diff options
| -rw-r--r-- | po/bg.po | 4985 | ||||
| -rw-r--r-- | po/ca.po | 60 | ||||
| -rw-r--r-- | po/fr.po | 4940 | ||||
| -rw-r--r-- | po/git.pot | 4881 | ||||
| -rw-r--r-- | po/it.po | 4992 | ||||
| -rw-r--r-- | po/sv.po | 1006 |
6 files changed, 10658 insertions, 10206 deletions
@@ -31,7 +31,7 @@ # am прилагам поредица от кръпки # working directory/tree — винаги работно дърво, git следи цялото дърво, а не директории, работна директория за cwd # switch to branch преминавам към клон -# sparse entry частично изтеглена директория/път +# sparse entry/blob частично изтеглена директория/път/обект-BLOB # revision range диапазон на версиите # cover letter придружаващо писмо # reference repository еталонно хранилище @@ -155,10 +155,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.22\n" +"Project-Id-Version: git 2.24\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2019-08-10 12:25+0300\n" -"PO-Revision-Date: 2019-08-10 12:33+0300\n" +"POT-Creation-Date: 2019-10-19 09:17+0200\n" +"PO-Revision-Date: 2019-10-19 12:20+0200\n" "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" "Language: bg\n" @@ -209,7 +209,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "Изход от програмата заради некоригиран конфликт." -#: advice.c:193 builtin/merge.c:1327 +#: advice.c:193 builtin/merge.c:1332 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува)." @@ -355,17 +355,7 @@ msgstr "грешен режим на ред №%d: %s" msgid "inconsistent header lines %d and %d" msgstr "несъвместими заглавни части на редове №%d и №%d" -#: apply.c:1460 -#, c-format -msgid "recount: unexpected line: %.*s" -msgstr "при повторното преброяване бе получен неочакван ред: „%.*s“" - -#: apply.c:1529 -#, c-format -msgid "patch fragment without header at line %d: %.*s" -msgstr "част от кръпка без заглавна част на ред %d: %.*s" - -#: apply.c:1551 +#: apply.c:1372 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -380,71 +370,81 @@ msgstr[1] "" "След съкращаването на първите %d части от компонентите на пътя, в заглавната " "част на „git diff“ липсва информация за име на файл (ред: %d)" -#: apply.c:1564 +#: apply.c:1385 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" "в заглавната част на „git diff“ липсва информация за име на файл (ред: %d)" -#: apply.c:1752 +#: apply.c:1481 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "при повторното преброяване бе получен неочакван ред: „%.*s“" + +#: apply.c:1550 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "част от кръпка без заглавна част на ред %d: %.*s" + +#: apply.c:1753 msgid "new file depends on old contents" msgstr "новият файл зависи от старото съдържание на файла" -#: apply.c:1754 +#: apply.c:1755 msgid "deleted file still has contents" msgstr "изтритият файл не е празен" -#: apply.c:1788 +#: apply.c:1789 #, c-format msgid "corrupt patch at line %d" msgstr "грешка в кръпката на ред %d" -#: apply.c:1825 +#: apply.c:1826 #, c-format msgid "new file %s depends on old contents" msgstr "новият файл „%s“ зависи от старото съдържание на файла" -#: apply.c:1827 +#: apply.c:1828 #, c-format msgid "deleted file %s still has contents" msgstr "изтритият файл „%s“ не е празен" -#: apply.c:1830 +#: apply.c:1831 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "● предупреждение: файлът „%s“ вече е празен, но не е изтрит" -#: apply.c:1977 +#: apply.c:1978 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "грешка в двоичната кръпка на ред %d: %.*s" -#: apply.c:2014 +#: apply.c:2015 #, c-format msgid "unrecognized binary patch at line %d" msgstr "неразпозната двоичната кръпка на ред %d" -#: apply.c:2176 +#: apply.c:2177 #, c-format msgid "patch with only garbage at line %d" msgstr "кръпката е с изцяло повредени данни на ред %d" -#: apply.c:2262 +#: apply.c:2263 #, c-format msgid "unable to read symlink %s" msgstr "символната връзка „%s“ не може да бъде прочетена" -#: apply.c:2266 +#: apply.c:2267 #, c-format msgid "unable to open or read %s" msgstr "файлът „%s“ не може да бъде отворен или прочетен" -#: apply.c:2925 +#: apply.c:2926 #, c-format msgid "invalid start of line: '%c'" msgstr "неправилно начало на ред: „%c“" -#: apply.c:3046 +#: apply.c:3047 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." @@ -453,13 +453,13 @@ msgstr[0] "" msgstr[1] "" "%d-то парче код бе успешно приложено на ред %d (отместване от %d реда)." -#: apply.c:3058 +#: apply.c:3059 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" "Контекстът е намален на (%ld/%ld) за прилагането на парчето код на ред %d" -#: apply.c:3064 +#: apply.c:3065 #, c-format msgid "" "while searching for:\n" @@ -468,317 +468,317 @@ msgstr "" "при търсене за:\n" "%.*s" -#: apply.c:3086 +#: apply.c:3087 #, c-format msgid "missing binary patch data for '%s'" msgstr "липсват данните за двоичната кръпка за „%s“" -#: apply.c:3094 +#: apply.c:3095 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "двоичната кръпка не може да се приложи в обратна посока, когато обратното " "парче за „%s“ липсва" -#: apply.c:3141 +#: apply.c:3142 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "към „%s“ не може да се приложи двоична кръпка без пълен индекс" -#: apply.c:3151 +#: apply.c:3152 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "кръпката съответства на „%s“ (%s), който не съвпада по съдържание." -#: apply.c:3159 +#: apply.c:3160 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "кръпката съответства на „%s“, който трябва да е празен, но не е" -#: apply.c:3177 +#: apply.c:3178 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "" "необходимият резултат след операцията — „%s“ за „%s“ не може да бъде " "прочетен" -#: apply.c:3190 +#: apply.c:3191 #, c-format msgid "binary patch does not apply to '%s'" msgstr "двоичната кръпка не може да бъде приложена върху „%s“" -#: apply.c:3196 +#: apply.c:3197 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "двоичната кръпка за „%s“ води до неправилни резултати (очакваше се: „%s“, а " "бе получено: „%s“)" -#: apply.c:3217 +#: apply.c:3218 #, c-format msgid "patch failed: %s:%ld" msgstr "неуспешно прилагане на кръпка: „%s:%ld“" -#: apply.c:3340 +#: apply.c:3341 #, c-format msgid "cannot checkout %s" msgstr "„%s“ не може да се изтегли" -#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279 +#: apply.c:3393 apply.c:3404 apply.c:3450 midx.c:61 setup.c:280 #, c-format msgid "failed to read %s" msgstr "файлът „%s“ не може да бъде прочетен" -#: apply.c:3400 +#: apply.c:3401 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "изчитане на „%s“ след проследяване на символна връзка" -#: apply.c:3429 apply.c:3672 +#: apply.c:3430 apply.c:3673 #, c-format msgid "path %s has been renamed/deleted" msgstr "обектът с път „%s“ е преименуван или изтрит" -#: apply.c:3515 apply.c:3687 +#: apply.c:3516 apply.c:3688 #, c-format msgid "%s: does not exist in index" msgstr "„%s“ не съществува в индекса" -#: apply.c:3524 apply.c:3695 +#: apply.c:3525 apply.c:3696 #, c-format msgid "%s: does not match index" msgstr "„%s“ не съответства на индекса" -#: apply.c:3559 +#: apply.c:3560 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" "в хранилището липсват необходимите обекти-BLOB, за да се премине към тройно " "сливане." -#: apply.c:3562 +#: apply.c:3563 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Преминаване към тройно сливане…\n" -#: apply.c:3578 apply.c:3582 +#: apply.c:3579 apply.c:3583 #, c-format msgid "cannot read the current contents of '%s'" msgstr "текущото съдържание на „%s“ не може да бъде прочетено" -#: apply.c:3594 +#: apply.c:3595 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Неуспешно преминаване към тройно сливане…\n" -#: apply.c:3608 +#: apply.c:3609 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Конфликти при прилагането на кръпката към „%s“.\n" -#: apply.c:3613 +#: apply.c:3614 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Кръпката бе приложена чисто към „%s“.\n" -#: apply.c:3639 +#: apply.c:3640 msgid "removal patch leaves file contents" msgstr "изтриващата кръпка оставя файла непразен" -#: apply.c:3712 +#: apply.c:3713 #, c-format msgid "%s: wrong type" msgstr "„%s“: неправилен вид" -#: apply.c:3714 +#: apply.c:3715 #, c-format msgid "%s has type %o, expected %o" msgstr "„%s“ е от вид „%o“, а се очакваше „%o“" -#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856 +#: apply.c:3866 apply.c:3868 read-cache.c:830 read-cache.c:856 #: read-cache.c:1309 #, c-format msgid "invalid path '%s'" msgstr "неправилен път: „%s“" -#: apply.c:3923 +#: apply.c:3924 #, c-format msgid "%s: already exists in index" msgstr "„%s“: вече съществува в индекса" -#: apply.c:3926 +#: apply.c:3927 #, c-format msgid "%s: already exists in working directory" msgstr "„%s“: вече съществува в работното дърво" -#: apply.c:3946 +#: apply.c:3947 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "новите права за достъп (%o) на „%s“ не съвпадат със старите (%o)" -#: apply.c:3951 +#: apply.c:3952 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" "новите права за достъп (%o) на „%s“ не съвпадат със старите (%o) на „%s“" -#: apply.c:3971 +#: apply.c:3972 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "засегнатият файл „%s“ е след символна връзка" -#: apply.c:3975 +#: apply.c:3976 #, c-format msgid "%s: patch does not apply" msgstr "Кръпката „%s“ не може да бъде приложена" -#: apply.c:3990 +#: apply.c:3991 #, c-format msgid "Checking patch %s..." msgstr "Проверяване на кръпката „%s“…" -#: apply.c:4082 +#: apply.c:4083 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "" "информацията за сумата по SHA1 за подмодула липсва или не е достатъчна (%s)." -#: apply.c:4089 +#: apply.c:4090 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "смяна на режима на достъпа на „%s“, който не е в текущия връх „HEAD“" -#: apply.c:4092 +#: apply.c:4093 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "информацията за сумата по SHA1 липсва или не е достатъчна (%s)." -#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143 +#: apply.c:4098 builtin/checkout.c:279 builtin/reset.c:143 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "неуспешно създаване на запис в кеша чрез „make_cache_entry“ за „%s“" -#: apply.c:4101 +#: apply.c:4102 #, c-format msgid "could not add %s to temporary index" msgstr "„%s“ не може да се добави към временния индекс" -#: apply.c:4111 +#: apply.c:4112 #, c-format msgid "could not write temporary index to %s" msgstr "временният индекс не може да се запази в „%s“" -#: apply.c:4249 +#: apply.c:4250 #, c-format msgid "unable to remove %s from index" msgstr "„%s“ не може да се извади от индекса" -#: apply.c:4283 +#: apply.c:4284 #, c-format msgid "corrupt patch for submodule %s" msgstr "повредена кръпка за модула „%s“" -#: apply.c:4289 +#: apply.c:4290 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" "не може да се получи информация чрез „stat“ за новосъздадения файл „%s“" -#: apply.c:4297 +#: apply.c:4298 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" "не може да се за създаде мястото за съхранение на новосъздадения файл „%s“" -#: apply.c:4303 apply.c:4448 +#: apply.c:4304 apply.c:4449 #, c-format msgid "unable to add cache entry for %s" msgstr "не може да се добави запис в кеша за „%s“" -#: apply.c:4346 +#: apply.c:4347 #, c-format msgid "failed to write to '%s'" msgstr "в „%s“ не може да се пише" -#: apply.c:4350 +#: apply.c:4351 #, c-format msgid "closing file '%s'" msgstr "затваряне на файла „%s“" -#: apply.c:4420 +#: apply.c:4421 #, c-format msgid "unable to write file '%s' mode %o" msgstr "файлът „%s“ не може да се запише с режим на достъп „%o“" -#: apply.c:4518 +#: apply.c:4519 #, c-format msgid "Applied patch %s cleanly." msgstr "Кръпката „%s“ бе приложена чисто." -#: apply.c:4526 +#: apply.c:4527 msgid "internal error" msgstr "вътрешна грешка" -#: apply.c:4529 +#: apply.c:4530 #, 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:4540 +#: apply.c:4541 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "съкращаване на името на файла с отхвърлените парчета на „ %.*s.rej“" -#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168 +#: apply.c:4549 builtin/fetch.c:898 builtin/fetch.c:1194 #, c-format msgid "cannot open %s" msgstr "„%s“ не може да бъде отворен" -#: apply.c:4562 +#: apply.c:4563 #, c-format msgid "Hunk #%d applied cleanly." msgstr "%d-то парче бе успешно приложено." -#: apply.c:4566 +#: apply.c:4567 #, c-format msgid "Rejected hunk #%d." msgstr "%d-то парче бе отхвърлено." -#: apply.c:4676 +#: apply.c:4686 #, c-format msgid "Skipped patch '%s'." msgstr "Пропусната кръпка: „%s“" -#: apply.c:4684 +#: apply.c:4694 msgid "unrecognized input" msgstr "непознат вход" -#: apply.c:4704 +#: apply.c:4714 msgid "unable to read index file" msgstr "индексът не може да бъде записан" -#: apply.c:4859 +#: apply.c:4871 #, c-format msgid "can't open patch '%s': %s" msgstr "кръпката „%s“ не може да бъде отворена: %s" -#: apply.c:4886 +#: apply.c:4898 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "пренебрегната е %d грешка в знаците за интервали" msgstr[1] "пренебрегнати са %d грешки в знаците за интервали" -#: apply.c:4892 apply.c:4907 +#: apply.c:4904 apply.c:4919 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d ред добавя грешки в знаците за интервали." msgstr[1] "%d реда добавят грешки в знаците за интервали." -#: apply.c:4900 +#: apply.c:4912 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." @@ -787,144 +787,144 @@ msgstr[0] "" msgstr[1] "" "Добавени са %d реда след корекцията на грешките в знаците за интервали." -#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4928 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "Новият индекс не може да бъде записан" -#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211 -#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273 -#: builtin/pull.c:208 builtin/submodule--helper.c:407 +#: apply.c:4955 apply.c:4958 builtin/am.c:2197 builtin/am.c:2200 +#: builtin/clone.c:122 builtin/fetch.c:143 builtin/merge.c:273 +#: builtin/pull.c:209 builtin/submodule--helper.c:407 #: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370 #: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853 #: builtin/submodule--helper.c:2092 git-add--interactive.perl:211 msgid "path" msgstr "път" -#: apply.c:4944 +#: apply.c:4956 msgid "don't apply changes matching the given path" msgstr "без прилагане на промените напасващи на дадения път" -#: apply.c:4947 +#: apply.c:4959 msgid "apply changes matching the given path" msgstr "прилагане на промените напасващи на дадения път" -#: apply.c:4949 builtin/am.c:2217 +#: apply.c:4961 builtin/am.c:2206 msgid "num" msgstr "БРОЙ" -#: apply.c:4950 +#: apply.c:4962 msgid "remove <num> leading slashes from traditional diff paths" msgstr "премахване на този БРОЙ водещи елементи от пътищата в разликата" -#: apply.c:4953 +#: apply.c:4965 msgid "ignore additions made by the patch" msgstr "игнориране на редовете добавени от тази кръпка" -#: apply.c:4955 +#: apply.c:4967 msgid "instead of applying the patch, output diffstat for the input" msgstr "извеждане на статистика на промените без прилагане на кръпката" -#: apply.c:4959 +#: apply.c:4971 msgid "show number of added and deleted lines in decimal notation" msgstr "извеждане на броя на добавените и изтритите редове" -#: apply.c:4961 +#: apply.c:4973 msgid "instead of applying the patch, output a summary for the input" msgstr "извеждане на статистика на входните данни без прилагане на кръпката" -#: apply.c:4963 +#: apply.c:4975 msgid "instead of applying the patch, see if the patch is applicable" msgstr "проверка дали кръпката може да се приложи, без действително прилагане" -#: apply.c:4965 +#: apply.c:4977 msgid "make sure the patch is applicable to the current index" msgstr "проверка дали кръпката може да бъде приложена към текущия индекс" -#: apply.c:4967 +#: apply.c:4979 msgid "mark new files with `git add --intent-to-add`" msgstr "отбелязване на новите файлове с „git add --intent-to-add“" -#: apply.c:4969 +#: apply.c:4981 msgid "apply a patch without touching the working tree" msgstr "прилагане на кръпката без промяна на работното дърво" -#: apply.c:4971 +#: apply.c:4983 msgid "accept a patch that touches outside the working area" msgstr "прилагане на кръпка, която променя и файлове извън работното дърво" -#: apply.c:4974 +#: apply.c:4986 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" "кръпката да бъде приложена. Опцията се комбинира с „--check“/„--stat“/„--" "summary“" -#: apply.c:4976 +#: apply.c:4988 msgid "attempt three-way merge if a patch does not apply" msgstr "пробване с тройно сливане, ако кръпката не може да се приложи директно" -#: apply.c:4978 +#: apply.c:4990 msgid "build a temporary index based on embedded index information" msgstr "" "създаване на временен индекс на база на включената информация за индекса" -#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:4993 builtin/checkout-index.c:173 builtin/ls-files.c:524 msgid "paths are separated with NUL character" msgstr "разделяне на пътищата с нулевия знак „NUL“" -#: apply.c:4983 +#: apply.c:4995 msgid "ensure at least <n> lines of context match" msgstr "да се осигури контекст от поне такъв БРОЙ съвпадащи редове" -#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98 +#: apply.c:4996 builtin/am.c:2185 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3330 builtin/rebase.c:1421 +#: builtin/pack-objects.c:3310 builtin/rebase.c:1445 msgid "action" msgstr "действие" -#: apply.c:4985 +#: apply.c:4997 msgid "detect new or modified lines that have whitespace errors" msgstr "засичане на нови или променени редове с грешки в знаците за интервали" -#: apply.c:4988 apply.c:4991 +#: apply.c:5000 apply.c:5003 msgid "ignore changes in whitespace when finding context" msgstr "" "игнориране на промените в знаците за интервали при откриване на контекста" -#: apply.c:4994 +#: apply.c:5006 msgid "apply the patch in reverse" msgstr "прилагане на кръпката в обратна посока" -#: apply.c:4996 +#: apply.c:5008 msgid "don't expect at least one line of context" msgstr "без изискване на дори и един ред контекст" -#: apply.c:4998 +#: apply.c:5010 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "оставяне на отхвърлените парчета във файлове с разширение „.rej“" -#: apply.c:5000 +#: apply.c:5012 msgid "allow overlapping hunks" msgstr "позволяване на застъпващи се парчета" -#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22 +#: apply.c:5013 builtin/add.c:291 builtin/check-ignore.c:22 #: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786 -#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128 +#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "повече подробности" -#: apply.c:5003 +#: apply.c:5015 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "пренебрегване на неправилно липсващ знак за нов ред в края на файл" -#: apply.c:5006 +#: apply.c:5018 msgid "do not trust the line counts in the hunk headers" msgstr "без доверяване на номерата на редовете в заглавните части на парчетата" -#: apply.c:5008 builtin/am.c:2205 +#: apply.c:5020 builtin/am.c:2194 msgid "root" msgstr "НАЧАЛНА_ДИРЕКТОРИЯ" -#: apply.c:5009 +#: apply.c:5021 msgid "prepend <root> to all filenames" msgstr "добавяне на тази НАЧАЛНА_ДИРЕКТОРИЯ към имената на всички файлове" @@ -979,7 +979,7 @@ msgstr "ФОРМАТ" msgid "archive format" msgstr "ФОРМАТ на архива" -#: archive.c:458 builtin/log.c:1580 +#: archive.c:458 builtin/log.c:1581 msgid "prefix" msgstr "ПРЕФИКС" @@ -987,11 +987,12 @@ msgstr "ПРЕФИКС" msgid "prepend prefix to each pathname in the archive" msgstr "добавяне на този ПРЕФИКС към всеки път в архива" -#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875 -#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134 -#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105 -#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412 -#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177 +#: archive.c:460 builtin/blame.c:861 builtin/blame.c:873 builtin/blame.c:874 +#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162 +#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899 +#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563 +#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 +#: parse-options.h:186 msgid "file" msgstr "ФАЙЛ" @@ -1023,7 +1024,7 @@ msgstr "добро компресиране" msgid "list supported archive formats" msgstr "извеждане на списъка с поддържаните формати" -#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: archive.c:479 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115 #: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859 msgid "repo" msgstr "хранилище" @@ -1032,7 +1033,7 @@ msgstr "хранилище" msgid "retrieve the archive from remote repository <repo>" msgstr "изтегляне на архива от отдалеченото ХРАНИЛИЩЕ" -#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707 +#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715 #: builtin/notes.c:498 msgid "command" msgstr "команда" @@ -1068,26 +1069,26 @@ msgstr "Аргументът не се поддържа за форма̀та msgid "cannot stream blob %s" msgstr "обектът-BLOB „%s“ не може да бъде обработен" -#: archive-tar.c:260 archive-zip.c:363 +#: archive-tar.c:266 archive-zip.c:363 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "неподдържани права за достъп до файл: 0%o (SHA1: %s)" -#: archive-tar.c:287 archive-zip.c:353 +#: archive-tar.c:293 archive-zip.c:353 #, c-format msgid "cannot read %s" msgstr "обектът „%s“ не може да бъде прочетен" -#: archive-tar.c:459 +#: archive-tar.c:465 #, c-format msgid "unable to start '%s' filter" msgstr "филтърът „%s“ не може да бъде стартиран" -#: archive-tar.c:462 +#: archive-tar.c:468 msgid "unable to redirect descriptor" msgstr "дескрипторът не може да бъде пренасочен" -#: archive-tar.c:469 +#: archive-tar.c:475 #, c-format msgid "'%s' filter reported error" msgstr "филтърът „%s“ върна грешка" @@ -1112,17 +1113,17 @@ msgstr "грешка при декомпресиране с „deflate“ (%d)" msgid "timestamp too large for this system: %<PRIuMAX>" msgstr "времевата стойност е твърде голяма за тази система: %<PRIuMAX>" -#: attr.c:211 +#: attr.c:213 #, c-format msgid "%.*s is not a valid attribute name" msgstr "„%.*s“ е неправилно име за атрибут" -#: attr.c:368 +#: attr.c:370 #, c-format msgid "%s not allowed: %s:%d" msgstr "%s: командата не е позволена: „%s:%d“" -#: attr.c:408 +#: attr.c:410 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1249,41 +1250,41 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "Двоично търсене: остава %d версия след тази %s\n" msgstr[1] "Двоично търсене: остават %d версии след тази %s\n" -#: blame.c:2697 +#: blame.c:2700 msgid "--contents and --reverse do not blend well." msgstr "Опциите „--contents“ и „--reverse“ са несъвместими" -#: blame.c:2711 +#: blame.c:2714 msgid "cannot use --contents with final commit object name" msgstr "Опцията „--contents“ е несъвместима с име на обект от крайно подаване" -#: blame.c:2732 +#: blame.c:2735 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "Едновременното задаване на опциите „--reverse“ и „--first-parent“ изисква " "указването на крайно подаване" -#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033 -#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963 -#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411 -#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163 +#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:1971 +#: sequencer.c:4305 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:964 +#: builtin/log.c:1452 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411 +#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "неуспешно настройване на обхождането на версиите" -#: blame.c:2759 +#: blame.c:2762 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "Едновременното задаване на опциите „--reverse“ и „--first-parent“ изисква " "указването на диапазон по веригата на първите наследници" -#: blame.c:2770 +#: blame.c:2773 #, c-format msgid "no such path %s in %s" msgstr "няма път на име „%s“ в „%s“" -#: blame.c:2781 +#: blame.c:2784 #, c-format msgid "cannot read blob %s for path %s" msgstr "обектът-BLOB „%s“ в пътя %s не може да бъде прочетен" @@ -1436,7 +1437,7 @@ msgstr "Файлът „%s“ не изглежда да е пратка на gi msgid "unrecognized header: %s%s (%d)" msgstr "непозната заглавна част: %s%s (%d)" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2221 sequencer.c:2962 #: builtin/commit.c:791 #, c-format msgid "could not open '%s'" @@ -1490,7 +1491,7 @@ msgid "ref '%s' is excluded by the rev-list options" msgstr "" "указателят „%s“ не е бил включен поради опциите зададени на „git rev-list“" -#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306 +#: bundle.c:460 builtin/log.c:202 builtin/log.c:1733 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "непознат аргумент: %s" @@ -1513,8 +1514,8 @@ msgstr "Командата „git index-pack“ не завърши успешн msgid "invalid color value: %.*s" msgstr "неправилна стойност за цвят: %.*s" -#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399 -#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455 +#: commit.c:50 sequencer.c:2665 builtin/am.c:354 builtin/am.c:398 +#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456 #, c-format msgid "could not parse %s" msgstr "„%s“ не може да се анализира" @@ -1547,29 +1548,29 @@ msgstr "" "\n" " git config advice.graftFileDeprecated false" -#: commit.c:1127 +#: commit.c:1128 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "Подаването „%s“ е с недоверен подпис от GPG, който твърди, че е на „%s“." -#: commit.c:1130 +#: commit.c:1131 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" "Подаването „%s“ е с неправилен подпис от GPG, който твърди, че е на „%s“." -#: commit.c:1133 +#: commit.c:1134 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Подаването „%s“ е без подпис от GPG." -#: commit.c:1136 +#: commit.c:1137 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Подаването „%s“ е с коректен подпис от GPG на „%s“.\n" -#: commit.c:1390 +#: commit.c:1391 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -1631,185 +1632,200 @@ msgstr "" msgid "unable to find all commit-graph files" msgstr "някои файлове на гра̀фа с подаванията не могат да бъдат открити" -#: commit-graph.c:554 commit-graph.c:614 +#: commit-graph.c:561 commit-graph.c:621 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "" "неправилна позиция на подаването. Вероятно графът с подаванията е повреден" -#: commit-graph.c:575 +#: commit-graph.c:582 #, c-format msgid "could not find commit %s" msgstr "подаването „%s“ не може да бъде открито" -#: commit-graph.c:1002 builtin/pack-objects.c:2657 +#: commit-graph.c:855 builtin/am.c:1287 +#, c-format +msgid "unable to parse commit %s" +msgstr "подаването не може да бъде анализирано: %s" + +#: commit-graph.c:859 +#, c-format +msgid "unable to get tree for %s" +msgstr "дървото на „%s“ не може да бъде получено" + +#: commit-graph.c:1017 builtin/pack-objects.c:2641 #, c-format msgid "unable to get type of object %s" msgstr "видът на обекта „%s“ не може да бъде определен" -#: commit-graph.c:1034 +#: commit-graph.c:1049 msgid "Loading known commits in commit graph" msgstr "Зареждане на познатите подавания в гра̀фа с подаванията" -#: commit-graph.c:1051 +#: commit-graph.c:1066 msgid "Expanding reachable commits in commit graph" msgstr "Разширяване на достижимите подавания в гра̀фа" -#: commit-graph.c:1070 +#: commit-graph.c:1085 msgid "Clearing commit marks in commit graph" msgstr "Изчистване на отбелязванията на подаванията в гра̀фа с подаванията" -#: commit-graph.c:1089 +#: commit-graph.c:1104 msgid "Computing commit graph generation numbers" msgstr "Изчисляване на номерата на поколенията в гра̀фа с подаванията" -#: commit-graph.c:1163 +#: commit-graph.c:1179 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "Откриване на подаванията в гра̀фа в %d пакетен файл" msgstr[1] "Откриване на подаванията в гра̀фа в %d пакетни файла" -#: commit-graph.c:1176 +#: commit-graph.c:1192 #, c-format msgid "error adding pack %s" msgstr "грешка при добавяне на пакетен файл „%s“" -#: commit-graph.c:1180 +#: commit-graph.c:1196 #, c-format msgid "error opening index for %s" msgstr "грешка при отваряне на индекса на „%s“" -#: commit-graph.c:1204 +#: commit-graph.c:1220 #, c-format msgid "Finding commits for commit graph from %d ref" msgid_plural "Finding commits for commit graph from %d refs" msgstr[0] "Откриване на подаванията в гра̀фа измежду %d указател" msgstr[1] "Откриване на подаванията в гра̀фа измежду %d указатели" -#: commit-graph.c:1238 +#: commit-graph.c:1240 +#, c-format +msgid "invalid commit object id: %s" +msgstr "неправилен идентификатор на обект-подаване: „%s“" + +#: commit-graph.c:1255 msgid "Finding commits for commit graph among packed objects" msgstr "Откриване на подаванията в гра̀фа измежду пакетираните обекти" -#: commit-graph.c:1253 +#: commit-graph.c:1270 msgid "Counting distinct commits in commit graph" msgstr "Преброяване на различните подавания в гра̀фа" -#: commit-graph.c:1284 +#: commit-graph.c:1300 msgid "Finding extra edges in commit graph" msgstr "Откриване на още върхове в гра̀фа с подаванията" -#: commit-graph.c:1332 +#: commit-graph.c:1346 msgid "failed to write correct number of base graph ids" msgstr "правилният брой на базовите идентификатори не може да се запише" -#: commit-graph.c:1365 midx.c:811 +#: commit-graph.c:1379 midx.c:810 #, c-format msgid "unable to create leading directories of %s" msgstr "родителските директории на „%s“ не могат да бъдат създадени" -#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240 +#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:241 #, c-format msgid "unable to create '%s'" msgstr "пакетният файл „%s“ не може да бъде създаден" -#: commit-graph.c:1437 +#: commit-graph.c:1451 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "Запазване на гра̀фа с подаванията в %d пас" msgstr[1] "Запазване на гра̀фа с подаванията в %d паса" -#: commit-graph.c:1478 +#: commit-graph.c:1492 msgid "unable to open commit-graph chain file" msgstr "файлът с веригата на гра̀фа с подаванията не може да се отвори" -#: commit-graph.c:1490 +#: commit-graph.c:1504 msgid "failed to rename base commit-graph file" msgstr "основният файл на гра̀фа с подаванията не може да бъде преименуван" -#: commit-graph.c:1510 +#: commit-graph.c:1524 msgid "failed to rename temporary commit-graph file" msgstr "временният файл на гра̀фа с подаванията не може да бъде преименуван" -#: commit-graph.c:1621 +#: commit-graph.c:1635 msgid "Scanning merged commits" msgstr "Търсене на подаванията със сливания" -#: commit-graph.c:1632 +#: commit-graph.c:1646 #, c-format msgid "unexpected duplicate commit id %s" msgstr "неочакван, повтарящ се идентификатор на подаване: %s" -#: commit-graph.c:1657 +#: commit-graph.c:1670 msgid "Merging commit-graph" msgstr "Сливане на гра̀фа с подаванията" -#: commit-graph.c:1844 +#: commit-graph.c:1860 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "форматът на гра̀фа с подаванията не може да запише %d подавания" -#: commit-graph.c:1855 +#: commit-graph.c:1871 msgid "too many commits to write graph" msgstr "прекалено много подавания за записване на гра̀фа" -#: commit-graph.c:1945 +#: commit-graph.c:1961 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "графът с подаванията е с грешна сума за проверка — вероятно е повреден" -#: commit-graph.c:1955 +#: commit-graph.c:1971 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "" "неправилна подредба на обектите по идентификатор в гра̀фа с подаванията: „%s“ " "е преди „%s“, а не трябва" -#: commit-graph.c:1965 commit-graph.c:1980 +#: commit-graph.c:1981 commit-graph.c:1996 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" "неправилна стойност за откъс в гра̀фа с подаванията: fanout[%d] = %u, а " "трябва да е %u" -#: commit-graph.c:1972 +#: commit-graph.c:1988 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "подаване „%s“ в гра̀фа с подаванията не може да се анализира" -#: commit-graph.c:1989 +#: commit-graph.c:2006 msgid "Verifying commits in commit graph" msgstr "Проверка на подаванията в гра̀фа" -#: commit-graph.c:2002 +#: commit-graph.c:2020 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" "подаване „%s“ в базата от данни към гра̀фа с подаванията не може да се " "анализира" -#: commit-graph.c:2009 +#: commit-graph.c:2027 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" "идентификаторът на обект за кореновото дърво за подаване „%s“ в гра̀фа с " "подаванията е „%s“, а трябва да е „%s“" -#: commit-graph.c:2019 +#: commit-graph.c:2037 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "списъкът с родители на „%s“ в гра̀фа с подаванията е прекалено дълъг" -#: commit-graph.c:2028 +#: commit-graph.c:2046 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "родителят на „%s“ в гра̀фа с подаванията е „%s“, а трябва да е „%s“" -#: commit-graph.c:2041 +#: commit-graph.c:2059 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "списъкът с родители на „%s“ в гра̀фа с подаванията е прекалено къс" -#: commit-graph.c:2046 +#: commit-graph.c:2064 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -1817,7 +1833,7 @@ msgstr "" "номерът на поколението на подаване „%s“ в гра̀фа с подаванията е 0, а другаде " "не е" -#: commit-graph.c:2050 +#: commit-graph.c:2068 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -1825,14 +1841,14 @@ msgstr "" "номерът на поколението на подаване „%s“ в гра̀фа с подаванията не е 0, а " "другаде е" -#: commit-graph.c:2065 +#: commit-graph.c:2083 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "" "номерът на поколението на подаване „%s“ в гра̀фа с подаванията е %u, а " "другаде е %u" -#: commit-graph.c:2071 +#: commit-graph.c:2089 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" @@ -1881,7 +1897,7 @@ msgstr "ключът не съдържа раздел: „%s“" msgid "key does not contain variable name: %s" msgstr "ключът не съдържа име на променлива: „%s“" -#: config.c:406 sequencer.c:2463 +#: config.c:406 sequencer.c:2401 #, c-format msgid "invalid key: %s" msgstr "неправилен ключ: „%s“" @@ -2003,17 +2019,17 @@ msgstr "настройката „core.commentChar“ трябва да е са msgid "invalid mode for object creation: %s" msgstr "неправилен режим за създаването на обекти: %s" -#: config.c:1430 +#: config.c:1425 #, c-format msgid "malformed value for %s" msgstr "неправилна стойност за „%s“" -#: config.c:1456 +#: config.c:1451 #, c-format msgid "malformed value for %s: %s" msgstr "неправилна стойност за „%s“: „%s“" -#: config.c:1457 +#: config.c:1452 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "" "трябва да е една от следните стойности: „nothing“ (без изтласкване при липса " @@ -2021,139 +2037,132 @@ msgstr "" "„simple“ (клонът със същото име, от който се издърпва), „upstream“ (клонът, " "от който се издърпва) или „current“ (клонът със същото име)" -#: config.c:1518 builtin/pack-objects.c:3410 +#: config.c:1513 builtin/pack-objects.c:3394 #, c-format msgid "bad pack compression level %d" msgstr "неправилно ниво на компресиране при пакетиране: %d" -#: config.c:1639 +#: config.c:1634 #, c-format msgid "unable to load config blob object '%s'" msgstr "обектът-BLOB „%s“ с конфигурации не може да се зареди" -#: config.c:1642 +#: config.c:1637 #, c-format msgid "reference '%s' does not point to a blob" msgstr "указателят „%s“ не сочи към обект-BLOB" -#: config.c:1659 +#: config.c:1654 #, c-format msgid "unable to resolve config blob '%s'" msgstr "обектът-BLOB „%s“ с конфигурации не може да бъде открит" -#: config.c:1689 +#: config.c:1684 #, c-format msgid "failed to parse %s" msgstr "„%s“ не може да бъде анализиран" -#: config.c:1745 +#: config.c:1740 msgid "unable to parse command-line config" msgstr "неправилни настройки от командния ред" -#: config.c:2094 +#: config.c:2091 msgid "unknown error occurred while reading the configuration files" msgstr "неочаквана грешка при изчитането на конфигурационните файлове" -#: config.c:2264 +#: config.c:2261 #, c-format msgid "Invalid %s: '%s'" msgstr "Неправилен %s: „%s“" -#: config.c:2307 -#, c-format -msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" -msgstr "" -"непозната стойност „%s“ за настройката „core.untrackedCache“. Ще се ползва " -"стандартната стойност „keep“ (запазване)" - -#: config.c:2333 +#: config.c:2306 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" "стойността на „splitIndex.maxPercentChange“ трябва да е между 1 и 100, а не " "%d" -#: config.c:2379 +#: config.c:2352 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "неразпозната стойност „%s“ от командния ред" -#: config.c:2381 +#: config.c:2354 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "неправилна настройка „%s“ във файла „%s“ на ред №%d" -#: config.c:2462 +#: config.c:2435 #, c-format msgid "invalid section name '%s'" msgstr "неправилно име на раздел: „%s“" -#: config.c:2494 +#: config.c:2467 #, c-format msgid "%s has multiple values" msgstr "зададени са няколко стойности за „%s“" -#: config.c:2523 +#: config.c:2496 #, c-format msgid "failed to write new configuration file %s" msgstr "новият конфигурационен файл „%s“ не може да бъде запазен" -#: config.c:2775 config.c:3099 +#: config.c:2748 config.c:3072 #, c-format msgid "could not lock config file %s" msgstr "конфигурационният файл „%s“ не може да бъде заключен" -#: config.c:2786 +#: config.c:2759 #, c-format msgid "opening %s" msgstr "отваряне на „%s“" -#: config.c:2821 builtin/config.c:328 +#: config.c:2794 builtin/config.c:328 #, c-format msgid "invalid pattern: %s" msgstr "неправилен шаблон: %s" -#: config.c:2846 +#: config.c:2819 #, c-format msgid "invalid config file %s" msgstr "неправилен конфигурационен файл: „%s“" -#: config.c:2859 config.c:3112 +#: config.c:2832 config.c:3085 #, c-format msgid "fstat on %s failed" msgstr "неуспешно изпълнение на „fstat“ върху „%s“" -#: config.c:2870 +#: config.c:2843 #, c-format msgid "unable to mmap '%s'" msgstr "неуспешно изпълнение на „mmap“ върху „%s“" -#: config.c:2879 config.c:3117 +#: config.c:2852 config.c:3090 #, c-format msgid "chmod on %s failed" msgstr "неуспешна смяна на права с „chmod“ върху „%s“" -#: config.c:2964 config.c:3214 +#: config.c:2937 config.c:3187 #, c-format msgid "could not write config file %s" msgstr "конфигурационният файл „%s“ не може да бъде записан" -#: config.c:2998 +#: config.c:2971 #, c-format msgid "could not set '%s' to '%s'" msgstr "„%s“ не може да се зададе да е „%s“" -#: config.c:3000 builtin/remote.c:782 +#: config.c:2973 builtin/remote.c:782 #, c-format msgid "could not unset '%s'" msgstr "„%s“ не може да се премахне" -#: config.c:3090 +#: config.c:3063 #, c-format msgid "invalid section name: %s" msgstr "неправилно име на раздел: %s" -#: config.c:3257 +#: config.c:3230 #, c-format msgid "missing value for '%s'" msgstr "липсва стойност за „%s“" @@ -2278,7 +2287,7 @@ msgstr "„%s“ не може да се открие (%s)" msgid "unknown port %s" msgstr "непознат порт „%s“" -#: connect.c:845 connect.c:1171 +#: connect.c:845 connect.c:1175 #, c-format msgid "strange hostname '%s' blocked" msgstr "необичайното име на хост „%s“ е блокирано" @@ -2293,62 +2302,62 @@ msgstr "необичайният порт „%s“ е блокиран" msgid "cannot start proxy %s" msgstr "посредникът „%s“ не може да се стартира" -#: connect.c:924 +#: connect.c:928 msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "" "не е указан път. Проверете синтаксиса с командата:\n" "\n" " git help pull" -#: connect.c:1119 +#: connect.c:1123 msgid "ssh variant 'simple' does not support -4" msgstr "вариантът за „ssh“ — „simple“ (опростен), не поддържа опцията „-4“" -#: connect.c:1131 +#: connect.c:1135 msgid "ssh variant 'simple' does not support -6" msgstr "вариантът за „ssh“ — „simple“ (опростен), не поддържа опцията „-6“" -#: connect.c:1148 +#: connect.c:1152 msgid "ssh variant 'simple' does not support setting port" msgstr "" "вариантът за „ssh“ — „simple“ (опростен), не поддържа задаването на порт" -#: connect.c:1260 +#: connect.c:1264 #, c-format msgid "strange pathname '%s' blocked" msgstr "необичайният път „%s“ е блокиран" -#: connect.c:1307 +#: connect.c:1311 msgid "unable to fork" msgstr "неуспешно създаване на процес" -#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43 +#: connected.c:88 builtin/fsck.c:221 builtin/prune.c:43 msgid "Checking connectivity" msgstr "Проверка на свързаността" -#: connected.c:98 +#: connected.c:100 msgid "Could not run 'git rev-list'" msgstr "Командата „git rev-list“ не може да бъде изпълнена." -#: connected.c:118 +#: connected.c:120 msgid "failed write to rev-list" msgstr "неуспешен запис на списъка с версиите" -#: connected.c:125 +#: connected.c:127 msgid "failed to close rev-list's stdin" msgstr "стандартният вход на списъка с версиите не може да бъде затворен" -#: convert.c:193 +#: convert.c:194 #, c-format msgid "illegal crlf_action %d" msgstr "неправилно действие за край на ред: %d" -#: convert.c:206 +#: convert.c:207 #, c-format msgid "CRLF would be replaced by LF in %s" msgstr "Всяка последователност от знаци „CRLF“ ще бъдe заменена с „LF“ в „%s“." -#: convert.c:208 +#: convert.c:209 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" @@ -2358,13 +2367,13 @@ msgstr "" "Файлът ще остане с първоначалните знаци за край на ред в работната ви " "директория." -#: convert.c:216 +#: convert.c:217 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "" "Всеки знак „LF“ ще бъдe заменен с последователността от знаци „CRLF“ в „%s“." -#: convert.c:218 +#: convert.c:219 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" @@ -2375,14 +2384,14 @@ msgstr "" "Файлът ще остане с първоначалните знаци за край на ред в работната ви " "директория." -#: convert.c:279 +#: convert.c:280 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "" "„%s“ не трябва да съдържа маркер за поредността на байтовете (BOM) при " "кодиране „%s“" -#: convert.c:286 +#: convert.c:287 #, c-format msgid "" "The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-" @@ -2391,14 +2400,14 @@ msgstr "" "Файлът „%s“ съдържа маркер за поредността на байтовете (BOM). Използвайте " "„UTF-%s“ като кодиране за работното дърво." -#: convert.c:304 +#: convert.c:305 #, c-format msgid "BOM is required in '%s' if encoded as %s" msgstr "" "„%s“ трябва да съдържа маркер за поредността на байтовете (BOM) при кодиране " "„%s“" -#: convert.c:306 +#: convert.c:307 #, c-format msgid "" "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" @@ -2408,50 +2417,50 @@ msgstr "" "на работното дърво използвайте UTF-%sBE или UTF-%sLE (в зависимост от " "поредността на байтовете)." -#: convert.c:424 convert.c:495 +#: convert.c:425 convert.c:496 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "неуспешно прекодиране на „%s“ от „%s“ към „%s“" -#: convert.c:467 +#: convert.c:468 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "Прекодирането на „%s“ от „%s“ към „%s“ и обратно променя файла" -#: convert.c:673 +#: convert.c:674 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "неуспешно създаване на процес за външен филтър „%s“" -#: convert.c:693 +#: convert.c:694 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "входът не може да бъде подаден на външния филтър „%s“" -#: convert.c:700 +#: convert.c:701 #, c-format msgid "external filter '%s' failed %d" msgstr "неуспешно изпълнение на външния филтър „%s“: %d" -#: convert.c:735 convert.c:738 +#: convert.c:736 convert.c:739 #, c-format msgid "read from external filter '%s' failed" msgstr "неуспешно четене от външния филтър „%s“" -#: convert.c:741 convert.c:796 +#: convert.c:742 convert.c:797 #, c-format msgid "external filter '%s' failed" msgstr "неуспешно изпълнение на външния филтър „%s“" -#: convert.c:844 +#: convert.c:845 msgid "unexpected filter type" msgstr "неочакван вид филтър" -#: convert.c:855 +#: convert.c:856 msgid "path name too long for external filter" msgstr "пътят е прекалено дълъг за външен филтър" -#: convert.c:929 +#: convert.c:930 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " @@ -2460,67 +2469,67 @@ msgstr "" "външният филтър „%s“ вече не е наличен, въпреки че не всички пътища са " "филтрирани" -#: convert.c:1228 +#: convert.c:1229 msgid "true/false are no valid working-tree-encodings" msgstr "„true“/„false“ не може да са кодирания на работното дърво" -#: convert.c:1398 convert.c:1432 +#: convert.c:1417 convert.c:1451 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s: неуспешно изпълнение на декодиращ филтър „%s“" -#: convert.c:1476 +#: convert.c:1495 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s: неуспешно изпълнение на кодиращ филтър „%s“" -#: date.c:137 +#: date.c:138 msgid "in the future" msgstr "в бъдещето" -#: date.c:143 +#: date.c:144 #, c-format msgid "%<PRIuMAX> second ago" msgid_plural "%<PRIuMAX> seconds ago" msgstr[0] "преди %<PRIuMAX> секунда" msgstr[1] "преди %<PRIuMAX> секунди" -#: date.c:150 +#: date.c:151 #, c-format msgid "%<PRIuMAX> minute ago" msgid_plural "%<PRIuMAX> minutes ago" msgstr[0] "преди %<PRIuMAX> минута" msgstr[1] "преди %<PRIuMAX> минути" -#: date.c:157 +#: date.c:158 #, c-format msgid "%<PRIuMAX> hour ago" msgid_plural "%<PRIuMAX> hours ago" msgstr[0] "преди %<PRIuMAX> час" msgstr[1] "преди %<PRIuMAX> часа" -#: date.c:164 +#: date.c:165 #, c-format msgid "%<PRIuMAX> day ago" msgid_plural "%<PRIuMAX> days ago" msgstr[0] "преди %<PRIuMAX> ден" msgstr[1] "преди %<PRIuMAX> дена" -#: date.c:170 +#: date.c:171 #, c-format msgid "%<PRIuMAX> week ago" msgid_plural "%<PRIuMAX> weeks ago" msgstr[0] "преди %<PRIuMAX> седмица" msgstr[1] "преди %<PRIuMAX> седмици" -#: date.c:177 +#: date.c:178 #, c-format msgid "%<PRIuMAX> month ago" msgid_plural "%<PRIuMAX> months ago" msgstr[0] "преди %<PRIuMAX> месец" msgstr[1] "преди %<PRIuMAX> месеца" -#: date.c:188 +#: date.c:189 #, c-format msgid "%<PRIuMAX> year" msgid_plural "%<PRIuMAX> years" @@ -2528,14 +2537,14 @@ msgstr[0] "%<PRIuMAX> година" msgstr[1] "%<PRIuMAX> години" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:191 +#: date.c:192 #, c-format msgid "%s, %<PRIuMAX> month ago" msgid_plural "%s, %<PRIuMAX> months ago" msgstr[0] "преди %s и %<PRIuMAX> месец" msgstr[1] "преди %s и %<PRIuMAX> месеца" -#: date.c:196 date.c:201 +#: date.c:197 date.c:202 #, c-format msgid "%<PRIuMAX> year ago" msgid_plural "%<PRIuMAX> years ago" @@ -2573,7 +2582,7 @@ msgstr "Отбелязани са %d групи, работата приключ msgid "failed to read orderfile '%s'" msgstr "файлът с подредбата на съответствията „%s“ не може да бъде прочетен" -#: diffcore-rename.c:544 +#: diffcore-rename.c:543 msgid "Performing inexact rename detection" msgstr "Търсене на преименувания на обекти съчетани с промени" @@ -2645,38 +2654,38 @@ msgstr "" "Грешки в настройката „diff.dirstat“:\n" "%s" -#: diff.c:4215 +#: diff.c:4218 #, c-format msgid "external diff died, stopping at %s" msgstr "" "външната програма за разлики завърши неуспешно. Спиране на работата при „%s“" -#: diff.c:4560 +#: diff.c:4563 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" "Опциите „--name-only“, „--name-status“, „--check“ и „-s“ са несъвместими " "една с друга" -#: diff.c:4563 +#: diff.c:4566 msgid "-G, -S and --find-object are mutually exclusive" msgstr "Опциите „-G“, „-S“ и „--find-object“ са несъвместими една с друга" -#: diff.c:4641 +#: diff.c:4644 msgid "--follow requires exactly one pathspec" msgstr "Опцията „--follow“ изисква точно един път" -#: diff.c:4689 +#: diff.c:4692 #, c-format msgid "invalid --stat value: %s" msgstr "неправилна стойност за „--stat“: %s" -#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222 +#: diff.c:4697 diff.c:4702 diff.c:4707 diff.c:4712 diff.c:5225 #: parse-options.c:199 parse-options.c:203 #, c-format msgid "%s expects a numerical value" msgstr "опцията „%s“ очаква число за аргумент" -#: diff.c:4726 +#: diff.c:4729 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -2685,44 +2694,44 @@ msgstr "" "Неразпознат параметър към опцията „--dirstat/-X“:\n" "%s" -#: diff.c:4811 +#: diff.c:4814 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "непознат вид промяна: „%c“ в „--diff-filter=%s“" -#: diff.c:4835 +#: diff.c:4838 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "непозната стойност след „ws-error-highlight=%.*s“" -#: diff.c:4849 +#: diff.c:4852 #, c-format msgid "unable to resolve '%s'" msgstr "„%s“ не може да се открие" -#: diff.c:4899 diff.c:4905 +#: diff.c:4902 diff.c:4908 #, c-format msgid "%s expects <n>/<m> form" msgstr "" "опцията „%s“ изисква стойности за МИНИМАЛЕН_%%_ПРОМЯНА_ЗА_ИЗТОЧНИК_/" "МАКСИМАЛЕН_%%_ПРОМЯНА_ЗА_ЗАМЯНА от" -#: diff.c:4917 +#: diff.c:4920 #, c-format msgid "%s expects a character, got '%s'" msgstr "опцията „%s“ изисква знак, а не: „%s“" -#: diff.c:4938 +#: diff.c:4941 #, c-format msgid "bad --color-moved argument: %s" msgstr "неправилен аргумент за „--color-moved“: „%s“" -#: diff.c:4957 +#: diff.c:4960 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "неправилен режим „%s“ за „ --color-moved-ws“" -#: diff.c:4997 +#: diff.c:5000 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -2731,153 +2740,153 @@ msgstr "" "Майерс), „minimal“ (минимизиране на разликите), „patience“ (пасианс) и " "„histogram“ (хистограмен)" -#: diff.c:5033 diff.c:5053 +#: diff.c:5036 diff.c:5056 #, c-format msgid "invalid argument to %s" msgstr "неправилен аргумент към „%s“" -#: diff.c:5191 +#: diff.c:5194 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "неразпознат параметър към опцията „--submodule“: „%s“" -#: diff.c:5247 +#: diff.c:5250 #, c-format msgid "bad --word-diff argument: %s" msgstr "неправилен аргумент към „--word-diff“: „%s“" -#: diff.c:5270 +#: diff.c:5273 msgid "Diff output format options" msgstr "Формат на изхода за разликите" -#: diff.c:5272 diff.c:5278 +#: diff.c:5275 diff.c:5281 msgid "generate patch" msgstr "създаване на кръпки" -#: diff.c:5275 builtin/log.c:172 +#: diff.c:5278 builtin/log.c:172 msgid "suppress diff output" msgstr "без извеждане на разликите" -#: diff.c:5280 diff.c:5394 diff.c:5401 +#: diff.c:5283 diff.c:5397 diff.c:5404 msgid "<n>" msgstr "БРОЙ" -#: diff.c:5281 diff.c:5284 +#: diff.c:5284 diff.c:5287 msgid "generate diffs with <n> lines context" msgstr "файловете с разлики да са с контекст с такъв БРОЙ редове" -#: diff.c:5286 +#: diff.c:5289 msgid "generate the diff in raw format" msgstr "файловете с разлики да са в суров формат" -#: diff.c:5289 +#: diff.c:5292 msgid "synonym for '-p --raw'" msgstr "псевдоним на „-p --stat“" -#: diff.c:5293 +#: diff.c:5296 msgid "synonym for '-p --stat'" msgstr "псевдоним на „-p --stat“" -#: diff.c:5297 +#: diff.c:5300 msgid "machine friendly --stat" msgstr "„--stat“ във формат за четене от програма" -#: diff.c:5300 +#: diff.c:5303 msgid "output only the last line of --stat" msgstr "извеждане само на последния ред на „--stat“" -#: diff.c:5302 diff.c:5310 +#: diff.c:5305 diff.c:5313 msgid "<param1,param2>..." msgstr "ПАРАМЕТЪР_1, ПАРАМЕТЪР_2, …" -#: diff.c:5303 +#: diff.c:5306 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "извеждане на разпределението на промените за всяка поддиректория" -#: diff.c:5307 +#: diff.c:5310 msgid "synonym for --dirstat=cumulative" msgstr "псевдоним на „--dirstat=cumulative“" -#: diff.c:5311 +#: diff.c:5314 msgid "synonym for --dirstat=files,param1,param2..." msgstr "псевдоним на „--dirstat=ФАЙЛОВЕ,ПАРАМЕТЪР_1,ПАРАМЕТЪР_2,…“" -#: diff.c:5315 +#: diff.c:5318 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" "предупреждаване, ако промените водят до маркери за конфликт или грешки в " "празните знаци" -#: diff.c:5318 +#: diff.c:5321 msgid "condensed summary such as creations, renames and mode changes" msgstr "" "съкратено резюме на създадените, преименуваните и файловете с промяна на " "режима на достъп" -#: diff.c:5321 +#: diff.c:5324 msgid "show only names of changed files" msgstr "извеждане само на имената на променените файлове" -#: diff.c:5324 +#: diff.c:5327 msgid "show only names and status of changed files" msgstr "извеждане само на имената и статистиката за променените файлове" -#: diff.c:5326 +#: diff.c:5329 msgid "<width>[,<name-width>[,<count>]]" msgstr "ШИРОЧИНА[,ИМЕ-ШИРОЧИНА[,БРОЙ]]" -#: diff.c:5327 +#: diff.c:5330 msgid "generate diffstat" msgstr "извеждане на статистика за промените" -#: diff.c:5329 diff.c:5332 diff.c:5335 +#: diff.c:5332 diff.c:5335 diff.c:5338 msgid "<width>" msgstr "ШИРОЧИНА" -#: diff.c:5330 +#: diff.c:5333 msgid "generate diffstat with a given width" msgstr "статистика с такава ШИРОЧИНА за промените" -#: diff.c:5333 +#: diff.c:5336 msgid "generate diffstat with a given name width" msgstr "статистика за промените с такава ШИРОЧИНА на имената" -#: diff.c:5336 +#: diff.c:5339 msgid "generate diffstat with a given graph width" msgstr "статистика за промените с такава ШИРОЧИНА на гра̀фа" -#: diff.c:5338 +#: diff.c:5341 msgid "<count>" msgstr "БРОЙ" -#: diff.c:5339 +#: diff.c:5342 msgid "generate diffstat with limited lines" msgstr "ограничаване на БРОя на редовете в статистиката за промените" -#: diff.c:5342 +#: diff.c:5345 msgid "generate compact summary in diffstat" msgstr "кратко резюме в статистиката за промените" -#: diff.c:5345 +#: diff.c:5348 msgid "output a binary diff that can be applied" msgstr "извеждане на двоична разлика във вид за прилагане" -#: diff.c:5348 +#: diff.c:5351 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" "показване на пълните имена на обекти в редовете за индекса при вариантите " "преди и след промяната" -#: diff.c:5350 +#: diff.c:5353 msgid "show colored diff" msgstr "разлики в цвят" -#: diff.c:5351 +#: diff.c:5354 msgid "<kind>" msgstr "ВИД" -#: diff.c:5352 +#: diff.c:5355 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -2885,7 +2894,7 @@ msgstr "" "грешките в празните знаци да се указват в редовете за контекста, вариантите " "преди и след разликата," -#: diff.c:5355 +#: diff.c:5358 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -2893,257 +2902,257 @@ msgstr "" "без преименуване на пътищата. Да се използват нулеви байтове за разделители " "на полета в изхода при ползване на опцията „--raw“ или „--numstat“" -#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470 +#: diff.c:5361 diff.c:5364 diff.c:5367 diff.c:5473 msgid "<prefix>" msgstr "ПРЕФИКС" -#: diff.c:5359 +#: diff.c:5362 msgid "show the given source prefix instead of \"a/\"" msgstr "префикс вместо „a/“ за източник" -#: diff.c:5362 +#: diff.c:5365 msgid "show the given destination prefix instead of \"b/\"" msgstr "префикс вместо „b/“ за цел" -#: diff.c:5365 +#: diff.c:5368 msgid "prepend an additional prefix to every line of output" msgstr "добавяне на допълнителен префикс за всеки ред на изхода" -#: diff.c:5368 +#: diff.c:5371 msgid "do not show any source or destination prefix" msgstr "без префикс за източника и целта" -#: diff.c:5371 +#: diff.c:5374 msgid "show context between diff hunks up to the specified number of lines" msgstr "" "извеждане на контекст между последователните парчета с разлики от указания " "БРОЙ редове" -#: diff.c:5375 diff.c:5380 diff.c:5385 +#: diff.c:5378 diff.c:5383 diff.c:5388 msgid "<char>" msgstr "ЗНАК" -#: diff.c:5376 +#: diff.c:5379 msgid "specify the character to indicate a new line instead of '+'" msgstr "знак вместо „+“ за нов вариант на ред" -#: diff.c:5381 +#: diff.c:5384 msgid "specify the character to indicate an old line instead of '-'" msgstr "знак вместо „-“ за стар вариант на ред" -#: diff.c:5386 +#: diff.c:5389 msgid "specify the character to indicate a context instead of ' '" msgstr "знак вместо „ “ за контекст" -#: diff.c:5389 +#: diff.c:5392 msgid "Diff rename options" msgstr "Настройки за разлики с преименуване" -#: diff.c:5390 +#: diff.c:5393 msgid "<n>[/<m>]" msgstr "МИНИМАЛЕН_%_ПРОМЯНА_ЗА_ИЗТОЧНИК[/МАКСИМАЛEН_%_ПРОМЯНА_ЗА_ЗАМЯНА]" -#: diff.c:5391 +#: diff.c:5394 msgid "break complete rewrite changes into pairs of delete and create" msgstr "" "заместване на пълните промени с последователност от изтриване и създаване" -#: diff.c:5395 +#: diff.c:5398 msgid "detect renames" msgstr "засичане на преименуванията" -#: diff.c:5399 +#: diff.c:5402 msgid "omit the preimage for deletes" msgstr "без предварителен вариант при изтриване" -#: diff.c:5402 +#: diff.c:5405 msgid "detect copies" msgstr "засичане на копиранията" -#: diff.c:5406 +#: diff.c:5409 msgid "use unmodified files as source to find copies" msgstr "търсене на копирано и от непроменените файлове" -#: diff.c:5408 +#: diff.c:5411 msgid "disable rename detection" msgstr "без търсене на преименувания" -#: diff.c:5411 +#: diff.c:5414 msgid "use empty blobs as rename source" msgstr "празни обекти като източник при преименувания" -#: diff.c:5413 +#: diff.c:5416 msgid "continue listing the history of a file beyond renames" msgstr "" "продължаване на извеждането на историята — без отрязването при преименувания " "на файл" -#: diff.c:5416 +#: diff.c:5419 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "" "без засичане на преименувания/копирания, ако броят им надвишава тази стойност" -#: diff.c:5418 +#: diff.c:5421 msgid "Diff algorithm options" msgstr "Опции към алгоритъма за разлики" -#: diff.c:5420 +#: diff.c:5423 msgid "produce the smallest possible diff" msgstr "търсене на възможно най-малка разлика" -#: diff.c:5423 +#: diff.c:5426 msgid "ignore whitespace when comparing lines" msgstr "без промени в празните знаци при сравняване на редове" -#: diff.c:5426 +#: diff.c:5429 msgid "ignore changes in amount of whitespace" msgstr "без промени в празните знаци" -#: diff.c:5429 +#: diff.c:5432 msgid "ignore changes in whitespace at EOL" msgstr "без промени в празните знаци в края на редовете" -#: diff.c:5432 +#: diff.c:5435 msgid "ignore carrier-return at the end of line" msgstr "без промени в знаците за край на ред" -#: diff.c:5435 +#: diff.c:5438 msgid "ignore changes whose lines are all blank" msgstr "без промени в редовете, които са изцяло от празни знаци" -#: diff.c:5438 +#: diff.c:5441 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "" "евристика за преместване на границите на парчетата за улесняване на четенето" -#: diff.c:5441 +#: diff.c:5444 msgid "generate diff using the \"patience diff\" algorithm" msgstr "разлика чрез алгоритъм за подредба като пасианс" -#: diff.c:5445 +#: diff.c:5448 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "разлика по хистограмния алгоритъм" -#: diff.c:5447 +#: diff.c:5450 msgid "<algorithm>" msgstr "АЛГОРИТЪМ" -#: diff.c:5448 +#: diff.c:5451 msgid "choose a diff algorithm" msgstr "избор на АЛГОРИТЪМа за разлики" -#: diff.c:5450 +#: diff.c:5453 msgid "<text>" msgstr "ТЕКСТ" -#: diff.c:5451 +#: diff.c:5454 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "разлика чрез алгоритъма със закотвяне" -#: diff.c:5453 diff.c:5462 diff.c:5465 +#: diff.c:5456 diff.c:5465 diff.c:5468 msgid "<mode>" msgstr "РЕЖИМ" -#: diff.c:5454 +#: diff.c:5457 msgid "show word diff, using <mode> to delimit changed words" msgstr "" "разлика по думи, като се ползва този РЕЖИМ за отделянето на променените думи" -#: diff.c:5456 diff.c:5459 diff.c:5504 +#: diff.c:5459 diff.c:5462 diff.c:5507 msgid "<regex>" msgstr "РЕГУЛЯРЕН_ИЗРАЗ" -#: diff.c:5457 +#: diff.c:5460 msgid "use <regex> to decide what a word is" msgstr "РЕГУЛЯРЕН_ИЗРАЗ за разделяне по думи" -#: diff.c:5460 +#: diff.c:5463 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "псевдоним на „--word-diff=color --word-diff-regex=РЕГУЛЯРЕН_ИЗРАЗ“" -#: diff.c:5463 +#: diff.c:5466 msgid "moved lines of code are colored differently" msgstr "различен цвят за извеждане на преместените редове" -#: diff.c:5466 +#: diff.c:5469 msgid "how white spaces are ignored in --color-moved" msgstr "" "режим за прескачането на празните знаци при задаването на „--color-moved“" -#: diff.c:5469 +#: diff.c:5472 msgid "Other diff options" msgstr "Други опции за разлики" -#: diff.c:5471 +#: diff.c:5474 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" "при изпълнение от поддиректория да се пренебрегват разликите извън нея и да " "се ползват относителни пътища" -#: diff.c:5475 +#: diff.c:5478 msgid "treat all files as text" msgstr "обработка на всички файлове като текстови" -#: diff.c:5477 +#: diff.c:5480 msgid "swap two inputs, reverse the diff" msgstr "размяна на двата входа — обръщане на разликата" -#: diff.c:5479 +#: diff.c:5482 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "" "завършване с код за състояние 1 при наличието на разлики, а в противен " "случай — с 0" -#: diff.c:5481 +#: diff.c:5484 msgid "disable all output of the program" msgstr "без всякакъв изход от програмата" -#: diff.c:5483 +#: diff.c:5486 msgid "allow an external diff helper to be executed" msgstr "позволяване на изпълнение на външна помощна програма за разлики" -#: diff.c:5485 +#: diff.c:5488 msgid "run external text conversion filters when comparing binary files" msgstr "" "изпълнение на външни програми-филтри при сравнението на двоични файлове" -#: diff.c:5487 +#: diff.c:5490 msgid "<when>" msgstr "КОГА" -#: diff.c:5488 +#: diff.c:5491 msgid "ignore changes to submodules in the diff generation" msgstr "игнориране на промените в подмодулите при извеждането на разликите" -#: diff.c:5491 +#: diff.c:5494 msgid "<format>" msgstr "ФОРМАТ" -#: diff.c:5492 +#: diff.c:5495 msgid "specify how differences in submodules are shown" msgstr "начин за извеждане на промените в подмодулите" -#: diff.c:5496 +#: diff.c:5499 msgid "hide 'git add -N' entries from the index" msgstr "без включване в индекса на записите, добавени с „git add -N“" -#: diff.c:5499 +#: diff.c:5502 msgid "treat 'git add -N' entries as real in the index" msgstr "включване в индекса на записите, добавени с „git add -N“" -#: diff.c:5501 +#: diff.c:5504 msgid "<string>" msgstr "НИЗ" -#: diff.c:5502 +#: diff.c:5505 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "търсене на разлики, които променят броя на поява на указаните низове" -#: diff.c:5505 +#: diff.c:5508 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -3151,97 +3160,97 @@ msgstr "" "търсене на разлики, които променят броя на поява на низовете, които напасват " "на регулярния израз" -#: diff.c:5508 +#: diff.c:5511 msgid "show all changes in the changeset with -S or -G" msgstr "извеждане на всички промени с „-G“/„-S“" -#: diff.c:5511 +#: diff.c:5514 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "НИЗът към „-S“ да се тълкува като разширен регулярен израз по POSIX" -#: diff.c:5514 +#: diff.c:5517 msgid "control the order in which files appear in the output" msgstr "управление на подредбата на файловете в изхода" -#: diff.c:5515 +#: diff.c:5518 msgid "<object-id>" msgstr "ИДЕНТИФИКАТОР_НА_ОБЕКТ" -#: diff.c:5516 +#: diff.c:5519 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "търсене на разлики, които променят броя на поява на указания обект" -#: diff.c:5518 +#: diff.c:5521 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)…[*]]" -#: diff.c:5519 +#: diff.c:5522 msgid "select files by diff type" msgstr "избор на файловете по вид разлика" -#: diff.c:5521 +#: diff.c:5524 msgid "<file>" msgstr "ФАЙЛ" -#: diff.c:5522 +#: diff.c:5525 msgid "Output to a specific file" msgstr "Изход към указания файл" -#: diff.c:6177 +#: diff.c:6180 msgid "inexact rename detection was skipped due to too many files." msgstr "" "търсенето на преименувания на обекти съчетани с промени се прескача поради " "многото файлове." -#: diff.c:6180 +#: diff.c:6183 msgid "only found copies from modified paths due to too many files." msgstr "" "установени са само точните копия на променените пътища поради многото " "файлове." -#: diff.c:6183 +#: diff.c:6186 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "задайте променливата „%s“ да е поне %d и отново изпълнете командата." -#: dir.c:537 +#: dir.c:549 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "пътят „%s“ не съвпада с никой файл в git" -#: dir.c:926 +#: dir.c:938 #, c-format msgid "cannot use %s as an exclude file" msgstr "„%s“ не може да се ползва за игнорираните файлове (като gitignore)" -#: dir.c:1843 +#: dir.c:1877 #, c-format msgid "could not open directory '%s'" msgstr "директорията „%s“ не може да бъде отворена" -#: dir.c:2085 +#: dir.c:2128 msgid "failed to get kernel name and information" msgstr "името и версията на ядрото не бяха получени" -#: dir.c:2209 +#: dir.c:2252 msgid "untracked cache is disabled on this system or location" msgstr "" "кешът за неследените файлове е изключен на тази система или местоположение" -#: dir.c:3013 +#: dir.c:3056 #, c-format msgid "index file corrupt in repo %s" msgstr "файлът с индекса е повреден в хранилището „%s“" -#: dir.c:3058 dir.c:3063 +#: dir.c:3101 dir.c:3106 #, c-format msgid "could not create directories for %s" msgstr "директориите за „%s“ не може да бъдат създадени" -#: dir.c:3092 +#: dir.c:3135 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "директорията на git не може да се мигрира от „%s“ до „%s“" @@ -3260,12 +3269,12 @@ msgstr "Филтриране на съдържанието" msgid "could not stat file '%s'" msgstr "неуспешно изпълнение на „stat“ върху файла „%s“" -#: environment.c:150 +#: environment.c:148 #, c-format msgid "bad git namespace path \"%s\"" msgstr "неправилен път към пространства от имена „%s“" -#: environment.c:332 +#: environment.c:330 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "GIT_DIR не може да се зададе да е „%s“" @@ -3275,159 +3284,155 @@ msgstr "GIT_DIR не може да се зададе да е „%s“" msgid "too many args to run %s" msgstr "прекалено много аргументи за изпълнение „%s“" -#: fetch-object.c:17 -msgid "Remote with no URL" -msgstr "Липсва адрес за отдалеченото хранилище" - -#: fetch-pack.c:151 +#: fetch-pack.c:150 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: очаква се плитък списък" -#: fetch-pack.c:154 +#: fetch-pack.c:153 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "git fetch-pack: след плитък списък се очаква изчистващ пакет „flush“" -#: fetch-pack.c:165 +#: fetch-pack.c:164 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "" "git fetch-pack: очаква се „ACK“/„NAK“, а бе получен изчистващ пакет „flush“" -#: fetch-pack.c:185 +#: fetch-pack.c:184 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: очаква се „ACK“/„NAK“, а бе получено „%s“" -#: fetch-pack.c:196 +#: fetch-pack.c:195 msgid "unable to write to remote" msgstr "невъзможно писане към отдалечено хранилище" -#: fetch-pack.c:258 +#: fetch-pack.c:257 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "опцията „--stateless-rpc“ изисква „multi_ack_detailed“" -#: fetch-pack.c:360 fetch-pack.c:1284 +#: fetch-pack.c:356 fetch-pack.c:1280 #, c-format msgid "invalid shallow line: %s" msgstr "неправилен плитък ред: „%s“" -#: fetch-pack.c:366 fetch-pack.c:1290 +#: fetch-pack.c:362 fetch-pack.c:1286 #, c-format msgid "invalid unshallow line: %s" msgstr "неправилен неплитък ред: „%s“" -#: fetch-pack.c:368 fetch-pack.c:1292 +#: fetch-pack.c:364 fetch-pack.c:1288 #, c-format msgid "object not found: %s" msgstr "обектът „%s“ липсва" -#: fetch-pack.c:371 fetch-pack.c:1295 +#: fetch-pack.c:367 fetch-pack.c:1291 #, c-format msgid "error in object: %s" msgstr "грешка в обекта: „%s“" -#: fetch-pack.c:373 fetch-pack.c:1297 +#: fetch-pack.c:369 fetch-pack.c:1293 #, c-format msgid "no shallow found: %s" msgstr "не е открит плитък обект: %s" -#: fetch-pack.c:376 fetch-pack.c:1301 +#: fetch-pack.c:372 fetch-pack.c:1297 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "очаква се плитък или не обект, а бе получено: „%s“" -#: fetch-pack.c:417 +#: fetch-pack.c:414 #, c-format msgid "got %s %d %s" msgstr "получено бе %s %d %s" -#: fetch-pack.c:434 +#: fetch-pack.c:431 #, c-format msgid "invalid commit %s" msgstr "неправилно подаване: „%s“" -#: fetch-pack.c:465 +#: fetch-pack.c:462 msgid "giving up" msgstr "преустановяване" -#: fetch-pack.c:477 progress.c:277 +#: fetch-pack.c:475 progress.c:312 msgid "done" msgstr "действието завърши" -#: fetch-pack.c:489 +#: fetch-pack.c:487 #, c-format msgid "got %s (%d) %s" msgstr "получено бе %s (%d) %s" -#: fetch-pack.c:535 +#: fetch-pack.c:533 #, c-format msgid "Marking %s as complete" msgstr "Отбелязване на „%s“ като пълно" -#: fetch-pack.c:744 +#: fetch-pack.c:742 #, c-format msgid "already have %s (%s)" msgstr "вече има „%s“ (%s)" -#: fetch-pack.c:783 +#: fetch-pack.c:781 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: не може да се създаде процес за демултиплексора" -#: fetch-pack.c:791 +#: fetch-pack.c:789 msgid "protocol error: bad pack header" msgstr "протоколна грешка: неправилна заглавна част на пакет" -#: fetch-pack.c:859 +#: fetch-pack.c:857 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: не може да се създаде процес за „%s“" -#: fetch-pack.c:875 +#: fetch-pack.c:873 #, c-format msgid "%s failed" msgstr "неуспешно изпълнение на „%s“" -#: fetch-pack.c:877 +#: fetch-pack.c:875 msgid "error in sideband demultiplexer" msgstr "грешка в демултиплексора" -#: fetch-pack.c:908 +#: fetch-pack.c:907 #, c-format msgid "Server version is %.*s" msgstr "Версията на сървъра е: %.*s" -#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928 -#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944 -#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960 -#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982 +#: fetch-pack.c:912 fetch-pack.c:918 fetch-pack.c:921 fetch-pack.c:927 +#: fetch-pack.c:931 fetch-pack.c:935 fetch-pack.c:939 fetch-pack.c:943 +#: fetch-pack.c:947 fetch-pack.c:951 fetch-pack.c:955 fetch-pack.c:959 +#: fetch-pack.c:965 fetch-pack.c:971 fetch-pack.c:976 fetch-pack.c:981 #, c-format msgid "Server supports %s" msgstr "Сървърът поддържа „%s“" -#: fetch-pack.c:915 +#: fetch-pack.c:914 msgid "Server does not support shallow clients" msgstr "Сървърът не поддържа плитки клиенти" -#: fetch-pack.c:975 +#: fetch-pack.c:974 msgid "Server does not support --shallow-since" msgstr "Сървърът не поддържа опцията „--shallow-since“" -#: fetch-pack.c:980 +#: fetch-pack.c:979 msgid "Server does not support --shallow-exclude" msgstr "Сървърът не поддържа опцията „--shallow-exclude“" -#: fetch-pack.c:984 +#: fetch-pack.c:983 msgid "Server does not support --deepen" msgstr "Сървърът не поддържа опцията „--deepen“" -#: fetch-pack.c:1001 +#: fetch-pack.c:1000 msgid "no common commits" msgstr "няма общи подавания" -#: fetch-pack.c:1013 fetch-pack.c:1462 +#: fetch-pack.c:1012 fetch-pack.c:1468 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: неуспешно доставяне." -#: fetch-pack.c:1151 +#: fetch-pack.c:1150 msgid "Server does not support shallow requests" msgstr "Сървърът не поддържа плитки заявки" @@ -3435,75 +3440,75 @@ msgstr "Сървърът не поддържа плитки заявки" msgid "Server supports filter" msgstr "Сървърът поддържа филтри" -#: fetch-pack.c:1184 +#: fetch-pack.c:1180 msgid "unable to write request to remote" msgstr "невъзможно писане към отдалечено хранилище" -#: fetch-pack.c:1202 +#: fetch-pack.c:1198 #, c-format msgid "error reading section header '%s'" msgstr "грешка при прочитане на заглавната част на раздел „%s“" -#: fetch-pack.c:1208 +#: fetch-pack.c:1204 #, c-format msgid "expected '%s', received '%s'" msgstr "очаква се „%s“, а бе получено „%s“" -#: fetch-pack.c:1247 +#: fetch-pack.c:1243 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "неочакван ред за потвърждение: „%s“" -#: fetch-pack.c:1252 +#: fetch-pack.c:1248 #, c-format msgid "error processing acks: %d" msgstr "грешка при обработка на потвържденията: %d" -#: fetch-pack.c:1262 +#: fetch-pack.c:1258 msgid "expected packfile to be sent after 'ready'" msgstr "" "очакваше се пакетният файл да бъде изпратен след отговор за готовност (ready)" -#: fetch-pack.c:1264 +#: fetch-pack.c:1260 msgid "expected no other sections to be sent after no 'ready'" msgstr "" "очакваше се след липса на отговор за готовност (ready) да не се се пращат " "други раздели" -#: fetch-pack.c:1306 +#: fetch-pack.c:1302 #, c-format msgid "error processing shallow info: %d" msgstr "грешка при обработка на информация за дълбочината/плиткостта: %d" -#: fetch-pack.c:1353 +#: fetch-pack.c:1349 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "очаква се искан указател, а бе получено: „%s“" -#: fetch-pack.c:1358 +#: fetch-pack.c:1354 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "неочакван искан указател: „%s“" -#: fetch-pack.c:1363 +#: fetch-pack.c:1359 #, c-format msgid "error processing wanted refs: %d" msgstr "грешка при обработката на исканите указатели: %d" -#: fetch-pack.c:1689 +#: fetch-pack.c:1693 msgid "no matching remote head" msgstr "не може да бъде открит подходящ връх от отдалеченото хранилище" -#: fetch-pack.c:1712 builtin/clone.c:686 +#: fetch-pack.c:1716 builtin/clone.c:685 msgid "remote did not send all necessary objects" msgstr "отдалеченото хранилище не изпрати всички необходими обекти." -#: fetch-pack.c:1739 +#: fetch-pack.c:1743 #, c-format msgid "no such remote ref %s" msgstr "такъв отдалечен указател няма: %s" -#: fetch-pack.c:1742 +#: fetch-pack.c:1746 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Сървърът не позволява заявка за необявен обект „%s“" @@ -3526,18 +3531,26 @@ msgstr "Програмата не успя да запише самостоят msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "прескачане на неправилния цвят „%.*s“ в „log.graphColors“" -#: grep.c:2117 +#: grep.c:627 +msgid "" +"given pattern contains NULL byte (via -f <file>). This is only supported " +"with -P under PCRE v2" +msgstr "" +"зададеният шаблон съдържа нулев знак (идва от -f „ФАЙЛ“). Това се поддържа " +"в комбинация с „-P“ само при ползването на „PCRE v2“" + +#: grep.c:2083 #, c-format msgid "'%s': unable to read %s" msgstr "„%s“: файлът сочен от „%s“ не може да бъде прочетен" -#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82 +#: grep.c:2100 setup.c:165 builtin/clone.c:408 builtin/diff.c:82 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "не може да бъде получена информация чрез „stat“ за „%s“" -#: grep.c:2145 +#: grep.c:2111 #, c-format msgid "'%s': short read" msgstr "„%s“: изчитането върна по-малко байтове от очакваното" @@ -3684,12 +3697,12 @@ msgstr[1] "" msgid "git version [<options>]" msgstr "git version [ОПЦИЯ…]" -#: help.c:782 +#: help.c:783 #, c-format msgid "%s: %s - %s" msgstr "%s: %s — %s" -#: help.c:786 +#: help.c:787 msgid "" "\n" "Did you mean this?" @@ -3765,41 +3778,57 @@ msgstr "името съдържа само непозволени знаци: msgid "invalid date format: %s" msgstr "неправилен формат на дата: %s" -#: list-objects.c:129 +#: list-objects.c:127 #, c-format msgid "entry '%s' in tree %s has tree mode, but is not a tree" msgstr "обект „%s“ в дървото „%s“ е отбелязан като дърво, но не е" -#: list-objects.c:142 +#: list-objects.c:140 #, c-format msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "обект „%s“ в дървото „%s“ е отбелязан като BLOB, но не е" -#: list-objects.c:378 +#: list-objects.c:375 #, c-format msgid "unable to load root tree for commit %s" msgstr "кореновото дърво за подаване „%s“ не може да се зареди" -#: list-objects-filter-options.c:36 -msgid "multiple filter-specs cannot be combined" -msgstr "не може да комбинирате множество филтри" +#: list-objects-filter.c:492 +#, c-format +msgid "unable to access sparse blob in '%s'" +msgstr "няма достъп до частично изтегления обект-BLOB в „%s“" + +#: list-objects-filter.c:495 +#, c-format +msgid "unable to parse sparse filter data in %s" +msgstr "" +"данните от филтъра за частични изтеглания в „%s“ не може да бъдат анализирани" #: list-objects-filter-options.c:58 msgid "expected 'tree:<depth>'" msgstr "очаква се „tree:ДЪЛБОЧИНА“" -#: list-objects-filter-options.c:84 +#: list-objects-filter-options.c:73 msgid "sparse:path filters support has been dropped" msgstr "поддръжката на филтри със „sparse:path“ е премахната" -#: list-objects-filter-options.c:94 +#: list-objects-filter-options.c:86 #, c-format msgid "invalid filter-spec '%s'" msgstr "неправилен филтър: „%s“" -#: list-objects-filter-options.c:158 -msgid "cannot change partial clone promisor remote" -msgstr "не може да промените хранилището-гарант на непълно хранилище" +#: list-objects-filter-options.c:102 +#, c-format +msgid "must escape char in sub-filter-spec: '%c'" +msgstr "знак за екраниране в подфилтър: „%c“" + +#: list-objects-filter-options.c:144 +msgid "expected something after combine:" +msgstr "добавете нещо след комбинирането:" + +#: list-objects-filter-options.c:226 +msgid "multiple filter-specs cannot be combined" +msgstr "не може да комбинирате множество филтри" #: lockfile.c:151 #, c-format @@ -3829,126 +3858,122 @@ msgstr "Файлът-ключалка „%s.lock“ не може да бъде msgid "failed to read the cache" msgstr "кешът не може да бъде прочетен" -#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919 -#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786 +#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908 +#: builtin/checkout.c:537 builtin/checkout.c:796 builtin/clone.c:785 #: builtin/stash.c:264 msgid "unable to write new index file" msgstr "неуспешно записване на новия индекс" -#: merge-recursive.c:322 +#: merge-recursive.c:367 msgid "(bad commit)\n" msgstr "(лошо подаване)\n" -#: merge-recursive.c:345 +#: merge-recursive.c:390 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "" "неуспешно изпълнение на „add_cacheinfo“ за пътя „%s“. Сливането е " "преустановено." -#: merge-recursive.c:354 +#: merge-recursive.c:399 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "" "неуспешно изпълнение на „add_cacheinfo“ за обновяването на пътя „%s“. " "Сливането е преустановено." -#: merge-recursive.c:437 -msgid "error building trees" -msgstr "грешка при изграждане на дърветата" - -#: merge-recursive.c:863 +#: merge-recursive.c:885 #, c-format msgid "failed to create path '%s'%s" msgstr "грешка при създаването на пътя „%s“%s" -#: merge-recursive.c:874 +#: merge-recursive.c:896 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Изтриване на „%s“, за да се освободи място за поддиректория\n" -#: merge-recursive.c:888 merge-recursive.c:907 +#: merge-recursive.c:910 merge-recursive.c:929 msgid ": perhaps a D/F conflict?" msgstr ": възможно е да има конфликт директория/файл." -#: merge-recursive.c:897 +#: merge-recursive.c:919 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" "преустановяване на действието, за да не се изтрие неследеният файл „%s“" -#: merge-recursive.c:938 builtin/cat-file.c:40 +#: merge-recursive.c:960 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "обектът „%s“ (%s) не може да бъде прочетен" -#: merge-recursive.c:941 +#: merge-recursive.c:965 #, c-format msgid "blob expected for %s '%s'" msgstr "обектът „%s“ (%s) се очакваше да е BLOB, а не е" -#: merge-recursive.c:965 +#: merge-recursive.c:990 #, c-format msgid "failed to open '%s': %s" msgstr "„%s“ не може да се отвори: %s" -#: merge-recursive.c:976 +#: merge-recursive.c:1001 #, c-format msgid "failed to symlink '%s': %s" msgstr "неуспешно създаване на символната връзка „%s“: %s" -#: merge-recursive.c:981 +#: merge-recursive.c:1006 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" "не е ясно какво да се прави с обекта „%2$s“ (%3$s) с права за достъп „%1$06o“" -#: merge-recursive.c:1177 +#: merge-recursive.c:1199 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Неуспешно сливане на подмодула „%s“ (не е изтеглен)" -#: merge-recursive.c:1184 +#: merge-recursive.c:1206 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Неуспешно сливане на подмодула „%s“ (няма подавания)" -#: merge-recursive.c:1191 +#: merge-recursive.c:1213 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "" "Подмодулът „%s“ не може да бъде слят (базата за сливане не предшества " "подаванията)" -#: merge-recursive.c:1199 merge-recursive.c:1211 +#: merge-recursive.c:1221 merge-recursive.c:1233 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Превъртане на подмодула „%s“ до следното подаване:" -#: merge-recursive.c:1202 merge-recursive.c:1214 +#: merge-recursive.c:1224 merge-recursive.c:1236 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Превъртане на подмодула „%s“" -#: merge-recursive.c:1237 +#: merge-recursive.c:1259 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" "Неуспешно сливане на подмодула „%s“ (липсва сливането, което се предшества " "от подаванията)" -#: merge-recursive.c:1241 +#: merge-recursive.c:1263 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "Неуспешно сливане на подмодула „%s“ (не е превъртане)" -#: merge-recursive.c:1242 +#: merge-recursive.c:1264 msgid "Found a possible merge resolution for the submodule:\n" msgstr "" "Открито е сливане, което може да решава проблема със сливането на " "подмодула:\n" -#: merge-recursive.c:1245 +#: merge-recursive.c:1267 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -3964,31 +3989,31 @@ msgstr "" "\n" "Това приема предложеното.\n" -#: merge-recursive.c:1254 +#: merge-recursive.c:1276 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "Неуспешно сливане на подмодула „%s“ (открити са множество сливания)" -#: merge-recursive.c:1327 +#: merge-recursive.c:1349 msgid "Failed to execute internal merge" msgstr "Неуспешно вътрешно сливане" -#: merge-recursive.c:1332 +#: merge-recursive.c:1354 #, c-format msgid "Unable to add %s to database" msgstr "„%s“ не може да се добави в базата с данни" -#: merge-recursive.c:1364 +#: merge-recursive.c:1386 #, c-format msgid "Auto-merging %s" msgstr "Автоматично сливане на „%s“" -#: merge-recursive.c:1387 +#: merge-recursive.c:1410 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "Грешка: за да не се изтрие неследеният файл „%s“, се записва в „%s“." -#: merge-recursive.c:1459 +#: merge-recursive.c:1482 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3997,7 +4022,7 @@ msgstr "" "КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s. Версия %s на „%s“ " "е оставена в дървото." -#: merge-recursive.c:1464 +#: merge-recursive.c:1487 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4006,7 +4031,7 @@ msgstr "" "КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ е преименуван на „%s“ в " "%s. Версия %s на „%s“ е оставена в дървото." -#: merge-recursive.c:1471 +#: merge-recursive.c:1494 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4015,7 +4040,7 @@ msgstr "" "КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s. Версия %s на „%s“ " "е оставена в дървото: %s." -#: merge-recursive.c:1476 +#: merge-recursive.c:1499 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4024,45 +4049,45 @@ msgstr "" "КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ е преименуван на „%s“ в " "%s. Версия %s на „%s“ е оставена в дървото: %s." -#: merge-recursive.c:1511 +#: merge-recursive.c:1534 msgid "rename" msgstr "преименуване" -#: merge-recursive.c:1511 +#: merge-recursive.c:1534 msgid "renamed" msgstr "преименуван" -#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094 +#: merge-recursive.c:1614 merge-recursive.c:2472 merge-recursive.c:3117 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Преустановяване на действието, за да не се изгуби промененият „%s“" -#: merge-recursive.c:1601 +#: merge-recursive.c:1624 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "" "Отказ да се загуби неследеният файл „%s“, защото е на място, където пречи." -#: merge-recursive.c:1659 +#: merge-recursive.c:1682 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" "КОНФЛИКТ (преименуване/добавяне): „%s“ е преименуван на „%s“ в клон „%s“, а " "„%s“ е добавен в „%s“" -#: merge-recursive.c:1690 +#: merge-recursive.c:1713 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "„%s“ е директория в „%s“, затова се добавя като „%s“" -#: merge-recursive.c:1695 +#: merge-recursive.c:1718 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "" "Преустановяване на действието, за да не се изгуби неследеният файл „%s“. " "Вместо него се добавя „%s“" -#: merge-recursive.c:1714 +#: merge-recursive.c:1737 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -4071,18 +4096,18 @@ msgstr "" "КОНФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон " "„%s“, а „%s“ е преименуван на „%s“ в „%s“/%s." -#: merge-recursive.c:1719 +#: merge-recursive.c:1742 msgid " (left unresolved)" msgstr " (некоригиран конфликт)" -#: merge-recursive.c:1828 +#: merge-recursive.c:1851 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "КОНФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон " "„%s“, а „%s“ е преименуван на „%s“ в „%s“" -#: merge-recursive.c:2035 +#: merge-recursive.c:2056 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -4093,7 +4118,7 @@ msgstr "" "постави „%s“, защото няколко нови директории поделят съдържанието на " "директория „%s“, като никоя не съдържа мнозинство от файловете ѝ." -#: merge-recursive.c:2067 +#: merge-recursive.c:2088 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -4102,7 +4127,7 @@ msgstr "" "КОНФЛИКТ (косвено преименуване на директория): следният файл или директория " "„%s“ не позволяват косвеното преименуване на следния път/ища: %s." -#: merge-recursive.c:2077 +#: merge-recursive.c:2098 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -4112,7 +4137,7 @@ msgstr "" "съответства на „%s“. Косвено преименуване на директория води до поставянето " "на тези пътища там: %s." -#: merge-recursive.c:2169 +#: merge-recursive.c:2190 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -4121,7 +4146,7 @@ msgstr "" "КОНФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон " "„%s“, а „%s“ е преименуван на „%s“ в „%s“" -#: merge-recursive.c:2413 +#: merge-recursive.c:2435 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -4130,52 +4155,52 @@ msgstr "" "ПРЕДУПРЕЖДЕНИЕ: прескачане на преименуването на „%s“ на „%s“ в „%s“, защото " "„%s“ също е с променено име." -#: merge-recursive.c:2938 +#: merge-recursive.c:2961 #, c-format msgid "cannot read object %s" msgstr "обектът „%s“ не може да се прочете" -#: merge-recursive.c:2941 +#: merge-recursive.c:2964 #, c-format msgid "object %s is not a blob" msgstr "обектът „%s“ не е BLOB" -#: merge-recursive.c:3005 +#: merge-recursive.c:3028 msgid "modify" msgstr "промяна" -#: merge-recursive.c:3005 +#: merge-recursive.c:3028 msgid "modified" msgstr "променен" -#: merge-recursive.c:3017 +#: merge-recursive.c:3040 msgid "content" msgstr "съдържание" -#: merge-recursive.c:3021 +#: merge-recursive.c:3044 msgid "add/add" msgstr "добавяне/добавяне" -#: merge-recursive.c:3044 +#: merge-recursive.c:3067 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Прескачане на „%s“ (слетият резултат е идентичен със сегашния)" -#: merge-recursive.c:3066 git-submodule.sh:937 +#: merge-recursive.c:3089 git-submodule.sh:937 msgid "submodule" msgstr "ПОДМОДУЛ" -#: merge-recursive.c:3067 +#: merge-recursive.c:3090 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "КОНФЛИКТ (%s): Конфликт при сливане на „%s“" -#: merge-recursive.c:3097 +#: merge-recursive.c:3120 #, c-format msgid "Adding as %s instead" msgstr "Добавяне като „%s“" -#: merge-recursive.c:3179 +#: merge-recursive.c:3203 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4184,7 +4209,7 @@ msgstr "" "Обновен път: „%s“ е добавен в „%s“ в директория, която е преименувана в " "„%s“. Обектът се мести в „%s“." -#: merge-recursive.c:3182 +#: merge-recursive.c:3206 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4193,7 +4218,7 @@ msgstr "" "КОНФЛИКТ (места на файлове): „%s“ е добавен в „%s“ в директория, която е " "преименувана в „%s“. Предложението е да преместите обекта в „%s“." -#: merge-recursive.c:3186 +#: merge-recursive.c:3210 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4202,7 +4227,7 @@ msgstr "" "Обновен път: „%s“ е преименуван на „%s“ в „%s“ в директория, която е " "преименувана в „%s“. Обектът се мести в „%s“." -#: merge-recursive.c:3189 +#: merge-recursive.c:3213 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4211,179 +4236,179 @@ msgstr "" "КОНФЛИКТ (места на файлове): „%s“ е преименуван на „%s“ в „%s“ в директория, " "която е преименувана в „%s“. Предложението е да преместите обекта в „%s“." -#: merge-recursive.c:3303 +#: merge-recursive.c:3327 #, c-format msgid "Removing %s" msgstr "Изтриване на „%s“" -#: merge-recursive.c:3326 +#: merge-recursive.c:3350 msgid "file/directory" msgstr "файл/директория" -#: merge-recursive.c:3331 +#: merge-recursive.c:3355 msgid "directory/file" msgstr "директория/файл" -#: merge-recursive.c:3338 +#: merge-recursive.c:3362 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "КОНФЛИКТ (%s): Съществува директория на име „%s“ в „%s“. Добавяне на „%s“ " "като „%s“" -#: merge-recursive.c:3347 +#: merge-recursive.c:3371 #, c-format msgid "Adding %s" msgstr "Добавяне на „%s“" -#: merge-recursive.c:3356 +#: merge-recursive.c:3380 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "КОНФЛИКТ (добавяне/добавяне): Конфликт при сливане на „%s“" -#: merge-recursive.c:3394 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" -"Сливането ще презапише локалните промени на тези файлове:\n" -" %s" - -#: merge-recursive.c:3405 +#: merge-recursive.c:3424 msgid "Already up to date!" msgstr "Вече е обновено!" -#: merge-recursive.c:3414 +#: merge-recursive.c:3433 #, c-format msgid "merging of trees %s and %s failed" msgstr "неуспешно сливане на дърветата „%s“ и „%s“" -#: merge-recursive.c:3513 +#: merge-recursive.c:3537 msgid "Merging:" msgstr "Сливане:" -#: merge-recursive.c:3526 +#: merge-recursive.c:3550 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "открит е %u общ предшественик:" msgstr[1] "открити са %u общи предшественици:" -#: merge-recursive.c:3565 +#: merge-recursive.c:3600 msgid "merge returned no commit" msgstr "сливането не върна подаване" -#: merge-recursive.c:3631 +#: merge-recursive.c:3659 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"Сливането ще презапише локалните промени на тези файлове:\n" +" %s" + +#: merge-recursive.c:3756 #, c-format msgid "Could not parse object '%s'" msgstr "Неуспешен анализ на обекта „%s“" -#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869 +#: merge-recursive.c:3774 builtin/merge.c:694 builtin/merge.c:874 msgid "Unable to write index." msgstr "Индексът не може да бъде прочетен" -#: midx.c:69 +#: midx.c:68 #, c-format msgid "multi-pack-index file %s is too small" msgstr "файлът с индекса за множество пакети „%s“ е твърде малък" -#: midx.c:85 +#: midx.c:84 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "отпечатъкът на индекса за множество пакети 0x%08x не съвпада с 0x%08x" -#: midx.c:90 +#: midx.c:89 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "непозната версия на индекс за множество пакети — %d" -#: midx.c:95 +#: midx.c:94 #, c-format msgid "hash version %u does not match" msgstr "версията на отпечатъка %u не съвпада" -#: midx.c:109 +#: midx.c:108 msgid "invalid chunk offset (too large)" msgstr "неправилно (прекалено голямо) отместване на откъс" -#: midx.c:133 +#: midx.c:132 msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "" "идентификаторът за краен откъс на индекс за множество пакети се явява по-" "рано от очакваното" -#: midx.c:146 +#: midx.c:145 msgid "multi-pack-index missing required pack-name chunk" msgstr "липсва откъс (pack-name) от индекс за множество пакети" -#: midx.c:148 +#: midx.c:147 msgid "multi-pack-index missing required OID fanout chunk" msgstr "липсва откъс (OID fanout) от индекс за множество пакети" -#: midx.c:150 +#: midx.c:149 msgid "multi-pack-index missing required OID lookup chunk" msgstr "липсва откъс (OID lookup) от индекс за множество пакети" -#: midx.c:152 +#: midx.c:151 msgid "multi-pack-index missing required object offsets chunk" msgstr "липсва откъс за отместванията на обекти от индекс за множество пакети" -#: midx.c:166 +#: midx.c:165 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "" "неправилна подредба на имената в индекс за множество пакети: „%s“ се появи " "преди „%s“" -#: midx.c:211 +#: midx.c:210 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "" "неправилен идентификатор на пакет (pack-int-id): %u (от общо %u пакети)" -#: midx.c:261 +#: midx.c:260 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" "индексът за множество пакети съдържа 64-битови отмествания, но размерът на " "„off_t“ е недостатъчен" -#: midx.c:289 +#: midx.c:288 msgid "error preparing packfile from multi-pack-index" msgstr "" "грешка при създаването на пакетен файл на базата на индекс за множество " "пакети" -#: midx.c:470 +#: midx.c:469 #, c-format msgid "failed to add packfile '%s'" msgstr "пакетният файл „%s“ не може да бъде добавен" -#: midx.c:476 +#: midx.c:475 #, c-format msgid "failed to open pack-index '%s'" msgstr "индексът за пакети „%s“ не може да бъде отворен" -#: midx.c:536 +#: midx.c:535 #, c-format msgid "failed to locate object %d in packfile" msgstr "обект %d в пакетния файл липсва" -#: midx.c:865 +#: midx.c:864 #, c-format msgid "did not see pack-file %s to drop" msgstr "пакетният файл за триене „%s“ не може да се открие" -#: midx.c:1036 +#: midx.c:1035 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "индексът за множество пакети не може да бъде изчистен при „%s“" -#: midx.c:1091 +#: midx.c:1090 msgid "Looking for referenced packfiles" msgstr "Търсене на указаните пакетни файлове" -#: midx.c:1106 +#: midx.c:1105 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" @@ -4391,60 +4416,60 @@ msgstr "" "неправилна подредба на откъси (OID fanout): fanout[%d] = %<PRIx32> > " "%<PRIx32> = fanout[%d]" -#: midx.c:1110 +#: midx.c:1109 msgid "Verifying OID order in MIDX" msgstr "" "Проверка на подредбата на идентификатори на обекти в MIDX (файл с индекс към " "множество пакетни файлове)" -#: midx.c:1119 +#: midx.c:1118 #, 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:1138 +#: midx.c:1137 msgid "Sorting objects by packfile" msgstr "Подредба на обектите по пакетни файлове" -#: midx.c:1144 +#: midx.c:1143 msgid "Verifying object offsets" msgstr "Проверка на отместването на обекти" -#: midx.c:1160 +#: midx.c:1159 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "записът в пакета за обекта oid[%d] = %s не може да бъде зареден" -#: midx.c:1166 +#: midx.c:1165 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "индексът на пакета „%s“ не може да бъде зареден" -#: midx.c:1175 +#: midx.c:1174 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "неправилно отместване на обект за oid[%d] = %s: %<PRIx64> != %<PRIx64>" -#: midx.c:1350 +#: midx.c:1349 msgid "could not start pack-objects" msgstr "командата „pack-objects“ не може да бъде стартирана" -#: midx.c:1369 +#: midx.c:1368 msgid "could not finish pack-objects" msgstr "командата „pack-objects“ не може да бъде завършена" -#: name-hash.c:532 +#: name-hash.c:537 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "не може да се създаде нишка за директории: %s" -#: name-hash.c:554 +#: name-hash.c:559 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "не може да се създаде нишка за имена: %s" -#: name-hash.c:560 +#: name-hash.c:565 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "не може да се изчака нишка за имена: %s" @@ -4497,44 +4522,44 @@ msgstr "" msgid "Bad %s value: '%s'" msgstr "Зададена е лоша стойност на променливата „%s“: „%s“" -#: object.c:54 +#: object.c:53 #, c-format msgid "invalid object type \"%s\"" msgstr "неправилен вид обект: „%s“" -#: object.c:174 +#: object.c:173 #, c-format msgid "object %s is a %s, not a %s" msgstr "обектът „%s“ е %s, а не %s" -#: object.c:234 +#: object.c:233 #, c-format msgid "object %s has unknown type id %d" msgstr "обектът „%s“ е непознат вид: %d" -#: object.c:247 +#: object.c:246 #, c-format msgid "unable to parse object: %s" msgstr "обектът „%s“ не може да бъде анализиран" -#: object.c:267 object.c:278 +#: object.c:266 object.c:277 #, c-format msgid "hash mismatch %s" msgstr "разлика в контролната сума: „%s“" -#: packfile.c:648 +#: packfile.c:641 msgid "offset before end of packfile (broken .idx?)" msgstr "" "отместване преди края на пакетния файл (възможно е индексът да е повреден)" -#: packfile.c:1899 +#: packfile.c:1887 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" "отместване преди началото на индекса на пакетния файл „%s“ (възможно е " "индексът да е повреден)" -#: packfile.c:1903 +#: packfile.c:1891 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" @@ -4582,26 +4607,26 @@ msgstr "нееднозначна опция: „%s“ (може да е „--%s% msgid "did you mean `--%s` (with two dashes ?)" msgstr "„--%s“ (с 2 тирета) ли имахте предвид?" -#: parse-options.c:859 +#: parse-options.c:860 #, c-format msgid "unknown option `%s'" msgstr "непозната опция: „%s“" -#: parse-options.c:861 +#: parse-options.c:862 #, c-format msgid "unknown switch `%c'" msgstr "непознат флаг „%c“" -#: parse-options.c:863 +#: parse-options.c:864 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "непозната стойност извън „ascii“ в низа: „%s“" -#: parse-options.c:887 +#: parse-options.c:888 msgid "..." msgstr "…" -#: parse-options.c:906 +#: parse-options.c:907 #, c-format msgid "usage: %s" msgstr "употреба: %s" @@ -4609,21 +4634,21 @@ msgstr "употреба: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:912 +#: parse-options.c:913 #, c-format msgid " or: %s" msgstr " или: %s" -#: parse-options.c:915 +#: parse-options.c:916 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:954 +#: parse-options.c:955 msgid "-NUM" msgstr "-ЧИСЛО" -#: parse-options.c:968 +#: parse-options.c:969 #, c-format msgid "alias of --%s" msgstr "псевдоним на „--%s“" @@ -4795,30 +4820,40 @@ msgstr "не може да се създаде нишка за изпълнен msgid "unable to parse --pretty format" msgstr "аргументът към опцията „--pretty“ не може да се анализира" -#: range-diff.c:70 +#: promisor-remote.c:25 +msgid "Remote with no URL" +msgstr "Липсва адрес за отдалеченото хранилище" + +#: promisor-remote.c:61 +#, c-format +msgid "promisor remote name cannot begin with '/': %s" +msgstr "" +"името отдалеченото хранилище-гарант не може за започва със знака „/“: %s" + +#: range-diff.c:71 msgid "could not start `log`" msgstr "командата за журнала с подавания „log“ не може да се стартира" -#: range-diff.c:72 +#: range-diff.c:73 msgid "could not read `log` output" msgstr "" "изходът от командата за журнала с подавания „log“ не може да се прочете" -#: range-diff.c:91 sequencer.c:5021 +#: range-diff.c:92 sequencer.c:4985 #, c-format msgid "could not parse commit '%s'" msgstr "подаването „%s“ не може да бъде анализирано" -#: range-diff.c:117 +#: range-diff.c:118 #, c-format msgid "could not parse git header '%.*s'" msgstr "заглавната част на git „%.*s“ не може да се анализира" -#: range-diff.c:274 +#: range-diff.c:275 msgid "failed to generate diff" msgstr "неуспешно търсене на разлика" -#: range-diff.c:506 range-diff.c:508 +#: range-diff.c:507 range-diff.c:509 #, c-format msgid "could not parse log for '%s'" msgstr "журналът с подаванията на „%s“ не може да бъде анализиран" @@ -4865,11 +4900,11 @@ msgstr "„stat“ не може да се изпълни върху „%s“" msgid "'%s' appears as both a file and as a directory" msgstr "„%s“ съществува и като файл, и като директория" -#: read-cache.c:1499 +#: read-cache.c:1520 msgid "Refresh index" msgstr "Обновяване на индекса" -#: read-cache.c:1613 +#: read-cache.c:1635 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -4878,7 +4913,7 @@ msgstr "" "Зададена е неправилна стойност на настройката „index.version“.\n" "Ще се ползва версия %i" -#: read-cache.c:1623 +#: read-cache.c:1645 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -4888,141 +4923,141 @@ msgstr "" "„GIT_INDEX_VERSION“.\n" "Ще се ползва версия %i" -#: read-cache.c:1679 +#: read-cache.c:1701 #, c-format msgid "bad signature 0x%08x" msgstr "неправилен подпис: „0x%08x“" -#: read-cache.c:1682 +#: read-cache.c:1704 #, c-format msgid "bad index version %d" msgstr "неправилна версия на индекса %d" -#: read-cache.c:1691 +#: read-cache.c:1713 msgid "bad index file sha1 signature" msgstr "неправилен подпис за контролна сума по SHA1 на файла на индекса" -#: read-cache.c:1721 +#: read-cache.c:1743 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "" "индексът ползва разширение „%.4s“, което не се поддържа от тази версия на git" -#: read-cache.c:1723 +#: read-cache.c:1745 #, c-format msgid "ignoring %.4s extension" msgstr "игнориране на разширението „%.4s“" -#: read-cache.c:1760 +#: read-cache.c:1782 #, c-format msgid "unknown index entry format 0x%08x" msgstr "непознат формат на запис в индекса: „0x%08x“" -#: read-cache.c:1776 +#: read-cache.c:1798 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "неправилно име на поле в индекса близо до пътя „%s“" -#: read-cache.c:1833 +#: read-cache.c:1855 msgid "unordered stage entries in index" msgstr "неподредени записи в индекса" -#: read-cache.c:1836 +#: read-cache.c:1858 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "множество записи за слетия файл „%s“" -#: read-cache.c:1839 +#: read-cache.c:1861 #, c-format msgid "unordered stage entries for '%s'" msgstr "неподредени записи за „%s“" -#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111 -#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467 -#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347 +#: read-cache.c:1967 read-cache.c:2255 rerere.c:565 rerere.c:599 rerere.c:1111 +#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:468 +#: builtin/checkout.c:652 builtin/clean.c:967 builtin/commit.c:347 #: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145 #: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330 msgid "index file corrupt" msgstr "файлът с индекса е повреден" -#: read-cache.c:2087 +#: read-cache.c:2108 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "не може да се създаде нишка за зареждане на обектите от кеша: %s" -#: read-cache.c:2100 +#: read-cache.c:2121 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "не може да се изчака нишка за зареждане на обектите от кеша: %s" -#: read-cache.c:2133 +#: read-cache.c:2154 #, c-format msgid "%s: index file open failed" msgstr "%s: неуспешно отваряне на файла на индекса" -#: read-cache.c:2137 +#: read-cache.c:2158 #, c-format msgid "%s: cannot stat the open index" msgstr "%s: не може да се получи информация за отворения индекс със „stat“" -#: read-cache.c:2141 +#: read-cache.c:2162 #, c-format msgid "%s: index file smaller than expected" msgstr "%s: файлът на индекса е по-малък от очакваното" -#: read-cache.c:2145 +#: read-cache.c:2166 #, c-format msgid "%s: unable to map index file" msgstr "%s: неуспешно заделяне на съответстваща памет чрез „mmap“ на индекса" -#: read-cache.c:2187 +#: read-cache.c:2208 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "" "не може да се създаде нишка за зареждане на разширенията на индекса: %s" -#: read-cache.c:2214 +#: read-cache.c:2235 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "" "не може да се създаде нишка за зареждане на разширенията на индекса: %s" -#: read-cache.c:2246 +#: read-cache.c:2267 #, c-format msgid "could not freshen shared index '%s'" msgstr "споделеният индекс „%s“ не може да се обнови" -#: read-cache.c:2293 +#: read-cache.c:2314 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "грешки в индекса — в „%2$s“ се очаква „%1$s“, а бе получено „%3$s“" -#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114 +#: read-cache.c:3010 wrapper.c:622 builtin/merge.c:1119 #, c-format msgid "could not close '%s'" msgstr "„%s“ не може да се затвори" -#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928 +#: read-cache.c:3113 sequencer.c:2296 sequencer.c:3917 #, c-format msgid "could not stat '%s'" msgstr "неуспешно изпълнение на „stat“ върху „%s“" -#: read-cache.c:3105 +#: read-cache.c:3126 #, c-format msgid "unable to open git dir: %s" msgstr "не може да се отвори директорията на git: %s" -#: read-cache.c:3117 +#: read-cache.c:3138 #, c-format msgid "unable to unlink: %s" msgstr "неуспешно изтриване на „%s“" -#: read-cache.c:3142 +#: read-cache.c:3163 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "правата за достъп до „%s“ не могат да бъдат поправени" -#: read-cache.c:3291 +#: read-cache.c:3312 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: не може да се премине към етап №0" @@ -5135,8 +5170,8 @@ msgstr "" msgid "Note that empty commits are commented out" msgstr "Празните подавания са коментирани" -#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447 -#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235 +#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3388 +#: sequencer.c:3414 sequencer.c:5084 builtin/fsck.c:356 builtin/rebase.c:235 #, c-format msgid "could not write '%s'" msgstr "„%s“ не може да се запише" @@ -5182,7 +5217,7 @@ msgstr "„%s“ не сочи към позволен обект!" msgid "ignoring dangling symref %s" msgstr "игнориране на указател на обект извън клон „%s“" -#: refs.c:669 ref-filter.c:2092 +#: refs.c:669 ref-filter.c:2098 #, c-format msgid "ignoring broken ref %s" msgstr "игнориране на повредения указател „%s“" @@ -5207,14 +5242,14 @@ msgstr "указателят „%s“ вече съществува" msgid "unexpected object ID when writing '%s'" msgstr "неочакван идентификатор на обект при записването на „%s“" -#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913 -#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656 +#: refs.c:833 sequencer.c:403 sequencer.c:2647 sequencer.c:2851 +#: sequencer.c:2865 sequencer.c:3122 sequencer.c:5001 wrapper.c:620 #, c-format msgid "could not write to '%s'" msgstr "в „%s“ не може да се пише" -#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715 -#: builtin/rebase.c:1003 +#: refs.c:860 wrapper.c:188 wrapper.c:358 builtin/am.c:714 +#: builtin/rebase.c:1004 #, c-format msgid "could not open '%s' for writing" msgstr "„%s“ не може да бъде отворен за запис" @@ -5249,21 +5284,21 @@ msgstr "указател не може да се обнови с грешно и msgid "update_ref failed for ref '%s': %s" msgstr "неуспешно обновяване на указателя „%s“: %s" -#: refs.c:2012 +#: refs.c:2023 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "не са позволени повече от една промени на указателя „%s“" -#: refs.c:2044 +#: refs.c:2055 msgid "ref updates forbidden inside quarantine environment" msgstr "обновяванията на указатели са забранени в среди под карантина" -#: refs.c:2140 refs.c:2170 +#: refs.c:2151 refs.c:2181 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "„%s“ съществува, не може да се създаде „%s“" -#: refs.c:2146 refs.c:2181 +#: refs.c:2157 refs.c:2192 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "невъзможно е едновременно да се обработват „%s“ и „%s“" @@ -5273,13 +5308,13 @@ msgstr "невъзможно е едновременно да се обрабо msgid "could not remove reference %s" msgstr "Указателят „%s“ не може да бъде изтрит" -#: refs/files-backend.c:1248 refs/packed-backend.c:1532 -#: refs/packed-backend.c:1542 +#: refs/files-backend.c:1248 refs/packed-backend.c:1541 +#: refs/packed-backend.c:1551 #, c-format msgid "could not delete reference %s: %s" msgstr "Указателят „%s“ не може да бъде изтрит: %s" -#: refs/files-backend.c:1251 refs/packed-backend.c:1545 +#: refs/files-backend.c:1251 refs/packed-backend.c:1554 #, c-format msgid "could not delete references: %s" msgstr "Указателите не може да бъдат изтрити: %s" @@ -5289,7 +5324,7 @@ msgstr "Указателите не може да бъдат изтрити: %s" msgid "invalid refspec '%s'" msgstr "неправилен указател: „%s“" -#: ref-filter.c:42 wt-status.c:1934 +#: ref-filter.c:42 wt-status.c:1938 msgid "gone" msgstr "изтрит" @@ -5308,281 +5343,281 @@ msgstr "назад с %d" msgid "ahead %d, behind %d" msgstr "напред с %d, назад с %d" -#: ref-filter.c:162 +#: ref-filter.c:165 #, c-format msgid "expected format: %%(color:<color>)" msgstr "очакван формат: %%(color:ЦВЯТ)" -#: ref-filter.c:164 +#: ref-filter.c:167 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "непознат цвят: %%(color:%s)" -#: ref-filter.c:186 +#: ref-filter.c:189 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "очаква се цяло число за „refname:lstrip=%s“" -#: ref-filter.c:190 +#: ref-filter.c:193 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "очаква се цяло число за „refname:rstrip=%s“" -#: ref-filter.c:192 +#: ref-filter.c:195 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "непознат аргумент за „%%(%s)“: %s" -#: ref-filter.c:247 +#: ref-filter.c:250 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) не приема аргументи" -#: ref-filter.c:269 +#: ref-filter.c:272 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "непознат аргумент за %%(objectsize): %s" -#: ref-filter.c:277 +#: ref-filter.c:280 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) не приема аргументи" -#: ref-filter.c:289 +#: ref-filter.c:292 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) не приема аргументи" -#: ref-filter.c:298 +#: ref-filter.c:301 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) не приема аргументи" -#: ref-filter.c:320 +#: ref-filter.c:323 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "непознат аргумент „%%(trailers)“: %s" -#: ref-filter.c:349 +#: ref-filter.c:352 #, c-format msgid "positive value expected contents:lines=%s" msgstr "очаква се положителна стойност за „contents:lines=%s“" -#: ref-filter.c:351 +#: ref-filter.c:354 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "непознат аргумент за %%(contents): %s" -#: ref-filter.c:366 +#: ref-filter.c:369 #, c-format msgid "positive value expected objectname:short=%s" msgstr "очаква се положителна стойност за „objectname:short=%s“" -#: ref-filter.c:370 +#: ref-filter.c:373 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "непознат аргумент за %%(objectname): %s" -#: ref-filter.c:400 +#: ref-filter.c:403 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "очакван формат: %%(align:ШИРОЧИНА,ПОЗИЦИЯ)" -#: ref-filter.c:412 +#: ref-filter.c:415 #, c-format msgid "unrecognized position:%s" msgstr "непозната позиция: %s" -#: ref-filter.c:419 +#: ref-filter.c:422 #, c-format msgid "unrecognized width:%s" msgstr "непозната широчина: %s" -#: ref-filter.c:428 +#: ref-filter.c:431 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "непознат аргумент за %%(align): %s" -#: ref-filter.c:436 +#: ref-filter.c:439 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "очаква се положителна широчина с лексемата „%%(align)“" -#: ref-filter.c:454 +#: ref-filter.c:457 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "непознат аргумент за „%%(if)“: %s" -#: ref-filter.c:556 +#: ref-filter.c:559 #, c-format msgid "malformed field name: %.*s" msgstr "неправилно име на обект: „%.*s“" -#: ref-filter.c:583 +#: ref-filter.c:586 #, c-format msgid "unknown field name: %.*s" msgstr "непознато име на обект: „%.*s“" -#: ref-filter.c:587 +#: ref-filter.c:590 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "не е хранилище на git, а полето „%.*s“ изисква достъп данни на обектни" -#: ref-filter.c:711 +#: ref-filter.c:714 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "формат: лексемата %%(if) е използвана без съответната ѝ %%(then)" -#: ref-filter.c:774 +#: ref-filter.c:777 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "формат: лексемата %%(then) е използвана без съответната ѝ %%(if)" -#: ref-filter.c:776 +#: ref-filter.c:779 #, c-format msgid "format: %%(then) atom used more than once" msgstr "формат: лексемата %%(then) е използвана повече от един път" -#: ref-filter.c:778 +#: ref-filter.c:781 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "формат: лексемата %%(then) е използвана след %%(else)" -#: ref-filter.c:806 +#: ref-filter.c:809 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "формат: лексемата %%(else) е използвана без съответната ѝ %%(if)" -#: ref-filter.c:808 +#: ref-filter.c:811 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "формат: лексемата %%(else) е използвана без съответната ѝ %%(then)" -#: ref-filter.c:810 +#: ref-filter.c:813 #, c-format msgid "format: %%(else) atom used more than once" msgstr "формат: лексемата %%(else) е използвана повече от един път" -#: ref-filter.c:825 +#: ref-filter.c:828 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "формат: лексемата %%(end) е използвана без съответната ѝ" -#: ref-filter.c:882 +#: ref-filter.c:885 #, c-format msgid "malformed format string %s" msgstr "неправилен форматиращ низ „%s“" -#: ref-filter.c:1485 +#: ref-filter.c:1488 #, c-format msgid "no branch, rebasing %s" msgstr "извън клон, пребазиране на „%s“" -#: ref-filter.c:1488 +#: ref-filter.c:1491 #, c-format msgid "no branch, rebasing detached HEAD %s" msgstr "извън клон, пребазиране на несвързан указател „HEAD“ при „%s“" -#: ref-filter.c:1491 +#: ref-filter.c:1494 #, c-format msgid "no branch, bisect started on %s" msgstr "извън клон, двоично търсене от „%s“" -#: ref-filter.c:1501 +#: ref-filter.c:1504 msgid "no branch" msgstr "извън клон" -#: ref-filter.c:1537 ref-filter.c:1743 +#: ref-filter.c:1540 ref-filter.c:1749 #, c-format msgid "missing object %s for %s" msgstr "обектът „%s“ липсва за „%s“" -#: ref-filter.c:1547 +#: ref-filter.c:1550 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "неуспешно анализиране чрез „parse_object_buffer“ на „%s“ за „%s“" -#: ref-filter.c:1998 +#: ref-filter.c:2004 #, c-format msgid "malformed object at '%s'" msgstr "обект със сгрешен формат при „%s“" -#: ref-filter.c:2087 +#: ref-filter.c:2093 #, c-format msgid "ignoring ref with broken name %s" msgstr "игнориране на указателя с грешно име „%s“" -#: ref-filter.c:2382 +#: ref-filter.c:2389 #, c-format msgid "format: %%(end) atom missing" msgstr "грешка във форма̀та: липсва лексемата %%(end)" -#: ref-filter.c:2482 +#: ref-filter.c:2489 #, c-format msgid "option `%s' is incompatible with --merged" msgstr "опциите „%s“ и „--merged“ са несъвместими" -#: ref-filter.c:2485 +#: ref-filter.c:2492 #, c-format msgid "option `%s' is incompatible with --no-merged" msgstr "опциите „%s“ и „--no-merged“ са несъвместими" -#: ref-filter.c:2495 +#: ref-filter.c:2502 #, c-format msgid "malformed object name %s" msgstr "неправилно име на обект „%s“" -#: ref-filter.c:2500 +#: ref-filter.c:2507 #, c-format msgid "option `%s' must point to a commit" msgstr "опцията „%s“ не сочи към подаване" -#: remote.c:363 +#: remote.c:366 #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "" "съкращението за отдалечено хранилище не може за започва със знака „/“: %s" -#: remote.c:410 +#: remote.c:413 msgid "more than one receivepack given, using the first" msgstr "зададен е повече от един пакет за получаване, ще се ползва първият" -#: remote.c:418 +#: remote.c:421 msgid "more than one uploadpack given, using the first" msgstr "зададен е повече от един пакет за изпращане, ще се ползва първият" -#: remote.c:608 +#: remote.c:611 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Невъзможно е да се доставят едновременно и „%s“, и „%s“ към „%s“" -#: remote.c:612 +#: remote.c:615 #, c-format msgid "%s usually tracks %s, not %s" msgstr "„%s“ обикновено следи „%s“, а не „%s“" -#: remote.c:616 +#: remote.c:619 #, c-format msgid "%s tracks both %s and %s" msgstr "„%s“ следи както „%s“, така и „%s“" -#: remote.c:684 +#: remote.c:687 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "ключ „%s“ на шаблона не съдържа „*“" -#: remote.c:694 +#: remote.c:697 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "стойност „%s“ на шаблона не съдържа „*“" -#: remote.c:1000 +#: remote.c:1003 #, c-format msgid "src refspec %s does not match any" msgstr "указателят на версия-източник „%s“ не съвпада с никой обект" -#: remote.c:1005 +#: remote.c:1008 #, c-format msgid "src refspec %s matches more than one" msgstr "указателят на версия-източник „%s“ съвпада с повече от един обект" @@ -5591,7 +5626,7 @@ msgstr "указателят на версия-източник „%s“ съв #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1020 +#: remote.c:1023 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -5615,7 +5650,7 @@ msgstr "" "Никой от вариантите не сработи. Трябва сами да укажете пълното име на\n" "указателя." -#: remote.c:1040 +#: remote.c:1043 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -5626,7 +5661,7 @@ msgstr "" "като\n" "изтласкате към „%s:refs/heads/%s“?" -#: remote.c:1045 +#: remote.c:1048 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -5637,7 +5672,7 @@ msgstr "" "като\n" "изтласкате към „%s:refs/tags/%s“?" -#: remote.c:1050 +#: remote.c:1053 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -5647,7 +5682,7 @@ msgstr "" "ИЗТОЧНИКът е обект-дърво. Не целите ли всъщност да създадете нов клон като\n" "изтласкате към „%s:refs/tags/%s“?" -#: remote.c:1055 +#: remote.c:1058 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -5657,118 +5692,118 @@ msgstr "" "ИЗТОЧНИКът е обект-BLOB. Не целите ли всъщност да създадете нов клон като\n" "изтласкате към „%s:refs/tags/%s“?" -#: remote.c:1091 +#: remote.c:1094 #, c-format msgid "%s cannot be resolved to branch" msgstr "не е открит клон съответстващ на „%s“" -#: remote.c:1102 +#: remote.c:1105 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "„%s“ не може да се изтрие: отдалечения указател не съществува" -#: remote.c:1114 +#: remote.c:1117 #, c-format msgid "dst refspec %s matches more than one" msgstr "указателят на версия-цел „%s“ съвпада с повече от един обект" -#: remote.c:1121 +#: remote.c:1124 #, c-format msgid "dst ref %s receives from more than one src" msgstr "" "указателят на версия-цел „%s“ съответства и ще получава от повече от един " "източник" -#: remote.c:1624 remote.c:1725 +#: remote.c:1627 remote.c:1728 msgid "HEAD does not point to a branch" msgstr "Указателят „HEAD“ не сочи към клон" -#: remote.c:1633 +#: remote.c:1636 #, c-format msgid "no such branch: '%s'" msgstr "няма клон на име „%s“" -#: remote.c:1636 +#: remote.c:1639 #, c-format msgid "no upstream configured for branch '%s'" msgstr "не е зададен клон-източник за клона „%s“" -#: remote.c:1642 +#: remote.c:1645 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "клонът-източник „%s“ не е съхранен като следящ клон" -#: remote.c:1657 +#: remote.c:1660 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "липсва локален следящ клон за местоположението за изтласкване „%s“ в " "хранилището „%s“" -#: remote.c:1669 +#: remote.c:1672 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "няма информация клонът „%s“ да следи някой друг" -#: remote.c:1679 +#: remote.c:1682 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "указателят за изтласкване на „%s“ не включва „%s“" -#: remote.c:1692 +#: remote.c:1695 msgid "push has no destination (push.default is 'nothing')" msgstr "указателят за изтласкване не включва цел („push.default“ е „nothing“)" -#: remote.c:1714 +#: remote.c:1717 msgid "cannot resolve 'simple' push to a single destination" msgstr "простото (simple) изтласкване не съответства на една цел" -#: remote.c:1840 +#: remote.c:1843 #, c-format msgid "couldn't find remote ref %s" msgstr "отдалеченият указател „%s“ не може да бъде открит" -#: remote.c:1853 +#: remote.c:1856 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "• прескачане на неочаквания локален указател „%s“" -#: remote.c:2016 +#: remote.c:2019 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Този клон следи „%s“, но следеният клон е изтрит.\n" -#: remote.c:2020 +#: remote.c:2023 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (за да коригирате това, използвайте „git branch --unset-upstream“)\n" -#: remote.c:2023 +#: remote.c:2026 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Клонът е актуализиран към „%s“.\n" -#: remote.c:2027 +#: remote.c:2030 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "Клонът ви и „%s“ сочат към различни подавания.\n" -#: remote.c:2030 +#: remote.c:2033 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (за повече информация ползвайте „%s“)\n" -#: remote.c:2034 +#: remote.c:2037 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Клонът ви е с %2$d подаване пред „%1$s“.\n" msgstr[1] "Клонът ви е с %2$d подавания пред „%1$s“.\n" -#: remote.c:2040 +#: remote.c:2043 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (публикувайте локалните си промени чрез „git push“)\n" -#: remote.c:2043 +#: remote.c:2046 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -5776,11 +5811,11 @@ msgid_plural "" msgstr[0] "Клонът ви е с %2$d подаване зад „%1$s“ и може да бъде превъртян.\n" msgstr[1] "Клонът ви е с %2$d подавания зад „%1$s“ и може да бъде превъртян.\n" -#: remote.c:2051 +#: remote.c:2054 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (обновете локалния си клон чрез „git pull“)\n" -#: remote.c:2054 +#: remote.c:2057 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -5795,11 +5830,11 @@ msgstr[1] "" "Текущият клон се е отделил от „%s“,\n" "двата имат съответно по %d и %d несъвпадащи подавания.\n" -#: remote.c:2064 +#: remote.c:2067 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (слейте отдалечения клон в локалния чрез „git pull“)\n" -#: remote.c:2247 +#: remote.c:2250 #, c-format msgid "cannot parse expected object name '%s'" msgstr "очакваното име на обект „%s“ не може да бъде анализирано" @@ -5880,7 +5915,7 @@ msgstr "излишният обект „%s“ не може да се изтр msgid "Recorded preimage for '%s'" msgstr "Предварителният вариант на „%s“ е запазен" -#: rerere.c:881 submodule.c:2023 builtin/log.c:1773 +#: rerere.c:881 submodule.c:2023 builtin/log.c:1790 #: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 #, c-format msgid "could not create directory '%s'" @@ -5915,20 +5950,20 @@ msgstr "Запазената корекция на конфликт при „%s msgid "unable to open rr-cache directory" msgstr "директорията „rr-cache“ не може да се отвори" -#: revision.c:2507 +#: revision.c:2509 msgid "your current branch appears to be broken" msgstr "Текущият клон е повреден" -#: revision.c:2510 +#: revision.c:2512 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "Текущият клон „%s“ е без подавания " -#: revision.c:2710 +#: revision.c:2720 msgid "--first-parent is incompatible with --bisect" msgstr "опциите „--first-parent“ и „--bisect“ са несъвместими" -#: revision.c:2714 +#: revision.c:2724 msgid "-L does not yet support diff formats besides -p and -s" msgstr "" "опцията „-L“ поддържа единствено форматирането на разликите според опциите „-" @@ -5953,32 +5988,32 @@ msgstr "" "За да изключите това предупреждение, изпълнете:\n" " git config advice.ignoredHook false" -#: send-pack.c:141 +#: send-pack.c:142 msgid "unexpected flush packet while reading remote unpack status" msgstr "" "неочакван изчистващ пакет „flush“ при изчитане на състоянието от " "отдалеченото разпакетиране" -#: send-pack.c:143 +#: send-pack.c:144 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "" "състоянието от отдалеченото разпакетиране не може да бъде анализирано: %s" -#: send-pack.c:145 +#: send-pack.c:146 #, c-format msgid "remote unpack failed: %s" msgstr "неуспешно отдалечено разпакетиране: %s" -#: send-pack.c:306 +#: send-pack.c:307 msgid "failed to sign the push certificate" msgstr "сертификатът за изтласкване не може да бъде подписан" -#: send-pack.c:420 +#: send-pack.c:421 msgid "the receiving end does not support --signed push" msgstr "отсрещната страна не поддържа изтласкване с опцията „--signed“" -#: send-pack.c:422 +#: send-pack.c:423 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -5986,11 +6021,11 @@ msgstr "" "отсрещната страна не поддържа изтласкване с опцията „--signed“, затова не се " "използва сертификат" -#: send-pack.c:434 +#: send-pack.c:435 msgid "the receiving end does not support --atomic push" msgstr "получаващата страна не поддържа изтласкване с опцията „--atomic“" -#: send-pack.c:439 +#: send-pack.c:440 msgid "the receiving end does not support push options" msgstr "отсрещната страна не поддържа опции при изтласкване" @@ -6004,7 +6039,7 @@ msgstr "несъществуващ режим на изчистване „%s“ msgid "could not delete '%s'" msgstr "„%s“ не може да бъде изтрит" -#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369 +#: sequencer.c:311 builtin/rebase.c:760 builtin/rebase.c:1676 builtin/rm.c:369 #, c-format msgid "could not remove '%s'" msgstr "„%s“ не може да бъде изтрит" @@ -6044,7 +6079,7 @@ msgstr "" "пътища с „git add ПЪТ…“ или „git rm ПЪТ…“, след което\n" "подайте резултата с командата „git commit'“." -#: sequencer.c:401 sequencer.c:2909 +#: sequencer.c:401 sequencer.c:2847 #, c-format msgid "could not lock '%s'" msgstr "„%s“ не може да се заключи" @@ -6054,15 +6089,15 @@ msgstr "„%s“ не може да се заключи" msgid "could not write eol to '%s'" msgstr "краят на ред не може да се запише в „%s“" -#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929 -#: sequencer.c:3192 +#: sequencer.c:413 sequencer.c:2652 sequencer.c:2853 sequencer.c:2867 +#: sequencer.c:3130 #, c-format msgid "failed to finalize '%s'" msgstr "„%s“ не може да се завърши" -#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734 -#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763 -#: builtin/merge.c:1112 builtin/rebase.c:567 +#: sequencer.c:436 sequencer.c:1585 sequencer.c:2672 sequencer.c:3112 +#: sequencer.c:3221 builtin/am.c:244 builtin/commit.c:763 builtin/merge.c:1117 +#: builtin/rebase.c:568 #, c-format msgid "could not read '%s'" msgstr "файлът „%s“ не може да бъде прочетен" @@ -6089,70 +6124,65 @@ msgstr "Несъществуващ режим на изчистване „%s“ #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:632 +#: sequencer.c:631 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: новият индекс не може да бъде запазен" -#: sequencer.c:649 +#: sequencer.c:648 msgid "unable to update cache tree" msgstr "дървото на кеша не може да бъде обновено" -#: sequencer.c:663 +#: sequencer.c:662 msgid "could not resolve HEAD commit" msgstr "подаването, сочено от указателя „HEAD“, не може да бъде открито" -#: sequencer.c:743 +#: sequencer.c:742 #, c-format msgid "no key present in '%.*s'" msgstr "в „%.*s“ няма ключове" -#: sequencer.c:754 +#: sequencer.c:753 #, c-format msgid "unable to dequote value of '%s'" msgstr "цитирането на стойността на „%s“ не може да бъде изчистено" -#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706 -#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045 +#: sequencer.c:790 wrapper.c:190 wrapper.c:360 builtin/am.c:705 +#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1046 #, c-format msgid "could not open '%s' for reading" msgstr "файлът не може да бъде прочетен: „%s“" -#: sequencer.c:801 +#: sequencer.c:800 msgid "'GIT_AUTHOR_NAME' already given" msgstr "настройката за автор „GIT_AUTHOR_NAME“ вече е зададена" -#: sequencer.c:806 +#: sequencer.c:805 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "настройката за е-поща „GIT_AUTHOR_EMAIL“ вече е зададена" -#: sequencer.c:811 +#: sequencer.c:810 msgid "'GIT_AUTHOR_DATE' already given" msgstr "настройката за дата „GIT_AUTHOR_DATE“ вече е зададена" -#: sequencer.c:815 +#: sequencer.c:814 #, c-format msgid "unknown variable '%s'" msgstr "непозната променлива „%s“" -#: sequencer.c:820 +#: sequencer.c:819 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "настройката за автор „GIT_AUTHOR_NAME“ липсва" -#: sequencer.c:822 +#: sequencer.c:821 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "настройката за е-поща „GIT_AUTHOR_EMAIL“ липсва" -#: sequencer.c:824 +#: sequencer.c:823 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "настройката за дата „GIT_AUTHOR_DATE“ липсва" -#: sequencer.c:884 -#, c-format -msgid "invalid date format '%s' in '%s'" -msgstr "неправилен формат на дата „%s“ в „%s“" - -#: sequencer.c:901 +#: sequencer.c:872 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -6181,17 +6211,13 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:995 -msgid "writing root commit" -msgstr "запазване на начално подаване" - -#: sequencer.c:1216 +#: sequencer.c:1146 msgid "'prepare-commit-msg' hook failed" msgstr "" "неуспешно изпълнение на куката при промяна на съобщението при подаване " "(prepare-commit-msg)" -#: sequencer.c:1223 +#: sequencer.c:1153 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6220,7 +6246,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1236 +#: sequencer.c:1166 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6246,338 +6272,338 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1278 +#: sequencer.c:1208 msgid "couldn't look up newly created commit" msgstr "току що създаденото подаване не може да бъде открито" -#: sequencer.c:1280 +#: sequencer.c:1210 msgid "could not parse newly created commit" msgstr "току що създаденото подаване не може да бъде анализирано" -#: sequencer.c:1326 +#: sequencer.c:1256 msgid "unable to resolve HEAD after creating commit" msgstr "" "състоянието сочено от указателя „HEAD“ не може да бъде открито след " "подаването" -#: sequencer.c:1328 +#: sequencer.c:1258 msgid "detached HEAD" msgstr "несвързан връх „HEAD“" -#: sequencer.c:1332 +#: sequencer.c:1262 msgid " (root-commit)" msgstr " (начално подаване)" -#: sequencer.c:1353 +#: sequencer.c:1283 msgid "could not parse HEAD" msgstr "указателят „HEAD“ не може да бъде анализиран" -#: sequencer.c:1355 +#: sequencer.c:1285 #, c-format msgid "HEAD %s is not a commit!" msgstr "указателят „HEAD“ „%s“ сочи към нещо, което не е подаване!" -#: sequencer.c:1359 builtin/commit.c:1571 +#: sequencer.c:1289 builtin/commit.c:1571 msgid "could not parse HEAD commit" msgstr "върховото подаване „HEAD“ не може да бъде прочетено" -#: sequencer.c:1411 sequencer.c:2004 +#: sequencer.c:1341 sequencer.c:1933 msgid "unable to parse commit author" msgstr "авторът на подаването не може да бъде анализиран" -#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684 +#: sequencer.c:1352 builtin/am.c:1561 builtin/merge.c:684 msgid "git write-tree failed to write a tree" msgstr "Командата „git write-tree“ не успя да запише обект-дърво" -#: sequencer.c:1438 sequencer.c:1499 +#: sequencer.c:1369 sequencer.c:1429 #, c-format msgid "unable to read commit message from '%s'" msgstr "съобщението за подаване не може да бъде прочетено от „%s“" -#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878 -#: builtin/merge.c:903 +#: sequencer.c:1396 builtin/am.c:1583 builtin/commit.c:1670 builtin/merge.c:883 +#: builtin/merge.c:908 msgid "failed to write commit object" msgstr "обектът за подаването не може да бъде записан" -#: sequencer.c:1526 +#: sequencer.c:1456 #, c-format msgid "could not parse commit %s" msgstr "подаването „%s“ не може да бъде анализирано" -#: sequencer.c:1531 +#: sequencer.c:1461 #, c-format msgid "could not parse parent commit %s" msgstr "родителското подаване „%s“ не може да бъде анализирано" -#: sequencer.c:1605 sequencer.c:1715 +#: sequencer.c:1535 sequencer.c:1645 #, c-format msgid "unknown command: %d" msgstr "непозната команда: %d" -#: sequencer.c:1662 sequencer.c:1687 +#: sequencer.c:1592 sequencer.c:1617 #, c-format msgid "This is a combination of %d commits." msgstr "Това е обединение от %d подавания" -#: sequencer.c:1672 +#: sequencer.c:1602 msgid "need a HEAD to fixup" msgstr "За вкарване в предходното подаване ви трябва указател „HEAD“" -#: sequencer.c:1674 sequencer.c:3219 +#: sequencer.c:1604 sequencer.c:3157 msgid "could not read HEAD" msgstr "указателят „HEAD“ не може да се прочете" -#: sequencer.c:1676 +#: sequencer.c:1606 msgid "could not read HEAD's commit message" msgstr "" "съобщението за подаване към указателя „HEAD“ не може да бъде прочетено: %s" -#: sequencer.c:1682 +#: sequencer.c:1612 #, c-format msgid "cannot write '%s'" msgstr "„%s“ не може да се запази" -#: sequencer.c:1689 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1619 git-rebase--preserve-merges.sh:496 msgid "This is the 1st commit message:" msgstr "Това е 1-то съобщение при подаване:" -#: sequencer.c:1697 +#: sequencer.c:1627 #, c-format msgid "could not read commit message of %s" msgstr "съобщението за подаване към „%s“ не може да бъде прочетено" -#: sequencer.c:1704 +#: sequencer.c:1634 #, c-format msgid "This is the commit message #%d:" msgstr "Това е съобщение при подаване №%d:" -#: sequencer.c:1710 +#: sequencer.c:1640 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Съобщение при подаване №%d ще бъде прескочено:" -#: sequencer.c:1798 +#: sequencer.c:1728 msgid "your index file is unmerged." msgstr "индексът не е слят." -#: sequencer.c:1805 +#: sequencer.c:1735 msgid "cannot fixup root commit" msgstr "началното подаване не може да се вкара в предходното му" -#: sequencer.c:1824 +#: sequencer.c:1754 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "подаването „%s“ е сливане, но не е дадена опцията „-m“" -#: sequencer.c:1832 sequencer.c:1840 +#: sequencer.c:1762 sequencer.c:1770 #, c-format msgid "commit %s does not have parent %d" msgstr "подаването „%s“ няма родител %d" -#: sequencer.c:1846 +#: sequencer.c:1776 #, 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:1865 +#: sequencer.c:1795 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: неразпозната стойност за родителското подаване „%s“" -#: sequencer.c:1930 +#: sequencer.c:1860 #, c-format msgid "could not rename '%s' to '%s'" msgstr "„%s“ не може да се преименува на „%s“" -#: sequencer.c:1985 +#: sequencer.c:1915 #, c-format msgid "could not revert %s... %s" msgstr "подаването „%s“… не може да бъде отменено: „%s“" -#: sequencer.c:1986 +#: sequencer.c:1916 #, c-format msgid "could not apply %s... %s" msgstr "подаването „%s“… не може да бъде приложено: „%s“" -#: sequencer.c:2045 +#: sequencer.c:1983 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: неуспешно изчитане на индекса" -#: sequencer.c:2052 +#: sequencer.c:1990 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: неуспешно обновяване на индекса" -#: sequencer.c:2128 +#: sequencer.c:2066 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "„%s“ не приема аргументи: „%s“" -#: sequencer.c:2137 +#: sequencer.c:2075 #, c-format msgid "missing arguments for %s" msgstr "„%s“ изисква аргументи" -#: sequencer.c:2174 +#: sequencer.c:2112 #, c-format msgid "could not parse '%.*s'" msgstr "„%.*s“ не може да се анализира" -#: sequencer.c:2228 +#: sequencer.c:2166 #, c-format msgid "invalid line %d: %.*s" msgstr "неправилен ред %d: %.*s" -#: sequencer.c:2239 +#: sequencer.c:2177 #, c-format msgid "cannot '%s' without a previous commit" msgstr "Без предишно подаване не може да се изпълни „%s“" -#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178 +#: sequencer.c:2225 builtin/rebase.c:153 builtin/rebase.c:178 #: builtin/rebase.c:204 builtin/rebase.c:229 #, c-format msgid "could not read '%s'." msgstr "от „%s“ не може да се чете." -#: sequencer.c:2323 +#: sequencer.c:2261 msgid "cancelling a cherry picking in progress" msgstr "преустановяване на извършваното в момента отбиране на подавания" -#: sequencer.c:2330 +#: sequencer.c:2268 msgid "cancelling a revert in progress" msgstr "преустановяване на извършваното в момента отмяна на подаване" -#: sequencer.c:2364 +#: sequencer.c:2302 msgid "please fix this using 'git rebase --edit-todo'." msgstr "коригирайте това чрез „git rebase --edit-todo“." -#: sequencer.c:2366 +#: sequencer.c:2304 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "неизползваем файл с описание на предстоящите действия: „%s“" -#: sequencer.c:2371 +#: sequencer.c:2309 msgid "no commits parsed." msgstr "никое от подаванията не може да се разпознае." -#: sequencer.c:2382 +#: sequencer.c:2320 msgid "cannot cherry-pick during a revert." msgstr "" "по време на отмяна на подаване не може да се извърши отбиране на подаване." -#: sequencer.c:2384 +#: sequencer.c:2322 msgid "cannot revert during a cherry-pick." msgstr "по време на отбиране не може да се извърши отмяна на подаване." -#: sequencer.c:2466 +#: sequencer.c:2404 #, c-format msgid "invalid value for %s: %s" msgstr "неправилна стойност за „%s“: „%s“" -#: sequencer.c:2553 +#: sequencer.c:2491 msgid "unusable squash-onto" msgstr "подаването, в което другите да се вкарат, не може да се използва" -#: sequencer.c:2569 +#: sequencer.c:2507 #, c-format msgid "malformed options sheet: '%s'" msgstr "неправилен файл с опции: „%s“" -#: sequencer.c:2652 sequencer.c:4351 +#: sequencer.c:2590 sequencer.c:4308 msgid "empty commit set passed" msgstr "зададено е празно множество от подавания" -#: sequencer.c:2668 +#: sequencer.c:2606 msgid "revert is already in progress" msgstr "в момента вече се извършва отмяна на подавания" -#: sequencer.c:2670 +#: sequencer.c:2608 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "използвайте „git cherry-pick (--continue | %s--abort | --quit)“" -#: sequencer.c:2673 +#: sequencer.c:2611 msgid "cherry-pick is already in progress" msgstr "в момента вече се извършва отбиране на подавания" -#: sequencer.c:2675 +#: sequencer.c:2613 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "използвайте „git cherry-pick (--continue | %s--abort | --quit)“" -#: sequencer.c:2689 +#: sequencer.c:2627 #, c-format msgid "could not create sequencer directory '%s'" msgstr "" "директорията за определянето на последователността „%s“ не може да бъде " "създадена" -#: sequencer.c:2704 +#: sequencer.c:2642 msgid "could not lock HEAD" msgstr "указателят „HEAD“ не може да се заключи" -#: sequencer.c:2764 sequencer.c:4103 +#: sequencer.c:2702 sequencer.c:4057 msgid "no cherry-pick or revert in progress" msgstr "" "в момента не се извършва отбиране на подавания или пребазиране на клона" -#: sequencer.c:2766 sequencer.c:2777 +#: sequencer.c:2704 sequencer.c:2715 msgid "cannot resolve HEAD" msgstr "Подаването сочено от указателя „HEAD“ не може да бъде открито" -#: sequencer.c:2768 sequencer.c:2812 +#: sequencer.c:2706 sequencer.c:2750 msgid "cannot abort from a branch yet to be born" msgstr "" "действието не може да бъде преустановено, когато сте на клон, който тепърва " "предстои да бъде създаден" -#: sequencer.c:2798 builtin/grep.c:734 +#: sequencer.c:2736 builtin/grep.c:736 #, c-format msgid "cannot open '%s'" msgstr "„%s“ не може да бъде отворен" -#: sequencer.c:2800 +#: sequencer.c:2738 #, c-format msgid "cannot read '%s': %s" msgstr "„%s“ не може да бъде прочетен: %s" -#: sequencer.c:2801 +#: sequencer.c:2739 msgid "unexpected end of file" msgstr "неочакван край на файл" -#: sequencer.c:2807 +#: sequencer.c:2745 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" "запазеният преди започването на отбирането файл за указателя „HEAD“ — „%s“ е " "повреден" -#: sequencer.c:2818 +#: sequencer.c:2756 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" "Изглежда указателят „HEAD“ е променен. Проверете към какво сочи.\n" "Не се правят промени." -#: sequencer.c:2859 +#: sequencer.c:2797 msgid "no revert in progress" msgstr "в момента не тече пребазиране" -#: sequencer.c:2867 +#: sequencer.c:2805 msgid "no cherry-pick in progress" msgstr "в момента не се извършва отбиране на подавания" -#: sequencer.c:2877 +#: sequencer.c:2815 msgid "failed to skip the commit" msgstr "неуспешно прескачане на подаването" -#: sequencer.c:2884 +#: sequencer.c:2822 msgid "there is nothing to skip" msgstr "няма какво да се прескочи" -#: sequencer.c:2887 +#: sequencer.c:2825 #, c-format msgid "" "have you committed already?\n" @@ -6587,21 +6613,21 @@ msgstr "" "\n" " git %s --continue" -#: sequencer.c:3011 sequencer.c:4015 +#: sequencer.c:2949 sequencer.c:3969 #, c-format msgid "could not update %s" msgstr "„%s“ не може да се обнови" -#: sequencer.c:3049 sequencer.c:3995 +#: sequencer.c:2987 sequencer.c:3949 msgid "cannot read HEAD" msgstr "указателят „HEAD“ не може да бъде прочетен" -#: sequencer.c:3066 +#: sequencer.c:3004 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "„%s“ не може да се копира като „%s“" -#: sequencer.c:3074 +#: sequencer.c:3012 #, c-format msgid "" "You can amend the commit now, with\n" @@ -6620,27 +6646,27 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3084 +#: sequencer.c:3022 #, c-format msgid "Could not apply %s... %.*s" msgstr "Подаването „%s“… не може да бъде приложено: „%.*s“" -#: sequencer.c:3091 +#: sequencer.c:3029 #, c-format msgid "Could not merge %.*s" msgstr "Невъзможно сливане на „%.*s“" -#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633 +#: sequencer.c:3043 sequencer.c:3047 builtin/difftool.c:641 #, c-format msgid "could not copy '%s' to '%s'" msgstr "„%s“ не може да се копира като „%s“" -#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582 -#: builtin/rebase.c:1953 builtin/rebase.c:2008 +#: sequencer.c:3069 sequencer.c:3506 builtin/rebase.c:850 builtin/rebase.c:1613 +#: builtin/rebase.c:1987 builtin/rebase.c:2031 msgid "could not read index" msgstr "индексът не може да бъде прочетен" -#: sequencer.c:3136 +#: sequencer.c:3074 #, c-format msgid "" "execution failed: %s\n" @@ -6655,11 +6681,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3142 +#: sequencer.c:3080 msgid "and made changes to the index and/or the working tree\n" msgstr "и променѝ индекса и/или работното дърво\n" -#: sequencer.c:3148 +#: sequencer.c:3086 #, c-format msgid "" "execution succeeded: %s\n" @@ -6676,76 +6702,76 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3209 +#: sequencer.c:3147 #, c-format msgid "illegal label name: '%.*s'" msgstr "неправилно име на етикет: „%.*s“" -#: sequencer.c:3263 +#: sequencer.c:3201 msgid "writing fake root commit" msgstr "запазване на фалшиво начално подаване" -#: sequencer.c:3268 +#: sequencer.c:3206 msgid "writing squash-onto" msgstr "запазване на подаването, в което другите да се вкарат" -#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860 +#: sequencer.c:3244 builtin/rebase.c:855 builtin/rebase.c:861 #, c-format msgid "failed to find tree of %s" msgstr "дървото, сочено от „%s“, не може да бъде открито" -#: sequencer.c:3324 builtin/rebase.c:873 +#: sequencer.c:3262 builtin/rebase.c:874 msgid "could not write index" msgstr "индексът не може да бъде записан" -#: sequencer.c:3351 +#: sequencer.c:3289 #, c-format msgid "could not resolve '%s'" msgstr "„%s“ не може да бъде открит" -#: sequencer.c:3379 +#: sequencer.c:3320 msgid "cannot merge without a current revision" msgstr "без текущо подаване не може да се слива" -#: sequencer.c:3401 +#: sequencer.c:3342 #, c-format msgid "unable to parse '%.*s'" msgstr "„%.*s“ не може да се анализира" -#: sequencer.c:3410 +#: sequencer.c:3351 #, c-format msgid "nothing to merge: '%.*s'" msgstr "няма нищо за сливане: „%.*s“" -#: sequencer.c:3422 +#: sequencer.c:3363 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "върху начално подаване не може да се извърши множествено сливане" -#: sequencer.c:3437 +#: sequencer.c:3378 #, c-format msgid "could not get commit message of '%s'" msgstr "съобщението за подаване към „%s“ не може да бъде получено" -#: sequencer.c:3590 +#: sequencer.c:3538 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "сливането на „%.*s“ не може даже да започне" -#: sequencer.c:3606 +#: sequencer.c:3554 msgid "merge: Unable to write new index file" msgstr "сливане: новият индекс не може да бъде запазен" -#: sequencer.c:3675 builtin/rebase.c:711 +#: sequencer.c:3623 builtin/rebase.c:712 #, c-format msgid "Applied autostash.\n" msgstr "Автоматично скатаното е приложено.\n" -#: sequencer.c:3687 +#: sequencer.c:3635 #, c-format msgid "cannot store %s" msgstr "„%s“ не може да бъде запазен" -#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113 +#: sequencer.c:3638 builtin/rebase.c:728 git-rebase--preserve-merges.sh:113 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -6756,31 +6782,31 @@ msgstr "" "надеждно скатани. Можете да пробвате да ги приложите чрез „git stash pop“\n" "или да ги изхвърлите чрез „git stash drop“, когато поискате.\n" -#: sequencer.c:3751 +#: sequencer.c:3699 #, c-format msgid "could not checkout %s" msgstr "„%s“ не може да се изтегли" -#: sequencer.c:3765 +#: sequencer.c:3713 #, c-format msgid "%s: not a valid OID" msgstr "„%s“ е неправилен идентификатор на обект" -#: sequencer.c:3770 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3718 git-rebase--preserve-merges.sh:779 msgid "could not detach HEAD" msgstr "указателят „HEAD“ не може да се отдели" -#: sequencer.c:3785 +#: sequencer.c:3733 #, c-format msgid "Stopped at HEAD\n" msgstr "Бе спряно при „HEAD“\n" -#: sequencer.c:3787 +#: sequencer.c:3735 #, c-format msgid "Stopped at %s\n" msgstr "Бе спряно при „%s“\n" -#: sequencer.c:3795 +#: sequencer.c:3743 #, c-format msgid "" "Could not execute the todo command\n" @@ -6803,48 +6829,48 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3877 +#: sequencer.c:3827 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Спиране при „%s“… %.*s\n" -#: sequencer.c:3958 +#: sequencer.c:3898 #, c-format msgid "unknown command %d" msgstr "непозната команда %d" -#: sequencer.c:4003 +#: sequencer.c:3957 msgid "could not read orig-head" msgstr "указателят за „orig-head“ не може да се прочете" -#: sequencer.c:4008 +#: sequencer.c:3962 msgid "could not read 'onto'" msgstr "указателят за „onto“ не може да се прочете" -#: sequencer.c:4022 +#: sequencer.c:3976 #, c-format msgid "could not update HEAD to %s" msgstr "„HEAD“ не може да бъде обновен до „%s“" -#: sequencer.c:4115 +#: sequencer.c:4069 msgid "cannot rebase: You have unstaged changes." msgstr "не може да пребазирате, защото има промени, които не са в индекса." -#: sequencer.c:4124 +#: sequencer.c:4078 msgid "cannot amend non-existing commit" msgstr "несъществуващо подаване не може да се поправи" -#: sequencer.c:4126 +#: sequencer.c:4080 #, c-format msgid "invalid file: '%s'" msgstr "неправилен файл: „%s“" -#: sequencer.c:4128 +#: sequencer.c:4082 #, c-format msgid "invalid contents: '%s'" msgstr "неправилно съдържание: „%s“" -#: sequencer.c:4131 +#: sequencer.c:4085 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -6854,42 +6880,42 @@ msgstr "" "В работното дърво има неподадени промени. Първо ги подайте, а след това\n" "отново изпълнете „git rebase --continue“." -#: sequencer.c:4167 sequencer.c:4205 +#: sequencer.c:4121 sequencer.c:4159 #, c-format msgid "could not write file: '%s'" msgstr "файлът „%s“ не може да бъде записан" -#: sequencer.c:4220 +#: sequencer.c:4174 msgid "could not remove CHERRY_PICK_HEAD" msgstr "указателят „CHERRY_PICK_HEAD“ не може да бъде изтрит" -#: sequencer.c:4227 +#: sequencer.c:4181 msgid "could not commit staged changes." msgstr "промените в индекса не могат да бъдат подадени." -#: sequencer.c:4328 +#: sequencer.c:4285 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: не може да се отбере „%s“" -#: sequencer.c:4332 +#: sequencer.c:4289 #, c-format msgid "%s: bad revision" msgstr "%s: неправилна версия" -#: sequencer.c:4367 +#: sequencer.c:4324 msgid "can't revert as initial commit" msgstr "първоначалното подаване не може да бъде отменено" -#: sequencer.c:4810 +#: sequencer.c:4774 msgid "make_script: unhandled options" msgstr "make_script: неподдържани опции" -#: sequencer.c:4813 +#: sequencer.c:4777 msgid "make_script: error preparing revisions" msgstr "make_script: грешка при подготовката на версии" -#: sequencer.c:4971 +#: sequencer.c:4935 msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" "continue'.\n" @@ -6899,24 +6925,24 @@ msgstr "" "continue“ след това.\n" "Може и да преустановите пребазирането с командата „git rebase --abort“.\n" -#: sequencer.c:5083 sequencer.c:5100 +#: sequencer.c:5047 sequencer.c:5064 msgid "nothing to do" msgstr "няма какво да се прави" -#: sequencer.c:5114 +#: sequencer.c:5078 msgid "could not skip unnecessary pick commands" msgstr "излишните команди за отбиране не бяха прескочени" -#: sequencer.c:5197 +#: sequencer.c:5166 msgid "the script was already rearranged." msgstr "скриптът вече е преподреден." -#: setup.c:123 +#: setup.c:124 #, c-format msgid "'%s' is outside repository" msgstr "„%s“ е извън хранилището" -#: setup.c:173 +#: setup.c:174 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -6927,7 +6953,7 @@ msgstr "" "\n" " git КОМАНДА -- ПЪТ…" -#: setup.c:186 +#: setup.c:187 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -6940,12 +6966,12 @@ msgstr "" "\n" " git КОМАНДА [ВЕРСИЯ…] -- [ФАЙЛ…]" -#: setup.c:235 +#: setup.c:236 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "опцията „%s“ трябва да е преди първия аргумент, който не е опция" -#: setup.c:254 +#: setup.c:255 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -6957,95 +6983,95 @@ msgstr "" "\n" " git КОМАНДА [ВЕРСИЯ…] -- [ФАЙЛ…]" -#: setup.c:390 +#: setup.c:391 msgid "unable to set up work tree using invalid config" msgstr "" "не може да се зададе текуща работна директория при неправилни настройки" -#: setup.c:394 +#: setup.c:395 msgid "this operation must be run in a work tree" msgstr "тази команда трябва да се изпълни в работно дърво" -#: setup.c:540 +#: setup.c:541 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Очаква се версия на хранилището на git <= %d, а не %d" -#: setup.c:548 +#: setup.c:549 msgid "unknown repository extensions found:" msgstr "открити са непознати разширения в хранилището:" -#: setup.c:567 +#: setup.c:568 #, c-format msgid "error opening '%s'" msgstr "„%s“ не може да се отвори" -#: setup.c:569 +#: setup.c:570 #, c-format msgid "too large to be a .git file: '%s'" msgstr "прекалено голям файл „.git“: „%s“" -#: setup.c:571 +#: setup.c:572 #, c-format msgid "error reading %s" msgstr "грешка при прочитане на „%s“" -#: setup.c:573 +#: setup.c:574 #, c-format msgid "invalid gitfile format: %s" msgstr "неправилен формат на gitfile: %s" -#: setup.c:575 +#: setup.c:576 #, c-format msgid "no path in gitfile: %s" msgstr "липсва път в gitfile: „%s“" -#: setup.c:577 +#: setup.c:578 #, c-format msgid "not a git repository: %s" msgstr "не е хранилище на Git: %s" -#: setup.c:676 +#: setup.c:677 #, c-format msgid "'$%s' too big" msgstr "„%s“ е прекалено голям" -#: setup.c:690 +#: setup.c:691 #, c-format msgid "not a git repository: '%s'" msgstr "не е хранилище на git: „%s“" -#: setup.c:719 setup.c:721 setup.c:752 +#: setup.c:720 setup.c:722 setup.c:753 #, c-format msgid "cannot chdir to '%s'" msgstr "не може да се влезе в директорията „%s“" -#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837 +#: setup.c:725 setup.c:781 setup.c:791 setup.c:830 setup.c:838 msgid "cannot come back to cwd" msgstr "процесът не може да се върне към предишната работна директория" -#: setup.c:851 +#: setup.c:852 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "не може да бъде получена информация чрез „stat“ за „%*s%s%s“" -#: setup.c:1083 +#: setup.c:1090 msgid "Unable to read current working directory" msgstr "Текущата работна директория не може да бъде прочетена" -#: setup.c:1092 setup.c:1098 +#: setup.c:1099 setup.c:1105 #, c-format msgid "cannot change to '%s'" msgstr "не може да се влезе в директорията „%s“" -#: setup.c:1103 +#: setup.c:1110 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "" "нито тази, нито която и да е от по-горните директории, не е хранилище на " "git: %s" -#: setup.c:1109 +#: setup.c:1116 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -7056,7 +7082,7 @@ msgstr "" "Git работи в рамките на една файлова система, защото променливата на средата " "„GIT_DISCOVERY_ACROSS_FILESYSTEM“ не е зададена." -#: setup.c:1220 +#: setup.c:1227 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -7066,291 +7092,291 @@ msgstr "" "(0%.3o).\n" "Собственикът на файла трябва да има права за писане и четене." -#: setup.c:1264 +#: setup.c:1271 msgid "open /dev/null or dup failed" msgstr "неуспешно изпълнение на „open“ или „dup“ върху „/dev/null“" -#: setup.c:1279 +#: setup.c:1286 msgid "fork failed" msgstr "неуспешно създаване на процес чрез „fork“" -#: setup.c:1284 +#: setup.c:1291 msgid "setsid failed" msgstr "неуспешно изпълнение на „setsid“" -#: sha1-file.c:453 +#: sha1-file.c:452 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "" "директорията за обекти „%s“ не съществува, проверете „.git/objects/info/" "alternates“" -#: sha1-file.c:504 +#: sha1-file.c:503 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "алтернативният път към обекти не може да бъде нормализиран: „%s“" -#: sha1-file.c:576 +#: sha1-file.c:575 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "" "%s: алтернативните хранилища за обекти се пренебрегват поради прекалено " "дълбоко влагане" -#: sha1-file.c:583 +#: sha1-file.c:582 #, c-format msgid "unable to normalize object directory: %s" msgstr "директорията за обекти „%s“ не може да бъде нормализирана" -#: sha1-file.c:626 +#: sha1-file.c:625 msgid "unable to fdopen alternates lockfile" msgstr "заключващият файл за алтернативите не може да се отвори с „fdopen“" -#: sha1-file.c:644 +#: sha1-file.c:643 msgid "unable to read alternates file" msgstr "файлът с алтернативите не може да бъде прочетен" -#: sha1-file.c:651 +#: sha1-file.c:650 msgid "unable to move new alternates file into place" msgstr "новият файл с алтернативите не може да бъде преместен на мястото му" -#: sha1-file.c:686 +#: sha1-file.c:685 #, c-format msgid "path '%s' does not exist" msgstr "пътят „%s“ не съществува." -#: sha1-file.c:712 +#: sha1-file.c:711 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "все още не се поддържа еталонно хранилище „%s“ като свързано." -#: sha1-file.c:718 +#: sha1-file.c:717 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "еталонното хранилище „%s“ не е локално" -#: sha1-file.c:724 +#: sha1-file.c:723 #, c-format msgid "reference repository '%s' is shallow" msgstr "еталонното хранилище „%s“ е плитко" -#: sha1-file.c:732 +#: sha1-file.c:731 #, c-format msgid "reference repository '%s' is grafted" msgstr "еталонното хранилище „%s“ е с присаждане" -#: sha1-file.c:792 +#: sha1-file.c:791 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "неправилен ред при анализа на алтернативните указатели: „%s“" -#: sha1-file.c:944 +#: sha1-file.c:943 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "" "неуспешен опит за „mmap“ %<PRIuMAX>, което е над позволеното %<PRIuMAX>" -#: sha1-file.c:969 +#: sha1-file.c:964 msgid "mmap failed" msgstr "неуспешно изпълнение на „mmap“" -#: sha1-file.c:1133 +#: sha1-file.c:1128 #, c-format msgid "object file %s is empty" msgstr "файлът с обектите „%s“ е празен" -#: sha1-file.c:1257 sha1-file.c:2396 +#: sha1-file.c:1252 sha1-file.c:2392 #, c-format msgid "corrupt loose object '%s'" msgstr "непакетираният обект „%s“ е повреден" -#: sha1-file.c:1259 sha1-file.c:2400 +#: sha1-file.c:1254 sha1-file.c:2396 #, c-format msgid "garbage at end of loose object '%s'" msgstr "грешни данни в края на непакетирания обект „%s“" -#: sha1-file.c:1301 +#: sha1-file.c:1296 msgid "invalid object type" msgstr "неправилен вид обект" -#: sha1-file.c:1385 +#: sha1-file.c:1380 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "" "заглавната част „%s“ не може да се разпакетира с опцията „--allow-unknown-" "type“" -#: sha1-file.c:1388 +#: sha1-file.c:1383 #, c-format msgid "unable to unpack %s header" msgstr "заглавната част на „%s“ не може да бъде разпакетирана" -#: sha1-file.c:1394 +#: sha1-file.c:1389 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "" "заглавната част „%s“ не може да се анализира с опцията „--allow-unknown-type“" -#: sha1-file.c:1397 +#: sha1-file.c:1392 #, c-format msgid "unable to parse %s header" msgstr "заглавната част на „%s“ не може да бъде анализирана" -#: sha1-file.c:1588 +#: sha1-file.c:1584 #, c-format msgid "failed to read object %s" msgstr "обектът „%s“ не може да бъде прочетен" -#: sha1-file.c:1592 +#: sha1-file.c:1588 #, c-format msgid "replacement %s not found for %s" msgstr "заместителят „%s“ на „%s“ не може да бъде открит" -#: sha1-file.c:1596 +#: sha1-file.c:1592 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "непакетираният обект „%s“ (в „%s“) е повреден" -#: sha1-file.c:1600 +#: sha1-file.c:1596 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "пакетираният обект „%s“ (в „%s“) е повреден" -#: sha1-file.c:1703 +#: sha1-file.c:1699 #, c-format msgid "unable to write file %s" msgstr "файлът „%s“ не може да бъде записан" -#: sha1-file.c:1710 +#: sha1-file.c:1706 #, c-format msgid "unable to set permission to '%s'" msgstr "правата за достъп до „%s“ не могат да бъдат зададени" -#: sha1-file.c:1717 +#: sha1-file.c:1713 msgid "file write error" msgstr "грешка при запис на файл" -#: sha1-file.c:1736 +#: sha1-file.c:1732 msgid "error when closing loose object file" msgstr "грешка при затварянето на файла с непакетиран обект" -#: sha1-file.c:1801 +#: sha1-file.c:1797 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" "няма права за добавяне на обект към базата от данни на хранилището „%s“" -#: sha1-file.c:1803 +#: sha1-file.c:1799 msgid "unable to create temporary file" msgstr "не може да бъде създаден временен файл" -#: sha1-file.c:1827 +#: sha1-file.c:1823 msgid "unable to write loose object file" msgstr "грешка при записа на файла с непакетиран обект" -#: sha1-file.c:1833 +#: sha1-file.c:1829 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "новият обект „%s“ не може да се компресира с „deflate“: %d" -#: sha1-file.c:1837 +#: sha1-file.c:1833 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "неуспешно приключване на „deflate“ върху „%s“: %d" -#: sha1-file.c:1841 +#: sha1-file.c:1837 #, c-format msgid "confused by unstable object source data for %s" msgstr "грешка поради нестабилния източник данни за обектите „%s“" -#: sha1-file.c:1851 builtin/pack-objects.c:925 +#: sha1-file.c:1847 builtin/pack-objects.c:925 #, c-format msgid "failed utime() on %s" msgstr "неуспешно задаване на време на достъп/създаване чрез „utime“ на „%s“" -#: sha1-file.c:1926 +#: sha1-file.c:1922 #, c-format msgid "cannot read object for %s" msgstr "обектът за „%s“ не може да се прочете" -#: sha1-file.c:1966 +#: sha1-file.c:1962 msgid "corrupt commit" msgstr "повредено подаване" -#: sha1-file.c:1974 +#: sha1-file.c:1970 msgid "corrupt tag" msgstr "повреден етикет" -#: sha1-file.c:2073 +#: sha1-file.c:2069 #, c-format msgid "read error while indexing %s" msgstr "грешка при четене по време на индексиране на „%s“" -#: sha1-file.c:2076 +#: sha1-file.c:2072 #, c-format msgid "short read while indexing %s" msgstr "непълно прочитане по време на индексиране на „%s“" -#: sha1-file.c:2149 sha1-file.c:2158 +#: sha1-file.c:2145 sha1-file.c:2154 #, c-format msgid "%s: failed to insert into database" msgstr "„%s“ не може да се вмъкне в базата от данни" -#: sha1-file.c:2164 +#: sha1-file.c:2160 #, c-format msgid "%s: unsupported file type" msgstr "неподдържан вид файл: „%s“" -#: sha1-file.c:2188 +#: sha1-file.c:2184 #, c-format msgid "%s is not a valid object" msgstr "„%s“ е неправилен обект" -#: sha1-file.c:2190 +#: sha1-file.c:2186 #, c-format msgid "%s is not a valid '%s' object" msgstr "„%s“ е неправилен обект от вид „%s“" -#: sha1-file.c:2217 builtin/index-pack.c:155 +#: sha1-file.c:2213 builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "обектът „%s“ не може да бъде отворен" -#: sha1-file.c:2407 sha1-file.c:2459 +#: sha1-file.c:2403 sha1-file.c:2455 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "неправилна контролна сума за „%s“ (трябва да е %s)" -#: sha1-file.c:2431 +#: sha1-file.c:2427 #, c-format msgid "unable to mmap %s" msgstr "неуспешно изпълнение на „mmap“ върху „%s“" -#: sha1-file.c:2436 +#: sha1-file.c:2432 #, c-format msgid "unable to unpack header of %s" msgstr "заглавната част на „%s“ не може да бъде разпакетирана" -#: sha1-file.c:2442 +#: sha1-file.c:2438 #, c-format msgid "unable to parse header of %s" msgstr "заглавната част на „%s“ не може да бъде анализирана" -#: sha1-file.c:2453 +#: sha1-file.c:2449 #, c-format msgid "unable to unpack contents of %s" msgstr "съдържанието на „%s“ не може да бъде разпакетирано" -#: sha1-name.c:490 +#: sha1-name.c:487 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "късият SHA1 „%s“ не е еднозначен" -#: sha1-name.c:501 +#: sha1-name.c:498 msgid "The candidates are:" msgstr "Възможностите са:" -#: sha1-name.c:800 +#: sha1-name.c:797 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -7376,43 +7402,43 @@ msgstr "" " git config advice.objectNameWarning false" #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:821 +#: strbuf.c:822 #, c-format msgid "%u.%2.2u GiB" msgstr "%u.%2.2u GiB" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:823 +#: strbuf.c:824 #, c-format msgid "%u.%2.2u GiB/s" msgstr "%u.%2.2u GiB/s" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:831 +#: strbuf.c:832 #, c-format msgid "%u.%2.2u MiB" msgstr "%u.%2.2u MiB" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:833 +#: strbuf.c:834 #, c-format msgid "%u.%2.2u MiB/s" msgstr "%u.%2.2u MiB/s" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:840 +#: strbuf.c:841 #, c-format msgid "%u.%2.2u KiB" msgstr "%u.%2.2u KiB" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:842 +#: strbuf.c:843 #, c-format msgid "%u.%2.2u KiB/s" msgstr "%u.%2.2u KiB/s" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:848 +#: strbuf.c:849 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -7420,7 +7446,7 @@ msgstr[0] "%u байт" msgstr[1] "%u байта" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:850 +#: strbuf.c:851 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" @@ -7539,28 +7565,28 @@ msgstr "„ls-stat“ не може да се стартира в „..“" msgid "ls-tree returned unexpected return code %d" msgstr "„ls-tree“ завърши с неочакван изходен код: %d" -#: submodule-config.c:232 +#: submodule-config.c:236 #, c-format msgid "ignoring suspicious submodule name: %s" msgstr "игнориране на подозрително име на подмодул: „%s“" -#: submodule-config.c:299 +#: submodule-config.c:303 msgid "negative values not allowed for submodule.fetchjobs" msgstr "настройката „submodule.fetchjobs“ не приема отрицателни стойности" -#: submodule-config.c:397 +#: submodule-config.c:401 #, c-format msgid "ignoring '%s' which may be interpreted as a command-line option: %s" msgstr "" "„%s“ се прескача, защото е възможно да се тълкува като опция за командния " "ред: %s" -#: submodule-config.c:486 +#: submodule-config.c:490 #, c-format msgid "invalid value for %s" msgstr "Неправилна стойност за „%s“" -#: submodule-config.c:755 +#: submodule-config.c:761 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Записът „%s“ във файла „.gitmodules“ не може да бъде променен" @@ -7595,7 +7621,7 @@ msgstr "входният файл „%s“ не може да бъде проч msgid "could not read from stdin" msgstr "от стандартния вход не може да се чете" -#: trailer.c:1011 wrapper.c:701 +#: trailer.c:1011 wrapper.c:665 #, c-format msgid "could not stat %s" msgstr "Не може да се получи информация чрез „stat“ за „%s“" @@ -7624,48 +7650,48 @@ msgstr "временният файл не може да се преименув msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "Клонът „%s“ ще следи „%s“ от „%s“\n" -#: transport.c:142 +#: transport.c:145 #, c-format msgid "could not read bundle '%s'" msgstr "пратката на git „%s“ не може да бъде прочетена" -#: transport.c:208 +#: transport.c:214 #, c-format msgid "transport: invalid depth option '%s'" msgstr "transport: неправилна опция за дълбочина: %s" -#: transport.c:259 +#: transport.c:266 msgid "see protocol.version in 'git help config' for more details" msgstr "" "За повече информация вижте раздела „protocol.version“ в „git help config“" -#: transport.c:260 +#: transport.c:267 msgid "server options require protocol version 2 or later" msgstr "опциите на сървъра изискват поне версия 2 на протокола" -#: transport.c:625 +#: transport.c:632 msgid "could not parse transport.color.* config" msgstr "стойността на настройката „transport.color.*“ не може да се разпознае" -#: transport.c:698 +#: transport.c:705 msgid "support for protocol v2 not implemented yet" msgstr "протокол версия 2 все още не се поддържа" -#: transport.c:825 +#: transport.c:831 #, c-format msgid "unknown value for config '%s': %s" msgstr "непозната стойност за настройката „%s“: „%s“" -#: transport.c:891 +#: transport.c:897 #, c-format msgid "transport '%s' not allowed" msgstr "преносът по „%s“ не е позволен" -#: transport.c:945 +#: transport.c:949 msgid "git-over-rsync is no longer supported" msgstr "командата „git-over-rsync“ вече не се поддържа" -#: transport.c:1040 +#: transport.c:1044 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -7674,7 +7700,7 @@ msgstr "" "Следните пътища за подмодули съдържат промени,\n" "които липсват от всички отдалечени хранилища:\n" -#: transport.c:1044 +#: transport.c:1048 #, c-format msgid "" "\n" @@ -7699,34 +7725,34 @@ msgstr "" " git push\n" "\n" -#: transport.c:1052 +#: transport.c:1056 msgid "Aborting." msgstr "Преустановяване на действието." -#: transport.c:1193 +#: transport.c:1201 msgid "failed to push all needed submodules" msgstr "неуспешно изтласкване на всички необходими подмодули" -#: transport.c:1340 transport-helper.c:645 +#: transport.c:1345 transport-helper.c:655 msgid "operation not supported by protocol" msgstr "опцията не се поддържа от протокола" -#: transport-helper.c:51 transport-helper.c:80 +#: transport-helper.c:61 transport-helper.c:90 msgid "full write to remote helper failed" msgstr "неуспешен пълен запис към насрещната помощна програма" -#: transport-helper.c:134 +#: transport-helper.c:144 #, c-format msgid "unable to find remote helper for '%s'" msgstr "насрещната помощна програма за „%s“ не може да бъде открита" -#: transport-helper.c:150 transport-helper.c:559 +#: transport-helper.c:160 transport-helper.c:569 msgid "can't dup helper output fd" msgstr "" "файловият дескриптор от насрещната помощна програма не може да се дублира с " "„dup“" -#: transport-helper.c:201 +#: transport-helper.c:211 #, c-format msgid "" "unknown mandatory capability %s; this remote helper probably needs newer " @@ -7735,106 +7761,106 @@ msgstr "" "непозната задължителна способност „%s“. Насрещната помощна програма " "вероятно изисква нова версия на Git" -#: transport-helper.c:207 +#: transport-helper.c:217 msgid "this remote helper should implement refspec capability" msgstr "" "насрещната помощна програма трябва да поддържа способност за изброяване на " "указатели" -#: transport-helper.c:274 transport-helper.c:414 +#: transport-helper.c:284 transport-helper.c:424 #, c-format msgid "%s unexpectedly said: '%s'" msgstr "„%s“ неочаквано върна: „%s“" -#: transport-helper.c:403 +#: transport-helper.c:413 #, c-format msgid "%s also locked %s" msgstr "„%s“ заключи и „%s“" -#: transport-helper.c:481 +#: transport-helper.c:491 msgid "couldn't run fast-import" msgstr "неуспешно изпълнение на бързо внасяне" -#: transport-helper.c:504 +#: transport-helper.c:514 msgid "error while running fast-import" msgstr "грешка при изпълнението на бързо внасяне" -#: transport-helper.c:533 transport-helper.c:1105 +#: transport-helper.c:543 transport-helper.c:1128 #, c-format msgid "could not read ref %s" msgstr "указателят „%s“ не може да се прочете" -#: transport-helper.c:578 +#: transport-helper.c:588 #, c-format msgid "unknown response to connect: %s" msgstr "неочакван отговор при свързване: „%s“" -#: transport-helper.c:600 +#: transport-helper.c:610 msgid "setting remote service path not supported by protocol" msgstr "протоколът не поддържа задаването на път на отдалечената услуга" -#: transport-helper.c:602 +#: transport-helper.c:612 msgid "invalid remote service path" msgstr "неправилен път на отдалечената услуга" -#: transport-helper.c:648 +#: transport-helper.c:658 #, c-format msgid "can't connect to subservice %s" msgstr "неуспешно свързване към подуслугата „%s“" -#: transport-helper.c:720 +#: transport-helper.c:734 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "" "очаква се или успех, или грешка, но насрещната помощна програма върна „%s“" -#: transport-helper.c:773 +#: transport-helper.c:787 #, c-format msgid "helper reported unexpected status of %s" msgstr "насрещната помощна програма завърши с неочакван изходен код: „%s“" -#: transport-helper.c:834 +#: transport-helper.c:848 #, c-format msgid "helper %s does not support dry-run" msgstr "насрещната помощна програма „%s“ не поддържа проби „dry-run“" -#: transport-helper.c:837 +#: transport-helper.c:851 #, c-format msgid "helper %s does not support --signed" msgstr "насрещната помощна програма „%s“ не поддържа опцията „--signed“" -#: transport-helper.c:840 +#: transport-helper.c:854 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "" "насрещната помощна програма „%s“ не поддържа опцията „--signed=if-asked“" -#: transport-helper.c:847 +#: transport-helper.c:861 #, c-format msgid "helper %s does not support 'push-option'" msgstr "насрещната помощна програма „%s“ не поддържа опции за изтласкване" -#: transport-helper.c:945 +#: transport-helper.c:959 msgid "remote-helper doesn't support push; refspec needed" msgstr "" "насрещната помощна програма не поддържа изтласкване. Необходимо е " "изброяване на указателите" -#: transport-helper.c:950 +#: transport-helper.c:964 #, c-format msgid "helper %s does not support 'force'" msgstr "" "насрещната помощна програма не поддържа „%s“ поддържа опцията „--force“" -#: transport-helper.c:997 +#: transport-helper.c:1011 msgid "couldn't run fast-export" msgstr "не може да се извърши бързо изнасяне" -#: transport-helper.c:1002 +#: transport-helper.c:1016 msgid "error while running fast-export" msgstr "грешка при изпълнението на командата за бързо изнасяне" -#: transport-helper.c:1027 +#: transport-helper.c:1041 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -7843,47 +7869,47 @@ msgstr "" "Няма общи указатели, не са указани никакви указатели — нищо няма да бъде\n" "направено. Пробвайте да укажете клон, напр. “master“.\n" -#: transport-helper.c:1091 +#: transport-helper.c:1114 #, c-format msgid "malformed response in ref list: %s" msgstr "неправилен отговор в списъка с указатели: „%s“" -#: transport-helper.c:1244 +#: transport-helper.c:1266 #, c-format msgid "read(%s) failed" msgstr "неуспешно четене на „%s“" -#: transport-helper.c:1271 +#: transport-helper.c:1293 #, c-format msgid "write(%s) failed" msgstr "неуспешен запис в „%s“" -#: transport-helper.c:1320 +#: transport-helper.c:1342 #, c-format msgid "%s thread failed" msgstr "неуспешно изпълнение на нишката „%s“" -#: transport-helper.c:1324 +#: transport-helper.c:1346 #, c-format msgid "%s thread failed to join: %s" msgstr "завършването на нишката „%s“ не може да се изчака: „%s“" -#: transport-helper.c:1343 transport-helper.c:1347 +#: transport-helper.c:1365 transport-helper.c:1369 #, c-format msgid "can't start thread for copying data: %s" msgstr "неуспешно стартиране на нишка за копиране на данните: „%s“" -#: transport-helper.c:1384 +#: transport-helper.c:1406 #, c-format msgid "%s process failed to wait" msgstr "процесът на „%s“ не успя да изчака чрез „waitpid“" -#: transport-helper.c:1388 +#: transport-helper.c:1410 #, c-format msgid "%s process failed" msgstr "неуспешно изпълнение на „%s“" -#: transport-helper.c:1406 transport-helper.c:1415 +#: transport-helper.c:1428 transport-helper.c:1437 msgid "can't start thread for copying data" msgstr "неуспешно стартиране на нишка за копиране на данните" @@ -7903,7 +7929,7 @@ msgstr "празно име на файл в запис в дърво" msgid "too-short tree file" msgstr "прекалено кратък файл-дърво" -#: unpack-trees.c:111 +#: unpack-trees.c:110 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -7912,7 +7938,7 @@ msgstr "" "Изтеглянето ще презапише локалните промени на тези файлове:\n" "%%sПодайте или скатайте промените, за да преминете към нов клон." -#: unpack-trees.c:113 +#: unpack-trees.c:112 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -7921,7 +7947,7 @@ msgstr "" "Изтеглянето ще презапише локалните промени на тези файлове:\n" "%%s" -#: unpack-trees.c:116 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -7930,7 +7956,7 @@ msgstr "" "Сливането ще презапише локалните промени на тези файлове:\n" "%%sПодайте или скатайте промените, за да слеете." -#: unpack-trees.c:118 +#: unpack-trees.c:117 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -7939,7 +7965,7 @@ msgstr "" "Сливането ще презапише локалните промени на тези файлове:\n" "%%s" -#: unpack-trees.c:121 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -7948,7 +7974,7 @@ msgstr "" "„%s“ ще презапише локалните промени на тези файлове:\n" "%%sПодайте или скатайте промените, за да извършите „%s“." -#: unpack-trees.c:123 +#: unpack-trees.c:122 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -7957,7 +7983,7 @@ msgstr "" "„%s“ ще презапише локалните промени на тези файлове:\n" "%%s" -#: unpack-trees.c:128 +#: unpack-trees.c:127 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -7966,7 +7992,7 @@ msgstr "" "Обновяването на следните директории ще изтрие неследените файлове в тях:\n" "%s" -#: unpack-trees.c:132 +#: unpack-trees.c:131 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -7975,7 +8001,7 @@ msgstr "" "Изтеглянето ще изтрие тези неследени файлове в работното дърво:\n" "%%sПреместете ги или ги изтрийте, за да преминете на друг клон." -#: unpack-trees.c:134 +#: unpack-trees.c:133 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -7984,7 +8010,7 @@ msgstr "" "Изтеглянето ще изтрие тези неследени файлове в работното дърво:\n" "%%s" -#: unpack-trees.c:137 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -7993,7 +8019,7 @@ msgstr "" "Сливането ще изтрие тези неследени файлове в работното дърво:\n" "%%sПреместете ги или ги изтрийте, за да слеете." -#: unpack-trees.c:139 +#: unpack-trees.c:138 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -8002,7 +8028,7 @@ msgstr "" "Сливането ще изтрие тези неследени файлове в работното дърво:\n" "%%s" -#: unpack-trees.c:142 +#: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -8011,7 +8037,7 @@ msgstr "" "„%s“ ще изтрие тези неследени файлове в работното дърво:\n" "%%sПреместете ги или ги изтрийте, за да извършите „%s“." -#: unpack-trees.c:144 +#: unpack-trees.c:143 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -8020,7 +8046,7 @@ msgstr "" "„%s“ ще изтрие тези неследени файлове в работното дърво:\n" "%%s" -#: unpack-trees.c:150 +#: unpack-trees.c:149 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -8030,7 +8056,7 @@ msgstr "" "Изтеглянето ще презапише тези неследени файлове в работното дърво:\n" "%%sПреместете ги или ги изтрийте, за да смените клон." -#: unpack-trees.c:152 +#: unpack-trees.c:151 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -8040,7 +8066,7 @@ msgstr "" "Изтеглянето ще презапише тези неследени файлове в работното дърво:\n" "%%s" -#: unpack-trees.c:155 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -8049,7 +8075,7 @@ msgstr "" "Сливането ще презапише тези неследени файлове в работното дърво:\n" "%%sПреместете ги или ги изтрийте, за да слеете." -#: unpack-trees.c:157 +#: unpack-trees.c:156 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -8058,7 +8084,7 @@ msgstr "" "Сливането ще презапише тези неследени файлове в работното дърво:\n" "%%s" -#: unpack-trees.c:160 +#: unpack-trees.c:159 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -8067,7 +8093,7 @@ msgstr "" "„%s“ ще презапише тези неследени файлове в работното дърво:\n" "%%sПреместете ги или ги изтрийте, за да извършите „%s“." -#: unpack-trees.c:162 +#: unpack-trees.c:161 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -8076,12 +8102,12 @@ msgstr "" "„%s“ ще презапише тези неследени файлове в работното дърво:\n" "%%s" -#: unpack-trees.c:170 +#: unpack-trees.c:169 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "Записът за „%s“ съвпада с този за „%s“. Не може да се присвои." -#: unpack-trees.c:173 +#: unpack-trees.c:172 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" @@ -8091,7 +8117,7 @@ msgstr "" "актуални:\n" "%s" -#: unpack-trees.c:175 +#: unpack-trees.c:174 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -8102,7 +8128,7 @@ msgstr "" "дърво:\n" "%s" -#: unpack-trees.c:177 +#: unpack-trees.c:176 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -8113,7 +8139,7 @@ msgstr "" "дърво:\n" "%s" -#: unpack-trees.c:179 +#: unpack-trees.c:178 #, c-format msgid "" "Cannot update submodule:\n" @@ -8122,16 +8148,16 @@ msgstr "" "Подмодулът не може да бъде обновен:\n" "„%s“" -#: unpack-trees.c:256 +#: unpack-trees.c:255 #, c-format msgid "Aborting\n" msgstr "Преустановяване на действието\n" -#: unpack-trees.c:318 +#: unpack-trees.c:317 msgid "Updating files" msgstr "Обновяване на файлове" -#: unpack-trees.c:350 +#: unpack-trees.c:349 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" @@ -8170,7 +8196,7 @@ msgstr "неправилен номер на порт" msgid "invalid '..' path segment" msgstr "неправилна част от пътя „..“" -#: worktree.c:258 builtin/am.c:2095 +#: worktree.c:258 builtin/am.c:2084 #, c-format msgid "failed to read '%s'" msgstr "„%s“ не може да бъде прочетен" @@ -8201,17 +8227,17 @@ msgstr "„%s“ не е файл на .git, код за грешка: %d" msgid "'%s' does not point back to '%s'" msgstr "„%s“ не сочи към обратно към „%s“" -#: wrapper.c:223 wrapper.c:393 +#: wrapper.c:186 wrapper.c:356 #, c-format msgid "could not open '%s' for reading and writing" msgstr "„%s“ не може да бъде отворен и за четене, и за запис" -#: wrapper.c:424 wrapper.c:624 +#: wrapper.c:387 wrapper.c:588 #, c-format msgid "unable to access '%s'" msgstr "няма достъп до „%s“" -#: wrapper.c:632 +#: wrapper.c:596 msgid "unable to get current working directory" msgstr "текущата работна директория е недостъпна" @@ -8558,86 +8584,94 @@ msgstr "" " (всички конфликти са коригирани, изпълнете „git cherry-pick --continue“)" #: wt-status.c:1437 +msgid " (use \"git cherry-pick --skip\" to skip this patch)" +msgstr " (използвайте „git cherry-pick --skip“, за да пропуснете тази кръпка)" + +#: wt-status.c:1439 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (използвайте „git cherry-pick --abort“, за да отмените всички действия с " "отбиране)" -#: wt-status.c:1447 +#: wt-status.c:1449 msgid "Revert currently in progress." msgstr "В момента тече отмяна на подаване." -#: wt-status.c:1450 +#: wt-status.c:1452 #, c-format msgid "You are currently reverting commit %s." msgstr "В момента отменяте подаване „%s“." -#: wt-status.c:1456 +#: wt-status.c:1458 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (коригирайте конфликтите и изпълнете „git revert --continue“)" -#: wt-status.c:1459 +#: wt-status.c:1461 msgid " (run \"git revert --continue\" to continue)" msgstr " (за да продължите, изпълнете „git revert --continue“)" -#: wt-status.c:1462 +#: wt-status.c:1464 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (всички конфликти са коригирани, изпълнете „git revert --continue“)" -#: wt-status.c:1464 +#: wt-status.c:1466 +msgid " (use \"git revert --skip\" to skip this patch)" +msgstr " (използвайте „git revert --skip“, за да пропуснете тази кръпка)" + +#: wt-status.c:1468 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" " (използвайте „git revert --abort“, за да преустановите отмяната на " "подаване)" -#: wt-status.c:1474 +#: wt-status.c:1478 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "В момента търсите двоично, като сте стартирали от клон „%s“." -#: wt-status.c:1478 +#: wt-status.c:1482 msgid "You are currently bisecting." msgstr "В момента търсите двоично." -#: wt-status.c:1481 +#: wt-status.c:1485 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" " (използвайте „git bisect reset“, за да се върнете към първоначалното " "състояние и клон)" -#: wt-status.c:1690 +#: wt-status.c:1694 msgid "On branch " msgstr "На клон " -#: wt-status.c:1697 +#: wt-status.c:1701 msgid "interactive rebase in progress; onto " msgstr "извършвате интерактивно пребазиране върху " -#: wt-status.c:1699 +#: wt-status.c:1703 msgid "rebase in progress; onto " msgstr "извършвате пребазиране върху " -#: wt-status.c:1709 +#: wt-status.c:1713 msgid "Not currently on any branch." msgstr "Извън всички клони." -#: wt-status.c:1726 +#: wt-status.c:1730 msgid "Initial commit" msgstr "Първоначално подаване" -#: wt-status.c:1727 +#: wt-status.c:1731 msgid "No commits yet" msgstr "Все още липсват подавания" -#: wt-status.c:1741 +#: wt-status.c:1745 msgid "Untracked files" msgstr "Неследени файлове" -#: wt-status.c:1743 +#: wt-status.c:1747 msgid "Ignored files" msgstr "Игнорирани файлове" -#: wt-status.c:1747 +#: wt-status.c:1751 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -8649,32 +8683,32 @@ msgstr "" "изпълнението, но ще трябва да добавяте новите файлове ръчно.\n" "За повече подробности погледнете „git status help“." -#: wt-status.c:1753 +#: wt-status.c:1757 #, c-format msgid "Untracked files not listed%s" msgstr "Неследените файлове не са изведени%s" -#: wt-status.c:1755 +#: wt-status.c:1759 msgid " (use -u option to show untracked files)" msgstr " (използвайте опцията „-u“, за да изведете неследените файлове)" -#: wt-status.c:1761 +#: wt-status.c:1765 msgid "No changes" msgstr "Няма промени" -#: wt-status.c:1766 +#: wt-status.c:1770 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "към индекса за подаване не са добавени промени (използвайте „git add“ и/или " "„git commit -a“)\n" -#: wt-status.c:1769 +#: wt-status.c:1773 #, c-format msgid "no changes added to commit\n" msgstr "към индекса за подаване не са добавени промени\n" -#: wt-status.c:1772 +#: wt-status.c:1776 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -8683,71 +8717,71 @@ msgstr "" "към индекса за подаване не са добавени промени, но има нови файлове " "(използвайте „git add“, за да започне тяхното следене)\n" -#: wt-status.c:1775 +#: wt-status.c:1779 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "към индекса за подаване не са добавени промени, но има нови файлове\n" -#: wt-status.c:1778 +#: wt-status.c:1782 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "липсват каквито и да е промени (създайте или копирайте файлове и използвайте " "„git add“, за да започне тяхното следене)\n" -#: wt-status.c:1781 wt-status.c:1786 +#: wt-status.c:1785 wt-status.c:1790 #, c-format msgid "nothing to commit\n" msgstr "липсват каквито и да е промени\n" -#: wt-status.c:1784 +#: wt-status.c:1788 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "липсват каквито и да е промени (използвайте опцията „-u“, за да се изведат и " "неследените файлове)\n" -#: wt-status.c:1788 +#: wt-status.c:1792 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "липсват каквито и да е промени, работното дърво е чисто\n" -#: wt-status.c:1901 +#: wt-status.c:1905 msgid "No commits yet on " msgstr "Все още липсват подавания в " -#: wt-status.c:1905 +#: wt-status.c:1909 msgid "HEAD (no branch)" msgstr "HEAD (извън клон)" -#: wt-status.c:1936 +#: wt-status.c:1940 msgid "different" msgstr "различен" -#: wt-status.c:1938 wt-status.c:1946 +#: wt-status.c:1942 wt-status.c:1950 msgid "behind " msgstr "назад с " -#: wt-status.c:1941 wt-status.c:1944 +#: wt-status.c:1945 wt-status.c:1948 msgid "ahead " msgstr "напред с " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2466 +#: wt-status.c:2470 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "не може да извършите „%s“, защото има промени, които не са в индекса." -#: wt-status.c:2472 +#: wt-status.c:2476 msgid "additionally, your index contains uncommitted changes." msgstr "освен това в индекса има неподадени промени." -#: wt-status.c:2474 +#: wt-status.c:2478 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "не може да извършите „%s“, защото в индекса има неподадени промени." -#: compat/precompose_utf8.c:58 builtin/clone.c:453 +#: compat/precompose_utf8.c:58 builtin/clone.c:452 #, c-format msgid "failed to unlink '%s'" msgstr "неуспешно изтриване на „%s“" @@ -8774,7 +8808,7 @@ msgstr "изтриване на „%s“\n" msgid "Unstaged changes after refreshing the index:" msgstr "Промени, които и след обновяването на индекса не са добавени към него:" -#: builtin/add.c:234 builtin/rev-parse.c:896 +#: builtin/add.c:234 builtin/rev-parse.c:897 msgid "Could not read the index" msgstr "Индексът не може да бъде прочетен" @@ -8810,8 +8844,8 @@ msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Следните пътища ще бъдат игнорирани според някой от файловете „.gitignore“:\n" -#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124 -#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560 +#: builtin/add.c:290 builtin/clean.c:910 builtin/fetch.c:162 builtin/mv.c:124 +#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:547 #: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165 msgid "dry run" msgstr "пробно изпълнение" @@ -8869,7 +8903,7 @@ msgstr "" "проверка, че при пробно изпълнение всички файлове, дори и изтритите, се " "игнорират" -#: builtin/add.c:309 builtin/update-index.c:1001 +#: builtin/add.c:309 builtin/update-index.c:1002 msgid "override the executable bit of the listed files" msgstr "изрично задаване на стойността на флага дали файлът е изпълним" @@ -8945,114 +8979,110 @@ msgstr "Нищо не е зададено и нищо не е добавено.\ msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Вероятно искахте да използвате „git add .“?\n" -#: builtin/am.c:348 +#: builtin/am.c:347 msgid "could not parse author script" msgstr "скриптът за автор не може да се анализира" -#: builtin/am.c:432 +#: builtin/am.c:431 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "„%s“ бе изтрит от куката „applypatch-msg“" -#: builtin/am.c:474 +#: builtin/am.c:473 #, c-format msgid "Malformed input line: '%s'." msgstr "Даденият входен ред е с неправилен формат: „%s“." -#: builtin/am.c:512 +#: builtin/am.c:511 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Бележката не може да се копира от „%s“ към „%s“" -#: builtin/am.c:538 +#: builtin/am.c:537 msgid "fseek failed" msgstr "неуспешно изпълнение на „fseek“" -#: builtin/am.c:726 +#: builtin/am.c:725 #, c-format msgid "could not parse patch '%s'" msgstr "кръпката „%s“ не може да се анализира" -#: builtin/am.c:791 +#: builtin/am.c:790 msgid "Only one StGIT patch series can be applied at once" msgstr "" "Само една поредица от кръпки от „StGIT“ може да бъде прилагана в даден момент" -#: builtin/am.c:839 +#: builtin/am.c:838 msgid "invalid timestamp" msgstr "неправилна стойност за време" -#: builtin/am.c:844 builtin/am.c:856 +#: builtin/am.c:843 builtin/am.c:855 msgid "invalid Date line" msgstr "неправилен ред за дата „Date“" -#: builtin/am.c:851 +#: builtin/am.c:850 msgid "invalid timezone offset" msgstr "неправилно отместване на часовия пояс" -#: builtin/am.c:944 +#: builtin/am.c:943 msgid "Patch format detection failed." msgstr "Форматът на кръпката не може да бъде определен." -#: builtin/am.c:949 builtin/clone.c:407 +#: builtin/am.c:948 builtin/clone.c:406 #, c-format msgid "failed to create directory '%s'" msgstr "директорията „%s“ не може да бъде създадена" -#: builtin/am.c:954 +#: builtin/am.c:953 msgid "Failed to split patches." msgstr "Кръпките не могат да бъдат разделени." -#: builtin/am.c:1084 builtin/commit.c:374 -msgid "unable to write index file" -msgstr "индексът не може да бъде записан" - -#: builtin/am.c:1098 +#: builtin/am.c:1084 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "След коригирането на този проблем изпълнете „%s --continue“." -#: builtin/am.c:1099 +#: builtin/am.c:1085 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Ако предпочитате да прескочите тази кръпка, изпълнете „%s --skip“." -#: builtin/am.c:1100 +#: builtin/am.c:1086 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "За да се върнете към първоначалното състояние, изпълнете „%s --abort“." -#: builtin/am.c:1183 +#: builtin/am.c:1169 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" "Кръпката е пратена с форматиране „format=flowed“. Празните знаци в края на " "редовете може да се загубят." -#: builtin/am.c:1211 +#: builtin/am.c:1197 msgid "Patch is empty." msgstr "Кръпката е празна." -#: builtin/am.c:1277 +#: builtin/am.c:1262 #, c-format -msgid "invalid ident line: %.*s" -msgstr "грешен ред с идентичност: %.*s" +msgid "missing author line in commit %s" +msgstr "липсва ред за авторство в подаването „%s“" -#: builtin/am.c:1299 +#: builtin/am.c:1265 #, c-format -msgid "unable to parse commit %s" -msgstr "подаването не може да бъде анализирано: %s" +msgid "invalid ident line: %.*s" +msgstr "грешен ред с идентичност: %.*s" -#: builtin/am.c:1496 +#: builtin/am.c:1484 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "В хранилището липсват необходимите обекти-BLOB, за да се премине към тройно " "сливане." -#: builtin/am.c:1498 +#: builtin/am.c:1486 msgid "Using index info to reconstruct a base tree..." msgstr "Базовото дърво се реконструира от информацията в индекса…" -#: builtin/am.c:1517 +#: builtin/am.c:1505 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -9060,24 +9090,24 @@ msgstr "" "Кръпката не може да се приложи към обектите-BLOB в индекса.\n" "Да не би да сте я редактирали на ръка?" -#: builtin/am.c:1523 +#: builtin/am.c:1511 msgid "Falling back to patching base and 3-way merge..." msgstr "Преминаване към прилагане на кръпка към базата и тройно сливане…" -#: builtin/am.c:1549 +#: builtin/am.c:1537 msgid "Failed to merge in the changes." msgstr "Неуспешно сливане на промените." -#: builtin/am.c:1581 +#: builtin/am.c:1569 msgid "applying to an empty history" msgstr "прилагане върху празна история" -#: builtin/am.c:1628 builtin/am.c:1632 +#: builtin/am.c:1616 builtin/am.c:1620 #, c-format msgid "cannot resume: %s does not exist." msgstr "не може да се продължи — „%s“ не съществува." -#: builtin/am.c:1650 +#: builtin/am.c:1638 msgid "Commit Body is:" msgstr "Тялото на кръпката за прилагане е:" @@ -9085,40 +9115,44 @@ msgstr "Тялото на кръпката за прилагане е:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1660 +#: builtin/am.c:1648 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" "Прилагане? „y“ — да/„n“ — не/„e“ — редактиране/„v“ — преглед/„a“ — приемане " "на всичко:" -#: builtin/am.c:1710 +#: builtin/am.c:1695 builtin/commit.c:374 +msgid "unable to write index file" +msgstr "индексът не може да бъде записан" + +#: builtin/am.c:1699 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "" "Индексът не е чист: кръпките не могат да бъдат приложени (замърсени са: %s)" -#: builtin/am.c:1750 builtin/am.c:1818 +#: builtin/am.c:1739 builtin/am.c:1807 #, c-format msgid "Applying: %.*s" msgstr "Прилагане: %.*s" -#: builtin/am.c:1767 +#: builtin/am.c:1756 msgid "No changes -- Patch already applied." msgstr "Без промени — кръпката вече е приложена." -#: builtin/am.c:1773 +#: builtin/am.c:1762 #, c-format msgid "Patch failed at %s %.*s" msgstr "Неуспешно прилагане на кръпка при %s %.*s“" -#: builtin/am.c:1777 +#: builtin/am.c:1766 msgid "Use 'git am --show-current-patch' to see the failed patch" msgstr "" "За да видите неуспешно приложени кръпки, използвайте опцията „git am --show-" "current-patch“ to see the failed patch" -#: builtin/am.c:1821 +#: builtin/am.c:1810 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -9128,7 +9162,7 @@ msgstr "" "Ако няма друга промяна за включване в индекса, най-вероятно някоя друга\n" "кръпка е довела до същите промени и в такъв случай просто пропуснете тази." -#: builtin/am.c:1828 +#: builtin/am.c:1817 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -9139,17 +9173,17 @@ msgstr "" "След корекция на конфликтите изпълнете „git add“ върху поправените файлове.\n" "За да приемете „изтрити от тях“, изпълнете „git rm“ върху изтритите файлове." -#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329 +#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:329 #: builtin/reset.c:337 #, c-format msgid "Could not parse object '%s'." msgstr "„%s“ не е разпознат като обект." -#: builtin/am.c:1987 +#: builtin/am.c:1976 msgid "failed to clean index" msgstr "индексът не може да бъде изчистен" -#: builtin/am.c:2031 +#: builtin/am.c:2020 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -9160,149 +9194,149 @@ msgstr "" "сочи към\n" "„ORIG_HEAD“" -#: builtin/am.c:2128 +#: builtin/am.c:2117 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Неправилна стойност за „--patch-format“: „%s“" -#: builtin/am.c:2164 +#: builtin/am.c:2153 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [ОПЦИЯ…] [(ФАЙЛ_С_ПОЩА|ДИРЕКТОРИЯ_С_ПОЩА)…]" -#: builtin/am.c:2165 +#: builtin/am.c:2154 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [ОПЦИЯ…] (--continue | --quit | --abort)" -#: builtin/am.c:2171 +#: builtin/am.c:2160 msgid "run interactively" msgstr "интерактивна работа" -#: builtin/am.c:2173 +#: builtin/am.c:2162 msgid "historical option -- no-op" msgstr "изоставена опция, съществува по исторически причини, нищо не прави" -#: builtin/am.c:2175 +#: builtin/am.c:2164 msgid "allow fall back on 3way merging if needed" msgstr "да се преминава към тройно сливане при нужда." -#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:296 builtin/stash.c:806 +#: builtin/am.c:2165 builtin/init-db.c:494 builtin/prune-packed.c:58 +#: builtin/repack.c:297 builtin/stash.c:812 msgid "be quiet" msgstr "без извеждане на информация" -#: builtin/am.c:2178 +#: builtin/am.c:2167 msgid "add a Signed-off-by line to the commit message" msgstr "добавяне на ред за подпис „Signed-off-by“ в съобщението за подаване" -#: builtin/am.c:2181 +#: builtin/am.c:2170 msgid "recode into utf8 (default)" msgstr "прекодиране в UTF-8 (стандартно)" -#: builtin/am.c:2183 +#: builtin/am.c:2172 msgid "pass -k flag to git-mailinfo" msgstr "подаване на опцията „-k“ на командата „git-mailinfo“" -#: builtin/am.c:2185 +#: builtin/am.c:2174 msgid "pass -b flag to git-mailinfo" msgstr "подаване на опцията „-b“ на командата „git-mailinfo“" -#: builtin/am.c:2187 +#: builtin/am.c:2176 msgid "pass -m flag to git-mailinfo" msgstr "подаване на опцията „-m“ на командата „git-mailinfo“" -#: builtin/am.c:2189 +#: builtin/am.c:2178 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "" "подаване на опцията „--keep-cr“ на командата „git-mailsplit“ за формат „mbox“" -#: builtin/am.c:2192 +#: builtin/am.c:2181 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "без подаване на опцията „--keep-cr“ на командата „git-mailsplit“ независимо " "от „am.keepcr“" -#: builtin/am.c:2195 +#: builtin/am.c:2184 msgid "strip everything before a scissors line" msgstr "пропускане на всичко преди реда за отрязване" -#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206 -#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218 -#: builtin/am.c:2224 +#: builtin/am.c:2186 builtin/am.c:2189 builtin/am.c:2192 builtin/am.c:2195 +#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207 +#: builtin/am.c:2213 msgid "pass it through git-apply" msgstr "прекарване през „git-apply“" -#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671 -#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249 -#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418 -#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313 +#: builtin/am.c:2203 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:674 builtin/grep.c:883 builtin/merge.c:249 +#: builtin/pull.c:160 builtin/pull.c:219 builtin/rebase.c:1442 +#: builtin/repack.c:308 builtin/repack.c:312 builtin/repack.c:314 #: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 -#: parse-options.h:141 parse-options.h:162 parse-options.h:312 +#: parse-options.h:150 parse-options.h:171 parse-options.h:312 msgid "n" msgstr "БРОЙ" -#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38 -#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38 +#: builtin/am.c:2209 builtin/branch.c:661 builtin/for-each-ref.c:38 +#: builtin/replace.c:555 builtin/tag.c:437 builtin/verify-tag.c:38 msgid "format" msgstr "ФОРМАТ" -#: builtin/am.c:2221 +#: builtin/am.c:2210 msgid "format the patch(es) are in" msgstr "формат на кръпките" -#: builtin/am.c:2227 +#: builtin/am.c:2216 msgid "override error message when patch failure occurs" msgstr "избрано от вас съобщение за грешка при прилагане на кръпки" -#: builtin/am.c:2229 +#: builtin/am.c:2218 msgid "continue applying patches after resolving a conflict" msgstr "продължаване на прилагането на кръпки след коригирането на конфликт" -#: builtin/am.c:2232 +#: builtin/am.c:2221 msgid "synonyms for --continue" msgstr "псевдоними на „--continue“" -#: builtin/am.c:2235 +#: builtin/am.c:2224 msgid "skip the current patch" msgstr "прескачане на текущата кръпка" -#: builtin/am.c:2238 +#: builtin/am.c:2227 msgid "restore the original branch and abort the patching operation." msgstr "" "възстановяване на първоначалното състояние на клона и преустановяване на " "прилагането на кръпката." -#: builtin/am.c:2241 +#: builtin/am.c:2230 msgid "abort the patching operation but keep HEAD where it is." msgstr "" "преустановяване на прилагането на кръпката без промяна към кое сочи „HEAD“." -#: builtin/am.c:2244 +#: builtin/am.c:2233 msgid "show the patch being applied." msgstr "показване на прилаганата кръпка." -#: builtin/am.c:2248 +#: builtin/am.c:2237 msgid "lie about committer date" msgstr "дата за подаване различна от първоначалната" -#: builtin/am.c:2250 +#: builtin/am.c:2239 msgid "use current timestamp for author date" msgstr "използване на текущото време като това за автор" -#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511 -#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489 -#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418 +#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1511 +#: builtin/merge.c:286 builtin/pull.c:194 builtin/rebase.c:490 +#: builtin/rebase.c:1483 builtin/revert.c:117 builtin/tag.c:418 msgid "key-id" msgstr "ИДЕНТИФИКАТОР_НА_КЛЮЧ" -#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460 +#: builtin/am.c:2242 builtin/rebase.c:491 builtin/rebase.c:1484 msgid "GPG-sign commits" msgstr "подписване на подаванията с GPG" -#: builtin/am.c:2256 +#: builtin/am.c:2245 msgid "(internal use for git-rebase)" msgstr "(ползва се вътрешно за „git-rebase“)" -#: builtin/am.c:2274 +#: builtin/am.c:2263 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -9310,18 +9344,18 @@ msgstr "" "Опциите „-b“/„--binary“ отдавна не правят нищо и\n" "ще бъдат премахнати в бъдеще. Не ги ползвайте." -#: builtin/am.c:2281 +#: builtin/am.c:2270 msgid "failed to read the index" msgstr "неуспешно изчитане на индекса" -#: builtin/am.c:2296 +#: builtin/am.c:2285 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" "предишната директория за пребазиране „%s“ все още съществува, а е зададен " "файл „mbox“." -#: builtin/am.c:2320 +#: builtin/am.c:2309 #, c-format msgid "" "Stray %s directory found.\n" @@ -9330,11 +9364,11 @@ msgstr "" "Открита е излишна директория „%s“.\n" "Можете да я изтриете с командата „git am --abort“." -#: builtin/am.c:2326 +#: builtin/am.c:2315 msgid "Resolve operation not in progress, we are not resuming." msgstr "В момента не тече операция по коригиране и няма как да се продължи." -#: builtin/am.c:2336 +#: builtin/am.c:2325 msgid "interactive mode requires patches on the command line" msgstr "интерактивният режим изисква кръпки на командния ред" @@ -9652,171 +9686,171 @@ msgstr "опцията „--bisect-next-check“ изисква 2 или 3 ар msgid "--bisect-terms requires 0 or 1 argument" msgstr "опцията „--bisect-terms“ изисква 0 или 1 аргумента" -#: builtin/blame.c:32 +#: builtin/blame.c:31 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [ОПЦИЯ…] [ОПЦИЯ_ЗА_ВЕРСИЯТА…] [ВЕРСИЯ] [--] ФАЙЛ" -#: builtin/blame.c:37 +#: builtin/blame.c:36 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "ОПЦИИте_ЗА_ВЕРСИЯТА са документирани в ръководството git-rev-list(1)" -#: builtin/blame.c:410 +#: builtin/blame.c:409 #, c-format msgid "expecting a color: %s" msgstr "трябва да е цвят: %s" -#: builtin/blame.c:417 +#: builtin/blame.c:416 msgid "must end with a color" msgstr "трябва да завършва с цвят" -#: builtin/blame.c:730 +#: builtin/blame.c:729 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "неправилен цвят „%s“ в „color.blame.repeatedLines“" -#: builtin/blame.c:748 +#: builtin/blame.c:747 msgid "invalid value for blame.coloring" msgstr "неправилна стойност за „blame.coloring“" -#: builtin/blame.c:823 +#: builtin/blame.c:822 #, c-format msgid "cannot find revision %s to ignore" msgstr "версията за прескачане „%s“ не може да бъде открита" -#: builtin/blame.c:845 +#: builtin/blame.c:844 msgid "Show blame entries as we find them, incrementally" msgstr "Извеждане на авторството с намирането му, последователно" -#: builtin/blame.c:846 +#: builtin/blame.c:845 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" "Извеждане на празни суми по SHA1 за граничните подавания (стандартно опцията " "е изключена)" -#: builtin/blame.c:847 +#: builtin/blame.c:846 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" "Началните подавания да не се считат за гранични (стандартно опцията е " "изключена)" -#: builtin/blame.c:848 +#: builtin/blame.c:847 msgid "Show work cost statistics" msgstr "Извеждане на статистика за извършените действия" -#: builtin/blame.c:849 +#: builtin/blame.c:848 msgid "Force progress reporting" msgstr "Принудително извеждане на напредъка" -#: builtin/blame.c:850 +#: builtin/blame.c:849 msgid "Show output score for blame entries" msgstr "Извеждане на допълнителна информация за определянето на авторството" -#: builtin/blame.c:851 +#: builtin/blame.c:850 msgid "Show original filename (Default: auto)" msgstr "" "Извеждане на първоначалното име на файл (стандартно това е автоматично)" -#: builtin/blame.c:852 +#: builtin/blame.c:851 msgid "Show original linenumber (Default: off)" msgstr "" "Извеждане на първоначалният номер на ред (стандартно опцията е изключена)" -#: builtin/blame.c:853 +#: builtin/blame.c:852 msgid "Show in a format designed for machine consumption" msgstr "Извеждане във формат за по-нататъшна обработка" -#: builtin/blame.c:854 +#: builtin/blame.c:853 msgid "Show porcelain format with per-line commit information" msgstr "" "Извеждане във формат за команди от потребителско ниво с информация на всеки " "ред" -#: builtin/blame.c:855 +#: builtin/blame.c:854 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" "Използване на същия формат като „git-annotate“ (стандартно опцията е " "изключена)" -#: builtin/blame.c:856 +#: builtin/blame.c:855 msgid "Show raw timestamp (Default: off)" msgstr "Извеждане на неформатирани времена (стандартно опцията е изключена)" -#: builtin/blame.c:857 +#: builtin/blame.c:856 msgid "Show long commit SHA1 (Default: off)" msgstr "Извеждане на пълните суми по SHA1 (стандартно опцията е изключена)" -#: builtin/blame.c:858 +#: builtin/blame.c:857 msgid "Suppress author name and timestamp (Default: off)" msgstr "Без име на автор и време на промяна (стандартно опцията е изключена)" -#: builtin/blame.c:859 +#: builtin/blame.c:858 msgid "Show author email instead of name (Default: off)" msgstr "" "Извеждане на е-пощата на автора, а не името му (стандартно опцията е " "изключена)" -#: builtin/blame.c:860 +#: builtin/blame.c:859 msgid "Ignore whitespace differences" msgstr "Без разлики в знаците за интервали" -#: builtin/blame.c:861 builtin/log.c:1629 +#: builtin/blame.c:860 builtin/log.c:1630 msgid "rev" msgstr "ВЕРС" -#: builtin/blame.c:861 +#: builtin/blame.c:860 msgid "Ignore <rev> when blaming" msgstr "Прескачане на ВЕРСията при извеждане на авторството" -#: builtin/blame.c:862 +#: builtin/blame.c:861 msgid "Ignore revisions from <file>" msgstr "Прескачане на версиите указани във ФАЙЛа при извеждане на авторството" -#: builtin/blame.c:863 +#: builtin/blame.c:862 msgid "color redundant metadata from previous line differently" msgstr "" "оцветяване на повтарящите се метаданни от предишния ред в различен цвят" -#: builtin/blame.c:864 +#: builtin/blame.c:863 msgid "color lines by age" msgstr "оцветяване на редовете по възраст" -#: builtin/blame.c:871 +#: builtin/blame.c:870 msgid "Use an experimental heuristic to improve diffs" msgstr "Подобряване на разликите чрез експериментална евристика" -#: builtin/blame.c:873 +#: builtin/blame.c:872 msgid "Spend extra cycles to find better match" msgstr "Допълнителни изчисления за по-добри резултати" -#: builtin/blame.c:874 +#: builtin/blame.c:873 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Изчитане на версиите от ФАЙЛ, а не чрез изпълнение на „git-rev-list“" -#: builtin/blame.c:875 +#: builtin/blame.c:874 msgid "Use <file>'s contents as the final image" msgstr "Използване на съдържанието на ФАЙЛа като крайно положение" -#: builtin/blame.c:876 builtin/blame.c:877 +#: builtin/blame.c:875 builtin/blame.c:876 msgid "score" msgstr "напасване на редовете" -#: builtin/blame.c:876 +#: builtin/blame.c:875 msgid "Find line copies within and across files" msgstr "" "Търсене на копирани редове както в рамките на един файл, така и от един файл " "към друг" -#: builtin/blame.c:877 +#: builtin/blame.c:876 msgid "Find line movements within and across files" msgstr "" "Търсене на преместени редове както в рамките на един файл, така и от един " "файл към друг" -#: builtin/blame.c:878 +#: builtin/blame.c:877 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:878 +#: builtin/blame.c:877 msgid "Process only line range n,m, counting from 1" msgstr "" "Информация само за редовете в диапазона от n до m включително. Броенето " @@ -10059,7 +10093,7 @@ msgstr "задаване на режима на следене (виж git-pull( msgid "do not use" msgstr "да не се ползва" -#: builtin/branch.c:626 builtin/rebase.c:485 +#: builtin/branch.c:626 builtin/rebase.c:486 msgid "upstream" msgstr "клон-източник" @@ -10171,7 +10205,7 @@ msgstr "подредбата и филтрирането третират едн msgid "format to use for the output" msgstr "ФОРМАТ за изхода" -#: builtin/branch.c:684 builtin/clone.c:761 +#: builtin/branch.c:684 builtin/clone.c:760 msgid "HEAD not found below refs/heads!" msgstr "В директорията „refs/heads“ липсва файл „HEAD“" @@ -10274,7 +10308,7 @@ msgstr "За създаването на пратка е необходимо х msgid "Need a repository to unbundle." msgstr "За приемането на пратка е необходимо хранилище." -#: builtin/cat-file.c:594 +#: builtin/cat-file.c:595 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -10282,7 +10316,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | ВИД | --textconv --filters) [--path=ПЪТ] ОБЕКТ" -#: builtin/cat-file.c:595 +#: builtin/cat-file.c:596 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" @@ -10290,79 +10324,79 @@ msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:616 +#: builtin/cat-file.c:617 msgid "only one batch option may be specified" msgstr "може да укажете само една пакетна опция" -#: builtin/cat-file.c:634 +#: builtin/cat-file.c:635 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "" "ВИДът може да е: „blob“ (BLOB), „tree“ (дърво), „commit“ (подаване), " "„tag“ (етикет)" -#: builtin/cat-file.c:635 +#: builtin/cat-file.c:636 msgid "show object type" msgstr "извеждане на вида на обект" -#: builtin/cat-file.c:636 +#: builtin/cat-file.c:637 msgid "show object size" msgstr "извеждане на размера на обект" -#: builtin/cat-file.c:638 +#: builtin/cat-file.c:639 msgid "exit with zero when there's no error" msgstr "изход с 0, когато няма грешка" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:640 msgid "pretty-print object's content" msgstr "форматирано извеждане на съдържанието на обекта" -#: builtin/cat-file.c:641 +#: builtin/cat-file.c:642 msgid "for blob objects, run textconv on object's content" msgstr "" "да се стартира програмата зададена в настройката „textconv“ за преобразуване " "на съдържанието на обекта-BLOB" -#: builtin/cat-file.c:643 +#: builtin/cat-file.c:644 msgid "for blob objects, run filters on object's content" msgstr "" "да се стартират програмите за преобразуване на съдържанието на обектите-BLOB" -#: builtin/cat-file.c:644 git-submodule.sh:936 +#: builtin/cat-file.c:645 git-submodule.sh:936 msgid "blob" msgstr "обект-BLOB" -#: builtin/cat-file.c:645 +#: builtin/cat-file.c:646 msgid "use a specific path for --textconv/--filters" msgstr "опциите „--textconv“/„--filters“ изискват път" -#: builtin/cat-file.c:647 +#: builtin/cat-file.c:648 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "позволяване на опциите „-s“ и „-t“ да работят с повредени обекти" -#: builtin/cat-file.c:648 +#: builtin/cat-file.c:649 msgid "buffer --batch output" msgstr "буфериране на изхода от „--batch“" -#: builtin/cat-file.c:650 +#: builtin/cat-file.c:651 msgid "show info and content of objects fed from the standard input" msgstr "" "извеждане на информация и съдържание на обектите подадени на стандартния вход" -#: builtin/cat-file.c:654 +#: builtin/cat-file.c:655 msgid "show info about objects fed from the standard input" msgstr "извеждане на информация за обектите подадени на стандартния вход" -#: builtin/cat-file.c:658 +#: builtin/cat-file.c:659 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "следване на символните връзки сочещи в дървото (ползва се с „--batch“ или „--" "batch-check“)" -#: builtin/cat-file.c:660 +#: builtin/cat-file.c:661 msgid "show all objects with --batch or --batch-check" msgstr "извеждане на всички обекти с „--batch“ или „--batch-check“" -#: builtin/cat-file.c:662 +#: builtin/cat-file.c:663 msgid "do not order --batch-all-objects output" msgstr "без подреждане на изхода от „--batch-all-objects“" @@ -10390,8 +10424,8 @@ msgstr "изчитане на имената на файловете от ста msgid "terminate input and output records by a NUL character" msgstr "разделяне на входните и изходните записи с нулевия знак „NUL“" -#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538 -#: builtin/worktree.c:507 +#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:537 +#: builtin/worktree.c:506 msgid "suppress progress reporting" msgstr "без показване на напредъка" @@ -10483,7 +10517,7 @@ msgstr "записване на съдържанието във временни #: builtin/checkout-index.c:178 builtin/column.c:31 #: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376 #: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857 -#: builtin/worktree.c:680 +#: builtin/worktree.c:679 msgid "string" msgstr "НИЗ" @@ -10511,99 +10545,99 @@ msgstr "git switch [ОПЦИЯ…] КЛОН" msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "git restore [ОПЦИЯ…] [--source=КЛОН] ФАЙЛ…" -#: builtin/checkout.c:172 builtin/checkout.c:211 +#: builtin/checkout.c:173 builtin/checkout.c:212 #, c-format msgid "path '%s' does not have our version" msgstr "вашата версия липсва в пътя „%s“" -#: builtin/checkout.c:174 builtin/checkout.c:213 +#: builtin/checkout.c:175 builtin/checkout.c:214 #, c-format msgid "path '%s' does not have their version" msgstr "чуждата версия липсва в пътя „%s“" -#: builtin/checkout.c:190 +#: builtin/checkout.c:191 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "някоя от необходимите версии липсва в пътя „%s“" -#: builtin/checkout.c:240 +#: builtin/checkout.c:241 #, c-format msgid "path '%s' does not have necessary versions" msgstr "някоя от необходимите версии липсва в пътя „%s“" -#: builtin/checkout.c:258 +#: builtin/checkout.c:259 #, c-format msgid "path '%s': cannot merge" msgstr "пътят „%s“ не може да бъде слян" -#: builtin/checkout.c:274 +#: builtin/checkout.c:275 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Резултатът за „%s“ не може да бъде слян" -#: builtin/checkout.c:374 +#: builtin/checkout.c:375 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "Пресъздаден е %d конфликт при сливане" msgstr[1] "Пресъздадени са %d конфликта при сливане" -#: builtin/checkout.c:379 +#: builtin/checkout.c:380 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "Обновен е %d път от „%s“" msgstr[1] "Обновени са %d пътя от „%s“" -#: builtin/checkout.c:386 +#: builtin/checkout.c:387 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "Обновен е %d път от индекса" msgstr[1] "Обновени са %d пътя от индекса" -#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415 -#: builtin/checkout.c:419 +#: builtin/checkout.c:410 builtin/checkout.c:413 builtin/checkout.c:416 +#: builtin/checkout.c:420 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "опцията „%s“ е несъвместима с обновяването на пътища" -#: builtin/checkout.c:422 builtin/checkout.c:425 +#: builtin/checkout.c:423 builtin/checkout.c:426 #, c-format msgid "'%s' cannot be used with %s" msgstr "опцията „%s“ е несъвместима с „%s“" -#: builtin/checkout.c:429 +#: builtin/checkout.c:430 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Невъзможно е едновременно да обновявате пътища и да преминете към клона „%s“." -#: builtin/checkout.c:433 +#: builtin/checkout.c:434 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "не е указано нито „%s“, нито „%s“" -#: builtin/checkout.c:437 +#: builtin/checkout.c:438 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "опцията „%s“ е задължителна, когато „%s“ не е зададена" -#: builtin/checkout.c:442 builtin/checkout.c:447 +#: builtin/checkout.c:443 builtin/checkout.c:448 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "опцията „%3$s“ е несъвместима както с „%1$s“, така и с „%2$s“" -#: builtin/checkout.c:506 builtin/checkout.c:513 +#: builtin/checkout.c:507 builtin/checkout.c:514 #, c-format msgid "path '%s' is unmerged" msgstr "пътят „%s“ не е слят" -#: builtin/checkout.c:679 +#: builtin/checkout.c:680 msgid "you need to resolve your current index first" msgstr "първо трябва да коригирате индекса си" -#: builtin/checkout.c:729 +#: builtin/checkout.c:730 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -10613,11 +10647,6 @@ msgstr "" "индекса:\n" "%s" -#: builtin/checkout.c:736 -#, c-format -msgid "staged changes in the following files may be lost: %s" -msgstr "локалните промени в тези файлове ще се презапишат: %s" - #: builtin/checkout.c:833 #, c-format msgid "Can not do reflog for '%s': %s\n" @@ -10627,7 +10656,7 @@ msgstr "Журналът на указателите за „%s“ не може msgid "HEAD is now at" msgstr "Указателят „HEAD“ в момента сочи към" -#: builtin/checkout.c:879 builtin/clone.c:714 +#: builtin/checkout.c:879 builtin/clone.c:713 msgid "unable to update HEAD" msgstr "Указателят „HEAD“ не може да бъде обновен" @@ -10740,7 +10769,7 @@ msgstr "" "„%s“ може да е както локален файл, така и следящ клон. За уточняване\n" "ползвайте разделителя „--“ (и евентуално опцията „--no-guess“)" -#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456 +#: builtin/checkout.c:1243 builtin/worktree.c:290 builtin/worktree.c:455 #, c-format msgid "invalid reference: %s" msgstr "неправилен указател: %s" @@ -10846,9 +10875,9 @@ msgstr "" msgid "missing branch or commit argument" msgstr "липсва аргумент — клон или подаване" -#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151 -#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575 -#: builtin/send-pack.c:174 +#: builtin/checkout.c:1437 builtin/clone.c:90 builtin/commit-graph.c:59 +#: builtin/commit-graph.c:180 builtin/fetch.c:166 builtin/merge.c:285 +#: builtin/pull.c:138 builtin/push.c:562 builtin/send-pack.c:174 msgid "force progress reporting" msgstr "извеждане на напредъка" @@ -10856,7 +10885,7 @@ msgstr "извеждане на напредъка" msgid "perform a 3-way merge with the new branch" msgstr "извършване на тройно сливане с новия клон" -#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318 +#: builtin/checkout.c:1439 builtin/log.c:1618 parse-options.h:318 msgid "style" msgstr "СТИЛ" @@ -10864,7 +10893,7 @@ msgstr "СТИЛ" msgid "conflict style (merge or diff3)" msgstr "действие при конфликт (сливане или тройна разлика)" -#: builtin/checkout.c:1452 builtin/worktree.c:504 +#: builtin/checkout.c:1452 builtin/worktree.c:503 msgid "detach HEAD at named commit" msgstr "отделяне на указателя „HEAD“ към указаното подаване" @@ -10981,9 +11010,9 @@ msgstr "" "\n" " checkout.defaultRemote=origin" -#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733 -#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169 -#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502 +#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1742 +#: builtin/checkout.c:1744 builtin/clone.c:120 builtin/remote.c:169 +#: builtin/remote.c:171 builtin/worktree.c:499 builtin/worktree.c:501 msgid "branch" msgstr "клон" @@ -11009,41 +11038,41 @@ msgstr "" msgid "use overlay mode (default)" msgstr "използване на припокриващ режим (стандартно)" -#: builtin/checkout.c:1734 +#: builtin/checkout.c:1743 msgid "create and switch to a new branch" msgstr "създаване и преминаване към нов клон" -#: builtin/checkout.c:1736 +#: builtin/checkout.c:1745 msgid "create/reset and switch to a branch" msgstr "създаване/зануляване на клон и преминаване към него" -#: builtin/checkout.c:1738 +#: builtin/checkout.c:1747 msgid "second guess 'git switch <no-such-branch>'" msgstr "" "опит за отгатване на име на клон след неуспешен опит с „git switch " "НЕСЪЩЕСТВУВАЩ_КЛОН“" -#: builtin/checkout.c:1740 +#: builtin/checkout.c:1749 msgid "throw away local modifications" msgstr "зануляване на локалните промени" -#: builtin/checkout.c:1772 +#: builtin/checkout.c:1781 msgid "which tree-ish to checkout from" msgstr "към кой указател към дърво да се премине" -#: builtin/checkout.c:1774 +#: builtin/checkout.c:1783 msgid "restore the index" msgstr "възстановяване на индекса" -#: builtin/checkout.c:1776 +#: builtin/checkout.c:1785 msgid "restore the working tree (default)" msgstr "възстановяване на работното дърво (стандартно)" -#: builtin/checkout.c:1778 +#: builtin/checkout.c:1787 msgid "ignore unmerged entries" msgstr "пренебрегване на неслетите елементи" -#: builtin/checkout.c:1779 +#: builtin/checkout.c:1788 msgid "use overlay mode" msgstr "използване на припокриващ режим" @@ -11082,7 +11111,7 @@ msgstr "файлът „%s“ не може да бъде изтрит" msgid "could not lstat %s\n" msgstr "не може да се получи информация чрез „lstat“ за „%s“\n" -#: builtin/clean.c:300 git-add--interactive.perl:593 +#: builtin/clean.c:301 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -11095,7 +11124,7 @@ msgstr "" "ПРЕФИКС — избор на единствен обект по този уникален префикс\n" " — (празно) нищо да не се избира\n" -#: builtin/clean.c:304 git-add--interactive.perl:602 +#: builtin/clean.c:305 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -11116,39 +11145,39 @@ msgstr "" "* — избиране на всички обекти\n" " — (празно) завършване на избирането\n" -#: builtin/clean.c:520 git-add--interactive.perl:568 +#: 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" -#: builtin/clean.c:662 +#: builtin/clean.c:663 #, c-format msgid "Input ignore patterns>> " msgstr "Шаблони за игнорирани елементи≫ " -#: builtin/clean.c:699 +#: builtin/clean.c:700 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "ПРЕДУПРЕЖДЕНИЕ: Никой обект не напасва на „%s“" -#: builtin/clean.c:720 +#: builtin/clean.c:721 msgid "Select items to delete" msgstr "Избиране на обекти за изтриване" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:761 +#: builtin/clean.c:762 #, c-format msgid "Remove %s [y/N]? " msgstr "Да се изтрие ли „%s“? „y“ — да, „N“ — НЕ" # -#: builtin/clean.c:786 git-add--interactive.perl:1763 +#: builtin/clean.c:787 git-add--interactive.perl:1763 #, c-format msgid "Bye.\n" msgstr "Изход.\n" -#: builtin/clean.c:794 +#: builtin/clean.c:795 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -11166,64 +11195,64 @@ msgstr "" "help — този край\n" "? — подсказка за шаблоните" -#: builtin/clean.c:821 git-add--interactive.perl:1849 +#: builtin/clean.c:822 git-add--interactive.perl:1849 msgid "*** Commands ***" msgstr "●●● Команди ●●●" -#: builtin/clean.c:822 git-add--interactive.perl:1846 +#: builtin/clean.c:823 git-add--interactive.perl:1846 msgid "What now" msgstr "Избор на следващо действие" -#: builtin/clean.c:830 +#: builtin/clean.c:831 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Следният обект ще бъде изтрит:" msgstr[1] "Следните обекти ще бъдат изтрити:" -#: builtin/clean.c:846 +#: builtin/clean.c:847 msgid "No more files to clean, exiting." msgstr "Файловете за изчистване свършиха. Изход от програмата." -#: builtin/clean.c:908 +#: builtin/clean.c:909 msgid "do not print names of files removed" msgstr "без извеждане на имената на файловете, които ще бъдат изтрити" -#: builtin/clean.c:910 +#: builtin/clean.c:911 msgid "force" msgstr "принудително изтриване" -#: builtin/clean.c:911 +#: builtin/clean.c:912 msgid "interactive cleaning" msgstr "интерактивно изтриване" -#: builtin/clean.c:913 +#: builtin/clean.c:914 msgid "remove whole directories" msgstr "изтриване на цели директории" -#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548 -#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178 -#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415 +#: builtin/clean.c:915 builtin/describe.c:548 builtin/describe.c:550 +#: builtin/grep.c:901 builtin/log.c:176 builtin/log.c:178 +#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419 #: builtin/show-ref.c:179 msgid "pattern" msgstr "ШАБЛОН" -#: builtin/clean.c:915 +#: builtin/clean.c:916 msgid "add <pattern> to ignore rules" msgstr "добавяне на ШАБЛОН от файлове, които да не се трият" -#: builtin/clean.c:916 +#: builtin/clean.c:917 msgid "remove ignored files, too" msgstr "изтриване и на игнорираните файлове" -#: builtin/clean.c:918 +#: builtin/clean.c:919 msgid "remove only ignored files" msgstr "изтриване само на игнорирани файлове" -#: builtin/clean.c:936 +#: builtin/clean.c:937 msgid "-x and -X cannot be used together" msgstr "опциите „-x“ и „-X“ са несъвместими" -#: builtin/clean.c:940 +#: builtin/clean.c:941 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -11231,7 +11260,7 @@ msgstr "" "Настройката „clean.requireForce“ е зададена като истина, което изисква някоя " "от опциите „-i“, „-n“ или „-f“. Няма да се извърши изчистване" -#: builtin/clean.c:943 +#: builtin/clean.c:944 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -11240,164 +11269,164 @@ msgstr "" "което изисква някоя от опциите „-i“, „-n“ или „-f“. Няма да се извърши " "изчистване" -#: builtin/clone.c:46 +#: builtin/clone.c:45 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [ОПЦИЯ…] [--] ХРАНИЛИЩЕ [ДИРЕКТОРИЯ]" -#: builtin/clone.c:93 +#: builtin/clone.c:92 msgid "don't create a checkout" msgstr "без създаване на работно дърво" -#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489 +#: builtin/clone.c:93 builtin/clone.c:95 builtin/init-db.c:489 msgid "create a bare repository" msgstr "създаване на голо хранилище" -#: builtin/clone.c:98 +#: builtin/clone.c:97 msgid "create a mirror repository (implies bare)" msgstr "" "създаване на хранилище-огледало (включва опцията „--bare“ за голо хранилище)" -#: builtin/clone.c:100 +#: builtin/clone.c:99 msgid "to clone from a local repository" msgstr "клониране от локално хранилище" -#: builtin/clone.c:102 +#: builtin/clone.c:101 msgid "don't use local hardlinks, always copy" msgstr "без твърди връзки, файловете винаги да се копират" -#: builtin/clone.c:104 +#: builtin/clone.c:103 msgid "setup as shared repository" msgstr "настройване за споделено хранилище" -#: builtin/clone.c:107 +#: builtin/clone.c:106 msgid "pathspec" msgstr "път" -#: builtin/clone.c:107 +#: builtin/clone.c:106 msgid "initialize submodules in the clone" msgstr "инициализиране на подмодулите при това клониране" -#: builtin/clone.c:110 +#: builtin/clone.c:109 msgid "number of submodules cloned in parallel" msgstr "брой подмодули, клонирани паралелно" -#: builtin/clone.c:111 builtin/init-db.c:486 +#: builtin/clone.c:110 builtin/init-db.c:486 msgid "template-directory" msgstr "директория с шаблони" -#: builtin/clone.c:112 builtin/init-db.c:487 +#: builtin/clone.c:111 builtin/init-db.c:487 msgid "directory from which templates will be used" msgstr "директория, която съдържа шаблоните, които да се ползват" -#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380 +#: builtin/clone.c:113 builtin/clone.c:115 builtin/submodule--helper.c:1380 #: builtin/submodule--helper.c:1860 msgid "reference repository" msgstr "еталонно хранилище" -#: builtin/clone.c:118 builtin/submodule--helper.c:1382 +#: builtin/clone.c:117 builtin/submodule--helper.c:1382 #: builtin/submodule--helper.c:1862 msgid "use --reference only while cloning" msgstr "опцията „--reference“ може да се използва само при клониране" -#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3314 builtin/repack.c:319 +#: builtin/clone.c:118 builtin/column.c:27 builtin/merge-file.c:46 +#: builtin/pack-objects.c:3294 builtin/repack.c:320 msgid "name" msgstr "ИМЕ" -#: builtin/clone.c:120 +#: builtin/clone.c:119 msgid "use <name> instead of 'origin' to track upstream" msgstr "използване на това ИМЕ вместо „origin“ при проследяване на клони" -#: builtin/clone.c:122 +#: builtin/clone.c:121 msgid "checkout <branch> instead of the remote's HEAD" msgstr "изтегляне на този КЛОН, а не соченият от отдалечения указател „HEAD“" -#: builtin/clone.c:124 +#: builtin/clone.c:123 msgid "path to git-upload-pack on the remote" msgstr "път към командата „git-upload-pack“ на отдалеченото хранилище" -#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838 -#: builtin/pull.c:226 +#: builtin/clone.c:124 builtin/fetch.c:167 builtin/grep.c:840 +#: builtin/pull.c:227 msgid "depth" msgstr "ДЪЛБОЧИНА" -#: builtin/clone.c:126 +#: builtin/clone.c:125 msgid "create a shallow clone of that depth" msgstr "плитко клониране до тази ДЪЛБОЧИНА" -#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303 +#: builtin/clone.c:126 builtin/fetch.c:169 builtin/pack-objects.c:3283 msgid "time" msgstr "ВРЕМЕ" -#: builtin/clone.c:128 +#: builtin/clone.c:127 msgid "create a shallow clone since a specific time" msgstr "плитко клониране до момент във времето" -#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179 -#: builtin/rebase.c:1395 +#: builtin/clone.c:128 builtin/fetch.c:171 builtin/fetch.c:194 +#: builtin/rebase.c:1417 msgid "revision" msgstr "ВЕРСИЯ" -#: builtin/clone.c:130 builtin/fetch.c:157 +#: builtin/clone.c:129 builtin/fetch.c:172 msgid "deepen history of shallow clone, excluding rev" msgstr "задълбочаване на историята на плитко хранилище до изключващ указател" -#: builtin/clone.c:132 +#: builtin/clone.c:131 msgid "clone only one branch, HEAD or --branch" msgstr "" "клониране само на един клон — или сочения от отдалечения „HEAD“, или изрично " "зададения с „--branch“" -#: builtin/clone.c:134 +#: builtin/clone.c:133 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "" "без клониране на етикети, като последващите доставяния няма да ги следят" -#: builtin/clone.c:136 +#: builtin/clone.c:135 msgid "any cloned submodules will be shallow" msgstr "всички клонирани подмодули ще са плитки" -#: builtin/clone.c:137 builtin/init-db.c:495 +#: builtin/clone.c:136 builtin/init-db.c:495 msgid "gitdir" msgstr "СЛУЖЕБНА_ДИРЕКТОРИЯ" -#: builtin/clone.c:138 builtin/init-db.c:496 +#: builtin/clone.c:137 builtin/init-db.c:496 msgid "separate git dir from working tree" msgstr "отделна СЛУЖЕБНА_ДИРЕКТОРИЯ за git извън работното дърво" -#: builtin/clone.c:139 +#: builtin/clone.c:138 msgid "key=value" msgstr "КЛЮЧ=СТОЙНОСТ" -#: builtin/clone.c:140 +#: builtin/clone.c:139 msgid "set config inside the new repository" msgstr "задаване на настройките на новото хранилище" -#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 -#: builtin/push.c:585 builtin/send-pack.c:172 +#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76 +#: builtin/push.c:572 builtin/send-pack.c:172 msgid "server-specific" msgstr "специфични за сървъра" -#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 -#: builtin/push.c:585 builtin/send-pack.c:173 +#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76 +#: builtin/push.c:572 builtin/send-pack.c:173 msgid "option to transmit" msgstr "опция за пренос" -#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239 -#: builtin/push.c:586 +#: builtin/clone.c:142 builtin/fetch.c:190 builtin/pull.c:240 +#: builtin/push.c:573 msgid "use IPv4 addresses only" msgstr "само адреси IPv4" -#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242 -#: builtin/push.c:588 +#: builtin/clone.c:144 builtin/fetch.c:192 builtin/pull.c:243 +#: builtin/push.c:575 msgid "use IPv6 addresses only" msgstr "само адреси IPv6" -#: builtin/clone.c:149 +#: builtin/clone.c:148 msgid "any cloned submodules will use their remote-tracking branch" msgstr "всички клонирани подмодули ще ползват следящите си клони" -#: builtin/clone.c:285 +#: builtin/clone.c:284 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -11405,43 +11434,43 @@ msgstr "" "Името на директорията не може да бъде отгатнато.\n" "Задайте директорията изрично на командния ред" -#: builtin/clone.c:338 +#: builtin/clone.c:337 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "" "ПРЕДУПРЕЖДЕНИЕ: не може да се добави алтернативен източник на „%s“: %s\n" -#: builtin/clone.c:411 +#: builtin/clone.c:410 #, c-format msgid "%s exists and is not a directory" msgstr "„%s“ съществува и не е директория" -#: builtin/clone.c:428 +#: builtin/clone.c:427 #, c-format msgid "failed to start iterator over '%s'" msgstr "неуспешно итериране по „%s“" -#: builtin/clone.c:458 +#: builtin/clone.c:457 #, c-format msgid "failed to create link '%s'" msgstr "връзката „%s“ не може да бъде създадена" -#: builtin/clone.c:462 +#: builtin/clone.c:461 #, c-format msgid "failed to copy file to '%s'" msgstr "файлът не може да бъде копиран като „%s“" -#: builtin/clone.c:467 +#: builtin/clone.c:466 #, c-format msgid "failed to iterate over '%s'" msgstr "неуспешно итериране по „%s“" -#: builtin/clone.c:492 +#: builtin/clone.c:491 #, c-format msgid "done.\n" msgstr "действието завърши.\n" -#: builtin/clone.c:506 +#: builtin/clone.c:505 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -11454,99 +11483,99 @@ msgstr "" "\n" " git restore --source=HEAD :/\n" -#: builtin/clone.c:583 +#: builtin/clone.c:582 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" "Клонът „%s“ от отдалеченото хранилище, което клонирате,\n" "и който следва да бъде изтеглен, не съществува." -#: builtin/clone.c:702 +#: builtin/clone.c:701 #, c-format msgid "unable to update %s" msgstr "обектът „%s“ не може да бъде обновен" -#: builtin/clone.c:752 +#: builtin/clone.c:751 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "указателят „HEAD“ от отдалеченото хранилище сочи към нещо,\n" "което не съществува. Не може да се изтегли определен клон.\n" -#: builtin/clone.c:783 +#: builtin/clone.c:782 msgid "unable to checkout working tree" msgstr "работното дърво не може да бъде подготвено" -#: builtin/clone.c:833 +#: builtin/clone.c:832 msgid "unable to write parameters to config file" msgstr "настройките не могат да бъдат записани в конфигурационния файл" -#: builtin/clone.c:896 +#: builtin/clone.c:895 msgid "cannot repack to clean up" msgstr "не може да се извърши пакетиране за изчистване на файловете" -#: builtin/clone.c:898 +#: builtin/clone.c:897 msgid "cannot unlink temporary alternates file" msgstr "временният файл за алтернативни обекти не може да бъде изтрит" -#: builtin/clone.c:938 builtin/receive-pack.c:1950 +#: builtin/clone.c:937 builtin/receive-pack.c:1948 msgid "Too many arguments." msgstr "Прекалено много аргументи." -#: builtin/clone.c:942 +#: builtin/clone.c:941 msgid "You must specify a repository to clone." msgstr "Трябва да укажете кое хранилище искате да клонирате." -#: builtin/clone.c:955 +#: builtin/clone.c:954 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "опциите „--bare“ и „--origin %s“ са несъвместими." -#: builtin/clone.c:958 +#: builtin/clone.c:957 msgid "--bare and --separate-git-dir are incompatible." msgstr "опциите „--bare“ и „--separate-git-dir“ са несъвместими." -#: builtin/clone.c:971 +#: builtin/clone.c:970 #, c-format msgid "repository '%s' does not exist" msgstr "не съществува хранилище „%s“" -#: builtin/clone.c:977 builtin/fetch.c:1660 +#: builtin/clone.c:976 builtin/fetch.c:1790 #, c-format msgid "depth %s is not a positive number" msgstr "дълбочината трябва да е положително цяло число, а не „%s“" -#: builtin/clone.c:987 +#: builtin/clone.c:986 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "целевият път „%s“ съществува и не е празна директория." -#: builtin/clone.c:997 +#: builtin/clone.c:996 #, c-format msgid "working tree '%s' already exists." msgstr "в „%s“ вече съществува работно дърво." -#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264 -#: builtin/worktree.c:303 builtin/worktree.c:335 +#: builtin/clone.c:1011 builtin/clone.c:1032 builtin/difftool.c:271 +#: builtin/log.c:1785 builtin/worktree.c:302 builtin/worktree.c:334 #, c-format msgid "could not create leading directories of '%s'" msgstr "родителските директории на „%s“ не могат да бъдат създадени" -#: builtin/clone.c:1017 +#: builtin/clone.c:1016 #, c-format msgid "could not create work tree dir '%s'" msgstr "работното дърво в „%s“ не може да бъде създадено." -#: builtin/clone.c:1037 +#: builtin/clone.c:1036 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Клониране и създаване на голо хранилище в „%s“…\n" -#: builtin/clone.c:1039 +#: builtin/clone.c:1038 #, c-format msgid "Cloning into '%s'...\n" msgstr "Клониране и създаване на хранилище в „%s“…\n" -#: builtin/clone.c:1063 +#: builtin/clone.c:1062 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -11554,44 +11583,44 @@ msgstr "" "Опцията „--recursive“ е несъвместима с опциите „--reference“ и „--reference-" "if-able“" -#: builtin/clone.c:1124 +#: builtin/clone.c:1123 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" "При локално клониране опцията „--depth“ се прескача. Ползвайте схемата " "„file://“." -#: builtin/clone.c:1126 +#: builtin/clone.c:1125 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" "При локално клониране опцията „--shallow-since“ се прескача. Ползвайте " "схемата „file://“." -#: builtin/clone.c:1128 +#: builtin/clone.c:1127 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" "При локално клониране опцията „--shallow-exclude“ се прескача. Ползвайте " "схемата „file://“." -#: builtin/clone.c:1130 +#: builtin/clone.c:1129 msgid "--filter is ignored in local clones; use file:// instead." msgstr "" "При локално клониране опцията „--filter“ се прескача. Ползвайте схемата " "„file://“." -#: builtin/clone.c:1133 +#: builtin/clone.c:1132 msgid "source repository is shallow, ignoring --local" msgstr "клонираното хранилище е плитко, затова опцията „--local“ се прескача" -#: builtin/clone.c:1138 +#: builtin/clone.c:1137 msgid "--local is ignored" msgstr "опцията „--local“ се прескача" -#: builtin/clone.c:1215 builtin/clone.c:1223 +#: builtin/clone.c:1212 builtin/clone.c:1220 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Отдалеченият клон „%s“ липсва в клонираното хранилище „%s“" -#: builtin/clone.c:1226 +#: builtin/clone.c:1223 msgid "You appear to have cloned an empty repository." msgstr "Изглежда клонирахте празно хранилище." @@ -11669,7 +11698,7 @@ msgid "id of a parent commit object" msgstr "ИДЕНТИФИКАТОР на обекта за подаването-родител" #: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1469 #: builtin/tag.c:412 msgid "message" msgstr "СЪОБЩЕНИЕ" @@ -11683,7 +11712,7 @@ msgid "read commit log message from file" msgstr "изчитане на съобщението за подаване от ФАЙЛ" #: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287 -#: builtin/pull.c:194 builtin/revert.c:118 +#: builtin/pull.c:195 builtin/revert.c:118 msgid "GPG sign commit" msgstr "подписване на подаването с GPG" @@ -12021,8 +12050,8 @@ msgstr "изчисляване на точните стойности напре msgid "version" msgstr "версия" -#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561 -#: builtin/worktree.c:651 +#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:548 +#: builtin/worktree.c:650 msgid "machine-readable output" msgstr "формат на изхода за четене от програма" @@ -12035,8 +12064,8 @@ msgid "terminate entries with NUL" msgstr "разделяне на елементите с нулевия знак „NUL“" #: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537 -#: builtin/fast-export.c:1125 builtin/fast-export.c:1128 -#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332 +#: builtin/fast-export.c:1153 builtin/fast-export.c:1156 +#: builtin/fast-export.c:1159 builtin/rebase.c:1495 parse-options.h:332 msgid "mode" msgstr "РЕЖИМ" @@ -12056,7 +12085,7 @@ msgstr "" "„traditional“ (традиционен), „matching“ (напасващи), „no“ (без игнорираните " "файлове). Стандартният РЕЖИМ е: „traditional“." -#: builtin/commit.c:1362 parse-options.h:179 +#: builtin/commit.c:1362 parse-options.h:188 msgid "when" msgstr "КОГА" @@ -12109,7 +12138,7 @@ msgstr "АВТОР" msgid "override author for commit" msgstr "задаване на АВТОР за подаването" -#: builtin/commit.c:1499 builtin/gc.c:539 +#: builtin/commit.c:1499 builtin/gc.c:538 msgid "date" msgstr "ДАТА" @@ -12147,8 +12176,8 @@ msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" "смяна на автора да съвпада с подаващия (използва се с „-C“/„-c“/„--amend“)" -#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289 -#: builtin/pull.c:163 builtin/revert.c:110 +#: builtin/commit.c:1506 builtin/log.c:1565 builtin/merge.c:289 +#: builtin/pull.c:164 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "добавяне на поле за подпис — „Signed-off-by:“" @@ -12259,71 +12288,74 @@ msgid "git commit-graph read [--object-dir <objdir>]" msgstr "git commit-graph read [--object-dir ДИР_ОБЕКТИ]" #: builtin/commit-graph.c:13 builtin/commit-graph.c:19 -msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]" -msgstr "git commit-graph verify [--object-dir ДИР_ОБЕКТИ] [--shallow]" +msgid "" +"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" +msgstr "" +"git commit-graph verify [--object-dir ДИР_ОБЕКТИ] [--shallow] [--" +"[no-]progress]" #: builtin/commit-graph.c:14 builtin/commit-graph.c:29 msgid "" "git commit-graph write [--object-dir <objdir>] [--append|--split] [--" -"reachable|--stdin-packs|--stdin-commits] <split options>" +"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>" msgstr "" "git commit-graph write [--object-dir ДИР_ОБЕКТИ] [--append|--split] [--" -"reachable|--stdin-packs|--stdin-commits] ОПЦИИ_ЗА_РАЗДЕЛЯНЕ" +"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] ОПЦИИ_ЗА_РАЗДЕЛЯНЕ" -#: builtin/commit-graph.c:54 builtin/commit-graph.c:100 -#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163 -#: builtin/log.c:1584 +#: builtin/commit-graph.c:55 builtin/commit-graph.c:107 +#: builtin/commit-graph.c:170 builtin/commit-graph.c:254 builtin/fetch.c:178 +#: builtin/log.c:1585 msgid "dir" msgstr "директория" -#: builtin/commit-graph.c:55 builtin/commit-graph.c:101 -#: builtin/commit-graph.c:162 builtin/commit-graph.c:238 +#: builtin/commit-graph.c:56 builtin/commit-graph.c:108 +#: builtin/commit-graph.c:171 builtin/commit-graph.c:255 msgid "The object directory to store the graph" msgstr "ДИРекторията_с_ОБЕКТИ за запазване на гра̀фа" -#: builtin/commit-graph.c:57 +#: builtin/commit-graph.c:58 msgid "if the commit-graph is split, only verify the tip file" msgstr "" "ако гра̀фа с подаванията е раздробен, да се проверява само файлът на върха" -#: builtin/commit-graph.c:73 builtin/commit-graph.c:116 +#: builtin/commit-graph.c:80 builtin/commit-graph.c:125 #, c-format msgid "Could not open commit-graph '%s'" msgstr "Графът с подаванията не може да се отвори: „%s“" -#: builtin/commit-graph.c:164 +#: builtin/commit-graph.c:173 msgid "start walk at all refs" msgstr "обхождането да започне от всички указатели" -#: builtin/commit-graph.c:166 +#: builtin/commit-graph.c:175 msgid "scan pack-indexes listed by stdin for commits" msgstr "" "проверка на подаванията за индексите на пакетите изброени на командния ред" -#: builtin/commit-graph.c:168 +#: builtin/commit-graph.c:177 msgid "start walk at commits listed by stdin" msgstr "започване на обхождането при подаванията подадени на стандартния вход" -#: builtin/commit-graph.c:170 +#: builtin/commit-graph.c:179 msgid "include all commits already in the commit-graph file" msgstr "" "включване на всички подавания, които вече са във файла с гра̀фа на подаванията" -#: builtin/commit-graph.c:172 +#: builtin/commit-graph.c:182 msgid "allow writing an incremental commit-graph file" msgstr "позволяване на запис на нарастващ файл с гра̀фа на подаванията" -#: builtin/commit-graph.c:174 builtin/commit-graph.c:178 +#: builtin/commit-graph.c:184 builtin/commit-graph.c:188 msgid "maximum number of commits in a non-base split commit-graph" msgstr "максимален брой подавания в небазово ниво на раздробен граф" -#: builtin/commit-graph.c:176 +#: builtin/commit-graph.c:186 msgid "maximum ratio between two levels of a split commit-graph" msgstr "" "максимално отношение на броя подавания в две последователни нива в раздробен " "граф" -#: builtin/commit-graph.c:191 +#: builtin/commit-graph.c:204 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "" "опциите „--reachable“, „--stdin-commits“ и „--stdin-packs“ са несъвместими" @@ -12649,57 +12681,57 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "извеждане на размерите на обектите във формат лесно четим от хора" -#: builtin/describe.c:27 +#: builtin/describe.c:26 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [ОПЦИЯ…] [УКАЗАТЕЛ_КЪМ_ПОДАВАНЕ…]" -#: builtin/describe.c:28 +#: builtin/describe.c:27 msgid "git describe [<options>] --dirty" msgstr "git describe [ОПЦИЯ…] --dirty" -#: builtin/describe.c:63 +#: builtin/describe.c:62 msgid "head" msgstr "основно" -#: builtin/describe.c:63 +#: builtin/describe.c:62 msgid "lightweight" msgstr "кратко" -#: builtin/describe.c:63 +#: builtin/describe.c:62 msgid "annotated" msgstr "анотирано" -#: builtin/describe.c:273 +#: builtin/describe.c:275 #, c-format msgid "annotated tag %s not available" msgstr "не съществува анотиран етикет „%s“" -#: builtin/describe.c:277 +#: builtin/describe.c:279 #, c-format msgid "annotated tag %s has no embedded name" msgstr "в анотирания етикет „%s“ липсва вградено име" -#: builtin/describe.c:279 +#: builtin/describe.c:281 #, c-format msgid "tag '%s' is really '%s' here" msgstr "етикетът „%s“ тук е всъщност „%s“" -#: builtin/describe.c:323 +#: builtin/describe.c:325 #, c-format msgid "no tag exactly matches '%s'" msgstr "никой етикет не напасва точно „%s“" -#: builtin/describe.c:325 +#: builtin/describe.c:327 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "Никоя версия и етикет не напасват точно. Търси се по описание\n" -#: builtin/describe.c:379 +#: builtin/describe.c:381 #, c-format msgid "finished search at %s\n" msgstr "търсенето приключи при „%s“\n" -#: builtin/describe.c:405 +#: builtin/describe.c:407 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -12708,7 +12740,7 @@ msgstr "" "Никой анотиран етикет не описва „%s“.\n" "Съществуват и неанотирани етикети. Пробвайте с опцията „--tags“." -#: builtin/describe.c:409 +#: builtin/describe.c:411 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -12717,12 +12749,12 @@ msgstr "" "Никой етикет не описва „%s“.\n" "Пробвайте с опцията „--always“ или създайте етикети." -#: builtin/describe.c:439 +#: builtin/describe.c:441 #, c-format msgid "traversed %lu commits\n" msgstr "претърсени са %lu подавания\n" -#: builtin/describe.c:442 +#: builtin/describe.c:444 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -12731,93 +12763,93 @@ msgstr "" "открити са над %i етикета, изведени са последните %i,\n" "търсенето бе прекратено при „%s“.\n" -#: builtin/describe.c:510 +#: builtin/describe.c:512 #, c-format msgid "describe %s\n" msgstr "описание на „%s“\n" -#: builtin/describe.c:513 +#: builtin/describe.c:515 #, c-format msgid "Not a valid object name %s" msgstr "Неправилно име на обект „%s“" -#: builtin/describe.c:521 +#: builtin/describe.c:523 #, c-format msgid "%s is neither a commit nor blob" msgstr "„%s“ не е нито подаване, нито обект-BLOB" -#: builtin/describe.c:535 +#: builtin/describe.c:537 msgid "find the tag that comes after the commit" msgstr "откриване на етикета, който следва подаване" -#: builtin/describe.c:536 +#: builtin/describe.c:538 msgid "debug search strategy on stderr" msgstr "" "извеждане на информация за трасиране на стратегията за търсене на " "стандартната грешка" -#: builtin/describe.c:537 +#: builtin/describe.c:539 msgid "use any ref" msgstr "използване на произволен указател" -#: builtin/describe.c:538 +#: builtin/describe.c:540 msgid "use any tag, even unannotated" msgstr "използване на всеки етикет — включително и неанотираните" -#: builtin/describe.c:539 +#: builtin/describe.c:541 msgid "always use long format" msgstr "винаги да се ползва дългият формат" -#: builtin/describe.c:540 +#: builtin/describe.c:542 msgid "only follow first parent" msgstr "проследяване само на първия родител" -#: builtin/describe.c:543 +#: builtin/describe.c:545 msgid "only output exact matches" msgstr "извеждане само на точните съвпадения" -#: builtin/describe.c:545 +#: builtin/describe.c:547 msgid "consider <n> most recent tags (default: 10)" msgstr "да се търси само в този БРОЙ последни етикети (стандартно: 10)" -#: builtin/describe.c:547 +#: builtin/describe.c:549 msgid "only consider tags matching <pattern>" msgstr "да се търси само измежду етикетите напасващи този ШАБЛОН" -#: builtin/describe.c:549 +#: builtin/describe.c:551 msgid "do not consider tags matching <pattern>" msgstr "да не се търси измежду етикетите напасващи този ШАБЛОН" -#: builtin/describe.c:551 builtin/name-rev.c:422 +#: builtin/describe.c:553 builtin/name-rev.c:426 msgid "show abbreviated commit object as fallback" msgstr "извеждане на съкратено име на обект като резервен вариант" -#: builtin/describe.c:552 builtin/describe.c:555 +#: builtin/describe.c:554 builtin/describe.c:557 msgid "mark" msgstr "МАРКЕР" -#: builtin/describe.c:553 +#: builtin/describe.c:555 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "добавяне на такъв МАРКЕР на работното дърво (стандартно е „-dirty“)" -#: builtin/describe.c:556 +#: builtin/describe.c:558 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "" "добавяне на такъв МАРКЕР на счупеното работно дърво (стандартно е „-broken“)" -#: builtin/describe.c:574 +#: builtin/describe.c:576 msgid "--long is incompatible with --abbrev=0" msgstr "Опциите „--long“ и „--abbrev=0“ са несъвместими" -#: builtin/describe.c:603 +#: builtin/describe.c:605 msgid "No names found, cannot describe anything." msgstr "Не са открити имена — нищо не може да бъде описано." -#: builtin/describe.c:654 +#: builtin/describe.c:656 msgid "--dirty is incompatible with commit-ishes" msgstr "опцията „--dirty“ е несъвместима с указател към подаване" -#: builtin/describe.c:656 +#: builtin/describe.c:658 msgid "--broken is incompatible with commit-ishes" msgstr "опцията „--broken“ е несъвместима с указател към подаване" @@ -12854,27 +12886,27 @@ msgstr "зададен е неподдържан обект „%s“." msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [ОПЦИЯ…] [ПОДАВАНЕ [ПОДАВАНЕ]] [[--] ПЪТ…]" -#: builtin/difftool.c:253 +#: builtin/difftool.c:260 #, c-format msgid "failed: %d" msgstr "неуспешно действие с изходен код: %d" -#: builtin/difftool.c:295 +#: builtin/difftool.c:302 #, c-format msgid "could not read symlink %s" msgstr "символната връзка „%s“ не може да бъде прочетена" -#: builtin/difftool.c:297 +#: builtin/difftool.c:304 #, c-format msgid "could not read symlink file %s" msgstr "файлът, сочен от символната връзка „%s“, не може да бъде прочетен" -#: builtin/difftool.c:305 +#: builtin/difftool.c:312 #, c-format msgid "could not read object %s for symlink %s" msgstr "обектът „%s“ за символната връзка „%s“ не може да бъде прочетен" -#: builtin/difftool.c:406 +#: builtin/difftool.c:413 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -12882,55 +12914,55 @@ msgstr "" "комбинираните формати на разликите („-c“ и „--cc“) не се поддържат\n" "в режима за разлики върху директории („-d“ и „--dir-diff“)." -#: builtin/difftool.c:626 +#: builtin/difftool.c:634 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "и двата файла са променени: „%s“ и „%s“." -#: builtin/difftool.c:628 +#: builtin/difftool.c:636 msgid "working tree file has been left." msgstr "работното дърво е изоставено." -#: builtin/difftool.c:639 +#: builtin/difftool.c:647 #, c-format msgid "temporary files exist in '%s'." msgstr "в „%s“ има временни файлове." -#: builtin/difftool.c:640 +#: builtin/difftool.c:648 msgid "you may want to cleanup or recover these." msgstr "възможно е да ги изчистите или възстановите" -#: builtin/difftool.c:689 +#: builtin/difftool.c:697 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "използвайте „diff.guitool“ вместо „diff.tool“" -#: builtin/difftool.c:691 +#: builtin/difftool.c:699 msgid "perform a full-directory diff" msgstr "разлика по директории" -#: builtin/difftool.c:693 +#: builtin/difftool.c:701 msgid "do not prompt before launching a diff tool" msgstr "стартиране на ПРОГРАМАта за разлики без предупреждение" -#: builtin/difftool.c:698 +#: builtin/difftool.c:706 msgid "use symlinks in dir-diff mode" msgstr "следване на символните връзки при разлика по директории" -#: builtin/difftool.c:699 +#: builtin/difftool.c:707 msgid "tool" msgstr "ПРОГРАМА" -#: builtin/difftool.c:700 +#: builtin/difftool.c:708 msgid "use the specified diff tool" msgstr "използване на указаната ПРОГРАМА" -#: builtin/difftool.c:702 +#: builtin/difftool.c:710 msgid "print a list of diff tools that may be used with `--tool`" msgstr "" "извеждане на списък с всички ПРОГРАМи, които може да се ползват с опцията „--" "tool“" -#: builtin/difftool.c:705 +#: builtin/difftool.c:713 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -12938,31 +12970,31 @@ msgstr "" "„git-difftool“ да спре работа, когато стартираната ПРОГРАМА завърши с " "ненулев код" -#: builtin/difftool.c:708 +#: builtin/difftool.c:716 msgid "specify a custom command for viewing diffs" msgstr "команда за разглеждане на разлики" -#: builtin/difftool.c:709 +#: builtin/difftool.c:717 msgid "passed to `diff`" msgstr "подава се към „diff“" -#: builtin/difftool.c:724 +#: builtin/difftool.c:732 msgid "difftool requires worktree or --no-index" msgstr "„git-difftool“ изисква работно дърво или опцията „--no-index“" -#: builtin/difftool.c:731 +#: builtin/difftool.c:739 msgid "--dir-diff is incompatible with --no-index" msgstr "опциите „--dir-diff“ и „--no-index“ са несъвместими" -#: builtin/difftool.c:734 +#: builtin/difftool.c:742 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "опциите „--gui“, „--tool“ и „--extcmd“ са несъвместими една с друга" -#: builtin/difftool.c:742 +#: builtin/difftool.c:750 msgid "no <tool> given for --tool=<tool>" msgstr "не е зададена програма за „--tool=ПРОГРАМА“" -#: builtin/difftool.c:749 +#: builtin/difftool.c:757 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "не е зададена команда за „--extcmd=КОМАНДА“" @@ -13002,160 +13034,185 @@ msgstr "" msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [ОПЦИИ_ЗА_СПИСЪКА_С_ВЕРСИИ]" -#: builtin/fast-export.c:1124 +#: builtin/fast-export.c:852 +msgid "Error: Cannot export nested tags unless --mark-tags is specified." +msgstr "" +"Грешка: непреките етикети не се изнасят, освен ако не зададете „--mark-tags“." + +#: builtin/fast-export.c:1152 msgid "show progress after <n> objects" msgstr "Съобщение за напредъка на всеки такъв БРОЙ обекта" -#: builtin/fast-export.c:1126 +#: builtin/fast-export.c:1154 msgid "select handling of signed tags" msgstr "Как да се обработват подписаните етикети" -#: builtin/fast-export.c:1129 +#: builtin/fast-export.c:1157 msgid "select handling of tags that tag filtered objects" msgstr "Как да се обработват етикетите на филтрираните обекти" -#: builtin/fast-export.c:1132 +#: builtin/fast-export.c:1160 msgid "select handling of commit messages in an alternate encoding" msgstr "" "как да се обработват съобщенията за подаване, които са в друго кодиране" -#: builtin/fast-export.c:1135 +#: builtin/fast-export.c:1163 msgid "Dump marks to this file" msgstr "Запазване на маркерите в този ФАЙЛ" -#: builtin/fast-export.c:1137 +#: builtin/fast-export.c:1165 msgid "Import marks from this file" msgstr "Внасяне на маркерите от този ФАЙЛ" -#: builtin/fast-export.c:1139 +#: builtin/fast-export.c:1169 +msgid "Import marks from this file if it exists" +msgstr "Внасяне на маркерите от този ФАЙЛ, ако съществува" + +#: builtin/fast-export.c:1171 msgid "Fake a tagger when tags lack one" msgstr "Да се използва изкуствено име на човек при липса на задаващ етикета" -#: builtin/fast-export.c:1141 +#: builtin/fast-export.c:1173 msgid "Output full tree for each commit" msgstr "Извеждане на цялото дърво за всяко подаване" -#: builtin/fast-export.c:1143 +#: builtin/fast-export.c:1175 msgid "Use the done feature to terminate the stream" msgstr "Използване на маркер за завършване на потока" -#: builtin/fast-export.c:1144 +#: builtin/fast-export.c:1176 msgid "Skip output of blob data" msgstr "Без извеждане на съдържанието на обектите-BLOB" -#: builtin/fast-export.c:1145 builtin/log.c:1632 +#: builtin/fast-export.c:1177 builtin/log.c:1633 msgid "refspec" msgstr "УКАЗАТЕЛ_НА_ВЕРСИЯ" -#: builtin/fast-export.c:1146 +#: builtin/fast-export.c:1178 msgid "Apply refspec to exported refs" msgstr "Прилагане на УКАЗАТЕЛя_НА_ВЕРСИЯ към изнесените указатели" -#: builtin/fast-export.c:1147 +#: builtin/fast-export.c:1179 msgid "anonymize output" msgstr "анонимизиране на извежданата информация" -#: builtin/fast-export.c:1149 +#: builtin/fast-export.c:1181 msgid "Reference parents which are not in fast-export stream by object id" msgstr "" "Указване на родителите, които не са в потока на бързо изнасяне, с " "идентификатор на обект" -#: builtin/fast-export.c:1151 +#: builtin/fast-export.c:1183 msgid "Show original object ids of blobs/commits" msgstr "Извеждане на първоначалните идентификатори на обектите BLOB/подавяния" -#: builtin/fetch.c:30 +#: builtin/fast-export.c:1185 +msgid "Label tags with mark ids" +msgstr "Задаване на идентификатори на маркери на етикетите" + +#: builtin/fast-export.c:1220 +msgid "Cannot pass both --import-marks and --import-marks-if-exists" +msgstr "опциите „--import-marks“ и „--import-marks-if-exists“ са несъвместими" + +#: builtin/fetch.c:34 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [ОПЦИЯ…] [ХРАНИЛИЩЕ [УКАЗАТЕЛ…]]" -#: builtin/fetch.c:31 +#: builtin/fetch.c:35 msgid "git fetch [<options>] <group>" msgstr "git fetch [ОПЦИЯ…] ГРУПА" -#: builtin/fetch.c:32 +#: builtin/fetch.c:36 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [ОПЦИЯ…] [(ХРАНИЛИЩЕ | ГРУПА)…]" -#: builtin/fetch.c:33 +#: builtin/fetch.c:37 msgid "git fetch --all [<options>]" msgstr "git fetch --all [ОПЦИЯ…]" -#: builtin/fetch.c:125 builtin/pull.c:203 +#: builtin/fetch.c:115 +msgid "fetch.parallel cannot be negative" +msgstr "опцията „fetch.parallel“ трябва да е неотрицателна" + +#: builtin/fetch.c:138 builtin/pull.c:204 msgid "fetch from all remotes" msgstr "доставяне от всички отдалечени хранилища" -#: builtin/fetch.c:127 builtin/pull.c:206 +#: builtin/fetch.c:140 builtin/pull.c:248 +msgid "set upstream for git pull/fetch" +msgstr "задаване на клон за следене за издърпване/доставяне" + +#: builtin/fetch.c:142 builtin/pull.c:207 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "добавяне към „.git/FETCH_HEAD“ вместо замяна" -#: builtin/fetch.c:129 builtin/pull.c:209 +#: builtin/fetch.c:144 builtin/pull.c:210 msgid "path to upload pack on remote end" msgstr "отдалечен път, където да се качи пакетът" -#: builtin/fetch.c:130 +#: builtin/fetch.c:145 msgid "force overwrite of local reference" msgstr "принудително презаписване на локален указател" -#: builtin/fetch.c:132 +#: builtin/fetch.c:147 msgid "fetch from multiple remotes" msgstr "доставяне от множество отдалечени хранилища" -#: builtin/fetch.c:134 builtin/pull.c:213 +#: builtin/fetch.c:149 builtin/pull.c:214 msgid "fetch all tags and associated objects" msgstr "доставяне на всички етикети и принадлежащи обекти" -#: builtin/fetch.c:136 +#: builtin/fetch.c:151 msgid "do not fetch all tags (--no-tags)" msgstr "без доставянето на всички етикети „--no-tags“" -#: builtin/fetch.c:138 +#: builtin/fetch.c:153 msgid "number of submodules fetched in parallel" msgstr "брой подмодули доставени паралелно" -#: builtin/fetch.c:140 builtin/pull.c:216 +#: builtin/fetch.c:155 builtin/pull.c:217 msgid "prune remote-tracking branches no longer on remote" msgstr "окастряне на клоните следящи вече несъществуващи отдалечени клони" -#: builtin/fetch.c:142 +#: builtin/fetch.c:157 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" "окастряне на локалните етикети, които вече не съществуват в отдалеченото " "хранилище и презаписване на променените" -#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140 +#: builtin/fetch.c:158 builtin/fetch.c:181 builtin/pull.c:141 msgid "on-demand" msgstr "ПРИ НУЖДА" -#: builtin/fetch.c:144 +#: builtin/fetch.c:159 msgid "control recursive fetching of submodules" msgstr "управление на рекурсивното доставяне на подмодулите" -#: builtin/fetch.c:148 builtin/pull.c:224 +#: builtin/fetch.c:163 builtin/pull.c:225 msgid "keep downloaded pack" msgstr "запазване на изтеглените пакети с обекти" -#: builtin/fetch.c:150 +#: builtin/fetch.c:165 msgid "allow updating of HEAD ref" msgstr "позволяване на обновяването на указателя „HEAD“" -#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227 +#: builtin/fetch.c:168 builtin/fetch.c:174 builtin/pull.c:228 msgid "deepen history of shallow clone" msgstr "задълбочаване на историята на плитко хранилище" -#: builtin/fetch.c:155 +#: builtin/fetch.c:170 msgid "deepen history of shallow repository based on time" msgstr "задълбочаване на историята на плитко хранилище до определено време" -#: builtin/fetch.c:161 builtin/pull.c:230 +#: builtin/fetch.c:176 builtin/pull.c:231 msgid "convert to a complete repository" msgstr "превръщане в пълно хранилище" -#: builtin/fetch.c:164 +#: builtin/fetch.c:179 msgid "prepend this to submodule path output" msgstr "добавяне на това пред пътя на подмодула" -#: builtin/fetch.c:167 +#: builtin/fetch.c:182 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -13163,90 +13220,90 @@ msgstr "" "стандартно рекурсивно изтегляне на подмодулите (файловете с настройки са с " "приоритет)" -#: builtin/fetch.c:171 builtin/pull.c:233 +#: builtin/fetch.c:186 builtin/pull.c:234 msgid "accept refs that update .git/shallow" msgstr "приемане на указатели, които обновяват „.git/shallow“" -#: builtin/fetch.c:172 builtin/pull.c:235 +#: builtin/fetch.c:187 builtin/pull.c:236 msgid "refmap" msgstr "КАРТА_С_УКАЗАТЕЛИ" -#: builtin/fetch.c:173 builtin/pull.c:236 +#: builtin/fetch.c:188 builtin/pull.c:237 msgid "specify fetch refmap" msgstr "указване на КАРТАта_С_УКАЗАТЕЛИ за доставяне" -#: builtin/fetch.c:180 +#: builtin/fetch.c:195 msgid "report that we have only objects reachable from this object" msgstr "докладване, че всички обекти могат са достижими при започване от този" -#: builtin/fetch.c:183 +#: builtin/fetch.c:198 msgid "run 'gc --auto' after fetching" msgstr "изпълняване на „gc --auto“ след доставяне" -#: builtin/fetch.c:185 builtin/pull.c:245 +#: builtin/fetch.c:200 builtin/pull.c:246 msgid "check for forced-updates on all updated branches" msgstr "проверка за принудителни обновявания на всички клони" -#: builtin/fetch.c:491 +#: builtin/fetch.c:510 msgid "Couldn't find remote ref HEAD" msgstr "Указателят „HEAD“ в отдалеченото хранилище не може да бъде открит" -#: builtin/fetch.c:630 +#: builtin/fetch.c:650 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "настройката „fetch.output“ е с неправилна стойност „%s“" -#: builtin/fetch.c:728 +#: builtin/fetch.c:748 #, c-format msgid "object %s not found" msgstr "обектът „%s“ липсва" -#: builtin/fetch.c:732 +#: builtin/fetch.c:752 msgid "[up to date]" msgstr "[актуализиран]" -#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833 +#: builtin/fetch.c:765 builtin/fetch.c:781 builtin/fetch.c:853 msgid "[rejected]" msgstr "[отхвърлен]" -#: builtin/fetch.c:746 +#: builtin/fetch.c:766 msgid "can't fetch in current branch" msgstr "в текущия клон не може да се доставя" -#: builtin/fetch.c:756 +#: builtin/fetch.c:776 msgid "[tag update]" msgstr "[обновяване на етикетите]" -#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816 -#: builtin/fetch.c:828 +#: builtin/fetch.c:777 builtin/fetch.c:814 builtin/fetch.c:836 +#: builtin/fetch.c:848 msgid "unable to update local ref" msgstr "локален указател не може да бъде обновен" -#: builtin/fetch.c:761 +#: builtin/fetch.c:781 msgid "would clobber existing tag" msgstr "съществуващ етикет ще бъде презаписан" -#: builtin/fetch.c:783 +#: builtin/fetch.c:803 msgid "[new tag]" msgstr "[нов етикет]" -#: builtin/fetch.c:786 +#: builtin/fetch.c:806 msgid "[new branch]" msgstr "[нов клон]" -#: builtin/fetch.c:789 +#: builtin/fetch.c:809 msgid "[new ref]" msgstr "[нов указател]" -#: builtin/fetch.c:828 +#: builtin/fetch.c:848 msgid "forced update" msgstr "принудително обновяване" -#: builtin/fetch.c:833 +#: builtin/fetch.c:853 msgid "non-fast-forward" msgstr "същинско сливане" -#: builtin/fetch.c:854 +#: builtin/fetch.c:874 msgid "" "Fetch normally indicates which branches had a forced update,\n" "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" @@ -13257,7 +13314,7 @@ msgstr "" "\n" " git config fetch.showForcedUpdates true" -#: builtin/fetch.c:858 +#: builtin/fetch.c:878 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -13271,24 +13328,24 @@ msgstr "" "\n" " git config fetch.showForcedUpdates false\n" -#: builtin/fetch.c:888 +#: builtin/fetch.c:908 #, c-format msgid "%s did not send all necessary objects\n" msgstr "хранилището „%s“ не изпрати всички необходими обекти\n" -#: builtin/fetch.c:909 +#: builtin/fetch.c:929 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" "отхвърляне на върха „%s“, защото плитките хранилища не могат да бъдат " "обновявани" -#: builtin/fetch.c:1000 builtin/fetch.c:1131 +#: builtin/fetch.c:1020 builtin/fetch.c:1157 #, c-format msgid "From %.*s\n" msgstr "От %.*s\n" -#: builtin/fetch.c:1011 +#: builtin/fetch.c:1031 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -13298,58 +13355,80 @@ msgstr "" "„git remote prune %s“, за да премахнете остарелите клони, които\n" "предизвикват конфликта" -#: builtin/fetch.c:1101 +#: builtin/fetch.c:1127 #, c-format msgid " (%s will become dangling)" msgstr " (обектът „%s“ ще се окаже извън клон)" -#: builtin/fetch.c:1102 +#: builtin/fetch.c:1128 #, c-format msgid " (%s has become dangling)" msgstr " (обектът „%s“ вече е извън клон)" -#: builtin/fetch.c:1134 +#: builtin/fetch.c:1160 msgid "[deleted]" msgstr "[изтрит]" -#: builtin/fetch.c:1135 builtin/remote.c:1036 +#: builtin/fetch.c:1161 builtin/remote.c:1036 msgid "(none)" msgstr "(нищо)" -#: builtin/fetch.c:1158 +#: builtin/fetch.c:1184 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Не може да доставите в текущия клон „%s“ на хранилище, което не е голо" -#: builtin/fetch.c:1177 +#: builtin/fetch.c:1203 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Стойността „%2$s“ за опцията „%1$s“ не е съвместима с „%3$s“" -#: builtin/fetch.c:1180 +#: builtin/fetch.c:1206 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Опцията „%s“ се прескача при „%s“\n" -#: builtin/fetch.c:1484 +#: builtin/fetch.c:1414 +msgid "multiple branch detected, incompatible with --set-upstream" +msgstr "" +"засечени са множество клони, това е несъвместимо с опцията „--set-upstream“" + +#: builtin/fetch.c:1429 +msgid "not setting upstream for a remote remote-tracking branch" +msgstr "не може да указвате клон за следене на отдалечен етикет" + +#: builtin/fetch.c:1431 +msgid "not setting upstream for a remote tag" +msgstr "не може да указвате клон за следене на отдалечен етикет" + +#: builtin/fetch.c:1433 +msgid "unknown branch type" +msgstr "непознат вид клон" + +#: builtin/fetch.c:1435 +msgid "" +"no source branch found.\n" +"you need to specify exactly one branch with the --set-upstream option." +msgstr "" +"не е открит клон за следене.\n" +"Трябва изрично да зададете един клон с опцията „--set-upstream option“." + +#: builtin/fetch.c:1561 builtin/fetch.c:1623 #, c-format msgid "Fetching %s\n" msgstr "Доставяне на „%s“\n" -#: builtin/fetch.c:1486 builtin/remote.c:100 +#: builtin/fetch.c:1571 builtin/fetch.c:1625 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "„%s“ не може да се достави" -#: builtin/fetch.c:1532 -msgid "" -"--filter can only be used with the remote configured in extensions." -"partialClone" -msgstr "" -"опцията „--filter“ може да се ползва само с отдалеченото хранилище указано в " -"настройката „extensions.partialClone“" +#: builtin/fetch.c:1583 +#, c-format +msgid "could not fetch '%s' (exit code: %d)\n" +msgstr "„%s“ не може да се достави (изходният код е: %d)\n" -#: builtin/fetch.c:1556 +#: builtin/fetch.c:1685 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -13357,45 +13436,45 @@ msgstr "" "Не сте указали отдалечено хранилище. Задайте или адрес, или име\n" "на отдалечено хранилище, откъдето да се доставят новите версии." -#: builtin/fetch.c:1593 +#: builtin/fetch.c:1722 msgid "You need to specify a tag name." msgstr "Трябва да укажете име на етикет." -#: builtin/fetch.c:1644 +#: builtin/fetch.c:1774 msgid "Negative depth in --deepen is not supported" msgstr "Отрицателна дълбочина като аргумент на „--deepen“ не се поддържа" -#: builtin/fetch.c:1646 +#: builtin/fetch.c:1776 msgid "--deepen and --depth are mutually exclusive" -msgstr "Опциите „--deepen“ и „--depth“ са несъвместими една с друга" +msgstr "опциите „--deepen“ и „--depth“ са несъвместими" -#: builtin/fetch.c:1651 +#: builtin/fetch.c:1781 msgid "--depth and --unshallow cannot be used together" msgstr "опциите „--depth“ и „--unshallow“ са несъвместими" -#: builtin/fetch.c:1653 +#: builtin/fetch.c:1783 msgid "--unshallow on a complete repository does not make sense" msgstr "не можете да използвате опцията „--unshallow“ върху пълно хранилище" -#: builtin/fetch.c:1669 +#: builtin/fetch.c:1799 msgid "fetch --all does not take a repository argument" msgstr "към „git fetch --all“ не можете да добавите аргумент — хранилище" -#: builtin/fetch.c:1671 +#: builtin/fetch.c:1801 msgid "fetch --all does not make sense with refspecs" msgstr "" "към „git fetch --all“ не можете да добавите аргумент — указател на версия" -#: builtin/fetch.c:1680 +#: builtin/fetch.c:1810 #, c-format msgid "No such remote or remote group: %s" msgstr "Няма нито отдалечено хранилище, нито група от хранилища на име „%s“" -#: builtin/fetch.c:1687 +#: builtin/fetch.c:1817 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Указването на група и указването на версия са несъвместими" -#: builtin/fetch.c:1703 +#: builtin/fetch.c:1835 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -13735,7 +13814,7 @@ msgstr "„%s“: липсващ обект" msgid "invalid parameter: expected sha1, got '%s'" msgstr "неправилен параметър: очаква се SHA1, а бе получено: „%s“" -#: builtin/gc.c:34 +#: builtin/gc.c:35 msgid "git gc [<options>]" msgstr "git gc [ОПЦИЯ…]" @@ -13749,17 +13828,17 @@ msgstr "Неуспешно изпълнение на „fstat“ върху „% msgid "failed to parse '%s' value '%s'" msgstr "стойността на „%s“ — „%s“ не може да се анализира" -#: builtin/gc.c:476 builtin/init-db.c:55 +#: builtin/gc.c:475 builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" msgstr "не може да се получи информация чрез „stat“ за директорията „%s“" -#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529 +#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529 #, c-format msgid "cannot read '%s'" msgstr "файлът „%s“ не може да бъде прочетен" -#: builtin/gc.c:492 +#: builtin/gc.c:491 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -13776,58 +13855,58 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:540 +#: builtin/gc.c:539 msgid "prune unreferenced objects" msgstr "окастряне на обектите, към които нищо не сочи" -#: builtin/gc.c:542 +#: builtin/gc.c:541 msgid "be more thorough (increased runtime)" msgstr "изчерпателно търсене на боклука (за сметка на повече време работа)" -#: builtin/gc.c:543 +#: builtin/gc.c:542 msgid "enable auto-gc mode" msgstr "включване на автоматичното събиране на боклука (auto-gc)" -#: builtin/gc.c:546 +#: builtin/gc.c:545 msgid "force running gc even if there may be another gc running" msgstr "" "изрично стартиране на събирането на боклука, дори и ако вече работи друго " "събиране" -#: builtin/gc.c:549 +#: builtin/gc.c:548 msgid "repack all other packs except the largest pack" msgstr "препакетиране на всичко без най-големия пакет" -#: builtin/gc.c:566 +#: builtin/gc.c:565 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "неразпозната стойност на „gc.logexpiry“ %s" -#: builtin/gc.c:577 +#: builtin/gc.c:576 #, c-format msgid "failed to parse prune expiry value %s" msgstr "неразпозната стойност на периода за окастряне: %s" -#: builtin/gc.c:597 +#: builtin/gc.c:596 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" "Автоматично пакетиране на заден фон на хранилището за по-добра " "производителност.\n" -#: builtin/gc.c:599 +#: builtin/gc.c:598 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Автоматично пакетиране на хранилището за по-добра производителност.\n" -#: builtin/gc.c:600 +#: builtin/gc.c:599 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "" "Погледнете ръководството за повече информация как да изпълните „git help " "gc“.\n" -#: builtin/gc.c:640 +#: builtin/gc.c:639 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -13836,7 +13915,7 @@ msgstr "" "процеса: %<PRIuMAX> (ако сте сигурни, че това не е вярно, това използвайте\n" "опцията „--force“)" -#: builtin/gc.c:695 +#: builtin/gc.c:694 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -13862,271 +13941,271 @@ msgstr "зададен е неправилен брой нишки (%d) за %s" #. grep.threads #. #: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727 -#: builtin/pack-objects.c:2728 +#: builtin/pack-objects.c:2708 #, c-format msgid "no threads support, ignoring %s" msgstr "липсва поддръжка за нишки. „%s“ ще се пренебрегне" -#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633 +#: builtin/grep.c:467 builtin/grep.c:592 builtin/grep.c:635 #, c-format msgid "unable to read tree (%s)" msgstr "дървото не може да бъде прочетено (%s)" -#: builtin/grep.c:648 +#: builtin/grep.c:650 #, c-format msgid "unable to grep from object of type %s" msgstr "не може да се изпълни „grep“ от обект от вида %s" -#: builtin/grep.c:714 +#: builtin/grep.c:716 #, c-format msgid "switch `%c' expects a numerical value" msgstr "опцията „%c“ очаква число за аргумент" -#: builtin/grep.c:813 +#: builtin/grep.c:815 msgid "search in index instead of in the work tree" msgstr "търсене в индекса, а не в работното дърво" -#: builtin/grep.c:815 +#: builtin/grep.c:817 msgid "find in contents not managed by git" msgstr "търсене и във файловете, които не са под управлението на git" -#: builtin/grep.c:817 +#: builtin/grep.c:819 msgid "search in both tracked and untracked files" msgstr "търсене и в следените, и в неследените файлове" -#: builtin/grep.c:819 +#: builtin/grep.c:821 msgid "ignore files specified via '.gitignore'" msgstr "игнориране на файловете указани в „.gitignore“" -#: builtin/grep.c:821 +#: builtin/grep.c:823 msgid "recursively search in each submodule" msgstr "рекурсивно търсене във всички подмодули" -#: builtin/grep.c:824 +#: builtin/grep.c:826 msgid "show non-matching lines" msgstr "извеждане на редовете, които не съвпадат" -#: builtin/grep.c:826 +#: builtin/grep.c:828 msgid "case insensitive matching" msgstr "без значение на регистъра на буквите (главни/малки)" -#: builtin/grep.c:828 +#: builtin/grep.c:830 msgid "match patterns only at word boundaries" msgstr "напасване на шаблоните само по границите на думите" -#: builtin/grep.c:830 +#: builtin/grep.c:832 msgid "process binary files as text" msgstr "обработване на двоичните файлове като текстови" -#: builtin/grep.c:832 +#: builtin/grep.c:834 msgid "don't match patterns in binary files" msgstr "прескачане на двоичните файлове" -#: builtin/grep.c:835 +#: builtin/grep.c:837 msgid "process binary files with textconv filters" msgstr "" "обработване на двоичните файлове чрез филтри за преобразуване към текст" -#: builtin/grep.c:837 +#: builtin/grep.c:839 msgid "search in subdirectories (default)" msgstr "търсене в поддиректориите (стандартно)" -#: builtin/grep.c:839 +#: builtin/grep.c:841 msgid "descend at most <depth> levels" msgstr "навлизане максимално на тази ДЪЛБОЧИНА в дървото" -#: builtin/grep.c:843 +#: builtin/grep.c:845 msgid "use extended POSIX regular expressions" msgstr "разширени регулярни изрази по POSIX" -#: builtin/grep.c:846 +#: builtin/grep.c:848 msgid "use basic POSIX regular expressions (default)" msgstr "основни регулярни изрази по POSIX (стандартно)" -#: builtin/grep.c:849 +#: builtin/grep.c:851 msgid "interpret patterns as fixed strings" msgstr "шаблоните са дословни низове" -#: builtin/grep.c:852 +#: builtin/grep.c:854 msgid "use Perl-compatible regular expressions" msgstr "регулярни изрази на Perl" -#: builtin/grep.c:855 +#: builtin/grep.c:857 msgid "show line numbers" msgstr "извеждане на номерата на редовете" -#: builtin/grep.c:856 +#: builtin/grep.c:858 msgid "show column number of first match" msgstr "извеждане на номера на колоната на първото напасване" -#: builtin/grep.c:857 +#: builtin/grep.c:859 msgid "don't show filenames" msgstr "без извеждане на имената на файловете" -#: builtin/grep.c:858 +#: builtin/grep.c:860 msgid "show filenames" msgstr "извеждане на имената на файловете" -#: builtin/grep.c:860 +#: builtin/grep.c:862 msgid "show filenames relative to top directory" msgstr "" "извеждане на относителните имена на файловете спрямо основната директория на " "хранилището" -#: builtin/grep.c:862 +#: builtin/grep.c:864 msgid "show only filenames instead of matching lines" msgstr "извеждане само на имената на файловете без напасващите редове" -#: builtin/grep.c:864 +#: builtin/grep.c:866 msgid "synonym for --files-with-matches" msgstr "псевдоним на „--files-with-matches“" -#: builtin/grep.c:867 +#: builtin/grep.c:869 msgid "show only the names of files without match" msgstr "" "извеждане само на имената на файловете, които не съдържат ред, напасващ на " "шаблона" -#: builtin/grep.c:869 +#: builtin/grep.c:871 msgid "print NUL after filenames" msgstr "извеждане на нулевия знак „NUL“ след всяко име на файл" -#: builtin/grep.c:872 +#: builtin/grep.c:874 msgid "show only matching parts of a line" msgstr "извеждане само на частите на редовете, които съвпадат" -#: builtin/grep.c:874 +#: builtin/grep.c:876 msgid "show the number of matches instead of matching lines" msgstr "извеждане на броя на съвпаденията вместо напасващите редове" -#: builtin/grep.c:875 +#: builtin/grep.c:877 msgid "highlight matches" msgstr "оцветяване на напасванията" -#: builtin/grep.c:877 +#: builtin/grep.c:879 msgid "print empty line between matches from different files" msgstr "извеждане на празен ред между напасванията от различни файлове" -#: builtin/grep.c:879 +#: builtin/grep.c:881 msgid "show filename only once above matches from same file" msgstr "" "извеждане на името на файла само веднъж за всички напасвания от този файл" -#: builtin/grep.c:882 +#: builtin/grep.c:884 msgid "show <n> context lines before and after matches" msgstr "извеждане на такъв БРОЙ редове преди и след напасванията" -#: builtin/grep.c:885 +#: builtin/grep.c:887 msgid "show <n> context lines before matches" msgstr "извеждане на такъв БРОЙ редове преди напасванията" -#: builtin/grep.c:887 +#: builtin/grep.c:889 msgid "show <n> context lines after matches" msgstr "извеждане на такъв БРОЙ редове след напасванията" -#: builtin/grep.c:889 +#: builtin/grep.c:891 msgid "use <n> worker threads" msgstr "използване на такъв БРОЙ работещи нишки" -#: builtin/grep.c:890 +#: builtin/grep.c:892 msgid "shortcut for -C NUM" msgstr "псевдоним на „-C БРОЙ“" -#: builtin/grep.c:893 +#: builtin/grep.c:895 msgid "show a line with the function name before matches" msgstr "извеждане на ред с името на функцията, в която е напаснат шаблона" -#: builtin/grep.c:895 +#: builtin/grep.c:897 msgid "show the surrounding function" msgstr "извеждане на обхващащата функция" -#: builtin/grep.c:898 +#: builtin/grep.c:900 msgid "read patterns from file" msgstr "изчитане на шаблоните от ФАЙЛ" -#: builtin/grep.c:900 +#: builtin/grep.c:902 msgid "match <pattern>" msgstr "напасване на ШАБЛОН" -#: builtin/grep.c:902 +#: builtin/grep.c:904 msgid "combine patterns specified with -e" msgstr "комбиниране на шаблоните указани с опцията „-e“" -#: builtin/grep.c:914 +#: builtin/grep.c:916 msgid "indicate hit with exit status without output" msgstr "" "без извеждане на стандартния изход. Изходният код указва наличието на " "напасване" -#: builtin/grep.c:916 +#: builtin/grep.c:918 msgid "show only matches from files that match all patterns" msgstr "" "извеждане на редове само от файловете, които напасват на всички шаблони" -#: builtin/grep.c:918 +#: builtin/grep.c:920 msgid "show parse tree for grep expression" msgstr "извеждане на дървото за анализ на регулярния израз" -#: builtin/grep.c:922 +#: builtin/grep.c:924 msgid "pager" msgstr "програма за преглед по страници" -#: builtin/grep.c:922 +#: builtin/grep.c:924 msgid "show matching files in the pager" msgstr "извеждане на съвпадащите файлове в програма за преглед по страници" -#: builtin/grep.c:926 +#: builtin/grep.c:928 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" "позволяване на стартирането на grep(1) (текущият компилат пренебрегва тази " "опция)" -#: builtin/grep.c:990 +#: builtin/grep.c:992 msgid "no pattern given" msgstr "не сте задали шаблон" -#: builtin/grep.c:1026 +#: builtin/grep.c:1028 msgid "--no-index or --untracked cannot be used with revs" msgstr "опциите „--cached“ и „--untracked“ са несъвместими с версии." -#: builtin/grep.c:1034 +#: builtin/grep.c:1036 #, c-format msgid "unable to resolve revision: %s" msgstr "версията „%s“ не може бъде открита" -#: builtin/grep.c:1065 +#: builtin/grep.c:1067 msgid "invalid option combination, ignoring --threads" msgstr "неправилна комбинация от опции, „--threads“ ще се пренебрегне" -#: builtin/grep.c:1068 builtin/pack-objects.c:3416 +#: builtin/grep.c:1070 builtin/pack-objects.c:3400 msgid "no threads support, ignoring --threads" msgstr "липсва поддръжка за нишки. „--threads“ ще се пренебрегне" -#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725 +#: builtin/grep.c:1073 builtin/index-pack.c:1531 builtin/pack-objects.c:2705 #, c-format msgid "invalid number of threads specified (%d)" msgstr "зададен е неправилен брой нишки: %d" -#: builtin/grep.c:1094 +#: builtin/grep.c:1096 msgid "--open-files-in-pager only works on the worktree" msgstr "" "опцията „--open-files-in-pager“ е съвместима само с търсене в работното дърво" -#: builtin/grep.c:1117 +#: builtin/grep.c:1119 msgid "option not supported with --recurse-submodules" msgstr "опцията е несъвместима с „--recurse-submodules“" -#: builtin/grep.c:1123 +#: builtin/grep.c:1125 msgid "--cached or --untracked cannot be used with --no-index" msgstr "опциите „--cached“ и „--untracked“ са несъвместими с „--no-index“" -#: builtin/grep.c:1129 +#: builtin/grep.c:1131 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "" "опциите „--(no-)exclude-standard“ са несъвместими с търсене по следени " "файлове" -#: builtin/grep.c:1137 +#: builtin/grep.c:1139 msgid "both --cached and trees are given" msgstr "опцията „--cached“ е несъвместима със задаване на дърво" @@ -14446,7 +14525,7 @@ msgstr "" msgid "Resolving deltas" msgstr "Откриване на съответните разлики" -#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497 +#: builtin/index-pack.c:1205 builtin/pack-objects.c:2481 #, c-format msgid "unable to create thread: %s" msgstr "не може да се създаде нишка: %s" @@ -14516,7 +14595,7 @@ msgstr "пакетният файл не може да бъде запазен" msgid "cannot store index file" msgstr "файлът за индекса не може да бъде съхранен" -#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736 +#: builtin/index-pack.c:1525 builtin/pack-objects.c:2716 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "зададена е неправилна версия пакетиране: „pack.indexversion=%<PRIu32>“" @@ -14804,74 +14883,74 @@ msgstr "Резултат: %d %s\n" msgid "git show %s: bad file" msgstr "git show %s: повреден файл" -#: builtin/log.c:549 builtin/log.c:643 +#: builtin/log.c:549 builtin/log.c:644 #, c-format msgid "could not read object %s" msgstr "обектът не може да бъде прочетен: %s" -#: builtin/log.c:668 +#: builtin/log.c:669 #, c-format msgid "unknown type: %d" msgstr "неизвестен вид: %d" -#: builtin/log.c:791 +#: builtin/log.c:792 msgid "format.headers without value" msgstr "не е зададена стойност на „format.headers“" -#: builtin/log.c:908 +#: builtin/log.c:909 msgid "name of output directory is too long" msgstr "прекалено дълго име на директорията за изходната информация" -#: builtin/log.c:924 +#: builtin/log.c:925 #, c-format msgid "cannot open patch file %s" msgstr "файлът-кръпка „%s“ не може да бъде отворен" -#: builtin/log.c:941 +#: builtin/log.c:942 msgid "need exactly one range" msgstr "трябва да зададете точно един диапазон" -#: builtin/log.c:951 +#: builtin/log.c:952 msgid "not a range" msgstr "не е диапазон" -#: builtin/log.c:1074 +#: builtin/log.c:1075 msgid "cover letter needs email format" msgstr "придружаващото писмо трябва да е форматирано като е-писмо" -#: builtin/log.c:1080 +#: builtin/log.c:1081 msgid "failed to create cover-letter file" msgstr "неуспешно създаване на придружаващо писмо" -#: builtin/log.c:1159 +#: builtin/log.c:1160 #, c-format msgid "insane in-reply-to: %s" msgstr "неправилен формат на заглавната част за отговор „in-reply-to“: %s" -#: builtin/log.c:1186 +#: builtin/log.c:1187 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [ОПЦИЯ…] [ОТ | ДИАПАЗОН_НА_ВЕРСИИТЕ]" -#: builtin/log.c:1244 +#: builtin/log.c:1245 msgid "two output directories?" msgstr "може да укажете максимум една директория за изход" -#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113 +#: builtin/log.c:1356 builtin/log.c:2116 builtin/log.c:2118 builtin/log.c:2130 #, c-format msgid "unknown commit %s" msgstr "непознато подаване: „%s“" -#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1366 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:1370 +#: builtin/log.c:1371 msgid "could not find exact merge base" msgstr "точната база за сливане не може да бъде открита" -#: builtin/log.c:1374 +#: builtin/log.c:1375 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" @@ -14881,281 +14960,281 @@ msgstr "" "зададете, използвайте „git branch --set-upstream-to“.\n" "Можете ръчно да зададете базово подаване чрез „--base=<base-commit-id>“." -#: builtin/log.c:1394 +#: builtin/log.c:1395 msgid "failed to find exact merge base" msgstr "точната база при сливане не може да бъде открита" -#: builtin/log.c:1405 +#: builtin/log.c:1406 msgid "base commit should be the ancestor of revision list" msgstr "базовото подаване трябва да е предшественикът на списъка с версиите" -#: builtin/log.c:1409 +#: builtin/log.c:1410 msgid "base commit shouldn't be in revision list" msgstr "базовото подаване не може да е в списъка с версиите" -#: builtin/log.c:1462 +#: builtin/log.c:1463 msgid "cannot get patch id" msgstr "идентификаторът на кръпката не може да бъде получен" -#: builtin/log.c:1514 +#: builtin/log.c:1515 msgid "failed to infer range-diff ranges" msgstr "неуспешно определяне на диапазоните за разлика" -#: builtin/log.c:1559 +#: builtin/log.c:1560 msgid "use [PATCH n/m] even with a single patch" msgstr "номерация „[PATCH n/m]“ дори и при единствена кръпка" -#: builtin/log.c:1562 +#: builtin/log.c:1563 msgid "use [PATCH] even with multiple patches" msgstr "номерация „[PATCH]“ дори и при множество кръпки" -#: builtin/log.c:1566 +#: builtin/log.c:1567 msgid "print patches to standard out" msgstr "извеждане на кръпките на стандартния изход" -#: builtin/log.c:1568 +#: builtin/log.c:1569 msgid "generate a cover letter" msgstr "създаване на придружаващо писмо" -#: builtin/log.c:1570 +#: builtin/log.c:1571 msgid "use simple number sequence for output file names" msgstr "проста числова последователност за имената на файловете-кръпки" -#: builtin/log.c:1571 +#: builtin/log.c:1572 msgid "sfx" msgstr "ЗНАЦИ" -#: builtin/log.c:1572 +#: builtin/log.c:1573 msgid "use <sfx> instead of '.patch'" msgstr "използване на тези ЗНАЦИ за суфикс вместо „.patch“" -#: builtin/log.c:1574 +#: builtin/log.c:1575 msgid "start numbering patches at <n> instead of 1" msgstr "номерирането на кръпките да започва от този БРОЙ, а не с 1" -#: builtin/log.c:1576 +#: builtin/log.c:1577 msgid "mark the series as Nth re-roll" msgstr "отбелязване, че това е N-тата поредна редакция на поредицата от кръпки" -#: builtin/log.c:1578 +#: builtin/log.c:1579 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Използване на „[RFC PATCH]“ вместо „[PATCH]“" -#: builtin/log.c:1581 +#: builtin/log.c:1582 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Използване на този „[ПРЕФИКС]“ вместо „[PATCH]“" -#: builtin/log.c:1584 +#: builtin/log.c:1585 msgid "store resulting files in <dir>" msgstr "запазване на изходните файлове в тази ДИРЕКТОРИЯ" -#: builtin/log.c:1587 +#: builtin/log.c:1588 msgid "don't strip/add [PATCH]" msgstr "без добавяне/махане на префикса „[PATCH]“" -#: builtin/log.c:1590 +#: builtin/log.c:1591 msgid "don't output binary diffs" msgstr "без извеждане на разлики между двоични файлове" -#: builtin/log.c:1592 +#: builtin/log.c:1593 msgid "output all-zero hash in From header" msgstr "в заглавната част „From:“ (от) контролната сума да е само от нули" -#: builtin/log.c:1594 +#: builtin/log.c:1595 msgid "don't include a patch matching a commit upstream" msgstr "без кръпки, които присъстват в следения клон" -#: builtin/log.c:1596 +#: builtin/log.c:1597 msgid "show patch format instead of default (patch + stat)" msgstr "" "извеждане във формат за кръпки, а на в стандартния (кръпка и статистика)" -#: builtin/log.c:1598 +#: builtin/log.c:1599 msgid "Messaging" msgstr "Опции при изпращане" -#: builtin/log.c:1599 +#: builtin/log.c:1600 msgid "header" msgstr "ЗАГЛАВНА_ЧАСТ" -#: builtin/log.c:1600 +#: builtin/log.c:1601 msgid "add email header" msgstr "добавяне на тази ЗАГЛАВНА_ЧАСТ" -#: builtin/log.c:1601 builtin/log.c:1603 +#: builtin/log.c:1602 builtin/log.c:1604 msgid "email" msgstr "Е-ПОЩА" -#: builtin/log.c:1601 +#: builtin/log.c:1602 msgid "add To: header" msgstr "добавяне на заглавна част „To:“ (до)" -#: builtin/log.c:1603 +#: builtin/log.c:1604 msgid "add Cc: header" msgstr "добавяне на заглавна част „Cc:“ (и до)" -#: builtin/log.c:1605 +#: builtin/log.c:1606 msgid "ident" msgstr "ИДЕНТИЧНОСТ" -#: builtin/log.c:1606 +#: builtin/log.c:1607 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "задаване на адреса в заглавната част „From“ (от) да е тази ИДЕНТИЧНОСТ. Ако " "не е зададена такава, се взима адреса на подаващия" -#: builtin/log.c:1608 +#: builtin/log.c:1609 msgid "message-id" msgstr "ИДЕНТИФИКАТОР_НА_СЪОБЩЕНИЕ" -#: builtin/log.c:1609 +#: builtin/log.c:1610 msgid "make first mail a reply to <message-id>" msgstr "" "първото съобщение да е в отговор на е-писмото с този " "ИДЕНТИФИКАТОР_НА_СЪОБЩЕНИЕ" -#: builtin/log.c:1610 builtin/log.c:1613 +#: builtin/log.c:1611 builtin/log.c:1614 msgid "boundary" msgstr "граница" -#: builtin/log.c:1611 +#: builtin/log.c:1612 msgid "attach the patch" msgstr "прикрепяне на кръпката" -#: builtin/log.c:1614 +#: builtin/log.c:1615 msgid "inline the patch" msgstr "включване на кръпката в текста на писмата" -#: builtin/log.c:1618 +#: builtin/log.c:1619 msgid "enable message threading, styles: shallow, deep" msgstr "" "използване на нишки за съобщенията. СТИЛът е „shallow“ (плитък) или " "„deep“ (дълбок)" -#: builtin/log.c:1620 +#: builtin/log.c:1621 msgid "signature" msgstr "подпис" -#: builtin/log.c:1621 +#: builtin/log.c:1622 msgid "add a signature" msgstr "добавяне на поле за подпис" -#: builtin/log.c:1622 +#: builtin/log.c:1623 msgid "base-commit" msgstr "БАЗОВО_ПОДАВАНЕ" -#: builtin/log.c:1623 +#: builtin/log.c:1624 msgid "add prerequisite tree info to the patch series" msgstr "добавяне на необходимото БАЗово дърво към поредицата от кръпки" -#: builtin/log.c:1625 +#: builtin/log.c:1626 msgid "add a signature from a file" msgstr "добавяне на подпис от файл" -#: builtin/log.c:1626 +#: builtin/log.c:1627 msgid "don't print the patch filenames" msgstr "без извеждане на имената на кръпките" -#: builtin/log.c:1628 +#: builtin/log.c:1629 msgid "show progress while generating patches" msgstr "извеждане на напредъка във фазата на създаване на кръпките" -#: builtin/log.c:1630 +#: builtin/log.c:1631 msgid "show changes against <rev> in cover letter or single patch" msgstr "" "показване на промените спрямо ВЕРСията в придружаващото писмо или единствена " "кръпка" -#: builtin/log.c:1633 +#: builtin/log.c:1634 msgid "show changes against <refspec> in cover letter or single patch" msgstr "" "показване на промените спрямо указателя на ВЕРСията в придружаващото писмо " "или единствена кръпка" -#: builtin/log.c:1635 +#: builtin/log.c:1636 msgid "percentage by which creation is weighted" msgstr "процент за претегляне при оценка на създаването" -#: builtin/log.c:1710 +#: builtin/log.c:1711 #, c-format msgid "invalid ident line: %s" msgstr "грешна идентичност: %s" -#: builtin/log.c:1725 +#: builtin/log.c:1726 msgid "-n and -k are mutually exclusive" msgstr "опциите „-n“ и „-k“ са несъвместими" -#: builtin/log.c:1727 +#: builtin/log.c:1728 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "опциите „--subject-prefix“/„-rfc“ и „-k“ са несъвместими" -#: builtin/log.c:1735 +#: builtin/log.c:1736 msgid "--name-only does not make sense" msgstr "опцията „--name-only“ е несъвместима с генерирането на кръпки" -#: builtin/log.c:1737 +#: builtin/log.c:1738 msgid "--name-status does not make sense" msgstr "опцията „--name-status“ е несъвместима с генерирането на кръпки" -#: builtin/log.c:1739 +#: builtin/log.c:1740 msgid "--check does not make sense" msgstr "опцията „--check“ е несъвместима с генерирането на кръпки" -#: builtin/log.c:1771 +#: builtin/log.c:1773 msgid "standard output, or directory, which one?" msgstr "" "изходът може да или стандартният, или да е в директория, но не и двете." -#: builtin/log.c:1860 +#: builtin/log.c:1877 msgid "--interdiff requires --cover-letter or single patch" msgstr "" "опцията „--interdiff“ изисква опция „--cover-letter“ или единствена кръпка" -#: builtin/log.c:1864 +#: builtin/log.c:1881 msgid "Interdiff:" msgstr "Разлика в разликите:" -#: builtin/log.c:1865 +#: builtin/log.c:1882 #, c-format msgid "Interdiff against v%d:" msgstr "Разлика в разликите спрямо v%d:" -#: builtin/log.c:1871 +#: builtin/log.c:1888 msgid "--creation-factor requires --range-diff" msgstr "опцията „--creation-factor“ изисква опция „--range-diff“" -#: builtin/log.c:1875 +#: builtin/log.c:1892 msgid "--range-diff requires --cover-letter or single patch" msgstr "" "опцията „--range-diff“ изисква опция „--cover-letter“ или единствена кръпка" -#: builtin/log.c:1883 +#: builtin/log.c:1900 msgid "Range-diff:" msgstr "Диапазонна разлика:" -#: builtin/log.c:1884 +#: builtin/log.c:1901 #, c-format msgid "Range-diff against v%d:" msgstr "Диапазонна разлика спрямо v%d:" -#: builtin/log.c:1895 +#: builtin/log.c:1912 #, c-format msgid "unable to read signature file '%s'" msgstr "файлът „%s“ с подпис не може да бъде прочетен" -#: builtin/log.c:1931 +#: builtin/log.c:1948 msgid "Generating patches" msgstr "Създаване на кръпки" -#: builtin/log.c:1975 +#: builtin/log.c:1992 msgid "failed to create output files" msgstr "неуспешно създаване на изходни файлове" -#: builtin/log.c:2034 +#: builtin/log.c:2051 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [ОТДАЛЕЧЕН_КЛОН [ВРЪХ [ПРЕДЕЛ]]]" -#: builtin/log.c:2088 +#: builtin/log.c:2105 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -15283,7 +15362,7 @@ msgstr "" msgid "do not print remote URL" msgstr "без извеждане на адресите на отдалечените хранилища" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1488 msgid "exec" msgstr "КОМАНДА" @@ -15394,33 +15473,33 @@ msgstr "Наличните стратегии са:" msgid "Available custom strategies are:" msgstr "Допълнителните стратегии са:" -#: builtin/merge.c:244 builtin/pull.c:151 +#: builtin/merge.c:244 builtin/pull.c:152 msgid "do not show a diffstat at the end of the merge" msgstr "без извеждане на статистиката след завършване на сливане" -#: builtin/merge.c:247 builtin/pull.c:154 +#: builtin/merge.c:247 builtin/pull.c:155 msgid "show a diffstat at the end of the merge" msgstr "извеждане на статистиката след завършване на сливане" -#: builtin/merge.c:248 builtin/pull.c:157 +#: builtin/merge.c:248 builtin/pull.c:158 msgid "(synonym to --stat)" msgstr "(псевдоним на „--stat“)" -#: builtin/merge.c:250 builtin/pull.c:160 +#: builtin/merge.c:250 builtin/pull.c:161 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "добавяне (на максимум такъв БРОЙ) записи от съкратения журнал в съобщението " "за подаване" -#: builtin/merge.c:253 builtin/pull.c:166 +#: builtin/merge.c:253 builtin/pull.c:167 msgid "create a single commit instead of doing a merge" msgstr "създаване на едно подаване вместо извършване на сливане" -#: builtin/merge.c:255 builtin/pull.c:169 +#: builtin/merge.c:255 builtin/pull.c:170 msgid "perform a commit if the merge succeeds (default)" msgstr "извършване на подаване при успешно сливане (стандартно действие)" -#: builtin/merge.c:257 builtin/pull.c:172 +#: builtin/merge.c:257 builtin/pull.c:173 msgid "edit message before committing" msgstr "редактиране на съобщението преди подаване" @@ -15428,28 +15507,28 @@ msgstr "редактиране на съобщението преди подав msgid "allow fast-forward (default)" msgstr "позволяване на превъртане (стандартно действие)" -#: builtin/merge.c:261 builtin/pull.c:179 +#: builtin/merge.c:261 builtin/pull.c:180 msgid "abort if fast-forward is not possible" msgstr "преустановяване, ако превъртането е невъзможно" -#: builtin/merge.c:265 builtin/pull.c:182 +#: builtin/merge.c:265 builtin/pull.c:183 msgid "verify that the named commit has a valid GPG signature" msgstr "проверка, че указаното подаване е с правилен подпис на GPG" -#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186 -#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114 +#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:187 +#: builtin/rebase.c:493 builtin/rebase.c:1501 builtin/revert.c:114 msgid "strategy" msgstr "СТРАТЕГИЯ" -#: builtin/merge.c:267 builtin/pull.c:187 +#: builtin/merge.c:267 builtin/pull.c:188 msgid "merge strategy to use" msgstr "СТРАТЕГИЯ за сливане, която да се ползва" -#: builtin/merge.c:268 builtin/pull.c:190 +#: builtin/merge.c:268 builtin/pull.c:191 msgid "option=value" msgstr "ОПЦИЯ=СТОЙНОСТ" -#: builtin/merge.c:269 builtin/pull.c:191 +#: builtin/merge.c:269 builtin/pull.c:192 msgid "option for selected merge strategy" msgstr "ОПЦИЯ за избраната стратегия за сливане" @@ -15469,14 +15548,15 @@ msgstr "преустановяване без промяна на индекса msgid "continue the current in-progress merge" msgstr "продължаване на текущото сливане" -#: builtin/merge.c:284 builtin/pull.c:198 +#: builtin/merge.c:284 builtin/pull.c:199 msgid "allow merging unrelated histories" msgstr "позволяване на сливане на независими истории" #: builtin/merge.c:290 -msgid "verify commit-msg hook" +msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "" -"проверка на куката при промяна на съобщението при подаване (commit-msg)" +"без изпълнение на куките преди подаване и сливане и при промяна на " +"съобщението за подаване (pre-merge-commit и commit-msg)" #: builtin/merge.c:307 msgid "could not run stash." @@ -15520,33 +15600,33 @@ msgstr "„%s“ не сочи към подаване" msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Неправилен низ за настройката „branch.%s.mergeoptions“: „%s“" -#: builtin/merge.c:708 +#: builtin/merge.c:705 msgid "Not handling anything other than two heads merge." msgstr "Поддържа се само сливане на точно две истории." -#: builtin/merge.c:722 +#: builtin/merge.c:719 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Непозната опция за рекурсивното сливане „merge-recursive“: „-X%s“" -#: builtin/merge.c:737 +#: builtin/merge.c:734 #, c-format msgid "unable to write %s" msgstr "„%s“ не може да бъде записан" -#: builtin/merge.c:789 +#: builtin/merge.c:786 #, c-format msgid "Could not read from '%s'" msgstr "От „%s“ не може да се чете" -#: builtin/merge.c:798 +#: builtin/merge.c:795 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Сливането няма да бъде подадено. За завършването му и подаването му " "използвайте командата „git commit“.\n" -#: builtin/merge.c:804 +#: builtin/merge.c:801 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" @@ -15555,11 +15635,11 @@ msgstr "" "В съобщението при подаване добавете информация за причината за\n" "сливането, особено ако сливате обновен отдалечен клон в тематичен клон.\n" -#: builtin/merge.c:809 +#: builtin/merge.c:806 msgid "An empty message aborts the commit.\n" msgstr "Празно съобщение предотвратява подаването.\n" -#: builtin/merge.c:812 +#: builtin/merge.c:809 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -15568,76 +15648,76 @@ msgstr "" "Редовете, които започват с „%c“, ще бъдат пропуснати, а празно\n" "съобщение преустановява подаването.\n" -#: builtin/merge.c:853 +#: builtin/merge.c:862 msgid "Empty commit message." msgstr "Празно съобщение при подаване." -#: builtin/merge.c:872 +#: builtin/merge.c:877 #, c-format msgid "Wonderful.\n" msgstr "Първият етап на сливането завърши.\n" -#: builtin/merge.c:933 +#: builtin/merge.c:938 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Неуспешно автоматично сливане — коригирайте конфликтите и подайте " "резултата.\n" -#: builtin/merge.c:972 +#: builtin/merge.c:977 msgid "No current branch." msgstr "Няма текущ клон." -#: builtin/merge.c:974 +#: builtin/merge.c:979 msgid "No remote for the current branch." msgstr "Текущият клон не следи никой." -#: builtin/merge.c:976 +#: builtin/merge.c:981 msgid "No default upstream defined for the current branch." msgstr "Текущият клон не следи никой клон." -#: builtin/merge.c:981 +#: builtin/merge.c:986 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Никой клон не следи клона „%s“ от хранилището „%s“" -#: builtin/merge.c:1038 +#: builtin/merge.c:1043 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Неправилна стойност „%s“ в средата „%s“" -#: builtin/merge.c:1141 +#: builtin/merge.c:1146 #, c-format msgid "not something we can merge in %s: %s" msgstr "не може да се слее в „%s“: %s" -#: builtin/merge.c:1175 +#: builtin/merge.c:1180 msgid "not something we can merge" msgstr "не може да се слее" -#: builtin/merge.c:1278 +#: builtin/merge.c:1283 msgid "--abort expects no arguments" msgstr "опцията „--abort“ не приема аргументи" -#: builtin/merge.c:1282 +#: builtin/merge.c:1287 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" "Не може да преустановите сливане, защото в момента не се извършва такова " "(липсва указател „MERGE_HEAD“)." -#: builtin/merge.c:1291 +#: builtin/merge.c:1296 msgid "--quit expects no arguments" msgstr "опцията „--quit“ не приема аргументи" -#: builtin/merge.c:1304 +#: builtin/merge.c:1309 msgid "--continue expects no arguments" msgstr "опцията „--continue“ не приема аргументи" -#: builtin/merge.c:1308 +#: builtin/merge.c:1313 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "В момента не се извършва сливане (липсва указател „MERGE_HEAD“)." -#: builtin/merge.c:1324 +#: builtin/merge.c:1329 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15645,7 +15725,7 @@ msgstr "" "Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува).\n" "Подайте промените си, преди да започнете ново сливане." -#: builtin/merge.c:1331 +#: builtin/merge.c:1336 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15653,103 +15733,103 @@ msgstr "" "Не сте завършили отбиране на подаване (указателят „CHERRY_PICK_HEAD“\n" "съществува). Подайте промените си, преди да започнете ново сливане." -#: builtin/merge.c:1334 +#: builtin/merge.c:1339 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" "Не сте завършили отбиране на подаване (указателят „CHERRY_PICK_HEAD“\n" "съществува)." -#: builtin/merge.c:1348 +#: builtin/merge.c:1353 msgid "You cannot combine --squash with --no-ff." msgstr "Опцията „--squash“ е несъвместима с „--no-ff“." -#: builtin/merge.c:1350 +#: builtin/merge.c:1355 msgid "You cannot combine --squash with --commit." msgstr "Опцията „--squash“ е несъвместима с „--commit“." -#: builtin/merge.c:1366 +#: builtin/merge.c:1371 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "Не е указано подаване и настройката „merge.defaultToUpstream“ не е зададена." -#: builtin/merge.c:1383 +#: builtin/merge.c:1388 msgid "Squash commit into empty head not supported yet" msgstr "Вкарване на подаване във връх без история все още не се поддържа" -#: builtin/merge.c:1385 +#: builtin/merge.c:1390 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" "Понеже върхът е без история, всички сливания са превъртания, не може да се " "извърши същинско сливане изисквано от опцията „--no-ff“" -#: builtin/merge.c:1390 +#: builtin/merge.c:1395 #, c-format msgid "%s - not something we can merge" msgstr "„%s“ — не е нещо, което може да се слее" -#: builtin/merge.c:1392 +#: builtin/merge.c:1397 msgid "Can merge only exactly one commit into empty head" msgstr "Можете да слеете точно едно подаване във връх без история" -#: builtin/merge.c:1471 +#: builtin/merge.c:1476 msgid "refusing to merge unrelated histories" msgstr "независими истории не може да се слеят" -#: builtin/merge.c:1480 +#: builtin/merge.c:1485 msgid "Already up to date." msgstr "Вече е обновено." -#: builtin/merge.c:1490 +#: builtin/merge.c:1495 #, c-format msgid "Updating %s..%s\n" msgstr "Обновяване „%s..%s“\n" -#: builtin/merge.c:1532 +#: builtin/merge.c:1537 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Проба със сливане в рамките на индекса…\n" -#: builtin/merge.c:1539 +#: builtin/merge.c:1544 #, c-format msgid "Nope.\n" msgstr "Неуспешно сливане.\n" -#: builtin/merge.c:1564 +#: builtin/merge.c:1569 msgid "Already up to date. Yeeah!" msgstr "Вече е обновено!" -#: builtin/merge.c:1570 +#: builtin/merge.c:1575 msgid "Not possible to fast-forward, aborting." msgstr "Не може да се извърши превъртане, преустановяване на действието." -#: builtin/merge.c:1593 builtin/merge.c:1658 +#: builtin/merge.c:1598 builtin/merge.c:1663 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Привеждане на дървото към първоначалното…\n" -#: builtin/merge.c:1597 +#: builtin/merge.c:1602 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Пробване със стратегията за сливане „%s“…\n" -#: builtin/merge.c:1649 +#: builtin/merge.c:1654 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Никоя стратегия за сливане не може да извърши сливането.\n" -#: builtin/merge.c:1651 +#: builtin/merge.c:1656 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Неуспешно сливане със стратегия „%s“.\n" -#: builtin/merge.c:1660 +#: builtin/merge.c:1665 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" "Ползва се стратегията „%s“, която ще подготви дървото за коригиране на " "ръка.\n" -#: builtin/merge.c:1672 +#: builtin/merge.c:1677 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -15837,33 +15917,33 @@ msgstr "без предупреждения при конфликти" msgid "set labels for file1/orig-file/file2" msgstr "задаване на етикети за ФАЙЛ_1/ОРИГИНАЛ/ФАЙЛ_2" -#: builtin/merge-recursive.c:46 +#: builtin/merge-recursive.c:47 #, c-format msgid "unknown option %s" msgstr "непозната опция: „%s“" -#: builtin/merge-recursive.c:52 +#: builtin/merge-recursive.c:53 #, c-format msgid "could not parse object '%s'" msgstr "неуспешен анализ на обекта „%s“" -#: builtin/merge-recursive.c:56 +#: builtin/merge-recursive.c:57 #, c-format msgid "cannot handle more than %d base. Ignoring %s." msgid_plural "cannot handle more than %d bases. Ignoring %s." msgstr[0] "не се поддържа повече от %d база. „%s“ се прескача." msgstr[1] "не се поддържат повече от %d бази. „%s“ се прескача." -#: builtin/merge-recursive.c:64 +#: builtin/merge-recursive.c:65 msgid "not handling anything other than two heads merge." msgstr "поддържа се само сливане на точно две истории." -#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72 +#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76 #, c-format msgid "could not resolve ref '%s'" msgstr "указателят „%s“ не може да бъде изтрит" -#: builtin/merge-recursive.c:78 +#: builtin/merge-recursive.c:82 #, c-format msgid "Merging %s with %s\n" msgstr "Сливане на „%s“ с „%s“\n" @@ -16008,54 +16088,54 @@ msgstr "%s, обект: „%s“, цел: „%s“" msgid "Renaming %s to %s\n" msgstr "Преименуване на „%s“ на „%s“\n" -#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510 +#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:511 #, c-format msgid "renaming '%s' failed" msgstr "неуспешно преименуване на „%s“" -#: builtin/name-rev.c:352 +#: builtin/name-rev.c:356 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [ОПЦИЯ…] ПОДАВАНЕ…" -#: builtin/name-rev.c:353 +#: builtin/name-rev.c:357 msgid "git name-rev [<options>] --all" msgstr "git name-rev [ОПЦИЯ…] --all" -#: builtin/name-rev.c:354 +#: builtin/name-rev.c:358 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [ОПЦИЯ…] --stdin" -#: builtin/name-rev.c:411 +#: builtin/name-rev.c:415 msgid "print only names (no SHA-1)" msgstr "извеждане само на имената (без сумите по SHA1)" -#: builtin/name-rev.c:412 +#: builtin/name-rev.c:416 msgid "only use tags to name the commits" msgstr "използване само на етикетите за именуване на подаванията" -#: builtin/name-rev.c:414 +#: builtin/name-rev.c:418 msgid "only use refs matching <pattern>" msgstr "използване само на указателите напасващи на ШАБЛОНа" -#: builtin/name-rev.c:416 +#: builtin/name-rev.c:420 msgid "ignore refs matching <pattern>" msgstr "игнориране на указателите напасващи на ШАБЛОНа" -#: builtin/name-rev.c:418 +#: builtin/name-rev.c:422 msgid "list all commits reachable from all refs" msgstr "" "извеждане на всички подавания, които могат да бъдат достигнати от всички " "указатели" -#: builtin/name-rev.c:419 +#: builtin/name-rev.c:423 msgid "read from stdin" msgstr "четене от стандартния вход" -#: builtin/name-rev.c:420 +#: builtin/name-rev.c:424 msgid "allow to print `undefined` names (default)" msgstr "да се извеждат и недефинираните имена (стандартна стойност на опцията)" -#: builtin/name-rev.c:426 +#: builtin/name-rev.c:430 msgid "dereference tags in the input (internal use)" msgstr "извеждане на идентификаторите на обекти-етикети (за вътрешни нужди)" @@ -16461,7 +16541,7 @@ msgstr "опитът за изтриването на несъществуващ msgid "read object names from the standard input" msgstr "изчитане на имената на обектите от стандартния вход" -#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165 +#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164 msgid "do not remove, show only" msgstr "само извеждане без действително окастряне" @@ -16477,7 +16557,7 @@ msgstr "УКАЗАТЕЛ_ЗА_БЕЛЕЖКА" msgid "use notes from <notes-ref>" msgstr "да се използва бележката сочена от този УКАЗАТЕЛ_ЗА_БЕЛЕЖКА" -#: builtin/notes.c:1034 builtin/stash.c:1598 +#: builtin/notes.c:1034 builtin/stash.c:1607 #, c-format msgid "unknown subcommand: %s" msgstr "непозната подкоманда: %s" @@ -16553,72 +16633,72 @@ msgstr "не може да бъде получена информация чре msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "бяха записани %<PRIu32> обекти, а се очакваха %<PRIu32>" -#: builtin/pack-objects.c:1166 +#: builtin/pack-objects.c:1164 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "изключване на записването на битовата маска, защото някои обекти няма да се " "пакетират" -#: builtin/pack-objects.c:1597 +#: builtin/pack-objects.c:1592 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "прекалено далечно начало на отместването за обектите-разлика за „%s“" -#: builtin/pack-objects.c:1606 +#: builtin/pack-objects.c:1601 #, c-format msgid "delta base offset out of bound for %s" msgstr "недостижимо начало на отместването за обектите-разлика за „%s“" -#: builtin/pack-objects.c:1875 +#: builtin/pack-objects.c:1870 msgid "Counting objects" msgstr "Преброяване на обектите" -#: builtin/pack-objects.c:2005 +#: builtin/pack-objects.c:2000 #, c-format msgid "unable to get size of %s" msgstr "размерът на „%s“ не може да бъде получен" -#: builtin/pack-objects.c:2020 +#: builtin/pack-objects.c:2015 #, c-format msgid "unable to parse object header of %s" msgstr "заглавната част на „%s“ не може да бъде анализирана" -#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106 -#: builtin/pack-objects.c:2116 +#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2101 +#: builtin/pack-objects.c:2111 #, c-format msgid "object %s cannot be read" msgstr "обектът „%s“ не може да се прочете" -#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120 +#: builtin/pack-objects.c:2088 builtin/pack-objects.c:2115 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "обектът „%s“ е с неправилна дължина (%<PRIuMAX>, а не %<PRIuMAX>)" -#: builtin/pack-objects.c:2130 +#: builtin/pack-objects.c:2125 msgid "suboptimal pack - out of memory" msgstr "неоптимизиран пакет — паметта свърши" -#: builtin/pack-objects.c:2456 +#: builtin/pack-objects.c:2440 #, c-format msgid "Delta compression using up to %d threads" msgstr "Делта компресията ще използва до %d нишки" -#: builtin/pack-objects.c:2588 +#: builtin/pack-objects.c:2572 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "" "обектите, които могат да бъдат достигнати от етикета „%s“, не може да бъдат " "пакетирани" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2659 msgid "Compressing objects" msgstr "Компресиране на обектите" -#: builtin/pack-objects.c:2681 +#: builtin/pack-objects.c:2665 msgid "inconsistency with delta count" msgstr "неправилен брой разлики" -#: builtin/pack-objects.c:2762 +#: builtin/pack-objects.c:2742 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -16627,7 +16707,7 @@ msgstr "" "очаква се идентификатор на краен обект, а не:\n" " %s" -#: builtin/pack-objects.c:2768 +#: builtin/pack-objects.c:2748 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -16636,262 +16716,262 @@ msgstr "" "очаква се идентификатор на обект, а не:\n" " %s" -#: builtin/pack-objects.c:2866 +#: builtin/pack-objects.c:2846 msgid "invalid value for --missing" msgstr "неправилна стойност за „--missing“" -#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033 +#: builtin/pack-objects.c:2905 builtin/pack-objects.c:3013 msgid "cannot open pack index" msgstr "индексът на пакетния файл не може да бъде отворен" -#: builtin/pack-objects.c:2956 +#: builtin/pack-objects.c:2936 #, c-format msgid "loose object at %s could not be examined" msgstr "непакетираният обект в „%s“ не може да бъде анализиран" -#: builtin/pack-objects.c:3041 +#: builtin/pack-objects.c:3021 msgid "unable to force loose object" msgstr "оставането на обекта непакетиран не може да бъде наложено" -#: builtin/pack-objects.c:3133 +#: builtin/pack-objects.c:3113 #, c-format msgid "not a rev '%s'" msgstr "„%s“ не е версия" -#: builtin/pack-objects.c:3136 +#: builtin/pack-objects.c:3116 #, c-format msgid "bad revision '%s'" msgstr "неправилна версия „%s“" -#: builtin/pack-objects.c:3161 +#: builtin/pack-objects.c:3141 msgid "unable to add recent objects" msgstr "скорошните обекти не могат да бъдат добавени" -#: builtin/pack-objects.c:3214 +#: builtin/pack-objects.c:3194 #, c-format msgid "unsupported index version %s" msgstr "неподдържана версия на индекса „%s“" -#: builtin/pack-objects.c:3218 +#: builtin/pack-objects.c:3198 #, c-format msgid "bad index version '%s'" msgstr "неправилна версия на индекса „%s“" -#: builtin/pack-objects.c:3248 +#: builtin/pack-objects.c:3228 msgid "do not show progress meter" msgstr "без извеждане на напредъка" -#: builtin/pack-objects.c:3250 +#: builtin/pack-objects.c:3230 msgid "show progress meter" msgstr "извеждане на напредъка" -#: builtin/pack-objects.c:3252 +#: builtin/pack-objects.c:3232 msgid "show progress meter during object writing phase" msgstr "извеждане на напредъка във фазата на запазване на обектите" -#: builtin/pack-objects.c:3255 +#: builtin/pack-objects.c:3235 msgid "similar to --all-progress when progress meter is shown" msgstr "" "същото действие като опцията „--all-progress“ при извеждането на напредъка" -#: builtin/pack-objects.c:3256 +#: builtin/pack-objects.c:3236 msgid "<version>[,<offset>]" msgstr "ВЕРСИЯ[,ОТМЕСТВАНЕ]" -#: builtin/pack-objects.c:3257 +#: builtin/pack-objects.c:3237 msgid "write the pack index file in the specified idx format version" msgstr "" "запазване на индекса на пакетните файлове във форма̀та с указаната версия" -#: builtin/pack-objects.c:3260 +#: builtin/pack-objects.c:3240 msgid "maximum size of each output pack file" msgstr "максимален размер на всеки пакетен файл" -#: builtin/pack-objects.c:3262 +#: builtin/pack-objects.c:3242 msgid "ignore borrowed objects from alternate object store" msgstr "игнориране на обектите заети от други хранилища на обекти" -#: builtin/pack-objects.c:3264 +#: builtin/pack-objects.c:3244 msgid "ignore packed objects" msgstr "игнориране на пакетираните обекти" -#: builtin/pack-objects.c:3266 +#: builtin/pack-objects.c:3246 msgid "limit pack window by objects" msgstr "ограничаване на прозореца за пакетиране по брой обекти" -#: builtin/pack-objects.c:3268 +#: builtin/pack-objects.c:3248 msgid "limit pack window by memory in addition to object limit" msgstr "" "ограничаване на прозореца за пакетиране и по памет освен по брой обекти" -#: builtin/pack-objects.c:3270 +#: builtin/pack-objects.c:3250 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" "максимална дължина на веригата от разлики, която е позволена в пакетния файл" -#: builtin/pack-objects.c:3272 +#: builtin/pack-objects.c:3252 msgid "reuse existing deltas" msgstr "преизползване на съществуващите разлики" -#: builtin/pack-objects.c:3274 +#: builtin/pack-objects.c:3254 msgid "reuse existing objects" msgstr "преизползване на съществуващите обекти" -#: builtin/pack-objects.c:3276 +#: builtin/pack-objects.c:3256 msgid "use OFS_DELTA objects" msgstr "използване на обекти „OFS_DELTA“" -#: builtin/pack-objects.c:3278 +#: builtin/pack-objects.c:3258 msgid "use threads when searching for best delta matches" msgstr "" "стартиране на нишки за претърсване на най-добрите съвпадения на разликите" -#: builtin/pack-objects.c:3280 +#: builtin/pack-objects.c:3260 msgid "do not create an empty pack output" msgstr "без създаване на празен пакетен файл" -#: builtin/pack-objects.c:3282 +#: builtin/pack-objects.c:3262 msgid "read revision arguments from standard input" msgstr "изчитане на версиите от стандартния вход" -#: builtin/pack-objects.c:3284 +#: builtin/pack-objects.c:3264 msgid "limit the objects to those that are not yet packed" msgstr "ограничаване до все още непакетираните обекти" -#: builtin/pack-objects.c:3287 +#: builtin/pack-objects.c:3267 msgid "include objects reachable from any reference" msgstr "" "включване на всички обекти, които могат да се достигнат от произволен " "указател" -#: builtin/pack-objects.c:3290 +#: builtin/pack-objects.c:3270 msgid "include objects referred by reflog entries" msgstr "включване и на обектите сочени от записите в журнала на указателите" -#: builtin/pack-objects.c:3293 +#: builtin/pack-objects.c:3273 msgid "include objects referred to by the index" msgstr "включване и на обектите сочени от индекса" -#: builtin/pack-objects.c:3296 +#: builtin/pack-objects.c:3276 msgid "output pack to stdout" msgstr "извеждане на пакета на стандартния изход" -#: builtin/pack-objects.c:3298 +#: builtin/pack-objects.c:3278 msgid "include tag objects that refer to objects to be packed" msgstr "" "включване и на обектите-етикети, които сочат към обектите, които ще бъдат " "пакетирани" -#: builtin/pack-objects.c:3300 +#: builtin/pack-objects.c:3280 msgid "keep unreachable objects" msgstr "запазване на недостижимите обекти" -#: builtin/pack-objects.c:3302 +#: builtin/pack-objects.c:3282 msgid "pack loose unreachable objects" msgstr "пакетиране и на недостижимите обекти" -#: builtin/pack-objects.c:3304 +#: builtin/pack-objects.c:3284 msgid "unpack unreachable objects newer than <time>" msgstr "разпакетиране на недостижимите обекти, които са по-нови от това ВРЕМЕ" -#: builtin/pack-objects.c:3307 +#: builtin/pack-objects.c:3287 msgid "use the sparse reachability algorithm" msgstr "използване на алгоритъм за частична достижимост" -#: builtin/pack-objects.c:3309 +#: builtin/pack-objects.c:3289 msgid "create thin packs" msgstr "създаване на съкратени пакети" -#: builtin/pack-objects.c:3311 +#: builtin/pack-objects.c:3291 msgid "create packs suitable for shallow fetches" msgstr "пакетиране подходящо за плитко доставяне" -#: builtin/pack-objects.c:3313 +#: builtin/pack-objects.c:3293 msgid "ignore packs that have companion .keep file" msgstr "игнориране на пакетите, които са придружени от файл „.keep“" -#: builtin/pack-objects.c:3315 +#: builtin/pack-objects.c:3295 msgid "ignore this pack" msgstr "пропускане на този пакет" -#: builtin/pack-objects.c:3317 +#: builtin/pack-objects.c:3297 msgid "pack compression level" msgstr "ниво на компресиране при пакетиране" -#: builtin/pack-objects.c:3319 +#: builtin/pack-objects.c:3299 msgid "do not hide commits by grafts" msgstr "" "извеждане на всички родители — дори и тези, които нормално са скрити при " "присажданията" -#: builtin/pack-objects.c:3321 +#: builtin/pack-objects.c:3301 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "използване на съществуващи индекси на база битови маски за ускоряване на " "преброяването на обектите" -#: builtin/pack-objects.c:3323 +#: builtin/pack-objects.c:3303 msgid "write a bitmap index together with the pack index" msgstr "" "запазване и на индекс на база побитова маска, заедно с индекса за пакета" -#: builtin/pack-objects.c:3327 +#: builtin/pack-objects.c:3307 msgid "write a bitmap index if possible" msgstr "записване на индекси на база битови маски при възможност" -#: builtin/pack-objects.c:3331 +#: builtin/pack-objects.c:3311 msgid "handling for missing objects" msgstr "как да се обработват липсващите обекти" -#: builtin/pack-objects.c:3334 +#: builtin/pack-objects.c:3314 msgid "do not pack objects in promisor packfiles" msgstr "без пакетиране на обекти в гарантиращи пакети" -#: builtin/pack-objects.c:3336 +#: builtin/pack-objects.c:3316 msgid "respect islands during delta compression" msgstr "без промяна на групите при делта компресия" -#: builtin/pack-objects.c:3361 +#: builtin/pack-objects.c:3345 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "веригата с разлики е прекалено дълбока — %d, ще се ползва %d" -#: builtin/pack-objects.c:3366 +#: builtin/pack-objects.c:3350 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "" "Стойността на настройката „pack.deltaCacheLimit“ е прекалено голяма. Ще се " "ползва %d" -#: builtin/pack-objects.c:3420 +#: builtin/pack-objects.c:3404 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" "опцията „--max-pack-size“ не може да се използва за създаване на пакетни " "файлове за пренос" -#: builtin/pack-objects.c:3422 +#: builtin/pack-objects.c:3406 msgid "minimum pack size limit is 1 MiB" msgstr "минималният размер на пакетите е 1 MiB" -#: builtin/pack-objects.c:3427 +#: builtin/pack-objects.c:3411 msgid "--thin cannot be used to build an indexable pack" msgstr "" "опцията „--thin“не може да се използва за създаване на пакетни файлове с " "индекс" -#: builtin/pack-objects.c:3430 +#: builtin/pack-objects.c:3414 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "опциите „--keep-unreachable“ и „--unpack-unreachable“ са несъвместими" -#: builtin/pack-objects.c:3436 +#: builtin/pack-objects.c:3420 msgid "cannot use --filter without --stdout" msgstr "опцията „-filter“ изисква „-stdout“" -#: builtin/pack-objects.c:3497 +#: builtin/pack-objects.c:3481 msgid "Enumerating objects" msgstr "Изброяване на обектите" -#: builtin/pack-objects.c:3527 +#: builtin/pack-objects.c:3511 #, c-format msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" msgstr "" @@ -16947,44 +17027,44 @@ msgstr "Неправилна стойност за „%s“: „%s“" msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git push [ОПЦИЯ…] [ХРАНИЛИЩЕ [УКАЗАТЕЛ_НА_ВЕРСИЯ…]]" -#: builtin/pull.c:141 +#: builtin/pull.c:142 msgid "control for recursive fetching of submodules" msgstr "управление на рекурсивното доставяне на подмодулите" -#: builtin/pull.c:145 +#: builtin/pull.c:146 msgid "Options related to merging" msgstr "Опции при сливане" -#: builtin/pull.c:148 +#: builtin/pull.c:149 msgid "incorporate changes by rebasing rather than merging" msgstr "внасяне на промените чрез пребазиране, а не чрез сливане" -#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126 +#: builtin/pull.c:177 builtin/rebase.c:448 builtin/revert.c:126 msgid "allow fast-forward" msgstr "позволяване на превъртания" -#: builtin/pull.c:185 +#: builtin/pull.c:186 msgid "automatically stash/stash pop before and after rebase" msgstr "автоматично скатаване/прилагане на скатаното преди и след пребазиране" -#: builtin/pull.c:201 +#: builtin/pull.c:202 msgid "Options related to fetching" msgstr "Опции при доставяне" -#: builtin/pull.c:211 +#: builtin/pull.c:212 msgid "force overwrite of local branch" msgstr "принудително презаписване на локалния клон" -#: builtin/pull.c:219 +#: builtin/pull.c:220 msgid "number of submodules pulled in parallel" msgstr "брой подмодули издърпани паралелно" -#: builtin/pull.c:316 +#: builtin/pull.c:320 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Неправилна стойност за „pull.ff“: „%s“" -#: builtin/pull.c:433 +#: builtin/pull.c:437 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -16992,14 +17072,14 @@ msgstr "" "Между указателите, които току що доставихте, няма подходящ кандидат, върху " "който да пребазирате." -#: builtin/pull.c:435 +#: builtin/pull.c:439 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "Между указателите, които току що доставихте, няма подходящ кандидат, който " "да слеете." -#: builtin/pull.c:436 +#: builtin/pull.c:440 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -17007,7 +17087,7 @@ msgstr "" "Най вероятно сте подали шаблон за указатели, който не е напаснал с нищо в " "отдалеченото хранилище." -#: builtin/pull.c:439 +#: builtin/pull.c:443 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -17018,44 +17098,44 @@ msgstr "" "Понеже това не е хранилището по подразбиране на текущия клон, трябва\n" "да укажете отдалечения клон на командния ред." -#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73 +#: builtin/pull.c:448 builtin/rebase.c:1347 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Извън всички клони." -#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79 +#: builtin/pull.c:450 builtin/pull.c:465 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Укажете върху кой клон искате да пребазирате." -#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82 +#: builtin/pull.c:452 builtin/pull.c:467 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Укажете кой клон искате да слеете." -#: builtin/pull.c:449 builtin/pull.c:464 +#: builtin/pull.c:453 builtin/pull.c:468 msgid "See git-pull(1) for details." msgstr "За повече информация погледнете ръководството „git-pull(1)“" -#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466 -#: builtin/rebase.c:1332 git-parse-remote.sh:64 +#: builtin/pull.c:455 builtin/pull.c:461 builtin/pull.c:470 +#: builtin/rebase.c:1353 git-parse-remote.sh:64 msgid "<remote>" msgstr "ОТДАЛЕЧЕНО_ХРАНИЛИЩЕ" -#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471 +#: builtin/pull.c:455 builtin/pull.c:470 builtin/pull.c:475 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "КЛОН" -#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75 +#: builtin/pull.c:463 builtin/rebase.c:1345 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "Текущият клон не следи никой." -#: builtin/pull.c:468 git-parse-remote.sh:95 +#: builtin/pull.c:472 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" "Ако искате да зададете информация за следен клон, можете да направите това с " "командата:" -#: builtin/pull.c:473 +#: builtin/pull.c:477 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -17064,32 +17144,32 @@ msgstr "" "За сливане е указан отдалеченият указател „%s“,\n" "но такъв не е доставен." -#: builtin/pull.c:581 +#: builtin/pull.c:587 #, c-format msgid "unable to access commit %s" msgstr "недостъпно подаване: %s" -#: builtin/pull.c:861 +#: builtin/pull.c:867 msgid "ignoring --verify-signatures for rebase" msgstr "без „--verify-signatures“ при пребазиране" -#: builtin/pull.c:916 +#: builtin/pull.c:922 msgid "--[no-]autostash option is only valid with --rebase." msgstr "опцията „--[no-]autostash“ изисква „--rebase“" -#: builtin/pull.c:924 +#: builtin/pull.c:930 msgid "Updating an unborn branch with changes added to the index." msgstr "Обновяване на все още несъздаден клон с промените от индекса" -#: builtin/pull.c:928 +#: builtin/pull.c:934 msgid "pull with rebase" msgstr "издърпване с пребазиране" -#: builtin/pull.c:929 +#: builtin/pull.c:935 msgid "please commit or stash them." msgstr "трябва да подадете или скатаете промените." -#: builtin/pull.c:954 +#: builtin/pull.c:960 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -17099,7 +17179,7 @@ msgstr "" "доставянето обнови върха на текущия клон. Работното\n" "ви копие бе превъртяно от подаване „%s“." -#: builtin/pull.c:960 +#: builtin/pull.c:966 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -17116,15 +17196,15 @@ msgstr "" " git reset --hard\n" "за връщане към нормално състояние." -#: builtin/pull.c:975 +#: builtin/pull.c:981 msgid "Cannot merge multiple branches into empty head." msgstr "Не може да сливате множество клони в празен върхов указател." -#: builtin/pull.c:979 +#: builtin/pull.c:985 msgid "Cannot rebase onto multiple branches." msgstr "Не може да пребазирате върху повече от един клон." -#: builtin/pull.c:986 +#: builtin/pull.c:992 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "пребазирането е невъзможно заради локално записаните промени по подмодулите" @@ -17298,139 +17378,139 @@ msgstr "" msgid "Pushing to %s\n" msgstr "Изтласкване към „%s“\n" -#: builtin/push.c:364 +#: builtin/push.c:366 #, c-format msgid "failed to push some refs to '%s'" msgstr "част от указателите не бяха изтласкани към „%s“" -#: builtin/push.c:398 -#, c-format -msgid "bad repository '%s'" -msgstr "неправилно указано хранилище „%s“" - -#: builtin/push.c:399 -msgid "" -"No configured push destination.\n" -"Either specify the URL from the command-line or configure a remote " -"repository using\n" -"\n" -" git remote add <name> <url>\n" -"\n" -"and then push using the remote name\n" -"\n" -" git push <name>\n" -msgstr "" -"Не е указано хранилище, към което да се изтласква.\n" -"Или укажете адреса на командния ред, или настройте отдалечено хранилище с " -"командата:\n" -"\n" -" git remote add ИМЕ АДРЕС\n" -"\n" -"и след това изтласкайте, като укажете името на отдалеченото хранилище:\n" -"\n" -" git push ИМЕ\n" - -#: builtin/push.c:554 +#: builtin/push.c:541 msgid "repository" msgstr "хранилище" -#: builtin/push.c:555 builtin/send-pack.c:164 +#: builtin/push.c:542 builtin/send-pack.c:164 msgid "push all refs" msgstr "изтласкване на всички указатели" -#: builtin/push.c:556 builtin/send-pack.c:166 +#: builtin/push.c:543 builtin/send-pack.c:166 msgid "mirror all refs" msgstr "огледално копие на всички указатели" -#: builtin/push.c:558 +#: builtin/push.c:545 msgid "delete refs" msgstr "изтриване на указателите" -#: builtin/push.c:559 +#: builtin/push.c:546 msgid "push tags (can't be used with --all or --mirror)" msgstr "изтласкване на етикетите (несъвместимо с опциите „--all“ и „--mirror“)" -#: builtin/push.c:562 builtin/send-pack.c:167 +#: builtin/push.c:549 builtin/send-pack.c:167 msgid "force updates" msgstr "принудително обновяване" -#: builtin/push.c:564 builtin/send-pack.c:181 +#: builtin/push.c:551 builtin/send-pack.c:181 msgid "<refname>:<expect>" msgstr "УКАЗАТЕЛ:ОЧАКВАНА_СТОЙНОСТ" -#: builtin/push.c:565 builtin/send-pack.c:182 +#: builtin/push.c:552 builtin/send-pack.c:182 msgid "require old value of ref to be at this value" msgstr "УКАЗАТЕЛят трябва първоначално да е с тази ОЧАКВАНА_СТОЙНОСТ" -#: builtin/push.c:568 +#: builtin/push.c:555 msgid "control recursive pushing of submodules" msgstr "управление на рекурсивното изтласкване на подмодулите" -#: builtin/push.c:570 builtin/send-pack.c:175 +#: builtin/push.c:557 builtin/send-pack.c:175 msgid "use thin pack" msgstr "използване на съкратени пакети" -#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161 +#: builtin/push.c:558 builtin/push.c:559 builtin/send-pack.c:161 #: builtin/send-pack.c:162 msgid "receive pack program" msgstr "програма за получаването на пакети" -#: builtin/push.c:573 +#: builtin/push.c:560 msgid "set upstream for git pull/status" msgstr "задаване на отдалеченото хранилище за командите „git pull/status“" -#: builtin/push.c:576 +#: builtin/push.c:563 msgid "prune locally removed refs" msgstr "окастряне на указателите, които са премахнати от локалното хранилище" -#: builtin/push.c:578 +#: builtin/push.c:565 msgid "bypass pre-push hook" msgstr "без изпълнение на куката преди изтласкване (pre-push)" -#: builtin/push.c:579 +#: builtin/push.c:566 msgid "push missing but relevant tags" msgstr "" "изтласкване на липсващите в отдалеченото хранилище, но свързани с текущото " "изтласкване, етикети" -#: builtin/push.c:582 builtin/send-pack.c:169 +#: builtin/push.c:569 builtin/send-pack.c:169 msgid "GPG sign the push" msgstr "подписване на изтласкването с GPG" -#: builtin/push.c:584 builtin/send-pack.c:176 +#: builtin/push.c:571 builtin/send-pack.c:176 msgid "request atomic transaction on remote side" msgstr "изискване на атомарни операции от отсрещната страна" -#: builtin/push.c:602 +#: builtin/push.c:589 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" "опцията „--delete“ е несъвместима с опциите „--all“, „--mirror“ и „--tags“" -#: builtin/push.c:604 +#: builtin/push.c:591 msgid "--delete doesn't make sense without any refs" msgstr "опцията „--delete“ изисква поне един указател на версия" -#: builtin/push.c:607 +#: builtin/push.c:611 +#, c-format +msgid "bad repository '%s'" +msgstr "неправилно указано хранилище „%s“" + +#: builtin/push.c:612 +msgid "" +"No configured push destination.\n" +"Either specify the URL from the command-line or configure a remote " +"repository using\n" +"\n" +" git remote add <name> <url>\n" +"\n" +"and then push using the remote name\n" +"\n" +" git push <name>\n" +msgstr "" +"Не е указано хранилище, към което да се изтласква.\n" +"Или укажете адреса на командния ред, или настройте отдалечено хранилище с " +"командата:\n" +"\n" +" git remote add ИМЕ АДРЕС\n" +"\n" +"и след това изтласкайте, като укажете името на отдалеченото хранилище:\n" +"\n" +" git push ИМЕ\n" + +#: builtin/push.c:627 msgid "--all and --tags are incompatible" msgstr "опциите „--all“ и „--tags“ са несъвместими" -#: builtin/push.c:609 +#: builtin/push.c:629 msgid "--all can't be combined with refspecs" msgstr "опцията „--all“ е несъвместима с указването на версия" -#: builtin/push.c:613 +#: builtin/push.c:633 msgid "--mirror and --tags are incompatible" msgstr "опциите „--mirror“ и „--tags“ са несъвместими" -#: builtin/push.c:615 +#: builtin/push.c:635 msgid "--mirror can't be combined with refspecs" msgstr "опцията „--mirror“ е несъвместима с указването на версия" -#: builtin/push.c:618 +#: builtin/push.c:638 msgid "--all and --mirror are incompatible" msgstr "опциите „--all“ и „--mirror“ са несъвместими" -#: builtin/push.c:637 +#: builtin/push.c:642 msgid "push options must not have new line characters" msgstr "опциите за изтласкване не трябва да съдържат знак за нов ред" @@ -17548,11 +17628,11 @@ msgstr "без информационни съобщения" #: builtin/rebase.c:32 msgid "" -"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] " -"[<branch>]" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " +"[<upstream> [<branch>]]" msgstr "" -"git rebase [-i] [ОПЦИЯ…] [--exec КОМАНДА] [--onto НОВА_БАЗА] [КЛОН_ИЗТОЧНИК] " -"[КЛОН]" +"git rebase [-i] [ОПЦИЯ…] [--exec КОМАНДА] [--onto НОВА_БАЗА | --keep-base] " +"[КЛОН_ИЗТОЧНИК [КЛОН]]" #: builtin/rebase.c:34 msgid "" @@ -17591,193 +17671,193 @@ msgstr "невъзможно задаване на интерактивна ра msgid "could not generate todo list" msgstr "файлът с командите не може да се генерира" -#: builtin/rebase.c:382 +#: builtin/rebase.c:383 msgid "a base commit must be provided with --upstream or --onto" msgstr "опциите „--upstream“ и „--onto“ изискват базово подаване" -#: builtin/rebase.c:437 +#: builtin/rebase.c:438 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [ОПЦИЯ…]" -#: builtin/rebase.c:449 +#: builtin/rebase.c:450 msgid "keep empty commits" msgstr "запазване на празните подавания" -#: builtin/rebase.c:451 builtin/revert.c:128 +#: builtin/rebase.c:452 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "позволяване на празни съобщения при подаване" -#: builtin/rebase.c:452 +#: builtin/rebase.c:453 msgid "rebase merge commits" msgstr "пребазиране на подаванията със сливания" -#: builtin/rebase.c:454 +#: builtin/rebase.c:455 msgid "keep original branch points of cousins" msgstr "" "запазване на първоначалните точки на разклоняване на сестринските клони" -#: builtin/rebase.c:456 +#: builtin/rebase.c:457 msgid "move commits that begin with squash!/fixup!" msgstr "преместване на подаванията, които започват със „squash!“/“fixup!“" -#: builtin/rebase.c:457 +#: builtin/rebase.c:458 msgid "sign commits" msgstr "подписване на подаванията" -#: builtin/rebase.c:459 builtin/rebase.c:1403 +#: builtin/rebase.c:460 builtin/rebase.c:1427 msgid "display a diffstat of what changed upstream" msgstr "извеждане на статистика с промените в следения клон" -#: builtin/rebase.c:461 +#: builtin/rebase.c:462 msgid "continue rebase" msgstr "продължаване на пребазирането" -#: builtin/rebase.c:463 +#: builtin/rebase.c:464 msgid "skip commit" msgstr "прескачане на подаване" -#: builtin/rebase.c:464 +#: builtin/rebase.c:465 msgid "edit the todo list" msgstr "редактиране на списъка с команди за изпълнение" -#: builtin/rebase.c:466 +#: builtin/rebase.c:467 msgid "show the current patch" msgstr "извеждане на текущата кръпка" -#: builtin/rebase.c:469 +#: builtin/rebase.c:470 msgid "shorten commit ids in the todo list" msgstr "съкратени идентификатори в списъка за изпълнение" -#: builtin/rebase.c:471 +#: builtin/rebase.c:472 msgid "expand commit ids in the todo list" msgstr "пълни идентификатори в списъка за изпълнение" -#: builtin/rebase.c:473 +#: builtin/rebase.c:474 msgid "check the todo list" msgstr "проверка на списъка за изпълнение" -#: builtin/rebase.c:475 +#: builtin/rebase.c:476 msgid "rearrange fixup/squash lines" msgstr "" "преподреждане на редовете за вкарване на подаванията подаванията в " "предходните им със и без смени на съобщението" -#: builtin/rebase.c:477 +#: builtin/rebase.c:478 msgid "insert exec commands in todo list" msgstr "вмъкване на командите за изпълнение в списъка за изпълнение" -#: builtin/rebase.c:478 +#: builtin/rebase.c:479 msgid "onto" msgstr "върху" -#: builtin/rebase.c:481 +#: builtin/rebase.c:482 msgid "restrict-revision" msgstr "ограничена версия" -#: builtin/rebase.c:481 +#: builtin/rebase.c:482 msgid "restrict revision" msgstr "ограничена версия" -#: builtin/rebase.c:483 +#: builtin/rebase.c:484 msgid "squash-onto" msgstr "подаване, в което другите да се вкарат" -#: builtin/rebase.c:484 +#: builtin/rebase.c:485 msgid "squash onto" msgstr "подаване, в което другите да се вкарат" -#: builtin/rebase.c:486 +#: builtin/rebase.c:487 msgid "the upstream commit" msgstr "подаване на източника" -#: builtin/rebase.c:488 +#: builtin/rebase.c:489 msgid "head-name" msgstr "име на върха" -#: builtin/rebase.c:488 +#: builtin/rebase.c:489 msgid "head name" msgstr "име на върха" -#: builtin/rebase.c:493 +#: builtin/rebase.c:494 msgid "rebase strategy" msgstr "стратегия на пребазиране" -#: builtin/rebase.c:494 +#: builtin/rebase.c:495 msgid "strategy-opts" msgstr "опции на стратегията" -#: builtin/rebase.c:495 +#: builtin/rebase.c:496 msgid "strategy options" msgstr "опции на стратегията" -#: builtin/rebase.c:496 +#: builtin/rebase.c:497 msgid "switch-to" msgstr "преминаване към" -#: builtin/rebase.c:497 +#: builtin/rebase.c:498 msgid "the branch or commit to checkout" msgstr "клонът, към който да се премине" -#: builtin/rebase.c:498 +#: builtin/rebase.c:499 msgid "onto-name" msgstr "име на база" -#: builtin/rebase.c:498 +#: builtin/rebase.c:499 msgid "onto name" msgstr "име на база" -#: builtin/rebase.c:499 +#: builtin/rebase.c:500 msgid "cmd" msgstr "команда" -#: builtin/rebase.c:499 +#: builtin/rebase.c:500 msgid "the command to run" msgstr "команда за изпълнение" -#: builtin/rebase.c:502 builtin/rebase.c:1486 +#: builtin/rebase.c:503 builtin/rebase.c:1510 msgid "automatically re-schedule any `exec` that fails" msgstr "" "автоматично подаване за повторно изпълнение на командите завършили с неуспех" -#: builtin/rebase.c:518 +#: builtin/rebase.c:519 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "опциите „--[no-]rebase-cousins“ изискват опцията „--rebase-merges“" -#: builtin/rebase.c:534 +#: builtin/rebase.c:535 #, c-format msgid "%s requires an interactive rebase" msgstr "„%s“ изисква интерактивно пребазиране" -#: builtin/rebase.c:586 +#: builtin/rebase.c:587 #, c-format msgid "could not get 'onto': '%s'" msgstr "не може да се премине към новата база, зададена с „onto“: „%s“" -#: builtin/rebase.c:601 +#: builtin/rebase.c:602 #, c-format msgid "invalid orig-head: '%s'" msgstr "неправилен указател към първоначален връх „orig-head“: „%s“" -#: builtin/rebase.c:626 +#: builtin/rebase.c:627 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "неправилната стойност на „allow_rerere_autoupdate“ се прескача: „%s“" -#: builtin/rebase.c:702 +#: builtin/rebase.c:703 #, c-format msgid "Could not read '%s'" msgstr "Пътят „%s“ не може да бъде прочетен" -#: builtin/rebase.c:720 +#: builtin/rebase.c:721 #, c-format msgid "Cannot store %s" msgstr "„%s“ не може да бъде запазен" -#: builtin/rebase.c:827 +#: builtin/rebase.c:828 msgid "could not determine HEAD revision" msgstr "не може да се определи към какво да сочи указателят „HEAD“" -#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:951 git-rebase--preserve-merges.sh:81 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -17791,7 +17871,7 @@ msgstr "" "За да откажете пребазирането и да се върнете към първоначалното състояние,\n" "изпълнете „git rebase --abort“." -#: builtin/rebase.c:1031 +#: builtin/rebase.c:1032 #, c-format msgid "" "\n" @@ -17809,7 +17889,7 @@ msgstr "" "\n" "В резултат те не могат да се пребазират." -#: builtin/rebase.c:1318 +#: builtin/rebase.c:1339 #, c-format msgid "" "%s\n" @@ -17826,7 +17906,7 @@ msgstr "" " git rebase КЛОН\n" "\n" -#: builtin/rebase.c:1334 +#: builtin/rebase.c:1355 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -17839,135 +17919,139 @@ msgstr "" "\n" " git branch --set-upstream-to=%s/КЛОН %s\n" -#: builtin/rebase.c:1364 +#: builtin/rebase.c:1385 msgid "exec commands cannot contain newlines" msgstr "командите за изпълнение не може да съдържат нови редове" -#: builtin/rebase.c:1368 +#: builtin/rebase.c:1389 msgid "empty exec command" msgstr "празна команда за изпълнение" -#: builtin/rebase.c:1396 +#: builtin/rebase.c:1418 msgid "rebase onto given branch instead of upstream" msgstr "пребазиране върху зададения, а не следения клон" -#: builtin/rebase.c:1398 +#: builtin/rebase.c:1420 +msgid "use the merge-base of upstream and branch as the current base" +msgstr "за текуща база да се ползва базата за сливане на клона и следеното" + +#: builtin/rebase.c:1422 msgid "allow pre-rebase hook to run" msgstr "позволяване на куката преди пребазиране да се изпълни" -#: builtin/rebase.c:1400 +#: builtin/rebase.c:1424 msgid "be quiet. implies --no-stat" msgstr "без извеждане на информация. Включва опцията „--no-stat“" -#: builtin/rebase.c:1406 +#: builtin/rebase.c:1430 msgid "do not show diffstat of what changed upstream" msgstr "без извеждане на статистика с промените в следения клон" -#: builtin/rebase.c:1409 +#: builtin/rebase.c:1433 msgid "add a Signed-off-by: line to each commit" msgstr "" "добавяне на ред за подпис „Signed-off-by“ в съобщението на всяко подаване" -#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417 +#: builtin/rebase.c:1435 builtin/rebase.c:1439 builtin/rebase.c:1441 msgid "passed to 'git am'" msgstr "подава се на командата „git am“" -#: builtin/rebase.c:1419 builtin/rebase.c:1421 +#: builtin/rebase.c:1443 builtin/rebase.c:1445 msgid "passed to 'git apply'" msgstr "подава се на командата „git apply“" -#: builtin/rebase.c:1423 builtin/rebase.c:1426 +#: builtin/rebase.c:1447 builtin/rebase.c:1450 msgid "cherry-pick all commits, even if unchanged" msgstr "отбиране на всички подавания дори да няма промени" -#: builtin/rebase.c:1428 +#: builtin/rebase.c:1452 msgid "continue" msgstr "продължаване" -#: builtin/rebase.c:1431 +#: builtin/rebase.c:1455 msgid "skip current patch and continue" msgstr "прескачане на текущата кръпка и продължаване" -#: builtin/rebase.c:1433 +#: builtin/rebase.c:1457 msgid "abort and check out the original branch" msgstr "преустановяване и възстановяване на първоначалния клон" -#: builtin/rebase.c:1436 +#: builtin/rebase.c:1460 msgid "abort but keep HEAD where it is" msgstr "преустановяване без промяна към какво сочи „HEAD“" -#: builtin/rebase.c:1437 +#: builtin/rebase.c:1461 msgid "edit the todo list during an interactive rebase" msgstr "редактиране на файла с команди при интерактивно пребазиране" -#: builtin/rebase.c:1440 +#: builtin/rebase.c:1464 msgid "show the patch file being applied or merged" msgstr "показване на кръпката, която се прилага или слива" -#: builtin/rebase.c:1443 +#: builtin/rebase.c:1467 msgid "use merging strategies to rebase" msgstr "при пребазиране да се ползва стратегия за сливане" -#: builtin/rebase.c:1447 +#: builtin/rebase.c:1471 msgid "let the user edit the list of commits to rebase" msgstr "" "позволяване на потребителя да редактира списъка с подавания за пребазиране" -#: builtin/rebase.c:1451 +#: builtin/rebase.c:1475 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "(остаряло) пресъздаване на сливанията вместо да се прескачат" -#: builtin/rebase.c:1455 +#: builtin/rebase.c:1479 msgid "preserve empty commits during rebase" msgstr "запазване на празните подавания при пребазиране" -#: builtin/rebase.c:1457 +#: builtin/rebase.c:1481 msgid "move commits that begin with squash!/fixup! under -i" msgstr "" "преместване на подаванията, които започват със „squash!“/“fixup!“ при „-i“" -#: builtin/rebase.c:1463 +#: builtin/rebase.c:1487 msgid "automatically stash/stash pop before and after" msgstr "автоматично скатаване/прилагане на скатаното преди и след пребазиране" -#: builtin/rebase.c:1465 +#: builtin/rebase.c:1489 msgid "add exec lines after each commit of the editable list" msgstr "" "добавяне на редове с команди за изпълнение след всяко подаване в " "редактирания списък" -#: builtin/rebase.c:1469 +#: builtin/rebase.c:1493 msgid "allow rebasing commits with empty messages" msgstr "позволяване на пребазиране на подавания с празни съобщения" -#: builtin/rebase.c:1472 +#: builtin/rebase.c:1496 msgid "try to rebase merges instead of skipping them" msgstr "опит за пребазиране на сливанията вместо те да се прескачат" -#: builtin/rebase.c:1475 +#: builtin/rebase.c:1499 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "" "за доуточняването на следения клон, използвайте:\n" "\n" " git merge-base --fork-point" -#: builtin/rebase.c:1477 +#: builtin/rebase.c:1501 msgid "use the given merge strategy" msgstr "използване на зададената стратегията на сливане" -#: builtin/rebase.c:1479 builtin/revert.c:115 +#: builtin/rebase.c:1503 builtin/revert.c:115 msgid "option" msgstr "опция" -#: builtin/rebase.c:1480 +#: builtin/rebase.c:1504 msgid "pass the argument through to the merge strategy" msgstr "аргументът да се подаде на стратегията за сливане" -#: builtin/rebase.c:1483 +#: builtin/rebase.c:1507 msgid "rebase all reachable commits up to the root(s)" msgstr "пребазиране на всички достижими подавания до началното им подаване" -#: builtin/rebase.c:1500 +#: builtin/rebase.c:1524 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -17975,33 +18059,41 @@ msgstr "" "поддръжката на „rebase.useBuiltin“ е премахната.\n" "За повече информация вижте „git help config“." -#: builtin/rebase.c:1506 +#: builtin/rebase.c:1530 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "" "Изглежда, че сега се прилагат кръпки чрез командата „git-am“. Не може да " "пребазирате в момента." -#: builtin/rebase.c:1547 +#: builtin/rebase.c:1571 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "" "Опцията „--preserve-merges“ е остаряла. Ползвайте „--rebase-merges“ вместо " "нея." -#: builtin/rebase.c:1551 +#: builtin/rebase.c:1576 +msgid "cannot combine '--keep-base' with '--onto'" +msgstr "опциите „--keep-base“ и „--onto“ са несъвместими" + +#: builtin/rebase.c:1578 +msgid "cannot combine '--keep-base' with '--root'" +msgstr "опциите „--keep-base“ и „--root“ са несъвместими" + +#: builtin/rebase.c:1582 msgid "No rebase in progress?" msgstr "Изглежда в момента не тече пребазиране" -#: builtin/rebase.c:1555 +#: builtin/rebase.c:1586 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "Опцията „--edit-todo“ е достъпна само по време на интерактивно пребазиране." -#: builtin/rebase.c:1578 +#: builtin/rebase.c:1609 msgid "Cannot read HEAD" msgstr "Указателят „HEAD“ не може да бъде прочетен" -#: builtin/rebase.c:1590 +#: builtin/rebase.c:1621 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -18009,16 +18101,16 @@ msgstr "" "Трябва да редактирате всички конфликти при сливането. След това\n" "отбележете коригирането им чрез командата „git add“" -#: builtin/rebase.c:1609 +#: builtin/rebase.c:1640 msgid "could not discard worktree changes" msgstr "промените в работното дърво не могат да бъдат занулени" -#: builtin/rebase.c:1628 +#: builtin/rebase.c:1659 #, c-format msgid "could not move back to %s" msgstr "връщането към „%s“ е невъзможно" -#: builtin/rebase.c:1673 +#: builtin/rebase.c:1704 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -18039,171 +18131,163 @@ msgstr "" "за\n" "да не загубите случайно промени.\n" -#: builtin/rebase.c:1694 +#: builtin/rebase.c:1725 msgid "switch `C' expects a numerical value" msgstr "опцията „C“ очаква число за аргумент" -#: builtin/rebase.c:1735 +#: builtin/rebase.c:1766 #, c-format msgid "Unknown mode: %s" msgstr "Неизвестна стратегия: „%s“" -#: builtin/rebase.c:1757 +#: builtin/rebase.c:1788 msgid "--strategy requires --merge or --interactive" msgstr "" "опцията „--strategy“ изисква някоя от опциите „--merge“ или „--interactive“" -#: builtin/rebase.c:1797 +#: builtin/rebase.c:1828 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "" "опцията „--reschedule-failed-exec“ изисква някоя от опциите „--exec“ или „--" "interactive“" -#: builtin/rebase.c:1809 +#: builtin/rebase.c:1840 msgid "cannot combine am options with either interactive or merge options" msgstr "" "опциите за „am“ са несъвместими с опциите за сливане или за интерактивна " "работа" -#: builtin/rebase.c:1828 +#: builtin/rebase.c:1859 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "опциите „--preserve-merges“ и „--rebase-merges“ са несъвместими" -#: builtin/rebase.c:1832 +#: builtin/rebase.c:1863 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" "ГРЕШКА: опциите „--preserve-merges“ и „--reschedule-failed-exec“ са " "несъвместими" -#: builtin/rebase.c:1838 -msgid "cannot combine '--rebase-merges' with '--strategy-option'" -msgstr "опциите „--rebase-merges“ и „--strategy-option“ са несъвместими" - -#: builtin/rebase.c:1841 -msgid "cannot combine '--rebase-merges' with '--strategy'" -msgstr "опциите „--rebase-merges“ и „--strategy“ са несъвместими" - -#: builtin/rebase.c:1865 +#: builtin/rebase.c:1887 #, c-format msgid "invalid upstream '%s'" msgstr "неправилен следен клон: „%s“" -#: builtin/rebase.c:1871 +#: builtin/rebase.c:1893 msgid "Could not create new root commit" msgstr "Не може да се създаде ново начално подаване" -#: builtin/rebase.c:1889 +#: builtin/rebase.c:1919 +#, c-format +msgid "'%s': need exactly one merge base with branch" +msgstr "„%s“: изисква се точно една база за сливане с клона" + +#: builtin/rebase.c:1922 #, c-format msgid "'%s': need exactly one merge base" msgstr "„%s“: изисква се точно една база за пребазиране" -#: builtin/rebase.c:1896 +#: builtin/rebase.c:1930 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "Указателят „%s“ не сочи към подаване" -#: builtin/rebase.c:1921 +#: builtin/rebase.c:1955 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "ФАТАЛНА ГРЕШКА: не съществува клон „%s“" -#: builtin/rebase.c:1929 builtin/submodule--helper.c:38 +#: builtin/rebase.c:1963 builtin/submodule--helper.c:38 #: builtin/submodule--helper.c:1934 #, c-format msgid "No such ref: %s" msgstr "Такъв указател няма: %s" -#: builtin/rebase.c:1940 +#: builtin/rebase.c:1974 msgid "Could not resolve HEAD to a revision" msgstr "Подаването, сочено от указателя „HEAD“, не може да бъде открито" -#: builtin/rebase.c:1981 +#: builtin/rebase.c:2012 msgid "Cannot autostash" msgstr "Не може да се скатае автоматично" -#: builtin/rebase.c:1984 +#: builtin/rebase.c:2015 #, c-format msgid "Unexpected stash response: '%s'" msgstr "Неочакван резултат при скатаване: „%s“" -#: builtin/rebase.c:1990 +#: builtin/rebase.c:2021 #, c-format msgid "Could not create directory for '%s'" msgstr "Директорията за „%s“ не може да бъде създадена" -#: builtin/rebase.c:1993 +#: builtin/rebase.c:2024 #, c-format msgid "Created autostash: %s\n" msgstr "Автоматично скатано: „%s“\n" -#: builtin/rebase.c:1996 +#: builtin/rebase.c:2027 msgid "could not reset --hard" msgstr "неуспешно изпълнение на „git reset --hard“" -#: builtin/rebase.c:1997 builtin/reset.c:114 -#, c-format -msgid "HEAD is now at %s" -msgstr "Указателят „HEAD“ сочи към „%s“" - -#: builtin/rebase.c:2013 +#: builtin/rebase.c:2036 msgid "Please commit or stash them." msgstr "Промените трябва или да се подадат, или да се скатаят." -#: builtin/rebase.c:2040 +#: builtin/rebase.c:2063 #, c-format msgid "could not parse '%s'" msgstr "„%s“ не може да се анализира" -#: builtin/rebase.c:2053 +#: builtin/rebase.c:2076 #, c-format msgid "could not switch to %s" msgstr "не може да се премине към „%s“" -#: builtin/rebase.c:2064 +#: builtin/rebase.c:2087 msgid "HEAD is up to date." msgstr "Указателят „HEAD“ е напълно актуален." -#: builtin/rebase.c:2066 +#: builtin/rebase.c:2089 #, c-format msgid "Current branch %s is up to date.\n" msgstr "Текущият клон „%s“ е напълно актуален.\n" -#: builtin/rebase.c:2074 +#: builtin/rebase.c:2097 msgid "HEAD is up to date, rebase forced." msgstr "Указателят „HEAD“ е напълно актуален — принудително пребазиране" -#: builtin/rebase.c:2076 +#: builtin/rebase.c:2099 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "Текущият клон „%s“ е напълно актуален — принудително пребазиране\n" -#: builtin/rebase.c:2084 +#: builtin/rebase.c:2107 msgid "The pre-rebase hook refused to rebase." msgstr "Куката за изпълнение преди пребазиране отхвърли пребазирането." -#: builtin/rebase.c:2091 +#: builtin/rebase.c:2114 #, c-format msgid "Changes to %s:\n" msgstr "Промените в „%s“:\n" -#: builtin/rebase.c:2094 +#: builtin/rebase.c:2117 #, c-format msgid "Changes from %s to %s:\n" msgstr "Промените от „%s“ към „%s“:\n" -#: builtin/rebase.c:2119 +#: builtin/rebase.c:2142 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" "Първо, указателят „HEAD“ започва да сочи към базата, върху която " "пребазирате…\n" -#: builtin/rebase.c:2128 +#: builtin/rebase.c:2151 msgid "Could not detach HEAD" msgstr "Указателят „HEAD“ не може да се отделѝ" -#: builtin/rebase.c:2137 +#: builtin/rebase.c:2160 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Превъртане на „%s“ към „%s“.\n" @@ -18212,7 +18296,7 @@ msgstr "Превъртане на „%s“ към „%s“.\n" msgid "git receive-pack <git-dir>" msgstr "git receive-pack ДИРЕКТОРИЯ_НА_GIT" -#: builtin/receive-pack.c:832 +#: builtin/receive-pack.c:830 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" @@ -18245,7 +18329,7 @@ msgstr "" "За да заглушите това съобщение, като запазите стандартното поведение,\n" "задайте настройката „receive.denyCurrentBranch“ да е „refuse“ (отказ)." -#: builtin/receive-pack.c:852 +#: builtin/receive-pack.c:850 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" @@ -18266,11 +18350,11 @@ msgstr "" "За да заглушите това съобщение, задайте настройката\n" "„receive.denyDeleteCurrent“ да е „refuse“ (отказ)." -#: builtin/receive-pack.c:1938 +#: builtin/receive-pack.c:1936 msgid "quiet" msgstr "без извеждане на информация" -#: builtin/receive-pack.c:1952 +#: builtin/receive-pack.c:1950 msgid "You must specify a directory." msgstr "Трябва да укажете директория." @@ -18851,11 +18935,11 @@ msgstr "повече подробности. Поставя се пред по msgid "Unknown subcommand: %s" msgstr "Непозната подкоманда: %s" -#: builtin/repack.c:22 +#: builtin/repack.c:23 msgid "git repack [<options>]" msgstr "git repack [ОПЦИЯ…]" -#: builtin/repack.c:27 +#: builtin/repack.c:28 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -18864,126 +18948,126 @@ msgstr "" "Ползвайте опцията --no-write-bitmap-index или изключете настройката\n" "„pack.writebitmaps“." -#: builtin/repack.c:190 +#: builtin/repack.c:191 msgid "could not start pack-objects to repack promisor objects" msgstr "" "командата „pack-objects“ не може да се стартира за препакетирането на " "гарантиращите обекти" -#: builtin/repack.c:229 builtin/repack.c:408 +#: builtin/repack.c:230 builtin/repack.c:409 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" "repack: от „pack-objects“ се очакват редове само с пълни шестнайсетични " "указатели." -#: builtin/repack.c:246 +#: builtin/repack.c:247 msgid "could not finish pack-objects to repack promisor objects" msgstr "" "командата „pack-objects“ не може да завърши за препакетирането на " "гарантиращите обекти" -#: builtin/repack.c:284 +#: builtin/repack.c:285 msgid "pack everything in a single pack" msgstr "пакетиране на всичко в пакет" -#: builtin/repack.c:286 +#: builtin/repack.c:287 msgid "same as -a, and turn unreachable objects loose" msgstr "" "същото като опцията „-a“. Допълнително — недостижимите обекти да станат " "непакетирани" -#: builtin/repack.c:289 +#: builtin/repack.c:290 msgid "remove redundant packs, and run git-prune-packed" msgstr "" "премахване на ненужните пакетирани файлове и изпълнение на командата „git-" "prune-packed“" -#: builtin/repack.c:291 +#: builtin/repack.c:292 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "подаване на опцията „--no-reuse-delta“ на командата „git-pack-objects“" -#: builtin/repack.c:293 +#: builtin/repack.c:294 msgid "pass --no-reuse-object to git-pack-objects" msgstr "" "подаване на опцията „--no-reuse-object“ на командата „git-pack-objects“" -#: builtin/repack.c:295 +#: builtin/repack.c:296 msgid "do not run git-update-server-info" msgstr "без изпълнение на командата „git-update-server-info“" -#: builtin/repack.c:298 +#: builtin/repack.c:299 msgid "pass --local to git-pack-objects" msgstr "подаване на опцията „--local“ на командата „git-pack-objects“" -#: builtin/repack.c:300 +#: builtin/repack.c:301 msgid "write bitmap index" msgstr "създаване и записване на индекси на база битови маски" -#: builtin/repack.c:302 +#: builtin/repack.c:303 msgid "pass --delta-islands to git-pack-objects" msgstr "подаване на опцията „--delta-islands“ на командата „git-pack-objects“" -#: builtin/repack.c:303 +#: builtin/repack.c:304 msgid "approxidate" msgstr "евристична дата" -#: builtin/repack.c:304 +#: builtin/repack.c:305 msgid "with -A, do not loosen objects older than this" msgstr "" "при комбинирането с опцията „-A“ — без разпакетиране на обектите по стари от " "това" -#: builtin/repack.c:306 +#: builtin/repack.c:307 msgid "with -a, repack unreachable objects" msgstr "с „-a“ — препакетиране на недостижимите обекти" -#: builtin/repack.c:308 +#: builtin/repack.c:309 msgid "size of the window used for delta compression" msgstr "размер на прозореца за делта компресията" -#: builtin/repack.c:309 builtin/repack.c:315 +#: builtin/repack.c:310 builtin/repack.c:316 msgid "bytes" msgstr "байтове" -#: builtin/repack.c:310 +#: builtin/repack.c:311 msgid "same as the above, but limit memory size instead of entries count" msgstr "" "същото като горната опция, но ограничението да е по размер на паметта, а не " "по броя на обектите" -#: builtin/repack.c:312 +#: builtin/repack.c:313 msgid "limits the maximum delta depth" msgstr "ограничаване на максималната дълбочина на делтата" -#: builtin/repack.c:314 +#: builtin/repack.c:315 msgid "limits the maximum number of threads" msgstr "ограничаване на максималния брой нишки" -#: builtin/repack.c:316 +#: builtin/repack.c:317 msgid "maximum size of each packfile" msgstr "максимален размер на всеки пакет" -#: builtin/repack.c:318 +#: builtin/repack.c:319 msgid "repack objects in packs marked with .keep" msgstr "препакетиране на обектите в пакети белязани с „.keep“" -#: builtin/repack.c:320 +#: builtin/repack.c:321 msgid "do not repack this pack" msgstr "без препакетиране на този пакет" -#: builtin/repack.c:330 +#: builtin/repack.c:331 msgid "cannot delete packs in a precious-objects repo" msgstr "пакетите в хранилище с важни обекти не може да се трият" -#: builtin/repack.c:334 +#: builtin/repack.c:335 msgid "--keep-unreachable and -A are incompatible" msgstr "Опциите „--keep-unreachable“ и „-A“ са несъвместими" -#: builtin/repack.c:417 +#: builtin/repack.c:418 msgid "Nothing new to pack." msgstr "Нищо ново за пакетиране" -#: builtin/repack.c:478 +#: builtin/repack.c:479 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -19001,7 +19085,7 @@ msgstr "" "ПРЕДУПРЕЖДЕНИЕ: ѝ — за връщането на първоначалните имена.\n" "ПРЕДУПРЕЖДЕНИЕ: Преименувайте файловете в „%s“ ръчно:\n" -#: builtin/repack.c:526 +#: builtin/repack.c:527 #, c-format msgid "failed to remove '%s'" msgstr "директорията „%s“ не може да бъде изтрита" @@ -19109,8 +19193,8 @@ msgstr "„fstat“ не може да се изпълни върху „%s“" msgid "unable to write object to database" msgstr "обектът не може да бъде записан в базата от данни" -#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422 -#: builtin/replace.c:452 +#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:423 +#: builtin/replace.c:453 #, c-format msgid "not a valid object name: '%s'" msgstr "неправилно име на обект: „%s“" @@ -19129,22 +19213,22 @@ msgstr "неуспешно редактиране на файла с обект msgid "new object is the same as the old one: '%s'" msgstr "новият и старият обект са един и същ: „%s“" -#: builtin/replace.c:383 +#: builtin/replace.c:384 #, c-format msgid "could not parse %s as a commit" msgstr "„%s“ не може да се анализира като подаване" -#: builtin/replace.c:414 +#: builtin/replace.c:415 #, c-format msgid "bad mergetag in commit '%s'" msgstr "етикетът при сливане в подаването „%s“ e неправилен" -#: builtin/replace.c:416 +#: builtin/replace.c:417 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "етикетът при сливане в подаването „%s“ e неправилен" -#: builtin/replace.c:428 +#: builtin/replace.c:429 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -19153,31 +19237,31 @@ msgstr "" "Първоначалното подаване „%s“ съдържа етикета при сливане „%s“, който е " "изхвърлен, затова използвайте опцията „--edit“, а не „--graft“." -#: builtin/replace.c:467 +#: builtin/replace.c:468 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "първоначалното подаване „%s“ е с подпис на GPG" -#: builtin/replace.c:468 +#: builtin/replace.c:469 msgid "the signature will be removed in the replacement commit!" msgstr "Подписът ще бъде премахнат в заменящото подаване!" -#: builtin/replace.c:478 +#: builtin/replace.c:479 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "заменящото подаване за „%s“ не може да бъде записано" -#: builtin/replace.c:486 +#: builtin/replace.c:487 #, c-format msgid "graft for '%s' unnecessary" msgstr "присадката за „%s“ е излишна" -#: builtin/replace.c:490 +#: builtin/replace.c:491 #, c-format msgid "new commit is the same as the old one: '%s'" msgstr "новото и старото подаване са едно и също: „%s“" -#: builtin/replace.c:525 +#: builtin/replace.c:526 #, c-format msgid "" "could not convert the following graft(s):\n" @@ -19186,71 +19270,71 @@ msgstr "" "следните присадки не могат да се преобразуват:\n" "%s" -#: builtin/replace.c:546 +#: builtin/replace.c:547 msgid "list replace refs" msgstr "извеждане на списъка с указателите за замяна" -#: builtin/replace.c:547 +#: builtin/replace.c:548 msgid "delete replace refs" msgstr "изтриване на указателите за замяна" -#: builtin/replace.c:548 +#: builtin/replace.c:549 msgid "edit existing object" msgstr "редактиране на съществуващ обект" -#: builtin/replace.c:549 +#: builtin/replace.c:550 msgid "change a commit's parents" msgstr "смяна на родителите на подаване" -#: builtin/replace.c:550 +#: builtin/replace.c:551 msgid "convert existing graft file" msgstr "преобразуване на файла за присадките" -#: builtin/replace.c:551 +#: builtin/replace.c:552 msgid "replace the ref if it exists" msgstr "замяна на указателя, ако съществува" -#: builtin/replace.c:553 +#: builtin/replace.c:554 msgid "do not pretty-print contents for --edit" msgstr "без форматирано извеждане на съдържанието — за опцията „--edit“" -#: builtin/replace.c:554 +#: builtin/replace.c:555 msgid "use this format" msgstr "използване на този ФОРМАТ" -#: builtin/replace.c:567 +#: builtin/replace.c:568 msgid "--format cannot be used when not listing" msgstr "опцията „--format“ изисква извеждане на списък" -#: builtin/replace.c:575 +#: builtin/replace.c:576 msgid "-f only makes sense when writing a replacement" msgstr "опцията „-f“ изисква запазването на заместител" -#: builtin/replace.c:579 +#: builtin/replace.c:580 msgid "--raw only makes sense with --edit" msgstr "опцията „--raw“ изисква „--edit“" -#: builtin/replace.c:585 +#: builtin/replace.c:586 msgid "-d needs at least one argument" msgstr "опцията „-d“ изисква поне един аргумент" -#: builtin/replace.c:591 +#: builtin/replace.c:592 msgid "bad number of arguments" msgstr "неправилен брой аргументи" -#: builtin/replace.c:597 +#: builtin/replace.c:598 msgid "-e needs exactly one argument" msgstr "опцията „-e“ изисква поне един аргумент" -#: builtin/replace.c:603 +#: builtin/replace.c:604 msgid "-g needs at least one argument" msgstr "опцията „-g“ изисква поне един аргумент" -#: builtin/replace.c:609 +#: builtin/replace.c:610 msgid "--convert-graft-file takes no argument" msgstr "опцията „--convert-graft-file“ не приема аргументи" -#: builtin/replace.c:615 +#: builtin/replace.c:616 msgid "only one pattern can be given with -l" msgstr "опцията „-l“ приема точно един шаблон" @@ -19318,13 +19402,18 @@ msgstr "Дървото, сочено от указателя „HEAD“, не м msgid "Failed to find tree of %s." msgstr "Дървото, сочено от „%s“, не може да бъде открито." +#: builtin/reset.c:114 +#, c-format +msgid "HEAD is now at %s" +msgstr "Указателят „HEAD“ сочи към „%s“" + #: builtin/reset.c:193 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "Не може да се извърши %s зануляване по време на сливане." -#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589 -#: builtin/stash.c:613 +#: builtin/reset.c:293 builtin/stash.c:520 builtin/stash.c:595 +#: builtin/stash.c:619 msgid "be quiet, only report errors" msgstr "по-малко подробности, да се извеждат само грешките" @@ -19410,24 +19499,19 @@ msgstr "Индексът не може да бъде занулен към ве msgid "Could not write new index file." msgstr "Новият индекс не може да бъде записан." -#: builtin/rev-list.c:412 +#: builtin/rev-list.c:411 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "опциите „--exclude-promisor-objects“ и „--missing“ и са несъвместими" -#: builtin/rev-list.c:473 +#: builtin/rev-list.c:472 msgid "object filtering requires --objects" msgstr "филтрирането на обекти изисква опцията „--objects“" -#: builtin/rev-list.c:476 -#, c-format -msgid "invalid sparse value '%s'" -msgstr "неправилна частична стойност: %s" - -#: builtin/rev-list.c:527 +#: builtin/rev-list.c:522 msgid "rev-list does not support display of notes" msgstr "командата „rev-list“ не поддържа извеждането на бележки" -#: builtin/rev-list.c:530 +#: builtin/rev-list.c:525 msgid "cannot combine --use-bitmap-index with object filtering" msgstr "опцията „--use-bitmap-index“ е несъвместима с филтриране на обектите" @@ -19982,134 +20066,134 @@ msgstr "" msgid "could not save index tree" msgstr "дървото сочено от индекса не може да бъде запазено" -#: builtin/stash.c:434 +#: builtin/stash.c:436 msgid "could not restore untracked files from stash" msgstr "неследени файлове не могат да се възстановят от скатаното" -#: builtin/stash.c:448 +#: builtin/stash.c:450 #, c-format msgid "Merging %s with %s" msgstr "Сливане на „%s“ с „%s“" -#: builtin/stash.c:458 git-legacy-stash.sh:680 +#: builtin/stash.c:460 git-legacy-stash.sh:680 msgid "Index was not unstashed." msgstr "Индексът не е изваден от скатаното." -#: builtin/stash.c:516 builtin/stash.c:615 +#: builtin/stash.c:522 builtin/stash.c:621 msgid "attempt to recreate the index" msgstr "опит за повторно създаване на индекса" -#: builtin/stash.c:549 +#: builtin/stash.c:555 #, c-format msgid "Dropped %s (%s)" msgstr "Изтрито: „%s“ (%s)" -#: builtin/stash.c:552 +#: builtin/stash.c:558 #, c-format msgid "%s: Could not drop stash entry" msgstr "Скатаното „%s“ не може да бъде изтрито" -#: builtin/stash.c:577 +#: builtin/stash.c:583 #, c-format msgid "'%s' is not a stash reference" msgstr "„%s“ не е указател към нещо скатано" -#: builtin/stash.c:627 git-legacy-stash.sh:694 +#: builtin/stash.c:633 git-legacy-stash.sh:694 msgid "The stash entry is kept in case you need it again." msgstr "Скатаното е запазено в случай, че ви потрябва отново." -#: builtin/stash.c:650 git-legacy-stash.sh:712 +#: builtin/stash.c:656 git-legacy-stash.sh:712 msgid "No branch name specified" msgstr "Не е указано име на клон" -#: builtin/stash.c:790 builtin/stash.c:827 +#: builtin/stash.c:796 builtin/stash.c:833 #, c-format msgid "Cannot update %s with %s" msgstr "Указателят „%s“ не може да бъде обновен да сочи към „%s“" -#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497 +#: builtin/stash.c:814 builtin/stash.c:1470 builtin/stash.c:1506 msgid "stash message" msgstr "съобщение при скатаване" -#: builtin/stash.c:818 +#: builtin/stash.c:824 msgid "\"git stash store\" requires one <commit> argument" msgstr "командата „git stash store“ изисква точно един аргумент-ПОДАВАНЕ" -#: builtin/stash.c:1040 git-legacy-stash.sh:217 +#: builtin/stash.c:1046 git-legacy-stash.sh:217 msgid "No changes selected" msgstr "Не са избрани никакви промени" -#: builtin/stash.c:1136 git-legacy-stash.sh:150 +#: builtin/stash.c:1145 git-legacy-stash.sh:150 msgid "You do not have the initial commit yet" msgstr "Все още липсва първоначално подаване" -#: builtin/stash.c:1163 git-legacy-stash.sh:165 +#: builtin/stash.c:1172 git-legacy-stash.sh:165 msgid "Cannot save the current index state" msgstr "Състоянието на текущия индекс не може да бъде запазено" -#: builtin/stash.c:1172 git-legacy-stash.sh:180 +#: builtin/stash.c:1181 git-legacy-stash.sh:180 msgid "Cannot save the untracked files" msgstr "Неследените файлове не могат да се запазят" -#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200 +#: builtin/stash.c:1192 builtin/stash.c:1201 git-legacy-stash.sh:200 #: git-legacy-stash.sh:213 msgid "Cannot save the current worktree state" msgstr "Състоянието на работното дърво не може да бъде запазено" -#: builtin/stash.c:1220 git-legacy-stash.sh:233 +#: builtin/stash.c:1229 git-legacy-stash.sh:233 msgid "Cannot record working tree state" msgstr "Състоянието на работното дърво не може да бъде запазено" -#: builtin/stash.c:1269 git-legacy-stash.sh:337 +#: builtin/stash.c:1278 git-legacy-stash.sh:337 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "Опцията „--patch“ е несъвместима с „--include-untracked“ и „--all“" -#: builtin/stash.c:1285 +#: builtin/stash.c:1294 msgid "Did you forget to 'git add'?" msgstr "Пробвайте да използвате „git add“" -#: builtin/stash.c:1300 git-legacy-stash.sh:345 +#: builtin/stash.c:1309 git-legacy-stash.sh:345 msgid "No local changes to save" msgstr "Няма никакви локални промени за скатаване" -#: builtin/stash.c:1307 git-legacy-stash.sh:350 +#: builtin/stash.c:1316 git-legacy-stash.sh:350 msgid "Cannot initialize stash" msgstr "Скатаването не може да стартира" -#: builtin/stash.c:1322 git-legacy-stash.sh:354 +#: builtin/stash.c:1331 git-legacy-stash.sh:354 msgid "Cannot save the current status" msgstr "Текущото състояние не може да бъде запазено" -#: builtin/stash.c:1327 +#: builtin/stash.c:1336 #, c-format msgid "Saved working directory and index state %s" msgstr "Състоянието на работната директория и индекса e запазено: „%s“" -#: builtin/stash.c:1417 git-legacy-stash.sh:384 +#: builtin/stash.c:1426 git-legacy-stash.sh:384 msgid "Cannot remove worktree changes" msgstr "Промените в работното дърво не могат да бъдат занулени" -#: builtin/stash.c:1452 builtin/stash.c:1488 +#: builtin/stash.c:1461 builtin/stash.c:1497 msgid "keep index" msgstr "запазване на индекса" -#: builtin/stash.c:1454 builtin/stash.c:1490 +#: builtin/stash.c:1463 builtin/stash.c:1499 msgid "stash in patch mode" msgstr "скатаване в режим за кръпки" -#: builtin/stash.c:1455 builtin/stash.c:1491 +#: builtin/stash.c:1464 builtin/stash.c:1500 msgid "quiet mode" msgstr "без извеждане на информация" -#: builtin/stash.c:1457 builtin/stash.c:1493 +#: builtin/stash.c:1466 builtin/stash.c:1502 msgid "include untracked files in stash" msgstr "скатаване и на неследените файлове" -#: builtin/stash.c:1459 builtin/stash.c:1495 +#: builtin/stash.c:1468 builtin/stash.c:1504 msgid "include ignore files" msgstr "скатаване и на игнорираните файлове" -#: builtin/stash.c:1555 +#: builtin/stash.c:1564 #, c-format msgid "could not exec %s" msgstr "„%s“ не може да се изпълни" @@ -20485,8 +20569,8 @@ msgid "don't print cloning progress" msgstr "без извеждане на напредъка на клонирането" #: builtin/submodule--helper.c:1877 -msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" -msgstr "git submodule--helper update_clone [--prefix=ПЪТ] [ПЪТ…]" +msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper update-clone [--prefix=ПЪТ] [ПЪТ…]" #: builtin/submodule--helper.c:1890 msgid "bad value for update parameter" @@ -20539,7 +20623,7 @@ msgstr "git submodule--helper config --check-writeable" msgid "please make sure that the .gitmodules file is in the working tree" msgstr "файлът „.gitmodules“ трябва да е в работното дърво" -#: builtin/submodule--helper.c:2235 git.c:434 git.c:684 +#: builtin/submodule--helper.c:2235 git.c:433 git.c:683 #, c-format msgid "%s doesn't support --super-prefix" msgstr "„%s“ не поддържа опцията „--super-prefix“" @@ -20871,149 +20955,149 @@ msgstr " Добре" msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [ОПЦИЯ…] [--] [ФАЙЛ…]" -#: builtin/update-index.c:971 +#: builtin/update-index.c:972 msgid "continue refresh even when index needs update" msgstr "" "продължаване с обновяването, дори когато индексът трябва да бъде обновен" -#: builtin/update-index.c:974 +#: builtin/update-index.c:975 msgid "refresh: ignore submodules" msgstr "подмодулите да се игнорират при обновяването" -#: builtin/update-index.c:977 +#: builtin/update-index.c:978 msgid "do not ignore new files" msgstr "новите файлове да не се игнорират" -#: builtin/update-index.c:979 +#: builtin/update-index.c:980 msgid "let files replace directories and vice-versa" msgstr "файлове да могат да заменят директории и обратно" -#: builtin/update-index.c:981 +#: builtin/update-index.c:982 msgid "notice files missing from worktree" msgstr "предупреждаване при липсващи в работното дърво файлове" -#: builtin/update-index.c:983 +#: builtin/update-index.c:984 msgid "refresh even if index contains unmerged entries" msgstr "обновяване дори и индексът да съдържа неслети обекти" -#: builtin/update-index.c:986 +#: builtin/update-index.c:987 msgid "refresh stat information" msgstr "обновяване на информацията от функцията „stat“" -#: builtin/update-index.c:990 +#: builtin/update-index.c:991 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "" "като опцията „--refresh“, но да се проверят и обектите, които са били приети " "за непроменени" -#: builtin/update-index.c:994 +#: builtin/update-index.c:995 msgid "<mode>,<object>,<path>" msgstr "РЕЖИМ,ОБЕКТ,ПЪТ" -#: builtin/update-index.c:995 +#: builtin/update-index.c:996 msgid "add the specified entry to the index" msgstr "добавяне на изброените обекти към индекса" -#: builtin/update-index.c:1005 +#: builtin/update-index.c:1006 msgid "mark files as \"not changing\"" msgstr "задаване на флаг, че файлът не се променя" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1009 msgid "clear assumed-unchanged bit" msgstr "изчистване на флага, че файлът не се променя" -#: builtin/update-index.c:1011 +#: builtin/update-index.c:1012 msgid "mark files as \"index-only\"" msgstr "задаване на флаг, че файловете са само за индекса" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1015 msgid "clear skip-worktree bit" msgstr "изчистване на флага, че файловете са само за индекса" -#: builtin/update-index.c:1017 +#: builtin/update-index.c:1018 msgid "add to index only; do not add content to object database" msgstr "добавяне само към индекса без добавяне към базата от данни за обектите" -#: builtin/update-index.c:1019 +#: builtin/update-index.c:1020 msgid "remove named paths even if present in worktree" msgstr "изтриване на указаните пътища, дори и да съществуват в работното дърво" -#: builtin/update-index.c:1021 +#: builtin/update-index.c:1022 msgid "with --stdin: input lines are terminated by null bytes" msgstr "" "при комбиниране с опцията „--stdin“ — входните редове са разделени с нулевия " "байт" -#: builtin/update-index.c:1023 +#: builtin/update-index.c:1024 msgid "read list of paths to be updated from standard input" msgstr "изчитане на списъка с пътища за обновяване от стандартния вход" -#: builtin/update-index.c:1027 +#: builtin/update-index.c:1028 msgid "add entries from standard input to the index" msgstr "добавяне на елементите от стандартния вход към индекса" -#: builtin/update-index.c:1031 +#: builtin/update-index.c:1032 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" "възстановяване на състоянието преди сливане или нужда от обновяване за " "изброените пътища" -#: builtin/update-index.c:1035 +#: builtin/update-index.c:1036 msgid "only update entries that differ from HEAD" msgstr "добавяне само на съдържанието, което се различава от това в „HEAD“" -#: builtin/update-index.c:1039 +#: builtin/update-index.c:1040 msgid "ignore files missing from worktree" msgstr "игнориране на файловете, които липсват в работното дърво" -#: builtin/update-index.c:1042 +#: builtin/update-index.c:1043 msgid "report actions to standard output" msgstr "извеждане на действията на стандартния изход" -#: builtin/update-index.c:1044 +#: builtin/update-index.c:1045 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" "забравяне на записаната информация за неразрешени конфликти — за командите " "от потребителско ниво" -#: builtin/update-index.c:1048 +#: builtin/update-index.c:1049 msgid "write index in this format" msgstr "записване на индекса в този формат" -#: builtin/update-index.c:1050 +#: builtin/update-index.c:1051 msgid "enable or disable split index" msgstr "включване или изключване на разделянето на индекса" -#: builtin/update-index.c:1052 +#: builtin/update-index.c:1053 msgid "enable/disable untracked cache" msgstr "включване/изключване на кеша за неследените файлове" -#: builtin/update-index.c:1054 +#: builtin/update-index.c:1055 msgid "test if the filesystem supports untracked cache" msgstr "проверка дали файловата система поддържа кеш за неследени файлове" -#: builtin/update-index.c:1056 +#: builtin/update-index.c:1057 msgid "enable untracked cache without testing the filesystem" msgstr "" "включване на кеша за неследените файлове без проверка на файловата система" -#: builtin/update-index.c:1058 +#: builtin/update-index.c:1059 msgid "write out the index even if is not flagged as changed" msgstr "запис на индекса, дори да не е отбелязан като променен" -#: builtin/update-index.c:1060 +#: builtin/update-index.c:1061 msgid "enable or disable file system monitor" msgstr "включване или изключване на наблюдението на файловата система" -#: builtin/update-index.c:1062 +#: builtin/update-index.c:1063 msgid "mark files as fsmonitor valid" msgstr "отбелязване на файловете, че могат да се следят чрез файловата система" -#: builtin/update-index.c:1065 +#: builtin/update-index.c:1066 msgid "clear fsmonitor valid bit" msgstr "изчистване на флага за следенето чрез файловата система" -#: builtin/update-index.c:1168 +#: builtin/update-index.c:1169 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -21021,7 +21105,7 @@ msgstr "" "Настройката „core.splitIndex“ е зададена на „false“ (лъжа). Сменете я или я " "изтрийте, за да включите разделянето на индекса" -#: builtin/update-index.c:1177 +#: builtin/update-index.c:1178 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -21029,7 +21113,7 @@ msgstr "" "Настройката „core.splitIndex“ е зададена на „true“ (истина). Сменете я или " "я изтрийте, за да изключите разделянето на индекса." -#: builtin/update-index.c:1188 +#: builtin/update-index.c:1190 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -21037,11 +21121,11 @@ msgstr "" "Настройката „core.untrackedCache“ е зададена на „true“ (истина). Сменете я " "или я изтрийте, за да изключите кеша за неследените файлове" -#: builtin/update-index.c:1192 +#: builtin/update-index.c:1194 msgid "Untracked cache disabled" msgstr "Кешът за неследените файлове е изключен" -#: builtin/update-index.c:1200 +#: builtin/update-index.c:1202 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -21049,29 +21133,29 @@ msgstr "" "Настройката „core.untrackedCache“ е зададена на „false“ (лъжа). Сменете я " "или я изтрийте, за да включите кеша за неследените файлове" -#: builtin/update-index.c:1204 +#: builtin/update-index.c:1206 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Кешът за неследените файлове е включен за „%s“" -#: builtin/update-index.c:1212 +#: builtin/update-index.c:1214 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "" "Настройката „core.fsmonitor“ не е зададена. Задайте я, за да включите " "следенето чрез файловата система." -#: builtin/update-index.c:1216 +#: builtin/update-index.c:1218 msgid "fsmonitor enabled" msgstr "следенето чрез файловата система е включено" -#: builtin/update-index.c:1219 +#: builtin/update-index.c:1221 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" "Настройката „core.fsmonitor“ е зададена. Изтрийте я, за да изключите " "следенето чрез файловата система." -#: builtin/update-index.c:1223 +#: builtin/update-index.c:1225 msgid "fsmonitor disabled" msgstr "следенето чрез файловата система е изключено" @@ -21166,56 +21250,56 @@ msgstr "git verify-tag [-v | --verbose] [--format=ФОРМАТ] ЕТИКЕТ…" msgid "print tag contents" msgstr "извеждане на съдържанието на ЕТИКЕТи" -#: builtin/worktree.c:18 +#: builtin/worktree.c:17 msgid "git worktree add [<options>] <path> [<commit-ish>]" msgstr "git worktree add [ОПЦИЯ…] ПЪТ [УКАЗАТЕЛ_КЪМ_ПОДАВАНЕ]" -#: builtin/worktree.c:19 +#: builtin/worktree.c:18 msgid "git worktree list [<options>]" msgstr "git worktree list [ОПЦИЯ…]" -#: builtin/worktree.c:20 +#: builtin/worktree.c:19 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [ОПЦИЯ…] [ПЪТ]" -#: builtin/worktree.c:21 +#: builtin/worktree.c:20 msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move [ДЪРВО] [НОВ_ПЪТ]" -#: builtin/worktree.c:22 +#: builtin/worktree.c:21 msgid "git worktree prune [<options>]" msgstr "git worktree prune [ОПЦИЯ…]" -#: builtin/worktree.c:23 +#: builtin/worktree.c:22 msgid "git worktree remove [<options>] <worktree>" msgstr "git worktree remove [ОПЦИЯ…] [ДЪРВО]" -#: builtin/worktree.c:24 +#: builtin/worktree.c:23 msgid "git worktree unlock <path>" msgstr "git worktree unlock [ПЪТ]" -#: builtin/worktree.c:61 builtin/worktree.c:899 +#: builtin/worktree.c:60 builtin/worktree.c:898 #, c-format msgid "failed to delete '%s'" msgstr "неуспешно изтриване на „%s“" -#: builtin/worktree.c:80 +#: builtin/worktree.c:79 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Изтриване на „worktrees/%s“: не е правилна поддиректория" -#: builtin/worktree.c:86 +#: builtin/worktree.c:85 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Изтриване на „worktrees/%s“: файлът „gitdir“ не съществува" -#: builtin/worktree.c:91 builtin/worktree.c:100 +#: builtin/worktree.c:90 builtin/worktree.c:99 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "" "Изтриване на „worktrees/%s“: файлът „gitdir“ (%s) не може да бъде прочетен" -#: builtin/worktree.c:110 +#: builtin/worktree.c:109 #, c-format msgid "" "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " @@ -21224,37 +21308,37 @@ msgstr "" "Изтриване на „worktrees/%s“: изчитането върна по-малко байтове от очакваното " "(очаквани: %<PRIuMAX> байта, получени: %<PRIuMAX>)" -#: builtin/worktree.c:118 +#: builtin/worktree.c:117 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Изтриване на „worktrees/%s“: неправилен файл „gitdir“" -#: builtin/worktree.c:127 +#: builtin/worktree.c:126 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "" "Изтриване на „worktrees/%s“: файлът „gitdir“ сочи несъществуващо " "местоположение" -#: builtin/worktree.c:166 +#: builtin/worktree.c:165 msgid "report pruned working trees" msgstr "докладване на окастрените работни дървета" -#: builtin/worktree.c:168 +#: builtin/worktree.c:167 msgid "expire working trees older than <time>" msgstr "обявяване на работните копия по-стари от това ВРЕМЕ за остарели" -#: builtin/worktree.c:235 +#: builtin/worktree.c:234 #, c-format msgid "'%s' already exists" msgstr "„%s“ вече съществува" -#: builtin/worktree.c:252 +#: builtin/worktree.c:251 #, c-format msgid "unable to re-add worktree '%s'" msgstr "дървото „%s“ не може да бъде добавено наново" -#: builtin/worktree.c:257 +#: builtin/worktree.c:256 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" @@ -21264,7 +21348,7 @@ msgstr "" "За изрично задаване ползвайте „add -f“, а за изчистване — „prune“ или " "„remove“" -#: builtin/worktree.c:259 +#: builtin/worktree.c:258 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" @@ -21274,125 +21358,125 @@ msgstr "" "За изрично задаване ползвайте „add -f“, а за изчистване — „prune“ или " "„remove“" -#: builtin/worktree.c:309 +#: builtin/worktree.c:308 #, c-format msgid "could not create directory of '%s'" msgstr "директорията „%s“ не може да бъде създадена" -#: builtin/worktree.c:440 builtin/worktree.c:446 +#: builtin/worktree.c:439 builtin/worktree.c:445 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Приготвяне на работното дърво (нов клон „%s“)" -#: builtin/worktree.c:442 +#: builtin/worktree.c:441 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "" "Приготвяне на работното дърво (зануляване на клона „%s“, който сочеше към " "„%s“)" -#: builtin/worktree.c:451 +#: builtin/worktree.c:450 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Приготвяне на работното дърво (изтегляне на „%s“)" -#: builtin/worktree.c:457 +#: builtin/worktree.c:456 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Подготвяне на работно дърво (указателят „HEAD“ не свързан: %s)" -#: builtin/worktree.c:498 +#: builtin/worktree.c:497 msgid "checkout <branch> even if already checked out in other worktree" msgstr "Изтегляне КЛОНа, дори и да е изтеглен в друго работно дърво" -#: builtin/worktree.c:501 +#: builtin/worktree.c:500 msgid "create a new branch" msgstr "създаване на нов клон" -#: builtin/worktree.c:503 +#: builtin/worktree.c:502 msgid "create or reset a branch" msgstr "създаване или зануляване на клони" -#: builtin/worktree.c:505 +#: builtin/worktree.c:504 msgid "populate the new working tree" msgstr "подготвяне на новото работно дърво" -#: builtin/worktree.c:506 +#: builtin/worktree.c:505 msgid "keep the new working tree locked" msgstr "новото работно дърво да остане заключено" -#: builtin/worktree.c:509 +#: builtin/worktree.c:508 msgid "set up tracking mode (see git-branch(1))" msgstr "задаване на режима на следене (виж git-branch(1))" -#: builtin/worktree.c:512 +#: builtin/worktree.c:511 msgid "try to match the new branch name with a remote-tracking branch" msgstr "опит за напасване на името на новия клон с това на следящ клон" -#: builtin/worktree.c:520 +#: builtin/worktree.c:519 msgid "-b, -B, and --detach are mutually exclusive" msgstr "Опциите „-b“, „-B“ и „--detach“ са несъвместими една с друга" -#: builtin/worktree.c:581 +#: builtin/worktree.c:580 msgid "--[no-]track can only be used if a new branch is created" msgstr "„--[no-]track“ може да се използва само при създаването на нов клон" -#: builtin/worktree.c:681 +#: builtin/worktree.c:680 msgid "reason for locking" msgstr "причина за заключване" -#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800 -#: builtin/worktree.c:927 +#: builtin/worktree.c:692 builtin/worktree.c:725 builtin/worktree.c:799 +#: builtin/worktree.c:926 #, c-format msgid "'%s' is not a working tree" msgstr "„%s“ не е работно дърво" -#: builtin/worktree.c:695 builtin/worktree.c:728 +#: builtin/worktree.c:694 builtin/worktree.c:727 msgid "The main working tree cannot be locked or unlocked" msgstr "Основното дърво не може да се отключи или заключи" -#: builtin/worktree.c:700 +#: builtin/worktree.c:699 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "„%s“ вече е заключено, защото „%s“" -#: builtin/worktree.c:702 +#: builtin/worktree.c:701 #, c-format msgid "'%s' is already locked" msgstr "„%s“ вече е заключено" -#: builtin/worktree.c:730 +#: builtin/worktree.c:729 #, c-format msgid "'%s' is not locked" msgstr "„%s“ не е заключено" -#: builtin/worktree.c:771 +#: builtin/worktree.c:770 msgid "working trees containing submodules cannot be moved or removed" msgstr "" "не може да местите или изтривате работни дървета, в които има подмодули" -#: builtin/worktree.c:779 +#: builtin/worktree.c:778 msgid "force move even if worktree is dirty or locked" msgstr "" "принудително преместване, дори работното дърво да не е чисто или да е " "заключено" -#: builtin/worktree.c:802 builtin/worktree.c:929 +#: builtin/worktree.c:801 builtin/worktree.c:928 #, c-format msgid "'%s' is a main working tree" msgstr "„%s“ е основно работно дърво" -#: builtin/worktree.c:807 +#: builtin/worktree.c:806 #, c-format msgid "could not figure out destination name from '%s'" msgstr "името на целта не може да се определи от „%s“" -#: builtin/worktree.c:813 +#: builtin/worktree.c:812 #, c-format msgid "target '%s' already exists" msgstr "целта „%s“ вече съществува" -#: builtin/worktree.c:821 +#: builtin/worktree.c:820 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -21401,7 +21485,7 @@ msgstr "" "не може да преместите заключено работно дърво, причина за заключването: %s\n" "или го отключете, или го преместете принудително с „move -f -f“" -#: builtin/worktree.c:823 +#: builtin/worktree.c:822 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -21409,41 +21493,41 @@ msgstr "" "не може да преместите заключено работно дърво:\n" "или го отключете, или го преместете принудително с „move -f -f“" -#: builtin/worktree.c:826 +#: builtin/worktree.c:825 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "" "проверките са неуспешни, работното дърво не може да бъде преместено: %s" -#: builtin/worktree.c:831 +#: builtin/worktree.c:830 #, c-format msgid "failed to move '%s' to '%s'" msgstr "„%s“ не може да се премести в „%s“" -#: builtin/worktree.c:879 +#: builtin/worktree.c:878 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "не може да изпълни „git status“ върху „%s“" -#: builtin/worktree.c:883 +#: builtin/worktree.c:882 #, c-format -msgid "'%s' is dirty, use --force to delete it" +msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "" -"работното дърво „%s“ не е чисто, за принудително изтриване е необходима " -"опцията „--force“ " +"„%s“ съдържа провенени или нови файлове, за принудително изтриване е " +"необходима опцията „--force“" -#: builtin/worktree.c:888 +#: builtin/worktree.c:887 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "" "командата „git status“ не може да се изпълни за „%s“, код за грешка: %d" -#: builtin/worktree.c:911 +#: builtin/worktree.c:910 msgid "force removal even if worktree is dirty or locked" msgstr "" "принудително изтриване, дори работното дърво да не е чисто или да е заключено" -#: builtin/worktree.c:934 +#: builtin/worktree.c:933 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -21452,7 +21536,7 @@ msgstr "" "не може да изтриете заключено работно дърво, причина за заключването: %s\n" "или го отключете, или го изтрийте принудително с „remove -f -f“" -#: builtin/worktree.c:936 +#: builtin/worktree.c:935 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -21460,7 +21544,7 @@ msgstr "" "не може да изтриете заключено работно дърво:\n" "или го отключете, или го изтрийте принудително с „remove -f -f“" -#: builtin/worktree.c:939 +#: builtin/worktree.c:938 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "проверките са неуспешни, работното дърво не може да бъде изтрито: %s" @@ -21481,6 +21565,16 @@ msgstr "запис на обект-дърво за поддиректорият msgid "only useful for debugging" msgstr "само за изчистване на грешки" +#: fast-import.c:3118 +#, c-format +msgid "Expected 'mark' command, got %s" +msgstr "очаква се команда „mark“, а бе получена: „%s“" + +#: fast-import.c:3123 +#, c-format +msgid "Expected 'to' command, got %s" +msgstr "очаква се команда „to“, а бе получена: „%s“" + #: credential-cache--daemon.c:223 #, c-format msgid "" @@ -21598,39 +21692,39 @@ msgstr "" "псевдонимът „%s“ променя променливи на средата.\n" "За това може да ползвате „!git“ в псевдонима" -#: git.c:377 +#: git.c:376 #, c-format msgid "empty alias for %s" msgstr "празен псевдоним за „%s“" -#: git.c:380 +#: git.c:379 #, c-format msgid "recursive alias: %s" msgstr "зациклен псевдоним: „%s“" -#: git.c:460 +#: git.c:459 msgid "write failure on standard output" msgstr "грешка при запис на стандартния изход" -#: git.c:462 +#: git.c:461 msgid "unknown write failure on standard output" msgstr "неизвестна грешка при запис на стандартния изход" -#: git.c:464 +#: git.c:463 msgid "close failed on standard output" msgstr "грешка при затваряне на стандартния изход" -#: git.c:793 +#: git.c:792 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "зацикляне в псевдонимите: заместванията на „%s“ не приключват:%s" -#: git.c:843 +#: git.c:842 #, c-format msgid "cannot handle %s as a builtin" msgstr "„%s“ не може да се обработи като вградена команда" -#: git.c:856 +#: git.c:855 #, c-format msgid "" "usage: %s\n" @@ -21639,14 +21733,14 @@ msgstr "" "употреба: %s\n" "\n" -#: git.c:876 +#: git.c:875 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "" "неуспешно заместване на псевдонима „%s“ — резултатът „%s“ не е команда на " "git\n" -#: git.c:888 +#: git.c:887 #, c-format msgid "failed to run command '%s': %s\n" msgstr "командата „%s“ не може да се изпълни: %s\n" @@ -21665,34 +21759,34 @@ msgstr "Управлението на делегирането не се под msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "Задаването на постоянен публичен ключ не се поддържа от cURL < 7.44.0" -#: http.c:876 +#: http.c:878 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" msgstr "„CURLSSLOPT_NO_REVOKE“ не се поддържа от cURL < 7.44.0" -#: http.c:949 +#: http.c:951 msgid "Protocol restrictions not supported with cURL < 7.19.4" msgstr "Ограничаването на протоколите не се поддържа от cURL < 7.44.0" -#: http.c:1085 +#: http.c:1088 #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" msgstr "Неподдържана реализация на SSL „%s“. Поддържат се:" -#: http.c:1092 +#: http.c:1095 #, c-format msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" msgstr "" "Реализацията на SSL не може да се зададе да е „%s“: cURL е компилиран без " "поддръжка на SSL" -#: http.c:1096 +#: http.c:1099 #, c-format msgid "Could not set SSL backend to '%s': already set" msgstr "" "Реализацията на SSL не може да се зададе да е „%s“, защото вече е зададена " "друга" -#: http.c:1965 +#: http.c:1968 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -21795,7 +21889,7 @@ msgstr "умният вариант на http не може да доставя msgid "protocol error: expected sha/ref, got '%s'" msgstr "протоколна грешка: очаква се SHA1 или указател, а бе получено: „%s“" -#: remote-curl.c:1138 remote-curl.c:1252 +#: remote-curl.c:1138 remote-curl.c:1250 #, c-format msgid "http transport does not support %s" msgstr "транспортът по http не поддържа „%s“" @@ -21804,36 +21898,36 @@ msgstr "транспортът по http не поддържа „%s“" msgid "git-http-push failed" msgstr "неуспешно изпълнение на „git-http-push“" -#: remote-curl.c:1360 +#: remote-curl.c:1356 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "remote-curl: употреба: git remote-curl ХРАНИЛИЩЕ [АДРЕС]" -#: remote-curl.c:1392 +#: remote-curl.c:1388 msgid "remote-curl: error reading command stream from git" msgstr "remote-curl: грешка при изчитането на потока команди от git" -#: remote-curl.c:1399 +#: remote-curl.c:1395 msgid "remote-curl: fetch attempted without a local repo" msgstr "remote-curl: опит за доставяне без локално хранилище" -#: remote-curl.c:1439 +#: remote-curl.c:1435 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl: непозната команда „%s“ от git" -#: list-objects-filter-options.h:61 +#: list-objects-filter-options.h:85 msgid "args" msgstr "АРГУМЕНТИ" -#: list-objects-filter-options.h:62 +#: list-objects-filter-options.h:86 msgid "object filtering" msgstr "филтриране по вид на обекта" -#: parse-options.h:170 +#: parse-options.h:179 msgid "expiry-date" msgstr "период на валидност/запазване" -#: parse-options.h:184 +#: parse-options.h:193 msgid "no-op (backward compatibility)" msgstr "нулева операция (за съвместимост с предишни версии)" @@ -24311,3 +24405,44 @@ msgstr "„%s“ се пропуска, защото е с разширение #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Наистина ли искате да изпратите „%s“? [y|N]: " + +#, c-format +#~ msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" +#~ msgstr "" +#~ "непозната стойност „%s“ за настройката „core.untrackedCache“. Ще се " +#~ "ползва стандартната стойност „keep“ (запазване)" + +#~ msgid "cannot change partial clone promisor remote" +#~ msgstr "не може да промените хранилището-гарант на непълно хранилище" + +#~ msgid "error building trees" +#~ msgstr "грешка при изграждане на дърветата" + +#, c-format +#~ msgid "invalid date format '%s' in '%s'" +#~ msgstr "неправилен формат на дата „%s“ в „%s“" + +#~ msgid "writing root commit" +#~ msgstr "запазване на начално подаване" + +#, c-format +#~ msgid "staged changes in the following files may be lost: %s" +#~ msgstr "локалните промени в тези файлове ще се презапишат: %s" + +#~ msgid "" +#~ "--filter can only be used with the remote configured in extensions." +#~ "partialClone" +#~ msgstr "" +#~ "опцията „--filter“ може да се ползва само с отдалеченото хранилище " +#~ "указано в настройката „extensions.partialClone“" + +#~ msgid "verify commit-msg hook" +#~ msgstr "" +#~ "проверка на куката при промяна на съобщението при подаване (commit-msg)" + +#~ msgid "cannot combine '--rebase-merges' with '--strategy-option'" +#~ msgstr "опциите „--rebase-merges“ и „--strategy-option“ са несъвместими" + +#, c-format +#~ msgid "invalid sparse value '%s'" +#~ msgstr "неправилна частична стойност: %s" @@ -1332,7 +1332,7 @@ msgstr "no s'ha pogut obrir «%s»" #: bundle.c:143 msgid "Repository lacks these prerequisite commits:" -msgstr "Al dipòsit li manquen aquestes comissions prerequisits:" +msgstr "Al dipòsit li manquen aquestes comissions prerequerides:" #: bundle.c:146 msgid "need a repository to verify a bundle" @@ -2552,7 +2552,7 @@ msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" msgstr "" -"l'opció diff-algorithm accepta «myers», «minimalminimal», \"patience\" and " +"l'opció diff-algorithm accepta «myers», «minimal», «patience» i " "«histogram»" #: diff.c:5033 diff.c:5053 @@ -4582,7 +4582,7 @@ msgstr "no es pot crear un blob buit a la base de dades d'objectes" #: read-cache.c:718 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" -msgstr "%s: només pot afegir fitxers normals, enllaços simbolics o directoris git" +msgstr "%s: només pot afegir fitxers normals, enllaços simbòlics o directoris git" #: read-cache.c:723 #, fuzzy, c-format @@ -7817,9 +7817,8 @@ msgid "Aborting\n" msgstr "S'està avortant\n" #: unpack-trees.c:318 -#, fuzzy msgid "Updating files" -msgstr "S'està actualitzant %s" +msgstr "S'estan actualitzant els fitxers" #: unpack-trees.c:350 msgid "" @@ -8307,7 +8306,7 @@ msgstr "Comissió inicial" #: wt-status.c:1727 msgid "No commits yet" -msgstr "No s'ha fet cap comissió encara." +msgstr "No s'ha fet cap comissió encara" #: wt-status.c:1741 msgid "Untracked files" @@ -10215,11 +10214,11 @@ msgstr[0] "actualitzat %d camí\n" msgstr[1] "actualitzats %d camins\n" #: builtin/checkout.c:386 -#, fuzzy, c-format +#, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" -msgstr[0] "S'ha produït un error en llegir l'índex" -msgstr[1] "S'ha produït un error en llegir l'índex" +msgstr[0] "S'ha actualitzat un camí des de l'índex" +msgstr[1] "S'ha actualitzat %d camins des de l'índex" #: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415 #: builtin/checkout.c:419 @@ -15848,7 +15847,7 @@ msgid "" "existing notes" msgstr "" "No es poden afegir les notes. S'han trobat notes existents de l'objecte %s. " -"Useu '-f' per a sobreescriure les notes existents." +"Useu '-f' per a sobreescriure les notes existents" #: builtin/notes.c:463 builtin/notes.c:544 #, c-format @@ -19570,7 +19569,7 @@ msgstr "No es pot registrar l'estat de l'arbre de treball" #: builtin/stash.c:1269 git-legacy-stash.sh:337 msgid "Can't use --patch and --include-untracked or --all at the same time" -msgstr "No es poden usar --patch i --include-untracked o --all a la vegada." +msgstr "No es poden usar --patch i --include-untracked o --all a la vegada" #: builtin/stash.c:1285 #, fuzzy @@ -19698,7 +19697,7 @@ msgstr "Omet la sortida en entrar l'ordre de cada submòdul" #: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050 msgid "Recurse into nested submodules" -msgstr "Inclou recursivament els submòduls imbrincats" +msgstr "Inclou recursivament els submòduls imbricats" #: builtin/submodule--helper.c:570 #, fuzzy @@ -21487,7 +21486,7 @@ msgstr "Dóna un nom llegible per humans basant-se en les referències disponibl #: command-list.h:86 msgid "Show changes between commits, commit and working tree, etc" msgstr "" -"Mostra els canvis entre comissions, la comissió i l'arbre de treball, etc." +"Mostra els canvis entre comissions, la comissió i l'arbre de treball, etc" #: command-list.h:87 msgid "Compares files in the working tree and the index" @@ -21800,7 +21799,7 @@ msgstr "Elimina fitxers de l'arbre de treball i de l'índex" #: command-list.h:161 msgid "Send a collection of patches as emails" -msgstr "Envia una col·leció de pedaços com a correus electrònics" +msgstr "Envia una col·lecció de pedaços com a correus electrònics" #: command-list.h:162 msgid "Push objects over Git protocol to another repository" @@ -22321,11 +22320,12 @@ msgstr "" "camí de submòdul '$sm_path'" #: git-submodule.sh:606 -#, fuzzy, sh-format +#, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " "$sha1:" -msgstr "No s'ha pogut obtenir en el camí de submòdul '$displaypath'" +msgstr "No s'ha pogut obtenir en el camí de submòdul «$displaypath»; s'està intentant " +"obtenir directament $sha1:" #: git-submodule.sh:612 #, sh-format @@ -22333,58 +22333,58 @@ msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " "Direct fetching of that commit failed." msgstr "" -"S'ha obtingut en el camí de submòdul '$displaypath', però no contenia $sha1. " +"S'ha obtingut en el camí de submòdul «$displaypath», però no contenia $sha1. " "L'obtenció directa d'aquella comissió ha fallat." #: git-submodule.sh:619 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" -msgstr "No s'ha pogut agafar '$sha1' en el camí de submòdul '$displaypath'" +msgstr "No s'ha pogut agafar «$sha1» en el camí de submòdul «$displaypath»" #: git-submodule.sh:620 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" -msgstr "Camí de submòdul '$displaypath': s'ha agafat '$sha1'" +msgstr "Camí de submòdul «$displaypath»: s'ha agafat «$sha1»" #: git-submodule.sh:624 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" -"No s'ha pogut fer «rebase» '$sha1' en el camí de submòdul '$displaypath'" +"No s'ha pogut fer «rebase» «$sha1»' en el camí de submòdul «$displaypath»" #: git-submodule.sh:625 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" -msgstr "Camí de submòdul '$displaypath': s'ha fet «rebase» en '$sha1'" +msgstr "Camí de submòdul «$displaypath»: s'ha fet «rebase» en «$sha1»" #: git-submodule.sh:630 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" -msgstr "No s'ha pogut fusionar '$sha1' en el camí de submòdul '$displaypath'" +msgstr "No s'ha pogut fusionar «$sha1» en el camí de submòdul «$displaypath»" #: git-submodule.sh:631 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" -msgstr "Camí de submòdul '$displaypath': s'ha fusionat en '$sha1'" +msgstr "Camí de submòdul «$displaypath»: s'ha fusionat en «$sha1»" #: git-submodule.sh:636 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" -"L'execució de '$command $sha1' ha fallat en el camí de submòdul " -"'$displaypath'" +"L'execució de «$command $sha1» ha fallat en el camí de submòdul " +"«$displaypath»" #: git-submodule.sh:637 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" -msgstr "Camí de submòdul '$displaypath': '$command $sha1'" +msgstr "Camí de submòdul «$displaypath»: «$command $sha1»" #: git-submodule.sh:668 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "" "S'ha produït un error en recorre recursivament dins del camí de submòdul " -"'$displaypath'" +"«$displaypath»" #: git-submodule.sh:830 msgid "The --cached option cannot be used with the --files option" @@ -22421,7 +22421,7 @@ msgid "Applied autostash." msgstr "S'ha aplicat el magatzem automàtic." #: git-rebase--preserve-merges.sh:112 -#, fuzzy, sh-format +#, sh-format msgid "Cannot store $stash_sha1" msgstr "No es pot emmagatzemar $stash_sha1" @@ -22719,8 +22719,8 @@ msgstr "No s'ha pogut marcar com a interactiu" #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" -msgstr[0] "Rebasa $shortrevisions sobre $shortonto ($todocount ordre)" -msgstr[1] "Rebasa $shortrevisions sobre $shortonto ($todocount ordres)" +msgstr[0] "Fes «rebase» $shortrevisions sobre $shortonto ($todocount ordre)" +msgstr[1] "Fes «rebase» $shortrevisions sobre $shortonto ($todocount ordres)" #: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002 msgid "Could not init rewritten commits" @@ -75,8 +75,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2019-08-10 20:12+0800\n" -"PO-Revision-Date: 2019-08-10 18:17+0200\n" +"POT-Creation-Date: 2019-10-21 19:55+0800\n" +"PO-Revision-Date: 2019-10-21 20:17+0200\n" "Last-Translator: Cédric Malard <c.malard-git@valdun.net>\n" "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n" "Language: fr\n" @@ -128,7 +128,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "Abandon à cause de conflit non résolu." -#: advice.c:193 builtin/merge.c:1327 +#: advice.c:193 builtin/merge.c:1332 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)." @@ -275,17 +275,7 @@ msgstr "mode invalide dans la ligne %d : %s" msgid "inconsistent header lines %d and %d" msgstr "lignes d'entête inconsistantes %d et %d" -#: apply.c:1460 -#, c-format -msgid "recount: unexpected line: %.*s" -msgstr "recomptage : ligne inattendue : %.*s" - -#: apply.c:1529 -#, c-format -msgid "patch fragment without header at line %d: %.*s" -msgstr "fragment de patch sans en-tête à la ligne %d : %.*s" - -#: apply.c:1551 +#: apply.c:1372 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -300,83 +290,93 @@ msgstr[1] "" "information de nom de fichier manquante dans l'en-tête de git diff lors de " "la suppression de %d composants de préfixe de chemin (ligne %d)" -#: apply.c:1564 +#: apply.c:1385 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" "information de nom de fichier manquante dans l'en-tête de git diff (ligne %d)" -#: apply.c:1752 +#: apply.c:1481 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "recomptage : ligne inattendue : %.*s" + +#: apply.c:1550 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "fragment de patch sans en-tête à la ligne %d : %.*s" + +#: apply.c:1753 msgid "new file depends on old contents" msgstr "le nouveau fichier dépend de contenus anciens" -#: apply.c:1754 +#: apply.c:1755 msgid "deleted file still has contents" msgstr "le fichier supprimé a encore du contenu" -#: apply.c:1788 +#: apply.c:1789 #, c-format msgid "corrupt patch at line %d" msgstr "patch corrompu à la ligne %d" -#: apply.c:1825 +#: apply.c:1826 #, c-format msgid "new file %s depends on old contents" msgstr "le nouveau fichier %s dépend de contenus anciens" -#: apply.c:1827 +#: apply.c:1828 #, c-format msgid "deleted file %s still has contents" msgstr "le fichier supprimé %s a encore du contenu" -#: apply.c:1830 +#: apply.c:1831 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** attention : le fichier %s devient vide mais n'est pas supprimé" -#: apply.c:1977 +#: apply.c:1978 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "patch binaire corrompu à la ligne %d : %.*s" -#: apply.c:2014 +#: apply.c:2015 #, c-format msgid "unrecognized binary patch at line %d" msgstr "patch binaire non reconnu à la ligne %d" -#: apply.c:2176 +#: apply.c:2177 #, c-format msgid "patch with only garbage at line %d" msgstr "patch totalement incompréhensible à la ligne %d" -#: apply.c:2262 +#: apply.c:2263 #, c-format msgid "unable to read symlink %s" msgstr "lecture du lien symbolique %s impossible" -#: apply.c:2266 +#: apply.c:2267 #, c-format msgid "unable to open or read %s" msgstr "ouverture ou lecture de %s impossible" -#: apply.c:2925 +#: apply.c:2926 #, c-format msgid "invalid start of line: '%c'" msgstr "début de ligne invalide : '%c'" -#: apply.c:3046 +#: apply.c:3047 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "La section n°%d a réussi à la ligne %d (offset %d ligne)." msgstr[1] "La section n°%d a réussi à la ligne %d (offset %d lignes)." -#: apply.c:3058 +#: apply.c:3059 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Contexte réduit à (%ld/%ld) pour appliquer le fragment à la ligne %d" -#: apply.c:3064 +#: apply.c:3065 #, c-format msgid "" "while searching for:\n" @@ -385,463 +385,463 @@ msgstr "" "pendant la recherche de :\n" "%.*s" -#: apply.c:3086 +#: apply.c:3087 #, c-format msgid "missing binary patch data for '%s'" msgstr "données de patch binaire manquantes pour '%s'" -#: apply.c:3094 +#: apply.c:3095 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "impossible d'appliquer l'inverse d'un patch binaire à '%s' sans la section " "inverse" -#: apply.c:3141 +#: apply.c:3142 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" "impossible d'appliquer un patch binaire à '%s' sans la ligne complète d'index" -#: apply.c:3151 +#: apply.c:3152 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "" "le patch s'applique à '%s' (%s), ce qui ne correspond pas au contenu actuel." -#: apply.c:3159 +#: apply.c:3160 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "le patch s'applique à un '%s' vide mais ce n'est pas vide" -#: apply.c:3177 +#: apply.c:3178 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "l'image postérieure nécessaire %s pour '%s' ne peut pas être lue" -#: apply.c:3190 +#: apply.c:3191 #, c-format msgid "binary patch does not apply to '%s'" msgstr "le patch binaire ne s'applique par correctement à '%s'" -#: apply.c:3196 +#: apply.c:3197 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "le patch binaire sur '%s' crée un résultat incorrect (%s attendu, mais %s " "trouvé)" -#: apply.c:3217 +#: apply.c:3218 #, c-format msgid "patch failed: %s:%ld" msgstr "le patch a échoué : %s:%ld" -#: apply.c:3340 +#: apply.c:3341 #, c-format msgid "cannot checkout %s" msgstr "extraction de %s impossible" -#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279 +#: apply.c:3393 apply.c:3404 apply.c:3450 midx.c:61 setup.c:280 #, c-format msgid "failed to read %s" msgstr "échec de la lecture de %s" -#: apply.c:3400 +#: apply.c:3401 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "lecture depuis '%s' au-delà d'un lien symbolique" -#: apply.c:3429 apply.c:3672 +#: apply.c:3430 apply.c:3673 #, c-format msgid "path %s has been renamed/deleted" msgstr "le chemin %s a été renommé/supprimé" -#: apply.c:3515 apply.c:3687 +#: apply.c:3516 apply.c:3688 #, c-format msgid "%s: does not exist in index" msgstr "%s : n'existe pas dans l'index" -#: apply.c:3524 apply.c:3695 +#: apply.c:3525 apply.c:3696 #, c-format msgid "%s: does not match index" msgstr "%s : ne correspond pas à l'index" -#: apply.c:3559 +#: apply.c:3560 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" "le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 " "points." -#: apply.c:3562 +#: apply.c:3563 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Retour à une fusion à 3 points…\n" -#: apply.c:3578 apply.c:3582 +#: apply.c:3579 apply.c:3583 #, c-format msgid "cannot read the current contents of '%s'" msgstr "impossible de lire le contenu actuel de '%s'" -#: apply.c:3594 +#: apply.c:3595 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Échec du retour à une fusion à 3 points…\n" -#: apply.c:3608 +#: apply.c:3609 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Patch %s appliqué avec des conflits.\n" -#: apply.c:3613 +#: apply.c:3614 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Patch %s appliqué proprement.\n" -#: apply.c:3639 +#: apply.c:3640 msgid "removal patch leaves file contents" msgstr "le patch de suppression laisse un contenu dans le fichier" -#: apply.c:3712 +#: apply.c:3713 #, c-format msgid "%s: wrong type" msgstr "%s : type erroné" -#: apply.c:3714 +#: apply.c:3715 #, c-format msgid "%s has type %o, expected %o" msgstr "%s est de type %o, mais %o attendu" -#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856 +#: apply.c:3866 apply.c:3868 read-cache.c:830 read-cache.c:856 #: read-cache.c:1309 #, c-format msgid "invalid path '%s'" msgstr "chemin invalide '%s'" -#: apply.c:3923 +#: apply.c:3924 #, c-format msgid "%s: already exists in index" msgstr "%s : existe déjà dans l'index" -#: apply.c:3926 +#: apply.c:3927 #, c-format msgid "%s: already exists in working directory" msgstr "%s : existe déjà dans la copie de travail" -#: apply.c:3946 +#: apply.c:3947 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o)" -#: apply.c:3951 +#: apply.c:3952 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o) de %s" -#: apply.c:3971 +#: apply.c:3972 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "le fichier affecté '%s' est au-delà d'un lien symbolique" -#: apply.c:3975 +#: apply.c:3976 #, c-format msgid "%s: patch does not apply" msgstr "%s : le patch ne s'applique pas" -#: apply.c:3990 +#: apply.c:3991 #, c-format msgid "Checking patch %s..." msgstr "Vérification du patch %s..." -#: apply.c:4082 +#: apply.c:4083 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "" "l'information sha1 est manquante ou inutilisable pour le sous-module %s" -#: apply.c:4089 +#: apply.c:4090 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "le mode change pour %s, qui n'est pas dans la HEAD actuelle" -#: apply.c:4092 +#: apply.c:4093 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "l'information de sha1 est manquante ou inutilisable (%s)." -#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143 +#: apply.c:4098 builtin/checkout.c:279 builtin/reset.c:143 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "échec de make_cache_entry pour le chemin '%s'" -#: apply.c:4101 +#: apply.c:4102 #, c-format msgid "could not add %s to temporary index" msgstr "impossible d'ajouter %s à l'index temporaire" -#: apply.c:4111 +#: apply.c:4112 #, c-format msgid "could not write temporary index to %s" msgstr "impossible d'écrire l'index temporaire dans %s" -#: apply.c:4249 +#: apply.c:4250 #, c-format msgid "unable to remove %s from index" msgstr "suppression de %s dans l'index impossible" -#: apply.c:4283 +#: apply.c:4284 #, c-format msgid "corrupt patch for submodule %s" msgstr "patch corrompu pour le sous-module %s" -#: apply.c:4289 +#: apply.c:4290 #, c-format msgid "unable to stat newly created file '%s'" msgstr "stat du fichier nouvellement créé '%s' impossible" -#: apply.c:4297 +#: apply.c:4298 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" "création du magasin de stockage pour le fichier nouvellement créé %s " "impossible" -#: apply.c:4303 apply.c:4448 +#: apply.c:4304 apply.c:4449 #, c-format msgid "unable to add cache entry for %s" msgstr "ajout de l'élément de cache %s impossible" -#: apply.c:4346 +#: apply.c:4347 #, c-format msgid "failed to write to '%s'" msgstr "échec de l'écriture dans '%s'" -#: apply.c:4350 +#: apply.c:4351 #, c-format msgid "closing file '%s'" msgstr "fermeture du fichier '%s'" -#: apply.c:4420 +#: apply.c:4421 #, c-format msgid "unable to write file '%s' mode %o" msgstr "écriture du fichier '%s' mode %o impossible" -#: apply.c:4518 +#: apply.c:4519 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s appliqué proprement." -#: apply.c:4526 +#: apply.c:4527 msgid "internal error" msgstr "erreur interne" -#: apply.c:4529 +#: apply.c:4530 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Application du patch %%s avec %d rejet..." msgstr[1] "Application du patch %%s avec %d rejets..." -#: apply.c:4540 +#: apply.c:4541 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "troncature du nom de fichier .rej en %.*s.rej" -#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168 +#: apply.c:4549 builtin/fetch.c:898 builtin/fetch.c:1194 #, c-format msgid "cannot open %s" msgstr "impossible d'ouvrir %s" -#: apply.c:4562 +#: apply.c:4563 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Section n°%d appliquée proprement." -#: apply.c:4566 +#: apply.c:4567 #, c-format msgid "Rejected hunk #%d." msgstr "Section n°%d rejetée." -#: apply.c:4676 +#: apply.c:4686 #, c-format msgid "Skipped patch '%s'." msgstr "Chemin '%s' non traité." -#: apply.c:4684 +#: apply.c:4694 msgid "unrecognized input" msgstr "entrée non reconnue" -#: apply.c:4704 +#: apply.c:4714 msgid "unable to read index file" msgstr "lecture du fichier d'index impossible" -#: apply.c:4859 +#: apply.c:4871 #, c-format msgid "can't open patch '%s': %s" msgstr "ouverture impossible du patch '%s' :%s" -#: apply.c:4886 +#: apply.c:4898 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "%d erreur d'espace ignorée" msgstr[1] "%d erreurs d'espace ignorées" -#: apply.c:4892 apply.c:4907 +#: apply.c:4904 apply.c:4919 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d ligne a ajouté des erreurs d'espace." msgstr[1] "%d lignes ont ajouté des erreurs d'espace." -#: apply.c:4900 +#: apply.c:4912 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "%d ligne ajoutée après correction des erreurs d'espace." msgstr[1] "%d lignes ajoutées après correction des erreurs d'espace." -#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4928 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "Impossible d'écrire le nouveau fichier d'index" -#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211 -#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273 -#: builtin/pull.c:208 builtin/submodule--helper.c:407 +#: apply.c:4955 apply.c:4958 builtin/am.c:2197 builtin/am.c:2200 +#: builtin/clone.c:122 builtin/fetch.c:143 builtin/merge.c:273 +#: builtin/pull.c:209 builtin/submodule--helper.c:407 #: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370 #: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853 #: builtin/submodule--helper.c:2092 git-add--interactive.perl:211 msgid "path" msgstr "chemin" -#: apply.c:4944 +#: apply.c:4956 msgid "don't apply changes matching the given path" msgstr "ne pas appliquer les modifications qui correspondent au chemin donné" -#: apply.c:4947 +#: apply.c:4959 msgid "apply changes matching the given path" msgstr "appliquer les modifications qui correspondent au chemin donné" -#: apply.c:4949 builtin/am.c:2217 +#: apply.c:4961 builtin/am.c:2206 msgid "num" msgstr "num" -#: apply.c:4950 +#: apply.c:4962 msgid "remove <num> leading slashes from traditional diff paths" msgstr "supprimer <num> barres obliques des chemins traditionnels de diff" -#: apply.c:4953 +#: apply.c:4965 msgid "ignore additions made by the patch" msgstr "ignorer les additions réalisées par le patch" -#: apply.c:4955 +#: apply.c:4967 msgid "instead of applying the patch, output diffstat for the input" msgstr "au lieu d'appliquer le patch, afficher le diffstat de l'entrée" -#: apply.c:4959 +#: apply.c:4971 msgid "show number of added and deleted lines in decimal notation" msgstr "" "afficher le nombre de lignes ajoutées et supprimées en notation décimale" -#: apply.c:4961 +#: apply.c:4973 msgid "instead of applying the patch, output a summary for the input" msgstr "au lieu d'appliquer le patch, afficher un résumé de l'entrée" -#: apply.c:4963 +#: apply.c:4975 msgid "instead of applying the patch, see if the patch is applicable" msgstr "au lieu d'appliquer le patch, voir si le patch est applicable" -#: apply.c:4965 +#: apply.c:4977 msgid "make sure the patch is applicable to the current index" msgstr "s'assurer que le patch est applicable sur l'index actuel" -#: apply.c:4967 +#: apply.c:4979 msgid "mark new files with `git add --intent-to-add`" msgstr "marquer les nouveaux fichiers `git add --intent-to-add`" -#: apply.c:4969 +#: apply.c:4981 msgid "apply a patch without touching the working tree" msgstr "appliquer les patch sans toucher à la copie de travail" -#: apply.c:4971 +#: apply.c:4983 msgid "accept a patch that touches outside the working area" msgstr "accepter un patch qui touche hors de la copie de travail" -#: apply.c:4974 +#: apply.c:4986 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "appliquer aussi le patch (à utiliser avec --stat/--summary/--check)" -#: apply.c:4976 +#: apply.c:4988 msgid "attempt three-way merge if a patch does not apply" msgstr "tenter une fusion à 3 points si le patch ne s'applique pas proprement" -#: apply.c:4978 +#: apply.c:4990 msgid "build a temporary index based on embedded index information" msgstr "" "construire un index temporaire fondé sur l'information de l'index embarqué" -#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:4993 builtin/checkout-index.c:173 builtin/ls-files.c:524 msgid "paths are separated with NUL character" msgstr "les chemins sont séparés par un caractère NUL" -#: apply.c:4983 +#: apply.c:4995 msgid "ensure at least <n> lines of context match" msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte" -#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98 +#: apply.c:4996 builtin/am.c:2185 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3330 builtin/rebase.c:1421 +#: builtin/pack-objects.c:3310 builtin/rebase.c:1445 msgid "action" msgstr "action" -#: apply.c:4985 +#: apply.c:4997 msgid "detect new or modified lines that have whitespace errors" msgstr "" "détecter des lignes nouvelles ou modifiées qui contiennent des erreurs " "d'espace" -#: apply.c:4988 apply.c:4991 +#: apply.c:5000 apply.c:5003 msgid "ignore changes in whitespace when finding context" msgstr "ignorer des modifications d'espace lors de la recherche de contexte" -#: apply.c:4994 +#: apply.c:5006 msgid "apply the patch in reverse" msgstr "appliquer le patch en sens inverse" -#: apply.c:4996 +#: apply.c:5008 msgid "don't expect at least one line of context" msgstr "ne pas s'attendre à au moins une ligne de contexte" -#: apply.c:4998 +#: apply.c:5010 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants" -#: apply.c:5000 +#: apply.c:5012 msgid "allow overlapping hunks" msgstr "accepter les recouvrements de sections" -#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22 +#: apply.c:5013 builtin/add.c:291 builtin/check-ignore.c:22 #: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786 -#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128 +#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "mode verbeux" -#: apply.c:5003 +#: apply.c:5015 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" "tolérer des erreurs de détection de retours chariot manquants en fin de " "fichier" -#: apply.c:5006 +#: apply.c:5018 msgid "do not trust the line counts in the hunk headers" msgstr "ne pas se fier au compte de lignes dans les en-têtes de section" -#: apply.c:5008 builtin/am.c:2205 +#: apply.c:5020 builtin/am.c:2194 msgid "root" msgstr "racine" -#: apply.c:5009 +#: apply.c:5021 msgid "prepend <root> to all filenames" msgstr "préfixer tous les noms de fichier avec <root>" @@ -896,7 +896,7 @@ msgstr "fmt" msgid "archive format" msgstr "format d'archive" -#: archive.c:458 builtin/log.c:1580 +#: archive.c:458 builtin/log.c:1581 msgid "prefix" msgstr "préfixe" @@ -904,11 +904,12 @@ msgstr "préfixe" msgid "prepend prefix to each pathname in the archive" msgstr "préfixer chaque chemin de fichier dans l'archive" -#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875 -#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134 -#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105 -#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412 -#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177 +#: archive.c:460 builtin/blame.c:861 builtin/blame.c:873 builtin/blame.c:874 +#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162 +#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899 +#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563 +#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 +#: parse-options.h:186 msgid "file" msgstr "fichier" @@ -940,7 +941,7 @@ msgstr "compression efficace" msgid "list supported archive formats" msgstr "afficher les formats d'archive supportés" -#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: archive.c:479 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115 #: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859 msgid "repo" msgstr "dépôt" @@ -949,7 +950,7 @@ msgstr "dépôt" msgid "retrieve the archive from remote repository <repo>" msgstr "récupérer l'archive depuis le dépôt distant <dépôt>" -#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707 +#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715 #: builtin/notes.c:498 msgid "command" msgstr "commande" @@ -985,26 +986,26 @@ msgstr "Argument non supporté pour le format '%s' : -%d" msgid "cannot stream blob %s" msgstr "impossible de transmettre le blob %s en flux" -#: archive-tar.c:260 archive-zip.c:363 +#: archive-tar.c:266 archive-zip.c:363 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "mode de fichier non supporté :0%o (SHA1: %s)" -#: archive-tar.c:287 archive-zip.c:353 +#: archive-tar.c:293 archive-zip.c:353 #, c-format msgid "cannot read %s" msgstr "impossible de lire %s" -#: archive-tar.c:459 +#: archive-tar.c:465 #, c-format msgid "unable to start '%s' filter" msgstr "impossible de démarrer le filtre '%s'" -#: archive-tar.c:462 +#: archive-tar.c:468 msgid "unable to redirect descriptor" msgstr "impossible de rediriger un descripteur" -#: archive-tar.c:469 +#: archive-tar.c:475 #, c-format msgid "'%s' filter reported error" msgstr "le filtre '%s' a retourné une erreur" @@ -1029,17 +1030,17 @@ msgstr "erreur de compression (%d)" msgid "timestamp too large for this system: %<PRIuMAX>" msgstr "l'horodatage est trop grand pour ce système : %<PRIuMAX>" -#: attr.c:211 +#: attr.c:213 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s n'est pas un nom valide d'attribut" -#: attr.c:368 +#: attr.c:370 #, c-format msgid "%s not allowed: %s:%d" msgstr "%s non permis : %s : %d" -#: attr.c:408 +#: attr.c:410 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1167,41 +1168,41 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "Bissection : %d révision à tester après ceci %s\n" msgstr[1] "Bissection : %d révisions à tester après ceci %s\n" -#: blame.c:2697 +#: blame.c:2700 msgid "--contents and --reverse do not blend well." msgstr "--contents et --reverse ne font pas bon ménage." -#: blame.c:2711 +#: blame.c:2714 msgid "cannot use --contents with final commit object name" msgstr "on ne peut pas utiliser --contents avec un nom d'objet commit final" -#: blame.c:2732 +#: blame.c:2735 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse et --first-parent ensemble nécessitent la spécification d'un " "dernier commit" -#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033 -#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963 -#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411 -#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163 +#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:1971 +#: sequencer.c:4305 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:964 +#: builtin/log.c:1452 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411 +#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "échec de la préparation du parcours des révisions" -#: blame.c:2759 +#: blame.c:2762 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "--reverse --first-parent ensemble nécessitent une portée avec la chaîne de " "premier parent" -#: blame.c:2770 +#: blame.c:2773 #, c-format msgid "no such path %s in %s" msgstr "pas de chemin %s dans %s" -#: blame.c:2781 +#: blame.c:2784 #, c-format msgid "cannot read blob %s for path %s" msgstr "impossible de lire le blob %s pour le chemin %s" @@ -1364,7 +1365,7 @@ msgstr "'%s' ne semble pas être un fichier bundle v2" msgid "unrecognized header: %s%s (%d)" msgstr "en-tête non reconnu : %s%s (%d)" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2221 sequencer.c:2962 #: builtin/commit.c:791 #, c-format msgid "could not open '%s'" @@ -1417,7 +1418,7 @@ msgstr "rev-list a disparu" msgid "ref '%s' is excluded by the rev-list options" msgstr "la référence '%s' est exclue par les options de rev-list" -#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306 +#: bundle.c:460 builtin/log.c:202 builtin/log.c:1733 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "argument non reconnu : %s" @@ -1440,8 +1441,8 @@ msgstr "l'index de groupe a disparu" msgid "invalid color value: %.*s" msgstr "Valeur invalide de couleur : %.*s" -#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399 -#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455 +#: commit.c:50 sequencer.c:2665 builtin/am.c:354 builtin/am.c:398 +#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456 #, c-format msgid "could not parse %s" msgstr "impossible d'analyser %s" @@ -1471,27 +1472,27 @@ msgstr "" "Supprimez ce message en lançant\n" "\"git config advice.graftFileDeprecated false\"" -#: commit.c:1127 +#: commit.c:1128 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "La validation %s a une signature GPG non fiable, prétendument par %s." -#: commit.c:1130 +#: commit.c:1131 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "La validation %s a une mauvaise signature GPG prétendument par %s." -#: commit.c:1133 +#: commit.c:1134 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "La validation %s n'a pas de signature GPG." -#: commit.c:1136 +#: commit.c:1137 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "La validation %s a une signature GPG correcte par %s\n" -#: commit.c:1390 +#: commit.c:1391 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -1559,189 +1560,204 @@ msgstr "" msgid "unable to find all commit-graph files" msgstr "impossible de trouver tous les fichiers du graphe de commit" -#: commit-graph.c:554 commit-graph.c:614 +#: commit-graph.c:561 commit-graph.c:621 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "" "position de commit invalide. Le graphe de commit est vraisemblablement " "corrompu" -#: commit-graph.c:575 +#: commit-graph.c:582 #, c-format msgid "could not find commit %s" msgstr "impossible de trouver le commit %s" -#: commit-graph.c:1002 builtin/pack-objects.c:2657 +#: commit-graph.c:855 builtin/am.c:1287 +#, c-format +msgid "unable to parse commit %s" +msgstr "impossible d'analyser le commit %s" + +#: commit-graph.c:859 +#, c-format +msgid "unable to get tree for %s" +msgstr "impossible de récupérer l'arbre de %s" + +#: commit-graph.c:1017 builtin/pack-objects.c:2641 #, c-format msgid "unable to get type of object %s" msgstr "impossible d'obtenir le type de l'objet %s" -#: commit-graph.c:1034 +#: commit-graph.c:1049 msgid "Loading known commits in commit graph" msgstr "Lecture des commits connus dans un graphe de commit" -#: commit-graph.c:1051 +#: commit-graph.c:1066 msgid "Expanding reachable commits in commit graph" msgstr "Expansion des commits joignables dans un graphe de commit" -#: commit-graph.c:1070 +#: commit-graph.c:1085 msgid "Clearing commit marks in commit graph" msgstr "Suppression les marques de commit dans le graphe de commits" -#: commit-graph.c:1089 +#: commit-graph.c:1104 msgid "Computing commit graph generation numbers" msgstr "Calcul des chiffres de génération du graphe de commits" -#: commit-graph.c:1163 +#: commit-graph.c:1179 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "Recherche de commits pour un graphe de commits dans %d paquet" msgstr[1] "Recherche de commits pour un graphe de commits dans %d paquets" -#: commit-graph.c:1176 +#: commit-graph.c:1192 #, c-format msgid "error adding pack %s" msgstr "erreur à l'ajout du packet %s" -#: commit-graph.c:1180 +#: commit-graph.c:1196 #, c-format msgid "error opening index for %s" msgstr "erreur à l'ouverture de l'index pour %s" -#: commit-graph.c:1204 +#: commit-graph.c:1220 #, c-format msgid "Finding commits for commit graph from %d ref" msgid_plural "Finding commits for commit graph from %d refs" msgstr[0] "Recherche de commits pour un graphe de commits depuis %d réf" msgstr[1] "Recherche de commits pour un graphe de commits depuis %d réfs" -#: commit-graph.c:1238 +#: commit-graph.c:1240 +#, c-format +msgid "invalid commit object id: %s" +msgstr "identifiant d'objet commit invalide : %s" + +#: commit-graph.c:1255 msgid "Finding commits for commit graph among packed objects" msgstr "" "Recherche de commits pour un graphe de commits parmi les objets empaquetés" -#: commit-graph.c:1253 +#: commit-graph.c:1270 msgid "Counting distinct commits in commit graph" msgstr "Comptage des commits distincts dans un graphe de commit" -#: commit-graph.c:1284 +#: commit-graph.c:1300 msgid "Finding extra edges in commit graph" msgstr "Recherche d'arêtes supplémentaires dans un graphe de commits" -#: commit-graph.c:1332 +#: commit-graph.c:1346 msgid "failed to write correct number of base graph ids" msgstr "échec à l'écriture le nombre correct d'id de base de fusion" -#: commit-graph.c:1365 midx.c:811 +#: commit-graph.c:1379 midx.c:810 #, c-format msgid "unable to create leading directories of %s" msgstr "impossible de créer les répertoires de premier niveau de %s" -#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240 +#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:241 #, c-format msgid "unable to create '%s'" msgstr "impossible de créer '%s'" -#: commit-graph.c:1437 +#: commit-graph.c:1451 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "Écriture le graphe de commits en %d passe" msgstr[1] "Écriture le graphe de commits en %d passes" -#: commit-graph.c:1478 +#: commit-graph.c:1492 msgid "unable to open commit-graph chain file" msgstr "impossible d'ouvrir le fichier de graphe de commit" -#: commit-graph.c:1490 +#: commit-graph.c:1504 msgid "failed to rename base commit-graph file" msgstr "échec du renommage du fichier de graphe de commits" -#: commit-graph.c:1510 +#: commit-graph.c:1524 msgid "failed to rename temporary commit-graph file" msgstr "impossible de renommer le fichier temporaire de graphe de commits" -#: commit-graph.c:1621 +#: commit-graph.c:1635 msgid "Scanning merged commits" msgstr "Analyse des commits de fusion" -#: commit-graph.c:1632 +#: commit-graph.c:1646 #, c-format msgid "unexpected duplicate commit id %s" msgstr "id de commit %s dupliqué inattendu" -#: commit-graph.c:1657 +#: commit-graph.c:1670 msgid "Merging commit-graph" msgstr "fusion du graphe de commits" -#: commit-graph.c:1844 +#: commit-graph.c:1860 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "le graphe de commits ne peut pas écrire %d commits" -#: commit-graph.c:1855 +#: commit-graph.c:1871 msgid "too many commits to write graph" msgstr "trop de commits pour écrire un graphe" -#: commit-graph.c:1945 +#: commit-graph.c:1961 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" "le graphe de commit a une somme de contrôle incorrecte et est " "vraisemblablement corrompu" -#: commit-graph.c:1955 +#: commit-graph.c:1971 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "le graphe de commit a un ordre d'OID incorrect : %s puis %s" -#: commit-graph.c:1965 commit-graph.c:1980 +#: commit-graph.c:1981 commit-graph.c:1996 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" "le graphe de commit a une valeur de dispersion incorrecte : dispersion[%d] = " "%u != %u" -#: commit-graph.c:1972 +#: commit-graph.c:1988 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "échec de l'analyse le commit %s depuis le graphe de commits" -#: commit-graph.c:1989 +#: commit-graph.c:2006 msgid "Verifying commits in commit graph" msgstr "Verification des commits dans le graphe de commits" -#: commit-graph.c:2002 +#: commit-graph.c:2020 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" "échec de l'analyse du commit %s depuis la base de données d'objets pour le " "graphe de commit" -#: commit-graph.c:2009 +#: commit-graph.c:2027 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" "l'OID de l'arbre racine pour le commit %s dans le graphe de commit est %s != " "%s" -#: commit-graph.c:2019 +#: commit-graph.c:2037 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "" "la liste des parents du graphe de commit pour le commit %s est trop longue" -#: commit-graph.c:2028 +#: commit-graph.c:2046 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "le parent du graphe de commit pour %s est %s != %s" -#: commit-graph.c:2041 +#: commit-graph.c:2059 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" "la liste de parents du graphe de commit pour le commit %s se termine trop tôt" -#: commit-graph.c:2046 +#: commit-graph.c:2064 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -1749,7 +1765,7 @@ msgstr "" "le graphe de commit a un numéro de génération nul pour le commit %s, mais " "non-nul ailleurs" -#: commit-graph.c:2050 +#: commit-graph.c:2068 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -1757,12 +1773,12 @@ msgstr "" "le graphe de commit a un numéro de génération non-nul pour le commit %s, " "mais nul ailleurs" -#: commit-graph.c:2065 +#: commit-graph.c:2083 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "la génération du graphe de commit pour le commit %s est %u != %u" -#: commit-graph.c:2071 +#: commit-graph.c:2089 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" @@ -1813,7 +1829,7 @@ msgstr "la clé ne contient pas de section: %s" msgid "key does not contain variable name: %s" msgstr "la clé ne contient pas de nom de variable : %s" -#: config.c:406 sequencer.c:2463 +#: config.c:406 sequencer.c:2401 #, c-format msgid "invalid key: %s" msgstr "clé invalide : %s" @@ -1946,155 +1962,148 @@ msgstr "core.commentChar ne devrait être qu'un unique caractère" msgid "invalid mode for object creation: %s" msgstr "mode invalide pour la création d'objet : %s" -#: config.c:1430 +#: config.c:1425 #, c-format msgid "malformed value for %s" msgstr "valeur mal formée pour %s" -#: config.c:1456 +#: config.c:1451 #, c-format msgid "malformed value for %s: %s" msgstr "valeur mal formée pour %s : %s" -#: config.c:1457 +#: config.c:1452 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "doit être parmi nothing, matching, simple, upstream ou current" -#: config.c:1518 builtin/pack-objects.c:3410 +#: config.c:1513 builtin/pack-objects.c:3394 #, c-format msgid "bad pack compression level %d" msgstr "niveau de compression du paquet %d" -#: config.c:1639 +#: config.c:1634 #, c-format msgid "unable to load config blob object '%s'" msgstr "impossible de charger l'objet blob de config '%s'" -#: config.c:1642 +#: config.c:1637 #, c-format msgid "reference '%s' does not point to a blob" msgstr "la référence '%s' ne pointe pas sur un blob" -#: config.c:1659 +#: config.c:1654 #, c-format msgid "unable to resolve config blob '%s'" msgstr "impossible de résoudre le blob de config '%s'" -#: config.c:1689 +#: config.c:1684 #, c-format msgid "failed to parse %s" msgstr "échec de l'analyse de %s" -#: config.c:1745 +#: config.c:1740 msgid "unable to parse command-line config" msgstr "lecture de la configuration de ligne de commande impossible" -#: config.c:2094 +#: config.c:2091 msgid "unknown error occurred while reading the configuration files" msgstr "erreur inconnue pendant la lecture des fichiers de configuration" -#: config.c:2264 +#: config.c:2261 #, c-format msgid "Invalid %s: '%s'" msgstr "%s invalide : '%s'" -#: config.c:2307 -#, c-format -msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" -msgstr "" -"valeur '%s' de core.untrackedCache inconnue ; utilisation de 'keep' par " -"défaut" - -#: config.c:2333 +#: config.c:2306 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" "la valeur '%d' de splitIndex.maxPercentChange devrait se situer entre 0 et " "100" -#: config.c:2379 +#: config.c:2352 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" "impossible d'analyser '%s' depuis le configuration en ligne de commande" -#: config.c:2381 +#: config.c:2354 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" "variable de configuration '%s' incorrecte dans le fichier '%s' à la ligne %d" -#: config.c:2462 +#: config.c:2435 #, c-format msgid "invalid section name '%s'" msgstr "nom de section invalide '%s'" -#: config.c:2494 +#: config.c:2467 #, c-format msgid "%s has multiple values" msgstr "%s a des valeurs multiples" -#: config.c:2523 +#: config.c:2496 #, c-format msgid "failed to write new configuration file %s" msgstr "impossible d'écrire le fichier de configuration %s" -#: config.c:2775 config.c:3099 +#: config.c:2748 config.c:3072 #, c-format msgid "could not lock config file %s" msgstr "impossible de verrouiller le fichier de configuration %s" -#: config.c:2786 +#: config.c:2759 #, c-format msgid "opening %s" msgstr "ouverture de %s" -#: config.c:2821 builtin/config.c:328 +#: config.c:2794 builtin/config.c:328 #, c-format msgid "invalid pattern: %s" msgstr "motif invalide : %s" -#: config.c:2846 +#: config.c:2819 #, c-format msgid "invalid config file %s" msgstr "fichier de configuration invalide %s" -#: config.c:2859 config.c:3112 +#: config.c:2832 config.c:3085 #, c-format msgid "fstat on %s failed" msgstr "échec de fstat sur %s" -#: config.c:2870 +#: config.c:2843 #, c-format msgid "unable to mmap '%s'" msgstr "impossible de réaliser un map de '%s'" -#: config.c:2879 config.c:3117 +#: config.c:2852 config.c:3090 #, c-format msgid "chmod on %s failed" msgstr "échec de chmod sur %s" -#: config.c:2964 config.c:3214 +#: config.c:2937 config.c:3187 #, c-format msgid "could not write config file %s" msgstr "impossible d'écrire le fichier de configuration %s" -#: config.c:2998 +#: config.c:2971 #, c-format msgid "could not set '%s' to '%s'" msgstr "impossible de régler '%s' à '%s'" -#: config.c:3000 builtin/remote.c:782 +#: config.c:2973 builtin/remote.c:782 #, c-format msgid "could not unset '%s'" msgstr "impossible de désinitialiser '%s'" -#: config.c:3090 +#: config.c:3063 #, c-format msgid "invalid section name: %s" msgstr "nom de section invalide : %s" -#: config.c:3257 +#: config.c:3230 #, c-format msgid "missing value for '%s'" msgstr "valeur manquante pour '%s'" @@ -2218,7 +2227,7 @@ msgstr "impossible de rechercher %s (%s)" msgid "unknown port %s" msgstr "port inconnu %s" -#: connect.c:845 connect.c:1171 +#: connect.c:845 connect.c:1175 #, c-format msgid "strange hostname '%s' blocked" msgstr "nom d'hôte étrange '%s' bloqué" @@ -2233,60 +2242,60 @@ msgstr "port étrange '%s' bloqué" msgid "cannot start proxy %s" msgstr "impossible de démarrer un proxy %s" -#: connect.c:924 +#: connect.c:928 msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "" "aucun chemin spécifié ; référez-vous à 'git help pull' pour une syntaxe " "d'URL valide" -#: connect.c:1119 +#: connect.c:1123 msgid "ssh variant 'simple' does not support -4" msgstr "la variante ssh 'simple' ne supporte pas -4" -#: connect.c:1131 +#: connect.c:1135 msgid "ssh variant 'simple' does not support -6" msgstr "la variante ssh 'simple' ne supporte pas -6" -#: connect.c:1148 +#: connect.c:1152 msgid "ssh variant 'simple' does not support setting port" msgstr "la variante ssh 'simple' ne supporte pas de spécifier le port" -#: connect.c:1260 +#: connect.c:1264 #, c-format msgid "strange pathname '%s' blocked" msgstr "chemin étrange '%s' bloqué" -#: connect.c:1307 +#: connect.c:1311 msgid "unable to fork" msgstr "fork impossible" -#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43 +#: connected.c:88 builtin/fsck.c:221 builtin/prune.c:43 msgid "Checking connectivity" msgstr "Vérification de la connectivité" -#: connected.c:98 +#: connected.c:100 msgid "Could not run 'git rev-list'" msgstr "Impossible de lancer 'git rev-list'" -#: connected.c:118 +#: connected.c:120 msgid "failed write to rev-list" msgstr "impossible d'écrire dans la rev-list" -#: connected.c:125 +#: connected.c:127 msgid "failed to close rev-list's stdin" msgstr "impossible de fermer l'entrée standard du rev-list" -#: convert.c:193 +#: convert.c:194 #, c-format msgid "illegal crlf_action %d" msgstr "crlf_action illégal %d" -#: convert.c:206 +#: convert.c:207 #, c-format msgid "CRLF would be replaced by LF in %s" msgstr "Les CRLF seraient remplacés par des LF dans %s" -#: convert.c:208 +#: convert.c:209 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" @@ -2295,12 +2304,12 @@ msgstr "" "Les CRLF seront remplacés par des LF dans %s.\n" "Le fichier conservera ses fins de ligne d'origine dans votre copie de travail" -#: convert.c:216 +#: convert.c:217 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "Les LF seraient remplacés par des CRLF dans %s" -#: convert.c:218 +#: convert.c:219 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" @@ -2309,12 +2318,12 @@ msgstr "" "Les LF seront remplacés par des CRLF dans %s.\n" "Le fichier conservera ses fins de ligne d'origine dans votre copie de travail" -#: convert.c:279 +#: convert.c:280 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "Aucun BOM n'est permis dans '%s' s'il est encodé comme %s" -#: convert.c:286 +#: convert.c:287 #, c-format msgid "" "The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-" @@ -2323,12 +2332,12 @@ msgstr "" "Le fichier '%s' contient un marqueur d'ordre d'octets (BOM). Veuillez " "utiliser UTF-%s comme encodage d'arbre de travail." -#: convert.c:304 +#: convert.c:305 #, c-format msgid "BOM is required in '%s' if encoded as %s" msgstr "Un BOM est obligatoire dans '%s' s'il est encodé comme %s" -#: convert.c:306 +#: convert.c:307 #, c-format msgid "" "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" @@ -2338,52 +2347,52 @@ msgstr "" "utiliser UTF-%sBE ou UTF-%sLE (selon l'ordre désiré) comme encodage d'arbre " "de travail." -#: convert.c:424 convert.c:495 +#: convert.c:425 convert.c:496 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "échec de l'encodage de '%s' de %s vers %s" -#: convert.c:467 +#: convert.c:468 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "" "encoder '%s' depuis %s vers %s puis inversement ne produit pas le même " "contenu" -#: convert.c:673 +#: convert.c:674 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "impossible de forker pour lancer le filtre externe '%s'" -#: convert.c:693 +#: convert.c:694 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "impossible de fournir l'entrée au filtre externe '%s'" -#: convert.c:700 +#: convert.c:701 #, c-format msgid "external filter '%s' failed %d" msgstr "le filtre externe '%s' a échoué %d" -#: convert.c:735 convert.c:738 +#: convert.c:736 convert.c:739 #, c-format msgid "read from external filter '%s' failed" msgstr "la lecture depuis le filtre externe '%s' a échoué" -#: convert.c:741 convert.c:796 +#: convert.c:742 convert.c:797 #, c-format msgid "external filter '%s' failed" msgstr "le filtre externe '%s' a échoué" -#: convert.c:844 +#: convert.c:845 msgid "unexpected filter type" msgstr "type de filtre inattendu" -#: convert.c:855 +#: convert.c:856 msgid "path name too long for external filter" msgstr "nom de chemin trop long pour un filtre externe" -#: convert.c:929 +#: convert.c:930 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " @@ -2392,67 +2401,67 @@ msgstr "" "le filtre externe '%s' n'est plus disponible bien que tous les chemins " "n'aient pas été filtrés" -#: convert.c:1228 +#: convert.c:1229 msgid "true/false are no valid working-tree-encodings" msgstr "true/false ne sont pas des encodages d'arbre de travail valides" -#: convert.c:1398 convert.c:1432 +#: convert.c:1417 convert.c:1451 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s : le filtre clean '%s' a échoué" -#: convert.c:1476 +#: convert.c:1495 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s : le filtre smudge '%s' a échoué" -#: date.c:137 +#: date.c:138 msgid "in the future" msgstr "dans le futur" -#: date.c:143 +#: date.c:144 #, c-format msgid "%<PRIuMAX> second ago" msgid_plural "%<PRIuMAX> seconds ago" msgstr[0] "il y a %<PRIuMAX> seconde" msgstr[1] "il y a %<PRIuMAX> secondes" -#: date.c:150 +#: date.c:151 #, c-format msgid "%<PRIuMAX> minute ago" msgid_plural "%<PRIuMAX> minutes ago" msgstr[0] "il y a %<PRIuMAX> minute" msgstr[1] "il y a %<PRIuMAX> minutes" -#: date.c:157 +#: date.c:158 #, c-format msgid "%<PRIuMAX> hour ago" msgid_plural "%<PRIuMAX> hours ago" msgstr[0] "il y a %<PRIuMAX> heure" msgstr[1] "il y a %<PRIuMAX> heures" -#: date.c:164 +#: date.c:165 #, c-format msgid "%<PRIuMAX> day ago" msgid_plural "%<PRIuMAX> days ago" msgstr[0] "il y a %<PRIuMAX> jour" msgstr[1] "il y a %<PRIuMAX> jours" -#: date.c:170 +#: date.c:171 #, c-format msgid "%<PRIuMAX> week ago" msgid_plural "%<PRIuMAX> weeks ago" msgstr[0] "il y a %<PRIuMAX> semaine" msgstr[1] "il y a %<PRIuMAX> semaines" -#: date.c:177 +#: date.c:178 #, c-format msgid "%<PRIuMAX> month ago" msgid_plural "%<PRIuMAX> months ago" msgstr[0] "il y a %<PRIuMAX> mois" msgstr[1] "il y a %<PRIuMAX> mois" -#: date.c:188 +#: date.c:189 #, c-format msgid "%<PRIuMAX> year" msgid_plural "%<PRIuMAX> years" @@ -2460,14 +2469,14 @@ msgstr[0] "%<PRIuMAX> an" msgstr[1] "%<PRIuMAX> ans" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:191 +#: date.c:192 #, c-format msgid "%s, %<PRIuMAX> month ago" msgid_plural "%s, %<PRIuMAX> months ago" msgstr[0] "il y a %s et %<PRIuMAX> mois" msgstr[1] "il y a %s et %<PRIuMAX> mois" -#: date.c:196 date.c:201 +#: date.c:197 date.c:202 #, c-format msgid "%<PRIuMAX> year ago" msgid_plural "%<PRIuMAX> years ago" @@ -2505,7 +2514,7 @@ msgstr "Marquage de %d îlots, fait.\n" msgid "failed to read orderfile '%s'" msgstr "impossible de lire le fichier de commande '%s'" -#: diffcore-rename.c:544 +#: diffcore-rename.c:543 msgid "Performing inexact rename detection" msgstr "Détection de renommage inexact en cours" @@ -2573,35 +2582,35 @@ msgstr "" "Erreurs dans la variable de configuration 'diff.dirstat' :\n" "%s" -#: diff.c:4215 +#: diff.c:4218 #, c-format msgid "external diff died, stopping at %s" msgstr "l'application de diff externe a disparu, arrêt à %s" -#: diff.c:4560 +#: diff.c:4563 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check et -s sont mutuellement exclusifs" -#: diff.c:4563 +#: diff.c:4566 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S et --find-object sont mutuellement exclusifs" -#: diff.c:4641 +#: diff.c:4644 msgid "--follow requires exactly one pathspec" msgstr "--follow a besoin d'une spécification de chemin unique" -#: diff.c:4689 +#: diff.c:4692 #, c-format msgid "invalid --stat value: %s" msgstr "valeur invalide de --stat : %s" -#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222 +#: diff.c:4697 diff.c:4702 diff.c:4707 diff.c:4712 diff.c:5225 #: parse-options.c:199 parse-options.c:203 #, c-format msgid "%s expects a numerical value" msgstr "%s attend une valeur numérique" -#: diff.c:4726 +#: diff.c:4729 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -2610,42 +2619,42 @@ msgstr "" "Impossible d'analyser le paramètre de l'option --dirstat/-X :\n" "%s" -#: diff.c:4811 +#: diff.c:4814 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "classe de modification inconnue '%c' dans --diff-fileter=%s" -#: diff.c:4835 +#: diff.c:4838 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "valeur inconnue après ws-error-highlight=%.*s" -#: diff.c:4849 +#: diff.c:4852 #, c-format msgid "unable to resolve '%s'" msgstr "impossible de résoudre '%s'" -#: diff.c:4899 diff.c:4905 +#: diff.c:4902 diff.c:4908 #, c-format msgid "%s expects <n>/<m> form" msgstr "forme <n>/<m> attendue par %s" -#: diff.c:4917 +#: diff.c:4920 #, c-format msgid "%s expects a character, got '%s'" msgstr "caractère attendu par %s, '%s' trouvé" -#: diff.c:4938 +#: diff.c:4941 #, c-format msgid "bad --color-moved argument: %s" msgstr "mauvais argument --color-moved : %s" -#: diff.c:4957 +#: diff.c:4960 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "mode invalide '%s' dans --color-moved-ws" -#: diff.c:4997 +#: diff.c:5000 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -2653,155 +2662,155 @@ msgstr "" "l'option diff-algorithm accept \"myers\", \"minimal\", \"patience\" et " "\"histogram\"" -#: diff.c:5033 diff.c:5053 +#: diff.c:5036 diff.c:5056 #, c-format msgid "invalid argument to %s" msgstr "argument invalide pour %s" -#: diff.c:5191 +#: diff.c:5194 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "échec de l'analyse du paramètre de l'option --submodule : '%s'" -#: diff.c:5247 +#: diff.c:5250 #, c-format msgid "bad --word-diff argument: %s" msgstr "mauvais argument pour --word-diff : %s" -#: diff.c:5270 +#: diff.c:5273 msgid "Diff output format options" msgstr "Options de format de sortie de diff" -#: diff.c:5272 diff.c:5278 +#: diff.c:5275 diff.c:5281 msgid "generate patch" msgstr "générer la rustine" -#: diff.c:5275 builtin/log.c:172 +#: diff.c:5278 builtin/log.c:172 msgid "suppress diff output" msgstr "supprimer la sortie des différences" -#: diff.c:5280 diff.c:5394 diff.c:5401 +#: diff.c:5283 diff.c:5397 diff.c:5404 msgid "<n>" msgstr "<n>" -#: diff.c:5281 diff.c:5284 +#: diff.c:5284 diff.c:5287 msgid "generate diffs with <n> lines context" msgstr "générer les diffs avec <n> lignes de contexte" -#: diff.c:5286 +#: diff.c:5289 msgid "generate the diff in raw format" msgstr "générer le diff en format brut" -#: diff.c:5289 +#: diff.c:5292 msgid "synonym for '-p --raw'" msgstr "synonyme de '-p --raw'" -#: diff.c:5293 +#: diff.c:5296 msgid "synonym for '-p --stat'" msgstr "synonyme de '-p --stat'" -#: diff.c:5297 +#: diff.c:5300 msgid "machine friendly --stat" msgstr "--stat pour traitement automatique" -#: diff.c:5300 +#: diff.c:5303 msgid "output only the last line of --stat" msgstr "afficher seulement la dernière ligne de --stat" -#: diff.c:5302 diff.c:5310 +#: diff.c:5305 diff.c:5313 msgid "<param1,param2>..." msgstr "<param1,param2>..." -#: diff.c:5303 +#: diff.c:5306 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" "afficher la distribution des quantités de modifications relatives pour " "chaque sous-répertoire" -#: diff.c:5307 +#: diff.c:5310 msgid "synonym for --dirstat=cumulative" msgstr "synonyme pour --dirstat=cumulative" -#: diff.c:5311 +#: diff.c:5314 msgid "synonym for --dirstat=files,param1,param2..." msgstr "synonyme pour --dirstat=files,param1,param2..." -#: diff.c:5315 +#: diff.c:5318 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" "avertir si les modifications introduisent des marqueurs de conflit ou des " "erreurs d'espace" -#: diff.c:5318 +#: diff.c:5321 msgid "condensed summary such as creations, renames and mode changes" msgstr "" "résumé succinct tel que les créations, les renommages et les modifications " "de mode" -#: diff.c:5321 +#: diff.c:5324 msgid "show only names of changed files" msgstr "n'afficher que les noms de fichiers modifiés" -#: diff.c:5324 +#: diff.c:5327 msgid "show only names and status of changed files" msgstr "n'afficher que les noms et les status des fichiers modifiés" -#: diff.c:5326 +#: diff.c:5329 msgid "<width>[,<name-width>[,<count>]]" msgstr "<largeur>[,<largeur-de-nom>[,<compte>]]" -#: diff.c:5327 +#: diff.c:5330 msgid "generate diffstat" msgstr "générer un diffstat" -#: diff.c:5329 diff.c:5332 diff.c:5335 +#: diff.c:5332 diff.c:5335 diff.c:5338 msgid "<width>" msgstr "<largeur>" -#: diff.c:5330 +#: diff.c:5333 msgid "generate diffstat with a given width" msgstr "générer un diffstat avec la largeur indiquée" -#: diff.c:5333 +#: diff.c:5336 msgid "generate diffstat with a given name width" msgstr "génerer un diffstat avec la largeur de nom indiquée" -#: diff.c:5336 +#: diff.c:5339 msgid "generate diffstat with a given graph width" msgstr "génerer un diffstat avec la largeur de graphe indiquée" -#: diff.c:5338 +#: diff.c:5341 msgid "<count>" msgstr "<compte>" -#: diff.c:5339 +#: diff.c:5342 msgid "generate diffstat with limited lines" msgstr "générer un diffstat avec des lignes limitées" -#: diff.c:5342 +#: diff.c:5345 msgid "generate compact summary in diffstat" msgstr "générer une résumé compact dans le diffstat" -#: diff.c:5345 +#: diff.c:5348 msgid "output a binary diff that can be applied" msgstr "produire un diff binaire qui peut être appliqué" -#: diff.c:5348 +#: diff.c:5351 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" "afficher les noms complets des objets pre- et post-image sur les lignes " "\"index\"" -#: diff.c:5350 +#: diff.c:5353 msgid "show colored diff" msgstr "afficher un diff coloré" -#: diff.c:5351 +#: diff.c:5354 msgid "<kind>" msgstr "<sorte>" -#: diff.c:5352 +#: diff.c:5355 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -2809,7 +2818,7 @@ msgstr "" "surligner les erreurs d'espace dans les lignes 'contexte', 'ancien', " "'nouveau' dans le diff" -#: diff.c:5355 +#: diff.c:5358 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -2817,93 +2826,93 @@ msgstr "" "ne pas compresser les chemins et utiliser des NULs comme terminateurs de " "champs dans --raw ou --numstat" -#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470 +#: diff.c:5361 diff.c:5364 diff.c:5367 diff.c:5473 msgid "<prefix>" msgstr "<préfixe>" -#: diff.c:5359 +#: diff.c:5362 msgid "show the given source prefix instead of \"a/\"" msgstr "afficher le préfixe de source indiqué au lieu de \"a/\"" -#: diff.c:5362 +#: diff.c:5365 msgid "show the given destination prefix instead of \"b/\"" msgstr "afficher le préfixe de destination indiqué au lieu de \"b/\"" -#: diff.c:5365 +#: diff.c:5368 msgid "prepend an additional prefix to every line of output" msgstr "préfixer toutes les lignes en sortie avec la chaîne indiquée" -#: diff.c:5368 +#: diff.c:5371 msgid "do not show any source or destination prefix" msgstr "n'afficher aucun préfixe, ni de source, ni de destination" -#: diff.c:5371 +#: diff.c:5374 msgid "show context between diff hunks up to the specified number of lines" msgstr "" "afficher le contexte entre les sections à concurrence du nombre de ligne " "indiqué" -#: diff.c:5375 diff.c:5380 diff.c:5385 +#: diff.c:5378 diff.c:5383 diff.c:5388 msgid "<char>" msgstr "<caractère>" -#: diff.c:5376 +#: diff.c:5379 msgid "specify the character to indicate a new line instead of '+'" msgstr "spécifier le caractère pour indiquer une nouvelle ligne au lieu de '+'" -#: diff.c:5381 +#: diff.c:5384 msgid "specify the character to indicate an old line instead of '-'" msgstr "spécifier le caractère pour indiquer une ancienne ligne au lieu de '-'" -#: diff.c:5386 +#: diff.c:5389 msgid "specify the character to indicate a context instead of ' '" msgstr "" "spécifier le caractère pour indiquer une ligne de contexte au lieu de ' '" -#: diff.c:5389 +#: diff.c:5392 msgid "Diff rename options" msgstr "Options de renommage de diff" -#: diff.c:5390 +#: diff.c:5393 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5391 +#: diff.c:5394 msgid "break complete rewrite changes into pairs of delete and create" msgstr "" "casser les modifications d'une réécrire complète en paires de suppression et " "création" -#: diff.c:5395 +#: diff.c:5398 msgid "detect renames" msgstr "détecter les renommages" -#: diff.c:5399 +#: diff.c:5402 msgid "omit the preimage for deletes" msgstr "supprimer la pré-image pour les suppressions" -#: diff.c:5402 +#: diff.c:5405 msgid "detect copies" msgstr "détecter les copies" -#: diff.c:5406 +#: diff.c:5409 msgid "use unmodified files as source to find copies" msgstr "" "utiliser les fichiers non-modifiés comme sources pour trouver des copies" -#: diff.c:5408 +#: diff.c:5411 msgid "disable rename detection" msgstr "désactiver la détection de renommage" -#: diff.c:5411 +#: diff.c:5414 msgid "use empty blobs as rename source" msgstr "utiliser des blobs vides comme source de renommage" -#: diff.c:5413 +#: diff.c:5416 msgid "continue listing the history of a file beyond renames" msgstr "continuer à afficher l'historique d'un fichier au delà des renommages" -#: diff.c:5416 +#: diff.c:5419 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -2911,161 +2920,161 @@ msgstr "" "empêcher la détection de renommage/copie si le nombre de cibles de renommage/" "copie excède la limite indiquée" -#: diff.c:5418 +#: diff.c:5421 msgid "Diff algorithm options" msgstr "Options de l'algorithme de diff" -#: diff.c:5420 +#: diff.c:5423 msgid "produce the smallest possible diff" msgstr "produire le diff le plus petit possible" -#: diff.c:5423 +#: diff.c:5426 msgid "ignore whitespace when comparing lines" msgstr "ignorer les espaces lors de la comparaison de ligne" -#: diff.c:5426 +#: diff.c:5429 msgid "ignore changes in amount of whitespace" msgstr "ignorer des modifications du nombre d'espaces" -#: diff.c:5429 +#: diff.c:5432 msgid "ignore changes in whitespace at EOL" msgstr "ignorer des modifications d'espace en fin de ligne" -#: diff.c:5432 +#: diff.c:5435 msgid "ignore carrier-return at the end of line" msgstr "ignore le retour chariot en fin de ligne" -#: diff.c:5435 +#: diff.c:5438 msgid "ignore changes whose lines are all blank" msgstr "ignorer les modifications dont les lignes sont vides" -#: diff.c:5438 +#: diff.c:5441 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "" "heuristique qui déplace les limites de sections de diff pour faciliter la " "lecture" -#: diff.c:5441 +#: diff.c:5444 msgid "generate diff using the \"patience diff\" algorithm" msgstr "générer un diff en utilisant l'algorithme de différence \"patience\"" -#: diff.c:5445 +#: diff.c:5448 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "" "générer un diff en utilisant l'algorithme de différence \"histogramme\"" -#: diff.c:5447 +#: diff.c:5450 msgid "<algorithm>" msgstr "<algorithme>" -#: diff.c:5448 +#: diff.c:5451 msgid "choose a diff algorithm" msgstr "choisir un algorithme de différence" -#: diff.c:5450 +#: diff.c:5453 msgid "<text>" msgstr "<texte>" -#: diff.c:5451 +#: diff.c:5454 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "générer un diff en utilisant l'algorithme de différence \"ancré\"" -#: diff.c:5453 diff.c:5462 diff.c:5465 +#: diff.c:5456 diff.c:5465 diff.c:5468 msgid "<mode>" msgstr "<mode>" -#: diff.c:5454 +#: diff.c:5457 msgid "show word diff, using <mode> to delimit changed words" msgstr "" "afficher des différences par mot, en utilisant <mode> pour délimiter les " "mots modifiés" -#: diff.c:5456 diff.c:5459 diff.c:5504 +#: diff.c:5459 diff.c:5462 diff.c:5507 msgid "<regex>" msgstr "<regex>" -#: diff.c:5457 +#: diff.c:5460 msgid "use <regex> to decide what a word is" msgstr "utiliser <regex> pour décider ce qu'est un mot" -#: diff.c:5460 +#: diff.c:5463 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "équivalent à --word-diff=color --word-diff-regex=<regex>" -#: diff.c:5463 +#: diff.c:5466 msgid "moved lines of code are colored differently" msgstr "les lignes déplacées sont colorées différemment" -#: diff.c:5466 +#: diff.c:5469 msgid "how white spaces are ignored in --color-moved" msgstr "comment les espaces sont ignorés dans --color-moved" -#: diff.c:5469 +#: diff.c:5472 msgid "Other diff options" msgstr "Autres options diff" -#: diff.c:5471 +#: diff.c:5474 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" "lancé depuis un sous-répertoire, exclure les modifications en dehors et " "afficher les chemins relatifs" -#: diff.c:5475 +#: diff.c:5478 msgid "treat all files as text" msgstr "traiter les fichiers comme texte" -#: diff.c:5477 +#: diff.c:5480 msgid "swap two inputs, reverse the diff" msgstr "échanger les entrées, inverser le diff" -#: diff.c:5479 +#: diff.c:5482 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "sortir un code d'erreur 1 s'il y avait de différences, 0 sinon" -#: diff.c:5481 +#: diff.c:5484 msgid "disable all output of the program" msgstr "désactiver tous les affichages du programme" -#: diff.c:5483 +#: diff.c:5486 msgid "allow an external diff helper to be executed" msgstr "autoriser l'exécution d'un assistant externe de diff" -#: diff.c:5485 +#: diff.c:5488 msgid "run external text conversion filters when comparing binary files" msgstr "" "lancer les filtres externes de conversion en texte lors de la comparaison de " "fichiers binaires" -#: diff.c:5487 +#: diff.c:5490 msgid "<when>" msgstr "<quand>" -#: diff.c:5488 +#: diff.c:5491 msgid "ignore changes to submodules in the diff generation" msgstr "" "ignorer les modifications dans les sous-modules lors de la génération de diff" -#: diff.c:5491 +#: diff.c:5494 msgid "<format>" msgstr "<format>" -#: diff.c:5492 +#: diff.c:5495 msgid "specify how differences in submodules are shown" msgstr "spécifier comment les différences dans les sous-modules sont affichées" -#: diff.c:5496 +#: diff.c:5499 msgid "hide 'git add -N' entries from the index" msgstr "masquer les entrées 'git add -N' de l'index" -#: diff.c:5499 +#: diff.c:5502 msgid "treat 'git add -N' entries as real in the index" msgstr "traiter les entrées 'git add -N' comme réelles dans l'index" -#: diff.c:5501 +#: diff.c:5504 msgid "<string>" msgstr "<chaîne>" -#: diff.c:5502 +#: diff.c:5505 msgid "" "look for differences that change the number of occurrences of the specified " "string" @@ -3073,7 +3082,7 @@ msgstr "" "rechercher les différences qui modifient le nombre d'occurrences de la " "chaîne spécifiée" -#: diff.c:5505 +#: diff.c:5508 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -3081,26 +3090,26 @@ msgstr "" "rechercher les différences qui modifient le nombre d'occurrences de la regex " "spécifiée" -#: diff.c:5508 +#: diff.c:5511 msgid "show all changes in the changeset with -S or -G" msgstr "" "afficher toutes les modifications dans l'ensemble de modifications avec -S " "ou -G" -#: diff.c:5511 +#: diff.c:5514 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "" "traiter <chaîne> dans -S comme une expression rationnelle POSIX étendue" -#: diff.c:5514 +#: diff.c:5517 msgid "control the order in which files appear in the output" msgstr "contrôler l'ordre dans lequel les fichiers apparaissent dans la sortie" -#: diff.c:5515 +#: diff.c:5518 msgid "<object-id>" msgstr "<id-objet>" -#: diff.c:5516 +#: diff.c:5519 msgid "" "look for differences that change the number of occurrences of the specified " "object" @@ -3108,35 +3117,35 @@ msgstr "" "rechercher les différences qui modifient le nombre d'occurrences de l'objet " "indiqué" -#: diff.c:5518 +#: diff.c:5521 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5519 +#: diff.c:5522 msgid "select files by diff type" msgstr "sélectionner les fichiers par types de diff" -#: diff.c:5521 +#: diff.c:5524 msgid "<file>" msgstr "<fichier>" -#: diff.c:5522 +#: diff.c:5525 msgid "Output to a specific file" msgstr "Sortie vers un fichier spécifié" -#: diff.c:6177 +#: diff.c:6180 msgid "inexact rename detection was skipped due to too many files." msgstr "" "détection de renommage inexact annulée à cause d'un trop grand nombre de " "fichiers." -#: diff.c:6180 +#: diff.c:6183 msgid "only found copies from modified paths due to too many files." msgstr "" "recherche uniquement des copies par modification de chemin à cause d'un trop " "grand nombre de fichiers." -#: diff.c:6183 +#: diff.c:6186 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3144,41 +3153,41 @@ msgstr "" "vous souhaitez peut-être régler la variable %s à au moins %d et réessayer le " "commande." -#: dir.c:537 +#: dir.c:549 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "" "le spécificateur de chemin '%s' ne correspond à aucun fichier connu de git" -#: dir.c:926 +#: dir.c:938 #, c-format msgid "cannot use %s as an exclude file" msgstr "impossible d'utiliser %s comme fichier d'exclusion" -#: dir.c:1843 +#: dir.c:1877 #, c-format msgid "could not open directory '%s'" msgstr "impossible d'ouvrir le répertoire '%s'" -#: dir.c:2085 +#: dir.c:2128 msgid "failed to get kernel name and information" msgstr "echec de l'obtention d'information de kernel" -#: dir.c:2209 +#: dir.c:2252 msgid "untracked cache is disabled on this system or location" msgstr "Le cache non suivi est désactivé sur ce système ou sur cet endroit" -#: dir.c:3013 +#: dir.c:3056 #, c-format msgid "index file corrupt in repo %s" msgstr "fichier d'index corrompu dans le dépôt %s" -#: dir.c:3058 dir.c:3063 +#: dir.c:3101 dir.c:3106 #, c-format msgid "could not create directories for %s" msgstr "impossible de créer les répertoires pour %s" -#: dir.c:3092 +#: dir.c:3135 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "impossible de migrer le répertoire git de '%s' vers '%s'" @@ -3199,12 +3208,12 @@ msgstr "Filtrage du contenu" msgid "could not stat file '%s'" msgstr "impossible de stat le fichier '%s'" -#: environment.c:150 +#: environment.c:148 #, c-format msgid "bad git namespace path \"%s\"" msgstr "Espaces de nom de Git \"%s\"" -#: environment.c:332 +#: environment.c:330 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "impossible de régler GIT_DIR à '%s'" @@ -3214,159 +3223,155 @@ msgstr "impossible de régler GIT_DIR à '%s'" msgid "too many args to run %s" msgstr "trop d'arguments pour lancer %s" -#: fetch-object.c:17 -msgid "Remote with no URL" -msgstr "Dépôt distant sans URL" - -#: fetch-pack.c:151 +#: fetch-pack.c:150 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack : liste superficielle attendue" -#: fetch-pack.c:154 +#: fetch-pack.c:153 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "" "git fetch-pack : paquet de vidage attendu après une liste superficielle" -#: fetch-pack.c:165 +#: fetch-pack.c:164 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack : ACK/NACK attendu, paquet de nettoyage reçu" -#: fetch-pack.c:185 +#: fetch-pack.c:184 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack : ACK/NACK attendu, '%s' reçu" -#: fetch-pack.c:196 +#: fetch-pack.c:195 msgid "unable to write to remote" msgstr "impossible d'écrire sur un distant" -#: fetch-pack.c:258 +#: fetch-pack.c:257 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc nécessite multi_ack_detailed" -#: fetch-pack.c:360 fetch-pack.c:1284 +#: fetch-pack.c:356 fetch-pack.c:1280 #, c-format msgid "invalid shallow line: %s" msgstr "ligne de superficiel invalide : %s" -#: fetch-pack.c:366 fetch-pack.c:1290 +#: fetch-pack.c:362 fetch-pack.c:1286 #, c-format msgid "invalid unshallow line: %s" msgstr "ligne de fin de superficiel invalide : %s" -#: fetch-pack.c:368 fetch-pack.c:1292 +#: fetch-pack.c:364 fetch-pack.c:1288 #, c-format msgid "object not found: %s" msgstr "objet non trouvé : %s" -#: fetch-pack.c:371 fetch-pack.c:1295 +#: fetch-pack.c:367 fetch-pack.c:1291 #, c-format msgid "error in object: %s" msgstr "Erreur dans l'objet : %s" -#: fetch-pack.c:373 fetch-pack.c:1297 +#: fetch-pack.c:369 fetch-pack.c:1293 #, c-format msgid "no shallow found: %s" msgstr "Pas de superficiel trouvé : %s" -#: fetch-pack.c:376 fetch-pack.c:1301 +#: fetch-pack.c:372 fetch-pack.c:1297 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "superficiel/non superficiel attendu, %s trouvé" -#: fetch-pack.c:417 +#: fetch-pack.c:414 #, c-format msgid "got %s %d %s" msgstr "réponse %s %d %s" -#: fetch-pack.c:434 +#: fetch-pack.c:431 #, c-format msgid "invalid commit %s" msgstr "commit invalide %s" -#: fetch-pack.c:465 +#: fetch-pack.c:462 msgid "giving up" msgstr "abandon" -#: fetch-pack.c:477 progress.c:277 +#: fetch-pack.c:475 progress.c:312 msgid "done" msgstr "fait" -#: fetch-pack.c:489 +#: fetch-pack.c:487 #, c-format msgid "got %s (%d) %s" msgstr "%s trouvé (%d) %s" -#: fetch-pack.c:535 +#: fetch-pack.c:533 #, c-format msgid "Marking %s as complete" msgstr "Marquage de %s comme terminé" -#: fetch-pack.c:744 +#: fetch-pack.c:742 #, c-format msgid "already have %s (%s)" msgstr "%s déjà possédé (%s)" -#: fetch-pack.c:783 +#: fetch-pack.c:781 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack : impossible de dupliquer le démultiplexeur latéral" -#: fetch-pack.c:791 +#: fetch-pack.c:789 msgid "protocol error: bad pack header" msgstr "erreur de protocole : mauvais entête de paquet" -#: fetch-pack.c:859 +#: fetch-pack.c:857 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack : impossible de dupliquer %s" -#: fetch-pack.c:875 +#: fetch-pack.c:873 #, c-format msgid "%s failed" msgstr "échec de %s" -#: fetch-pack.c:877 +#: fetch-pack.c:875 msgid "error in sideband demultiplexer" msgstr "erreur dans le démultiplexer latéral" -#: fetch-pack.c:908 +#: fetch-pack.c:907 #, c-format msgid "Server version is %.*s" msgstr "La version du serveur est %.*s" -#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928 -#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944 -#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960 -#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982 +#: fetch-pack.c:912 fetch-pack.c:918 fetch-pack.c:921 fetch-pack.c:927 +#: fetch-pack.c:931 fetch-pack.c:935 fetch-pack.c:939 fetch-pack.c:943 +#: fetch-pack.c:947 fetch-pack.c:951 fetch-pack.c:955 fetch-pack.c:959 +#: fetch-pack.c:965 fetch-pack.c:971 fetch-pack.c:976 fetch-pack.c:981 #, c-format msgid "Server supports %s" msgstr "Le serveur supporte %s" -#: fetch-pack.c:915 +#: fetch-pack.c:914 msgid "Server does not support shallow clients" msgstr "Le serveur ne supporte les clients superficiels" -#: fetch-pack.c:975 +#: fetch-pack.c:974 msgid "Server does not support --shallow-since" msgstr "Le receveur ne gère pas --shallow-since" -#: fetch-pack.c:980 +#: fetch-pack.c:979 msgid "Server does not support --shallow-exclude" msgstr "Le receveur ne gère pas --shallow-exclude" -#: fetch-pack.c:984 +#: fetch-pack.c:983 msgid "Server does not support --deepen" msgstr "Le receveur ne gère pas --deepen" -#: fetch-pack.c:1001 +#: fetch-pack.c:1000 msgid "no common commits" msgstr "pas de commit commun" -#: fetch-pack.c:1013 fetch-pack.c:1462 +#: fetch-pack.c:1012 fetch-pack.c:1468 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack : échec de le récupération." -#: fetch-pack.c:1151 +#: fetch-pack.c:1150 msgid "Server does not support shallow requests" msgstr "Le serveur ne supporte les requêtes superficielles" @@ -3374,72 +3379,72 @@ msgstr "Le serveur ne supporte les requêtes superficielles" msgid "Server supports filter" msgstr "Le serveur supporte filter" -#: fetch-pack.c:1184 +#: fetch-pack.c:1180 msgid "unable to write request to remote" msgstr "impossible d'écrire la requête sur le distant" -#: fetch-pack.c:1202 +#: fetch-pack.c:1198 #, c-format msgid "error reading section header '%s'" msgstr "erreur à la lecture de l'entête de section '%s'" -#: fetch-pack.c:1208 +#: fetch-pack.c:1204 #, c-format msgid "expected '%s', received '%s'" msgstr "'%s' attendu, '%s' reçu" -#: fetch-pack.c:1247 +#: fetch-pack.c:1243 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "ligne d'acquittement inattendue : '%s'" -#: fetch-pack.c:1252 +#: fetch-pack.c:1248 #, c-format msgid "error processing acks: %d" msgstr "erreur lors du traitement des acquittements : %d" -#: fetch-pack.c:1262 +#: fetch-pack.c:1258 msgid "expected packfile to be sent after 'ready'" msgstr "fichier paquet attendu à envoyer après 'ready'" -#: fetch-pack.c:1264 +#: fetch-pack.c:1260 msgid "expected no other sections to be sent after no 'ready'" msgstr "aucune autre section attendue à envoyer après absence de 'ready'" -#: fetch-pack.c:1306 +#: fetch-pack.c:1302 #, c-format msgid "error processing shallow info: %d" msgstr "erreur lors du traitement de l'information de superficialité : %d" -#: fetch-pack.c:1353 +#: fetch-pack.c:1349 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "wanted-ref attendu, '%s' trouvé" -#: fetch-pack.c:1358 +#: fetch-pack.c:1354 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "wanted-ref inattendu : '%s'" -#: fetch-pack.c:1363 +#: fetch-pack.c:1359 #, c-format msgid "error processing wanted refs: %d" msgstr "erreur lors du traitement des références voulues : %d" -#: fetch-pack.c:1689 +#: fetch-pack.c:1693 msgid "no matching remote head" msgstr "pas de HEAD distante correspondante" -#: fetch-pack.c:1712 builtin/clone.c:686 +#: fetch-pack.c:1716 builtin/clone.c:685 msgid "remote did not send all necessary objects" msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires" -#: fetch-pack.c:1739 +#: fetch-pack.c:1743 #, c-format msgid "no such remote ref %s" msgstr "référence distante inconnue %s" -#: fetch-pack.c:1742 +#: fetch-pack.c:1746 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Le serveur n'autorise pas de requête pour l'objet %s non annoncé" @@ -3462,18 +3467,24 @@ msgstr "impossible d'écrire la signature détachée dans '%s'" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "couleur invalide '%.*s' ignorée dans log.graphColors" -#: grep.c:2117 +#: grep.c:627 +msgid "" +"given pattern contains NULL byte (via -f <file>). This is only supported " +"with -P under PCRE v2" +msgstr "le motif fourni contient des octets NUL (via -f <fichier>). Ce n'est supporté qu'avec -P avec PCRE v2" + +#: grep.c:2083 #, c-format msgid "'%s': unable to read %s" msgstr "'%s' : lecture de %s impossible" -#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82 +#: grep.c:2100 setup.c:165 builtin/clone.c:408 builtin/diff.c:82 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "échec du stat de '%s'" -#: grep.c:2145 +#: grep.c:2111 #, c-format msgid "'%s': short read" msgstr "'%s' : lecture tronquée" @@ -3620,12 +3631,12 @@ msgstr[1] "" msgid "git version [<options>]" msgstr "git version [<options>]" -#: help.c:782 +#: help.c:783 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:786 +#: help.c:787 msgid "" "\n" "Did you mean this?" @@ -3698,43 +3709,58 @@ msgstr "le nom n'est constitué que de caractères interdits : %s" msgid "invalid date format: %s" msgstr "format de date invalide : %s" -#: list-objects.c:129 +#: list-objects.c:127 #, c-format msgid "entry '%s' in tree %s has tree mode, but is not a tree" msgstr "" "l'entrée '%s' dans l'arbre %s a un mode d'arbre, mais n'est pas un arbre" -#: list-objects.c:142 +#: list-objects.c:140 #, c-format msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "" "l'entrée '%s' dans l'arbre %s a un mode de blob, mais n'est pas un blob" -#: list-objects.c:378 +#: list-objects.c:375 #, c-format msgid "unable to load root tree for commit %s" msgstr "impossible de charger l'arbre racine pour le commit %s" -#: list-objects-filter-options.c:36 -msgid "multiple filter-specs cannot be combined" -msgstr "impossible de combiner des spécificateurs multiples de filtre" +#: list-objects-filter.c:492 +#, c-format +msgid "unable to access sparse blob in '%s'" +msgstr "impossible d'accéder au blob clairsemé dans '%s'" + +#: list-objects-filter.c:495 +#, c-format +msgid "unable to parse sparse filter data in %s" +msgstr "impossible d'analyser la donnée de filtre clairsemé dans %s" #: list-objects-filter-options.c:58 msgid "expected 'tree:<depth>'" msgstr "attendu : 'tree:<profondeur>'" -#: list-objects-filter-options.c:84 +#: list-objects-filter-options.c:73 msgid "sparse:path filters support has been dropped" msgstr "sparse : le support des filtres de chemin a été abandonné" -#: list-objects-filter-options.c:94 +#: list-objects-filter-options.c:86 #, c-format msgid "invalid filter-spec '%s'" msgstr "spécificateur de filtre invalide '%s'" -#: list-objects-filter-options.c:158 -msgid "cannot change partial clone promisor remote" -msgstr "impossible de modifier le prometteur distant de clone partiel" +#: list-objects-filter-options.c:102 +#, c-format +msgid "must escape char in sub-filter-spec: '%c'" +msgstr "le caractère doit être échappé dans le spécificateur de sous-filtre : '%c'" + +#: list-objects-filter-options.c:144 +msgid "expected something after combine:" +msgstr "quelque chose attendu après combine :" + +#: list-objects-filter-options.c:226 +msgid "multiple filter-specs cannot be combined" +msgstr "impossible de combiner des spécificateurs multiples de filtre" #: lockfile.c:151 #, c-format @@ -3764,117 +3790,113 @@ msgstr "Impossible de créer '%s.lock' : %s" msgid "failed to read the cache" msgstr "impossible de lire le cache" -#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919 -#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786 +#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908 +#: builtin/checkout.c:537 builtin/checkout.c:796 builtin/clone.c:785 #: builtin/stash.c:264 msgid "unable to write new index file" msgstr "impossible d'écrire le nouveau fichier d'index" -#: merge-recursive.c:322 +#: merge-recursive.c:367 msgid "(bad commit)\n" msgstr "(mauvais commit)\n" -#: merge-recursive.c:345 +#: merge-recursive.c:390 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "échec de addinfo_cache pour le chemin '%s' ; abandon de la fusion." -#: merge-recursive.c:354 +#: merge-recursive.c:399 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "échec de addinfo_cache pour le chemin '%s' ; abandon de la fusion." -#: merge-recursive.c:437 -msgid "error building trees" -msgstr "erreur de construction des arbres" - -#: merge-recursive.c:863 +#: merge-recursive.c:885 #, c-format msgid "failed to create path '%s'%s" msgstr "impossible de créer le chemin '%s' %s" -#: merge-recursive.c:874 +#: merge-recursive.c:896 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Suppression de %s pour faire de la place pour le sous-répertoire\n" -#: merge-recursive.c:888 merge-recursive.c:907 +#: merge-recursive.c:910 merge-recursive.c:929 msgid ": perhaps a D/F conflict?" msgstr ": peut-être un conflit D/F ?" -#: merge-recursive.c:897 +#: merge-recursive.c:919 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "refus de perdre le fichier non suivi '%s'" -#: merge-recursive.c:938 builtin/cat-file.c:40 +#: merge-recursive.c:960 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "impossible de lire l'objet %s '%s'" -#: merge-recursive.c:941 +#: merge-recursive.c:965 #, c-format msgid "blob expected for %s '%s'" msgstr "blob attendu pour %s '%s'" -#: merge-recursive.c:965 +#: merge-recursive.c:990 #, c-format msgid "failed to open '%s': %s" msgstr "échec à l'ouverture de '%s' : %s" -#: merge-recursive.c:976 +#: merge-recursive.c:1001 #, c-format msgid "failed to symlink '%s': %s" msgstr "échec à la création du lien symbolique '%s' : %s" -#: merge-recursive.c:981 +#: merge-recursive.c:1006 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "ne sait pas traiter %06o %s '%s'" -#: merge-recursive.c:1177 +#: merge-recursive.c:1199 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Échec de la fusion du sous-module %s (non extrait)" -#: merge-recursive.c:1184 +#: merge-recursive.c:1206 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Échec de fusion du sous-module %s (commits non présents)" -#: merge-recursive.c:1191 +#: merge-recursive.c:1213 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "" "Échec de la fusion du sous-module %s (les commits ne descendent pas de la " "base de fusion)" -#: merge-recursive.c:1199 merge-recursive.c:1211 +#: merge-recursive.c:1221 merge-recursive.c:1233 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Avance rapide du sous-module %s au commit suivant :" -#: merge-recursive.c:1202 merge-recursive.c:1214 +#: merge-recursive.c:1224 merge-recursive.c:1236 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Avance rapide du sous-module %s" -#: merge-recursive.c:1237 +#: merge-recursive.c:1259 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" "Échec de fusion du sous-module %s (fusion suivant les commits non trouvée)" -#: merge-recursive.c:1241 +#: merge-recursive.c:1263 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "Échec de fusion du sous-module %s (pas en avance rapide)" -#: merge-recursive.c:1242 +#: merge-recursive.c:1264 msgid "Found a possible merge resolution for the submodule:\n" msgstr "Résolution possible de fusion trouvée pour le sous-module :\n" -#: merge-recursive.c:1245 +#: merge-recursive.c:1267 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -3891,33 +3913,33 @@ msgstr "" "\n" "qui acceptera cette suggestion.\n" -#: merge-recursive.c:1254 +#: merge-recursive.c:1276 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "Échec de fusion du sous-module %s (plusieurs fusions trouvées)" -#: merge-recursive.c:1327 +#: merge-recursive.c:1349 msgid "Failed to execute internal merge" msgstr "Échec à l'exécution de la fusion interne" -#: merge-recursive.c:1332 +#: merge-recursive.c:1354 #, c-format msgid "Unable to add %s to database" msgstr "Impossible d'ajouter %s à la base de données" -#: merge-recursive.c:1364 +#: merge-recursive.c:1386 #, c-format msgid "Auto-merging %s" msgstr "Fusion automatique de %s" -#: merge-recursive.c:1387 +#: merge-recursive.c:1410 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" "Erreur : refus de perdre le fichier non suivi %s ; écriture dans %s à la " "place." -#: merge-recursive.c:1459 +#: merge-recursive.c:1482 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3926,7 +3948,7 @@ msgstr "" "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de " "%s laissée dans l'arbre." -#: merge-recursive.c:1464 +#: merge-recursive.c:1487 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3935,7 +3957,7 @@ msgstr "" "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version " "%s de %s laissée dans l'arbre." -#: merge-recursive.c:1471 +#: merge-recursive.c:1494 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3944,7 +3966,7 @@ msgstr "" "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de " "%s laissée dans l'arbre dans le fichier %s." -#: merge-recursive.c:1476 +#: merge-recursive.c:1499 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3953,41 +3975,41 @@ msgstr "" "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version " "%s de %s laissée dans l'arbre dans le fichier %s." -#: merge-recursive.c:1511 +#: merge-recursive.c:1534 msgid "rename" msgstr "renommage" -#: merge-recursive.c:1511 +#: merge-recursive.c:1534 msgid "renamed" msgstr "renommé" -#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094 +#: merge-recursive.c:1614 merge-recursive.c:2472 merge-recursive.c:3117 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Refus de perdre le fichier modifié %s" -#: merge-recursive.c:1601 +#: merge-recursive.c:1624 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "Refus de perdre le fichier non suivi %s, même s'il gêne." -#: merge-recursive.c:1659 +#: merge-recursive.c:1682 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" "CONFLIT (renommage/ajout) : Renommage de %s->%s dans %s. %s ajouté dans %s" -#: merge-recursive.c:1690 +#: merge-recursive.c:1713 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s est un répertoire dans %s ajouté plutôt comme %s" -#: merge-recursive.c:1695 +#: merge-recursive.c:1718 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "Refus de perdre le fichier non suivi %s ; ajout comme %s à la place" -#: merge-recursive.c:1714 +#: merge-recursive.c:1737 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -3996,18 +4018,18 @@ msgstr "" "CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche " "\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s" -#: merge-recursive.c:1719 +#: merge-recursive.c:1742 msgid " (left unresolved)" msgstr " (laissé non résolu)" -#: merge-recursive.c:1828 +#: merge-recursive.c:1851 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "CONFLIT (renommage/renommage) : renommage '%s'->'%s' dans %s. Renommage '%s'-" ">'%s' dans %s" -#: merge-recursive.c:2035 +#: merge-recursive.c:2056 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -4018,7 +4040,7 @@ msgstr "" "parce que le répertoire %s a été renommé en plusieurs autres répertoires, " "sans aucune destination récupérant la majorité des fichiers." -#: merge-recursive.c:2067 +#: merge-recursive.c:2088 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -4027,7 +4049,7 @@ msgstr "" "CONFLIT (renommage implicite de répertoire) : le répertoire/fichier %s gêne " "des renommages implicites de répertoire déplaçant les chemins suivants : %s." -#: merge-recursive.c:2077 +#: merge-recursive.c:2098 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -4036,7 +4058,7 @@ msgstr "" "CONFLIT (renommage implicite de répertoire) : impossible de transformer " "plusieurs chemins sur %s ; les chemins concernés sont : %s" -#: merge-recursive.c:2169 +#: merge-recursive.c:2190 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -4045,7 +4067,7 @@ msgstr "" "CONFLIT (renommage/renommage) : renommage du répertoire %s->%s dans %s. " "Renommage de répertoire %s->%s dans %s" -#: merge-recursive.c:2413 +#: merge-recursive.c:2435 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -4054,52 +4076,52 @@ msgstr "" "AVERTISSEMENT : ne renomme pas %s->%s dans %s, parce que %s lui-même a été " "renommé." -#: merge-recursive.c:2938 +#: merge-recursive.c:2961 #, c-format msgid "cannot read object %s" msgstr "impossible de lire l'objet %s" -#: merge-recursive.c:2941 +#: merge-recursive.c:2964 #, c-format msgid "object %s is not a blob" msgstr "l'objet %s n'est pas un blob" -#: merge-recursive.c:3005 +#: merge-recursive.c:3028 msgid "modify" msgstr "modification" -#: merge-recursive.c:3005 +#: merge-recursive.c:3028 msgid "modified" msgstr "modifié" -#: merge-recursive.c:3017 +#: merge-recursive.c:3040 msgid "content" msgstr "contenu" -#: merge-recursive.c:3021 +#: merge-recursive.c:3044 msgid "add/add" msgstr "ajout/ajout" -#: merge-recursive.c:3044 +#: merge-recursive.c:3067 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "%s sauté (fusion identique à l'existant)" -#: merge-recursive.c:3066 git-submodule.sh:937 +#: merge-recursive.c:3089 git-submodule.sh:937 msgid "submodule" msgstr "sous-module" -#: merge-recursive.c:3067 +#: merge-recursive.c:3090 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLIT (%s) : Conflit de fusion dans %s" -#: merge-recursive.c:3097 +#: merge-recursive.c:3120 #, c-format msgid "Adding as %s instead" msgstr "Ajout plutôt comme %s" -#: merge-recursive.c:3179 +#: merge-recursive.c:3203 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4108,7 +4130,7 @@ msgstr "" "Chemin mis à jour : %s ajouté dans %s dans un répertoire qui a été renommé " "en %s ; déplacé dans %s." -#: merge-recursive.c:3182 +#: merge-recursive.c:3206 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4118,7 +4140,7 @@ msgstr "" "a été renommé dans %s, ce qui suggère qu'il devrait peut-être être déplacé " "vers %s." -#: merge-recursive.c:3186 +#: merge-recursive.c:3210 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4127,7 +4149,7 @@ msgstr "" "Chemin mis à jour : %s renommé en %s dans %s, dans un répertoire qui a été " "renommé en %s ; déplacé dans %s." -#: merge-recursive.c:3189 +#: merge-recursive.c:3213 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4137,176 +4159,176 @@ msgstr "" "répertoire qui a été renommé dans %s, ce qui suggère qu'il devrait peut-être " "être déplacé vers %s." -#: merge-recursive.c:3303 +#: merge-recursive.c:3327 #, c-format msgid "Removing %s" msgstr "Suppression de %s" -#: merge-recursive.c:3326 +#: merge-recursive.c:3350 msgid "file/directory" msgstr "fichier/répertoire" -#: merge-recursive.c:3331 +#: merge-recursive.c:3355 msgid "directory/file" msgstr "répertoire/fichier" -#: merge-recursive.c:3338 +#: merge-recursive.c:3362 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "CONFLIT (%s) : Il y a un répertoire nommé %s dans %s. Ajout de %s comme %s" -#: merge-recursive.c:3347 +#: merge-recursive.c:3371 #, c-format msgid "Adding %s" msgstr "Ajout de %s" -#: merge-recursive.c:3356 +#: merge-recursive.c:3380 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "CONFLIT (ajout/ajout) : Conflit de fusion dans %s" -#: merge-recursive.c:3394 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" -"Vos modifications locales aux fichiers suivants seraient écrasées par la " -"fusion :\n" -" %s" - -#: merge-recursive.c:3405 +#: merge-recursive.c:3424 msgid "Already up to date!" msgstr "Déjà à jour !" -#: merge-recursive.c:3414 +#: merge-recursive.c:3433 #, c-format msgid "merging of trees %s and %s failed" msgstr "échec de fusion des arbres %s et %s" -#: merge-recursive.c:3513 +#: merge-recursive.c:3537 msgid "Merging:" msgstr "Fusion :" -#: merge-recursive.c:3526 +#: merge-recursive.c:3550 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "%u ancêtre commun trouvé :" msgstr[1] "%u ancêtres communs trouvés :" -#: merge-recursive.c:3565 +#: merge-recursive.c:3600 msgid "merge returned no commit" msgstr "la fusion n'a pas retourné de commit" -#: merge-recursive.c:3631 +#: merge-recursive.c:3659 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"Vos modifications locales aux fichiers suivants seraient écrasées par la " +"fusion :\n" +" %s" + +#: merge-recursive.c:3756 #, c-format msgid "Could not parse object '%s'" msgstr "Impossible d'analyser l'objet '%s'" -#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869 +#: merge-recursive.c:3774 builtin/merge.c:694 builtin/merge.c:874 msgid "Unable to write index." msgstr "Impossible d'écrire l'index." -#: midx.c:69 +#: midx.c:68 #, c-format msgid "multi-pack-index file %s is too small" msgstr "le fichier d'index multi-paquet %s est trop petit" -#: midx.c:85 +#: midx.c:84 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "" "la signature de l'index multi-paquet 0x%08x ne correspond pas à la signature " "0x%08x" -#: midx.c:90 +#: midx.c:89 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "la version d'index multi-paquet %d n'est pas reconnue" -#: midx.c:95 +#: midx.c:94 #, c-format msgid "hash version %u does not match" msgstr "la version %u du condensé ne correspond pas" -#: midx.c:109 +#: midx.c:108 msgid "invalid chunk offset (too large)" msgstr "décalage de section invalide (trop grand)" -#: midx.c:133 +#: midx.c:132 msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "" "identifiant de terminaison de tronçon d'index multi-paquet terminant " "apparaît plus tôt qu'attendu" -#: midx.c:146 +#: midx.c:145 msgid "multi-pack-index missing required pack-name chunk" msgstr "index multi-paquet manque de tronçon de nom de paquet" -#: midx.c:148 +#: midx.c:147 msgid "multi-pack-index missing required OID fanout chunk" msgstr "index multi-paquet manque de tronçon de d'étalement OID requis" -#: midx.c:150 +#: midx.c:149 msgid "multi-pack-index missing required OID lookup chunk" msgstr "index multi-paquet manque de tronçon de recherche OID" -#: midx.c:152 +#: midx.c:151 msgid "multi-pack-index missing required object offsets chunk" msgstr "index multi-paquet manque de tronçon de décalage d'objet" -#: midx.c:166 +#: midx.c:165 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "" "index multi-paquet les noms de paquets sont en désordre : '%s' avant '%s'" -#: midx.c:211 +#: midx.c:210 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "mauvais pack-int-id : %u (%u paquets au total)" -#: midx.c:261 +#: midx.c:260 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" "multi-pack-index stock un décalage en 64-bit, mais off_t est trop petit" -#: midx.c:289 +#: midx.c:288 msgid "error preparing packfile from multi-pack-index" msgstr "erreur à la préparation du fichier paquet depuis un index multi-paquet" -#: midx.c:470 +#: midx.c:469 #, c-format msgid "failed to add packfile '%s'" msgstr "échec de l'ajout du fichier paquet '%s'" -#: midx.c:476 +#: midx.c:475 #, c-format msgid "failed to open pack-index '%s'" msgstr "échec à l'ouverture du fichier paquet '%s'" -#: midx.c:536 +#: midx.c:535 #, c-format msgid "failed to locate object %d in packfile" msgstr "échec de localisation de l'objet %d dans le fichier paquet" -#: midx.c:865 +#: midx.c:864 #, c-format msgid "did not see pack-file %s to drop" msgstr "fichier paquet à éliminer %s non trouvé" -#: midx.c:1036 +#: midx.c:1035 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "échec du nettoyage de l'index de multi-paquet à %s" -#: midx.c:1091 +#: midx.c:1090 msgid "Looking for referenced packfiles" msgstr "Recherche de fichiers paquets référencés" -#: midx.c:1106 +#: midx.c:1105 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" @@ -4314,57 +4336,57 @@ msgstr "" "étalement oid en désordre : étalement[%d] = %<PRIx32> > %<PRIx32> = " "étalement[%d]" -#: midx.c:1110 +#: midx.c:1109 msgid "Verifying OID order in MIDX" msgstr "Vérification de l'ordre des OID dans MIDX" -#: midx.c:1119 +#: midx.c:1118 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "recherche d'oid en désordre : oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1138 +#: midx.c:1137 msgid "Sorting objects by packfile" msgstr "Classement des objets par fichier paquet" -#: midx.c:1144 +#: midx.c:1143 msgid "Verifying object offsets" msgstr "Vérification des décalages des objets" -#: midx.c:1160 +#: midx.c:1159 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "échec de la lecture de l'élément de cache pour oid[%d] = %s" -#: midx.c:1166 +#: midx.c:1165 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "impossible de lire le fichier paquet %s" -#: midx.c:1175 +#: midx.c:1174 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "décalage d'objet incorrect pour oid[%d] = %s : %<PRIx64> != %<PRIx64>" -#: midx.c:1350 +#: midx.c:1349 msgid "could not start pack-objects" msgstr "Impossible de démarrer le groupement d'objets" -#: midx.c:1369 +#: midx.c:1368 msgid "could not finish pack-objects" msgstr "Impossible de finir le groupement d'objets" -#: name-hash.c:532 +#: name-hash.c:537 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "impossible de créer le fil lazy_dir : %s" -#: name-hash.c:554 +#: name-hash.c:559 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "impossible de créer le fil lazy_name : %s" -#: name-hash.c:560 +#: name-hash.c:565 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "impossible de joindre le fil lazy_name : %s" @@ -4408,41 +4430,41 @@ msgstr "Refus de réécrire des notes dans %s (hors de refs/notes/)" msgid "Bad %s value: '%s'" msgstr "Mauvaise valeur de %s : '%s'" -#: object.c:54 +#: object.c:53 #, c-format msgid "invalid object type \"%s\"" msgstr "type d'objet invalide \"%s\"" -#: object.c:174 +#: object.c:173 #, c-format msgid "object %s is a %s, not a %s" msgstr "l'objet %s est de type %s, pas de type %s" -#: object.c:234 +#: object.c:233 #, c-format msgid "object %s has unknown type id %d" msgstr "l'objet %s a un id de type inconnu %d" -#: object.c:247 +#: object.c:246 #, c-format msgid "unable to parse object: %s" msgstr "impossible d'analyser l'objet : %s" -#: object.c:267 object.c:278 +#: object.c:266 object.c:277 #, c-format msgid "hash mismatch %s" msgstr "incohérence de hachage %s" -#: packfile.c:648 +#: packfile.c:641 msgid "offset before end of packfile (broken .idx?)" msgstr "offset avant la fin du fichier paquet (.idx cassé ?)" -#: packfile.c:1899 +#: packfile.c:1887 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "offset avant le début de l'index de paquet pour %s (index corrompu ?)" -#: packfile.c:1903 +#: packfile.c:1891 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" @@ -4488,26 +4510,26 @@ msgstr "option ambigüe : %s (devrait être --%s%s ou --%s%s)" msgid "did you mean `--%s` (with two dashes ?)" msgstr "vouliez-vous dire `--%s` (avec deux signes moins)?" -#: parse-options.c:859 +#: parse-options.c:860 #, c-format msgid "unknown option `%s'" msgstr "option inconnue « %s »" -#: parse-options.c:861 +#: parse-options.c:862 #, c-format msgid "unknown switch `%c'" msgstr "bascule inconnue « %c »" -#: parse-options.c:863 +#: parse-options.c:864 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "option non-ascii inconnue dans la chaîne : '%s'" -#: parse-options.c:887 +#: parse-options.c:888 msgid "..." msgstr "..." -#: parse-options.c:906 +#: parse-options.c:907 #, c-format msgid "usage: %s" msgstr "usage : %s" @@ -4515,21 +4537,21 @@ msgstr "usage : %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:912 +#: parse-options.c:913 #, c-format msgid " or: %s" msgstr " ou : %s" -#: parse-options.c:915 +#: parse-options.c:916 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:954 +#: parse-options.c:955 msgid "-NUM" msgstr "-NUM" -#: parse-options.c:968 +#: parse-options.c:969 #, c-format msgid "alias of --%s" msgstr "alias pour --%s" @@ -4704,29 +4726,38 @@ msgstr "impossible de créer le lstat en fil : %s" msgid "unable to parse --pretty format" msgstr "impossible d'analyser le format --pretty" -#: range-diff.c:70 +#: promisor-remote.c:25 +msgid "Remote with no URL" +msgstr "Dépôt distant sans URL" + +#: promisor-remote.c:61 +#, c-format +msgid "promisor remote name cannot begin with '/': %s" +msgstr "un nom de prometteur distant ne peut pas commencer par '/' : %s" + +#: range-diff.c:71 msgid "could not start `log`" msgstr "impossible de démarrer `log`" -#: range-diff.c:72 +#: range-diff.c:73 msgid "could not read `log` output" msgstr "impossible de lire la sortie de `log`" -#: range-diff.c:91 sequencer.c:5021 +#: range-diff.c:92 sequencer.c:4985 #, c-format msgid "could not parse commit '%s'" msgstr "impossible d'analyser le commit '%s'" -#: range-diff.c:117 +#: range-diff.c:118 #, c-format msgid "could not parse git header '%.*s'" msgstr "impossible d'analyser l'entête git '%.*s'" -#: range-diff.c:274 +#: range-diff.c:275 msgid "failed to generate diff" msgstr "échec de la génération de diff" -#: range-diff.c:506 range-diff.c:508 +#: range-diff.c:507 range-diff.c:509 #, c-format msgid "could not parse log for '%s'" msgstr "impossible d'analyser le journal pour '%s'" @@ -4772,11 +4803,11 @@ msgstr "fstat de '%s' impossible" msgid "'%s' appears as both a file and as a directory" msgstr "'%s' existe à la fois comme un fichier et un répertoire" -#: read-cache.c:1499 +#: read-cache.c:1520 msgid "Refresh index" msgstr "Rafraîchir l'index" -#: read-cache.c:1613 +#: read-cache.c:1635 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -4785,7 +4816,7 @@ msgstr "" "version d'index renseignée, mais la valeur est invalide.\n" "Utilisation de la version %i" -#: read-cache.c:1623 +#: read-cache.c:1645 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -4794,138 +4825,138 @@ msgstr "" "GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n" "Utilisation de la version %i" -#: read-cache.c:1679 +#: read-cache.c:1701 #, c-format msgid "bad signature 0x%08x" msgstr "signature incorrecte 0x%08x" -#: read-cache.c:1682 +#: read-cache.c:1704 #, c-format msgid "bad index version %d" msgstr "mauvaise version d'index %d" -#: read-cache.c:1691 +#: read-cache.c:1713 msgid "bad index file sha1 signature" msgstr "mauvaise signature sha1 d'index" -#: read-cache.c:1721 +#: read-cache.c:1743 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "l'index utilise l'extension %.4s qui n'est pas comprise" -#: read-cache.c:1723 +#: read-cache.c:1745 #, c-format msgid "ignoring %.4s extension" msgstr "extension %.4s ignorée" -#: read-cache.c:1760 +#: read-cache.c:1782 #, c-format msgid "unknown index entry format 0x%08x" msgstr "format d'entrée d'index inconnu 0x%08x" -#: read-cache.c:1776 +#: read-cache.c:1798 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "champ de nom malformé dans l'index, près du chemin '%s'" -#: read-cache.c:1833 +#: read-cache.c:1855 msgid "unordered stage entries in index" msgstr "entrées de préparation non ordonnées dans l'index" -#: read-cache.c:1836 +#: read-cache.c:1858 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "entrées multiples de préparation pour le fichier fusionné '%s'" -#: read-cache.c:1839 +#: read-cache.c:1861 #, c-format msgid "unordered stage entries for '%s'" msgstr "entrées de préparation non ordonnées pour '%s'" -#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111 -#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467 -#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347 +#: read-cache.c:1967 read-cache.c:2255 rerere.c:565 rerere.c:599 rerere.c:1111 +#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:468 +#: builtin/checkout.c:652 builtin/clean.c:967 builtin/commit.c:347 #: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145 #: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330 msgid "index file corrupt" msgstr "fichier d'index corrompu" -#: read-cache.c:2087 +#: read-cache.c:2108 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "impossible de créer le fil load_cache_entries : %s" -#: read-cache.c:2100 +#: read-cache.c:2121 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "impossible de joindre le fil load_cach_entries : %s" -#: read-cache.c:2133 +#: read-cache.c:2154 #, c-format msgid "%s: index file open failed" msgstr "%s : l'ouverture du fichier d'index a échoué" -#: read-cache.c:2137 +#: read-cache.c:2158 #, c-format msgid "%s: cannot stat the open index" msgstr "%s : impossible de faire un stat sur l'index ouvert" -#: read-cache.c:2141 +#: read-cache.c:2162 #, c-format msgid "%s: index file smaller than expected" msgstr "%s : fichier d'index plus petit qu'attendu" -#: read-cache.c:2145 +#: read-cache.c:2166 #, c-format msgid "%s: unable to map index file" msgstr "%s : impossible de mapper le fichier d'index" -#: read-cache.c:2187 +#: read-cache.c:2208 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "impossible de créer le fil load_index_extensions : %s" -#: read-cache.c:2214 +#: read-cache.c:2235 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "impossible de joindre le fil load_index_extensions : %s" -#: read-cache.c:2246 +#: read-cache.c:2267 #, c-format msgid "could not freshen shared index '%s'" msgstr "impossible de rafraîchir l'index partagé '%s'" -#: read-cache.c:2293 +#: read-cache.c:2314 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "index cassé, %s attendu dans %s, %s obtenu" -#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114 +#: read-cache.c:3010 wrapper.c:622 builtin/merge.c:1119 #, c-format msgid "could not close '%s'" msgstr "impossible de fermer '%s'" -#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928 +#: read-cache.c:3113 sequencer.c:2296 sequencer.c:3917 #, c-format msgid "could not stat '%s'" msgstr "stat impossible de '%s'" -#: read-cache.c:3105 +#: read-cache.c:3126 #, c-format msgid "unable to open git dir: %s" msgstr "impossible d'ouvrir le répertoire git : %s" -#: read-cache.c:3117 +#: read-cache.c:3138 #, c-format msgid "unable to unlink: %s" msgstr "échec lors de l'unlink : %s" -#: read-cache.c:3142 +#: read-cache.c:3163 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "impossible de régler les bits de droit de '%s'" -#: read-cache.c:3291 +#: read-cache.c:3312 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s : impossible de revenir à l'étape 0" @@ -5032,8 +5063,8 @@ msgstr "" msgid "Note that empty commits are commented out" msgstr "Veuillez noter que les commits vides sont en commentaire" -#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447 -#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235 +#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3388 +#: sequencer.c:3414 sequencer.c:5084 builtin/fsck.c:356 builtin/rebase.c:235 #, c-format msgid "could not write '%s'" msgstr "impossible d'écrire '%s'" @@ -5080,7 +5111,7 @@ msgstr "%s ne pointe pas sur un objet valide!" msgid "ignoring dangling symref %s" msgstr "symref pendant %s ignoré" -#: refs.c:669 ref-filter.c:2092 +#: refs.c:669 ref-filter.c:2098 #, c-format msgid "ignoring broken ref %s" msgstr "réf cassé %s ignoré" @@ -5105,14 +5136,14 @@ msgstr "la référence '%s' existe déjà" msgid "unexpected object ID when writing '%s'" msgstr "id d'objet inattendu pendant l'écriture de '%s'" -#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913 -#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656 +#: refs.c:833 sequencer.c:403 sequencer.c:2647 sequencer.c:2851 +#: sequencer.c:2865 sequencer.c:3122 sequencer.c:5001 wrapper.c:620 #, c-format msgid "could not write to '%s'" msgstr "impossible d'écrire dans '%s'" -#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715 -#: builtin/rebase.c:1003 +#: refs.c:860 wrapper.c:188 wrapper.c:358 builtin/am.c:714 +#: builtin/rebase.c:1004 #, c-format msgid "could not open '%s' for writing" msgstr "impossible d'ouvrir '%s' en écriture" @@ -5147,21 +5178,21 @@ msgstr "refus de mettre à jour une réf avec un nom cassé '%s'" msgid "update_ref failed for ref '%s': %s" msgstr "échec de update_ref pour la réf '%s' : %s" -#: refs.c:2012 +#: refs.c:2023 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "mises à jour multiples pour la réf '%s' non permises" -#: refs.c:2044 +#: refs.c:2055 msgid "ref updates forbidden inside quarantine environment" msgstr "mises à jour des références interdites en environnement de quarantaine" -#: refs.c:2140 refs.c:2170 +#: refs.c:2151 refs.c:2181 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "'%s' existe ; impossible de créer '%s'" -#: refs.c:2146 refs.c:2181 +#: refs.c:2157 refs.c:2192 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "impossible de traiter '%s' et '%s' en même temps" @@ -5171,13 +5202,13 @@ msgstr "impossible de traiter '%s' et '%s' en même temps" msgid "could not remove reference %s" msgstr "impossible de supprimer la référence %s" -#: refs/files-backend.c:1248 refs/packed-backend.c:1532 -#: refs/packed-backend.c:1542 +#: refs/files-backend.c:1248 refs/packed-backend.c:1541 +#: refs/packed-backend.c:1551 #, c-format msgid "could not delete reference %s: %s" msgstr "Impossible de supprimer la référence %s : %s" -#: refs/files-backend.c:1251 refs/packed-backend.c:1545 +#: refs/files-backend.c:1251 refs/packed-backend.c:1554 #, c-format msgid "could not delete references: %s" msgstr "impossible de supprimer les références : %s" @@ -5188,7 +5219,7 @@ msgid "invalid refspec '%s'" msgstr "spécificateur de réference invalide : '%s'" # à priori on parle d'une branche ici -#: ref-filter.c:42 wt-status.c:1934 +#: ref-filter.c:42 wt-status.c:1938 msgid "gone" msgstr "disparue" @@ -5207,283 +5238,283 @@ msgstr "en retard de %d" msgid "ahead %d, behind %d" msgstr "en avance de %d, en retard de %d" -#: ref-filter.c:162 +#: ref-filter.c:165 #, c-format msgid "expected format: %%(color:<color>)" msgstr "format attendu : %%(color:<couleur>)" -#: ref-filter.c:164 +#: ref-filter.c:167 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "couleur non reconnue : %%(color:%s)" -#: ref-filter.c:186 +#: ref-filter.c:189 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Valeur entière attendue refname:lstrip=%s" -#: ref-filter.c:190 +#: ref-filter.c:193 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Valeur entière attendue refname:rstrip=%s" -#: ref-filter.c:192 +#: ref-filter.c:195 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "argument %%(%s) non reconnu : %s" -#: ref-filter.c:247 +#: ref-filter.c:250 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) n'accepte pas d'argument" -#: ref-filter.c:269 +#: ref-filter.c:272 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "argument %%(objectsize) non reconnu : %s" -#: ref-filter.c:277 +#: ref-filter.c:280 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) n'accepte pas d'argument" -#: ref-filter.c:289 +#: ref-filter.c:292 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) n'accepte pas d'argument" -#: ref-filter.c:298 +#: ref-filter.c:301 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) n'accepte pas d'argument" -#: ref-filter.c:320 +#: ref-filter.c:323 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "argument %%(trailers) inconnu : %s" -#: ref-filter.c:349 +#: ref-filter.c:352 #, c-format msgid "positive value expected contents:lines=%s" msgstr "valeur positive attendue contents:lines=%s" -#: ref-filter.c:351 +#: ref-filter.c:354 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "argument %%(contents) non reconnu : %s" -#: ref-filter.c:366 +#: ref-filter.c:369 #, c-format msgid "positive value expected objectname:short=%s" msgstr "valeur positive attendue objectname:short=%s" -#: ref-filter.c:370 +#: ref-filter.c:373 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "argument %%(objectname) non reconnu : %s" -#: ref-filter.c:400 +#: ref-filter.c:403 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "format attendu : %%(align:<largeur>,<position>)" -#: ref-filter.c:412 +#: ref-filter.c:415 #, c-format msgid "unrecognized position:%s" msgstr "position non reconnue : %s" -#: ref-filter.c:419 +#: ref-filter.c:422 #, c-format msgid "unrecognized width:%s" msgstr "largeur non reconnue : %s" -#: ref-filter.c:428 +#: ref-filter.c:431 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "argument %%(align) non reconnu : %s" -#: ref-filter.c:436 +#: ref-filter.c:439 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "valeur positive attendue avec l'atome %%(align)" -#: ref-filter.c:454 +#: ref-filter.c:457 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "argument %%(if) non reconnu : %s" -#: ref-filter.c:556 +#: ref-filter.c:559 #, c-format msgid "malformed field name: %.*s" msgstr "nom de champ malformé %.*s" -#: ref-filter.c:583 +#: ref-filter.c:586 #, c-format msgid "unknown field name: %.*s" msgstr "nom de champ inconnu : %.*s" -#: ref-filter.c:587 +#: ref-filter.c:590 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "" "pas un dépôt git, mais le champ '%.*s' nécessite l'accès aux données d'objet" -#: ref-filter.c:711 +#: ref-filter.c:714 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "format : atome %%(if) utilisé sans un atome %%(then)" -#: ref-filter.c:774 +#: ref-filter.c:777 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "format : atome %%(then) utilisé sans un atome %%(if)" -#: ref-filter.c:776 +#: ref-filter.c:779 #, c-format msgid "format: %%(then) atom used more than once" msgstr "format : atome %%(then) utilisé plus d'une fois" -#: ref-filter.c:778 +#: ref-filter.c:781 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "format: atome %%(then) utilisé après %%(else)" -#: ref-filter.c:806 +#: ref-filter.c:809 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "format : atome %%(else) utilisé sans un atome %%(if)" -#: ref-filter.c:808 +#: ref-filter.c:811 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "format : atome %%(else) utilisé sans un atome %%(then)" -#: ref-filter.c:810 +#: ref-filter.c:813 #, c-format msgid "format: %%(else) atom used more than once" msgstr "format : atome %%(else) utilisé plus d'une fois" -#: ref-filter.c:825 +#: ref-filter.c:828 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "format : atome %%(end) utilisé sans atome correspondant" -#: ref-filter.c:882 +#: ref-filter.c:885 #, c-format msgid "malformed format string %s" msgstr "Chaîne de formatage mal formée %s" -#: ref-filter.c:1485 +#: ref-filter.c:1488 #, c-format msgid "no branch, rebasing %s" msgstr "aucune branche, rebasage de %s" -#: ref-filter.c:1488 +#: ref-filter.c:1491 #, c-format msgid "no branch, rebasing detached HEAD %s" msgstr "aucune branche, rebasage de la HEAD détachée %s" -#: ref-filter.c:1491 +#: ref-filter.c:1494 #, c-format msgid "no branch, bisect started on %s" msgstr "aucune branche, bisect a démarré sur %s" -#: ref-filter.c:1501 +#: ref-filter.c:1504 msgid "no branch" msgstr "aucune branche" -#: ref-filter.c:1537 ref-filter.c:1743 +#: ref-filter.c:1540 ref-filter.c:1749 #, c-format msgid "missing object %s for %s" msgstr "objet manquant %s pour %s" -#: ref-filter.c:1547 +#: ref-filter.c:1550 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "échec de parse_object_buffer sur %s pour %s" -#: ref-filter.c:1998 +#: ref-filter.c:2004 #, c-format msgid "malformed object at '%s'" msgstr "objet malformé à '%s'" -#: ref-filter.c:2087 +#: ref-filter.c:2093 #, c-format msgid "ignoring ref with broken name %s" msgstr "réf avec un nom cassé %s ignoré" -#: ref-filter.c:2382 +#: ref-filter.c:2389 #, c-format msgid "format: %%(end) atom missing" msgstr "format: atome %%(end) manquant" -#: ref-filter.c:2482 +#: ref-filter.c:2489 #, c-format msgid "option `%s' is incompatible with --merged" msgstr "l'option « %s » est incompatible avec --merged" -#: ref-filter.c:2485 +#: ref-filter.c:2492 #, c-format msgid "option `%s' is incompatible with --no-merged" msgstr "l'option « %s » est incompatible avec --no-merged" -#: ref-filter.c:2495 +#: ref-filter.c:2502 #, c-format msgid "malformed object name %s" msgstr "nom d'objet malformé %s" -#: ref-filter.c:2500 +#: ref-filter.c:2507 #, c-format msgid "option `%s' must point to a commit" msgstr "l'option '%s' doit pointer sur un commit" -#: remote.c:363 +#: remote.c:366 #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "" "un raccourci de configuration de distant ne peut pas commencer par '/' : %s" -#: remote.c:410 +#: remote.c:413 msgid "more than one receivepack given, using the first" msgstr "plus d'un receivepack fournis, utilisation du premier" -#: remote.c:418 +#: remote.c:421 msgid "more than one uploadpack given, using the first" msgstr "plus d'un uploadpack fournis, utilisation du premier" -#: remote.c:608 +#: remote.c:611 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Impossible de récupérer à la fois %s et %s pour %s" -#: remote.c:612 +#: remote.c:615 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s suit habituellement %s, pas %s" -#: remote.c:616 +#: remote.c:619 #, c-format msgid "%s tracks both %s and %s" msgstr "%s suit à la fois %s et %s" -#: remote.c:684 +#: remote.c:687 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "la clé '%s' du modèle n'a pas de '*'" -#: remote.c:694 +#: remote.c:697 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "la valeur '%s' du modèle n'a pas de '*'" -#: remote.c:1000 +#: remote.c:1003 #, c-format msgid "src refspec %s does not match any" msgstr "" "le spécificateur de référence source %s ne correspond à aucune référence" -#: remote.c:1005 +#: remote.c:1008 #, c-format msgid "src refspec %s matches more than one" msgstr "" @@ -5493,7 +5524,7 @@ msgstr "" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1020 +#: remote.c:1023 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -5517,7 +5548,7 @@ msgstr "" "Aucune n'a fonctionné, donc abandon. Veuillez spécifier une référence " "totalement qualifiée." -#: remote.c:1040 +#: remote.c:1043 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -5528,7 +5559,7 @@ msgstr "" "Souhaitiez-vous créer une nouvelle branche en poussant sur\n" "'%s:refs/heads/%s' ?" -#: remote.c:1045 +#: remote.c:1048 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -5539,7 +5570,7 @@ msgstr "" "Souhaitiez-vous créer une nouvelle étiquette en poussant sur\n" "'%s:refs/tags/%s' ?" -#: remote.c:1050 +#: remote.c:1053 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -5550,7 +5581,7 @@ msgstr "" "Souhaitiez-vous créer un nouvel arbre en poussant sur\n" "'%s:refs/tags/%s' ?" -#: remote.c:1055 +#: remote.c:1058 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -5561,119 +5592,119 @@ msgstr "" "Souhaitiez-vous créer un nouveau blob en poussant sur\n" "'%s:refs/tags/%s' ?" -#: remote.c:1091 +#: remote.c:1094 #, c-format msgid "%s cannot be resolved to branch" msgstr "'%s' ne peut pas être résolue comme une branche" -#: remote.c:1102 +#: remote.c:1105 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "suppression d '%s' impossible : la référence distante n'existe pas" -#: remote.c:1114 +#: remote.c:1117 #, c-format msgid "dst refspec %s matches more than one" msgstr "" "le spécificateur de référence dst %s correspond à plus d'un spécificateur de " "références" -#: remote.c:1121 +#: remote.c:1124 #, c-format msgid "dst ref %s receives from more than one src" msgstr "le spécificateur de référence dst %s reçoit depuis plus d'une source" -#: remote.c:1624 remote.c:1725 +#: remote.c:1627 remote.c:1728 msgid "HEAD does not point to a branch" msgstr "HEAD ne pointe pas sur une branche" -#: remote.c:1633 +#: remote.c:1636 #, c-format msgid "no such branch: '%s'" msgstr "pas de branche '%s'" -#: remote.c:1636 +#: remote.c:1639 #, c-format msgid "no upstream configured for branch '%s'" msgstr "aucune branche amont configurée pour la branche '%s'" -#: remote.c:1642 +#: remote.c:1645 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "la branche amont '%s' n'est pas stockée comme branche de suivi" -#: remote.c:1657 +#: remote.c:1660 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "la destination de poussée '%s' sur le serveur distant '%s' n'a pas de " "branche locale de suivi" -#: remote.c:1669 +#: remote.c:1672 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "la branche '%s' n'a aucune branche distante de poussée" -#: remote.c:1679 +#: remote.c:1682 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "les références de spec pour '%s' n'incluent pas '%s'" -#: remote.c:1692 +#: remote.c:1695 msgid "push has no destination (push.default is 'nothing')" msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')" -#: remote.c:1714 +#: remote.c:1717 msgid "cannot resolve 'simple' push to a single destination" msgstr "" "impossible de résoudre une poussée 'simple' pour une destination unique" -#: remote.c:1840 +#: remote.c:1843 #, c-format msgid "couldn't find remote ref %s" msgstr "impossible de trouver la référence distante %s" -#: remote.c:1853 +#: remote.c:1856 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "* Référence bizarre '%s' ignorée localement" -#: remote.c:2016 +#: remote.c:2019 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Votre branche est basée sur '%s', mais la branche amont a disparu.\n" -#: remote.c:2020 +#: remote.c:2023 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n" -#: remote.c:2023 +#: remote.c:2026 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Votre branche est à jour avec '%s'.\n" -#: remote.c:2027 +#: remote.c:2030 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "Votre branche et '%s' font référence à des commits différents.\n" -#: remote.c:2030 +#: remote.c:2033 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (utilisez \"%s\" pour plus de détails)\n" -#: remote.c:2034 +#: remote.c:2037 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Votre branche est en avance sur '%s' de %d commit.\n" msgstr[1] "Votre branche est en avance sur '%s' de %d commits.\n" -#: remote.c:2040 +#: remote.c:2043 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n" -#: remote.c:2043 +#: remote.c:2046 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -5685,11 +5716,11 @@ msgstr[1] "" "Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour " "en avance rapide.\n" -#: remote.c:2051 +#: remote.c:2054 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (utilisez \"git pull\" pour mettre à jour votre branche locale)\n" -#: remote.c:2054 +#: remote.c:2057 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -5704,12 +5735,12 @@ msgstr[1] "" "Votre branche et '%s' ont divergé,\n" "et ont %d et %d commits différents chacune respectivement.\n" -#: remote.c:2064 +#: remote.c:2067 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" " (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n" -#: remote.c:2247 +#: remote.c:2250 #, c-format msgid "cannot parse expected object name '%s'" msgstr "impossible d'analyser le nom attendu d'objet '%s'" @@ -5787,7 +5818,7 @@ msgstr "impossible de délier '%s' qui est errant" msgid "Recorded preimage for '%s'" msgstr "Pré-image enregistrée pour '%s'" -#: rerere.c:881 submodule.c:2023 builtin/log.c:1773 +#: rerere.c:881 submodule.c:2023 builtin/log.c:1790 #: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 #, c-format msgid "could not create directory '%s'" @@ -5822,20 +5853,20 @@ msgstr "Résolution pour '%s' oubliée\n" msgid "unable to open rr-cache directory" msgstr "impossible d'ouvrir le répertoire rr-cache" -#: revision.c:2507 +#: revision.c:2509 msgid "your current branch appears to be broken" msgstr "votre branche actuelle semble cassée" -#: revision.c:2510 +#: revision.c:2512 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "votre branche actuelle '%s' ne contient encore aucun commit" -#: revision.c:2710 +#: revision.c:2720 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent est incompatible avec --bisect" -#: revision.c:2714 +#: revision.c:2724 msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L ne supporte pas encore les formats de diff autres que -p et -s" @@ -5858,31 +5889,31 @@ msgstr "" "Vous pouvez désactiver cet avertissement avec `git config advice.ignoredHook " "false`." -#: send-pack.c:141 +#: send-pack.c:142 msgid "unexpected flush packet while reading remote unpack status" msgstr "" "paquet de nettoyage inattendu pendant la lecture de l'état de dépaquetage " "distant" -#: send-pack.c:143 +#: send-pack.c:144 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "impossible d'analyser l'état de dépaquetage distant : %s" -#: send-pack.c:145 +#: send-pack.c:146 #, c-format msgid "remote unpack failed: %s" msgstr "le dépaquetage a échoué : %s" -#: send-pack.c:306 +#: send-pack.c:307 msgid "failed to sign the push certificate" msgstr "impossible de signer le certificat de poussée" -#: send-pack.c:420 +#: send-pack.c:421 msgid "the receiving end does not support --signed push" msgstr "Le receveur ne gère pas les poussées avec --signed" -#: send-pack.c:422 +#: send-pack.c:423 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -5890,11 +5921,11 @@ msgstr "" "pas d'envoi de certificat de poussée car le receveur ne gère pas les " "poussées avec --signed" -#: send-pack.c:434 +#: send-pack.c:435 msgid "the receiving end does not support --atomic push" msgstr "Le receveur ne gère pas les poussées avec --atomic" -#: send-pack.c:439 +#: send-pack.c:440 msgid "the receiving end does not support push options" msgstr "Le receveur ne gère pas les options de poussées" @@ -5908,7 +5939,7 @@ msgstr "mode de nettoyage invalide de message de validation '%s'" msgid "could not delete '%s'" msgstr "Impossible de supprimer '%s'" -#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369 +#: sequencer.c:311 builtin/rebase.c:760 builtin/rebase.c:1676 builtin/rm.c:369 #, c-format msgid "could not remove '%s'" msgstr "impossible de supprimer '%s'" @@ -5948,7 +5979,7 @@ msgstr "" "avec 'git add <chemins>' ou 'git rm <chemins>'\n" "puis validez le résultat avec 'git commit'" -#: sequencer.c:401 sequencer.c:2909 +#: sequencer.c:401 sequencer.c:2847 #, c-format msgid "could not lock '%s'" msgstr "impossible de verrouiller '%s'" @@ -5958,15 +5989,15 @@ msgstr "impossible de verrouiller '%s'" msgid "could not write eol to '%s'" msgstr "impossible d'écrire la fin de ligne dans '%s'" -#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929 -#: sequencer.c:3192 +#: sequencer.c:413 sequencer.c:2652 sequencer.c:2853 sequencer.c:2867 +#: sequencer.c:3130 #, c-format msgid "failed to finalize '%s'" msgstr "échec lors de la finalisation de '%s'" -#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734 -#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763 -#: builtin/merge.c:1112 builtin/rebase.c:567 +#: sequencer.c:436 sequencer.c:1585 sequencer.c:2672 sequencer.c:3112 +#: sequencer.c:3221 builtin/am.c:244 builtin/commit.c:763 builtin/merge.c:1117 +#: builtin/rebase.c:568 #, c-format msgid "could not read '%s'" msgstr "impossible de lire '%s'" @@ -5993,70 +6024,65 @@ msgstr "Mode de nettoyage invalide %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:632 +#: sequencer.c:631 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Impossible d'écrire le nouveau fichier index" -#: sequencer.c:649 +#: sequencer.c:648 msgid "unable to update cache tree" msgstr "impossible de mettre à jour l'arbre de cache" -#: sequencer.c:663 +#: sequencer.c:662 msgid "could not resolve HEAD commit" msgstr "impossible de résoudre le commit HEAD" -#: sequencer.c:743 +#: sequencer.c:742 #, c-format msgid "no key present in '%.*s'" msgstr "aucune clé présente dans '%.*s'" -#: sequencer.c:754 +#: sequencer.c:753 #, c-format msgid "unable to dequote value of '%s'" msgstr "Impossible de décoter la valeur de '%s'" -#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706 -#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045 +#: sequencer.c:790 wrapper.c:190 wrapper.c:360 builtin/am.c:705 +#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1046 #, c-format msgid "could not open '%s' for reading" msgstr "impossible d'ouvrir '%s' en lecture" -#: sequencer.c:801 +#: sequencer.c:800 msgid "'GIT_AUTHOR_NAME' already given" msgstr "'GIT_AUTHOR_NAME' déjà fourni" -#: sequencer.c:806 +#: sequencer.c:805 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "'GIT_AUTHOR_EMAIL' déjà fourni" -#: sequencer.c:811 +#: sequencer.c:810 msgid "'GIT_AUTHOR_DATE' already given" msgstr "'GIT_AUTHOR_DATE' déjà fourni" -#: sequencer.c:815 +#: sequencer.c:814 #, c-format msgid "unknown variable '%s'" msgstr "variable inconnue '%s'" -#: sequencer.c:820 +#: sequencer.c:819 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "'GIT_AUTHOR_NAME' manquant" -#: sequencer.c:822 +#: sequencer.c:821 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "'GIT_AUTHOR_EMAIL' manquant" -#: sequencer.c:824 +#: sequencer.c:823 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "'GIT_AUTHOR_DATE' manquant" -#: sequencer.c:884 -#, c-format -msgid "invalid date format '%s' in '%s'" -msgstr "format de date invalide '%s' dans '%s'" - -#: sequencer.c:901 +#: sequencer.c:872 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -6085,15 +6111,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:995 -msgid "writing root commit" -msgstr "écriture du commit racine" - -#: sequencer.c:1216 +#: sequencer.c:1146 msgid "'prepare-commit-msg' hook failed" msgstr "échec du crochet 'prepare-commit-msg'" -#: sequencer.c:1223 +#: sequencer.c:1153 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6122,7 +6144,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1236 +#: sequencer.c:1166 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6148,326 +6170,326 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1278 +#: sequencer.c:1208 msgid "couldn't look up newly created commit" msgstr "impossible de retrouver le commit nouvellement créé" -#: sequencer.c:1280 +#: sequencer.c:1210 msgid "could not parse newly created commit" msgstr "impossible d'analyser le commit nouvellement créé" -#: sequencer.c:1326 +#: sequencer.c:1256 msgid "unable to resolve HEAD after creating commit" msgstr "impossible de résoudre HEAD après création du commit" -#: sequencer.c:1328 +#: sequencer.c:1258 msgid "detached HEAD" msgstr "HEAD détachée" -#: sequencer.c:1332 +#: sequencer.c:1262 msgid " (root-commit)" msgstr " (commit racine)" -#: sequencer.c:1353 +#: sequencer.c:1283 msgid "could not parse HEAD" msgstr "impossible de lire HEAD" -#: sequencer.c:1355 +#: sequencer.c:1285 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s n'est pas un commit !" -#: sequencer.c:1359 builtin/commit.c:1571 +#: sequencer.c:1289 builtin/commit.c:1571 msgid "could not parse HEAD commit" msgstr "impossible d'analyser le commit HEAD" -#: sequencer.c:1411 sequencer.c:2004 +#: sequencer.c:1341 sequencer.c:1933 msgid "unable to parse commit author" msgstr "impossible d'analyser l'auteur du commit" -#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684 +#: sequencer.c:1352 builtin/am.c:1561 builtin/merge.c:684 msgid "git write-tree failed to write a tree" msgstr "git write-tree a échoué à écrire un arbre" -#: sequencer.c:1438 sequencer.c:1499 +#: sequencer.c:1369 sequencer.c:1429 #, c-format msgid "unable to read commit message from '%s'" msgstr "impossible de lire le message de validation de '%s'" -#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878 -#: builtin/merge.c:903 +#: sequencer.c:1396 builtin/am.c:1583 builtin/commit.c:1670 builtin/merge.c:883 +#: builtin/merge.c:908 msgid "failed to write commit object" msgstr "échec de l'écriture de l'objet commit" -#: sequencer.c:1526 +#: sequencer.c:1456 #, c-format msgid "could not parse commit %s" msgstr "impossible d'analyser le commit %s" -#: sequencer.c:1531 +#: sequencer.c:1461 #, c-format msgid "could not parse parent commit %s" msgstr "impossible d'analyser le commit parent %s" -#: sequencer.c:1605 sequencer.c:1715 +#: sequencer.c:1535 sequencer.c:1645 #, c-format msgid "unknown command: %d" msgstr "commande inconnue : %d" -#: sequencer.c:1662 sequencer.c:1687 +#: sequencer.c:1592 sequencer.c:1617 #, c-format msgid "This is a combination of %d commits." msgstr "Ceci est la combinaison de %d commits." -#: sequencer.c:1672 +#: sequencer.c:1602 msgid "need a HEAD to fixup" msgstr "une HEAD est nécessaire à la correction" -#: sequencer.c:1674 sequencer.c:3219 +#: sequencer.c:1604 sequencer.c:3157 msgid "could not read HEAD" msgstr "Impossible de lire HEAD" -#: sequencer.c:1676 +#: sequencer.c:1606 msgid "could not read HEAD's commit message" msgstr "impossible de lire le message de validation de HEAD" -#: sequencer.c:1682 +#: sequencer.c:1612 #, c-format msgid "cannot write '%s'" msgstr "impossible d'écrire '%s'" -#: sequencer.c:1689 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1619 git-rebase--preserve-merges.sh:496 msgid "This is the 1st commit message:" msgstr "Ceci est le premier message de validation :" -#: sequencer.c:1697 +#: sequencer.c:1627 #, c-format msgid "could not read commit message of %s" msgstr "impossible de lire le message de validation de %s" -#: sequencer.c:1704 +#: sequencer.c:1634 #, c-format msgid "This is the commit message #%d:" msgstr "Ceci est le message de validation numéro %d :" -#: sequencer.c:1710 +#: sequencer.c:1640 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Le message de validation %d sera ignoré :" -#: sequencer.c:1798 +#: sequencer.c:1728 msgid "your index file is unmerged." msgstr "votre fichier d'index n'est pas fusionné." -#: sequencer.c:1805 +#: sequencer.c:1735 msgid "cannot fixup root commit" msgstr "impossible de réparer le commit racine" -#: sequencer.c:1824 +#: sequencer.c:1754 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "le commit %s est une fusion mais l'option -m n'a pas été spécifiée." -#: sequencer.c:1832 sequencer.c:1840 +#: sequencer.c:1762 sequencer.c:1770 #, c-format msgid "commit %s does not have parent %d" msgstr "le commit %s n'a pas de parent %d" -#: sequencer.c:1846 +#: sequencer.c:1776 #, c-format msgid "cannot get commit message for %s" msgstr "impossible d'obtenir un message de validation pour %s" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1865 +#: sequencer.c:1795 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s : impossible d'analyser le commit parent %s" -#: sequencer.c:1930 +#: sequencer.c:1860 #, c-format msgid "could not rename '%s' to '%s'" msgstr "impossible de renommer '%s' en '%s'" -#: sequencer.c:1985 +#: sequencer.c:1915 #, c-format msgid "could not revert %s... %s" msgstr "impossible d'annuler %s... %s" -#: sequencer.c:1986 +#: sequencer.c:1916 #, c-format msgid "could not apply %s... %s" msgstr "impossible d'appliquer %s... %s" -#: sequencer.c:2045 +#: sequencer.c:1983 #, c-format msgid "git %s: failed to read the index" msgstr "git %s : échec à la lecture de l'index" -#: sequencer.c:2052 +#: sequencer.c:1990 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s : échec du rafraîchissement de l'index" -#: sequencer.c:2128 +#: sequencer.c:2066 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s n'accepte pas d'argument : '%s'" -#: sequencer.c:2137 +#: sequencer.c:2075 #, c-format msgid "missing arguments for %s" msgstr "argument manquant pour %s" -#: sequencer.c:2174 +#: sequencer.c:2112 #, c-format msgid "could not parse '%.*s'" msgstr "impossible d'analyser '%.*s'" -#: sequencer.c:2228 +#: sequencer.c:2166 #, c-format msgid "invalid line %d: %.*s" msgstr "ligne %d invalide : %.*s" -#: sequencer.c:2239 +#: sequencer.c:2177 #, c-format msgid "cannot '%s' without a previous commit" msgstr "'%s' impossible avec le commit précédent" -#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178 +#: sequencer.c:2225 builtin/rebase.c:153 builtin/rebase.c:178 #: builtin/rebase.c:204 builtin/rebase.c:229 #, c-format msgid "could not read '%s'." msgstr "impossible de lire '%s'." -#: sequencer.c:2323 +#: sequencer.c:2261 msgid "cancelling a cherry picking in progress" msgstr "annulation d'un picorage en cours" -#: sequencer.c:2330 +#: sequencer.c:2268 msgid "cancelling a revert in progress" msgstr "annulation d'un retour en cours" -#: sequencer.c:2364 +#: sequencer.c:2302 msgid "please fix this using 'git rebase --edit-todo'." msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'." -#: sequencer.c:2366 +#: sequencer.c:2304 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "feuille d'instruction inutilisable : '%s'" -#: sequencer.c:2371 +#: sequencer.c:2309 msgid "no commits parsed." msgstr "aucun commit analysé." -#: sequencer.c:2382 +#: sequencer.c:2320 msgid "cannot cherry-pick during a revert." msgstr "impossible de picorer pendant l'annulation d'un commit." -#: sequencer.c:2384 +#: sequencer.c:2322 msgid "cannot revert during a cherry-pick." msgstr "impossible d'annuler un commit pendant un picorage." -#: sequencer.c:2466 +#: sequencer.c:2404 #, c-format msgid "invalid value for %s: %s" msgstr "valeur invalide pour %s : %s" -#: sequencer.c:2553 +#: sequencer.c:2491 msgid "unusable squash-onto" msgstr "\"écrase-sur\" inutilisable" -#: sequencer.c:2569 +#: sequencer.c:2507 #, c-format msgid "malformed options sheet: '%s'" msgstr "feuille d'options malformée : %s" -#: sequencer.c:2652 sequencer.c:4351 +#: sequencer.c:2590 sequencer.c:4308 msgid "empty commit set passed" msgstr "l'ensemble de commits spécifié est vide" -#: sequencer.c:2668 +#: sequencer.c:2606 msgid "revert is already in progress" msgstr "un retour est déjà en cours" -#: sequencer.c:2670 +#: sequencer.c:2608 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "essayez \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:2673 +#: sequencer.c:2611 msgid "cherry-pick is already in progress" msgstr "un picorage est déjà en cours" -#: sequencer.c:2675 +#: sequencer.c:2613 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "essayez \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:2689 +#: sequencer.c:2627 #, c-format msgid "could not create sequencer directory '%s'" msgstr "impossible de créer le répertoire de séquenceur '%s'" -#: sequencer.c:2704 +#: sequencer.c:2642 msgid "could not lock HEAD" msgstr "impossible de verrouiller HEAD" -#: sequencer.c:2764 sequencer.c:4103 +#: sequencer.c:2702 sequencer.c:4057 msgid "no cherry-pick or revert in progress" msgstr "aucun picorage ou retour en cours" -#: sequencer.c:2766 sequencer.c:2777 +#: sequencer.c:2704 sequencer.c:2715 msgid "cannot resolve HEAD" msgstr "impossible de résoudre HEAD" -#: sequencer.c:2768 sequencer.c:2812 +#: sequencer.c:2706 sequencer.c:2750 msgid "cannot abort from a branch yet to be born" msgstr "impossible d'abandonner depuis une branche non encore créée" -#: sequencer.c:2798 builtin/grep.c:734 +#: sequencer.c:2736 builtin/grep.c:736 #, c-format msgid "cannot open '%s'" msgstr "impossible d'ouvrir '%s'" -#: sequencer.c:2800 +#: sequencer.c:2738 #, c-format msgid "cannot read '%s': %s" msgstr "impossible de lire '%s' : %s" -#: sequencer.c:2801 +#: sequencer.c:2739 msgid "unexpected end of file" msgstr "fin de fichier inattendue" -#: sequencer.c:2807 +#: sequencer.c:2745 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "le fichier HEAD de préparation de picorage '%s' est corrompu" -#: sequencer.c:2818 +#: sequencer.c:2756 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" "Vous semblez avoir déplacé la HEAD. Pas de rembobinage, vérifiez votre HEAD !" -#: sequencer.c:2859 +#: sequencer.c:2797 msgid "no revert in progress" msgstr "Pas de retour en cours ?" -#: sequencer.c:2867 +#: sequencer.c:2805 msgid "no cherry-pick in progress" msgstr "aucun picorage en cours" -#: sequencer.c:2877 +#: sequencer.c:2815 msgid "failed to skip the commit" msgstr "échec du saut de commit" -#: sequencer.c:2884 +#: sequencer.c:2822 msgid "there is nothing to skip" msgstr "il n'y a rien à sauter" -#: sequencer.c:2887 +#: sequencer.c:2825 #, c-format msgid "" "have you committed already?\n" @@ -6476,21 +6498,21 @@ msgstr "" "Avez-vous déjà validé ?\n" "essayez \"git %s -continue\"" -#: sequencer.c:3011 sequencer.c:4015 +#: sequencer.c:2949 sequencer.c:3969 #, c-format msgid "could not update %s" msgstr "impossible de mettre à jour %s" -#: sequencer.c:3049 sequencer.c:3995 +#: sequencer.c:2987 sequencer.c:3949 msgid "cannot read HEAD" msgstr "impossible de lire HEAD" -#: sequencer.c:3066 +#: sequencer.c:3004 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "impossible de copier '%s' vers '%s'" -#: sequencer.c:3074 +#: sequencer.c:3012 #, c-format msgid "" "You can amend the commit now, with\n" @@ -6509,27 +6531,27 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3084 +#: sequencer.c:3022 #, c-format msgid "Could not apply %s... %.*s" msgstr "impossible d'appliquer %s... %.*s" -#: sequencer.c:3091 +#: sequencer.c:3029 #, c-format msgid "Could not merge %.*s" msgstr "Impossible de fusionner %.*s" -#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633 +#: sequencer.c:3043 sequencer.c:3047 builtin/difftool.c:641 #, c-format msgid "could not copy '%s' to '%s'" msgstr "impossible de copier '%s' vers '%s'" -#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582 -#: builtin/rebase.c:1953 builtin/rebase.c:2008 +#: sequencer.c:3069 sequencer.c:3506 builtin/rebase.c:850 builtin/rebase.c:1613 +#: builtin/rebase.c:1987 builtin/rebase.c:2031 msgid "could not read index" msgstr "impossible de lire l'index" -#: sequencer.c:3136 +#: sequencer.c:3074 #, c-format msgid "" "execution failed: %s\n" @@ -6544,11 +6566,11 @@ msgstr "" "git rebase --continue\n" "\n" -#: sequencer.c:3142 +#: sequencer.c:3080 msgid "and made changes to the index and/or the working tree\n" msgstr "et a mis à jour l'index ou l'arbre de travail\n" -#: sequencer.c:3148 +#: sequencer.c:3086 #, c-format msgid "" "execution succeeded: %s\n" @@ -6565,77 +6587,77 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3209 +#: sequencer.c:3147 #, c-format msgid "illegal label name: '%.*s'" msgstr "nom de label illégal '%.*s'" -#: sequencer.c:3263 +#: sequencer.c:3201 msgid "writing fake root commit" msgstr "écriture d'un commit racine bidon" -#: sequencer.c:3268 +#: sequencer.c:3206 msgid "writing squash-onto" msgstr "écriture de 'écraser-sur'" -#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860 +#: sequencer.c:3244 builtin/rebase.c:855 builtin/rebase.c:861 #, c-format msgid "failed to find tree of %s" msgstr "impossible de trouver l'arbre de %s" -#: sequencer.c:3324 builtin/rebase.c:873 +#: sequencer.c:3262 builtin/rebase.c:874 msgid "could not write index" msgstr "impossible d'écrire l'index" -#: sequencer.c:3351 +#: sequencer.c:3289 #, c-format msgid "could not resolve '%s'" msgstr "impossible de résoudre '%s'" -#: sequencer.c:3379 +#: sequencer.c:3320 msgid "cannot merge without a current revision" msgstr "impossible de fusionner avec une révision courante" -#: sequencer.c:3401 +#: sequencer.c:3342 #, c-format msgid "unable to parse '%.*s'" msgstr "impossible d'analyser '%.*s'" -#: sequencer.c:3410 +#: sequencer.c:3351 #, c-format msgid "nothing to merge: '%.*s'" msgstr "rien à fusionner : '%.*s'" -#: sequencer.c:3422 +#: sequencer.c:3363 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "" "une fusion octopus ne peut pas être exécutée par dessus une nouvelle racine" -#: sequencer.c:3437 +#: sequencer.c:3378 #, c-format msgid "could not get commit message of '%s'" msgstr "impossible de lire le message de validation de '%s'" -#: sequencer.c:3590 +#: sequencer.c:3538 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "impossible de seulement essayer de fusionner '%.*s'" -#: sequencer.c:3606 +#: sequencer.c:3554 msgid "merge: Unable to write new index file" msgstr "fusion : Impossible d'écrire le nouveau fichier index" -#: sequencer.c:3675 builtin/rebase.c:711 +#: sequencer.c:3623 builtin/rebase.c:712 #, c-format msgid "Applied autostash.\n" msgstr "Autoremisage appliqué.\n" -#: sequencer.c:3687 +#: sequencer.c:3635 #, c-format msgid "cannot store %s" msgstr "impossible de stocker %s" -#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113 +#: sequencer.c:3638 builtin/rebase.c:728 git-rebase--preserve-merges.sh:113 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -6646,31 +6668,31 @@ msgstr "" "Vos modifications sont à l'abri dans la remise.\n" "Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n" -#: sequencer.c:3751 +#: sequencer.c:3699 #, c-format msgid "could not checkout %s" msgstr "extraction de %s impossible" -#: sequencer.c:3765 +#: sequencer.c:3713 #, c-format msgid "%s: not a valid OID" msgstr "%s n'est pas un OID valide" -#: sequencer.c:3770 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3718 git-rebase--preserve-merges.sh:779 msgid "could not detach HEAD" msgstr "Impossible de détacher HEAD" -#: sequencer.c:3785 +#: sequencer.c:3733 #, c-format msgid "Stopped at HEAD\n" msgstr "arrêt à HEAD\n" -#: sequencer.c:3787 +#: sequencer.c:3735 #, c-format msgid "Stopped at %s\n" msgstr "Arrêté à %s\n" -#: sequencer.c:3795 +#: sequencer.c:3743 #, c-format msgid "" "Could not execute the todo command\n" @@ -6691,48 +6713,48 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3877 +#: sequencer.c:3827 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "arrêt à %s... %.*s\n" -#: sequencer.c:3958 +#: sequencer.c:3898 #, c-format msgid "unknown command %d" msgstr "commande inconnue %d" -#: sequencer.c:4003 +#: sequencer.c:3957 msgid "could not read orig-head" msgstr "impossible de lire orig-head" -#: sequencer.c:4008 +#: sequencer.c:3962 msgid "could not read 'onto'" msgstr "impossible de lire 'onto'" -#: sequencer.c:4022 +#: sequencer.c:3976 #, c-format msgid "could not update HEAD to %s" msgstr "impossible de mettre à jour HEAD sur %s" -#: sequencer.c:4115 +#: sequencer.c:4069 msgid "cannot rebase: You have unstaged changes." msgstr "impossible de rebaser : vous avez des modifications non indexées." -#: sequencer.c:4124 +#: sequencer.c:4078 msgid "cannot amend non-existing commit" msgstr "impossible de corriger un commit non-existant" -#: sequencer.c:4126 +#: sequencer.c:4080 #, c-format msgid "invalid file: '%s'" msgstr "fichier invalide : '%s'" -#: sequencer.c:4128 +#: sequencer.c:4082 #, c-format msgid "invalid contents: '%s'" msgstr "contenu invalide : '%s'" -#: sequencer.c:4131 +#: sequencer.c:4085 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -6742,42 +6764,42 @@ msgstr "" "Vous avez des modifications non validées dans votre copie de travail.\n" "Veuillez les valider d'abord, puis relancer 'git rebase --continue'." -#: sequencer.c:4167 sequencer.c:4205 +#: sequencer.c:4121 sequencer.c:4159 #, c-format msgid "could not write file: '%s'" msgstr "impossible d'écrire le fichier : '%s'" -#: sequencer.c:4220 +#: sequencer.c:4174 msgid "could not remove CHERRY_PICK_HEAD" msgstr "impossible de supprimer CHERRY_PICK_HEAD" -#: sequencer.c:4227 +#: sequencer.c:4181 msgid "could not commit staged changes." msgstr "impossible de valider les modifications indexées." -#: sequencer.c:4328 +#: sequencer.c:4285 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s : impossible de picorer un %s" -#: sequencer.c:4332 +#: sequencer.c:4289 #, c-format msgid "%s: bad revision" msgstr "%s : mauvaise révision" -#: sequencer.c:4367 +#: sequencer.c:4324 msgid "can't revert as initial commit" msgstr "impossible d'annuler en tant que commit initial" -#: sequencer.c:4810 +#: sequencer.c:4774 msgid "make_script: unhandled options" msgstr "make_script : options non gérées" -#: sequencer.c:4813 +#: sequencer.c:4777 msgid "make_script: error preparing revisions" msgstr "make_script : erreur lors de la préparation des révisions" -#: sequencer.c:4971 +#: sequencer.c:4935 msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" "continue'.\n" @@ -6787,24 +6809,24 @@ msgstr "" "rebase --continue'.\n" "Ou vous pouvez abandonner le rebasage avec 'git rebase --abort'.\n" -#: sequencer.c:5083 sequencer.c:5100 +#: sequencer.c:5047 sequencer.c:5064 msgid "nothing to do" msgstr "rien à faire" -#: sequencer.c:5114 +#: sequencer.c:5078 msgid "could not skip unnecessary pick commands" msgstr "impossible d'éviter les commandes de picorage non nécessaires" -#: sequencer.c:5197 +#: sequencer.c:5166 msgid "the script was already rearranged." msgstr "le script a déjà été réarrangé." -#: setup.c:123 +#: setup.c:124 #, c-format msgid "'%s' is outside repository" msgstr "'%s' est hors du dépôt" -#: setup.c:173 +#: setup.c:174 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -6814,7 +6836,7 @@ msgstr "" "Utilisez 'git <commande> -- <chemin>...' pour spécifier des chemins qui " "n'existent pas localement." -#: setup.c:186 +#: setup.c:187 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -6825,14 +6847,14 @@ msgstr "" "Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n" "'git <commande> [<révision>...] -- [<chemin>...]'" -#: setup.c:235 +#: setup.c:236 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "" "l'option '%s' doit être présente avant les arguments qui ne sont pas des " "options" -#: setup.c:254 +#: setup.c:255 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -6843,94 +6865,94 @@ msgstr "" "Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n" "'git <commande> [<révision>...] -- [<chemin>...]'" -#: setup.c:390 +#: setup.c:391 msgid "unable to set up work tree using invalid config" msgstr "" "impossible de mettre en place le répertoire de travail en utilisant une " "configuration invalide" -#: setup.c:394 +#: setup.c:395 msgid "this operation must be run in a work tree" msgstr "Cette opération doit être effectuée dans un arbre de travail" -#: setup.c:540 +#: setup.c:541 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Version attendue du dépôt git <= %d, %d trouvée" -#: setup.c:548 +#: setup.c:549 msgid "unknown repository extensions found:" msgstr "extensions de dépôt inconnues trouvées :" -#: setup.c:567 +#: setup.c:568 #, c-format msgid "error opening '%s'" msgstr "erreur à l'ouverture de '%s'" -#: setup.c:569 +#: setup.c:570 #, c-format msgid "too large to be a .git file: '%s'" msgstr "trop gros pour être une fichier .git : '%s'" -#: setup.c:571 +#: setup.c:572 #, c-format msgid "error reading %s" msgstr "erreur à la lecture de %s" -#: setup.c:573 +#: setup.c:574 #, c-format msgid "invalid gitfile format: %s" msgstr "format de fichier git invalide : %s" -#: setup.c:575 +#: setup.c:576 #, c-format msgid "no path in gitfile: %s" msgstr "aucun chemin dans le fichier git : %s" -#: setup.c:577 +#: setup.c:578 #, c-format msgid "not a git repository: %s" msgstr "ce n'est pas un dépôt git : %s" -#: setup.c:676 +#: setup.c:677 #, c-format msgid "'$%s' too big" msgstr "'$%s' trop gros" -#: setup.c:690 +#: setup.c:691 #, c-format msgid "not a git repository: '%s'" msgstr "ce n'est pas un dépôt git : '%s'" -#: setup.c:719 setup.c:721 setup.c:752 +#: setup.c:720 setup.c:722 setup.c:753 #, c-format msgid "cannot chdir to '%s'" msgstr "impossible de se déplacer vers le répertoire (chdir) '%s'" -#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837 +#: setup.c:725 setup.c:781 setup.c:791 setup.c:830 setup.c:838 msgid "cannot come back to cwd" msgstr "impossible de revenir au répertoire de travail courant" -#: setup.c:851 +#: setup.c:852 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "échec du stat de '%*s%s%s'" -#: setup.c:1083 +#: setup.c:1090 msgid "Unable to read current working directory" msgstr "Impossible d'accéder au répertoire de travail courant" -#: setup.c:1092 setup.c:1098 +#: setup.c:1099 setup.c:1105 #, c-format msgid "cannot change to '%s'" msgstr "impossible de modifier en '%s'" -#: setup.c:1103 +#: setup.c:1110 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "ni ceci ni aucun de ses répertoires parents n'est un dépôt git : %s" -#: setup.c:1109 +#: setup.c:1116 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -6941,7 +6963,7 @@ msgstr "" "Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM " "n'est pas défini)." -#: setup.c:1220 +#: setup.c:1227 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -6951,286 +6973,286 @@ msgstr "" "Le propriétaire des fichiers doit toujours avoir les droits en lecture et " "écriture." -#: setup.c:1264 +#: setup.c:1271 msgid "open /dev/null or dup failed" msgstr "échec de l'ouverture ou au dup de /dev/null" -#: setup.c:1279 +#: setup.c:1286 msgid "fork failed" msgstr "échec de la bifurcation" -#: setup.c:1284 +#: setup.c:1291 msgid "setsid failed" msgstr "échec du setsid" -#: sha1-file.c:453 +#: sha1-file.c:452 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "" "le répertoire objet %s n'existe pas ; vérifiez .git/objects/info/alternates" -#: sha1-file.c:504 +#: sha1-file.c:503 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "impossible de normaliser le chemin d'objet alternatif : %s" -#: sha1-file.c:576 +#: sha1-file.c:575 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s : magasins d'objets alternatifs ignorés, récursion trop profonde" -#: sha1-file.c:583 +#: sha1-file.c:582 #, c-format msgid "unable to normalize object directory: %s" msgstr "impossible de normaliser le répertoire d'objet : %s" -#: sha1-file.c:626 +#: sha1-file.c:625 msgid "unable to fdopen alternates lockfile" msgstr "impossible d'ouvrir (fdopen) le fichier verrou des alternatives" -#: sha1-file.c:644 +#: sha1-file.c:643 msgid "unable to read alternates file" msgstr "lecture du fichier d'alternatives impossible" -#: sha1-file.c:651 +#: sha1-file.c:650 msgid "unable to move new alternates file into place" msgstr "impossible de déplacer le nouveau fichier d'alternative" -#: sha1-file.c:686 +#: sha1-file.c:685 #, c-format msgid "path '%s' does not exist" msgstr "le chemin '%s' n'existe pas" -#: sha1-file.c:712 +#: sha1-file.c:711 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" "extraire le dépôt de référence '%s' comme une extraction liée n'est pas " "encore supporté." -#: sha1-file.c:718 +#: sha1-file.c:717 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "le dépôt de référence '%s' n'est pas un dépôt local." -#: sha1-file.c:724 +#: sha1-file.c:723 #, c-format msgid "reference repository '%s' is shallow" msgstr "le dépôt de référence '%s' est superficiel" -#: sha1-file.c:732 +#: sha1-file.c:731 #, c-format msgid "reference repository '%s' is grafted" msgstr "le dépôt de référence '%s' est greffé" -#: sha1-file.c:792 +#: sha1-file.c:791 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "ligne invalide pendant l'analyse des refs alternatives : %s" -#: sha1-file.c:944 +#: sha1-file.c:943 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "essai de mmap %<PRIuMAX> au delà de la limite %<PRIuMAX>" -#: sha1-file.c:969 +#: sha1-file.c:964 msgid "mmap failed" msgstr "échec de mmap" -#: sha1-file.c:1133 +#: sha1-file.c:1128 #, c-format msgid "object file %s is empty" msgstr "le fichier objet %s est vide" -#: sha1-file.c:1257 sha1-file.c:2396 +#: sha1-file.c:1252 sha1-file.c:2392 #, c-format msgid "corrupt loose object '%s'" msgstr "objet libre corrompu '%s'" -#: sha1-file.c:1259 sha1-file.c:2400 +#: sha1-file.c:1254 sha1-file.c:2396 #, c-format msgid "garbage at end of loose object '%s'" msgstr "données incorrectes à la fin de l'objet libre '%s'" -#: sha1-file.c:1301 +#: sha1-file.c:1296 msgid "invalid object type" msgstr "type d'objet invalide" -#: sha1-file.c:1385 +#: sha1-file.c:1380 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "impossible de dépaqueter l'entête %s avec --allow-unknow-type" -#: sha1-file.c:1388 +#: sha1-file.c:1383 #, c-format msgid "unable to unpack %s header" msgstr "impossible de dépaqueter l'entête %s" -#: sha1-file.c:1394 +#: sha1-file.c:1389 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "impossible d'analyser l'entête %s avec --allow-unknow-type" -#: sha1-file.c:1397 +#: sha1-file.c:1392 #, c-format msgid "unable to parse %s header" msgstr "impossible d'analyser l'entête %s" -#: sha1-file.c:1588 +#: sha1-file.c:1584 #, c-format msgid "failed to read object %s" msgstr "impossible de lire l'objet %s" -#: sha1-file.c:1592 +#: sha1-file.c:1588 #, c-format msgid "replacement %s not found for %s" msgstr "remplacement %s non trouvé pour %s" -#: sha1-file.c:1596 +#: sha1-file.c:1592 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "l'objet libre %s (stocké dans %s) est corrompu" -#: sha1-file.c:1600 +#: sha1-file.c:1596 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "l'objet empaqueté %s (stocké dans %s) est corrompu" -#: sha1-file.c:1703 +#: sha1-file.c:1699 #, c-format msgid "unable to write file %s" msgstr "impossible d'écrire le fichier %s" -#: sha1-file.c:1710 +#: sha1-file.c:1706 #, c-format msgid "unable to set permission to '%s'" msgstr "impossible de régler les droits de '%s'" -#: sha1-file.c:1717 +#: sha1-file.c:1713 msgid "file write error" msgstr "erreur d'écriture d'un fichier" -#: sha1-file.c:1736 +#: sha1-file.c:1732 msgid "error when closing loose object file" msgstr "erreur en fermeture du fichier d'objet esseulé" -#: sha1-file.c:1801 +#: sha1-file.c:1797 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" "droits insuffisants pour ajouter un objet à la base de données %s du dépôt" -#: sha1-file.c:1803 +#: sha1-file.c:1799 msgid "unable to create temporary file" msgstr "impossible de créer un fichier temporaire" -#: sha1-file.c:1827 +#: sha1-file.c:1823 msgid "unable to write loose object file" msgstr "impossible d'écrire le fichier d'objet esseulé" -#: sha1-file.c:1833 +#: sha1-file.c:1829 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "impossible de compresser le nouvel objet %s (%d)" -#: sha1-file.c:1837 +#: sha1-file.c:1833 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "échec de deflateEnd sur l'objet %s (%d)" -#: sha1-file.c:1841 +#: sha1-file.c:1837 #, c-format msgid "confused by unstable object source data for %s" msgstr "données de source d'objet instable pour %s" -#: sha1-file.c:1851 builtin/pack-objects.c:925 +#: sha1-file.c:1847 builtin/pack-objects.c:925 #, c-format msgid "failed utime() on %s" msgstr "échec de utime() sur %s" -#: sha1-file.c:1926 +#: sha1-file.c:1922 #, c-format msgid "cannot read object for %s" msgstr "impossible de lire l'objet pour %s" -#: sha1-file.c:1966 +#: sha1-file.c:1962 msgid "corrupt commit" msgstr "commit corrompu" -#: sha1-file.c:1974 +#: sha1-file.c:1970 msgid "corrupt tag" msgstr "étiquette corrompue" -#: sha1-file.c:2073 +#: sha1-file.c:2069 #, c-format msgid "read error while indexing %s" msgstr "erreur de lecture à l'indexation de %s" -#: sha1-file.c:2076 +#: sha1-file.c:2072 #, c-format msgid "short read while indexing %s" msgstr "lecture tronquée pendant l'indexation de %s" -#: sha1-file.c:2149 sha1-file.c:2158 +#: sha1-file.c:2145 sha1-file.c:2154 #, c-format msgid "%s: failed to insert into database" msgstr "%s : échec de l'insertion dans la base de données" -#: sha1-file.c:2164 +#: sha1-file.c:2160 #, c-format msgid "%s: unsupported file type" msgstr "%s : type de fichier non supporté" -#: sha1-file.c:2188 +#: sha1-file.c:2184 #, c-format msgid "%s is not a valid object" msgstr "%s n'est pas un objet valide" -#: sha1-file.c:2190 +#: sha1-file.c:2186 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s n'est pas un objet '%s' valide" -#: sha1-file.c:2217 builtin/index-pack.c:155 +#: sha1-file.c:2213 builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "impossible d'ouvrir %s" -#: sha1-file.c:2407 sha1-file.c:2459 +#: sha1-file.c:2403 sha1-file.c:2455 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "incohérence de hachage pour %s (%s attendu)" -#: sha1-file.c:2431 +#: sha1-file.c:2427 #, c-format msgid "unable to mmap %s" msgstr "impossible de mmap %s" -#: sha1-file.c:2436 +#: sha1-file.c:2432 #, c-format msgid "unable to unpack header of %s" msgstr "impossible de dépaqueter l'entête de %s" -#: sha1-file.c:2442 +#: sha1-file.c:2438 #, c-format msgid "unable to parse header of %s" msgstr "impossible d'analyser l'entête de %s" -#: sha1-file.c:2453 +#: sha1-file.c:2449 #, c-format msgid "unable to unpack contents of %s" msgstr "impossible de dépaqueter le contenu de %s" -#: sha1-name.c:490 +#: sha1-name.c:487 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "le SHA1 court %s est ambigu" -#: sha1-name.c:501 +#: sha1-name.c:498 msgid "The candidates are:" msgstr "Les candidats sont :" -#: sha1-name.c:800 +#: sha1-name.c:797 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -7255,43 +7277,43 @@ msgstr "" "en lançant \"git config advice.objectNameWarning false\"" #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:821 +#: strbuf.c:822 #, c-format msgid "%u.%2.2u GiB" msgstr "%u.%2.2u Gio" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:823 +#: strbuf.c:824 #, c-format msgid "%u.%2.2u GiB/s" msgstr "%u.%2.2u Gio/s" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:831 +#: strbuf.c:832 #, c-format msgid "%u.%2.2u MiB" msgstr "%u.%2.2u Mio" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:833 +#: strbuf.c:834 #, c-format msgid "%u.%2.2u MiB/s" msgstr "%u.%2.2u Mio/s" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:840 +#: strbuf.c:841 #, c-format msgid "%u.%2.2u KiB" msgstr "%u.%2.2u Kio" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:842 +#: strbuf.c:843 #, c-format msgid "%u.%2.2u KiB/s" msgstr "%u.%2.2u Kio/s" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:848 +#: strbuf.c:849 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -7299,7 +7321,7 @@ msgstr[0] "%u octet" msgstr[1] "%u octets" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:850 +#: strbuf.c:851 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" @@ -7419,28 +7441,28 @@ msgstr "impossible de démarrer ls-files dans .." msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree a renvoyé un code de retour inattendu %d" -#: submodule-config.c:232 +#: submodule-config.c:236 #, c-format msgid "ignoring suspicious submodule name: %s" msgstr "nom de sous-module suspicieux %s ignoré" -#: submodule-config.c:299 +#: submodule-config.c:303 msgid "negative values not allowed for submodule.fetchjobs" msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs" -#: submodule-config.c:397 +#: submodule-config.c:401 #, c-format msgid "ignoring '%s' which may be interpreted as a command-line option: %s" msgstr "" "'%s' ignoré et qui peut être interprété comme une option de ligne de " "commande : %s" -#: submodule-config.c:486 +#: submodule-config.c:490 #, c-format msgid "invalid value for %s" msgstr "Valeur invalide pour %s" -#: submodule-config.c:755 +#: submodule-config.c:761 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Impossible de mettre à jour l'élément %s de .gitmodules" @@ -7475,7 +7497,7 @@ msgstr "impossible de lire le fichier d'entrée '%s'" msgid "could not read from stdin" msgstr "Impossible de lire depuis l'entrée standard" -#: trailer.c:1011 wrapper.c:701 +#: trailer.c:1011 wrapper.c:665 #, c-format msgid "could not stat %s" msgstr "stat impossible de %s" @@ -7504,47 +7526,47 @@ msgstr "impossible de renommer un fichier temporaire en %s" msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "Positionnerait la branche amont de '%s' sur '%s' de '%s'\n" -#: transport.c:142 +#: transport.c:145 #, c-format msgid "could not read bundle '%s'" msgstr "impossible de lire la liasse '%s'" -#: transport.c:208 +#: transport.c:214 #, c-format msgid "transport: invalid depth option '%s'" msgstr "transport : option de profondeur invalide '%s'" -#: transport.c:259 +#: transport.c:266 msgid "see protocol.version in 'git help config' for more details" msgstr "voir protocol.version dans 'git help config' pour plus d'information" -#: transport.c:260 +#: transport.c:267 msgid "server options require protocol version 2 or later" msgstr "les options de serveur exigent une version 2 ou supérieure" -#: transport.c:625 +#: transport.c:632 msgid "could not parse transport.color.* config" msgstr "impossible d'analyser la configuration transport.color.*" -#: transport.c:698 +#: transport.c:705 msgid "support for protocol v2 not implemented yet" msgstr "le support du protocole v2 n'est pas encore implanté" -#: transport.c:825 +#: transport.c:831 #, c-format msgid "unknown value for config '%s': %s" msgstr "valeur inconnue pour la config '%s' : %s" -#: transport.c:891 +#: transport.c:897 #, c-format msgid "transport '%s' not allowed" msgstr "transport '%s' non permis" -#: transport.c:945 +#: transport.c:949 msgid "git-over-rsync is no longer supported" msgstr "git-over-rsync n'est plus supporté" -#: transport.c:1040 +#: transport.c:1044 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -7553,7 +7575,7 @@ msgstr "" "Les chemins suivants de sous-module contiennent des modifications\n" "qui ne peuvent être trouvées sur aucun distant :\n" -#: transport.c:1044 +#: transport.c:1048 #, c-format msgid "" "\n" @@ -7580,33 +7602,33 @@ msgstr "" "pour les pousser vers un serveur distant.\n" "\n" -#: transport.c:1052 +#: transport.c:1056 msgid "Aborting." msgstr "Abandon." -#: transport.c:1193 +#: transport.c:1201 msgid "failed to push all needed submodules" msgstr "échec de la poussée de tous les sous-modules nécessaires" -#: transport.c:1340 transport-helper.c:645 +#: transport.c:1345 transport-helper.c:655 msgid "operation not supported by protocol" msgstr "option non supportée par le protocole" -#: transport-helper.c:51 transport-helper.c:80 +#: transport-helper.c:61 transport-helper.c:90 msgid "full write to remote helper failed" msgstr "échec de l'écriture totale sur l'assistant distant" -#: transport-helper.c:134 +#: transport-helper.c:144 #, c-format msgid "unable to find remote helper for '%s'" msgstr "Impossible de trouver un assistant distant pour '%s'" -#: transport-helper.c:150 transport-helper.c:559 +#: transport-helper.c:160 transport-helper.c:569 msgid "can't dup helper output fd" msgstr "" "impossible de dupliquer le descripteur de flux de sortie de l'assistant" -#: transport-helper.c:201 +#: transport-helper.c:211 #, c-format msgid "" "unknown mandatory capability %s; this remote helper probably needs newer " @@ -7615,103 +7637,103 @@ msgstr "" "capacité obligatoire inconnue %s ; cet assistant distant requiert " "probablement une une nouvelle version de Git" -#: transport-helper.c:207 +#: transport-helper.c:217 msgid "this remote helper should implement refspec capability" msgstr "cet assistant distant devrait supporter la capacité refspec" -#: transport-helper.c:274 transport-helper.c:414 +#: transport-helper.c:284 transport-helper.c:424 #, c-format msgid "%s unexpectedly said: '%s'" msgstr "%s a dit de manière inattendue : '%s'" -#: transport-helper.c:403 +#: transport-helper.c:413 #, c-format msgid "%s also locked %s" msgstr "%s a aussi verrouillé %s" -#: transport-helper.c:481 +#: transport-helper.c:491 msgid "couldn't run fast-import" msgstr "impossible de lancer fast-import" -#: transport-helper.c:504 +#: transport-helper.c:514 msgid "error while running fast-import" msgstr "erreur au lancement de fast-import" -#: transport-helper.c:533 transport-helper.c:1105 +#: transport-helper.c:543 transport-helper.c:1128 #, c-format msgid "could not read ref %s" msgstr "impossible de lire la réf %s" -#: transport-helper.c:578 +#: transport-helper.c:588 #, c-format msgid "unknown response to connect: %s" msgstr "réponse inconnue à connect : %s" -#: transport-helper.c:600 +#: transport-helper.c:610 msgid "setting remote service path not supported by protocol" msgstr "" "la spécification du chemin de service distant n'est pas supportée par le " "protocole" -#: transport-helper.c:602 +#: transport-helper.c:612 msgid "invalid remote service path" msgstr "chemin de service distant invalide" -#: transport-helper.c:648 +#: transport-helper.c:658 #, c-format msgid "can't connect to subservice %s" msgstr "impossible de se connecter au sous-service %s" -#: transport-helper.c:720 +#: transport-helper.c:734 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "ok/error attendu, l'assistant a dit '%s'" -#: transport-helper.c:773 +#: transport-helper.c:787 #, c-format msgid "helper reported unexpected status of %s" msgstr "l'assistant a renvoyé un statut de retour inattendu %s" -#: transport-helper.c:834 +#: transport-helper.c:848 #, c-format msgid "helper %s does not support dry-run" msgstr "l'assistant %s ne gère pas dry-run" -#: transport-helper.c:837 +#: transport-helper.c:851 #, c-format msgid "helper %s does not support --signed" msgstr "l'assistant %s ne gère pas --signed" -#: transport-helper.c:840 +#: transport-helper.c:854 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "l'assistant %s ne gère pas --signed=if-asked" -#: transport-helper.c:847 +#: transport-helper.c:861 #, c-format msgid "helper %s does not support 'push-option'" msgstr "l'assistant %s ne gère pas 'push-option'" -#: transport-helper.c:945 +#: transport-helper.c:959 msgid "remote-helper doesn't support push; refspec needed" msgstr "" "l'assistant %s ne gère pas push ; un spécificateur de référence est " "nécessaire" -#: transport-helper.c:950 +#: transport-helper.c:964 #, c-format msgid "helper %s does not support 'force'" msgstr "l'assistant %s ne gère pas 'force'" -#: transport-helper.c:997 +#: transport-helper.c:1011 msgid "couldn't run fast-export" msgstr "impossible de lancer fast-export" -#: transport-helper.c:1002 +#: transport-helper.c:1016 msgid "error while running fast-export" msgstr "erreur au lancement de fast-export" -#: transport-helper.c:1027 +#: transport-helper.c:1041 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -7720,47 +7742,47 @@ msgstr "" "Aucune référence en commun et aucune spécfiée ; rien à faire.\n" "Vous devriez peut-être spécifier une branche telle que 'master'.\n" -#: transport-helper.c:1091 +#: transport-helper.c:1114 #, c-format msgid "malformed response in ref list: %s" msgstr "réponse malformée dans le liste de réfs : %s" -#: transport-helper.c:1244 +#: transport-helper.c:1266 #, c-format msgid "read(%s) failed" msgstr "échec de read(%s)" -#: transport-helper.c:1271 +#: transport-helper.c:1293 #, c-format msgid "write(%s) failed" msgstr "échec de write(%s)" -#: transport-helper.c:1320 +#: transport-helper.c:1342 #, c-format msgid "%s thread failed" msgstr "échec du fil d'exécution %s" -#: transport-helper.c:1324 +#: transport-helper.c:1346 #, c-format msgid "%s thread failed to join: %s" msgstr "échec de jonction du fil d'exécution %s : %s" -#: transport-helper.c:1343 transport-helper.c:1347 +#: transport-helper.c:1365 transport-helper.c:1369 #, c-format msgid "can't start thread for copying data: %s" msgstr "impossible de démarrer le fil d'exécution pour copier les données : %s" -#: transport-helper.c:1384 +#: transport-helper.c:1406 #, c-format msgid "%s process failed to wait" msgstr "échec du processus %s pour l'attente" -#: transport-helper.c:1388 +#: transport-helper.c:1410 #, c-format msgid "%s process failed" msgstr "échec du processus %s" -#: transport-helper.c:1406 transport-helper.c:1415 +#: transport-helper.c:1428 transport-helper.c:1437 msgid "can't start thread for copying data" msgstr "impossible de démarrer le fil d'exécution pour copier les données" @@ -7780,7 +7802,7 @@ msgstr "nom de fichier vide dans une entrée de l'arbre" msgid "too-short tree file" msgstr "fichier arbre trop court" -#: unpack-trees.c:111 +#: unpack-trees.c:110 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -7791,7 +7813,7 @@ msgstr "" "%%sVeuillez valider ou remiser vos modifications avant de basculer de " "branche." -#: unpack-trees.c:113 +#: unpack-trees.c:112 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -7801,7 +7823,7 @@ msgstr "" "l'extraction :\n" "%%s" -#: unpack-trees.c:116 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -7811,7 +7833,7 @@ msgstr "" "fusion :\n" "%%sVeuillez valider ou remiser vos modifications avant la fusion." -#: unpack-trees.c:118 +#: unpack-trees.c:117 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -7821,7 +7843,7 @@ msgstr "" "fusion :\n" "%%s" -#: unpack-trees.c:121 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -7830,7 +7852,7 @@ msgstr "" "Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n" "%%sVeuillez valider ou remiser vos modifications avant %s." -#: unpack-trees.c:123 +#: unpack-trees.c:122 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -7839,7 +7861,7 @@ msgstr "" "Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n" "%%s" -#: unpack-trees.c:128 +#: unpack-trees.c:127 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -7849,7 +7871,7 @@ msgstr "" "contenus :\n" "%s" -#: unpack-trees.c:132 +#: unpack-trees.c:131 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -7859,7 +7881,7 @@ msgstr "" "l'extraction :\n" "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche." -#: unpack-trees.c:134 +#: unpack-trees.c:133 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -7868,7 +7890,7 @@ msgstr "" "Les fichiers suivants non suivis seraient effacés par l'extraction :\n" "%%s" -#: unpack-trees.c:137 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -7878,7 +7900,7 @@ msgstr "" "la fusion :\n" "%%sVeuillez renommer ou effacer ces fichiers avant la fusion." -#: unpack-trees.c:139 +#: unpack-trees.c:138 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -7887,7 +7909,7 @@ msgstr "" "Les fichiers suivants non suivis seraient effacés par la fusion :\n" "%%s" -#: unpack-trees.c:142 +#: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -7897,7 +7919,7 @@ msgstr "" "%s :\n" "%%sVeuillez renommer ou effacer ces fichiers avant %s." -#: unpack-trees.c:144 +#: unpack-trees.c:143 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -7906,7 +7928,7 @@ msgstr "" "Les fichiers suivants non suivis seraient effacés par %s :\n" "%%s" -#: unpack-trees.c:150 +#: unpack-trees.c:149 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7917,7 +7939,7 @@ msgstr "" "l'extraction :\n" "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche." -#: unpack-trees.c:152 +#: unpack-trees.c:151 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7927,7 +7949,7 @@ msgstr "" "Les fichiers suivants non suivis seraient écrasés par l'extraction :\n" "%%s" -#: unpack-trees.c:155 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -7937,7 +7959,7 @@ msgstr "" "la fusion :\n" "%%sVeuillez renommer ou effacer ces fichiers avant la fusion." -#: unpack-trees.c:157 +#: unpack-trees.c:156 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -7946,7 +7968,7 @@ msgstr "" "Les fichiers suivants non suivis seraient écrasés par la fusion :\n" "%%s" -#: unpack-trees.c:160 +#: unpack-trees.c:159 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -7956,7 +7978,7 @@ msgstr "" "%s :\n" "%%sVeuillez renommer ou effacer ces fichiers avant %s." -#: unpack-trees.c:162 +#: unpack-trees.c:161 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -7965,12 +7987,12 @@ msgstr "" "Les fichiers suivants non suivis seraient écrasés par %s :\n" "%%s" -#: unpack-trees.c:170 +#: unpack-trees.c:169 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "L'entrée '%s' surcharge avec '%s'. Affectation impossible." -#: unpack-trees.c:173 +#: unpack-trees.c:172 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" @@ -7980,7 +8002,7 @@ msgstr "" "pas à jour :\n" "%s" -#: unpack-trees.c:175 +#: unpack-trees.c:174 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -7991,7 +8013,7 @@ msgstr "" "jour par l'extraction creuse :\n" "%s" -#: unpack-trees.c:177 +#: unpack-trees.c:176 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -8002,7 +8024,7 @@ msgstr "" "à jour par extraction creuse :\n" "%s" -#: unpack-trees.c:179 +#: unpack-trees.c:178 #, c-format msgid "" "Cannot update submodule:\n" @@ -8011,16 +8033,16 @@ msgstr "" "Mise à jour impossible pour le sous-module :\n" "%s" -#: unpack-trees.c:256 +#: unpack-trees.c:255 #, c-format msgid "Aborting\n" msgstr "Abandon\n" -#: unpack-trees.c:318 +#: unpack-trees.c:317 msgid "Updating files" msgstr "Mise à jour des fichiers" -#: unpack-trees.c:350 +#: unpack-trees.c:349 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" @@ -8059,7 +8081,7 @@ msgstr "numéro de port invalide" msgid "invalid '..' path segment" msgstr "segment de chemin '..' invalide" -#: worktree.c:258 builtin/am.c:2095 +#: worktree.c:258 builtin/am.c:2084 #, c-format msgid "failed to read '%s'" msgstr "échec de la lecture de '%s'" @@ -8092,17 +8114,17 @@ msgstr "'%s' n'est pas un fichier .git, code d'erreur %d" msgid "'%s' does not point back to '%s'" msgstr "'%s' ne pointe pas en retour sur '%s'" -#: wrapper.c:223 wrapper.c:393 +#: wrapper.c:186 wrapper.c:356 #, c-format msgid "could not open '%s' for reading and writing" msgstr "impossible d'ouvrir '%s' en lecture/écriture" -#: wrapper.c:424 wrapper.c:624 +#: wrapper.c:387 wrapper.c:588 #, c-format msgid "unable to access '%s'" msgstr "impossible d'accéder à '%s'" -#: wrapper.c:632 +#: wrapper.c:596 msgid "unable to get current working directory" msgstr "impossible d'accéder au répertoire de travail courant" @@ -8447,80 +8469,88 @@ msgstr "" " (tous les conflits sont réglés : lancez \"git cherry-pick --continue\")" #: wt-status.c:1437 +msgid " (use \"git cherry-pick --skip\" to skip this patch)" +msgstr " (utilisez \"git cherry-pick --skip\" pour sauter ce patch)" + +#: wt-status.c:1439 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " (utilisez \"git cherry-pick --abort\" pour annuler le picorage)" -#: wt-status.c:1447 +#: wt-status.c:1449 msgid "Revert currently in progress." msgstr "Rétablissement en cours." -#: wt-status.c:1450 +#: wt-status.c:1452 #, c-format msgid "You are currently reverting commit %s." msgstr "Vous êtes actuellement en train de rétablir le commit %s." -#: wt-status.c:1456 +#: wt-status.c:1458 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (réglez les conflits puis lancez \"git revert --continue\")" -#: wt-status.c:1459 +#: wt-status.c:1461 msgid " (run \"git revert --continue\" to continue)" msgstr " (lancez \"git revert --continue\" pour continuer)" -#: wt-status.c:1462 +#: wt-status.c:1464 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")" -#: wt-status.c:1464 +#: wt-status.c:1466 +msgid " (use \"git revert --skip\" to skip this patch)" +msgstr " (utilisez \"git revert --skip\" pour sauter ce patch)" + +#: wt-status.c:1468 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)" -#: wt-status.c:1474 +#: wt-status.c:1478 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Vous êtes en cours de bissection, depuis la branche '%s'." -#: wt-status.c:1478 +#: wt-status.c:1482 msgid "You are currently bisecting." msgstr "Vous êtes en cours de bissection." -#: wt-status.c:1481 +#: wt-status.c:1485 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (utilisez \"git bisect reset\" pour revenir à la branche d'origine)" -#: wt-status.c:1690 +#: wt-status.c:1694 msgid "On branch " msgstr "Sur la branche " -#: wt-status.c:1697 +#: wt-status.c:1701 msgid "interactive rebase in progress; onto " msgstr "rebasage interactif en cours ; sur " -#: wt-status.c:1699 +#: wt-status.c:1703 msgid "rebase in progress; onto " msgstr "rebasage en cours ; sur " -#: wt-status.c:1709 +#: wt-status.c:1713 msgid "Not currently on any branch." msgstr "Actuellement sur aucun branche." -#: wt-status.c:1726 +#: wt-status.c:1730 msgid "Initial commit" msgstr "Validation initiale" -#: wt-status.c:1727 +#: wt-status.c:1731 msgid "No commits yet" msgstr "Aucun commit" -#: wt-status.c:1741 +#: wt-status.c:1745 msgid "Untracked files" msgstr "Fichiers non suivis" -#: wt-status.c:1743 +#: wt-status.c:1747 msgid "Ignored files" msgstr "Fichiers ignorés" -#: wt-status.c:1747 +#: wt-status.c:1751 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -8532,32 +8562,32 @@ msgstr "" "oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help " "status')." -#: wt-status.c:1753 +#: wt-status.c:1757 #, c-format msgid "Untracked files not listed%s" msgstr "Fichiers non suivis non affichés%s" -#: wt-status.c:1755 +#: wt-status.c:1759 msgid " (use -u option to show untracked files)" msgstr " (utilisez -u pour afficher les fichiers non suivis)" -#: wt-status.c:1761 +#: wt-status.c:1765 msgid "No changes" msgstr "Aucune modification" -#: wt-status.c:1766 +#: wt-status.c:1770 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou " "\"git commit -a\")\n" -#: wt-status.c:1769 +#: wt-status.c:1773 #, c-format msgid "no changes added to commit\n" msgstr "aucune modification ajoutée à la validation\n" -#: wt-status.c:1772 +#: wt-status.c:1776 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -8566,70 +8596,75 @@ msgstr "" "aucune modification ajoutée à la validation mais des fichiers non suivis " "sont présents (utilisez \"git add\" pour les suivre)\n" -#: wt-status.c:1775 +#: wt-status.c:1779 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" "aucune modification ajoutée à la validation mais des fichiers non suivis " "sont présents\n" -#: wt-status.c:1778 +#: wt-status.c:1782 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les " "suivre)\n" -#: wt-status.c:1781 wt-status.c:1786 +#: wt-status.c:1785 wt-status.c:1790 #, c-format msgid "nothing to commit\n" msgstr "rien à valider\n" -#: wt-status.c:1784 +#: wt-status.c:1788 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "rien à valider (utilisez -u pour afficher les fichiers non suivis)\n" -#: wt-status.c:1788 +#: wt-status.c:1792 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "rien à valider, la copie de travail est propre\n" -#: wt-status.c:1901 +#: wt-status.c:1905 msgid "No commits yet on " msgstr "Encore aucun commit sur " -#: wt-status.c:1905 +#: wt-status.c:1909 msgid "HEAD (no branch)" msgstr "HEAD (aucune branche)" -#: wt-status.c:1936 +#: wt-status.c:1940 msgid "different" msgstr "différent" -#: wt-status.c:1938 wt-status.c:1946 +#: wt-status.c:1942 wt-status.c:1950 msgid "behind " msgstr "derrière " -#: wt-status.c:1941 wt-status.c:1944 +#: wt-status.c:1945 wt-status.c:1948 msgid "ahead " msgstr "devant " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2466 +#: wt-status.c:2470 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "Impossible de %s : vous avez des modifications non indexées." -#: wt-status.c:2472 +#: wt-status.c:2476 msgid "additionally, your index contains uncommitted changes." msgstr "de plus, votre index contient des modifications non validées." -#: wt-status.c:2474 +#: wt-status.c:2478 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "%s impossible : votre index contient des modifications non validées." +#: compat/precompose_utf8.c:58 builtin/clone.c:452 +#, c-format +msgid "failed to unlink '%s'" +msgstr "échec pour délier '%s'" + #: builtin/add.c:25 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<options>] [--] <chemin>..." @@ -8652,7 +8687,7 @@ msgstr "suppression de '%s'\n" msgid "Unstaged changes after refreshing the index:" msgstr "Modifications non indexées après rafraîchissement de l'index :" -#: builtin/add.c:234 builtin/rev-parse.c:896 +#: builtin/add.c:234 builtin/rev-parse.c:897 msgid "Could not read the index" msgstr "Impossible de lire l'index" @@ -8688,8 +8723,8 @@ msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n" -#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124 -#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560 +#: builtin/add.c:290 builtin/clean.c:910 builtin/fetch.c:162 builtin/mv.c:124 +#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:547 #: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165 msgid "dry run" msgstr "simuler l'action" @@ -8746,7 +8781,7 @@ msgstr "" msgid "check if - even missing - files are ignored in dry run" msgstr "vérifier si des fichiers - même manquants - sont ignorés, à vide" -#: builtin/add.c:309 builtin/update-index.c:1001 +#: builtin/add.c:309 builtin/update-index.c:1002 msgid "override the executable bit of the listed files" msgstr "outrepasser le bit exécutable pour les fichiers listés" @@ -8823,116 +8858,112 @@ msgstr "Rien de spécifié, rien n'a été ajouté.\n" msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Vous vouliez sûrement dire 'git add .' ?\n" -#: builtin/am.c:348 +#: builtin/am.c:347 msgid "could not parse author script" msgstr "impossible d'analyser l'auteur du script" -#: builtin/am.c:432 +#: builtin/am.c:431 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' a été effacé par le crochet applypatch-msg" -#: builtin/am.c:474 +#: builtin/am.c:473 #, c-format msgid "Malformed input line: '%s'." msgstr "Ligne en entrée malformée : '%s'." -#: builtin/am.c:512 +#: builtin/am.c:511 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Impossible de copier les notes de '%s' vers '%s'" -#: builtin/am.c:538 +#: builtin/am.c:537 msgid "fseek failed" msgstr "échec de fseek" -#: builtin/am.c:726 +#: builtin/am.c:725 #, c-format msgid "could not parse patch '%s'" msgstr "impossible d'analyser le patch '%s'" -#: builtin/am.c:791 +#: builtin/am.c:790 msgid "Only one StGIT patch series can be applied at once" msgstr "Seulement une série de patchs StGIT peut être appliquée à la fois" -#: builtin/am.c:839 +#: builtin/am.c:838 msgid "invalid timestamp" msgstr "horodatage invalide" -#: builtin/am.c:844 builtin/am.c:856 +#: builtin/am.c:843 builtin/am.c:855 msgid "invalid Date line" msgstr "ligne de Date invalide" -#: builtin/am.c:851 +#: builtin/am.c:850 msgid "invalid timezone offset" msgstr "décalage horaire invalide" -#: builtin/am.c:944 +#: builtin/am.c:943 msgid "Patch format detection failed." msgstr "Échec de détection du format du patch." -#: builtin/am.c:949 builtin/clone.c:407 +#: builtin/am.c:948 builtin/clone.c:406 #, c-format msgid "failed to create directory '%s'" msgstr "échec de la création du répertoire '%s'" -#: builtin/am.c:954 +#: builtin/am.c:953 msgid "Failed to split patches." msgstr "Échec de découpage des patchs." -#: builtin/am.c:1084 builtin/commit.c:374 -msgid "unable to write index file" -msgstr "impossible d'écrire le fichier d'index" - -#: builtin/am.c:1098 +#: builtin/am.c:1084 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Quand vous avez résolu ce problème, lancez \"%s --continue\"." -#: builtin/am.c:1099 +#: builtin/am.c:1085 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Si vous préférez plutôt sauter ce patch, lancez \"%s --skip\"." -#: builtin/am.c:1100 +#: builtin/am.c:1086 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "Pour restaurer la branche originale et arrêter de patcher, lancez \"%s --" "abort\"." -#: builtin/am.c:1183 +#: builtin/am.c:1169 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" "Rustine envoyée avec format=flowed ; les espaces en fin de ligne peuvent " "être perdus." -#: builtin/am.c:1211 +#: builtin/am.c:1197 msgid "Patch is empty." msgstr "Le patch actuel est vide." -#: builtin/am.c:1277 +#: builtin/am.c:1262 #, c-format -msgid "invalid ident line: %.*s" -msgstr "ligne d'identification invalide : %.*s" +msgid "missing author line in commit %s" +msgstr "ligne d'auteur manquante dans le commit %s" -#: builtin/am.c:1299 +#: builtin/am.c:1265 #, c-format -msgid "unable to parse commit %s" -msgstr "impossible d'analyser le commit %s" +msgid "invalid ident line: %.*s" +msgstr "ligne d'identification invalide : %.*s" -#: builtin/am.c:1496 +#: builtin/am.c:1484 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 " "points." -#: builtin/am.c:1498 +#: builtin/am.c:1486 msgid "Using index info to reconstruct a base tree..." msgstr "" "Utilisation de l'information de l'index pour reconstruire un arbre de base..." -#: builtin/am.c:1517 +#: builtin/am.c:1505 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -8940,24 +8971,24 @@ msgstr "" "Avez-vous édité le patch à la main ?\n" "Il ne s'applique pas aux blobs enregistrés dans son index." -#: builtin/am.c:1523 +#: builtin/am.c:1511 msgid "Falling back to patching base and 3-way merge..." msgstr "Retour à un patch de la base et fusion à 3 points..." -#: builtin/am.c:1549 +#: builtin/am.c:1537 msgid "Failed to merge in the changes." msgstr "Échec d'intégration des modifications." -#: builtin/am.c:1581 +#: builtin/am.c:1569 msgid "applying to an empty history" msgstr "application à un historique vide" -#: builtin/am.c:1628 builtin/am.c:1632 +#: builtin/am.c:1616 builtin/am.c:1620 #, c-format msgid "cannot resume: %s does not exist." msgstr "impossible de continuer : %s n'existe pas." -#: builtin/am.c:1650 +#: builtin/am.c:1638 msgid "Commit Body is:" msgstr "Le corps de la validation est :" @@ -8965,36 +8996,40 @@ msgstr "Le corps de la validation est :" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1660 +#: builtin/am.c:1648 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Appliquer ? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all : " -#: builtin/am.c:1710 +#: builtin/am.c:1695 builtin/commit.c:374 +msgid "unable to write index file" +msgstr "impossible d'écrire le fichier d'index" + +#: builtin/am.c:1699 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)" -#: builtin/am.c:1750 builtin/am.c:1818 +#: builtin/am.c:1739 builtin/am.c:1807 #, c-format msgid "Applying: %.*s" msgstr "Application de %.*s" -#: builtin/am.c:1767 +#: builtin/am.c:1756 msgid "No changes -- Patch already applied." msgstr "Pas de changement -- Patch déjà appliqué." -#: builtin/am.c:1773 +#: builtin/am.c:1762 #, c-format msgid "Patch failed at %s %.*s" msgstr "le patch a échoué à %s %.*s" -#: builtin/am.c:1777 +#: builtin/am.c:1766 msgid "Use 'git am --show-current-patch' to see the failed patch" msgstr "" "Utilisez 'git am --show-current-patch' pour visualiser le patch en échec" -#: builtin/am.c:1821 +#: builtin/am.c:1810 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -9005,7 +9040,7 @@ msgstr "" "introduit les mêmes changements ; vous pourriez avoir envie de sauter ce " "patch." -#: builtin/am.c:1828 +#: builtin/am.c:1817 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -9018,17 +9053,17 @@ msgstr "" "Vous pouvez lancer 'git rm' sur un fichier \"supprimé par eux\" pour " "accepter son état." -#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329 +#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:329 #: builtin/reset.c:337 #, c-format msgid "Could not parse object '%s'." msgstr "Impossible d'analyser l'objet '%s'." -#: builtin/am.c:1987 +#: builtin/am.c:1976 msgid "failed to clean index" msgstr "échec du nettoyage de l'index" -#: builtin/am.c:2031 +#: builtin/am.c:2020 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -9036,145 +9071,145 @@ msgstr "" "Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n" "Pas de retour à ORIG_HEAD" -#: builtin/am.c:2128 +#: builtin/am.c:2117 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valeur invalide pour --patch-format : %s" -#: builtin/am.c:2164 +#: builtin/am.c:2153 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<options>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2165 +#: builtin/am.c:2154 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<options>] (--continue | --skip | --abort)" -#: builtin/am.c:2171 +#: builtin/am.c:2160 msgid "run interactively" msgstr "exécution interactive" -#: builtin/am.c:2173 +#: builtin/am.c:2162 msgid "historical option -- no-op" msgstr "option historique -- no-op" -#: builtin/am.c:2175 +#: builtin/am.c:2164 msgid "allow fall back on 3way merging if needed" msgstr "permettre de revenir à une fusion à 3 points si nécessaire" -#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:296 builtin/stash.c:806 +#: builtin/am.c:2165 builtin/init-db.c:494 builtin/prune-packed.c:58 +#: builtin/repack.c:297 builtin/stash.c:812 msgid "be quiet" msgstr "être silencieux" -#: builtin/am.c:2178 +#: builtin/am.c:2167 msgid "add a Signed-off-by line to the commit message" msgstr "ajouter une ligne Signed-off-by au message de validation" -#: builtin/am.c:2181 +#: builtin/am.c:2170 msgid "recode into utf8 (default)" msgstr "recoder en utf-8 (par défaut)" -#: builtin/am.c:2183 +#: builtin/am.c:2172 msgid "pass -k flag to git-mailinfo" msgstr "passer l'option -k à git-mailinfo" -#: builtin/am.c:2185 +#: builtin/am.c:2174 msgid "pass -b flag to git-mailinfo" msgstr "passer l'option -b à git-mailinfo" -#: builtin/am.c:2187 +#: builtin/am.c:2176 msgid "pass -m flag to git-mailinfo" msgstr "passer l'option -m à git-mailinfo" -#: builtin/am.c:2189 +#: builtin/am.c:2178 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "passer l'option --keep-cr à git-mailsplit fpour le format mbox" -#: builtin/am.c:2192 +#: builtin/am.c:2181 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "ne pas passer l'option --keep-cr à git-mailsplit indépendamment de am.keepcr" -#: builtin/am.c:2195 +#: builtin/am.c:2184 msgid "strip everything before a scissors line" msgstr "retirer tout le contenu avant la ligne des ciseaux" -#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206 -#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218 -#: builtin/am.c:2224 +#: builtin/am.c:2186 builtin/am.c:2189 builtin/am.c:2192 builtin/am.c:2195 +#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207 +#: builtin/am.c:2213 msgid "pass it through git-apply" msgstr "le passer jusqu'à git-apply" -#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671 -#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249 -#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418 -#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313 +#: builtin/am.c:2203 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:674 builtin/grep.c:883 builtin/merge.c:249 +#: builtin/pull.c:160 builtin/pull.c:219 builtin/rebase.c:1442 +#: builtin/repack.c:308 builtin/repack.c:312 builtin/repack.c:314 #: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 -#: parse-options.h:141 parse-options.h:162 parse-options.h:312 +#: parse-options.h:150 parse-options.h:171 parse-options.h:312 msgid "n" msgstr "n" -#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38 -#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38 +#: builtin/am.c:2209 builtin/branch.c:661 builtin/for-each-ref.c:38 +#: builtin/replace.c:555 builtin/tag.c:437 builtin/verify-tag.c:38 msgid "format" msgstr "format" -#: builtin/am.c:2221 +#: builtin/am.c:2210 msgid "format the patch(es) are in" msgstr "format de présentation des patchs" -#: builtin/am.c:2227 +#: builtin/am.c:2216 msgid "override error message when patch failure occurs" msgstr "surcharger le message d'erreur lors d'un échec d'application de patch" -#: builtin/am.c:2229 +#: builtin/am.c:2218 msgid "continue applying patches after resolving a conflict" msgstr "continuer à appliquer les patchs après résolution d'un conflit" -#: builtin/am.c:2232 +#: builtin/am.c:2221 msgid "synonyms for --continue" msgstr "synonymes de --continue" -#: builtin/am.c:2235 +#: builtin/am.c:2224 msgid "skip the current patch" msgstr "sauter le patch courant" -#: builtin/am.c:2238 +#: builtin/am.c:2227 msgid "restore the original branch and abort the patching operation." msgstr "" "restaurer la branche originale et abandonner les applications de patch." -#: builtin/am.c:2241 +#: builtin/am.c:2230 msgid "abort the patching operation but keep HEAD where it is." msgstr "abandonne l'opération de patch mais garde HEAD où il est." -#: builtin/am.c:2244 +#: builtin/am.c:2233 msgid "show the patch being applied." msgstr "afficher le patch en cours d'application." -#: builtin/am.c:2248 +#: builtin/am.c:2237 msgid "lie about committer date" msgstr "mentir sur la date de validation" -#: builtin/am.c:2250 +#: builtin/am.c:2239 msgid "use current timestamp for author date" msgstr "utiliser l'horodatage actuel pour la date d'auteur" -#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511 -#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489 -#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418 +#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1511 +#: builtin/merge.c:286 builtin/pull.c:194 builtin/rebase.c:490 +#: builtin/rebase.c:1483 builtin/revert.c:117 builtin/tag.c:418 msgid "key-id" msgstr "id-clé" -#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460 +#: builtin/am.c:2242 builtin/rebase.c:491 builtin/rebase.c:1484 msgid "GPG-sign commits" msgstr "signer les commits avec GPG" -#: builtin/am.c:2256 +#: builtin/am.c:2245 msgid "(internal use for git-rebase)" msgstr "(utilisation interne pour git-rebase)" -#: builtin/am.c:2274 +#: builtin/am.c:2263 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -9182,17 +9217,17 @@ msgstr "" "L'option -b/--binary ne fait plus rien depuis longtemps,\n" "et elle sera supprimée. Veuillez ne plus l'utiliser." -#: builtin/am.c:2281 +#: builtin/am.c:2270 msgid "failed to read the index" msgstr "échec à la lecture de l'index" -#: builtin/am.c:2296 +#: builtin/am.c:2285 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" "le répertoire précédent de rebasage %s existe toujours mais mbox donnée." -#: builtin/am.c:2320 +#: builtin/am.c:2309 #, c-format msgid "" "Stray %s directory found.\n" @@ -9201,13 +9236,13 @@ msgstr "" "Répertoire abandonné %s trouvé.\n" "Utilisez \"git am --abort\" pour le supprimer." -#: builtin/am.c:2326 +#: builtin/am.c:2315 msgid "Resolve operation not in progress, we are not resuming." msgstr "" "Pas de résolution de l'opération en cours, nous ne sommes pas dans une " "reprise." -#: builtin/am.c:2336 +#: builtin/am.c:2325 msgid "interactive mode requires patches on the command line" msgstr "le mode interactif requiert des rustines sur la ligne de commande" @@ -9525,160 +9560,160 @@ msgstr "--bisect-next-check exige 2 ou 3 arguments" msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms exige 0 ou 1 argument" -#: builtin/blame.c:32 +#: builtin/blame.c:31 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<options>] [<rev-opts>] [<rev>] [--] <fichier>" -#: builtin/blame.c:37 +#: builtin/blame.c:36 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<options-de-révision> sont documentés dans git-rev-list(1)" -#: builtin/blame.c:410 +#: builtin/blame.c:409 #, c-format msgid "expecting a color: %s" msgstr "couleur attendue : %s" -#: builtin/blame.c:417 +#: builtin/blame.c:416 msgid "must end with a color" msgstr "doit finir avec une couleur" -#: builtin/blame.c:730 +#: builtin/blame.c:729 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "couleur invalide '%s' dans color.blame.repeatedlines" -#: builtin/blame.c:748 +#: builtin/blame.c:747 msgid "invalid value for blame.coloring" msgstr "valeur invalide pour blame.coloring" -#: builtin/blame.c:823 +#: builtin/blame.c:822 #, c-format msgid "cannot find revision %s to ignore" msgstr "référence à ignorer %s introuvable" -#: builtin/blame.c:845 +#: builtin/blame.c:844 msgid "Show blame entries as we find them, incrementally" msgstr "" "Montrer les éléments de blâme au fur et à mesure de leur découverte, de " "manière incrémentale" -#: builtin/blame.c:846 +#: builtin/blame.c:845 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Montrer un SHA-1 blanc pour les commits de limite (Défaut : désactivé)" -#: builtin/blame.c:847 +#: builtin/blame.c:846 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" "Ne pas traiter les commits racine comme des limites (Défaut : désactivé)" -#: builtin/blame.c:848 +#: builtin/blame.c:847 msgid "Show work cost statistics" msgstr "Montrer les statistiques de coût d'activité" -#: builtin/blame.c:849 +#: builtin/blame.c:848 msgid "Force progress reporting" msgstr "Forcer l'affichage de l'état d'avancement" -#: builtin/blame.c:850 +#: builtin/blame.c:849 msgid "Show output score for blame entries" msgstr "Montrer le score de sortie pour les éléments de blâme" -#: builtin/blame.c:851 +#: builtin/blame.c:850 msgid "Show original filename (Default: auto)" msgstr "Montrer les noms de fichier originaux (Défaut : auto)" -#: builtin/blame.c:852 +#: builtin/blame.c:851 msgid "Show original linenumber (Default: off)" msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)" -#: builtin/blame.c:853 +#: builtin/blame.c:852 msgid "Show in a format designed for machine consumption" msgstr "Afficher dans un format propice à la consommation par machine" -#: builtin/blame.c:854 +#: builtin/blame.c:853 msgid "Show porcelain format with per-line commit information" msgstr "Afficher en format porcelaine avec l'information de commit par ligne" -#: builtin/blame.c:855 +#: builtin/blame.c:854 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "Utiliser le même mode de sortie que git-annotate (Défaut : désactivé)" -#: builtin/blame.c:856 +#: builtin/blame.c:855 msgid "Show raw timestamp (Default: off)" msgstr "Afficher les horodatages bruts (Défaut : désactivé)" -#: builtin/blame.c:857 +#: builtin/blame.c:856 msgid "Show long commit SHA1 (Default: off)" msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)" -#: builtin/blame.c:858 +#: builtin/blame.c:857 msgid "Suppress author name and timestamp (Default: off)" msgstr "Supprimer le nom de l'auteur et l'horodatage (Défaut : désactivé)" -#: builtin/blame.c:859 +#: builtin/blame.c:858 msgid "Show author email instead of name (Default: off)" msgstr "Afficher le courriel de l'auteur au lieu du nom (Défaut : désactivé)" -#: builtin/blame.c:860 +#: builtin/blame.c:859 msgid "Ignore whitespace differences" msgstr "Ignorer les différences d'espace" -#: builtin/blame.c:861 builtin/log.c:1629 +#: builtin/blame.c:860 builtin/log.c:1630 msgid "rev" msgstr "rév" -#: builtin/blame.c:861 +#: builtin/blame.c:860 msgid "Ignore <rev> when blaming" msgstr "ignore <rev> pendant le blâme" -#: builtin/blame.c:862 +#: builtin/blame.c:861 msgid "Ignore revisions from <file>" msgstr "ignorer les révisions listées dans <fichier>" -#: builtin/blame.c:863 +#: builtin/blame.c:862 msgid "color redundant metadata from previous line differently" msgstr "" "colorer différemment les métadonnées redondantes avec la ligne précédente" -#: builtin/blame.c:864 +#: builtin/blame.c:863 msgid "color lines by age" msgstr "colorier les lignes par âge" -#: builtin/blame.c:871 +#: builtin/blame.c:870 msgid "Use an experimental heuristic to improve diffs" msgstr "Utiliser une heuristique expérimentale pour améliorer les diffs" -#: builtin/blame.c:873 +#: builtin/blame.c:872 msgid "Spend extra cycles to find better match" msgstr "" "Dépenser des cycles supplémentaires pour trouver une meilleure correspondance" -#: builtin/blame.c:874 +#: builtin/blame.c:873 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" "Utiliser les révisions du fichier <fichier> au lieu d'appeler git-rev-list" -#: builtin/blame.c:875 +#: builtin/blame.c:874 msgid "Use <file>'s contents as the final image" msgstr "Utiliser le contenu de <fichier> comme image finale" -#: builtin/blame.c:876 builtin/blame.c:877 +#: builtin/blame.c:875 builtin/blame.c:876 msgid "score" msgstr "score" -#: builtin/blame.c:876 +#: builtin/blame.c:875 msgid "Find line copies within and across files" msgstr "Trouver les copies de ligne dans et entre les fichiers" -#: builtin/blame.c:877 +#: builtin/blame.c:876 msgid "Find line movements within and across files" msgstr "Trouver les mouvements de ligne dans et entre les fichiers" -#: builtin/blame.c:878 +#: builtin/blame.c:877 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:878 +#: builtin/blame.c:877 msgid "Process only line range n,m, counting from 1" msgstr "" "Traiter seulement l'intervalle de ligne n,m en commençant le compte à 1" @@ -9923,7 +9958,7 @@ msgstr "régler le mode de suivi (voir git-pull(1))" msgid "do not use" msgstr "ne pas utiliser" -#: builtin/branch.c:626 builtin/rebase.c:485 +#: builtin/branch.c:626 builtin/rebase.c:486 msgid "upstream" msgstr "amont" @@ -10034,7 +10069,7 @@ msgstr "le tri et le filtrage sont non-sensibles à la casse" msgid "format to use for the output" msgstr "format à utiliser pour la sortie" -#: builtin/branch.c:684 builtin/clone.c:761 +#: builtin/branch.c:684 builtin/clone.c:760 msgid "HEAD not found below refs/heads!" msgstr "HEAD non trouvée sous refs/heads !" @@ -10139,7 +10174,7 @@ msgstr "La création d'un colis requiert un dépôt." msgid "Need a repository to unbundle." msgstr "Le dépaquetage d'un colis requiert un dépôt." -#: builtin/cat-file.c:594 +#: builtin/cat-file.c:595 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -10147,7 +10182,7 @@ msgstr "" "git cat-file (-t [--allow-unknow-type] | -s [--allow-unknow-type] | -e | -p " "| <type> | --textconv | --filters) [--path=<chemin>] <objet>" -#: builtin/cat-file.c:595 +#: builtin/cat-file.c:596 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" @@ -10155,74 +10190,74 @@ msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:616 +#: builtin/cat-file.c:617 msgid "only one batch option may be specified" msgstr "une seule option de traitement ne peut être spécifiée à la fois" -#: builtin/cat-file.c:634 +#: builtin/cat-file.c:635 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<type> peut être : blob, tree, commit ou tag" -#: builtin/cat-file.c:635 +#: builtin/cat-file.c:636 msgid "show object type" msgstr "afficher le type de l'objet" -#: builtin/cat-file.c:636 +#: builtin/cat-file.c:637 msgid "show object size" msgstr "afficher la taille de l'objet" -#: builtin/cat-file.c:638 +#: builtin/cat-file.c:639 msgid "exit with zero when there's no error" msgstr "sortir avec un code d'erreur nul quand il n'y a aucune erreur" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:640 msgid "pretty-print object's content" msgstr "afficher avec mise en forme le contenu de l'objet" -#: builtin/cat-file.c:641 +#: builtin/cat-file.c:642 msgid "for blob objects, run textconv on object's content" msgstr "pour les objets blob, lancer textconv sur le contenu de l'objet" -#: builtin/cat-file.c:643 +#: builtin/cat-file.c:644 msgid "for blob objects, run filters on object's content" msgstr "pour les objets blob, lancer les filtres sur le contenu de l'objet" -#: builtin/cat-file.c:644 git-submodule.sh:936 +#: builtin/cat-file.c:645 git-submodule.sh:936 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:645 +#: builtin/cat-file.c:646 msgid "use a specific path for --textconv/--filters" msgstr "utiliser un chemin spécifique pour --textconv/--filters" -#: builtin/cat-file.c:647 +#: builtin/cat-file.c:648 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "autoriser -s et -t à travailler sur des objets cassés/corrompus" -#: builtin/cat-file.c:648 +#: builtin/cat-file.c:649 msgid "buffer --batch output" msgstr "bufferiser la sortie de --batch" -#: builtin/cat-file.c:650 +#: builtin/cat-file.c:651 msgid "show info and content of objects fed from the standard input" msgstr "" "afficher l'information et le contenu des objets passés en entrée standard" -#: builtin/cat-file.c:654 +#: builtin/cat-file.c:655 msgid "show info about objects fed from the standard input" msgstr "afficher l'information des objets passés en entrée standard" -#: builtin/cat-file.c:658 +#: builtin/cat-file.c:659 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "suivre les liens symbolique internes à la copie de travail (utilisé avec --" "batch ou --batch-check)" -#: builtin/cat-file.c:660 +#: builtin/cat-file.c:661 msgid "show all objects with --batch or --batch-check" msgstr "montrer tous les objets avec --batch ou --batch-check" -#: builtin/cat-file.c:662 +#: builtin/cat-file.c:663 msgid "do not order --batch-all-objects output" msgstr "ne pas ordonner la sortie de --batch-all-objects" @@ -10251,8 +10286,8 @@ msgid "terminate input and output records by a NUL character" msgstr "" "terminer les enregistrements en entrée et en sortie par un caractère NUL" -#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538 -#: builtin/worktree.c:507 +#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:537 +#: builtin/worktree.c:506 msgid "suppress progress reporting" msgstr "supprimer l'état d'avancement" @@ -10346,7 +10381,7 @@ msgstr "écrire le contenu dans des fichiers temporaires" #: builtin/checkout-index.c:178 builtin/column.c:31 #: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376 #: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857 -#: builtin/worktree.c:680 +#: builtin/worktree.c:679 msgid "string" msgstr "chaîne" @@ -10374,100 +10409,100 @@ msgstr "git switch [<options>] <branche>" msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "git restore [<options>] [--source=<branche>] <fichier>..." -#: builtin/checkout.c:172 builtin/checkout.c:211 +#: builtin/checkout.c:173 builtin/checkout.c:212 #, c-format msgid "path '%s' does not have our version" msgstr "le chemin '%s' n'a pas notre version" -#: builtin/checkout.c:174 builtin/checkout.c:213 +#: builtin/checkout.c:175 builtin/checkout.c:214 #, c-format msgid "path '%s' does not have their version" msgstr "le chemin '%s' n'a pas leur version" -#: builtin/checkout.c:190 +#: builtin/checkout.c:191 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "le chemin '%s' n'a aucune des versions nécessaires" -#: builtin/checkout.c:240 +#: builtin/checkout.c:241 #, c-format msgid "path '%s' does not have necessary versions" msgstr "le chemin '%s' n'a pas les versions nécessaires" -#: builtin/checkout.c:258 +#: builtin/checkout.c:259 #, c-format msgid "path '%s': cannot merge" msgstr "chemin '%s' : impossible de fusionner" -#: builtin/checkout.c:274 +#: builtin/checkout.c:275 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Impossible d'ajouter le résultat de fusion pour '%s'" -#: builtin/checkout.c:374 +#: builtin/checkout.c:375 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "%d conflit du fusion recréé" msgstr[1] "%d conflits du fusion recréés" -#: builtin/checkout.c:379 +#: builtin/checkout.c:380 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "%d chemin mis à jour depuis %s" msgstr[1] "%d chemins mis à jour depuis %s" -#: builtin/checkout.c:386 +#: builtin/checkout.c:387 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "%d chemin mis à jour depuis l'index" msgstr[1] "%d chemins mis à jour depuis l'index" -#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415 -#: builtin/checkout.c:419 +#: builtin/checkout.c:410 builtin/checkout.c:413 builtin/checkout.c:416 +#: builtin/checkout.c:420 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' ne peut pas être utilisé avec des mises à jour de chemins" -#: builtin/checkout.c:422 builtin/checkout.c:425 +#: builtin/checkout.c:423 builtin/checkout.c:426 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' ne peut pas être utilisé avec %s" -#: builtin/checkout.c:429 +#: builtin/checkout.c:430 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Impossible de mettre à jour les chemins et basculer sur la branche '%s' en " "même temps." -#: builtin/checkout.c:433 +#: builtin/checkout.c:434 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "ni '%s', ni '%s' spécifié" -#: builtin/checkout.c:437 +#: builtin/checkout.c:438 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "'%s' ne peut pas être utilisé quand '%s' n'est pas spécifié" -#: builtin/checkout.c:442 builtin/checkout.c:447 +#: builtin/checkout.c:443 builtin/checkout.c:448 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' ou '%s' ne peut pas être utilisé avec %s" -#: builtin/checkout.c:506 builtin/checkout.c:513 +#: builtin/checkout.c:507 builtin/checkout.c:514 #, c-format msgid "path '%s' is unmerged" msgstr "le chemin '%s' n'est pas fusionné" -#: builtin/checkout.c:679 +#: builtin/checkout.c:680 msgid "you need to resolve your current index first" msgstr "vous devez d'abord résoudre votre index courant" -#: builtin/checkout.c:729 +#: builtin/checkout.c:730 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -10477,12 +10512,6 @@ msgstr "" "suivants :\n" "%s" -#: builtin/checkout.c:736 -#, c-format -msgid "staged changes in the following files may be lost: %s" -msgstr "" -"les modifications indexées dans les fichiers suivants seraient perdues : %s" - #: builtin/checkout.c:833 #, c-format msgid "Can not do reflog for '%s': %s\n" @@ -10492,7 +10521,7 @@ msgstr "Impossible de faire un reflog pour '%s' : %s\n" msgid "HEAD is now at" msgstr "HEAD est maintenant sur" -#: builtin/checkout.c:879 builtin/clone.c:714 +#: builtin/checkout.c:879 builtin/clone.c:713 msgid "unable to update HEAD" msgstr "impossible de mettre à jour HEAD" @@ -10608,7 +10637,7 @@ msgstr "" "'%s' pourrait être un fichier local ou un branche de suivi.\n" "Veuillez utiliser -- (et --no-guess en facultatif) pour les distinguer" -#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456 +#: builtin/checkout.c:1243 builtin/worktree.c:290 builtin/worktree.c:455 #, c-format msgid "invalid reference: %s" msgstr "référence invalide : %s" @@ -10711,9 +10740,9 @@ msgstr "Impossible de basculer de branche vers '%s' qui n'est pas un commit" msgid "missing branch or commit argument" msgstr "argument de branche ou de commit manquant" -#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151 -#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575 -#: builtin/send-pack.c:174 +#: builtin/checkout.c:1437 builtin/clone.c:90 builtin/commit-graph.c:59 +#: builtin/commit-graph.c:180 builtin/fetch.c:166 builtin/merge.c:285 +#: builtin/pull.c:138 builtin/push.c:562 builtin/send-pack.c:174 msgid "force progress reporting" msgstr "forcer l'affichage de l'état d'avancement" @@ -10721,7 +10750,7 @@ msgstr "forcer l'affichage de l'état d'avancement" msgid "perform a 3-way merge with the new branch" msgstr "effectuer une fusion à 3 points avec la nouvelle branche" -#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318 +#: builtin/checkout.c:1439 builtin/log.c:1618 parse-options.h:318 msgid "style" msgstr "style" @@ -10729,7 +10758,7 @@ msgstr "style" msgid "conflict style (merge or diff3)" msgstr "style de conflit (merge (fusion) ou diff3)" -#: builtin/checkout.c:1452 builtin/worktree.c:504 +#: builtin/checkout.c:1452 builtin/worktree.c:503 msgid "detach HEAD at named commit" msgstr "détacher la HEAD au commit nommé" @@ -10847,9 +10876,9 @@ msgstr "" "ambigu, vous pouvez positionner checkout.defaultRemote=origin dans\n" "votre config." -#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733 -#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169 -#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502 +#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1742 +#: builtin/checkout.c:1744 builtin/clone.c:120 builtin/remote.c:169 +#: builtin/remote.c:171 builtin/worktree.c:499 builtin/worktree.c:501 msgid "branch" msgstr "branche" @@ -10874,39 +10903,39 @@ msgstr "" msgid "use overlay mode (default)" msgstr "utiliser le mode de superposition (défaut)" -#: builtin/checkout.c:1734 +#: builtin/checkout.c:1743 msgid "create and switch to a new branch" msgstr "créer et basculer sur une nouvelle branche" -#: builtin/checkout.c:1736 +#: builtin/checkout.c:1745 msgid "create/reset and switch to a branch" msgstr "créer/réinitialiser et basculer sur une branche" -#: builtin/checkout.c:1738 +#: builtin/checkout.c:1747 msgid "second guess 'git switch <no-such-branch>'" msgstr "interpréter 'git switch <branche-inexistante>'" -#: builtin/checkout.c:1740 +#: builtin/checkout.c:1749 msgid "throw away local modifications" msgstr "laisser tomber les modifications locales" -#: builtin/checkout.c:1772 +#: builtin/checkout.c:1781 msgid "which tree-ish to checkout from" msgstr "de quel <arbre-esque> faire l'extraction" -#: builtin/checkout.c:1774 +#: builtin/checkout.c:1783 msgid "restore the index" msgstr "restaurer l'index" -#: builtin/checkout.c:1776 +#: builtin/checkout.c:1785 msgid "restore the working tree (default)" msgstr "restaurer l'arbre de travail (par défaut)" -#: builtin/checkout.c:1778 +#: builtin/checkout.c:1787 msgid "ignore unmerged entries" msgstr "ignorer les entrées non-fusionnées" -#: builtin/checkout.c:1779 +#: builtin/checkout.c:1788 msgid "use overlay mode" msgstr "utiliser le mode de superposition" @@ -10946,7 +10975,7 @@ msgstr "échec de la suppression de %s" msgid "could not lstat %s\n" msgstr "lstat de %s impossible\n" -#: builtin/clean.c:300 git-add--interactive.perl:593 +#: builtin/clean.c:301 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -10959,7 +10988,7 @@ msgstr "" "foo - sélectionner un élément par un préfixe unique\n" " - (vide) ne rien sélectionner\n" -#: builtin/clean.c:304 git-add--interactive.perl:602 +#: builtin/clean.c:305 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -10980,38 +11009,38 @@ msgstr "" "* - choisir tous les éléments\n" " - (vide) terminer la sélection\n" -#: builtin/clean.c:520 git-add--interactive.perl:568 +#: builtin/clean.c:521 git-add--interactive.perl:568 #: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Hein (%s) ?\n" -#: builtin/clean.c:662 +#: builtin/clean.c:663 #, c-format msgid "Input ignore patterns>> " msgstr "Entrez les motifs à ignorer>> " -#: builtin/clean.c:699 +#: builtin/clean.c:700 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s" -#: builtin/clean.c:720 +#: builtin/clean.c:721 msgid "Select items to delete" msgstr "Sélectionner les éléments à supprimer" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:761 +#: builtin/clean.c:762 #, c-format msgid "Remove %s [y/N]? " msgstr "Supprimer %s [y/N] ? " -#: builtin/clean.c:786 git-add--interactive.perl:1763 +#: builtin/clean.c:787 git-add--interactive.perl:1763 #, c-format msgid "Bye.\n" msgstr "Au revoir.\n" -#: builtin/clean.c:794 +#: builtin/clean.c:795 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -11029,64 +11058,64 @@ msgstr "" "help - cet écran\n" "? - aide pour la sélection en ligne" -#: builtin/clean.c:821 git-add--interactive.perl:1849 +#: builtin/clean.c:822 git-add--interactive.perl:1849 msgid "*** Commands ***" msgstr "*** Commandes ***" -#: builtin/clean.c:822 git-add--interactive.perl:1846 +#: builtin/clean.c:823 git-add--interactive.perl:1846 msgid "What now" msgstr "Et maintenant ?" -#: builtin/clean.c:830 +#: builtin/clean.c:831 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Supprimerait l'élément suivant :" msgstr[1] "Supprimerait les éléments suivants :" -#: builtin/clean.c:846 +#: builtin/clean.c:847 msgid "No more files to clean, exiting." msgstr "Plus de fichier à nettoyer, sortie." -#: builtin/clean.c:908 +#: builtin/clean.c:909 msgid "do not print names of files removed" msgstr "ne pas afficher les noms des fichiers supprimés" -#: builtin/clean.c:910 +#: builtin/clean.c:911 msgid "force" msgstr "forcer" -#: builtin/clean.c:911 +#: builtin/clean.c:912 msgid "interactive cleaning" msgstr "nettoyage interactif" -#: builtin/clean.c:913 +#: builtin/clean.c:914 msgid "remove whole directories" msgstr "supprimer les répertoires entiers" -#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548 -#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178 -#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415 +#: builtin/clean.c:915 builtin/describe.c:548 builtin/describe.c:550 +#: builtin/grep.c:901 builtin/log.c:176 builtin/log.c:178 +#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419 #: builtin/show-ref.c:179 msgid "pattern" msgstr "motif" -#: builtin/clean.c:915 +#: builtin/clean.c:916 msgid "add <pattern> to ignore rules" msgstr "ajouter <motif> aux règles ignore" -#: builtin/clean.c:916 +#: builtin/clean.c:917 msgid "remove ignored files, too" msgstr "supprimer les fichiers ignorés, aussi" -#: builtin/clean.c:918 +#: builtin/clean.c:919 msgid "remove only ignored files" msgstr "supprimer seulement les fichiers ignorés" -#: builtin/clean.c:936 +#: builtin/clean.c:937 msgid "-x and -X cannot be used together" msgstr "-x et -X ne peuvent pas être utilisés ensemble" -#: builtin/clean.c:940 +#: builtin/clean.c:941 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -11094,7 +11123,7 @@ msgstr "" "clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de " "nettoyer" -#: builtin/clean.c:943 +#: builtin/clean.c:944 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -11102,164 +11131,164 @@ msgstr "" "clean.requireForce à true par défaut et ni -i, -n ou -f fourni ; refus de " "nettoyer" -#: builtin/clone.c:46 +#: builtin/clone.c:45 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]" -#: builtin/clone.c:93 +#: builtin/clone.c:92 msgid "don't create a checkout" msgstr "ne pas créer d'extraction" -#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489 +#: builtin/clone.c:93 builtin/clone.c:95 builtin/init-db.c:489 msgid "create a bare repository" msgstr "créer un dépôt nu" -#: builtin/clone.c:98 +#: builtin/clone.c:97 msgid "create a mirror repository (implies bare)" msgstr "créer un dépôt miroir (implique dépôt nu)" -#: builtin/clone.c:100 +#: builtin/clone.c:99 msgid "to clone from a local repository" msgstr "pour cloner depuis un dépôt local" -#: builtin/clone.c:102 +#: builtin/clone.c:101 msgid "don't use local hardlinks, always copy" msgstr "ne pas utiliser de liens durs locaux, toujours copier" -#: builtin/clone.c:104 +#: builtin/clone.c:103 msgid "setup as shared repository" msgstr "régler comme dépôt partagé" -#: builtin/clone.c:107 +#: builtin/clone.c:106 msgid "pathspec" msgstr "spécificateur de chemin" -#: builtin/clone.c:107 +#: builtin/clone.c:106 msgid "initialize submodules in the clone" msgstr "initialiser les sous-modules dans le clone" -#: builtin/clone.c:110 +#: builtin/clone.c:109 msgid "number of submodules cloned in parallel" msgstr "nombre de sous-modules clonés en parallèle" -#: builtin/clone.c:111 builtin/init-db.c:486 +#: builtin/clone.c:110 builtin/init-db.c:486 msgid "template-directory" msgstr "répertoire-modèle" -#: builtin/clone.c:112 builtin/init-db.c:487 +#: builtin/clone.c:111 builtin/init-db.c:487 msgid "directory from which templates will be used" msgstr "répertoire depuis lequel les modèles vont être utilisés" -#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380 +#: builtin/clone.c:113 builtin/clone.c:115 builtin/submodule--helper.c:1380 #: builtin/submodule--helper.c:1860 msgid "reference repository" msgstr "dépôt de référence" -#: builtin/clone.c:118 builtin/submodule--helper.c:1382 +#: builtin/clone.c:117 builtin/submodule--helper.c:1382 #: builtin/submodule--helper.c:1862 msgid "use --reference only while cloning" msgstr "utiliser seulement --reference pour cloner" -#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3314 builtin/repack.c:319 +#: builtin/clone.c:118 builtin/column.c:27 builtin/merge-file.c:46 +#: builtin/pack-objects.c:3294 builtin/repack.c:320 msgid "name" msgstr "nom" -#: builtin/clone.c:120 +#: builtin/clone.c:119 msgid "use <name> instead of 'origin' to track upstream" msgstr "utiliser <nom> au lieu de 'origin' pour suivre la branche amont" -#: builtin/clone.c:122 +#: builtin/clone.c:121 msgid "checkout <branch> instead of the remote's HEAD" msgstr "extraire <branche> au lieu de la HEAD du répertoire distant" -#: builtin/clone.c:124 +#: builtin/clone.c:123 msgid "path to git-upload-pack on the remote" msgstr "chemin vers git-upload-pack sur le serveur distant" -#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838 -#: builtin/pull.c:226 +#: builtin/clone.c:124 builtin/fetch.c:167 builtin/grep.c:840 +#: builtin/pull.c:227 msgid "depth" msgstr "profondeur" -#: builtin/clone.c:126 +#: builtin/clone.c:125 msgid "create a shallow clone of that depth" msgstr "créer un clone superficiel de cette profondeur" -#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303 +#: builtin/clone.c:126 builtin/fetch.c:169 builtin/pack-objects.c:3283 msgid "time" msgstr "heure" -#: builtin/clone.c:128 +#: builtin/clone.c:127 msgid "create a shallow clone since a specific time" msgstr "créer un clone superficiel depuis une date spécifique" -#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179 -#: builtin/rebase.c:1395 +#: builtin/clone.c:128 builtin/fetch.c:171 builtin/fetch.c:194 +#: builtin/rebase.c:1417 msgid "revision" msgstr "révision" -#: builtin/clone.c:130 builtin/fetch.c:157 +#: builtin/clone.c:129 builtin/fetch.c:172 msgid "deepen history of shallow clone, excluding rev" msgstr "" "approfondir l'historique d'un clone superficiel en excluant une révision" -#: builtin/clone.c:132 +#: builtin/clone.c:131 msgid "clone only one branch, HEAD or --branch" msgstr "cloner seulement une branche, HEAD ou --branch" -#: builtin/clone.c:134 +#: builtin/clone.c:133 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "" "ne pas cloner les tags et indiquer aux récupérations futures de ne pas le " "faire" -#: builtin/clone.c:136 +#: builtin/clone.c:135 msgid "any cloned submodules will be shallow" msgstr "tous les sous-modules clonés seront superficiels" -#: builtin/clone.c:137 builtin/init-db.c:495 +#: builtin/clone.c:136 builtin/init-db.c:495 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:138 builtin/init-db.c:496 +#: builtin/clone.c:137 builtin/init-db.c:496 msgid "separate git dir from working tree" msgstr "séparer le répertoire git de la copie de travail" -#: builtin/clone.c:139 +#: builtin/clone.c:138 msgid "key=value" msgstr "clé=valeur" -#: builtin/clone.c:140 +#: builtin/clone.c:139 msgid "set config inside the new repository" msgstr "régler la configuration dans le nouveau dépôt" -#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 -#: builtin/push.c:585 builtin/send-pack.c:172 +#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76 +#: builtin/push.c:572 builtin/send-pack.c:172 msgid "server-specific" msgstr "spécifique au serveur" -#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 -#: builtin/push.c:585 builtin/send-pack.c:173 +#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76 +#: builtin/push.c:572 builtin/send-pack.c:173 msgid "option to transmit" msgstr "option à transmettre" -#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239 -#: builtin/push.c:586 +#: builtin/clone.c:142 builtin/fetch.c:190 builtin/pull.c:240 +#: builtin/push.c:573 msgid "use IPv4 addresses only" msgstr "n'utiliser que des adresses IPv4" -#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242 -#: builtin/push.c:588 +#: builtin/clone.c:144 builtin/fetch.c:192 builtin/pull.c:243 +#: builtin/push.c:575 msgid "use IPv6 addresses only" msgstr "n'utiliser que des adresses IPv6" -#: builtin/clone.c:149 +#: builtin/clone.c:148 msgid "any cloned submodules will use their remote-tracking branch" msgstr "" "tous les sous-modules clonés utiliseront leur branche de suivi à distance" -#: builtin/clone.c:285 +#: builtin/clone.c:284 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -11267,47 +11296,42 @@ msgstr "" "Aucun nom de répertoire n'a pu être deviné\n" "Veuillez spécifier un répertoire dans la ligne de commande" -#: builtin/clone.c:338 +#: builtin/clone.c:337 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info : impossible d'ajouter une alternative pour '%s' : %s\n" -#: builtin/clone.c:411 +#: builtin/clone.c:410 #, c-format msgid "%s exists and is not a directory" msgstr "%s existe et n'est pas un répertoire" -#: builtin/clone.c:428 +#: builtin/clone.c:427 #, c-format msgid "failed to start iterator over '%s'" msgstr "échec du démarrage un itérateur sur '%s'" -#: builtin/clone.c:453 -#, c-format -msgid "failed to unlink '%s'" -msgstr "échec pour délier '%s'" - -#: builtin/clone.c:458 +#: builtin/clone.c:457 #, c-format msgid "failed to create link '%s'" msgstr "échec de la création du lien '%s'" -#: builtin/clone.c:462 +#: builtin/clone.c:461 #, c-format msgid "failed to copy file to '%s'" msgstr "échec de la copie vers '%s'" -#: builtin/clone.c:467 +#: builtin/clone.c:466 #, c-format msgid "failed to iterate over '%s'" msgstr "échec de l'itération sur '%s'" -#: builtin/clone.c:492 +#: builtin/clone.c:491 #, c-format msgid "done.\n" msgstr "fait.\n" -#: builtin/clone.c:506 +#: builtin/clone.c:505 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -11317,98 +11341,98 @@ msgstr "" "Vous pouvez inspecter ce qui a été extrait avec 'git status'\n" "et réessayer avec 'git restore --source=HEAD :/'\n" -#: builtin/clone.c:583 +#: builtin/clone.c:582 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Impossible de trouver la branche distante '%s' à cloner." -#: builtin/clone.c:702 +#: builtin/clone.c:701 #, c-format msgid "unable to update %s" msgstr "impossible de mettre à jour %s" -#: builtin/clone.c:752 +#: builtin/clone.c:751 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "la HEAD distante réfère à une référence non existante, impossible de " "l'extraire.\n" -#: builtin/clone.c:783 +#: builtin/clone.c:782 msgid "unable to checkout working tree" msgstr "impossible d'extraire la copie de travail" -#: builtin/clone.c:833 +#: builtin/clone.c:832 msgid "unable to write parameters to config file" msgstr "impossible d'écrire les paramètres dans le fichier de configuration" -#: builtin/clone.c:896 +#: builtin/clone.c:895 msgid "cannot repack to clean up" msgstr "impossible de remballer pour nettoyer" -#: builtin/clone.c:898 +#: builtin/clone.c:897 msgid "cannot unlink temporary alternates file" msgstr "impossible de délier le fichier temporaire alternates" -#: builtin/clone.c:938 builtin/receive-pack.c:1950 +#: builtin/clone.c:937 builtin/receive-pack.c:1948 msgid "Too many arguments." msgstr "Trop d'arguments." -#: builtin/clone.c:942 +#: builtin/clone.c:941 msgid "You must specify a repository to clone." msgstr "Vous devez spécifier un dépôt à cloner." -#: builtin/clone.c:955 +#: builtin/clone.c:954 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "les options --bare et --origin %s sont incompatibles." -#: builtin/clone.c:958 +#: builtin/clone.c:957 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare et --separate-git-dir sont incompatibles." -#: builtin/clone.c:971 +#: builtin/clone.c:970 #, c-format msgid "repository '%s' does not exist" msgstr "le dépôt '%s' n'existe pas" -#: builtin/clone.c:977 builtin/fetch.c:1660 +#: builtin/clone.c:976 builtin/fetch.c:1790 #, c-format msgid "depth %s is not a positive number" msgstr "la profondeur %s n'est pas un entier positif" -#: builtin/clone.c:987 +#: builtin/clone.c:986 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" "le chemin de destination '%s' existe déjà et n'est pas un répertoire vide." -#: builtin/clone.c:997 +#: builtin/clone.c:996 #, c-format msgid "working tree '%s' already exists." msgstr "la copie de travail '%s' existe déjà." -#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264 -#: builtin/worktree.c:303 builtin/worktree.c:335 +#: builtin/clone.c:1011 builtin/clone.c:1032 builtin/difftool.c:271 +#: builtin/log.c:1785 builtin/worktree.c:302 builtin/worktree.c:334 #, c-format msgid "could not create leading directories of '%s'" msgstr "impossible de créer les répertoires de premier niveau dans '%s'" -#: builtin/clone.c:1017 +#: builtin/clone.c:1016 #, c-format msgid "could not create work tree dir '%s'" msgstr "impossible de créer le répertoire de la copie de travail '%s'" -#: builtin/clone.c:1037 +#: builtin/clone.c:1036 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clonage dans le dépôt nu '%s'\n" -#: builtin/clone.c:1039 +#: builtin/clone.c:1038 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clonage dans '%s'...\n" -#: builtin/clone.c:1063 +#: builtin/clone.c:1062 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -11416,41 +11440,41 @@ msgstr "" "clone --recursive n'est pas compatible avec à la fois --reference et --" "reference-if-able" -#: builtin/clone.c:1124 +#: builtin/clone.c:1123 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" "--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"." -#: builtin/clone.c:1126 +#: builtin/clone.c:1125 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" "--shallow-since est ignoré dans les clones locaux : utilisez plutôt \"file://" "\"." -#: builtin/clone.c:1128 +#: builtin/clone.c:1127 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" "--shallow-exclude est ignoré dans les clones locaux : utilisez plutôt " "\"file://\"." -#: builtin/clone.c:1130 +#: builtin/clone.c:1129 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter est ignoré dans les clones locaux ; utilisez plutôt file:// ." -#: builtin/clone.c:1133 +#: builtin/clone.c:1132 msgid "source repository is shallow, ignoring --local" msgstr "le dépôt source est superficiel, option --local ignorée" -#: builtin/clone.c:1138 +#: builtin/clone.c:1137 msgid "--local is ignored" msgstr "--local est ignoré" -#: builtin/clone.c:1215 builtin/clone.c:1223 +#: builtin/clone.c:1212 builtin/clone.c:1220 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "La branche distante %s n'a pas été trouvée dans le dépôt amont %s" -#: builtin/clone.c:1226 +#: builtin/clone.c:1223 msgid "You appear to have cloned an empty repository." msgstr "Vous semblez avoir cloné un dépôt vide." @@ -11528,7 +11552,7 @@ msgid "id of a parent commit object" msgstr "id d'un objet commit parent" #: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1469 #: builtin/tag.c:412 msgid "message" msgstr "message" @@ -11542,7 +11566,7 @@ msgid "read commit log message from file" msgstr "lire le message de validation depuis un fichier" #: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287 -#: builtin/pull.c:194 builtin/revert.c:118 +#: builtin/pull.c:195 builtin/revert.c:118 msgid "GPG sign commit" msgstr "signer la validation avec GPG" @@ -11874,8 +11898,8 @@ msgstr "calcule les valeurs complètes en avance/en retard" msgid "version" msgstr "version" -#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561 -#: builtin/worktree.c:651 +#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:548 +#: builtin/worktree.c:650 msgid "machine-readable output" msgstr "sortie pour traitement automatique" @@ -11888,8 +11912,8 @@ msgid "terminate entries with NUL" msgstr "terminer les éléments par NUL" #: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537 -#: builtin/fast-export.c:1125 builtin/fast-export.c:1128 -#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332 +#: builtin/fast-export.c:1153 builtin/fast-export.c:1156 +#: builtin/fast-export.c:1159 builtin/rebase.c:1495 parse-options.h:332 msgid "mode" msgstr "mode" @@ -11907,7 +11931,7 @@ msgstr "" "afficher les fichiers ignorés, \"mode\" facultatif : traditional " "(traditionnel), matching (correspondant), no. (Défaut : traditional)" -#: builtin/commit.c:1362 parse-options.h:179 +#: builtin/commit.c:1362 parse-options.h:188 msgid "when" msgstr "quand" @@ -11962,7 +11986,7 @@ msgstr "auteur" msgid "override author for commit" msgstr "remplacer l'auteur pour la validation" -#: builtin/commit.c:1499 builtin/gc.c:539 +#: builtin/commit.c:1499 builtin/gc.c:538 msgid "date" msgstr "date" @@ -11998,8 +12022,8 @@ msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" "à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)" -#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289 -#: builtin/pull.c:163 builtin/revert.c:110 +#: builtin/commit.c:1506 builtin/log.c:1565 builtin/merge.c:289 +#: builtin/pull.c:164 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "ajouter une entrée Signed-off-by :" @@ -12106,69 +12130,68 @@ msgid "git commit-graph read [--object-dir <objdir>]" msgstr "git commit-graph read [--object-dir <objdir>]" #: builtin/commit-graph.c:13 builtin/commit-graph.c:19 -msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]" -msgstr "git commit-graph verify [--object-dir <objdir>] [--shallow]" +msgid "" +"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" +msgstr "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" #: builtin/commit-graph.c:14 builtin/commit-graph.c:29 msgid "" "git commit-graph write [--object-dir <objdir>] [--append|--split] [--" -"reachable|--stdin-packs|--stdin-commits] <split options>" -msgstr "" -"git commit-graph write [--object-dir <objdir>] [--append|--split] [--" -"reachable|--stdin-packs|--stdin-commits] <options de division>" +"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>" +msgstr "git commit-graph write [--object-dir <répertoire-d'objet>] [--append|--split] [--reachable|--stdin-packs|--stdin-commits] [--|no-]progress] <options de division>" -#: builtin/commit-graph.c:54 builtin/commit-graph.c:100 -#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163 -#: builtin/log.c:1584 +#: builtin/commit-graph.c:55 builtin/commit-graph.c:107 +#: builtin/commit-graph.c:170 builtin/commit-graph.c:254 builtin/fetch.c:178 +#: builtin/log.c:1585 msgid "dir" msgstr "répertoire" -#: builtin/commit-graph.c:55 builtin/commit-graph.c:101 -#: builtin/commit-graph.c:162 builtin/commit-graph.c:238 +#: builtin/commit-graph.c:56 builtin/commit-graph.c:108 +#: builtin/commit-graph.c:171 builtin/commit-graph.c:255 msgid "The object directory to store the graph" msgstr "Le répertoire d'objet où stocker le graphe" -#: builtin/commit-graph.c:57 +#: builtin/commit-graph.c:58 msgid "if the commit-graph is split, only verify the tip file" msgstr "" "si le graphe de commit est divisé, vérifier seulement le fichier sommet" -#: builtin/commit-graph.c:73 builtin/commit-graph.c:116 +#: builtin/commit-graph.c:80 builtin/commit-graph.c:125 #, c-format msgid "Could not open commit-graph '%s'" msgstr "impossible d'ouvrir le graphe de commit '%s'" -#: builtin/commit-graph.c:164 +#: builtin/commit-graph.c:173 msgid "start walk at all refs" msgstr "commencer le parcours à toutes les réfs" -#: builtin/commit-graph.c:166 +#: builtin/commit-graph.c:175 msgid "scan pack-indexes listed by stdin for commits" msgstr "scanner les index compactés listés sur stdin à la recherche de commits" -#: builtin/commit-graph.c:168 +#: builtin/commit-graph.c:177 msgid "start walk at commits listed by stdin" msgstr "commencer le parcours aux commits listés sur stdin" -#: builtin/commit-graph.c:170 +#: builtin/commit-graph.c:179 msgid "include all commits already in the commit-graph file" msgstr "" "inclure tous les commits déjà présents dans le fichier de graphe de commits" -#: builtin/commit-graph.c:172 +#: builtin/commit-graph.c:182 msgid "allow writing an incremental commit-graph file" msgstr "permettre d'écrire un fichier incrémental de graphe de commit" -#: builtin/commit-graph.c:174 builtin/commit-graph.c:178 +#: builtin/commit-graph.c:184 builtin/commit-graph.c:188 msgid "maximum number of commits in a non-base split commit-graph" msgstr "" "le nombre maximum de commits dans un graphe de commit divisé pas de base" -#: builtin/commit-graph.c:176 +#: builtin/commit-graph.c:186 msgid "maximum ratio between two levels of a split commit-graph" msgstr "rapport maximum entre deux niveaux d'un graphe de commit divisé" -#: builtin/commit-graph.c:191 +#: builtin/commit-graph.c:204 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "utilisez un seul parmi --reachable, --stdin-commits ou --stdin-packs" @@ -12487,59 +12510,59 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "affiche les tailles dans un format humainement lisible" -#: builtin/describe.c:27 +#: builtin/describe.c:26 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<options>] <commit ou apparenté>*" -#: builtin/describe.c:28 +#: builtin/describe.c:27 msgid "git describe [<options>] --dirty" msgstr "git describe [<options>] --dirty" -#: builtin/describe.c:63 +#: builtin/describe.c:62 msgid "head" msgstr "tête" -#: builtin/describe.c:63 +#: builtin/describe.c:62 msgid "lightweight" msgstr "léger" -#: builtin/describe.c:63 +#: builtin/describe.c:62 msgid "annotated" msgstr "annoté" -#: builtin/describe.c:273 +#: builtin/describe.c:275 #, c-format msgid "annotated tag %s not available" msgstr "l'étiquette annotée %s n'est pas disponible" -#: builtin/describe.c:277 +#: builtin/describe.c:279 #, c-format msgid "annotated tag %s has no embedded name" msgstr "l'étiquette annotée %s n'a pas de nom embarqué" -#: builtin/describe.c:279 +#: builtin/describe.c:281 #, c-format msgid "tag '%s' is really '%s' here" msgstr "l'étiquette '%s' est en fait '%s'" -#: builtin/describe.c:323 +#: builtin/describe.c:325 #, c-format msgid "no tag exactly matches '%s'" msgstr "aucune étiquette ne correspond parfaitement à '%s'" -#: builtin/describe.c:325 +#: builtin/describe.c:327 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "" "Pas de correspondance exacte sur des réfs ou des étiquettes, recherche par " "describe\n" -#: builtin/describe.c:379 +#: builtin/describe.c:381 #, c-format msgid "finished search at %s\n" msgstr "recherche terminée à %s\n" -#: builtin/describe.c:405 +#: builtin/describe.c:407 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -12548,7 +12571,7 @@ msgstr "" "Aucune étiquette annotée ne peut décrire '%s'.\n" "Cependant, il existe des étiquettes non-annotées : essayez avec --tags." -#: builtin/describe.c:409 +#: builtin/describe.c:411 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -12557,12 +12580,12 @@ msgstr "" "Aucune étiquette ne peut décrire '%s'.\n" "Essayez --always, ou créez des étiquettes." -#: builtin/describe.c:439 +#: builtin/describe.c:441 #, c-format msgid "traversed %lu commits\n" msgstr "%lu commits parcourus\n" -#: builtin/describe.c:442 +#: builtin/describe.c:444 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -12572,92 +12595,92 @@ msgstr "" "affichées\n" "abandon de la recherche à %s\n" -#: builtin/describe.c:510 +#: builtin/describe.c:512 #, c-format msgid "describe %s\n" msgstr "décrire %s\n" -#: builtin/describe.c:513 +#: builtin/describe.c:515 #, c-format msgid "Not a valid object name %s" msgstr "%s n'est pas un nom d'objet valide" -#: builtin/describe.c:521 +#: builtin/describe.c:523 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s n'est ni un commit ni un blob" -#: builtin/describe.c:535 +#: builtin/describe.c:537 msgid "find the tag that comes after the commit" msgstr "rechercher l'étiquette qui suit le commit" -#: builtin/describe.c:536 +#: builtin/describe.c:538 msgid "debug search strategy on stderr" msgstr "déboguer la stratégie de recherche sur stderr" -#: builtin/describe.c:537 +#: builtin/describe.c:539 msgid "use any ref" msgstr "utiliser n'importe quelle référence" -#: builtin/describe.c:538 +#: builtin/describe.c:540 msgid "use any tag, even unannotated" msgstr "utiliser n'importe quelle étiquette, même non-annotée" -#: builtin/describe.c:539 +#: builtin/describe.c:541 msgid "always use long format" msgstr "toujours utiliser le format long" -#: builtin/describe.c:540 +#: builtin/describe.c:542 msgid "only follow first parent" msgstr "ne suivre que le premier parent" -#: builtin/describe.c:543 +#: builtin/describe.c:545 msgid "only output exact matches" msgstr "n'afficher que les correspondances exactes" -#: builtin/describe.c:545 +#: builtin/describe.c:547 msgid "consider <n> most recent tags (default: 10)" msgstr "" "considérer uniquement les <n> étiquettes le plus récentes (défaut : 10)" -#: builtin/describe.c:547 +#: builtin/describe.c:549 msgid "only consider tags matching <pattern>" msgstr "ne considérer que les étiquettes correspondant à <motif>" -#: builtin/describe.c:549 +#: builtin/describe.c:551 msgid "do not consider tags matching <pattern>" msgstr "ne pas considérer les étiquettes correspondant à <motif>" -#: builtin/describe.c:551 builtin/name-rev.c:422 +#: builtin/describe.c:553 builtin/name-rev.c:426 msgid "show abbreviated commit object as fallback" msgstr "afficher les objets commits abrégés en dernier recours" -#: builtin/describe.c:552 builtin/describe.c:555 +#: builtin/describe.c:554 builtin/describe.c:557 msgid "mark" msgstr "marque" -#: builtin/describe.c:553 +#: builtin/describe.c:555 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "ajouter <marque> si la copie de travail est sale (défaut : \"-dirty\")" -#: builtin/describe.c:556 +#: builtin/describe.c:558 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "" "ajouter <marque> si la copie de travail est cassée (défaut : \"-broken\")" -#: builtin/describe.c:574 +#: builtin/describe.c:576 msgid "--long is incompatible with --abbrev=0" msgstr "--long et --abbrev=0 sont incompatibles" -#: builtin/describe.c:603 +#: builtin/describe.c:605 msgid "No names found, cannot describe anything." msgstr "aucun nom trouvé, impossible de décrire quoi que ce soit." -#: builtin/describe.c:654 +#: builtin/describe.c:656 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty est incompatible avec la spécification de commits ou assimilés" -#: builtin/describe.c:656 +#: builtin/describe.c:658 msgid "--broken is incompatible with commit-ishes" msgstr "--broken est incompatible avec les commits ou assimilés" @@ -12694,27 +12717,27 @@ msgstr "objet non géré '%s' spécifié." msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<options>] [<commit> [<commit>]] [--] [<chemin>...]" -#: builtin/difftool.c:253 +#: builtin/difftool.c:260 #, c-format msgid "failed: %d" msgstr "échec : %d" -#: builtin/difftool.c:295 +#: builtin/difftool.c:302 #, c-format msgid "could not read symlink %s" msgstr "lecture du lien symbolique %s impossible" -#: builtin/difftool.c:297 +#: builtin/difftool.c:304 #, c-format msgid "could not read symlink file %s" msgstr "impossible de lire le fichier symlink %s" -#: builtin/difftool.c:305 +#: builtin/difftool.c:312 #, c-format msgid "could not read object %s for symlink %s" msgstr "Impossible de lire l'objet %s pour le symlink %s" -#: builtin/difftool.c:406 +#: builtin/difftool.c:413 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -12722,53 +12745,53 @@ msgstr "" "les formats de diff combinés ('-c' et '--cc') ne sont pas supportés\n" "dans le mode de diff de répertoire ('-d' et '--dir-diff')." -#: builtin/difftool.c:626 +#: builtin/difftool.c:634 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "les deux fichiers sont modifiés : '%s' et '%s'." -#: builtin/difftool.c:628 +#: builtin/difftool.c:636 msgid "working tree file has been left." msgstr "le fichier dans l'arbre de travail a été laissé." -#: builtin/difftool.c:639 +#: builtin/difftool.c:647 #, c-format msgid "temporary files exist in '%s'." msgstr "des fichiers temporaires existent dans '%s'." -#: builtin/difftool.c:640 +#: builtin/difftool.c:648 msgid "you may want to cleanup or recover these." msgstr "vous pourriez souhaiter les nettoyer ou les récupérer." -#: builtin/difftool.c:689 +#: builtin/difftool.c:697 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "utiliser `diff.guitool` au lieu de `diff.tool`" -#: builtin/difftool.c:691 +#: builtin/difftool.c:699 msgid "perform a full-directory diff" msgstr "réalise un diff de répertoire complet" -#: builtin/difftool.c:693 +#: builtin/difftool.c:701 msgid "do not prompt before launching a diff tool" msgstr "ne pas confirmer avant de lancer l'outil de diff" -#: builtin/difftool.c:698 +#: builtin/difftool.c:706 msgid "use symlinks in dir-diff mode" msgstr "utiliser les liens symboliques en mode de diff de répertoire" -#: builtin/difftool.c:699 +#: builtin/difftool.c:707 msgid "tool" msgstr "outil" -#: builtin/difftool.c:700 +#: builtin/difftool.c:708 msgid "use the specified diff tool" msgstr "utiliser l'outil de diff spécifié" -#: builtin/difftool.c:702 +#: builtin/difftool.c:710 msgid "print a list of diff tools that may be used with `--tool`" msgstr "afficher une liste des outils de diff utilisables avec `--tool`" -#: builtin/difftool.c:705 +#: builtin/difftool.c:713 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -12776,31 +12799,31 @@ msgstr "" "provoque la fin de 'git-difftool' si l'outil de diff invoqué renvoie un code " "non-nul" -#: builtin/difftool.c:708 +#: builtin/difftool.c:716 msgid "specify a custom command for viewing diffs" msgstr "spécifier une commande personnalisée pour visualiser les différences" -#: builtin/difftool.c:709 +#: builtin/difftool.c:717 msgid "passed to `diff`" msgstr "passé à `diff`" -#: builtin/difftool.c:724 +#: builtin/difftool.c:732 msgid "difftool requires worktree or --no-index" msgstr "difftool exige un arbre de travail ou --no-index" -#: builtin/difftool.c:731 +#: builtin/difftool.c:739 msgid "--dir-diff is incompatible with --no-index" msgstr "--dir-diff est incompatible avec --no-index" -#: builtin/difftool.c:734 +#: builtin/difftool.c:742 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "--gui, --tool et --extcmd sont mutuellement exclusifs" -#: builtin/difftool.c:742 +#: builtin/difftool.c:750 msgid "no <tool> given for --tool=<tool>" msgstr "pas d'<outil> spécifié pour --tool=<outil>" -#: builtin/difftool.c:749 +#: builtin/difftool.c:757 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "pas de <commande> spécifié pour --extcmd=<commande>" @@ -12841,164 +12864,188 @@ msgstr "" msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [options-de-liste-de-révisions]" -#: builtin/fast-export.c:1124 +#: builtin/fast-export.c:852 +msgid "Error: Cannot export nested tags unless --mark-tags is specified." +msgstr "Erreur : impossible d'exporter des étiquettes imbriquées à moins que --mark-tags ne soit spécifié." + +#: builtin/fast-export.c:1152 msgid "show progress after <n> objects" msgstr "afficher la progression après <n> objets" -#: builtin/fast-export.c:1126 +#: builtin/fast-export.c:1154 msgid "select handling of signed tags" msgstr "sélectionner la gestion des étiquettes signées" -#: builtin/fast-export.c:1129 +#: builtin/fast-export.c:1157 msgid "select handling of tags that tag filtered objects" msgstr "" "sélectionner la gestion des étiquettes qui pointent sur des objets filtrés" -#: builtin/fast-export.c:1132 +#: builtin/fast-export.c:1160 msgid "select handling of commit messages in an alternate encoding" msgstr "" "sélectionner la gestion des messages de validation dans un encodage " "alternatif" -#: builtin/fast-export.c:1135 +#: builtin/fast-export.c:1163 msgid "Dump marks to this file" msgstr "Enregistrer les marques dans ce fichier" -#: builtin/fast-export.c:1137 +#: builtin/fast-export.c:1165 msgid "Import marks from this file" msgstr "importer les marques depuis ce fichier" -#: builtin/fast-export.c:1139 +#: builtin/fast-export.c:1169 +msgid "Import marks from this file if it exists" +msgstr "importer les marques depuis ce fichier s'il existe" + +#: builtin/fast-export.c:1171 msgid "Fake a tagger when tags lack one" msgstr "falsifier un auteur d'étiquette si l'étiquette n'en présente pas" -#: builtin/fast-export.c:1141 +#: builtin/fast-export.c:1173 msgid "Output full tree for each commit" msgstr "Afficher l'arbre complet pour chaque commit" -#: builtin/fast-export.c:1143 +#: builtin/fast-export.c:1175 msgid "Use the done feature to terminate the stream" msgstr "Utiliser la fonction \"done\" pour terminer le flux" -#: builtin/fast-export.c:1144 +#: builtin/fast-export.c:1176 msgid "Skip output of blob data" msgstr "Sauter l'affichage de données de blob" -#: builtin/fast-export.c:1145 builtin/log.c:1632 +#: builtin/fast-export.c:1177 builtin/log.c:1633 msgid "refspec" msgstr "spécificateur de référence" -#: builtin/fast-export.c:1146 +#: builtin/fast-export.c:1178 msgid "Apply refspec to exported refs" msgstr "Appliquer le spécificateur de référence aux références exportées" -#: builtin/fast-export.c:1147 +#: builtin/fast-export.c:1179 msgid "anonymize output" msgstr "anonymise la sortie" -#: builtin/fast-export.c:1149 +#: builtin/fast-export.c:1181 msgid "Reference parents which are not in fast-export stream by object id" msgstr "" "les parents références qui ne sont pas dans le flux d'export rapide par id " "d'objet" -#: builtin/fast-export.c:1151 +#: builtin/fast-export.c:1183 msgid "Show original object ids of blobs/commits" msgstr "Afficher les ids d'objet originaux des blobs/commits" -#: builtin/fetch.c:30 +#: builtin/fast-export.c:1185 +msgid "Label tags with mark ids" +msgstr "Marquer les étiquettes avec des ids de marque" + +#: builtin/fast-export.c:1220 +msgid "Cannot pass both --import-marks and --import-marks-if-exists" +msgstr "Impossible d'utiliser à la fois --import-marks et --import-marks-if-exists" + +#: builtin/fetch.c:34 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<options>] [<dépôt> [<spécification-de-référence>...]]" -#: builtin/fetch.c:31 +#: builtin/fetch.c:35 msgid "git fetch [<options>] <group>" msgstr "git fetch [<options>] <groupe>" -#: builtin/fetch.c:32 +#: builtin/fetch.c:36 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]" -#: builtin/fetch.c:33 +#: builtin/fetch.c:37 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<options>]" -#: builtin/fetch.c:125 builtin/pull.c:203 +#: builtin/fetch.c:115 +msgid "fetch.parallel cannot be negative" +msgstr "fetch.parallel ne peut pas être négatif" + +#: builtin/fetch.c:138 builtin/pull.c:204 msgid "fetch from all remotes" msgstr "récupérer depuis tous les dépôts distants" -#: builtin/fetch.c:127 builtin/pull.c:206 +#: builtin/fetch.c:140 builtin/pull.c:248 +msgid "set upstream for git pull/fetch" +msgstr "définir la branche amont pour git pull/fetch" + +#: builtin/fetch.c:142 builtin/pull.c:207 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser" -#: builtin/fetch.c:129 builtin/pull.c:209 +#: builtin/fetch.c:144 builtin/pull.c:210 msgid "path to upload pack on remote end" msgstr "chemin vers lequel télécharger le paquet sur le poste distant" -#: builtin/fetch.c:130 +#: builtin/fetch.c:145 msgid "force overwrite of local reference" msgstr "forcer l'écrasement de la branche locale" -#: builtin/fetch.c:132 +#: builtin/fetch.c:147 msgid "fetch from multiple remotes" msgstr "récupérer depuis plusieurs dépôts distants" -#: builtin/fetch.c:134 builtin/pull.c:213 +#: builtin/fetch.c:149 builtin/pull.c:214 msgid "fetch all tags and associated objects" msgstr "récupérer toutes les étiquettes et leurs objets associés" -#: builtin/fetch.c:136 +#: builtin/fetch.c:151 msgid "do not fetch all tags (--no-tags)" msgstr "ne pas récupérer toutes les étiquettes (--no-tags)" -#: builtin/fetch.c:138 +#: builtin/fetch.c:153 msgid "number of submodules fetched in parallel" msgstr "nombre de sous-modules récupérés en parallèle" -#: builtin/fetch.c:140 builtin/pull.c:216 +#: builtin/fetch.c:155 builtin/pull.c:217 msgid "prune remote-tracking branches no longer on remote" msgstr "" "éliminer les branches de suivi distant si la branche n'existe plus dans le " "dépôt distant" -#: builtin/fetch.c:142 +#: builtin/fetch.c:157 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" "éliminer les étiquettes locales qui ont disparu du dépôt distant et qui " "encombrent les étiquettes modifiées" -#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140 +#: builtin/fetch.c:158 builtin/fetch.c:181 builtin/pull.c:141 msgid "on-demand" msgstr "à la demande" -#: builtin/fetch.c:144 +#: builtin/fetch.c:159 msgid "control recursive fetching of submodules" msgstr "contrôler la récupération récursive dans les sous-modules" -#: builtin/fetch.c:148 builtin/pull.c:224 +#: builtin/fetch.c:163 builtin/pull.c:225 msgid "keep downloaded pack" msgstr "conserver le paquet téléchargé" -#: builtin/fetch.c:150 +#: builtin/fetch.c:165 msgid "allow updating of HEAD ref" msgstr "permettre la mise à jour de la référence HEAD" -#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227 +#: builtin/fetch.c:168 builtin/fetch.c:174 builtin/pull.c:228 msgid "deepen history of shallow clone" msgstr "approfondir l'historique d'un clone superficiel" -#: builtin/fetch.c:155 +#: builtin/fetch.c:170 msgid "deepen history of shallow repository based on time" msgstr "approfondir l'historique d'un clone superficiel en fonction d'une date" -#: builtin/fetch.c:161 builtin/pull.c:230 +#: builtin/fetch.c:176 builtin/pull.c:231 msgid "convert to a complete repository" msgstr "convertir en un dépôt complet" -#: builtin/fetch.c:164 +#: builtin/fetch.c:179 msgid "prepend this to submodule path output" msgstr "préfixer ceci à la sortie du chemin du sous-module" -#: builtin/fetch.c:167 +#: builtin/fetch.c:182 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -13006,91 +13053,91 @@ msgstr "" "par défaut pour la récupération récursive de sous-modules (priorité plus " "basse que les fichiers de config)" -#: builtin/fetch.c:171 builtin/pull.c:233 +#: builtin/fetch.c:186 builtin/pull.c:234 msgid "accept refs that update .git/shallow" msgstr "accepter les références qui mettent à jour .git/shallow" -#: builtin/fetch.c:172 builtin/pull.c:235 +#: builtin/fetch.c:187 builtin/pull.c:236 msgid "refmap" msgstr "correspondance de référence" -#: builtin/fetch.c:173 builtin/pull.c:236 +#: builtin/fetch.c:188 builtin/pull.c:237 msgid "specify fetch refmap" msgstr "spécifier une correspondance de référence pour la récupération" -#: builtin/fetch.c:180 +#: builtin/fetch.c:195 msgid "report that we have only objects reachable from this object" msgstr "rapporte que nous n'avons que des objets joignables depuis cet objet" -#: builtin/fetch.c:183 +#: builtin/fetch.c:198 msgid "run 'gc --auto' after fetching" msgstr "lancer 'gc --auto' après la récupération" -#: builtin/fetch.c:185 builtin/pull.c:245 +#: builtin/fetch.c:200 builtin/pull.c:246 msgid "check for forced-updates on all updated branches" msgstr "vérifier les mises à jour forcées sur toutes les branches mises à jour" -#: builtin/fetch.c:491 +#: builtin/fetch.c:510 msgid "Couldn't find remote ref HEAD" msgstr "impossible de trouver la référence HEAD distante" -#: builtin/fetch.c:630 +#: builtin/fetch.c:650 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "" "le paramètre de configuration fetch.output contient une valeur invalide %s" -#: builtin/fetch.c:728 +#: builtin/fetch.c:748 #, c-format msgid "object %s not found" msgstr "objet %s non trouvé" -#: builtin/fetch.c:732 +#: builtin/fetch.c:752 msgid "[up to date]" msgstr "[à jour]" -#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833 +#: builtin/fetch.c:765 builtin/fetch.c:781 builtin/fetch.c:853 msgid "[rejected]" msgstr "[rejeté]" -#: builtin/fetch.c:746 +#: builtin/fetch.c:766 msgid "can't fetch in current branch" msgstr "impossible de récupérer dans la branche actuelle" -#: builtin/fetch.c:756 +#: builtin/fetch.c:776 msgid "[tag update]" msgstr "[mise à jour de l'étiquette]" -#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816 -#: builtin/fetch.c:828 +#: builtin/fetch.c:777 builtin/fetch.c:814 builtin/fetch.c:836 +#: builtin/fetch.c:848 msgid "unable to update local ref" msgstr "impossible de mettre à jour la référence locale" -#: builtin/fetch.c:761 +#: builtin/fetch.c:781 msgid "would clobber existing tag" msgstr "écraserait l'étiquette existante" -#: builtin/fetch.c:783 +#: builtin/fetch.c:803 msgid "[new tag]" msgstr "[nouvelle étiquette]" -#: builtin/fetch.c:786 +#: builtin/fetch.c:806 msgid "[new branch]" msgstr "[nouvelle branche]" -#: builtin/fetch.c:789 +#: builtin/fetch.c:809 msgid "[new ref]" msgstr "[nouvelle référence]" -#: builtin/fetch.c:828 +#: builtin/fetch.c:848 msgid "forced update" msgstr "mise à jour forcée" -#: builtin/fetch.c:833 +#: builtin/fetch.c:853 msgid "non-fast-forward" msgstr "pas en avance rapide" -#: builtin/fetch.c:854 +#: builtin/fetch.c:874 msgid "" "Fetch normally indicates which branches had a forced update,\n" "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" @@ -13100,7 +13147,7 @@ msgstr "" "mais ceci a été désactivé. Pour ré-activer, utilisez le drapeau\n" "'--show-forced-update' ou lancez 'git config fetch.showForcedUpdates true'." -#: builtin/fetch.c:858 +#: builtin/fetch.c:878 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -13112,23 +13159,23 @@ msgstr "" "Vous pouvez utiliser '--no-show-forced-update' ou lancer\n" "'git config fetch.showForcedUpdates false' pour éviter ceci.\n" -#: builtin/fetch.c:888 +#: builtin/fetch.c:908 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s n'a pas envoyé tous les objets nécessaires\n" -#: builtin/fetch.c:909 +#: builtin/fetch.c:929 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" "%s rejeté parce que les racines superficielles ne sont pas mises à jour" -#: builtin/fetch.c:1000 builtin/fetch.c:1131 +#: builtin/fetch.c:1020 builtin/fetch.c:1157 #, c-format msgid "From %.*s\n" msgstr "Depuis %.*s\n" -#: builtin/fetch.c:1011 +#: builtin/fetch.c:1031 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -13137,58 +13184,79 @@ msgstr "" "des références locales n'ont pas pu être mises à jour ; essayez de lancer\n" " 'git remote prune %s' pour supprimer des branches anciennes en conflit" -#: builtin/fetch.c:1101 +#: builtin/fetch.c:1127 #, c-format msgid " (%s will become dangling)" msgstr " (%s sera en suspens)" -#: builtin/fetch.c:1102 +#: builtin/fetch.c:1128 #, c-format msgid " (%s has become dangling)" msgstr " (%s est devenu en suspens)" -#: builtin/fetch.c:1134 +#: builtin/fetch.c:1160 msgid "[deleted]" msgstr "[supprimé]" -#: builtin/fetch.c:1135 builtin/remote.c:1036 +#: builtin/fetch.c:1161 builtin/remote.c:1036 msgid "(none)" msgstr "(aucun(e))" -#: builtin/fetch.c:1158 +#: builtin/fetch.c:1184 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Refus de récupérer dans la branche courant %s d'un dépôt non nu" -#: builtin/fetch.c:1177 +#: builtin/fetch.c:1203 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "La valeur \"%2$s\" de l'option \"%1$s\" est invalide pour %3$s" -#: builtin/fetch.c:1180 +#: builtin/fetch.c:1206 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "L'option \"%s\" est ignorée pour %s\n" -#: builtin/fetch.c:1484 +#: builtin/fetch.c:1414 +msgid "multiple branch detected, incompatible with --set-upstream" +msgstr "branches multiples détectées, imcompatible avec --set-upstream" + +#: builtin/fetch.c:1429 +msgid "not setting upstream for a remote remote-tracking branch" +msgstr "dépôt amont non défini pour la branche de suivi à distance" + +#: builtin/fetch.c:1431 +msgid "not setting upstream for a remote tag" +msgstr "dépôt amont non défini pour l'étiquette distante" + +#: builtin/fetch.c:1433 +msgid "unknown branch type" +msgstr "type de branche inconnu" + +#: builtin/fetch.c:1435 +msgid "" +"no source branch found.\n" +"you need to specify exactly one branch with the --set-upstream option." +msgstr "" +"Aucune branche source trouvée.\n" +"Vous devez spécifier exactement une branche avec l'option --set-upstream." + +#: builtin/fetch.c:1561 builtin/fetch.c:1623 #, c-format msgid "Fetching %s\n" msgstr "Récupération de %s\n" -#: builtin/fetch.c:1486 builtin/remote.c:100 +#: builtin/fetch.c:1571 builtin/fetch.c:1625 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "Impossible de récupérer %s" -#: builtin/fetch.c:1532 -msgid "" -"--filter can only be used with the remote configured in extensions." -"partialClone" -msgstr "" -"--filter ne peut être utilisé qu'avec le dépôt distant configuré dans " -"extensions.partialClone" +#: builtin/fetch.c:1583 +#, c-format +msgid "could not fetch '%s' (exit code: %d)\n" +msgstr "impossible de récupérer '%s' (code de sortie : %d)\n" -#: builtin/fetch.c:1556 +#: builtin/fetch.c:1685 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -13196,46 +13264,46 @@ msgstr "" "Aucun dépôt distant spécifié. Veuillez spécifier une URL ou un nom\n" "distant depuis lesquels les nouvelles révisions devraient être récupérées." -#: builtin/fetch.c:1593 +#: builtin/fetch.c:1722 msgid "You need to specify a tag name." msgstr "Vous devez spécifier un nom d'étiquette." -#: builtin/fetch.c:1644 +#: builtin/fetch.c:1774 msgid "Negative depth in --deepen is not supported" msgstr "Une profondeur négative dans --deepen n'est pas supportée" -#: builtin/fetch.c:1646 +#: builtin/fetch.c:1776 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen et --depth sont mutuellement exclusifs" -#: builtin/fetch.c:1651 +#: builtin/fetch.c:1781 msgid "--depth and --unshallow cannot be used together" msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble" -#: builtin/fetch.c:1653 +#: builtin/fetch.c:1783 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow sur un dépôt complet n'a pas de sens" -#: builtin/fetch.c:1669 +#: builtin/fetch.c:1799 msgid "fetch --all does not take a repository argument" msgstr "fetch --all n'accepte pas d'argument de dépôt" -#: builtin/fetch.c:1671 +#: builtin/fetch.c:1801 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all n'a pas de sens avec des spécifications de référence" -#: builtin/fetch.c:1680 +#: builtin/fetch.c:1810 #, c-format msgid "No such remote or remote group: %s" msgstr "distant ou groupe distant inexistant : %s" -#: builtin/fetch.c:1687 +#: builtin/fetch.c:1817 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" "La récupération d'un groupe et les spécifications de référence n'ont pas de " "sens" -#: builtin/fetch.c:1703 +#: builtin/fetch.c:1835 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -13573,7 +13641,7 @@ msgstr "%s : objet manquant" msgid "invalid parameter: expected sha1, got '%s'" msgstr "paramètre invalide : sha-1 attendu, '%s' trouvé" -#: builtin/gc.c:34 +#: builtin/gc.c:35 msgid "git gc [<options>]" msgstr "git gc [<options>]" @@ -13587,17 +13655,17 @@ msgstr "Échec du stat de %s : %s" msgid "failed to parse '%s' value '%s'" msgstr "échec de l'analyse de '%s' valeur '%s'" -#: builtin/gc.c:476 builtin/init-db.c:55 +#: builtin/gc.c:475 builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" msgstr "impossible de faire un stat de '%s'" -#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529 +#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529 #, c-format msgid "cannot read '%s'" msgstr "impossible de lire '%s'" -#: builtin/gc.c:492 +#: builtin/gc.c:491 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -13613,56 +13681,56 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:540 +#: builtin/gc.c:539 msgid "prune unreferenced objects" msgstr "éliminer les objets non référencés" -#: builtin/gc.c:542 +#: builtin/gc.c:541 msgid "be more thorough (increased runtime)" msgstr "être plus consciencieux (durée de traitement allongée)" -#: builtin/gc.c:543 +#: builtin/gc.c:542 msgid "enable auto-gc mode" msgstr "activer le mode auto-gc" -#: builtin/gc.c:546 +#: builtin/gc.c:545 msgid "force running gc even if there may be another gc running" msgstr "" "forcer le lancement du ramasse-miettes même si un autre ramasse-miettes " "tourne déjà" -#: builtin/gc.c:549 +#: builtin/gc.c:548 msgid "repack all other packs except the largest pack" msgstr "recompacter tous les autres paquets excepté le plus gros paquet" -#: builtin/gc.c:566 +#: builtin/gc.c:565 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "impossible d'analyser gc.logexpiry %s" -#: builtin/gc.c:577 +#: builtin/gc.c:576 #, c-format msgid "failed to parse prune expiry value %s" msgstr "impossible d'analyser la valeur d'expiration d'élagage %s" -#: builtin/gc.c:597 +#: builtin/gc.c:596 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" "Compression automatique du dépôt en tâche de fond pour optimiser les " "performances.\n" -#: builtin/gc.c:599 +#: builtin/gc.c:598 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Compression du dépôt pour optimiser les performances.\n" -#: builtin/gc.c:600 +#: builtin/gc.c:599 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Voir \"git help gc\" pour toute information sur le nettoyage manuel.\n" -#: builtin/gc.c:640 +#: builtin/gc.c:639 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -13670,7 +13738,7 @@ msgstr "" "un ramasse-miettes est déjà en cours sur la machine '%s' pid %<PRIuMAX> " "(utilisez --force si ce n'est pas le cas)" -#: builtin/gc.c:695 +#: builtin/gc.c:694 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -13696,265 +13764,265 @@ msgstr "nombre de fils spécifié invalide (%d) pour %s" #. grep.threads #. #: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727 -#: builtin/pack-objects.c:2728 +#: builtin/pack-objects.c:2708 #, c-format msgid "no threads support, ignoring %s" msgstr "pas de support des fils, ignore %s" -#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633 +#: builtin/grep.c:467 builtin/grep.c:592 builtin/grep.c:635 #, c-format msgid "unable to read tree (%s)" msgstr "impossible de lire l'arbre (%s)" -#: builtin/grep.c:648 +#: builtin/grep.c:650 #, c-format msgid "unable to grep from object of type %s" msgstr "impossible de faire un grep sur un objet de type %s" -#: builtin/grep.c:714 +#: builtin/grep.c:716 #, c-format msgid "switch `%c' expects a numerical value" msgstr "l'option '%c' attend une valeur numérique" -#: builtin/grep.c:813 +#: builtin/grep.c:815 msgid "search in index instead of in the work tree" msgstr "rechercher dans l'index plutôt que dans la copie de travail" -#: builtin/grep.c:815 +#: builtin/grep.c:817 msgid "find in contents not managed by git" msgstr "rechercher dans les contenus non gérés par git" -#: builtin/grep.c:817 +#: builtin/grep.c:819 msgid "search in both tracked and untracked files" msgstr "rechercher dans les fichiers suivis et non-suivis" -#: builtin/grep.c:819 +#: builtin/grep.c:821 msgid "ignore files specified via '.gitignore'" msgstr "ignorer les fichiers spécifiés via '.gitignore'" -#: builtin/grep.c:821 +#: builtin/grep.c:823 msgid "recursively search in each submodule" msgstr "rechercher récursivement dans chaque sous-module" -#: builtin/grep.c:824 +#: builtin/grep.c:826 msgid "show non-matching lines" msgstr "afficher les lignes qui ne correspondent pas" -#: builtin/grep.c:826 +#: builtin/grep.c:828 msgid "case insensitive matching" msgstr "correspondance insensible à la casse" -#: builtin/grep.c:828 +#: builtin/grep.c:830 msgid "match patterns only at word boundaries" msgstr "rechercher les motifs aux séparateurs de mots" -#: builtin/grep.c:830 +#: builtin/grep.c:832 msgid "process binary files as text" msgstr "traiter les fichiers binaires comme texte" -#: builtin/grep.c:832 +#: builtin/grep.c:834 msgid "don't match patterns in binary files" msgstr "ne pas chercher les motifs dans les fichiers binaires" -#: builtin/grep.c:835 +#: builtin/grep.c:837 msgid "process binary files with textconv filters" msgstr "traiter les fichiers binaires avec les filtres textconv" -#: builtin/grep.c:837 +#: builtin/grep.c:839 msgid "search in subdirectories (default)" msgstr "rechercher dans les sous-répertoires (défaut)" -#: builtin/grep.c:839 +#: builtin/grep.c:841 msgid "descend at most <depth> levels" msgstr "descendre au plus de <profondeur> dans l'arborescence" -#: builtin/grep.c:843 +#: builtin/grep.c:845 msgid "use extended POSIX regular expressions" msgstr "utiliser des expressions régulières étendues POSIX" -#: builtin/grep.c:846 +#: builtin/grep.c:848 msgid "use basic POSIX regular expressions (default)" msgstr "utiliser des expressions régulières basiques POSIX (par défaut)" -#: builtin/grep.c:849 +#: builtin/grep.c:851 msgid "interpret patterns as fixed strings" msgstr "interpréter les motifs comme de chaînes fixes" -#: builtin/grep.c:852 +#: builtin/grep.c:854 msgid "use Perl-compatible regular expressions" msgstr "utiliser des expressions régulières compatibles avec Perl" -#: builtin/grep.c:855 +#: builtin/grep.c:857 msgid "show line numbers" msgstr "afficher les numéros de ligne" -#: builtin/grep.c:856 +#: builtin/grep.c:858 msgid "show column number of first match" msgstr "afficher le numéro de colonne de la première correspondance" -#: builtin/grep.c:857 +#: builtin/grep.c:859 msgid "don't show filenames" msgstr "ne pas pas afficher les noms de fichier" -#: builtin/grep.c:858 +#: builtin/grep.c:860 msgid "show filenames" msgstr "afficher les noms de fichier" -#: builtin/grep.c:860 +#: builtin/grep.c:862 msgid "show filenames relative to top directory" msgstr "afficher les noms de fichiers relativement au répertoire de base" -#: builtin/grep.c:862 +#: builtin/grep.c:864 msgid "show only filenames instead of matching lines" msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant" -#: builtin/grep.c:864 +#: builtin/grep.c:866 msgid "synonym for --files-with-matches" msgstr "synonyme pour --files-with-matches" -#: builtin/grep.c:867 +#: builtin/grep.c:869 msgid "show only the names of files without match" msgstr "n'afficher que les noms des fichiers sans correspondance" -#: builtin/grep.c:869 +#: builtin/grep.c:871 msgid "print NUL after filenames" msgstr "imprimer une caractère NUL après le noms de fichier" -#: builtin/grep.c:872 +#: builtin/grep.c:874 msgid "show only matching parts of a line" msgstr "n'afficher que les parties correspondantes d'une ligne" -#: builtin/grep.c:874 +#: builtin/grep.c:876 msgid "show the number of matches instead of matching lines" msgstr "afficher le nombre de correspondances au lieu des lignes correspondant" -#: builtin/grep.c:875 +#: builtin/grep.c:877 msgid "highlight matches" msgstr "mettre en évidence les correspondances" -#: builtin/grep.c:877 +#: builtin/grep.c:879 msgid "print empty line between matches from different files" msgstr "" "imprimer une ligne vide entre les correspondances de fichiers différents" -#: builtin/grep.c:879 +#: builtin/grep.c:881 msgid "show filename only once above matches from same file" msgstr "" "afficher le nom de fichier une fois au dessus des correspondances du même " "fichier" -#: builtin/grep.c:882 +#: builtin/grep.c:884 msgid "show <n> context lines before and after matches" msgstr "afficher <n> lignes de contexte avant et après les correspondances" -#: builtin/grep.c:885 +#: builtin/grep.c:887 msgid "show <n> context lines before matches" msgstr "afficher <n> lignes de contexte avant les correspondances" -#: builtin/grep.c:887 +#: builtin/grep.c:889 msgid "show <n> context lines after matches" msgstr "afficher <n> lignes de contexte après les correspondances" -#: builtin/grep.c:889 +#: builtin/grep.c:891 msgid "use <n> worker threads" msgstr "utiliser <n> fils de travail" -#: builtin/grep.c:890 +#: builtin/grep.c:892 msgid "shortcut for -C NUM" msgstr "raccourci pour -C NUM" -#: builtin/grep.c:893 +#: builtin/grep.c:895 msgid "show a line with the function name before matches" msgstr "" "afficher une ligne avec le nom de la fonction avant les correspondances" -#: builtin/grep.c:895 +#: builtin/grep.c:897 msgid "show the surrounding function" msgstr "afficher la fonction contenante" -#: builtin/grep.c:898 +#: builtin/grep.c:900 msgid "read patterns from file" msgstr "lire les motifs depuis fichier" -#: builtin/grep.c:900 +#: builtin/grep.c:902 msgid "match <pattern>" msgstr "rechercher <motif>" -#: builtin/grep.c:902 +#: builtin/grep.c:904 msgid "combine patterns specified with -e" msgstr "combiner les motifs spécifiés par -e" -#: builtin/grep.c:914 +#: builtin/grep.c:916 msgid "indicate hit with exit status without output" msgstr "" "indiquer des correspondances avec le code de sortie mais sans rien afficher" -#: builtin/grep.c:916 +#: builtin/grep.c:918 msgid "show only matches from files that match all patterns" msgstr "" "n'afficher que les correspondances de fichiers qui correspondent à tous les " "motifs" -#: builtin/grep.c:918 +#: builtin/grep.c:920 msgid "show parse tree for grep expression" msgstr "afficher l'arbre d'analyse pour le motif grep" -#: builtin/grep.c:922 +#: builtin/grep.c:924 msgid "pager" msgstr "pagineur" -#: builtin/grep.c:922 +#: builtin/grep.c:924 msgid "show matching files in the pager" msgstr "afficher les fichiers correspondant dans le pagineur" -#: builtin/grep.c:926 +#: builtin/grep.c:928 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permettre l'appel de grep(1) (ignoré par ce build)" -#: builtin/grep.c:990 +#: builtin/grep.c:992 msgid "no pattern given" msgstr "aucun motif fourni" -#: builtin/grep.c:1026 +#: builtin/grep.c:1028 msgid "--no-index or --untracked cannot be used with revs" msgstr "" "--no-index ou --untracked ne peuvent pas être utilisés avec des révisions" -#: builtin/grep.c:1034 +#: builtin/grep.c:1036 #, c-format msgid "unable to resolve revision: %s" msgstr "impossible de résoudre la révision : %s" -#: builtin/grep.c:1065 +#: builtin/grep.c:1067 msgid "invalid option combination, ignoring --threads" msgstr "option de combinaison invalide, ignore --threads" -#: builtin/grep.c:1068 builtin/pack-objects.c:3416 +#: builtin/grep.c:1070 builtin/pack-objects.c:3400 msgid "no threads support, ignoring --threads" msgstr "pas de support des fils, ignore --threads" -#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725 +#: builtin/grep.c:1073 builtin/index-pack.c:1531 builtin/pack-objects.c:2705 #, c-format msgid "invalid number of threads specified (%d)" msgstr "nombre de fils spécifié invalide (%d)" -#: builtin/grep.c:1094 +#: builtin/grep.c:1096 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager ne fonctionne que sur la copie de travail" -#: builtin/grep.c:1117 +#: builtin/grep.c:1119 msgid "option not supported with --recurse-submodules" msgstr "option non supportée avec --recurse-submodules" -#: builtin/grep.c:1123 +#: builtin/grep.c:1125 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached ou --untracked ne peuvent pas être utilisés avec --no-index" -#: builtin/grep.c:1129 +#: builtin/grep.c:1131 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard ne peut pas être utilisé avec du contenu suivi" -#: builtin/grep.c:1137 +#: builtin/grep.c:1139 msgid "both --cached and trees are given" msgstr "--cached et des arbres sont fournis en même temps" @@ -14268,7 +14336,7 @@ msgstr "confusion extrême dans parse_pack_objects()" msgid "Resolving deltas" msgstr "Résolution des deltas" -#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497 +#: builtin/index-pack.c:1205 builtin/pack-objects.c:2481 #, c-format msgid "unable to create thread: %s" msgstr "impossible de créer le fil : %s" @@ -14334,7 +14402,7 @@ msgstr "impossible de stocker le fichier paquet" msgid "cannot store index file" msgstr "impossible de stocker le fichier d'index" -#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736 +#: builtin/index-pack.c:1525 builtin/pack-objects.c:2716 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "mauvais pack.indexversion=%<PRIu32>" @@ -14617,74 +14685,74 @@ msgstr "Sortie finale : %d %s\n" msgid "git show %s: bad file" msgstr "git show %s : fichier incorrect" -#: builtin/log.c:549 builtin/log.c:643 +#: builtin/log.c:549 builtin/log.c:644 #, c-format msgid "could not read object %s" msgstr "impossible de lire l'objet %s" -#: builtin/log.c:668 +#: builtin/log.c:669 #, c-format msgid "unknown type: %d" msgstr "type inconnu : %d" -#: builtin/log.c:791 +#: builtin/log.c:792 msgid "format.headers without value" msgstr "format.headers sans valeur" -#: builtin/log.c:908 +#: builtin/log.c:909 msgid "name of output directory is too long" msgstr "le nom du répertoire de sortie est trop long" -#: builtin/log.c:924 +#: builtin/log.c:925 #, c-format msgid "cannot open patch file %s" msgstr "impossible d'ouvrir le fichier correctif %s" -#: builtin/log.c:941 +#: builtin/log.c:942 msgid "need exactly one range" msgstr "exactement une plage nécessaire" -#: builtin/log.c:951 +#: builtin/log.c:952 msgid "not a range" msgstr "ceci n'est pas une plage" -#: builtin/log.c:1074 +#: builtin/log.c:1075 msgid "cover letter needs email format" msgstr "la lettre de motivation doit être au format courriel" -#: builtin/log.c:1080 +#: builtin/log.c:1081 msgid "failed to create cover-letter file" msgstr "échec de création du fichier de lettre de motivation" -#: builtin/log.c:1159 +#: builtin/log.c:1160 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to aberrant : %s" -#: builtin/log.c:1186 +#: builtin/log.c:1187 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]" -#: builtin/log.c:1244 +#: builtin/log.c:1245 msgid "two output directories?" msgstr "deux répertoires de sortie ?" -#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113 +#: builtin/log.c:1356 builtin/log.c:2116 builtin/log.c:2118 builtin/log.c:2130 #, c-format msgid "unknown commit %s" msgstr "commit inconnu %s" -#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1366 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "échec à résoudre '%s' comme une référence valide" -#: builtin/log.c:1370 +#: builtin/log.c:1371 msgid "could not find exact merge base" msgstr "impossible de trouver la base de fusion exacte" -#: builtin/log.c:1374 +#: builtin/log.c:1375 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" @@ -14697,275 +14765,275 @@ msgstr "" "Ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> " "manuellement" -#: builtin/log.c:1394 +#: builtin/log.c:1395 msgid "failed to find exact merge base" msgstr "échec à trouver la base de fusion exacte" -#: builtin/log.c:1405 +#: builtin/log.c:1406 msgid "base commit should be the ancestor of revision list" msgstr "le commit de base devrait être l'ancêtre de la liste de révisions" -#: builtin/log.c:1409 +#: builtin/log.c:1410 msgid "base commit shouldn't be in revision list" msgstr "le commit de base ne devrait pas faire partie de la liste de révisions" -#: builtin/log.c:1462 +#: builtin/log.c:1463 msgid "cannot get patch id" msgstr "impossible d'obtenir l'id du patch" -#: builtin/log.c:1514 +#: builtin/log.c:1515 msgid "failed to infer range-diff ranges" msgstr "échec d'inférence d'intervalles de différence d'intervalles" -#: builtin/log.c:1559 +#: builtin/log.c:1560 msgid "use [PATCH n/m] even with a single patch" msgstr "utiliser [PATCH n/m] même avec un patch unique" -#: builtin/log.c:1562 +#: builtin/log.c:1563 msgid "use [PATCH] even with multiple patches" msgstr "utiliser [PATCH] même avec des patchs multiples" -#: builtin/log.c:1566 +#: builtin/log.c:1567 msgid "print patches to standard out" msgstr "afficher les patchs sur la sortie standard" -#: builtin/log.c:1568 +#: builtin/log.c:1569 msgid "generate a cover letter" msgstr "générer une lettre de motivation" -#: builtin/log.c:1570 +#: builtin/log.c:1571 msgid "use simple number sequence for output file names" msgstr "" "utiliser une séquence simple de nombres pour les nom des fichiers de sortie" -#: builtin/log.c:1571 +#: builtin/log.c:1572 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1572 +#: builtin/log.c:1573 msgid "use <sfx> instead of '.patch'" msgstr "utiliser <sfx> au lieu de '.patch'" -#: builtin/log.c:1574 +#: builtin/log.c:1575 msgid "start numbering patches at <n> instead of 1" msgstr "démarrer la numérotation des patchs à <n> au lieu de 1" -#: builtin/log.c:1576 +#: builtin/log.c:1577 msgid "mark the series as Nth re-roll" msgstr "marquer la série comme une Nième réédition" -#: builtin/log.c:1578 +#: builtin/log.c:1579 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "utiliser [RFC PATCH] au lieu de [PATCH]" -#: builtin/log.c:1581 +#: builtin/log.c:1582 msgid "Use [<prefix>] instead of [PATCH]" msgstr "utiliser [<préfixe>] au lieu de [PATCH]" -#: builtin/log.c:1584 +#: builtin/log.c:1585 msgid "store resulting files in <dir>" msgstr "stocker les fichiers résultats dans <répertoire>" -#: builtin/log.c:1587 +#: builtin/log.c:1588 msgid "don't strip/add [PATCH]" msgstr "ne pas retirer/ajouter [PATCH]" -#: builtin/log.c:1590 +#: builtin/log.c:1591 msgid "don't output binary diffs" msgstr "ne pas imprimer les diffs binaires" -#: builtin/log.c:1592 +#: builtin/log.c:1593 msgid "output all-zero hash in From header" msgstr "écrire une empreinte à zéro dans l'entête From" -#: builtin/log.c:1594 +#: builtin/log.c:1595 msgid "don't include a patch matching a commit upstream" msgstr "ne pas inclure un patch correspondant à un commit amont" -#: builtin/log.c:1596 +#: builtin/log.c:1597 msgid "show patch format instead of default (patch + stat)" msgstr "afficher le format du patch au lieu du défaut (patch + stat)" -#: builtin/log.c:1598 +#: builtin/log.c:1599 msgid "Messaging" msgstr "Communication" -#: builtin/log.c:1599 +#: builtin/log.c:1600 msgid "header" msgstr "en-tête" -#: builtin/log.c:1600 +#: builtin/log.c:1601 msgid "add email header" msgstr "ajouter l'en-tête de courriel" -#: builtin/log.c:1601 builtin/log.c:1603 +#: builtin/log.c:1602 builtin/log.c:1604 msgid "email" msgstr "courriel" -#: builtin/log.c:1601 +#: builtin/log.c:1602 msgid "add To: header" msgstr "ajouter l'en-tête \"To:\"" -#: builtin/log.c:1603 +#: builtin/log.c:1604 msgid "add Cc: header" msgstr "ajouter l'en-tête \"Cc:\"" -#: builtin/log.c:1605 +#: builtin/log.c:1606 msgid "ident" msgstr "ident" -#: builtin/log.c:1606 +#: builtin/log.c:1607 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "renseigner l'adresse From à <ident> (ou à l'ident du validateur si absent)" -#: builtin/log.c:1608 +#: builtin/log.c:1609 msgid "message-id" msgstr "id-message" -#: builtin/log.c:1609 +#: builtin/log.c:1610 msgid "make first mail a reply to <message-id>" msgstr "répondre dans le premier message à <id-message>" -#: builtin/log.c:1610 builtin/log.c:1613 +#: builtin/log.c:1611 builtin/log.c:1614 msgid "boundary" msgstr "limite" -#: builtin/log.c:1611 +#: builtin/log.c:1612 msgid "attach the patch" msgstr "attacher le patch" -#: builtin/log.c:1614 +#: builtin/log.c:1615 msgid "inline the patch" msgstr "patch à l'intérieur" -#: builtin/log.c:1618 +#: builtin/log.c:1619 msgid "enable message threading, styles: shallow, deep" msgstr "" "activer l'enfilage de message, styles : shallow (superficiel), deep (profond)" -#: builtin/log.c:1620 +#: builtin/log.c:1621 msgid "signature" msgstr "signature" -#: builtin/log.c:1621 +#: builtin/log.c:1622 msgid "add a signature" msgstr "ajouter une signature" -#: builtin/log.c:1622 +#: builtin/log.c:1623 msgid "base-commit" msgstr "commit-de-base" -#: builtin/log.c:1623 +#: builtin/log.c:1624 msgid "add prerequisite tree info to the patch series" msgstr "Ajouter un arbre prérequis à la série de patchs" -#: builtin/log.c:1625 +#: builtin/log.c:1626 msgid "add a signature from a file" msgstr "ajouter une signature depuis un fichier" -#: builtin/log.c:1626 +#: builtin/log.c:1627 msgid "don't print the patch filenames" msgstr "ne pas afficher les noms de fichiers des patchs" -#: builtin/log.c:1628 +#: builtin/log.c:1629 msgid "show progress while generating patches" msgstr "" "afficher la barre de progression durant la phase de génération des patchs" -#: builtin/log.c:1630 +#: builtin/log.c:1631 msgid "show changes against <rev> in cover letter or single patch" msgstr "" "afficher les modifications par rapport à <rév> dans la première page ou une " "rustine" -#: builtin/log.c:1633 +#: builtin/log.c:1634 msgid "show changes against <refspec> in cover letter or single patch" msgstr "" "afficher les modifications par rapport à <refspec> dans la première page ou " "une rustine" -#: builtin/log.c:1635 +#: builtin/log.c:1636 msgid "percentage by which creation is weighted" msgstr "pourcentage par lequel la création est pondérée" -#: builtin/log.c:1710 +#: builtin/log.c:1711 #, c-format msgid "invalid ident line: %s" msgstr "ligne d'identification invalide : %s" -#: builtin/log.c:1725 +#: builtin/log.c:1726 msgid "-n and -k are mutually exclusive" msgstr "-n et -k sont mutuellement exclusifs" -#: builtin/log.c:1727 +#: builtin/log.c:1728 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc et -k sont mutuellement exclusifs" -#: builtin/log.c:1735 +#: builtin/log.c:1736 msgid "--name-only does not make sense" msgstr "--name-only n'a pas de sens" -#: builtin/log.c:1737 +#: builtin/log.c:1738 msgid "--name-status does not make sense" msgstr "--name-status n'a pas de sens" -#: builtin/log.c:1739 +#: builtin/log.c:1740 msgid "--check does not make sense" msgstr "--check n'a pas de sens" -#: builtin/log.c:1771 +#: builtin/log.c:1773 msgid "standard output, or directory, which one?" msgstr "sortie standard, ou répertoire, lequel ?" -#: builtin/log.c:1860 +#: builtin/log.c:1877 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff requiert --cover-letter ou une rustine unique" -#: builtin/log.c:1864 +#: builtin/log.c:1881 msgid "Interdiff:" msgstr "Interdiff :" -#: builtin/log.c:1865 +#: builtin/log.c:1882 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff contre v%d :" -#: builtin/log.c:1871 +#: builtin/log.c:1888 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor requiert --range-diff" -#: builtin/log.c:1875 +#: builtin/log.c:1892 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff requiert --cover-letter ou une rustine unique" -#: builtin/log.c:1883 +#: builtin/log.c:1900 msgid "Range-diff:" msgstr "Diff-intervalle :" -#: builtin/log.c:1884 +#: builtin/log.c:1901 #, c-format msgid "Range-diff against v%d:" msgstr "Diff-intervalle contre v%d :" -#: builtin/log.c:1895 +#: builtin/log.c:1912 #, c-format msgid "unable to read signature file '%s'" msgstr "lecture du fichier de signature '%s' impossible" -#: builtin/log.c:1931 +#: builtin/log.c:1948 msgid "Generating patches" msgstr "Génération des patchs" -#: builtin/log.c:1975 +#: builtin/log.c:1992 msgid "failed to create output files" msgstr "échec de création des fichiers en sortie" -#: builtin/log.c:2034 +#: builtin/log.c:2051 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]" -#: builtin/log.c:2088 +#: builtin/log.c:2105 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -15094,7 +15162,7 @@ msgstr "" msgid "do not print remote URL" msgstr "ne pas afficher les URL distantes" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1488 msgid "exec" msgstr "exécutable" @@ -15207,33 +15275,33 @@ msgstr "Les stratégies disponibles sont :" msgid "Available custom strategies are:" msgstr "Les stratégies personnalisées sont :" -#: builtin/merge.c:244 builtin/pull.c:151 +#: builtin/merge.c:244 builtin/pull.c:152 msgid "do not show a diffstat at the end of the merge" msgstr "ne pas afficher un diffstat à la fin de la fusion" -#: builtin/merge.c:247 builtin/pull.c:154 +#: builtin/merge.c:247 builtin/pull.c:155 msgid "show a diffstat at the end of the merge" msgstr "afficher un diffstat à la fin de la fusion" -#: builtin/merge.c:248 builtin/pull.c:157 +#: builtin/merge.c:248 builtin/pull.c:158 msgid "(synonym to --stat)" msgstr "(synonyme de --stat)" -#: builtin/merge.c:250 builtin/pull.c:160 +#: builtin/merge.c:250 builtin/pull.c:161 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "ajouter (au plus <n>) éléments du journal court au message de validation de " "la fusion" -#: builtin/merge.c:253 builtin/pull.c:166 +#: builtin/merge.c:253 builtin/pull.c:167 msgid "create a single commit instead of doing a merge" msgstr "créer une validation unique au lieu de faire une fusion" -#: builtin/merge.c:255 builtin/pull.c:169 +#: builtin/merge.c:255 builtin/pull.c:170 msgid "perform a commit if the merge succeeds (default)" msgstr "effectuer une validation si la fusion réussit (défaut)" -#: builtin/merge.c:257 builtin/pull.c:172 +#: builtin/merge.c:257 builtin/pull.c:173 msgid "edit message before committing" msgstr "éditer le message avant la validation" @@ -15241,28 +15309,28 @@ msgstr "éditer le message avant la validation" msgid "allow fast-forward (default)" msgstr "autoriser l'avance rapide (défaut)" -#: builtin/merge.c:261 builtin/pull.c:179 +#: builtin/merge.c:261 builtin/pull.c:180 msgid "abort if fast-forward is not possible" msgstr "abandonner si l'avance rapide n'est pas possible" -#: builtin/merge.c:265 builtin/pull.c:182 +#: builtin/merge.c:265 builtin/pull.c:183 msgid "verify that the named commit has a valid GPG signature" msgstr "vérifier que le commit nommé a une signature GPG valide" -#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186 -#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114 +#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:187 +#: builtin/rebase.c:493 builtin/rebase.c:1501 builtin/revert.c:114 msgid "strategy" msgstr "stratégie" -#: builtin/merge.c:267 builtin/pull.c:187 +#: builtin/merge.c:267 builtin/pull.c:188 msgid "merge strategy to use" msgstr "stratégie de fusion à utiliser" -#: builtin/merge.c:268 builtin/pull.c:190 +#: builtin/merge.c:268 builtin/pull.c:191 msgid "option=value" msgstr "option=valeur" -#: builtin/merge.c:269 builtin/pull.c:191 +#: builtin/merge.c:269 builtin/pull.c:192 msgid "option for selected merge strategy" msgstr "option pour la stratégie de fusion sélectionnée" @@ -15283,13 +15351,13 @@ msgstr "--abort mais laisser l'index et l'arbre de travail inchangés" msgid "continue the current in-progress merge" msgstr "continuer la fusion en cours" -#: builtin/merge.c:284 builtin/pull.c:198 +#: builtin/merge.c:284 builtin/pull.c:199 msgid "allow merging unrelated histories" msgstr "permettre la fusion d'historiques sans rapport" #: builtin/merge.c:290 -msgid "verify commit-msg hook" -msgstr "vérifier le crochet commit-msg" +msgid "bypass pre-merge-commit and commit-msg hooks" +msgstr "ne pas utiliser les crochets pre-merge-commit et commit-msg" #: builtin/merge.c:307 msgid "could not run stash." @@ -15332,33 +15400,33 @@ msgstr "'%s' ne pointe pas sur un commit" msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s" -#: builtin/merge.c:708 +#: builtin/merge.c:705 msgid "Not handling anything other than two heads merge." msgstr "Impossible de gérer autre chose que la fusion de deux têtes." -#: builtin/merge.c:722 +#: builtin/merge.c:719 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Options inconnue pour merge-recursive : -X%s" -#: builtin/merge.c:737 +#: builtin/merge.c:734 #, c-format msgid "unable to write %s" msgstr "impossible d'écrire %s" -#: builtin/merge.c:789 +#: builtin/merge.c:786 #, c-format msgid "Could not read from '%s'" msgstr "Impossible de lire depuis '%s'" -#: builtin/merge.c:798 +#: builtin/merge.c:795 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Pas de validation de la fusion ; utilisez 'git commit' pour terminer la " "fusion.\n" -#: builtin/merge.c:804 +#: builtin/merge.c:801 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" @@ -15370,11 +15438,11 @@ msgstr "" "branche de sujet.\n" "\n" -#: builtin/merge.c:809 +#: builtin/merge.c:806 msgid "An empty message aborts the commit.\n" msgstr "Un message vide abandonne la validation.\n" -#: builtin/merge.c:812 +#: builtin/merge.c:809 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -15383,74 +15451,74 @@ msgstr "" "Les lignes commençant par '%c' seront ignorées, et un message vide\n" "abandonne la validation.\n" -#: builtin/merge.c:853 +#: builtin/merge.c:862 msgid "Empty commit message." msgstr "Message de validation vide." -#: builtin/merge.c:872 +#: builtin/merge.c:877 #, c-format msgid "Wonderful.\n" msgstr "Merveilleux.\n" -#: builtin/merge.c:933 +#: builtin/merge.c:938 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "La fusion automatique a échoué ; réglez les conflits et validez le " "résultat.\n" -#: builtin/merge.c:972 +#: builtin/merge.c:977 msgid "No current branch." msgstr "Pas de branche courante." -#: builtin/merge.c:974 +#: builtin/merge.c:979 msgid "No remote for the current branch." msgstr "Pas de branche distante pour la branche courante." -#: builtin/merge.c:976 +#: builtin/merge.c:981 msgid "No default upstream defined for the current branch." msgstr "Pas de branche amont par défaut définie pour la branche courante." -#: builtin/merge.c:981 +#: builtin/merge.c:986 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Pas de branche de suivi pour %s depuis %s" -#: builtin/merge.c:1038 +#: builtin/merge.c:1043 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Mauvaise valeur '%s' dans l'environnement '%s'" -#: builtin/merge.c:1141 +#: builtin/merge.c:1146 #, c-format msgid "not something we can merge in %s: %s" msgstr "pas possible de fusionner ceci dans %s : %s" -#: builtin/merge.c:1175 +#: builtin/merge.c:1180 msgid "not something we can merge" msgstr "pas possible de fusionner ceci" -#: builtin/merge.c:1278 +#: builtin/merge.c:1283 msgid "--abort expects no arguments" msgstr "--abort n'accepte pas d'argument" -#: builtin/merge.c:1282 +#: builtin/merge.c:1287 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Il n'y a pas de fusion à abandonner (MERGE_HEAD manquant)." -#: builtin/merge.c:1291 +#: builtin/merge.c:1296 msgid "--quit expects no arguments" msgstr "--quit n'accepte pas d'argument" -#: builtin/merge.c:1304 +#: builtin/merge.c:1309 msgid "--continue expects no arguments" msgstr "--continue ne supporte aucun argument" -#: builtin/merge.c:1308 +#: builtin/merge.c:1313 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Il n'y a pas de fusion en cours (MERGE_HEAD manquant)." -#: builtin/merge.c:1324 +#: builtin/merge.c:1329 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15458,7 +15526,7 @@ msgstr "" "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n" "Veuillez valider vos modifications avant de pouvoir fusionner." -#: builtin/merge.c:1331 +#: builtin/merge.c:1336 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15466,98 +15534,98 @@ msgstr "" "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n" "Veuillez valider vos modifications avant de pouvoir fusionner." -#: builtin/merge.c:1334 +#: builtin/merge.c:1339 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe)." -#: builtin/merge.c:1348 +#: builtin/merge.c:1353 msgid "You cannot combine --squash with --no-ff." msgstr "Vous ne pouvez pas combiner --squash avec --no-ff." -#: builtin/merge.c:1350 +#: builtin/merge.c:1355 msgid "You cannot combine --squash with --commit." msgstr "Vous ne pouvez pas combiner --squash avec --commit." -#: builtin/merge.c:1366 +#: builtin/merge.c:1371 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "Pas de validation spécifiée et merge.defaultToUpstream n'est pas défini." -#: builtin/merge.c:1383 +#: builtin/merge.c:1388 msgid "Squash commit into empty head not supported yet" msgstr "La validation compressée vers une tête vide n'est pas encore supportée" -#: builtin/merge.c:1385 +#: builtin/merge.c:1390 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Une validation sans avance rapide n'a pas de sens dans une tête vide" -#: builtin/merge.c:1390 +#: builtin/merge.c:1395 #, c-format msgid "%s - not something we can merge" msgstr "%s - pas possible de fusionner ceci" -#: builtin/merge.c:1392 +#: builtin/merge.c:1397 msgid "Can merge only exactly one commit into empty head" msgstr "" "Possible de fusionner exactement une seule validation dans une tête vide" -#: builtin/merge.c:1471 +#: builtin/merge.c:1476 msgid "refusing to merge unrelated histories" msgstr "refus de fusionner des historiques sans relation" -#: builtin/merge.c:1480 +#: builtin/merge.c:1485 msgid "Already up to date." msgstr "Déjà à jour." -#: builtin/merge.c:1490 +#: builtin/merge.c:1495 #, c-format msgid "Updating %s..%s\n" msgstr "Mise à jour %s..%s\n" -#: builtin/merge.c:1532 +#: builtin/merge.c:1537 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Essai de fusion vraiment triviale dans l'index...\n" -#: builtin/merge.c:1539 +#: builtin/merge.c:1544 #, c-format msgid "Nope.\n" msgstr "Non.\n" -#: builtin/merge.c:1564 +#: builtin/merge.c:1569 msgid "Already up to date. Yeeah!" msgstr "Déjà à jour. Ouais !" -#: builtin/merge.c:1570 +#: builtin/merge.c:1575 msgid "Not possible to fast-forward, aborting." msgstr "Pas possible d'avancer rapidement, abandon." -#: builtin/merge.c:1593 builtin/merge.c:1658 +#: builtin/merge.c:1598 builtin/merge.c:1663 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Retour de l'arbre à l'original...\n" -#: builtin/merge.c:1597 +#: builtin/merge.c:1602 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Essai de la stratégie de fusion %s...\n" -#: builtin/merge.c:1649 +#: builtin/merge.c:1654 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Aucune stratégie de fusion n'a pris en charge la fusion.\n" -#: builtin/merge.c:1651 +#: builtin/merge.c:1656 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "La fusion avec la stratégie %s a échoué.\n" -#: builtin/merge.c:1660 +#: builtin/merge.c:1665 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Utilisation de %s pour préparer la résolution à la main.\n" -#: builtin/merge.c:1672 +#: builtin/merge.c:1677 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -15643,33 +15711,33 @@ msgstr "ne pas avertir à propos des conflits" msgid "set labels for file1/orig-file/file2" msgstr "définir les labels pour fichier1/fichier-orig/fichier2" -#: builtin/merge-recursive.c:46 +#: builtin/merge-recursive.c:47 #, c-format msgid "unknown option %s" msgstr "option inconnue %s" -#: builtin/merge-recursive.c:52 +#: builtin/merge-recursive.c:53 #, c-format msgid "could not parse object '%s'" msgstr "Impossible d'analyser l'objet '%s'" -#: builtin/merge-recursive.c:56 +#: builtin/merge-recursive.c:57 #, c-format msgid "cannot handle more than %d base. Ignoring %s." msgid_plural "cannot handle more than %d bases. Ignoring %s." msgstr[0] "impossible de gérer plus de %d base. %s ignoré." msgstr[1] "impossible de gérer plus de %d bases. %s ignoré." -#: builtin/merge-recursive.c:64 +#: builtin/merge-recursive.c:65 msgid "not handling anything other than two heads merge." msgstr "impossible de gérer autre chose que la fusion de deux têtes." -#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72 +#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76 #, c-format msgid "could not resolve ref '%s'" msgstr "impossible de résoudre la référence '%s'" -#: builtin/merge-recursive.c:78 +#: builtin/merge-recursive.c:82 #, c-format msgid "Merging %s with %s\n" msgstr "Fusion de %s avec %s\n" @@ -15814,53 +15882,53 @@ msgstr "%s, source=%s, destination=%s" msgid "Renaming %s to %s\n" msgstr "Renommage de %s en %s\n" -#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510 +#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:511 #, c-format msgid "renaming '%s' failed" msgstr "le renommage de '%s' a échoué" -#: builtin/name-rev.c:352 +#: builtin/name-rev.c:356 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<options>] <validation>..." -#: builtin/name-rev.c:353 +#: builtin/name-rev.c:357 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<options>] --all" -#: builtin/name-rev.c:354 +#: builtin/name-rev.c:358 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<options>] --stdin" -#: builtin/name-rev.c:411 +#: builtin/name-rev.c:415 msgid "print only names (no SHA-1)" msgstr "afficher seulement les noms (pas de SHA-1)" -#: builtin/name-rev.c:412 +#: builtin/name-rev.c:416 msgid "only use tags to name the commits" msgstr "utiliser seulement les étiquettes pour nommer les validations" -#: builtin/name-rev.c:414 +#: builtin/name-rev.c:418 msgid "only use refs matching <pattern>" msgstr "utiliser seulement les références correspondant à <motif>" -#: builtin/name-rev.c:416 +#: builtin/name-rev.c:420 msgid "ignore refs matching <pattern>" msgstr "ignorer les références correspondant à <motif>" -#: builtin/name-rev.c:418 +#: builtin/name-rev.c:422 msgid "list all commits reachable from all refs" msgstr "" "afficher toutes les validations accessibles depuis toutes les références" -#: builtin/name-rev.c:419 +#: builtin/name-rev.c:423 msgid "read from stdin" msgstr "lire depuis l'entrée standard" -#: builtin/name-rev.c:420 +#: builtin/name-rev.c:424 msgid "allow to print `undefined` names (default)" msgstr "autoriser l'affichage des noms `non définis` (par défaut)" -#: builtin/name-rev.c:426 +#: builtin/name-rev.c:430 msgid "dereference tags in the input (internal use)" msgstr "déréférencer les étiquettes en entrée (usage interne)" @@ -16260,7 +16328,7 @@ msgstr "" msgid "read object names from the standard input" msgstr "lire les noms d'objet depuis l'entrée standard" -#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165 +#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164 msgid "do not remove, show only" msgstr "ne pas supprimer, afficher seulement" @@ -16276,7 +16344,7 @@ msgstr "références-notes" msgid "use notes from <notes-ref>" msgstr "utiliser les notes depuis <références-notes>" -#: builtin/notes.c:1034 builtin/stash.c:1598 +#: builtin/notes.c:1034 builtin/stash.c:1607 #, c-format msgid "unknown subcommand: %s" msgstr "sous-commande inconnue : %s" @@ -16353,71 +16421,71 @@ msgstr "échec du stat de %s" msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "%<PRIu32> objets écrits, %<PRIu32> attendus" -#: builtin/pack-objects.c:1166 +#: builtin/pack-objects.c:1164 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "désactivation de l'écriture en bitmap car certains objets ne sont pas " "compressés" -#: builtin/pack-objects.c:1597 +#: builtin/pack-objects.c:1592 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "dépassement de décalage de base de delta pour %s" -#: builtin/pack-objects.c:1606 +#: builtin/pack-objects.c:1601 #, c-format msgid "delta base offset out of bound for %s" msgstr "décalage de base de delta est hors limite pour %s" -#: builtin/pack-objects.c:1875 +#: builtin/pack-objects.c:1870 msgid "Counting objects" msgstr "Décompte des objets" -#: builtin/pack-objects.c:2005 +#: builtin/pack-objects.c:2000 #, c-format msgid "unable to get size of %s" msgstr "impossible de récupérer la taille de %s" -#: builtin/pack-objects.c:2020 +#: builtin/pack-objects.c:2015 #, c-format msgid "unable to parse object header of %s" msgstr "impossible d'analyser l'entête d'objet de %s" -#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106 -#: builtin/pack-objects.c:2116 +#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2101 +#: builtin/pack-objects.c:2111 #, c-format msgid "object %s cannot be read" msgstr "l'objet %s ne peut être lu" -#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120 +#: builtin/pack-objects.c:2088 builtin/pack-objects.c:2115 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "" "objet %s longueur de l'objet inconsistante (%<PRIuMAX> contre %<PRIuMAX>)" -#: builtin/pack-objects.c:2130 +#: builtin/pack-objects.c:2125 msgid "suboptimal pack - out of memory" msgstr "paquet sous-optimal - mémoire insuffisante" -#: builtin/pack-objects.c:2456 +#: builtin/pack-objects.c:2440 #, c-format msgid "Delta compression using up to %d threads" msgstr "Compression par delta en utilisant jusqu'à %d fils d'exécution" -#: builtin/pack-objects.c:2588 +#: builtin/pack-objects.c:2572 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "impossible d'empaqueter les objets joignables depuis l'étiquette %s" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2659 msgid "Compressing objects" msgstr "Compression des objets" -#: builtin/pack-objects.c:2681 +#: builtin/pack-objects.c:2665 msgid "inconsistency with delta count" msgstr "inconsistance dans le compte de delta" -#: builtin/pack-objects.c:2762 +#: builtin/pack-objects.c:2742 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -16426,7 +16494,7 @@ msgstr "" "ID d'objet de bord attendu, reçu des données illisibles :\n" "%s" -#: builtin/pack-objects.c:2768 +#: builtin/pack-objects.c:2748 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -16435,252 +16503,252 @@ msgstr "" "ID d'objet attendu, reçu des données illisibles :\n" "%s" -#: builtin/pack-objects.c:2866 +#: builtin/pack-objects.c:2846 msgid "invalid value for --missing" msgstr "valeur invalide pour --missing" -#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033 +#: builtin/pack-objects.c:2905 builtin/pack-objects.c:3013 msgid "cannot open pack index" msgstr "impossible d'ouvrir l'index de paquet" -#: builtin/pack-objects.c:2956 +#: builtin/pack-objects.c:2936 #, c-format msgid "loose object at %s could not be examined" msgstr "l'objet libre à %s n'a pas pu être examiné" -#: builtin/pack-objects.c:3041 +#: builtin/pack-objects.c:3021 msgid "unable to force loose object" msgstr "impossible de forcer l'objet libre" -#: builtin/pack-objects.c:3133 +#: builtin/pack-objects.c:3113 #, c-format msgid "not a rev '%s'" msgstr "'%s' n'est pas une révision" -#: builtin/pack-objects.c:3136 +#: builtin/pack-objects.c:3116 #, c-format msgid "bad revision '%s'" msgstr "mauvaise révision '%s'" -#: builtin/pack-objects.c:3161 +#: builtin/pack-objects.c:3141 msgid "unable to add recent objects" msgstr "impossible d'ajouter les objets récents" -#: builtin/pack-objects.c:3214 +#: builtin/pack-objects.c:3194 #, c-format msgid "unsupported index version %s" msgstr "version d'index non supportée %s" -#: builtin/pack-objects.c:3218 +#: builtin/pack-objects.c:3198 #, c-format msgid "bad index version '%s'" msgstr "mauvaise version d'index '%s'" -#: builtin/pack-objects.c:3248 +#: builtin/pack-objects.c:3228 msgid "do not show progress meter" msgstr "ne pas afficher la barre de progression" -#: builtin/pack-objects.c:3250 +#: builtin/pack-objects.c:3230 msgid "show progress meter" msgstr "afficher la barre de progression" -#: builtin/pack-objects.c:3252 +#: builtin/pack-objects.c:3232 msgid "show progress meter during object writing phase" msgstr "afficher la barre de progression durant la phase d'écrite des objets" -#: builtin/pack-objects.c:3255 +#: builtin/pack-objects.c:3235 msgid "similar to --all-progress when progress meter is shown" msgstr "similaire à --all-progress quand la barre de progression est affichée" -#: builtin/pack-objects.c:3256 +#: builtin/pack-objects.c:3236 msgid "<version>[,<offset>]" msgstr "<version>[,<décalage>]" -#: builtin/pack-objects.c:3257 +#: builtin/pack-objects.c:3237 msgid "write the pack index file in the specified idx format version" msgstr "" "écrire le fichier d'index du paquet dans le format d'index de version " "spécifié" -#: builtin/pack-objects.c:3260 +#: builtin/pack-objects.c:3240 msgid "maximum size of each output pack file" msgstr "taille maximum de chaque fichier paquet en sortie" -#: builtin/pack-objects.c:3262 +#: builtin/pack-objects.c:3242 msgid "ignore borrowed objects from alternate object store" msgstr "ignorer les objets empruntés à un autre magasin d'objets" -#: builtin/pack-objects.c:3264 +#: builtin/pack-objects.c:3244 msgid "ignore packed objects" msgstr "ignorer les objets empaquetés" -#: builtin/pack-objects.c:3266 +#: builtin/pack-objects.c:3246 msgid "limit pack window by objects" msgstr "limiter la fenêtre d'empaquetage par objets" -#: builtin/pack-objects.c:3268 +#: builtin/pack-objects.c:3248 msgid "limit pack window by memory in addition to object limit" msgstr "" "limiter la fenêtre d'empaquetage par mémoire en plus de la limite d'objets" -#: builtin/pack-objects.c:3270 +#: builtin/pack-objects.c:3250 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" "longueur maximum de la chaîne de delta autorisée dans le paquet résultant" -#: builtin/pack-objects.c:3272 +#: builtin/pack-objects.c:3252 msgid "reuse existing deltas" msgstr "réutiliser les deltas existants" -#: builtin/pack-objects.c:3274 +#: builtin/pack-objects.c:3254 msgid "reuse existing objects" msgstr "réutiliser les objets existants" -#: builtin/pack-objects.c:3276 +#: builtin/pack-objects.c:3256 msgid "use OFS_DELTA objects" msgstr "utiliser les objets OFS_DELTA" -#: builtin/pack-objects.c:3278 +#: builtin/pack-objects.c:3258 msgid "use threads when searching for best delta matches" msgstr "" "utiliser des fils lors de la recherche pour une meilleure correspondance des " "deltas" -#: builtin/pack-objects.c:3280 +#: builtin/pack-objects.c:3260 msgid "do not create an empty pack output" msgstr "ne pas créer un paquet vide" -#: builtin/pack-objects.c:3282 +#: builtin/pack-objects.c:3262 msgid "read revision arguments from standard input" msgstr "lire les paramètres de révision depuis l'entrée standard" -#: builtin/pack-objects.c:3284 +#: builtin/pack-objects.c:3264 msgid "limit the objects to those that are not yet packed" msgstr "limiter les objets à ceux qui ne sont pas encore empaquetés" -#: builtin/pack-objects.c:3287 +#: builtin/pack-objects.c:3267 msgid "include objects reachable from any reference" msgstr "inclure les objets accessibles depuis toute référence" -#: builtin/pack-objects.c:3290 +#: builtin/pack-objects.c:3270 msgid "include objects referred by reflog entries" msgstr "inclure les objets référencés par les éléments de reflog" -#: builtin/pack-objects.c:3293 +#: builtin/pack-objects.c:3273 msgid "include objects referred to by the index" msgstr "inclure les objets référencés par l'index" -#: builtin/pack-objects.c:3296 +#: builtin/pack-objects.c:3276 msgid "output pack to stdout" msgstr "afficher l'empaquetage sur la sortie standard" -#: builtin/pack-objects.c:3298 +#: builtin/pack-objects.c:3278 msgid "include tag objects that refer to objects to be packed" msgstr "inclure les objets d'étiquettes qui réfèrent à des objets à empaqueter" -#: builtin/pack-objects.c:3300 +#: builtin/pack-objects.c:3280 msgid "keep unreachable objects" msgstr "garder les objets inaccessibles" -#: builtin/pack-objects.c:3302 +#: builtin/pack-objects.c:3282 msgid "pack loose unreachable objects" msgstr "empaqueter les objets inaccessibles détachés" -#: builtin/pack-objects.c:3304 +#: builtin/pack-objects.c:3284 msgid "unpack unreachable objects newer than <time>" msgstr "dépaqueter les objets inaccessibles plus récents que <heure>" -#: builtin/pack-objects.c:3307 +#: builtin/pack-objects.c:3287 msgid "use the sparse reachability algorithm" msgstr "utiliser l'algorithme de joignabilité creuse" -#: builtin/pack-objects.c:3309 +#: builtin/pack-objects.c:3289 msgid "create thin packs" msgstr "créer des paquets légers" -#: builtin/pack-objects.c:3311 +#: builtin/pack-objects.c:3291 msgid "create packs suitable for shallow fetches" msgstr "créer des paquets permettant des récupérations superficielles" -#: builtin/pack-objects.c:3313 +#: builtin/pack-objects.c:3293 msgid "ignore packs that have companion .keep file" msgstr "ignorer les paquets qui ont un fichier .keep" -#: builtin/pack-objects.c:3315 +#: builtin/pack-objects.c:3295 msgid "ignore this pack" msgstr "ignorer ce paquet" -#: builtin/pack-objects.c:3317 +#: builtin/pack-objects.c:3297 msgid "pack compression level" msgstr "niveau de compression du paquet" -#: builtin/pack-objects.c:3319 +#: builtin/pack-objects.c:3299 msgid "do not hide commits by grafts" msgstr "ne pas cacher les validations par greffes" -#: builtin/pack-objects.c:3321 +#: builtin/pack-objects.c:3301 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "utiliser un index en bitmap si disponible pour accélerer le décompte des " "objets" -#: builtin/pack-objects.c:3323 +#: builtin/pack-objects.c:3303 msgid "write a bitmap index together with the pack index" msgstr "écrire un index en bitmap associé à l'index de paquet" -#: builtin/pack-objects.c:3327 +#: builtin/pack-objects.c:3307 msgid "write a bitmap index if possible" msgstr "écrire un index de bitmap si possible" -#: builtin/pack-objects.c:3331 +#: builtin/pack-objects.c:3311 msgid "handling for missing objects" msgstr "gestion des objets manquants" -#: builtin/pack-objects.c:3334 +#: builtin/pack-objects.c:3314 msgid "do not pack objects in promisor packfiles" msgstr "ne pas empaqueter les objets dans les fichiers paquets prometteurs" -#: builtin/pack-objects.c:3336 +#: builtin/pack-objects.c:3316 msgid "respect islands during delta compression" msgstr "respecter les îlots pendant la compression des deltas" -#: builtin/pack-objects.c:3361 +#: builtin/pack-objects.c:3345 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "la profondeur %d de chaîne de delta est trop grande, forcée à %d" -#: builtin/pack-objects.c:3366 +#: builtin/pack-objects.c:3350 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "pack.deltaCacheLimit est trop grand, forcé à %d" -#: builtin/pack-objects.c:3420 +#: builtin/pack-objects.c:3404 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" "--max-pack-size ne peut pas être utilisé pour construire un paquet à " "transférer" -#: builtin/pack-objects.c:3422 +#: builtin/pack-objects.c:3406 msgid "minimum pack size limit is 1 MiB" msgstr "la taille limite minimale d'un paquet est 1 MiB" -#: builtin/pack-objects.c:3427 +#: builtin/pack-objects.c:3411 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin ne peut pas être utilisé pour construire un paquet indexable" -#: builtin/pack-objects.c:3430 +#: builtin/pack-objects.c:3414 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable et --unpack-unreachable sont incompatibles" -#: builtin/pack-objects.c:3436 +#: builtin/pack-objects.c:3420 msgid "cannot use --filter without --stdout" msgstr "impossible d'utiliser --filter sans --stdout" -#: builtin/pack-objects.c:3497 +#: builtin/pack-objects.c:3481 msgid "Enumerating objects" msgstr "Énumération des objets" -#: builtin/pack-objects.c:3527 +#: builtin/pack-objects.c:3511 #, c-format msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" msgstr "" @@ -16735,44 +16803,44 @@ msgstr "Valeur invalide pour %s : %s" msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<options>] [<dépôt> [<spécification-de-référence>...]]" -#: builtin/pull.c:141 +#: builtin/pull.c:142 msgid "control for recursive fetching of submodules" msgstr "contrôler la récupération récursive dans les sous-modules" -#: builtin/pull.c:145 +#: builtin/pull.c:146 msgid "Options related to merging" msgstr "Options relatives à la fusion" -#: builtin/pull.c:148 +#: builtin/pull.c:149 msgid "incorporate changes by rebasing rather than merging" msgstr "incorporer les modifications en rebasant plutôt qu'en fusionnant" -#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126 +#: builtin/pull.c:177 builtin/rebase.c:448 builtin/revert.c:126 msgid "allow fast-forward" msgstr "autoriser l'avance rapide" -#: builtin/pull.c:185 +#: builtin/pull.c:186 msgid "automatically stash/stash pop before and after rebase" msgstr "remiser avant et réappliquer après le rebasage automatiquement" -#: builtin/pull.c:201 +#: builtin/pull.c:202 msgid "Options related to fetching" msgstr "Options relatives au rapatriement" -#: builtin/pull.c:211 +#: builtin/pull.c:212 msgid "force overwrite of local branch" msgstr "forcer l'écrasement de la branche locale" -#: builtin/pull.c:219 +#: builtin/pull.c:220 msgid "number of submodules pulled in parallel" msgstr "nombre de sous-modules tirés en parallèle" -#: builtin/pull.c:316 +#: builtin/pull.c:320 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Valeur invalide pour pull.ff : %s" -#: builtin/pull.c:433 +#: builtin/pull.c:437 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -16780,14 +16848,14 @@ msgstr "" "Il n'y a pas de candidate sur laquelle rebaser parmi les références que vous " "venez de récupérer." -#: builtin/pull.c:435 +#: builtin/pull.c:439 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "Il n'y a pas de candidate avec laquelle fusionner parmi les références que " "vous venez de récupérer." -#: builtin/pull.c:436 +#: builtin/pull.c:440 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -16795,7 +16863,7 @@ msgstr "" "Généralement, cela signifie que vous avez indiqué un spécificateur\n" "de référence joker qui n'a pas eu de correspondance sur le serveur distant." -#: builtin/pull.c:439 +#: builtin/pull.c:443 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -16807,44 +16875,44 @@ msgstr "" "configuration\n" "pour la branche actuelle, vous devez spécifier la branche avec la commande." -#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73 +#: builtin/pull.c:448 builtin/rebase.c:1347 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Vous n'êtes actuellement sur aucune branche." -#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79 +#: builtin/pull.c:450 builtin/pull.c:465 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Veuillez spécifier sur quelle branche vous souhaiter rebaser." -#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82 +#: builtin/pull.c:452 builtin/pull.c:467 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Veuillez spécifier une branche avec laquelle fusionner." -#: builtin/pull.c:449 builtin/pull.c:464 +#: builtin/pull.c:453 builtin/pull.c:468 msgid "See git-pull(1) for details." msgstr "Référez-vous à git-pull(1) pour de plus amples détails." -#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466 -#: builtin/rebase.c:1332 git-parse-remote.sh:64 +#: builtin/pull.c:455 builtin/pull.c:461 builtin/pull.c:470 +#: builtin/rebase.c:1353 git-parse-remote.sh:64 msgid "<remote>" msgstr "<distant>" -#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471 +#: builtin/pull.c:455 builtin/pull.c:470 builtin/pull.c:475 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<branche>" -#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75 +#: builtin/pull.c:463 builtin/rebase.c:1345 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "Pas d'information de suivi distant pour la branche actuelle." -#: builtin/pull.c:468 git-parse-remote.sh:95 +#: builtin/pull.c:472 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" "Si vous souhaitez indiquer l'information de suivi distant pour cette " "branche, vous pouvez le faire avec :" -#: builtin/pull.c:473 +#: builtin/pull.c:477 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -16854,34 +16922,34 @@ msgstr "" "'%s'\n" "du serveur distant, mais cette référence n'a pas été récupérée." -#: builtin/pull.c:581 +#: builtin/pull.c:587 #, c-format msgid "unable to access commit %s" msgstr "impossible d'accéder le commit %s" -#: builtin/pull.c:861 +#: builtin/pull.c:867 msgid "ignoring --verify-signatures for rebase" msgstr "--verify-signatures est ignoré pour un rebasage" -#: builtin/pull.c:916 +#: builtin/pull.c:922 msgid "--[no-]autostash option is only valid with --rebase." msgstr "l'option --[no-]autostash n'est valide qu'avec --rebase." -#: builtin/pull.c:924 +#: builtin/pull.c:930 msgid "Updating an unborn branch with changes added to the index." msgstr "" "Mise à jour d'une branche non encore créée avec les changements ajoutés dans " "l'index." -#: builtin/pull.c:928 +#: builtin/pull.c:934 msgid "pull with rebase" msgstr "tirer avec un rebasage" -#: builtin/pull.c:929 +#: builtin/pull.c:935 msgid "please commit or stash them." msgstr "veuillez les valider ou les remiser." -#: builtin/pull.c:954 +#: builtin/pull.c:960 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -16892,7 +16960,7 @@ msgstr "" "avance rapide de votre copie de travail\n" "depuis le commit %s." -#: builtin/pull.c:960 +#: builtin/pull.c:966 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -16909,15 +16977,15 @@ msgstr "" "$ git reset --hard\n" "pour régénérer." -#: builtin/pull.c:975 +#: builtin/pull.c:981 msgid "Cannot merge multiple branches into empty head." msgstr "Impossible de fusionner de multiples branches sur une tête vide." -#: builtin/pull.c:979 +#: builtin/pull.c:985 msgid "Cannot rebase onto multiple branches." msgstr "Impossible de rebaser sur de multiples branches." -#: builtin/pull.c:986 +#: builtin/pull.c:992 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "impossible de rebaser avec des modifications de sous-modules enregistrées " @@ -17093,137 +17161,137 @@ msgstr "" msgid "Pushing to %s\n" msgstr "Poussée vers %s\n" -#: builtin/push.c:364 +#: builtin/push.c:366 #, c-format msgid "failed to push some refs to '%s'" msgstr "impossible de pousser des références vers '%s'" -#: builtin/push.c:398 -#, c-format -msgid "bad repository '%s'" -msgstr "mauvais dépôt '%s'" - -#: builtin/push.c:399 -msgid "" -"No configured push destination.\n" -"Either specify the URL from the command-line or configure a remote " -"repository using\n" -"\n" -" git remote add <name> <url>\n" -"\n" -"and then push using the remote name\n" -"\n" -" git push <name>\n" -msgstr "" -"Pas de destination pour pousser.\n" -"Spécifiez une URL depuis la ligne de commande ou configurez un dépôt distant " -"en utilisant\n" -"\n" -" git remote add <nom> <url>\n" -"\n" -"et poussez alors en utilisant le dépôt distant\n" -"\n" -" git push <nom>\n" - -#: builtin/push.c:554 +#: builtin/push.c:541 msgid "repository" msgstr "dépôt" -#: builtin/push.c:555 builtin/send-pack.c:164 +#: builtin/push.c:542 builtin/send-pack.c:164 msgid "push all refs" msgstr "pousser toutes les références" -#: builtin/push.c:556 builtin/send-pack.c:166 +#: builtin/push.c:543 builtin/send-pack.c:166 msgid "mirror all refs" msgstr "refléter toutes les références" -#: builtin/push.c:558 +#: builtin/push.c:545 msgid "delete refs" msgstr "supprimer les références" -#: builtin/push.c:559 +#: builtin/push.c:546 msgid "push tags (can't be used with --all or --mirror)" msgstr "" "pousser les étiquettes (ne peut pas être utilisé avec --all ou --mirror)" -#: builtin/push.c:562 builtin/send-pack.c:167 +#: builtin/push.c:549 builtin/send-pack.c:167 msgid "force updates" msgstr "forcer les mises à jour" -#: builtin/push.c:564 builtin/send-pack.c:181 +#: builtin/push.c:551 builtin/send-pack.c:181 msgid "<refname>:<expect>" msgstr "<nom-de-ref>:<attendu>" -#: builtin/push.c:565 builtin/send-pack.c:182 +#: builtin/push.c:552 builtin/send-pack.c:182 msgid "require old value of ref to be at this value" msgstr "exiger que l'ancienne valeur de la référence soit à cette valeur" -#: builtin/push.c:568 +#: builtin/push.c:555 msgid "control recursive pushing of submodules" msgstr "contrôler la poussée récursive des sous-modules" -#: builtin/push.c:570 builtin/send-pack.c:175 +#: builtin/push.c:557 builtin/send-pack.c:175 msgid "use thin pack" msgstr "utiliser un empaquetage léger" -#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161 +#: builtin/push.c:558 builtin/push.c:559 builtin/send-pack.c:161 #: builtin/send-pack.c:162 msgid "receive pack program" msgstr "recevoir le programme d'empaquetage" -#: builtin/push.c:573 +#: builtin/push.c:560 msgid "set upstream for git pull/status" msgstr "définir la branche amont pour git pull/status" -#: builtin/push.c:576 +#: builtin/push.c:563 msgid "prune locally removed refs" msgstr "éliminer les références locales supprimées" -#: builtin/push.c:578 +#: builtin/push.c:565 msgid "bypass pre-push hook" msgstr "éviter d'utiliser le crochet pre-push" -#: builtin/push.c:579 +#: builtin/push.c:566 msgid "push missing but relevant tags" msgstr "pousser les étiquettes manquantes mais pertinentes" -#: builtin/push.c:582 builtin/send-pack.c:169 +#: builtin/push.c:569 builtin/send-pack.c:169 msgid "GPG sign the push" msgstr "signer la poussée avec GPG" -#: builtin/push.c:584 builtin/send-pack.c:176 +#: builtin/push.c:571 builtin/send-pack.c:176 msgid "request atomic transaction on remote side" msgstr "demande une transaction atomique sur le serveur distant" -#: builtin/push.c:602 +#: builtin/push.c:589 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete est incompatible avec --all, --mirror et --tags" -#: builtin/push.c:604 +#: builtin/push.c:591 msgid "--delete doesn't make sense without any refs" msgstr "--delete n'a pas de sens sans aucune référence" -#: builtin/push.c:607 +#: builtin/push.c:611 +#, c-format +msgid "bad repository '%s'" +msgstr "mauvais dépôt '%s'" + +#: builtin/push.c:612 +msgid "" +"No configured push destination.\n" +"Either specify the URL from the command-line or configure a remote " +"repository using\n" +"\n" +" git remote add <name> <url>\n" +"\n" +"and then push using the remote name\n" +"\n" +" git push <name>\n" +msgstr "" +"Pas de destination pour pousser.\n" +"Spécifiez une URL depuis la ligne de commande ou configurez un dépôt distant " +"en utilisant\n" +"\n" +" git remote add <nom> <url>\n" +"\n" +"et poussez alors en utilisant le dépôt distant\n" +"\n" +" git push <nom>\n" + +#: builtin/push.c:627 msgid "--all and --tags are incompatible" msgstr "--all et --tags sont incompatibles" -#: builtin/push.c:609 +#: builtin/push.c:629 msgid "--all can't be combined with refspecs" msgstr "--all ne peut pas être combiné avec des spécifications de référence" -#: builtin/push.c:613 +#: builtin/push.c:633 msgid "--mirror and --tags are incompatible" msgstr "--mirror et --tags sont incompatibles" -#: builtin/push.c:615 +#: builtin/push.c:635 msgid "--mirror can't be combined with refspecs" msgstr "--mirror ne peut pas être combiné avec des spécifications de référence" -#: builtin/push.c:618 +#: builtin/push.c:638 msgid "--all and --mirror are incompatible" msgstr "--all et --mirror sont incompatibles" -#: builtin/push.c:637 +#: builtin/push.c:642 msgid "push options must not have new line characters" msgstr "" "les options de poussée ne peuvent pas contenir de caractères de nouvelle " @@ -17345,11 +17413,9 @@ msgstr "supprimer les messages d'information de suivi" #: builtin/rebase.c:32 msgid "" -"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] " -"[<branch>]" -msgstr "" -"git rebase [-i] [options] [--exec <cmd>] [--onto <nouvelle-base>] [<amont>] " -"[<branche>]" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " +"[<upstream> [<branch>]]" +msgstr "git rebase [-i] [options] [--exec <cmd>] [--onto <nouvelle-base> | --keep-base] [<amont> [<branche>]]" #: builtin/rebase.c:34 msgid "" @@ -17389,189 +17455,189 @@ msgstr "impossible de marquer comme interactif" msgid "could not generate todo list" msgstr "impossible de générer la liste à-faire" -#: builtin/rebase.c:382 +#: builtin/rebase.c:383 msgid "a base commit must be provided with --upstream or --onto" msgstr "un commit de base doit être fourni avec --upstream ou --onto" -#: builtin/rebase.c:437 +#: builtin/rebase.c:438 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [<options>]" -#: builtin/rebase.c:449 +#: builtin/rebase.c:450 msgid "keep empty commits" msgstr "garder les validations vides" -#: builtin/rebase.c:451 builtin/revert.c:128 +#: builtin/rebase.c:452 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "autoriser les validations avec des messages vides" -#: builtin/rebase.c:452 +#: builtin/rebase.c:453 msgid "rebase merge commits" msgstr "rebaser les commits de fusion" -#: builtin/rebase.c:454 +#: builtin/rebase.c:455 msgid "keep original branch points of cousins" msgstr "conserver les points de branchement de cousins originaux" -#: builtin/rebase.c:456 +#: builtin/rebase.c:457 msgid "move commits that begin with squash!/fixup!" msgstr "déplacer les commits qui commencent par squash!/fixup!" -#: builtin/rebase.c:457 +#: builtin/rebase.c:458 msgid "sign commits" msgstr "signer les commits" -#: builtin/rebase.c:459 builtin/rebase.c:1403 +#: builtin/rebase.c:460 builtin/rebase.c:1427 msgid "display a diffstat of what changed upstream" msgstr "afficher un diffstat de ce qui a changé en amont" -#: builtin/rebase.c:461 +#: builtin/rebase.c:462 msgid "continue rebase" msgstr "continuer le rebasage" -#: builtin/rebase.c:463 +#: builtin/rebase.c:464 msgid "skip commit" msgstr "sauter le commit" -#: builtin/rebase.c:464 +#: builtin/rebase.c:465 msgid "edit the todo list" msgstr "éditer la liste à-faire" -#: builtin/rebase.c:466 +#: builtin/rebase.c:467 msgid "show the current patch" msgstr "afficher le patch courant" -#: builtin/rebase.c:469 +#: builtin/rebase.c:470 msgid "shorten commit ids in the todo list" msgstr "raccourcir les identifiants de commits dans la liste à-faire" -#: builtin/rebase.c:471 +#: builtin/rebase.c:472 msgid "expand commit ids in the todo list" msgstr "étendre les identifiants de commit dans la liste à-faire" -#: builtin/rebase.c:473 +#: builtin/rebase.c:474 msgid "check the todo list" msgstr "vérifier la liste à-faire" -#: builtin/rebase.c:475 +#: builtin/rebase.c:476 msgid "rearrange fixup/squash lines" msgstr "réarranger les lignes fixup/squash" -#: builtin/rebase.c:477 +#: builtin/rebase.c:478 msgid "insert exec commands in todo list" msgstr "insérer les commandes exec dans la liste à-faire" -#: builtin/rebase.c:478 +#: builtin/rebase.c:479 msgid "onto" msgstr "sur" -#: builtin/rebase.c:481 +#: builtin/rebase.c:482 msgid "restrict-revision" msgstr "restrict-revision" -#: builtin/rebase.c:481 +#: builtin/rebase.c:482 msgid "restrict revision" msgstr "restreindre la révision" -#: builtin/rebase.c:483 +#: builtin/rebase.c:484 msgid "squash-onto" msgstr "écraser-sur" -#: builtin/rebase.c:484 +#: builtin/rebase.c:485 msgid "squash onto" msgstr "écraser sur" -#: builtin/rebase.c:486 +#: builtin/rebase.c:487 msgid "the upstream commit" msgstr "le commit amont" -#: builtin/rebase.c:488 +#: builtin/rebase.c:489 msgid "head-name" msgstr "nom du head" -#: builtin/rebase.c:488 +#: builtin/rebase.c:489 msgid "head name" msgstr "nom du head" -#: builtin/rebase.c:493 +#: builtin/rebase.c:494 msgid "rebase strategy" msgstr "stratégie de rebasage" -#: builtin/rebase.c:494 +#: builtin/rebase.c:495 msgid "strategy-opts" msgstr "options de stratégie" -#: builtin/rebase.c:495 +#: builtin/rebase.c:496 msgid "strategy options" msgstr "options de stratégie" -#: builtin/rebase.c:496 +#: builtin/rebase.c:497 msgid "switch-to" msgstr "switch-to" -#: builtin/rebase.c:497 +#: builtin/rebase.c:498 msgid "the branch or commit to checkout" msgstr "la branche ou le commit à extraire" -#: builtin/rebase.c:498 +#: builtin/rebase.c:499 msgid "onto-name" msgstr "sur-le-nom" -#: builtin/rebase.c:498 +#: builtin/rebase.c:499 msgid "onto name" msgstr "sur le nom" -#: builtin/rebase.c:499 +#: builtin/rebase.c:500 msgid "cmd" msgstr "cmd" -#: builtin/rebase.c:499 +#: builtin/rebase.c:500 msgid "the command to run" msgstr "la commande à lancer" -#: builtin/rebase.c:502 builtin/rebase.c:1486 +#: builtin/rebase.c:503 builtin/rebase.c:1510 msgid "automatically re-schedule any `exec` that fails" msgstr "re-planifier automatiquement tout `exec` qui échoue" -#: builtin/rebase.c:518 +#: builtin/rebase.c:519 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "--[no-]rebase-cousins n'a aucun effet sans --rebase-merges" -#: builtin/rebase.c:534 +#: builtin/rebase.c:535 #, c-format msgid "%s requires an interactive rebase" msgstr "%s requiert un rebasage interactif" -#: builtin/rebase.c:586 +#: builtin/rebase.c:587 #, c-format msgid "could not get 'onto': '%s'" msgstr "impossible d'accéder 'onto' : '%s'" -#: builtin/rebase.c:601 +#: builtin/rebase.c:602 #, c-format msgid "invalid orig-head: '%s'" msgstr "orig-head invalide : '%s'" -#: builtin/rebase.c:626 +#: builtin/rebase.c:627 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "allow_rerere_autoupdate invalide ignoré : '%s'" -#: builtin/rebase.c:702 +#: builtin/rebase.c:703 #, c-format msgid "Could not read '%s'" msgstr "Impossible de lire '%s'" -#: builtin/rebase.c:720 +#: builtin/rebase.c:721 #, c-format msgid "Cannot store %s" msgstr "Impossible de stocker %s" -#: builtin/rebase.c:827 +#: builtin/rebase.c:828 msgid "could not determine HEAD revision" msgstr "impossible de déterminer la révision HEAD" -#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:951 git-rebase--preserve-merges.sh:81 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -17585,7 +17651,7 @@ msgstr "" "arrêter\n" "et revenir à l'état antérieur à la commande, lancez \"git rebase --abort\"." -#: builtin/rebase.c:1031 +#: builtin/rebase.c:1032 #, c-format msgid "" "\n" @@ -17604,7 +17670,7 @@ msgstr "" "\n" "Résultat, git ne peut pas les rebaser." -#: builtin/rebase.c:1318 +#: builtin/rebase.c:1339 #, c-format msgid "" "%s\n" @@ -17621,7 +17687,7 @@ msgstr "" " git rebase '<branche>'\n" "\n" -#: builtin/rebase.c:1334 +#: builtin/rebase.c:1355 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -17635,127 +17701,131 @@ msgstr "" " git branch --set-upstream-to=%s/<branche> %s\n" "\n" -#: builtin/rebase.c:1364 +#: builtin/rebase.c:1385 msgid "exec commands cannot contain newlines" msgstr "les commandes exec ne peut pas contenir de retour à la ligne" -#: builtin/rebase.c:1368 +#: builtin/rebase.c:1389 msgid "empty exec command" msgstr "commande exec vide" -#: builtin/rebase.c:1396 +#: builtin/rebase.c:1418 msgid "rebase onto given branch instead of upstream" msgstr "rebaser sur la branche %s au lieu de la branche amont" -#: builtin/rebase.c:1398 +#: builtin/rebase.c:1420 +msgid "use the merge-base of upstream and branch as the current base" +msgstr "utiliser la base de fusion de l'amont et la branche comme base actuelle" + +#: builtin/rebase.c:1422 msgid "allow pre-rebase hook to run" msgstr "permettre le lancement du crochet pre-rebase" -#: builtin/rebase.c:1400 +#: builtin/rebase.c:1424 msgid "be quiet. implies --no-stat" msgstr "être silencieux. implique --no-stat" -#: builtin/rebase.c:1406 +#: builtin/rebase.c:1430 msgid "do not show diffstat of what changed upstream" msgstr "ne pas afficher un diffstat de ce qui a changé en amont" -#: builtin/rebase.c:1409 +#: builtin/rebase.c:1433 msgid "add a Signed-off-by: line to each commit" msgstr "ajouter une ligne Signed-off-by à chaque message de validation" -#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417 +#: builtin/rebase.c:1435 builtin/rebase.c:1439 builtin/rebase.c:1441 msgid "passed to 'git am'" msgstr "passé à 'git am'" -#: builtin/rebase.c:1419 builtin/rebase.c:1421 +#: builtin/rebase.c:1443 builtin/rebase.c:1445 msgid "passed to 'git apply'" msgstr "passé jusqu'à git-apply" -#: builtin/rebase.c:1423 builtin/rebase.c:1426 +#: builtin/rebase.c:1447 builtin/rebase.c:1450 msgid "cherry-pick all commits, even if unchanged" msgstr "picorer tous les commits, même sans modifiant" -#: builtin/rebase.c:1428 +#: builtin/rebase.c:1452 msgid "continue" msgstr "continuer" -#: builtin/rebase.c:1431 +#: builtin/rebase.c:1455 msgid "skip current patch and continue" msgstr "sauter le patch courant et continuer" -#: builtin/rebase.c:1433 +#: builtin/rebase.c:1457 msgid "abort and check out the original branch" msgstr "abandonner et extraire la branche d'origine" -#: builtin/rebase.c:1436 +#: builtin/rebase.c:1460 msgid "abort but keep HEAD where it is" msgstr "abandonne mais garde HEAD où il est" -#: builtin/rebase.c:1437 +#: builtin/rebase.c:1461 msgid "edit the todo list during an interactive rebase" msgstr "éditer la liste à faire lors d'un rebasage interactif" -#: builtin/rebase.c:1440 +#: builtin/rebase.c:1464 msgid "show the patch file being applied or merged" msgstr "afficher le patch en cours d'application ou de fusion" -#: builtin/rebase.c:1443 +#: builtin/rebase.c:1467 msgid "use merging strategies to rebase" msgstr "utiliser des stratégies de fusion pour rebaser" -#: builtin/rebase.c:1447 +#: builtin/rebase.c:1471 msgid "let the user edit the list of commits to rebase" msgstr "laisser l'utilisateur éditer la liste des commits à rebaser" -#: builtin/rebase.c:1451 +#: builtin/rebase.c:1475 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "(DÉCONSEILLÉ) essayer de recréer les fusions au lieu de les ignorer" -#: builtin/rebase.c:1455 +#: builtin/rebase.c:1479 msgid "preserve empty commits during rebase" msgstr "préserver les validations vides pendant le rebasage" -#: builtin/rebase.c:1457 +#: builtin/rebase.c:1481 msgid "move commits that begin with squash!/fixup! under -i" msgstr "déplace les commits qui commencent par squash!/fixup! sous -i" -#: builtin/rebase.c:1463 +#: builtin/rebase.c:1487 msgid "automatically stash/stash pop before and after" msgstr "remiser et réappliquer automatiquement avant et après" -#: builtin/rebase.c:1465 +#: builtin/rebase.c:1489 msgid "add exec lines after each commit of the editable list" msgstr "ajouter les lignes exec après chaque commit de la liste éditable" -#: builtin/rebase.c:1469 +#: builtin/rebase.c:1493 msgid "allow rebasing commits with empty messages" msgstr "autoriser les commits de rebasage avec des messages vides" -#: builtin/rebase.c:1472 +#: builtin/rebase.c:1496 msgid "try to rebase merges instead of skipping them" msgstr "essayer de rebaser les fusions au lieu de les garder" -#: builtin/rebase.c:1475 +#: builtin/rebase.c:1499 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "utiliser 'merge-base --fork-point' pour raffiner l'amont" -#: builtin/rebase.c:1477 +#: builtin/rebase.c:1501 msgid "use the given merge strategy" msgstr "utiliser la stratégie de fusion indiquée" -#: builtin/rebase.c:1479 builtin/revert.c:115 +#: builtin/rebase.c:1503 builtin/revert.c:115 msgid "option" msgstr "option" -#: builtin/rebase.c:1480 +#: builtin/rebase.c:1504 msgid "pass the argument through to the merge strategy" msgstr "passer les arguments jusqu'à la stratégie de fusion" -#: builtin/rebase.c:1483 +#: builtin/rebase.c:1507 msgid "rebase all reachable commits up to the root(s)" msgstr "rebaser tous les objets inatteignables depuis les racines" -#: builtin/rebase.c:1500 +#: builtin/rebase.c:1524 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -17763,32 +17833,40 @@ msgstr "" "les support de rebase.useBuiltin a été supprimé !\n" "Voir son entrée dans 'git help config' pour plus de détails." -#: builtin/rebase.c:1506 +#: builtin/rebase.c:1530 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "Il semble que 'git-am' soit en cours. Impossible de rebaser." -#: builtin/rebase.c:1547 +#: builtin/rebase.c:1571 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "" "git rebase --preserve-merges est déconseillé. Utilisez --rebase-merges à la " "place." -#: builtin/rebase.c:1551 +#: builtin/rebase.c:1576 +msgid "cannot combine '--keep-base' with '--onto'" +msgstr "impossible de combiner '--keep-base' avec '--onto'" + +#: builtin/rebase.c:1578 +msgid "cannot combine '--keep-base' with '--root'" +msgstr "impossible de combiner '--keep-base' avec '--root'" + +#: builtin/rebase.c:1582 msgid "No rebase in progress?" msgstr "Pas de rebasage en cours ?" -#: builtin/rebase.c:1555 +#: builtin/rebase.c:1586 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "L'action --edit-todo peut seulement être utilisée lors d'un rebasage " "interactif." -#: builtin/rebase.c:1578 +#: builtin/rebase.c:1609 msgid "Cannot read HEAD" msgstr "Impossible de lire HEAD" -#: builtin/rebase.c:1590 +#: builtin/rebase.c:1621 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -17796,16 +17874,16 @@ msgstr "" "Vous devez éditer tous les conflits de fusion et\n" "les marquer comme résolus avec git add" -#: builtin/rebase.c:1609 +#: builtin/rebase.c:1640 msgid "could not discard worktree changes" msgstr "Impossible de supprimer les changements de l'arbre de travail" -#: builtin/rebase.c:1628 +#: builtin/rebase.c:1659 #, c-format msgid "could not move back to %s" msgstr "Impossible de revenir à %s" -#: builtin/rebase.c:1673 +#: builtin/rebase.c:1704 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -17827,167 +17905,159 @@ msgstr "" "chose\n" "d'important ici.\n" -#: builtin/rebase.c:1694 +#: builtin/rebase.c:1725 msgid "switch `C' expects a numerical value" msgstr "l'option `C' attend un valeur numérique" -#: builtin/rebase.c:1735 +#: builtin/rebase.c:1766 #, c-format msgid "Unknown mode: %s" msgstr "mode inconnu : %s" -#: builtin/rebase.c:1757 +#: builtin/rebase.c:1788 msgid "--strategy requires --merge or --interactive" msgstr "--strategy requiert --merge ou --interactive" -#: builtin/rebase.c:1797 +#: builtin/rebase.c:1828 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec requiert --exec ou --interactive" -#: builtin/rebase.c:1809 +#: builtin/rebase.c:1840 msgid "cannot combine am options with either interactive or merge options" msgstr "" "impossible de combiner les options am avec l'options interactive ou merge" -#: builtin/rebase.c:1828 +#: builtin/rebase.c:1859 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "impossible de combiner '--preserve-merges' avec '--rebase-merges'" -#: builtin/rebase.c:1832 +#: builtin/rebase.c:1863 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" "erreur : impossible de combiner '--preserve-merges' avec '--reschedule-" "failed-exec'" -#: builtin/rebase.c:1838 -msgid "cannot combine '--rebase-merges' with '--strategy-option'" -msgstr "impossible de combiner '--rebase-merges' avec '--strategy-option'" - -#: builtin/rebase.c:1841 -msgid "cannot combine '--rebase-merges' with '--strategy'" -msgstr "impossible de combiner '--rebase-merges' avec '--strategy'" - -#: builtin/rebase.c:1865 +#: builtin/rebase.c:1887 #, c-format msgid "invalid upstream '%s'" msgstr "amont invalide '%s'" -#: builtin/rebase.c:1871 +#: builtin/rebase.c:1893 msgid "Could not create new root commit" msgstr "Impossible de créer un nouveau commit racine" -#: builtin/rebase.c:1889 +#: builtin/rebase.c:1919 +#, c-format +msgid "'%s': need exactly one merge base with branch" +msgstr "'%s': exactement une base de fusion nécessaire avec une branche" + +#: builtin/rebase.c:1922 #, c-format msgid "'%s': need exactly one merge base" msgstr "'%s': exactement une base de fusion nécessaire" -#: builtin/rebase.c:1896 +#: builtin/rebase.c:1930 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "ne pointe pas sur une validation valide : '%s'" -#: builtin/rebase.c:1921 +#: builtin/rebase.c:1955 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "fatal : pas de branche ou commit '%s'" -#: builtin/rebase.c:1929 builtin/submodule--helper.c:38 +#: builtin/rebase.c:1963 builtin/submodule--helper.c:38 #: builtin/submodule--helper.c:1934 #, c-format msgid "No such ref: %s" msgstr "Référence inexistante : %s" -#: builtin/rebase.c:1940 +#: builtin/rebase.c:1974 msgid "Could not resolve HEAD to a revision" msgstr "Impossible de résoudre le commit HEAD vers un révision" -#: builtin/rebase.c:1981 +#: builtin/rebase.c:2012 msgid "Cannot autostash" msgstr "Autoremisage impossible" -#: builtin/rebase.c:1984 +#: builtin/rebase.c:2015 #, c-format msgid "Unexpected stash response: '%s'" msgstr "réponse de remisage inattendue : '%s'" -#: builtin/rebase.c:1990 +#: builtin/rebase.c:2021 #, c-format msgid "Could not create directory for '%s'" msgstr "Impossible de créer le répertoire pour '%s'" -#: builtin/rebase.c:1993 +#: builtin/rebase.c:2024 #, c-format msgid "Created autostash: %s\n" msgstr "Autoremisage créé : %s\n" -#: builtin/rebase.c:1996 +#: builtin/rebase.c:2027 msgid "could not reset --hard" msgstr "impossible de réinitialiser --hard" -#: builtin/rebase.c:1997 builtin/reset.c:114 -#, c-format -msgid "HEAD is now at %s" -msgstr "HEAD est maintenant à %s" - -#: builtin/rebase.c:2013 +#: builtin/rebase.c:2036 msgid "Please commit or stash them." msgstr "Veuillez les valider ou les remiser." -#: builtin/rebase.c:2040 +#: builtin/rebase.c:2063 #, c-format msgid "could not parse '%s'" msgstr "impossible d'analyser '%s'" -#: builtin/rebase.c:2053 +#: builtin/rebase.c:2076 #, c-format msgid "could not switch to %s" msgstr "Impossible de basculer vers %s" -#: builtin/rebase.c:2064 +#: builtin/rebase.c:2087 msgid "HEAD is up to date." msgstr "HEAD est à jour." -#: builtin/rebase.c:2066 +#: builtin/rebase.c:2089 #, c-format msgid "Current branch %s is up to date.\n" msgstr "La branche courante %s est à jour.\n" -#: builtin/rebase.c:2074 +#: builtin/rebase.c:2097 msgid "HEAD is up to date, rebase forced." msgstr "HEAD est à jour, rebasage forcé." -#: builtin/rebase.c:2076 +#: builtin/rebase.c:2099 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "La branche courante %s est à jour, rebasage forcé.\n" -#: builtin/rebase.c:2084 +#: builtin/rebase.c:2107 msgid "The pre-rebase hook refused to rebase." msgstr "Le crochet pre-rebase a refusé de rebaser." -#: builtin/rebase.c:2091 +#: builtin/rebase.c:2114 #, c-format msgid "Changes to %s:\n" msgstr "Changements vers %s :\n" -#: builtin/rebase.c:2094 +#: builtin/rebase.c:2117 #, c-format msgid "Changes from %s to %s:\n" msgstr "Changements de %s sur %s :\n" -#: builtin/rebase.c:2119 +#: builtin/rebase.c:2142 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" "Rembobinage préalable de head pour pouvoir rejouer votre travail par-" "dessus...\n" -#: builtin/rebase.c:2128 +#: builtin/rebase.c:2151 msgid "Could not detach HEAD" msgstr "Impossible de détacher HEAD" -#: builtin/rebase.c:2137 +#: builtin/rebase.c:2160 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Avance rapide de %s sur %s.\n" @@ -17996,7 +18066,7 @@ msgstr "Avance rapide de %s sur %s.\n" msgid "git receive-pack <git-dir>" msgstr "git receive-pack <répertoire-git>" -#: builtin/receive-pack.c:832 +#: builtin/receive-pack.c:830 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" @@ -18026,7 +18096,7 @@ msgstr "" "Pour éliminer ce message et conserver le comportement par défaut,\n" "réglez « receive.denyCurrentBranch » à 'refuse'." -#: builtin/receive-pack.c:852 +#: builtin/receive-pack.c:850 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" @@ -18046,11 +18116,11 @@ msgstr "" "\n" "Pour éliminer ce message, réglez-le à 'refuse'." -#: builtin/receive-pack.c:1938 +#: builtin/receive-pack.c:1936 msgid "quiet" msgstr "quiet" -#: builtin/receive-pack.c:1952 +#: builtin/receive-pack.c:1950 msgid "You must specify a directory." msgstr "Vous devez spécifier un répertoire." @@ -18632,11 +18702,11 @@ msgstr "être verbeux : doit être placé avant une sous-commande" msgid "Unknown subcommand: %s" msgstr "Sous-commande inconnue : %s" -#: builtin/repack.c:22 +#: builtin/repack.c:23 msgid "git repack [<options>]" msgstr "git repack [<options>]" -#: builtin/repack.c:27 +#: builtin/repack.c:28 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -18645,117 +18715,117 @@ msgstr "" "Utilisez\n" "--no-write-bitmap-index ou désactivez le paramètre pack.writebitmaps." -#: builtin/repack.c:190 +#: builtin/repack.c:191 msgid "could not start pack-objects to repack promisor objects" msgstr "" "ne pas démarrer pack-objects pour ré-empaqueter les objects de prometteur" -#: builtin/repack.c:229 builtin/repack.c:408 +#: builtin/repack.c:230 builtin/repack.c:409 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" "repack : attente de lignes d'Id d'objets en hexa complet seulement depuis " "les objects de paquet." -#: builtin/repack.c:246 +#: builtin/repack.c:247 msgid "could not finish pack-objects to repack promisor objects" msgstr "" "impossible de terminer pack-objects pour ré-empaqueter les objets de " "prometteur" -#: builtin/repack.c:284 +#: builtin/repack.c:285 msgid "pack everything in a single pack" msgstr "empaqueter tout dans un seul paquet" -#: builtin/repack.c:286 +#: builtin/repack.c:287 msgid "same as -a, and turn unreachable objects loose" msgstr "identique à -a et transformer les objets inaccessibles en suspens" -#: builtin/repack.c:289 +#: builtin/repack.c:290 msgid "remove redundant packs, and run git-prune-packed" msgstr "supprimer les paquets redondants et lancer git-prune-packed" -#: builtin/repack.c:291 +#: builtin/repack.c:292 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "passer --no-reuse-delta à git-pack-objects" -#: builtin/repack.c:293 +#: builtin/repack.c:294 msgid "pass --no-reuse-object to git-pack-objects" msgstr "passer --no-reuse-object à git-pack-objects" -#: builtin/repack.c:295 +#: builtin/repack.c:296 msgid "do not run git-update-server-info" msgstr "ne pas lancer git update-server-info" -#: builtin/repack.c:298 +#: builtin/repack.c:299 msgid "pass --local to git-pack-objects" msgstr "passer --local à git-pack-objects" -#: builtin/repack.c:300 +#: builtin/repack.c:301 msgid "write bitmap index" msgstr "écrire un index en bitmap" -#: builtin/repack.c:302 +#: builtin/repack.c:303 msgid "pass --delta-islands to git-pack-objects" msgstr "passer --delta-islands à git-pack-objects" -#: builtin/repack.c:303 +#: builtin/repack.c:304 msgid "approxidate" msgstr "date approximative" -#: builtin/repack.c:304 +#: builtin/repack.c:305 msgid "with -A, do not loosen objects older than this" msgstr "avec -A, ne pas suspendre les objets plus vieux que celui-ci" -#: builtin/repack.c:306 +#: builtin/repack.c:307 msgid "with -a, repack unreachable objects" msgstr "avec -a, repaquétiser les objets inaccessibles" -#: builtin/repack.c:308 +#: builtin/repack.c:309 msgid "size of the window used for delta compression" msgstr "taille de la fenêtre utilisée pour la compression des deltas" -#: builtin/repack.c:309 builtin/repack.c:315 +#: builtin/repack.c:310 builtin/repack.c:316 msgid "bytes" msgstr "octets" -#: builtin/repack.c:310 +#: builtin/repack.c:311 msgid "same as the above, but limit memory size instead of entries count" msgstr "" "idem ci-dessus, mais limiter la taille mémoire au lieu du nombre d'éléments" -#: builtin/repack.c:312 +#: builtin/repack.c:313 msgid "limits the maximum delta depth" msgstr "limite la profondeur maximale des deltas" -#: builtin/repack.c:314 +#: builtin/repack.c:315 msgid "limits the maximum number of threads" msgstr "limite le nombre maximal de fils" -#: builtin/repack.c:316 +#: builtin/repack.c:317 msgid "maximum size of each packfile" msgstr "taille maximum de chaque fichier paquet" -#: builtin/repack.c:318 +#: builtin/repack.c:319 msgid "repack objects in packs marked with .keep" msgstr "réempaqueter les objets dans des paquets marqués avec .keep" -#: builtin/repack.c:320 +#: builtin/repack.c:321 msgid "do not repack this pack" msgstr "ne pas rempaqueter ce paquet" -#: builtin/repack.c:330 +#: builtin/repack.c:331 msgid "cannot delete packs in a precious-objects repo" msgstr "impossible de supprimer les paquets dans un dépôt d'objets précieux" -#: builtin/repack.c:334 +#: builtin/repack.c:335 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable et -A sont incompatibles" -#: builtin/repack.c:417 +#: builtin/repack.c:418 msgid "Nothing new to pack." msgstr "Rien de neuf à empaqueter." -#: builtin/repack.c:478 +#: builtin/repack.c:479 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -18774,7 +18844,7 @@ msgstr "" "ALERTE : aussi échoué.\n" "ALERTE : Veuillez les renommer manuellement dans %s :\n" -#: builtin/repack.c:526 +#: builtin/repack.c:527 #, c-format msgid "failed to remove '%s'" msgstr "échec de la suppression de '%s'" @@ -18882,8 +18952,8 @@ msgstr "fstat de %s impossible" msgid "unable to write object to database" msgstr "impossible d'écrire l'objet dans la base de données" -#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422 -#: builtin/replace.c:452 +#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:423 +#: builtin/replace.c:453 #, c-format msgid "not a valid object name: '%s'" msgstr "nom d'objet invalide : '%s'" @@ -18902,22 +18972,22 @@ msgstr "échec de l'édition du fichier d'objet" msgid "new object is the same as the old one: '%s'" msgstr "le nouvel objet est identique à l'ancien : '%s'" -#: builtin/replace.c:383 +#: builtin/replace.c:384 #, c-format msgid "could not parse %s as a commit" msgstr "impossible d'analyser %s comme commit" -#: builtin/replace.c:414 +#: builtin/replace.c:415 #, c-format msgid "bad mergetag in commit '%s'" msgstr "mauvaise étiquette de fusion dans le commit '%s'" -#: builtin/replace.c:416 +#: builtin/replace.c:417 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "étiquette de fusion malformée dans le commit '%s'" -#: builtin/replace.c:428 +#: builtin/replace.c:429 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -18926,31 +18996,31 @@ msgstr "" "le commit original '%s' contient l'étiquette de fusion '%s' qui a disparu ; " "utilisez --edit au lieu de --graft" -#: builtin/replace.c:467 +#: builtin/replace.c:468 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "le commit original '%s' contient une signature GPG" -#: builtin/replace.c:468 +#: builtin/replace.c:469 msgid "the signature will be removed in the replacement commit!" msgstr "la signature sera éliminée dans la validation de remplacement !" -#: builtin/replace.c:478 +#: builtin/replace.c:479 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "Impossible d'écrire le commit de remplacement pour '%s'" -#: builtin/replace.c:486 +#: builtin/replace.c:487 #, c-format msgid "graft for '%s' unnecessary" msgstr "graft pour '%s' non nécessaire" -#: builtin/replace.c:490 +#: builtin/replace.c:491 #, c-format msgid "new commit is the same as the old one: '%s'" msgstr "le nouveau commit est identique à l'ancien : '%s'" -#: builtin/replace.c:525 +#: builtin/replace.c:526 #, c-format msgid "" "could not convert the following graft(s):\n" @@ -18959,71 +19029,71 @@ msgstr "" "impossible de convertir la(les) greffe(s) suivante(s) :\n" "%s" -#: builtin/replace.c:546 +#: builtin/replace.c:547 msgid "list replace refs" msgstr "afficher les références de remplacement" -#: builtin/replace.c:547 +#: builtin/replace.c:548 msgid "delete replace refs" msgstr "supprimer les références de remplacement" -#: builtin/replace.c:548 +#: builtin/replace.c:549 msgid "edit existing object" msgstr "éditer l'objet existant" -#: builtin/replace.c:549 +#: builtin/replace.c:550 msgid "change a commit's parents" msgstr "Modifier les parents d'un commit" -#: builtin/replace.c:550 +#: builtin/replace.c:551 msgid "convert existing graft file" msgstr "convertir le fichier de greffe existant" -#: builtin/replace.c:551 +#: builtin/replace.c:552 msgid "replace the ref if it exists" msgstr "remplacer la référence si elle existe" -#: builtin/replace.c:553 +#: builtin/replace.c:554 msgid "do not pretty-print contents for --edit" msgstr "afficher sans mise en forme pour --edit" -#: builtin/replace.c:554 +#: builtin/replace.c:555 msgid "use this format" msgstr "utiliser ce format" -#: builtin/replace.c:567 +#: builtin/replace.c:568 msgid "--format cannot be used when not listing" msgstr "--format ne peut pas être utilisé sans lister" -#: builtin/replace.c:575 +#: builtin/replace.c:576 msgid "-f only makes sense when writing a replacement" msgstr "-f n'a de sens qu'en écrivant un remplacement" -#: builtin/replace.c:579 +#: builtin/replace.c:580 msgid "--raw only makes sense with --edit" msgstr "--raw n'a de sens qu'avec l'option --edit" -#: builtin/replace.c:585 +#: builtin/replace.c:586 msgid "-d needs at least one argument" msgstr "-d requiert au moins un argument" -#: builtin/replace.c:591 +#: builtin/replace.c:592 msgid "bad number of arguments" msgstr "mauvais nombre d'arguments" -#: builtin/replace.c:597 +#: builtin/replace.c:598 msgid "-e needs exactly one argument" msgstr "-e requiert un seul argument" -#: builtin/replace.c:603 +#: builtin/replace.c:604 msgid "-g needs at least one argument" msgstr "-g requiert au moins un argument" -#: builtin/replace.c:609 +#: builtin/replace.c:610 msgid "--convert-graft-file takes no argument" msgstr "--convert-graft-file ne supporte aucun argument" -#: builtin/replace.c:615 +#: builtin/replace.c:616 msgid "only one pattern can be given with -l" msgstr "-l n'accepte qu'un motifs" @@ -19092,13 +19162,18 @@ msgstr "Impossible de trouver l'arbre pour HEAD." msgid "Failed to find tree of %s." msgstr "Impossible de trouver l'arbre pour %s." +#: builtin/reset.c:114 +#, c-format +msgid "HEAD is now at %s" +msgstr "HEAD est maintenant à %s" + #: builtin/reset.c:193 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "Impossible de faire un \"reset %s\" au milieu d'une fusion." -#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589 -#: builtin/stash.c:613 +#: builtin/reset.c:293 builtin/stash.c:520 builtin/stash.c:595 +#: builtin/stash.c:619 msgid "be quiet, only report errors" msgstr "être silencieux, afficher seulement les erreurs" @@ -19186,24 +19261,19 @@ msgstr "Impossible de réinitialiser le fichier d'index à la révision '%s'." msgid "Could not write new index file." msgstr "Impossible d'écrire le nouveau fichier d'index." -#: builtin/rev-list.c:412 +#: builtin/rev-list.c:411 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "impossible de combiner --exclude-promisor-objects et --missing" -#: builtin/rev-list.c:473 +#: builtin/rev-list.c:472 msgid "object filtering requires --objects" msgstr "le filtrage d'objet exige --objects" -#: builtin/rev-list.c:476 -#, c-format -msgid "invalid sparse value '%s'" -msgstr "valeur invalide de 'sparse' '%s'" - -#: builtin/rev-list.c:527 +#: builtin/rev-list.c:522 msgid "rev-list does not support display of notes" msgstr "rev-list ne supporte l'affichage des notes" -#: builtin/rev-list.c:530 +#: builtin/rev-list.c:525 msgid "cannot combine --use-bitmap-index with object filtering" msgstr "impossible de combiner --use-bitmap-index avec le filtrage d'objet" @@ -19754,136 +19824,136 @@ msgstr "conflits dans l'index. Essayez sans --index." msgid "could not save index tree" msgstr "impossible de sauvegarder l'arbre d'index" -#: builtin/stash.c:434 +#: builtin/stash.c:436 msgid "could not restore untracked files from stash" msgstr "impossible de restaurer les fichiers non-suivis depuis le remisage" -#: builtin/stash.c:448 +#: builtin/stash.c:450 #, c-format msgid "Merging %s with %s" msgstr "Fusion de %s avec %s" -#: builtin/stash.c:458 git-legacy-stash.sh:680 +#: builtin/stash.c:460 git-legacy-stash.sh:680 msgid "Index was not unstashed." msgstr "L'index n'a pas été sorti de remise." -#: builtin/stash.c:516 builtin/stash.c:615 +#: builtin/stash.c:522 builtin/stash.c:621 msgid "attempt to recreate the index" msgstr "tentative de recréer l'index" -#: builtin/stash.c:549 +#: builtin/stash.c:555 #, c-format msgid "Dropped %s (%s)" msgstr "%s supprimé (%s)" -#: builtin/stash.c:552 +#: builtin/stash.c:558 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s : Impossible de supprimer l'élément de stash" -#: builtin/stash.c:577 +#: builtin/stash.c:583 #, c-format msgid "'%s' is not a stash reference" msgstr "'%s' n'est pas une référence de remisage" -#: builtin/stash.c:627 git-legacy-stash.sh:694 +#: builtin/stash.c:633 git-legacy-stash.sh:694 msgid "The stash entry is kept in case you need it again." msgstr "" "L'entrée de remisage est conservée au cas où vous en auriez encore besoin." -#: builtin/stash.c:650 git-legacy-stash.sh:712 +#: builtin/stash.c:656 git-legacy-stash.sh:712 msgid "No branch name specified" msgstr "Aucune branche spécifiée" -#: builtin/stash.c:790 builtin/stash.c:827 +#: builtin/stash.c:796 builtin/stash.c:833 #, c-format msgid "Cannot update %s with %s" msgstr "Impossible de mettre à jour %s avec %s" -#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497 +#: builtin/stash.c:814 builtin/stash.c:1470 builtin/stash.c:1506 msgid "stash message" msgstr "message pour le remisage" -#: builtin/stash.c:818 +#: builtin/stash.c:824 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" exige un argument <commit>" -#: builtin/stash.c:1040 git-legacy-stash.sh:217 +#: builtin/stash.c:1046 git-legacy-stash.sh:217 msgid "No changes selected" msgstr "Aucun changement sélectionné" -#: builtin/stash.c:1136 git-legacy-stash.sh:150 +#: builtin/stash.c:1145 git-legacy-stash.sh:150 msgid "You do not have the initial commit yet" msgstr "Vous n'avez pas encore la validation initiale" -#: builtin/stash.c:1163 git-legacy-stash.sh:165 +#: builtin/stash.c:1172 git-legacy-stash.sh:165 msgid "Cannot save the current index state" msgstr "Impossible de sauver l'état courant de l'index" -#: builtin/stash.c:1172 git-legacy-stash.sh:180 +#: builtin/stash.c:1181 git-legacy-stash.sh:180 msgid "Cannot save the untracked files" msgstr "Impossible de sauver les fichiers non-suivis" -#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200 +#: builtin/stash.c:1192 builtin/stash.c:1201 git-legacy-stash.sh:200 #: git-legacy-stash.sh:213 msgid "Cannot save the current worktree state" msgstr "Impossible de sauver l'état courant de la copie de travail" -#: builtin/stash.c:1220 git-legacy-stash.sh:233 +#: builtin/stash.c:1229 git-legacy-stash.sh:233 msgid "Cannot record working tree state" msgstr "Impossible d'enregistrer l'état de la copie de travail" -#: builtin/stash.c:1269 git-legacy-stash.sh:337 +#: builtin/stash.c:1278 git-legacy-stash.sh:337 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "" "Impossible d'utiliser --patch et --include-untracked ou --all en même temps" -#: builtin/stash.c:1285 +#: builtin/stash.c:1294 msgid "Did you forget to 'git add'?" msgstr "Vous avez sûrement oublié 'git add' ?" -#: builtin/stash.c:1300 git-legacy-stash.sh:345 +#: builtin/stash.c:1309 git-legacy-stash.sh:345 msgid "No local changes to save" msgstr "Pas de modifications locales à sauver" -#: builtin/stash.c:1307 git-legacy-stash.sh:350 +#: builtin/stash.c:1316 git-legacy-stash.sh:350 msgid "Cannot initialize stash" msgstr "Impossible d'initialiser le remisage" -#: builtin/stash.c:1322 git-legacy-stash.sh:354 +#: builtin/stash.c:1331 git-legacy-stash.sh:354 msgid "Cannot save the current status" msgstr "Impossible de sauver l'état courant" -#: builtin/stash.c:1327 +#: builtin/stash.c:1336 #, c-format msgid "Saved working directory and index state %s" msgstr "Arbre de travail et état de l'index sauvegardés dans %s" -#: builtin/stash.c:1417 git-legacy-stash.sh:384 +#: builtin/stash.c:1426 git-legacy-stash.sh:384 msgid "Cannot remove worktree changes" msgstr "Impossible de supprimer les changements de la copie de travail" -#: builtin/stash.c:1452 builtin/stash.c:1488 +#: builtin/stash.c:1461 builtin/stash.c:1497 msgid "keep index" msgstr "conserver l'index" -#: builtin/stash.c:1454 builtin/stash.c:1490 +#: builtin/stash.c:1463 builtin/stash.c:1499 msgid "stash in patch mode" msgstr "remiser une mode rustine" -#: builtin/stash.c:1455 builtin/stash.c:1491 +#: builtin/stash.c:1464 builtin/stash.c:1500 msgid "quiet mode" msgstr "mode silencieux" -#: builtin/stash.c:1457 builtin/stash.c:1493 +#: builtin/stash.c:1466 builtin/stash.c:1502 msgid "include untracked files in stash" msgstr "inclure les fichiers non suivis dans la remise" -#: builtin/stash.c:1459 builtin/stash.c:1495 +#: builtin/stash.c:1468 builtin/stash.c:1504 msgid "include ignore files" msgstr "inclure les fichiers ignorés" -#: builtin/stash.c:1555 +#: builtin/stash.c:1564 #, c-format msgid "could not exec %s" msgstr "impossible d'exécuter %s" @@ -20267,8 +20337,8 @@ msgid "don't print cloning progress" msgstr "ne pas afficher la progression du clonage" #: builtin/submodule--helper.c:1877 -msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" -msgstr "git submodule--helper update_clone [--prefix=<chemin>] [<chemin>...]" +msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper update-clone [--prefix=<chemin>] [<chemin>...]" #: builtin/submodule--helper.c:1890 msgid "bad value for update parameter" @@ -20322,7 +20392,7 @@ msgid "please make sure that the .gitmodules file is in the working tree" msgstr "" "veuillez vous assurer que le fichier .gitmodules est dans l'arbre de travail" -#: builtin/submodule--helper.c:2235 git.c:434 git.c:684 +#: builtin/submodule--helper.c:2235 git.c:433 git.c:683 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s ne gère pas --super-prefix" @@ -20655,144 +20725,144 @@ msgstr " OK" msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<options>] [--] [<fichier>...]" -#: builtin/update-index.c:971 +#: builtin/update-index.c:972 msgid "continue refresh even when index needs update" msgstr "continuer de rafraîchir même si l'index a besoin d'une mise à jour" -#: builtin/update-index.c:974 +#: builtin/update-index.c:975 msgid "refresh: ignore submodules" msgstr "rafraîchir : ignorer les sous-modules" -#: builtin/update-index.c:977 +#: builtin/update-index.c:978 msgid "do not ignore new files" msgstr "ne pas ignorer les nouveaux fichiers" -#: builtin/update-index.c:979 +#: builtin/update-index.c:980 msgid "let files replace directories and vice-versa" msgstr "laisser les fichiers remplacer des répertoires et vice-versa" -#: builtin/update-index.c:981 +#: builtin/update-index.c:982 msgid "notice files missing from worktree" msgstr "aviser des fichiers manquants dans la copie de travail" -#: builtin/update-index.c:983 +#: builtin/update-index.c:984 msgid "refresh even if index contains unmerged entries" msgstr "rafraîchir même si l'index contient des éléments non fusionnés" -#: builtin/update-index.c:986 +#: builtin/update-index.c:987 msgid "refresh stat information" msgstr "rafraîchir l'information de stat" -#: builtin/update-index.c:990 +#: builtin/update-index.c:991 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "comme --refresh, mais en ignorant l'option assume-unchanged" -#: builtin/update-index.c:994 +#: builtin/update-index.c:995 msgid "<mode>,<object>,<path>" msgstr "<mode>, <objet>, <chemin>" -#: builtin/update-index.c:995 +#: builtin/update-index.c:996 msgid "add the specified entry to the index" msgstr "ajouter l'élément spécifié dans l'index" -#: builtin/update-index.c:1005 +#: builtin/update-index.c:1006 msgid "mark files as \"not changing\"" msgstr "marquer les fichiers comme \"non changeants\"" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1009 msgid "clear assumed-unchanged bit" msgstr "mettre à zéro le bit supposé-non-modifié" -#: builtin/update-index.c:1011 +#: builtin/update-index.c:1012 msgid "mark files as \"index-only\"" msgstr "marquer les fichiers comme \"index seulement\"" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1015 msgid "clear skip-worktree bit" msgstr "mettre à zéro le bit sauter-la-copie-de travail" -#: builtin/update-index.c:1017 +#: builtin/update-index.c:1018 msgid "add to index only; do not add content to object database" msgstr "" "ajouter seulement à l'index ; ne pas ajouter le contenu dans la base de " "données des objets" -#: builtin/update-index.c:1019 +#: builtin/update-index.c:1020 msgid "remove named paths even if present in worktree" msgstr "" "supprimer les chemins nommés même s'ils sont présents dans la copie de " "travail" -#: builtin/update-index.c:1021 +#: builtin/update-index.c:1022 msgid "with --stdin: input lines are terminated by null bytes" msgstr "avec --stdin : les lignes en entrée sont terminées par des octets nuls" -#: builtin/update-index.c:1023 +#: builtin/update-index.c:1024 msgid "read list of paths to be updated from standard input" msgstr "lire la liste des chemins à mettre à jour depuis l'entrée standard" -#: builtin/update-index.c:1027 +#: builtin/update-index.c:1028 msgid "add entries from standard input to the index" msgstr "ajouter les éléments depuis l'entrée standard à l'index" -#: builtin/update-index.c:1031 +#: builtin/update-index.c:1032 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "repeupler les étapes n°2 et n°3 pour les chemins listés" -#: builtin/update-index.c:1035 +#: builtin/update-index.c:1036 msgid "only update entries that differ from HEAD" msgstr "mettre à jour seulement les éléments qui diffèrent de HEAD" -#: builtin/update-index.c:1039 +#: builtin/update-index.c:1040 msgid "ignore files missing from worktree" msgstr "ignorer les fichiers manquants dans la copie de travail" -#: builtin/update-index.c:1042 +#: builtin/update-index.c:1043 msgid "report actions to standard output" msgstr "afficher les actions sur la sortie standard" -#: builtin/update-index.c:1044 +#: builtin/update-index.c:1045 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(pour porcelaines) oublier les conflits sauvés et non résolus" -#: builtin/update-index.c:1048 +#: builtin/update-index.c:1049 msgid "write index in this format" msgstr "écrire l'index dans ce format" -#: builtin/update-index.c:1050 +#: builtin/update-index.c:1051 msgid "enable or disable split index" msgstr "activer ou désactiver l'index divisé" -#: builtin/update-index.c:1052 +#: builtin/update-index.c:1053 msgid "enable/disable untracked cache" msgstr "activer ou désactiver le cache de non-suivis" -#: builtin/update-index.c:1054 +#: builtin/update-index.c:1055 msgid "test if the filesystem supports untracked cache" msgstr "tester si le système de fichier supporte le cache de non-suivis" -#: builtin/update-index.c:1056 +#: builtin/update-index.c:1057 msgid "enable untracked cache without testing the filesystem" msgstr "activer le cache de non-suivis sans tester le système de fichier" -#: builtin/update-index.c:1058 +#: builtin/update-index.c:1059 msgid "write out the index even if is not flagged as changed" msgstr "écrire l'index même s'il n'est pas marqué comme modifié" -#: builtin/update-index.c:1060 +#: builtin/update-index.c:1061 msgid "enable or disable file system monitor" msgstr "" "activer ou désactiver la surveillance du système de fichier (fsmonitor)" -#: builtin/update-index.c:1062 +#: builtin/update-index.c:1063 msgid "mark files as fsmonitor valid" msgstr "marquer les fichiers comme valides pour fsmonitor" -#: builtin/update-index.c:1065 +#: builtin/update-index.c:1066 msgid "clear fsmonitor valid bit" msgstr "effacer le bit de validité fsmonitor" -#: builtin/update-index.c:1168 +#: builtin/update-index.c:1169 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -20800,7 +20870,7 @@ msgstr "" "core.splitIndex est réglé à false ; supprimez-le ou changez-le si vous " "souhaitez vraiment activer l'index coupé" -#: builtin/update-index.c:1177 +#: builtin/update-index.c:1178 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -20808,7 +20878,7 @@ msgstr "" "core.splitIndex est réglé à vrai ; supprimez-le ou changez-le si vous " "souhaitez vraiment désactiver l'index coupé" -#: builtin/update-index.c:1188 +#: builtin/update-index.c:1190 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -20816,11 +20886,11 @@ msgstr "" "core.untrackedCache est réglé à true ; supprimez-le ou changez-le si vous " "souhaitez vraiment désactiver le cache des fichiers non-suivis" -#: builtin/update-index.c:1192 +#: builtin/update-index.c:1194 msgid "Untracked cache disabled" msgstr "Le cache non suivi est désactivé" -#: builtin/update-index.c:1200 +#: builtin/update-index.c:1202 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -20828,29 +20898,29 @@ msgstr "" "core.untrackedCache est réglé à false ; supprimez-le ou changez-le si vous " "souhaitez vraiment activer le cache des fichiers non-suivis" -#: builtin/update-index.c:1204 +#: builtin/update-index.c:1206 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Le cache non suivi est activé pour '%s'" -#: builtin/update-index.c:1212 +#: builtin/update-index.c:1214 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "" "core.fsmonitor est réglé à false ; changez-le si vous souhaitez vraiment " "activer la surveillance du système de fichiers" -#: builtin/update-index.c:1216 +#: builtin/update-index.c:1218 msgid "fsmonitor enabled" msgstr "fsmonitor activé" -#: builtin/update-index.c:1219 +#: builtin/update-index.c:1221 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" "core.fsmonitor est réglé à true ; supprimez-le ou changez-le si vous " "souhaitez vraiment désactiver la surveillance du système de fichiers" -#: builtin/update-index.c:1223 +#: builtin/update-index.c:1225 msgid "fsmonitor disabled" msgstr "fsmonitor désactivé" @@ -20946,56 +21016,56 @@ msgstr "git verify-tag [-v | --verbose] [--format=<format>] <étiquette>..." msgid "print tag contents" msgstr "afficher le contenu de l'étiquette" -#: builtin/worktree.c:18 +#: builtin/worktree.c:17 msgid "git worktree add [<options>] <path> [<commit-ish>]" msgstr "git worktree add [<options>] <chemin> [<commit>]" -#: builtin/worktree.c:19 +#: builtin/worktree.c:18 msgid "git worktree list [<options>]" msgstr "git worktree list [<options>]" -#: builtin/worktree.c:20 +#: builtin/worktree.c:19 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<options>] <chemin>" -#: builtin/worktree.c:21 +#: builtin/worktree.c:20 msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <arbre-de-travail> <nouveau-chemin>" -#: builtin/worktree.c:22 +#: builtin/worktree.c:21 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<options>]" -#: builtin/worktree.c:23 +#: builtin/worktree.c:22 msgid "git worktree remove [<options>] <worktree>" msgstr "git worktree remove [<options>] <arbre-de-travail>" -#: builtin/worktree.c:24 +#: builtin/worktree.c:23 msgid "git worktree unlock <path>" msgstr "git worktree unlock <chemin>" -#: builtin/worktree.c:61 builtin/worktree.c:899 +#: builtin/worktree.c:60 builtin/worktree.c:898 #, c-format msgid "failed to delete '%s'" msgstr "échec de la suppression de '%s'" -#: builtin/worktree.c:80 +#: builtin/worktree.c:79 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Suppression de worktrees/%s : répertoire invalide" -#: builtin/worktree.c:86 +#: builtin/worktree.c:85 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Suppression de worktrees/%s : le fichier gitdir n'existe pas" -#: builtin/worktree.c:91 builtin/worktree.c:100 +#: builtin/worktree.c:90 builtin/worktree.c:99 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "" "Suppression de worktrees/%s : échec de la lecture du fichier gitdir (%s)" -#: builtin/worktree.c:110 +#: builtin/worktree.c:109 #, c-format msgid "" "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " @@ -21004,37 +21074,37 @@ msgstr "" "Suppression de worktrees/%s: lecture trop courte ( %<PRIuMAX> octets " "attendus, %<PRIuMAX> octets lus)" -#: builtin/worktree.c:118 +#: builtin/worktree.c:117 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Suppression de worktrees/%s : fichier gitdir invalide" -#: builtin/worktree.c:127 +#: builtin/worktree.c:126 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "" "Suppression de worktrees/%s : le fichier gitdir point sur un endroit " "inexistant" -#: builtin/worktree.c:166 +#: builtin/worktree.c:165 msgid "report pruned working trees" msgstr "afficher les arbres de travail éliminés" -#: builtin/worktree.c:168 +#: builtin/worktree.c:167 msgid "expire working trees older than <time>" msgstr "faire expirer les arbres de travail plus vieux que <temps>" -#: builtin/worktree.c:235 +#: builtin/worktree.c:234 #, c-format msgid "'%s' already exists" msgstr "'%s' existe déjà" -#: builtin/worktree.c:252 +#: builtin/worktree.c:251 #, c-format msgid "unable to re-add worktree '%s'" msgstr "impossible de ré-ajouter l'arbre de travail '%s'" -#: builtin/worktree.c:257 +#: builtin/worktree.c:256 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" @@ -21044,7 +21114,7 @@ msgstr "" "utilisez 'add -f -f' pour passer outre, ou 'unlock' et 'prune' ou 'remove' " "pour corriger" -#: builtin/worktree.c:259 +#: builtin/worktree.c:258 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" @@ -21053,129 +21123,129 @@ msgstr "" "'%s' est un arbre de travail manquant mais déjà enregistré ;\n" "utilisez 'add -f' pour passer outre, ou 'prune' ou 'remove' pour corriger" -#: builtin/worktree.c:309 +#: builtin/worktree.c:308 #, c-format msgid "could not create directory of '%s'" msgstr "impossible de créer le répertoire de '%s'" -#: builtin/worktree.c:440 builtin/worktree.c:446 +#: builtin/worktree.c:439 builtin/worktree.c:445 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Préparation de l'arbre de travail (nouvelle branche '%s')" -#: builtin/worktree.c:442 +#: builtin/worktree.c:441 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "" "Préparation de l'arbre de travail (réinitialisation de la branche '%s' ; " "précédemment sur %s)" -#: builtin/worktree.c:451 +#: builtin/worktree.c:450 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Préparation de l'arbre de travail (extraction de '%s')" -#: builtin/worktree.c:457 +#: builtin/worktree.c:456 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Préparation de l'arbre de travail (HEAD détachée %s)" -#: builtin/worktree.c:498 +#: builtin/worktree.c:497 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "extraire la <branche> même si elle est déjà extraite dans une autre copie de " "travail" -#: builtin/worktree.c:501 +#: builtin/worktree.c:500 msgid "create a new branch" msgstr "créer une nouvelle branche" -#: builtin/worktree.c:503 +#: builtin/worktree.c:502 msgid "create or reset a branch" msgstr "créer ou réinitialiser une branche" -#: builtin/worktree.c:505 +#: builtin/worktree.c:504 msgid "populate the new working tree" msgstr "remplissage de la nouvelle copie de travail" -#: builtin/worktree.c:506 +#: builtin/worktree.c:505 msgid "keep the new working tree locked" msgstr "conserver le verrou sur le nouvel arbre de travail" -#: builtin/worktree.c:509 +#: builtin/worktree.c:508 msgid "set up tracking mode (see git-branch(1))" msgstr "régler le mode de suivi (voir git-branch(1))" -#: builtin/worktree.c:512 +#: builtin/worktree.c:511 msgid "try to match the new branch name with a remote-tracking branch" msgstr "essayer de nommer la nouvelle branche comme la branche amont" -#: builtin/worktree.c:520 +#: builtin/worktree.c:519 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B et --detach sont mutuellement exclusifs" -#: builtin/worktree.c:581 +#: builtin/worktree.c:580 msgid "--[no-]track can only be used if a new branch is created" msgstr "" "--[no-]track ne peut être utilisé qu'à la création d'une nouvelle branche" -#: builtin/worktree.c:681 +#: builtin/worktree.c:680 msgid "reason for locking" msgstr "raison du verrouillage" -#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800 -#: builtin/worktree.c:927 +#: builtin/worktree.c:692 builtin/worktree.c:725 builtin/worktree.c:799 +#: builtin/worktree.c:926 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' n'est pas une copie de travail" -#: builtin/worktree.c:695 builtin/worktree.c:728 +#: builtin/worktree.c:694 builtin/worktree.c:727 msgid "The main working tree cannot be locked or unlocked" msgstr "" "La copie de travail principale ne peut pas être verrouillée ou déverrouillée" -#: builtin/worktree.c:700 +#: builtin/worktree.c:699 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' est déjà verrouillé, car '%s'" -#: builtin/worktree.c:702 +#: builtin/worktree.c:701 #, c-format msgid "'%s' is already locked" msgstr "'%s' est déjà verrouillé" -#: builtin/worktree.c:730 +#: builtin/worktree.c:729 #, c-format msgid "'%s' is not locked" msgstr "'%s' n'est pas verrouillé" -#: builtin/worktree.c:771 +#: builtin/worktree.c:770 msgid "working trees containing submodules cannot be moved or removed" msgstr "" "les arbres de travail contenant des sous-modules ne peuvent pas être " "déplacés ou supprimés" -#: builtin/worktree.c:779 +#: builtin/worktree.c:778 msgid "force move even if worktree is dirty or locked" msgstr "" "forcer le déplacement même si l'arbre de travail est sale ou verrouillé" -#: builtin/worktree.c:802 builtin/worktree.c:929 +#: builtin/worktree.c:801 builtin/worktree.c:928 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' est un arbre de travail principal" -#: builtin/worktree.c:807 +#: builtin/worktree.c:806 #, c-format msgid "could not figure out destination name from '%s'" msgstr "impossible de trouver le nom de la destination à partir de '%s'" -#: builtin/worktree.c:813 +#: builtin/worktree.c:812 #, c-format msgid "target '%s' already exists" msgstr "la cible '%s' existe déjà" -#: builtin/worktree.c:821 +#: builtin/worktree.c:820 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -21185,7 +21255,7 @@ msgstr "" "verrouillage : %s\n" "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant" -#: builtin/worktree.c:823 +#: builtin/worktree.c:822 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -21193,37 +21263,37 @@ msgstr "" "impossible de déplacer un arbre de travail verrouillé;\n" "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant" -#: builtin/worktree.c:826 +#: builtin/worktree.c:825 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "la validation a échoué, impossible de déplacer l'arbre de travail : %s" -#: builtin/worktree.c:831 +#: builtin/worktree.c:830 #, c-format msgid "failed to move '%s' to '%s'" msgstr "échec au déplacement de '%s' vers '%s'" -#: builtin/worktree.c:879 +#: builtin/worktree.c:878 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "échec du lancement de 'git status' sur '%s'" -#: builtin/worktree.c:883 +#: builtin/worktree.c:882 #, c-format -msgid "'%s' is dirty, use --force to delete it" -msgstr "'%s' est sale, utilisez --force pour le supprimer" +msgid "'%s' contains modified or untracked files, use --force to delete it" +msgstr "'%s' contient des fichiers modifiés ou non-suivis, utilisez --force pour le supprimer" -#: builtin/worktree.c:888 +#: builtin/worktree.c:887 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "impossible de lancer 'git status' sur '%s', code %d" -#: builtin/worktree.c:911 +#: builtin/worktree.c:910 msgid "force removal even if worktree is dirty or locked" msgstr "" "forcer la suppression même si l'arbre de travail est sale ou verrouillé" -#: builtin/worktree.c:934 +#: builtin/worktree.c:933 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -21233,7 +21303,7 @@ msgstr "" "verrouillage : %s\n" "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant" -#: builtin/worktree.c:936 +#: builtin/worktree.c:935 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -21241,7 +21311,7 @@ msgstr "" "impossible de supprimer un arbre de travail verrouillé;\n" "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant" -#: builtin/worktree.c:939 +#: builtin/worktree.c:938 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "" @@ -21263,6 +21333,16 @@ msgstr "écrire l'objet arbre pour un sous-répertoire <préfixe>" msgid "only useful for debugging" msgstr "seulement utile pour le débogage" +#: fast-import.c:3118 +#, c-format +msgid "Expected 'mark' command, got %s" +msgstr "commande 'mark' attendue, %s trouvé" + +#: fast-import.c:3123 +#, c-format +msgid "Expected 'to' command, got %s" +msgstr "commande 'to' attendue, %s trouvé" + #: credential-cache--daemon.c:223 #, c-format msgid "" @@ -21375,39 +21455,39 @@ msgstr "" "l'alias '%s' modifie les variables d'environnement.\n" "Vous pouvez utiliser '!git' dans l'alias pour le faire" -#: git.c:377 +#: git.c:376 #, c-format msgid "empty alias for %s" msgstr "alias vide pour %s" -#: git.c:380 +#: git.c:379 #, c-format msgid "recursive alias: %s" msgstr "alias recursif : %s" -#: git.c:460 +#: git.c:459 msgid "write failure on standard output" msgstr "échec d'écriture sur la sortie standard" -#: git.c:462 +#: git.c:461 msgid "unknown write failure on standard output" msgstr "échec inconnu d'écriture sur la sortie standard" -#: git.c:464 +#: git.c:463 msgid "close failed on standard output" msgstr "échec de fermeture de la sortie standard" -#: git.c:793 +#: git.c:792 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "boucle d'alias détectée : l'expansion de '%s' ne finit jamais : %s" -#: git.c:843 +#: git.c:842 #, c-format msgid "cannot handle %s as a builtin" msgstr "impossible d'utiliser %s comme une fonction intégrée" -#: git.c:856 +#: git.c:855 #, c-format msgid "" "usage: %s\n" @@ -21416,13 +21496,13 @@ msgstr "" "usage : %s\n" "\n" -#: git.c:876 +#: git.c:875 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "" "l'expansion de l'alias '%s' a échoué : '%s' n'est pas une commande git\n" -#: git.c:888 +#: git.c:887 #, c-format msgid "failed to run command '%s': %s\n" msgstr "échec au lancement de la commande '%s' : %s\n" @@ -21441,32 +21521,32 @@ msgstr "La délégation de commande n'est pas supporté avec cuRL < 7.22.0" msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "L'épinglage de clé publique n'est pas supporté avec cuRL < 7.44.0" -#: http.c:876 +#: http.c:878 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" msgstr "CURLSSLOPT_NO_REMOVE n'est pas supporté avec cuRL < 7.44.0" -#: http.c:949 +#: http.c:951 msgid "Protocol restrictions not supported with cURL < 7.19.4" msgstr "Les restrictions de protocole ne sont pas supportés avec cuRL < 7.19.4" -#: http.c:1085 +#: http.c:1088 #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" msgstr "Dorsale SSL '%s' non supportée. Dorsales SSL supportées :" -#: http.c:1092 +#: http.c:1095 #, c-format msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" msgstr "" "Impossible de régler la dorsale SSL à '%s' : cURL a été construit sans " "dorsale SSL" -#: http.c:1096 +#: http.c:1099 #, c-format msgid "Could not set SSL backend to '%s': already set" msgstr "Impossible de spécifier le dorsal SSL à '%s' : déjà spécifié" -#: http.c:1965 +#: http.c:1968 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -21562,7 +21642,7 @@ msgstr "impossible de récupérer par sha1 sur http intelligent" msgid "protocol error: expected sha/ref, got '%s'" msgstr "erreur de protocole : sha/ref attendu, '%s' trouvé" -#: remote-curl.c:1138 remote-curl.c:1252 +#: remote-curl.c:1138 remote-curl.c:1250 #, c-format msgid "http transport does not support %s" msgstr "le transport http ne supporte pas %s" @@ -21571,36 +21651,36 @@ msgstr "le transport http ne supporte pas %s" msgid "git-http-push failed" msgstr "échec de git-http-push" -#: remote-curl.c:1360 +#: remote-curl.c:1356 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "remote-curl: usage: git remote-curl <distant> [<url>]" -#: remote-curl.c:1392 +#: remote-curl.c:1388 msgid "remote-curl: error reading command stream from git" msgstr "remote-curl : erreur de lecture du flux de commande depuis git" -#: remote-curl.c:1399 +#: remote-curl.c:1395 msgid "remote-curl: fetch attempted without a local repo" msgstr "remote-curl : récupération tentée sans dépôt local" -#: remote-curl.c:1439 +#: remote-curl.c:1435 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl : commande inconnue '%s' depuis git" -#: list-objects-filter-options.h:61 +#: list-objects-filter-options.h:85 msgid "args" msgstr "args" -#: list-objects-filter-options.h:62 +#: list-objects-filter-options.h:86 msgid "object filtering" msgstr "filtrage d'objet" -#: parse-options.h:170 +#: parse-options.h:179 msgid "expiry-date" msgstr "date-d'expiration" -#: parse-options.h:184 +#: parse-options.h:193 msgid "no-op (backward compatibility)" msgstr "sans action (rétrocompatibilité)" diff --git a/po/git.pot b/po/git.pot index d799696ad0..5dff922d03 100644 --- a/po/git.pot +++ b/po/git.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2019-08-10 20:12+0800\n" +"POT-Creation-Date: 2019-10-21 19:55+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -58,7 +58,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "" -#: advice.c:193 builtin/merge.c:1327 +#: advice.c:193 builtin/merge.c:1332 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" @@ -176,17 +176,7 @@ msgstr "" msgid "inconsistent header lines %d and %d" msgstr "" -#: apply.c:1460 -#, c-format -msgid "recount: unexpected line: %.*s" -msgstr "" - -#: apply.c:1529 -#, c-format -msgid "patch fragment without header at line %d: %.*s" -msgstr "" - -#: apply.c:1551 +#: apply.c:1372 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -197,527 +187,537 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: apply.c:1564 +#: apply.c:1385 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" -#: apply.c:1752 +#: apply.c:1481 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "" + +#: apply.c:1550 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "" + +#: apply.c:1753 msgid "new file depends on old contents" msgstr "" -#: apply.c:1754 +#: apply.c:1755 msgid "deleted file still has contents" msgstr "" -#: apply.c:1788 +#: apply.c:1789 #, c-format msgid "corrupt patch at line %d" msgstr "" -#: apply.c:1825 +#: apply.c:1826 #, c-format msgid "new file %s depends on old contents" msgstr "" -#: apply.c:1827 +#: apply.c:1828 #, c-format msgid "deleted file %s still has contents" msgstr "" -#: apply.c:1830 +#: apply.c:1831 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "" -#: apply.c:1977 +#: apply.c:1978 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "" -#: apply.c:2014 +#: apply.c:2015 #, c-format msgid "unrecognized binary patch at line %d" msgstr "" -#: apply.c:2176 +#: apply.c:2177 #, c-format msgid "patch with only garbage at line %d" msgstr "" -#: apply.c:2262 +#: apply.c:2263 #, c-format msgid "unable to read symlink %s" msgstr "" -#: apply.c:2266 +#: apply.c:2267 #, c-format msgid "unable to open or read %s" msgstr "" -#: apply.c:2925 +#: apply.c:2926 #, c-format msgid "invalid start of line: '%c'" msgstr "" -#: apply.c:3046 +#: apply.c:3047 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "" msgstr[1] "" -#: apply.c:3058 +#: apply.c:3059 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: apply.c:3064 +#: apply.c:3065 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" -#: apply.c:3086 +#: apply.c:3087 #, c-format msgid "missing binary patch data for '%s'" msgstr "" -#: apply.c:3094 +#: apply.c:3095 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" -#: apply.c:3141 +#: apply.c:3142 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" -#: apply.c:3151 +#: apply.c:3152 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "" -#: apply.c:3159 +#: apply.c:3160 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "" -#: apply.c:3177 +#: apply.c:3178 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "" -#: apply.c:3190 +#: apply.c:3191 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" -#: apply.c:3196 +#: apply.c:3197 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: apply.c:3217 +#: apply.c:3218 #, c-format msgid "patch failed: %s:%ld" msgstr "" -#: apply.c:3340 +#: apply.c:3341 #, c-format msgid "cannot checkout %s" msgstr "" -#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279 +#: apply.c:3393 apply.c:3404 apply.c:3450 midx.c:61 setup.c:280 #, c-format msgid "failed to read %s" msgstr "" -#: apply.c:3400 +#: apply.c:3401 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "" -#: apply.c:3429 apply.c:3672 +#: apply.c:3430 apply.c:3673 #, c-format msgid "path %s has been renamed/deleted" msgstr "" -#: apply.c:3515 apply.c:3687 +#: apply.c:3516 apply.c:3688 #, c-format msgid "%s: does not exist in index" msgstr "" -#: apply.c:3524 apply.c:3695 +#: apply.c:3525 apply.c:3696 #, c-format msgid "%s: does not match index" msgstr "" -#: apply.c:3559 +#: apply.c:3560 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" -#: apply.c:3562 +#: apply.c:3563 #, c-format msgid "Falling back to three-way merge...\n" msgstr "" -#: apply.c:3578 apply.c:3582 +#: apply.c:3579 apply.c:3583 #, c-format msgid "cannot read the current contents of '%s'" msgstr "" -#: apply.c:3594 +#: apply.c:3595 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "" -#: apply.c:3608 +#: apply.c:3609 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "" -#: apply.c:3613 +#: apply.c:3614 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "" -#: apply.c:3639 +#: apply.c:3640 msgid "removal patch leaves file contents" msgstr "" -#: apply.c:3712 +#: apply.c:3713 #, c-format msgid "%s: wrong type" msgstr "" -#: apply.c:3714 +#: apply.c:3715 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856 +#: apply.c:3866 apply.c:3868 read-cache.c:830 read-cache.c:856 #: read-cache.c:1309 #, c-format msgid "invalid path '%s'" msgstr "" -#: apply.c:3923 +#: apply.c:3924 #, c-format msgid "%s: already exists in index" msgstr "" -#: apply.c:3926 +#: apply.c:3927 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: apply.c:3946 +#: apply.c:3947 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: apply.c:3951 +#: apply.c:3952 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: apply.c:3971 +#: apply.c:3972 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "" -#: apply.c:3975 +#: apply.c:3976 #, c-format msgid "%s: patch does not apply" msgstr "" -#: apply.c:3990 +#: apply.c:3991 #, c-format msgid "Checking patch %s..." msgstr "" -#: apply.c:4082 +#: apply.c:4083 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "" -#: apply.c:4089 +#: apply.c:4090 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "" -#: apply.c:4092 +#: apply.c:4093 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "" -#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143 +#: apply.c:4098 builtin/checkout.c:279 builtin/reset.c:143 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: apply.c:4101 +#: apply.c:4102 #, c-format msgid "could not add %s to temporary index" msgstr "" -#: apply.c:4111 +#: apply.c:4112 #, c-format msgid "could not write temporary index to %s" msgstr "" -#: apply.c:4249 +#: apply.c:4250 #, c-format msgid "unable to remove %s from index" msgstr "" -#: apply.c:4283 +#: apply.c:4284 #, c-format msgid "corrupt patch for submodule %s" msgstr "" -#: apply.c:4289 +#: apply.c:4290 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: apply.c:4297 +#: apply.c:4298 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: apply.c:4303 apply.c:4448 +#: apply.c:4304 apply.c:4449 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: apply.c:4346 +#: apply.c:4347 #, c-format msgid "failed to write to '%s'" msgstr "" -#: apply.c:4350 +#: apply.c:4351 #, c-format msgid "closing file '%s'" msgstr "" -#: apply.c:4420 +#: apply.c:4421 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: apply.c:4518 +#: apply.c:4519 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: apply.c:4526 +#: apply.c:4527 msgid "internal error" msgstr "" -#: apply.c:4529 +#: apply.c:4530 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: apply.c:4540 +#: apply.c:4541 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168 +#: apply.c:4549 builtin/fetch.c:898 builtin/fetch.c:1194 #, c-format msgid "cannot open %s" msgstr "" -#: apply.c:4562 +#: apply.c:4563 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: apply.c:4566 +#: apply.c:4567 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: apply.c:4676 +#: apply.c:4686 #, c-format msgid "Skipped patch '%s'." msgstr "" -#: apply.c:4684 +#: apply.c:4694 msgid "unrecognized input" msgstr "" -#: apply.c:4704 +#: apply.c:4714 msgid "unable to read index file" msgstr "" -#: apply.c:4859 +#: apply.c:4871 #, c-format msgid "can't open patch '%s': %s" msgstr "" -#: apply.c:4886 +#: apply.c:4898 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: apply.c:4892 apply.c:4907 +#: apply.c:4904 apply.c:4919 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "" msgstr[1] "" -#: apply.c:4900 +#: apply.c:4912 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "" msgstr[1] "" -#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4928 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "" -#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211 -#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273 -#: builtin/pull.c:208 builtin/submodule--helper.c:407 +#: apply.c:4955 apply.c:4958 builtin/am.c:2197 builtin/am.c:2200 +#: builtin/clone.c:122 builtin/fetch.c:143 builtin/merge.c:273 +#: builtin/pull.c:209 builtin/submodule--helper.c:407 #: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370 #: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853 #: builtin/submodule--helper.c:2092 git-add--interactive.perl:211 msgid "path" msgstr "" -#: apply.c:4944 +#: apply.c:4956 msgid "don't apply changes matching the given path" msgstr "" -#: apply.c:4947 +#: apply.c:4959 msgid "apply changes matching the given path" msgstr "" -#: apply.c:4949 builtin/am.c:2217 +#: apply.c:4961 builtin/am.c:2206 msgid "num" msgstr "" -#: apply.c:4950 +#: apply.c:4962 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" -#: apply.c:4953 +#: apply.c:4965 msgid "ignore additions made by the patch" msgstr "" -#: apply.c:4955 +#: apply.c:4967 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: apply.c:4959 +#: apply.c:4971 msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: apply.c:4961 +#: apply.c:4973 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: apply.c:4963 +#: apply.c:4975 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: apply.c:4965 +#: apply.c:4977 msgid "make sure the patch is applicable to the current index" msgstr "" -#: apply.c:4967 +#: apply.c:4979 msgid "mark new files with `git add --intent-to-add`" msgstr "" -#: apply.c:4969 +#: apply.c:4981 msgid "apply a patch without touching the working tree" msgstr "" -#: apply.c:4971 +#: apply.c:4983 msgid "accept a patch that touches outside the working area" msgstr "" -#: apply.c:4974 +#: apply.c:4986 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: apply.c:4976 +#: apply.c:4988 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: apply.c:4978 +#: apply.c:4990 msgid "build a temporary index based on embedded index information" msgstr "" -#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:4993 builtin/checkout-index.c:173 builtin/ls-files.c:524 msgid "paths are separated with NUL character" msgstr "" -#: apply.c:4983 +#: apply.c:4995 msgid "ensure at least <n> lines of context match" msgstr "" -#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98 +#: apply.c:4996 builtin/am.c:2185 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3330 builtin/rebase.c:1421 +#: builtin/pack-objects.c:3310 builtin/rebase.c:1445 msgid "action" msgstr "" -#: apply.c:4985 +#: apply.c:4997 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: apply.c:4988 apply.c:4991 +#: apply.c:5000 apply.c:5003 msgid "ignore changes in whitespace when finding context" msgstr "" -#: apply.c:4994 +#: apply.c:5006 msgid "apply the patch in reverse" msgstr "" -#: apply.c:4996 +#: apply.c:5008 msgid "don't expect at least one line of context" msgstr "" -#: apply.c:4998 +#: apply.c:5010 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: apply.c:5000 +#: apply.c:5012 msgid "allow overlapping hunks" msgstr "" -#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22 +#: apply.c:5013 builtin/add.c:291 builtin/check-ignore.c:22 #: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786 -#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128 +#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "" -#: apply.c:5003 +#: apply.c:5015 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: apply.c:5006 +#: apply.c:5018 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: apply.c:5008 builtin/am.c:2205 +#: apply.c:5020 builtin/am.c:2194 msgid "root" msgstr "" -#: apply.c:5009 +#: apply.c:5021 msgid "prepend <root> to all filenames" msgstr "" @@ -770,7 +770,7 @@ msgstr "" msgid "archive format" msgstr "" -#: archive.c:458 builtin/log.c:1580 +#: archive.c:458 builtin/log.c:1581 msgid "prefix" msgstr "" @@ -778,11 +778,12 @@ msgstr "" msgid "prepend prefix to each pathname in the archive" msgstr "" -#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875 -#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134 -#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105 -#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412 -#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177 +#: archive.c:460 builtin/blame.c:861 builtin/blame.c:873 builtin/blame.c:874 +#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162 +#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899 +#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563 +#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 +#: parse-options.h:186 msgid "file" msgstr "" @@ -814,7 +815,7 @@ msgstr "" msgid "list supported archive formats" msgstr "" -#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: archive.c:479 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115 #: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859 msgid "repo" msgstr "" @@ -823,7 +824,7 @@ msgstr "" msgid "retrieve the archive from remote repository <repo>" msgstr "" -#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707 +#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715 #: builtin/notes.c:498 msgid "command" msgstr "" @@ -859,26 +860,26 @@ msgstr "" msgid "cannot stream blob %s" msgstr "" -#: archive-tar.c:260 archive-zip.c:363 +#: archive-tar.c:266 archive-zip.c:363 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "" -#: archive-tar.c:287 archive-zip.c:353 +#: archive-tar.c:293 archive-zip.c:353 #, c-format msgid "cannot read %s" msgstr "" -#: archive-tar.c:459 +#: archive-tar.c:465 #, c-format msgid "unable to start '%s' filter" msgstr "" -#: archive-tar.c:462 +#: archive-tar.c:468 msgid "unable to redirect descriptor" msgstr "" -#: archive-tar.c:469 +#: archive-tar.c:475 #, c-format msgid "'%s' filter reported error" msgstr "" @@ -903,17 +904,17 @@ msgstr "" msgid "timestamp too large for this system: %<PRIuMAX>" msgstr "" -#: attr.c:211 +#: attr.c:213 #, c-format msgid "%.*s is not a valid attribute name" msgstr "" -#: attr.c:368 +#: attr.c:370 #, c-format msgid "%s not allowed: %s:%d" msgstr "" -#: attr.c:408 +#: attr.c:410 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1024,37 +1025,37 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "" msgstr[1] "" -#: blame.c:2697 +#: blame.c:2700 msgid "--contents and --reverse do not blend well." msgstr "" -#: blame.c:2711 +#: blame.c:2714 msgid "cannot use --contents with final commit object name" msgstr "" -#: blame.c:2732 +#: blame.c:2735 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" -#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033 -#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963 -#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411 -#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163 +#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:1971 +#: sequencer.c:4305 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:964 +#: builtin/log.c:1452 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411 +#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "" -#: blame.c:2759 +#: blame.c:2762 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" -#: blame.c:2770 +#: blame.c:2773 #, c-format msgid "no such path %s in %s" msgstr "" -#: blame.c:2781 +#: blame.c:2784 #, c-format msgid "cannot read blob %s for path %s" msgstr "" @@ -1193,7 +1194,7 @@ msgstr "" msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2221 sequencer.c:2962 #: builtin/commit.c:791 #, c-format msgid "could not open '%s'" @@ -1246,7 +1247,7 @@ msgstr "" msgid "ref '%s' is excluded by the rev-list options" msgstr "" -#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306 +#: bundle.c:460 builtin/log.c:202 builtin/log.c:1733 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "" @@ -1269,8 +1270,8 @@ msgstr "" msgid "invalid color value: %.*s" msgstr "" -#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399 -#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455 +#: commit.c:50 sequencer.c:2665 builtin/am.c:354 builtin/am.c:398 +#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456 #, c-format msgid "could not parse %s" msgstr "" @@ -1292,27 +1293,27 @@ msgid "" "\"git config advice.graftFileDeprecated false\"" msgstr "" -#: commit.c:1127 +#: commit.c:1128 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" -#: commit.c:1130 +#: commit.c:1131 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" -#: commit.c:1133 +#: commit.c:1134 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "" -#: commit.c:1136 +#: commit.c:1137 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "" -#: commit.c:1390 +#: commit.c:1391 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -1369,193 +1370,208 @@ msgstr "" msgid "unable to find all commit-graph files" msgstr "" -#: commit-graph.c:554 commit-graph.c:614 +#: commit-graph.c:561 commit-graph.c:621 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "" -#: commit-graph.c:575 +#: commit-graph.c:582 #, c-format msgid "could not find commit %s" msgstr "" -#: commit-graph.c:1002 builtin/pack-objects.c:2657 +#: commit-graph.c:855 builtin/am.c:1287 +#, c-format +msgid "unable to parse commit %s" +msgstr "" + +#: commit-graph.c:859 +#, c-format +msgid "unable to get tree for %s" +msgstr "" + +#: commit-graph.c:1017 builtin/pack-objects.c:2641 #, c-format msgid "unable to get type of object %s" msgstr "" -#: commit-graph.c:1034 +#: commit-graph.c:1049 msgid "Loading known commits in commit graph" msgstr "" -#: commit-graph.c:1051 +#: commit-graph.c:1066 msgid "Expanding reachable commits in commit graph" msgstr "" -#: commit-graph.c:1070 +#: commit-graph.c:1085 msgid "Clearing commit marks in commit graph" msgstr "" -#: commit-graph.c:1089 +#: commit-graph.c:1104 msgid "Computing commit graph generation numbers" msgstr "" -#: commit-graph.c:1163 +#: commit-graph.c:1179 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "" msgstr[1] "" -#: commit-graph.c:1176 +#: commit-graph.c:1192 #, c-format msgid "error adding pack %s" msgstr "" -#: commit-graph.c:1180 +#: commit-graph.c:1196 #, c-format msgid "error opening index for %s" msgstr "" -#: commit-graph.c:1204 +#: commit-graph.c:1220 #, c-format msgid "Finding commits for commit graph from %d ref" msgid_plural "Finding commits for commit graph from %d refs" msgstr[0] "" msgstr[1] "" -#: commit-graph.c:1238 +#: commit-graph.c:1240 +#, c-format +msgid "invalid commit object id: %s" +msgstr "" + +#: commit-graph.c:1255 msgid "Finding commits for commit graph among packed objects" msgstr "" -#: commit-graph.c:1253 +#: commit-graph.c:1270 msgid "Counting distinct commits in commit graph" msgstr "" -#: commit-graph.c:1284 +#: commit-graph.c:1300 msgid "Finding extra edges in commit graph" msgstr "" -#: commit-graph.c:1332 +#: commit-graph.c:1346 msgid "failed to write correct number of base graph ids" msgstr "" -#: commit-graph.c:1365 midx.c:811 +#: commit-graph.c:1379 midx.c:810 #, c-format msgid "unable to create leading directories of %s" msgstr "" -#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240 +#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:241 #, c-format msgid "unable to create '%s'" msgstr "" -#: commit-graph.c:1437 +#: commit-graph.c:1451 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "" msgstr[1] "" -#: commit-graph.c:1478 +#: commit-graph.c:1492 msgid "unable to open commit-graph chain file" msgstr "" -#: commit-graph.c:1490 +#: commit-graph.c:1504 msgid "failed to rename base commit-graph file" msgstr "" -#: commit-graph.c:1510 +#: commit-graph.c:1524 msgid "failed to rename temporary commit-graph file" msgstr "" -#: commit-graph.c:1621 +#: commit-graph.c:1635 msgid "Scanning merged commits" msgstr "" -#: commit-graph.c:1632 +#: commit-graph.c:1646 #, c-format msgid "unexpected duplicate commit id %s" msgstr "" -#: commit-graph.c:1657 +#: commit-graph.c:1670 msgid "Merging commit-graph" msgstr "" -#: commit-graph.c:1844 +#: commit-graph.c:1860 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "" -#: commit-graph.c:1855 +#: commit-graph.c:1871 msgid "too many commits to write graph" msgstr "" -#: commit-graph.c:1945 +#: commit-graph.c:1961 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" -#: commit-graph.c:1955 +#: commit-graph.c:1971 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "" -#: commit-graph.c:1965 commit-graph.c:1980 +#: commit-graph.c:1981 commit-graph.c:1996 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" -#: commit-graph.c:1972 +#: commit-graph.c:1988 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "" -#: commit-graph.c:1989 +#: commit-graph.c:2006 msgid "Verifying commits in commit graph" msgstr "" -#: commit-graph.c:2002 +#: commit-graph.c:2020 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" -#: commit-graph.c:2009 +#: commit-graph.c:2027 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" -#: commit-graph.c:2019 +#: commit-graph.c:2037 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "" -#: commit-graph.c:2028 +#: commit-graph.c:2046 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "" -#: commit-graph.c:2041 +#: commit-graph.c:2059 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" -#: commit-graph.c:2046 +#: commit-graph.c:2064 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "" -#: commit-graph.c:2050 +#: commit-graph.c:2068 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "" -#: commit-graph.c:2065 +#: commit-graph.c:2083 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "" -#: commit-graph.c:2071 +#: commit-graph.c:2089 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" @@ -1597,7 +1613,7 @@ msgstr "" msgid "key does not contain variable name: %s" msgstr "" -#: config.c:406 sequencer.c:2463 +#: config.c:406 sequencer.c:2401 #, c-format msgid "invalid key: %s" msgstr "" @@ -1719,149 +1735,144 @@ msgstr "" msgid "invalid mode for object creation: %s" msgstr "" -#: config.c:1430 +#: config.c:1425 #, c-format msgid "malformed value for %s" msgstr "" -#: config.c:1456 +#: config.c:1451 #, c-format msgid "malformed value for %s: %s" msgstr "" -#: config.c:1457 +#: config.c:1452 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "" -#: config.c:1518 builtin/pack-objects.c:3410 +#: config.c:1513 builtin/pack-objects.c:3394 #, c-format msgid "bad pack compression level %d" msgstr "" -#: config.c:1639 +#: config.c:1634 #, c-format msgid "unable to load config blob object '%s'" msgstr "" -#: config.c:1642 +#: config.c:1637 #, c-format msgid "reference '%s' does not point to a blob" msgstr "" -#: config.c:1659 +#: config.c:1654 #, c-format msgid "unable to resolve config blob '%s'" msgstr "" -#: config.c:1689 +#: config.c:1684 #, c-format msgid "failed to parse %s" msgstr "" -#: config.c:1745 +#: config.c:1740 msgid "unable to parse command-line config" msgstr "" -#: config.c:2094 +#: config.c:2091 msgid "unknown error occurred while reading the configuration files" msgstr "" -#: config.c:2264 +#: config.c:2261 #, c-format msgid "Invalid %s: '%s'" msgstr "" -#: config.c:2307 -#, c-format -msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" -msgstr "" - -#: config.c:2333 +#: config.c:2306 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" -#: config.c:2379 +#: config.c:2352 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" -#: config.c:2381 +#: config.c:2354 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" -#: config.c:2462 +#: config.c:2435 #, c-format msgid "invalid section name '%s'" msgstr "" -#: config.c:2494 +#: config.c:2467 #, c-format msgid "%s has multiple values" msgstr "" -#: config.c:2523 +#: config.c:2496 #, c-format msgid "failed to write new configuration file %s" msgstr "" -#: config.c:2775 config.c:3099 +#: config.c:2748 config.c:3072 #, c-format msgid "could not lock config file %s" msgstr "" -#: config.c:2786 +#: config.c:2759 #, c-format msgid "opening %s" msgstr "" -#: config.c:2821 builtin/config.c:328 +#: config.c:2794 builtin/config.c:328 #, c-format msgid "invalid pattern: %s" msgstr "" -#: config.c:2846 +#: config.c:2819 #, c-format msgid "invalid config file %s" msgstr "" -#: config.c:2859 config.c:3112 +#: config.c:2832 config.c:3085 #, c-format msgid "fstat on %s failed" msgstr "" -#: config.c:2870 +#: config.c:2843 #, c-format msgid "unable to mmap '%s'" msgstr "" -#: config.c:2879 config.c:3117 +#: config.c:2852 config.c:3090 #, c-format msgid "chmod on %s failed" msgstr "" -#: config.c:2964 config.c:3214 +#: config.c:2937 config.c:3187 #, c-format msgid "could not write config file %s" msgstr "" -#: config.c:2998 +#: config.c:2971 #, c-format msgid "could not set '%s' to '%s'" msgstr "" -#: config.c:3000 builtin/remote.c:782 +#: config.c:2973 builtin/remote.c:782 #, c-format msgid "could not unset '%s'" msgstr "" -#: config.c:3090 +#: config.c:3063 #, c-format msgid "invalid section name: %s" msgstr "" -#: config.c:3257 +#: config.c:3230 #, c-format msgid "missing value for '%s'" msgstr "" @@ -1977,7 +1988,7 @@ msgstr "" msgid "unknown port %s" msgstr "" -#: connect.c:845 connect.c:1171 +#: connect.c:845 connect.c:1175 #, c-format msgid "strange hostname '%s' blocked" msgstr "" @@ -1992,211 +2003,211 @@ msgstr "" msgid "cannot start proxy %s" msgstr "" -#: connect.c:924 +#: connect.c:928 msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "" -#: connect.c:1119 +#: connect.c:1123 msgid "ssh variant 'simple' does not support -4" msgstr "" -#: connect.c:1131 +#: connect.c:1135 msgid "ssh variant 'simple' does not support -6" msgstr "" -#: connect.c:1148 +#: connect.c:1152 msgid "ssh variant 'simple' does not support setting port" msgstr "" -#: connect.c:1260 +#: connect.c:1264 #, c-format msgid "strange pathname '%s' blocked" msgstr "" -#: connect.c:1307 +#: connect.c:1311 msgid "unable to fork" msgstr "" -#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43 +#: connected.c:88 builtin/fsck.c:221 builtin/prune.c:43 msgid "Checking connectivity" msgstr "" -#: connected.c:98 +#: connected.c:100 msgid "Could not run 'git rev-list'" msgstr "" -#: connected.c:118 +#: connected.c:120 msgid "failed write to rev-list" msgstr "" -#: connected.c:125 +#: connected.c:127 msgid "failed to close rev-list's stdin" msgstr "" -#: convert.c:193 +#: convert.c:194 #, c-format msgid "illegal crlf_action %d" msgstr "" -#: convert.c:206 +#: convert.c:207 #, c-format msgid "CRLF would be replaced by LF in %s" msgstr "" -#: convert.c:208 +#: convert.c:209 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" "The file will have its original line endings in your working directory" msgstr "" -#: convert.c:216 +#: convert.c:217 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "" -#: convert.c:218 +#: convert.c:219 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" "The file will have its original line endings in your working directory" msgstr "" -#: convert.c:279 +#: convert.c:280 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "" -#: convert.c:286 +#: convert.c:287 #, c-format msgid "" "The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-" "tree-encoding." msgstr "" -#: convert.c:304 +#: convert.c:305 #, c-format msgid "BOM is required in '%s' if encoded as %s" msgstr "" -#: convert.c:306 +#: convert.c:307 #, 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." msgstr "" -#: convert.c:424 convert.c:495 +#: convert.c:425 convert.c:496 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "" -#: convert.c:467 +#: convert.c:468 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "" -#: convert.c:673 +#: convert.c:674 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "" -#: convert.c:693 +#: convert.c:694 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "" -#: convert.c:700 +#: convert.c:701 #, c-format msgid "external filter '%s' failed %d" msgstr "" -#: convert.c:735 convert.c:738 +#: convert.c:736 convert.c:739 #, c-format msgid "read from external filter '%s' failed" msgstr "" -#: convert.c:741 convert.c:796 +#: convert.c:742 convert.c:797 #, c-format msgid "external filter '%s' failed" msgstr "" -#: convert.c:844 +#: convert.c:845 msgid "unexpected filter type" msgstr "" -#: convert.c:855 +#: convert.c:856 msgid "path name too long for external filter" msgstr "" -#: convert.c:929 +#: convert.c:930 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " "been filtered" msgstr "" -#: convert.c:1228 +#: convert.c:1229 msgid "true/false are no valid working-tree-encodings" msgstr "" -#: convert.c:1398 convert.c:1432 +#: convert.c:1417 convert.c:1451 #, c-format msgid "%s: clean filter '%s' failed" msgstr "" -#: convert.c:1476 +#: convert.c:1495 #, c-format msgid "%s: smudge filter %s failed" msgstr "" -#: date.c:137 +#: date.c:138 msgid "in the future" msgstr "" -#: date.c:143 +#: date.c:144 #, c-format msgid "%<PRIuMAX> second ago" msgid_plural "%<PRIuMAX> seconds ago" msgstr[0] "" msgstr[1] "" -#: date.c:150 +#: date.c:151 #, c-format msgid "%<PRIuMAX> minute ago" msgid_plural "%<PRIuMAX> minutes ago" msgstr[0] "" msgstr[1] "" -#: date.c:157 +#: date.c:158 #, c-format msgid "%<PRIuMAX> hour ago" msgid_plural "%<PRIuMAX> hours ago" msgstr[0] "" msgstr[1] "" -#: date.c:164 +#: date.c:165 #, c-format msgid "%<PRIuMAX> day ago" msgid_plural "%<PRIuMAX> days ago" msgstr[0] "" msgstr[1] "" -#: date.c:170 +#: date.c:171 #, c-format msgid "%<PRIuMAX> week ago" msgid_plural "%<PRIuMAX> weeks ago" msgstr[0] "" msgstr[1] "" -#: date.c:177 +#: date.c:178 #, c-format msgid "%<PRIuMAX> month ago" msgid_plural "%<PRIuMAX> months ago" msgstr[0] "" msgstr[1] "" -#: date.c:188 +#: date.c:189 #, c-format msgid "%<PRIuMAX> year" msgid_plural "%<PRIuMAX> years" @@ -2204,14 +2215,14 @@ msgstr[0] "" msgstr[1] "" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:191 +#: date.c:192 #, c-format msgid "%s, %<PRIuMAX> month ago" msgid_plural "%s, %<PRIuMAX> months ago" msgstr[0] "" msgstr[1] "" -#: date.c:196 date.c:201 +#: date.c:197 date.c:202 #, c-format msgid "%<PRIuMAX> year ago" msgid_plural "%<PRIuMAX> years ago" @@ -2247,7 +2258,7 @@ msgstr "" msgid "failed to read orderfile '%s'" msgstr "" -#: diffcore-rename.c:544 +#: diffcore-rename.c:543 msgid "Performing inexact rename detection" msgstr "" @@ -2302,562 +2313,562 @@ msgid "" "%s" msgstr "" -#: diff.c:4215 +#: diff.c:4218 #, c-format msgid "external diff died, stopping at %s" msgstr "" -#: diff.c:4560 +#: diff.c:4563 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" -#: diff.c:4563 +#: diff.c:4566 msgid "-G, -S and --find-object are mutually exclusive" msgstr "" -#: diff.c:4641 +#: diff.c:4644 msgid "--follow requires exactly one pathspec" msgstr "" -#: diff.c:4689 +#: diff.c:4692 #, c-format msgid "invalid --stat value: %s" msgstr "" -#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222 +#: diff.c:4697 diff.c:4702 diff.c:4707 diff.c:4712 diff.c:5225 #: parse-options.c:199 parse-options.c:203 #, c-format msgid "%s expects a numerical value" msgstr "" -#: diff.c:4726 +#: diff.c:4729 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: diff.c:4811 +#: diff.c:4814 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "" -#: diff.c:4835 +#: diff.c:4838 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "" -#: diff.c:4849 +#: diff.c:4852 #, c-format msgid "unable to resolve '%s'" msgstr "" -#: diff.c:4899 diff.c:4905 +#: diff.c:4902 diff.c:4908 #, c-format msgid "%s expects <n>/<m> form" msgstr "" -#: diff.c:4917 +#: diff.c:4920 #, c-format msgid "%s expects a character, got '%s'" msgstr "" -#: diff.c:4938 +#: diff.c:4941 #, c-format msgid "bad --color-moved argument: %s" msgstr "" -#: diff.c:4957 +#: diff.c:4960 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "" -#: diff.c:4997 +#: diff.c:5000 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" msgstr "" -#: diff.c:5033 diff.c:5053 +#: diff.c:5036 diff.c:5056 #, c-format msgid "invalid argument to %s" msgstr "" -#: diff.c:5191 +#: diff.c:5194 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "" -#: diff.c:5247 +#: diff.c:5250 #, c-format msgid "bad --word-diff argument: %s" msgstr "" -#: diff.c:5270 +#: diff.c:5273 msgid "Diff output format options" msgstr "" -#: diff.c:5272 diff.c:5278 +#: diff.c:5275 diff.c:5281 msgid "generate patch" msgstr "" -#: diff.c:5275 builtin/log.c:172 +#: diff.c:5278 builtin/log.c:172 msgid "suppress diff output" msgstr "" -#: diff.c:5280 diff.c:5394 diff.c:5401 +#: diff.c:5283 diff.c:5397 diff.c:5404 msgid "<n>" msgstr "" -#: diff.c:5281 diff.c:5284 +#: diff.c:5284 diff.c:5287 msgid "generate diffs with <n> lines context" msgstr "" -#: diff.c:5286 +#: diff.c:5289 msgid "generate the diff in raw format" msgstr "" -#: diff.c:5289 +#: diff.c:5292 msgid "synonym for '-p --raw'" msgstr "" -#: diff.c:5293 +#: diff.c:5296 msgid "synonym for '-p --stat'" msgstr "" -#: diff.c:5297 +#: diff.c:5300 msgid "machine friendly --stat" msgstr "" -#: diff.c:5300 +#: diff.c:5303 msgid "output only the last line of --stat" msgstr "" -#: diff.c:5302 diff.c:5310 +#: diff.c:5305 diff.c:5313 msgid "<param1,param2>..." msgstr "" -#: diff.c:5303 +#: diff.c:5306 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" -#: diff.c:5307 +#: diff.c:5310 msgid "synonym for --dirstat=cumulative" msgstr "" -#: diff.c:5311 +#: diff.c:5314 msgid "synonym for --dirstat=files,param1,param2..." msgstr "" -#: diff.c:5315 +#: diff.c:5318 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" -#: diff.c:5318 +#: diff.c:5321 msgid "condensed summary such as creations, renames and mode changes" msgstr "" -#: diff.c:5321 +#: diff.c:5324 msgid "show only names of changed files" msgstr "" -#: diff.c:5324 +#: diff.c:5327 msgid "show only names and status of changed files" msgstr "" -#: diff.c:5326 +#: diff.c:5329 msgid "<width>[,<name-width>[,<count>]]" msgstr "" -#: diff.c:5327 +#: diff.c:5330 msgid "generate diffstat" msgstr "" -#: diff.c:5329 diff.c:5332 diff.c:5335 +#: diff.c:5332 diff.c:5335 diff.c:5338 msgid "<width>" msgstr "" -#: diff.c:5330 +#: diff.c:5333 msgid "generate diffstat with a given width" msgstr "" -#: diff.c:5333 +#: diff.c:5336 msgid "generate diffstat with a given name width" msgstr "" -#: diff.c:5336 +#: diff.c:5339 msgid "generate diffstat with a given graph width" msgstr "" -#: diff.c:5338 +#: diff.c:5341 msgid "<count>" msgstr "" -#: diff.c:5339 +#: diff.c:5342 msgid "generate diffstat with limited lines" msgstr "" -#: diff.c:5342 +#: diff.c:5345 msgid "generate compact summary in diffstat" msgstr "" -#: diff.c:5345 +#: diff.c:5348 msgid "output a binary diff that can be applied" msgstr "" -#: diff.c:5348 +#: diff.c:5351 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" -#: diff.c:5350 +#: diff.c:5353 msgid "show colored diff" msgstr "" -#: diff.c:5351 +#: diff.c:5354 msgid "<kind>" msgstr "" -#: diff.c:5352 +#: diff.c:5355 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "" -#: diff.c:5355 +#: diff.c:5358 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" msgstr "" -#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470 +#: diff.c:5361 diff.c:5364 diff.c:5367 diff.c:5473 msgid "<prefix>" msgstr "" -#: diff.c:5359 +#: diff.c:5362 msgid "show the given source prefix instead of \"a/\"" msgstr "" -#: diff.c:5362 +#: diff.c:5365 msgid "show the given destination prefix instead of \"b/\"" msgstr "" -#: diff.c:5365 +#: diff.c:5368 msgid "prepend an additional prefix to every line of output" msgstr "" -#: diff.c:5368 +#: diff.c:5371 msgid "do not show any source or destination prefix" msgstr "" -#: diff.c:5371 +#: diff.c:5374 msgid "show context between diff hunks up to the specified number of lines" msgstr "" -#: diff.c:5375 diff.c:5380 diff.c:5385 +#: diff.c:5378 diff.c:5383 diff.c:5388 msgid "<char>" msgstr "" -#: diff.c:5376 +#: diff.c:5379 msgid "specify the character to indicate a new line instead of '+'" msgstr "" -#: diff.c:5381 +#: diff.c:5384 msgid "specify the character to indicate an old line instead of '-'" msgstr "" -#: diff.c:5386 +#: diff.c:5389 msgid "specify the character to indicate a context instead of ' '" msgstr "" -#: diff.c:5389 +#: diff.c:5392 msgid "Diff rename options" msgstr "" -#: diff.c:5390 +#: diff.c:5393 msgid "<n>[/<m>]" msgstr "" -#: diff.c:5391 +#: diff.c:5394 msgid "break complete rewrite changes into pairs of delete and create" msgstr "" -#: diff.c:5395 +#: diff.c:5398 msgid "detect renames" msgstr "" -#: diff.c:5399 +#: diff.c:5402 msgid "omit the preimage for deletes" msgstr "" -#: diff.c:5402 +#: diff.c:5405 msgid "detect copies" msgstr "" -#: diff.c:5406 +#: diff.c:5409 msgid "use unmodified files as source to find copies" msgstr "" -#: diff.c:5408 +#: diff.c:5411 msgid "disable rename detection" msgstr "" -#: diff.c:5411 +#: diff.c:5414 msgid "use empty blobs as rename source" msgstr "" -#: diff.c:5413 +#: diff.c:5416 msgid "continue listing the history of a file beyond renames" msgstr "" -#: diff.c:5416 +#: diff.c:5419 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "" -#: diff.c:5418 +#: diff.c:5421 msgid "Diff algorithm options" msgstr "" -#: diff.c:5420 +#: diff.c:5423 msgid "produce the smallest possible diff" msgstr "" -#: diff.c:5423 +#: diff.c:5426 msgid "ignore whitespace when comparing lines" msgstr "" -#: diff.c:5426 +#: diff.c:5429 msgid "ignore changes in amount of whitespace" msgstr "" -#: diff.c:5429 +#: diff.c:5432 msgid "ignore changes in whitespace at EOL" msgstr "" -#: diff.c:5432 +#: diff.c:5435 msgid "ignore carrier-return at the end of line" msgstr "" -#: diff.c:5435 +#: diff.c:5438 msgid "ignore changes whose lines are all blank" msgstr "" -#: diff.c:5438 +#: diff.c:5441 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "" -#: diff.c:5441 +#: diff.c:5444 msgid "generate diff using the \"patience diff\" algorithm" msgstr "" -#: diff.c:5445 +#: diff.c:5448 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "" -#: diff.c:5447 +#: diff.c:5450 msgid "<algorithm>" msgstr "" -#: diff.c:5448 +#: diff.c:5451 msgid "choose a diff algorithm" msgstr "" -#: diff.c:5450 +#: diff.c:5453 msgid "<text>" msgstr "" -#: diff.c:5451 +#: diff.c:5454 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "" -#: diff.c:5453 diff.c:5462 diff.c:5465 +#: diff.c:5456 diff.c:5465 diff.c:5468 msgid "<mode>" msgstr "" -#: diff.c:5454 +#: diff.c:5457 msgid "show word diff, using <mode> to delimit changed words" msgstr "" -#: diff.c:5456 diff.c:5459 diff.c:5504 +#: diff.c:5459 diff.c:5462 diff.c:5507 msgid "<regex>" msgstr "" -#: diff.c:5457 +#: diff.c:5460 msgid "use <regex> to decide what a word is" msgstr "" -#: diff.c:5460 +#: diff.c:5463 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "" -#: diff.c:5463 +#: diff.c:5466 msgid "moved lines of code are colored differently" msgstr "" -#: diff.c:5466 +#: diff.c:5469 msgid "how white spaces are ignored in --color-moved" msgstr "" -#: diff.c:5469 +#: diff.c:5472 msgid "Other diff options" msgstr "" -#: diff.c:5471 +#: diff.c:5474 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" -#: diff.c:5475 +#: diff.c:5478 msgid "treat all files as text" msgstr "" -#: diff.c:5477 +#: diff.c:5480 msgid "swap two inputs, reverse the diff" msgstr "" -#: diff.c:5479 +#: diff.c:5482 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "" -#: diff.c:5481 +#: diff.c:5484 msgid "disable all output of the program" msgstr "" -#: diff.c:5483 +#: diff.c:5486 msgid "allow an external diff helper to be executed" msgstr "" -#: diff.c:5485 +#: diff.c:5488 msgid "run external text conversion filters when comparing binary files" msgstr "" -#: diff.c:5487 +#: diff.c:5490 msgid "<when>" msgstr "" -#: diff.c:5488 +#: diff.c:5491 msgid "ignore changes to submodules in the diff generation" msgstr "" -#: diff.c:5491 +#: diff.c:5494 msgid "<format>" msgstr "" -#: diff.c:5492 +#: diff.c:5495 msgid "specify how differences in submodules are shown" msgstr "" -#: diff.c:5496 +#: diff.c:5499 msgid "hide 'git add -N' entries from the index" msgstr "" -#: diff.c:5499 +#: diff.c:5502 msgid "treat 'git add -N' entries as real in the index" msgstr "" -#: diff.c:5501 +#: diff.c:5504 msgid "<string>" msgstr "" -#: diff.c:5502 +#: diff.c:5505 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "" -#: diff.c:5505 +#: diff.c:5508 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "" -#: diff.c:5508 +#: diff.c:5511 msgid "show all changes in the changeset with -S or -G" msgstr "" -#: diff.c:5511 +#: diff.c:5514 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "" -#: diff.c:5514 +#: diff.c:5517 msgid "control the order in which files appear in the output" msgstr "" -#: diff.c:5515 +#: diff.c:5518 msgid "<object-id>" msgstr "" -#: diff.c:5516 +#: diff.c:5519 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "" -#: diff.c:5518 +#: diff.c:5521 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "" -#: diff.c:5519 +#: diff.c:5522 msgid "select files by diff type" msgstr "" -#: diff.c:5521 +#: diff.c:5524 msgid "<file>" msgstr "" -#: diff.c:5522 +#: diff.c:5525 msgid "Output to a specific file" msgstr "" -#: diff.c:6177 +#: diff.c:6180 msgid "inexact rename detection was skipped due to too many files." msgstr "" -#: diff.c:6180 +#: diff.c:6183 msgid "only found copies from modified paths due to too many files." msgstr "" -#: diff.c:6183 +#: diff.c:6186 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "" -#: dir.c:537 +#: dir.c:549 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "" -#: dir.c:926 +#: dir.c:938 #, c-format msgid "cannot use %s as an exclude file" msgstr "" -#: dir.c:1843 +#: dir.c:1877 #, c-format msgid "could not open directory '%s'" msgstr "" -#: dir.c:2085 +#: dir.c:2128 msgid "failed to get kernel name and information" msgstr "" -#: dir.c:2209 +#: dir.c:2252 msgid "untracked cache is disabled on this system or location" msgstr "" -#: dir.c:3013 +#: dir.c:3056 #, c-format msgid "index file corrupt in repo %s" msgstr "" -#: dir.c:3058 dir.c:3063 +#: dir.c:3101 dir.c:3106 #, c-format msgid "could not create directories for %s" msgstr "" -#: dir.c:3092 +#: dir.c:3135 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "" @@ -2876,12 +2887,12 @@ msgstr "" msgid "could not stat file '%s'" msgstr "" -#: environment.c:150 +#: environment.c:148 #, c-format msgid "bad git namespace path \"%s\"" msgstr "" -#: environment.c:332 +#: environment.c:330 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "" @@ -2891,158 +2902,154 @@ msgstr "" msgid "too many args to run %s" msgstr "" -#: fetch-object.c:17 -msgid "Remote with no URL" -msgstr "" - -#: fetch-pack.c:151 +#: fetch-pack.c:150 msgid "git fetch-pack: expected shallow list" msgstr "" -#: fetch-pack.c:154 +#: fetch-pack.c:153 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "" -#: fetch-pack.c:165 +#: fetch-pack.c:164 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "" -#: fetch-pack.c:185 +#: fetch-pack.c:184 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "" -#: fetch-pack.c:196 +#: fetch-pack.c:195 msgid "unable to write to remote" msgstr "" -#: fetch-pack.c:258 +#: fetch-pack.c:257 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "" -#: fetch-pack.c:360 fetch-pack.c:1284 +#: fetch-pack.c:356 fetch-pack.c:1280 #, c-format msgid "invalid shallow line: %s" msgstr "" -#: fetch-pack.c:366 fetch-pack.c:1290 +#: fetch-pack.c:362 fetch-pack.c:1286 #, c-format msgid "invalid unshallow line: %s" msgstr "" -#: fetch-pack.c:368 fetch-pack.c:1292 +#: fetch-pack.c:364 fetch-pack.c:1288 #, c-format msgid "object not found: %s" msgstr "" -#: fetch-pack.c:371 fetch-pack.c:1295 +#: fetch-pack.c:367 fetch-pack.c:1291 #, c-format msgid "error in object: %s" msgstr "" -#: fetch-pack.c:373 fetch-pack.c:1297 +#: fetch-pack.c:369 fetch-pack.c:1293 #, c-format msgid "no shallow found: %s" msgstr "" -#: fetch-pack.c:376 fetch-pack.c:1301 +#: fetch-pack.c:372 fetch-pack.c:1297 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "" -#: fetch-pack.c:417 +#: fetch-pack.c:414 #, c-format msgid "got %s %d %s" msgstr "" -#: fetch-pack.c:434 +#: fetch-pack.c:431 #, c-format msgid "invalid commit %s" msgstr "" -#: fetch-pack.c:465 +#: fetch-pack.c:462 msgid "giving up" msgstr "" -#: fetch-pack.c:477 progress.c:277 +#: fetch-pack.c:475 progress.c:312 msgid "done" msgstr "" -#: fetch-pack.c:489 +#: fetch-pack.c:487 #, c-format msgid "got %s (%d) %s" msgstr "" -#: fetch-pack.c:535 +#: fetch-pack.c:533 #, c-format msgid "Marking %s as complete" msgstr "" -#: fetch-pack.c:744 +#: fetch-pack.c:742 #, c-format msgid "already have %s (%s)" msgstr "" -#: fetch-pack.c:783 +#: fetch-pack.c:781 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "" -#: fetch-pack.c:791 +#: fetch-pack.c:789 msgid "protocol error: bad pack header" msgstr "" -#: fetch-pack.c:859 +#: fetch-pack.c:857 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "" -#: fetch-pack.c:875 +#: fetch-pack.c:873 #, c-format msgid "%s failed" msgstr "" -#: fetch-pack.c:877 +#: fetch-pack.c:875 msgid "error in sideband demultiplexer" msgstr "" -#: fetch-pack.c:908 +#: fetch-pack.c:907 #, c-format msgid "Server version is %.*s" msgstr "" -#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928 -#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944 -#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960 -#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982 +#: fetch-pack.c:912 fetch-pack.c:918 fetch-pack.c:921 fetch-pack.c:927 +#: fetch-pack.c:931 fetch-pack.c:935 fetch-pack.c:939 fetch-pack.c:943 +#: fetch-pack.c:947 fetch-pack.c:951 fetch-pack.c:955 fetch-pack.c:959 +#: fetch-pack.c:965 fetch-pack.c:971 fetch-pack.c:976 fetch-pack.c:981 #, c-format msgid "Server supports %s" msgstr "" -#: fetch-pack.c:915 +#: fetch-pack.c:914 msgid "Server does not support shallow clients" msgstr "" -#: fetch-pack.c:975 +#: fetch-pack.c:974 msgid "Server does not support --shallow-since" msgstr "" -#: fetch-pack.c:980 +#: fetch-pack.c:979 msgid "Server does not support --shallow-exclude" msgstr "" -#: fetch-pack.c:984 +#: fetch-pack.c:983 msgid "Server does not support --deepen" msgstr "" -#: fetch-pack.c:1001 +#: fetch-pack.c:1000 msgid "no common commits" msgstr "" -#: fetch-pack.c:1013 fetch-pack.c:1462 +#: fetch-pack.c:1012 fetch-pack.c:1468 msgid "git fetch-pack: fetch failed." msgstr "" -#: fetch-pack.c:1151 +#: fetch-pack.c:1150 msgid "Server does not support shallow requests" msgstr "" @@ -3050,72 +3057,72 @@ msgstr "" msgid "Server supports filter" msgstr "" -#: fetch-pack.c:1184 +#: fetch-pack.c:1180 msgid "unable to write request to remote" msgstr "" -#: fetch-pack.c:1202 +#: fetch-pack.c:1198 #, c-format msgid "error reading section header '%s'" msgstr "" -#: fetch-pack.c:1208 +#: fetch-pack.c:1204 #, c-format msgid "expected '%s', received '%s'" msgstr "" -#: fetch-pack.c:1247 +#: fetch-pack.c:1243 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "" -#: fetch-pack.c:1252 +#: fetch-pack.c:1248 #, c-format msgid "error processing acks: %d" msgstr "" -#: fetch-pack.c:1262 +#: fetch-pack.c:1258 msgid "expected packfile to be sent after 'ready'" msgstr "" -#: fetch-pack.c:1264 +#: fetch-pack.c:1260 msgid "expected no other sections to be sent after no 'ready'" msgstr "" -#: fetch-pack.c:1306 +#: fetch-pack.c:1302 #, c-format msgid "error processing shallow info: %d" msgstr "" -#: fetch-pack.c:1353 +#: fetch-pack.c:1349 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "" -#: fetch-pack.c:1358 +#: fetch-pack.c:1354 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "" -#: fetch-pack.c:1363 +#: fetch-pack.c:1359 #, c-format msgid "error processing wanted refs: %d" msgstr "" -#: fetch-pack.c:1689 +#: fetch-pack.c:1693 msgid "no matching remote head" msgstr "" -#: fetch-pack.c:1712 builtin/clone.c:686 +#: fetch-pack.c:1716 builtin/clone.c:685 msgid "remote did not send all necessary objects" msgstr "" -#: fetch-pack.c:1739 +#: fetch-pack.c:1743 #, c-format msgid "no such remote ref %s" msgstr "" -#: fetch-pack.c:1742 +#: fetch-pack.c:1746 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "" @@ -3138,18 +3145,24 @@ msgstr "" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "" -#: grep.c:2117 +#: grep.c:627 +msgid "" +"given pattern contains NULL byte (via -f <file>). This is only supported " +"with -P under PCRE v2" +msgstr "" + +#: grep.c:2083 #, c-format msgid "'%s': unable to read %s" msgstr "" -#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82 +#: grep.c:2100 setup.c:165 builtin/clone.c:408 builtin/diff.c:82 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "" -#: grep.c:2145 +#: grep.c:2111 #, c-format msgid "'%s': short read" msgstr "" @@ -3285,12 +3298,12 @@ msgstr[1] "" msgid "git version [<options>]" msgstr "" -#: help.c:782 +#: help.c:783 #, c-format msgid "%s: %s - %s" msgstr "" -#: help.c:786 +#: help.c:787 msgid "" "\n" "Did you mean this?" @@ -3348,40 +3361,55 @@ msgstr "" msgid "invalid date format: %s" msgstr "" -#: list-objects.c:129 +#: list-objects.c:127 #, c-format msgid "entry '%s' in tree %s has tree mode, but is not a tree" msgstr "" -#: list-objects.c:142 +#: list-objects.c:140 #, c-format msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "" -#: list-objects.c:378 +#: list-objects.c:375 #, c-format msgid "unable to load root tree for commit %s" msgstr "" -#: list-objects-filter-options.c:36 -msgid "multiple filter-specs cannot be combined" +#: list-objects-filter.c:492 +#, c-format +msgid "unable to access sparse blob in '%s'" +msgstr "" + +#: list-objects-filter.c:495 +#, c-format +msgid "unable to parse sparse filter data in %s" msgstr "" #: list-objects-filter-options.c:58 msgid "expected 'tree:<depth>'" msgstr "" -#: list-objects-filter-options.c:84 +#: list-objects-filter-options.c:73 msgid "sparse:path filters support has been dropped" msgstr "" -#: list-objects-filter-options.c:94 +#: list-objects-filter-options.c:86 #, c-format msgid "invalid filter-spec '%s'" msgstr "" -#: list-objects-filter-options.c:158 -msgid "cannot change partial clone promisor remote" +#: list-objects-filter-options.c:102 +#, c-format +msgid "must escape char in sub-filter-spec: '%c'" +msgstr "" + +#: list-objects-filter-options.c:144 +msgid "expected something after combine:" +msgstr "" + +#: list-objects-filter-options.c:226 +msgid "multiple filter-specs cannot be combined" msgstr "" #: lockfile.c:151 @@ -3405,114 +3433,110 @@ msgstr "" msgid "failed to read the cache" msgstr "" -#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919 -#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786 +#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908 +#: builtin/checkout.c:537 builtin/checkout.c:796 builtin/clone.c:785 #: builtin/stash.c:264 msgid "unable to write new index file" msgstr "" -#: merge-recursive.c:322 +#: merge-recursive.c:367 msgid "(bad commit)\n" msgstr "" -#: merge-recursive.c:345 +#: merge-recursive.c:390 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "" -#: merge-recursive.c:354 +#: merge-recursive.c:399 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "" -#: merge-recursive.c:437 -msgid "error building trees" -msgstr "" - -#: merge-recursive.c:863 +#: merge-recursive.c:885 #, c-format msgid "failed to create path '%s'%s" msgstr "" -#: merge-recursive.c:874 +#: merge-recursive.c:896 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "" -#: merge-recursive.c:888 merge-recursive.c:907 +#: merge-recursive.c:910 merge-recursive.c:929 msgid ": perhaps a D/F conflict?" msgstr "" -#: merge-recursive.c:897 +#: merge-recursive.c:919 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" -#: merge-recursive.c:938 builtin/cat-file.c:40 +#: merge-recursive.c:960 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "" -#: merge-recursive.c:941 +#: merge-recursive.c:965 #, c-format msgid "blob expected for %s '%s'" msgstr "" -#: merge-recursive.c:965 +#: merge-recursive.c:990 #, c-format msgid "failed to open '%s': %s" msgstr "" -#: merge-recursive.c:976 +#: merge-recursive.c:1001 #, c-format msgid "failed to symlink '%s': %s" msgstr "" -#: merge-recursive.c:981 +#: merge-recursive.c:1006 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" -#: merge-recursive.c:1177 +#: merge-recursive.c:1199 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "" -#: merge-recursive.c:1184 +#: merge-recursive.c:1206 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "" -#: merge-recursive.c:1191 +#: merge-recursive.c:1213 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "" -#: merge-recursive.c:1199 merge-recursive.c:1211 +#: merge-recursive.c:1221 merge-recursive.c:1233 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "" -#: merge-recursive.c:1202 merge-recursive.c:1214 +#: merge-recursive.c:1224 merge-recursive.c:1236 #, c-format msgid "Fast-forwarding submodule %s" msgstr "" -#: merge-recursive.c:1237 +#: merge-recursive.c:1259 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" -#: merge-recursive.c:1241 +#: merge-recursive.c:1263 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "" -#: merge-recursive.c:1242 +#: merge-recursive.c:1264 msgid "Found a possible merge resolution for the submodule:\n" msgstr "" -#: merge-recursive.c:1245 +#: merge-recursive.c:1267 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -3523,108 +3547,108 @@ msgid "" "which will accept this suggestion.\n" msgstr "" -#: merge-recursive.c:1254 +#: merge-recursive.c:1276 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "" -#: merge-recursive.c:1327 +#: merge-recursive.c:1349 msgid "Failed to execute internal merge" msgstr "" -#: merge-recursive.c:1332 +#: merge-recursive.c:1354 #, c-format msgid "Unable to add %s to database" msgstr "" -#: merge-recursive.c:1364 +#: merge-recursive.c:1386 #, c-format msgid "Auto-merging %s" msgstr "" -#: merge-recursive.c:1387 +#: merge-recursive.c:1410 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" -#: merge-recursive.c:1459 +#: merge-recursive.c:1482 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree." msgstr "" -#: merge-recursive.c:1464 +#: merge-recursive.c:1487 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " "left in tree." msgstr "" -#: merge-recursive.c:1471 +#: merge-recursive.c:1494 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree at %s." msgstr "" -#: merge-recursive.c:1476 +#: merge-recursive.c:1499 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " "left in tree at %s." msgstr "" -#: merge-recursive.c:1511 +#: merge-recursive.c:1534 msgid "rename" msgstr "" -#: merge-recursive.c:1511 +#: merge-recursive.c:1534 msgid "renamed" msgstr "" -#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094 +#: merge-recursive.c:1614 merge-recursive.c:2472 merge-recursive.c:3117 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "" -#: merge-recursive.c:1601 +#: merge-recursive.c:1624 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "" -#: merge-recursive.c:1659 +#: merge-recursive.c:1682 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" -#: merge-recursive.c:1690 +#: merge-recursive.c:1713 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "" -#: merge-recursive.c:1695 +#: merge-recursive.c:1718 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "" -#: merge-recursive.c:1714 +#: merge-recursive.c:1737 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" "\"->\"%s\" in \"%s\"%s" msgstr "" -#: merge-recursive.c:1719 +#: merge-recursive.c:1742 msgid " (left unresolved)" msgstr "" -#: merge-recursive.c:1828 +#: merge-recursive.c:1851 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" -#: merge-recursive.c:2035 +#: merge-recursive.c:2056 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -3632,323 +3656,323 @@ msgid "" "getting a majority of the files." msgstr "" -#: merge-recursive.c:2067 +#: merge-recursive.c:2088 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " "implicit directory rename(s) putting the following path(s) there: %s." msgstr "" -#: merge-recursive.c:2077 +#: merge-recursive.c:2098 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " "implicit directory renames tried to put these paths there: %s" msgstr "" -#: merge-recursive.c:2169 +#: merge-recursive.c:2190 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" ">%s in %s" msgstr "" -#: merge-recursive.c:2413 +#: merge-recursive.c:2435 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " "renamed." msgstr "" -#: merge-recursive.c:2938 +#: merge-recursive.c:2961 #, c-format msgid "cannot read object %s" msgstr "" -#: merge-recursive.c:2941 +#: merge-recursive.c:2964 #, c-format msgid "object %s is not a blob" msgstr "" -#: merge-recursive.c:3005 +#: merge-recursive.c:3028 msgid "modify" msgstr "" -#: merge-recursive.c:3005 +#: merge-recursive.c:3028 msgid "modified" msgstr "" -#: merge-recursive.c:3017 +#: merge-recursive.c:3040 msgid "content" msgstr "" -#: merge-recursive.c:3021 +#: merge-recursive.c:3044 msgid "add/add" msgstr "" -#: merge-recursive.c:3044 +#: merge-recursive.c:3067 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "" -#: merge-recursive.c:3066 git-submodule.sh:937 +#: merge-recursive.c:3089 git-submodule.sh:937 msgid "submodule" msgstr "" -#: merge-recursive.c:3067 +#: merge-recursive.c:3090 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "" -#: merge-recursive.c:3097 +#: merge-recursive.c:3120 #, c-format msgid "Adding as %s instead" msgstr "" -#: merge-recursive.c:3179 +#: merge-recursive.c:3203 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " "moving it to %s." msgstr "" -#: merge-recursive.c:3182 +#: merge-recursive.c:3206 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " "in %s, suggesting it should perhaps be moved to %s." msgstr "" -#: merge-recursive.c:3186 +#: merge-recursive.c:3210 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " "%s; moving it to %s." msgstr "" -#: merge-recursive.c:3189 +#: merge-recursive.c:3213 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " "was renamed in %s, suggesting it should perhaps be moved to %s." msgstr "" -#: merge-recursive.c:3303 +#: merge-recursive.c:3327 #, c-format msgid "Removing %s" msgstr "" -#: merge-recursive.c:3326 +#: merge-recursive.c:3350 msgid "file/directory" msgstr "" -#: merge-recursive.c:3331 +#: merge-recursive.c:3355 msgid "directory/file" msgstr "" -#: merge-recursive.c:3338 +#: merge-recursive.c:3362 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -#: merge-recursive.c:3347 +#: merge-recursive.c:3371 #, c-format msgid "Adding %s" msgstr "" -#: merge-recursive.c:3356 +#: merge-recursive.c:3380 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "" -#: merge-recursive.c:3394 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" - -#: merge-recursive.c:3405 +#: merge-recursive.c:3424 msgid "Already up to date!" msgstr "" -#: merge-recursive.c:3414 +#: merge-recursive.c:3433 #, c-format msgid "merging of trees %s and %s failed" msgstr "" -#: merge-recursive.c:3513 +#: merge-recursive.c:3537 msgid "Merging:" msgstr "" -#: merge-recursive.c:3526 +#: merge-recursive.c:3550 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:3565 +#: merge-recursive.c:3600 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:3631 +#: merge-recursive.c:3659 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" + +#: merge-recursive.c:3756 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869 +#: merge-recursive.c:3774 builtin/merge.c:694 builtin/merge.c:874 msgid "Unable to write index." msgstr "" -#: midx.c:69 +#: midx.c:68 #, c-format msgid "multi-pack-index file %s is too small" msgstr "" -#: midx.c:85 +#: midx.c:84 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "" -#: midx.c:90 +#: midx.c:89 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "" -#: midx.c:95 +#: midx.c:94 #, c-format msgid "hash version %u does not match" msgstr "" -#: midx.c:109 +#: midx.c:108 msgid "invalid chunk offset (too large)" msgstr "" -#: midx.c:133 +#: midx.c:132 msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "" -#: midx.c:146 +#: midx.c:145 msgid "multi-pack-index missing required pack-name chunk" msgstr "" -#: midx.c:148 +#: midx.c:147 msgid "multi-pack-index missing required OID fanout chunk" msgstr "" -#: midx.c:150 +#: midx.c:149 msgid "multi-pack-index missing required OID lookup chunk" msgstr "" -#: midx.c:152 +#: midx.c:151 msgid "multi-pack-index missing required object offsets chunk" msgstr "" -#: midx.c:166 +#: midx.c:165 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "" -#: midx.c:211 +#: midx.c:210 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "" -#: midx.c:261 +#: midx.c:260 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" -#: midx.c:289 +#: midx.c:288 msgid "error preparing packfile from multi-pack-index" msgstr "" -#: midx.c:470 +#: midx.c:469 #, c-format msgid "failed to add packfile '%s'" msgstr "" -#: midx.c:476 +#: midx.c:475 #, c-format msgid "failed to open pack-index '%s'" msgstr "" -#: midx.c:536 +#: midx.c:535 #, c-format msgid "failed to locate object %d in packfile" msgstr "" -#: midx.c:865 +#: midx.c:864 #, c-format msgid "did not see pack-file %s to drop" msgstr "" -#: midx.c:1036 +#: midx.c:1035 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "" -#: midx.c:1091 +#: midx.c:1090 msgid "Looking for referenced packfiles" msgstr "" -#: midx.c:1106 +#: midx.c:1105 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "" -#: midx.c:1110 +#: midx.c:1109 msgid "Verifying OID order in MIDX" msgstr "" -#: midx.c:1119 +#: midx.c:1118 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "" -#: midx.c:1138 +#: midx.c:1137 msgid "Sorting objects by packfile" msgstr "" -#: midx.c:1144 +#: midx.c:1143 msgid "Verifying object offsets" msgstr "" -#: midx.c:1160 +#: midx.c:1159 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "" -#: midx.c:1166 +#: midx.c:1165 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "" -#: midx.c:1175 +#: midx.c:1174 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "" -#: midx.c:1350 +#: midx.c:1349 msgid "could not start pack-objects" msgstr "" -#: midx.c:1369 +#: midx.c:1368 msgid "could not finish pack-objects" msgstr "" -#: name-hash.c:532 +#: name-hash.c:537 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "" -#: name-hash.c:554 +#: name-hash.c:559 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "" -#: name-hash.c:560 +#: name-hash.c:565 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "" @@ -3989,41 +4013,41 @@ msgstr "" msgid "Bad %s value: '%s'" msgstr "" -#: object.c:54 +#: object.c:53 #, c-format msgid "invalid object type \"%s\"" msgstr "" -#: object.c:174 +#: object.c:173 #, c-format msgid "object %s is a %s, not a %s" msgstr "" -#: object.c:234 +#: object.c:233 #, c-format msgid "object %s has unknown type id %d" msgstr "" -#: object.c:247 +#: object.c:246 #, c-format msgid "unable to parse object: %s" msgstr "" -#: object.c:267 object.c:278 +#: object.c:266 object.c:277 #, c-format msgid "hash mismatch %s" msgstr "" -#: packfile.c:648 +#: packfile.c:641 msgid "offset before end of packfile (broken .idx?)" msgstr "" -#: packfile.c:1899 +#: packfile.c:1887 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" -#: packfile.c:1903 +#: packfile.c:1891 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" @@ -4068,26 +4092,26 @@ msgstr "" msgid "did you mean `--%s` (with two dashes ?)" msgstr "" -#: parse-options.c:859 +#: parse-options.c:860 #, c-format msgid "unknown option `%s'" msgstr "" -#: parse-options.c:861 +#: parse-options.c:862 #, c-format msgid "unknown switch `%c'" msgstr "" -#: parse-options.c:863 +#: parse-options.c:864 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "" -#: parse-options.c:887 +#: parse-options.c:888 msgid "..." msgstr "" -#: parse-options.c:906 +#: parse-options.c:907 #, c-format msgid "usage: %s" msgstr "" @@ -4095,21 +4119,21 @@ msgstr "" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:912 +#: parse-options.c:913 #, c-format msgid " or: %s" msgstr "" -#: parse-options.c:915 +#: parse-options.c:916 #, c-format msgid " %s" msgstr "" -#: parse-options.c:954 +#: parse-options.c:955 msgid "-NUM" msgstr "" -#: parse-options.c:968 +#: parse-options.c:969 #, c-format msgid "alias of --%s" msgstr "" @@ -4274,29 +4298,38 @@ msgstr "" msgid "unable to parse --pretty format" msgstr "" -#: range-diff.c:70 +#: promisor-remote.c:25 +msgid "Remote with no URL" +msgstr "" + +#: promisor-remote.c:61 +#, c-format +msgid "promisor remote name cannot begin with '/': %s" +msgstr "" + +#: range-diff.c:71 msgid "could not start `log`" msgstr "" -#: range-diff.c:72 +#: range-diff.c:73 msgid "could not read `log` output" msgstr "" -#: range-diff.c:91 sequencer.c:5021 +#: range-diff.c:92 sequencer.c:4985 #, c-format msgid "could not parse commit '%s'" msgstr "" -#: range-diff.c:117 +#: range-diff.c:118 #, c-format msgid "could not parse git header '%.*s'" msgstr "" -#: range-diff.c:274 +#: range-diff.c:275 msgid "failed to generate diff" msgstr "" -#: range-diff.c:506 range-diff.c:508 +#: range-diff.c:507 range-diff.c:509 #, c-format msgid "could not parse log for '%s'" msgstr "" @@ -4340,156 +4373,156 @@ msgstr "" msgid "'%s' appears as both a file and as a directory" msgstr "" -#: read-cache.c:1499 +#: read-cache.c:1520 msgid "Refresh index" msgstr "" -#: read-cache.c:1613 +#: read-cache.c:1635 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1623 +#: read-cache.c:1645 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1679 +#: read-cache.c:1701 #, c-format msgid "bad signature 0x%08x" msgstr "" -#: read-cache.c:1682 +#: read-cache.c:1704 #, c-format msgid "bad index version %d" msgstr "" -#: read-cache.c:1691 +#: read-cache.c:1713 msgid "bad index file sha1 signature" msgstr "" -#: read-cache.c:1721 +#: read-cache.c:1743 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "" -#: read-cache.c:1723 +#: read-cache.c:1745 #, c-format msgid "ignoring %.4s extension" msgstr "" -#: read-cache.c:1760 +#: read-cache.c:1782 #, c-format msgid "unknown index entry format 0x%08x" msgstr "" -#: read-cache.c:1776 +#: read-cache.c:1798 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "" -#: read-cache.c:1833 +#: read-cache.c:1855 msgid "unordered stage entries in index" msgstr "" -#: read-cache.c:1836 +#: read-cache.c:1858 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "" -#: read-cache.c:1839 +#: read-cache.c:1861 #, c-format msgid "unordered stage entries for '%s'" msgstr "" -#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111 -#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467 -#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347 +#: read-cache.c:1967 read-cache.c:2255 rerere.c:565 rerere.c:599 rerere.c:1111 +#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:468 +#: builtin/checkout.c:652 builtin/clean.c:967 builtin/commit.c:347 #: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145 #: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330 msgid "index file corrupt" msgstr "" -#: read-cache.c:2087 +#: read-cache.c:2108 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "" -#: read-cache.c:2100 +#: read-cache.c:2121 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "" -#: read-cache.c:2133 +#: read-cache.c:2154 #, c-format msgid "%s: index file open failed" msgstr "" -#: read-cache.c:2137 +#: read-cache.c:2158 #, c-format msgid "%s: cannot stat the open index" msgstr "" -#: read-cache.c:2141 +#: read-cache.c:2162 #, c-format msgid "%s: index file smaller than expected" msgstr "" -#: read-cache.c:2145 +#: read-cache.c:2166 #, c-format msgid "%s: unable to map index file" msgstr "" -#: read-cache.c:2187 +#: read-cache.c:2208 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "" -#: read-cache.c:2214 +#: read-cache.c:2235 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "" -#: read-cache.c:2246 +#: read-cache.c:2267 #, c-format msgid "could not freshen shared index '%s'" msgstr "" -#: read-cache.c:2293 +#: read-cache.c:2314 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "" -#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114 +#: read-cache.c:3010 wrapper.c:622 builtin/merge.c:1119 #, c-format msgid "could not close '%s'" msgstr "" -#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928 +#: read-cache.c:3113 sequencer.c:2296 sequencer.c:3917 #, c-format msgid "could not stat '%s'" msgstr "" -#: read-cache.c:3105 +#: read-cache.c:3126 #, c-format msgid "unable to open git dir: %s" msgstr "" -#: read-cache.c:3117 +#: read-cache.c:3138 #, c-format msgid "unable to unlink: %s" msgstr "" -#: read-cache.c:3142 +#: read-cache.c:3163 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "" -#: read-cache.c:3291 +#: read-cache.c:3312 #, c-format msgid "%s: cannot drop to stage #0" msgstr "" @@ -4561,8 +4594,8 @@ msgstr "" msgid "Note that empty commits are commented out" msgstr "" -#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447 -#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235 +#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3388 +#: sequencer.c:3414 sequencer.c:5084 builtin/fsck.c:356 builtin/rebase.c:235 #, c-format msgid "could not write '%s'" msgstr "" @@ -4600,7 +4633,7 @@ msgstr "" msgid "ignoring dangling symref %s" msgstr "" -#: refs.c:669 ref-filter.c:2092 +#: refs.c:669 ref-filter.c:2098 #, c-format msgid "ignoring broken ref %s" msgstr "" @@ -4625,14 +4658,14 @@ msgstr "" msgid "unexpected object ID when writing '%s'" msgstr "" -#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913 -#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656 +#: refs.c:833 sequencer.c:403 sequencer.c:2647 sequencer.c:2851 +#: sequencer.c:2865 sequencer.c:3122 sequencer.c:5001 wrapper.c:620 #, c-format msgid "could not write to '%s'" msgstr "" -#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715 -#: builtin/rebase.c:1003 +#: refs.c:860 wrapper.c:188 wrapper.c:358 builtin/am.c:714 +#: builtin/rebase.c:1004 #, c-format msgid "could not open '%s' for writing" msgstr "" @@ -4667,21 +4700,21 @@ msgstr "" msgid "update_ref failed for ref '%s': %s" msgstr "" -#: refs.c:2012 +#: refs.c:2023 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "" -#: refs.c:2044 +#: refs.c:2055 msgid "ref updates forbidden inside quarantine environment" msgstr "" -#: refs.c:2140 refs.c:2170 +#: refs.c:2151 refs.c:2181 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "" -#: refs.c:2146 refs.c:2181 +#: refs.c:2157 refs.c:2192 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "" @@ -4691,13 +4724,13 @@ msgstr "" msgid "could not remove reference %s" msgstr "" -#: refs/files-backend.c:1248 refs/packed-backend.c:1532 -#: refs/packed-backend.c:1542 +#: refs/files-backend.c:1248 refs/packed-backend.c:1541 +#: refs/packed-backend.c:1551 #, c-format msgid "could not delete reference %s: %s" msgstr "" -#: refs/files-backend.c:1251 refs/packed-backend.c:1545 +#: refs/files-backend.c:1251 refs/packed-backend.c:1554 #, c-format msgid "could not delete references: %s" msgstr "" @@ -4707,7 +4740,7 @@ msgstr "" msgid "invalid refspec '%s'" msgstr "" -#: ref-filter.c:42 wt-status.c:1934 +#: ref-filter.c:42 wt-status.c:1938 msgid "gone" msgstr "" @@ -4726,280 +4759,280 @@ msgstr "" msgid "ahead %d, behind %d" msgstr "" -#: ref-filter.c:162 +#: ref-filter.c:165 #, c-format msgid "expected format: %%(color:<color>)" msgstr "" -#: ref-filter.c:164 +#: ref-filter.c:167 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "" -#: ref-filter.c:186 +#: ref-filter.c:189 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "" -#: ref-filter.c:190 +#: ref-filter.c:193 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "" -#: ref-filter.c:192 +#: ref-filter.c:195 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "" -#: ref-filter.c:247 +#: ref-filter.c:250 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "" -#: ref-filter.c:269 +#: ref-filter.c:272 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "" -#: ref-filter.c:277 +#: ref-filter.c:280 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "" -#: ref-filter.c:289 +#: ref-filter.c:292 #, c-format msgid "%%(body) does not take arguments" msgstr "" -#: ref-filter.c:298 +#: ref-filter.c:301 #, c-format msgid "%%(subject) does not take arguments" msgstr "" -#: ref-filter.c:320 +#: ref-filter.c:323 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "" -#: ref-filter.c:349 +#: ref-filter.c:352 #, c-format msgid "positive value expected contents:lines=%s" msgstr "" -#: ref-filter.c:351 +#: ref-filter.c:354 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "" -#: ref-filter.c:366 +#: ref-filter.c:369 #, c-format msgid "positive value expected objectname:short=%s" msgstr "" -#: ref-filter.c:370 +#: ref-filter.c:373 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "" -#: ref-filter.c:400 +#: ref-filter.c:403 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "" -#: ref-filter.c:412 +#: ref-filter.c:415 #, c-format msgid "unrecognized position:%s" msgstr "" -#: ref-filter.c:419 +#: ref-filter.c:422 #, c-format msgid "unrecognized width:%s" msgstr "" -#: ref-filter.c:428 +#: ref-filter.c:431 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "" -#: ref-filter.c:436 +#: ref-filter.c:439 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "" -#: ref-filter.c:454 +#: ref-filter.c:457 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "" -#: ref-filter.c:556 +#: ref-filter.c:559 #, c-format msgid "malformed field name: %.*s" msgstr "" -#: ref-filter.c:583 +#: ref-filter.c:586 #, c-format msgid "unknown field name: %.*s" msgstr "" -#: ref-filter.c:587 +#: ref-filter.c:590 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "" -#: ref-filter.c:711 +#: ref-filter.c:714 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "" -#: ref-filter.c:774 +#: ref-filter.c:777 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "" -#: ref-filter.c:776 +#: ref-filter.c:779 #, c-format msgid "format: %%(then) atom used more than once" msgstr "" -#: ref-filter.c:778 +#: ref-filter.c:781 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "" -#: ref-filter.c:806 +#: ref-filter.c:809 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "" -#: ref-filter.c:808 +#: ref-filter.c:811 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "" -#: ref-filter.c:810 +#: ref-filter.c:813 #, c-format msgid "format: %%(else) atom used more than once" msgstr "" -#: ref-filter.c:825 +#: ref-filter.c:828 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "" -#: ref-filter.c:882 +#: ref-filter.c:885 #, c-format msgid "malformed format string %s" msgstr "" -#: ref-filter.c:1485 +#: ref-filter.c:1488 #, c-format msgid "no branch, rebasing %s" msgstr "" -#: ref-filter.c:1488 +#: ref-filter.c:1491 #, c-format msgid "no branch, rebasing detached HEAD %s" msgstr "" -#: ref-filter.c:1491 +#: ref-filter.c:1494 #, c-format msgid "no branch, bisect started on %s" msgstr "" -#: ref-filter.c:1501 +#: ref-filter.c:1504 msgid "no branch" msgstr "" -#: ref-filter.c:1537 ref-filter.c:1743 +#: ref-filter.c:1540 ref-filter.c:1749 #, c-format msgid "missing object %s for %s" msgstr "" -#: ref-filter.c:1547 +#: ref-filter.c:1550 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "" -#: ref-filter.c:1998 +#: ref-filter.c:2004 #, c-format msgid "malformed object at '%s'" msgstr "" -#: ref-filter.c:2087 +#: ref-filter.c:2093 #, c-format msgid "ignoring ref with broken name %s" msgstr "" -#: ref-filter.c:2382 +#: ref-filter.c:2389 #, c-format msgid "format: %%(end) atom missing" msgstr "" -#: ref-filter.c:2482 +#: ref-filter.c:2489 #, c-format msgid "option `%s' is incompatible with --merged" msgstr "" -#: ref-filter.c:2485 +#: ref-filter.c:2492 #, c-format msgid "option `%s' is incompatible with --no-merged" msgstr "" -#: ref-filter.c:2495 +#: ref-filter.c:2502 #, c-format msgid "malformed object name %s" msgstr "" -#: ref-filter.c:2500 +#: ref-filter.c:2507 #, c-format msgid "option `%s' must point to a commit" msgstr "" -#: remote.c:363 +#: remote.c:366 #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "" -#: remote.c:410 +#: remote.c:413 msgid "more than one receivepack given, using the first" msgstr "" -#: remote.c:418 +#: remote.c:421 msgid "more than one uploadpack given, using the first" msgstr "" -#: remote.c:608 +#: remote.c:611 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "" -#: remote.c:612 +#: remote.c:615 #, c-format msgid "%s usually tracks %s, not %s" msgstr "" -#: remote.c:616 +#: remote.c:619 #, c-format msgid "%s tracks both %s and %s" msgstr "" -#: remote.c:684 +#: remote.c:687 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "" -#: remote.c:694 +#: remote.c:697 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "" -#: remote.c:1000 +#: remote.c:1003 #, c-format msgid "src refspec %s does not match any" msgstr "" -#: remote.c:1005 +#: remote.c:1008 #, c-format msgid "src refspec %s matches more than one" msgstr "" @@ -5008,7 +5041,7 @@ msgstr "" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1020 +#: remote.c:1023 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -5022,7 +5055,7 @@ msgid "" "Neither worked, so we gave up. You must fully qualify the ref." msgstr "" -#: remote.c:1040 +#: remote.c:1043 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -5030,7 +5063,7 @@ msgid "" "'%s:refs/heads/%s'?" msgstr "" -#: remote.c:1045 +#: remote.c:1048 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -5038,7 +5071,7 @@ msgid "" "'%s:refs/tags/%s'?" msgstr "" -#: remote.c:1050 +#: remote.c:1053 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -5046,7 +5079,7 @@ msgid "" "'%s:refs/tags/%s'?" msgstr "" -#: remote.c:1055 +#: remote.c:1058 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -5054,114 +5087,114 @@ msgid "" "'%s:refs/tags/%s'?" msgstr "" -#: remote.c:1091 +#: remote.c:1094 #, c-format msgid "%s cannot be resolved to branch" msgstr "" -#: remote.c:1102 +#: remote.c:1105 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "" -#: remote.c:1114 +#: remote.c:1117 #, c-format msgid "dst refspec %s matches more than one" msgstr "" -#: remote.c:1121 +#: remote.c:1124 #, c-format msgid "dst ref %s receives from more than one src" msgstr "" -#: remote.c:1624 remote.c:1725 +#: remote.c:1627 remote.c:1728 msgid "HEAD does not point to a branch" msgstr "" -#: remote.c:1633 +#: remote.c:1636 #, c-format msgid "no such branch: '%s'" msgstr "" -#: remote.c:1636 +#: remote.c:1639 #, c-format msgid "no upstream configured for branch '%s'" msgstr "" -#: remote.c:1642 +#: remote.c:1645 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "" -#: remote.c:1657 +#: remote.c:1660 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" -#: remote.c:1669 +#: remote.c:1672 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "" -#: remote.c:1679 +#: remote.c:1682 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "" -#: remote.c:1692 +#: remote.c:1695 msgid "push has no destination (push.default is 'nothing')" msgstr "" -#: remote.c:1714 +#: remote.c:1717 msgid "cannot resolve 'simple' push to a single destination" msgstr "" -#: remote.c:1840 +#: remote.c:1843 #, c-format msgid "couldn't find remote ref %s" msgstr "" -#: remote.c:1853 +#: remote.c:1856 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "" -#: remote.c:2016 +#: remote.c:2019 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" -#: remote.c:2020 +#: remote.c:2023 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr "" -#: remote.c:2023 +#: remote.c:2026 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "" -#: remote.c:2027 +#: remote.c:2030 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "" -#: remote.c:2030 +#: remote.c:2033 #, c-format msgid " (use \"%s\" for details)\n" msgstr "" -#: remote.c:2034 +#: remote.c:2037 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "" msgstr[1] "" -#: remote.c:2040 +#: remote.c:2043 msgid " (use \"git push\" to publish your local commits)\n" msgstr "" -#: remote.c:2043 +#: remote.c:2046 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -5169,11 +5202,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2051 +#: remote.c:2054 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" -#: remote.c:2054 +#: remote.c:2057 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -5184,11 +5217,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2064 +#: remote.c:2067 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" -#: remote.c:2247 +#: remote.c:2250 #, c-format msgid "cannot parse expected object name '%s'" msgstr "" @@ -5266,7 +5299,7 @@ msgstr "" msgid "Recorded preimage for '%s'" msgstr "" -#: rerere.c:881 submodule.c:2023 builtin/log.c:1773 +#: rerere.c:881 submodule.c:2023 builtin/log.c:1790 #: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 #, c-format msgid "could not create directory '%s'" @@ -5301,20 +5334,20 @@ msgstr "" msgid "unable to open rr-cache directory" msgstr "" -#: revision.c:2507 +#: revision.c:2509 msgid "your current branch appears to be broken" msgstr "" -#: revision.c:2510 +#: revision.c:2512 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "" -#: revision.c:2710 +#: revision.c:2720 msgid "--first-parent is incompatible with --bisect" msgstr "" -#: revision.c:2714 +#: revision.c:2724 msgid "-L does not yet support diff formats besides -p and -s" msgstr "" @@ -5334,39 +5367,39 @@ msgid "" "You can disable this warning with `git config advice.ignoredHook false`." msgstr "" -#: send-pack.c:141 +#: send-pack.c:142 msgid "unexpected flush packet while reading remote unpack status" msgstr "" -#: send-pack.c:143 +#: send-pack.c:144 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "" -#: send-pack.c:145 +#: send-pack.c:146 #, c-format msgid "remote unpack failed: %s" msgstr "" -#: send-pack.c:306 +#: send-pack.c:307 msgid "failed to sign the push certificate" msgstr "" -#: send-pack.c:420 +#: send-pack.c:421 msgid "the receiving end does not support --signed push" msgstr "" -#: send-pack.c:422 +#: send-pack.c:423 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" msgstr "" -#: send-pack.c:434 +#: send-pack.c:435 msgid "the receiving end does not support --atomic push" msgstr "" -#: send-pack.c:439 +#: send-pack.c:440 msgid "the receiving end does not support push options" msgstr "" @@ -5380,7 +5413,7 @@ msgstr "" msgid "could not delete '%s'" msgstr "" -#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369 +#: sequencer.c:311 builtin/rebase.c:760 builtin/rebase.c:1676 builtin/rm.c:369 #, c-format msgid "could not remove '%s'" msgstr "" @@ -5415,7 +5448,7 @@ msgid "" "and commit the result with 'git commit'" msgstr "" -#: sequencer.c:401 sequencer.c:2909 +#: sequencer.c:401 sequencer.c:2847 #, c-format msgid "could not lock '%s'" msgstr "" @@ -5425,15 +5458,15 @@ msgstr "" msgid "could not write eol to '%s'" msgstr "" -#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929 -#: sequencer.c:3192 +#: sequencer.c:413 sequencer.c:2652 sequencer.c:2853 sequencer.c:2867 +#: sequencer.c:3130 #, c-format msgid "failed to finalize '%s'" msgstr "" -#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734 -#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763 -#: builtin/merge.c:1112 builtin/rebase.c:567 +#: sequencer.c:436 sequencer.c:1585 sequencer.c:2672 sequencer.c:3112 +#: sequencer.c:3221 builtin/am.c:244 builtin/commit.c:763 builtin/merge.c:1117 +#: builtin/rebase.c:568 #, c-format msgid "could not read '%s'" msgstr "" @@ -5460,70 +5493,65 @@ msgstr "" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:632 +#: sequencer.c:631 #, c-format msgid "%s: Unable to write new index file" msgstr "" -#: sequencer.c:649 +#: sequencer.c:648 msgid "unable to update cache tree" msgstr "" -#: sequencer.c:663 +#: sequencer.c:662 msgid "could not resolve HEAD commit" msgstr "" -#: sequencer.c:743 +#: sequencer.c:742 #, c-format msgid "no key present in '%.*s'" msgstr "" -#: sequencer.c:754 +#: sequencer.c:753 #, c-format msgid "unable to dequote value of '%s'" msgstr "" -#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706 -#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045 +#: sequencer.c:790 wrapper.c:190 wrapper.c:360 builtin/am.c:705 +#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1046 #, c-format msgid "could not open '%s' for reading" msgstr "" -#: sequencer.c:801 +#: sequencer.c:800 msgid "'GIT_AUTHOR_NAME' already given" msgstr "" -#: sequencer.c:806 +#: sequencer.c:805 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "" -#: sequencer.c:811 +#: sequencer.c:810 msgid "'GIT_AUTHOR_DATE' already given" msgstr "" -#: sequencer.c:815 +#: sequencer.c:814 #, c-format msgid "unknown variable '%s'" msgstr "" -#: sequencer.c:820 +#: sequencer.c:819 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "" -#: sequencer.c:822 +#: sequencer.c:821 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "" -#: sequencer.c:824 +#: sequencer.c:823 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "" -#: sequencer.c:884 -#, c-format -msgid "invalid date format '%s' in '%s'" -msgstr "" - -#: sequencer.c:901 +#: sequencer.c:872 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -5540,15 +5568,11 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:995 -msgid "writing root commit" -msgstr "" - -#: sequencer.c:1216 +#: sequencer.c:1146 msgid "'prepare-commit-msg' hook failed" msgstr "" -#: sequencer.c:1223 +#: sequencer.c:1153 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -5563,7 +5587,7 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" -#: sequencer.c:1236 +#: sequencer.c:1166 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -5577,346 +5601,346 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" -#: sequencer.c:1278 +#: sequencer.c:1208 msgid "couldn't look up newly created commit" msgstr "" -#: sequencer.c:1280 +#: sequencer.c:1210 msgid "could not parse newly created commit" msgstr "" -#: sequencer.c:1326 +#: sequencer.c:1256 msgid "unable to resolve HEAD after creating commit" msgstr "" -#: sequencer.c:1328 +#: sequencer.c:1258 msgid "detached HEAD" msgstr "" -#: sequencer.c:1332 +#: sequencer.c:1262 msgid " (root-commit)" msgstr "" -#: sequencer.c:1353 +#: sequencer.c:1283 msgid "could not parse HEAD" msgstr "" -#: sequencer.c:1355 +#: sequencer.c:1285 #, c-format msgid "HEAD %s is not a commit!" msgstr "" -#: sequencer.c:1359 builtin/commit.c:1571 +#: sequencer.c:1289 builtin/commit.c:1571 msgid "could not parse HEAD commit" msgstr "" -#: sequencer.c:1411 sequencer.c:2004 +#: sequencer.c:1341 sequencer.c:1933 msgid "unable to parse commit author" msgstr "" -#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684 +#: sequencer.c:1352 builtin/am.c:1561 builtin/merge.c:684 msgid "git write-tree failed to write a tree" msgstr "" -#: sequencer.c:1438 sequencer.c:1499 +#: sequencer.c:1369 sequencer.c:1429 #, c-format msgid "unable to read commit message from '%s'" msgstr "" -#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878 -#: builtin/merge.c:903 +#: sequencer.c:1396 builtin/am.c:1583 builtin/commit.c:1670 builtin/merge.c:883 +#: builtin/merge.c:908 msgid "failed to write commit object" msgstr "" -#: sequencer.c:1526 +#: sequencer.c:1456 #, c-format msgid "could not parse commit %s" msgstr "" -#: sequencer.c:1531 +#: sequencer.c:1461 #, c-format msgid "could not parse parent commit %s" msgstr "" -#: sequencer.c:1605 sequencer.c:1715 +#: sequencer.c:1535 sequencer.c:1645 #, c-format msgid "unknown command: %d" msgstr "" -#: sequencer.c:1662 sequencer.c:1687 +#: sequencer.c:1592 sequencer.c:1617 #, c-format msgid "This is a combination of %d commits." msgstr "" -#: sequencer.c:1672 +#: sequencer.c:1602 msgid "need a HEAD to fixup" msgstr "" -#: sequencer.c:1674 sequencer.c:3219 +#: sequencer.c:1604 sequencer.c:3157 msgid "could not read HEAD" msgstr "" -#: sequencer.c:1676 +#: sequencer.c:1606 msgid "could not read HEAD's commit message" msgstr "" -#: sequencer.c:1682 +#: sequencer.c:1612 #, c-format msgid "cannot write '%s'" msgstr "" -#: sequencer.c:1689 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1619 git-rebase--preserve-merges.sh:496 msgid "This is the 1st commit message:" msgstr "" -#: sequencer.c:1697 +#: sequencer.c:1627 #, c-format msgid "could not read commit message of %s" msgstr "" -#: sequencer.c:1704 +#: sequencer.c:1634 #, c-format msgid "This is the commit message #%d:" msgstr "" -#: sequencer.c:1710 +#: sequencer.c:1640 #, c-format msgid "The commit message #%d will be skipped:" msgstr "" -#: sequencer.c:1798 +#: sequencer.c:1728 msgid "your index file is unmerged." msgstr "" -#: sequencer.c:1805 +#: sequencer.c:1735 msgid "cannot fixup root commit" msgstr "" -#: sequencer.c:1824 +#: sequencer.c:1754 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:1832 sequencer.c:1840 +#: sequencer.c:1762 sequencer.c:1770 #, c-format msgid "commit %s does not have parent %d" msgstr "" -#: sequencer.c:1846 +#: sequencer.c:1776 #, c-format msgid "cannot get commit message for %s" msgstr "" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1865 +#: sequencer.c:1795 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:1930 +#: sequencer.c:1860 #, c-format msgid "could not rename '%s' to '%s'" msgstr "" -#: sequencer.c:1985 +#: sequencer.c:1915 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:1986 +#: sequencer.c:1916 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:2045 +#: sequencer.c:1983 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:2052 +#: sequencer.c:1990 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:2128 +#: sequencer.c:2066 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "" -#: sequencer.c:2137 +#: sequencer.c:2075 #, c-format msgid "missing arguments for %s" msgstr "" -#: sequencer.c:2174 +#: sequencer.c:2112 #, c-format msgid "could not parse '%.*s'" msgstr "" -#: sequencer.c:2228 +#: sequencer.c:2166 #, c-format msgid "invalid line %d: %.*s" msgstr "" -#: sequencer.c:2239 +#: sequencer.c:2177 #, c-format msgid "cannot '%s' without a previous commit" msgstr "" -#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178 +#: sequencer.c:2225 builtin/rebase.c:153 builtin/rebase.c:178 #: builtin/rebase.c:204 builtin/rebase.c:229 #, c-format msgid "could not read '%s'." msgstr "" -#: sequencer.c:2323 +#: sequencer.c:2261 msgid "cancelling a cherry picking in progress" msgstr "" -#: sequencer.c:2330 +#: sequencer.c:2268 msgid "cancelling a revert in progress" msgstr "" -#: sequencer.c:2364 +#: sequencer.c:2302 msgid "please fix this using 'git rebase --edit-todo'." msgstr "" -#: sequencer.c:2366 +#: sequencer.c:2304 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "" -#: sequencer.c:2371 +#: sequencer.c:2309 msgid "no commits parsed." msgstr "" -#: sequencer.c:2382 +#: sequencer.c:2320 msgid "cannot cherry-pick during a revert." msgstr "" -#: sequencer.c:2384 +#: sequencer.c:2322 msgid "cannot revert during a cherry-pick." msgstr "" -#: sequencer.c:2466 +#: sequencer.c:2404 #, c-format msgid "invalid value for %s: %s" msgstr "" -#: sequencer.c:2553 +#: sequencer.c:2491 msgid "unusable squash-onto" msgstr "" -#: sequencer.c:2569 +#: sequencer.c:2507 #, c-format msgid "malformed options sheet: '%s'" msgstr "" -#: sequencer.c:2652 sequencer.c:4351 +#: sequencer.c:2590 sequencer.c:4308 msgid "empty commit set passed" msgstr "" -#: sequencer.c:2668 +#: sequencer.c:2606 msgid "revert is already in progress" msgstr "" -#: sequencer.c:2670 +#: sequencer.c:2608 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "" -#: sequencer.c:2673 +#: sequencer.c:2611 msgid "cherry-pick is already in progress" msgstr "" -#: sequencer.c:2675 +#: sequencer.c:2613 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "" -#: sequencer.c:2689 +#: sequencer.c:2627 #, c-format msgid "could not create sequencer directory '%s'" msgstr "" -#: sequencer.c:2704 +#: sequencer.c:2642 msgid "could not lock HEAD" msgstr "" -#: sequencer.c:2764 sequencer.c:4103 +#: sequencer.c:2702 sequencer.c:4057 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:2766 sequencer.c:2777 +#: sequencer.c:2704 sequencer.c:2715 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:2768 sequencer.c:2812 +#: sequencer.c:2706 sequencer.c:2750 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:2798 builtin/grep.c:734 +#: sequencer.c:2736 builtin/grep.c:736 #, c-format msgid "cannot open '%s'" msgstr "" -#: sequencer.c:2800 +#: sequencer.c:2738 #, c-format msgid "cannot read '%s': %s" msgstr "" -#: sequencer.c:2801 +#: sequencer.c:2739 msgid "unexpected end of file" msgstr "" -#: sequencer.c:2807 +#: sequencer.c:2745 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:2818 +#: sequencer.c:2756 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" -#: sequencer.c:2859 +#: sequencer.c:2797 msgid "no revert in progress" msgstr "" -#: sequencer.c:2867 +#: sequencer.c:2805 msgid "no cherry-pick in progress" msgstr "" -#: sequencer.c:2877 +#: sequencer.c:2815 msgid "failed to skip the commit" msgstr "" -#: sequencer.c:2884 +#: sequencer.c:2822 msgid "there is nothing to skip" msgstr "" -#: sequencer.c:2887 +#: sequencer.c:2825 #, c-format msgid "" "have you committed already?\n" "try \"git %s --continue\"" msgstr "" -#: sequencer.c:3011 sequencer.c:4015 +#: sequencer.c:2949 sequencer.c:3969 #, c-format msgid "could not update %s" msgstr "" -#: sequencer.c:3049 sequencer.c:3995 +#: sequencer.c:2987 sequencer.c:3949 msgid "cannot read HEAD" msgstr "" -#: sequencer.c:3066 +#: sequencer.c:3004 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "" -#: sequencer.c:3074 +#: sequencer.c:3012 #, c-format msgid "" "You can amend the commit now, with\n" @@ -5928,27 +5952,27 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:3084 +#: sequencer.c:3022 #, c-format msgid "Could not apply %s... %.*s" msgstr "" -#: sequencer.c:3091 +#: sequencer.c:3029 #, c-format msgid "Could not merge %.*s" msgstr "" -#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633 +#: sequencer.c:3043 sequencer.c:3047 builtin/difftool.c:641 #, c-format msgid "could not copy '%s' to '%s'" msgstr "" -#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582 -#: builtin/rebase.c:1953 builtin/rebase.c:2008 +#: sequencer.c:3069 sequencer.c:3506 builtin/rebase.c:850 builtin/rebase.c:1613 +#: builtin/rebase.c:1987 builtin/rebase.c:2031 msgid "could not read index" msgstr "" -#: sequencer.c:3136 +#: sequencer.c:3074 #, c-format msgid "" "execution failed: %s\n" @@ -5958,11 +5982,11 @@ msgid "" "\n" msgstr "" -#: sequencer.c:3142 +#: sequencer.c:3080 msgid "and made changes to the index and/or the working tree\n" msgstr "" -#: sequencer.c:3148 +#: sequencer.c:3086 #, c-format msgid "" "execution succeeded: %s\n" @@ -5973,76 +5997,76 @@ msgid "" "\n" msgstr "" -#: sequencer.c:3209 +#: sequencer.c:3147 #, c-format msgid "illegal label name: '%.*s'" msgstr "" -#: sequencer.c:3263 +#: sequencer.c:3201 msgid "writing fake root commit" msgstr "" -#: sequencer.c:3268 +#: sequencer.c:3206 msgid "writing squash-onto" msgstr "" -#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860 +#: sequencer.c:3244 builtin/rebase.c:855 builtin/rebase.c:861 #, c-format msgid "failed to find tree of %s" msgstr "" -#: sequencer.c:3324 builtin/rebase.c:873 +#: sequencer.c:3262 builtin/rebase.c:874 msgid "could not write index" msgstr "" -#: sequencer.c:3351 +#: sequencer.c:3289 #, c-format msgid "could not resolve '%s'" msgstr "" -#: sequencer.c:3379 +#: sequencer.c:3320 msgid "cannot merge without a current revision" msgstr "" -#: sequencer.c:3401 +#: sequencer.c:3342 #, c-format msgid "unable to parse '%.*s'" msgstr "" -#: sequencer.c:3410 +#: sequencer.c:3351 #, c-format msgid "nothing to merge: '%.*s'" msgstr "" -#: sequencer.c:3422 +#: sequencer.c:3363 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "" -#: sequencer.c:3437 +#: sequencer.c:3378 #, c-format msgid "could not get commit message of '%s'" msgstr "" -#: sequencer.c:3590 +#: sequencer.c:3538 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "" -#: sequencer.c:3606 +#: sequencer.c:3554 msgid "merge: Unable to write new index file" msgstr "" -#: sequencer.c:3675 builtin/rebase.c:711 +#: sequencer.c:3623 builtin/rebase.c:712 #, c-format msgid "Applied autostash.\n" msgstr "" -#: sequencer.c:3687 +#: sequencer.c:3635 #, c-format msgid "cannot store %s" msgstr "" -#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113 +#: sequencer.c:3638 builtin/rebase.c:728 git-rebase--preserve-merges.sh:113 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -6050,31 +6074,31 @@ msgid "" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -#: sequencer.c:3751 +#: sequencer.c:3699 #, c-format msgid "could not checkout %s" msgstr "" -#: sequencer.c:3765 +#: sequencer.c:3713 #, c-format msgid "%s: not a valid OID" msgstr "" -#: sequencer.c:3770 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3718 git-rebase--preserve-merges.sh:779 msgid "could not detach HEAD" msgstr "" -#: sequencer.c:3785 +#: sequencer.c:3733 #, c-format msgid "Stopped at HEAD\n" msgstr "" -#: sequencer.c:3787 +#: sequencer.c:3735 #, c-format msgid "Stopped at %s\n" msgstr "" -#: sequencer.c:3795 +#: sequencer.c:3743 #, c-format msgid "" "Could not execute the todo command\n" @@ -6087,121 +6111,121 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:3877 +#: sequencer.c:3827 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "" -#: sequencer.c:3958 +#: sequencer.c:3898 #, c-format msgid "unknown command %d" msgstr "" -#: sequencer.c:4003 +#: sequencer.c:3957 msgid "could not read orig-head" msgstr "" -#: sequencer.c:4008 +#: sequencer.c:3962 msgid "could not read 'onto'" msgstr "" -#: sequencer.c:4022 +#: sequencer.c:3976 #, c-format msgid "could not update HEAD to %s" msgstr "" -#: sequencer.c:4115 +#: sequencer.c:4069 msgid "cannot rebase: You have unstaged changes." msgstr "" -#: sequencer.c:4124 +#: sequencer.c:4078 msgid "cannot amend non-existing commit" msgstr "" -#: sequencer.c:4126 +#: sequencer.c:4080 #, c-format msgid "invalid file: '%s'" msgstr "" -#: sequencer.c:4128 +#: sequencer.c:4082 #, c-format msgid "invalid contents: '%s'" msgstr "" -#: sequencer.c:4131 +#: sequencer.c:4085 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" "first and then run 'git rebase --continue' again." msgstr "" -#: sequencer.c:4167 sequencer.c:4205 +#: sequencer.c:4121 sequencer.c:4159 #, c-format msgid "could not write file: '%s'" msgstr "" -#: sequencer.c:4220 +#: sequencer.c:4174 msgid "could not remove CHERRY_PICK_HEAD" msgstr "" -#: sequencer.c:4227 +#: sequencer.c:4181 msgid "could not commit staged changes." msgstr "" -#: sequencer.c:4328 +#: sequencer.c:4285 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "" -#: sequencer.c:4332 +#: sequencer.c:4289 #, c-format msgid "%s: bad revision" msgstr "" -#: sequencer.c:4367 +#: sequencer.c:4324 msgid "can't revert as initial commit" msgstr "" -#: sequencer.c:4810 +#: sequencer.c:4774 msgid "make_script: unhandled options" msgstr "" -#: sequencer.c:4813 +#: sequencer.c:4777 msgid "make_script: error preparing revisions" msgstr "" -#: sequencer.c:4971 +#: sequencer.c:4935 msgid "" "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 "" -#: sequencer.c:5083 sequencer.c:5100 +#: sequencer.c:5047 sequencer.c:5064 msgid "nothing to do" msgstr "" -#: sequencer.c:5114 +#: sequencer.c:5078 msgid "could not skip unnecessary pick commands" msgstr "" -#: sequencer.c:5197 +#: sequencer.c:5166 msgid "the script was already rearranged." msgstr "" -#: setup.c:123 +#: setup.c:124 #, c-format msgid "'%s' is outside repository" msgstr "" -#: setup.c:173 +#: setup.c:174 #, c-format msgid "" "%s: no such path in the working tree.\n" "Use 'git <command> -- <path>...' to specify paths that do not exist locally." msgstr "" -#: setup.c:186 +#: setup.c:187 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -6209,12 +6233,12 @@ msgid "" "'git <command> [<revision>...] -- [<file>...]'" msgstr "" -#: setup.c:235 +#: setup.c:236 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "" -#: setup.c:254 +#: setup.c:255 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -6222,381 +6246,381 @@ msgid "" "'git <command> [<revision>...] -- [<file>...]'" msgstr "" -#: setup.c:390 +#: setup.c:391 msgid "unable to set up work tree using invalid config" msgstr "" -#: setup.c:394 +#: setup.c:395 msgid "this operation must be run in a work tree" msgstr "" -#: setup.c:540 +#: setup.c:541 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "" -#: setup.c:548 +#: setup.c:549 msgid "unknown repository extensions found:" msgstr "" -#: setup.c:567 +#: setup.c:568 #, c-format msgid "error opening '%s'" msgstr "" -#: setup.c:569 +#: setup.c:570 #, c-format msgid "too large to be a .git file: '%s'" msgstr "" -#: setup.c:571 +#: setup.c:572 #, c-format msgid "error reading %s" msgstr "" -#: setup.c:573 +#: setup.c:574 #, c-format msgid "invalid gitfile format: %s" msgstr "" -#: setup.c:575 +#: setup.c:576 #, c-format msgid "no path in gitfile: %s" msgstr "" -#: setup.c:577 +#: setup.c:578 #, c-format msgid "not a git repository: %s" msgstr "" -#: setup.c:676 +#: setup.c:677 #, c-format msgid "'$%s' too big" msgstr "" -#: setup.c:690 +#: setup.c:691 #, c-format msgid "not a git repository: '%s'" msgstr "" -#: setup.c:719 setup.c:721 setup.c:752 +#: setup.c:720 setup.c:722 setup.c:753 #, c-format msgid "cannot chdir to '%s'" msgstr "" -#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837 +#: setup.c:725 setup.c:781 setup.c:791 setup.c:830 setup.c:838 msgid "cannot come back to cwd" msgstr "" -#: setup.c:851 +#: setup.c:852 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "" -#: setup.c:1083 +#: setup.c:1090 msgid "Unable to read current working directory" msgstr "" -#: setup.c:1092 setup.c:1098 +#: setup.c:1099 setup.c:1105 #, c-format msgid "cannot change to '%s'" msgstr "" -#: setup.c:1103 +#: setup.c:1110 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "" -#: setup.c:1109 +#: setup.c:1116 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." msgstr "" -#: setup.c:1220 +#: setup.c:1227 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." msgstr "" -#: setup.c:1264 +#: setup.c:1271 msgid "open /dev/null or dup failed" msgstr "" -#: setup.c:1279 +#: setup.c:1286 msgid "fork failed" msgstr "" -#: setup.c:1284 +#: setup.c:1291 msgid "setsid failed" msgstr "" -#: sha1-file.c:453 +#: sha1-file.c:452 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "" -#: sha1-file.c:504 +#: sha1-file.c:503 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "" -#: sha1-file.c:576 +#: sha1-file.c:575 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "" -#: sha1-file.c:583 +#: sha1-file.c:582 #, c-format msgid "unable to normalize object directory: %s" msgstr "" -#: sha1-file.c:626 +#: sha1-file.c:625 msgid "unable to fdopen alternates lockfile" msgstr "" -#: sha1-file.c:644 +#: sha1-file.c:643 msgid "unable to read alternates file" msgstr "" -#: sha1-file.c:651 +#: sha1-file.c:650 msgid "unable to move new alternates file into place" msgstr "" -#: sha1-file.c:686 +#: sha1-file.c:685 #, c-format msgid "path '%s' does not exist" msgstr "" -#: sha1-file.c:712 +#: sha1-file.c:711 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" -#: sha1-file.c:718 +#: sha1-file.c:717 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "" -#: sha1-file.c:724 +#: sha1-file.c:723 #, c-format msgid "reference repository '%s' is shallow" msgstr "" -#: sha1-file.c:732 +#: sha1-file.c:731 #, c-format msgid "reference repository '%s' is grafted" msgstr "" -#: sha1-file.c:792 +#: sha1-file.c:791 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "" -#: sha1-file.c:944 +#: sha1-file.c:943 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "" -#: sha1-file.c:969 +#: sha1-file.c:964 msgid "mmap failed" msgstr "" -#: sha1-file.c:1133 +#: sha1-file.c:1128 #, c-format msgid "object file %s is empty" msgstr "" -#: sha1-file.c:1257 sha1-file.c:2396 +#: sha1-file.c:1252 sha1-file.c:2392 #, c-format msgid "corrupt loose object '%s'" msgstr "" -#: sha1-file.c:1259 sha1-file.c:2400 +#: sha1-file.c:1254 sha1-file.c:2396 #, c-format msgid "garbage at end of loose object '%s'" msgstr "" -#: sha1-file.c:1301 +#: sha1-file.c:1296 msgid "invalid object type" msgstr "" -#: sha1-file.c:1385 +#: sha1-file.c:1380 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "" -#: sha1-file.c:1388 +#: sha1-file.c:1383 #, c-format msgid "unable to unpack %s header" msgstr "" -#: sha1-file.c:1394 +#: sha1-file.c:1389 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "" -#: sha1-file.c:1397 +#: sha1-file.c:1392 #, c-format msgid "unable to parse %s header" msgstr "" -#: sha1-file.c:1588 +#: sha1-file.c:1584 #, c-format msgid "failed to read object %s" msgstr "" -#: sha1-file.c:1592 +#: sha1-file.c:1588 #, c-format msgid "replacement %s not found for %s" msgstr "" -#: sha1-file.c:1596 +#: sha1-file.c:1592 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "" -#: sha1-file.c:1600 +#: sha1-file.c:1596 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "" -#: sha1-file.c:1703 +#: sha1-file.c:1699 #, c-format msgid "unable to write file %s" msgstr "" -#: sha1-file.c:1710 +#: sha1-file.c:1706 #, c-format msgid "unable to set permission to '%s'" msgstr "" -#: sha1-file.c:1717 +#: sha1-file.c:1713 msgid "file write error" msgstr "" -#: sha1-file.c:1736 +#: sha1-file.c:1732 msgid "error when closing loose object file" msgstr "" -#: sha1-file.c:1801 +#: sha1-file.c:1797 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" -#: sha1-file.c:1803 +#: sha1-file.c:1799 msgid "unable to create temporary file" msgstr "" -#: sha1-file.c:1827 +#: sha1-file.c:1823 msgid "unable to write loose object file" msgstr "" -#: sha1-file.c:1833 +#: sha1-file.c:1829 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "" -#: sha1-file.c:1837 +#: sha1-file.c:1833 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "" -#: sha1-file.c:1841 +#: sha1-file.c:1837 #, c-format msgid "confused by unstable object source data for %s" msgstr "" -#: sha1-file.c:1851 builtin/pack-objects.c:925 +#: sha1-file.c:1847 builtin/pack-objects.c:925 #, c-format msgid "failed utime() on %s" msgstr "" -#: sha1-file.c:1926 +#: sha1-file.c:1922 #, c-format msgid "cannot read object for %s" msgstr "" -#: sha1-file.c:1966 +#: sha1-file.c:1962 msgid "corrupt commit" msgstr "" -#: sha1-file.c:1974 +#: sha1-file.c:1970 msgid "corrupt tag" msgstr "" -#: sha1-file.c:2073 +#: sha1-file.c:2069 #, c-format msgid "read error while indexing %s" msgstr "" -#: sha1-file.c:2076 +#: sha1-file.c:2072 #, c-format msgid "short read while indexing %s" msgstr "" -#: sha1-file.c:2149 sha1-file.c:2158 +#: sha1-file.c:2145 sha1-file.c:2154 #, c-format msgid "%s: failed to insert into database" msgstr "" -#: sha1-file.c:2164 +#: sha1-file.c:2160 #, c-format msgid "%s: unsupported file type" msgstr "" -#: sha1-file.c:2188 +#: sha1-file.c:2184 #, c-format msgid "%s is not a valid object" msgstr "" -#: sha1-file.c:2190 +#: sha1-file.c:2186 #, c-format msgid "%s is not a valid '%s' object" msgstr "" -#: sha1-file.c:2217 builtin/index-pack.c:155 +#: sha1-file.c:2213 builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "" -#: sha1-file.c:2407 sha1-file.c:2459 +#: sha1-file.c:2403 sha1-file.c:2455 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "" -#: sha1-file.c:2431 +#: sha1-file.c:2427 #, c-format msgid "unable to mmap %s" msgstr "" -#: sha1-file.c:2436 +#: sha1-file.c:2432 #, c-format msgid "unable to unpack header of %s" msgstr "" -#: sha1-file.c:2442 +#: sha1-file.c:2438 #, c-format msgid "unable to parse header of %s" msgstr "" -#: sha1-file.c:2453 +#: sha1-file.c:2449 #, c-format msgid "unable to unpack contents of %s" msgstr "" -#: sha1-name.c:490 +#: sha1-name.c:487 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "" -#: sha1-name.c:501 +#: sha1-name.c:498 msgid "The candidates are:" msgstr "" -#: sha1-name.c:800 +#: sha1-name.c:797 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -6610,43 +6634,43 @@ msgid "" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:821 +#: strbuf.c:822 #, c-format msgid "%u.%2.2u GiB" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:823 +#: strbuf.c:824 #, c-format msgid "%u.%2.2u GiB/s" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:831 +#: strbuf.c:832 #, c-format msgid "%u.%2.2u MiB" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:833 +#: strbuf.c:834 #, c-format msgid "%u.%2.2u MiB/s" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:840 +#: strbuf.c:841 #, c-format msgid "%u.%2.2u KiB" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:842 +#: strbuf.c:843 #, c-format msgid "%u.%2.2u KiB/s" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:848 +#: strbuf.c:849 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -6654,7 +6678,7 @@ msgstr[0] "" msgstr[1] "" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:850 +#: strbuf.c:851 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" @@ -6766,26 +6790,26 @@ msgstr "" msgid "ls-tree returned unexpected return code %d" msgstr "" -#: submodule-config.c:232 +#: submodule-config.c:236 #, c-format msgid "ignoring suspicious submodule name: %s" msgstr "" -#: submodule-config.c:299 +#: submodule-config.c:303 msgid "negative values not allowed for submodule.fetchjobs" msgstr "" -#: submodule-config.c:397 +#: submodule-config.c:401 #, c-format msgid "ignoring '%s' which may be interpreted as a command-line option: %s" msgstr "" -#: submodule-config.c:486 +#: submodule-config.c:490 #, c-format msgid "invalid value for %s" msgstr "" -#: submodule-config.c:755 +#: submodule-config.c:761 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "" @@ -6820,7 +6844,7 @@ msgstr "" msgid "could not read from stdin" msgstr "" -#: trailer.c:1011 wrapper.c:701 +#: trailer.c:1011 wrapper.c:665 #, c-format msgid "could not stat %s" msgstr "" @@ -6849,54 +6873,54 @@ msgstr "" msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "" -#: transport.c:142 +#: transport.c:145 #, c-format msgid "could not read bundle '%s'" msgstr "" -#: transport.c:208 +#: transport.c:214 #, c-format msgid "transport: invalid depth option '%s'" msgstr "" -#: transport.c:259 +#: transport.c:266 msgid "see protocol.version in 'git help config' for more details" msgstr "" -#: transport.c:260 +#: transport.c:267 msgid "server options require protocol version 2 or later" msgstr "" -#: transport.c:625 +#: transport.c:632 msgid "could not parse transport.color.* config" msgstr "" -#: transport.c:698 +#: transport.c:705 msgid "support for protocol v2 not implemented yet" msgstr "" -#: transport.c:825 +#: transport.c:831 #, c-format msgid "unknown value for config '%s': %s" msgstr "" -#: transport.c:891 +#: transport.c:897 #, c-format msgid "transport '%s' not allowed" msgstr "" -#: transport.c:945 +#: transport.c:949 msgid "git-over-rsync is no longer supported" msgstr "" -#: transport.c:1040 +#: transport.c:1044 #, c-format msgid "" "The following submodule paths contain changes that can\n" "not be found on any remote:\n" msgstr "" -#: transport.c:1044 +#: transport.c:1048 #, c-format msgid "" "\n" @@ -6912,178 +6936,178 @@ msgid "" "\n" msgstr "" -#: transport.c:1052 +#: transport.c:1056 msgid "Aborting." msgstr "" -#: transport.c:1193 +#: transport.c:1201 msgid "failed to push all needed submodules" msgstr "" -#: transport.c:1340 transport-helper.c:645 +#: transport.c:1345 transport-helper.c:655 msgid "operation not supported by protocol" msgstr "" -#: transport-helper.c:51 transport-helper.c:80 +#: transport-helper.c:61 transport-helper.c:90 msgid "full write to remote helper failed" msgstr "" -#: transport-helper.c:134 +#: transport-helper.c:144 #, c-format msgid "unable to find remote helper for '%s'" msgstr "" -#: transport-helper.c:150 transport-helper.c:559 +#: transport-helper.c:160 transport-helper.c:569 msgid "can't dup helper output fd" msgstr "" -#: transport-helper.c:201 +#: transport-helper.c:211 #, c-format msgid "" "unknown mandatory capability %s; this remote helper probably needs newer " "version of Git" msgstr "" -#: transport-helper.c:207 +#: transport-helper.c:217 msgid "this remote helper should implement refspec capability" msgstr "" -#: transport-helper.c:274 transport-helper.c:414 +#: transport-helper.c:284 transport-helper.c:424 #, c-format msgid "%s unexpectedly said: '%s'" msgstr "" -#: transport-helper.c:403 +#: transport-helper.c:413 #, c-format msgid "%s also locked %s" msgstr "" -#: transport-helper.c:481 +#: transport-helper.c:491 msgid "couldn't run fast-import" msgstr "" -#: transport-helper.c:504 +#: transport-helper.c:514 msgid "error while running fast-import" msgstr "" -#: transport-helper.c:533 transport-helper.c:1105 +#: transport-helper.c:543 transport-helper.c:1128 #, c-format msgid "could not read ref %s" msgstr "" -#: transport-helper.c:578 +#: transport-helper.c:588 #, c-format msgid "unknown response to connect: %s" msgstr "" -#: transport-helper.c:600 +#: transport-helper.c:610 msgid "setting remote service path not supported by protocol" msgstr "" -#: transport-helper.c:602 +#: transport-helper.c:612 msgid "invalid remote service path" msgstr "" -#: transport-helper.c:648 +#: transport-helper.c:658 #, c-format msgid "can't connect to subservice %s" msgstr "" -#: transport-helper.c:720 +#: transport-helper.c:734 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "" -#: transport-helper.c:773 +#: transport-helper.c:787 #, c-format msgid "helper reported unexpected status of %s" msgstr "" -#: transport-helper.c:834 +#: transport-helper.c:848 #, c-format msgid "helper %s does not support dry-run" msgstr "" -#: transport-helper.c:837 +#: transport-helper.c:851 #, c-format msgid "helper %s does not support --signed" msgstr "" -#: transport-helper.c:840 +#: transport-helper.c:854 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "" -#: transport-helper.c:847 +#: transport-helper.c:861 #, c-format msgid "helper %s does not support 'push-option'" msgstr "" -#: transport-helper.c:945 +#: transport-helper.c:959 msgid "remote-helper doesn't support push; refspec needed" msgstr "" -#: transport-helper.c:950 +#: transport-helper.c:964 #, c-format msgid "helper %s does not support 'force'" msgstr "" -#: transport-helper.c:997 +#: transport-helper.c:1011 msgid "couldn't run fast-export" msgstr "" -#: transport-helper.c:1002 +#: transport-helper.c:1016 msgid "error while running fast-export" msgstr "" -#: transport-helper.c:1027 +#: transport-helper.c:1041 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" "Perhaps you should specify a branch such as 'master'.\n" msgstr "" -#: transport-helper.c:1091 +#: transport-helper.c:1114 #, c-format msgid "malformed response in ref list: %s" msgstr "" -#: transport-helper.c:1244 +#: transport-helper.c:1266 #, c-format msgid "read(%s) failed" msgstr "" -#: transport-helper.c:1271 +#: transport-helper.c:1293 #, c-format msgid "write(%s) failed" msgstr "" -#: transport-helper.c:1320 +#: transport-helper.c:1342 #, c-format msgid "%s thread failed" msgstr "" -#: transport-helper.c:1324 +#: transport-helper.c:1346 #, c-format msgid "%s thread failed to join: %s" msgstr "" -#: transport-helper.c:1343 transport-helper.c:1347 +#: transport-helper.c:1365 transport-helper.c:1369 #, c-format msgid "can't start thread for copying data: %s" msgstr "" -#: transport-helper.c:1384 +#: transport-helper.c:1406 #, c-format msgid "%s process failed to wait" msgstr "" -#: transport-helper.c:1388 +#: transport-helper.c:1410 #, c-format msgid "%s process failed" msgstr "" -#: transport-helper.c:1406 transport-helper.c:1415 +#: transport-helper.c:1428 transport-helper.c:1437 msgid "can't start thread for copying data" msgstr "" @@ -7103,98 +7127,98 @@ msgstr "" msgid "too-short tree file" msgstr "" -#: unpack-trees.c:111 +#: unpack-trees.c:110 #, c-format 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 "" -#: unpack-trees.c:113 +#: unpack-trees.c:112 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%s" msgstr "" -#: unpack-trees.c:116 +#: unpack-trees.c:115 #, c-format 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 "" -#: unpack-trees.c:118 +#: unpack-trees.c:117 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:121 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%sPlease commit your changes or stash them before you %s." msgstr "" -#: unpack-trees.c:123 +#: unpack-trees.c:122 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:128 +#: unpack-trees.c:127 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" "%s" msgstr "" -#: unpack-trees.c:132 +#: unpack-trees.c:131 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%sPlease move or remove them before you switch branches." msgstr "" -#: unpack-trees.c:134 +#: unpack-trees.c:133 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%s" msgstr "" -#: unpack-trees.c:137 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" -#: unpack-trees.c:139 +#: unpack-trees.c:138 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:142 +#: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%sPlease move or remove them before you %s." msgstr "" -#: unpack-trees.c:144 +#: unpack-trees.c:143 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:150 +#: unpack-trees.c:149 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7202,7 +7226,7 @@ msgid "" "%%sPlease move or remove them before you switch branches." msgstr "" -#: unpack-trees.c:152 +#: unpack-trees.c:151 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7210,47 +7234,47 @@ msgid "" "%%s" msgstr "" -#: unpack-trees.c:155 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" -#: unpack-trees.c:157 +#: unpack-trees.c:156 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:160 +#: unpack-trees.c:159 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%sPlease move or remove them before you %s." msgstr "" -#: unpack-trees.c:162 +#: unpack-trees.c:161 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:170 +#: unpack-trees.c:169 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "" -#: unpack-trees.c:173 +#: unpack-trees.c:172 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" "%s" msgstr "" -#: unpack-trees.c:175 +#: unpack-trees.c:174 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -7258,7 +7282,7 @@ msgid "" "%s" msgstr "" -#: unpack-trees.c:177 +#: unpack-trees.c:176 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -7266,23 +7290,23 @@ msgid "" "%s" msgstr "" -#: unpack-trees.c:179 +#: unpack-trees.c:178 #, c-format msgid "" "Cannot update submodule:\n" "%s" msgstr "" -#: unpack-trees.c:256 +#: unpack-trees.c:255 #, c-format msgid "Aborting\n" msgstr "" -#: unpack-trees.c:318 +#: unpack-trees.c:317 msgid "Updating files" msgstr "" -#: unpack-trees.c:350 +#: unpack-trees.c:349 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" @@ -7318,7 +7342,7 @@ msgstr "" msgid "invalid '..' path segment" msgstr "" -#: worktree.c:258 builtin/am.c:2095 +#: worktree.c:258 builtin/am.c:2084 #, c-format msgid "failed to read '%s'" msgstr "" @@ -7348,17 +7372,17 @@ msgstr "" msgid "'%s' does not point back to '%s'" msgstr "" -#: wrapper.c:223 wrapper.c:393 +#: wrapper.c:186 wrapper.c:356 #, c-format msgid "could not open '%s' for reading and writing" msgstr "" -#: wrapper.c:424 wrapper.c:624 +#: wrapper.c:387 wrapper.c:588 #, c-format msgid "unable to access '%s'" msgstr "" -#: wrapper.c:632 +#: wrapper.c:596 msgid "unable to get current working directory" msgstr "" @@ -7676,80 +7700,88 @@ msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" #: wt-status.c:1437 +msgid " (use \"git cherry-pick --skip\" to skip this patch)" +msgstr "" + +#: wt-status.c:1439 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" -#: wt-status.c:1447 +#: wt-status.c:1449 msgid "Revert currently in progress." msgstr "" -#: wt-status.c:1450 +#: wt-status.c:1452 #, c-format msgid "You are currently reverting commit %s." msgstr "" -#: wt-status.c:1456 +#: wt-status.c:1458 msgid " (fix conflicts and run \"git revert --continue\")" msgstr "" -#: wt-status.c:1459 +#: wt-status.c:1461 msgid " (run \"git revert --continue\" to continue)" msgstr "" -#: wt-status.c:1462 +#: wt-status.c:1464 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" -#: wt-status.c:1464 +#: wt-status.c:1466 +msgid " (use \"git revert --skip\" to skip this patch)" +msgstr "" + +#: wt-status.c:1468 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" -#: wt-status.c:1474 +#: wt-status.c:1478 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "" -#: wt-status.c:1478 +#: wt-status.c:1482 msgid "You are currently bisecting." msgstr "" -#: wt-status.c:1481 +#: wt-status.c:1485 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -#: wt-status.c:1690 +#: wt-status.c:1694 msgid "On branch " msgstr "" -#: wt-status.c:1697 +#: wt-status.c:1701 msgid "interactive rebase in progress; onto " msgstr "" -#: wt-status.c:1699 +#: wt-status.c:1703 msgid "rebase in progress; onto " msgstr "" -#: wt-status.c:1709 +#: wt-status.c:1713 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:1726 +#: wt-status.c:1730 msgid "Initial commit" msgstr "" -#: wt-status.c:1727 +#: wt-status.c:1731 msgid "No commits yet" msgstr "" -#: wt-status.c:1741 +#: wt-status.c:1745 msgid "Untracked files" msgstr "" -#: wt-status.c:1743 +#: wt-status.c:1747 msgid "Ignored files" msgstr "" -#: wt-status.c:1747 +#: wt-status.c:1751 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -7757,96 +7789,101 @@ msgid "" "new files yourself (see 'git help status')." msgstr "" -#: wt-status.c:1753 +#: wt-status.c:1757 #, c-format msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:1755 +#: wt-status.c:1759 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:1761 +#: wt-status.c:1765 msgid "No changes" msgstr "" -#: wt-status.c:1766 +#: wt-status.c:1770 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -#: wt-status.c:1769 +#: wt-status.c:1773 #, c-format msgid "no changes added to commit\n" msgstr "" -#: wt-status.c:1772 +#: wt-status.c:1776 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -#: wt-status.c:1775 +#: wt-status.c:1779 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" -#: wt-status.c:1778 +#: wt-status.c:1782 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -#: wt-status.c:1781 wt-status.c:1786 +#: wt-status.c:1785 wt-status.c:1790 #, c-format msgid "nothing to commit\n" msgstr "" -#: wt-status.c:1784 +#: wt-status.c:1788 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -#: wt-status.c:1788 +#: wt-status.c:1792 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "" -#: wt-status.c:1901 +#: wt-status.c:1905 msgid "No commits yet on " msgstr "" -#: wt-status.c:1905 +#: wt-status.c:1909 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:1936 +#: wt-status.c:1940 msgid "different" msgstr "" -#: wt-status.c:1938 wt-status.c:1946 +#: wt-status.c:1942 wt-status.c:1950 msgid "behind " msgstr "" -#: wt-status.c:1941 wt-status.c:1944 +#: wt-status.c:1945 wt-status.c:1948 msgid "ahead " msgstr "" #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2466 +#: wt-status.c:2470 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "" -#: wt-status.c:2472 +#: wt-status.c:2476 msgid "additionally, your index contains uncommitted changes." msgstr "" -#: wt-status.c:2474 +#: wt-status.c:2478 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "" +#: compat/precompose_utf8.c:58 builtin/clone.c:452 +#, c-format +msgid "failed to unlink '%s'" +msgstr "" + #: builtin/add.c:25 msgid "git add [<options>] [--] <pathspec>..." msgstr "" @@ -7869,7 +7906,7 @@ msgstr "" msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/add.c:234 builtin/rev-parse.c:896 +#: builtin/add.c:234 builtin/rev-parse.c:897 msgid "Could not read the index" msgstr "" @@ -7904,8 +7941,8 @@ msgstr "" msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124 -#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560 +#: builtin/add.c:290 builtin/clean.c:910 builtin/fetch.c:162 builtin/mv.c:124 +#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:547 #: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165 msgid "dry run" msgstr "" @@ -7958,7 +7995,7 @@ msgstr "" msgid "check if - even missing - files are ignored in dry run" msgstr "" -#: builtin/add.c:309 builtin/update-index.c:1001 +#: builtin/add.c:309 builtin/update-index.c:1002 msgid "override the executable bit of the listed files" msgstr "" @@ -8021,132 +8058,128 @@ msgstr "" msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" -#: builtin/am.c:348 +#: builtin/am.c:347 msgid "could not parse author script" msgstr "" -#: builtin/am.c:432 +#: builtin/am.c:431 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "" -#: builtin/am.c:474 +#: builtin/am.c:473 #, c-format msgid "Malformed input line: '%s'." msgstr "" -#: builtin/am.c:512 +#: builtin/am.c:511 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "" -#: builtin/am.c:538 +#: builtin/am.c:537 msgid "fseek failed" msgstr "" -#: builtin/am.c:726 +#: builtin/am.c:725 #, c-format msgid "could not parse patch '%s'" msgstr "" -#: builtin/am.c:791 +#: builtin/am.c:790 msgid "Only one StGIT patch series can be applied at once" msgstr "" -#: builtin/am.c:839 +#: builtin/am.c:838 msgid "invalid timestamp" msgstr "" -#: builtin/am.c:844 builtin/am.c:856 +#: builtin/am.c:843 builtin/am.c:855 msgid "invalid Date line" msgstr "" -#: builtin/am.c:851 +#: builtin/am.c:850 msgid "invalid timezone offset" msgstr "" -#: builtin/am.c:944 +#: builtin/am.c:943 msgid "Patch format detection failed." msgstr "" -#: builtin/am.c:949 builtin/clone.c:407 +#: builtin/am.c:948 builtin/clone.c:406 #, c-format msgid "failed to create directory '%s'" msgstr "" -#: builtin/am.c:954 +#: builtin/am.c:953 msgid "Failed to split patches." msgstr "" -#: builtin/am.c:1084 builtin/commit.c:374 -msgid "unable to write index file" -msgstr "" - -#: builtin/am.c:1098 +#: builtin/am.c:1084 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "" -#: builtin/am.c:1099 +#: builtin/am.c:1085 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" -#: builtin/am.c:1100 +#: builtin/am.c:1086 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" -#: builtin/am.c:1183 +#: builtin/am.c:1169 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" -#: builtin/am.c:1211 +#: builtin/am.c:1197 msgid "Patch is empty." msgstr "" -#: builtin/am.c:1277 +#: builtin/am.c:1262 #, c-format -msgid "invalid ident line: %.*s" +msgid "missing author line in commit %s" msgstr "" -#: builtin/am.c:1299 +#: builtin/am.c:1265 #, c-format -msgid "unable to parse commit %s" +msgid "invalid ident line: %.*s" msgstr "" -#: builtin/am.c:1496 +#: builtin/am.c:1484 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" -#: builtin/am.c:1498 +#: builtin/am.c:1486 msgid "Using index info to reconstruct a base tree..." msgstr "" -#: builtin/am.c:1517 +#: builtin/am.c:1505 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" -#: builtin/am.c:1523 +#: builtin/am.c:1511 msgid "Falling back to patching base and 3-way merge..." msgstr "" -#: builtin/am.c:1549 +#: builtin/am.c:1537 msgid "Failed to merge in the changes." msgstr "" -#: builtin/am.c:1581 +#: builtin/am.c:1569 msgid "applying to an empty history" msgstr "" -#: builtin/am.c:1628 builtin/am.c:1632 +#: builtin/am.c:1616 builtin/am.c:1620 #, c-format msgid "cannot resume: %s does not exist." msgstr "" -#: builtin/am.c:1650 +#: builtin/am.c:1638 msgid "Commit Body is:" msgstr "" @@ -8154,42 +8187,46 @@ msgstr "" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1660 +#: builtin/am.c:1648 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" -#: builtin/am.c:1710 +#: builtin/am.c:1695 builtin/commit.c:374 +msgid "unable to write index file" +msgstr "" + +#: builtin/am.c:1699 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "" -#: builtin/am.c:1750 builtin/am.c:1818 +#: builtin/am.c:1739 builtin/am.c:1807 #, c-format msgid "Applying: %.*s" msgstr "" -#: builtin/am.c:1767 +#: builtin/am.c:1756 msgid "No changes -- Patch already applied." msgstr "" -#: builtin/am.c:1773 +#: builtin/am.c:1762 #, c-format msgid "Patch failed at %s %.*s" msgstr "" -#: builtin/am.c:1777 +#: builtin/am.c:1766 msgid "Use 'git am --show-current-patch' to see the failed patch" msgstr "" -#: builtin/am.c:1821 +#: builtin/am.c:1810 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch." msgstr "" -#: builtin/am.c:1828 +#: builtin/am.c:1817 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -8197,185 +8234,185 @@ msgid "" "You might run `git rm` on a file to accept \"deleted by them\" for it." msgstr "" -#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329 +#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:329 #: builtin/reset.c:337 #, c-format msgid "Could not parse object '%s'." msgstr "" -#: builtin/am.c:1987 +#: builtin/am.c:1976 msgid "failed to clean index" msgstr "" -#: builtin/am.c:2031 +#: builtin/am.c:2020 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "" -#: builtin/am.c:2128 +#: builtin/am.c:2117 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "" -#: builtin/am.c:2164 +#: builtin/am.c:2153 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "" -#: builtin/am.c:2165 +#: builtin/am.c:2154 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "" -#: builtin/am.c:2171 +#: builtin/am.c:2160 msgid "run interactively" msgstr "" -#: builtin/am.c:2173 +#: builtin/am.c:2162 msgid "historical option -- no-op" msgstr "" -#: builtin/am.c:2175 +#: builtin/am.c:2164 msgid "allow fall back on 3way merging if needed" msgstr "" -#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:296 builtin/stash.c:806 +#: builtin/am.c:2165 builtin/init-db.c:494 builtin/prune-packed.c:58 +#: builtin/repack.c:297 builtin/stash.c:812 msgid "be quiet" msgstr "" -#: builtin/am.c:2178 +#: builtin/am.c:2167 msgid "add a Signed-off-by line to the commit message" msgstr "" -#: builtin/am.c:2181 +#: builtin/am.c:2170 msgid "recode into utf8 (default)" msgstr "" -#: builtin/am.c:2183 +#: builtin/am.c:2172 msgid "pass -k flag to git-mailinfo" msgstr "" -#: builtin/am.c:2185 +#: builtin/am.c:2174 msgid "pass -b flag to git-mailinfo" msgstr "" -#: builtin/am.c:2187 +#: builtin/am.c:2176 msgid "pass -m flag to git-mailinfo" msgstr "" -#: builtin/am.c:2189 +#: builtin/am.c:2178 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "" -#: builtin/am.c:2192 +#: builtin/am.c:2181 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" -#: builtin/am.c:2195 +#: builtin/am.c:2184 msgid "strip everything before a scissors line" msgstr "" -#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206 -#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218 -#: builtin/am.c:2224 +#: builtin/am.c:2186 builtin/am.c:2189 builtin/am.c:2192 builtin/am.c:2195 +#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207 +#: builtin/am.c:2213 msgid "pass it through git-apply" msgstr "" -#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671 -#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249 -#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418 -#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313 +#: builtin/am.c:2203 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:674 builtin/grep.c:883 builtin/merge.c:249 +#: builtin/pull.c:160 builtin/pull.c:219 builtin/rebase.c:1442 +#: builtin/repack.c:308 builtin/repack.c:312 builtin/repack.c:314 #: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 -#: parse-options.h:141 parse-options.h:162 parse-options.h:312 +#: parse-options.h:150 parse-options.h:171 parse-options.h:312 msgid "n" msgstr "" -#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38 -#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38 +#: builtin/am.c:2209 builtin/branch.c:661 builtin/for-each-ref.c:38 +#: builtin/replace.c:555 builtin/tag.c:437 builtin/verify-tag.c:38 msgid "format" msgstr "" -#: builtin/am.c:2221 +#: builtin/am.c:2210 msgid "format the patch(es) are in" msgstr "" -#: builtin/am.c:2227 +#: builtin/am.c:2216 msgid "override error message when patch failure occurs" msgstr "" -#: builtin/am.c:2229 +#: builtin/am.c:2218 msgid "continue applying patches after resolving a conflict" msgstr "" -#: builtin/am.c:2232 +#: builtin/am.c:2221 msgid "synonyms for --continue" msgstr "" -#: builtin/am.c:2235 +#: builtin/am.c:2224 msgid "skip the current patch" msgstr "" -#: builtin/am.c:2238 +#: builtin/am.c:2227 msgid "restore the original branch and abort the patching operation." msgstr "" -#: builtin/am.c:2241 +#: builtin/am.c:2230 msgid "abort the patching operation but keep HEAD where it is." msgstr "" -#: builtin/am.c:2244 +#: builtin/am.c:2233 msgid "show the patch being applied." msgstr "" -#: builtin/am.c:2248 +#: builtin/am.c:2237 msgid "lie about committer date" msgstr "" -#: builtin/am.c:2250 +#: builtin/am.c:2239 msgid "use current timestamp for author date" msgstr "" -#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511 -#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489 -#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418 +#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1511 +#: builtin/merge.c:286 builtin/pull.c:194 builtin/rebase.c:490 +#: builtin/rebase.c:1483 builtin/revert.c:117 builtin/tag.c:418 msgid "key-id" msgstr "" -#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460 +#: builtin/am.c:2242 builtin/rebase.c:491 builtin/rebase.c:1484 msgid "GPG-sign commits" msgstr "" -#: builtin/am.c:2256 +#: builtin/am.c:2245 msgid "(internal use for git-rebase)" msgstr "" -#: builtin/am.c:2274 +#: builtin/am.c:2263 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." msgstr "" -#: builtin/am.c:2281 +#: builtin/am.c:2270 msgid "failed to read the index" msgstr "" -#: builtin/am.c:2296 +#: builtin/am.c:2285 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" -#: builtin/am.c:2320 +#: builtin/am.c:2309 #, c-format msgid "" "Stray %s directory found.\n" "Use \"git am --abort\" to remove it." msgstr "" -#: builtin/am.c:2326 +#: builtin/am.c:2315 msgid "Resolve operation not in progress, we are not resuming." msgstr "" -#: builtin/am.c:2336 +#: builtin/am.c:2325 msgid "interactive mode requires patches on the command line" msgstr "" @@ -8670,154 +8707,154 @@ msgstr "" msgid "--bisect-terms requires 0 or 1 argument" msgstr "" -#: builtin/blame.c:32 +#: builtin/blame.c:31 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "" -#: builtin/blame.c:37 +#: builtin/blame.c:36 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "" -#: builtin/blame.c:410 +#: builtin/blame.c:409 #, c-format msgid "expecting a color: %s" msgstr "" -#: builtin/blame.c:417 +#: builtin/blame.c:416 msgid "must end with a color" msgstr "" -#: builtin/blame.c:730 +#: builtin/blame.c:729 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "" -#: builtin/blame.c:748 +#: builtin/blame.c:747 msgid "invalid value for blame.coloring" msgstr "" -#: builtin/blame.c:823 +#: builtin/blame.c:822 #, c-format msgid "cannot find revision %s to ignore" msgstr "" -#: builtin/blame.c:845 +#: builtin/blame.c:844 msgid "Show blame entries as we find them, incrementally" msgstr "" -#: builtin/blame.c:846 +#: builtin/blame.c:845 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" -#: builtin/blame.c:847 +#: builtin/blame.c:846 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" -#: builtin/blame.c:848 +#: builtin/blame.c:847 msgid "Show work cost statistics" msgstr "" -#: builtin/blame.c:849 +#: builtin/blame.c:848 msgid "Force progress reporting" msgstr "" -#: builtin/blame.c:850 +#: builtin/blame.c:849 msgid "Show output score for blame entries" msgstr "" -#: builtin/blame.c:851 +#: builtin/blame.c:850 msgid "Show original filename (Default: auto)" msgstr "" -#: builtin/blame.c:852 +#: builtin/blame.c:851 msgid "Show original linenumber (Default: off)" msgstr "" -#: builtin/blame.c:853 +#: builtin/blame.c:852 msgid "Show in a format designed for machine consumption" msgstr "" -#: builtin/blame.c:854 +#: builtin/blame.c:853 msgid "Show porcelain format with per-line commit information" msgstr "" -#: builtin/blame.c:855 +#: builtin/blame.c:854 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" -#: builtin/blame.c:856 +#: builtin/blame.c:855 msgid "Show raw timestamp (Default: off)" msgstr "" -#: builtin/blame.c:857 +#: builtin/blame.c:856 msgid "Show long commit SHA1 (Default: off)" msgstr "" -#: builtin/blame.c:858 +#: builtin/blame.c:857 msgid "Suppress author name and timestamp (Default: off)" msgstr "" -#: builtin/blame.c:859 +#: builtin/blame.c:858 msgid "Show author email instead of name (Default: off)" msgstr "" -#: builtin/blame.c:860 +#: builtin/blame.c:859 msgid "Ignore whitespace differences" msgstr "" -#: builtin/blame.c:861 builtin/log.c:1629 +#: builtin/blame.c:860 builtin/log.c:1630 msgid "rev" msgstr "" -#: builtin/blame.c:861 +#: builtin/blame.c:860 msgid "Ignore <rev> when blaming" msgstr "" -#: builtin/blame.c:862 +#: builtin/blame.c:861 msgid "Ignore revisions from <file>" msgstr "" -#: builtin/blame.c:863 +#: builtin/blame.c:862 msgid "color redundant metadata from previous line differently" msgstr "" -#: builtin/blame.c:864 +#: builtin/blame.c:863 msgid "color lines by age" msgstr "" -#: builtin/blame.c:871 +#: builtin/blame.c:870 msgid "Use an experimental heuristic to improve diffs" msgstr "" -#: builtin/blame.c:873 +#: builtin/blame.c:872 msgid "Spend extra cycles to find better match" msgstr "" -#: builtin/blame.c:874 +#: builtin/blame.c:873 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" -#: builtin/blame.c:875 +#: builtin/blame.c:874 msgid "Use <file>'s contents as the final image" msgstr "" -#: builtin/blame.c:876 builtin/blame.c:877 +#: builtin/blame.c:875 builtin/blame.c:876 msgid "score" msgstr "" -#: builtin/blame.c:876 +#: builtin/blame.c:875 msgid "Find line copies within and across files" msgstr "" -#: builtin/blame.c:877 +#: builtin/blame.c:876 msgid "Find line movements within and across files" msgstr "" -#: builtin/blame.c:878 +#: builtin/blame.c:877 msgid "n,m" msgstr "" -#: builtin/blame.c:878 +#: builtin/blame.c:877 msgid "Process only line range n,m, counting from 1" msgstr "" @@ -9044,7 +9081,7 @@ msgstr "" msgid "do not use" msgstr "" -#: builtin/branch.c:626 builtin/rebase.c:485 +#: builtin/branch.c:626 builtin/rebase.c:486 msgid "upstream" msgstr "" @@ -9155,7 +9192,7 @@ msgstr "" msgid "format to use for the output" msgstr "" -#: builtin/branch.c:684 builtin/clone.c:761 +#: builtin/branch.c:684 builtin/clone.c:760 msgid "HEAD not found below refs/heads!" msgstr "" @@ -9251,83 +9288,83 @@ msgstr "" msgid "Need a repository to unbundle." msgstr "" -#: builtin/cat-file.c:594 +#: builtin/cat-file.c:595 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" msgstr "" -#: builtin/cat-file.c:595 +#: builtin/cat-file.c:596 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" msgstr "" -#: builtin/cat-file.c:616 +#: builtin/cat-file.c:617 msgid "only one batch option may be specified" msgstr "" -#: builtin/cat-file.c:634 +#: builtin/cat-file.c:635 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "" -#: builtin/cat-file.c:635 +#: builtin/cat-file.c:636 msgid "show object type" msgstr "" -#: builtin/cat-file.c:636 +#: builtin/cat-file.c:637 msgid "show object size" msgstr "" -#: builtin/cat-file.c:638 +#: builtin/cat-file.c:639 msgid "exit with zero when there's no error" msgstr "" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:640 msgid "pretty-print object's content" msgstr "" -#: builtin/cat-file.c:641 +#: builtin/cat-file.c:642 msgid "for blob objects, run textconv on object's content" msgstr "" -#: builtin/cat-file.c:643 +#: builtin/cat-file.c:644 msgid "for blob objects, run filters on object's content" msgstr "" -#: builtin/cat-file.c:644 git-submodule.sh:936 +#: builtin/cat-file.c:645 git-submodule.sh:936 msgid "blob" msgstr "" -#: builtin/cat-file.c:645 +#: builtin/cat-file.c:646 msgid "use a specific path for --textconv/--filters" msgstr "" -#: builtin/cat-file.c:647 +#: builtin/cat-file.c:648 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "" -#: builtin/cat-file.c:648 +#: builtin/cat-file.c:649 msgid "buffer --batch output" msgstr "" -#: builtin/cat-file.c:650 +#: builtin/cat-file.c:651 msgid "show info and content of objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:654 +#: builtin/cat-file.c:655 msgid "show info about objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:658 +#: builtin/cat-file.c:659 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" -#: builtin/cat-file.c:660 +#: builtin/cat-file.c:661 msgid "show all objects with --batch or --batch-check" msgstr "" -#: builtin/cat-file.c:662 +#: builtin/cat-file.c:663 msgid "do not order --batch-all-objects output" msgstr "" @@ -9355,8 +9392,8 @@ msgstr "" msgid "terminate input and output records by a NUL character" msgstr "" -#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538 -#: builtin/worktree.c:507 +#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:537 +#: builtin/worktree.c:506 msgid "suppress progress reporting" msgstr "" @@ -9448,7 +9485,7 @@ msgstr "" #: builtin/checkout-index.c:178 builtin/column.c:31 #: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376 #: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857 -#: builtin/worktree.c:680 +#: builtin/worktree.c:679 msgid "string" msgstr "" @@ -9476,109 +9513,104 @@ msgstr "" msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "" -#: builtin/checkout.c:172 builtin/checkout.c:211 +#: builtin/checkout.c:173 builtin/checkout.c:212 #, c-format msgid "path '%s' does not have our version" msgstr "" -#: builtin/checkout.c:174 builtin/checkout.c:213 +#: builtin/checkout.c:175 builtin/checkout.c:214 #, c-format msgid "path '%s' does not have their version" msgstr "" -#: builtin/checkout.c:190 +#: builtin/checkout.c:191 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "" -#: builtin/checkout.c:240 +#: builtin/checkout.c:241 #, c-format msgid "path '%s' does not have necessary versions" msgstr "" -#: builtin/checkout.c:258 +#: builtin/checkout.c:259 #, c-format msgid "path '%s': cannot merge" msgstr "" -#: builtin/checkout.c:274 +#: builtin/checkout.c:275 #, c-format msgid "Unable to add merge result for '%s'" msgstr "" -#: builtin/checkout.c:374 +#: builtin/checkout.c:375 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:379 +#: builtin/checkout.c:380 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:386 +#: builtin/checkout.c:387 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415 -#: builtin/checkout.c:419 +#: builtin/checkout.c:410 builtin/checkout.c:413 builtin/checkout.c:416 +#: builtin/checkout.c:420 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "" -#: builtin/checkout.c:422 builtin/checkout.c:425 +#: builtin/checkout.c:423 builtin/checkout.c:426 #, c-format msgid "'%s' cannot be used with %s" msgstr "" -#: builtin/checkout.c:429 +#: builtin/checkout.c:430 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" -#: builtin/checkout.c:433 +#: builtin/checkout.c:434 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "" -#: builtin/checkout.c:437 +#: builtin/checkout.c:438 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "" -#: builtin/checkout.c:442 builtin/checkout.c:447 +#: builtin/checkout.c:443 builtin/checkout.c:448 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "" -#: builtin/checkout.c:506 builtin/checkout.c:513 +#: builtin/checkout.c:507 builtin/checkout.c:514 #, c-format msgid "path '%s' is unmerged" msgstr "" -#: builtin/checkout.c:679 +#: builtin/checkout.c:680 msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:729 +#: builtin/checkout.c:730 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" "%s" msgstr "" -#: builtin/checkout.c:736 -#, c-format -msgid "staged changes in the following files may be lost: %s" -msgstr "" - #: builtin/checkout.c:833 #, c-format msgid "Can not do reflog for '%s': %s\n" @@ -9588,7 +9620,7 @@ msgstr "" msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:879 builtin/clone.c:714 +#: builtin/checkout.c:879 builtin/clone.c:713 msgid "unable to update HEAD" msgstr "" @@ -9682,7 +9714,7 @@ msgid "" "Please use -- (and optionally --no-guess) to disambiguate" msgstr "" -#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456 +#: builtin/checkout.c:1243 builtin/worktree.c:290 builtin/worktree.c:455 #, c-format msgid "invalid reference: %s" msgstr "" @@ -9775,9 +9807,9 @@ msgstr "" msgid "missing branch or commit argument" msgstr "" -#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151 -#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575 -#: builtin/send-pack.c:174 +#: builtin/checkout.c:1437 builtin/clone.c:90 builtin/commit-graph.c:59 +#: builtin/commit-graph.c:180 builtin/fetch.c:166 builtin/merge.c:285 +#: builtin/pull.c:138 builtin/push.c:562 builtin/send-pack.c:174 msgid "force progress reporting" msgstr "" @@ -9785,7 +9817,7 @@ msgstr "" msgid "perform a 3-way merge with the new branch" msgstr "" -#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318 +#: builtin/checkout.c:1439 builtin/log.c:1618 parse-options.h:318 msgid "style" msgstr "" @@ -9793,7 +9825,7 @@ msgstr "" msgid "conflict style (merge or diff3)" msgstr "" -#: builtin/checkout.c:1452 builtin/worktree.c:504 +#: builtin/checkout.c:1452 builtin/worktree.c:503 msgid "detach HEAD at named commit" msgstr "" @@ -9895,9 +9927,9 @@ msgid "" "checkout.defaultRemote=origin in your config." msgstr "" -#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733 -#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169 -#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502 +#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1742 +#: builtin/checkout.c:1744 builtin/clone.c:120 builtin/remote.c:169 +#: builtin/remote.c:171 builtin/worktree.c:499 builtin/worktree.c:501 msgid "branch" msgstr "" @@ -9921,39 +9953,39 @@ msgstr "" msgid "use overlay mode (default)" msgstr "" -#: builtin/checkout.c:1734 +#: builtin/checkout.c:1743 msgid "create and switch to a new branch" msgstr "" -#: builtin/checkout.c:1736 +#: builtin/checkout.c:1745 msgid "create/reset and switch to a branch" msgstr "" -#: builtin/checkout.c:1738 +#: builtin/checkout.c:1747 msgid "second guess 'git switch <no-such-branch>'" msgstr "" -#: builtin/checkout.c:1740 +#: builtin/checkout.c:1749 msgid "throw away local modifications" msgstr "" -#: builtin/checkout.c:1772 +#: builtin/checkout.c:1781 msgid "which tree-ish to checkout from" msgstr "" -#: builtin/checkout.c:1774 +#: builtin/checkout.c:1783 msgid "restore the index" msgstr "" -#: builtin/checkout.c:1776 +#: builtin/checkout.c:1785 msgid "restore the working tree (default)" msgstr "" -#: builtin/checkout.c:1778 +#: builtin/checkout.c:1787 msgid "ignore unmerged entries" msgstr "" -#: builtin/checkout.c:1779 +#: builtin/checkout.c:1788 msgid "use overlay mode" msgstr "" @@ -9992,7 +10024,7 @@ msgstr "" msgid "could not lstat %s\n" msgstr "" -#: builtin/clean.c:300 git-add--interactive.perl:593 +#: builtin/clean.c:301 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -10001,7 +10033,7 @@ msgid "" " - (empty) select nothing\n" msgstr "" -#: builtin/clean.c:304 git-add--interactive.perl:602 +#: builtin/clean.c:305 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -10014,38 +10046,38 @@ msgid "" " - (empty) finish selecting\n" msgstr "" -#: builtin/clean.c:520 git-add--interactive.perl:568 +#: builtin/clean.c:521 git-add--interactive.perl:568 #: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "" -#: builtin/clean.c:662 +#: builtin/clean.c:663 #, c-format msgid "Input ignore patterns>> " msgstr "" -#: builtin/clean.c:699 +#: builtin/clean.c:700 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "" -#: builtin/clean.c:720 +#: builtin/clean.c:721 msgid "Select items to delete" msgstr "" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:761 +#: builtin/clean.c:762 #, c-format msgid "Remove %s [y/N]? " msgstr "" -#: builtin/clean.c:786 git-add--interactive.perl:1763 +#: builtin/clean.c:787 git-add--interactive.perl:1763 #, c-format msgid "Bye.\n" msgstr "" -#: builtin/clean.c:794 +#: builtin/clean.c:795 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -10056,405 +10088,400 @@ msgid "" "? - help for prompt selection" msgstr "" -#: builtin/clean.c:821 git-add--interactive.perl:1849 +#: builtin/clean.c:822 git-add--interactive.perl:1849 msgid "*** Commands ***" msgstr "" -#: builtin/clean.c:822 git-add--interactive.perl:1846 +#: builtin/clean.c:823 git-add--interactive.perl:1846 msgid "What now" msgstr "" -#: builtin/clean.c:830 +#: builtin/clean.c:831 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "" msgstr[1] "" -#: builtin/clean.c:846 +#: builtin/clean.c:847 msgid "No more files to clean, exiting." msgstr "" -#: builtin/clean.c:908 +#: builtin/clean.c:909 msgid "do not print names of files removed" msgstr "" -#: builtin/clean.c:910 +#: builtin/clean.c:911 msgid "force" msgstr "" -#: builtin/clean.c:911 +#: builtin/clean.c:912 msgid "interactive cleaning" msgstr "" -#: builtin/clean.c:913 +#: builtin/clean.c:914 msgid "remove whole directories" msgstr "" -#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548 -#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178 -#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415 +#: builtin/clean.c:915 builtin/describe.c:548 builtin/describe.c:550 +#: builtin/grep.c:901 builtin/log.c:176 builtin/log.c:178 +#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419 #: builtin/show-ref.c:179 msgid "pattern" msgstr "" -#: builtin/clean.c:915 +#: builtin/clean.c:916 msgid "add <pattern> to ignore rules" msgstr "" -#: builtin/clean.c:916 +#: builtin/clean.c:917 msgid "remove ignored files, too" msgstr "" -#: builtin/clean.c:918 +#: builtin/clean.c:919 msgid "remove only ignored files" msgstr "" -#: builtin/clean.c:936 +#: builtin/clean.c:937 msgid "-x and -X cannot be used together" msgstr "" -#: builtin/clean.c:940 +#: builtin/clean.c:941 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" -#: builtin/clean.c:943 +#: builtin/clean.c:944 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "" -#: builtin/clone.c:46 +#: builtin/clone.c:45 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "" -#: builtin/clone.c:93 +#: builtin/clone.c:92 msgid "don't create a checkout" msgstr "" -#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489 +#: builtin/clone.c:93 builtin/clone.c:95 builtin/init-db.c:489 msgid "create a bare repository" msgstr "" -#: builtin/clone.c:98 +#: builtin/clone.c:97 msgid "create a mirror repository (implies bare)" msgstr "" -#: builtin/clone.c:100 +#: builtin/clone.c:99 msgid "to clone from a local repository" msgstr "" -#: builtin/clone.c:102 +#: builtin/clone.c:101 msgid "don't use local hardlinks, always copy" msgstr "" -#: builtin/clone.c:104 +#: builtin/clone.c:103 msgid "setup as shared repository" msgstr "" -#: builtin/clone.c:107 +#: builtin/clone.c:106 msgid "pathspec" msgstr "" -#: builtin/clone.c:107 +#: builtin/clone.c:106 msgid "initialize submodules in the clone" msgstr "" -#: builtin/clone.c:110 +#: builtin/clone.c:109 msgid "number of submodules cloned in parallel" msgstr "" -#: builtin/clone.c:111 builtin/init-db.c:486 +#: builtin/clone.c:110 builtin/init-db.c:486 msgid "template-directory" msgstr "" -#: builtin/clone.c:112 builtin/init-db.c:487 +#: builtin/clone.c:111 builtin/init-db.c:487 msgid "directory from which templates will be used" msgstr "" -#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380 +#: builtin/clone.c:113 builtin/clone.c:115 builtin/submodule--helper.c:1380 #: builtin/submodule--helper.c:1860 msgid "reference repository" msgstr "" -#: builtin/clone.c:118 builtin/submodule--helper.c:1382 +#: builtin/clone.c:117 builtin/submodule--helper.c:1382 #: builtin/submodule--helper.c:1862 msgid "use --reference only while cloning" msgstr "" -#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3314 builtin/repack.c:319 +#: builtin/clone.c:118 builtin/column.c:27 builtin/merge-file.c:46 +#: builtin/pack-objects.c:3294 builtin/repack.c:320 msgid "name" msgstr "" -#: builtin/clone.c:120 +#: builtin/clone.c:119 msgid "use <name> instead of 'origin' to track upstream" msgstr "" -#: builtin/clone.c:122 +#: builtin/clone.c:121 msgid "checkout <branch> instead of the remote's HEAD" msgstr "" -#: builtin/clone.c:124 +#: builtin/clone.c:123 msgid "path to git-upload-pack on the remote" msgstr "" -#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838 -#: builtin/pull.c:226 +#: builtin/clone.c:124 builtin/fetch.c:167 builtin/grep.c:840 +#: builtin/pull.c:227 msgid "depth" msgstr "" -#: builtin/clone.c:126 +#: builtin/clone.c:125 msgid "create a shallow clone of that depth" msgstr "" -#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303 +#: builtin/clone.c:126 builtin/fetch.c:169 builtin/pack-objects.c:3283 msgid "time" msgstr "" -#: builtin/clone.c:128 +#: builtin/clone.c:127 msgid "create a shallow clone since a specific time" msgstr "" -#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179 -#: builtin/rebase.c:1395 +#: builtin/clone.c:128 builtin/fetch.c:171 builtin/fetch.c:194 +#: builtin/rebase.c:1417 msgid "revision" msgstr "" -#: builtin/clone.c:130 builtin/fetch.c:157 +#: builtin/clone.c:129 builtin/fetch.c:172 msgid "deepen history of shallow clone, excluding rev" msgstr "" -#: builtin/clone.c:132 +#: builtin/clone.c:131 msgid "clone only one branch, HEAD or --branch" msgstr "" -#: builtin/clone.c:134 +#: builtin/clone.c:133 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "" -#: builtin/clone.c:136 +#: builtin/clone.c:135 msgid "any cloned submodules will be shallow" msgstr "" -#: builtin/clone.c:137 builtin/init-db.c:495 +#: builtin/clone.c:136 builtin/init-db.c:495 msgid "gitdir" msgstr "" -#: builtin/clone.c:138 builtin/init-db.c:496 +#: builtin/clone.c:137 builtin/init-db.c:496 msgid "separate git dir from working tree" msgstr "" -#: builtin/clone.c:139 +#: builtin/clone.c:138 msgid "key=value" msgstr "" -#: builtin/clone.c:140 +#: builtin/clone.c:139 msgid "set config inside the new repository" msgstr "" -#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 -#: builtin/push.c:585 builtin/send-pack.c:172 +#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76 +#: builtin/push.c:572 builtin/send-pack.c:172 msgid "server-specific" msgstr "" -#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 -#: builtin/push.c:585 builtin/send-pack.c:173 +#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76 +#: builtin/push.c:572 builtin/send-pack.c:173 msgid "option to transmit" msgstr "" -#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239 -#: builtin/push.c:586 +#: builtin/clone.c:142 builtin/fetch.c:190 builtin/pull.c:240 +#: builtin/push.c:573 msgid "use IPv4 addresses only" msgstr "" -#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242 -#: builtin/push.c:588 +#: builtin/clone.c:144 builtin/fetch.c:192 builtin/pull.c:243 +#: builtin/push.c:575 msgid "use IPv6 addresses only" msgstr "" -#: builtin/clone.c:149 +#: builtin/clone.c:148 msgid "any cloned submodules will use their remote-tracking branch" msgstr "" -#: builtin/clone.c:285 +#: builtin/clone.c:284 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" msgstr "" -#: builtin/clone.c:338 +#: builtin/clone.c:337 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "" -#: builtin/clone.c:411 +#: builtin/clone.c:410 #, c-format msgid "%s exists and is not a directory" msgstr "" -#: builtin/clone.c:428 +#: builtin/clone.c:427 #, c-format msgid "failed to start iterator over '%s'" msgstr "" -#: builtin/clone.c:453 -#, c-format -msgid "failed to unlink '%s'" -msgstr "" - -#: builtin/clone.c:458 +#: builtin/clone.c:457 #, c-format msgid "failed to create link '%s'" msgstr "" -#: builtin/clone.c:462 +#: builtin/clone.c:461 #, c-format msgid "failed to copy file to '%s'" msgstr "" -#: builtin/clone.c:467 +#: builtin/clone.c:466 #, c-format msgid "failed to iterate over '%s'" msgstr "" -#: builtin/clone.c:492 +#: builtin/clone.c:491 #, c-format msgid "done.\n" msgstr "" -#: builtin/clone.c:506 +#: builtin/clone.c:505 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" "and retry with 'git restore --source=HEAD :/'\n" msgstr "" -#: builtin/clone.c:583 +#: builtin/clone.c:582 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" -#: builtin/clone.c:702 +#: builtin/clone.c:701 #, c-format msgid "unable to update %s" msgstr "" -#: builtin/clone.c:752 +#: builtin/clone.c:751 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -#: builtin/clone.c:783 +#: builtin/clone.c:782 msgid "unable to checkout working tree" msgstr "" -#: builtin/clone.c:833 +#: builtin/clone.c:832 msgid "unable to write parameters to config file" msgstr "" -#: builtin/clone.c:896 +#: builtin/clone.c:895 msgid "cannot repack to clean up" msgstr "" -#: builtin/clone.c:898 +#: builtin/clone.c:897 msgid "cannot unlink temporary alternates file" msgstr "" -#: builtin/clone.c:938 builtin/receive-pack.c:1950 +#: builtin/clone.c:937 builtin/receive-pack.c:1948 msgid "Too many arguments." msgstr "" -#: builtin/clone.c:942 +#: builtin/clone.c:941 msgid "You must specify a repository to clone." msgstr "" -#: builtin/clone.c:955 +#: builtin/clone.c:954 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:958 +#: builtin/clone.c:957 msgid "--bare and --separate-git-dir are incompatible." msgstr "" -#: builtin/clone.c:971 +#: builtin/clone.c:970 #, c-format msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:977 builtin/fetch.c:1660 +#: builtin/clone.c:976 builtin/fetch.c:1790 #, c-format msgid "depth %s is not a positive number" msgstr "" -#: builtin/clone.c:987 +#: builtin/clone.c:986 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:997 +#: builtin/clone.c:996 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264 -#: builtin/worktree.c:303 builtin/worktree.c:335 +#: builtin/clone.c:1011 builtin/clone.c:1032 builtin/difftool.c:271 +#: builtin/log.c:1785 builtin/worktree.c:302 builtin/worktree.c:334 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:1017 +#: builtin/clone.c:1016 #, c-format msgid "could not create work tree dir '%s'" msgstr "" -#: builtin/clone.c:1037 +#: builtin/clone.c:1036 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:1039 +#: builtin/clone.c:1038 #, c-format msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/clone.c:1063 +#: builtin/clone.c:1062 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "" -#: builtin/clone.c:1124 +#: builtin/clone.c:1123 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1126 +#: builtin/clone.c:1125 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1128 +#: builtin/clone.c:1127 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1130 +#: builtin/clone.c:1129 msgid "--filter is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1133 +#: builtin/clone.c:1132 msgid "source repository is shallow, ignoring --local" msgstr "" -#: builtin/clone.c:1138 +#: builtin/clone.c:1137 msgid "--local is ignored" msgstr "" -#: builtin/clone.c:1215 builtin/clone.c:1223 +#: builtin/clone.c:1212 builtin/clone.c:1220 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:1226 +#: builtin/clone.c:1223 msgid "You appear to have cloned an empty repository." msgstr "" @@ -10530,7 +10557,7 @@ msgid "id of a parent commit object" msgstr "" #: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1469 #: builtin/tag.c:412 msgid "message" msgstr "" @@ -10544,7 +10571,7 @@ msgid "read commit log message from file" msgstr "" #: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287 -#: builtin/pull.c:194 builtin/revert.c:118 +#: builtin/pull.c:195 builtin/revert.c:118 msgid "GPG sign commit" msgstr "" @@ -10835,8 +10862,8 @@ msgstr "" msgid "version" msgstr "" -#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561 -#: builtin/worktree.c:651 +#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:548 +#: builtin/worktree.c:650 msgid "machine-readable output" msgstr "" @@ -10849,8 +10876,8 @@ msgid "terminate entries with NUL" msgstr "" #: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537 -#: builtin/fast-export.c:1125 builtin/fast-export.c:1128 -#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332 +#: builtin/fast-export.c:1153 builtin/fast-export.c:1156 +#: builtin/fast-export.c:1159 builtin/rebase.c:1495 parse-options.h:332 msgid "mode" msgstr "" @@ -10864,7 +10891,7 @@ msgid "" "traditional)" msgstr "" -#: builtin/commit.c:1362 parse-options.h:179 +#: builtin/commit.c:1362 parse-options.h:188 msgid "when" msgstr "" @@ -10914,7 +10941,7 @@ msgstr "" msgid "override author for commit" msgstr "" -#: builtin/commit.c:1499 builtin/gc.c:539 +#: builtin/commit.c:1499 builtin/gc.c:538 msgid "date" msgstr "" @@ -10947,8 +10974,8 @@ msgstr "" msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289 -#: builtin/pull.c:163 builtin/revert.c:110 +#: builtin/commit.c:1506 builtin/log.c:1565 builtin/merge.c:289 +#: builtin/pull.c:164 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "" @@ -11052,64 +11079,65 @@ msgid "git commit-graph read [--object-dir <objdir>]" msgstr "" #: builtin/commit-graph.c:13 builtin/commit-graph.c:19 -msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]" +msgid "" +"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" msgstr "" #: builtin/commit-graph.c:14 builtin/commit-graph.c:29 msgid "" "git commit-graph write [--object-dir <objdir>] [--append|--split] [--" -"reachable|--stdin-packs|--stdin-commits] <split options>" +"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>" msgstr "" -#: builtin/commit-graph.c:54 builtin/commit-graph.c:100 -#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163 -#: builtin/log.c:1584 +#: builtin/commit-graph.c:55 builtin/commit-graph.c:107 +#: builtin/commit-graph.c:170 builtin/commit-graph.c:254 builtin/fetch.c:178 +#: builtin/log.c:1585 msgid "dir" msgstr "" -#: builtin/commit-graph.c:55 builtin/commit-graph.c:101 -#: builtin/commit-graph.c:162 builtin/commit-graph.c:238 +#: builtin/commit-graph.c:56 builtin/commit-graph.c:108 +#: builtin/commit-graph.c:171 builtin/commit-graph.c:255 msgid "The object directory to store the graph" msgstr "" -#: builtin/commit-graph.c:57 +#: builtin/commit-graph.c:58 msgid "if the commit-graph is split, only verify the tip file" msgstr "" -#: builtin/commit-graph.c:73 builtin/commit-graph.c:116 +#: builtin/commit-graph.c:80 builtin/commit-graph.c:125 #, c-format msgid "Could not open commit-graph '%s'" msgstr "" -#: builtin/commit-graph.c:164 +#: builtin/commit-graph.c:173 msgid "start walk at all refs" msgstr "" -#: builtin/commit-graph.c:166 +#: builtin/commit-graph.c:175 msgid "scan pack-indexes listed by stdin for commits" msgstr "" -#: builtin/commit-graph.c:168 +#: builtin/commit-graph.c:177 msgid "start walk at commits listed by stdin" msgstr "" -#: builtin/commit-graph.c:170 +#: builtin/commit-graph.c:179 msgid "include all commits already in the commit-graph file" msgstr "" -#: builtin/commit-graph.c:172 +#: builtin/commit-graph.c:182 msgid "allow writing an incremental commit-graph file" msgstr "" -#: builtin/commit-graph.c:174 builtin/commit-graph.c:178 +#: builtin/commit-graph.c:184 builtin/commit-graph.c:188 msgid "maximum number of commits in a non-base split commit-graph" msgstr "" -#: builtin/commit-graph.c:176 +#: builtin/commit-graph.c:186 msgid "maximum ratio between two levels of a split commit-graph" msgstr "" -#: builtin/commit-graph.c:191 +#: builtin/commit-graph.c:204 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "" @@ -11412,166 +11440,166 @@ msgstr "" msgid "print sizes in human readable format" msgstr "" -#: builtin/describe.c:27 +#: builtin/describe.c:26 msgid "git describe [<options>] [<commit-ish>...]" msgstr "" -#: builtin/describe.c:28 +#: builtin/describe.c:27 msgid "git describe [<options>] --dirty" msgstr "" -#: builtin/describe.c:63 +#: builtin/describe.c:62 msgid "head" msgstr "" -#: builtin/describe.c:63 +#: builtin/describe.c:62 msgid "lightweight" msgstr "" -#: builtin/describe.c:63 +#: builtin/describe.c:62 msgid "annotated" msgstr "" -#: builtin/describe.c:273 +#: builtin/describe.c:275 #, c-format msgid "annotated tag %s not available" msgstr "" -#: builtin/describe.c:277 +#: builtin/describe.c:279 #, c-format msgid "annotated tag %s has no embedded name" msgstr "" -#: builtin/describe.c:279 +#: builtin/describe.c:281 #, c-format msgid "tag '%s' is really '%s' here" msgstr "" -#: builtin/describe.c:323 +#: builtin/describe.c:325 #, c-format msgid "no tag exactly matches '%s'" msgstr "" -#: builtin/describe.c:325 +#: builtin/describe.c:327 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "" -#: builtin/describe.c:379 +#: builtin/describe.c:381 #, c-format msgid "finished search at %s\n" msgstr "" -#: builtin/describe.c:405 +#: builtin/describe.c:407 #, c-format msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "" -#: builtin/describe.c:409 +#: builtin/describe.c:411 #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" -#: builtin/describe.c:439 +#: builtin/describe.c:441 #, c-format msgid "traversed %lu commits\n" msgstr "" -#: builtin/describe.c:442 +#: builtin/describe.c:444 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "" -#: builtin/describe.c:510 +#: builtin/describe.c:512 #, c-format msgid "describe %s\n" msgstr "" -#: builtin/describe.c:513 +#: builtin/describe.c:515 #, c-format msgid "Not a valid object name %s" msgstr "" -#: builtin/describe.c:521 +#: builtin/describe.c:523 #, c-format msgid "%s is neither a commit nor blob" msgstr "" -#: builtin/describe.c:535 +#: builtin/describe.c:537 msgid "find the tag that comes after the commit" msgstr "" -#: builtin/describe.c:536 +#: builtin/describe.c:538 msgid "debug search strategy on stderr" msgstr "" -#: builtin/describe.c:537 +#: builtin/describe.c:539 msgid "use any ref" msgstr "" -#: builtin/describe.c:538 +#: builtin/describe.c:540 msgid "use any tag, even unannotated" msgstr "" -#: builtin/describe.c:539 +#: builtin/describe.c:541 msgid "always use long format" msgstr "" -#: builtin/describe.c:540 +#: builtin/describe.c:542 msgid "only follow first parent" msgstr "" -#: builtin/describe.c:543 +#: builtin/describe.c:545 msgid "only output exact matches" msgstr "" -#: builtin/describe.c:545 +#: builtin/describe.c:547 msgid "consider <n> most recent tags (default: 10)" msgstr "" -#: builtin/describe.c:547 +#: builtin/describe.c:549 msgid "only consider tags matching <pattern>" msgstr "" -#: builtin/describe.c:549 +#: builtin/describe.c:551 msgid "do not consider tags matching <pattern>" msgstr "" -#: builtin/describe.c:551 builtin/name-rev.c:422 +#: builtin/describe.c:553 builtin/name-rev.c:426 msgid "show abbreviated commit object as fallback" msgstr "" -#: builtin/describe.c:552 builtin/describe.c:555 +#: builtin/describe.c:554 builtin/describe.c:557 msgid "mark" msgstr "" -#: builtin/describe.c:553 +#: builtin/describe.c:555 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "" -#: builtin/describe.c:556 +#: builtin/describe.c:558 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "" -#: builtin/describe.c:574 +#: builtin/describe.c:576 msgid "--long is incompatible with --abbrev=0" msgstr "" -#: builtin/describe.c:603 +#: builtin/describe.c:605 msgid "No names found, cannot describe anything." msgstr "" -#: builtin/describe.c:654 +#: builtin/describe.c:656 msgid "--dirty is incompatible with commit-ishes" msgstr "" -#: builtin/describe.c:656 +#: builtin/describe.c:658 msgid "--broken is incompatible with commit-ishes" msgstr "" @@ -11608,109 +11636,109 @@ msgstr "" msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "" -#: builtin/difftool.c:253 +#: builtin/difftool.c:260 #, c-format msgid "failed: %d" msgstr "" -#: builtin/difftool.c:295 +#: builtin/difftool.c:302 #, c-format msgid "could not read symlink %s" msgstr "" -#: builtin/difftool.c:297 +#: builtin/difftool.c:304 #, c-format msgid "could not read symlink file %s" msgstr "" -#: builtin/difftool.c:305 +#: builtin/difftool.c:312 #, c-format msgid "could not read object %s for symlink %s" msgstr "" -#: builtin/difftool.c:406 +#: builtin/difftool.c:413 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." msgstr "" -#: builtin/difftool.c:626 +#: builtin/difftool.c:634 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "" -#: builtin/difftool.c:628 +#: builtin/difftool.c:636 msgid "working tree file has been left." msgstr "" -#: builtin/difftool.c:639 +#: builtin/difftool.c:647 #, c-format msgid "temporary files exist in '%s'." msgstr "" -#: builtin/difftool.c:640 +#: builtin/difftool.c:648 msgid "you may want to cleanup or recover these." msgstr "" -#: builtin/difftool.c:689 +#: builtin/difftool.c:697 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "" -#: builtin/difftool.c:691 +#: builtin/difftool.c:699 msgid "perform a full-directory diff" msgstr "" -#: builtin/difftool.c:693 +#: builtin/difftool.c:701 msgid "do not prompt before launching a diff tool" msgstr "" -#: builtin/difftool.c:698 +#: builtin/difftool.c:706 msgid "use symlinks in dir-diff mode" msgstr "" -#: builtin/difftool.c:699 +#: builtin/difftool.c:707 msgid "tool" msgstr "" -#: builtin/difftool.c:700 +#: builtin/difftool.c:708 msgid "use the specified diff tool" msgstr "" -#: builtin/difftool.c:702 +#: builtin/difftool.c:710 msgid "print a list of diff tools that may be used with `--tool`" msgstr "" -#: builtin/difftool.c:705 +#: builtin/difftool.c:713 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" msgstr "" -#: builtin/difftool.c:708 +#: builtin/difftool.c:716 msgid "specify a custom command for viewing diffs" msgstr "" -#: builtin/difftool.c:709 +#: builtin/difftool.c:717 msgid "passed to `diff`" msgstr "" -#: builtin/difftool.c:724 +#: builtin/difftool.c:732 msgid "difftool requires worktree or --no-index" msgstr "" -#: builtin/difftool.c:731 +#: builtin/difftool.c:739 msgid "--dir-diff is incompatible with --no-index" msgstr "" -#: builtin/difftool.c:734 +#: builtin/difftool.c:742 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "" -#: builtin/difftool.c:742 +#: builtin/difftool.c:750 msgid "no <tool> given for --tool=<tool>" msgstr "" -#: builtin/difftool.c:749 +#: builtin/difftool.c:757 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "" @@ -11746,251 +11774,275 @@ msgstr "" msgid "git fast-export [rev-list-opts]" msgstr "" -#: builtin/fast-export.c:1124 +#: builtin/fast-export.c:852 +msgid "Error: Cannot export nested tags unless --mark-tags is specified." +msgstr "" + +#: builtin/fast-export.c:1152 msgid "show progress after <n> objects" msgstr "" -#: builtin/fast-export.c:1126 +#: builtin/fast-export.c:1154 msgid "select handling of signed tags" msgstr "" -#: builtin/fast-export.c:1129 +#: builtin/fast-export.c:1157 msgid "select handling of tags that tag filtered objects" msgstr "" -#: builtin/fast-export.c:1132 +#: builtin/fast-export.c:1160 msgid "select handling of commit messages in an alternate encoding" msgstr "" -#: builtin/fast-export.c:1135 +#: builtin/fast-export.c:1163 msgid "Dump marks to this file" msgstr "" -#: builtin/fast-export.c:1137 +#: builtin/fast-export.c:1165 msgid "Import marks from this file" msgstr "" -#: builtin/fast-export.c:1139 +#: builtin/fast-export.c:1169 +msgid "Import marks from this file if it exists" +msgstr "" + +#: builtin/fast-export.c:1171 msgid "Fake a tagger when tags lack one" msgstr "" -#: builtin/fast-export.c:1141 +#: builtin/fast-export.c:1173 msgid "Output full tree for each commit" msgstr "" -#: builtin/fast-export.c:1143 +#: builtin/fast-export.c:1175 msgid "Use the done feature to terminate the stream" msgstr "" -#: builtin/fast-export.c:1144 +#: builtin/fast-export.c:1176 msgid "Skip output of blob data" msgstr "" -#: builtin/fast-export.c:1145 builtin/log.c:1632 +#: builtin/fast-export.c:1177 builtin/log.c:1633 msgid "refspec" msgstr "" -#: builtin/fast-export.c:1146 +#: builtin/fast-export.c:1178 msgid "Apply refspec to exported refs" msgstr "" -#: builtin/fast-export.c:1147 +#: builtin/fast-export.c:1179 msgid "anonymize output" msgstr "" -#: builtin/fast-export.c:1149 +#: builtin/fast-export.c:1181 msgid "Reference parents which are not in fast-export stream by object id" msgstr "" -#: builtin/fast-export.c:1151 +#: builtin/fast-export.c:1183 msgid "Show original object ids of blobs/commits" msgstr "" -#: builtin/fetch.c:30 +#: builtin/fast-export.c:1185 +msgid "Label tags with mark ids" +msgstr "" + +#: builtin/fast-export.c:1220 +msgid "Cannot pass both --import-marks and --import-marks-if-exists" +msgstr "" + +#: builtin/fetch.c:34 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "" -#: builtin/fetch.c:31 +#: builtin/fetch.c:35 msgid "git fetch [<options>] <group>" msgstr "" -#: builtin/fetch.c:32 +#: builtin/fetch.c:36 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "" -#: builtin/fetch.c:33 +#: builtin/fetch.c:37 msgid "git fetch --all [<options>]" msgstr "" -#: builtin/fetch.c:125 builtin/pull.c:203 +#: builtin/fetch.c:115 +msgid "fetch.parallel cannot be negative" +msgstr "" + +#: builtin/fetch.c:138 builtin/pull.c:204 msgid "fetch from all remotes" msgstr "" -#: builtin/fetch.c:127 builtin/pull.c:206 +#: builtin/fetch.c:140 builtin/pull.c:248 +msgid "set upstream for git pull/fetch" +msgstr "" + +#: builtin/fetch.c:142 builtin/pull.c:207 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "" -#: builtin/fetch.c:129 builtin/pull.c:209 +#: builtin/fetch.c:144 builtin/pull.c:210 msgid "path to upload pack on remote end" msgstr "" -#: builtin/fetch.c:130 +#: builtin/fetch.c:145 msgid "force overwrite of local reference" msgstr "" -#: builtin/fetch.c:132 +#: builtin/fetch.c:147 msgid "fetch from multiple remotes" msgstr "" -#: builtin/fetch.c:134 builtin/pull.c:213 +#: builtin/fetch.c:149 builtin/pull.c:214 msgid "fetch all tags and associated objects" msgstr "" -#: builtin/fetch.c:136 +#: builtin/fetch.c:151 msgid "do not fetch all tags (--no-tags)" msgstr "" -#: builtin/fetch.c:138 +#: builtin/fetch.c:153 msgid "number of submodules fetched in parallel" msgstr "" -#: builtin/fetch.c:140 builtin/pull.c:216 +#: builtin/fetch.c:155 builtin/pull.c:217 msgid "prune remote-tracking branches no longer on remote" msgstr "" -#: builtin/fetch.c:142 +#: builtin/fetch.c:157 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" -#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140 +#: builtin/fetch.c:158 builtin/fetch.c:181 builtin/pull.c:141 msgid "on-demand" msgstr "" -#: builtin/fetch.c:144 +#: builtin/fetch.c:159 msgid "control recursive fetching of submodules" msgstr "" -#: builtin/fetch.c:148 builtin/pull.c:224 +#: builtin/fetch.c:163 builtin/pull.c:225 msgid "keep downloaded pack" msgstr "" -#: builtin/fetch.c:150 +#: builtin/fetch.c:165 msgid "allow updating of HEAD ref" msgstr "" -#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227 +#: builtin/fetch.c:168 builtin/fetch.c:174 builtin/pull.c:228 msgid "deepen history of shallow clone" msgstr "" -#: builtin/fetch.c:155 +#: builtin/fetch.c:170 msgid "deepen history of shallow repository based on time" msgstr "" -#: builtin/fetch.c:161 builtin/pull.c:230 +#: builtin/fetch.c:176 builtin/pull.c:231 msgid "convert to a complete repository" msgstr "" -#: builtin/fetch.c:164 +#: builtin/fetch.c:179 msgid "prepend this to submodule path output" msgstr "" -#: builtin/fetch.c:167 +#: builtin/fetch.c:182 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "" -#: builtin/fetch.c:171 builtin/pull.c:233 +#: builtin/fetch.c:186 builtin/pull.c:234 msgid "accept refs that update .git/shallow" msgstr "" -#: builtin/fetch.c:172 builtin/pull.c:235 +#: builtin/fetch.c:187 builtin/pull.c:236 msgid "refmap" msgstr "" -#: builtin/fetch.c:173 builtin/pull.c:236 +#: builtin/fetch.c:188 builtin/pull.c:237 msgid "specify fetch refmap" msgstr "" -#: builtin/fetch.c:180 +#: builtin/fetch.c:195 msgid "report that we have only objects reachable from this object" msgstr "" -#: builtin/fetch.c:183 +#: builtin/fetch.c:198 msgid "run 'gc --auto' after fetching" msgstr "" -#: builtin/fetch.c:185 builtin/pull.c:245 +#: builtin/fetch.c:200 builtin/pull.c:246 msgid "check for forced-updates on all updated branches" msgstr "" -#: builtin/fetch.c:491 +#: builtin/fetch.c:510 msgid "Couldn't find remote ref HEAD" msgstr "" -#: builtin/fetch.c:630 +#: builtin/fetch.c:650 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "" -#: builtin/fetch.c:728 +#: builtin/fetch.c:748 #, c-format msgid "object %s not found" msgstr "" -#: builtin/fetch.c:732 +#: builtin/fetch.c:752 msgid "[up to date]" msgstr "" -#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833 +#: builtin/fetch.c:765 builtin/fetch.c:781 builtin/fetch.c:853 msgid "[rejected]" msgstr "" -#: builtin/fetch.c:746 +#: builtin/fetch.c:766 msgid "can't fetch in current branch" msgstr "" -#: builtin/fetch.c:756 +#: builtin/fetch.c:776 msgid "[tag update]" msgstr "" -#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816 -#: builtin/fetch.c:828 +#: builtin/fetch.c:777 builtin/fetch.c:814 builtin/fetch.c:836 +#: builtin/fetch.c:848 msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:761 +#: builtin/fetch.c:781 msgid "would clobber existing tag" msgstr "" -#: builtin/fetch.c:783 +#: builtin/fetch.c:803 msgid "[new tag]" msgstr "" -#: builtin/fetch.c:786 +#: builtin/fetch.c:806 msgid "[new branch]" msgstr "" -#: builtin/fetch.c:789 +#: builtin/fetch.c:809 msgid "[new ref]" msgstr "" -#: builtin/fetch.c:828 +#: builtin/fetch.c:848 msgid "forced update" msgstr "" -#: builtin/fetch.c:833 +#: builtin/fetch.c:853 msgid "non-fast-forward" msgstr "" -#: builtin/fetch.c:854 +#: builtin/fetch.c:874 msgid "" "Fetch normally indicates which branches had a forced update,\n" "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" "flag or run 'git config fetch.showForcedUpdates true'." msgstr "" -#: builtin/fetch.c:858 +#: builtin/fetch.c:878 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -11999,121 +12051,142 @@ msgid "" " to avoid this check.\n" msgstr "" -#: builtin/fetch.c:888 +#: builtin/fetch.c:908 #, c-format msgid "%s did not send all necessary objects\n" msgstr "" -#: builtin/fetch.c:909 +#: builtin/fetch.c:929 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" -#: builtin/fetch.c:1000 builtin/fetch.c:1131 +#: builtin/fetch.c:1020 builtin/fetch.c:1157 #, c-format msgid "From %.*s\n" msgstr "" -#: builtin/fetch.c:1011 +#: builtin/fetch.c:1031 #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" -#: builtin/fetch.c:1101 +#: builtin/fetch.c:1127 #, c-format msgid " (%s will become dangling)" msgstr "" -#: builtin/fetch.c:1102 +#: builtin/fetch.c:1128 #, c-format msgid " (%s has become dangling)" msgstr "" -#: builtin/fetch.c:1134 +#: builtin/fetch.c:1160 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:1135 builtin/remote.c:1036 +#: builtin/fetch.c:1161 builtin/remote.c:1036 msgid "(none)" msgstr "" -#: builtin/fetch.c:1158 +#: builtin/fetch.c:1184 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:1177 +#: builtin/fetch.c:1203 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/fetch.c:1180 +#: builtin/fetch.c:1206 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" -#: builtin/fetch.c:1484 +#: builtin/fetch.c:1414 +msgid "multiple branch detected, incompatible with --set-upstream" +msgstr "" + +#: builtin/fetch.c:1429 +msgid "not setting upstream for a remote remote-tracking branch" +msgstr "" + +#: builtin/fetch.c:1431 +msgid "not setting upstream for a remote tag" +msgstr "" + +#: builtin/fetch.c:1433 +msgid "unknown branch type" +msgstr "" + +#: builtin/fetch.c:1435 +msgid "" +"no source branch found.\n" +"you need to specify exactly one branch with the --set-upstream option." +msgstr "" + +#: builtin/fetch.c:1561 builtin/fetch.c:1623 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:1486 builtin/remote.c:100 +#: builtin/fetch.c:1571 builtin/fetch.c:1625 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:1532 -msgid "" -"--filter can only be used with the remote configured in extensions." -"partialClone" +#: builtin/fetch.c:1583 +#, c-format +msgid "could not fetch '%s' (exit code: %d)\n" msgstr "" -#: builtin/fetch.c:1556 +#: builtin/fetch.c:1685 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "" -#: builtin/fetch.c:1593 +#: builtin/fetch.c:1722 msgid "You need to specify a tag name." msgstr "" -#: builtin/fetch.c:1644 +#: builtin/fetch.c:1774 msgid "Negative depth in --deepen is not supported" msgstr "" -#: builtin/fetch.c:1646 +#: builtin/fetch.c:1776 msgid "--deepen and --depth are mutually exclusive" msgstr "" -#: builtin/fetch.c:1651 +#: builtin/fetch.c:1781 msgid "--depth and --unshallow cannot be used together" msgstr "" -#: builtin/fetch.c:1653 +#: builtin/fetch.c:1783 msgid "--unshallow on a complete repository does not make sense" msgstr "" -#: builtin/fetch.c:1669 +#: builtin/fetch.c:1799 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:1671 +#: builtin/fetch.c:1801 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:1680 +#: builtin/fetch.c:1810 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:1687 +#: builtin/fetch.c:1817 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" -#: builtin/fetch.c:1703 +#: builtin/fetch.c:1835 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -12445,7 +12518,7 @@ msgstr "" msgid "invalid parameter: expected sha1, got '%s'" msgstr "" -#: builtin/gc.c:34 +#: builtin/gc.c:35 msgid "git gc [<options>]" msgstr "" @@ -12459,17 +12532,17 @@ msgstr "" msgid "failed to parse '%s' value '%s'" msgstr "" -#: builtin/gc.c:476 builtin/init-db.c:55 +#: builtin/gc.c:475 builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" msgstr "" -#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529 +#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529 #, c-format msgid "cannot read '%s'" msgstr "" -#: builtin/gc.c:492 +#: builtin/gc.c:491 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -12479,58 +12552,58 @@ msgid "" "%s" msgstr "" -#: builtin/gc.c:540 +#: builtin/gc.c:539 msgid "prune unreferenced objects" msgstr "" -#: builtin/gc.c:542 +#: builtin/gc.c:541 msgid "be more thorough (increased runtime)" msgstr "" -#: builtin/gc.c:543 +#: builtin/gc.c:542 msgid "enable auto-gc mode" msgstr "" -#: builtin/gc.c:546 +#: builtin/gc.c:545 msgid "force running gc even if there may be another gc running" msgstr "" -#: builtin/gc.c:549 +#: builtin/gc.c:548 msgid "repack all other packs except the largest pack" msgstr "" -#: builtin/gc.c:566 +#: builtin/gc.c:565 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "" -#: builtin/gc.c:577 +#: builtin/gc.c:576 #, c-format msgid "failed to parse prune expiry value %s" msgstr "" -#: builtin/gc.c:597 +#: builtin/gc.c:596 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" -#: builtin/gc.c:599 +#: builtin/gc.c:598 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "" -#: builtin/gc.c:600 +#: builtin/gc.c:599 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "" -#: builtin/gc.c:640 +#: builtin/gc.c:639 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "" -#: builtin/gc.c:695 +#: builtin/gc.c:694 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -12554,257 +12627,257 @@ msgstr "" #. grep.threads #. #: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727 -#: builtin/pack-objects.c:2728 +#: builtin/pack-objects.c:2708 #, c-format msgid "no threads support, ignoring %s" msgstr "" -#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633 +#: builtin/grep.c:467 builtin/grep.c:592 builtin/grep.c:635 #, c-format msgid "unable to read tree (%s)" msgstr "" -#: builtin/grep.c:648 +#: builtin/grep.c:650 #, c-format msgid "unable to grep from object of type %s" msgstr "" -#: builtin/grep.c:714 +#: builtin/grep.c:716 #, c-format msgid "switch `%c' expects a numerical value" msgstr "" -#: builtin/grep.c:813 +#: builtin/grep.c:815 msgid "search in index instead of in the work tree" msgstr "" -#: builtin/grep.c:815 +#: builtin/grep.c:817 msgid "find in contents not managed by git" msgstr "" -#: builtin/grep.c:817 +#: builtin/grep.c:819 msgid "search in both tracked and untracked files" msgstr "" -#: builtin/grep.c:819 +#: builtin/grep.c:821 msgid "ignore files specified via '.gitignore'" msgstr "" -#: builtin/grep.c:821 +#: builtin/grep.c:823 msgid "recursively search in each submodule" msgstr "" -#: builtin/grep.c:824 +#: builtin/grep.c:826 msgid "show non-matching lines" msgstr "" -#: builtin/grep.c:826 +#: builtin/grep.c:828 msgid "case insensitive matching" msgstr "" -#: builtin/grep.c:828 +#: builtin/grep.c:830 msgid "match patterns only at word boundaries" msgstr "" -#: builtin/grep.c:830 +#: builtin/grep.c:832 msgid "process binary files as text" msgstr "" -#: builtin/grep.c:832 +#: builtin/grep.c:834 msgid "don't match patterns in binary files" msgstr "" -#: builtin/grep.c:835 +#: builtin/grep.c:837 msgid "process binary files with textconv filters" msgstr "" -#: builtin/grep.c:837 +#: builtin/grep.c:839 msgid "search in subdirectories (default)" msgstr "" -#: builtin/grep.c:839 +#: builtin/grep.c:841 msgid "descend at most <depth> levels" msgstr "" -#: builtin/grep.c:843 +#: builtin/grep.c:845 msgid "use extended POSIX regular expressions" msgstr "" -#: builtin/grep.c:846 +#: builtin/grep.c:848 msgid "use basic POSIX regular expressions (default)" msgstr "" -#: builtin/grep.c:849 +#: builtin/grep.c:851 msgid "interpret patterns as fixed strings" msgstr "" -#: builtin/grep.c:852 +#: builtin/grep.c:854 msgid "use Perl-compatible regular expressions" msgstr "" -#: builtin/grep.c:855 +#: builtin/grep.c:857 msgid "show line numbers" msgstr "" -#: builtin/grep.c:856 +#: builtin/grep.c:858 msgid "show column number of first match" msgstr "" -#: builtin/grep.c:857 +#: builtin/grep.c:859 msgid "don't show filenames" msgstr "" -#: builtin/grep.c:858 +#: builtin/grep.c:860 msgid "show filenames" msgstr "" -#: builtin/grep.c:860 +#: builtin/grep.c:862 msgid "show filenames relative to top directory" msgstr "" -#: builtin/grep.c:862 +#: builtin/grep.c:864 msgid "show only filenames instead of matching lines" msgstr "" -#: builtin/grep.c:864 +#: builtin/grep.c:866 msgid "synonym for --files-with-matches" msgstr "" -#: builtin/grep.c:867 +#: builtin/grep.c:869 msgid "show only the names of files without match" msgstr "" -#: builtin/grep.c:869 +#: builtin/grep.c:871 msgid "print NUL after filenames" msgstr "" -#: builtin/grep.c:872 +#: builtin/grep.c:874 msgid "show only matching parts of a line" msgstr "" -#: builtin/grep.c:874 +#: builtin/grep.c:876 msgid "show the number of matches instead of matching lines" msgstr "" -#: builtin/grep.c:875 +#: builtin/grep.c:877 msgid "highlight matches" msgstr "" -#: builtin/grep.c:877 +#: builtin/grep.c:879 msgid "print empty line between matches from different files" msgstr "" -#: builtin/grep.c:879 +#: builtin/grep.c:881 msgid "show filename only once above matches from same file" msgstr "" -#: builtin/grep.c:882 +#: builtin/grep.c:884 msgid "show <n> context lines before and after matches" msgstr "" -#: builtin/grep.c:885 +#: builtin/grep.c:887 msgid "show <n> context lines before matches" msgstr "" -#: builtin/grep.c:887 +#: builtin/grep.c:889 msgid "show <n> context lines after matches" msgstr "" -#: builtin/grep.c:889 +#: builtin/grep.c:891 msgid "use <n> worker threads" msgstr "" -#: builtin/grep.c:890 +#: builtin/grep.c:892 msgid "shortcut for -C NUM" msgstr "" -#: builtin/grep.c:893 +#: builtin/grep.c:895 msgid "show a line with the function name before matches" msgstr "" -#: builtin/grep.c:895 +#: builtin/grep.c:897 msgid "show the surrounding function" msgstr "" -#: builtin/grep.c:898 +#: builtin/grep.c:900 msgid "read patterns from file" msgstr "" -#: builtin/grep.c:900 +#: builtin/grep.c:902 msgid "match <pattern>" msgstr "" -#: builtin/grep.c:902 +#: builtin/grep.c:904 msgid "combine patterns specified with -e" msgstr "" -#: builtin/grep.c:914 +#: builtin/grep.c:916 msgid "indicate hit with exit status without output" msgstr "" -#: builtin/grep.c:916 +#: builtin/grep.c:918 msgid "show only matches from files that match all patterns" msgstr "" -#: builtin/grep.c:918 +#: builtin/grep.c:920 msgid "show parse tree for grep expression" msgstr "" -#: builtin/grep.c:922 +#: builtin/grep.c:924 msgid "pager" msgstr "" -#: builtin/grep.c:922 +#: builtin/grep.c:924 msgid "show matching files in the pager" msgstr "" -#: builtin/grep.c:926 +#: builtin/grep.c:928 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" -#: builtin/grep.c:990 +#: builtin/grep.c:992 msgid "no pattern given" msgstr "" -#: builtin/grep.c:1026 +#: builtin/grep.c:1028 msgid "--no-index or --untracked cannot be used with revs" msgstr "" -#: builtin/grep.c:1034 +#: builtin/grep.c:1036 #, c-format msgid "unable to resolve revision: %s" msgstr "" -#: builtin/grep.c:1065 +#: builtin/grep.c:1067 msgid "invalid option combination, ignoring --threads" msgstr "" -#: builtin/grep.c:1068 builtin/pack-objects.c:3416 +#: builtin/grep.c:1070 builtin/pack-objects.c:3400 msgid "no threads support, ignoring --threads" msgstr "" -#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725 +#: builtin/grep.c:1073 builtin/index-pack.c:1531 builtin/pack-objects.c:2705 #, c-format msgid "invalid number of threads specified (%d)" msgstr "" -#: builtin/grep.c:1094 +#: builtin/grep.c:1096 msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/grep.c:1117 +#: builtin/grep.c:1119 msgid "option not supported with --recurse-submodules" msgstr "" -#: builtin/grep.c:1123 +#: builtin/grep.c:1125 msgid "--cached or --untracked cannot be used with --no-index" msgstr "" -#: builtin/grep.c:1129 +#: builtin/grep.c:1131 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "" -#: builtin/grep.c:1137 +#: builtin/grep.c:1139 msgid "both --cached and trees are given" msgstr "" @@ -13110,7 +13183,7 @@ msgstr "" msgid "Resolving deltas" msgstr "" -#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497 +#: builtin/index-pack.c:1205 builtin/pack-objects.c:2481 #, c-format msgid "unable to create thread: %s" msgstr "" @@ -13175,7 +13248,7 @@ msgstr "" msgid "cannot store index file" msgstr "" -#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736 +#: builtin/index-pack.c:1525 builtin/pack-objects.c:2716 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "" @@ -13450,341 +13523,341 @@ msgstr "" msgid "git show %s: bad file" msgstr "" -#: builtin/log.c:549 builtin/log.c:643 +#: builtin/log.c:549 builtin/log.c:644 #, c-format msgid "could not read object %s" msgstr "" -#: builtin/log.c:668 +#: builtin/log.c:669 #, c-format msgid "unknown type: %d" msgstr "" -#: builtin/log.c:791 +#: builtin/log.c:792 msgid "format.headers without value" msgstr "" -#: builtin/log.c:908 +#: builtin/log.c:909 msgid "name of output directory is too long" msgstr "" -#: builtin/log.c:924 +#: builtin/log.c:925 #, c-format msgid "cannot open patch file %s" msgstr "" -#: builtin/log.c:941 +#: builtin/log.c:942 msgid "need exactly one range" msgstr "" -#: builtin/log.c:951 +#: builtin/log.c:952 msgid "not a range" msgstr "" -#: builtin/log.c:1074 +#: builtin/log.c:1075 msgid "cover letter needs email format" msgstr "" -#: builtin/log.c:1080 +#: builtin/log.c:1081 msgid "failed to create cover-letter file" msgstr "" -#: builtin/log.c:1159 +#: builtin/log.c:1160 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:1186 +#: builtin/log.c:1187 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "" -#: builtin/log.c:1244 +#: builtin/log.c:1245 msgid "two output directories?" msgstr "" -#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113 +#: builtin/log.c:1356 builtin/log.c:2116 builtin/log.c:2118 builtin/log.c:2130 #, c-format msgid "unknown commit %s" msgstr "" -#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1366 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "" -#: builtin/log.c:1370 +#: builtin/log.c:1371 msgid "could not find exact merge base" msgstr "" -#: builtin/log.c:1374 +#: builtin/log.c:1375 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" "Or you could specify base commit by --base=<base-commit-id> manually" msgstr "" -#: builtin/log.c:1394 +#: builtin/log.c:1395 msgid "failed to find exact merge base" msgstr "" -#: builtin/log.c:1405 +#: builtin/log.c:1406 msgid "base commit should be the ancestor of revision list" msgstr "" -#: builtin/log.c:1409 +#: builtin/log.c:1410 msgid "base commit shouldn't be in revision list" msgstr "" -#: builtin/log.c:1462 +#: builtin/log.c:1463 msgid "cannot get patch id" msgstr "" -#: builtin/log.c:1514 +#: builtin/log.c:1515 msgid "failed to infer range-diff ranges" msgstr "" -#: builtin/log.c:1559 +#: builtin/log.c:1560 msgid "use [PATCH n/m] even with a single patch" msgstr "" -#: builtin/log.c:1562 +#: builtin/log.c:1563 msgid "use [PATCH] even with multiple patches" msgstr "" -#: builtin/log.c:1566 +#: builtin/log.c:1567 msgid "print patches to standard out" msgstr "" -#: builtin/log.c:1568 +#: builtin/log.c:1569 msgid "generate a cover letter" msgstr "" -#: builtin/log.c:1570 +#: builtin/log.c:1571 msgid "use simple number sequence for output file names" msgstr "" -#: builtin/log.c:1571 +#: builtin/log.c:1572 msgid "sfx" msgstr "" -#: builtin/log.c:1572 +#: builtin/log.c:1573 msgid "use <sfx> instead of '.patch'" msgstr "" -#: builtin/log.c:1574 +#: builtin/log.c:1575 msgid "start numbering patches at <n> instead of 1" msgstr "" -#: builtin/log.c:1576 +#: builtin/log.c:1577 msgid "mark the series as Nth re-roll" msgstr "" -#: builtin/log.c:1578 +#: builtin/log.c:1579 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "" -#: builtin/log.c:1581 +#: builtin/log.c:1582 msgid "Use [<prefix>] instead of [PATCH]" msgstr "" -#: builtin/log.c:1584 +#: builtin/log.c:1585 msgid "store resulting files in <dir>" msgstr "" -#: builtin/log.c:1587 +#: builtin/log.c:1588 msgid "don't strip/add [PATCH]" msgstr "" -#: builtin/log.c:1590 +#: builtin/log.c:1591 msgid "don't output binary diffs" msgstr "" -#: builtin/log.c:1592 +#: builtin/log.c:1593 msgid "output all-zero hash in From header" msgstr "" -#: builtin/log.c:1594 +#: builtin/log.c:1595 msgid "don't include a patch matching a commit upstream" msgstr "" -#: builtin/log.c:1596 +#: builtin/log.c:1597 msgid "show patch format instead of default (patch + stat)" msgstr "" -#: builtin/log.c:1598 +#: builtin/log.c:1599 msgid "Messaging" msgstr "" -#: builtin/log.c:1599 +#: builtin/log.c:1600 msgid "header" msgstr "" -#: builtin/log.c:1600 +#: builtin/log.c:1601 msgid "add email header" msgstr "" -#: builtin/log.c:1601 builtin/log.c:1603 +#: builtin/log.c:1602 builtin/log.c:1604 msgid "email" msgstr "" -#: builtin/log.c:1601 +#: builtin/log.c:1602 msgid "add To: header" msgstr "" -#: builtin/log.c:1603 +#: builtin/log.c:1604 msgid "add Cc: header" msgstr "" -#: builtin/log.c:1605 +#: builtin/log.c:1606 msgid "ident" msgstr "" -#: builtin/log.c:1606 +#: builtin/log.c:1607 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" -#: builtin/log.c:1608 +#: builtin/log.c:1609 msgid "message-id" msgstr "" -#: builtin/log.c:1609 +#: builtin/log.c:1610 msgid "make first mail a reply to <message-id>" msgstr "" -#: builtin/log.c:1610 builtin/log.c:1613 +#: builtin/log.c:1611 builtin/log.c:1614 msgid "boundary" msgstr "" -#: builtin/log.c:1611 +#: builtin/log.c:1612 msgid "attach the patch" msgstr "" -#: builtin/log.c:1614 +#: builtin/log.c:1615 msgid "inline the patch" msgstr "" -#: builtin/log.c:1618 +#: builtin/log.c:1619 msgid "enable message threading, styles: shallow, deep" msgstr "" -#: builtin/log.c:1620 +#: builtin/log.c:1621 msgid "signature" msgstr "" -#: builtin/log.c:1621 +#: builtin/log.c:1622 msgid "add a signature" msgstr "" -#: builtin/log.c:1622 +#: builtin/log.c:1623 msgid "base-commit" msgstr "" -#: builtin/log.c:1623 +#: builtin/log.c:1624 msgid "add prerequisite tree info to the patch series" msgstr "" -#: builtin/log.c:1625 +#: builtin/log.c:1626 msgid "add a signature from a file" msgstr "" -#: builtin/log.c:1626 +#: builtin/log.c:1627 msgid "don't print the patch filenames" msgstr "" -#: builtin/log.c:1628 +#: builtin/log.c:1629 msgid "show progress while generating patches" msgstr "" -#: builtin/log.c:1630 +#: builtin/log.c:1631 msgid "show changes against <rev> in cover letter or single patch" msgstr "" -#: builtin/log.c:1633 +#: builtin/log.c:1634 msgid "show changes against <refspec> in cover letter or single patch" msgstr "" -#: builtin/log.c:1635 +#: builtin/log.c:1636 msgid "percentage by which creation is weighted" msgstr "" -#: builtin/log.c:1710 +#: builtin/log.c:1711 #, c-format msgid "invalid ident line: %s" msgstr "" -#: builtin/log.c:1725 +#: builtin/log.c:1726 msgid "-n and -k are mutually exclusive" msgstr "" -#: builtin/log.c:1727 +#: builtin/log.c:1728 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "" -#: builtin/log.c:1735 +#: builtin/log.c:1736 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1737 +#: builtin/log.c:1738 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1739 +#: builtin/log.c:1740 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1771 +#: builtin/log.c:1773 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:1860 +#: builtin/log.c:1877 msgid "--interdiff requires --cover-letter or single patch" msgstr "" -#: builtin/log.c:1864 +#: builtin/log.c:1881 msgid "Interdiff:" msgstr "" -#: builtin/log.c:1865 +#: builtin/log.c:1882 #, c-format msgid "Interdiff against v%d:" msgstr "" -#: builtin/log.c:1871 +#: builtin/log.c:1888 msgid "--creation-factor requires --range-diff" msgstr "" -#: builtin/log.c:1875 +#: builtin/log.c:1892 msgid "--range-diff requires --cover-letter or single patch" msgstr "" -#: builtin/log.c:1883 +#: builtin/log.c:1900 msgid "Range-diff:" msgstr "" -#: builtin/log.c:1884 +#: builtin/log.c:1901 #, c-format msgid "Range-diff against v%d:" msgstr "" -#: builtin/log.c:1895 +#: builtin/log.c:1912 #, c-format msgid "unable to read signature file '%s'" msgstr "" -#: builtin/log.c:1931 +#: builtin/log.c:1948 msgid "Generating patches" msgstr "" -#: builtin/log.c:1975 +#: builtin/log.c:1992 msgid "failed to create output files" msgstr "" -#: builtin/log.c:2034 +#: builtin/log.c:2051 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "" -#: builtin/log.c:2088 +#: builtin/log.c:2105 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -13905,7 +13978,7 @@ msgstr "" msgid "do not print remote URL" msgstr "" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1488 msgid "exec" msgstr "" @@ -14014,31 +14087,31 @@ msgstr "" msgid "Available custom strategies are:" msgstr "" -#: builtin/merge.c:244 builtin/pull.c:151 +#: builtin/merge.c:244 builtin/pull.c:152 msgid "do not show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:247 builtin/pull.c:154 +#: builtin/merge.c:247 builtin/pull.c:155 msgid "show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:248 builtin/pull.c:157 +#: builtin/merge.c:248 builtin/pull.c:158 msgid "(synonym to --stat)" msgstr "" -#: builtin/merge.c:250 builtin/pull.c:160 +#: builtin/merge.c:250 builtin/pull.c:161 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" -#: builtin/merge.c:253 builtin/pull.c:166 +#: builtin/merge.c:253 builtin/pull.c:167 msgid "create a single commit instead of doing a merge" msgstr "" -#: builtin/merge.c:255 builtin/pull.c:169 +#: builtin/merge.c:255 builtin/pull.c:170 msgid "perform a commit if the merge succeeds (default)" msgstr "" -#: builtin/merge.c:257 builtin/pull.c:172 +#: builtin/merge.c:257 builtin/pull.c:173 msgid "edit message before committing" msgstr "" @@ -14046,28 +14119,28 @@ msgstr "" msgid "allow fast-forward (default)" msgstr "" -#: builtin/merge.c:261 builtin/pull.c:179 +#: builtin/merge.c:261 builtin/pull.c:180 msgid "abort if fast-forward is not possible" msgstr "" -#: builtin/merge.c:265 builtin/pull.c:182 +#: builtin/merge.c:265 builtin/pull.c:183 msgid "verify that the named commit has a valid GPG signature" msgstr "" -#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186 -#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114 +#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:187 +#: builtin/rebase.c:493 builtin/rebase.c:1501 builtin/revert.c:114 msgid "strategy" msgstr "" -#: builtin/merge.c:267 builtin/pull.c:187 +#: builtin/merge.c:267 builtin/pull.c:188 msgid "merge strategy to use" msgstr "" -#: builtin/merge.c:268 builtin/pull.c:190 +#: builtin/merge.c:268 builtin/pull.c:191 msgid "option=value" msgstr "" -#: builtin/merge.c:269 builtin/pull.c:191 +#: builtin/merge.c:269 builtin/pull.c:192 msgid "option for selected merge strategy" msgstr "" @@ -14087,12 +14160,12 @@ msgstr "" msgid "continue the current in-progress merge" msgstr "" -#: builtin/merge.c:284 builtin/pull.c:198 +#: builtin/merge.c:284 builtin/pull.c:199 msgid "allow merging unrelated histories" msgstr "" #: builtin/merge.c:290 -msgid "verify commit-msg hook" +msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "" #: builtin/merge.c:307 @@ -14136,215 +14209,215 @@ msgstr "" msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" -#: builtin/merge.c:708 +#: builtin/merge.c:705 msgid "Not handling anything other than two heads merge." msgstr "" -#: builtin/merge.c:722 +#: builtin/merge.c:719 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" -#: builtin/merge.c:737 +#: builtin/merge.c:734 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:789 +#: builtin/merge.c:786 #, c-format msgid "Could not read from '%s'" msgstr "" -#: builtin/merge.c:798 +#: builtin/merge.c:795 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -#: builtin/merge.c:804 +#: builtin/merge.c:801 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" "\n" msgstr "" -#: builtin/merge.c:809 +#: builtin/merge.c:806 msgid "An empty message aborts the commit.\n" msgstr "" -#: builtin/merge.c:812 +#: builtin/merge.c:809 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "" -#: builtin/merge.c:853 +#: builtin/merge.c:862 msgid "Empty commit message." msgstr "" -#: builtin/merge.c:872 +#: builtin/merge.c:877 #, c-format msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:933 +#: builtin/merge.c:938 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:972 +#: builtin/merge.c:977 msgid "No current branch." msgstr "" -#: builtin/merge.c:974 +#: builtin/merge.c:979 msgid "No remote for the current branch." msgstr "" -#: builtin/merge.c:976 +#: builtin/merge.c:981 msgid "No default upstream defined for the current branch." msgstr "" -#: builtin/merge.c:981 +#: builtin/merge.c:986 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:1038 +#: builtin/merge.c:1043 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "" -#: builtin/merge.c:1141 +#: builtin/merge.c:1146 #, c-format msgid "not something we can merge in %s: %s" msgstr "" -#: builtin/merge.c:1175 +#: builtin/merge.c:1180 msgid "not something we can merge" msgstr "" -#: builtin/merge.c:1278 +#: builtin/merge.c:1283 msgid "--abort expects no arguments" msgstr "" -#: builtin/merge.c:1282 +#: builtin/merge.c:1287 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1291 +#: builtin/merge.c:1296 msgid "--quit expects no arguments" msgstr "" -#: builtin/merge.c:1304 +#: builtin/merge.c:1309 msgid "--continue expects no arguments" msgstr "" -#: builtin/merge.c:1308 +#: builtin/merge.c:1313 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1324 +#: builtin/merge.c:1329 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1331 +#: builtin/merge.c:1336 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1334 +#: builtin/merge.c:1339 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1348 +#: builtin/merge.c:1353 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1350 +#: builtin/merge.c:1355 msgid "You cannot combine --squash with --commit." msgstr "" -#: builtin/merge.c:1366 +#: builtin/merge.c:1371 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1383 +#: builtin/merge.c:1388 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1385 +#: builtin/merge.c:1390 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1390 +#: builtin/merge.c:1395 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1392 +#: builtin/merge.c:1397 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:1471 +#: builtin/merge.c:1476 msgid "refusing to merge unrelated histories" msgstr "" -#: builtin/merge.c:1480 +#: builtin/merge.c:1485 msgid "Already up to date." msgstr "" -#: builtin/merge.c:1490 +#: builtin/merge.c:1495 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1532 +#: builtin/merge.c:1537 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1539 +#: builtin/merge.c:1544 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1564 +#: builtin/merge.c:1569 msgid "Already up to date. Yeeah!" msgstr "" -#: builtin/merge.c:1570 +#: builtin/merge.c:1575 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1593 builtin/merge.c:1658 +#: builtin/merge.c:1598 builtin/merge.c:1663 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1597 +#: builtin/merge.c:1602 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1649 +#: builtin/merge.c:1654 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1651 +#: builtin/merge.c:1656 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1660 +#: builtin/merge.c:1665 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1672 +#: builtin/merge.c:1677 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -14427,33 +14500,33 @@ msgstr "" msgid "set labels for file1/orig-file/file2" msgstr "" -#: builtin/merge-recursive.c:46 +#: builtin/merge-recursive.c:47 #, c-format msgid "unknown option %s" msgstr "" -#: builtin/merge-recursive.c:52 +#: builtin/merge-recursive.c:53 #, c-format msgid "could not parse object '%s'" msgstr "" -#: builtin/merge-recursive.c:56 +#: builtin/merge-recursive.c:57 #, c-format msgid "cannot handle more than %d base. Ignoring %s." msgid_plural "cannot handle more than %d bases. Ignoring %s." msgstr[0] "" msgstr[1] "" -#: builtin/merge-recursive.c:64 +#: builtin/merge-recursive.c:65 msgid "not handling anything other than two heads merge." msgstr "" -#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72 +#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76 #, c-format msgid "could not resolve ref '%s'" msgstr "" -#: builtin/merge-recursive.c:78 +#: builtin/merge-recursive.c:82 #, c-format msgid "Merging %s with %s\n" msgstr "" @@ -14590,52 +14663,52 @@ msgstr "" msgid "Renaming %s to %s\n" msgstr "" -#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510 +#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:511 #, c-format msgid "renaming '%s' failed" msgstr "" -#: builtin/name-rev.c:352 +#: builtin/name-rev.c:356 msgid "git name-rev [<options>] <commit>..." msgstr "" -#: builtin/name-rev.c:353 +#: builtin/name-rev.c:357 msgid "git name-rev [<options>] --all" msgstr "" -#: builtin/name-rev.c:354 +#: builtin/name-rev.c:358 msgid "git name-rev [<options>] --stdin" msgstr "" -#: builtin/name-rev.c:411 +#: builtin/name-rev.c:415 msgid "print only names (no SHA-1)" msgstr "" -#: builtin/name-rev.c:412 +#: builtin/name-rev.c:416 msgid "only use tags to name the commits" msgstr "" -#: builtin/name-rev.c:414 +#: builtin/name-rev.c:418 msgid "only use refs matching <pattern>" msgstr "" -#: builtin/name-rev.c:416 +#: builtin/name-rev.c:420 msgid "ignore refs matching <pattern>" msgstr "" -#: builtin/name-rev.c:418 +#: builtin/name-rev.c:422 msgid "list all commits reachable from all refs" msgstr "" -#: builtin/name-rev.c:419 +#: builtin/name-rev.c:423 msgid "read from stdin" msgstr "" -#: builtin/name-rev.c:420 +#: builtin/name-rev.c:424 msgid "allow to print `undefined` names (default)" msgstr "" -#: builtin/name-rev.c:426 +#: builtin/name-rev.c:430 msgid "dereference tags in the input (internal use)" msgstr "" @@ -15014,7 +15087,7 @@ msgstr "" msgid "read object names from the standard input" msgstr "" -#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165 +#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164 msgid "do not remove, show only" msgstr "" @@ -15030,7 +15103,7 @@ msgstr "" msgid "use notes from <notes-ref>" msgstr "" -#: builtin/notes.c:1034 builtin/stash.c:1598 +#: builtin/notes.c:1034 builtin/stash.c:1607 #, c-format msgid "unknown subcommand: %s" msgstr "" @@ -15101,317 +15174,317 @@ msgstr "" msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "" -#: builtin/pack-objects.c:1166 +#: builtin/pack-objects.c:1164 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" -#: builtin/pack-objects.c:1597 +#: builtin/pack-objects.c:1592 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "" -#: builtin/pack-objects.c:1606 +#: builtin/pack-objects.c:1601 #, c-format msgid "delta base offset out of bound for %s" msgstr "" -#: builtin/pack-objects.c:1875 +#: builtin/pack-objects.c:1870 msgid "Counting objects" msgstr "" -#: builtin/pack-objects.c:2005 +#: builtin/pack-objects.c:2000 #, c-format msgid "unable to get size of %s" msgstr "" -#: builtin/pack-objects.c:2020 +#: builtin/pack-objects.c:2015 #, c-format msgid "unable to parse object header of %s" msgstr "" -#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106 -#: builtin/pack-objects.c:2116 +#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2101 +#: builtin/pack-objects.c:2111 #, c-format msgid "object %s cannot be read" msgstr "" -#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120 +#: builtin/pack-objects.c:2088 builtin/pack-objects.c:2115 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "" -#: builtin/pack-objects.c:2130 +#: builtin/pack-objects.c:2125 msgid "suboptimal pack - out of memory" msgstr "" -#: builtin/pack-objects.c:2456 +#: builtin/pack-objects.c:2440 #, c-format msgid "Delta compression using up to %d threads" msgstr "" -#: builtin/pack-objects.c:2588 +#: builtin/pack-objects.c:2572 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2659 msgid "Compressing objects" msgstr "" -#: builtin/pack-objects.c:2681 +#: builtin/pack-objects.c:2665 msgid "inconsistency with delta count" msgstr "" -#: builtin/pack-objects.c:2762 +#: builtin/pack-objects.c:2742 #, c-format msgid "" "expected edge object ID, got garbage:\n" " %s" msgstr "" -#: builtin/pack-objects.c:2768 +#: builtin/pack-objects.c:2748 #, c-format msgid "" "expected object ID, got garbage:\n" " %s" msgstr "" -#: builtin/pack-objects.c:2866 +#: builtin/pack-objects.c:2846 msgid "invalid value for --missing" msgstr "" -#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033 +#: builtin/pack-objects.c:2905 builtin/pack-objects.c:3013 msgid "cannot open pack index" msgstr "" -#: builtin/pack-objects.c:2956 +#: builtin/pack-objects.c:2936 #, c-format msgid "loose object at %s could not be examined" msgstr "" -#: builtin/pack-objects.c:3041 +#: builtin/pack-objects.c:3021 msgid "unable to force loose object" msgstr "" -#: builtin/pack-objects.c:3133 +#: builtin/pack-objects.c:3113 #, c-format msgid "not a rev '%s'" msgstr "" -#: builtin/pack-objects.c:3136 +#: builtin/pack-objects.c:3116 #, c-format msgid "bad revision '%s'" msgstr "" -#: builtin/pack-objects.c:3161 +#: builtin/pack-objects.c:3141 msgid "unable to add recent objects" msgstr "" -#: builtin/pack-objects.c:3214 +#: builtin/pack-objects.c:3194 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:3218 +#: builtin/pack-objects.c:3198 #, c-format msgid "bad index version '%s'" msgstr "" -#: builtin/pack-objects.c:3248 +#: builtin/pack-objects.c:3228 msgid "do not show progress meter" msgstr "" -#: builtin/pack-objects.c:3250 +#: builtin/pack-objects.c:3230 msgid "show progress meter" msgstr "" -#: builtin/pack-objects.c:3252 +#: builtin/pack-objects.c:3232 msgid "show progress meter during object writing phase" msgstr "" -#: builtin/pack-objects.c:3255 +#: builtin/pack-objects.c:3235 msgid "similar to --all-progress when progress meter is shown" msgstr "" -#: builtin/pack-objects.c:3256 +#: builtin/pack-objects.c:3236 msgid "<version>[,<offset>]" msgstr "" -#: builtin/pack-objects.c:3257 +#: builtin/pack-objects.c:3237 msgid "write the pack index file in the specified idx format version" msgstr "" -#: builtin/pack-objects.c:3260 +#: builtin/pack-objects.c:3240 msgid "maximum size of each output pack file" msgstr "" -#: builtin/pack-objects.c:3262 +#: builtin/pack-objects.c:3242 msgid "ignore borrowed objects from alternate object store" msgstr "" -#: builtin/pack-objects.c:3264 +#: builtin/pack-objects.c:3244 msgid "ignore packed objects" msgstr "" -#: builtin/pack-objects.c:3266 +#: builtin/pack-objects.c:3246 msgid "limit pack window by objects" msgstr "" -#: builtin/pack-objects.c:3268 +#: builtin/pack-objects.c:3248 msgid "limit pack window by memory in addition to object limit" msgstr "" -#: builtin/pack-objects.c:3270 +#: builtin/pack-objects.c:3250 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" -#: builtin/pack-objects.c:3272 +#: builtin/pack-objects.c:3252 msgid "reuse existing deltas" msgstr "" -#: builtin/pack-objects.c:3274 +#: builtin/pack-objects.c:3254 msgid "reuse existing objects" msgstr "" -#: builtin/pack-objects.c:3276 +#: builtin/pack-objects.c:3256 msgid "use OFS_DELTA objects" msgstr "" -#: builtin/pack-objects.c:3278 +#: builtin/pack-objects.c:3258 msgid "use threads when searching for best delta matches" msgstr "" -#: builtin/pack-objects.c:3280 +#: builtin/pack-objects.c:3260 msgid "do not create an empty pack output" msgstr "" -#: builtin/pack-objects.c:3282 +#: builtin/pack-objects.c:3262 msgid "read revision arguments from standard input" msgstr "" -#: builtin/pack-objects.c:3284 +#: builtin/pack-objects.c:3264 msgid "limit the objects to those that are not yet packed" msgstr "" -#: builtin/pack-objects.c:3287 +#: builtin/pack-objects.c:3267 msgid "include objects reachable from any reference" msgstr "" -#: builtin/pack-objects.c:3290 +#: builtin/pack-objects.c:3270 msgid "include objects referred by reflog entries" msgstr "" -#: builtin/pack-objects.c:3293 +#: builtin/pack-objects.c:3273 msgid "include objects referred to by the index" msgstr "" -#: builtin/pack-objects.c:3296 +#: builtin/pack-objects.c:3276 msgid "output pack to stdout" msgstr "" -#: builtin/pack-objects.c:3298 +#: builtin/pack-objects.c:3278 msgid "include tag objects that refer to objects to be packed" msgstr "" -#: builtin/pack-objects.c:3300 +#: builtin/pack-objects.c:3280 msgid "keep unreachable objects" msgstr "" -#: builtin/pack-objects.c:3302 +#: builtin/pack-objects.c:3282 msgid "pack loose unreachable objects" msgstr "" -#: builtin/pack-objects.c:3304 +#: builtin/pack-objects.c:3284 msgid "unpack unreachable objects newer than <time>" msgstr "" -#: builtin/pack-objects.c:3307 +#: builtin/pack-objects.c:3287 msgid "use the sparse reachability algorithm" msgstr "" -#: builtin/pack-objects.c:3309 +#: builtin/pack-objects.c:3289 msgid "create thin packs" msgstr "" -#: builtin/pack-objects.c:3311 +#: builtin/pack-objects.c:3291 msgid "create packs suitable for shallow fetches" msgstr "" -#: builtin/pack-objects.c:3313 +#: builtin/pack-objects.c:3293 msgid "ignore packs that have companion .keep file" msgstr "" -#: builtin/pack-objects.c:3315 +#: builtin/pack-objects.c:3295 msgid "ignore this pack" msgstr "" -#: builtin/pack-objects.c:3317 +#: builtin/pack-objects.c:3297 msgid "pack compression level" msgstr "" -#: builtin/pack-objects.c:3319 +#: builtin/pack-objects.c:3299 msgid "do not hide commits by grafts" msgstr "" -#: builtin/pack-objects.c:3321 +#: builtin/pack-objects.c:3301 msgid "use a bitmap index if available to speed up counting objects" msgstr "" -#: builtin/pack-objects.c:3323 +#: builtin/pack-objects.c:3303 msgid "write a bitmap index together with the pack index" msgstr "" -#: builtin/pack-objects.c:3327 +#: builtin/pack-objects.c:3307 msgid "write a bitmap index if possible" msgstr "" -#: builtin/pack-objects.c:3331 +#: builtin/pack-objects.c:3311 msgid "handling for missing objects" msgstr "" -#: builtin/pack-objects.c:3334 +#: builtin/pack-objects.c:3314 msgid "do not pack objects in promisor packfiles" msgstr "" -#: builtin/pack-objects.c:3336 +#: builtin/pack-objects.c:3316 msgid "respect islands during delta compression" msgstr "" -#: builtin/pack-objects.c:3361 +#: builtin/pack-objects.c:3345 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "" -#: builtin/pack-objects.c:3366 +#: builtin/pack-objects.c:3350 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "" -#: builtin/pack-objects.c:3420 +#: builtin/pack-objects.c:3404 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" -#: builtin/pack-objects.c:3422 +#: builtin/pack-objects.c:3406 msgid "minimum pack size limit is 1 MiB" msgstr "" -#: builtin/pack-objects.c:3427 +#: builtin/pack-objects.c:3411 msgid "--thin cannot be used to build an indexable pack" msgstr "" -#: builtin/pack-objects.c:3430 +#: builtin/pack-objects.c:3414 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "" -#: builtin/pack-objects.c:3436 +#: builtin/pack-objects.c:3420 msgid "cannot use --filter without --stdout" msgstr "" -#: builtin/pack-objects.c:3497 +#: builtin/pack-objects.c:3481 msgid "Enumerating objects" msgstr "" -#: builtin/pack-objects.c:3527 +#: builtin/pack-objects.c:3511 #, c-format msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" msgstr "" @@ -15465,61 +15538,61 @@ msgstr "" msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "" -#: builtin/pull.c:141 +#: builtin/pull.c:142 msgid "control for recursive fetching of submodules" msgstr "" -#: builtin/pull.c:145 +#: builtin/pull.c:146 msgid "Options related to merging" msgstr "" -#: builtin/pull.c:148 +#: builtin/pull.c:149 msgid "incorporate changes by rebasing rather than merging" msgstr "" -#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126 +#: builtin/pull.c:177 builtin/rebase.c:448 builtin/revert.c:126 msgid "allow fast-forward" msgstr "" -#: builtin/pull.c:185 +#: builtin/pull.c:186 msgid "automatically stash/stash pop before and after rebase" msgstr "" -#: builtin/pull.c:201 +#: builtin/pull.c:202 msgid "Options related to fetching" msgstr "" -#: builtin/pull.c:211 +#: builtin/pull.c:212 msgid "force overwrite of local branch" msgstr "" -#: builtin/pull.c:219 +#: builtin/pull.c:220 msgid "number of submodules pulled in parallel" msgstr "" -#: builtin/pull.c:316 +#: builtin/pull.c:320 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "" -#: builtin/pull.c:433 +#: builtin/pull.c:437 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "" -#: builtin/pull.c:435 +#: builtin/pull.c:439 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" -#: builtin/pull.c:436 +#: builtin/pull.c:440 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "" -#: builtin/pull.c:439 +#: builtin/pull.c:443 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -15527,74 +15600,74 @@ msgid "" "for your current branch, you must specify a branch on the command line." msgstr "" -#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73 +#: builtin/pull.c:448 builtin/rebase.c:1347 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "" -#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79 +#: builtin/pull.c:450 builtin/pull.c:465 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "" -#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82 +#: builtin/pull.c:452 builtin/pull.c:467 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "" -#: builtin/pull.c:449 builtin/pull.c:464 +#: builtin/pull.c:453 builtin/pull.c:468 msgid "See git-pull(1) for details." msgstr "" -#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466 -#: builtin/rebase.c:1332 git-parse-remote.sh:64 +#: builtin/pull.c:455 builtin/pull.c:461 builtin/pull.c:470 +#: builtin/rebase.c:1353 git-parse-remote.sh:64 msgid "<remote>" msgstr "" -#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471 +#: builtin/pull.c:455 builtin/pull.c:470 builtin/pull.c:475 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "" -#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75 +#: builtin/pull.c:463 builtin/rebase.c:1345 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "" -#: builtin/pull.c:468 git-parse-remote.sh:95 +#: builtin/pull.c:472 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" -#: builtin/pull.c:473 +#: builtin/pull.c:477 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" "from the remote, but no such ref was fetched." msgstr "" -#: builtin/pull.c:581 +#: builtin/pull.c:587 #, c-format msgid "unable to access commit %s" msgstr "" -#: builtin/pull.c:861 +#: builtin/pull.c:867 msgid "ignoring --verify-signatures for rebase" msgstr "" -#: builtin/pull.c:916 +#: builtin/pull.c:922 msgid "--[no-]autostash option is only valid with --rebase." msgstr "" -#: builtin/pull.c:924 +#: builtin/pull.c:930 msgid "Updating an unborn branch with changes added to the index." msgstr "" -#: builtin/pull.c:928 +#: builtin/pull.c:934 msgid "pull with rebase" msgstr "" -#: builtin/pull.c:929 +#: builtin/pull.c:935 msgid "please commit or stash them." msgstr "" -#: builtin/pull.c:954 +#: builtin/pull.c:960 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -15602,7 +15675,7 @@ msgid "" "commit %s." msgstr "" -#: builtin/pull.c:960 +#: builtin/pull.c:966 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -15613,15 +15686,15 @@ msgid "" "to recover." msgstr "" -#: builtin/pull.c:975 +#: builtin/pull.c:981 msgid "Cannot merge multiple branches into empty head." msgstr "" -#: builtin/pull.c:979 +#: builtin/pull.c:985 msgid "Cannot rebase onto multiple branches." msgstr "" -#: builtin/pull.c:986 +#: builtin/pull.c:992 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" @@ -15736,127 +15809,127 @@ msgstr "" msgid "Pushing to %s\n" msgstr "" -#: builtin/push.c:364 +#: builtin/push.c:366 #, c-format msgid "failed to push some refs to '%s'" msgstr "" -#: builtin/push.c:398 -#, c-format -msgid "bad repository '%s'" -msgstr "" - -#: builtin/push.c:399 -msgid "" -"No configured push destination.\n" -"Either specify the URL from the command-line or configure a remote " -"repository using\n" -"\n" -" git remote add <name> <url>\n" -"\n" -"and then push using the remote name\n" -"\n" -" git push <name>\n" -msgstr "" - -#: builtin/push.c:554 +#: builtin/push.c:541 msgid "repository" msgstr "" -#: builtin/push.c:555 builtin/send-pack.c:164 +#: builtin/push.c:542 builtin/send-pack.c:164 msgid "push all refs" msgstr "" -#: builtin/push.c:556 builtin/send-pack.c:166 +#: builtin/push.c:543 builtin/send-pack.c:166 msgid "mirror all refs" msgstr "" -#: builtin/push.c:558 +#: builtin/push.c:545 msgid "delete refs" msgstr "" -#: builtin/push.c:559 +#: builtin/push.c:546 msgid "push tags (can't be used with --all or --mirror)" msgstr "" -#: builtin/push.c:562 builtin/send-pack.c:167 +#: builtin/push.c:549 builtin/send-pack.c:167 msgid "force updates" msgstr "" -#: builtin/push.c:564 builtin/send-pack.c:181 +#: builtin/push.c:551 builtin/send-pack.c:181 msgid "<refname>:<expect>" msgstr "" -#: builtin/push.c:565 builtin/send-pack.c:182 +#: builtin/push.c:552 builtin/send-pack.c:182 msgid "require old value of ref to be at this value" msgstr "" -#: builtin/push.c:568 +#: builtin/push.c:555 msgid "control recursive pushing of submodules" msgstr "" -#: builtin/push.c:570 builtin/send-pack.c:175 +#: builtin/push.c:557 builtin/send-pack.c:175 msgid "use thin pack" msgstr "" -#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161 +#: builtin/push.c:558 builtin/push.c:559 builtin/send-pack.c:161 #: builtin/send-pack.c:162 msgid "receive pack program" msgstr "" -#: builtin/push.c:573 +#: builtin/push.c:560 msgid "set upstream for git pull/status" msgstr "" -#: builtin/push.c:576 +#: builtin/push.c:563 msgid "prune locally removed refs" msgstr "" -#: builtin/push.c:578 +#: builtin/push.c:565 msgid "bypass pre-push hook" msgstr "" -#: builtin/push.c:579 +#: builtin/push.c:566 msgid "push missing but relevant tags" msgstr "" -#: builtin/push.c:582 builtin/send-pack.c:169 +#: builtin/push.c:569 builtin/send-pack.c:169 msgid "GPG sign the push" msgstr "" -#: builtin/push.c:584 builtin/send-pack.c:176 +#: builtin/push.c:571 builtin/send-pack.c:176 msgid "request atomic transaction on remote side" msgstr "" -#: builtin/push.c:602 +#: builtin/push.c:589 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" -#: builtin/push.c:604 +#: builtin/push.c:591 msgid "--delete doesn't make sense without any refs" msgstr "" -#: builtin/push.c:607 +#: builtin/push.c:611 +#, c-format +msgid "bad repository '%s'" +msgstr "" + +#: builtin/push.c:612 +msgid "" +"No configured push destination.\n" +"Either specify the URL from the command-line or configure a remote " +"repository using\n" +"\n" +" git remote add <name> <url>\n" +"\n" +"and then push using the remote name\n" +"\n" +" git push <name>\n" +msgstr "" + +#: builtin/push.c:627 msgid "--all and --tags are incompatible" msgstr "" -#: builtin/push.c:609 +#: builtin/push.c:629 msgid "--all can't be combined with refspecs" msgstr "" -#: builtin/push.c:613 +#: builtin/push.c:633 msgid "--mirror and --tags are incompatible" msgstr "" -#: builtin/push.c:615 +#: builtin/push.c:635 msgid "--mirror can't be combined with refspecs" msgstr "" -#: builtin/push.c:618 +#: builtin/push.c:638 msgid "--all and --mirror are incompatible" msgstr "" -#: builtin/push.c:637 +#: builtin/push.c:642 msgid "push options must not have new line characters" msgstr "" @@ -15970,8 +16043,8 @@ msgstr "" #: builtin/rebase.c:32 msgid "" -"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] " -"[<branch>]" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " +"[<upstream> [<branch>]]" msgstr "" #: builtin/rebase.c:34 @@ -16010,189 +16083,189 @@ msgstr "" msgid "could not generate todo list" msgstr "" -#: builtin/rebase.c:382 +#: builtin/rebase.c:383 msgid "a base commit must be provided with --upstream or --onto" msgstr "" -#: builtin/rebase.c:437 +#: builtin/rebase.c:438 msgid "git rebase--interactive [<options>]" msgstr "" -#: builtin/rebase.c:449 +#: builtin/rebase.c:450 msgid "keep empty commits" msgstr "" -#: builtin/rebase.c:451 builtin/revert.c:128 +#: builtin/rebase.c:452 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "" -#: builtin/rebase.c:452 +#: builtin/rebase.c:453 msgid "rebase merge commits" msgstr "" -#: builtin/rebase.c:454 +#: builtin/rebase.c:455 msgid "keep original branch points of cousins" msgstr "" -#: builtin/rebase.c:456 +#: builtin/rebase.c:457 msgid "move commits that begin with squash!/fixup!" msgstr "" -#: builtin/rebase.c:457 +#: builtin/rebase.c:458 msgid "sign commits" msgstr "" -#: builtin/rebase.c:459 builtin/rebase.c:1403 +#: builtin/rebase.c:460 builtin/rebase.c:1427 msgid "display a diffstat of what changed upstream" msgstr "" -#: builtin/rebase.c:461 +#: builtin/rebase.c:462 msgid "continue rebase" msgstr "" -#: builtin/rebase.c:463 +#: builtin/rebase.c:464 msgid "skip commit" msgstr "" -#: builtin/rebase.c:464 +#: builtin/rebase.c:465 msgid "edit the todo list" msgstr "" -#: builtin/rebase.c:466 +#: builtin/rebase.c:467 msgid "show the current patch" msgstr "" -#: builtin/rebase.c:469 +#: builtin/rebase.c:470 msgid "shorten commit ids in the todo list" msgstr "" -#: builtin/rebase.c:471 +#: builtin/rebase.c:472 msgid "expand commit ids in the todo list" msgstr "" -#: builtin/rebase.c:473 +#: builtin/rebase.c:474 msgid "check the todo list" msgstr "" -#: builtin/rebase.c:475 +#: builtin/rebase.c:476 msgid "rearrange fixup/squash lines" msgstr "" -#: builtin/rebase.c:477 +#: builtin/rebase.c:478 msgid "insert exec commands in todo list" msgstr "" -#: builtin/rebase.c:478 +#: builtin/rebase.c:479 msgid "onto" msgstr "" -#: builtin/rebase.c:481 +#: builtin/rebase.c:482 msgid "restrict-revision" msgstr "" -#: builtin/rebase.c:481 +#: builtin/rebase.c:482 msgid "restrict revision" msgstr "" -#: builtin/rebase.c:483 +#: builtin/rebase.c:484 msgid "squash-onto" msgstr "" -#: builtin/rebase.c:484 +#: builtin/rebase.c:485 msgid "squash onto" msgstr "" -#: builtin/rebase.c:486 +#: builtin/rebase.c:487 msgid "the upstream commit" msgstr "" -#: builtin/rebase.c:488 +#: builtin/rebase.c:489 msgid "head-name" msgstr "" -#: builtin/rebase.c:488 +#: builtin/rebase.c:489 msgid "head name" msgstr "" -#: builtin/rebase.c:493 +#: builtin/rebase.c:494 msgid "rebase strategy" msgstr "" -#: builtin/rebase.c:494 +#: builtin/rebase.c:495 msgid "strategy-opts" msgstr "" -#: builtin/rebase.c:495 +#: builtin/rebase.c:496 msgid "strategy options" msgstr "" -#: builtin/rebase.c:496 +#: builtin/rebase.c:497 msgid "switch-to" msgstr "" -#: builtin/rebase.c:497 +#: builtin/rebase.c:498 msgid "the branch or commit to checkout" msgstr "" -#: builtin/rebase.c:498 +#: builtin/rebase.c:499 msgid "onto-name" msgstr "" -#: builtin/rebase.c:498 +#: builtin/rebase.c:499 msgid "onto name" msgstr "" -#: builtin/rebase.c:499 +#: builtin/rebase.c:500 msgid "cmd" msgstr "" -#: builtin/rebase.c:499 +#: builtin/rebase.c:500 msgid "the command to run" msgstr "" -#: builtin/rebase.c:502 builtin/rebase.c:1486 +#: builtin/rebase.c:503 builtin/rebase.c:1510 msgid "automatically re-schedule any `exec` that fails" msgstr "" -#: builtin/rebase.c:518 +#: builtin/rebase.c:519 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "" -#: builtin/rebase.c:534 +#: builtin/rebase.c:535 #, c-format msgid "%s requires an interactive rebase" msgstr "" -#: builtin/rebase.c:586 +#: builtin/rebase.c:587 #, c-format msgid "could not get 'onto': '%s'" msgstr "" -#: builtin/rebase.c:601 +#: builtin/rebase.c:602 #, c-format msgid "invalid orig-head: '%s'" msgstr "" -#: builtin/rebase.c:626 +#: builtin/rebase.c:627 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "" -#: builtin/rebase.c:702 +#: builtin/rebase.c:703 #, c-format msgid "Could not read '%s'" msgstr "" -#: builtin/rebase.c:720 +#: builtin/rebase.c:721 #, c-format msgid "Cannot store %s" msgstr "" -#: builtin/rebase.c:827 +#: builtin/rebase.c:828 msgid "could not determine HEAD revision" msgstr "" -#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:951 git-rebase--preserve-merges.sh:81 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -16201,7 +16274,7 @@ msgid "" "abort\"." msgstr "" -#: builtin/rebase.c:1031 +#: builtin/rebase.c:1032 #, c-format msgid "" "\n" @@ -16213,7 +16286,7 @@ msgid "" "As a result, git cannot rebase them." msgstr "" -#: builtin/rebase.c:1318 +#: builtin/rebase.c:1339 #, c-format msgid "" "%s\n" @@ -16224,7 +16297,7 @@ msgid "" "\n" msgstr "" -#: builtin/rebase.c:1334 +#: builtin/rebase.c:1355 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -16233,169 +16306,181 @@ msgid "" "\n" msgstr "" -#: builtin/rebase.c:1364 +#: builtin/rebase.c:1385 msgid "exec commands cannot contain newlines" msgstr "" -#: builtin/rebase.c:1368 +#: builtin/rebase.c:1389 msgid "empty exec command" msgstr "" -#: builtin/rebase.c:1396 +#: builtin/rebase.c:1418 msgid "rebase onto given branch instead of upstream" msgstr "" -#: builtin/rebase.c:1398 +#: builtin/rebase.c:1420 +msgid "use the merge-base of upstream and branch as the current base" +msgstr "" + +#: builtin/rebase.c:1422 msgid "allow pre-rebase hook to run" msgstr "" -#: builtin/rebase.c:1400 +#: builtin/rebase.c:1424 msgid "be quiet. implies --no-stat" msgstr "" -#: builtin/rebase.c:1406 +#: builtin/rebase.c:1430 msgid "do not show diffstat of what changed upstream" msgstr "" -#: builtin/rebase.c:1409 +#: builtin/rebase.c:1433 msgid "add a Signed-off-by: line to each commit" msgstr "" -#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417 +#: builtin/rebase.c:1435 builtin/rebase.c:1439 builtin/rebase.c:1441 msgid "passed to 'git am'" msgstr "" -#: builtin/rebase.c:1419 builtin/rebase.c:1421 +#: builtin/rebase.c:1443 builtin/rebase.c:1445 msgid "passed to 'git apply'" msgstr "" -#: builtin/rebase.c:1423 builtin/rebase.c:1426 +#: builtin/rebase.c:1447 builtin/rebase.c:1450 msgid "cherry-pick all commits, even if unchanged" msgstr "" -#: builtin/rebase.c:1428 +#: builtin/rebase.c:1452 msgid "continue" msgstr "" -#: builtin/rebase.c:1431 +#: builtin/rebase.c:1455 msgid "skip current patch and continue" msgstr "" -#: builtin/rebase.c:1433 +#: builtin/rebase.c:1457 msgid "abort and check out the original branch" msgstr "" -#: builtin/rebase.c:1436 +#: builtin/rebase.c:1460 msgid "abort but keep HEAD where it is" msgstr "" -#: builtin/rebase.c:1437 +#: builtin/rebase.c:1461 msgid "edit the todo list during an interactive rebase" msgstr "" -#: builtin/rebase.c:1440 +#: builtin/rebase.c:1464 msgid "show the patch file being applied or merged" msgstr "" -#: builtin/rebase.c:1443 +#: builtin/rebase.c:1467 msgid "use merging strategies to rebase" msgstr "" -#: builtin/rebase.c:1447 +#: builtin/rebase.c:1471 msgid "let the user edit the list of commits to rebase" msgstr "" -#: builtin/rebase.c:1451 +#: builtin/rebase.c:1475 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "" -#: builtin/rebase.c:1455 +#: builtin/rebase.c:1479 msgid "preserve empty commits during rebase" msgstr "" -#: builtin/rebase.c:1457 +#: builtin/rebase.c:1481 msgid "move commits that begin with squash!/fixup! under -i" msgstr "" -#: builtin/rebase.c:1463 +#: builtin/rebase.c:1487 msgid "automatically stash/stash pop before and after" msgstr "" -#: builtin/rebase.c:1465 +#: builtin/rebase.c:1489 msgid "add exec lines after each commit of the editable list" msgstr "" -#: builtin/rebase.c:1469 +#: builtin/rebase.c:1493 msgid "allow rebasing commits with empty messages" msgstr "" -#: builtin/rebase.c:1472 +#: builtin/rebase.c:1496 msgid "try to rebase merges instead of skipping them" msgstr "" -#: builtin/rebase.c:1475 +#: builtin/rebase.c:1499 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "" -#: builtin/rebase.c:1477 +#: builtin/rebase.c:1501 msgid "use the given merge strategy" msgstr "" -#: builtin/rebase.c:1479 builtin/revert.c:115 +#: builtin/rebase.c:1503 builtin/revert.c:115 msgid "option" msgstr "" -#: builtin/rebase.c:1480 +#: builtin/rebase.c:1504 msgid "pass the argument through to the merge strategy" msgstr "" -#: builtin/rebase.c:1483 +#: builtin/rebase.c:1507 msgid "rebase all reachable commits up to the root(s)" msgstr "" -#: builtin/rebase.c:1500 +#: builtin/rebase.c:1524 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." msgstr "" -#: builtin/rebase.c:1506 +#: builtin/rebase.c:1530 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "" -#: builtin/rebase.c:1547 +#: builtin/rebase.c:1571 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "" -#: builtin/rebase.c:1551 +#: builtin/rebase.c:1576 +msgid "cannot combine '--keep-base' with '--onto'" +msgstr "" + +#: builtin/rebase.c:1578 +msgid "cannot combine '--keep-base' with '--root'" +msgstr "" + +#: builtin/rebase.c:1582 msgid "No rebase in progress?" msgstr "" -#: builtin/rebase.c:1555 +#: builtin/rebase.c:1586 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" -#: builtin/rebase.c:1578 +#: builtin/rebase.c:1609 msgid "Cannot read HEAD" msgstr "" -#: builtin/rebase.c:1590 +#: builtin/rebase.c:1621 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" msgstr "" -#: builtin/rebase.c:1609 +#: builtin/rebase.c:1640 msgid "could not discard worktree changes" msgstr "" -#: builtin/rebase.c:1628 +#: builtin/rebase.c:1659 #, c-format msgid "could not move back to %s" msgstr "" -#: builtin/rebase.c:1673 +#: builtin/rebase.c:1704 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -16408,162 +16493,154 @@ msgid "" "valuable there.\n" msgstr "" -#: builtin/rebase.c:1694 +#: builtin/rebase.c:1725 msgid "switch `C' expects a numerical value" msgstr "" -#: builtin/rebase.c:1735 +#: builtin/rebase.c:1766 #, c-format msgid "Unknown mode: %s" msgstr "" -#: builtin/rebase.c:1757 +#: builtin/rebase.c:1788 msgid "--strategy requires --merge or --interactive" msgstr "" -#: builtin/rebase.c:1797 +#: builtin/rebase.c:1828 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "" -#: builtin/rebase.c:1809 +#: builtin/rebase.c:1840 msgid "cannot combine am options with either interactive or merge options" msgstr "" -#: builtin/rebase.c:1828 +#: builtin/rebase.c:1859 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "" -#: builtin/rebase.c:1832 +#: builtin/rebase.c:1863 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" -#: builtin/rebase.c:1838 -msgid "cannot combine '--rebase-merges' with '--strategy-option'" -msgstr "" - -#: builtin/rebase.c:1841 -msgid "cannot combine '--rebase-merges' with '--strategy'" -msgstr "" - -#: builtin/rebase.c:1865 +#: builtin/rebase.c:1887 #, c-format msgid "invalid upstream '%s'" msgstr "" -#: builtin/rebase.c:1871 +#: builtin/rebase.c:1893 msgid "Could not create new root commit" msgstr "" -#: builtin/rebase.c:1889 +#: builtin/rebase.c:1919 +#, c-format +msgid "'%s': need exactly one merge base with branch" +msgstr "" + +#: builtin/rebase.c:1922 #, c-format msgid "'%s': need exactly one merge base" msgstr "" -#: builtin/rebase.c:1896 +#: builtin/rebase.c:1930 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "" -#: builtin/rebase.c:1921 +#: builtin/rebase.c:1955 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "" -#: builtin/rebase.c:1929 builtin/submodule--helper.c:38 +#: builtin/rebase.c:1963 builtin/submodule--helper.c:38 #: builtin/submodule--helper.c:1934 #, c-format msgid "No such ref: %s" msgstr "" -#: builtin/rebase.c:1940 +#: builtin/rebase.c:1974 msgid "Could not resolve HEAD to a revision" msgstr "" -#: builtin/rebase.c:1981 +#: builtin/rebase.c:2012 msgid "Cannot autostash" msgstr "" -#: builtin/rebase.c:1984 +#: builtin/rebase.c:2015 #, c-format msgid "Unexpected stash response: '%s'" msgstr "" -#: builtin/rebase.c:1990 +#: builtin/rebase.c:2021 #, c-format msgid "Could not create directory for '%s'" msgstr "" -#: builtin/rebase.c:1993 +#: builtin/rebase.c:2024 #, c-format msgid "Created autostash: %s\n" msgstr "" -#: builtin/rebase.c:1996 +#: builtin/rebase.c:2027 msgid "could not reset --hard" msgstr "" -#: builtin/rebase.c:1997 builtin/reset.c:114 -#, c-format -msgid "HEAD is now at %s" -msgstr "" - -#: builtin/rebase.c:2013 +#: builtin/rebase.c:2036 msgid "Please commit or stash them." msgstr "" -#: builtin/rebase.c:2040 +#: builtin/rebase.c:2063 #, c-format msgid "could not parse '%s'" msgstr "" -#: builtin/rebase.c:2053 +#: builtin/rebase.c:2076 #, c-format msgid "could not switch to %s" msgstr "" -#: builtin/rebase.c:2064 +#: builtin/rebase.c:2087 msgid "HEAD is up to date." msgstr "" -#: builtin/rebase.c:2066 +#: builtin/rebase.c:2089 #, c-format msgid "Current branch %s is up to date.\n" msgstr "" -#: builtin/rebase.c:2074 +#: builtin/rebase.c:2097 msgid "HEAD is up to date, rebase forced." msgstr "" -#: builtin/rebase.c:2076 +#: builtin/rebase.c:2099 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "" -#: builtin/rebase.c:2084 +#: builtin/rebase.c:2107 msgid "The pre-rebase hook refused to rebase." msgstr "" -#: builtin/rebase.c:2091 +#: builtin/rebase.c:2114 #, c-format msgid "Changes to %s:\n" msgstr "" -#: builtin/rebase.c:2094 +#: builtin/rebase.c:2117 #, c-format msgid "Changes from %s to %s:\n" msgstr "" -#: builtin/rebase.c:2119 +#: builtin/rebase.c:2142 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" -#: builtin/rebase.c:2128 +#: builtin/rebase.c:2151 msgid "Could not detach HEAD" msgstr "" -#: builtin/rebase.c:2137 +#: builtin/rebase.c:2160 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "" @@ -16572,7 +16649,7 @@ msgstr "" msgid "git receive-pack <git-dir>" msgstr "" -#: builtin/receive-pack.c:832 +#: builtin/receive-pack.c:830 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" @@ -16589,7 +16666,7 @@ msgid "" "'receive.denyCurrentBranch' configuration variable to 'refuse'." msgstr "" -#: builtin/receive-pack.c:852 +#: builtin/receive-pack.c:850 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" @@ -16601,11 +16678,11 @@ msgid "" "To squelch this message, you can set it to 'refuse'." msgstr "" -#: builtin/receive-pack.c:1938 +#: builtin/receive-pack.c:1936 msgid "quiet" msgstr "" -#: builtin/receive-pack.c:1952 +#: builtin/receive-pack.c:1950 msgid "You must specify a directory." msgstr "" @@ -17158,121 +17235,121 @@ msgstr "" msgid "Unknown subcommand: %s" msgstr "" -#: builtin/repack.c:22 +#: builtin/repack.c:23 msgid "git repack [<options>]" msgstr "" -#: builtin/repack.c:27 +#: builtin/repack.c:28 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." msgstr "" -#: builtin/repack.c:190 +#: builtin/repack.c:191 msgid "could not start pack-objects to repack promisor objects" msgstr "" -#: builtin/repack.c:229 builtin/repack.c:408 +#: builtin/repack.c:230 builtin/repack.c:409 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" -#: builtin/repack.c:246 +#: builtin/repack.c:247 msgid "could not finish pack-objects to repack promisor objects" msgstr "" -#: builtin/repack.c:284 +#: builtin/repack.c:285 msgid "pack everything in a single pack" msgstr "" -#: builtin/repack.c:286 +#: builtin/repack.c:287 msgid "same as -a, and turn unreachable objects loose" msgstr "" -#: builtin/repack.c:289 +#: builtin/repack.c:290 msgid "remove redundant packs, and run git-prune-packed" msgstr "" -#: builtin/repack.c:291 +#: builtin/repack.c:292 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "" -#: builtin/repack.c:293 +#: builtin/repack.c:294 msgid "pass --no-reuse-object to git-pack-objects" msgstr "" -#: builtin/repack.c:295 +#: builtin/repack.c:296 msgid "do not run git-update-server-info" msgstr "" -#: builtin/repack.c:298 +#: builtin/repack.c:299 msgid "pass --local to git-pack-objects" msgstr "" -#: builtin/repack.c:300 +#: builtin/repack.c:301 msgid "write bitmap index" msgstr "" -#: builtin/repack.c:302 +#: builtin/repack.c:303 msgid "pass --delta-islands to git-pack-objects" msgstr "" -#: builtin/repack.c:303 +#: builtin/repack.c:304 msgid "approxidate" msgstr "" -#: builtin/repack.c:304 +#: builtin/repack.c:305 msgid "with -A, do not loosen objects older than this" msgstr "" -#: builtin/repack.c:306 +#: builtin/repack.c:307 msgid "with -a, repack unreachable objects" msgstr "" -#: builtin/repack.c:308 +#: builtin/repack.c:309 msgid "size of the window used for delta compression" msgstr "" -#: builtin/repack.c:309 builtin/repack.c:315 +#: builtin/repack.c:310 builtin/repack.c:316 msgid "bytes" msgstr "" -#: builtin/repack.c:310 +#: builtin/repack.c:311 msgid "same as the above, but limit memory size instead of entries count" msgstr "" -#: builtin/repack.c:312 +#: builtin/repack.c:313 msgid "limits the maximum delta depth" msgstr "" -#: builtin/repack.c:314 +#: builtin/repack.c:315 msgid "limits the maximum number of threads" msgstr "" -#: builtin/repack.c:316 +#: builtin/repack.c:317 msgid "maximum size of each packfile" msgstr "" -#: builtin/repack.c:318 +#: builtin/repack.c:319 msgid "repack objects in packs marked with .keep" msgstr "" -#: builtin/repack.c:320 +#: builtin/repack.c:321 msgid "do not repack this pack" msgstr "" -#: builtin/repack.c:330 +#: builtin/repack.c:331 msgid "cannot delete packs in a precious-objects repo" msgstr "" -#: builtin/repack.c:334 +#: builtin/repack.c:335 msgid "--keep-unreachable and -A are incompatible" msgstr "" -#: builtin/repack.c:417 +#: builtin/repack.c:418 msgid "Nothing new to pack." msgstr "" -#: builtin/repack.c:478 +#: builtin/repack.c:479 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -17284,7 +17361,7 @@ msgid "" "WARNING: Please rename them in %s manually:\n" msgstr "" -#: builtin/repack.c:526 +#: builtin/repack.c:527 #, c-format msgid "failed to remove '%s'" msgstr "" @@ -17387,8 +17464,8 @@ msgstr "" msgid "unable to write object to database" msgstr "" -#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422 -#: builtin/replace.c:452 +#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:423 +#: builtin/replace.c:453 #, c-format msgid "not a valid object name: '%s'" msgstr "" @@ -17407,124 +17484,124 @@ msgstr "" msgid "new object is the same as the old one: '%s'" msgstr "" -#: builtin/replace.c:383 +#: builtin/replace.c:384 #, c-format msgid "could not parse %s as a commit" msgstr "" -#: builtin/replace.c:414 +#: builtin/replace.c:415 #, c-format msgid "bad mergetag in commit '%s'" msgstr "" -#: builtin/replace.c:416 +#: builtin/replace.c:417 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "" -#: builtin/replace.c:428 +#: builtin/replace.c:429 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " "instead of --graft" msgstr "" -#: builtin/replace.c:467 +#: builtin/replace.c:468 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "" -#: builtin/replace.c:468 +#: builtin/replace.c:469 msgid "the signature will be removed in the replacement commit!" msgstr "" -#: builtin/replace.c:478 +#: builtin/replace.c:479 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "" -#: builtin/replace.c:486 +#: builtin/replace.c:487 #, c-format msgid "graft for '%s' unnecessary" msgstr "" -#: builtin/replace.c:490 +#: builtin/replace.c:491 #, c-format msgid "new commit is the same as the old one: '%s'" msgstr "" -#: builtin/replace.c:525 +#: builtin/replace.c:526 #, c-format msgid "" "could not convert the following graft(s):\n" "%s" msgstr "" -#: builtin/replace.c:546 +#: builtin/replace.c:547 msgid "list replace refs" msgstr "" -#: builtin/replace.c:547 +#: builtin/replace.c:548 msgid "delete replace refs" msgstr "" -#: builtin/replace.c:548 +#: builtin/replace.c:549 msgid "edit existing object" msgstr "" -#: builtin/replace.c:549 +#: builtin/replace.c:550 msgid "change a commit's parents" msgstr "" -#: builtin/replace.c:550 +#: builtin/replace.c:551 msgid "convert existing graft file" msgstr "" -#: builtin/replace.c:551 +#: builtin/replace.c:552 msgid "replace the ref if it exists" msgstr "" -#: builtin/replace.c:553 +#: builtin/replace.c:554 msgid "do not pretty-print contents for --edit" msgstr "" -#: builtin/replace.c:554 +#: builtin/replace.c:555 msgid "use this format" msgstr "" -#: builtin/replace.c:567 +#: builtin/replace.c:568 msgid "--format cannot be used when not listing" msgstr "" -#: builtin/replace.c:575 +#: builtin/replace.c:576 msgid "-f only makes sense when writing a replacement" msgstr "" -#: builtin/replace.c:579 +#: builtin/replace.c:580 msgid "--raw only makes sense with --edit" msgstr "" -#: builtin/replace.c:585 +#: builtin/replace.c:586 msgid "-d needs at least one argument" msgstr "" -#: builtin/replace.c:591 +#: builtin/replace.c:592 msgid "bad number of arguments" msgstr "" -#: builtin/replace.c:597 +#: builtin/replace.c:598 msgid "-e needs exactly one argument" msgstr "" -#: builtin/replace.c:603 +#: builtin/replace.c:604 msgid "-g needs at least one argument" msgstr "" -#: builtin/replace.c:609 +#: builtin/replace.c:610 msgid "--convert-graft-file takes no argument" msgstr "" -#: builtin/replace.c:615 +#: builtin/replace.c:616 msgid "only one pattern can be given with -l" msgstr "" @@ -17591,13 +17668,18 @@ msgstr "" msgid "Failed to find tree of %s." msgstr "" +#: builtin/reset.c:114 +#, c-format +msgid "HEAD is now at %s" +msgstr "" + #: builtin/reset.c:193 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "" -#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589 -#: builtin/stash.c:613 +#: builtin/reset.c:293 builtin/stash.c:520 builtin/stash.c:595 +#: builtin/stash.c:619 msgid "be quiet, only report errors" msgstr "" @@ -17675,24 +17757,19 @@ msgstr "" msgid "Could not write new index file." msgstr "" -#: builtin/rev-list.c:412 +#: builtin/rev-list.c:411 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "" -#: builtin/rev-list.c:473 +#: builtin/rev-list.c:472 msgid "object filtering requires --objects" msgstr "" -#: builtin/rev-list.c:476 -#, c-format -msgid "invalid sparse value '%s'" -msgstr "" - -#: builtin/rev-list.c:527 +#: builtin/rev-list.c:522 msgid "rev-list does not support display of notes" msgstr "" -#: builtin/rev-list.c:530 +#: builtin/rev-list.c:525 msgid "cannot combine --use-bitmap-index with object filtering" msgstr "" @@ -18200,134 +18277,134 @@ msgstr "" msgid "could not save index tree" msgstr "" -#: builtin/stash.c:434 +#: builtin/stash.c:436 msgid "could not restore untracked files from stash" msgstr "" -#: builtin/stash.c:448 +#: builtin/stash.c:450 #, c-format msgid "Merging %s with %s" msgstr "" -#: builtin/stash.c:458 git-legacy-stash.sh:680 +#: builtin/stash.c:460 git-legacy-stash.sh:680 msgid "Index was not unstashed." msgstr "" -#: builtin/stash.c:516 builtin/stash.c:615 +#: builtin/stash.c:522 builtin/stash.c:621 msgid "attempt to recreate the index" msgstr "" -#: builtin/stash.c:549 +#: builtin/stash.c:555 #, c-format msgid "Dropped %s (%s)" msgstr "" -#: builtin/stash.c:552 +#: builtin/stash.c:558 #, c-format msgid "%s: Could not drop stash entry" msgstr "" -#: builtin/stash.c:577 +#: builtin/stash.c:583 #, c-format msgid "'%s' is not a stash reference" msgstr "" -#: builtin/stash.c:627 git-legacy-stash.sh:694 +#: builtin/stash.c:633 git-legacy-stash.sh:694 msgid "The stash entry is kept in case you need it again." msgstr "" -#: builtin/stash.c:650 git-legacy-stash.sh:712 +#: builtin/stash.c:656 git-legacy-stash.sh:712 msgid "No branch name specified" msgstr "" -#: builtin/stash.c:790 builtin/stash.c:827 +#: builtin/stash.c:796 builtin/stash.c:833 #, c-format msgid "Cannot update %s with %s" msgstr "" -#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497 +#: builtin/stash.c:814 builtin/stash.c:1470 builtin/stash.c:1506 msgid "stash message" msgstr "" -#: builtin/stash.c:818 +#: builtin/stash.c:824 msgid "\"git stash store\" requires one <commit> argument" msgstr "" -#: builtin/stash.c:1040 git-legacy-stash.sh:217 +#: builtin/stash.c:1046 git-legacy-stash.sh:217 msgid "No changes selected" msgstr "" -#: builtin/stash.c:1136 git-legacy-stash.sh:150 +#: builtin/stash.c:1145 git-legacy-stash.sh:150 msgid "You do not have the initial commit yet" msgstr "" -#: builtin/stash.c:1163 git-legacy-stash.sh:165 +#: builtin/stash.c:1172 git-legacy-stash.sh:165 msgid "Cannot save the current index state" msgstr "" -#: builtin/stash.c:1172 git-legacy-stash.sh:180 +#: builtin/stash.c:1181 git-legacy-stash.sh:180 msgid "Cannot save the untracked files" msgstr "" -#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200 +#: builtin/stash.c:1192 builtin/stash.c:1201 git-legacy-stash.sh:200 #: git-legacy-stash.sh:213 msgid "Cannot save the current worktree state" msgstr "" -#: builtin/stash.c:1220 git-legacy-stash.sh:233 +#: builtin/stash.c:1229 git-legacy-stash.sh:233 msgid "Cannot record working tree state" msgstr "" -#: builtin/stash.c:1269 git-legacy-stash.sh:337 +#: builtin/stash.c:1278 git-legacy-stash.sh:337 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "" -#: builtin/stash.c:1285 +#: builtin/stash.c:1294 msgid "Did you forget to 'git add'?" msgstr "" -#: builtin/stash.c:1300 git-legacy-stash.sh:345 +#: builtin/stash.c:1309 git-legacy-stash.sh:345 msgid "No local changes to save" msgstr "" -#: builtin/stash.c:1307 git-legacy-stash.sh:350 +#: builtin/stash.c:1316 git-legacy-stash.sh:350 msgid "Cannot initialize stash" msgstr "" -#: builtin/stash.c:1322 git-legacy-stash.sh:354 +#: builtin/stash.c:1331 git-legacy-stash.sh:354 msgid "Cannot save the current status" msgstr "" -#: builtin/stash.c:1327 +#: builtin/stash.c:1336 #, c-format msgid "Saved working directory and index state %s" msgstr "" -#: builtin/stash.c:1417 git-legacy-stash.sh:384 +#: builtin/stash.c:1426 git-legacy-stash.sh:384 msgid "Cannot remove worktree changes" msgstr "" -#: builtin/stash.c:1452 builtin/stash.c:1488 +#: builtin/stash.c:1461 builtin/stash.c:1497 msgid "keep index" msgstr "" -#: builtin/stash.c:1454 builtin/stash.c:1490 +#: builtin/stash.c:1463 builtin/stash.c:1499 msgid "stash in patch mode" msgstr "" -#: builtin/stash.c:1455 builtin/stash.c:1491 +#: builtin/stash.c:1464 builtin/stash.c:1500 msgid "quiet mode" msgstr "" -#: builtin/stash.c:1457 builtin/stash.c:1493 +#: builtin/stash.c:1466 builtin/stash.c:1502 msgid "include untracked files in stash" msgstr "" -#: builtin/stash.c:1459 builtin/stash.c:1495 +#: builtin/stash.c:1468 builtin/stash.c:1504 msgid "include ignore files" msgstr "" -#: builtin/stash.c:1555 +#: builtin/stash.c:1564 #, c-format msgid "could not exec %s" msgstr "" @@ -18678,7 +18755,7 @@ msgid "don't print cloning progress" msgstr "" #: builtin/submodule--helper.c:1877 -msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" +msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "" #: builtin/submodule--helper.c:1890 @@ -18730,7 +18807,7 @@ msgstr "" msgid "please make sure that the .gitmodules file is in the working tree" msgstr "" -#: builtin/submodule--helper.c:2235 git.c:434 git.c:684 +#: builtin/submodule--helper.c:2235 git.c:433 git.c:683 #, c-format msgid "%s doesn't support --super-prefix" msgstr "" @@ -19032,185 +19109,185 @@ msgstr "" msgid "git update-index [<options>] [--] [<file>...]" msgstr "" -#: builtin/update-index.c:971 +#: builtin/update-index.c:972 msgid "continue refresh even when index needs update" msgstr "" -#: builtin/update-index.c:974 +#: builtin/update-index.c:975 msgid "refresh: ignore submodules" msgstr "" -#: builtin/update-index.c:977 +#: builtin/update-index.c:978 msgid "do not ignore new files" msgstr "" -#: builtin/update-index.c:979 +#: builtin/update-index.c:980 msgid "let files replace directories and vice-versa" msgstr "" -#: builtin/update-index.c:981 +#: builtin/update-index.c:982 msgid "notice files missing from worktree" msgstr "" -#: builtin/update-index.c:983 +#: builtin/update-index.c:984 msgid "refresh even if index contains unmerged entries" msgstr "" -#: builtin/update-index.c:986 +#: builtin/update-index.c:987 msgid "refresh stat information" msgstr "" -#: builtin/update-index.c:990 +#: builtin/update-index.c:991 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "" -#: builtin/update-index.c:994 +#: builtin/update-index.c:995 msgid "<mode>,<object>,<path>" msgstr "" -#: builtin/update-index.c:995 +#: builtin/update-index.c:996 msgid "add the specified entry to the index" msgstr "" -#: builtin/update-index.c:1005 +#: builtin/update-index.c:1006 msgid "mark files as \"not changing\"" msgstr "" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1009 msgid "clear assumed-unchanged bit" msgstr "" -#: builtin/update-index.c:1011 +#: builtin/update-index.c:1012 msgid "mark files as \"index-only\"" msgstr "" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1015 msgid "clear skip-worktree bit" msgstr "" -#: builtin/update-index.c:1017 +#: builtin/update-index.c:1018 msgid "add to index only; do not add content to object database" msgstr "" -#: builtin/update-index.c:1019 +#: builtin/update-index.c:1020 msgid "remove named paths even if present in worktree" msgstr "" -#: builtin/update-index.c:1021 +#: builtin/update-index.c:1022 msgid "with --stdin: input lines are terminated by null bytes" msgstr "" -#: builtin/update-index.c:1023 +#: builtin/update-index.c:1024 msgid "read list of paths to be updated from standard input" msgstr "" -#: builtin/update-index.c:1027 +#: builtin/update-index.c:1028 msgid "add entries from standard input to the index" msgstr "" -#: builtin/update-index.c:1031 +#: builtin/update-index.c:1032 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" -#: builtin/update-index.c:1035 +#: builtin/update-index.c:1036 msgid "only update entries that differ from HEAD" msgstr "" -#: builtin/update-index.c:1039 +#: builtin/update-index.c:1040 msgid "ignore files missing from worktree" msgstr "" -#: builtin/update-index.c:1042 +#: builtin/update-index.c:1043 msgid "report actions to standard output" msgstr "" -#: builtin/update-index.c:1044 +#: builtin/update-index.c:1045 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" -#: builtin/update-index.c:1048 +#: builtin/update-index.c:1049 msgid "write index in this format" msgstr "" -#: builtin/update-index.c:1050 +#: builtin/update-index.c:1051 msgid "enable or disable split index" msgstr "" -#: builtin/update-index.c:1052 +#: builtin/update-index.c:1053 msgid "enable/disable untracked cache" msgstr "" -#: builtin/update-index.c:1054 +#: builtin/update-index.c:1055 msgid "test if the filesystem supports untracked cache" msgstr "" -#: builtin/update-index.c:1056 +#: builtin/update-index.c:1057 msgid "enable untracked cache without testing the filesystem" msgstr "" -#: builtin/update-index.c:1058 +#: builtin/update-index.c:1059 msgid "write out the index even if is not flagged as changed" msgstr "" -#: builtin/update-index.c:1060 +#: builtin/update-index.c:1061 msgid "enable or disable file system monitor" msgstr "" -#: builtin/update-index.c:1062 +#: builtin/update-index.c:1063 msgid "mark files as fsmonitor valid" msgstr "" -#: builtin/update-index.c:1065 +#: builtin/update-index.c:1066 msgid "clear fsmonitor valid bit" msgstr "" -#: builtin/update-index.c:1168 +#: builtin/update-index.c:1169 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" msgstr "" -#: builtin/update-index.c:1177 +#: builtin/update-index.c:1178 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" msgstr "" -#: builtin/update-index.c:1188 +#: builtin/update-index.c:1190 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" msgstr "" -#: builtin/update-index.c:1192 +#: builtin/update-index.c:1194 msgid "Untracked cache disabled" msgstr "" -#: builtin/update-index.c:1200 +#: builtin/update-index.c:1202 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" msgstr "" -#: builtin/update-index.c:1204 +#: builtin/update-index.c:1206 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "" -#: builtin/update-index.c:1212 +#: builtin/update-index.c:1214 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "" -#: builtin/update-index.c:1216 +#: builtin/update-index.c:1218 msgid "fsmonitor enabled" msgstr "" -#: builtin/update-index.c:1219 +#: builtin/update-index.c:1221 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" -#: builtin/update-index.c:1223 +#: builtin/update-index.c:1225 msgid "fsmonitor disabled" msgstr "" @@ -19302,272 +19379,272 @@ msgstr "" msgid "print tag contents" msgstr "" -#: builtin/worktree.c:18 +#: builtin/worktree.c:17 msgid "git worktree add [<options>] <path> [<commit-ish>]" msgstr "" -#: builtin/worktree.c:19 +#: builtin/worktree.c:18 msgid "git worktree list [<options>]" msgstr "" -#: builtin/worktree.c:20 +#: builtin/worktree.c:19 msgid "git worktree lock [<options>] <path>" msgstr "" -#: builtin/worktree.c:21 +#: builtin/worktree.c:20 msgid "git worktree move <worktree> <new-path>" msgstr "" -#: builtin/worktree.c:22 +#: builtin/worktree.c:21 msgid "git worktree prune [<options>]" msgstr "" -#: builtin/worktree.c:23 +#: builtin/worktree.c:22 msgid "git worktree remove [<options>] <worktree>" msgstr "" -#: builtin/worktree.c:24 +#: builtin/worktree.c:23 msgid "git worktree unlock <path>" msgstr "" -#: builtin/worktree.c:61 builtin/worktree.c:899 +#: builtin/worktree.c:60 builtin/worktree.c:898 #, c-format msgid "failed to delete '%s'" msgstr "" -#: builtin/worktree.c:80 +#: builtin/worktree.c:79 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "" -#: builtin/worktree.c:86 +#: builtin/worktree.c:85 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "" -#: builtin/worktree.c:91 builtin/worktree.c:100 +#: builtin/worktree.c:90 builtin/worktree.c:99 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "" -#: builtin/worktree.c:110 +#: builtin/worktree.c:109 #, c-format msgid "" "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " "%<PRIuMAX>)" msgstr "" -#: builtin/worktree.c:118 +#: builtin/worktree.c:117 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "" -#: builtin/worktree.c:127 +#: builtin/worktree.c:126 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "" -#: builtin/worktree.c:166 +#: builtin/worktree.c:165 msgid "report pruned working trees" msgstr "" -#: builtin/worktree.c:168 +#: builtin/worktree.c:167 msgid "expire working trees older than <time>" msgstr "" -#: builtin/worktree.c:235 +#: builtin/worktree.c:234 #, c-format msgid "'%s' already exists" msgstr "" -#: builtin/worktree.c:252 +#: builtin/worktree.c:251 #, c-format msgid "unable to re-add worktree '%s'" msgstr "" -#: builtin/worktree.c:257 +#: builtin/worktree.c:256 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" "use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear" msgstr "" -#: builtin/worktree.c:259 +#: builtin/worktree.c:258 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" "use 'add -f' to override, or 'prune' or 'remove' to clear" msgstr "" -#: builtin/worktree.c:309 +#: builtin/worktree.c:308 #, c-format msgid "could not create directory of '%s'" msgstr "" -#: builtin/worktree.c:440 builtin/worktree.c:446 +#: builtin/worktree.c:439 builtin/worktree.c:445 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "" -#: builtin/worktree.c:442 +#: builtin/worktree.c:441 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "" -#: builtin/worktree.c:451 +#: builtin/worktree.c:450 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "" -#: builtin/worktree.c:457 +#: builtin/worktree.c:456 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "" -#: builtin/worktree.c:498 +#: builtin/worktree.c:497 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" -#: builtin/worktree.c:501 +#: builtin/worktree.c:500 msgid "create a new branch" msgstr "" -#: builtin/worktree.c:503 +#: builtin/worktree.c:502 msgid "create or reset a branch" msgstr "" -#: builtin/worktree.c:505 +#: builtin/worktree.c:504 msgid "populate the new working tree" msgstr "" -#: builtin/worktree.c:506 +#: builtin/worktree.c:505 msgid "keep the new working tree locked" msgstr "" -#: builtin/worktree.c:509 +#: builtin/worktree.c:508 msgid "set up tracking mode (see git-branch(1))" msgstr "" -#: builtin/worktree.c:512 +#: builtin/worktree.c:511 msgid "try to match the new branch name with a remote-tracking branch" msgstr "" -#: builtin/worktree.c:520 +#: builtin/worktree.c:519 msgid "-b, -B, and --detach are mutually exclusive" msgstr "" -#: builtin/worktree.c:581 +#: builtin/worktree.c:580 msgid "--[no-]track can only be used if a new branch is created" msgstr "" -#: builtin/worktree.c:681 +#: builtin/worktree.c:680 msgid "reason for locking" msgstr "" -#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800 -#: builtin/worktree.c:927 +#: builtin/worktree.c:692 builtin/worktree.c:725 builtin/worktree.c:799 +#: builtin/worktree.c:926 #, c-format msgid "'%s' is not a working tree" msgstr "" -#: builtin/worktree.c:695 builtin/worktree.c:728 +#: builtin/worktree.c:694 builtin/worktree.c:727 msgid "The main working tree cannot be locked or unlocked" msgstr "" -#: builtin/worktree.c:700 +#: builtin/worktree.c:699 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "" -#: builtin/worktree.c:702 +#: builtin/worktree.c:701 #, c-format msgid "'%s' is already locked" msgstr "" -#: builtin/worktree.c:730 +#: builtin/worktree.c:729 #, c-format msgid "'%s' is not locked" msgstr "" -#: builtin/worktree.c:771 +#: builtin/worktree.c:770 msgid "working trees containing submodules cannot be moved or removed" msgstr "" -#: builtin/worktree.c:779 +#: builtin/worktree.c:778 msgid "force move even if worktree is dirty or locked" msgstr "" -#: builtin/worktree.c:802 builtin/worktree.c:929 +#: builtin/worktree.c:801 builtin/worktree.c:928 #, c-format msgid "'%s' is a main working tree" msgstr "" -#: builtin/worktree.c:807 +#: builtin/worktree.c:806 #, c-format msgid "could not figure out destination name from '%s'" msgstr "" -#: builtin/worktree.c:813 +#: builtin/worktree.c:812 #, c-format msgid "target '%s' already exists" msgstr "" -#: builtin/worktree.c:821 +#: builtin/worktree.c:820 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" "use 'move -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:823 +#: builtin/worktree.c:822 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:826 +#: builtin/worktree.c:825 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "" -#: builtin/worktree.c:831 +#: builtin/worktree.c:830 #, c-format msgid "failed to move '%s' to '%s'" msgstr "" -#: builtin/worktree.c:879 +#: builtin/worktree.c:878 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "" -#: builtin/worktree.c:883 +#: builtin/worktree.c:882 #, c-format -msgid "'%s' is dirty, use --force to delete it" +msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "" -#: builtin/worktree.c:888 +#: builtin/worktree.c:887 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "" -#: builtin/worktree.c:911 +#: builtin/worktree.c:910 msgid "force removal even if worktree is dirty or locked" msgstr "" -#: builtin/worktree.c:934 +#: builtin/worktree.c:933 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" "use 'remove -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:936 +#: builtin/worktree.c:935 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:939 +#: builtin/worktree.c:938 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "" @@ -19588,6 +19665,16 @@ msgstr "" msgid "only useful for debugging" msgstr "" +#: fast-import.c:3118 +#, c-format +msgid "Expected 'mark' command, got %s" +msgstr "" + +#: fast-import.c:3123 +#, c-format +msgid "Expected 'to' command, got %s" +msgstr "" + #: credential-cache--daemon.c:223 #, c-format msgid "" @@ -19683,51 +19770,51 @@ msgid "" "You can use '!git' in the alias to do this" msgstr "" -#: git.c:377 +#: git.c:376 #, c-format msgid "empty alias for %s" msgstr "" -#: git.c:380 +#: git.c:379 #, c-format msgid "recursive alias: %s" msgstr "" -#: git.c:460 +#: git.c:459 msgid "write failure on standard output" msgstr "" -#: git.c:462 +#: git.c:461 msgid "unknown write failure on standard output" msgstr "" -#: git.c:464 +#: git.c:463 msgid "close failed on standard output" msgstr "" -#: git.c:793 +#: git.c:792 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "" -#: git.c:843 +#: git.c:842 #, c-format msgid "cannot handle %s as a builtin" msgstr "" -#: git.c:856 +#: git.c:855 #, c-format msgid "" "usage: %s\n" "\n" msgstr "" -#: git.c:876 +#: git.c:875 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "" -#: git.c:888 +#: git.c:887 #, c-format msgid "failed to run command '%s': %s\n" msgstr "" @@ -19745,30 +19832,30 @@ msgstr "" msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "" -#: http.c:876 +#: http.c:878 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" msgstr "" -#: http.c:949 +#: http.c:951 msgid "Protocol restrictions not supported with cURL < 7.19.4" msgstr "" -#: http.c:1085 +#: http.c:1088 #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" msgstr "" -#: http.c:1092 +#: http.c:1095 #, c-format msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" msgstr "" -#: http.c:1096 +#: http.c:1099 #, c-format msgid "Could not set SSL backend to '%s': already set" msgstr "" -#: http.c:1965 +#: http.c:1968 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -19859,7 +19946,7 @@ msgstr "" msgid "protocol error: expected sha/ref, got '%s'" msgstr "" -#: remote-curl.c:1138 remote-curl.c:1252 +#: remote-curl.c:1138 remote-curl.c:1250 #, c-format msgid "http transport does not support %s" msgstr "" @@ -19868,36 +19955,36 @@ msgstr "" msgid "git-http-push failed" msgstr "" -#: remote-curl.c:1360 +#: remote-curl.c:1356 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "" -#: remote-curl.c:1392 +#: remote-curl.c:1388 msgid "remote-curl: error reading command stream from git" msgstr "" -#: remote-curl.c:1399 +#: remote-curl.c:1395 msgid "remote-curl: fetch attempted without a local repo" msgstr "" -#: remote-curl.c:1439 +#: remote-curl.c:1435 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "" -#: list-objects-filter-options.h:61 +#: list-objects-filter-options.h:85 msgid "args" msgstr "" -#: list-objects-filter-options.h:62 +#: list-objects-filter-options.h:86 msgid "object filtering" msgstr "" -#: parse-options.h:170 +#: parse-options.h:179 msgid "expiry-date" msgstr "" -#: parse-options.h:184 +#: parse-options.h:193 msgid "no-op (backward compatibility)" msgstr "" @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2019-08-10 20:12+0800\n" -"PO-Revision-Date: 2019-08-11 11:48+0200\n" +"POT-Creation-Date: 2019-10-21 19:55+0800\n" +"PO-Revision-Date: 2019-10-21 22:57+0200\n" "Last-Translator: Alessandro Menti <alessandro.menti@alessandromenti.it>\n" "Language-Team: Italian <>\n" "Language: it\n" @@ -20,7 +20,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 19.04.3\n" +"X-Generator: Lokalize 19.08.2\n" #: advice.c:109 #, c-format @@ -76,7 +76,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "Esco a causa di un conflitto non risolto." -#: advice.c:193 builtin/merge.c:1327 +#: advice.c:193 builtin/merge.c:1332 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Il merge non è stato concluso (esiste MERGE_HEAD)." @@ -219,17 +219,7 @@ msgstr "modo non valido alla riga %d: %s" msgid "inconsistent header lines %d and %d" msgstr "righe di intestazione %d e %d inconsistenti" -#: apply.c:1460 -#, c-format -msgid "recount: unexpected line: %.*s" -msgstr "recount: riga inattesa: %.*s" - -#: apply.c:1529 -#, c-format -msgid "patch fragment without header at line %d: %.*s" -msgstr "frammento di patch senza intestazione alla riga %d: %.*s" - -#: apply.c:1551 +#: apply.c:1372 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -244,82 +234,92 @@ msgstr[1] "" "l'intestazione git diff non riporta le informazioni sul file una volta " "rimossi %d componenti iniziali del percorso (riga %d)" -#: apply.c:1564 +#: apply.c:1385 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "l'intestazione git diff non riporta le informazioni sul file (riga %d)" -#: apply.c:1752 +#: apply.c:1481 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "recount: riga inattesa: %.*s" + +#: apply.c:1550 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "frammento di patch senza intestazione alla riga %d: %.*s" + +#: apply.c:1753 msgid "new file depends on old contents" msgstr "il nuovo file dipende da vecchi contenuti" -#: apply.c:1754 +#: apply.c:1755 msgid "deleted file still has contents" msgstr "il file eliminato ha ancora dei contenuti" -#: apply.c:1788 +#: apply.c:1789 #, c-format msgid "corrupt patch at line %d" msgstr "patch corrotta alla riga %d" -#: apply.c:1825 +#: apply.c:1826 #, c-format msgid "new file %s depends on old contents" msgstr "il nuovo file %s dipende da vecchi contenuti" -#: apply.c:1827 +#: apply.c:1828 #, c-format msgid "deleted file %s still has contents" msgstr "il file eliminato %s ha ancora dei contenuti" -#: apply.c:1830 +#: apply.c:1831 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** attenzione: il file %s diventa vuoto ma non è eliminato" -#: apply.c:1977 +#: apply.c:1978 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "patch binaria corrotta alla riga %d: %.*s" -#: apply.c:2014 +#: apply.c:2015 #, c-format msgid "unrecognized binary patch at line %d" msgstr "patch binaria non riconosciuta alla riga %d" -#: apply.c:2176 +#: apply.c:2177 #, c-format msgid "patch with only garbage at line %d" msgstr "patch con soli contenuti garbage alla riga %d" -#: apply.c:2262 +#: apply.c:2263 #, c-format msgid "unable to read symlink %s" msgstr "impossibile leggere il collegamento simbolico %s" -#: apply.c:2266 +#: apply.c:2267 #, c-format msgid "unable to open or read %s" msgstr "impossibile aprire o leggere %s" -#: apply.c:2925 +#: apply.c:2926 #, c-format msgid "invalid start of line: '%c'" msgstr "inizio della riga non valido: '%c'" -#: apply.c:3046 +#: apply.c:3047 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "Applicazione frammento %d riuscita alla riga %d (offset: %d riga)." msgstr[1] "Applicazione frammento %d riuscita alla riga %d (offset: %d righe)." -#: apply.c:3058 +#: apply.c:3059 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Contesto ridotto a (%ld/%ld) per applicare il frammento alla riga %d" -#: apply.c:3064 +#: apply.c:3065 #, c-format msgid "" "while searching for:\n" @@ -328,26 +328,26 @@ msgstr "" "durante la ricerca di:\n" "%.*s" -#: apply.c:3086 +#: apply.c:3087 #, c-format msgid "missing binary patch data for '%s'" msgstr "dati della patch binaria mancanti per '%s'" -#: apply.c:3094 +#: apply.c:3095 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "impossibile applicare una patch binaria al contrario senza l'hunk contrario " "per '%s'" -#: apply.c:3141 +#: apply.c:3142 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" "impossibile applicare una patch binaria a '%s' senza la riga d'indice " "completa" -#: apply.c:3151 +#: apply.c:3152 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -355,432 +355,432 @@ msgstr "" "la patch si applica a '%s' (%s), che non corrisponde ai contenuti correnti " "del file." -#: apply.c:3159 +#: apply.c:3160 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "la patch si applica a un file vuoto '%s' ma il file non è vuoto" -#: apply.c:3177 +#: apply.c:3178 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "impossibile leggere la postimmagine %s necessaria per '%s'" -#: apply.c:3190 +#: apply.c:3191 #, c-format msgid "binary patch does not apply to '%s'" msgstr "la patch binaria non si applica correttamente a '%s'" -#: apply.c:3196 +#: apply.c:3197 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "la patch binaria su '%s' crea risultati non corretti (atteso %s, ricevuto %s)" -#: apply.c:3217 +#: apply.c:3218 #, c-format msgid "patch failed: %s:%ld" msgstr "patch non riuscita: %s:%ld" -#: apply.c:3340 +#: apply.c:3341 #, c-format msgid "cannot checkout %s" msgstr "impossibile eseguire il checkout di '%s'" -#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279 +#: apply.c:3393 apply.c:3404 apply.c:3450 midx.c:61 setup.c:280 #, c-format msgid "failed to read %s" msgstr "lettura di %s non riuscita" -#: apply.c:3400 +#: apply.c:3401 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "lettura di '%s' oltre un collegamento simbolico" -#: apply.c:3429 apply.c:3672 +#: apply.c:3430 apply.c:3673 #, c-format msgid "path %s has been renamed/deleted" msgstr "il percorso %s è stato rinominato/eliminato" -#: apply.c:3515 apply.c:3687 +#: apply.c:3516 apply.c:3688 #, c-format msgid "%s: does not exist in index" msgstr "%s: non esiste nell'indice" -#: apply.c:3524 apply.c:3695 +#: apply.c:3525 apply.c:3696 #, c-format msgid "%s: does not match index" msgstr "%s: non corrisponde all'indice" -#: apply.c:3559 +#: apply.c:3560 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" "dal repository manca il blob necessario per ripiegare sul merge a tre vie." -#: apply.c:3562 +#: apply.c:3563 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Ripiego sul merge a tre vie...\n" -#: apply.c:3578 apply.c:3582 +#: apply.c:3579 apply.c:3583 #, c-format msgid "cannot read the current contents of '%s'" msgstr "impossibile leggere i contenuti correnti di '%s'" -#: apply.c:3594 +#: apply.c:3595 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Ripiego sul merge a tre vie non riuscito...\n" -#: apply.c:3608 +#: apply.c:3609 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Patch applicata a '%s' con conflitti.\n" -#: apply.c:3613 +#: apply.c:3614 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Patch '%s' applicata correttamente.\n" -#: apply.c:3639 +#: apply.c:3640 msgid "removal patch leaves file contents" msgstr "la rimozione della patch lascia contenuti del file" -#: apply.c:3712 +#: apply.c:3713 #, c-format msgid "%s: wrong type" msgstr "%s: tipo errato" -#: apply.c:3714 +#: apply.c:3715 #, c-format msgid "%s has type %o, expected %o" msgstr "%s ha il tipo %o, atteso %o" -#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856 +#: apply.c:3866 apply.c:3868 read-cache.c:830 read-cache.c:856 #: read-cache.c:1309 #, c-format msgid "invalid path '%s'" msgstr "percorso '%s' non valido" -#: apply.c:3923 +#: apply.c:3924 #, c-format msgid "%s: already exists in index" msgstr "%s: esiste già nell'indice" -#: apply.c:3926 +#: apply.c:3927 #, c-format msgid "%s: already exists in working directory" msgstr "%s: esiste già nella directory di lavoro" -#: apply.c:3946 +#: apply.c:3947 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "il nuovo modo (%o) di %s non corrisponde al vecchio modo (%o)" -#: apply.c:3951 +#: apply.c:3952 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "il nuovo modo (%o) di %s non corrisponde al vecchio modo (%o) di %s" -#: apply.c:3971 +#: apply.c:3972 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "il file interessato '%s' si trova oltre un collegamento simbolico" -#: apply.c:3975 +#: apply.c:3976 #, c-format msgid "%s: patch does not apply" msgstr "%s: la patch non si applica correttamente" -#: apply.c:3990 +#: apply.c:3991 #, c-format msgid "Checking patch %s..." msgstr "Controllo della patch %s in corso..." -#: apply.c:4082 +#: apply.c:4083 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "le informazioni SHA1 per il sottomodulo %s sono mancanti o inutili" -#: apply.c:4089 +#: apply.c:4090 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "modifica modo per %s che non è nell'HEAD corrente" -#: apply.c:4092 +#: apply.c:4093 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "le informazioni SHA1 sono mancanti o inutili (%s)." -#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143 +#: apply.c:4098 builtin/checkout.c:279 builtin/reset.c:143 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry non riuscito per il percorso '%s'" -#: apply.c:4101 +#: apply.c:4102 #, c-format msgid "could not add %s to temporary index" msgstr "impossibile aggiungere %s all'indice temporaneo" -#: apply.c:4111 +#: apply.c:4112 #, c-format msgid "could not write temporary index to %s" msgstr "impossibile scrivere l'indice temporaneo in %s" -#: apply.c:4249 +#: apply.c:4250 #, c-format msgid "unable to remove %s from index" msgstr "impossibile rimuovere %s dall'indice" -#: apply.c:4283 +#: apply.c:4284 #, c-format msgid "corrupt patch for submodule %s" msgstr "patch corrotta per il sottomodulo %s" -#: apply.c:4289 +#: apply.c:4290 #, c-format msgid "unable to stat newly created file '%s'" msgstr "impossibile eseguire lo stat del file appena creato '%s'" -#: apply.c:4297 +#: apply.c:4298 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "impossibile creare l'archivio di backup per il file appena creato %s" -#: apply.c:4303 apply.c:4448 +#: apply.c:4304 apply.c:4449 #, c-format msgid "unable to add cache entry for %s" msgstr "impossibile aggiungere la voce della cache per %s" -#: apply.c:4346 +#: apply.c:4347 #, c-format msgid "failed to write to '%s'" msgstr "scrittura in '%s' non riuscita" -#: apply.c:4350 +#: apply.c:4351 #, c-format msgid "closing file '%s'" msgstr "chiusura del file '%s' in corso" -#: apply.c:4420 +#: apply.c:4421 #, c-format msgid "unable to write file '%s' mode %o" msgstr "impossibile scrivere il file '%s' con modo %o" -#: apply.c:4518 +#: apply.c:4519 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s applicata correttamente." -#: apply.c:4526 +#: apply.c:4527 msgid "internal error" msgstr "errore interno" -#: apply.c:4529 +#: apply.c:4530 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Applicazione della patch %%s con %d frammento respinto..." msgstr[1] "Applicazione della patch %%s con %d frammenti respinti..." -#: apply.c:4540 +#: apply.c:4541 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "nome file .rej troncato a %.*s.rej" -#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168 +#: apply.c:4549 builtin/fetch.c:898 builtin/fetch.c:1194 #, c-format msgid "cannot open %s" msgstr "impossibile aprire %s" -#: apply.c:4562 +#: apply.c:4563 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Frammento %d applicato correttamente." -#: apply.c:4566 +#: apply.c:4567 #, c-format msgid "Rejected hunk #%d." msgstr "Frammento %d respinto." -#: apply.c:4676 +#: apply.c:4686 #, c-format msgid "Skipped patch '%s'." msgstr "Patch '%s' ignorata." -#: apply.c:4684 +#: apply.c:4694 msgid "unrecognized input" msgstr "input non riconosciuto" -#: apply.c:4704 +#: apply.c:4714 msgid "unable to read index file" msgstr "impossibile leggere il file index" -#: apply.c:4859 +#: apply.c:4871 #, c-format msgid "can't open patch '%s': %s" msgstr "impossibile aprire la patch '%s': %s" -#: apply.c:4886 +#: apply.c:4898 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "%d errore di spazi bianchi soppresso" msgstr[1] "%d errori di spazi bianchi soppressi" -#: apply.c:4892 apply.c:4907 +#: apply.c:4904 apply.c:4919 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d riga aggiunge errori di spazi bianchi." msgstr[1] "%d righe aggiungono errori di spazi bianchi." -#: apply.c:4900 +#: apply.c:4912 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "%d riga applicata dopo la correzione di errori di spazi bianchi." msgstr[1] "%d righe applicate dopo la correzione di errori di spazi bianchi." -#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4928 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "Impossibile scrivere il nuovo file index" -#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211 -#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273 -#: builtin/pull.c:208 builtin/submodule--helper.c:407 +#: apply.c:4955 apply.c:4958 builtin/am.c:2197 builtin/am.c:2200 +#: builtin/clone.c:122 builtin/fetch.c:143 builtin/merge.c:273 +#: builtin/pull.c:209 builtin/submodule--helper.c:407 #: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370 #: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853 #: builtin/submodule--helper.c:2092 git-add--interactive.perl:211 msgid "path" msgstr "percorso" -#: apply.c:4944 +#: apply.c:4956 msgid "don't apply changes matching the given path" msgstr "non applicare le modifiche corrispondenti al percorso specificato" -#: apply.c:4947 +#: apply.c:4959 msgid "apply changes matching the given path" msgstr "applica le modifiche corrispondenti al percorso specificato" -#: apply.c:4949 builtin/am.c:2217 +#: apply.c:4961 builtin/am.c:2206 msgid "num" msgstr "num" -#: apply.c:4950 +#: apply.c:4962 msgid "remove <num> leading slashes from traditional diff paths" msgstr "rimuovi <num> barre iniziali dai percorsi diff tradizionali" -#: apply.c:4953 +#: apply.c:4965 msgid "ignore additions made by the patch" msgstr "ignora le aggiunte create dalla patch" -#: apply.c:4955 +#: apply.c:4967 msgid "instead of applying the patch, output diffstat for the input" msgstr "" "invece di applicare la patch, visualizza l'output di diffstat per l'input" -#: apply.c:4959 +#: apply.c:4971 msgid "show number of added and deleted lines in decimal notation" msgstr "" "visualizza il numero di righe aggiunte ed eliminate in notazione decimale" -#: apply.c:4961 +#: apply.c:4973 msgid "instead of applying the patch, output a summary for the input" msgstr "invece di applicare la patch, visualizza un riassunto per l'input" -#: apply.c:4963 +#: apply.c:4975 msgid "instead of applying the patch, see if the patch is applicable" msgstr "invece di applicare la patch, verifica se può essere applicata" -#: apply.c:4965 +#: apply.c:4977 msgid "make sure the patch is applicable to the current index" msgstr "assicura che la patch sia applicabile all'indice corrente" -#: apply.c:4967 +#: apply.c:4979 msgid "mark new files with `git add --intent-to-add`" msgstr "contrassegna i nuovi file con `git add --intent-to-add`" -#: apply.c:4969 +#: apply.c:4981 msgid "apply a patch without touching the working tree" msgstr "applica una patch senza modificare l'albero di lavoro" -#: apply.c:4971 +#: apply.c:4983 msgid "accept a patch that touches outside the working area" msgstr "" "accetta una patch che apporta modifiche al di fuori dell'area di lavoro" -#: apply.c:4974 +#: apply.c:4986 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "applica anche la patch (da usare con --stat/--summary/--check)" -#: apply.c:4976 +#: apply.c:4988 msgid "attempt three-way merge if a patch does not apply" msgstr "prova un merge a tre vie se la patch non si applica correttamente" -#: apply.c:4978 +#: apply.c:4990 msgid "build a temporary index based on embedded index information" msgstr "compila un index temporaneo basato sulle informazioni indice incluse" -#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:4993 builtin/checkout-index.c:173 builtin/ls-files.c:524 msgid "paths are separated with NUL character" msgstr "i percorsi sono separati con un carattere NUL" -#: apply.c:4983 +#: apply.c:4995 msgid "ensure at least <n> lines of context match" msgstr "assicura che almeno <n> righe di contesto corrispondano" -#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98 +#: apply.c:4996 builtin/am.c:2185 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3330 builtin/rebase.c:1421 +#: builtin/pack-objects.c:3310 builtin/rebase.c:1445 msgid "action" msgstr "azione" -#: apply.c:4985 +#: apply.c:4997 msgid "detect new or modified lines that have whitespace errors" msgstr "rileva righe nuove o modificate che hanno errori di spazi bianchi" -#: apply.c:4988 apply.c:4991 +#: apply.c:5000 apply.c:5003 msgid "ignore changes in whitespace when finding context" msgstr "ignora modifiche agli spazi bianchi durante la ricerca dei contesti" -#: apply.c:4994 +#: apply.c:5006 msgid "apply the patch in reverse" msgstr "applica la patch in maniera inversa" -#: apply.c:4996 +#: apply.c:5008 msgid "don't expect at least one line of context" msgstr "non aspettare almeno una riga di contesto" -#: apply.c:4998 +#: apply.c:5010 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "lascia i frammenti respinti nei file *.rej corrispondenti" -#: apply.c:5000 +#: apply.c:5012 msgid "allow overlapping hunks" msgstr "consenti la sovrapposizione dei frammenti" -#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22 +#: apply.c:5013 builtin/add.c:291 builtin/check-ignore.c:22 #: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786 -#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128 +#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "visualizza ulteriori dettagli" -#: apply.c:5003 +#: apply.c:5015 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" "tollera carattere fine riga rilevato erroneamente come mancante alla fine " "del file" -#: apply.c:5006 +#: apply.c:5018 msgid "do not trust the line counts in the hunk headers" msgstr "" "non fare affidamento sul numero di righe nelle intestazioni dei frammenti" -#: apply.c:5008 builtin/am.c:2205 +#: apply.c:5020 builtin/am.c:2194 msgid "root" msgstr "radice" -#: apply.c:5009 +#: apply.c:5021 msgid "prepend <root> to all filenames" msgstr "anteponi <radice> a tutti i nomi file" @@ -835,7 +835,7 @@ msgstr "fmt" msgid "archive format" msgstr "formato archivio" -#: archive.c:458 builtin/log.c:1580 +#: archive.c:458 builtin/log.c:1581 msgid "prefix" msgstr "prefisso" @@ -843,11 +843,12 @@ msgstr "prefisso" msgid "prepend prefix to each pathname in the archive" msgstr "anteponi <prefisso> a ogni nome percorso nell'archivio" -#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875 -#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134 -#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105 -#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412 -#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177 +#: archive.c:460 builtin/blame.c:861 builtin/blame.c:873 builtin/blame.c:874 +#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162 +#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899 +#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563 +#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 +#: parse-options.h:186 msgid "file" msgstr "file" @@ -879,7 +880,7 @@ msgstr "comprimi meglio" msgid "list supported archive formats" msgstr "elenca i formati archivio supportati" -#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: archive.c:479 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115 #: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859 msgid "repo" msgstr "repository" @@ -888,7 +889,7 @@ msgstr "repository" msgid "retrieve the archive from remote repository <repo>" msgstr "recupera l'archivio dal repository remoto <repository>" -#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707 +#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715 #: builtin/notes.c:498 msgid "command" msgstr "comando" @@ -924,26 +925,26 @@ msgstr "Argomento non supportato per il formato '%s': -%d" msgid "cannot stream blob %s" msgstr "impossibile eseguire lo streaming del blob %s" -#: archive-tar.c:260 archive-zip.c:363 +#: archive-tar.c:266 archive-zip.c:363 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "modo file non supportato: 0%o (SHA1: %s)" -#: archive-tar.c:287 archive-zip.c:353 +#: archive-tar.c:293 archive-zip.c:353 #, c-format msgid "cannot read %s" msgstr "impossibile leggere %s" -#: archive-tar.c:459 +#: archive-tar.c:465 #, c-format msgid "unable to start '%s' filter" msgstr "impossibile avviare il filtro '%s'" -#: archive-tar.c:462 +#: archive-tar.c:468 msgid "unable to redirect descriptor" msgstr "impossibile ridirezionare il descrittore" -#: archive-tar.c:469 +#: archive-tar.c:475 #, c-format msgid "'%s' filter reported error" msgstr "il filtro '%s' ha segnalato un errore" @@ -968,17 +969,17 @@ msgstr "errore deflate (%d)" msgid "timestamp too large for this system: %<PRIuMAX>" msgstr "timestamp troppo grande per questo sistema: %<PRIuMAX>" -#: attr.c:211 +#: attr.c:213 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s non è un nome attributo valido" -#: attr.c:368 +#: attr.c:370 #, c-format msgid "%s not allowed: %s:%d" msgstr "%s non consentito: %s:%d" -#: attr.c:408 +#: attr.c:410 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1107,41 +1108,41 @@ msgstr[0] "" msgstr[1] "" "Bisezione in corso: %d revisioni rimanenti da testare dopo questa %s\n" -#: blame.c:2697 +#: blame.c:2700 msgid "--contents and --reverse do not blend well." msgstr "--contents e --reverse non sono compatibili." -#: blame.c:2711 +#: blame.c:2714 msgid "cannot use --contents with final commit object name" msgstr "impossibile usare --contents con il nome oggetto del commit finale" -#: blame.c:2732 +#: blame.c:2735 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "le opzioni --reverse e --first-parent se usate insieme richiedono che sia " "specificato l'ultimo commit" -#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033 -#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963 -#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411 -#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163 +#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:1971 +#: sequencer.c:4305 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:964 +#: builtin/log.c:1452 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411 +#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "impostazione percorso revisioni non riuscita" -#: blame.c:2759 +#: blame.c:2762 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "le opzioni --reverse e --first-parent se usate insieme richiedono che sia " "specificato un intervallo nella catena del primo commit genitore" -#: blame.c:2770 +#: blame.c:2773 #, c-format msgid "no such path %s in %s" msgstr "il percorso %s in %s non esiste" -#: blame.c:2781 +#: blame.c:2784 #, c-format msgid "cannot read blob %s for path %s" msgstr "impossibile leggere il blob %s per il percorso %s" @@ -1303,7 +1304,7 @@ msgstr "'%s' non sembra essere un file bundle v2" msgid "unrecognized header: %s%s (%d)" msgstr "intestazione non riconosciuta: %s%s (%d)" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2221 sequencer.c:2962 #: builtin/commit.c:791 #, c-format msgid "could not open '%s'" @@ -1356,7 +1357,7 @@ msgstr "comando rev-list morto" msgid "ref '%s' is excluded by the rev-list options" msgstr "il riferimento '%s' è escluso dalle opzioni di rev-list" -#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306 +#: bundle.c:460 builtin/log.c:202 builtin/log.c:1733 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "argomento non riconosciuto: %s" @@ -1379,8 +1380,8 @@ msgstr "comando index-pack morto" msgid "invalid color value: %.*s" msgstr "valore colore non valido: %.*s" -#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399 -#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455 +#: commit.c:50 sequencer.c:2665 builtin/am.c:354 builtin/am.c:398 +#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456 #, c-format msgid "could not parse %s" msgstr "impossibile analizzare %s" @@ -1410,27 +1411,27 @@ msgstr "" "Per disabilitare questo messaggio, esegui\n" "\"git config advice.graftFileDeprecated false\"" -#: commit.c:1127 +#: commit.c:1128 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "Il commit %s ha una firma GPG non affidabile, presumibilmente di %s." -#: commit.c:1130 +#: commit.c:1131 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "Il commit %s ha una firma GPG non valida presumibilmente di %s." -#: commit.c:1133 +#: commit.c:1134 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Il commit %s non ha una firma GPG." -#: commit.c:1136 +#: commit.c:1137 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Il commit %s ha una firma GPG valida di %s\n" -#: commit.c:1390 +#: commit.c:1391 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -1494,55 +1495,65 @@ msgstr "catena grafo dei commit non valida: la riga '%s' non è un hash" msgid "unable to find all commit-graph files" msgstr "impossibile trovare tutti i file grafo dei commit" -#: commit-graph.c:554 commit-graph.c:614 +#: commit-graph.c:561 commit-graph.c:621 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "" "posizione commit non valida. Il grafo dei commit è probabilmente corrotto" -#: commit-graph.c:575 +#: commit-graph.c:582 #, c-format msgid "could not find commit %s" msgstr "impossibile trovare il commit %s" -#: commit-graph.c:1002 builtin/pack-objects.c:2657 +#: commit-graph.c:855 builtin/am.c:1287 +#, c-format +msgid "unable to parse commit %s" +msgstr "impossibile analizzare il commit %s" + +#: commit-graph.c:859 +#, c-format +msgid "unable to get tree for %s" +msgstr "impossibile recuperare l'albero per %s" + +#: commit-graph.c:1017 builtin/pack-objects.c:2641 #, c-format msgid "unable to get type of object %s" msgstr "impossibile recuperare il tipo dell'oggetto %s" -#: commit-graph.c:1034 +#: commit-graph.c:1049 msgid "Loading known commits in commit graph" msgstr "Caricamento commit noti nel grafo dei commit in corso" -#: commit-graph.c:1051 +#: commit-graph.c:1066 msgid "Expanding reachable commits in commit graph" msgstr "Espansione dei commit raggiungibili nel grafo dei commit in corso" -#: commit-graph.c:1070 +#: commit-graph.c:1085 msgid "Clearing commit marks in commit graph" msgstr "Rimozione dei contrassegni commit nel grafo dei commit in corso" -#: commit-graph.c:1089 +#: commit-graph.c:1104 msgid "Computing commit graph generation numbers" msgstr "Calcolo numeri generazione del grafo dei commit in corso" -#: commit-graph.c:1163 +#: commit-graph.c:1179 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "Ricerca dei commit per il grafo dei commit in %d pack in corso" msgstr[1] "Ricerca dei commit per il grafo dei commit in %d pack in corso" -#: commit-graph.c:1176 +#: commit-graph.c:1192 #, c-format msgid "error adding pack %s" msgstr "errore durante l'aggiunta del pack %s" -#: commit-graph.c:1180 +#: commit-graph.c:1196 #, c-format msgid "error opening index for %s" msgstr "errore durante l'apertura dell'indice per %s" -#: commit-graph.c:1204 +#: commit-graph.c:1220 #, c-format msgid "Finding commits for commit graph from %d ref" msgid_plural "Finding commits for commit graph from %d refs" @@ -1551,132 +1562,137 @@ msgstr[0] "" msgstr[1] "" "Ricerca dei commit per il grafo dei commit da %d riferimenti in corso" -#: commit-graph.c:1238 +#: commit-graph.c:1240 +#, c-format +msgid "invalid commit object id: %s" +msgstr "ID oggetto commit non valido: %s" + +#: commit-graph.c:1255 msgid "Finding commits for commit graph among packed objects" msgstr "" "Ricerca dei commit per il grafo dei commit fra gli oggetti nei pack in corso" -#: commit-graph.c:1253 +#: commit-graph.c:1270 msgid "Counting distinct commits in commit graph" msgstr "Conteggio commit distinti nel grafo dei commit in corso" -#: commit-graph.c:1284 +#: commit-graph.c:1300 msgid "Finding extra edges in commit graph" msgstr "Ricerca degli archi aggiuntivi nel grafo dei commit in corso" -#: commit-graph.c:1332 +#: commit-graph.c:1346 msgid "failed to write correct number of base graph ids" msgstr "impossibile scrivere il numero esatto degli ID grafo di base" -#: commit-graph.c:1365 midx.c:811 +#: commit-graph.c:1379 midx.c:810 #, c-format msgid "unable to create leading directories of %s" msgstr "impossibile creare le prime directory di %s" -#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240 +#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:241 #, c-format msgid "unable to create '%s'" msgstr "impossibile creare '%s'" -#: commit-graph.c:1437 +#: commit-graph.c:1451 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "Scrittura in %d passaggio del grafo dei commit in corso" msgstr[1] "Scrittura in %d passaggi del grafo dei commit in corso" -#: commit-graph.c:1478 +#: commit-graph.c:1492 msgid "unable to open commit-graph chain file" msgstr "impossibile aprire il file catena grafo dei commit" -#: commit-graph.c:1490 +#: commit-graph.c:1504 msgid "failed to rename base commit-graph file" msgstr "impossibile ridenominare il file di base grafo dei commit" -#: commit-graph.c:1510 +#: commit-graph.c:1524 msgid "failed to rename temporary commit-graph file" msgstr "impossibile ridenominare il file temporaneo grafo dei commit" -#: commit-graph.c:1621 +#: commit-graph.c:1635 msgid "Scanning merged commits" msgstr "Scansione dei commit sottoposti a merge in corso" -#: commit-graph.c:1632 +#: commit-graph.c:1646 #, c-format msgid "unexpected duplicate commit id %s" msgstr "ID commit duplicato inatteso: %s" -#: commit-graph.c:1657 +#: commit-graph.c:1670 msgid "Merging commit-graph" msgstr "Merge del grafo dei commit in corso" -#: commit-graph.c:1844 +#: commit-graph.c:1860 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "" "il formato del grafo dei commit non può essere usato per scrivere %d commit" -#: commit-graph.c:1855 +#: commit-graph.c:1871 msgid "too many commits to write graph" msgstr "troppi commit da scrivere nel grafo" -#: commit-graph.c:1945 +#: commit-graph.c:1961 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" "il file del grafo dei commit ha un checksum non corretto e probabilmente è " "corrotto" -#: commit-graph.c:1955 +#: commit-graph.c:1971 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "il grafo dei commit ha un ordine OID non corretto: %s seguito da %s" -#: commit-graph.c:1965 commit-graph.c:1980 +#: commit-graph.c:1981 commit-graph.c:1996 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" "il grafo dei commit ha un valore fanout non corretto: fanout[%d] = %u != %u" -#: commit-graph.c:1972 +#: commit-graph.c:1988 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "impossibile analizzare il commit %s nel grafo dei commit" -#: commit-graph.c:1989 +#: commit-graph.c:2006 msgid "Verifying commits in commit graph" msgstr "Verifica dei commit nel grafo dei commit in corso" -#: commit-graph.c:2002 +#: commit-graph.c:2020 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" "impossibile analizzare il commit %s dal database oggetti per il grafo dei " "commit" -#: commit-graph.c:2009 +#: commit-graph.c:2027 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" "l'OID dell'albero radice per il commit %s nel grafo dei commit è %s != %s" -#: commit-graph.c:2019 +#: commit-graph.c:2037 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "l'elenco genitori nel grafo dei commit per il commit %s è troppo lungo" -#: commit-graph.c:2028 +#: commit-graph.c:2046 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "il genitore nel grafo dei commit per %s è %s != %s" -#: commit-graph.c:2041 +#: commit-graph.c:2059 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" "l'elenco genitori nel grafo dei commit per il commit %s è finito prima del " "previsto" -#: commit-graph.c:2046 +#: commit-graph.c:2064 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -1684,7 +1700,7 @@ msgstr "" "il grafo dei commit ha un numero generazione zero per il commit %s ma non " "pari a zero per gli altri" -#: commit-graph.c:2050 +#: commit-graph.c:2068 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -1692,12 +1708,12 @@ msgstr "" "il grafo dei commit ha un numero generazione non pari a zero per il commit " "%s ma pari a zero per gli altri" -#: commit-graph.c:2065 +#: commit-graph.c:2083 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "il numero generazione nel grafo dei commit per il commit %s è %u != %u" -#: commit-graph.c:2071 +#: commit-graph.c:2089 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" @@ -1746,7 +1762,7 @@ msgstr "la chiave non contiene una sezione: %s" msgid "key does not contain variable name: %s" msgstr "la chiave non contiene un nome variabile: %s" -#: config.c:406 sequencer.c:2463 +#: config.c:406 sequencer.c:2401 #, c-format msgid "invalid key: %s" msgstr "chiave non valida: %s" @@ -1873,155 +1889,148 @@ msgstr "core.commentChar dovrebbe essere composto da un solo carattere" msgid "invalid mode for object creation: %s" msgstr "modalità non valida per la creazione di un oggetto: %s" -#: config.c:1430 +#: config.c:1425 #, c-format msgid "malformed value for %s" msgstr "valore malformato per %s" -#: config.c:1456 +#: config.c:1451 #, c-format msgid "malformed value for %s: %s" msgstr "valore malformato per %s: %s" -#: config.c:1457 +#: config.c:1452 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "dev'essere nothing, matching, simple, upstream o current" -#: config.c:1518 builtin/pack-objects.c:3410 +#: config.c:1513 builtin/pack-objects.c:3394 #, c-format msgid "bad pack compression level %d" msgstr "livello compressione pack %d non valido" -#: config.c:1639 +#: config.c:1634 #, c-format msgid "unable to load config blob object '%s'" msgstr "impossibile caricare l'oggetto blob configurazione '%s'" -#: config.c:1642 +#: config.c:1637 #, c-format msgid "reference '%s' does not point to a blob" msgstr "il riferimento '%s' non punta ad un blob" -#: config.c:1659 +#: config.c:1654 #, c-format msgid "unable to resolve config blob '%s'" msgstr "impossibile risolvere il blob configurazione '%s'" -#: config.c:1689 +#: config.c:1684 #, c-format msgid "failed to parse %s" msgstr "analisi di %s non riuscita" -#: config.c:1745 +#: config.c:1740 msgid "unable to parse command-line config" msgstr "impossibile analizzare la configurazione a riga di comando" -#: config.c:2094 +#: config.c:2091 msgid "unknown error occurred while reading the configuration files" msgstr "" "si è verificato un errore imprevisto durante la lettura dei file di " "configurazione" -#: config.c:2264 +#: config.c:2261 #, c-format msgid "Invalid %s: '%s'" msgstr "%s non valido: '%s'" -#: config.c:2307 -#, c-format -msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" -msgstr "" -"valore core.untrackedCache '%s' non valido; utilizzerò il valore predefinito " -"'keep'" - -#: config.c:2333 +#: config.c:2306 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" "il valore splitIndex.maxPercentChange '%d' dovrebbe essere compreso fra 0 e " "100" -#: config.c:2379 +#: config.c:2352 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "impossibile analizzare '%s' dalla configurazione a riga di comando" -#: config.c:2381 +#: config.c:2354 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "variabile configurazione '%s' errata nel file '%s' alla riga %d" -#: config.c:2462 +#: config.c:2435 #, c-format msgid "invalid section name '%s'" msgstr "nome sezione '%s' non valido" -#: config.c:2494 +#: config.c:2467 #, c-format msgid "%s has multiple values" msgstr "%s ha più valori" -#: config.c:2523 +#: config.c:2496 #, c-format msgid "failed to write new configuration file %s" msgstr "scrittura del nuovo file di configurazione %s non riuscita" -#: config.c:2775 config.c:3099 +#: config.c:2748 config.c:3072 #, c-format msgid "could not lock config file %s" msgstr "impossibile bloccare il file di configurazione %s" -#: config.c:2786 +#: config.c:2759 #, c-format msgid "opening %s" msgstr "apertura di %s in corso" -#: config.c:2821 builtin/config.c:328 +#: config.c:2794 builtin/config.c:328 #, c-format msgid "invalid pattern: %s" msgstr "pattern non valido: %s" -#: config.c:2846 +#: config.c:2819 #, c-format msgid "invalid config file %s" msgstr "file di configurazione %s non valido" -#: config.c:2859 config.c:3112 +#: config.c:2832 config.c:3085 #, c-format msgid "fstat on %s failed" msgstr "fstat di %s non riuscita" -#: config.c:2870 +#: config.c:2843 #, c-format msgid "unable to mmap '%s'" msgstr "impossibile eseguire mmap su '%s'" -#: config.c:2879 config.c:3117 +#: config.c:2852 config.c:3090 #, c-format msgid "chmod on %s failed" msgstr "esecuzione chmod su %s non riuscita" -#: config.c:2964 config.c:3214 +#: config.c:2937 config.c:3187 #, c-format msgid "could not write config file %s" msgstr "impossibile scrivere il file di configurazione %s" -#: config.c:2998 +#: config.c:2971 #, c-format msgid "could not set '%s' to '%s'" msgstr "impossibile impostare '%s' a '%s'" -#: config.c:3000 builtin/remote.c:782 +#: config.c:2973 builtin/remote.c:782 #, c-format msgid "could not unset '%s'" msgstr "impossibile eliminare l'impostazione di '%s'" -#: config.c:3090 +#: config.c:3063 #, c-format msgid "invalid section name: %s" msgstr "nome sezione non valido: %s" -#: config.c:3257 +#: config.c:3230 #, c-format msgid "missing value for '%s'" msgstr "valore mancante per '%s'" @@ -2146,7 +2155,7 @@ msgstr "impossibile risolvere %s (%s)" msgid "unknown port %s" msgstr "porta %s sconosciuta" -#: connect.c:845 connect.c:1171 +#: connect.c:845 connect.c:1175 #, c-format msgid "strange hostname '%s' blocked" msgstr "nome host strano '%s' bloccato" @@ -2161,60 +2170,60 @@ msgstr "porta strana '%s' bloccata" msgid "cannot start proxy %s" msgstr "impossibile avviare il proxy %s" -#: connect.c:924 +#: connect.c:928 msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "" "nessun percorso specificato; vedere 'git help pull' per le sintassi URL " "valide" -#: connect.c:1119 +#: connect.c:1123 msgid "ssh variant 'simple' does not support -4" msgstr "la variante SSH 'simple' non supporta -4" -#: connect.c:1131 +#: connect.c:1135 msgid "ssh variant 'simple' does not support -6" msgstr "la variante SSH 'simple' non supporta -6" -#: connect.c:1148 +#: connect.c:1152 msgid "ssh variant 'simple' does not support setting port" msgstr "la variante SSH 'simple' non supporta l'impostazione della porta" -#: connect.c:1260 +#: connect.c:1264 #, c-format msgid "strange pathname '%s' blocked" msgstr "percorso strano '%s' bloccato" -#: connect.c:1307 +#: connect.c:1311 msgid "unable to fork" msgstr "impossibile eseguire fork" -#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43 +#: connected.c:88 builtin/fsck.c:221 builtin/prune.c:43 msgid "Checking connectivity" msgstr "Controllo connessione in corso" -#: connected.c:98 +#: connected.c:100 msgid "Could not run 'git rev-list'" msgstr "Impossibile eseguire 'git-rev-list'" -#: connected.c:118 +#: connected.c:120 msgid "failed write to rev-list" msgstr "scrittura nella rev-list non riuscita" -#: connected.c:125 +#: connected.c:127 msgid "failed to close rev-list's stdin" msgstr "chiusura standard input della rev-list non riuscita" -#: convert.c:193 +#: convert.c:194 #, c-format msgid "illegal crlf_action %d" msgstr "crlf_action %d illecita" -#: convert.c:206 +#: convert.c:207 #, c-format msgid "CRLF would be replaced by LF in %s" msgstr "CRLF sarebbe sostituito da LF in %s" -#: convert.c:208 +#: convert.c:209 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" @@ -2223,12 +2232,12 @@ msgstr "" "CRLF sarà sostituito da LF in %s.\n" "Il file avrà i suoi fine riga originari nella propria directory di lavoro" -#: convert.c:216 +#: convert.c:217 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "LF sarebbe sostituito da CRLF in %s" -#: convert.c:218 +#: convert.c:219 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" @@ -2237,12 +2246,12 @@ msgstr "" "LF sarà sostituito da CRLF in %s.\n" "Il file avrà i suoi fine riga originari nella propria directory di lavoro" -#: convert.c:279 +#: convert.c:280 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "Il BOM è vietato in '%s' se il file è codificato come %s" -#: convert.c:286 +#: convert.c:287 #, c-format msgid "" "The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-" @@ -2251,12 +2260,12 @@ msgstr "" "Il file '%s' contiene un indicatore dell'ordine dei byte (BOM). Usare UTF-%s " "come codifica dell'albero di lavoro." -#: convert.c:304 +#: convert.c:305 #, c-format msgid "BOM is required in '%s' if encoded as %s" msgstr "Il BOM è richiesto in '%s' se il file è codificato come %s" -#: convert.c:306 +#: convert.c:307 #, c-format msgid "" "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" @@ -2266,51 +2275,51 @@ msgstr "" "o UTF-%sLE (a seconda dell'ordine dei byte) come codifica dell'albero di " "lavoro." -#: convert.c:424 convert.c:495 +#: convert.c:425 convert.c:496 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "conversione della codifica '%s' da %s a %s non riuscita" -#: convert.c:467 +#: convert.c:468 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "" "il risultato della codifica di '%s' da %s a %s e viceversa non è lo stesso" -#: convert.c:673 +#: convert.c:674 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "impossibile eseguire fork per eseguire il filtro esterno '%s'" -#: convert.c:693 +#: convert.c:694 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "impossibile fornire l'input al filtro esterno '%s'" -#: convert.c:700 +#: convert.c:701 #, c-format msgid "external filter '%s' failed %d" msgstr "esecuzione del filtro esterno '%s' non riuscita: %d" -#: convert.c:735 convert.c:738 +#: convert.c:736 convert.c:739 #, c-format msgid "read from external filter '%s' failed" msgstr "lettura dal filtro esterno '%s' non riuscita" -#: convert.c:741 convert.c:796 +#: convert.c:742 convert.c:797 #, c-format msgid "external filter '%s' failed" msgstr "esecuzione del filtro esterno '%s' non riuscita" -#: convert.c:844 +#: convert.c:845 msgid "unexpected filter type" msgstr "tipo filtro inatteso" -#: convert.c:855 +#: convert.c:856 msgid "path name too long for external filter" msgstr "nome percorso troppo lungo per il filtro esterno" -#: convert.c:929 +#: convert.c:930 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " @@ -2319,67 +2328,67 @@ msgstr "" "il filtro esterno '%s' non è più disponibile nonostante non tutti i percorsi " "siano stati filtrati" -#: convert.c:1228 +#: convert.c:1229 msgid "true/false are no valid working-tree-encodings" msgstr "true/false non sono codifiche dell'albero di lavoro valide" -#: convert.c:1398 convert.c:1432 +#: convert.c:1417 convert.c:1451 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s: esecuzione del filtro clean '%s' non riuscita" -#: convert.c:1476 +#: convert.c:1495 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s: esecuzione del filtro smudge '%s' non riuscita" -#: date.c:137 +#: date.c:138 msgid "in the future" msgstr "in futuro" -#: date.c:143 +#: date.c:144 #, c-format msgid "%<PRIuMAX> second ago" msgid_plural "%<PRIuMAX> seconds ago" msgstr[0] "%<PRIuMAX> secondo fa" msgstr[1] "%<PRIuMAX> secondi fa" -#: date.c:150 +#: date.c:151 #, c-format msgid "%<PRIuMAX> minute ago" msgid_plural "%<PRIuMAX> minutes ago" msgstr[0] "%<PRIuMAX> minuto fa" msgstr[1] "%<PRIuMAX> minuti fa" -#: date.c:157 +#: date.c:158 #, c-format msgid "%<PRIuMAX> hour ago" msgid_plural "%<PRIuMAX> hours ago" msgstr[0] "%<PRIuMAX> ora fa" msgstr[1] "%<PRIuMAX> ore fa" -#: date.c:164 +#: date.c:165 #, c-format msgid "%<PRIuMAX> day ago" msgid_plural "%<PRIuMAX> days ago" msgstr[0] "%<PRIuMAX> giorno fa" msgstr[1] "%<PRIuMAX> giorni fa" -#: date.c:170 +#: date.c:171 #, c-format msgid "%<PRIuMAX> week ago" msgid_plural "%<PRIuMAX> weeks ago" msgstr[0] "%<PRIuMAX> settimana fa" msgstr[1] "%<PRIuMAX> settimane fa" -#: date.c:177 +#: date.c:178 #, c-format msgid "%<PRIuMAX> month ago" msgid_plural "%<PRIuMAX> months ago" msgstr[0] "%<PRIuMAX> mese fa" msgstr[1] "%<PRIuMAX> mesi fa" -#: date.c:188 +#: date.c:189 #, c-format msgid "%<PRIuMAX> year" msgid_plural "%<PRIuMAX> years" @@ -2387,14 +2396,14 @@ msgstr[0] "%<PRIuMAX> anno" msgstr[1] "%<PRIuMAX> anni" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:191 +#: date.c:192 #, c-format msgid "%s, %<PRIuMAX> month ago" msgid_plural "%s, %<PRIuMAX> months ago" msgstr[0] "%s, %<PRIuMAX> mese fa" msgstr[1] "%s, %<PRIuMAX> mesi fa" -#: date.c:196 date.c:201 +#: date.c:197 date.c:202 #, c-format msgid "%<PRIuMAX> year ago" msgid_plural "%<PRIuMAX> years ago" @@ -2433,7 +2442,7 @@ msgstr "Contrassegnate %d isole, fatto.\n" msgid "failed to read orderfile '%s'" msgstr "lettura dell'orderfile '%s' non riuscita" -#: diffcore-rename.c:544 +#: diffcore-rename.c:543 msgid "Performing inexact rename detection" msgstr "Rilevamento ridenominazione non esatta in corso" @@ -2502,36 +2511,36 @@ msgstr "" "Trovati errori nella variabile di configurazione 'diff.dirstat':\n" "%s" -#: diff.c:4215 +#: diff.c:4218 #, c-format msgid "external diff died, stopping at %s" msgstr "processo esterno diff morto, mi fermo a %s" -#: diff.c:4560 +#: diff.c:4563 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" "le opzioni --name-only, --name-status, --check e -s sono mutuamente esclusive" -#: diff.c:4563 +#: diff.c:4566 msgid "-G, -S and --find-object are mutually exclusive" msgstr "le opzioni -G, -S e --find-object sono mutuamente esclusive" -#: diff.c:4641 +#: diff.c:4644 msgid "--follow requires exactly one pathspec" msgstr "--follow richiede esattamente uno specificatore percorso" -#: diff.c:4689 +#: diff.c:4692 #, c-format msgid "invalid --stat value: %s" msgstr "valore non valido per --stat: %s" -#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222 +#: diff.c:4697 diff.c:4702 diff.c:4707 diff.c:4712 diff.c:5225 #: parse-options.c:199 parse-options.c:203 #, c-format msgid "%s expects a numerical value" msgstr "%s richiede un valore numerico" -#: diff.c:4726 +#: diff.c:4729 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -2540,42 +2549,42 @@ msgstr "" "Analisi del parametro dell'opzione --dirstat/-X non riuscita:\n" "%s" -#: diff.c:4811 +#: diff.c:4814 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "classe modifica '%c' sconosciuta in --diff-filter=%s" -#: diff.c:4835 +#: diff.c:4838 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "valore sconosciuto dopo ws-error-highlight=%.*s" -#: diff.c:4849 +#: diff.c:4852 #, c-format msgid "unable to resolve '%s'" msgstr "impossibile risolvere '%s'" -#: diff.c:4899 diff.c:4905 +#: diff.c:4902 diff.c:4908 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s richiede il formato <n>/<m>" -#: diff.c:4917 +#: diff.c:4920 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s richiede un carattere, ricevuto '%s'" -#: diff.c:4938 +#: diff.c:4941 #, c-format msgid "bad --color-moved argument: %s" msgstr "argomento --color-moved errato: %s" -#: diff.c:4957 +#: diff.c:4960 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "modo non valido '%s' in --color-moved-ws" -#: diff.c:4997 +#: diff.c:5000 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -2583,151 +2592,151 @@ msgstr "" "l'opzione diff-algorithm accetta i valori \"myers\", \"minimal\", \"patience" "\" e \"histogram\"" -#: diff.c:5033 diff.c:5053 +#: diff.c:5036 diff.c:5056 #, c-format msgid "invalid argument to %s" msgstr "argomento non valido per %s" -#: diff.c:5191 +#: diff.c:5194 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "analisi del parametro dell'opzione --submodule non riuscita: '%s'" -#: diff.c:5247 +#: diff.c:5250 #, c-format msgid "bad --word-diff argument: %s" msgstr "argomento --word-diff errato: %s" -#: diff.c:5270 +#: diff.c:5273 msgid "Diff output format options" msgstr "Opzioni formato output diff" -#: diff.c:5272 diff.c:5278 +#: diff.c:5275 diff.c:5281 msgid "generate patch" msgstr "genera patch" -#: diff.c:5275 builtin/log.c:172 +#: diff.c:5278 builtin/log.c:172 msgid "suppress diff output" msgstr "non visualizzare l'output del diff" -#: diff.c:5280 diff.c:5394 diff.c:5401 +#: diff.c:5283 diff.c:5397 diff.c:5404 msgid "<n>" msgstr "<n>" -#: diff.c:5281 diff.c:5284 +#: diff.c:5284 diff.c:5287 msgid "generate diffs with <n> lines context" msgstr "genera diff con <n> righe di contesto" -#: diff.c:5286 +#: diff.c:5289 msgid "generate the diff in raw format" msgstr "genera il diff in formato grezzo" -#: diff.c:5289 +#: diff.c:5292 msgid "synonym for '-p --raw'" msgstr "sinonimo di '-p --raw'" -#: diff.c:5293 +#: diff.c:5296 msgid "synonym for '-p --stat'" msgstr "sinonimo di '-p --stat'" -#: diff.c:5297 +#: diff.c:5300 msgid "machine friendly --stat" msgstr "--stat leggibile da una macchina" -#: diff.c:5300 +#: diff.c:5303 msgid "output only the last line of --stat" msgstr "emetti in output solo l'ultima riga di --stat" -#: diff.c:5302 diff.c:5310 +#: diff.c:5305 diff.c:5313 msgid "<param1,param2>..." msgstr "<parametro1,parametro2>..." -#: diff.c:5303 +#: diff.c:5306 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" "emetti in output la distribuzione del numero di modifiche relativo a ogni " "sottodirectory" -#: diff.c:5307 +#: diff.c:5310 msgid "synonym for --dirstat=cumulative" msgstr "sinonimo di --dirstat=cumulative" -#: diff.c:5311 +#: diff.c:5314 msgid "synonym for --dirstat=files,param1,param2..." msgstr "sinonimo di --dirstat=files,parametro1,parametro2..." -#: diff.c:5315 +#: diff.c:5318 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" "avvisa se le modifiche introducono marcatori conflitto o errori spazi bianchi" -#: diff.c:5318 +#: diff.c:5321 msgid "condensed summary such as creations, renames and mode changes" msgstr "" "riassunto conciso (ad es. elementi creati, ridenominati e modifiche modi)" -#: diff.c:5321 +#: diff.c:5324 msgid "show only names of changed files" msgstr "visualizza solo i nomi dei file modificati" -#: diff.c:5324 +#: diff.c:5327 msgid "show only names and status of changed files" msgstr "visualizza solo i nomi e lo stato dei file modificati" -#: diff.c:5326 +#: diff.c:5329 msgid "<width>[,<name-width>[,<count>]]" msgstr "<ampiezza>[,<ampiezza nome>[,<numero>]]" -#: diff.c:5327 +#: diff.c:5330 msgid "generate diffstat" msgstr "genera diffstat" -#: diff.c:5329 diff.c:5332 diff.c:5335 +#: diff.c:5332 diff.c:5335 diff.c:5338 msgid "<width>" msgstr "<ampiezza>" -#: diff.c:5330 +#: diff.c:5333 msgid "generate diffstat with a given width" msgstr "genera il diffstat con un'ampiezza specificata" -#: diff.c:5333 +#: diff.c:5336 msgid "generate diffstat with a given name width" msgstr "genera il diffstat con un'ampiezza nomi specificata" -#: diff.c:5336 +#: diff.c:5339 msgid "generate diffstat with a given graph width" msgstr "genera il diffstat con un'ampiezza grafo specificata" -#: diff.c:5338 +#: diff.c:5341 msgid "<count>" msgstr "<numero>" -#: diff.c:5339 +#: diff.c:5342 msgid "generate diffstat with limited lines" msgstr "genera il diffstat con righe limitate" -#: diff.c:5342 +#: diff.c:5345 msgid "generate compact summary in diffstat" msgstr "genera riassunto conciso nel diffstat" -#: diff.c:5345 +#: diff.c:5348 msgid "output a binary diff that can be applied" msgstr "stampa in output un diff binario che può essere applicato" -#: diff.c:5348 +#: diff.c:5351 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "visualizza i nomi oggetto pre e post immagine nelle righe \"indice\"" -#: diff.c:5350 +#: diff.c:5353 msgid "show colored diff" msgstr "visualizza diff colorato" -#: diff.c:5351 +#: diff.c:5354 msgid "<kind>" msgstr "<tipo>" -#: diff.c:5352 +#: diff.c:5355 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -2735,7 +2744,7 @@ msgstr "" "evidenzia gli errori di spazi bianchi nelle righe 'contesto', 'vecchie' o " "'nuove' nel diff" -#: diff.c:5355 +#: diff.c:5358 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -2743,91 +2752,91 @@ msgstr "" "non rimuovere i nomi percorso e usare caratteri NUL come terminatori campo " "in --raw o --numstat" -#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470 +#: diff.c:5361 diff.c:5364 diff.c:5367 diff.c:5473 msgid "<prefix>" msgstr "<prefisso>" -#: diff.c:5359 +#: diff.c:5362 msgid "show the given source prefix instead of \"a/\"" msgstr "visualizza il prefisso sorgente specificato invece di \"a/\"" -#: diff.c:5362 +#: diff.c:5365 msgid "show the given destination prefix instead of \"b/\"" msgstr "visualizza il prefisso destinazione specificato invece di \"b/\"" -#: diff.c:5365 +#: diff.c:5368 msgid "prepend an additional prefix to every line of output" msgstr "anteponi un prefisso aggiuntivo ad ogni riga dell'output" -#: diff.c:5368 +#: diff.c:5371 msgid "do not show any source or destination prefix" msgstr "non visualizzare alcun prefisso sorgente o destinazione" -#: diff.c:5371 +#: diff.c:5374 msgid "show context between diff hunks up to the specified number of lines" msgstr "" "visualizza il contesto tra gli hunk del diff fino al numero di righe " "specificato" -#: diff.c:5375 diff.c:5380 diff.c:5385 +#: diff.c:5378 diff.c:5383 diff.c:5388 msgid "<char>" msgstr "<carattere>" -#: diff.c:5376 +#: diff.c:5379 msgid "specify the character to indicate a new line instead of '+'" msgstr "specifica il carattere che indica una nuova riga al posto di '+'" -#: diff.c:5381 +#: diff.c:5384 msgid "specify the character to indicate an old line instead of '-'" msgstr "specifica il carattere che indica una vecchia riga al posto di '-'" -#: diff.c:5386 +#: diff.c:5389 msgid "specify the character to indicate a context instead of ' '" msgstr "specifica il carattere che indica un contesto al posto di ' '" -#: diff.c:5389 +#: diff.c:5392 msgid "Diff rename options" msgstr "Opzioni rinominazione diff" -#: diff.c:5390 +#: diff.c:5393 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5391 +#: diff.c:5394 msgid "break complete rewrite changes into pairs of delete and create" msgstr "" "spezza modifiche di riscrittura completa in coppie eliminazione/creazione" -#: diff.c:5395 +#: diff.c:5398 msgid "detect renames" msgstr "rileva le ridenominazioni" -#: diff.c:5399 +#: diff.c:5402 msgid "omit the preimage for deletes" msgstr "ometti la preimmagine per le eliminazioni" -#: diff.c:5402 +#: diff.c:5405 msgid "detect copies" msgstr "rileva le copie" -#: diff.c:5406 +#: diff.c:5409 msgid "use unmodified files as source to find copies" msgstr "usa file non modificati come sorgente per trovare copie" -#: diff.c:5408 +#: diff.c:5411 msgid "disable rename detection" msgstr "disabilita rilevamento ridenominazione" -#: diff.c:5411 +#: diff.c:5414 msgid "use empty blobs as rename source" msgstr "usa blob vuoti come sorgente ridenominazione" -#: diff.c:5413 +#: diff.c:5416 msgid "continue listing the history of a file beyond renames" msgstr "" "continua a elencare la cronologia di un file al di là delle ridenominazioni" -#: diff.c:5416 +#: diff.c:5419 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -2835,159 +2844,159 @@ msgstr "" "impedisci il rilevamento ridenominazione/copia se il numero delle " "destinazioni ridenominazione/copia eccede il limite specificato" -#: diff.c:5418 +#: diff.c:5421 msgid "Diff algorithm options" msgstr "Opzioni algoritmo diff" -#: diff.c:5420 +#: diff.c:5423 msgid "produce the smallest possible diff" msgstr "produci il diff più piccolo possibile" -#: diff.c:5423 +#: diff.c:5426 msgid "ignore whitespace when comparing lines" msgstr "ignora gli spazi bianchi durante il confronto delle righe" -#: diff.c:5426 +#: diff.c:5429 msgid "ignore changes in amount of whitespace" msgstr "ignora le modifiche al numero degli spazi bianchi" -#: diff.c:5429 +#: diff.c:5432 msgid "ignore changes in whitespace at EOL" msgstr "ignora modifiche agli spazi bianchi a fine riga" -#: diff.c:5432 +#: diff.c:5435 msgid "ignore carrier-return at the end of line" msgstr "ignora carattere ritorno a capo a fine riga" -#: diff.c:5435 +#: diff.c:5438 msgid "ignore changes whose lines are all blank" msgstr "ignora modifiche che riguardano solo righe vuote" -#: diff.c:5438 +#: diff.c:5441 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "" "euristica per spostare i limiti degli hunk nel diff per una lettura agevole" -#: diff.c:5441 +#: diff.c:5444 msgid "generate diff using the \"patience diff\" algorithm" msgstr "genera il diff usando l'algoritmo \"patience diff\"" -#: diff.c:5445 +#: diff.c:5448 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "genera il diff usando l'algoritmo \"histogram diff\"" -#: diff.c:5447 +#: diff.c:5450 msgid "<algorithm>" msgstr "<algoritmo>" -#: diff.c:5448 +#: diff.c:5451 msgid "choose a diff algorithm" msgstr "seleziona un algoritmo diff" -#: diff.c:5450 +#: diff.c:5453 msgid "<text>" msgstr "<testo>" -#: diff.c:5451 +#: diff.c:5454 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "genera il diff usando l'algoritmo \"anchored diff\"" -#: diff.c:5453 diff.c:5462 diff.c:5465 +#: diff.c:5456 diff.c:5465 diff.c:5468 msgid "<mode>" msgstr "<modalità>" -#: diff.c:5454 +#: diff.c:5457 msgid "show word diff, using <mode> to delimit changed words" msgstr "" "visualizza il diff parola per parola usando <modalità> per delimitare le " "parole modificate" -#: diff.c:5456 diff.c:5459 diff.c:5504 +#: diff.c:5459 diff.c:5462 diff.c:5507 msgid "<regex>" msgstr "<espressione regolare>" -#: diff.c:5457 +#: diff.c:5460 msgid "use <regex> to decide what a word is" msgstr "usa <espressione regolare> per decidere cosa costituisce una parola" -#: diff.c:5460 +#: diff.c:5463 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "" "equivalente di --word-diff=color --word-diff-regex=<espressione regolare>" -#: diff.c:5463 +#: diff.c:5466 msgid "moved lines of code are colored differently" msgstr "le righe di codice spostate sono colorate in modo diverso" -#: diff.c:5466 +#: diff.c:5469 msgid "how white spaces are ignored in --color-moved" msgstr "modo in cui sono ignorati gli spazi bianchi in --color-moved" -#: diff.c:5469 +#: diff.c:5472 msgid "Other diff options" msgstr "Altre opzioni diff" -#: diff.c:5471 +#: diff.c:5474 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" "se eseguito da una sottodirectory, escludi le modifiche esterne ad essa e " "visualizza i percorsi relativi" -#: diff.c:5475 +#: diff.c:5478 msgid "treat all files as text" msgstr "tratta tutti i file come se fossero di testo" -#: diff.c:5477 +#: diff.c:5480 msgid "swap two inputs, reverse the diff" msgstr "scambia i due input, genera un diff al contrario" -#: diff.c:5479 +#: diff.c:5482 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "esci con codice 1 se ci sono differenze, con 0 altrimenti" -#: diff.c:5481 +#: diff.c:5484 msgid "disable all output of the program" msgstr "disabilita l'intero output del programma" -#: diff.c:5483 +#: diff.c:5486 msgid "allow an external diff helper to be executed" msgstr "consenti l'esecuzione di un helper diff esterno" -#: diff.c:5485 +#: diff.c:5488 msgid "run external text conversion filters when comparing binary files" msgstr "" "esegui filtri di conversione in testo esterni quando si confrontano file " "binari" -#: diff.c:5487 +#: diff.c:5490 msgid "<when>" msgstr "<quando>" -#: diff.c:5488 +#: diff.c:5491 msgid "ignore changes to submodules in the diff generation" msgstr "ignora le modifiche ai sottomoduli durante la generazione del diff" -#: diff.c:5491 +#: diff.c:5494 msgid "<format>" msgstr "<formato>" -#: diff.c:5492 +#: diff.c:5495 msgid "specify how differences in submodules are shown" msgstr "specifica come verranno visualizzate le differenze nei sottomoduli" -#: diff.c:5496 +#: diff.c:5499 msgid "hide 'git add -N' entries from the index" msgstr "nascondi le voci 'git add -N' nell'indice" -#: diff.c:5499 +#: diff.c:5502 msgid "treat 'git add -N' entries as real in the index" msgstr "tratta le voci 'git add -N' come reali nell'indice" -#: diff.c:5501 +#: diff.c:5504 msgid "<string>" msgstr "<stringa>" -#: diff.c:5502 +#: diff.c:5505 msgid "" "look for differences that change the number of occurrences of the specified " "string" @@ -2995,7 +3004,7 @@ msgstr "" "cerca differenze che modificano il numero di occorrenze della stringa " "specificata" -#: diff.c:5505 +#: diff.c:5508 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -3003,24 +3012,24 @@ msgstr "" "cerca differenze che modificano il numero di occorrenze dell'espressione " "regolare specificata" -#: diff.c:5508 +#: diff.c:5511 msgid "show all changes in the changeset with -S or -G" msgstr "visualizza tutte le modifiche nel changeset con -S o -G" -#: diff.c:5511 +#: diff.c:5514 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "" "tratta la <stringa> nell'opzione -S come un'espressione regolare POSIX estesa" -#: diff.c:5514 +#: diff.c:5517 msgid "control the order in which files appear in the output" msgstr "controlla l'ordine con cui i file appariranno nell'output" -#: diff.c:5515 +#: diff.c:5518 msgid "<object-id>" msgstr "<ID oggetto>" -#: diff.c:5516 +#: diff.c:5519 msgid "" "look for differences that change the number of occurrences of the specified " "object" @@ -3028,34 +3037,34 @@ msgstr "" "cerca differenze che modificano il numero di occorrenze dell'oggetto " "specificato" -#: diff.c:5518 +#: diff.c:5521 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5519 +#: diff.c:5522 msgid "select files by diff type" msgstr "seleziona file in base al tipo diff" -#: diff.c:5521 +#: diff.c:5524 msgid "<file>" msgstr "<file>" -#: diff.c:5522 +#: diff.c:5525 msgid "Output to a specific file" msgstr "Salva l'output in un file specifico" -#: diff.c:6177 +#: diff.c:6180 msgid "inexact rename detection was skipped due to too many files." msgstr "" "il rilevamento ridenominazione non esatta è stato omesso per la presenza di " "troppi file." -#: diff.c:6180 +#: diff.c:6183 msgid "only found copies from modified paths due to too many files." msgstr "" "trovate solo copie dai percorsi modificati per la presenza di troppi file." -#: diff.c:6183 +#: diff.c:6186 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3063,41 +3072,41 @@ msgstr "" "potresti voler impostare la variabile %s ad almeno %d e riprovare ad " "eseguire il comando." -#: dir.c:537 +#: dir.c:549 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "" "lo specificatore percorso '%s' non corrisponde ad alcun file noto a git" -#: dir.c:926 +#: dir.c:938 #, c-format msgid "cannot use %s as an exclude file" msgstr "impossibile usare %s come file di esclusione" -#: dir.c:1843 +#: dir.c:1877 #, c-format msgid "could not open directory '%s'" msgstr "impossibile aprire la directory '%s'" -#: dir.c:2085 +#: dir.c:2128 msgid "failed to get kernel name and information" msgstr "impossibile ottenere il nome e le informazioni sul kernel" -#: dir.c:2209 +#: dir.c:2252 msgid "untracked cache is disabled on this system or location" msgstr "la cache non tracciata è disabilitata su questo sistema o percorso" -#: dir.c:3013 +#: dir.c:3056 #, c-format msgid "index file corrupt in repo %s" msgstr "file index corrotto nel repository %s" -#: dir.c:3058 dir.c:3063 +#: dir.c:3101 dir.c:3106 #, c-format msgid "could not create directories for %s" msgstr "impossibile creare le directory per %s" -#: dir.c:3092 +#: dir.c:3135 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "impossibile migrare la directory git da '%s' a '%s'" @@ -3117,12 +3126,12 @@ msgstr "Filtraggio contenuto in corso" msgid "could not stat file '%s'" msgstr "impossibile eseguire stat sul file '%s'" -#: environment.c:150 +#: environment.c:148 #, c-format msgid "bad git namespace path \"%s\"" msgstr "percorso spazio dei nomi git \"%s\" non valido" -#: environment.c:332 +#: environment.c:330 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "impossibile impostare GIT_DIR a '%s'" @@ -3132,160 +3141,156 @@ msgstr "impossibile impostare GIT_DIR a '%s'" msgid "too many args to run %s" msgstr "troppi argomenti per eseguire %s" -#: fetch-object.c:17 -msgid "Remote with no URL" -msgstr "Remoto senza URL" - -#: fetch-pack.c:151 +#: fetch-pack.c:150 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: attesa lista shallow" -#: fetch-pack.c:154 +#: fetch-pack.c:153 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "git fetch-pack: atteso pacchetto flush dopo lista shallow" -#: fetch-pack.c:165 +#: fetch-pack.c:164 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack: attesi ACK/NAK, ricevuto pacchetto flush" -#: fetch-pack.c:185 +#: fetch-pack.c:184 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: attesi ACK/NAK, ricevuto '%s'" -#: fetch-pack.c:196 +#: fetch-pack.c:195 msgid "unable to write to remote" msgstr "impossibile scrivere sul remoto" -#: fetch-pack.c:258 +#: fetch-pack.c:257 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc richiede multi_ack_detailed" -#: fetch-pack.c:360 fetch-pack.c:1284 +#: fetch-pack.c:356 fetch-pack.c:1280 #, c-format msgid "invalid shallow line: %s" msgstr "riga shallow non valida: '%s'" -#: fetch-pack.c:366 fetch-pack.c:1290 +#: fetch-pack.c:362 fetch-pack.c:1286 #, c-format msgid "invalid unshallow line: %s" msgstr "riga unshallow non valida: '%s'" -#: fetch-pack.c:368 fetch-pack.c:1292 +#: fetch-pack.c:364 fetch-pack.c:1288 #, c-format msgid "object not found: %s" msgstr "oggetto non trovato: %s" -#: fetch-pack.c:371 fetch-pack.c:1295 +#: fetch-pack.c:367 fetch-pack.c:1291 #, c-format msgid "error in object: %s" msgstr "errore nell'oggetto: %s" -#: fetch-pack.c:373 fetch-pack.c:1297 +#: fetch-pack.c:369 fetch-pack.c:1293 #, c-format msgid "no shallow found: %s" msgstr "nessuno shallow trovato: %s" -#: fetch-pack.c:376 fetch-pack.c:1301 +#: fetch-pack.c:372 fetch-pack.c:1297 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "attesi shallow/unshallow, ricevuto %s" -#: fetch-pack.c:417 +#: fetch-pack.c:414 #, c-format msgid "got %s %d %s" msgstr "ricevuto %s %d %s" -#: fetch-pack.c:434 +#: fetch-pack.c:431 #, c-format msgid "invalid commit %s" msgstr "commit non valido: %s" -#: fetch-pack.c:465 +#: fetch-pack.c:462 msgid "giving up" msgstr "smetto di provare" -#: fetch-pack.c:477 progress.c:277 +#: fetch-pack.c:475 progress.c:312 msgid "done" msgstr "fatto" -#: fetch-pack.c:489 +#: fetch-pack.c:487 #, c-format msgid "got %s (%d) %s" msgstr "ricevuto %s (%d) %s" -#: fetch-pack.c:535 +#: fetch-pack.c:533 #, c-format msgid "Marking %s as complete" msgstr "Contrassegno %s come completo" -#: fetch-pack.c:744 +#: fetch-pack.c:742 #, c-format msgid "already have %s (%s)" msgstr "ho già %s (%s)" -#: fetch-pack.c:783 +#: fetch-pack.c:781 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "" "fetch-pack: impossibile eseguire il fork del demultiplexer della banda " "laterlae" -#: fetch-pack.c:791 +#: fetch-pack.c:789 msgid "protocol error: bad pack header" msgstr "errore protocollo: intestazione pack non valida" -#: fetch-pack.c:859 +#: fetch-pack.c:857 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: impossibile eseguire il fork di %s" -#: fetch-pack.c:875 +#: fetch-pack.c:873 #, c-format msgid "%s failed" msgstr "%s non riuscito" -#: fetch-pack.c:877 +#: fetch-pack.c:875 msgid "error in sideband demultiplexer" msgstr "errore nel demultiplexer della banda laterale" -#: fetch-pack.c:908 +#: fetch-pack.c:907 #, c-format msgid "Server version is %.*s" msgstr "La versione del server è %.*s" -#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928 -#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944 -#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960 -#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982 +#: fetch-pack.c:912 fetch-pack.c:918 fetch-pack.c:921 fetch-pack.c:927 +#: fetch-pack.c:931 fetch-pack.c:935 fetch-pack.c:939 fetch-pack.c:943 +#: fetch-pack.c:947 fetch-pack.c:951 fetch-pack.c:955 fetch-pack.c:959 +#: fetch-pack.c:965 fetch-pack.c:971 fetch-pack.c:976 fetch-pack.c:981 #, c-format msgid "Server supports %s" msgstr "Il server supporta %s" -#: fetch-pack.c:915 +#: fetch-pack.c:914 msgid "Server does not support shallow clients" msgstr "Il server non supporta client shallow" -#: fetch-pack.c:975 +#: fetch-pack.c:974 msgid "Server does not support --shallow-since" msgstr "Il server non supporta --shallow-since" -#: fetch-pack.c:980 +#: fetch-pack.c:979 msgid "Server does not support --shallow-exclude" msgstr "Il server non supporta --shallow-exclude" -#: fetch-pack.c:984 +#: fetch-pack.c:983 msgid "Server does not support --deepen" msgstr "Il server non supporta --deepen" -#: fetch-pack.c:1001 +#: fetch-pack.c:1000 msgid "no common commits" msgstr "nessun commit in comune" -#: fetch-pack.c:1013 fetch-pack.c:1462 +#: fetch-pack.c:1012 fetch-pack.c:1468 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: recupero non riuscito." -#: fetch-pack.c:1151 +#: fetch-pack.c:1150 msgid "Server does not support shallow requests" msgstr "Il server non supporta le richieste shallow" @@ -3293,73 +3298,73 @@ msgstr "Il server non supporta le richieste shallow" msgid "Server supports filter" msgstr "Il server supporta filter" -#: fetch-pack.c:1184 +#: fetch-pack.c:1180 msgid "unable to write request to remote" msgstr "impossibile scrivere la richiesta sul remoto" -#: fetch-pack.c:1202 +#: fetch-pack.c:1198 #, c-format msgid "error reading section header '%s'" msgstr "errore durante la lettura dell'intestazione di sezione '%s'" -#: fetch-pack.c:1208 +#: fetch-pack.c:1204 #, c-format msgid "expected '%s', received '%s'" msgstr "atteso '%s', ricevuto '%s'" -#: fetch-pack.c:1247 +#: fetch-pack.c:1243 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "riga di conferma inattesa: '%s'" -#: fetch-pack.c:1252 +#: fetch-pack.c:1248 #, c-format msgid "error processing acks: %d" msgstr "errore durante l'elaborazione degli ack: %d" -#: fetch-pack.c:1262 +#: fetch-pack.c:1258 msgid "expected packfile to be sent after 'ready'" msgstr "ci si attendeva che il packfile fosse inviato dopo 'ready'" -#: fetch-pack.c:1264 +#: fetch-pack.c:1260 msgid "expected no other sections to be sent after no 'ready'" msgstr "" "ci si attendeva che nessun'altra sezione fosse inviata in assenza di 'ready'" -#: fetch-pack.c:1306 +#: fetch-pack.c:1302 #, c-format msgid "error processing shallow info: %d" msgstr "errore durante l'elaborazione delle informazioni shallow: %d" -#: fetch-pack.c:1353 +#: fetch-pack.c:1349 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "atteso wanted-ref, ricevuto '%s'" -#: fetch-pack.c:1358 +#: fetch-pack.c:1354 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "wanted-ref inatteso: '%s'" -#: fetch-pack.c:1363 +#: fetch-pack.c:1359 #, c-format msgid "error processing wanted refs: %d" msgstr "errore durante l'elaborazione dei riferimenti desiderati: %d" -#: fetch-pack.c:1689 +#: fetch-pack.c:1693 msgid "no matching remote head" msgstr "nessun head remoto corrispondente" -#: fetch-pack.c:1712 builtin/clone.c:686 +#: fetch-pack.c:1716 builtin/clone.c:685 msgid "remote did not send all necessary objects" msgstr "il remoto non ha inviato tutti gli oggetti necessari" -#: fetch-pack.c:1739 +#: fetch-pack.c:1743 #, c-format msgid "no such remote ref %s" msgstr "riferimento remoto non esistente: %s" -#: fetch-pack.c:1742 +#: fetch-pack.c:1746 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Il server non consente richieste per l'oggetto non pubblicizzato %s" @@ -3382,18 +3387,26 @@ msgstr "scrittura della firma separata in '%s' non riuscita" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "ignoro il colore non valido '%.*s' in log.graphColors" -#: grep.c:2117 +#: grep.c:627 +msgid "" +"given pattern contains NULL byte (via -f <file>). This is only supported " +"with -P under PCRE v2" +msgstr "" +"il pattern fornito (con -f <file>) contiene un byte NULL. Ciò è supportato" +" solo con -P usando PCRE v2" + +#: grep.c:2083 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': impossibile leggere %s" -#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82 +#: grep.c:2100 setup.c:165 builtin/clone.c:408 builtin/diff.c:82 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "stat di '%s' non riuscito" -#: grep.c:2145 +#: grep.c:2111 #, c-format msgid "'%s': short read" msgstr "'%s': lettura troppo breve" @@ -3536,12 +3549,12 @@ msgstr[1] "" msgid "git version [<options>]" msgstr "git version [<opzioni>]" -#: help.c:782 +#: help.c:783 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:786 +#: help.c:787 msgid "" "\n" "Did you mean this?" @@ -3616,41 +3629,58 @@ msgstr "il nome è composto solo da caratteri non consentiti: %s" msgid "invalid date format: %s" msgstr "formato data non valido: %s" -#: list-objects.c:129 +#: list-objects.c:127 #, c-format msgid "entry '%s' in tree %s has tree mode, but is not a tree" msgstr "la voce '%s' nell'albero %s ha la modalità albero, ma non è un albero" -#: list-objects.c:142 +#: list-objects.c:140 #, c-format msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "la voce '%s' nell'albero %s ha la modalità blob, ma non è un blob" -#: list-objects.c:378 +#: list-objects.c:375 #, c-format msgid "unable to load root tree for commit %s" msgstr "impossibile caricare l'albero radice per il commit %s" -#: list-objects-filter-options.c:36 -msgid "multiple filter-specs cannot be combined" -msgstr "non è possibile combinare più specificatori filtro" +#: list-objects-filter.c:492 +#, c-format +msgid "unable to access sparse blob in '%s'" +msgstr "impossibile accedere al blob sparse in '%s'" + +#: list-objects-filter.c:495 +#, c-format +msgid "unable to parse sparse filter data in %s" +msgstr "impossibile analizzare i dati filtro sparse in %s" #: list-objects-filter-options.c:58 msgid "expected 'tree:<depth>'" msgstr "atteso 'tree:<profondità>'" -#: list-objects-filter-options.c:84 +#: list-objects-filter-options.c:73 msgid "sparse:path filters support has been dropped" msgstr "il supporto per i filtri sparse:percorso è stato rimosso" -#: list-objects-filter-options.c:94 +#: list-objects-filter-options.c:86 #, c-format msgid "invalid filter-spec '%s'" msgstr "specificatore filtro '%s' non valido" -#: list-objects-filter-options.c:158 -msgid "cannot change partial clone promisor remote" -msgstr "impossibile modificare il remoto promettente del clone parziale" +#: list-objects-filter-options.c:102 +#, c-format +msgid "must escape char in sub-filter-spec: '%c'" +msgstr "" +"è necessario eseguire l'escape del carattere nello specificatore del" +" sottofiltro: '%c'" + +#: list-objects-filter-options.c:144 +msgid "expected something after combine:" +msgstr "atteso qualcosa dopo la ricombinazione:" + +#: list-objects-filter-options.c:226 +msgid "multiple filter-specs cannot be combined" +msgstr "non è possibile combinare più specificatori filtro" #: lockfile.c:151 #, c-format @@ -3681,119 +3711,115 @@ msgstr "Impossibile creare '%s.lock': %s" msgid "failed to read the cache" msgstr "lettura della cache non riuscita" -#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919 -#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786 +#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908 +#: builtin/checkout.c:537 builtin/checkout.c:796 builtin/clone.c:785 #: builtin/stash.c:264 msgid "unable to write new index file" msgstr "impossibile scrivere il nuovo file index" -#: merge-recursive.c:322 +#: merge-recursive.c:367 msgid "(bad commit)\n" msgstr "(commit non valido)\n" -#: merge-recursive.c:345 +#: merge-recursive.c:390 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "add_cacheinfo non riuscito per il percorso '%s'; interrompo il merge." -#: merge-recursive.c:354 +#: merge-recursive.c:399 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "" "aggiornamento add_cacheinfo non riuscito per il percorso '%s'; interrompo il " "merge." -#: merge-recursive.c:437 -msgid "error building trees" -msgstr "errore durante la costruzione degli alberi" - -#: merge-recursive.c:863 +#: merge-recursive.c:885 #, c-format msgid "failed to create path '%s'%s" msgstr "creazione del percorso '%s' non riuscita%s" -#: merge-recursive.c:874 +#: merge-recursive.c:896 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Rimuovo %s per fare spazio alla sottodirectory\n" -#: merge-recursive.c:888 merge-recursive.c:907 +#: merge-recursive.c:910 merge-recursive.c:929 msgid ": perhaps a D/F conflict?" msgstr ": forse si tratta di un conflitto D/F?" -#: merge-recursive.c:897 +#: merge-recursive.c:919 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "mi rifiuto di perdere un file non tracciato in '%s'" -#: merge-recursive.c:938 builtin/cat-file.c:40 +#: merge-recursive.c:960 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "impossibile leggere l'oggetto %s '%s'" -#: merge-recursive.c:941 +#: merge-recursive.c:965 #, c-format msgid "blob expected for %s '%s'" msgstr "atteso blob per %s '%s'" -#: merge-recursive.c:965 +#: merge-recursive.c:990 #, c-format msgid "failed to open '%s': %s" msgstr "apertura di '%s' non riuscita: %s" -#: merge-recursive.c:976 +#: merge-recursive.c:1001 #, c-format msgid "failed to symlink '%s': %s" msgstr "creazione del collegamento simbolico '%s' non riuscita: %s" -#: merge-recursive.c:981 +#: merge-recursive.c:1006 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "non so che fare con %06o %s '%s'" -#: merge-recursive.c:1177 +#: merge-recursive.c:1199 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Merge del sottomodulo %s non riuscito (checkout non eseguito)" -#: merge-recursive.c:1184 +#: merge-recursive.c:1206 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Merge del sottomodulo %s non riuscito (commit non presenti)" -#: merge-recursive.c:1191 +#: merge-recursive.c:1213 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "" "Merge del sottomodulo %s non riuscito (i commit non seguono la base del " "merge)" -#: merge-recursive.c:1199 merge-recursive.c:1211 +#: merge-recursive.c:1221 merge-recursive.c:1233 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Eseguo il fast forward del sottomodulo %s al seguente commit:" -#: merge-recursive.c:1202 merge-recursive.c:1214 +#: merge-recursive.c:1224 merge-recursive.c:1236 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Eseguo il fast forward del sottomodulo %s" -#: merge-recursive.c:1237 +#: merge-recursive.c:1259 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" "Merge del sottomodulo %s non riuscito (merge dopo i commit non trovato)" -#: merge-recursive.c:1241 +#: merge-recursive.c:1263 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "Merge del sottomodulo %s non riuscito (non fast forward)" -#: merge-recursive.c:1242 +#: merge-recursive.c:1264 msgid "Found a possible merge resolution for the submodule:\n" msgstr "Trovata possibile risoluzione merge per il sottomodulo:\n" -#: merge-recursive.c:1245 +#: merge-recursive.c:1267 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -3810,32 +3836,32 @@ msgstr "" "\n" "per accettare questo suggerimento.\n" -#: merge-recursive.c:1254 +#: merge-recursive.c:1276 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "Merge del sottomodulo %s non riuscito (più merge trovati)" -#: merge-recursive.c:1327 +#: merge-recursive.c:1349 msgid "Failed to execute internal merge" msgstr "Esecuzione del merge interno non riuscita" -#: merge-recursive.c:1332 +#: merge-recursive.c:1354 #, c-format msgid "Unable to add %s to database" msgstr "Impossibile aggiungere %s al database" -#: merge-recursive.c:1364 +#: merge-recursive.c:1386 #, c-format msgid "Auto-merging %s" msgstr "Merge automatico di %s in corso" -#: merge-recursive.c:1387 +#: merge-recursive.c:1410 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" "Errore: mi rifiuto di perdere il file non tracciato %s; scrivo invece in %s." -#: merge-recursive.c:1459 +#: merge-recursive.c:1482 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3844,7 +3870,7 @@ msgstr "" "CONFLITTO (%s/eliminazione): %s eliminato in %s e %s in %s. Versione %s di " "%s lasciata nell'albero." -#: merge-recursive.c:1464 +#: merge-recursive.c:1487 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3853,7 +3879,7 @@ msgstr "" "CONFLITTO (%s/eliminazione): %s eliminato in %s e %s come %s in %s. Versione " "%s di %s lasciata nell'albero." -#: merge-recursive.c:1471 +#: merge-recursive.c:1494 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3862,7 +3888,7 @@ msgstr "" "CONFLITTO (%s/eliminazione): %s eliminato in %s e %s in %s. Versione %s di " "%s lasciata nell'albero in %s." -#: merge-recursive.c:1476 +#: merge-recursive.c:1499 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3871,43 +3897,43 @@ msgstr "" "CONFLITTO (%s/eliminazione): %s eliminato in %s e %s come %s in %s. Versione " "%s di %s lasciata nell'albero in %s." -#: merge-recursive.c:1511 +#: merge-recursive.c:1534 msgid "rename" msgstr "ridenominazione" -#: merge-recursive.c:1511 +#: merge-recursive.c:1534 msgid "renamed" msgstr "rinominato" -#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094 +#: merge-recursive.c:1614 merge-recursive.c:2472 merge-recursive.c:3117 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Mi rifiuto di perdere un file sporco in %s" -#: merge-recursive.c:1601 +#: merge-recursive.c:1624 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "" "Mi rifiuto di perdere un file non tracciato in %s, benché sia d'ostacolo." -#: merge-recursive.c:1659 +#: merge-recursive.c:1682 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" "CONFLITTO (ridenominazione/aggiunta): elemento ridenominato %s->%s in %s. %s " "aggiunto in %s" -#: merge-recursive.c:1690 +#: merge-recursive.c:1713 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s è una directory in %s; la aggiungo come %s" -#: merge-recursive.c:1695 +#: merge-recursive.c:1718 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "Mi rifiuto di perdere un file non tracciato in %s; lo aggiungo come %s" -#: merge-recursive.c:1714 +#: merge-recursive.c:1737 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -3916,18 +3942,18 @@ msgstr "" "CONFLITTO (ridenominazione/ridenominazione): file ridenominato \"%s\"->\"%s" "\" nel branch \"%s\", ridenominato \"%s\"->\"%s\" in \"%s\"%s" -#: merge-recursive.c:1719 +#: merge-recursive.c:1742 msgid " (left unresolved)" msgstr " (lasciato irrisolto)" -#: merge-recursive.c:1828 +#: merge-recursive.c:1851 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "CONFLITTO (ridenominazione/ridenominazione): file ridenominato %s->%s in %s. " "Ridenominato %s->%s in %s" -#: merge-recursive.c:2035 +#: merge-recursive.c:2056 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -3938,7 +3964,7 @@ msgstr "" "perché la directory %s è stata ridenominata in più directory diverse e " "nessuna directory di destinazione contiene la maggior parte dei file." -#: merge-recursive.c:2067 +#: merge-recursive.c:2088 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -3948,7 +3974,7 @@ msgstr "" "%s è d'ostacolo alle seguenti ridenominazioni directory che spostano in tale " "posizione i seguenti percorsi: %s." -#: merge-recursive.c:2077 +#: merge-recursive.c:2098 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -3958,7 +3984,7 @@ msgstr "" "un percorso in %s; delle ridenominazioni directory implicite hanno tentato " "di spostare in tale posizione i seguenti percorsi: %s" -#: merge-recursive.c:2169 +#: merge-recursive.c:2190 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -3967,7 +3993,7 @@ msgstr "" "CONFLITTO (ridenominazione/ridenominazione): directory ridenominata %s->%s " "in %s. Directory ridenominata %s->%s in %s" -#: merge-recursive.c:2413 +#: merge-recursive.c:2435 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -3976,52 +4002,52 @@ msgstr "" "ATTENZIONE: evito di applicare la ridenominazione %s -> %s a %s perché %s " "stesso è stato ridenominato." -#: merge-recursive.c:2938 +#: merge-recursive.c:2961 #, c-format msgid "cannot read object %s" msgstr "impossibile leggere l'oggetto %s" -#: merge-recursive.c:2941 +#: merge-recursive.c:2964 #, c-format msgid "object %s is not a blob" msgstr "l'oggetto %s non è un blob" -#: merge-recursive.c:3005 +#: merge-recursive.c:3028 msgid "modify" msgstr "modifica" -#: merge-recursive.c:3005 +#: merge-recursive.c:3028 msgid "modified" msgstr "modificato" -#: merge-recursive.c:3017 +#: merge-recursive.c:3040 msgid "content" msgstr "contenuto" -#: merge-recursive.c:3021 +#: merge-recursive.c:3044 msgid "add/add" msgstr "aggiunta/aggiunta" -#: merge-recursive.c:3044 +#: merge-recursive.c:3067 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Omesso %s (elemento sottoposto a merge uguale a quello esistente)" -#: merge-recursive.c:3066 git-submodule.sh:937 +#: merge-recursive.c:3089 git-submodule.sh:937 msgid "submodule" msgstr "sottomodulo" -#: merge-recursive.c:3067 +#: merge-recursive.c:3090 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLITTO (%s): conflitto di merge in %s" -#: merge-recursive.c:3097 +#: merge-recursive.c:3120 #, c-format msgid "Adding as %s instead" msgstr "Lo aggiungo come %s" -#: merge-recursive.c:3179 +#: merge-recursive.c:3203 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4030,7 +4056,7 @@ msgstr "" "Percorso aggiornato: %s aggiunto in %s in una directory ridenominata in %s; " "lo sposto in %s." -#: merge-recursive.c:3182 +#: merge-recursive.c:3206 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4039,7 +4065,7 @@ msgstr "" "CONFLITTO (posizione file): %s aggiunto in %s in una directory ridenominata " "in %s, il che suggerisce che forse dovrebbe essere spostato in %s." -#: merge-recursive.c:3186 +#: merge-recursive.c:3210 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4048,7 +4074,7 @@ msgstr "" "Percorso aggiornato: %s ridenominato in %s in %s in una directory " "ridenominata in %s; lo sposto in %s." -#: merge-recursive.c:3189 +#: merge-recursive.c:3213 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4058,228 +4084,228 @@ msgstr "" "ridenominata in %s, il che suggerisce che forse dovrebbe essere spostato in " "%s." -#: merge-recursive.c:3303 +#: merge-recursive.c:3327 #, c-format msgid "Removing %s" msgstr "Rimozione di %s" -#: merge-recursive.c:3326 +#: merge-recursive.c:3350 msgid "file/directory" msgstr "file/directory" -#: merge-recursive.c:3331 +#: merge-recursive.c:3355 msgid "directory/file" msgstr "directory/file" -#: merge-recursive.c:3338 +#: merge-recursive.c:3362 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "CONFLITTO (%s): una directory denominata %s esiste già in %s. Aggiungo %s " "come %s" -#: merge-recursive.c:3347 +#: merge-recursive.c:3371 #, c-format msgid "Adding %s" msgstr "Aggiunta %s" -#: merge-recursive.c:3356 +#: merge-recursive.c:3380 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "CONFLITTO (aggiungi/aggiungi): conflitto di merge in %s" -#: merge-recursive.c:3394 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" -"Le tue modifiche locali ai seguenti file sarebbero sovrascritte dal merge:\n" -" %s" - -#: merge-recursive.c:3405 +#: merge-recursive.c:3424 msgid "Already up to date!" msgstr "Già aggiornato!" -#: merge-recursive.c:3414 +#: merge-recursive.c:3433 #, c-format msgid "merging of trees %s and %s failed" msgstr "merge degli alberi %s e %s non riuscito" -#: merge-recursive.c:3513 +#: merge-recursive.c:3537 msgid "Merging:" msgstr "Merge in corso:" -#: merge-recursive.c:3526 +#: merge-recursive.c:3550 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "trovato %u antenato comune:" msgstr[1] "trovati %u antenati comuni:" -#: merge-recursive.c:3565 +#: merge-recursive.c:3600 msgid "merge returned no commit" msgstr "il merge non ha restituito alcun commit" -#: merge-recursive.c:3631 +#: merge-recursive.c:3659 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"Le tue modifiche locali ai seguenti file sarebbero sovrascritte dal merge:\n" +" %s" + +#: merge-recursive.c:3756 #, c-format msgid "Could not parse object '%s'" msgstr "Impossibile analizzare l'oggetto '%s'" -#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869 +#: merge-recursive.c:3774 builtin/merge.c:694 builtin/merge.c:874 msgid "Unable to write index." msgstr "Impossibile scrivere l'indice." -#: midx.c:69 +#: midx.c:68 #, c-format msgid "multi-pack-index file %s is too small" msgstr "il file multi-pack-index %s è troppo piccolo" -#: midx.c:85 +#: midx.c:84 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "la firma del multi-pack-index 0x%08x non corrisponde alla firma 0x%08x" -#: midx.c:90 +#: midx.c:89 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "versione %d multi-pack-index non riconosciuta" -#: midx.c:95 +#: midx.c:94 #, c-format msgid "hash version %u does not match" msgstr "la versione dell'hash %u non corrisponde" -#: midx.c:109 +#: midx.c:108 msgid "invalid chunk offset (too large)" msgstr "offset blocco non valido (troppo grande)" -#: midx.c:133 +#: midx.c:132 msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "l'ID blocco finale multi-pack-index compare prima di quanto previsto" -#: midx.c:146 +#: midx.c:145 msgid "multi-pack-index missing required pack-name chunk" msgstr "dal multi-pack-index manca il blocco richiesto pack-name" -#: midx.c:148 +#: midx.c:147 msgid "multi-pack-index missing required OID fanout chunk" msgstr "dal multi-pack-index manca il blocco richiesto fanout OID" -#: midx.c:150 +#: midx.c:149 msgid "multi-pack-index missing required OID lookup chunk" msgstr "dal multi-pack-index manca il blocco richiesto lookup OID" -#: midx.c:152 +#: midx.c:151 msgid "multi-pack-index missing required object offsets chunk" msgstr "dal multi-pack-index manca il blocco richiesto offset oggetti" -#: midx.c:166 +#: midx.c:165 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "nomi pack multi-pack-index in disordine: '%s' appare prima di '%s'" -#: midx.c:211 +#: midx.c:210 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "pack-int-id non valido: %u (%u pack totali)" -#: midx.c:261 +#: midx.c:260 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" "nel multi-pack-index è salvato un offset a 64 bit, ma off_t è troppo piccolo" -#: midx.c:289 +#: midx.c:288 msgid "error preparing packfile from multi-pack-index" msgstr "errore durante la preparazione del packfile dal multi-pack-index" -#: midx.c:470 +#: midx.c:469 #, c-format msgid "failed to add packfile '%s'" msgstr "aggiunta del packfile '%s' non riuscita" -#: midx.c:476 +#: midx.c:475 #, c-format msgid "failed to open pack-index '%s'" msgstr "apertura del pack-index '%s' non riuscita" -#: midx.c:536 +#: midx.c:535 #, c-format msgid "failed to locate object %d in packfile" msgstr "ricerca dell'oggetto %d nel packfile non riuscita" -#: midx.c:865 +#: midx.c:864 #, c-format msgid "did not see pack-file %s to drop" msgstr "non ho visto il file pack %s da scartare" -#: midx.c:1036 +#: midx.c:1035 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "pulizia del multi-pack-index %s non riuscita" -#: midx.c:1091 +#: midx.c:1090 msgid "Looking for referenced packfiles" msgstr "Ricerca di file pack referenziati in corso" -#: midx.c:1106 +#: midx.c:1105 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "" "fanout oid in disordine: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -#: midx.c:1110 +#: midx.c:1109 msgid "Verifying OID order in MIDX" msgstr "Verifica ordine OID in MIDX in corso" -#: midx.c:1119 +#: midx.c:1118 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "lookup oid in disordine: oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1138 +#: midx.c:1137 msgid "Sorting objects by packfile" msgstr "Ordinamento degli oggetti nel packfile in corso" -#: midx.c:1144 +#: midx.c:1143 msgid "Verifying object offsets" msgstr "Verifica offset oggetti in corso" -#: midx.c:1160 +#: midx.c:1159 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "caricamento voce pack per oid[%d] = %s non riuscito" -#: midx.c:1166 +#: midx.c:1165 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "caricamento pack-index per il packfile %s non riuscito" -#: midx.c:1175 +#: midx.c:1174 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "offset oggetto non corretto per oid[%d] = %s: %<PRIx64> != %<PRIx64>" -#: midx.c:1350 +#: midx.c:1349 msgid "could not start pack-objects" msgstr "impossibile avviare pack-objects" -#: midx.c:1369 +#: midx.c:1368 msgid "could not finish pack-objects" msgstr "impossibile finire pack-objects" -#: name-hash.c:532 +#: name-hash.c:537 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "impossibile creare il thread lazy_dir: %s" -#: name-hash.c:554 +#: name-hash.c:559 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "impossibile creare il thread lazy_name: %s" -#: name-hash.c:560 +#: name-hash.c:565 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "impossibile bloccare il thread lazy_name: %s" @@ -4326,42 +4352,42 @@ msgstr "Mi rifiuto di riscrivere le note in %s (al di fuori di refs/notes/)" msgid "Bad %s value: '%s'" msgstr "Valore di %s errato: '%s'" -#: object.c:54 +#: object.c:53 #, c-format msgid "invalid object type \"%s\"" msgstr "tipo oggetto \"%s\" non valido" -#: object.c:174 +#: object.c:173 #, c-format msgid "object %s is a %s, not a %s" msgstr "l'oggetto %s è un %s, non un %s" -#: object.c:234 +#: object.c:233 #, c-format msgid "object %s has unknown type id %d" msgstr "l'oggetto %s ha l'ID tipo sconosciuto %d" -#: object.c:247 +#: object.c:246 #, c-format msgid "unable to parse object: %s" msgstr "impossibile analizzare l'oggetto: %s" -#: object.c:267 object.c:278 +#: object.c:266 object.c:277 #, c-format msgid "hash mismatch %s" msgstr "hash non corrispondente: %s" -#: packfile.c:648 +#: packfile.c:641 msgid "offset before end of packfile (broken .idx?)" msgstr "offset collocato prima della fine del packfile (.idx corrotto?)" -#: packfile.c:1899 +#: packfile.c:1887 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" "offset collocato prima dell'inizio dell'indice pack per %s (indice corrotto?)" -#: packfile.c:1903 +#: packfile.c:1891 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" @@ -4408,26 +4434,26 @@ msgstr "opzione ambigua: %s (potrebbe essere --%s%s o --%s%s)" msgid "did you mean `--%s` (with two dashes ?)" msgstr "forse intendevi `--%s` (con due trattini)?" -#: parse-options.c:859 +#: parse-options.c:860 #, c-format msgid "unknown option `%s'" msgstr "opzione sconosciuta `%s'" -#: parse-options.c:861 +#: parse-options.c:862 #, c-format msgid "unknown switch `%c'" msgstr "opzione `%c` sconosciuta" -#: parse-options.c:863 +#: parse-options.c:864 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "opzione non ASCII sconosciuta presente nella stringa: `%s'" -#: parse-options.c:887 +#: parse-options.c:888 msgid "..." msgstr "..." -#: parse-options.c:906 +#: parse-options.c:907 #, c-format msgid "usage: %s" msgstr "uso: %s" @@ -4435,21 +4461,21 @@ msgstr "uso: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:912 +#: parse-options.c:913 #, c-format msgid " or: %s" msgstr " oppure: %s" -#: parse-options.c:915 +#: parse-options.c:916 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:954 +#: parse-options.c:955 msgid "-NUM" msgstr "-NUM" -#: parse-options.c:968 +#: parse-options.c:969 #, c-format msgid "alias of --%s" msgstr "alias di --%s" @@ -4623,29 +4649,38 @@ msgstr "impossibile creare lstat in versione threaded: %s" msgid "unable to parse --pretty format" msgstr "impossibile analizzare il formato --pretty" -#: range-diff.c:70 +#: promisor-remote.c:25 +msgid "Remote with no URL" +msgstr "Remoto senza URL" + +#: promisor-remote.c:61 +#, c-format +msgid "promisor remote name cannot begin with '/': %s" +msgstr "il nome del remoto promettente non può iniziare con '/': %s" + +#: range-diff.c:71 msgid "could not start `log`" msgstr "impossibile avviare `log`" -#: range-diff.c:72 +#: range-diff.c:73 msgid "could not read `log` output" msgstr "impossibile leggere l'output di `log`" -#: range-diff.c:91 sequencer.c:5021 +#: range-diff.c:92 sequencer.c:4985 #, c-format msgid "could not parse commit '%s'" msgstr "impossibile analizzare il commit '%s'" -#: range-diff.c:117 +#: range-diff.c:118 #, c-format msgid "could not parse git header '%.*s'" msgstr "impossibile analizzare l'header Git '%.*s'" -#: range-diff.c:274 +#: range-diff.c:275 msgid "failed to generate diff" msgstr "generazione del diff non riuscita" -#: range-diff.c:506 range-diff.c:508 +#: range-diff.c:507 range-diff.c:509 #, c-format msgid "could not parse log for '%s'" msgstr "impossibile analizzare il registro di '%s'" @@ -4691,11 +4726,11 @@ msgstr "impossibile eseguire stat su '%s'" msgid "'%s' appears as both a file and as a directory" msgstr "'%s' compare sia come file sia come directory" -#: read-cache.c:1499 +#: read-cache.c:1520 msgid "Refresh index" msgstr "Aggiornamento indice" -#: read-cache.c:1613 +#: read-cache.c:1635 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -4704,7 +4739,7 @@ msgstr "" "index.version impostato, ma il valore non è valido.\n" "Uso la versione %i" -#: read-cache.c:1623 +#: read-cache.c:1645 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -4713,138 +4748,138 @@ msgstr "" "GIT_INDEX_VERSION impostato, ma il valore non è valido.\n" "Uso la versione %i" -#: read-cache.c:1679 +#: read-cache.c:1701 #, c-format msgid "bad signature 0x%08x" msgstr "firma non valida: 0x%08x" -#: read-cache.c:1682 +#: read-cache.c:1704 #, c-format msgid "bad index version %d" msgstr "versione indice non valida: %d" -#: read-cache.c:1691 +#: read-cache.c:1713 msgid "bad index file sha1 signature" msgstr "firma SHA1 file indice non valida" -#: read-cache.c:1721 +#: read-cache.c:1743 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "l'indice usa l'estensione %.4s che non comprendiamo" -#: read-cache.c:1723 +#: read-cache.c:1745 #, c-format msgid "ignoring %.4s extension" msgstr "estensione %.4s ignorata" -#: read-cache.c:1760 +#: read-cache.c:1782 #, c-format msgid "unknown index entry format 0x%08x" msgstr "formato voce indice sconosciuto: 0x%08x" -#: read-cache.c:1776 +#: read-cache.c:1798 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "campo nome malformato nell'indice, vicino al percorso '%s'" -#: read-cache.c:1833 +#: read-cache.c:1855 msgid "unordered stage entries in index" msgstr "voci stage non ordinate nell'indice" -#: read-cache.c:1836 +#: read-cache.c:1858 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "voci stage multiple per il file sottoposto a merge '%s'" -#: read-cache.c:1839 +#: read-cache.c:1861 #, c-format msgid "unordered stage entries for '%s'" msgstr "voci stage non ordinate per '%s'" -#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111 -#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467 -#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347 +#: read-cache.c:1967 read-cache.c:2255 rerere.c:565 rerere.c:599 rerere.c:1111 +#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:468 +#: builtin/checkout.c:652 builtin/clean.c:967 builtin/commit.c:347 #: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145 #: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330 msgid "index file corrupt" msgstr "file indice corrotto" -#: read-cache.c:2087 +#: read-cache.c:2108 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "impossibile creare il thread load_cache_entries: %s" -#: read-cache.c:2100 +#: read-cache.c:2121 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "impossibile bloccare il thread load_cache_entries: %s" -#: read-cache.c:2133 +#: read-cache.c:2154 #, c-format msgid "%s: index file open failed" msgstr "%s: apertura del file indice non riuscita" -#: read-cache.c:2137 +#: read-cache.c:2158 #, c-format msgid "%s: cannot stat the open index" msgstr "%s: impossibile eseguire stat sull'indice aperto" -#: read-cache.c:2141 +#: read-cache.c:2162 #, c-format msgid "%s: index file smaller than expected" msgstr "%s: file indice più piccolo della dimensione attesa" -#: read-cache.c:2145 +#: read-cache.c:2166 #, c-format msgid "%s: unable to map index file" msgstr "%s: impossibile mappare il file indice" -#: read-cache.c:2187 +#: read-cache.c:2208 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "impossibile creare il thread load_index_extensions: %s" -#: read-cache.c:2214 +#: read-cache.c:2235 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "impossibile bloccare il thread load_index_extensions: %s" -#: read-cache.c:2246 +#: read-cache.c:2267 #, c-format msgid "could not freshen shared index '%s'" msgstr "impossibile aggiornare l'indice condiviso '%s'" -#: read-cache.c:2293 +#: read-cache.c:2314 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "indice corrotto, atteso %s in %s, presente %s" -#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114 +#: read-cache.c:3010 wrapper.c:622 builtin/merge.c:1119 #, c-format msgid "could not close '%s'" msgstr "impossibile chiudere '%s'" -#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928 +#: read-cache.c:3113 sequencer.c:2296 sequencer.c:3917 #, c-format msgid "could not stat '%s'" msgstr "impossibile eseguire lo stat di '%s'" -#: read-cache.c:3105 +#: read-cache.c:3126 #, c-format msgid "unable to open git dir: %s" msgstr "impossibile aprire la directory git: %s" -#: read-cache.c:3117 +#: read-cache.c:3138 #, c-format msgid "unable to unlink: %s" msgstr "impossibile eseguire unlink: %s" -#: read-cache.c:3142 +#: read-cache.c:3163 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "impossibile correggere i permessi di '%s'" -#: read-cache.c:3291 +#: read-cache.c:3312 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: impossibile ripiegare sullo stadio 0" @@ -4954,8 +4989,8 @@ msgstr "" msgid "Note that empty commits are commented out" msgstr "Nota che i commit vuoti sono commentati" -#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447 -#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235 +#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3388 +#: sequencer.c:3414 sequencer.c:5084 builtin/fsck.c:356 builtin/rebase.c:235 #, c-format msgid "could not write '%s'" msgstr "impossibile scrivere '%s'" @@ -5003,7 +5038,7 @@ msgstr "%s non punta a un oggetto valido!" msgid "ignoring dangling symref %s" msgstr "ignoro il riferimento simbolico pendente %s" -#: refs.c:669 ref-filter.c:2092 +#: refs.c:669 ref-filter.c:2098 #, c-format msgid "ignoring broken ref %s" msgstr "ignoro il riferimento rotto %s" @@ -5028,14 +5063,14 @@ msgstr "il riferimento '%s' esiste già" msgid "unexpected object ID when writing '%s'" msgstr "ID oggetto inatteso durante la scrittura di '%s'" -#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913 -#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656 +#: refs.c:833 sequencer.c:403 sequencer.c:2647 sequencer.c:2851 +#: sequencer.c:2865 sequencer.c:3122 sequencer.c:5001 wrapper.c:620 #, c-format msgid "could not write to '%s'" msgstr "impossibile scrivere su '%s'" -#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715 -#: builtin/rebase.c:1003 +#: refs.c:860 wrapper.c:188 wrapper.c:358 builtin/am.c:714 +#: builtin/rebase.c:1004 #, c-format msgid "could not open '%s' for writing" msgstr "impossibile aprire '%s' in scrittura" @@ -5070,21 +5105,21 @@ msgstr "mi rifiuto di aggiornare il riferimento con il nome non valido '%s'" msgid "update_ref failed for ref '%s': %s" msgstr "update_ref per il riferimento '%s' non riuscita: %s" -#: refs.c:2012 +#: refs.c:2023 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "aggiornamenti multipli per il riferimento '%s' non consentiti" -#: refs.c:2044 +#: refs.c:2055 msgid "ref updates forbidden inside quarantine environment" msgstr "aggiornamenti riferimento vietati nell'ambiente quarantena" -#: refs.c:2140 refs.c:2170 +#: refs.c:2151 refs.c:2181 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "'%s' esiste già; impossibile creare '%s'" -#: refs.c:2146 refs.c:2181 +#: refs.c:2157 refs.c:2192 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "impossibile gestire '%s' e '%s' contemporaneamente" @@ -5094,13 +5129,13 @@ msgstr "impossibile gestire '%s' e '%s' contemporaneamente" msgid "could not remove reference %s" msgstr "impossibile rimuovere il riferimento %s" -#: refs/files-backend.c:1248 refs/packed-backend.c:1532 -#: refs/packed-backend.c:1542 +#: refs/files-backend.c:1248 refs/packed-backend.c:1541 +#: refs/packed-backend.c:1551 #, c-format msgid "could not delete reference %s: %s" msgstr "impossibile eliminare il riferimento %s: %s" -#: refs/files-backend.c:1251 refs/packed-backend.c:1545 +#: refs/files-backend.c:1251 refs/packed-backend.c:1554 #, c-format msgid "could not delete references: %s" msgstr "impossibile eliminare i riferimenti: %s" @@ -5110,7 +5145,7 @@ msgstr "impossibile eliminare i riferimenti: %s" msgid "invalid refspec '%s'" msgstr "specificatore riferimento '%s' non valido" -#: ref-filter.c:42 wt-status.c:1934 +#: ref-filter.c:42 wt-status.c:1938 msgid "gone" msgstr "sparito" @@ -5129,122 +5164,122 @@ msgstr "prima di %d" msgid "ahead %d, behind %d" msgstr "dopo %d, prima di %d" -#: ref-filter.c:162 +#: ref-filter.c:165 #, c-format msgid "expected format: %%(color:<color>)" msgstr "formato atteso: %%(color:<colore>)" -#: ref-filter.c:164 +#: ref-filter.c:167 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "colore non riconosciuto: %%(color:%s)" -#: ref-filter.c:186 +#: ref-filter.c:189 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Atteso valore intero: refname:lstrip=%s" -#: ref-filter.c:190 +#: ref-filter.c:193 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Atteso valore intero: refname:rstrip=%s" -#: ref-filter.c:192 +#: ref-filter.c:195 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "argomento %%(%s) non riconosciuto: %s" -#: ref-filter.c:247 +#: ref-filter.c:250 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) non accetta argomenti" -#: ref-filter.c:269 +#: ref-filter.c:272 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "argomento %%(objectsize) non riconosciuto: %s" -#: ref-filter.c:277 +#: ref-filter.c:280 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) non accetta argomenti" -#: ref-filter.c:289 +#: ref-filter.c:292 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) non accetta argomenti" -#: ref-filter.c:298 +#: ref-filter.c:301 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) non accetta argomenti" -#: ref-filter.c:320 +#: ref-filter.c:323 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "argomento %%(trailers) sconosciuto: %s" -#: ref-filter.c:349 +#: ref-filter.c:352 #, c-format msgid "positive value expected contents:lines=%s" msgstr "atteso valore positivo in contents:lines=%s" -#: ref-filter.c:351 +#: ref-filter.c:354 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "argomento %%(contents) non riconosciuto: %s" -#: ref-filter.c:366 +#: ref-filter.c:369 #, c-format msgid "positive value expected objectname:short=%s" msgstr "atteso valore positivo in objectname:short=%s" -#: ref-filter.c:370 +#: ref-filter.c:373 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "argomento %%(objectname) non riconosciuto: %s" -#: ref-filter.c:400 +#: ref-filter.c:403 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "formato atteso: %%(align:<ampiezza>,<posizione>)" -#: ref-filter.c:412 +#: ref-filter.c:415 #, c-format msgid "unrecognized position:%s" msgstr "valore non riconosciuto: position:%s" -#: ref-filter.c:419 +#: ref-filter.c:422 #, c-format msgid "unrecognized width:%s" msgstr "valore non riconosciuto: width:%s" -#: ref-filter.c:428 +#: ref-filter.c:431 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "argomento %%(align) non riconosciuto: %s" -#: ref-filter.c:436 +#: ref-filter.c:439 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "attesa ampiezza positiva con l'atom %%(align)" -#: ref-filter.c:454 +#: ref-filter.c:457 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "argomento %%(if) non riconosciuto: %s" -#: ref-filter.c:556 +#: ref-filter.c:559 #, c-format msgid "malformed field name: %.*s" msgstr "nome campo malformato: %.*s" -#: ref-filter.c:583 +#: ref-filter.c:586 #, c-format msgid "unknown field name: %.*s" msgstr "nome campo sconosciuto: %.*s" -#: ref-filter.c:587 +#: ref-filter.c:590 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" @@ -5252,160 +5287,160 @@ msgstr "" "non è un repository git, ma il campo '%.*s' richiede l'accesso ai dati " "oggetto" -#: ref-filter.c:711 +#: ref-filter.c:714 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "formato: atomo %%(if) usato senza un atomo %%(then)" -#: ref-filter.c:774 +#: ref-filter.c:777 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "formato: atomo %%(then) usato senza un atomo %%(if)" -#: ref-filter.c:776 +#: ref-filter.c:779 #, c-format msgid "format: %%(then) atom used more than once" msgstr "formato: atomo %%(then) usato più di una volta" -#: ref-filter.c:778 +#: ref-filter.c:781 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "formato: atomo %%(then) usato dopo %%(else)" -#: ref-filter.c:806 +#: ref-filter.c:809 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "formato: atomo %%(else) usato senza un atomo %%(if)" -#: ref-filter.c:808 +#: ref-filter.c:811 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "formato: atomo %%(else) usato senza un atomo %%(then)" -#: ref-filter.c:810 +#: ref-filter.c:813 #, c-format msgid "format: %%(else) atom used more than once" msgstr "formato: atomo %%(else) usato più di una volta" -#: ref-filter.c:825 +#: ref-filter.c:828 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "formato: atomo %%(end) usato senza l'atomo corrispondente" -#: ref-filter.c:882 +#: ref-filter.c:885 #, c-format msgid "malformed format string %s" msgstr "stringa di formato %s malformata" -#: ref-filter.c:1485 +#: ref-filter.c:1488 #, c-format msgid "no branch, rebasing %s" msgstr "nessun branch, eseguo il rebase di %s" -#: ref-filter.c:1488 +#: ref-filter.c:1491 #, c-format msgid "no branch, rebasing detached HEAD %s" msgstr "nessun branch, eseguo il rebase dell'HEAD scollegato %s" -#: ref-filter.c:1491 +#: ref-filter.c:1494 #, c-format msgid "no branch, bisect started on %s" msgstr "nessun branch, bisezione avviata su %s" -#: ref-filter.c:1501 +#: ref-filter.c:1504 msgid "no branch" msgstr "nessun branch" -#: ref-filter.c:1537 ref-filter.c:1743 +#: ref-filter.c:1540 ref-filter.c:1749 #, c-format msgid "missing object %s for %s" msgstr "oggetto %s mancante per %s" -#: ref-filter.c:1547 +#: ref-filter.c:1550 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer non riuscito su %s per %s" -#: ref-filter.c:1998 +#: ref-filter.c:2004 #, c-format msgid "malformed object at '%s'" msgstr "oggetto malformato in '%s'" -#: ref-filter.c:2087 +#: ref-filter.c:2093 #, c-format msgid "ignoring ref with broken name %s" msgstr "ignoro il riferimento con il nome malformato %s" -#: ref-filter.c:2382 +#: ref-filter.c:2389 #, c-format msgid "format: %%(end) atom missing" msgstr "formato: atomo %%(end) mancante" -#: ref-filter.c:2482 +#: ref-filter.c:2489 #, c-format msgid "option `%s' is incompatible with --merged" msgstr "l'opzione `%s' non è compatibile con --merged" -#: ref-filter.c:2485 +#: ref-filter.c:2492 #, c-format msgid "option `%s' is incompatible with --no-merged" msgstr "l'opzione `%s' non è compatibile con --no-merged" -#: ref-filter.c:2495 +#: ref-filter.c:2502 #, c-format msgid "malformed object name %s" msgstr "nome dell'oggetto %s malformato" -#: ref-filter.c:2500 +#: ref-filter.c:2507 #, c-format msgid "option `%s' must point to a commit" msgstr "l'opzione `%s' deve puntare ad un commit" -#: remote.c:363 +#: remote.c:366 #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "" "la forma breve della configurazione del remoto non può iniziare con '/': %s" -#: remote.c:410 +#: remote.c:413 msgid "more than one receivepack given, using the first" msgstr "è stata specificata più di una direttiva receivepack, uso la prima" -#: remote.c:418 +#: remote.c:421 msgid "more than one uploadpack given, using the first" msgstr "è stata specificata più di una direttiva uploadpack, uso la prima" -#: remote.c:608 +#: remote.c:611 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Impossibile recuperare sia %s sia %s in %s" -#: remote.c:612 +#: remote.c:615 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s solitamente traccia %s, non %s" -#: remote.c:616 +#: remote.c:619 #, c-format msgid "%s tracks both %s and %s" msgstr "%s traccia sia %s sia %s" -#: remote.c:684 +#: remote.c:687 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "la chiave '%s' del pattern non aveva un '*'" -#: remote.c:694 +#: remote.c:697 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "il valore '%s' del pattern non ha un '*'" -#: remote.c:1000 +#: remote.c:1003 #, c-format msgid "src refspec %s does not match any" msgstr "nessuna corrispondenza per lo specificatore riferimento sorgente %s" -#: remote.c:1005 +#: remote.c:1008 #, c-format msgid "src refspec %s matches more than one" msgstr "" @@ -5416,7 +5451,7 @@ msgstr "" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1020 +#: remote.c:1023 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -5442,7 +5477,7 @@ msgstr "" "Nessuna delle due opzioni ha funzionato, quindi ci siamo arresi.\n" "Devi specificare un riferimento completamente qualificato." -#: remote.c:1040 +#: remote.c:1043 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -5453,7 +5488,7 @@ msgstr "" "è un oggetto tag. Forse intendevi creare un nuovo\n" "branch eseguendo il push a '%s:refs/heads/%s'?" -#: remote.c:1045 +#: remote.c:1048 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -5464,7 +5499,7 @@ msgstr "" "è un oggetto tag. Forse intendevi creare un nuovo\n" "branch eseguendo il push a '%s:refs/tags/%s'?" -#: remote.c:1050 +#: remote.c:1053 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -5476,7 +5511,7 @@ msgstr "" "tag a un nuovo albero eseguendo il push a\n" "'%s:refs/tags/%s'?" -#: remote.c:1055 +#: remote.c:1058 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -5488,121 +5523,121 @@ msgstr "" "tag a un nuovo blob eseguendo il push a\n" "'%s:refs/tags/%s'?" -#: remote.c:1091 +#: remote.c:1094 #, c-format msgid "%s cannot be resolved to branch" msgstr "%s non può essere risolto in un branch" -#: remote.c:1102 +#: remote.c:1105 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "impossibile eliminare '%s': il riferimento remoto non esiste" -#: remote.c:1114 +#: remote.c:1117 #, c-format msgid "dst refspec %s matches more than one" msgstr "" "sono state trovate più corrispondenze per lo specificatore riferimento " "destinazione %s" -#: remote.c:1121 +#: remote.c:1124 #, c-format msgid "dst ref %s receives from more than one src" msgstr "" "lo specificatore riferimento destinazione %s riceve dati da più di una " "sorgente" -#: remote.c:1624 remote.c:1725 +#: remote.c:1627 remote.c:1728 msgid "HEAD does not point to a branch" msgstr "HEAD non punta ad un branch" -#: remote.c:1633 +#: remote.c:1636 #, c-format msgid "no such branch: '%s'" msgstr "branch '%s' non esistente" -#: remote.c:1636 +#: remote.c:1639 #, c-format msgid "no upstream configured for branch '%s'" msgstr "nessun upstream configurato per il branch '%s'" -#: remote.c:1642 +#: remote.c:1645 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "" "branch upstream '%s' non memorizzato come branch che ne traccia uno remoto" -#: remote.c:1657 +#: remote.c:1660 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "la destinazione del push '%s' sul remoto '%s' non ha un branch locale che la " "traccia" -#: remote.c:1669 +#: remote.c:1672 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "il branch '%s' non ha un remoto per il push" -#: remote.c:1679 +#: remote.c:1682 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "gli specificatori riferimento per '%s' non includono '%s'" -#: remote.c:1692 +#: remote.c:1695 msgid "push has no destination (push.default is 'nothing')" msgstr "il push non ha una destinazione (push.default è 'nothing')" -#: remote.c:1714 +#: remote.c:1717 msgid "cannot resolve 'simple' push to a single destination" msgstr "impossibile risolvere il push 'simple' a una singola destinazione" -#: remote.c:1840 +#: remote.c:1843 #, c-format msgid "couldn't find remote ref %s" msgstr "impossibile trovare il riferimento remoto %s" -#: remote.c:1853 +#: remote.c:1856 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "* Ignoro localmente il riferimento strano '%s'" -#: remote.c:2016 +#: remote.c:2019 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Il tuo branch è basato su '%s', ma l'upstream è scomparso.\n" -#: remote.c:2020 +#: remote.c:2023 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (usa \"git branch --unset-upstream\" per correggere la situazione)\n" -#: remote.c:2023 +#: remote.c:2026 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Il tuo branch è aggiornato rispetto a '%s'.\n" -#: remote.c:2027 +#: remote.c:2030 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "Il tuo branch e '%s' fanno riferimento a commit differenti.\n" -#: remote.c:2030 +#: remote.c:2033 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (usa \"%s\" per visualizzare i dettagli)\n" -#: remote.c:2034 +#: remote.c:2037 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Il tuo branch è avanti rispetto a '%s' di %d commit.\n" msgstr[1] "Il tuo branch è avanti rispetto a '%s' di %d commit.\n" -#: remote.c:2040 +#: remote.c:2043 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (usa \"git push\" per pubblicare i tuoi commit locali)\n" -#: remote.c:2043 +#: remote.c:2046 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -5614,11 +5649,11 @@ msgstr[1] "" "Il tuo branch, rispetto a '%s', è indietro di %d commit e ne posso eseguire " "il fast forward.\n" -#: remote.c:2051 +#: remote.c:2054 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (usa \"git pull\" per aggiornare il tuo branch locale)\n" -#: remote.c:2054 +#: remote.c:2057 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -5633,11 +5668,11 @@ msgstr[1] "" "Il tuo branch e '%s' sono diventati divergenti\n" "e hanno rispettivamente %d e %d commit differenti.\n" -#: remote.c:2064 +#: remote.c:2067 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (usa \"git pull\" per eseguire il merge del branch remoto nel tuo)\n" -#: remote.c:2247 +#: remote.c:2250 #, c-format msgid "cannot parse expected object name '%s'" msgstr "impossibile analizzare il nome oggetto atteso '%s'" @@ -5715,7 +5750,7 @@ msgstr "impossibile eseguire l'unlink dell'oggetto smarrito '%s'" msgid "Recorded preimage for '%s'" msgstr "Salvata preimmagine di '%s'" -#: rerere.c:881 submodule.c:2023 builtin/log.c:1773 +#: rerere.c:881 submodule.c:2023 builtin/log.c:1790 #: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 #, c-format msgid "could not create directory '%s'" @@ -5750,20 +5785,20 @@ msgstr "Risoluzione per '%s' dimenticata\n" msgid "unable to open rr-cache directory" msgstr "impossibile aprire la directory cache rr" -#: revision.c:2507 +#: revision.c:2509 msgid "your current branch appears to be broken" msgstr "sembra che il tuo branch corrente sia rotto" -#: revision.c:2510 +#: revision.c:2512 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "il tuo branch corrente '%s' non ha ancora commit" -#: revision.c:2710 +#: revision.c:2720 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent non è compatibile con --bisect" -#: revision.c:2714 +#: revision.c:2724 msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L non supporta ancora formati diff oltre a -p e -s" @@ -5785,31 +5820,31 @@ msgstr "" "L'hook '%s' è stato ignorato perché non è impostato come eseguibile.\n" "Puoi disabilitare quest'avviso con `git config advice.ignoredHook false`." -#: send-pack.c:141 +#: send-pack.c:142 msgid "unexpected flush packet while reading remote unpack status" msgstr "" "pacchetto flush inatteso durante la lettura dello stato decompressione del " "remoto" -#: send-pack.c:143 +#: send-pack.c:144 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "impossibile analizzare lo stato decompressione del remoto: %s" -#: send-pack.c:145 +#: send-pack.c:146 #, c-format msgid "remote unpack failed: %s" msgstr "decompressione sul remoto non riuscita: %s" -#: send-pack.c:306 +#: send-pack.c:307 msgid "failed to sign the push certificate" msgstr "firma del certificato per il push non riuscita" -#: send-pack.c:420 +#: send-pack.c:421 msgid "the receiving end does not support --signed push" msgstr "il ricevente non supporta i push --signed" -#: send-pack.c:422 +#: send-pack.c:423 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -5817,11 +5852,11 @@ msgstr "" "non invio un certificato push perché il ricevente non supporta i push --" "signed" -#: send-pack.c:434 +#: send-pack.c:435 msgid "the receiving end does not support --atomic push" msgstr "il ricevente non supporta i push --atomic" -#: send-pack.c:439 +#: send-pack.c:440 msgid "the receiving end does not support push options" msgstr "il ricevente non supporta le opzioni push" @@ -5835,7 +5870,7 @@ msgstr "modalità pulizia messaggio commit non valida: '%s'" msgid "could not delete '%s'" msgstr "impossibile eliminare '%s'" -#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369 +#: sequencer.c:311 builtin/rebase.c:760 builtin/rebase.c:1676 builtin/rm.c:369 #, c-format msgid "could not remove '%s'" msgstr "impossibile rimuovere '%s'" @@ -5875,7 +5910,7 @@ msgstr "" "con 'git add <path>' o 'git rm <path>' ed esegui\n" "il commit del risultato con 'git commit'" -#: sequencer.c:401 sequencer.c:2909 +#: sequencer.c:401 sequencer.c:2847 #, c-format msgid "could not lock '%s'" msgstr "impossibile bloccare '%s'" @@ -5885,15 +5920,15 @@ msgstr "impossibile bloccare '%s'" msgid "could not write eol to '%s'" msgstr "impossibile scrivere il carattere di fine riga in '%s'" -#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929 -#: sequencer.c:3192 +#: sequencer.c:413 sequencer.c:2652 sequencer.c:2853 sequencer.c:2867 +#: sequencer.c:3130 #, c-format msgid "failed to finalize '%s'" msgstr "finalizzazione di '%s' non riuscita" -#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734 -#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763 -#: builtin/merge.c:1112 builtin/rebase.c:567 +#: sequencer.c:436 sequencer.c:1585 sequencer.c:2672 sequencer.c:3112 +#: sequencer.c:3221 builtin/am.c:244 builtin/commit.c:763 builtin/merge.c:1117 +#: builtin/rebase.c:568 #, c-format msgid "could not read '%s'" msgstr "impossibile leggere '%s'" @@ -5920,70 +5955,65 @@ msgstr "Modalità pulizia non valida: %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:632 +#: sequencer.c:631 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: impossibile scrivere il nuovo file indice" -#: sequencer.c:649 +#: sequencer.c:648 msgid "unable to update cache tree" msgstr "impossibile aggiornare l'albero cache" -#: sequencer.c:663 +#: sequencer.c:662 msgid "could not resolve HEAD commit" msgstr "impossibile risolvere il commit HEAD" -#: sequencer.c:743 +#: sequencer.c:742 #, c-format msgid "no key present in '%.*s'" msgstr "nessuna chiave presente in '%.*s'" -#: sequencer.c:754 +#: sequencer.c:753 #, c-format msgid "unable to dequote value of '%s'" msgstr "impossibile rimuovere gli apici dal valore di '%s'" -#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706 -#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045 +#: sequencer.c:790 wrapper.c:190 wrapper.c:360 builtin/am.c:705 +#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1046 #, c-format msgid "could not open '%s' for reading" msgstr "impossibile aprire '%s' in lettura" -#: sequencer.c:801 +#: sequencer.c:800 msgid "'GIT_AUTHOR_NAME' already given" msgstr "'GIT_AUTHOR_NAME' già specificato" -#: sequencer.c:806 +#: sequencer.c:805 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "'GIT_AUTHOR_EMAIL' già specificato" -#: sequencer.c:811 +#: sequencer.c:810 msgid "'GIT_AUTHOR_DATE' already given" msgstr "'GIT_AUTHOR_DATE' già specificato" -#: sequencer.c:815 +#: sequencer.c:814 #, c-format msgid "unknown variable '%s'" msgstr "variabile '%s' sconosciuta" -#: sequencer.c:820 +#: sequencer.c:819 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "'GIT_AUTHOR_NAME' mancante" -#: sequencer.c:822 +#: sequencer.c:821 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "'GIT_AUTHOR_EMAIL' mancante" -#: sequencer.c:824 +#: sequencer.c:823 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "'GIT_AUTHOR_DATE' mancante" -#: sequencer.c:884 -#, c-format -msgid "invalid date format '%s' in '%s'" -msgstr "formato data '%s' non valido in '%s'" - -#: sequencer.c:901 +#: sequencer.c:872 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -6013,15 +6043,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:995 -msgid "writing root commit" -msgstr "scrittura commit radice in corso" - -#: sequencer.c:1216 +#: sequencer.c:1146 msgid "'prepare-commit-msg' hook failed" msgstr "hook 'prepare-commit-msg' non riuscito" -#: sequencer.c:1223 +#: sequencer.c:1153 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6048,7 +6074,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1236 +#: sequencer.c:1166 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6074,329 +6100,329 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1278 +#: sequencer.c:1208 msgid "couldn't look up newly created commit" msgstr "impossibile trovare il commit appena creato" -#: sequencer.c:1280 +#: sequencer.c:1210 msgid "could not parse newly created commit" msgstr "impossibile analizzare il commit appena creato" -#: sequencer.c:1326 +#: sequencer.c:1256 msgid "unable to resolve HEAD after creating commit" msgstr "impossibile risolvere HEAD dopo la creazione del commit" -#: sequencer.c:1328 +#: sequencer.c:1258 msgid "detached HEAD" msgstr "HEAD scollegato" -#: sequencer.c:1332 +#: sequencer.c:1262 msgid " (root-commit)" msgstr " (commit radice)" -#: sequencer.c:1353 +#: sequencer.c:1283 msgid "could not parse HEAD" msgstr "impossibile analizzare HEAD" -#: sequencer.c:1355 +#: sequencer.c:1285 #, c-format msgid "HEAD %s is not a commit!" msgstr "L'HEAD %s non è un commit!" -#: sequencer.c:1359 builtin/commit.c:1571 +#: sequencer.c:1289 builtin/commit.c:1571 msgid "could not parse HEAD commit" msgstr "impossibile analizzare il commit HEAD" -#: sequencer.c:1411 sequencer.c:2004 +#: sequencer.c:1341 sequencer.c:1933 msgid "unable to parse commit author" msgstr "impossibile analizzare l'autore del commit" -#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684 +#: sequencer.c:1352 builtin/am.c:1561 builtin/merge.c:684 msgid "git write-tree failed to write a tree" msgstr "git write-tree non è riuscito a scrivere un albero" -#: sequencer.c:1438 sequencer.c:1499 +#: sequencer.c:1369 sequencer.c:1429 #, c-format msgid "unable to read commit message from '%s'" msgstr "impossibile leggere il messaggio di commit da '%s'" -#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878 -#: builtin/merge.c:903 +#: sequencer.c:1396 builtin/am.c:1583 builtin/commit.c:1670 builtin/merge.c:883 +#: builtin/merge.c:908 msgid "failed to write commit object" msgstr "scrittura dell'oggetto del commit non riuscita" -#: sequencer.c:1526 +#: sequencer.c:1456 #, c-format msgid "could not parse commit %s" msgstr "impossibile analizzare il commit %s" -#: sequencer.c:1531 +#: sequencer.c:1461 #, c-format msgid "could not parse parent commit %s" msgstr "impossibile analizzare il commit genitore %s" -#: sequencer.c:1605 sequencer.c:1715 +#: sequencer.c:1535 sequencer.c:1645 #, c-format msgid "unknown command: %d" msgstr "comando sconosciuto: %d" -#: sequencer.c:1662 sequencer.c:1687 +#: sequencer.c:1592 sequencer.c:1617 #, c-format msgid "This is a combination of %d commits." msgstr "Questa è una combinazione di %d commit." -#: sequencer.c:1672 +#: sequencer.c:1602 msgid "need a HEAD to fixup" msgstr "è necessaria un'HEAD per il fixup" -#: sequencer.c:1674 sequencer.c:3219 +#: sequencer.c:1604 sequencer.c:3157 msgid "could not read HEAD" msgstr "impossibile leggere l'HEAD" -#: sequencer.c:1676 +#: sequencer.c:1606 msgid "could not read HEAD's commit message" msgstr "impossibile leggere il messaggio di commit dell'HEAD" -#: sequencer.c:1682 +#: sequencer.c:1612 #, c-format msgid "cannot write '%s'" msgstr "impossibile scrivere '%s'" -#: sequencer.c:1689 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1619 git-rebase--preserve-merges.sh:496 msgid "This is the 1st commit message:" msgstr "Questo è il primo messaggio di commit:" -#: sequencer.c:1697 +#: sequencer.c:1627 #, c-format msgid "could not read commit message of %s" msgstr "impossibile leggere il messaggio di commit di %s" -#: sequencer.c:1704 +#: sequencer.c:1634 #, c-format msgid "This is the commit message #%d:" msgstr "Questo è il messaggio di commit numero %d:" -#: sequencer.c:1710 +#: sequencer.c:1640 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Il messaggio di commit numero %d sarà saltato:" -#: sequencer.c:1798 +#: sequencer.c:1728 msgid "your index file is unmerged." msgstr "il file indice non è stato sottoposto a merge." -#: sequencer.c:1805 +#: sequencer.c:1735 msgid "cannot fixup root commit" msgstr "impossibile eseguire il fixup sul commit radice" -#: sequencer.c:1824 +#: sequencer.c:1754 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "il commit %s è un merge ma non è stata specificata l'opzione -m." -#: sequencer.c:1832 sequencer.c:1840 +#: sequencer.c:1762 sequencer.c:1770 #, c-format msgid "commit %s does not have parent %d" msgstr "il commit %s non ha il genitore %d" -#: sequencer.c:1846 +#: sequencer.c:1776 #, c-format msgid "cannot get commit message for %s" msgstr "impossibile ottenere il messaggio di commit per %s" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1865 +#: sequencer.c:1795 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: impossibile analizzare il commit genitore %s" -#: sequencer.c:1930 +#: sequencer.c:1860 #, c-format msgid "could not rename '%s' to '%s'" msgstr "impossibile ridenominare '%s' in '%s'" -#: sequencer.c:1985 +#: sequencer.c:1915 #, c-format msgid "could not revert %s... %s" msgstr "non è stato possibile eseguire il revert di %s... %s" -#: sequencer.c:1986 +#: sequencer.c:1916 #, c-format msgid "could not apply %s... %s" msgstr "non è stato possibile applicare %s... %s" -#: sequencer.c:2045 +#: sequencer.c:1983 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: lettura dell'indice non riuscita" -#: sequencer.c:2052 +#: sequencer.c:1990 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: aggiornamento dell'indice non riuscito" -#: sequencer.c:2128 +#: sequencer.c:2066 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s non accetta argomenti: '%s'" -#: sequencer.c:2137 +#: sequencer.c:2075 #, c-format msgid "missing arguments for %s" msgstr "argomenti mancanti per %s" -#: sequencer.c:2174 +#: sequencer.c:2112 #, c-format msgid "could not parse '%.*s'" msgstr "impossibile analizzare '%.*s'" -#: sequencer.c:2228 +#: sequencer.c:2166 #, c-format msgid "invalid line %d: %.*s" msgstr "riga %d non valida: %.*s" -#: sequencer.c:2239 +#: sequencer.c:2177 #, c-format msgid "cannot '%s' without a previous commit" msgstr "impossibile eseguire '%s' senza un commit precedente" -#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178 +#: sequencer.c:2225 builtin/rebase.c:153 builtin/rebase.c:178 #: builtin/rebase.c:204 builtin/rebase.c:229 #, c-format msgid "could not read '%s'." msgstr "impossibile leggere '%s'." -#: sequencer.c:2323 +#: sequencer.c:2261 msgid "cancelling a cherry picking in progress" msgstr "annullo un'operazione di cherry-pick in corso" -#: sequencer.c:2330 +#: sequencer.c:2268 msgid "cancelling a revert in progress" msgstr "annullo un'operazione di revert in corso" -#: sequencer.c:2364 +#: sequencer.c:2302 msgid "please fix this using 'git rebase --edit-todo'." msgstr "correggi la situazione usando 'git rebase --edit-todo'." -#: sequencer.c:2366 +#: sequencer.c:2304 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "foglio istruzioni inutilizzabile: '%s'" -#: sequencer.c:2371 +#: sequencer.c:2309 msgid "no commits parsed." msgstr "nessun commit analizzato." -#: sequencer.c:2382 +#: sequencer.c:2320 msgid "cannot cherry-pick during a revert." msgstr "impossibile eseguire un cherry-pick durante un revert." -#: sequencer.c:2384 +#: sequencer.c:2322 msgid "cannot revert during a cherry-pick." msgstr "impossibile eseguire un revert durante un cherry-pick." -#: sequencer.c:2466 +#: sequencer.c:2404 #, c-format msgid "invalid value for %s: %s" msgstr "valore non valido per %s: %s" -#: sequencer.c:2553 +#: sequencer.c:2491 msgid "unusable squash-onto" msgstr "squash-onto inutilizzabile" -#: sequencer.c:2569 +#: sequencer.c:2507 #, c-format msgid "malformed options sheet: '%s'" msgstr "foglio opzioni malformati: '%s'" -#: sequencer.c:2652 sequencer.c:4351 +#: sequencer.c:2590 sequencer.c:4308 msgid "empty commit set passed" msgstr "è stato passato un insieme di commit vuoto" -#: sequencer.c:2668 +#: sequencer.c:2606 msgid "revert is already in progress" msgstr "un'operazione di revert è già in corso" -#: sequencer.c:2670 +#: sequencer.c:2608 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "prova \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:2673 +#: sequencer.c:2611 msgid "cherry-pick is already in progress" msgstr "un'operazione di cherry-pick è già in corso" -#: sequencer.c:2675 +#: sequencer.c:2613 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "prova \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:2689 +#: sequencer.c:2627 #, c-format msgid "could not create sequencer directory '%s'" msgstr "impossibile creare la directory sequencer '%s'" -#: sequencer.c:2704 +#: sequencer.c:2642 msgid "could not lock HEAD" msgstr "impossibile bloccare HEAD" -#: sequencer.c:2764 sequencer.c:4103 +#: sequencer.c:2702 sequencer.c:4057 msgid "no cherry-pick or revert in progress" msgstr "nessuna operazione di cherry-pick o revert in corso" -#: sequencer.c:2766 sequencer.c:2777 +#: sequencer.c:2704 sequencer.c:2715 msgid "cannot resolve HEAD" msgstr "impossibile risolvere HEAD" -#: sequencer.c:2768 sequencer.c:2812 +#: sequencer.c:2706 sequencer.c:2750 msgid "cannot abort from a branch yet to be born" msgstr "" "impossibile interrompere l'operazione da un branch che deve essere ancora " "creato" -#: sequencer.c:2798 builtin/grep.c:734 +#: sequencer.c:2736 builtin/grep.c:736 #, c-format msgid "cannot open '%s'" msgstr "impossibile aprire '%s'" -#: sequencer.c:2800 +#: sequencer.c:2738 #, c-format msgid "cannot read '%s': %s" msgstr "impossibile leggere '%s': %s" -#: sequencer.c:2801 +#: sequencer.c:2739 msgid "unexpected end of file" msgstr "fine del file inattesa" -#: sequencer.c:2807 +#: sequencer.c:2745 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" "il file '%s' in cui è stato salvato l'HEAD prima del cherry pick è corrotto" -#: sequencer.c:2818 +#: sequencer.c:2756 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" "Sembra che tu abbia spostato l'HEAD. Non eseguo il rewind, controlla l'HEAD!" -#: sequencer.c:2859 +#: sequencer.c:2797 msgid "no revert in progress" msgstr "nessun revert in corso" -#: sequencer.c:2867 +#: sequencer.c:2805 msgid "no cherry-pick in progress" msgstr "nessun cherry-pick in corso" -#: sequencer.c:2877 +#: sequencer.c:2815 msgid "failed to skip the commit" msgstr "salto del commit non riuscito" -#: sequencer.c:2884 +#: sequencer.c:2822 msgid "there is nothing to skip" msgstr "non c'è nulla da saltare" -#: sequencer.c:2887 +#: sequencer.c:2825 #, c-format msgid "" "have you committed already?\n" @@ -6405,21 +6431,21 @@ msgstr "" "hai già eseguito il commit?\n" "prova \"git %s --continue\"" -#: sequencer.c:3011 sequencer.c:4015 +#: sequencer.c:2949 sequencer.c:3969 #, c-format msgid "could not update %s" msgstr "impossibile aggiornare %s" -#: sequencer.c:3049 sequencer.c:3995 +#: sequencer.c:2987 sequencer.c:3949 msgid "cannot read HEAD" msgstr "impossibile leggere l'HEAD" -#: sequencer.c:3066 +#: sequencer.c:3004 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "impossibile copiare '%s' in '%s'" -#: sequencer.c:3074 +#: sequencer.c:3012 #, c-format msgid "" "You can amend the commit now, with\n" @@ -6438,27 +6464,27 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3084 +#: sequencer.c:3022 #, c-format msgid "Could not apply %s... %.*s" msgstr "Impossibile applicare %s... %.*s" -#: sequencer.c:3091 +#: sequencer.c:3029 #, c-format msgid "Could not merge %.*s" msgstr "Impossibile eseguire il merge di %.*s" -#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633 +#: sequencer.c:3043 sequencer.c:3047 builtin/difftool.c:641 #, c-format msgid "could not copy '%s' to '%s'" msgstr "impossibile copiare '%s' in '%s'" -#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582 -#: builtin/rebase.c:1953 builtin/rebase.c:2008 +#: sequencer.c:3069 sequencer.c:3506 builtin/rebase.c:850 builtin/rebase.c:1613 +#: builtin/rebase.c:1987 builtin/rebase.c:2031 msgid "could not read index" msgstr "impossibile leggere l'indice" -#: sequencer.c:3136 +#: sequencer.c:3074 #, c-format msgid "" "execution failed: %s\n" @@ -6473,11 +6499,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3142 +#: sequencer.c:3080 msgid "and made changes to the index and/or the working tree\n" msgstr "e sono state apportate modifiche all'indice e/o all'albero di lavoro\n" -#: sequencer.c:3148 +#: sequencer.c:3086 #, c-format msgid "" "execution succeeded: %s\n" @@ -6494,76 +6520,76 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3209 +#: sequencer.c:3147 #, c-format msgid "illegal label name: '%.*s'" msgstr "nome etichetta illecito: '%.*s'" -#: sequencer.c:3263 +#: sequencer.c:3201 msgid "writing fake root commit" msgstr "scrittura commit radice falso in corso" -#: sequencer.c:3268 +#: sequencer.c:3206 msgid "writing squash-onto" msgstr "scrittura squash-onto in corso" -#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860 +#: sequencer.c:3244 builtin/rebase.c:855 builtin/rebase.c:861 #, c-format msgid "failed to find tree of %s" msgstr "impossibile trovare l'albero di %s" -#: sequencer.c:3324 builtin/rebase.c:873 +#: sequencer.c:3262 builtin/rebase.c:874 msgid "could not write index" msgstr "impossibile scrivere l'indice" -#: sequencer.c:3351 +#: sequencer.c:3289 #, c-format msgid "could not resolve '%s'" msgstr "impossibile risolvere '%s'" -#: sequencer.c:3379 +#: sequencer.c:3320 msgid "cannot merge without a current revision" msgstr "impossibile eseguire il merge senza una revisione corrente" -#: sequencer.c:3401 +#: sequencer.c:3342 #, c-format msgid "unable to parse '%.*s'" msgstr "impossibile analizzare '%.*s'" -#: sequencer.c:3410 +#: sequencer.c:3351 #, c-format msgid "nothing to merge: '%.*s'" msgstr "non c'è nulla di cui eseguire il merge: '%.*s'" -#: sequencer.c:3422 +#: sequencer.c:3363 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "il merge octopus non può essere eseguito su un [nuovo commit radice]" -#: sequencer.c:3437 +#: sequencer.c:3378 #, c-format msgid "could not get commit message of '%s'" msgstr "impossibile ottenere il messaggio di commit per '%s'" -#: sequencer.c:3590 +#: sequencer.c:3538 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "non è stato nemmeno possibile tentare di eseguire il merge di '%.*s'" -#: sequencer.c:3606 +#: sequencer.c:3554 msgid "merge: Unable to write new index file" msgstr "merge: impossibile scrivere il nuovo file indice" -#: sequencer.c:3675 builtin/rebase.c:711 +#: sequencer.c:3623 builtin/rebase.c:712 #, c-format msgid "Applied autostash.\n" msgstr "Stash automatico applicato.\n" -#: sequencer.c:3687 +#: sequencer.c:3635 #, c-format msgid "cannot store %s" msgstr "impossibile memorizzare %s" -#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113 +#: sequencer.c:3638 builtin/rebase.c:728 git-rebase--preserve-merges.sh:113 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -6574,31 +6600,31 @@ msgstr "" "Le tue modifiche sono al sicuro nello stash.\n" "Puoi eseguire \"git stash pop\" o \"git stash drop\" in qualunque momento.\n" -#: sequencer.c:3751 +#: sequencer.c:3699 #, c-format msgid "could not checkout %s" msgstr "impossibile eseguire il checkout di %s" -#: sequencer.c:3765 +#: sequencer.c:3713 #, c-format msgid "%s: not a valid OID" msgstr "%s: non è un OID valido" -#: sequencer.c:3770 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3718 git-rebase--preserve-merges.sh:779 msgid "could not detach HEAD" msgstr "impossibile scollegare l'HEAD" -#: sequencer.c:3785 +#: sequencer.c:3733 #, c-format msgid "Stopped at HEAD\n" msgstr "Fermato a HEAD\n" -#: sequencer.c:3787 +#: sequencer.c:3735 #, c-format msgid "Stopped at %s\n" msgstr "Fermato a %s\n" -#: sequencer.c:3795 +#: sequencer.c:3743 #, c-format msgid "" "Could not execute the todo command\n" @@ -6620,49 +6646,49 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3877 +#: sequencer.c:3827 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Fermato a %s... %.*s\n" -#: sequencer.c:3958 +#: sequencer.c:3898 #, c-format msgid "unknown command %d" msgstr "comando %d sconosciuto" -#: sequencer.c:4003 +#: sequencer.c:3957 msgid "could not read orig-head" msgstr "impossibile leggere orig-head" -#: sequencer.c:4008 +#: sequencer.c:3962 msgid "could not read 'onto'" msgstr "impossibile leggere 'onto'" -#: sequencer.c:4022 +#: sequencer.c:3976 #, c-format msgid "could not update HEAD to %s" msgstr "impossibile aggiornare l'HEAD a %s" -#: sequencer.c:4115 +#: sequencer.c:4069 msgid "cannot rebase: You have unstaged changes." msgstr "" "impossibile eseguire il rebase: ci sono delle modifiche non in staging." -#: sequencer.c:4124 +#: sequencer.c:4078 msgid "cannot amend non-existing commit" msgstr "impossibile modificare un commit inesistente" -#: sequencer.c:4126 +#: sequencer.c:4080 #, c-format msgid "invalid file: '%s'" msgstr "file non valido: '%s'" -#: sequencer.c:4128 +#: sequencer.c:4082 #, c-format msgid "invalid contents: '%s'" msgstr "contenuti non validi: '%s'" -#: sequencer.c:4131 +#: sequencer.c:4085 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -6673,42 +6699,42 @@ msgstr "" "di lavoro. Eseguine prima il commit e quindi esegui nuovamente 'git rebase\n" "--continue'." -#: sequencer.c:4167 sequencer.c:4205 +#: sequencer.c:4121 sequencer.c:4159 #, c-format msgid "could not write file: '%s'" msgstr "impossibile scrivere il file: '%s'" -#: sequencer.c:4220 +#: sequencer.c:4174 msgid "could not remove CHERRY_PICK_HEAD" msgstr "impossibile rimuovere CHERRY_PICK_HEAD" -#: sequencer.c:4227 +#: sequencer.c:4181 msgid "could not commit staged changes." msgstr "impossibile eseguire il commit delle modifiche in staging." -#: sequencer.c:4328 +#: sequencer.c:4285 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: impossibile eseguire il cherry pick di un %s" -#: sequencer.c:4332 +#: sequencer.c:4289 #, c-format msgid "%s: bad revision" msgstr "%s: revisione non valida" -#: sequencer.c:4367 +#: sequencer.c:4324 msgid "can't revert as initial commit" msgstr "impossibile eseguire il revert come commit iniziale" -#: sequencer.c:4810 +#: sequencer.c:4774 msgid "make_script: unhandled options" msgstr "make_script: opzioni non gestite" -#: sequencer.c:4813 +#: sequencer.c:4777 msgid "make_script: error preparing revisions" msgstr "make_script: errore durante la preparazione delle revisioni" -#: sequencer.c:4971 +#: sequencer.c:4935 msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" "continue'.\n" @@ -6718,24 +6744,24 @@ msgstr "" "eseguire 'git rebase --continue'.\n" "Oppure puoi interrompere il rebase con 'git rebase --abort'.\n" -#: sequencer.c:5083 sequencer.c:5100 +#: sequencer.c:5047 sequencer.c:5064 msgid "nothing to do" msgstr "nulla da fare" -#: sequencer.c:5114 +#: sequencer.c:5078 msgid "could not skip unnecessary pick commands" msgstr "impossibile saltare i comandi pick non necessari" -#: sequencer.c:5197 +#: sequencer.c:5166 msgid "the script was already rearranged." msgstr "lo script è già stato riordinato." -#: setup.c:123 +#: setup.c:124 #, c-format msgid "'%s' is outside repository" msgstr "'%s' è al di fuori del repository" -#: setup.c:173 +#: setup.c:174 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -6745,7 +6771,7 @@ msgstr "" "Usa 'git <comando> -- <percorso>...' per specificare percorsi non esistenti " "localmente." -#: setup.c:186 +#: setup.c:187 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -6757,14 +6783,14 @@ msgstr "" "Usa '--' per separare i percorsi dalle revisioni, come segue:\n" "'git <comando> [<revisione>...] -- [<file>...]'" -#: setup.c:235 +#: setup.c:236 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "" "l'opzione '%s' deve essere specificata prima degli argomenti che non " "costituiscono un'opzione" -#: setup.c:254 +#: setup.c:255 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -6775,93 +6801,93 @@ msgstr "" "Usa '--' per separare i percorsi dalle revisioni, come segue:\n" "'git <comando> [<revisione>...] -- [<file>...]'" -#: setup.c:390 +#: setup.c:391 msgid "unable to set up work tree using invalid config" msgstr "" "impossibile preparare l'albero di lavoro usando una configurazione non valida" -#: setup.c:394 +#: setup.c:395 msgid "this operation must be run in a work tree" msgstr "quest'operazione deve essere eseguita in un albero di lavoro" -#: setup.c:540 +#: setup.c:541 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Attesa versione repository Git <= %d, trovata %d" -#: setup.c:548 +#: setup.c:549 msgid "unknown repository extensions found:" msgstr "trovate estensioni repository sconosciute:" -#: setup.c:567 +#: setup.c:568 #, c-format msgid "error opening '%s'" msgstr "errore durante l'apertura di '%s'" -#: setup.c:569 +#: setup.c:570 #, c-format msgid "too large to be a .git file: '%s'" msgstr "'%s' troppo grande per essere un file .git" -#: setup.c:571 +#: setup.c:572 #, c-format msgid "error reading %s" msgstr "errore durante la lettura di %s" -#: setup.c:573 +#: setup.c:574 #, c-format msgid "invalid gitfile format: %s" msgstr "formato file Git non valido: %s" -#: setup.c:575 +#: setup.c:576 #, c-format msgid "no path in gitfile: %s" msgstr "nessun percorso presente nel file Git: %s" -#: setup.c:577 +#: setup.c:578 #, c-format msgid "not a git repository: %s" msgstr "%s non è un repository Git" -#: setup.c:676 +#: setup.c:677 #, c-format msgid "'$%s' too big" msgstr "'$%s' è troppo grande" -#: setup.c:690 +#: setup.c:691 #, c-format msgid "not a git repository: '%s'" msgstr "'%s' non è un repository Git" -#: setup.c:719 setup.c:721 setup.c:752 +#: setup.c:720 setup.c:722 setup.c:753 #, c-format msgid "cannot chdir to '%s'" msgstr "impossibile modificare la directory corrente in '%s'" -#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837 +#: setup.c:725 setup.c:781 setup.c:791 setup.c:830 setup.c:838 msgid "cannot come back to cwd" msgstr "impossibile tornare alla directory di lavoro corrente" -#: setup.c:851 +#: setup.c:852 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "stat di '%*s%s%s' non riuscito" -#: setup.c:1083 +#: setup.c:1090 msgid "Unable to read current working directory" msgstr "Impossibile leggere la directory di lavoro corrente" -#: setup.c:1092 setup.c:1098 +#: setup.c:1099 setup.c:1105 #, c-format msgid "cannot change to '%s'" msgstr "impossibile entrare in '%s'" -#: setup.c:1103 +#: setup.c:1110 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "%s non è un repository Git (né lo è alcuna delle directory genitrici)" -#: setup.c:1109 +#: setup.c:1116 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -6871,7 +6897,7 @@ msgstr "" "Mi fermo al limite del filesystem (l'opzione GIT_DISCOVERY_ACROSS_FILESYSTEM " "non è impostata)." -#: setup.c:1220 +#: setup.c:1227 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -6881,289 +6907,289 @@ msgstr "" "(0%.3o).\n" "Il proprietario dei file deve avere sempre i permessi di lettura e scrittura." -#: setup.c:1264 +#: setup.c:1271 msgid "open /dev/null or dup failed" msgstr "apertura di /dev/null o dup non riuscita" -#: setup.c:1279 +#: setup.c:1286 msgid "fork failed" msgstr "fork non riuscita" -#: setup.c:1284 +#: setup.c:1291 msgid "setsid failed" msgstr "setsid non riuscita" -#: sha1-file.c:453 +#: sha1-file.c:452 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "" "la directory oggetti %s non esiste; controlla .git/objects/info/alternates" -#: sha1-file.c:504 +#: sha1-file.c:503 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "impossibile normalizzare il percorso alternativo oggetto: %s" -#: sha1-file.c:576 +#: sha1-file.c:575 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "" "%s: ignoro gli archivi oggetto alternativi, la nidificazione è troppo " "profonda" -#: sha1-file.c:583 +#: sha1-file.c:582 #, c-format msgid "unable to normalize object directory: %s" msgstr "impossibile normalizzare la directory oggetti: %s" -#: sha1-file.c:626 +#: sha1-file.c:625 msgid "unable to fdopen alternates lockfile" msgstr "impossibile eseguire fdopen sul file di lock alternates" -#: sha1-file.c:644 +#: sha1-file.c:643 msgid "unable to read alternates file" msgstr "impossibile leggere il file alternates" -#: sha1-file.c:651 +#: sha1-file.c:650 msgid "unable to move new alternates file into place" msgstr "impossibile spostare il nuovo file alternates nella posizione corretta" -#: sha1-file.c:686 +#: sha1-file.c:685 #, c-format msgid "path '%s' does not exist" msgstr "il percorso '%s' non esiste" -#: sha1-file.c:712 +#: sha1-file.c:711 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" "l'aggiunta del repository di riferimento '%s' come checkout collegato non è " "ancora supportata." -#: sha1-file.c:718 +#: sha1-file.c:717 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "il repository di riferimento '%s' non è un repository locale." -#: sha1-file.c:724 +#: sha1-file.c:723 #, c-format msgid "reference repository '%s' is shallow" msgstr "il repository di riferimento '%s' è shallow" -#: sha1-file.c:732 +#: sha1-file.c:731 #, c-format msgid "reference repository '%s' is grafted" msgstr "il repository di riferimento '%s' è un graft" -#: sha1-file.c:792 +#: sha1-file.c:791 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "riga non valida durante l'analisi dei riferimenti degli alternati: %s" -#: sha1-file.c:944 +#: sha1-file.c:943 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "tento di eseguire mmap %<PRIuMAX> al di sopra del limite %<PRIuMAX>" -#: sha1-file.c:969 +#: sha1-file.c:964 msgid "mmap failed" msgstr "mmap non riuscita" -#: sha1-file.c:1133 +#: sha1-file.c:1128 #, c-format msgid "object file %s is empty" msgstr "l'oggetto %s è vuoto" -#: sha1-file.c:1257 sha1-file.c:2396 +#: sha1-file.c:1252 sha1-file.c:2392 #, c-format msgid "corrupt loose object '%s'" msgstr "oggetto sciolto '%s' corrotto" -#: sha1-file.c:1259 sha1-file.c:2400 +#: sha1-file.c:1254 sha1-file.c:2396 #, c-format msgid "garbage at end of loose object '%s'" msgstr "dati inutilizzabili presenti alla fine dell'oggetto sciolto '%s'" -#: sha1-file.c:1301 +#: sha1-file.c:1296 msgid "invalid object type" msgstr "tipo oggetto non valido" -#: sha1-file.c:1385 +#: sha1-file.c:1380 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "impossibile decomprimere l'intestazione %s con --allow-unknown-type" -#: sha1-file.c:1388 +#: sha1-file.c:1383 #, c-format msgid "unable to unpack %s header" msgstr "impossibile decomprimere l'intestazione %s" -#: sha1-file.c:1394 +#: sha1-file.c:1389 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "impossibile analizzare l'intestazione %s con --allow-unknown-type" -#: sha1-file.c:1397 +#: sha1-file.c:1392 #, c-format msgid "unable to parse %s header" msgstr "impossibile analizzare l'intestazione %s" -#: sha1-file.c:1588 +#: sha1-file.c:1584 #, c-format msgid "failed to read object %s" msgstr "lettura dell'oggetto %s non riuscita" -#: sha1-file.c:1592 +#: sha1-file.c:1588 #, c-format msgid "replacement %s not found for %s" msgstr "%s sostitutivo non trovato per %s" -#: sha1-file.c:1596 +#: sha1-file.c:1592 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "l'oggetto sciolto %s (salvato in %s) è corrotto" -#: sha1-file.c:1600 +#: sha1-file.c:1596 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "l'oggetto archiviato %s (salvato in %s) è corrotto" -#: sha1-file.c:1703 +#: sha1-file.c:1699 #, c-format msgid "unable to write file %s" msgstr "impossibile scrivere il file %s" -#: sha1-file.c:1710 +#: sha1-file.c:1706 #, c-format msgid "unable to set permission to '%s'" msgstr "impossibile impostare i permessi a '%s'" -#: sha1-file.c:1717 +#: sha1-file.c:1713 msgid "file write error" msgstr "errore di scrittura del file" -#: sha1-file.c:1736 +#: sha1-file.c:1732 msgid "error when closing loose object file" msgstr "errore durante la chiusura del file oggetto sciolto" -#: sha1-file.c:1801 +#: sha1-file.c:1797 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" "permessi non sufficienti per l'aggiunta di un oggetto al database repository " "%s" -#: sha1-file.c:1803 +#: sha1-file.c:1799 msgid "unable to create temporary file" msgstr "impossibile creare il file temporaneo" -#: sha1-file.c:1827 +#: sha1-file.c:1823 msgid "unable to write loose object file" msgstr "impossibile scrivere il file oggetto sciolto" -#: sha1-file.c:1833 +#: sha1-file.c:1829 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "impossibile comprimere con deflate il nuovo oggetto %s (%d)" -#: sha1-file.c:1837 +#: sha1-file.c:1833 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "deflateEnd non riuscita sull'oggetto %s (%d)" -#: sha1-file.c:1841 +#: sha1-file.c:1837 #, c-format msgid "confused by unstable object source data for %s" msgstr "sono confuso dall'origine dati oggetto non stabile per %s" -#: sha1-file.c:1851 builtin/pack-objects.c:925 +#: sha1-file.c:1847 builtin/pack-objects.c:925 #, c-format msgid "failed utime() on %s" msgstr "utime() di %s non riuscita" -#: sha1-file.c:1926 +#: sha1-file.c:1922 #, c-format msgid "cannot read object for %s" msgstr "impossibile leggere l'oggetto per %s" -#: sha1-file.c:1966 +#: sha1-file.c:1962 msgid "corrupt commit" msgstr "commit corrotto" -#: sha1-file.c:1974 +#: sha1-file.c:1970 msgid "corrupt tag" msgstr "tag corrotto" -#: sha1-file.c:2073 +#: sha1-file.c:2069 #, c-format msgid "read error while indexing %s" msgstr "errore di lettura durante l'indicizzazione di %s" -#: sha1-file.c:2076 +#: sha1-file.c:2072 #, c-format msgid "short read while indexing %s" msgstr "lettura troppo breve durante l'indicizzazione di %s" -#: sha1-file.c:2149 sha1-file.c:2158 +#: sha1-file.c:2145 sha1-file.c:2154 #, c-format msgid "%s: failed to insert into database" msgstr "%s: inserimento del record nel database non riuscito" -#: sha1-file.c:2164 +#: sha1-file.c:2160 #, c-format msgid "%s: unsupported file type" msgstr "%s: tipo di file non supportato" -#: sha1-file.c:2188 +#: sha1-file.c:2184 #, c-format msgid "%s is not a valid object" msgstr "%s non è un oggetto valido" -#: sha1-file.c:2190 +#: sha1-file.c:2186 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s non è un oggetto '%s' valido" -#: sha1-file.c:2217 builtin/index-pack.c:155 +#: sha1-file.c:2213 builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "impossibile aprire %s" -#: sha1-file.c:2407 sha1-file.c:2459 +#: sha1-file.c:2403 sha1-file.c:2455 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "mancata corrispondenza per %s (atteso %s)" -#: sha1-file.c:2431 +#: sha1-file.c:2427 #, c-format msgid "unable to mmap %s" msgstr "impossibile eseguire mmap su %s" -#: sha1-file.c:2436 +#: sha1-file.c:2432 #, c-format msgid "unable to unpack header of %s" msgstr "impossibile decomprimere l'intestazione di %s" -#: sha1-file.c:2442 +#: sha1-file.c:2438 #, c-format msgid "unable to parse header of %s" msgstr "impossibile analizzare l'intestazione di %s" -#: sha1-file.c:2453 +#: sha1-file.c:2449 #, c-format msgid "unable to unpack contents of %s" msgstr "impossibile decomprimere i contenuti di %s" -#: sha1-name.c:490 +#: sha1-name.c:487 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "lo SHA1 breve %s è ambiguo" -#: sha1-name.c:501 +#: sha1-name.c:498 msgid "The candidates are:" msgstr "I candidati sono:" -#: sha1-name.c:800 +#: sha1-name.c:797 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -7188,43 +7214,43 @@ msgstr "" "messaggio eseguendo \"git config advice.objectNameWarning false\"" #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:821 +#: strbuf.c:822 #, c-format msgid "%u.%2.2u GiB" msgstr "%u.%2.2u GiB" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:823 +#: strbuf.c:824 #, c-format msgid "%u.%2.2u GiB/s" msgstr "%u.%2.2u GiB/s" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:831 +#: strbuf.c:832 #, c-format msgid "%u.%2.2u MiB" msgstr "%u.%2.2u MiB" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:833 +#: strbuf.c:834 #, c-format msgid "%u.%2.2u MiB/s" msgstr "%u.%2.2u MiB/s" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:840 +#: strbuf.c:841 #, c-format msgid "%u.%2.2u KiB" msgstr "%u.%2.2u KiB" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:842 +#: strbuf.c:843 #, c-format msgid "%u.%2.2u KiB/s" msgstr "%u.%2.2u KiB/s" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:848 +#: strbuf.c:849 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -7232,7 +7258,7 @@ msgstr[0] "%u byte" msgstr[1] "%u byte" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:850 +#: strbuf.c:851 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" @@ -7353,28 +7379,28 @@ msgstr "impossibile avviare ls-files in .." msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree ha restituito il valore di ritorno inatteso %d" -#: submodule-config.c:232 +#: submodule-config.c:236 #, c-format msgid "ignoring suspicious submodule name: %s" msgstr "ignoro un nome sottomodulo sospetto: %s" -#: submodule-config.c:299 +#: submodule-config.c:303 msgid "negative values not allowed for submodule.fetchjobs" msgstr "i valori negativi non sono consentiti per submodule.fetchjobs" -#: submodule-config.c:397 +#: submodule-config.c:401 #, c-format msgid "ignoring '%s' which may be interpreted as a command-line option: %s" msgstr "" "ignoro '%s' che potrebbe essere interpretato come argomento della riga di " "comando: %s" -#: submodule-config.c:486 +#: submodule-config.c:490 #, c-format msgid "invalid value for %s" msgstr "valore non valido per %s" -#: submodule-config.c:755 +#: submodule-config.c:761 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Impossibile aggiornare la voce .gitmodules %s" @@ -7409,7 +7435,7 @@ msgstr "impossibile leggere il file di input '%s'" msgid "could not read from stdin" msgstr "impossibile leggere dallo standard input" -#: trailer.c:1011 wrapper.c:701 +#: trailer.c:1011 wrapper.c:665 #, c-format msgid "could not stat %s" msgstr "impossibile eseguire lo stat di '%s'" @@ -7438,47 +7464,47 @@ msgstr "impossibile ridenominare il file temporaneo in %s" msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "L'upstream di '%s' sarebbe impostato a '%s' di '%s'\n" -#: transport.c:142 +#: transport.c:145 #, c-format msgid "could not read bundle '%s'" msgstr "impossibile leggere il bundle '%s'" -#: transport.c:208 +#: transport.c:214 #, c-format msgid "transport: invalid depth option '%s'" msgstr "trasporto: opzione profondità '%s' non valida" -#: transport.c:259 +#: transport.c:266 msgid "see protocol.version in 'git help config' for more details" msgstr "vedi protocol.version in 'git help config' per maggiori dettagli" -#: transport.c:260 +#: transport.c:267 msgid "server options require protocol version 2 or later" msgstr "le opzioni server richiedono la versione 2 o successiva del protocollo" -#: transport.c:625 +#: transport.c:632 msgid "could not parse transport.color.* config" msgstr "impossibile analizzare la configurazione transport.color.*" -#: transport.c:698 +#: transport.c:705 msgid "support for protocol v2 not implemented yet" msgstr "supporto alla versione 2 del protocollo non ancora implementato" -#: transport.c:825 +#: transport.c:831 #, c-format msgid "unknown value for config '%s': %s" msgstr "valore sconosciuto per la configurazione '%s': %s" -#: transport.c:891 +#: transport.c:897 #, c-format msgid "transport '%s' not allowed" msgstr "trasporto '%s' non consentito" -#: transport.c:945 +#: transport.c:949 msgid "git-over-rsync is no longer supported" msgstr "git-over-rsync non è più supportato" -#: transport.c:1040 +#: transport.c:1044 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -7487,7 +7513,7 @@ msgstr "" "I seguenti percorsi sottomodulo contengono modifiche\n" "non trovate su nessun remoto:\n" -#: transport.c:1044 +#: transport.c:1048 #, c-format msgid "" "\n" @@ -7514,32 +7540,32 @@ msgstr "" "per eseguirne il push a un remoto.\n" "\n" -#: transport.c:1052 +#: transport.c:1056 msgid "Aborting." msgstr "Interrompo l'operazione." -#: transport.c:1193 +#: transport.c:1201 msgid "failed to push all needed submodules" msgstr "push di tutti i sottomoduli richiesti non riuscito" -#: transport.c:1340 transport-helper.c:645 +#: transport.c:1345 transport-helper.c:655 msgid "operation not supported by protocol" msgstr "operazione non supportata dal protocollo" -#: transport-helper.c:51 transport-helper.c:80 +#: transport-helper.c:61 transport-helper.c:90 msgid "full write to remote helper failed" msgstr "scrittura completa verso l'helper remoto non riuscita" -#: transport-helper.c:134 +#: transport-helper.c:144 #, c-format msgid "unable to find remote helper for '%s'" msgstr "impossibile trovare l'helper remoto per '%s'" -#: transport-helper.c:150 transport-helper.c:559 +#: transport-helper.c:160 transport-helper.c:569 msgid "can't dup helper output fd" msgstr "impossibile duplicare il descrittore file dell'output helper" -#: transport-helper.c:201 +#: transport-helper.c:211 #, c-format msgid "" "unknown mandatory capability %s; this remote helper probably needs newer " @@ -7548,103 +7574,103 @@ msgstr "" "capability necessaria %s sconosciuta; quest'helper remoto probabilmente " "richiede una versione di Git più recente" -#: transport-helper.c:207 +#: transport-helper.c:217 msgid "this remote helper should implement refspec capability" msgstr "questo helper remoto dovrebbe implementare la capability refspec" -#: transport-helper.c:274 transport-helper.c:414 +#: transport-helper.c:284 transport-helper.c:424 #, c-format msgid "%s unexpectedly said: '%s'" msgstr "%s ha inviato un messaggio inatteso: '%s'" -#: transport-helper.c:403 +#: transport-helper.c:413 #, c-format msgid "%s also locked %s" msgstr "%s ha bloccato anche %s" -#: transport-helper.c:481 +#: transport-helper.c:491 msgid "couldn't run fast-import" msgstr "impossibile eseguire fast-import" -#: transport-helper.c:504 +#: transport-helper.c:514 msgid "error while running fast-import" msgstr "errore durante l'esecuzione di fast-import" -#: transport-helper.c:533 transport-helper.c:1105 +#: transport-helper.c:543 transport-helper.c:1128 #, c-format msgid "could not read ref %s" msgstr "impossibile leggere il riferimento %s" -#: transport-helper.c:578 +#: transport-helper.c:588 #, c-format msgid "unknown response to connect: %s" msgstr "risposta inattesa a connect: %s" -#: transport-helper.c:600 +#: transport-helper.c:610 msgid "setting remote service path not supported by protocol" msgstr "" "l'impostazione del percorso del servizio remoto non è supportata dal " "protocollo" -#: transport-helper.c:602 +#: transport-helper.c:612 msgid "invalid remote service path" msgstr "percorso servizio remoto non valido" -#: transport-helper.c:648 +#: transport-helper.c:658 #, c-format msgid "can't connect to subservice %s" msgstr "impossibile connettersi al sottoservizio %s" -#: transport-helper.c:720 +#: transport-helper.c:734 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "attesi ok/error, l'helper ha inviato '%s'" -#: transport-helper.c:773 +#: transport-helper.c:787 #, c-format msgid "helper reported unexpected status of %s" msgstr "l'helper ha segnalato uno stato inatteso di %s" -#: transport-helper.c:834 +#: transport-helper.c:848 #, c-format msgid "helper %s does not support dry-run" msgstr "l'helper %s non supporta dry-run" -#: transport-helper.c:837 +#: transport-helper.c:851 #, c-format msgid "helper %s does not support --signed" msgstr "l'helper %s non supporta --signed" -#: transport-helper.c:840 +#: transport-helper.c:854 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "l'helper %s non supporta --signed=if-asked" -#: transport-helper.c:847 +#: transport-helper.c:861 #, c-format msgid "helper %s does not support 'push-option'" msgstr "l'helper %s non supporta 'push-option'" -#: transport-helper.c:945 +#: transport-helper.c:959 msgid "remote-helper doesn't support push; refspec needed" msgstr "" "l'helper remoto non supporta il push; è necessario uno specificatore " "riferimento" -#: transport-helper.c:950 +#: transport-helper.c:964 #, c-format msgid "helper %s does not support 'force'" msgstr "l'helper %s non supporta 'force'" -#: transport-helper.c:997 +#: transport-helper.c:1011 msgid "couldn't run fast-export" msgstr "impossibile eseguire fast-export" -#: transport-helper.c:1002 +#: transport-helper.c:1016 msgid "error while running fast-export" msgstr "errore durante l'esecuzione di fast-export" -#: transport-helper.c:1027 +#: transport-helper.c:1041 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -7653,47 +7679,47 @@ msgstr "" "Nessun riferimento in comune e nessuno specificato; non eseguo nulla.\n" "Forse dovresti specificare un branch come 'master'.\n" -#: transport-helper.c:1091 +#: transport-helper.c:1114 #, c-format msgid "malformed response in ref list: %s" msgstr "risposta malformata nell'elenco riferimenti: %s" -#: transport-helper.c:1244 +#: transport-helper.c:1266 #, c-format msgid "read(%s) failed" msgstr "read(%s) non riuscita" -#: transport-helper.c:1271 +#: transport-helper.c:1293 #, c-format msgid "write(%s) failed" msgstr "write(%s) non riuscita" -#: transport-helper.c:1320 +#: transport-helper.c:1342 #, c-format msgid "%s thread failed" msgstr "thread %s non riuscito" -#: transport-helper.c:1324 +#: transport-helper.c:1346 #, c-format msgid "%s thread failed to join: %s" msgstr "join non riuscita per il thread %s: %s" -#: transport-helper.c:1343 transport-helper.c:1347 +#: transport-helper.c:1365 transport-helper.c:1369 #, c-format msgid "can't start thread for copying data: %s" msgstr "impossibile avviare il thread per la copia dei dati: %s" -#: transport-helper.c:1384 +#: transport-helper.c:1406 #, c-format msgid "%s process failed to wait" msgstr "wait non riuscita per il processo %s" -#: transport-helper.c:1388 +#: transport-helper.c:1410 #, c-format msgid "%s process failed" msgstr "processo %s non riuscito" -#: transport-helper.c:1406 transport-helper.c:1415 +#: transport-helper.c:1428 transport-helper.c:1437 msgid "can't start thread for copying data" msgstr "impossibile avviare il thread per la copia dei dati" @@ -7713,7 +7739,7 @@ msgstr "nome file vuoto nella voce dell'albero" msgid "too-short tree file" msgstr "file alber troppo corto" -#: unpack-trees.c:111 +#: unpack-trees.c:110 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -7723,7 +7749,7 @@ msgstr "" "checkout:\n" "%%sEsegui il commit o lo stash delle modifiche prima di cambiare branch." -#: unpack-trees.c:113 +#: unpack-trees.c:112 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -7733,7 +7759,7 @@ msgstr "" "checkout:\n" "%%s" -#: unpack-trees.c:116 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -7743,7 +7769,7 @@ msgstr "" "merge:\n" "%%sEsegui il commit o lo stash delle modifiche prima di eseguire il merge." -#: unpack-trees.c:118 +#: unpack-trees.c:117 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -7753,7 +7779,7 @@ msgstr "" "merge:\n" "%%s" -#: unpack-trees.c:121 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -7764,7 +7790,7 @@ msgstr "" "%%sEsegui il commit o lo stash delle modifiche prima di eseguire " "l'operazione di %s." -#: unpack-trees.c:123 +#: unpack-trees.c:122 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -7774,7 +7800,7 @@ msgstr "" "l'operazione di %s:\n" "%%s" -#: unpack-trees.c:128 +#: unpack-trees.c:127 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -7784,7 +7810,7 @@ msgstr "" "tracciati in esse contenuti vengano persi:\n" "%s" -#: unpack-trees.c:132 +#: unpack-trees.c:131 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -7794,7 +7820,7 @@ msgstr "" "eliminati con il checkout:\n" "%%sSpostali o eliminali prima di cambiare branch." -#: unpack-trees.c:134 +#: unpack-trees.c:133 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -7804,7 +7830,7 @@ msgstr "" "eliminati con il checkout:\n" "%%s" -#: unpack-trees.c:137 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -7814,7 +7840,7 @@ msgstr "" "eliminati dal merge:\n" "%%sSpostali o eliminali prima di eseguire il merge." -#: unpack-trees.c:139 +#: unpack-trees.c:138 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -7824,7 +7850,7 @@ msgstr "" "eliminati dal merge:\n" "%%s" -#: unpack-trees.c:142 +#: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -7834,7 +7860,7 @@ msgstr "" "eliminati con l'operazione di %s:\n" "%%sSpostali o eliminali prima di eseguire l'operazione di %s." -#: unpack-trees.c:144 +#: unpack-trees.c:143 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -7844,7 +7870,7 @@ msgstr "" "eliminati con l'operazione di %s:\n" "%%s" -#: unpack-trees.c:150 +#: unpack-trees.c:149 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7855,7 +7881,7 @@ msgstr "" "sovrascritti con il checkout:\n" "%%sSpostali o eliminali prima di cambiare branch." -#: unpack-trees.c:152 +#: unpack-trees.c:151 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7866,7 +7892,7 @@ msgstr "" "sovrascritti con il checkout:\n" "%%s" -#: unpack-trees.c:155 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -7876,7 +7902,7 @@ msgstr "" "sovrascritti dal merge:\n" "%%sSpostali o eliminali prima di eseguire il merge." -#: unpack-trees.c:157 +#: unpack-trees.c:156 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -7886,7 +7912,7 @@ msgstr "" "sovrascritti dal merge:\n" "%%s" -#: unpack-trees.c:160 +#: unpack-trees.c:159 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -7896,7 +7922,7 @@ msgstr "" "sovrascritti con l'operazione di %s:\n" "%%sSpostali o eliminali prima di eseguire l'operazione di %s." -#: unpack-trees.c:162 +#: unpack-trees.c:161 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -7906,13 +7932,13 @@ msgstr "" "sovrascritti con l'operazione di %s:\n" "%%s" -#: unpack-trees.c:170 +#: unpack-trees.c:169 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "" "La voce '%s' si sovrappone a '%s'. Impossibile eseguire il collegamento." -#: unpack-trees.c:173 +#: unpack-trees.c:172 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" @@ -7922,7 +7948,7 @@ msgstr "" "aggiornate:\n" "%s" -#: unpack-trees.c:175 +#: unpack-trees.c:174 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -7933,7 +7959,7 @@ msgstr "" "l'aggiornamento del checkout sparse:\n" "%s" -#: unpack-trees.c:177 +#: unpack-trees.c:176 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -7944,7 +7970,7 @@ msgstr "" "l'aggiornamento del checkout sparse:\n" "%s" -#: unpack-trees.c:179 +#: unpack-trees.c:178 #, c-format msgid "" "Cannot update submodule:\n" @@ -7953,16 +7979,16 @@ msgstr "" "Impossibile aggiornare il sottomodulo:\n" "%s" -#: unpack-trees.c:256 +#: unpack-trees.c:255 #, c-format msgid "Aborting\n" msgstr "Interrompo l'operazione\n" -#: unpack-trees.c:318 +#: unpack-trees.c:317 msgid "Updating files" msgstr "Aggiornamento dei file in corso" -#: unpack-trees.c:350 +#: unpack-trees.c:349 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" @@ -8002,7 +8028,7 @@ msgstr "numero di porta non valido" msgid "invalid '..' path segment" msgstr "parte percorso '..' non valida" -#: worktree.c:258 builtin/am.c:2095 +#: worktree.c:258 builtin/am.c:2084 #, c-format msgid "failed to read '%s'" msgstr "lettura di '%s' non riuscita" @@ -8035,17 +8061,17 @@ msgstr "'%s' non è un file .git, codice d'errore %d" msgid "'%s' does not point back to '%s'" msgstr "'%s' non punta a '%s'" -#: wrapper.c:223 wrapper.c:393 +#: wrapper.c:186 wrapper.c:356 #, c-format msgid "could not open '%s' for reading and writing" msgstr "impossibile aprire '%s' in lettura e scrittura" -#: wrapper.c:424 wrapper.c:624 +#: wrapper.c:387 wrapper.c:588 #, c-format msgid "unable to access '%s'" msgstr "impossibile accedere a '%s'" -#: wrapper.c:632 +#: wrapper.c:596 msgid "unable to get current working directory" msgstr "impossibile ottenere la directory di lavoro corrente" @@ -8402,82 +8428,90 @@ msgstr "" "\")" #: wt-status.c:1437 +msgid " (use \"git cherry-pick --skip\" to skip this patch)" +msgstr " (usa \"git cherry-pick --skip\" per saltare questa patch)" + +#: wt-status.c:1439 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (usa \"git cherry-pick --abort\" per annullare l'operazione di cherry-pick)" -#: wt-status.c:1447 +#: wt-status.c:1449 msgid "Revert currently in progress." msgstr "Revert in corso." -#: wt-status.c:1450 +#: wt-status.c:1452 #, c-format msgid "You are currently reverting commit %s." msgstr "Attualmente stai eseguendo il revert del commit %s." -#: wt-status.c:1456 +#: wt-status.c:1458 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (risolvi i conflitti ed esegui \"git revert --continue\")" -#: wt-status.c:1459 +#: wt-status.c:1461 msgid " (run \"git revert --continue\" to continue)" msgstr " (esegui \"git revert --continue\" per continuare)" -#: wt-status.c:1462 +#: wt-status.c:1464 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" " (tutti i conflitti sono stati risolti: esegui \"git revert --continue\")" -#: wt-status.c:1464 +#: wt-status.c:1466 +msgid " (use \"git revert --skip\" to skip this patch)" +msgstr " (usa \"git revert --skip\" per saltare questa patch)" + +#: wt-status.c:1468 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (usa \"git revert --abort\" per annullare l'operazione di revert)" -#: wt-status.c:1474 +#: wt-status.c:1478 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Attualmente stai eseguendo una bisezione partendo dal branch '%s'." -#: wt-status.c:1478 +#: wt-status.c:1482 msgid "You are currently bisecting." msgstr "Attualmente stai eseguendo una bisezione." -#: wt-status.c:1481 +#: wt-status.c:1485 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (usa \"git bisect reset\" per tornare al branch originario)" -#: wt-status.c:1690 +#: wt-status.c:1694 msgid "On branch " msgstr "Sul branch " -#: wt-status.c:1697 +#: wt-status.c:1701 msgid "interactive rebase in progress; onto " msgstr "rebase interattivo in corso su " -#: wt-status.c:1699 +#: wt-status.c:1703 msgid "rebase in progress; onto " msgstr "rebase in corso su " -#: wt-status.c:1709 +#: wt-status.c:1713 msgid "Not currently on any branch." msgstr "Attualmente non sei su alcun branch." -#: wt-status.c:1726 +#: wt-status.c:1730 msgid "Initial commit" msgstr "Commit iniziale" -#: wt-status.c:1727 +#: wt-status.c:1731 msgid "No commits yet" msgstr "Non ci sono ancora commit" -#: wt-status.c:1741 +#: wt-status.c:1745 msgid "Untracked files" msgstr "File non tracciati" -#: wt-status.c:1743 +#: wt-status.c:1747 msgid "Ignored files" msgstr "File ignorati" -#: wt-status.c:1747 +#: wt-status.c:1751 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -8489,31 +8523,31 @@ msgstr "" "ma devi stare attento a non dimenticarti di aggiungere\n" "autonomamente i file nuovi (vedi 'git help status')." -#: wt-status.c:1753 +#: wt-status.c:1757 #, c-format msgid "Untracked files not listed%s" msgstr "File non tracciati non elencati%s" -#: wt-status.c:1755 +#: wt-status.c:1759 msgid " (use -u option to show untracked files)" msgstr " (usa l'opzione -u per visualizzare i file non tracciati)" -#: wt-status.c:1761 +#: wt-status.c:1765 msgid "No changes" msgstr "Nessuna modifica" -#: wt-status.c:1766 +#: wt-status.c:1770 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "nessuna modifica aggiunta al commit (usa \"git add\" e/o \"git commit -a\")\n" -#: wt-status.c:1769 +#: wt-status.c:1773 #, c-format msgid "no changes added to commit\n" msgstr "nessuna modifica aggiunta al commit\n" -#: wt-status.c:1772 +#: wt-status.c:1776 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -8522,74 +8556,79 @@ msgstr "" "non è stato aggiunto nulla al commit ma sono presenti file non tracciati " "(usa \"git add\" per tracciarli)\n" -#: wt-status.c:1775 +#: wt-status.c:1779 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" "non è stato aggiunto nulla al commit ma sono presenti file non tracciati\n" -#: wt-status.c:1778 +#: wt-status.c:1782 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "non c'è nulla di cui eseguire il commit (crea/copia dei file e usa \"git add" "\" per tracciarli)\n" -#: wt-status.c:1781 wt-status.c:1786 +#: wt-status.c:1785 wt-status.c:1790 #, c-format msgid "nothing to commit\n" msgstr "non c'è nulla di cui eseguire il commit\n" -#: wt-status.c:1784 +#: wt-status.c:1788 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "non c'è nulla di cui eseguire il commit (usa -u per visualizzare i file non " "tracciati)\n" -#: wt-status.c:1788 +#: wt-status.c:1792 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "non c'è nulla di cui eseguire il commit, l'albero di lavoro è pulito\n" -#: wt-status.c:1901 +#: wt-status.c:1905 msgid "No commits yet on " msgstr "Non ci sono ancora commit su" -#: wt-status.c:1905 +#: wt-status.c:1909 msgid "HEAD (no branch)" msgstr "HEAD (nessun branch)" -#: wt-status.c:1936 +#: wt-status.c:1940 msgid "different" msgstr "differente" -#: wt-status.c:1938 wt-status.c:1946 +#: wt-status.c:1942 wt-status.c:1950 msgid "behind " msgstr "indietro " -#: wt-status.c:1941 wt-status.c:1944 +#: wt-status.c:1945 wt-status.c:1948 msgid "ahead " msgstr "avanti " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2466 +#: wt-status.c:2470 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "impossibile eseguire %s: ci sono delle modifiche non in staging." -#: wt-status.c:2472 +#: wt-status.c:2476 msgid "additionally, your index contains uncommitted changes." msgstr "" "inoltre, l'indice contiene modifiche di cui non è stato eseguito il commit." -#: wt-status.c:2474 +#: wt-status.c:2478 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "" "impossibile eseguire %s: l'indice contiene modifiche di cui non è stato " "eseguito il commit." +#: compat/precompose_utf8.c:58 builtin/clone.c:452 +#, c-format +msgid "failed to unlink '%s'" +msgstr "unlink di '%s' non riuscito" + #: builtin/add.c:25 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<opzioni>] [--] <specificatore percorso>..." @@ -8612,7 +8651,7 @@ msgstr "elimina '%s'\n" msgid "Unstaged changes after refreshing the index:" msgstr "Modifiche non nell'area di staging dopo l'aggiornamento dell'indice:" -#: builtin/add.c:234 builtin/rev-parse.c:896 +#: builtin/add.c:234 builtin/rev-parse.c:897 msgid "Could not read the index" msgstr "Impossibile leggere l'indice" @@ -8647,8 +8686,8 @@ msgstr "Impossibile applicare '%s'" msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "I seguenti percorsi sono ignorati da uno dei file .gitignore:\n" -#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124 -#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560 +#: builtin/add.c:290 builtin/clean.c:910 builtin/fetch.c:162 builtin/mv.c:124 +#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:547 #: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165 msgid "dry run" msgstr "test controllato" @@ -8704,7 +8743,7 @@ msgstr "" "controlla se i file - anche quelli mancanti - sono ignorati durante il test " "controllato" -#: builtin/add.c:309 builtin/update-index.c:1001 +#: builtin/add.c:309 builtin/update-index.c:1002 msgid "override the executable bit of the listed files" msgstr "esegui l'override del bit eseguibile dei file elencati" @@ -8780,115 +8819,111 @@ msgstr "Non è stato specificato nulla, non è stato aggiunto nulla.\n" msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Forse intendevi dire 'git add .'?\n" -#: builtin/am.c:348 +#: builtin/am.c:347 msgid "could not parse author script" msgstr "impossibile analizzare lo script author" -#: builtin/am.c:432 +#: builtin/am.c:431 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' è stato eliminato dall'hook applypatch-msg" -#: builtin/am.c:474 +#: builtin/am.c:473 #, c-format msgid "Malformed input line: '%s'." msgstr "Riga di input malformata: '%s'." -#: builtin/am.c:512 +#: builtin/am.c:511 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Copia delle note da '%s' a '%s' non riuscita" -#: builtin/am.c:538 +#: builtin/am.c:537 msgid "fseek failed" msgstr "fseek non riuscita" -#: builtin/am.c:726 +#: builtin/am.c:725 #, c-format msgid "could not parse patch '%s'" msgstr "impossibile analizzare la patch '%s'" -#: builtin/am.c:791 +#: builtin/am.c:790 msgid "Only one StGIT patch series can be applied at once" msgstr "Può essere applicata solo una serie di patch StGIT per volta" -#: builtin/am.c:839 +#: builtin/am.c:838 msgid "invalid timestamp" msgstr "timestamp non valido" -#: builtin/am.c:844 builtin/am.c:856 +#: builtin/am.c:843 builtin/am.c:855 msgid "invalid Date line" msgstr "riga Date non valida" -#: builtin/am.c:851 +#: builtin/am.c:850 msgid "invalid timezone offset" msgstr "offset fuso orario non valido" -#: builtin/am.c:944 +#: builtin/am.c:943 msgid "Patch format detection failed." msgstr "Rilevamento del formato della patch non riuscito." -#: builtin/am.c:949 builtin/clone.c:407 +#: builtin/am.c:948 builtin/clone.c:406 #, c-format msgid "failed to create directory '%s'" msgstr "creazione della directory '%s' non riuscita" -#: builtin/am.c:954 +#: builtin/am.c:953 msgid "Failed to split patches." msgstr "Divisione delle patch non riuscita." -#: builtin/am.c:1084 builtin/commit.c:374 -msgid "unable to write index file" -msgstr "impossibile scrivere il file indice" - -#: builtin/am.c:1098 +#: builtin/am.c:1084 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Una volta risolto questo problema, esegui \"%s --continue\"." -#: builtin/am.c:1099 +#: builtin/am.c:1085 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Se preferisci saltare questa patch, esegui invece \"%s --skip\"." -#: builtin/am.c:1100 +#: builtin/am.c:1086 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "Per ripristinare il branch originario e terminare il patching, esegui \"%s --" "abort\"." -#: builtin/am.c:1183 +#: builtin/am.c:1169 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" "Patch inviata con format=flowed; gli spazi al termine delle righe potrebbero " "essere andati perduti." -#: builtin/am.c:1211 +#: builtin/am.c:1197 msgid "Patch is empty." msgstr "La patch è vuota." -#: builtin/am.c:1277 +#: builtin/am.c:1262 #, c-format -msgid "invalid ident line: %.*s" -msgstr "riga ident non valida: %.*s" +msgid "missing author line in commit %s" +msgstr "riga autore mancante nel commit %s" -#: builtin/am.c:1299 +#: builtin/am.c:1265 #, c-format -msgid "unable to parse commit %s" -msgstr "impossibile analizzare il commit %s" +msgid "invalid ident line: %.*s" +msgstr "riga ident non valida: %.*s" -#: builtin/am.c:1496 +#: builtin/am.c:1484 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Dal repository mancano i blob necessari per ripiegare sul merge a tre vie." -#: builtin/am.c:1498 +#: builtin/am.c:1486 msgid "Using index info to reconstruct a base tree..." msgstr "" "Utilizzo le informazioni dell'indice per ricostruire un albero di base..." -#: builtin/am.c:1517 +#: builtin/am.c:1505 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -8896,24 +8931,24 @@ msgstr "" "Hai modificato manualmente la patch?\n" "Non può essere applicata ai blob registrati nel suo indice." -#: builtin/am.c:1523 +#: builtin/am.c:1511 msgid "Falling back to patching base and 3-way merge..." msgstr "Ripiego sul patching della base e sul merge a tre vie..." -#: builtin/am.c:1549 +#: builtin/am.c:1537 msgid "Failed to merge in the changes." msgstr "Merge delle modifiche non riuscito." -#: builtin/am.c:1581 +#: builtin/am.c:1569 msgid "applying to an empty history" msgstr "applicazione a una cronologia vuota" -#: builtin/am.c:1628 builtin/am.c:1632 +#: builtin/am.c:1616 builtin/am.c:1620 #, c-format msgid "cannot resume: %s does not exist." msgstr "impossibile riprendere l'attività: %s non esiste." -#: builtin/am.c:1650 +#: builtin/am.c:1638 msgid "Commit Body is:" msgstr "Il corpo del commit è:" @@ -8921,37 +8956,41 @@ msgstr "Il corpo del commit è:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1660 +#: builtin/am.c:1648 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" "Applico? Sì [y]/No [n]/Modifica [e]/[V]isualizza patch/[A]ccetta tutto:" -#: builtin/am.c:1710 +#: builtin/am.c:1695 builtin/commit.c:374 +msgid "unable to write index file" +msgstr "impossibile scrivere il file indice" + +#: builtin/am.c:1699 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Indice sporco: impossibile applicare le patch (elemento sporco: %s)" -#: builtin/am.c:1750 builtin/am.c:1818 +#: builtin/am.c:1739 builtin/am.c:1807 #, c-format msgid "Applying: %.*s" msgstr "Applicazione in corso: %.*s" -#: builtin/am.c:1767 +#: builtin/am.c:1756 msgid "No changes -- Patch already applied." msgstr "Nessuna modifica -- patch già applicata." -#: builtin/am.c:1773 +#: builtin/am.c:1762 #, c-format msgid "Patch failed at %s %.*s" msgstr "Patch non riuscita a %s %.*s" -#: builtin/am.c:1777 +#: builtin/am.c:1766 msgid "Use 'git am --show-current-patch' to see the failed patch" msgstr "" "Usa 'git am --show-current-patch' per visualizzare la patch non riuscita" -#: builtin/am.c:1821 +#: builtin/am.c:1810 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -8961,7 +9000,7 @@ msgstr "" "Se non rimane nulla da aggiungere all'area di staging, forse qualcos'altro\n" "ha già introdotto le stesse modifiche; potresti voler saltare questa patch." -#: builtin/am.c:1828 +#: builtin/am.c:1817 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -8974,17 +9013,17 @@ msgstr "" "Potresti eseguire `git rm` su un file per accettarne la risoluzione " "\"eliminato da loro\"." -#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329 +#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:329 #: builtin/reset.c:337 #, c-format msgid "Could not parse object '%s'." msgstr "Impossibile analizzare l'oggetto '%s'." -#: builtin/am.c:1987 +#: builtin/am.c:1976 msgid "failed to clean index" msgstr "pulizia dell'indice non riuscita" -#: builtin/am.c:2031 +#: builtin/am.c:2020 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -8993,148 +9032,148 @@ msgstr "" "'am'.\n" "Non ritorno indietro a ORIG_HEAD" -#: builtin/am.c:2128 +#: builtin/am.c:2117 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valore non valido per --patch-format: %s" -#: builtin/am.c:2164 +#: builtin/am.c:2153 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<opzioni>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2165 +#: builtin/am.c:2154 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<opzioni>] (--continue | --skip | --abort)" -#: builtin/am.c:2171 +#: builtin/am.c:2160 msgid "run interactively" msgstr "esegui in modalità interattiva" -#: builtin/am.c:2173 +#: builtin/am.c:2162 msgid "historical option -- no-op" msgstr "opzione storica -- non esegue nulla" -#: builtin/am.c:2175 +#: builtin/am.c:2164 msgid "allow fall back on 3way merging if needed" msgstr "consenti il ripiego sul merge a tre vie se necessario" -#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:296 builtin/stash.c:806 +#: builtin/am.c:2165 builtin/init-db.c:494 builtin/prune-packed.c:58 +#: builtin/repack.c:297 builtin/stash.c:812 msgid "be quiet" msgstr "non visualizzare messaggi" -#: builtin/am.c:2178 +#: builtin/am.c:2167 msgid "add a Signed-off-by line to the commit message" msgstr "aggiungi una riga Signed-off-by al messaggio di commit" -#: builtin/am.c:2181 +#: builtin/am.c:2170 msgid "recode into utf8 (default)" msgstr "converti codifica in UTF-8 (impostazione predefinita)" -#: builtin/am.c:2183 +#: builtin/am.c:2172 msgid "pass -k flag to git-mailinfo" msgstr "fornisci l'argomento -k a git-mailinfo" -#: builtin/am.c:2185 +#: builtin/am.c:2174 msgid "pass -b flag to git-mailinfo" msgstr "fornisci l'argomento -b a git-mailinfo" -#: builtin/am.c:2187 +#: builtin/am.c:2176 msgid "pass -m flag to git-mailinfo" msgstr "fornisci l'argomento -m a git-mailinfo" -#: builtin/am.c:2189 +#: builtin/am.c:2178 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "fornisci a git-mailsplit l'argomento --keep-cr per il formato mbox" -#: builtin/am.c:2192 +#: builtin/am.c:2181 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "non fornire l'argomento --keep-cr a git-mailsplit indipendentemente dal " "valore di am.keepcr" -#: builtin/am.c:2195 +#: builtin/am.c:2184 msgid "strip everything before a scissors line" msgstr "rimuovi tutte le righe prima di una riga \"taglia qui\"" -#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206 -#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218 -#: builtin/am.c:2224 +#: builtin/am.c:2186 builtin/am.c:2189 builtin/am.c:2192 builtin/am.c:2195 +#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207 +#: builtin/am.c:2213 msgid "pass it through git-apply" msgstr "passa l'argomento a git-apply" -#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671 -#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249 -#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418 -#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313 +#: builtin/am.c:2203 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:674 builtin/grep.c:883 builtin/merge.c:249 +#: builtin/pull.c:160 builtin/pull.c:219 builtin/rebase.c:1442 +#: builtin/repack.c:308 builtin/repack.c:312 builtin/repack.c:314 #: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 -#: parse-options.h:141 parse-options.h:162 parse-options.h:312 +#: parse-options.h:150 parse-options.h:171 parse-options.h:312 msgid "n" msgstr "n" -#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38 -#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38 +#: builtin/am.c:2209 builtin/branch.c:661 builtin/for-each-ref.c:38 +#: builtin/replace.c:555 builtin/tag.c:437 builtin/verify-tag.c:38 msgid "format" msgstr "formato" -#: builtin/am.c:2221 +#: builtin/am.c:2210 msgid "format the patch(es) are in" msgstr "il formato delle patch" -#: builtin/am.c:2227 +#: builtin/am.c:2216 msgid "override error message when patch failure occurs" msgstr "" "esegui l'override del messaggio d'errore quando si verifica un errore legato " "alle patch" -#: builtin/am.c:2229 +#: builtin/am.c:2218 msgid "continue applying patches after resolving a conflict" msgstr "" "continua l'applicazione delle patch dopo la risoluzione di un conflitto" -#: builtin/am.c:2232 +#: builtin/am.c:2221 msgid "synonyms for --continue" msgstr "sinonimi di --continue" -#: builtin/am.c:2235 +#: builtin/am.c:2224 msgid "skip the current patch" msgstr "salta la patch corrente" -#: builtin/am.c:2238 +#: builtin/am.c:2227 msgid "restore the original branch and abort the patching operation." msgstr "ripristina il branch originario e interrompi l'operazione di patching." -#: builtin/am.c:2241 +#: builtin/am.c:2230 msgid "abort the patching operation but keep HEAD where it is." msgstr "interrompi l'operazione di patching ma mantieni HEAD dov'è." -#: builtin/am.c:2244 +#: builtin/am.c:2233 msgid "show the patch being applied." msgstr "visualizza la patch in fase di applicazione." -#: builtin/am.c:2248 +#: builtin/am.c:2237 msgid "lie about committer date" msgstr "menti sulla data del commit" -#: builtin/am.c:2250 +#: builtin/am.c:2239 msgid "use current timestamp for author date" msgstr "usa il timestamp corrente come data autore" -#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511 -#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489 -#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418 +#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1511 +#: builtin/merge.c:286 builtin/pull.c:194 builtin/rebase.c:490 +#: builtin/rebase.c:1483 builtin/revert.c:117 builtin/tag.c:418 msgid "key-id" msgstr "ID chiave" -#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460 +#: builtin/am.c:2242 builtin/rebase.c:491 builtin/rebase.c:1484 msgid "GPG-sign commits" msgstr "firma i commit con GPG" -#: builtin/am.c:2256 +#: builtin/am.c:2245 msgid "(internal use for git-rebase)" msgstr "(a uso interno per git-rebase)" -#: builtin/am.c:2274 +#: builtin/am.c:2263 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -9142,18 +9181,18 @@ msgstr "" "L'opzione -b/--binary non esegue nulla da molto tempo e\n" "sarà rimossa. Non usarla più." -#: builtin/am.c:2281 +#: builtin/am.c:2270 msgid "failed to read the index" msgstr "lettura dell'indice non riuscita" -#: builtin/am.c:2296 +#: builtin/am.c:2285 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" "la directory di rebase precedente %s esiste ancora ma è stata specificata " "un'mbox." -#: builtin/am.c:2320 +#: builtin/am.c:2309 #, c-format msgid "" "Stray %s directory found.\n" @@ -9162,11 +9201,11 @@ msgstr "" "Trovata directory smarrita %s.\n" "Usa \"git am --abort\" per eliminarla." -#: builtin/am.c:2326 +#: builtin/am.c:2315 msgid "Resolve operation not in progress, we are not resuming." msgstr "Operazione di risoluzione non in corso, non riprendiamo." -#: builtin/am.c:2336 +#: builtin/am.c:2325 msgid "interactive mode requires patches on the command line" msgstr "" "la modalità interattiva richiede che le patch siano fornite sulla riga di " @@ -9489,172 +9528,172 @@ msgstr "--bisect-next-check richiede due o tre argomenti" msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms richiede zero o un argomento" -#: builtin/blame.c:32 +#: builtin/blame.c:31 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<opzioni>] [<opzioni revisione>] [<revisione>] [--] <file>" -#: builtin/blame.c:37 +#: builtin/blame.c:36 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "le <opzioni revisione> sono documentate in git-rev-list(1)" -#: builtin/blame.c:410 +#: builtin/blame.c:409 #, c-format msgid "expecting a color: %s" msgstr "atteso colore: %s" -#: builtin/blame.c:417 +#: builtin/blame.c:416 msgid "must end with a color" msgstr "deve terminare con un colore" -#: builtin/blame.c:730 +#: builtin/blame.c:729 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "colore '%s' non valido in color.blame.repeatedLines" -#: builtin/blame.c:748 +#: builtin/blame.c:747 msgid "invalid value for blame.coloring" msgstr "valore non valido per blame.coloring" -#: builtin/blame.c:823 +#: builtin/blame.c:822 #, c-format msgid "cannot find revision %s to ignore" msgstr "impossibile trovare la revisione %s da ignorare" -#: builtin/blame.c:845 +#: builtin/blame.c:844 msgid "Show blame entries as we find them, incrementally" msgstr "" "Visualizza le voci blame incrementalmente, a mano a mano che le troviamo" -#: builtin/blame.c:846 +#: builtin/blame.c:845 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" "Visualizza un hash SHA-1 vuoto per i commit limite (impostazione " "predefinita: off)" -#: builtin/blame.c:847 +#: builtin/blame.c:846 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" "Non gestire i commit radice come commit limite (impostazione predefinita: " "off)" -#: builtin/blame.c:848 +#: builtin/blame.c:847 msgid "Show work cost statistics" msgstr "Visualizza le statistiche sul costo dell'operazione" -#: builtin/blame.c:849 +#: builtin/blame.c:848 msgid "Force progress reporting" msgstr "Forza l'indicazione d'avanzamento dell'operazione" -#: builtin/blame.c:850 +#: builtin/blame.c:849 msgid "Show output score for blame entries" msgstr "Visualizza il punteggio di output per le voci blame" -#: builtin/blame.c:851 +#: builtin/blame.c:850 msgid "Show original filename (Default: auto)" msgstr "" "Visualizza il nome file originario (impostazione predefinita: automatico)" -#: builtin/blame.c:852 +#: builtin/blame.c:851 msgid "Show original linenumber (Default: off)" msgstr "" "Visualizza il numero di riga originario (impostazione predefinita: off)" -#: builtin/blame.c:853 +#: builtin/blame.c:852 msgid "Show in a format designed for machine consumption" msgstr "" "Visualizza l'output in un formato progettato per l'utilizzo da parte di una " "macchina" -#: builtin/blame.c:854 +#: builtin/blame.c:853 msgid "Show porcelain format with per-line commit information" msgstr "" "Visualizza il formato porcelain con le informazioni sul commit per ogni riga" -#: builtin/blame.c:855 +#: builtin/blame.c:854 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" "Usa la stessa modalità di output di git-annotate (impostazione predefinita: " "off)" -#: builtin/blame.c:856 +#: builtin/blame.c:855 msgid "Show raw timestamp (Default: off)" msgstr "Visualizza il timestamp grezzo (impostazione predefinita: off)" -#: builtin/blame.c:857 +#: builtin/blame.c:856 msgid "Show long commit SHA1 (Default: off)" msgstr "" "Visualizza l'hash SHA1 del commit in forma lunga (impostazione predefinita: " "off)" -#: builtin/blame.c:858 +#: builtin/blame.c:857 msgid "Suppress author name and timestamp (Default: off)" msgstr "" "Non visualizzare il nome autore e il timestamp (impostazione predefinita: " "off)" -#: builtin/blame.c:859 +#: builtin/blame.c:858 msgid "Show author email instead of name (Default: off)" msgstr "" "Visualizza l'indirizzo e-mail dell'autore invece del nome (impostazione " "predefinita: off)" -#: builtin/blame.c:860 +#: builtin/blame.c:859 msgid "Ignore whitespace differences" msgstr "Ignora le differenze relative agli spazi bianchi" -#: builtin/blame.c:861 builtin/log.c:1629 +#: builtin/blame.c:860 builtin/log.c:1630 msgid "rev" msgstr "revisione" -#: builtin/blame.c:861 +#: builtin/blame.c:860 msgid "Ignore <rev> when blaming" msgstr "Ignora <revisione> durante l'esecuzione del blame" -#: builtin/blame.c:862 +#: builtin/blame.c:861 msgid "Ignore revisions from <file>" msgstr "Ignora le revisioni specificate in <file>" -#: builtin/blame.c:863 +#: builtin/blame.c:862 msgid "color redundant metadata from previous line differently" msgstr "colora in modo differente i metadati ridondanti della riga precedente" -#: builtin/blame.c:864 +#: builtin/blame.c:863 msgid "color lines by age" msgstr "colora le righe in base all'età" -#: builtin/blame.c:871 +#: builtin/blame.c:870 msgid "Use an experimental heuristic to improve diffs" msgstr "Usa un'euristica sperimentale per migliorare i diff" -#: builtin/blame.c:873 +#: builtin/blame.c:872 msgid "Spend extra cycles to find better match" msgstr "Usa cicli extra per trovare una corrispondenza migliore" -#: builtin/blame.c:874 +#: builtin/blame.c:873 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Usa le revisioni salvate in <file> anziché richiamare git-rev-list" -#: builtin/blame.c:875 +#: builtin/blame.c:874 msgid "Use <file>'s contents as the final image" msgstr "Usa i contenuti di <file> come immagine finale" -#: builtin/blame.c:876 builtin/blame.c:877 +#: builtin/blame.c:875 builtin/blame.c:876 msgid "score" msgstr "punteggio" -#: builtin/blame.c:876 +#: builtin/blame.c:875 msgid "Find line copies within and across files" msgstr "Trova copie delle righe all'interno e fra file" -#: builtin/blame.c:877 +#: builtin/blame.c:876 msgid "Find line movements within and across files" msgstr "Trova righe spostate all'interno e fra file" -#: builtin/blame.c:878 +#: builtin/blame.c:877 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:878 +#: builtin/blame.c:877 msgid "Process only line range n,m, counting from 1" msgstr "Elabora solo l'intervallo righe n,m, contandole da 1" @@ -9900,7 +9939,7 @@ msgstr "imposta la modalità tracking (vedi git-pull(1))" msgid "do not use" msgstr "non usare" -#: builtin/branch.c:626 builtin/rebase.c:485 +#: builtin/branch.c:626 builtin/rebase.c:486 msgid "upstream" msgstr "upstream" @@ -10012,7 +10051,7 @@ msgstr "" msgid "format to use for the output" msgstr "formato da usare per l'output" -#: builtin/branch.c:684 builtin/clone.c:761 +#: builtin/branch.c:684 builtin/clone.c:760 msgid "HEAD not found below refs/heads!" msgstr "HEAD non trovato fra i riferimenti/head!" @@ -10121,7 +10160,7 @@ msgstr "Per creare un bundle è necessario un repository." msgid "Need a repository to unbundle." msgstr "Per decomprimere un bundle è necessario un repository." -#: builtin/cat-file.c:594 +#: builtin/cat-file.c:595 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -10129,7 +10168,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <tipo> | --textconv | --filters) [--path=<percorso>] <oggetto>" -#: builtin/cat-file.c:595 +#: builtin/cat-file.c:596 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" @@ -10137,75 +10176,75 @@ msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:616 +#: builtin/cat-file.c:617 msgid "only one batch option may be specified" msgstr "può essere specificata solo un'opzione batch" -#: builtin/cat-file.c:634 +#: builtin/cat-file.c:635 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<tipo> può essere uno fra blob, tree, commit, tag" -#: builtin/cat-file.c:635 +#: builtin/cat-file.c:636 msgid "show object type" msgstr "visualizza tipo oggetto" -#: builtin/cat-file.c:636 +#: builtin/cat-file.c:637 msgid "show object size" msgstr "visualizza dimensioni oggetto" -#: builtin/cat-file.c:638 +#: builtin/cat-file.c:639 msgid "exit with zero when there's no error" msgstr "esci con codice d'uscita zero se non si sono verificati errori" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:640 msgid "pretty-print object's content" msgstr "stampa il contenuto dell'oggetto con un formato leggibile" -#: builtin/cat-file.c:641 +#: builtin/cat-file.c:642 msgid "for blob objects, run textconv on object's content" msgstr "esegui textconv sul contenuto dell'oggetto (per gli oggetti blob)" -#: builtin/cat-file.c:643 +#: builtin/cat-file.c:644 msgid "for blob objects, run filters on object's content" msgstr "esegui i filtri sul contenuto dell'oggetto (per gli oggetti blob)" -#: builtin/cat-file.c:644 git-submodule.sh:936 +#: builtin/cat-file.c:645 git-submodule.sh:936 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:645 +#: builtin/cat-file.c:646 msgid "use a specific path for --textconv/--filters" msgstr "usa un percorso specifico per --textconv/--filters" -#: builtin/cat-file.c:647 +#: builtin/cat-file.c:648 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "consenti a -s e -t di funzionare con oggetti malformati/corrotti" -#: builtin/cat-file.c:648 +#: builtin/cat-file.c:649 msgid "buffer --batch output" msgstr "esegui il buffering dell'output di --batch" -#: builtin/cat-file.c:650 +#: builtin/cat-file.c:651 msgid "show info and content of objects fed from the standard input" msgstr "" "visualizza le informazioni e il contenuto degli oggetti forniti nello " "standard input" -#: builtin/cat-file.c:654 +#: builtin/cat-file.c:655 msgid "show info about objects fed from the standard input" msgstr "visualizza le informazioni degli oggetti forniti nello standard input" -#: builtin/cat-file.c:658 +#: builtin/cat-file.c:659 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "segui i collegamenti simbolici entro l'albero (usato con --batch o --batch-" "check)" -#: builtin/cat-file.c:660 +#: builtin/cat-file.c:661 msgid "show all objects with --batch or --batch-check" msgstr "visualizza tutti gli oggetti con --batch o --batch-check" -#: builtin/cat-file.c:662 +#: builtin/cat-file.c:663 msgid "do not order --batch-all-objects output" msgstr "non ordinare l'output di --batch-all-objects" @@ -10233,8 +10272,8 @@ msgstr "leggi i nomi dei file dallo standard input" msgid "terminate input and output records by a NUL character" msgstr "termina i record di input e output con un carattere NUL" -#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538 -#: builtin/worktree.c:507 +#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:537 +#: builtin/worktree.c:506 msgid "suppress progress reporting" msgstr "non visualizzare l'avanzamento dell'operazione" @@ -10326,7 +10365,7 @@ msgstr "scrivi il contenuto in file temporanei" #: builtin/checkout-index.c:178 builtin/column.c:31 #: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376 #: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857 -#: builtin/worktree.c:680 +#: builtin/worktree.c:679 msgid "string" msgstr "stringa" @@ -10354,100 +10393,100 @@ msgstr "git switch [<opzioni>] <branch>" msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "git restore [<opzioni>] [--source=<branch>] <file>..." -#: builtin/checkout.c:172 builtin/checkout.c:211 +#: builtin/checkout.c:173 builtin/checkout.c:212 #, c-format msgid "path '%s' does not have our version" msgstr "il percorso '%s' non ha la nostra versione" -#: builtin/checkout.c:174 builtin/checkout.c:213 +#: builtin/checkout.c:175 builtin/checkout.c:214 #, c-format msgid "path '%s' does not have their version" msgstr "il percorso '%s' non ha la loro versione" -#: builtin/checkout.c:190 +#: builtin/checkout.c:191 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "il percorso '%s' non ha tutte le versioni necessarie" -#: builtin/checkout.c:240 +#: builtin/checkout.c:241 #, c-format msgid "path '%s' does not have necessary versions" msgstr "il percorso '%s' non ha le versioni necessarie" -#: builtin/checkout.c:258 +#: builtin/checkout.c:259 #, c-format msgid "path '%s': cannot merge" msgstr "percorso '%s': impossibile eseguire il merge" -#: builtin/checkout.c:274 +#: builtin/checkout.c:275 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Impossibile aggiungere il risultato del merge per '%s'" -#: builtin/checkout.c:374 +#: builtin/checkout.c:375 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "Ricreato %d conflitto di merge" msgstr[1] "Ricreati %d conflitti di merge" -#: builtin/checkout.c:379 +#: builtin/checkout.c:380 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "Aggiornato %d percorso da %s" msgstr[1] "Aggiornati %d percorsi da %s" -#: builtin/checkout.c:386 +#: builtin/checkout.c:387 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "Aggiornato %d percorso dall'indice" msgstr[1] "Aggiornati %d percorsi dall'indice" -#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415 -#: builtin/checkout.c:419 +#: builtin/checkout.c:410 builtin/checkout.c:413 builtin/checkout.c:416 +#: builtin/checkout.c:420 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' non può essere usato con i percorsi in fase di aggiornamento" -#: builtin/checkout.c:422 builtin/checkout.c:425 +#: builtin/checkout.c:423 builtin/checkout.c:426 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' non può essere usato con %s" -#: builtin/checkout.c:429 +#: builtin/checkout.c:430 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Impossibile aggiornare dei percorsi e passare al branch '%s' " "contemporaneamente." -#: builtin/checkout.c:433 +#: builtin/checkout.c:434 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "né '%s' né '%s' sono stati specificati" -#: builtin/checkout.c:437 +#: builtin/checkout.c:438 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "'%s' dev'essere usato quando '%s' non è specificato" -#: builtin/checkout.c:442 builtin/checkout.c:447 +#: builtin/checkout.c:443 builtin/checkout.c:448 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' o '%s' non possono essere usati con %s" -#: builtin/checkout.c:506 builtin/checkout.c:513 +#: builtin/checkout.c:507 builtin/checkout.c:514 #, c-format msgid "path '%s' is unmerged" msgstr "il percorso '%s' non è stato sottoposto a merge" -#: builtin/checkout.c:679 +#: builtin/checkout.c:680 msgid "you need to resolve your current index first" msgstr "prima devi risolvere l'indice corrente" -#: builtin/checkout.c:729 +#: builtin/checkout.c:730 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -10456,11 +10495,6 @@ msgstr "" "impossibile continuare con modifiche in stage nei file seguenti:\n" "%s" -#: builtin/checkout.c:736 -#, c-format -msgid "staged changes in the following files may be lost: %s" -msgstr "le modifiche in stage nei seguenti file potrebbero andare perdute: %s" - #: builtin/checkout.c:833 #, c-format msgid "Can not do reflog for '%s': %s\n" @@ -10470,7 +10504,7 @@ msgstr "Impossibile esaminare il registro dei riferimenti per '%s': %s\n" msgid "HEAD is now at" msgstr "HEAD si trova ora a" -#: builtin/checkout.c:879 builtin/clone.c:714 +#: builtin/checkout.c:879 builtin/clone.c:713 msgid "unable to update HEAD" msgstr "impossibile aggiornare HEAD" @@ -10584,7 +10618,7 @@ msgstr "" "'%s' potrebbe essere sia un file locale, sia un branch da tracciare.\n" "Usa -- (e facoltativamente --no-guess) per rimuovere l'ambiguità" -#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456 +#: builtin/checkout.c:1243 builtin/worktree.c:290 builtin/worktree.c:455 #, c-format msgid "invalid reference: %s" msgstr "riferimento non valido: %s" @@ -10687,9 +10721,9 @@ msgstr "Impossibile cambiare branch per passare a '%s' che non è un commit" msgid "missing branch or commit argument" msgstr "argomento branch o commit mancante" -#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151 -#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575 -#: builtin/send-pack.c:174 +#: builtin/checkout.c:1437 builtin/clone.c:90 builtin/commit-graph.c:59 +#: builtin/commit-graph.c:180 builtin/fetch.c:166 builtin/merge.c:285 +#: builtin/pull.c:138 builtin/push.c:562 builtin/send-pack.c:174 msgid "force progress reporting" msgstr "forza l'indicazione d'avanzamento dell'operazione" @@ -10697,7 +10731,7 @@ msgstr "forza l'indicazione d'avanzamento dell'operazione" msgid "perform a 3-way merge with the new branch" msgstr "esegui un merge a tre vie con il nuovo branch" -#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318 +#: builtin/checkout.c:1439 builtin/log.c:1618 parse-options.h:318 msgid "style" msgstr "stile" @@ -10705,7 +10739,7 @@ msgstr "stile" msgid "conflict style (merge or diff3)" msgstr "stile conflitti (merge o diff3)" -#: builtin/checkout.c:1452 builtin/worktree.c:504 +#: builtin/checkout.c:1452 builtin/worktree.c:503 msgid "detach HEAD at named commit" msgstr "scollega l'HEAD al commit specificato" @@ -10828,9 +10862,9 @@ msgstr "" "rispetto a un particolare remoto, ad es. 'origin', potresti voler\n" "impostare checkout.defaultRemote=origin nel tuo file di configurazione." -#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733 -#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169 -#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502 +#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1742 +#: builtin/checkout.c:1744 builtin/clone.c:120 builtin/remote.c:169 +#: builtin/remote.c:171 builtin/worktree.c:499 builtin/worktree.c:501 msgid "branch" msgstr "branch" @@ -10854,39 +10888,39 @@ msgstr "prevedi 'git checkout <branch inesistente>' (impostazione predefinita)" msgid "use overlay mode (default)" msgstr "usa modalità overlay (impostazione predefinita)" -#: builtin/checkout.c:1734 +#: builtin/checkout.c:1743 msgid "create and switch to a new branch" msgstr "crea un nuovo branch e passa a quest'ultimo" -#: builtin/checkout.c:1736 +#: builtin/checkout.c:1745 msgid "create/reset and switch to a branch" msgstr "crea/reimposta un branch e passa a quest'ultimo" -#: builtin/checkout.c:1738 +#: builtin/checkout.c:1747 msgid "second guess 'git switch <no-such-branch>'" msgstr "prevedi 'git switch <branch inesistente>'" -#: builtin/checkout.c:1740 +#: builtin/checkout.c:1749 msgid "throw away local modifications" msgstr "scarta le modifiche locali" -#: builtin/checkout.c:1772 +#: builtin/checkout.c:1781 msgid "which tree-ish to checkout from" msgstr "albero da cui eseguire il checkout" -#: builtin/checkout.c:1774 +#: builtin/checkout.c:1783 msgid "restore the index" msgstr "ripristina l'indice" -#: builtin/checkout.c:1776 +#: builtin/checkout.c:1785 msgid "restore the working tree (default)" msgstr "ripristina l'albero di lavoro (impostazione predefinita)" -#: builtin/checkout.c:1778 +#: builtin/checkout.c:1787 msgid "ignore unmerged entries" msgstr "ignora voci non sottoposte a merge" -#: builtin/checkout.c:1779 +#: builtin/checkout.c:1788 msgid "use overlay mode" msgstr "usa modalità overlay" @@ -10927,7 +10961,7 @@ msgstr "eliminazione di %s non riuscita" msgid "could not lstat %s\n" msgstr "impossibile eseguire l'lstat di %s\n" -#: builtin/clean.c:300 git-add--interactive.perl:593 +#: builtin/clean.c:301 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -10940,7 +10974,7 @@ msgstr "" "pippo - seleziona un elemento basandoti su un prefisso univoco\n" " - (vuoto) non selezionare niente\n" -#: builtin/clean.c:304 git-add--interactive.perl:602 +#: builtin/clean.c:305 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -10961,38 +10995,38 @@ msgstr "" "* - seleziona tutti gli elementi\n" " - (vuoto) termina il processo di selezione\n" -#: builtin/clean.c:520 git-add--interactive.perl:568 +#: builtin/clean.c:521 git-add--interactive.perl:568 #: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Eh (%s)?\n" -#: builtin/clean.c:662 +#: builtin/clean.c:663 #, c-format msgid "Input ignore patterns>> " msgstr "Immetti i pattern da ignorare>> " -#: builtin/clean.c:699 +#: builtin/clean.c:700 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "ATTENZIONE: Impossibile trovare elementi corrispondenti a %s" -#: builtin/clean.c:720 +#: builtin/clean.c:721 msgid "Select items to delete" msgstr "Seleziona gli elementi da eliminare" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:761 +#: builtin/clean.c:762 #, c-format msgid "Remove %s [y/N]? " msgstr "Eliminare %s [y/N]? " -#: builtin/clean.c:786 git-add--interactive.perl:1763 +#: builtin/clean.c:787 git-add--interactive.perl:1763 #, c-format msgid "Bye.\n" msgstr "Ciao.\n" -#: builtin/clean.c:794 +#: builtin/clean.c:795 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -11011,64 +11045,64 @@ msgstr "" "help - visualizza questa schermata\n" "? - guida al prompt di selezione" -#: builtin/clean.c:821 git-add--interactive.perl:1849 +#: builtin/clean.c:822 git-add--interactive.perl:1849 msgid "*** Commands ***" msgstr "*** Comandi ***" -#: builtin/clean.c:822 git-add--interactive.perl:1846 +#: builtin/clean.c:823 git-add--interactive.perl:1846 msgid "What now" msgstr "Cosa faccio ora" -#: builtin/clean.c:830 +#: builtin/clean.c:831 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Eliminerei il seguente elemento:" msgstr[1] "Eliminerei i seguenti elementi:" -#: builtin/clean.c:846 +#: builtin/clean.c:847 msgid "No more files to clean, exiting." msgstr "Non ci sono più file da ripulire, esco." -#: builtin/clean.c:908 +#: builtin/clean.c:909 msgid "do not print names of files removed" msgstr "non stampare i nomi dei file eliminati" -#: builtin/clean.c:910 +#: builtin/clean.c:911 msgid "force" msgstr "forza l'operazione" -#: builtin/clean.c:911 +#: builtin/clean.c:912 msgid "interactive cleaning" msgstr "pulizia interattiva" -#: builtin/clean.c:913 +#: builtin/clean.c:914 msgid "remove whole directories" msgstr "rimuovi intere directory" -#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548 -#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178 -#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415 +#: builtin/clean.c:915 builtin/describe.c:548 builtin/describe.c:550 +#: builtin/grep.c:901 builtin/log.c:176 builtin/log.c:178 +#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419 #: builtin/show-ref.c:179 msgid "pattern" msgstr "pattern" -#: builtin/clean.c:915 +#: builtin/clean.c:916 msgid "add <pattern> to ignore rules" msgstr "aggiungi <pattern> alle regole usate per ignorare i file" -#: builtin/clean.c:916 +#: builtin/clean.c:917 msgid "remove ignored files, too" msgstr "elimina anche i file ignorati" -#: builtin/clean.c:918 +#: builtin/clean.c:919 msgid "remove only ignored files" msgstr "elimina solo i file ignorati" -#: builtin/clean.c:936 +#: builtin/clean.c:937 msgid "-x and -X cannot be used together" msgstr "-x e -X non possono essere usati insieme" -#: builtin/clean.c:940 +#: builtin/clean.c:941 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -11076,7 +11110,7 @@ msgstr "" "clean.requireForce è impostato a true e né -i, né -n, né -f sono stati " "specificati; mi rifiuto di eseguire la pulizia" -#: builtin/clean.c:943 +#: builtin/clean.c:944 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -11084,164 +11118,164 @@ msgstr "" "clean.requireForce è true per impostazione predefinita e né -i, né -n, né -f " "sono stati specificati; mi rifiuto di eseguire la pulizia" -#: builtin/clone.c:46 +#: builtin/clone.c:45 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<opzioni>] [--] <repository> [<directory>]" -#: builtin/clone.c:93 +#: builtin/clone.c:92 msgid "don't create a checkout" msgstr "non creare un checkout" -#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489 +#: builtin/clone.c:93 builtin/clone.c:95 builtin/init-db.c:489 msgid "create a bare repository" msgstr "crea un repository spoglio" -#: builtin/clone.c:98 +#: builtin/clone.c:97 msgid "create a mirror repository (implies bare)" msgstr "crea un repository mirror (implica che sia spoglio)" -#: builtin/clone.c:100 +#: builtin/clone.c:99 msgid "to clone from a local repository" msgstr "per clonare da un repository locale" -#: builtin/clone.c:102 +#: builtin/clone.c:101 msgid "don't use local hardlinks, always copy" msgstr "non usare i collegamenti reali locali, copia sempre i file" -#: builtin/clone.c:104 +#: builtin/clone.c:103 msgid "setup as shared repository" msgstr "imposta il repository come condiviso" -#: builtin/clone.c:107 +#: builtin/clone.c:106 msgid "pathspec" msgstr "specificatore percorso" -#: builtin/clone.c:107 +#: builtin/clone.c:106 msgid "initialize submodules in the clone" msgstr "inizializza sottomoduli durante la clonazione" -#: builtin/clone.c:110 +#: builtin/clone.c:109 msgid "number of submodules cloned in parallel" msgstr "numero di sottomoduli clonati in parallelo" -#: builtin/clone.c:111 builtin/init-db.c:486 +#: builtin/clone.c:110 builtin/init-db.c:486 msgid "template-directory" msgstr "directory modelli" -#: builtin/clone.c:112 builtin/init-db.c:487 +#: builtin/clone.c:111 builtin/init-db.c:487 msgid "directory from which templates will be used" msgstr "directory da cui saranno recuperati i modelli" -#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380 +#: builtin/clone.c:113 builtin/clone.c:115 builtin/submodule--helper.c:1380 #: builtin/submodule--helper.c:1860 msgid "reference repository" msgstr "repository di riferimento" -#: builtin/clone.c:118 builtin/submodule--helper.c:1382 +#: builtin/clone.c:117 builtin/submodule--helper.c:1382 #: builtin/submodule--helper.c:1862 msgid "use --reference only while cloning" msgstr "usa --reference solo durante la clonazione" -#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3314 builtin/repack.c:319 +#: builtin/clone.c:118 builtin/column.c:27 builtin/merge-file.c:46 +#: builtin/pack-objects.c:3294 builtin/repack.c:320 msgid "name" msgstr "nome" -#: builtin/clone.c:120 +#: builtin/clone.c:119 msgid "use <name> instead of 'origin' to track upstream" msgstr "usa <nome> anziché 'origin' per tracciare l'upstream" -#: builtin/clone.c:122 +#: builtin/clone.c:121 msgid "checkout <branch> instead of the remote's HEAD" msgstr "esegui il checkout di <branch> anziché dell'HEAD del remoto" -#: builtin/clone.c:124 +#: builtin/clone.c:123 msgid "path to git-upload-pack on the remote" msgstr "percorso al comando remoto git-upload-pack" -#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838 -#: builtin/pull.c:226 +#: builtin/clone.c:124 builtin/fetch.c:167 builtin/grep.c:840 +#: builtin/pull.c:227 msgid "depth" msgstr "profondità" -#: builtin/clone.c:126 +#: builtin/clone.c:125 msgid "create a shallow clone of that depth" msgstr "crea un clone shallow con questa profondità" -#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303 +#: builtin/clone.c:126 builtin/fetch.c:169 builtin/pack-objects.c:3283 msgid "time" msgstr "tempo" -#: builtin/clone.c:128 +#: builtin/clone.c:127 msgid "create a shallow clone since a specific time" msgstr "crea un clone shallow a partire dall'istante specificato" -#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179 -#: builtin/rebase.c:1395 +#: builtin/clone.c:128 builtin/fetch.c:171 builtin/fetch.c:194 +#: builtin/rebase.c:1417 msgid "revision" msgstr "revisione" -#: builtin/clone.c:130 builtin/fetch.c:157 +#: builtin/clone.c:129 builtin/fetch.c:172 msgid "deepen history of shallow clone, excluding rev" msgstr "" "aumenta la profondità della cronologia del clone shallow fino alla revisione " "specificata esclusa" -#: builtin/clone.c:132 +#: builtin/clone.c:131 msgid "clone only one branch, HEAD or --branch" msgstr "clona solo un branch, HEAD o quello specificato con --branch" -#: builtin/clone.c:134 +#: builtin/clone.c:133 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "non clonare alcun tag e fai sì che i fetch successivi non li seguano" -#: builtin/clone.c:136 +#: builtin/clone.c:135 msgid "any cloned submodules will be shallow" msgstr "tutti i sottomoduli clonati saranno shallow" -#: builtin/clone.c:137 builtin/init-db.c:495 +#: builtin/clone.c:136 builtin/init-db.c:495 msgid "gitdir" msgstr "directory Git" -#: builtin/clone.c:138 builtin/init-db.c:496 +#: builtin/clone.c:137 builtin/init-db.c:496 msgid "separate git dir from working tree" msgstr "separa la directory Git dall'albero di lavoro" -#: builtin/clone.c:139 +#: builtin/clone.c:138 msgid "key=value" msgstr "chiave=valore" -#: builtin/clone.c:140 +#: builtin/clone.c:139 msgid "set config inside the new repository" msgstr "imposta la configurazione nel nuovo repository" -#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 -#: builtin/push.c:585 builtin/send-pack.c:172 +#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76 +#: builtin/push.c:572 builtin/send-pack.c:172 msgid "server-specific" msgstr "specifica del server" -#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 -#: builtin/push.c:585 builtin/send-pack.c:173 +#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76 +#: builtin/push.c:572 builtin/send-pack.c:173 msgid "option to transmit" msgstr "opzione da trasmettere" -#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239 -#: builtin/push.c:586 +#: builtin/clone.c:142 builtin/fetch.c:190 builtin/pull.c:240 +#: builtin/push.c:573 msgid "use IPv4 addresses only" msgstr "usa solo indirizzi IPv4" -#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242 -#: builtin/push.c:588 +#: builtin/clone.c:144 builtin/fetch.c:192 builtin/pull.c:243 +#: builtin/push.c:575 msgid "use IPv6 addresses only" msgstr "usa solo indirizzi IPv6" -#: builtin/clone.c:149 +#: builtin/clone.c:148 msgid "any cloned submodules will use their remote-tracking branch" msgstr "" "tutti i sottomoduli clonati useranno il loro rispettivo branch remoto " "tracciato" -#: builtin/clone.c:285 +#: builtin/clone.c:284 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -11249,47 +11283,42 @@ msgstr "" "Non è stato possibile indovinare alcun nome directory.\n" "Specifica una directory tramite la riga di comando" -#: builtin/clone.c:338 +#: builtin/clone.c:337 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "informazione: Impossibile aggiungere un alternato a '%s': %s\n" -#: builtin/clone.c:411 +#: builtin/clone.c:410 #, c-format msgid "%s exists and is not a directory" msgstr "%s esiste e non è una directory" -#: builtin/clone.c:428 +#: builtin/clone.c:427 #, c-format msgid "failed to start iterator over '%s'" msgstr "impossibile avviare l'iteratore su '%s'" -#: builtin/clone.c:453 -#, c-format -msgid "failed to unlink '%s'" -msgstr "unlink di '%s' non riuscito" - -#: builtin/clone.c:458 +#: builtin/clone.c:457 #, c-format msgid "failed to create link '%s'" msgstr "creazione del collegamento '%s' non riuscita" -#: builtin/clone.c:462 +#: builtin/clone.c:461 #, c-format msgid "failed to copy file to '%s'" msgstr "copia del file in '%s' non riuscita" -#: builtin/clone.c:467 +#: builtin/clone.c:466 #, c-format msgid "failed to iterate over '%s'" msgstr "iterazione su '%s' non riuscita" -#: builtin/clone.c:492 +#: builtin/clone.c:491 #, c-format msgid "done.\n" msgstr "fatto.\n" -#: builtin/clone.c:506 +#: builtin/clone.c:505 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -11300,98 +11329,98 @@ msgstr "" "con 'git status' e riprovare ad eseguire il checkout con\n" "'git restore --source=HEAD :/'\n" -#: builtin/clone.c:583 +#: builtin/clone.c:582 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Impossibile trovare il branch remoto %s da clonare." -#: builtin/clone.c:702 +#: builtin/clone.c:701 #, c-format msgid "unable to update %s" msgstr "impossibile aggiornare %s" -#: builtin/clone.c:752 +#: builtin/clone.c:751 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "l'HEAD remoto fa riferimento a un riferimento inesistente, impossibile " "eseguire il checkout.\n" -#: builtin/clone.c:783 +#: builtin/clone.c:782 msgid "unable to checkout working tree" msgstr "impossibile eseguire il checkout dell'albero di lavoro" -#: builtin/clone.c:833 +#: builtin/clone.c:832 msgid "unable to write parameters to config file" msgstr "impossibile scrivere i parametri nel file di configurazione" -#: builtin/clone.c:896 +#: builtin/clone.c:895 msgid "cannot repack to clean up" msgstr "impossibile eseguire il repack per pulire l'area di lavoro" -#: builtin/clone.c:898 +#: builtin/clone.c:897 msgid "cannot unlink temporary alternates file" msgstr "impossibile eseguire l'unlink del file alternates temporaneo" -#: builtin/clone.c:938 builtin/receive-pack.c:1950 +#: builtin/clone.c:937 builtin/receive-pack.c:1948 msgid "Too many arguments." msgstr "Troppi argomenti." -#: builtin/clone.c:942 +#: builtin/clone.c:941 msgid "You must specify a repository to clone." msgstr "Devi specificare un repository da clonare." -#: builtin/clone.c:955 +#: builtin/clone.c:954 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "le opzioni --bare e --origin %s non sono compatibili." -#: builtin/clone.c:958 +#: builtin/clone.c:957 msgid "--bare and --separate-git-dir are incompatible." msgstr "le opzioni --bare e --separate-git-dir non sono compatibili." -#: builtin/clone.c:971 +#: builtin/clone.c:970 #, c-format msgid "repository '%s' does not exist" msgstr "il repository '%s' non esiste" -#: builtin/clone.c:977 builtin/fetch.c:1660 +#: builtin/clone.c:976 builtin/fetch.c:1790 #, c-format msgid "depth %s is not a positive number" msgstr "la profondità %s non è un numero positivo" -#: builtin/clone.c:987 +#: builtin/clone.c:986 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" "il percorso di destinazione '%s' esiste già e non è una directory vuota." -#: builtin/clone.c:997 +#: builtin/clone.c:996 #, c-format msgid "working tree '%s' already exists." msgstr "l'albero di lavoro '%s' esiste già." -#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264 -#: builtin/worktree.c:303 builtin/worktree.c:335 +#: builtin/clone.c:1011 builtin/clone.c:1032 builtin/difftool.c:271 +#: builtin/log.c:1785 builtin/worktree.c:302 builtin/worktree.c:334 #, c-format msgid "could not create leading directories of '%s'" msgstr "impossibile creare le prime directory di '%s'" -#: builtin/clone.c:1017 +#: builtin/clone.c:1016 #, c-format msgid "could not create work tree dir '%s'" msgstr "impossibile creare la directory dell'albero di lavoro '%s'" -#: builtin/clone.c:1037 +#: builtin/clone.c:1036 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clone nel repository spoglio '%s' in corso...\n" -#: builtin/clone.c:1039 +#: builtin/clone.c:1038 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clone in '%s' in corso...\n" -#: builtin/clone.c:1063 +#: builtin/clone.c:1062 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -11399,36 +11428,36 @@ msgstr "" "il clone --recursive non è compatibile né con --reference né con --reference-" "if-able" -#: builtin/clone.c:1124 +#: builtin/clone.c:1123 msgid "--depth is ignored in local clones; use file:// instead." msgstr "L'opzione --depth è ignorata nei cloni locali; usa file://." -#: builtin/clone.c:1126 +#: builtin/clone.c:1125 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "L'opzione --shallow-since è ignorata nei cloni locali; usa file://." -#: builtin/clone.c:1128 +#: builtin/clone.c:1127 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "L'opzione --shallow-exclude è ignorata nei cloni locali; usa file://." -#: builtin/clone.c:1130 +#: builtin/clone.c:1129 msgid "--filter is ignored in local clones; use file:// instead." msgstr "L'opzione --filter è ignorata nei cloni locali; usa file://." -#: builtin/clone.c:1133 +#: builtin/clone.c:1132 msgid "source repository is shallow, ignoring --local" msgstr "il repository sorgente è shallow, ignoro l'opzione --local" -#: builtin/clone.c:1138 +#: builtin/clone.c:1137 msgid "--local is ignored" msgstr "l'opzione --local è ignorata" -#: builtin/clone.c:1215 builtin/clone.c:1223 +#: builtin/clone.c:1212 builtin/clone.c:1220 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Il branch remoto %s non è stato trovato nell'upstream %s" -#: builtin/clone.c:1226 +#: builtin/clone.c:1223 msgid "You appear to have cloned an empty repository." msgstr "Sembra che tu abbia clonato un repository vuoto." @@ -11506,7 +11535,7 @@ msgid "id of a parent commit object" msgstr "ID di un oggetto commit genitore" #: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1469 #: builtin/tag.c:412 msgid "message" msgstr "messaggio" @@ -11520,7 +11549,7 @@ msgid "read commit log message from file" msgstr "leggi il messaggio di log del commit da un file" #: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287 -#: builtin/pull.c:194 builtin/revert.c:118 +#: builtin/pull.c:195 builtin/revert.c:118 msgid "GPG sign commit" msgstr "firma il commit con GPG" @@ -11852,8 +11881,8 @@ msgstr "calcola tutti i valori dopo/prima di" msgid "version" msgstr "versione" -#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561 -#: builtin/worktree.c:651 +#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:548 +#: builtin/worktree.c:650 msgid "machine-readable output" msgstr "output leggibile da una macchina" @@ -11866,8 +11895,8 @@ msgid "terminate entries with NUL" msgstr "termina le voci con NUL" #: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537 -#: builtin/fast-export.c:1125 builtin/fast-export.c:1128 -#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332 +#: builtin/fast-export.c:1153 builtin/fast-export.c:1156 +#: builtin/fast-export.c:1159 builtin/rebase.c:1495 parse-options.h:332 msgid "mode" msgstr "modo" @@ -11885,7 +11914,7 @@ msgstr "" "visualizza file ignorati, modalità facoltative: traditional, matching, no. " "(Impostazione predefinita: traditional)" -#: builtin/commit.c:1362 parse-options.h:179 +#: builtin/commit.c:1362 parse-options.h:188 msgid "when" msgstr "quando" @@ -11940,7 +11969,7 @@ msgstr "autore" msgid "override author for commit" msgstr "sovrascrivi l'autore per il commit" -#: builtin/commit.c:1499 builtin/gc.c:539 +#: builtin/commit.c:1499 builtin/gc.c:538 msgid "date" msgstr "data" @@ -11976,8 +12005,8 @@ msgstr "" msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "il commit ora ha me come autore (opzione usata con -C/-c/--amend)" -#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289 -#: builtin/pull.c:163 builtin/revert.c:110 +#: builtin/commit.c:1506 builtin/log.c:1565 builtin/merge.c:289 +#: builtin/pull.c:164 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "aggiungi Signed-off-by:" @@ -12086,67 +12115,70 @@ msgid "git commit-graph read [--object-dir <objdir>]" msgstr "git commit-graph read [--object-dir <directory oggetti>]" #: builtin/commit-graph.c:13 builtin/commit-graph.c:19 -msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]" -msgstr "git commit-graph verify [--object-dir <directory oggetti>] [--shallow]" +msgid "" +"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" +msgstr "" +"git commit-graph verify [--object-dir <directory oggetti>] [--shallow]" +" [--[no-]progress]" #: builtin/commit-graph.c:14 builtin/commit-graph.c:29 msgid "" "git commit-graph write [--object-dir <objdir>] [--append|--split] [--" -"reachable|--stdin-packs|--stdin-commits] <split options>" +"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>" msgstr "" -"git commit-graph write [--object-dir <directory oggetti>] [--append|--split] " -"[--reachable|--stdin-packs|--stdin-commits] <opzioni split>" +"git commit-graph write [--object-dir <directory oggetti>] [--append|--split]" +" [--reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <opzioni split>" -#: builtin/commit-graph.c:54 builtin/commit-graph.c:100 -#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163 -#: builtin/log.c:1584 +#: builtin/commit-graph.c:55 builtin/commit-graph.c:107 +#: builtin/commit-graph.c:170 builtin/commit-graph.c:254 builtin/fetch.c:178 +#: builtin/log.c:1585 msgid "dir" msgstr "directory" -#: builtin/commit-graph.c:55 builtin/commit-graph.c:101 -#: builtin/commit-graph.c:162 builtin/commit-graph.c:238 +#: builtin/commit-graph.c:56 builtin/commit-graph.c:108 +#: builtin/commit-graph.c:171 builtin/commit-graph.c:255 msgid "The object directory to store the graph" msgstr "La directory oggetti in cui memorizzare il grafo" -#: builtin/commit-graph.c:57 +#: builtin/commit-graph.c:58 msgid "if the commit-graph is split, only verify the tip file" msgstr "se il grafo dei commit è diviso, verifica solo l'ultimo file" -#: builtin/commit-graph.c:73 builtin/commit-graph.c:116 +#: builtin/commit-graph.c:80 builtin/commit-graph.c:125 #, c-format msgid "Could not open commit-graph '%s'" msgstr "Impossibile aprire il grafo dei commit '%s'" -#: builtin/commit-graph.c:164 +#: builtin/commit-graph.c:173 msgid "start walk at all refs" msgstr "inizia la visita da tutti i riferimenti" -#: builtin/commit-graph.c:166 +#: builtin/commit-graph.c:175 msgid "scan pack-indexes listed by stdin for commits" msgstr "" "esamina i pack-index elencati sullo standard input alla ricerca di commit" -#: builtin/commit-graph.c:168 +#: builtin/commit-graph.c:177 msgid "start walk at commits listed by stdin" msgstr "inizia la visita ai commit elencati sullo standard input" -#: builtin/commit-graph.c:170 +#: builtin/commit-graph.c:179 msgid "include all commits already in the commit-graph file" msgstr "includi tutti i commit già presenti nel file commit-graph" -#: builtin/commit-graph.c:172 +#: builtin/commit-graph.c:182 msgid "allow writing an incremental commit-graph file" msgstr "consenti la scrittura di un file grafo dei commit incrementale" -#: builtin/commit-graph.c:174 builtin/commit-graph.c:178 +#: builtin/commit-graph.c:184 builtin/commit-graph.c:188 msgid "maximum number of commits in a non-base split commit-graph" msgstr "numero massimo di commit in un grafo dei commit diviso non di base" -#: builtin/commit-graph.c:176 +#: builtin/commit-graph.c:186 msgid "maximum ratio between two levels of a split commit-graph" msgstr "rapporto massimo fra due livelli di un grafo dei commit diviso" -#: builtin/commit-graph.c:191 +#: builtin/commit-graph.c:204 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "usa al più un'opzione fra --reachable, --stdin-commits o --stdin-packs" @@ -12468,59 +12500,59 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "stampa le dimensioni in un formato leggibile" -#: builtin/describe.c:27 +#: builtin/describe.c:26 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<opzioni>] [<espressione commit>...]" -#: builtin/describe.c:28 +#: builtin/describe.c:27 msgid "git describe [<options>] --dirty" msgstr "git describe [<opzioni>] --dirty" -#: builtin/describe.c:63 +#: builtin/describe.c:62 msgid "head" msgstr "head" -#: builtin/describe.c:63 +#: builtin/describe.c:62 msgid "lightweight" msgstr "leggero" -#: builtin/describe.c:63 +#: builtin/describe.c:62 msgid "annotated" msgstr "annotato" -#: builtin/describe.c:273 +#: builtin/describe.c:275 #, c-format msgid "annotated tag %s not available" msgstr "il tag annotato %s non è disponibile" -#: builtin/describe.c:277 +#: builtin/describe.c:279 #, c-format msgid "annotated tag %s has no embedded name" msgstr "il tag annotato %s non ha un nome incorporato" -#: builtin/describe.c:279 +#: builtin/describe.c:281 #, c-format msgid "tag '%s' is really '%s' here" msgstr "il tag '%s' in realtà qui è '%s'" -#: builtin/describe.c:323 +#: builtin/describe.c:325 #, c-format msgid "no tag exactly matches '%s'" msgstr "nessun tag corrisponde esattamente a '%s'" -#: builtin/describe.c:325 +#: builtin/describe.c:327 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "" "Nessuna corrispondenza esatta sui riferimenti o sui tag, sto eseguendo una " "ricerca per descrivere il commit\n" -#: builtin/describe.c:379 +#: builtin/describe.c:381 #, c-format msgid "finished search at %s\n" msgstr "ricerca terminata in %s\n" -#: builtin/describe.c:405 +#: builtin/describe.c:407 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -12529,7 +12561,7 @@ msgstr "" "Nessun tag annotato può descrivere '%s'.\n" "Ciò nonostante, c'erano dei tag non annotati: prova con --tags." -#: builtin/describe.c:409 +#: builtin/describe.c:411 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -12538,12 +12570,12 @@ msgstr "" "Nessun tag può descrivere '%s'.\n" "Prova con --always o crea dei tag." -#: builtin/describe.c:439 +#: builtin/describe.c:441 #, c-format msgid "traversed %lu commits\n" msgstr "ho attraversato %lu commit\n" -#: builtin/describe.c:442 +#: builtin/describe.c:444 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -12552,94 +12584,94 @@ msgstr "" "trovati più di %i tag; ho elencato i %i più recenti\n" "ho terminato la ricerca in %s\n" -#: builtin/describe.c:510 +#: builtin/describe.c:512 #, c-format msgid "describe %s\n" msgstr "descrivi %s\n" -#: builtin/describe.c:513 +#: builtin/describe.c:515 #, c-format msgid "Not a valid object name %s" msgstr "%s non è un nome oggetto valido" -#: builtin/describe.c:521 +#: builtin/describe.c:523 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s non è né un commit né un blob" -#: builtin/describe.c:535 +#: builtin/describe.c:537 msgid "find the tag that comes after the commit" msgstr "trova il tag successivo al commit" -#: builtin/describe.c:536 +#: builtin/describe.c:538 msgid "debug search strategy on stderr" msgstr "esegui il debug della strategia di ricerca sullo standard error" -#: builtin/describe.c:537 +#: builtin/describe.c:539 msgid "use any ref" msgstr "usa qualunque riferimento" -#: builtin/describe.c:538 +#: builtin/describe.c:540 msgid "use any tag, even unannotated" msgstr "usa qualunque tag, anche quelli non annotati" -#: builtin/describe.c:539 +#: builtin/describe.c:541 msgid "always use long format" msgstr "usa sempre il formato lungo" -#: builtin/describe.c:540 +#: builtin/describe.c:542 msgid "only follow first parent" msgstr "segui solo il primo genitore" -#: builtin/describe.c:543 +#: builtin/describe.c:545 msgid "only output exact matches" msgstr "visualizza solo le corrispondenze esatte" -#: builtin/describe.c:545 +#: builtin/describe.c:547 msgid "consider <n> most recent tags (default: 10)" msgstr "considera gli <n> tag più recenti (impostazione predefinita: 10)" -#: builtin/describe.c:547 +#: builtin/describe.c:549 msgid "only consider tags matching <pattern>" msgstr "considera solo i tag corrispondenti al <pattern>" -#: builtin/describe.c:549 +#: builtin/describe.c:551 msgid "do not consider tags matching <pattern>" msgstr "non considerare i tag corrispondenti al <pattern>" -#: builtin/describe.c:551 builtin/name-rev.c:422 +#: builtin/describe.c:553 builtin/name-rev.c:426 msgid "show abbreviated commit object as fallback" msgstr "visualizza l'oggetto commit abbreviato come fallback" -#: builtin/describe.c:552 builtin/describe.c:555 +#: builtin/describe.c:554 builtin/describe.c:557 msgid "mark" msgstr "contrassegno" -#: builtin/describe.c:553 +#: builtin/describe.c:555 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "" "aggiungi <contrassegno> all'albero di lavoro sporco (impostazione " "predefinita: \"-dirty\")" -#: builtin/describe.c:556 +#: builtin/describe.c:558 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "" "aggiungi <contrassegno> all'albero di lavoro rotto (impostazione " "predefinita: \"-broken\")" -#: builtin/describe.c:574 +#: builtin/describe.c:576 msgid "--long is incompatible with --abbrev=0" msgstr "--long non è compatibile con --abbrev=0" -#: builtin/describe.c:603 +#: builtin/describe.c:605 msgid "No names found, cannot describe anything." msgstr "Nessun nome trovato, non è possibile descrivere nulla." -#: builtin/describe.c:654 +#: builtin/describe.c:656 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty non è compatibile con le espressioni commit" -#: builtin/describe.c:656 +#: builtin/describe.c:658 msgid "--broken is incompatible with commit-ishes" msgstr "--broken non è compatibile con le espressioni commit" @@ -12676,27 +12708,27 @@ msgstr "specificato oggetto non gestito '%s'." msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<opzioni>] [<commit> [<commit>]] [--] [<percorso>...]" -#: builtin/difftool.c:253 +#: builtin/difftool.c:260 #, c-format msgid "failed: %d" msgstr "non riuscito: %d" -#: builtin/difftool.c:295 +#: builtin/difftool.c:302 #, c-format msgid "could not read symlink %s" msgstr "impossibile leggere il collegamento simbolico %s" -#: builtin/difftool.c:297 +#: builtin/difftool.c:304 #, c-format msgid "could not read symlink file %s" msgstr "impossibile leggere il file collegamento simbolico %s" -#: builtin/difftool.c:305 +#: builtin/difftool.c:312 #, c-format msgid "could not read object %s for symlink %s" msgstr "impossibile leggere l'oggetto %s per il collegamento simbolico %s" -#: builtin/difftool.c:406 +#: builtin/difftool.c:413 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -12704,54 +12736,54 @@ msgstr "" "i formati diff combinati ('-c' e '--cc') non sono supportati in\n" "modalità diff directory ('-d' e '--dir-diff')." -#: builtin/difftool.c:626 +#: builtin/difftool.c:634 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "entrambi i file risultano modificati: '%s' e '%s'." -#: builtin/difftool.c:628 +#: builtin/difftool.c:636 msgid "working tree file has been left." msgstr "il file nell'albero di lavoro è stato mantenuto." -#: builtin/difftool.c:639 +#: builtin/difftool.c:647 #, c-format msgid "temporary files exist in '%s'." msgstr "esistono file temporanei in '%s'." -#: builtin/difftool.c:640 +#: builtin/difftool.c:648 msgid "you may want to cleanup or recover these." msgstr "potresti voler ripulirli o ripristinarli." -#: builtin/difftool.c:689 +#: builtin/difftool.c:697 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "usa `diff.guitool` anziché `diff.tool`" -#: builtin/difftool.c:691 +#: builtin/difftool.c:699 msgid "perform a full-directory diff" msgstr "esegui un diff directory completo" -#: builtin/difftool.c:693 +#: builtin/difftool.c:701 msgid "do not prompt before launching a diff tool" msgstr "non chiedere conferma prima di lanciare un tool diff" -#: builtin/difftool.c:698 +#: builtin/difftool.c:706 msgid "use symlinks in dir-diff mode" msgstr "usa collegamenti simbolici in modalità diff directory" -#: builtin/difftool.c:699 +#: builtin/difftool.c:707 msgid "tool" msgstr "strumento" -#: builtin/difftool.c:700 +#: builtin/difftool.c:708 msgid "use the specified diff tool" msgstr "usa lo strumento diff specificato" -#: builtin/difftool.c:702 +#: builtin/difftool.c:710 msgid "print a list of diff tools that may be used with `--tool`" msgstr "" "stampa un elenco di strumenti diff che possono essere usati con `--tool`" -#: builtin/difftool.c:705 +#: builtin/difftool.c:713 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -12759,31 +12791,31 @@ msgstr "" "fai sì che 'git-difftool' esca quando uno strumento diff invocato " "restituisce un codice d'uscita diverso da zero" -#: builtin/difftool.c:708 +#: builtin/difftool.c:716 msgid "specify a custom command for viewing diffs" msgstr "specifica un comando personalizzato per visualizzare i diff" -#: builtin/difftool.c:709 +#: builtin/difftool.c:717 msgid "passed to `diff`" msgstr "fornito a `diff`" -#: builtin/difftool.c:724 +#: builtin/difftool.c:732 msgid "difftool requires worktree or --no-index" msgstr "difftool richiede un albero di lavoro o --no-index" -#: builtin/difftool.c:731 +#: builtin/difftool.c:739 msgid "--dir-diff is incompatible with --no-index" msgstr "--dir-diff non è compatibile con --no-index" -#: builtin/difftool.c:734 +#: builtin/difftool.c:742 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "le opzioni --gui, --tool ed --extcmd sono mutualmente esclusive" -#: builtin/difftool.c:742 +#: builtin/difftool.c:750 msgid "no <tool> given for --tool=<tool>" msgstr "nessuno <strumento> specificato per --tool=<strumento>" -#: builtin/difftool.c:749 +#: builtin/difftool.c:757 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "nessun <comando> specificato per --extcmd=<comando>" @@ -12825,161 +12857,189 @@ msgstr "" msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [opzioni-elenco-rev]" -#: builtin/fast-export.c:1124 +#: builtin/fast-export.c:852 +msgid "Error: Cannot export nested tags unless --mark-tags is specified." +msgstr "" +"Errore: Impossibile esportare i tag nidificati a meno che non sia specificata" +" l'opzione --mark-tags." + +#: builtin/fast-export.c:1152 msgid "show progress after <n> objects" msgstr "visualizza l'avanzamento dopo <n> oggetti" -#: builtin/fast-export.c:1126 +#: builtin/fast-export.c:1154 msgid "select handling of signed tags" msgstr "seleziona la gestione dei tag firmati" -#: builtin/fast-export.c:1129 +#: builtin/fast-export.c:1157 msgid "select handling of tags that tag filtered objects" msgstr "seleziona la gestione dei tag che contrassegnano oggetti filtrati" -#: builtin/fast-export.c:1132 +#: builtin/fast-export.c:1160 msgid "select handling of commit messages in an alternate encoding" msgstr "" "seleziona la gestione dei messaggi di commit in una codifica alternativa" -#: builtin/fast-export.c:1135 +#: builtin/fast-export.c:1163 msgid "Dump marks to this file" msgstr "Esegui il dump dei contrassegni in questo file" -#: builtin/fast-export.c:1137 +#: builtin/fast-export.c:1165 msgid "Import marks from this file" msgstr "Importa i contrassegni da questo file" -#: builtin/fast-export.c:1139 +#: builtin/fast-export.c:1169 +msgid "Import marks from this file if it exists" +msgstr "Importa i contrassegni da questo file se esiste" + +#: builtin/fast-export.c:1171 msgid "Fake a tagger when tags lack one" msgstr "Usa un tagger falso se i tag non ne hanno uno" -#: builtin/fast-export.c:1141 +#: builtin/fast-export.c:1173 msgid "Output full tree for each commit" msgstr "Visualizza in output l'albero completo per ogni commit" -#: builtin/fast-export.c:1143 +#: builtin/fast-export.c:1175 msgid "Use the done feature to terminate the stream" msgstr "Usa la funzionalità \"fatto\" per terminare il flusso" -#: builtin/fast-export.c:1144 +#: builtin/fast-export.c:1176 msgid "Skip output of blob data" msgstr "Ometti l'output dei dati dei blob" -#: builtin/fast-export.c:1145 builtin/log.c:1632 +#: builtin/fast-export.c:1177 builtin/log.c:1633 msgid "refspec" msgstr "specificatore riferimento" -#: builtin/fast-export.c:1146 +#: builtin/fast-export.c:1178 msgid "Apply refspec to exported refs" msgstr "Applica lo specificatore riferimento ai riferimenti esportati" -#: builtin/fast-export.c:1147 +#: builtin/fast-export.c:1179 msgid "anonymize output" msgstr "rendi anonimo l'output" -#: builtin/fast-export.c:1149 +#: builtin/fast-export.c:1181 msgid "Reference parents which are not in fast-export stream by object id" msgstr "" "Fai riferimento ai genitori non nel flusso fast-export tramite l'ID oggetto" -#: builtin/fast-export.c:1151 +#: builtin/fast-export.c:1183 msgid "Show original object ids of blobs/commits" msgstr "Visualizza gli ID oggetto originari dei blob/commit" -#: builtin/fetch.c:30 +#: builtin/fast-export.c:1185 +msgid "Label tags with mark ids" +msgstr "Etichetta i tag con ID contrassegno" + +#: builtin/fast-export.c:1220 +msgid "Cannot pass both --import-marks and --import-marks-if-exists" +msgstr "" +"Impossibile fornire entrambe le opzioni --import-marks e" +" --import-marks-if-exists" + +#: builtin/fetch.c:34 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<opzioni>] [<repository> [<specificatore riferimento>...]]" -#: builtin/fetch.c:31 +#: builtin/fetch.c:35 msgid "git fetch [<options>] <group>" msgstr "git fetch [<opzioni>] <gruppo>" -#: builtin/fetch.c:32 +#: builtin/fetch.c:36 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<opzioni>] [(<repository> | <gruppo>)...]" -#: builtin/fetch.c:33 +#: builtin/fetch.c:37 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<opzioni>]" -#: builtin/fetch.c:125 builtin/pull.c:203 +#: builtin/fetch.c:115 +msgid "fetch.parallel cannot be negative" +msgstr "fetch.parallel non può essere negativo" + +#: builtin/fetch.c:138 builtin/pull.c:204 msgid "fetch from all remotes" msgstr "esegui il fetch da tutti i remoti" -#: builtin/fetch.c:127 builtin/pull.c:206 +#: builtin/fetch.c:140 builtin/pull.c:248 +msgid "set upstream for git pull/fetch" +msgstr "imposta l'upstream per git pull/fetch" + +#: builtin/fetch.c:142 builtin/pull.c:207 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "aggiungi i dati a .git/FETCH_HEAD anziché sovrascriverli" -#: builtin/fetch.c:129 builtin/pull.c:209 +#: builtin/fetch.c:144 builtin/pull.c:210 msgid "path to upload pack on remote end" msgstr "percorso in cui caricare il pack sul remoto" -#: builtin/fetch.c:130 +#: builtin/fetch.c:145 msgid "force overwrite of local reference" msgstr "forza la sovrascrittura del riferimento locale" -#: builtin/fetch.c:132 +#: builtin/fetch.c:147 msgid "fetch from multiple remotes" msgstr "esegui il fetch da più remoti" -#: builtin/fetch.c:134 builtin/pull.c:213 +#: builtin/fetch.c:149 builtin/pull.c:214 msgid "fetch all tags and associated objects" msgstr "esegui il fetch di tutti i tag e degli oggetti associati" -#: builtin/fetch.c:136 +#: builtin/fetch.c:151 msgid "do not fetch all tags (--no-tags)" msgstr "non eseguire il fetch di alcun tag (--no-tags)" -#: builtin/fetch.c:138 +#: builtin/fetch.c:153 msgid "number of submodules fetched in parallel" msgstr "numero di sottomoduli recuperati in parallelo" -#: builtin/fetch.c:140 builtin/pull.c:216 +#: builtin/fetch.c:155 builtin/pull.c:217 msgid "prune remote-tracking branches no longer on remote" msgstr "" "elimina i branch che ne tracciano uno remoto ma non più presenti sul remoto" -#: builtin/fetch.c:142 +#: builtin/fetch.c:157 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" "elimina i tag locali non più presenti sul remoto e sovrascrivi i tag " "modificati" -#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140 +#: builtin/fetch.c:158 builtin/fetch.c:181 builtin/pull.c:141 msgid "on-demand" msgstr "a richiesta" -#: builtin/fetch.c:144 +#: builtin/fetch.c:159 msgid "control recursive fetching of submodules" msgstr "controlla il recupero ricorsivo dei sottomoduli" -#: builtin/fetch.c:148 builtin/pull.c:224 +#: builtin/fetch.c:163 builtin/pull.c:225 msgid "keep downloaded pack" msgstr "mantieni il pack scaricato" -#: builtin/fetch.c:150 +#: builtin/fetch.c:165 msgid "allow updating of HEAD ref" msgstr "consenti l'aggiornamento del riferimento HEAD" -#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227 +#: builtin/fetch.c:168 builtin/fetch.c:174 builtin/pull.c:228 msgid "deepen history of shallow clone" msgstr "aumenta la profondità della cronologia di un clone shallow" -#: builtin/fetch.c:155 +#: builtin/fetch.c:170 msgid "deepen history of shallow repository based on time" msgstr "" "aumenta la profondità della cronologia di un clone shallow in base al tempo" -#: builtin/fetch.c:161 builtin/pull.c:230 +#: builtin/fetch.c:176 builtin/pull.c:231 msgid "convert to a complete repository" msgstr "converti in un repository completo" -#: builtin/fetch.c:164 +#: builtin/fetch.c:179 msgid "prepend this to submodule path output" msgstr "anteponi questo prefisso all'output del percorso del sottomodulo" -#: builtin/fetch.c:167 +#: builtin/fetch.c:182 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -12987,90 +13047,90 @@ msgstr "" "impostazione predefinita per il recupero ricorsivo dei sottomoduli (a " "priorità minore rispetto ai file di configurazione)" -#: builtin/fetch.c:171 builtin/pull.c:233 +#: builtin/fetch.c:186 builtin/pull.c:234 msgid "accept refs that update .git/shallow" msgstr "accetta i riferimenti che aggiornano .git/shallow" -#: builtin/fetch.c:172 builtin/pull.c:235 +#: builtin/fetch.c:187 builtin/pull.c:236 msgid "refmap" msgstr "mappa riferimenti" -#: builtin/fetch.c:173 builtin/pull.c:236 +#: builtin/fetch.c:188 builtin/pull.c:237 msgid "specify fetch refmap" msgstr "specifica la mappa dei riferimenti per il fetch" -#: builtin/fetch.c:180 +#: builtin/fetch.c:195 msgid "report that we have only objects reachable from this object" msgstr "segnala che abbiamo solo oggetti raggiungibili da quest'oggetto" -#: builtin/fetch.c:183 +#: builtin/fetch.c:198 msgid "run 'gc --auto' after fetching" msgstr "esegui 'gc --auto' dopo il fetch" -#: builtin/fetch.c:185 builtin/pull.c:245 +#: builtin/fetch.c:200 builtin/pull.c:246 msgid "check for forced-updates on all updated branches" msgstr "controlla aggiornamenti forzati su tutti i branch aggiornati" -#: builtin/fetch.c:491 +#: builtin/fetch.c:510 msgid "Couldn't find remote ref HEAD" msgstr "Impossibile trovare l'HEAD del riferimento remoto" -#: builtin/fetch.c:630 +#: builtin/fetch.c:650 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "il valore dell'opzione fetch.output contiene il valore non valido %s" -#: builtin/fetch.c:728 +#: builtin/fetch.c:748 #, c-format msgid "object %s not found" msgstr "oggetto %s non trovato" -#: builtin/fetch.c:732 +#: builtin/fetch.c:752 msgid "[up to date]" msgstr "[aggiornato]" -#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833 +#: builtin/fetch.c:765 builtin/fetch.c:781 builtin/fetch.c:853 msgid "[rejected]" msgstr "[rifiutato]" -#: builtin/fetch.c:746 +#: builtin/fetch.c:766 msgid "can't fetch in current branch" msgstr "impossibile eseguire il fetch nel branch corrente" -#: builtin/fetch.c:756 +#: builtin/fetch.c:776 msgid "[tag update]" msgstr "[tag aggiornato]" -#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816 -#: builtin/fetch.c:828 +#: builtin/fetch.c:777 builtin/fetch.c:814 builtin/fetch.c:836 +#: builtin/fetch.c:848 msgid "unable to update local ref" msgstr "impossibile aggiornare il riferimento locale" -#: builtin/fetch.c:761 +#: builtin/fetch.c:781 msgid "would clobber existing tag" msgstr "sovrascriverebbe il tag esistente" -#: builtin/fetch.c:783 +#: builtin/fetch.c:803 msgid "[new tag]" msgstr "[nuovo tag]" -#: builtin/fetch.c:786 +#: builtin/fetch.c:806 msgid "[new branch]" msgstr "[nuovo branch]" -#: builtin/fetch.c:789 +#: builtin/fetch.c:809 msgid "[new ref]" msgstr "[nuovo riferimento]" -#: builtin/fetch.c:828 +#: builtin/fetch.c:848 msgid "forced update" msgstr "aggiornamento forzato" -#: builtin/fetch.c:833 +#: builtin/fetch.c:853 msgid "non-fast-forward" msgstr "non fast forward" -#: builtin/fetch.c:854 +#: builtin/fetch.c:874 msgid "" "Fetch normally indicates which branches had a forced update,\n" "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" @@ -13081,7 +13141,7 @@ msgstr "" "riabilitarlo, usa l'opzione '--show-forced-updates' o esegui 'git config\n" "fetch.showForcedUpdates true'." -#: builtin/fetch.c:858 +#: builtin/fetch.c:878 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -13093,22 +13153,22 @@ msgstr "" "aggiornamenti forzati. Puoi usare '--no-show-forced-updates' o eseguire\n" "'git config fetch.showForcedUpdates false' per omettere questo controllo.\n" -#: builtin/fetch.c:888 +#: builtin/fetch.c:908 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s non ha inviato tutti gli oggetti necessari\n" -#: builtin/fetch.c:909 +#: builtin/fetch.c:929 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "%s rifiutato perché non è consentito aggiornare radici shallow" -#: builtin/fetch.c:1000 builtin/fetch.c:1131 +#: builtin/fetch.c:1020 builtin/fetch.c:1157 #, c-format msgid "From %.*s\n" msgstr "Da %.*s\n" -#: builtin/fetch.c:1011 +#: builtin/fetch.c:1031 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -13118,60 +13178,81 @@ msgstr "" "eseguire\n" " 'git remote prune %s' per rimuovere ogni branch vecchio in conflitto" -#: builtin/fetch.c:1101 +#: builtin/fetch.c:1127 #, c-format msgid " (%s will become dangling)" msgstr " (%s diventerà pendente)" -#: builtin/fetch.c:1102 +#: builtin/fetch.c:1128 #, c-format msgid " (%s has become dangling)" msgstr " (%s è diventato pendente)" -#: builtin/fetch.c:1134 +#: builtin/fetch.c:1160 msgid "[deleted]" msgstr "[eliminato]" -#: builtin/fetch.c:1135 builtin/remote.c:1036 +#: builtin/fetch.c:1161 builtin/remote.c:1036 msgid "(none)" msgstr "(nessuno)" -#: builtin/fetch.c:1158 +#: builtin/fetch.c:1184 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" "Mi rifiuto di eseguire il fetch nel branch corrente %s di un repository non " "bare" -#: builtin/fetch.c:1177 +#: builtin/fetch.c:1203 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "L'opzione \"%s\" con il valore \"%s\" non è valida per %s" -#: builtin/fetch.c:1180 +#: builtin/fetch.c:1206 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "L'opzione \"%s\" è ignorata per %s\n" -#: builtin/fetch.c:1484 +#: builtin/fetch.c:1414 +msgid "multiple branch detected, incompatible with --set-upstream" +msgstr "rilevati branch multipli, stato incompatibile con --set-upstream" + +#: builtin/fetch.c:1429 +msgid "not setting upstream for a remote remote-tracking branch" +msgstr "non imposto l'upstream per un branch remoto che ne traccia uno remoto" + +#: builtin/fetch.c:1431 +msgid "not setting upstream for a remote tag" +msgstr "non imposto l'upstream per un tag remoto" + +#: builtin/fetch.c:1433 +msgid "unknown branch type" +msgstr "tipo branch sconosciuto" + +#: builtin/fetch.c:1435 +msgid "" +"no source branch found.\n" +"you need to specify exactly one branch with the --set-upstream option." +msgstr "" +"nessun branch sorgente trovato.\n" +"devi specificare esattamente un branch con l'opzione --set-upstream." + +#: builtin/fetch.c:1561 builtin/fetch.c:1623 #, c-format msgid "Fetching %s\n" msgstr "Recupero di %s in corso\n" -#: builtin/fetch.c:1486 builtin/remote.c:100 +#: builtin/fetch.c:1571 builtin/fetch.c:1625 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "Impossibile recuperare %s" -#: builtin/fetch.c:1532 -msgid "" -"--filter can only be used with the remote configured in extensions." -"partialClone" -msgstr "" -"--filter può essere usato solo con il remoto configurato nelle estensioni." -"partialClone" +#: builtin/fetch.c:1583 +#, c-format +msgid "could not fetch '%s' (exit code: %d)\n" +msgstr "impossibile recuperare '%s' (codice di uscita: %d)\n" -#: builtin/fetch.c:1556 +#: builtin/fetch.c:1685 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -13179,45 +13260,45 @@ msgstr "" "Non è stato specificato alcun repository remoto. Specifica un URL o il\n" "nome di un remoto da cui dovranno essere recuperate le nuove revisioni." -#: builtin/fetch.c:1593 +#: builtin/fetch.c:1722 msgid "You need to specify a tag name." msgstr "Devi specificare il nome di un tag." -#: builtin/fetch.c:1644 +#: builtin/fetch.c:1774 msgid "Negative depth in --deepen is not supported" msgstr "Le profondità negative in --deepen non sono supportate" -#: builtin/fetch.c:1646 +#: builtin/fetch.c:1776 msgid "--deepen and --depth are mutually exclusive" msgstr "le opzioni --deepen e --depth sono mutualmente esclusive" -#: builtin/fetch.c:1651 +#: builtin/fetch.c:1781 msgid "--depth and --unshallow cannot be used together" msgstr "--depth e --unshallow non possono essere usati insieme." -#: builtin/fetch.c:1653 +#: builtin/fetch.c:1783 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow su un repository completo non ha senso" -#: builtin/fetch.c:1669 +#: builtin/fetch.c:1799 msgid "fetch --all does not take a repository argument" msgstr "fetch --all non richiede un repository come argomento" -#: builtin/fetch.c:1671 +#: builtin/fetch.c:1801 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all non ha senso con degli specificatori riferimento" -#: builtin/fetch.c:1680 +#: builtin/fetch.c:1810 #, c-format msgid "No such remote or remote group: %s" msgstr "Remoto o gruppo remoti non esistente: %s" -#: builtin/fetch.c:1687 +#: builtin/fetch.c:1817 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" "Recuperare un gruppo e specificare gli specificatori riferimento non ha senso" -#: builtin/fetch.c:1703 +#: builtin/fetch.c:1835 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -13557,7 +13638,7 @@ msgstr "%s: oggetto mancante" msgid "invalid parameter: expected sha1, got '%s'" msgstr "parametro non valido: atteso SHA1, presente '%s'" -#: builtin/gc.c:34 +#: builtin/gc.c:35 msgid "git gc [<options>]" msgstr "git gc [<opzioni>]" @@ -13571,17 +13652,17 @@ msgstr "fstat di %s non riuscito: %s" msgid "failed to parse '%s' value '%s'" msgstr "analisi dell'opzione '%s' con valore '%s' non riuscita" -#: builtin/gc.c:476 builtin/init-db.c:55 +#: builtin/gc.c:475 builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" msgstr "impossibile eseguire lo stat di '%s'" -#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529 +#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529 #, c-format msgid "cannot read '%s'" msgstr "impossibile leggere '%s'" -#: builtin/gc.c:492 +#: builtin/gc.c:491 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -13597,56 +13678,56 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:540 +#: builtin/gc.c:539 msgid "prune unreferenced objects" msgstr "elimina oggetti non referenziati" -#: builtin/gc.c:542 +#: builtin/gc.c:541 msgid "be more thorough (increased runtime)" msgstr "sii più accurato (tempi di esecuzione maggiori)" -#: builtin/gc.c:543 +#: builtin/gc.c:542 msgid "enable auto-gc mode" msgstr "abilita modalità garbage collector automatica" -#: builtin/gc.c:546 +#: builtin/gc.c:545 msgid "force running gc even if there may be another gc running" msgstr "" "forza l'esecuzione del garbage collector anche nel caso in cui ve ne " "potrebbe essere un altro in esecuzione" -#: builtin/gc.c:549 +#: builtin/gc.c:548 msgid "repack all other packs except the largest pack" msgstr "" "esegui il repack di tutti gli altri pack ad eccezione di quello più grande" -#: builtin/gc.c:566 +#: builtin/gc.c:565 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "analisi del valore %s di gc.logexpiry non riuscita" -#: builtin/gc.c:577 +#: builtin/gc.c:576 #, c-format msgid "failed to parse prune expiry value %s" msgstr "analisi del valore %s per la scadenza delle eliminazioni non riuscita" -#: builtin/gc.c:597 +#: builtin/gc.c:596 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" "Comprimo il repository in background per ottenere le migliori prestazioni.\n" -#: builtin/gc.c:599 +#: builtin/gc.c:598 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Comprimo il repository per ottenere le migliori prestazioni.\n" -#: builtin/gc.c:600 +#: builtin/gc.c:599 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Vedi \"git help gc\" per le operazioni di manutenzione manuali.\n" -#: builtin/gc.c:640 +#: builtin/gc.c:639 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -13654,7 +13735,7 @@ msgstr "" "gc è già in esecuzione sul computer '%s' con PID %<PRIuMAX> (usa --force se " "non lo è)" -#: builtin/gc.c:695 +#: builtin/gc.c:694 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -13681,262 +13762,262 @@ msgstr "specificato numero non valido di thread (%d) per %s" #. grep.threads #. #: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727 -#: builtin/pack-objects.c:2728 +#: builtin/pack-objects.c:2708 #, c-format msgid "no threads support, ignoring %s" msgstr "non vi è supporto per i thread, ignoro %s" -#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633 +#: builtin/grep.c:467 builtin/grep.c:592 builtin/grep.c:635 #, c-format msgid "unable to read tree (%s)" msgstr "impossibile leggere il tree (%s)" -#: builtin/grep.c:648 +#: builtin/grep.c:650 #, c-format msgid "unable to grep from object of type %s" msgstr "impossibile eseguire grep su un oggetto di tipo %s" -#: builtin/grep.c:714 +#: builtin/grep.c:716 #, c-format msgid "switch `%c' expects a numerical value" msgstr "switch '%c' richiede un valore numerico" -#: builtin/grep.c:813 +#: builtin/grep.c:815 msgid "search in index instead of in the work tree" msgstr "cerca nell'index anziché nell'albero di lavoro" -#: builtin/grep.c:815 +#: builtin/grep.c:817 msgid "find in contents not managed by git" msgstr "la ricerca nei contenuti non è gestita da Git" -#: builtin/grep.c:817 +#: builtin/grep.c:819 msgid "search in both tracked and untracked files" msgstr "cerca sia nei file tracciati sia in quelli non tracciati" -#: builtin/grep.c:819 +#: builtin/grep.c:821 msgid "ignore files specified via '.gitignore'" msgstr "ignora i file specificati in '.gitignore'" -#: builtin/grep.c:821 +#: builtin/grep.c:823 msgid "recursively search in each submodule" msgstr "cerca ricorsivamente in ogni sottomodulo" -#: builtin/grep.c:824 +#: builtin/grep.c:826 msgid "show non-matching lines" msgstr "visualizza le righe non corrispondenti" -#: builtin/grep.c:826 +#: builtin/grep.c:828 msgid "case insensitive matching" msgstr "ricerca corrispondenze senza differenze maiuscole/minuscole" -#: builtin/grep.c:828 +#: builtin/grep.c:830 msgid "match patterns only at word boundaries" msgstr "cerca corrispondenze ai pattern solo a inizio/fine parola" -#: builtin/grep.c:830 +#: builtin/grep.c:832 msgid "process binary files as text" msgstr "elabora i file binari come testuali" -#: builtin/grep.c:832 +#: builtin/grep.c:834 msgid "don't match patterns in binary files" msgstr "non cercare corrispondenze ai pattern nei file binari" -#: builtin/grep.c:835 +#: builtin/grep.c:837 msgid "process binary files with textconv filters" msgstr "elabora i file binari con filtri di conversione in testo" -#: builtin/grep.c:837 +#: builtin/grep.c:839 msgid "search in subdirectories (default)" msgstr "cerca nelle sottodirectory (impostazione predefinita)" -#: builtin/grep.c:839 +#: builtin/grep.c:841 msgid "descend at most <depth> levels" msgstr "scendi al più di <profondità> livelli" -#: builtin/grep.c:843 +#: builtin/grep.c:845 msgid "use extended POSIX regular expressions" msgstr "usa espressioni regolari POSIX estese" -#: builtin/grep.c:846 +#: builtin/grep.c:848 msgid "use basic POSIX regular expressions (default)" msgstr "usa espressioni regolari POSIX di base (impostazione predefinita)" -#: builtin/grep.c:849 +#: builtin/grep.c:851 msgid "interpret patterns as fixed strings" msgstr "interpreta i pattern come stringhe fisse" -#: builtin/grep.c:852 +#: builtin/grep.c:854 msgid "use Perl-compatible regular expressions" msgstr "usa espressioni regolari compatibili con Perl" -#: builtin/grep.c:855 +#: builtin/grep.c:857 msgid "show line numbers" msgstr "visualizza numeri di riga" -#: builtin/grep.c:856 +#: builtin/grep.c:858 msgid "show column number of first match" msgstr "visualizza il numero di colonna della prima corrispondenza" -#: builtin/grep.c:857 +#: builtin/grep.c:859 msgid "don't show filenames" msgstr "non visualizzare i nomi file" -#: builtin/grep.c:858 +#: builtin/grep.c:860 msgid "show filenames" msgstr "visualizza i nomi file" -#: builtin/grep.c:860 +#: builtin/grep.c:862 msgid "show filenames relative to top directory" msgstr "visualizza i nomi file relativi alla directory di primo livello" -#: builtin/grep.c:862 +#: builtin/grep.c:864 msgid "show only filenames instead of matching lines" msgstr "visualizza solo i nomi file anziché le righe corrispondenti" -#: builtin/grep.c:864 +#: builtin/grep.c:866 msgid "synonym for --files-with-matches" msgstr "sinonimo di --files-with-matches" -#: builtin/grep.c:867 +#: builtin/grep.c:869 msgid "show only the names of files without match" msgstr "visualizza solo i nomi dei file non corrispondenti" -#: builtin/grep.c:869 +#: builtin/grep.c:871 msgid "print NUL after filenames" msgstr "stampa NUL dopo i nomi file" -#: builtin/grep.c:872 +#: builtin/grep.c:874 msgid "show only matching parts of a line" msgstr "visualizza solo le parti corrispondenti di una riga" -#: builtin/grep.c:874 +#: builtin/grep.c:876 msgid "show the number of matches instead of matching lines" msgstr "visualizza il numero di corrispondenze anziché le righe corrispondenti" -#: builtin/grep.c:875 +#: builtin/grep.c:877 msgid "highlight matches" msgstr "evidenzia corrispondenze" -#: builtin/grep.c:877 +#: builtin/grep.c:879 msgid "print empty line between matches from different files" msgstr "stampa una riga vuota fra le corrispondenze in file differenti" -#: builtin/grep.c:879 +#: builtin/grep.c:881 msgid "show filename only once above matches from same file" msgstr "" "visualizza il nome file solo una volta prima delle corrispondenze nello " "stesso file" -#: builtin/grep.c:882 +#: builtin/grep.c:884 msgid "show <n> context lines before and after matches" msgstr "visualizza <n> righe di contesto prima e dopo le corrispondenze" -#: builtin/grep.c:885 +#: builtin/grep.c:887 msgid "show <n> context lines before matches" msgstr "visualizza <n> righe di contesto prima delle corrispondenze" -#: builtin/grep.c:887 +#: builtin/grep.c:889 msgid "show <n> context lines after matches" msgstr "visualizza <n> righe di contesto dopo le corrispondenze" -#: builtin/grep.c:889 +#: builtin/grep.c:891 msgid "use <n> worker threads" msgstr "usa <n> thread di lavoro" -#: builtin/grep.c:890 +#: builtin/grep.c:892 msgid "shortcut for -C NUM" msgstr "scorciatoia per -C NUM" -#: builtin/grep.c:893 +#: builtin/grep.c:895 msgid "show a line with the function name before matches" msgstr "visualizza una riga con il nome funzione prima delle corrispondenze" -#: builtin/grep.c:895 +#: builtin/grep.c:897 msgid "show the surrounding function" msgstr "visualizza la funzione circostante" -#: builtin/grep.c:898 +#: builtin/grep.c:900 msgid "read patterns from file" msgstr "leggi le corrispondenze da un file" -#: builtin/grep.c:900 +#: builtin/grep.c:902 msgid "match <pattern>" msgstr "cerca corrispondenze con <pattern>" -#: builtin/grep.c:902 +#: builtin/grep.c:904 msgid "combine patterns specified with -e" msgstr "combina i pattern specificati con -e" -#: builtin/grep.c:914 +#: builtin/grep.c:916 msgid "indicate hit with exit status without output" msgstr "" "segnala una corrispondenza con il codice di uscita senza emettere output" -#: builtin/grep.c:916 +#: builtin/grep.c:918 msgid "show only matches from files that match all patterns" msgstr "" "visualizza solo le corrispondenze nei file in cui vi sono corrispondenze per " "tutti i pattern" -#: builtin/grep.c:918 +#: builtin/grep.c:920 msgid "show parse tree for grep expression" msgstr "visualizza l'albero di analisi per l'espressione grep" -#: builtin/grep.c:922 +#: builtin/grep.c:924 msgid "pager" msgstr "pager" -#: builtin/grep.c:922 +#: builtin/grep.c:924 msgid "show matching files in the pager" msgstr "visualizza i file corrispondenti nel pager" -#: builtin/grep.c:926 +#: builtin/grep.c:928 msgid "allow calling of grep(1) (ignored by this build)" msgstr "consenti" -#: builtin/grep.c:990 +#: builtin/grep.c:992 msgid "no pattern given" msgstr "nessun pattern specificato" -#: builtin/grep.c:1026 +#: builtin/grep.c:1028 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index o --untracked non possono essere usate con le revisioni" -#: builtin/grep.c:1034 +#: builtin/grep.c:1036 #, c-format msgid "unable to resolve revision: %s" msgstr "impossibile risolvere la revisione %s" -#: builtin/grep.c:1065 +#: builtin/grep.c:1067 msgid "invalid option combination, ignoring --threads" msgstr "combinazione di opzioni non valida, ignoro --threads" -#: builtin/grep.c:1068 builtin/pack-objects.c:3416 +#: builtin/grep.c:1070 builtin/pack-objects.c:3400 msgid "no threads support, ignoring --threads" msgstr "non vi è supporto per i thread, ignoro --threads" -#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725 +#: builtin/grep.c:1073 builtin/index-pack.c:1531 builtin/pack-objects.c:2705 #, c-format msgid "invalid number of threads specified (%d)" msgstr "specificato numero non valido di thread (%d)" -#: builtin/grep.c:1094 +#: builtin/grep.c:1096 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager funziona solo sull'albero di lavoro" -#: builtin/grep.c:1117 +#: builtin/grep.c:1119 msgid "option not supported with --recurse-submodules" msgstr "opzione non supportata con --recurse-submodules" -#: builtin/grep.c:1123 +#: builtin/grep.c:1125 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached o --untracked non possono essere usate con --no-index" -#: builtin/grep.c:1129 +#: builtin/grep.c:1131 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard non può essere usata per i contenuti tracciati" -#: builtin/grep.c:1137 +#: builtin/grep.c:1139 msgid "both --cached and trees are given" msgstr "sono specificati sia --cached sia degli alberi" @@ -14250,7 +14331,7 @@ msgstr "confusione oltre ogni follia in parse_pack_objects()" msgid "Resolving deltas" msgstr "Risoluzione dei delta" -#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497 +#: builtin/index-pack.c:1205 builtin/pack-objects.c:2481 #, c-format msgid "unable to create thread: %s" msgstr "impossibile creare il thread: %s" @@ -14315,7 +14396,7 @@ msgstr "impossibile archiviare il file pack" msgid "cannot store index file" msgstr "impossibile archiviare index file" -#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736 +#: builtin/index-pack.c:1525 builtin/pack-objects.c:2716 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "pack.indexversion=%<PRIu32> non valida" @@ -14596,74 +14677,74 @@ msgstr "Output finale: %d %s\n" msgid "git show %s: bad file" msgstr "git show %s: file non valido" -#: builtin/log.c:549 builtin/log.c:643 +#: builtin/log.c:549 builtin/log.c:644 #, c-format msgid "could not read object %s" msgstr "impossibile leggere l'oggetto %s" -#: builtin/log.c:668 +#: builtin/log.c:669 #, c-format msgid "unknown type: %d" msgstr "tipo sconosciuto: %d" -#: builtin/log.c:791 +#: builtin/log.c:792 msgid "format.headers without value" msgstr "format.headers non ha alcun valore" -#: builtin/log.c:908 +#: builtin/log.c:909 msgid "name of output directory is too long" msgstr "il nome della directory di output è troppo lungo" -#: builtin/log.c:924 +#: builtin/log.c:925 #, c-format msgid "cannot open patch file %s" msgstr "impossibile aprire il file patch %s" -#: builtin/log.c:941 +#: builtin/log.c:942 msgid "need exactly one range" msgstr "è necessario specificare esattamente un intervallo" -#: builtin/log.c:951 +#: builtin/log.c:952 msgid "not a range" msgstr "il valore non è un intervallo" -#: builtin/log.c:1074 +#: builtin/log.c:1075 msgid "cover letter needs email format" msgstr "la lettera di accompagnamento dev'essere in formato e-mail" -#: builtin/log.c:1080 +#: builtin/log.c:1081 msgid "failed to create cover-letter file" msgstr "creazione del file lettera di accompagnamento non riuscita" -#: builtin/log.c:1159 +#: builtin/log.c:1160 #, c-format msgid "insane in-reply-to: %s" msgstr "valore in-reply-to folle: %s" -#: builtin/log.c:1186 +#: builtin/log.c:1187 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<opzioni>] [<da> | <intervallo revisioni>]" -#: builtin/log.c:1244 +#: builtin/log.c:1245 msgid "two output directories?" msgstr "due directory di output?" -#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113 +#: builtin/log.c:1356 builtin/log.c:2116 builtin/log.c:2118 builtin/log.c:2130 #, c-format msgid "unknown commit %s" msgstr "commit %s sconosciuto" -#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1366 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "impossibile risolvere '%s' come riferimento valido" -#: builtin/log.c:1370 +#: builtin/log.c:1371 msgid "could not find exact merge base" msgstr "impossibile trovare esattamente la base del merge" -#: builtin/log.c:1374 +#: builtin/log.c:1375 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" @@ -14675,278 +14756,278 @@ msgstr "" "In alternativa puoi specificare manualmente il commit di base con\n" "--base=<ID commit di base>" -#: builtin/log.c:1394 +#: builtin/log.c:1395 msgid "failed to find exact merge base" msgstr "impossibile trovare esattamente la base del merge" -#: builtin/log.c:1405 +#: builtin/log.c:1406 msgid "base commit should be the ancestor of revision list" msgstr "il commit di base dovrebbe essere l'antenato dell'elenco revisioni" -#: builtin/log.c:1409 +#: builtin/log.c:1410 msgid "base commit shouldn't be in revision list" msgstr "il commit di base non dovrebbe essere nell'elenco revisioni" -#: builtin/log.c:1462 +#: builtin/log.c:1463 msgid "cannot get patch id" msgstr "impossibile ottenere l'ID della patch" -#: builtin/log.c:1514 +#: builtin/log.c:1515 msgid "failed to infer range-diff ranges" msgstr "inferenza degli intervalli range-diff non riuscita" -#: builtin/log.c:1559 +#: builtin/log.c:1560 msgid "use [PATCH n/m] even with a single patch" msgstr "usa [PATCH n/m] anche con una singola patch" -#: builtin/log.c:1562 +#: builtin/log.c:1563 msgid "use [PATCH] even with multiple patches" msgstr "usa [PATCH] anche con più patch" -#: builtin/log.c:1566 +#: builtin/log.c:1567 msgid "print patches to standard out" msgstr "stampa le patch sullo standard output" -#: builtin/log.c:1568 +#: builtin/log.c:1569 msgid "generate a cover letter" msgstr "genera una lettera di accompagnamento" -#: builtin/log.c:1570 +#: builtin/log.c:1571 msgid "use simple number sequence for output file names" msgstr "usa una sequenza numerica semplice per i nomi file di output" -#: builtin/log.c:1571 +#: builtin/log.c:1572 msgid "sfx" msgstr "suff" -#: builtin/log.c:1572 +#: builtin/log.c:1573 msgid "use <sfx> instead of '.patch'" msgstr "usa <suff> anziché '.patch'" -#: builtin/log.c:1574 +#: builtin/log.c:1575 msgid "start numbering patches at <n> instead of 1" msgstr "inizia a numerare le patch da <n> anziché da 1" -#: builtin/log.c:1576 +#: builtin/log.c:1577 msgid "mark the series as Nth re-roll" msgstr "contrassegna la serie come l'n-esima versione revisionata" -#: builtin/log.c:1578 +#: builtin/log.c:1579 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Usa [RFC PATCH] anziché [PATCH]" -#: builtin/log.c:1581 +#: builtin/log.c:1582 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Usa [<prefisso>] anziché [PATCH]" -#: builtin/log.c:1584 +#: builtin/log.c:1585 msgid "store resulting files in <dir>" msgstr "salva i file risultanti in <dir>" -#: builtin/log.c:1587 +#: builtin/log.c:1588 msgid "don't strip/add [PATCH]" msgstr "non eliminare/aggiungere [PATCH]" -#: builtin/log.c:1590 +#: builtin/log.c:1591 msgid "don't output binary diffs" msgstr "non mandare in output diff binari" -#: builtin/log.c:1592 +#: builtin/log.c:1593 msgid "output all-zero hash in From header" msgstr "manda in output un hash costituito da soli zeri nell'intestazione From" -#: builtin/log.c:1594 +#: builtin/log.c:1595 msgid "don't include a patch matching a commit upstream" msgstr "non includere una patch corrispondente a un commit upstream" -#: builtin/log.c:1596 +#: builtin/log.c:1597 msgid "show patch format instead of default (patch + stat)" msgstr "" "visualizza il formato della patch anziché l'impostazione predefinita (patch " "+ stat)" -#: builtin/log.c:1598 +#: builtin/log.c:1599 msgid "Messaging" msgstr "Messaggistica" -#: builtin/log.c:1599 +#: builtin/log.c:1600 msgid "header" msgstr "intestazione" -#: builtin/log.c:1600 +#: builtin/log.c:1601 msgid "add email header" msgstr "aggiungi intestazione e-mail" -#: builtin/log.c:1601 builtin/log.c:1603 +#: builtin/log.c:1602 builtin/log.c:1604 msgid "email" msgstr "e-mail" -#: builtin/log.c:1601 +#: builtin/log.c:1602 msgid "add To: header" msgstr "aggiungi intestazione A:" -#: builtin/log.c:1603 +#: builtin/log.c:1604 msgid "add Cc: header" msgstr "aggiungi intestazione Cc:" -#: builtin/log.c:1605 +#: builtin/log.c:1606 msgid "ident" msgstr "identità" -#: builtin/log.c:1606 +#: builtin/log.c:1607 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "imposta l'indirizzo Da a <identità> (o all'identità di chi ha creato il " "commit se assente)" -#: builtin/log.c:1608 +#: builtin/log.c:1609 msgid "message-id" msgstr "ID messaggio" -#: builtin/log.c:1609 +#: builtin/log.c:1610 msgid "make first mail a reply to <message-id>" msgstr "rendi la prima e-mail una risposta a <ID messaggio>" -#: builtin/log.c:1610 builtin/log.c:1613 +#: builtin/log.c:1611 builtin/log.c:1614 msgid "boundary" msgstr "delimitatore" -#: builtin/log.c:1611 +#: builtin/log.c:1612 msgid "attach the patch" msgstr "allega la patch" -#: builtin/log.c:1614 +#: builtin/log.c:1615 msgid "inline the patch" msgstr "includi la patch nel messaggio" -#: builtin/log.c:1618 +#: builtin/log.c:1619 msgid "enable message threading, styles: shallow, deep" msgstr "" "abilita il raggruppamento messaggi per conversazione, stili: superficiale, " "profondo" -#: builtin/log.c:1620 +#: builtin/log.c:1621 msgid "signature" msgstr "firma" -#: builtin/log.c:1621 +#: builtin/log.c:1622 msgid "add a signature" msgstr "aggiungi una firma" -#: builtin/log.c:1622 +#: builtin/log.c:1623 msgid "base-commit" msgstr "commit di base" -#: builtin/log.c:1623 +#: builtin/log.c:1624 msgid "add prerequisite tree info to the patch series" msgstr "" "aggiungi le informazioni prerequisito per l'albero alla serie delle patch" -#: builtin/log.c:1625 +#: builtin/log.c:1626 msgid "add a signature from a file" msgstr "aggiungi una firma da file" -#: builtin/log.c:1626 +#: builtin/log.c:1627 msgid "don't print the patch filenames" msgstr "non stampare i nomi file delle patch" -#: builtin/log.c:1628 +#: builtin/log.c:1629 msgid "show progress while generating patches" msgstr "visualizza l'avanzamento dell'operazione di generazione patch" -#: builtin/log.c:1630 +#: builtin/log.c:1631 msgid "show changes against <rev> in cover letter or single patch" msgstr "" "visualizza le modifiche rispetto a <revisione> nella lettera di " "accompagnamento o in una patch singola" -#: builtin/log.c:1633 +#: builtin/log.c:1634 msgid "show changes against <refspec> in cover letter or single patch" msgstr "" "visualizza le modifiche rispetto a <specificatore revisione> nella lettera " "di accompagnamento o in una patch singola" -#: builtin/log.c:1635 +#: builtin/log.c:1636 msgid "percentage by which creation is weighted" msgstr "percentuale in base a cui viene pesata la creazione" -#: builtin/log.c:1710 +#: builtin/log.c:1711 #, c-format msgid "invalid ident line: %s" msgstr "riga ident non valida: %s" -#: builtin/log.c:1725 +#: builtin/log.c:1726 msgid "-n and -k are mutually exclusive" msgstr "le opzioni -n e -k sono mutuamente esclusive" -#: builtin/log.c:1727 +#: builtin/log.c:1728 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "le opzioni --subject-prefix/--rfc e -k sono mutuamente esclusive" -#: builtin/log.c:1735 +#: builtin/log.c:1736 msgid "--name-only does not make sense" msgstr "--name-only non ha senso" -#: builtin/log.c:1737 +#: builtin/log.c:1738 msgid "--name-status does not make sense" msgstr "--name-status non ha senso" -#: builtin/log.c:1739 +#: builtin/log.c:1740 msgid "--check does not make sense" msgstr "--check non ha senso" -#: builtin/log.c:1771 +#: builtin/log.c:1773 msgid "standard output, or directory, which one?" msgstr "standard output, o directory, quale dei due?" -#: builtin/log.c:1860 +#: builtin/log.c:1877 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff richiede --cover-letter o una singola patch" -#: builtin/log.c:1864 +#: builtin/log.c:1881 msgid "Interdiff:" msgstr "Interdiff:" -#: builtin/log.c:1865 +#: builtin/log.c:1882 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff rispetto alla versione %d:" -#: builtin/log.c:1871 +#: builtin/log.c:1888 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor richiede --range-diff" -#: builtin/log.c:1875 +#: builtin/log.c:1892 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff richiede --cover-letter o una singola patch" -#: builtin/log.c:1883 +#: builtin/log.c:1900 msgid "Range-diff:" msgstr "Range-diff:" -#: builtin/log.c:1884 +#: builtin/log.c:1901 #, c-format msgid "Range-diff against v%d:" msgstr "Range-diff rispetto alla versione %d:" -#: builtin/log.c:1895 +#: builtin/log.c:1912 #, c-format msgid "unable to read signature file '%s'" msgstr "impossibile leggere il file firma '%s'" -#: builtin/log.c:1931 +#: builtin/log.c:1948 msgid "Generating patches" msgstr "Generazione delle patch in corso" -#: builtin/log.c:1975 +#: builtin/log.c:1992 msgid "failed to create output files" msgstr "creazione dei file di output non riuscita" -#: builtin/log.c:2034 +#: builtin/log.c:2051 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<upstream> [<head> [<limite>]]]" -#: builtin/log.c:2088 +#: builtin/log.c:2105 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -15078,7 +15159,7 @@ msgstr "" msgid "do not print remote URL" msgstr "non stampare l'URL del remoto" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1488 msgid "exec" msgstr "eseguibile" @@ -15190,33 +15271,33 @@ msgstr "Le strategie disponibili sono:" msgid "Available custom strategies are:" msgstr "Le strategie personalizzate disponibili sono:" -#: builtin/merge.c:244 builtin/pull.c:151 +#: builtin/merge.c:244 builtin/pull.c:152 msgid "do not show a diffstat at the end of the merge" msgstr "non visualizzare un diffstat al termine del merge" -#: builtin/merge.c:247 builtin/pull.c:154 +#: builtin/merge.c:247 builtin/pull.c:155 msgid "show a diffstat at the end of the merge" msgstr "visualizza un diffstat al termine del merge" -#: builtin/merge.c:248 builtin/pull.c:157 +#: builtin/merge.c:248 builtin/pull.c:158 msgid "(synonym to --stat)" msgstr "(sinonimo di --stat)" -#: builtin/merge.c:250 builtin/pull.c:160 +#: builtin/merge.c:250 builtin/pull.c:161 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "aggiungi (al più <n>) voci dal registro breve al messaggio di commit del " "merge" -#: builtin/merge.c:253 builtin/pull.c:166 +#: builtin/merge.c:253 builtin/pull.c:167 msgid "create a single commit instead of doing a merge" msgstr "crea un singolo commit anziché eseguire un merge" -#: builtin/merge.c:255 builtin/pull.c:169 +#: builtin/merge.c:255 builtin/pull.c:170 msgid "perform a commit if the merge succeeds (default)" msgstr "esegui un commit se il merge ha successo (impostazione predefinita)" -#: builtin/merge.c:257 builtin/pull.c:172 +#: builtin/merge.c:257 builtin/pull.c:173 msgid "edit message before committing" msgstr "modifica il messaggio prima di eseguire il commit" @@ -15224,28 +15305,28 @@ msgstr "modifica il messaggio prima di eseguire il commit" msgid "allow fast-forward (default)" msgstr "consenti fast forward (impostazione predefinita)" -#: builtin/merge.c:261 builtin/pull.c:179 +#: builtin/merge.c:261 builtin/pull.c:180 msgid "abort if fast-forward is not possible" msgstr "interrompi se il fast forward non è possibile" -#: builtin/merge.c:265 builtin/pull.c:182 +#: builtin/merge.c:265 builtin/pull.c:183 msgid "verify that the named commit has a valid GPG signature" msgstr "verifica che il commit specificato abbia una firma GPG valida" -#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186 -#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114 +#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:187 +#: builtin/rebase.c:493 builtin/rebase.c:1501 builtin/revert.c:114 msgid "strategy" msgstr "strategia" -#: builtin/merge.c:267 builtin/pull.c:187 +#: builtin/merge.c:267 builtin/pull.c:188 msgid "merge strategy to use" msgstr "strategia di merge da usare" -#: builtin/merge.c:268 builtin/pull.c:190 +#: builtin/merge.c:268 builtin/pull.c:191 msgid "option=value" msgstr "opzione=valore" -#: builtin/merge.c:269 builtin/pull.c:191 +#: builtin/merge.c:269 builtin/pull.c:192 msgid "option for selected merge strategy" msgstr "opzione per la strategia di merge selezionata" @@ -15265,13 +15346,13 @@ msgstr "esegui --abort ma mantieni immutati l'indice e l'albero di lavoro" msgid "continue the current in-progress merge" msgstr "continua il merge attualmente in corso" -#: builtin/merge.c:284 builtin/pull.c:198 +#: builtin/merge.c:284 builtin/pull.c:199 msgid "allow merging unrelated histories" msgstr "consenti di unire cronologie non correlate" #: builtin/merge.c:290 -msgid "verify commit-msg hook" -msgstr "verifica hook commit-msg" +msgid "bypass pre-merge-commit and commit-msg hooks" +msgstr "ignora gli hook pre-merge-commit e commit-msg" #: builtin/merge.c:307 msgid "could not run stash." @@ -15314,32 +15395,32 @@ msgstr "'%s' non punta ad un commit" msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Stringa branch.%s.mergeoptions errata: %s" -#: builtin/merge.c:708 +#: builtin/merge.c:705 msgid "Not handling anything other than two heads merge." msgstr "Non gestisco nulla che non sia il merge di due head." -#: builtin/merge.c:722 +#: builtin/merge.c:719 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Opzione sconosciuta per merge-recursive: -X%s" -#: builtin/merge.c:737 +#: builtin/merge.c:734 #, c-format msgid "unable to write %s" msgstr "impossibile scrivere %s" -#: builtin/merge.c:789 +#: builtin/merge.c:786 #, c-format msgid "Could not read from '%s'" msgstr "Non è stato possibile leggere da '%s'" -#: builtin/merge.c:798 +#: builtin/merge.c:795 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Non eseguo il commit del merge; usa 'git commit' per completare il merge.\n" -#: builtin/merge.c:804 +#: builtin/merge.c:801 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" @@ -15350,11 +15431,11 @@ msgstr "" "aggiornato in un topic branch.\n" "\n" -#: builtin/merge.c:809 +#: builtin/merge.c:806 msgid "An empty message aborts the commit.\n" msgstr "Un messaggio vuoto interromperà il commit.\n" -#: builtin/merge.c:812 +#: builtin/merge.c:809 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -15363,74 +15444,74 @@ msgstr "" "Le righe che iniziano con '%c' saranno ignorate e un messaggio vuoto\n" "interromperà il commit.\n" -#: builtin/merge.c:853 +#: builtin/merge.c:862 msgid "Empty commit message." msgstr "Messaggio di commit vuoto." -#: builtin/merge.c:872 +#: builtin/merge.c:877 #, c-format msgid "Wonderful.\n" msgstr "Splendido.\n" -#: builtin/merge.c:933 +#: builtin/merge.c:938 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Merge automatico fallito; risolvi i conflitti ed esegui il commit\n" "del risultato.\n" -#: builtin/merge.c:972 +#: builtin/merge.c:977 msgid "No current branch." msgstr "Nessun branch corrente." -#: builtin/merge.c:974 +#: builtin/merge.c:979 msgid "No remote for the current branch." msgstr "Nessun remote per il branch corrente." -#: builtin/merge.c:976 +#: builtin/merge.c:981 msgid "No default upstream defined for the current branch." msgstr "Nessun upstream di default definito per il branch corrente." -#: builtin/merge.c:981 +#: builtin/merge.c:986 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Nessun branch che tracci un remoto per %s da %s" -#: builtin/merge.c:1038 +#: builtin/merge.c:1043 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Valore errato '%s' nell'ambiente '%s'" -#: builtin/merge.c:1141 +#: builtin/merge.c:1146 #, c-format msgid "not something we can merge in %s: %s" msgstr "non è qualcosa di cui possiamo eseguire il merge in %s: %s" -#: builtin/merge.c:1175 +#: builtin/merge.c:1180 msgid "not something we can merge" msgstr "non è qualcosa di cui possiamo eseguire il merge" -#: builtin/merge.c:1278 +#: builtin/merge.c:1283 msgid "--abort expects no arguments" msgstr "--abort non richiede argomenti" -#: builtin/merge.c:1282 +#: builtin/merge.c:1287 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Non c'è nessun merge da interrompere (MERGE_HEAD mancante)." -#: builtin/merge.c:1291 +#: builtin/merge.c:1296 msgid "--quit expects no arguments" msgstr "--quit non richiede argomenti" -#: builtin/merge.c:1304 +#: builtin/merge.c:1309 msgid "--continue expects no arguments" msgstr "--continue non richiede argomenti" -#: builtin/merge.c:1308 +#: builtin/merge.c:1313 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Non c'è nessun merge in corso (MERGE_HEAD mancante)." -#: builtin/merge.c:1324 +#: builtin/merge.c:1329 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15438,7 +15519,7 @@ msgstr "" "Non hai concluso il merge (MERGE_HEAD esiste).\n" "Esegui il commit delle modifiche prima di eseguire il merge." -#: builtin/merge.c:1331 +#: builtin/merge.c:1336 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15446,96 +15527,96 @@ msgstr "" "Non hai concluso il cherry-pick (CHERRY_PICK_HEAD esiste).\n" "Esegui il commit delle modifiche prima di eseguire il merge." -#: builtin/merge.c:1334 +#: builtin/merge.c:1339 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Il cherry-pick non è stato concluso (CHERRY_PICK_HEAD esiste)." -#: builtin/merge.c:1348 +#: builtin/merge.c:1353 msgid "You cannot combine --squash with --no-ff." msgstr "Non è possibile combinare --squash con --no-ff." -#: builtin/merge.c:1350 +#: builtin/merge.c:1355 msgid "You cannot combine --squash with --commit." msgstr "Non è possibile combinare --squash con --commit." -#: builtin/merge.c:1366 +#: builtin/merge.c:1371 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Nessun commit specificato e merge.defaultToUpstream non impostato." -#: builtin/merge.c:1383 +#: builtin/merge.c:1388 msgid "Squash commit into empty head not supported yet" msgstr "Lo squash di un commit in un'head vuota non è ancora supportato" -#: builtin/merge.c:1385 +#: builtin/merge.c:1390 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Un commit non fast forward non ha senso in un'head vuota" -#: builtin/merge.c:1390 +#: builtin/merge.c:1395 #, c-format msgid "%s - not something we can merge" msgstr "%s - non è qualcosa per cui possiamo eseguire il merge" -#: builtin/merge.c:1392 +#: builtin/merge.c:1397 msgid "Can merge only exactly one commit into empty head" msgstr "Si può eseguire solo il merge di uno e un solo commit in un'head vuota" -#: builtin/merge.c:1471 +#: builtin/merge.c:1476 msgid "refusing to merge unrelated histories" msgstr "mi rifiuto di eseguire il merge di cronologie non correlate" -#: builtin/merge.c:1480 +#: builtin/merge.c:1485 msgid "Already up to date." msgstr "Già aggiornato." -#: builtin/merge.c:1490 +#: builtin/merge.c:1495 #, c-format msgid "Updating %s..%s\n" msgstr "Aggiornamento di %s..%s\n" -#: builtin/merge.c:1532 +#: builtin/merge.c:1537 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Provo con un merge veramente banale dentro l'indice...\n" -#: builtin/merge.c:1539 +#: builtin/merge.c:1544 #, c-format msgid "Nope.\n" msgstr "No.\n" -#: builtin/merge.c:1564 +#: builtin/merge.c:1569 msgid "Already up to date. Yeeah!" msgstr "Già aggiornato. Oh sì!" -#: builtin/merge.c:1570 +#: builtin/merge.c:1575 msgid "Not possible to fast-forward, aborting." msgstr "Fast forward non possibile, interrompo l'operazione." -#: builtin/merge.c:1593 builtin/merge.c:1658 +#: builtin/merge.c:1598 builtin/merge.c:1663 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Ripristino l'albero in uno stato pulito...\n" -#: builtin/merge.c:1597 +#: builtin/merge.c:1602 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Tentativo con la strategia di merge %s...\n" -#: builtin/merge.c:1649 +#: builtin/merge.c:1654 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Nessuna strategia di merge ha gestito il merge.\n" -#: builtin/merge.c:1651 +#: builtin/merge.c:1656 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Merge con la strategia %s fallito.\n" -#: builtin/merge.c:1660 +#: builtin/merge.c:1665 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Uso %s per preparare una risoluzione manuale.\n" -#: builtin/merge.c:1672 +#: builtin/merge.c:1677 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -15624,33 +15705,33 @@ msgstr "non emettere avvisi in caso di conflitti" msgid "set labels for file1/orig-file/file2" msgstr "imposta etichette per file1/file originale/file2" -#: builtin/merge-recursive.c:46 +#: builtin/merge-recursive.c:47 #, c-format msgid "unknown option %s" msgstr "opzione sconosciuta %s" -#: builtin/merge-recursive.c:52 +#: builtin/merge-recursive.c:53 #, c-format msgid "could not parse object '%s'" msgstr "impossibile analizzare l'oggetto '%s'" -#: builtin/merge-recursive.c:56 +#: builtin/merge-recursive.c:57 #, c-format msgid "cannot handle more than %d base. Ignoring %s." msgid_plural "cannot handle more than %d bases. Ignoring %s." msgstr[0] "impossibile gestire più di %d base. Ignoro %s." msgstr[1] "impossibile gestire più di %d basi. Ignoro %s." -#: builtin/merge-recursive.c:64 +#: builtin/merge-recursive.c:65 msgid "not handling anything other than two heads merge." msgstr "non gestisco nulla che non sia il merge di due head." -#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72 +#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76 #, c-format msgid "could not resolve ref '%s'" msgstr "impossibile risolvere il riferimento '%s'" -#: builtin/merge-recursive.c:78 +#: builtin/merge-recursive.c:82 #, c-format msgid "Merging %s with %s\n" msgstr "Merge di %s con %s in corso\n" @@ -15794,52 +15875,52 @@ msgstr "%s, sorgente=%s, destinazione=%s" msgid "Renaming %s to %s\n" msgstr "Rinominazione di %s in %s in corso\n" -#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510 +#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:511 #, c-format msgid "renaming '%s' failed" msgstr "rinomina di '%s' non riuscita" -#: builtin/name-rev.c:352 +#: builtin/name-rev.c:356 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<opzioni>] <commit>..." -#: builtin/name-rev.c:353 +#: builtin/name-rev.c:357 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<opzioni>] --all" -#: builtin/name-rev.c:354 +#: builtin/name-rev.c:358 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<opzioni>] --stdin" -#: builtin/name-rev.c:411 +#: builtin/name-rev.c:415 msgid "print only names (no SHA-1)" msgstr "stampa solo i nomi (non lo SHA-1)" -#: builtin/name-rev.c:412 +#: builtin/name-rev.c:416 msgid "only use tags to name the commits" msgstr "usa solo tag per denominare i commit" -#: builtin/name-rev.c:414 +#: builtin/name-rev.c:418 msgid "only use refs matching <pattern>" msgstr "usa solo i riferimenti corrispondenti a <pattern>" -#: builtin/name-rev.c:416 +#: builtin/name-rev.c:420 msgid "ignore refs matching <pattern>" msgstr "ignora i riferimenti corrispondenti a <pattern>" -#: builtin/name-rev.c:418 +#: builtin/name-rev.c:422 msgid "list all commits reachable from all refs" msgstr "elenca tutti i commit raggiungibili da tutti i riferimenti" -#: builtin/name-rev.c:419 +#: builtin/name-rev.c:423 msgid "read from stdin" msgstr "leggi dallo standard input" -#: builtin/name-rev.c:420 +#: builtin/name-rev.c:424 msgid "allow to print `undefined` names (default)" msgstr "consenti di stampare nomi `non definito` (impostazione predefinita)" -#: builtin/name-rev.c:426 +#: builtin/name-rev.c:430 msgid "dereference tags in the input (internal use)" msgstr "dereferenzia tag nell'input (uso interno)" @@ -16243,7 +16324,7 @@ msgstr "il tentativo di rimuovere una nota inesistente non è un errore" msgid "read object names from the standard input" msgstr "leggi i nomi degli oggetti dallo standard input" -#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165 +#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164 msgid "do not remove, show only" msgstr "non rimuovere, limitati a visualizzare" @@ -16259,7 +16340,7 @@ msgstr "riferimento note" msgid "use notes from <notes-ref>" msgstr "usa le note in <riferimento note>" -#: builtin/notes.c:1034 builtin/stash.c:1598 +#: builtin/notes.c:1034 builtin/stash.c:1607 #, c-format msgid "unknown subcommand: %s" msgstr "sottocomando sconosciuto: %s" @@ -16336,71 +16417,71 @@ msgstr "stat di %s non riuscito" msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "scritti %<PRIu32> oggetti quando me ne attendevo %<PRIu32>" -#: builtin/pack-objects.c:1166 +#: builtin/pack-objects.c:1164 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "disabilito la scrittura delle bitmap perché alcuni oggetti non saranno " "sottoposti a pack" -#: builtin/pack-objects.c:1597 +#: builtin/pack-objects.c:1592 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "overflow dell'offset base del delta nel pack per %s" -#: builtin/pack-objects.c:1606 +#: builtin/pack-objects.c:1601 #, c-format msgid "delta base offset out of bound for %s" msgstr "offset base del delta fuori dall'intervallo consentito per %s" -#: builtin/pack-objects.c:1875 +#: builtin/pack-objects.c:1870 msgid "Counting objects" msgstr "Conteggio degli oggetti in corso" -#: builtin/pack-objects.c:2005 +#: builtin/pack-objects.c:2000 #, c-format msgid "unable to get size of %s" msgstr "impossibile recuperare le dimensioni di %s" -#: builtin/pack-objects.c:2020 +#: builtin/pack-objects.c:2015 #, c-format msgid "unable to parse object header of %s" msgstr "impossibile analizzare l'intestazione oggetto di %s" -#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106 -#: builtin/pack-objects.c:2116 +#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2101 +#: builtin/pack-objects.c:2111 #, c-format msgid "object %s cannot be read" msgstr "impossibile leggere l'oggetto %s" -#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120 +#: builtin/pack-objects.c:2088 builtin/pack-objects.c:2115 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "" "oggetto %s: lunghezza oggetto inconsistente (%<PRIuMAX> contro %<PRIuMAX>)" -#: builtin/pack-objects.c:2130 +#: builtin/pack-objects.c:2125 msgid "suboptimal pack - out of memory" msgstr "pack subottimo - memoria esaurita" -#: builtin/pack-objects.c:2456 +#: builtin/pack-objects.c:2440 #, c-format msgid "Delta compression using up to %d threads" msgstr "Compressione delta in corso, uso fino a %d thread" -#: builtin/pack-objects.c:2588 +#: builtin/pack-objects.c:2572 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "impossibile eseguire il pack degli oggetti raggiungibili dal tag %s" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2659 msgid "Compressing objects" msgstr "Compressione oggetti in corso" -#: builtin/pack-objects.c:2681 +#: builtin/pack-objects.c:2665 msgid "inconsistency with delta count" msgstr "inconsistenza con il numero dei delta" -#: builtin/pack-objects.c:2762 +#: builtin/pack-objects.c:2742 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -16409,7 +16490,7 @@ msgstr "" "atteso ID oggetto arco, ricevuti dati errati:\n" " %s" -#: builtin/pack-objects.c:2768 +#: builtin/pack-objects.c:2748 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -16418,251 +16499,251 @@ msgstr "" "atteso ID oggetto, ricevuti dati errati:\n" " %s" -#: builtin/pack-objects.c:2866 +#: builtin/pack-objects.c:2846 msgid "invalid value for --missing" msgstr "valore non valido per --missing" -#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033 +#: builtin/pack-objects.c:2905 builtin/pack-objects.c:3013 msgid "cannot open pack index" msgstr "impossibile aprire l'indice pack" -#: builtin/pack-objects.c:2956 +#: builtin/pack-objects.c:2936 #, c-format msgid "loose object at %s could not be examined" msgstr "impossibile esaminare l'oggetto sciolto %s" -#: builtin/pack-objects.c:3041 +#: builtin/pack-objects.c:3021 msgid "unable to force loose object" msgstr "impossibile forzare l'oggetto sciolto" -#: builtin/pack-objects.c:3133 +#: builtin/pack-objects.c:3113 #, c-format msgid "not a rev '%s'" msgstr "'%s' non è una revisione" -#: builtin/pack-objects.c:3136 +#: builtin/pack-objects.c:3116 #, c-format msgid "bad revision '%s'" msgstr "revisione '%s' errata" -#: builtin/pack-objects.c:3161 +#: builtin/pack-objects.c:3141 msgid "unable to add recent objects" msgstr "impossibile aggiungere gli oggetti recenti" -#: builtin/pack-objects.c:3214 +#: builtin/pack-objects.c:3194 #, c-format msgid "unsupported index version %s" msgstr "versione %s di index non supportata" -#: builtin/pack-objects.c:3218 +#: builtin/pack-objects.c:3198 #, c-format msgid "bad index version '%s'" msgstr "versione '%s' di index errata" -#: builtin/pack-objects.c:3248 +#: builtin/pack-objects.c:3228 msgid "do not show progress meter" msgstr "non visualizzare la barra di avanzamento" -#: builtin/pack-objects.c:3250 +#: builtin/pack-objects.c:3230 msgid "show progress meter" msgstr "visualizza la barra di avanzamento" -#: builtin/pack-objects.c:3252 +#: builtin/pack-objects.c:3232 msgid "show progress meter during object writing phase" msgstr "" "visualizza la barra di avanzamento durante la fase di scrittura oggetti" -#: builtin/pack-objects.c:3255 +#: builtin/pack-objects.c:3235 msgid "similar to --all-progress when progress meter is shown" msgstr "simile a --all-progress quando è visualizzata la barra di avanzamento" -#: builtin/pack-objects.c:3256 +#: builtin/pack-objects.c:3236 msgid "<version>[,<offset>]" msgstr "<versione>[,<offset>]" -#: builtin/pack-objects.c:3257 +#: builtin/pack-objects.c:3237 msgid "write the pack index file in the specified idx format version" msgstr "scrivi il file indice pack usando la versione formato idx specificata" -#: builtin/pack-objects.c:3260 +#: builtin/pack-objects.c:3240 msgid "maximum size of each output pack file" msgstr "dimensione massima di ogni file pack in output" -#: builtin/pack-objects.c:3262 +#: builtin/pack-objects.c:3242 msgid "ignore borrowed objects from alternate object store" msgstr "ignora gli oggetti presi in prestito dallo store oggetti alternativo" -#: builtin/pack-objects.c:3264 +#: builtin/pack-objects.c:3244 msgid "ignore packed objects" msgstr "ignora gli oggetti sottoposti a pack" -#: builtin/pack-objects.c:3266 +#: builtin/pack-objects.c:3246 msgid "limit pack window by objects" msgstr "limita la finestra di pack al numero di oggetti specificato" -#: builtin/pack-objects.c:3268 +#: builtin/pack-objects.c:3248 msgid "limit pack window by memory in addition to object limit" msgstr "" "limita la finestra di pack alla memoria specificata in aggiunta al limite " "sugli oggetti" -#: builtin/pack-objects.c:3270 +#: builtin/pack-objects.c:3250 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "lunghezza massima della catena di delta consentita nel pack risultante" -#: builtin/pack-objects.c:3272 +#: builtin/pack-objects.c:3252 msgid "reuse existing deltas" msgstr "riusa i delta esistenti" -#: builtin/pack-objects.c:3274 +#: builtin/pack-objects.c:3254 msgid "reuse existing objects" msgstr "riusa gli oggetti esistenti" -#: builtin/pack-objects.c:3276 +#: builtin/pack-objects.c:3256 msgid "use OFS_DELTA objects" msgstr "usa oggetti OFS_DELTA" -#: builtin/pack-objects.c:3278 +#: builtin/pack-objects.c:3258 msgid "use threads when searching for best delta matches" msgstr "" "usa più thread durante la ricerca delle migliori corrispondenze per i delta" -#: builtin/pack-objects.c:3280 +#: builtin/pack-objects.c:3260 msgid "do not create an empty pack output" msgstr "non creare un output pack vuoto" -#: builtin/pack-objects.c:3282 +#: builtin/pack-objects.c:3262 msgid "read revision arguments from standard input" msgstr "leggi gli argomenti revisione dallo standard input" -#: builtin/pack-objects.c:3284 +#: builtin/pack-objects.c:3264 msgid "limit the objects to those that are not yet packed" msgstr "limita gli oggetti a quelli non ancora sottoposti a pack" -#: builtin/pack-objects.c:3287 +#: builtin/pack-objects.c:3267 msgid "include objects reachable from any reference" msgstr "includi gli oggetti raggiungibili da qualunque riferimento" -#: builtin/pack-objects.c:3290 +#: builtin/pack-objects.c:3270 msgid "include objects referred by reflog entries" msgstr "includi gli oggetti referenziati da voci del log riferimenti" -#: builtin/pack-objects.c:3293 +#: builtin/pack-objects.c:3273 msgid "include objects referred to by the index" msgstr "includi gli oggetti referenziati dall'indice" -#: builtin/pack-objects.c:3296 +#: builtin/pack-objects.c:3276 msgid "output pack to stdout" msgstr "invia il pack in output sullo standard output" -#: builtin/pack-objects.c:3298 +#: builtin/pack-objects.c:3278 msgid "include tag objects that refer to objects to be packed" msgstr "" "includi gli oggetti tag che fanno riferimento agli oggetti da sottoporre a " "pack" -#: builtin/pack-objects.c:3300 +#: builtin/pack-objects.c:3280 msgid "keep unreachable objects" msgstr "mantieni gli oggetti non raggiungibili" -#: builtin/pack-objects.c:3302 +#: builtin/pack-objects.c:3282 msgid "pack loose unreachable objects" msgstr "esegui il pack degli oggetti non raggiungibili sciolti" -#: builtin/pack-objects.c:3304 +#: builtin/pack-objects.c:3284 msgid "unpack unreachable objects newer than <time>" msgstr "decomprimi gli oggetti non raggiungibili più recenti di <tempo>" -#: builtin/pack-objects.c:3307 +#: builtin/pack-objects.c:3287 msgid "use the sparse reachability algorithm" msgstr "usa l'algoritmo di raggiungibilità sparse" -#: builtin/pack-objects.c:3309 +#: builtin/pack-objects.c:3289 msgid "create thin packs" msgstr "crea pack thin" -#: builtin/pack-objects.c:3311 +#: builtin/pack-objects.c:3291 msgid "create packs suitable for shallow fetches" msgstr "crea pack adatti per fetch shallow" -#: builtin/pack-objects.c:3313 +#: builtin/pack-objects.c:3293 msgid "ignore packs that have companion .keep file" msgstr "ignora i pack che hanno un file .keep che li accompagna" -#: builtin/pack-objects.c:3315 +#: builtin/pack-objects.c:3295 msgid "ignore this pack" msgstr "ignora questo pack" -#: builtin/pack-objects.c:3317 +#: builtin/pack-objects.c:3297 msgid "pack compression level" msgstr "livello compressione pack" -#: builtin/pack-objects.c:3319 +#: builtin/pack-objects.c:3299 msgid "do not hide commits by grafts" msgstr "non nascondere i commit innestati" -#: builtin/pack-objects.c:3321 +#: builtin/pack-objects.c:3301 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "usa un indice bitmap se disponibile per velocizzare il conteggio degli " "oggetti" -#: builtin/pack-objects.c:3323 +#: builtin/pack-objects.c:3303 msgid "write a bitmap index together with the pack index" msgstr "scrivi un indice bitmap insieme all'indice pack" -#: builtin/pack-objects.c:3327 +#: builtin/pack-objects.c:3307 msgid "write a bitmap index if possible" msgstr "scrivi un indice bitmap se possibile" -#: builtin/pack-objects.c:3331 +#: builtin/pack-objects.c:3311 msgid "handling for missing objects" msgstr "azione da eseguire sugli oggetti mancanti" -#: builtin/pack-objects.c:3334 +#: builtin/pack-objects.c:3314 msgid "do not pack objects in promisor packfiles" msgstr "non eseguire il pack degli oggetti nei file pack promettenti" -#: builtin/pack-objects.c:3336 +#: builtin/pack-objects.c:3316 msgid "respect islands during delta compression" msgstr "rispetta le isole durante la compressione delta" -#: builtin/pack-objects.c:3361 +#: builtin/pack-objects.c:3345 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "la profondità della catena dei delta (%d) è troppo elevata, forzo %d" -#: builtin/pack-objects.c:3366 +#: builtin/pack-objects.c:3350 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "il valore pack.deltaCacheLimit è troppo elevato, forzo %d" -#: builtin/pack-objects.c:3420 +#: builtin/pack-objects.c:3404 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" "--max-pack-size non può essere usato per generare un pack da trasferire" -#: builtin/pack-objects.c:3422 +#: builtin/pack-objects.c:3406 msgid "minimum pack size limit is 1 MiB" msgstr "il limite minimo delle dimensioni dei pack è 1 MiB" -#: builtin/pack-objects.c:3427 +#: builtin/pack-objects.c:3411 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin non può essere usato per generare un pack indicizzabile" -#: builtin/pack-objects.c:3430 +#: builtin/pack-objects.c:3414 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable e --unpack-unreachable non sono compatibili" -#: builtin/pack-objects.c:3436 +#: builtin/pack-objects.c:3420 msgid "cannot use --filter without --stdout" msgstr "impossibile usare --filter senza --stdout" -#: builtin/pack-objects.c:3497 +#: builtin/pack-objects.c:3481 msgid "Enumerating objects" msgstr "Enumerazione degli oggetti in corso" -#: builtin/pack-objects.c:3527 +#: builtin/pack-objects.c:3511 #, c-format msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" msgstr "" @@ -16719,44 +16800,44 @@ msgstr "Valore non valido per %s: %s" msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<opzioni>] [<repository> [<specificatore riferimento>...]]" -#: builtin/pull.c:141 +#: builtin/pull.c:142 msgid "control for recursive fetching of submodules" msgstr "controlla il recupero ricorsivo dei sottomoduli" -#: builtin/pull.c:145 +#: builtin/pull.c:146 msgid "Options related to merging" msgstr "Opzioni relative al merge" -#: builtin/pull.c:148 +#: builtin/pull.c:149 msgid "incorporate changes by rebasing rather than merging" msgstr "incorpora le modifiche eseguendo un rebase anziché un merge" -#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126 +#: builtin/pull.c:177 builtin/rebase.c:448 builtin/revert.c:126 msgid "allow fast-forward" msgstr "consenti fast forward" -#: builtin/pull.c:185 +#: builtin/pull.c:186 msgid "automatically stash/stash pop before and after rebase" msgstr "esegui stash/stash pop automaticamente prima e dopo il rebase" -#: builtin/pull.c:201 +#: builtin/pull.c:202 msgid "Options related to fetching" msgstr "Opzioni relative al fetch" -#: builtin/pull.c:211 +#: builtin/pull.c:212 msgid "force overwrite of local branch" msgstr "forza la sovrascrittura del branch locale" -#: builtin/pull.c:219 +#: builtin/pull.c:220 msgid "number of submodules pulled in parallel" msgstr "numero di sottomoduli recuperati in parallelo" -#: builtin/pull.c:316 +#: builtin/pull.c:320 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Valore non valido per pull.ff: %s" -#: builtin/pull.c:433 +#: builtin/pull.c:437 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -16764,14 +16845,14 @@ msgstr "" "Non ci sono candidati in base ai quali eseguire il rebase fra i riferimenti " "appena recuperati." -#: builtin/pull.c:435 +#: builtin/pull.c:439 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "Non ci sono candidati in base ai quali eseguire il merge fra i riferimenti " "appena recuperati." -#: builtin/pull.c:436 +#: builtin/pull.c:440 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -16779,7 +16860,7 @@ msgstr "" "In generale, questo significa che hai fornito uno specificatore\n" "riferimento che non aveva corrispondenze nel remoto." -#: builtin/pull.c:439 +#: builtin/pull.c:443 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -16791,44 +16872,44 @@ msgstr "" "configurato come predefinito per il branch corrente, devi\n" "specificare un branch sulla riga di comando." -#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73 +#: builtin/pull.c:448 builtin/rebase.c:1347 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Attualmente non sei su un branch." -#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79 +#: builtin/pull.c:450 builtin/pull.c:465 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Specifica il branch in base a cui vuoi effettuare il rebase." -#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82 +#: builtin/pull.c:452 builtin/pull.c:467 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Specifica il branch in base a cui vuoi effettuare il merge." -#: builtin/pull.c:449 builtin/pull.c:464 +#: builtin/pull.c:453 builtin/pull.c:468 msgid "See git-pull(1) for details." msgstr "Vedi git-pull(1) per ulteriori dettagli." -#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466 -#: builtin/rebase.c:1332 git-parse-remote.sh:64 +#: builtin/pull.c:455 builtin/pull.c:461 builtin/pull.c:470 +#: builtin/rebase.c:1353 git-parse-remote.sh:64 msgid "<remote>" msgstr "<remoto>" -#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471 +#: builtin/pull.c:455 builtin/pull.c:470 builtin/pull.c:475 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<branch>" -#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75 +#: builtin/pull.c:463 builtin/rebase.c:1345 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "Non ci sono informazioni di tracciamento per il branch corrente." -#: builtin/pull.c:468 git-parse-remote.sh:95 +#: builtin/pull.c:472 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" "Se vuoi impostare le informazioni di tracciamento per questo branch puoi " "farlo con:" -#: builtin/pull.c:473 +#: builtin/pull.c:477 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -16838,32 +16919,32 @@ msgstr "" "il merge con il riferimento '%s' del remoto, ma un tale\n" "riferimento non è stato recuperato." -#: builtin/pull.c:581 +#: builtin/pull.c:587 #, c-format msgid "unable to access commit %s" msgstr "impossibile accedere al commit %s" -#: builtin/pull.c:861 +#: builtin/pull.c:867 msgid "ignoring --verify-signatures for rebase" msgstr "ignoro --verify-signature per il rebase" -#: builtin/pull.c:916 +#: builtin/pull.c:922 msgid "--[no-]autostash option is only valid with --rebase." msgstr "l'opzione --[no-]autostash option è valida solo con --rebase." -#: builtin/pull.c:924 +#: builtin/pull.c:930 msgid "Updating an unborn branch with changes added to the index." msgstr "Aggiorno un branch non nato con le modifiche aggiunte all'indice." -#: builtin/pull.c:928 +#: builtin/pull.c:934 msgid "pull with rebase" msgstr "pull con rebase" -#: builtin/pull.c:929 +#: builtin/pull.c:935 msgid "please commit or stash them." msgstr "eseguine il commit o lo stash." -#: builtin/pull.c:954 +#: builtin/pull.c:960 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -16875,7 +16956,7 @@ msgstr "" "Eseguo il fast forward dell'albero\n" "di lavoro dal commit %s." -#: builtin/pull.c:960 +#: builtin/pull.c:966 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -16894,15 +16975,15 @@ msgstr "" "$ git reset --hard\n" "per eseguire il ripristino." -#: builtin/pull.c:975 +#: builtin/pull.c:981 msgid "Cannot merge multiple branches into empty head." msgstr "Impossibile eseguire il merge di più branch in un head vuoto." -#: builtin/pull.c:979 +#: builtin/pull.c:985 msgid "Cannot rebase onto multiple branches." msgstr "Impossibile eseguire il rebase su più branch." -#: builtin/pull.c:986 +#: builtin/pull.c:992 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "impossibile eseguire il rebase se ci sono delle modifiche registrate " @@ -17073,137 +17154,137 @@ msgstr "" msgid "Pushing to %s\n" msgstr "Push su %s in corso\n" -#: builtin/push.c:364 +#: builtin/push.c:366 #, c-format msgid "failed to push some refs to '%s'" msgstr "push di alcuni riferimenti su '%s' non riuscito" -#: builtin/push.c:398 -#, c-format -msgid "bad repository '%s'" -msgstr "repository '%s' errato" - -#: builtin/push.c:399 -msgid "" -"No configured push destination.\n" -"Either specify the URL from the command-line or configure a remote " -"repository using\n" -"\n" -" git remote add <name> <url>\n" -"\n" -"and then push using the remote name\n" -"\n" -" git push <name>\n" -msgstr "" -"Nessuna destinazione per il push configurata.\n" -"Specifica un URL dalla riga di comando oppure configurare un repository " -"remoto usando\n" -"\n" -" git remote add <nome> <url>\n" -"\n" -"e poi eseguire il push usando il nome del remote\n" -"\n" -" git push <nome>\n" - -#: builtin/push.c:554 +#: builtin/push.c:541 msgid "repository" msgstr "repository" -#: builtin/push.c:555 builtin/send-pack.c:164 +#: builtin/push.c:542 builtin/send-pack.c:164 msgid "push all refs" msgstr "esegui il push di tutti i riferimenti" -#: builtin/push.c:556 builtin/send-pack.c:166 +#: builtin/push.c:543 builtin/send-pack.c:166 msgid "mirror all refs" msgstr "esegui il mirror di tutti i riferimenti" -#: builtin/push.c:558 +#: builtin/push.c:545 msgid "delete refs" msgstr "elimina riferimenti" -#: builtin/push.c:559 +#: builtin/push.c:546 msgid "push tags (can't be used with --all or --mirror)" msgstr "esegui il push dei tag (non può essere usato con --all o --mirror)" -#: builtin/push.c:562 builtin/send-pack.c:167 +#: builtin/push.c:549 builtin/send-pack.c:167 msgid "force updates" msgstr "forza gli aggiornamenti" -#: builtin/push.c:564 builtin/send-pack.c:181 +#: builtin/push.c:551 builtin/send-pack.c:181 msgid "<refname>:<expect>" msgstr "<nome riferimento>:<valore atteso>" -#: builtin/push.c:565 builtin/send-pack.c:182 +#: builtin/push.c:552 builtin/send-pack.c:182 msgid "require old value of ref to be at this value" msgstr "" "richiedi che il vecchio valore del riferimento corrisponda a questo valore" -#: builtin/push.c:568 +#: builtin/push.c:555 msgid "control recursive pushing of submodules" msgstr "controlla il push ricorsivo dei sottomoduli" -#: builtin/push.c:570 builtin/send-pack.c:175 +#: builtin/push.c:557 builtin/send-pack.c:175 msgid "use thin pack" msgstr "usa un thin pack" -#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161 +#: builtin/push.c:558 builtin/push.c:559 builtin/send-pack.c:161 #: builtin/send-pack.c:162 msgid "receive pack program" msgstr "programma ricezione pack" -#: builtin/push.c:573 +#: builtin/push.c:560 msgid "set upstream for git pull/status" msgstr "imposta l'upstream per git pull/status" -#: builtin/push.c:576 +#: builtin/push.c:563 msgid "prune locally removed refs" msgstr "elimina i riferimenti rimossi localmente" -#: builtin/push.c:578 +#: builtin/push.c:565 msgid "bypass pre-push hook" msgstr "ignora l'hook pre-push" -#: builtin/push.c:579 +#: builtin/push.c:566 msgid "push missing but relevant tags" msgstr "esegui il push dei tag mancanti ma rilevanti" -#: builtin/push.c:582 builtin/send-pack.c:169 +#: builtin/push.c:569 builtin/send-pack.c:169 msgid "GPG sign the push" msgstr "firma il push con GPG" -#: builtin/push.c:584 builtin/send-pack.c:176 +#: builtin/push.c:571 builtin/send-pack.c:176 msgid "request atomic transaction on remote side" msgstr "richiedi l'atomicità della transazione al remoto" -#: builtin/push.c:602 +#: builtin/push.c:589 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete non è compatibile con --all, --mirror e --tags" -#: builtin/push.c:604 +#: builtin/push.c:591 msgid "--delete doesn't make sense without any refs" msgstr "--delete non ha senso senza alcun ref" -#: builtin/push.c:607 +#: builtin/push.c:611 +#, c-format +msgid "bad repository '%s'" +msgstr "repository '%s' errato" + +#: builtin/push.c:612 +msgid "" +"No configured push destination.\n" +"Either specify the URL from the command-line or configure a remote " +"repository using\n" +"\n" +" git remote add <name> <url>\n" +"\n" +"and then push using the remote name\n" +"\n" +" git push <name>\n" +msgstr "" +"Nessuna destinazione per il push configurata.\n" +"Specifica un URL dalla riga di comando oppure configurare un repository " +"remoto usando\n" +"\n" +" git remote add <nome> <url>\n" +"\n" +"e poi eseguire il push usando il nome del remote\n" +"\n" +" git push <nome>\n" + +#: builtin/push.c:627 msgid "--all and --tags are incompatible" msgstr "--all e --tags non sono compatibili" -#: builtin/push.c:609 +#: builtin/push.c:629 msgid "--all can't be combined with refspecs" msgstr "--all non può essere combinato con degli specificatori riferimento" -#: builtin/push.c:613 +#: builtin/push.c:633 msgid "--mirror and --tags are incompatible" msgstr "--mirror e --tags non sono compatibili" -#: builtin/push.c:615 +#: builtin/push.c:635 msgid "--mirror can't be combined with refspecs" msgstr "--mirror non può essere combinato con degli specificatori riferimento" -#: builtin/push.c:618 +#: builtin/push.c:638 msgid "--all and --mirror are incompatible" msgstr "--all e --mirror non sono compatibili" -#: builtin/push.c:637 +#: builtin/push.c:642 msgid "push options must not have new line characters" msgstr "le opzioni push non devono avere caratteri di fine riga" @@ -17326,11 +17407,11 @@ msgstr "non visualizzare i messaggi di feedback" #: builtin/rebase.c:32 msgid "" -"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] " -"[<branch>]" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " +"[<upstream> [<branch>]]" msgstr "" -"git rebase [-i] [options] [--exec <comando>] [--onto <nuova base>] " -"[<upstream>] [<branch>]" +"git rebase [-i] [opzioni] [--exec <comando>] [--onto <nuova base> |" +" --keep-base] [<upstream> [<branch>]]" #: builtin/rebase.c:34 msgid "" @@ -17370,190 +17451,190 @@ msgstr "impossibile contrassegnare come interattivo" msgid "could not generate todo list" msgstr "impossibile generare l'elenco todo" -#: builtin/rebase.c:382 +#: builtin/rebase.c:383 msgid "a base commit must be provided with --upstream or --onto" msgstr "" "le opzioni --upstream o --onto richiedono che sia fornito un commit di base" -#: builtin/rebase.c:437 +#: builtin/rebase.c:438 msgid "git rebase--interactive [<options>]" msgstr "git rebase --interactive [<opzioni>]" -#: builtin/rebase.c:449 +#: builtin/rebase.c:450 msgid "keep empty commits" msgstr "mantieni i commit vuoti" -#: builtin/rebase.c:451 builtin/revert.c:128 +#: builtin/rebase.c:452 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "consenti commit con messaggi vuoti" -#: builtin/rebase.c:452 +#: builtin/rebase.c:453 msgid "rebase merge commits" msgstr "esegui il rebase dei commit di merge" -#: builtin/rebase.c:454 +#: builtin/rebase.c:455 msgid "keep original branch points of cousins" msgstr "mantieni i punti di branch originali dei cugini" -#: builtin/rebase.c:456 +#: builtin/rebase.c:457 msgid "move commits that begin with squash!/fixup!" msgstr "sposta i commit che iniziano con squash!/fixup!" -#: builtin/rebase.c:457 +#: builtin/rebase.c:458 msgid "sign commits" msgstr "firma i commit" -#: builtin/rebase.c:459 builtin/rebase.c:1403 +#: builtin/rebase.c:460 builtin/rebase.c:1427 msgid "display a diffstat of what changed upstream" msgstr "visualizza un diffstat delle modifiche upstream" -#: builtin/rebase.c:461 +#: builtin/rebase.c:462 msgid "continue rebase" msgstr "continua il rebase" -#: builtin/rebase.c:463 +#: builtin/rebase.c:464 msgid "skip commit" msgstr "salta il commit" -#: builtin/rebase.c:464 +#: builtin/rebase.c:465 msgid "edit the todo list" msgstr "modifica l'elenco todo" -#: builtin/rebase.c:466 +#: builtin/rebase.c:467 msgid "show the current patch" msgstr "visualizza la patch corrente" -#: builtin/rebase.c:469 +#: builtin/rebase.c:470 msgid "shorten commit ids in the todo list" msgstr "abbrevia gli ID dei commit nell'elenco todo" -#: builtin/rebase.c:471 +#: builtin/rebase.c:472 msgid "expand commit ids in the todo list" msgstr "espandi gli ID dei commit nell'elenco todo" -#: builtin/rebase.c:473 +#: builtin/rebase.c:474 msgid "check the todo list" msgstr "controlla l'elenco todo" -#: builtin/rebase.c:475 +#: builtin/rebase.c:476 msgid "rearrange fixup/squash lines" msgstr "ridisponi le righe fixup/squash" -#: builtin/rebase.c:477 +#: builtin/rebase.c:478 msgid "insert exec commands in todo list" msgstr "inserisci i comandi exec nell'elenco todo" -#: builtin/rebase.c:478 +#: builtin/rebase.c:479 msgid "onto" msgstr "su" -#: builtin/rebase.c:481 +#: builtin/rebase.c:482 msgid "restrict-revision" msgstr "revisioni-limite" -#: builtin/rebase.c:481 +#: builtin/rebase.c:482 msgid "restrict revision" msgstr "limita la revisione" -#: builtin/rebase.c:483 +#: builtin/rebase.c:484 msgid "squash-onto" msgstr "squash-su" -#: builtin/rebase.c:484 +#: builtin/rebase.c:485 msgid "squash onto" msgstr "esegui lo squash su" -#: builtin/rebase.c:486 +#: builtin/rebase.c:487 msgid "the upstream commit" msgstr "il commit upstream" -#: builtin/rebase.c:488 +#: builtin/rebase.c:489 msgid "head-name" msgstr "nome head" -#: builtin/rebase.c:488 +#: builtin/rebase.c:489 msgid "head name" msgstr "nome head" -#: builtin/rebase.c:493 +#: builtin/rebase.c:494 msgid "rebase strategy" msgstr "strategia di rebase" -#: builtin/rebase.c:494 +#: builtin/rebase.c:495 msgid "strategy-opts" msgstr "opzioni strategia" -#: builtin/rebase.c:495 +#: builtin/rebase.c:496 msgid "strategy options" msgstr "opzioni strategia" -#: builtin/rebase.c:496 +#: builtin/rebase.c:497 msgid "switch-to" msgstr "passa a" -#: builtin/rebase.c:497 +#: builtin/rebase.c:498 msgid "the branch or commit to checkout" msgstr "il branch o il commit di cui eseguire il checkout" -#: builtin/rebase.c:498 +#: builtin/rebase.c:499 msgid "onto-name" msgstr "nome" -#: builtin/rebase.c:498 +#: builtin/rebase.c:499 msgid "onto name" msgstr "sul nome" -#: builtin/rebase.c:499 +#: builtin/rebase.c:500 msgid "cmd" msgstr "comando" -#: builtin/rebase.c:499 +#: builtin/rebase.c:500 msgid "the command to run" msgstr "il comando da eseguire" -#: builtin/rebase.c:502 builtin/rebase.c:1486 +#: builtin/rebase.c:503 builtin/rebase.c:1510 msgid "automatically re-schedule any `exec` that fails" msgstr "schedula nuovamente le operazioni `exec` non riuscite automaticamente" -#: builtin/rebase.c:518 +#: builtin/rebase.c:519 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "--[no-]rebase-cousins non ha effetto senza --rebase-merges" -#: builtin/rebase.c:534 +#: builtin/rebase.c:535 #, c-format msgid "%s requires an interactive rebase" msgstr "%s richiede un rebase interattivo" -#: builtin/rebase.c:586 +#: builtin/rebase.c:587 #, c-format msgid "could not get 'onto': '%s'" msgstr "impossibile ottenere 'onto': '%s'" -#: builtin/rebase.c:601 +#: builtin/rebase.c:602 #, c-format msgid "invalid orig-head: '%s'" msgstr "orig-head non valida: '%s'" -#: builtin/rebase.c:626 +#: builtin/rebase.c:627 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "ignoro il valore non valido per allow_rerere_autoupdate: '%s'" -#: builtin/rebase.c:702 +#: builtin/rebase.c:703 #, c-format msgid "Could not read '%s'" msgstr "Impossibile leggere '%s'" -#: builtin/rebase.c:720 +#: builtin/rebase.c:721 #, c-format msgid "Cannot store %s" msgstr "Impossibile memorizzare %s" -#: builtin/rebase.c:827 +#: builtin/rebase.c:828 msgid "could not determine HEAD revision" msgstr "impossibile determinare la revisione HEAD" -#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:951 git-rebase--preserve-merges.sh:81 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -17569,7 +17650,7 @@ msgstr "" "Per interrompere l'operazione e tornare allo stato precedente\n" "il \"git rebase\", esegui \"git rebase --abort\"." -#: builtin/rebase.c:1031 +#: builtin/rebase.c:1032 #, c-format msgid "" "\n" @@ -17588,7 +17669,7 @@ msgstr "" "\n" "Di conseguenza, Git non può eseguirne il rebase." -#: builtin/rebase.c:1318 +#: builtin/rebase.c:1339 #, c-format msgid "" "%s\n" @@ -17605,7 +17686,7 @@ msgstr "" " git rebase '<branch>'\n" "\n" -#: builtin/rebase.c:1334 +#: builtin/rebase.c:1355 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -17619,131 +17700,135 @@ msgstr "" " git branch --set-upstream-to=%s/<branch> %s\n" "\n" -#: builtin/rebase.c:1364 +#: builtin/rebase.c:1385 msgid "exec commands cannot contain newlines" msgstr "i comandi exec non possono contenere caratteri di fine riga" -#: builtin/rebase.c:1368 +#: builtin/rebase.c:1389 msgid "empty exec command" msgstr "comando exec vuoto" -#: builtin/rebase.c:1396 +#: builtin/rebase.c:1418 msgid "rebase onto given branch instead of upstream" msgstr "esegui il rebase sul branch specificato anziché su quello upstream" -#: builtin/rebase.c:1398 +#: builtin/rebase.c:1420 +msgid "use the merge-base of upstream and branch as the current base" +msgstr "usa la base del merge dell'upstream e del branch come base corrente" + +#: builtin/rebase.c:1422 msgid "allow pre-rebase hook to run" msgstr "consenti l'esecuzione dell'hook pre-rebase" -#: builtin/rebase.c:1400 +#: builtin/rebase.c:1424 msgid "be quiet. implies --no-stat" msgstr "sii silenzioso. implica --no-stat" -#: builtin/rebase.c:1406 +#: builtin/rebase.c:1430 msgid "do not show diffstat of what changed upstream" msgstr "non visualizzare un diffstat delle modifiche upstream" -#: builtin/rebase.c:1409 +#: builtin/rebase.c:1433 msgid "add a Signed-off-by: line to each commit" msgstr "aggiungi una riga Signed-off-by: a ogni commit" -#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417 +#: builtin/rebase.c:1435 builtin/rebase.c:1439 builtin/rebase.c:1441 msgid "passed to 'git am'" msgstr "passato a 'git am'" -#: builtin/rebase.c:1419 builtin/rebase.c:1421 +#: builtin/rebase.c:1443 builtin/rebase.c:1445 msgid "passed to 'git apply'" msgstr "passato a 'git apply'" -#: builtin/rebase.c:1423 builtin/rebase.c:1426 +#: builtin/rebase.c:1447 builtin/rebase.c:1450 msgid "cherry-pick all commits, even if unchanged" msgstr "esegui il cherry-pick di tutti i commit, anche se non modificati" -#: builtin/rebase.c:1428 +#: builtin/rebase.c:1452 msgid "continue" msgstr "continua" -#: builtin/rebase.c:1431 +#: builtin/rebase.c:1455 msgid "skip current patch and continue" msgstr "salta la patch corrente e continua" -#: builtin/rebase.c:1433 +#: builtin/rebase.c:1457 msgid "abort and check out the original branch" msgstr "interrompi ed esegui il checkout del branch originario" -#: builtin/rebase.c:1436 +#: builtin/rebase.c:1460 msgid "abort but keep HEAD where it is" msgstr "interrompi ma mantieni l'HEAD dov'è" -#: builtin/rebase.c:1437 +#: builtin/rebase.c:1461 msgid "edit the todo list during an interactive rebase" msgstr "modifica l'elenco todo durante un rebase interattivo" -#: builtin/rebase.c:1440 +#: builtin/rebase.c:1464 msgid "show the patch file being applied or merged" msgstr "" "visualizza il file patch che sta per essere applicato o sottoposto a merge" -#: builtin/rebase.c:1443 +#: builtin/rebase.c:1467 msgid "use merging strategies to rebase" msgstr "usa le strategie di merge per eseguire il rebase" -#: builtin/rebase.c:1447 +#: builtin/rebase.c:1471 msgid "let the user edit the list of commits to rebase" msgstr "" "consenti all'utente di modificare l'elenco dei commit di cui eseguire il " "rebase" -#: builtin/rebase.c:1451 +#: builtin/rebase.c:1475 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "(DEPRECATO) prova a ricreare i merge anziché ignorarli" -#: builtin/rebase.c:1455 +#: builtin/rebase.c:1479 msgid "preserve empty commits during rebase" msgstr "mantieni i commit vuoti durante il rebase" -#: builtin/rebase.c:1457 +#: builtin/rebase.c:1481 msgid "move commits that begin with squash!/fixup! under -i" msgstr "sposta i commit che iniziano con squash!/fixup! in -i" -#: builtin/rebase.c:1463 +#: builtin/rebase.c:1487 msgid "automatically stash/stash pop before and after" msgstr "esegui stash/stash pop automaticamente prima e dopo" -#: builtin/rebase.c:1465 +#: builtin/rebase.c:1489 msgid "add exec lines after each commit of the editable list" msgstr "aggiungi righe exec dopo ogni commit della lista modificabile" -#: builtin/rebase.c:1469 +#: builtin/rebase.c:1493 msgid "allow rebasing commits with empty messages" msgstr "consenti il rebase di commit con messaggi vuoti" -#: builtin/rebase.c:1472 +#: builtin/rebase.c:1496 msgid "try to rebase merges instead of skipping them" msgstr "prova ad eseguire il rebase dei merge anziché saltarli" -#: builtin/rebase.c:1475 +#: builtin/rebase.c:1499 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "" "usa 'merge-base --fork-point' per ridefinire più precisamente l'upstream" -#: builtin/rebase.c:1477 +#: builtin/rebase.c:1501 msgid "use the given merge strategy" msgstr "usa la strategia di merge specificata" -#: builtin/rebase.c:1479 builtin/revert.c:115 +#: builtin/rebase.c:1503 builtin/revert.c:115 msgid "option" msgstr "opzione" -#: builtin/rebase.c:1480 +#: builtin/rebase.c:1504 msgid "pass the argument through to the merge strategy" msgstr "passa l'argomento alla strategia di merge" -#: builtin/rebase.c:1483 +#: builtin/rebase.c:1507 msgid "rebase all reachable commits up to the root(s)" msgstr "esegui il rebase di tutti i commit raggiungibili fino a quelli radice" -#: builtin/rebase.c:1500 +#: builtin/rebase.c:1524 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -17751,29 +17836,37 @@ msgstr "" "il supporto per rebase.useBuiltin è stato rimosso!\n" "Vedi la voce relativa in 'git help config' per i dettagli." -#: builtin/rebase.c:1506 +#: builtin/rebase.c:1530 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "Sembra che 'git am' sia in corso. Impossibile eseguire il rebase." -#: builtin/rebase.c:1547 +#: builtin/rebase.c:1571 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "git rebase --preserve-merges è deprecato. Usa --rebase-merges." -#: builtin/rebase.c:1551 +#: builtin/rebase.c:1576 +msgid "cannot combine '--keep-base' with '--onto'" +msgstr "impossibile combinare '--keep-base' con '--onto'" + +#: builtin/rebase.c:1578 +msgid "cannot combine '--keep-base' with '--root'" +msgstr "impossibile combinare '--keep-base' con '--root'" + +#: builtin/rebase.c:1582 msgid "No rebase in progress?" msgstr "Nessun rebase in corso?" -#: builtin/rebase.c:1555 +#: builtin/rebase.c:1586 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "L'azione --edit-todo può essere usata solo durante un rebase interattivo." -#: builtin/rebase.c:1578 +#: builtin/rebase.c:1609 msgid "Cannot read HEAD" msgstr "Impossibile leggere l'HEAD" -#: builtin/rebase.c:1590 +#: builtin/rebase.c:1621 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -17782,16 +17875,16 @@ msgstr "" "quindi contrassegnarli come risolti usando\n" "git add" -#: builtin/rebase.c:1609 +#: builtin/rebase.c:1640 msgid "could not discard worktree changes" msgstr "impossibile scartare le modifiche all'albero di lavoro" -#: builtin/rebase.c:1628 +#: builtin/rebase.c:1659 #, c-format msgid "could not move back to %s" msgstr "impossibile ritornare a %s" -#: builtin/rebase.c:1673 +#: builtin/rebase.c:1704 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -17812,166 +17905,159 @@ msgstr "" "ed eseguimi di nuovo. Mi fermo nel caso in cui tu abbia ancora\n" "salvato qualcosa di importante lì.\n" -#: builtin/rebase.c:1694 +#: builtin/rebase.c:1725 msgid "switch `C' expects a numerical value" msgstr "l'opzione `C` richiede un valore numerico" -#: builtin/rebase.c:1735 +#: builtin/rebase.c:1766 #, c-format msgid "Unknown mode: %s" msgstr "Modo sconosciuto: %s" -#: builtin/rebase.c:1757 +#: builtin/rebase.c:1788 msgid "--strategy requires --merge or --interactive" msgstr "--strategy richiede --merge o --interactive" -#: builtin/rebase.c:1797 +#: builtin/rebase.c:1828 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec richiede --exec o --interactive" -#: builtin/rebase.c:1809 +#: builtin/rebase.c:1840 msgid "cannot combine am options with either interactive or merge options" msgstr "non è possibile combinare le opzioni am con quelle interactive o merge" -#: builtin/rebase.c:1828 +#: builtin/rebase.c:1859 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "impossibile combinare '--preserve-merges' con '--rebase-merges'" -#: builtin/rebase.c:1832 +#: builtin/rebase.c:1863 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" "errore: impossibile combinare '--preserve-merges' con '--reschedule-failed-" "exec'" -#: builtin/rebase.c:1838 -msgid "cannot combine '--rebase-merges' with '--strategy-option'" -msgstr "impossibile combinare '--rebase-merges' con '--strategy-option'" - -#: builtin/rebase.c:1841 -msgid "cannot combine '--rebase-merges' with '--strategy'" -msgstr "impossibile combinare '--rebase-merges' con '--strategy'" - -#: builtin/rebase.c:1865 +#: builtin/rebase.c:1887 #, c-format msgid "invalid upstream '%s'" msgstr "upstream non valido: '%s'" -#: builtin/rebase.c:1871 +#: builtin/rebase.c:1893 msgid "Could not create new root commit" msgstr "Impossibile creare il nuovo commit radice" -#: builtin/rebase.c:1889 +#: builtin/rebase.c:1919 +#, c-format +msgid "'%s': need exactly one merge base with branch" +msgstr "" +"'%s': è necessario specificare esattamente una base per il merge con il branch" + +#: builtin/rebase.c:1922 #, c-format msgid "'%s': need exactly one merge base" msgstr "'%s': è necessario specificare esattamente una base per il merge" -#: builtin/rebase.c:1896 +#: builtin/rebase.c:1930 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "'%s' non punta a un commit valido" -#: builtin/rebase.c:1921 +#: builtin/rebase.c:1955 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "errore fatale: branch/commit '%s' inesistente" -#: builtin/rebase.c:1929 builtin/submodule--helper.c:38 +#: builtin/rebase.c:1963 builtin/submodule--helper.c:38 #: builtin/submodule--helper.c:1934 #, c-format msgid "No such ref: %s" msgstr "Riferimento non esistente: %s" -#: builtin/rebase.c:1940 +#: builtin/rebase.c:1974 msgid "Could not resolve HEAD to a revision" msgstr "Impossibile risolvere HEAD come revisione" -#: builtin/rebase.c:1981 +#: builtin/rebase.c:2012 msgid "Cannot autostash" msgstr "Impossibile eseguire lo stash automatico" -#: builtin/rebase.c:1984 +#: builtin/rebase.c:2015 #, c-format msgid "Unexpected stash response: '%s'" msgstr "Risposta stash non attesa: '%s'" -#: builtin/rebase.c:1990 +#: builtin/rebase.c:2021 #, c-format msgid "Could not create directory for '%s'" msgstr "Impossibile creare la directory '%s'" -#: builtin/rebase.c:1993 +#: builtin/rebase.c:2024 #, c-format msgid "Created autostash: %s\n" msgstr "Stash automatico creato: %s\n" -#: builtin/rebase.c:1996 +#: builtin/rebase.c:2027 msgid "could not reset --hard" msgstr "impossibile eseguire reset --hard" -#: builtin/rebase.c:1997 builtin/reset.c:114 -#, c-format -msgid "HEAD is now at %s" -msgstr "HEAD ora si trova a %s" - -#: builtin/rebase.c:2013 +#: builtin/rebase.c:2036 msgid "Please commit or stash them." msgstr "Eseguine il commit o lo stash." -#: builtin/rebase.c:2040 +#: builtin/rebase.c:2063 #, c-format msgid "could not parse '%s'" msgstr "impossibile analizzare '%s'" -#: builtin/rebase.c:2053 +#: builtin/rebase.c:2076 #, c-format msgid "could not switch to %s" msgstr "impossibile passare a %s" -#: builtin/rebase.c:2064 +#: builtin/rebase.c:2087 msgid "HEAD is up to date." msgstr "HEAD è aggiornato." -#: builtin/rebase.c:2066 +#: builtin/rebase.c:2089 #, c-format msgid "Current branch %s is up to date.\n" msgstr "Il branch corrente %s è aggiornato.\n" -#: builtin/rebase.c:2074 +#: builtin/rebase.c:2097 msgid "HEAD is up to date, rebase forced." msgstr "HEAD è aggiornato, forzo il rebase." -#: builtin/rebase.c:2076 +#: builtin/rebase.c:2099 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "Il branch corrente %s è aggiornato, forzo il rebase.\n" -#: builtin/rebase.c:2084 +#: builtin/rebase.c:2107 msgid "The pre-rebase hook refused to rebase." msgstr "L'hook pre-rebase ha rifiutato di consentire il rebase." -#: builtin/rebase.c:2091 +#: builtin/rebase.c:2114 #, c-format msgid "Changes to %s:\n" msgstr "Modifiche a %s:\n" -#: builtin/rebase.c:2094 +#: builtin/rebase.c:2117 #, c-format msgid "Changes from %s to %s:\n" msgstr "Modifiche da %s a %s:\n" -#: builtin/rebase.c:2119 +#: builtin/rebase.c:2142 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" "Per prima cosa, ripristino l'head per riapplicare le tue modifiche su di " "esso...\n" -#: builtin/rebase.c:2128 +#: builtin/rebase.c:2151 msgid "Could not detach HEAD" msgstr "Impossibile scollegare l'HEAD" -#: builtin/rebase.c:2137 +#: builtin/rebase.c:2160 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Fast forward da %s a %s eseguito.\n" @@ -17980,7 +18066,7 @@ msgstr "Fast forward da %s a %s eseguito.\n" msgid "git receive-pack <git-dir>" msgstr "git receive-pack <directory Git>" -#: builtin/receive-pack.c:832 +#: builtin/receive-pack.c:830 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" @@ -18013,7 +18099,7 @@ msgstr "" "il comportamento predefinito, imposta la variabile di\n" "configurazione 'receive.denyCurrentBranch' a 'refuse'." -#: builtin/receive-pack.c:852 +#: builtin/receive-pack.c:850 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" @@ -18036,11 +18122,11 @@ msgstr "" "Per non visualizzare più questo messaggio, puoi impostarla a\n" "'refuse'." -#: builtin/receive-pack.c:1938 +#: builtin/receive-pack.c:1936 msgid "quiet" msgstr "non visualizzare messaggi" -#: builtin/receive-pack.c:1952 +#: builtin/receive-pack.c:1950 msgid "You must specify a directory." msgstr "Devi specificare una directory." @@ -18622,11 +18708,11 @@ msgstr "" msgid "Unknown subcommand: %s" msgstr "Sottocomando sconosciuto: %s" -#: builtin/repack.c:22 +#: builtin/repack.c:23 msgid "git repack [<options>]" msgstr "git repack [<opzioni>]" -#: builtin/repack.c:27 +#: builtin/repack.c:28 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -18635,118 +18721,118 @@ msgstr "" "Usa --no-write-bitmap-index o disabilita l'opzione di configurazione\n" "pack.writebitmaps." -#: builtin/repack.c:190 +#: builtin/repack.c:191 msgid "could not start pack-objects to repack promisor objects" msgstr "" "impossibile avviare pack-objects per eseguire il repack degli oggetti " "promettenti" -#: builtin/repack.c:229 builtin/repack.c:408 +#: builtin/repack.c:230 builtin/repack.c:409 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" "repack: Da pack-objects mi attendevo solo righe con gli ID completi " "esadecimali degli oggetti." -#: builtin/repack.c:246 +#: builtin/repack.c:247 msgid "could not finish pack-objects to repack promisor objects" msgstr "" "impossibile portare a termine pack-objects per eseguire il repack degli " "oggetti promettenti" -#: builtin/repack.c:284 +#: builtin/repack.c:285 msgid "pack everything in a single pack" msgstr "esegui il pack di tutto in un singolo pack" -#: builtin/repack.c:286 +#: builtin/repack.c:287 msgid "same as -a, and turn unreachable objects loose" msgstr "come -a e rendi sciolti gli oggetti non raggiungibili" -#: builtin/repack.c:289 +#: builtin/repack.c:290 msgid "remove redundant packs, and run git-prune-packed" msgstr "rimuovi i pack ridondanti ed esegui git-prune-packed" -#: builtin/repack.c:291 +#: builtin/repack.c:292 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "fornisci l'opzione --no-reuse-delta a git-pack-objects" -#: builtin/repack.c:293 +#: builtin/repack.c:294 msgid "pass --no-reuse-object to git-pack-objects" msgstr "fornisci l'opzione --no-reuse-object a git-pack-objects" -#: builtin/repack.c:295 +#: builtin/repack.c:296 msgid "do not run git-update-server-info" msgstr "non eseguire git-update-server-info" -#: builtin/repack.c:298 +#: builtin/repack.c:299 msgid "pass --local to git-pack-objects" msgstr "fornisci l'opzione --local a git-pack-objects" -#: builtin/repack.c:300 +#: builtin/repack.c:301 msgid "write bitmap index" msgstr "scrivi l'indice bitmap" -#: builtin/repack.c:302 +#: builtin/repack.c:303 msgid "pass --delta-islands to git-pack-objects" msgstr "fornisci l'opzione --delta-islands a git-pack-objects" -#: builtin/repack.c:303 +#: builtin/repack.c:304 msgid "approxidate" msgstr "data approssimativa" -#: builtin/repack.c:304 +#: builtin/repack.c:305 msgid "with -A, do not loosen objects older than this" msgstr "con -A, non rendere sciolti gli oggetti meno recenti di questa data" -#: builtin/repack.c:306 +#: builtin/repack.c:307 msgid "with -a, repack unreachable objects" msgstr "con -a, esegui il repack degli oggetti non raggiungibili" -#: builtin/repack.c:308 +#: builtin/repack.c:309 msgid "size of the window used for delta compression" msgstr "dimensione della finestra usata per la compressione delta" -#: builtin/repack.c:309 builtin/repack.c:315 +#: builtin/repack.c:310 builtin/repack.c:316 msgid "bytes" msgstr "byte" -#: builtin/repack.c:310 +#: builtin/repack.c:311 msgid "same as the above, but limit memory size instead of entries count" msgstr "" "come sopra, ma limita le dimensioni della memoria invece del numero di voci" -#: builtin/repack.c:312 +#: builtin/repack.c:313 msgid "limits the maximum delta depth" msgstr "limita la profondità massima dei delta" -#: builtin/repack.c:314 +#: builtin/repack.c:315 msgid "limits the maximum number of threads" msgstr "limita il numero massimo di thread" -#: builtin/repack.c:316 +#: builtin/repack.c:317 msgid "maximum size of each packfile" msgstr "dimensione massima di ogni file pack" -#: builtin/repack.c:318 +#: builtin/repack.c:319 msgid "repack objects in packs marked with .keep" msgstr "esegui il repack degli oggetti nei pack contrassegnati con .keep" -#: builtin/repack.c:320 +#: builtin/repack.c:321 msgid "do not repack this pack" msgstr "non eseguire il repack di questo pack" -#: builtin/repack.c:330 +#: builtin/repack.c:331 msgid "cannot delete packs in a precious-objects repo" msgstr "impossibile eliminare i pack in un repository 'oggetti preziosi'" -#: builtin/repack.c:334 +#: builtin/repack.c:335 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable e -A non sono compatibili" -#: builtin/repack.c:417 +#: builtin/repack.c:418 msgid "Nothing new to pack." msgstr "Non ci sono oggetti nuovi di cui eseguire il pack." -#: builtin/repack.c:478 +#: builtin/repack.c:479 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -18766,7 +18852,7 @@ msgstr "" "AVVISO: non è riuscito. Ridenominali manualmente\n" "AVVISO: entro %s:\n" -#: builtin/repack.c:526 +#: builtin/repack.c:527 #, c-format msgid "failed to remove '%s'" msgstr "eliminazione di '%s' non riuscita" @@ -18874,8 +18960,8 @@ msgstr "impossibile eseguire fstat su %s" msgid "unable to write object to database" msgstr "impossibile scrivere l'oggetto nel database" -#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422 -#: builtin/replace.c:452 +#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:423 +#: builtin/replace.c:453 #, c-format msgid "not a valid object name: '%s'" msgstr "nome oggetto non valido: '%s'" @@ -18894,22 +18980,22 @@ msgstr "modifica del file oggetto non riuscita" msgid "new object is the same as the old one: '%s'" msgstr "il nuovo oggetto è lo stesso di quello vecchio: '%s'" -#: builtin/replace.c:383 +#: builtin/replace.c:384 #, c-format msgid "could not parse %s as a commit" msgstr "impossibile analizzare %s come commit" -#: builtin/replace.c:414 +#: builtin/replace.c:415 #, c-format msgid "bad mergetag in commit '%s'" msgstr "tag merge non valido nel commit '%s'" -#: builtin/replace.c:416 +#: builtin/replace.c:417 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "tag merge malformato nel commit '%s'" -#: builtin/replace.c:428 +#: builtin/replace.c:429 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -18918,31 +19004,31 @@ msgstr "" "il commit originario '%s' contiene il tag merge '%s' che è stato scartato; " "usa --edit anziché --graft" -#: builtin/replace.c:467 +#: builtin/replace.c:468 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "il commit originario '%s' ha una firma GPG" -#: builtin/replace.c:468 +#: builtin/replace.c:469 msgid "the signature will be removed in the replacement commit!" msgstr "la firma sarà rimossa nel commit sostitutivo!" -#: builtin/replace.c:478 +#: builtin/replace.c:479 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "impossibile scrivere il commit sostitutivo per '%s'" -#: builtin/replace.c:486 +#: builtin/replace.c:487 #, c-format msgid "graft for '%s' unnecessary" msgstr "graft per '%s' non necessario" -#: builtin/replace.c:490 +#: builtin/replace.c:491 #, c-format msgid "new commit is the same as the old one: '%s'" msgstr "il nuovo commit è lo stesso di quello vecchio: '%s'" -#: builtin/replace.c:525 +#: builtin/replace.c:526 #, c-format msgid "" "could not convert the following graft(s):\n" @@ -18951,71 +19037,71 @@ msgstr "" "impossibile convertire i seguenti graft:\n" "%s" -#: builtin/replace.c:546 +#: builtin/replace.c:547 msgid "list replace refs" msgstr "elenca i riferimenti sostitutivi" -#: builtin/replace.c:547 +#: builtin/replace.c:548 msgid "delete replace refs" msgstr "elimina i riferimenti sostitutivi" -#: builtin/replace.c:548 +#: builtin/replace.c:549 msgid "edit existing object" msgstr "modifica l'oggetto esistente" -#: builtin/replace.c:549 +#: builtin/replace.c:550 msgid "change a commit's parents" msgstr "cambia i genitori di un commit" -#: builtin/replace.c:550 +#: builtin/replace.c:551 msgid "convert existing graft file" msgstr "converti un file graft esistente" -#: builtin/replace.c:551 +#: builtin/replace.c:552 msgid "replace the ref if it exists" msgstr "sostituisci il riferimento se esiste" -#: builtin/replace.c:553 +#: builtin/replace.c:554 msgid "do not pretty-print contents for --edit" msgstr "non stampare i contenuti in un formato leggibile (per --edit)" -#: builtin/replace.c:554 +#: builtin/replace.c:555 msgid "use this format" msgstr "usa questo formato" -#: builtin/replace.c:567 +#: builtin/replace.c:568 msgid "--format cannot be used when not listing" msgstr "--format non può essere usato quando non si elencano voci" -#: builtin/replace.c:575 +#: builtin/replace.c:576 msgid "-f only makes sense when writing a replacement" msgstr "-f ha senso solo se si sta scrivendo un oggetto sostitutivo" -#: builtin/replace.c:579 +#: builtin/replace.c:580 msgid "--raw only makes sense with --edit" msgstr "--raw ha senso solo con --edit" -#: builtin/replace.c:585 +#: builtin/replace.c:586 msgid "-d needs at least one argument" msgstr "-d richiede almeno un argomento" -#: builtin/replace.c:591 +#: builtin/replace.c:592 msgid "bad number of arguments" msgstr "numero di argomenti errato" -#: builtin/replace.c:597 +#: builtin/replace.c:598 msgid "-e needs exactly one argument" msgstr "-e richiede esattamente un argomento" -#: builtin/replace.c:603 +#: builtin/replace.c:604 msgid "-g needs at least one argument" msgstr "-g richiede almeno un argomento" -#: builtin/replace.c:609 +#: builtin/replace.c:610 msgid "--convert-graft-file takes no argument" msgstr "--convert-graft-file non richiede argomenti" -#: builtin/replace.c:615 +#: builtin/replace.c:616 msgid "only one pattern can be given with -l" msgstr "con -l può essere specificato solo un pattern" @@ -19084,13 +19170,18 @@ msgstr "Impossibile trovare l'albero di HEAD." msgid "Failed to find tree of %s." msgstr "Impossibile trovare l'albero di %s." +#: builtin/reset.c:114 +#, c-format +msgid "HEAD is now at %s" +msgstr "HEAD ora si trova a %s" + #: builtin/reset.c:193 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "Impossibile eseguire un %s reset nel corso di un merge." -#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589 -#: builtin/stash.c:613 +#: builtin/reset.c:293 builtin/stash.c:520 builtin/stash.c:595 +#: builtin/stash.c:619 msgid "be quiet, only report errors" msgstr "non visualizzare messaggi, segnala solo gli errori" @@ -19174,24 +19265,19 @@ msgstr "Impossibile ripristinare il file indice alla revisione '%s'." msgid "Could not write new index file." msgstr "Impossibile scrivere il nuovo file indice." -#: builtin/rev-list.c:412 +#: builtin/rev-list.c:411 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "impossibile combinare --exclude-promisor-objects e --missing" -#: builtin/rev-list.c:473 +#: builtin/rev-list.c:472 msgid "object filtering requires --objects" msgstr "il filtraggio oggetti richiede --objects" -#: builtin/rev-list.c:476 -#, c-format -msgid "invalid sparse value '%s'" -msgstr "valore sparse non valido: '%s'" - -#: builtin/rev-list.c:527 +#: builtin/rev-list.c:522 msgid "rev-list does not support display of notes" msgstr "rev-list non supporta la visualizzazione delle note" -#: builtin/rev-list.c:530 +#: builtin/rev-list.c:525 msgid "cannot combine --use-bitmap-index with object filtering" msgstr "impossibile combinare --use-bitmap-index con il filtraggio oggetti" @@ -19742,136 +19828,136 @@ msgstr "ci sono conflitti nell'indice. Prova senza --index." msgid "could not save index tree" msgstr "impossibile salvare l'albero indice" -#: builtin/stash.c:434 +#: builtin/stash.c:436 msgid "could not restore untracked files from stash" msgstr "non è stato possibile ripristinare i file non tracciati dallo stash" -#: builtin/stash.c:448 +#: builtin/stash.c:450 #, c-format msgid "Merging %s with %s" msgstr "Merge di %s con %s in corso" -#: builtin/stash.c:458 git-legacy-stash.sh:680 +#: builtin/stash.c:460 git-legacy-stash.sh:680 msgid "Index was not unstashed." msgstr "L'indice non è stato rimosso dallo stash." -#: builtin/stash.c:516 builtin/stash.c:615 +#: builtin/stash.c:522 builtin/stash.c:621 msgid "attempt to recreate the index" msgstr "tenta di ricreare l'indice" -#: builtin/stash.c:549 +#: builtin/stash.c:555 #, c-format msgid "Dropped %s (%s)" msgstr "Ho scartato %s (%s)" -#: builtin/stash.c:552 +#: builtin/stash.c:558 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s: Impossibile scartare la voce di stash" -#: builtin/stash.c:577 +#: builtin/stash.c:583 #, c-format msgid "'%s' is not a stash reference" msgstr "'%s' non è un riferimento stash" -#: builtin/stash.c:627 git-legacy-stash.sh:694 +#: builtin/stash.c:633 git-legacy-stash.sh:694 msgid "The stash entry is kept in case you need it again." msgstr "" "La voce di stash è mantenuta nel caso in cui tu ne abbia nuovamente bisogno." -#: builtin/stash.c:650 git-legacy-stash.sh:712 +#: builtin/stash.c:656 git-legacy-stash.sh:712 msgid "No branch name specified" msgstr "Nome del branch non specificato" -#: builtin/stash.c:790 builtin/stash.c:827 +#: builtin/stash.c:796 builtin/stash.c:833 #, c-format msgid "Cannot update %s with %s" msgstr "Impossibile aggiornare %s con %s" -#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497 +#: builtin/stash.c:814 builtin/stash.c:1470 builtin/stash.c:1506 msgid "stash message" msgstr "messaggio di stash" -#: builtin/stash.c:818 +#: builtin/stash.c:824 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" richiede un argomento <commit>" -#: builtin/stash.c:1040 git-legacy-stash.sh:217 +#: builtin/stash.c:1046 git-legacy-stash.sh:217 msgid "No changes selected" msgstr "Nessuna modifica selezionata" -#: builtin/stash.c:1136 git-legacy-stash.sh:150 +#: builtin/stash.c:1145 git-legacy-stash.sh:150 msgid "You do not have the initial commit yet" msgstr "Non hai ancora un commit iniziale" -#: builtin/stash.c:1163 git-legacy-stash.sh:165 +#: builtin/stash.c:1172 git-legacy-stash.sh:165 msgid "Cannot save the current index state" msgstr "Impossibile salvare lo stato corrente di index" -#: builtin/stash.c:1172 git-legacy-stash.sh:180 +#: builtin/stash.c:1181 git-legacy-stash.sh:180 msgid "Cannot save the untracked files" msgstr "Impossibile salvare i file non tracciati" -#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200 +#: builtin/stash.c:1192 builtin/stash.c:1201 git-legacy-stash.sh:200 #: git-legacy-stash.sh:213 msgid "Cannot save the current worktree state" msgstr "Impossibile salvare lo stato corrente dell'albero di lavoro" -#: builtin/stash.c:1220 git-legacy-stash.sh:233 +#: builtin/stash.c:1229 git-legacy-stash.sh:233 msgid "Cannot record working tree state" msgstr "Impossibile registrare lo stato dell'albero di lavoro" -#: builtin/stash.c:1269 git-legacy-stash.sh:337 +#: builtin/stash.c:1278 git-legacy-stash.sh:337 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "" "Impossibile usare --patch e --include-untracked o --all allo stesso tempo" -#: builtin/stash.c:1285 +#: builtin/stash.c:1294 msgid "Did you forget to 'git add'?" msgstr "Ti sei scordato di eseguire 'git add'?" -#: builtin/stash.c:1300 git-legacy-stash.sh:345 +#: builtin/stash.c:1309 git-legacy-stash.sh:345 msgid "No local changes to save" msgstr "Nessuna modifica locale da salvare" -#: builtin/stash.c:1307 git-legacy-stash.sh:350 +#: builtin/stash.c:1316 git-legacy-stash.sh:350 msgid "Cannot initialize stash" msgstr "Impossibile inizializzare stash" -#: builtin/stash.c:1322 git-legacy-stash.sh:354 +#: builtin/stash.c:1331 git-legacy-stash.sh:354 msgid "Cannot save the current status" msgstr "Impossibile salvare lo stato attuale" -#: builtin/stash.c:1327 +#: builtin/stash.c:1336 #, c-format msgid "Saved working directory and index state %s" msgstr "Directory di lavoro e stato indice salvati: %s" -#: builtin/stash.c:1417 git-legacy-stash.sh:384 +#: builtin/stash.c:1426 git-legacy-stash.sh:384 msgid "Cannot remove worktree changes" msgstr "Impossibile rimuovere le modifiche all'albero di lavoro" -#: builtin/stash.c:1452 builtin/stash.c:1488 +#: builtin/stash.c:1461 builtin/stash.c:1497 msgid "keep index" msgstr "mantieni l'indice" -#: builtin/stash.c:1454 builtin/stash.c:1490 +#: builtin/stash.c:1463 builtin/stash.c:1499 msgid "stash in patch mode" msgstr "esegui lo stash in modalità patch" -#: builtin/stash.c:1455 builtin/stash.c:1491 +#: builtin/stash.c:1464 builtin/stash.c:1500 msgid "quiet mode" msgstr "modalità silenziosa" -#: builtin/stash.c:1457 builtin/stash.c:1493 +#: builtin/stash.c:1466 builtin/stash.c:1502 msgid "include untracked files in stash" msgstr "includi i file non tracciati nello stash" -#: builtin/stash.c:1459 builtin/stash.c:1495 +#: builtin/stash.c:1468 builtin/stash.c:1504 msgid "include ignore files" msgstr "includi i file ignorati" -#: builtin/stash.c:1555 +#: builtin/stash.c:1564 #, c-format msgid "could not exec %s" msgstr "impossibile eseguire %s" @@ -20250,9 +20336,9 @@ msgid "don't print cloning progress" msgstr "non stampare l'indicazione di avanzamento della clonazione" #: builtin/submodule--helper.c:1877 -msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" +msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "" -"git submodule--helper update_clone [--prefix=<percorso>] [<percorso>...]" +"git submodule--helper update-clone [--prefix=<percorso>] [<percorso>...]" #: builtin/submodule--helper.c:1890 msgid "bad value for update parameter" @@ -20305,7 +20391,7 @@ msgstr "git submodule--helper config --check-writeable" msgid "please make sure that the .gitmodules file is in the working tree" msgstr "assicurati che il file .gitmodules sia nell'albero di lavoro" -#: builtin/submodule--helper.c:2235 git.c:434 git.c:684 +#: builtin/submodule--helper.c:2235 git.c:433 git.c:683 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s non supporta --super-prefix" @@ -20640,146 +20726,146 @@ msgstr " OK" msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<opzioni>] [--] [<file>...]" -#: builtin/update-index.c:971 +#: builtin/update-index.c:972 msgid "continue refresh even when index needs update" msgstr "" "continua l'aggiornamento anche nel caso in cui l'indice richieda di essere " "aggiornato" -#: builtin/update-index.c:974 +#: builtin/update-index.c:975 msgid "refresh: ignore submodules" msgstr "aggiornamento: ignora i sottomoduli" -#: builtin/update-index.c:977 +#: builtin/update-index.c:978 msgid "do not ignore new files" msgstr "non ignorare i nuovi file" -#: builtin/update-index.c:979 +#: builtin/update-index.c:980 msgid "let files replace directories and vice-versa" msgstr "consenti che dei file sostituiscano delle directory e viceversa" -#: builtin/update-index.c:981 +#: builtin/update-index.c:982 msgid "notice files missing from worktree" msgstr "nota se dei file mancano dall'albero di lavoro" -#: builtin/update-index.c:983 +#: builtin/update-index.c:984 msgid "refresh even if index contains unmerged entries" msgstr "" "esegui l'aggiornamento anche se l'indice contiene delle voci non sottoposte " "a merge" -#: builtin/update-index.c:986 +#: builtin/update-index.c:987 msgid "refresh stat information" msgstr "aggiorna le informazioni stat" -#: builtin/update-index.c:990 +#: builtin/update-index.c:991 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "come --refresh, ma ignora l'impostazione assume-unchanged" -#: builtin/update-index.c:994 +#: builtin/update-index.c:995 msgid "<mode>,<object>,<path>" msgstr "<modo>,<oggetto>,<percorso>" -#: builtin/update-index.c:995 +#: builtin/update-index.c:996 msgid "add the specified entry to the index" msgstr "aggiunge la voce specificata all'indice" -#: builtin/update-index.c:1005 +#: builtin/update-index.c:1006 msgid "mark files as \"not changing\"" msgstr "contrassegna i file come \"non saranno modificati\"" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1009 msgid "clear assumed-unchanged bit" msgstr "reimposta a zero il bit \"non saranno modificati\"" -#: builtin/update-index.c:1011 +#: builtin/update-index.c:1012 msgid "mark files as \"index-only\"" msgstr "contrassegna i file come \"solamente da indicizzare\"" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1015 msgid "clear skip-worktree bit" msgstr "reimposta a zero il bit \"solamente da indicizzare\"" -#: builtin/update-index.c:1017 +#: builtin/update-index.c:1018 msgid "add to index only; do not add content to object database" msgstr "" "aggiungi solo all'indice; non aggiungere il contenuto al database oggetti" -#: builtin/update-index.c:1019 +#: builtin/update-index.c:1020 msgid "remove named paths even if present in worktree" msgstr "rimuovi i percorsi specificati anche se presenti nell'albero di lavoro" -#: builtin/update-index.c:1021 +#: builtin/update-index.c:1022 msgid "with --stdin: input lines are terminated by null bytes" msgstr "con --stdin: le righe di input sono terminate da byte NULL" -#: builtin/update-index.c:1023 +#: builtin/update-index.c:1024 msgid "read list of paths to be updated from standard input" msgstr "leggi l'elenco dei percorsi da aggiornare dallo standard input" -#: builtin/update-index.c:1027 +#: builtin/update-index.c:1028 msgid "add entries from standard input to the index" msgstr "aggiungi le voci specificate sullo standard input all'indice" -#: builtin/update-index.c:1031 +#: builtin/update-index.c:1032 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "ripopola le fasi 2 e 3 per i percorsi elencati" -#: builtin/update-index.c:1035 +#: builtin/update-index.c:1036 msgid "only update entries that differ from HEAD" msgstr "aggiorna solo le voci differenti rispetto all'HEAD" -#: builtin/update-index.c:1039 +#: builtin/update-index.c:1040 msgid "ignore files missing from worktree" msgstr "ignora i file mancanti nell'albero di lavoro" -#: builtin/update-index.c:1042 +#: builtin/update-index.c:1043 msgid "report actions to standard output" msgstr "stampa le azioni sullo standard output" -#: builtin/update-index.c:1044 +#: builtin/update-index.c:1045 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" "(per i comandi ad alto livello) dimentica i conflitti non risolti salvati" -#: builtin/update-index.c:1048 +#: builtin/update-index.c:1049 msgid "write index in this format" msgstr "scrivi l'indice in questo formato" -#: builtin/update-index.c:1050 +#: builtin/update-index.c:1051 msgid "enable or disable split index" msgstr "abilita o disabilita l'indice suddiviso" -#: builtin/update-index.c:1052 +#: builtin/update-index.c:1053 msgid "enable/disable untracked cache" msgstr "abilita/disabilita la cache non tracciata" -#: builtin/update-index.c:1054 +#: builtin/update-index.c:1055 msgid "test if the filesystem supports untracked cache" msgstr "verifica se il filesystem supporta la cache non tracciata" -#: builtin/update-index.c:1056 +#: builtin/update-index.c:1057 msgid "enable untracked cache without testing the filesystem" msgstr "abilita la cache non tracciata senza testare il filesystem" -#: builtin/update-index.c:1058 +#: builtin/update-index.c:1059 msgid "write out the index even if is not flagged as changed" msgstr "scrivi l'indice anche se non è stato contrassegnato come modificato" -#: builtin/update-index.c:1060 +#: builtin/update-index.c:1061 msgid "enable or disable file system monitor" msgstr "abilita o disabilita il monitor del filesystem" -#: builtin/update-index.c:1062 +#: builtin/update-index.c:1063 msgid "mark files as fsmonitor valid" msgstr "contrassegna i file come validi rispetto al monitor del filesystem" -#: builtin/update-index.c:1065 +#: builtin/update-index.c:1066 msgid "clear fsmonitor valid bit" msgstr "" "reimposta a zero il bit \"file validi rispetto al monitor del filesystem\"" -#: builtin/update-index.c:1168 +#: builtin/update-index.c:1169 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -20787,7 +20873,7 @@ msgstr "" "core.splitIndex è impostato a false; rimuovilo o modificalo se vuoi " "veramente abilitare l'indice suddiviso" -#: builtin/update-index.c:1177 +#: builtin/update-index.c:1178 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -20795,7 +20881,7 @@ msgstr "" "core.splitIndex è impostato a true; rimuovilo o modificalo se vuoi veramente " "disabilitare l'indice suddiviso" -#: builtin/update-index.c:1188 +#: builtin/update-index.c:1190 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -20803,11 +20889,11 @@ msgstr "" "core.untrackedCache è impostato a true; rimuovilo o modificalo se vuoi " "veramente disabilitare la cache non tracciata" -#: builtin/update-index.c:1192 +#: builtin/update-index.c:1194 msgid "Untracked cache disabled" msgstr "Cache non tracciata disabilitata" -#: builtin/update-index.c:1200 +#: builtin/update-index.c:1202 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -20815,29 +20901,29 @@ msgstr "" "core.untrackedCache è impostato a false; rimuovilo o modificalo se vuoi " "veramente abilitare la cache non tracciata" -#: builtin/update-index.c:1204 +#: builtin/update-index.c:1206 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Cache non tracciata abilitata per '%s'" -#: builtin/update-index.c:1212 +#: builtin/update-index.c:1214 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "" "core.fsmonitor non è impostato; impostalo se vuoi veramente abilitare il " "monitor del filesystem" -#: builtin/update-index.c:1216 +#: builtin/update-index.c:1218 msgid "fsmonitor enabled" msgstr "monitor filesystem abilitato" -#: builtin/update-index.c:1219 +#: builtin/update-index.c:1221 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" "core.fsmonitor è impostato; rimuovi tale impostazione se vuoi veramente " "disabilitare il monitor del filesystem" -#: builtin/update-index.c:1223 +#: builtin/update-index.c:1225 msgid "fsmonitor disabled" msgstr "monitor filesystem disabilitato" @@ -20933,55 +21019,55 @@ msgstr "git verify-tag [-v | --verbose] [--format=<formato>] <tag>..." msgid "print tag contents" msgstr "stampa i contenuti del tag" -#: builtin/worktree.c:18 +#: builtin/worktree.c:17 msgid "git worktree add [<options>] <path> [<commit-ish>]" msgstr "git worktree add [<opzioni>] <percorso> [<espressione commit>]" -#: builtin/worktree.c:19 +#: builtin/worktree.c:18 msgid "git worktree list [<options>]" msgstr "git worktree list [<opzioni>]" -#: builtin/worktree.c:20 +#: builtin/worktree.c:19 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<opzioni>] <percorso>" -#: builtin/worktree.c:21 +#: builtin/worktree.c:20 msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <albero di lavoro> <nuovo percorso>" -#: builtin/worktree.c:22 +#: builtin/worktree.c:21 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<opzioni>]" -#: builtin/worktree.c:23 +#: builtin/worktree.c:22 msgid "git worktree remove [<options>] <worktree>" msgstr "git worktree remove [<opzioni>] <albero di lavoro>" -#: builtin/worktree.c:24 +#: builtin/worktree.c:23 msgid "git worktree unlock <path>" msgstr "git worktree unlock <percorso>" -#: builtin/worktree.c:61 builtin/worktree.c:899 +#: builtin/worktree.c:60 builtin/worktree.c:898 #, c-format msgid "failed to delete '%s'" msgstr "eliminazione di '%s' non riuscita" -#: builtin/worktree.c:80 +#: builtin/worktree.c:79 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Rimuovo worktrees/%s: non è una directory valida" -#: builtin/worktree.c:86 +#: builtin/worktree.c:85 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Rimuovo worktrees/%s: il file gitdir non esiste" -#: builtin/worktree.c:91 builtin/worktree.c:100 +#: builtin/worktree.c:90 builtin/worktree.c:99 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "Rimuovo worktrees/%s: impossibile leggere il file gitdir (%s)" -#: builtin/worktree.c:110 +#: builtin/worktree.c:109 #, c-format msgid "" "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " @@ -20990,35 +21076,35 @@ msgstr "" "Rimuovo worktrees/%s: letti meno dati del previsto (attesi %<PRIuMAX>byte, " "%<PRIuMAX> letti)" -#: builtin/worktree.c:118 +#: builtin/worktree.c:117 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Rimuovo worktrees/%s: file gitdir non valido" -#: builtin/worktree.c:127 +#: builtin/worktree.c:126 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "Rimuovo worktrees/%s: il file gitdir punta a un percorso non esistente" -#: builtin/worktree.c:166 +#: builtin/worktree.c:165 msgid "report pruned working trees" msgstr "segnala gli alberi di lavoro eliminati" -#: builtin/worktree.c:168 +#: builtin/worktree.c:167 msgid "expire working trees older than <time>" msgstr "fai scadere gli alberi di lavoro più vecchi di <tempo>" -#: builtin/worktree.c:235 +#: builtin/worktree.c:234 #, c-format msgid "'%s' already exists" msgstr "'%s' esiste già" -#: builtin/worktree.c:252 +#: builtin/worktree.c:251 #, c-format msgid "unable to re-add worktree '%s'" msgstr "impossibile aggiungere nuovamente l'albero di lavoro '%s'" -#: builtin/worktree.c:257 +#: builtin/worktree.c:256 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" @@ -21028,7 +21114,7 @@ msgstr "" "usa 'add -f -f' per eseguire l'override, o 'unlock' e 'prune' o 'remove' per " "rimuoverlo" -#: builtin/worktree.c:259 +#: builtin/worktree.c:258 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" @@ -21037,129 +21123,129 @@ msgstr "" "'%s' è un albero di lavoro mancante ma già registrato;\n" "usa 'add -f' per eseguire l'override, o 'prune' o 'remove' per rimuoverlo" -#: builtin/worktree.c:309 +#: builtin/worktree.c:308 #, c-format msgid "could not create directory of '%s'" msgstr "impossibile creare la directory di '%s'" -#: builtin/worktree.c:440 builtin/worktree.c:446 +#: builtin/worktree.c:439 builtin/worktree.c:445 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Preparazione dell'albero di lavoro in corso (nuovo branch '%s')" -#: builtin/worktree.c:442 +#: builtin/worktree.c:441 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "" "Preparazione dell'albero di lavoro in corso (reimposto il branch '%s'; era a " "%s)" -#: builtin/worktree.c:451 +#: builtin/worktree.c:450 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Preparazione dell'albero di lavoro in corso (checkout di '%s')" -#: builtin/worktree.c:457 +#: builtin/worktree.c:456 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Preparazione dell'albero di lavoro in corso (HEAD scollegato %s)" -#: builtin/worktree.c:498 +#: builtin/worktree.c:497 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "esegui il checkout di <branch> anche se tale operazione è stata eseguita in " "un altro albero di lavoro" -#: builtin/worktree.c:501 +#: builtin/worktree.c:500 msgid "create a new branch" msgstr "crea un nuovo branch" -#: builtin/worktree.c:503 +#: builtin/worktree.c:502 msgid "create or reset a branch" msgstr "crea o reimposta un branch" -#: builtin/worktree.c:505 +#: builtin/worktree.c:504 msgid "populate the new working tree" msgstr "popola il nuovo albero di lavoro" -#: builtin/worktree.c:506 +#: builtin/worktree.c:505 msgid "keep the new working tree locked" msgstr "mantieni bloccato il nuovo albero di lavoro" -#: builtin/worktree.c:509 +#: builtin/worktree.c:508 msgid "set up tracking mode (see git-branch(1))" msgstr "imposta la modalità tracking (vedi git-branch(1))" -#: builtin/worktree.c:512 +#: builtin/worktree.c:511 msgid "try to match the new branch name with a remote-tracking branch" msgstr "" "tenta di cercare una corrispondenza fra il nome del nuovo branch e un branch " "remoto da tracciare" -#: builtin/worktree.c:520 +#: builtin/worktree.c:519 msgid "-b, -B, and --detach are mutually exclusive" msgstr "le opzioni -b, -B e --detach sono mutualmente esclusive" -#: builtin/worktree.c:581 +#: builtin/worktree.c:580 msgid "--[no-]track can only be used if a new branch is created" msgstr "" "l'opzione --[no-]track può essere usata solo se viene creato un nuovo branch" -#: builtin/worktree.c:681 +#: builtin/worktree.c:680 msgid "reason for locking" msgstr "motivo di blocco" -#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800 -#: builtin/worktree.c:927 +#: builtin/worktree.c:692 builtin/worktree.c:725 builtin/worktree.c:799 +#: builtin/worktree.c:926 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' non è un albero di lavoro" -#: builtin/worktree.c:695 builtin/worktree.c:728 +#: builtin/worktree.c:694 builtin/worktree.c:727 msgid "The main working tree cannot be locked or unlocked" msgstr "Non è possibile bloccare o sbloccare l'albero di lavoro principale" -#: builtin/worktree.c:700 +#: builtin/worktree.c:699 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' è già bloccato per questo motivo: %s" -#: builtin/worktree.c:702 +#: builtin/worktree.c:701 #, c-format msgid "'%s' is already locked" msgstr "'%s' è già bloccato" -#: builtin/worktree.c:730 +#: builtin/worktree.c:729 #, c-format msgid "'%s' is not locked" msgstr "'%s' non è bloccato" -#: builtin/worktree.c:771 +#: builtin/worktree.c:770 msgid "working trees containing submodules cannot be moved or removed" msgstr "" "gli alberi di lavoro contenenti sottomoduli non possono essere spostati o " "rimossi" -#: builtin/worktree.c:779 +#: builtin/worktree.c:778 msgid "force move even if worktree is dirty or locked" msgstr "forza lo spostamento anche se l'albero di lavoro è sporco o bloccato" -#: builtin/worktree.c:802 builtin/worktree.c:929 +#: builtin/worktree.c:801 builtin/worktree.c:928 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' è un albero di lavoro principale" -#: builtin/worktree.c:807 +#: builtin/worktree.c:806 #, c-format msgid "could not figure out destination name from '%s'" msgstr "impossibile determinare il nome destinazione da '%s'" -#: builtin/worktree.c:813 +#: builtin/worktree.c:812 #, c-format msgid "target '%s' already exists" msgstr "la destinazione '%s' esiste già" -#: builtin/worktree.c:821 +#: builtin/worktree.c:820 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -21169,7 +21255,7 @@ msgstr "" "usa 'move -f -f' per eseguirne l'override o sbloccalo prima di eseguire " "l'operazione" -#: builtin/worktree.c:823 +#: builtin/worktree.c:822 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -21178,36 +21264,37 @@ msgstr "" "usa 'move -f -f' per eseguirne l'override o sbloccalo prima di eseguire " "l'operazione" -#: builtin/worktree.c:826 +#: builtin/worktree.c:825 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "validazione non riuscita, impossibile spostare l'albero di lavoro: %s" -#: builtin/worktree.c:831 +#: builtin/worktree.c:830 #, c-format msgid "failed to move '%s' to '%s'" msgstr "spostamento di '%s' in '%s' non riuscito" -#: builtin/worktree.c:879 +#: builtin/worktree.c:878 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "esecuzione di 'git status' su '%s' non riuscita" -#: builtin/worktree.c:883 +#: builtin/worktree.c:882 #, c-format -msgid "'%s' is dirty, use --force to delete it" -msgstr "'%s' è sporco, usa --force per eliminarlo" +msgid "'%s' contains modified or untracked files, use --force to delete it" +msgstr "" +"'%s' contiene file modificati o non tracciati, usa --force per eliminarlo" -#: builtin/worktree.c:888 +#: builtin/worktree.c:887 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "esecuzione di 'git status' su '%s' non riuscita, codice %d" -#: builtin/worktree.c:911 +#: builtin/worktree.c:910 msgid "force removal even if worktree is dirty or locked" msgstr "forza la rimozione anche se l'albero di lavoro è sporco o bloccato" -#: builtin/worktree.c:934 +#: builtin/worktree.c:933 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -21217,7 +21304,7 @@ msgstr "" "usa 'remove -f -f' per eseguirne l'override o sbloccalo prima di eseguire " "l'operazione" -#: builtin/worktree.c:936 +#: builtin/worktree.c:935 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -21226,7 +21313,7 @@ msgstr "" "usa 'remove -f -f' per eseguirne l'override o sbloccalo prima di eseguire " "l'operazione" -#: builtin/worktree.c:939 +#: builtin/worktree.c:938 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "validazione non riuscita, impossibile rimuovere l'albero di lavoro: %s" @@ -21247,6 +21334,16 @@ msgstr "scrivi l'oggetto albero per una sottodirectory <prefisso>" msgid "only useful for debugging" msgstr "utile solo per il debug" +#: fast-import.c:3118 +#, c-format +msgid "Expected 'mark' command, got %s" +msgstr "Atteso comando 'mark', ricevuto %s" + +#: fast-import.c:3123 +#, c-format +msgid "Expected 'to' command, got %s" +msgstr "Atteso comando 'to', ricevuto %s" + #: credential-cache--daemon.c:223 #, c-format msgid "" @@ -21362,39 +21459,39 @@ msgstr "" "l'alias '%s' modifica le variabili d'ambiente.\n" "Puoi usare '!git' nell'alias per farlo" -#: git.c:377 +#: git.c:376 #, c-format msgid "empty alias for %s" msgstr "alias vuoto per %s" -#: git.c:380 +#: git.c:379 #, c-format msgid "recursive alias: %s" msgstr "alias ricorsivo: %s" -#: git.c:460 +#: git.c:459 msgid "write failure on standard output" msgstr "errore di scrittura sullo standard output" -#: git.c:462 +#: git.c:461 msgid "unknown write failure on standard output" msgstr "errore di scrittura sconosciuto sullo standard output" -#: git.c:464 +#: git.c:463 msgid "close failed on standard output" msgstr "chiusura dello standard output non riuscita" -#: git.c:793 +#: git.c:792 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "rilevato ciclo alias: l'espansione di '%s' non termina:%s" -#: git.c:843 +#: git.c:842 #, c-format msgid "cannot handle %s as a builtin" msgstr "impossibile gestire %s come comando incorporato" -#: git.c:856 +#: git.c:855 #, c-format msgid "" "usage: %s\n" @@ -21403,12 +21500,12 @@ msgstr "" "uso: %s\n" "\n" -#: git.c:876 +#: git.c:875 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "espansione dell'alias '%s' non riuscita; '%s' non è un comando Git\n" -#: git.c:888 +#: git.c:887 #, c-format msgid "failed to run command '%s': %s\n" msgstr "esecuzione del comando '%s' non riuscita: %s\n" @@ -21426,32 +21523,32 @@ msgstr "Il controllo delegazione non è supportato con cURL < 7.22.0" msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "Il pinning delle chiavi pubbliche non è supportato con cURL < 7.44.0" -#: http.c:876 +#: http.c:878 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" msgstr "CURLSSLOPT_NO_REVOKE non è supportato con cURL < 7.44.0" -#: http.c:949 +#: http.c:951 msgid "Protocol restrictions not supported with cURL < 7.19.4" msgstr "Le restrizioni protocollo non sono supportate con cURL < 7.19.4" -#: http.c:1085 +#: http.c:1088 #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" msgstr "Backend SSL '%s' non supportato. Backend SSL supportati:" -#: http.c:1092 +#: http.c:1095 #, c-format msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" msgstr "" "Impossibile impostare il backend SSL a '%s': cURL è stato compilato senza " "backend SSL" -#: http.c:1096 +#: http.c:1099 #, c-format msgid "Could not set SSL backend to '%s': already set" msgstr "Impossibile impostare il backend SSL a '%s': già impostato" -#: http.c:1965 +#: http.c:1968 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -21553,7 +21650,7 @@ msgstr "" msgid "protocol error: expected sha/ref, got '%s'" msgstr "errore protocollo: atteso SHA/riferimento, ricevuto '%s'" -#: remote-curl.c:1138 remote-curl.c:1252 +#: remote-curl.c:1138 remote-curl.c:1250 #, c-format msgid "http transport does not support %s" msgstr "il trasporto HTTP non supporta %s" @@ -21562,36 +21659,36 @@ msgstr "il trasporto HTTP non supporta %s" msgid "git-http-push failed" msgstr "git-http-push non riuscito" -#: remote-curl.c:1360 +#: remote-curl.c:1356 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "remote-curl: uso: git remote-curl <remoto> [<URL>]" -#: remote-curl.c:1392 +#: remote-curl.c:1388 msgid "remote-curl: error reading command stream from git" msgstr "remote-curl: errore durante la lettura del flusso dei comandi da Git" -#: remote-curl.c:1399 +#: remote-curl.c:1395 msgid "remote-curl: fetch attempted without a local repo" msgstr "remote-curl: tentato un fetch senza un repository locale" -#: remote-curl.c:1439 +#: remote-curl.c:1435 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl: ricevuto comando sconosciuto '%s' da Git" -#: list-objects-filter-options.h:61 +#: list-objects-filter-options.h:85 msgid "args" msgstr "argomenti" -#: list-objects-filter-options.h:62 +#: list-objects-filter-options.h:86 msgid "object filtering" msgstr "filtraggio oggetti" -#: parse-options.h:170 +#: parse-options.h:179 msgid "expiry-date" msgstr "data-scadenza" -#: parse-options.h:184 +#: parse-options.h:193 msgid "no-op (backward compatibility)" msgstr "no-op (retrocompatibilità)" @@ -24060,6 +24157,47 @@ msgstr "Salto %s con il suffisso di backup '%s'.\n" msgid "Do you really want to send %s? [y|N]: " msgstr "Inviare %s? [y|N]: " +#, c-format +#~ msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" +#~ msgstr "" +#~ "valore core.untrackedCache '%s' non valido; utilizzerò il valore " +#~ "predefinito 'keep'" + +#~ msgid "cannot change partial clone promisor remote" +#~ msgstr "impossibile modificare il remoto promettente del clone parziale" + +#~ msgid "error building trees" +#~ msgstr "errore durante la costruzione degli alberi" + +#, c-format +#~ msgid "invalid date format '%s' in '%s'" +#~ msgstr "formato data '%s' non valido in '%s'" + +#~ msgid "writing root commit" +#~ msgstr "scrittura commit radice in corso" + +#, c-format +#~ msgid "staged changes in the following files may be lost: %s" +#~ msgstr "" +#~ "le modifiche in stage nei seguenti file potrebbero andare perdute: %s" + +#~ msgid "" +#~ "--filter can only be used with the remote configured in extensions." +#~ "partialClone" +#~ msgstr "" +#~ "--filter può essere usato solo con il remoto configurato nelle estensioni." +#~ "partialClone" + +#~ msgid "verify commit-msg hook" +#~ msgstr "verifica hook commit-msg" + +#~ msgid "cannot combine '--rebase-merges' with '--strategy-option'" +#~ msgstr "impossibile combinare '--rebase-merges' con '--strategy-option'" + +#, c-format +#~ msgid "invalid sparse value '%s'" +#~ msgstr "valore sparse non valido: '%s'" + #~ msgid "" #~ "Fetch normally indicates which branches had a forced update, but that " #~ "check has been disabled." @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: git 2.23.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2019-07-30 09:59+0800\n" -"PO-Revision-Date: 2019-07-31 12:40+0200\n" +"POT-Creation-Date: 2019-08-10 20:12+0800\n" +"PO-Revision-Date: 2019-08-17 17:28+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.0.2\n" +"X-Generator: Gtranslator 2.91.7\n" #: advice.c:109 #, c-format @@ -576,7 +576,7 @@ msgstr[1] "Tillämpade patchen %%s med %d refuserade..." msgid "truncating .rej filename to %.*s.rej" msgstr "trunkerar .rej-filnamnet till %.*s.rej" -#: apply.c:4548 builtin/fetch.c:869 builtin/fetch.c:1161 +#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168 #, c-format msgid "cannot open %s" msgstr "kan inte öppna %s" @@ -717,7 +717,7 @@ msgstr "se till att åtminstone <n> rader sammanhang är lika" #: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3319 builtin/rebase.c:1421 +#: builtin/pack-objects.c:3330 builtin/rebase.c:1421 msgid "action" msgstr "åtgärd" @@ -747,7 +747,7 @@ msgstr "tillåt överlappande stycken" #: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22 #: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786 -#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128 +#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "var pratsam" @@ -818,7 +818,7 @@ msgstr "fmt" msgid "archive format" msgstr "arkivformat" -#: archive.c:458 builtin/log.c:1597 +#: archive.c:458 builtin/log.c:1580 msgid "prefix" msgstr "prefix" @@ -941,7 +941,7 @@ msgstr "sökvägen är inte giltig UTF-8: %s" msgid "path too long (%d chars, SHA1: %s): %s" msgstr "sökvägen för lång (%d tecken, SHA1: %s): %s" -#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229 +#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233 #, c-format msgid "deflate error (%d)" msgstr "fel i deflate (%d)" @@ -1104,9 +1104,9 @@ msgstr "" "incheckningen" #: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033 -#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:404 builtin/log.c:980 -#: builtin/log.c:1468 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411 -#: builtin/pack-objects.c:3142 builtin/pack-objects.c:3157 +#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963 +#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411 +#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "misslyckades skapa revisionstraversering" @@ -1334,7 +1334,7 @@ msgstr "rev-list dog" msgid "ref '%s' is excluded by the rev-list options" msgstr "referensen \"%s\" exkluderas av argumenten till rev-list" -#: bundle.c:460 builtin/log.c:212 builtin/log.c:1749 builtin/shortlog.c:306 +#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "okänt argument: %s" @@ -1472,180 +1472,180 @@ msgstr "ogiltig incheckingsgrafkedja: rad \"%s\" är inte ett hash-värde" msgid "unable to find all commit-graph files" msgstr "kan inte hitta alla incheckingsgraffiler" -#: commit-graph.c:553 commit-graph.c:613 +#: commit-graph.c:554 commit-graph.c:614 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "ogiltig incheckningsposition. incheckningsgrafen är troligtvis trasig" -#: commit-graph.c:574 +#: commit-graph.c:575 #, c-format msgid "could not find commit %s" msgstr "kunde inte hitta incheckningen %s" -#: commit-graph.c:1001 builtin/pack-objects.c:2651 +#: commit-graph.c:1002 builtin/pack-objects.c:2657 #, c-format msgid "unable to get type of object %s" msgstr "kunde inte hämta typ för objektet %s" -#: commit-graph.c:1033 +#: commit-graph.c:1034 msgid "Loading known commits in commit graph" msgstr "Läser in kända incheckningar i incheckningsgraf" -#: commit-graph.c:1050 +#: commit-graph.c:1051 msgid "Expanding reachable commits in commit graph" msgstr "Expanderar nåbara incheckningar i incheckningsgraf" -#: commit-graph.c:1069 +#: commit-graph.c:1070 msgid "Clearing commit marks in commit graph" msgstr "Rensar incheckningsmärken i incheckningsgraf" -#: commit-graph.c:1088 +#: commit-graph.c:1089 msgid "Computing commit graph generation numbers" msgstr "Beräknar generationsvärden för incheckningsgraf" -#: commit-graph.c:1162 +#: commit-graph.c:1163 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "Söker incheckningar för incheckingsgraf i %d paket" msgstr[1] "Söker incheckningar för incheckingsgraf i %d paket" -#: commit-graph.c:1175 +#: commit-graph.c:1176 #, c-format msgid "error adding pack %s" msgstr "fel vid tillägg av paketet %s" -#: commit-graph.c:1179 +#: commit-graph.c:1180 #, c-format msgid "error opening index for %s" msgstr "fel vid öppning av indexet för %s" -#: commit-graph.c:1203 +#: commit-graph.c:1204 #, c-format msgid "Finding commits for commit graph from %d ref" msgid_plural "Finding commits for commit graph from %d refs" msgstr[0] "Söker incheckningar för incheckingsgraf från %d referens" msgstr[1] "Söker incheckningar för incheckingsgraf från %d referenser" -#: commit-graph.c:1237 +#: commit-graph.c:1238 msgid "Finding commits for commit graph among packed objects" msgstr "Söker incheckningar för incheckingsgraf i packade objekt" -#: commit-graph.c:1252 +#: commit-graph.c:1253 msgid "Counting distinct commits in commit graph" msgstr "Räknar olika incheckningar i incheckningsgraf" -#: commit-graph.c:1283 +#: commit-graph.c:1284 msgid "Finding extra edges in commit graph" msgstr "Söker ytterligare kanter i incheckingsgraf" -#: commit-graph.c:1331 +#: commit-graph.c:1332 msgid "failed to write correct number of base graph ids" msgstr "kunde inte skriva korrekt antal bas-graf-id:n" -#: commit-graph.c:1364 midx.c:811 +#: commit-graph.c:1365 midx.c:811 #, c-format msgid "unable to create leading directories of %s" msgstr "kunde inte skapa inledande kataloger för %s" -#: commit-graph.c:1376 builtin/index-pack.c:306 builtin/repack.c:251 +#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240 #, c-format msgid "unable to create '%s'" msgstr "kunde inte skapa \"%s\"" -#: commit-graph.c:1436 +#: commit-graph.c:1437 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "Skriver ut incheckningsgraf i %d pass" msgstr[1] "Skriver ut incheckningsgraf i %d pass" -#: commit-graph.c:1477 +#: commit-graph.c:1478 msgid "unable to open commit-graph chain file" msgstr "Kunde inte öppna incheckningsgrafkedjefilen" -#: commit-graph.c:1489 +#: commit-graph.c:1490 msgid "failed to rename base commit-graph file" msgstr "kunde inte byta namn på bas-incheckingsgraffilen" -#: commit-graph.c:1509 +#: commit-graph.c:1510 msgid "failed to rename temporary commit-graph file" msgstr "kunde inte byta namn på temporär incheckningsgraffil" -#: commit-graph.c:1620 +#: commit-graph.c:1621 msgid "Scanning merged commits" msgstr "Söker sammanslagna incheckningar" -#: commit-graph.c:1631 +#: commit-graph.c:1632 #, c-format msgid "unexpected duplicate commit id %s" msgstr "oväntat duplicerat inchecknings-id %s" -#: commit-graph.c:1656 +#: commit-graph.c:1657 msgid "Merging commit-graph" msgstr "Slår ihop incheckningsgraf" -#: commit-graph.c:1842 +#: commit-graph.c:1844 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "formatet på incheckningsgrafen kan inte visa %d incheckningar" -#: commit-graph.c:1853 +#: commit-graph.c:1855 msgid "too many commits to write graph" msgstr "för många incheckningar för att skriva graf" -#: commit-graph.c:1943 +#: commit-graph.c:1945 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" "filen med incheckningsgraf har felaktig checksumma och är troligtvis trasig" -#: commit-graph.c:1953 +#: commit-graph.c:1955 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "incheckningsgrafen har felaktig OID-ordning: %s så %s" -#: commit-graph.c:1963 commit-graph.c:1978 +#: commit-graph.c:1965 commit-graph.c:1980 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" "incheckningsgrafen har felaktig utbredningsvärde: fanout[%d] = %u != %u" -#: commit-graph.c:1970 +#: commit-graph.c:1972 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "kunde inte tolka incheckning %s från incheckningsgraf" -#: commit-graph.c:1987 +#: commit-graph.c:1989 msgid "Verifying commits in commit graph" msgstr "Bekräftar incheckningar i incheckningsgrafen" -#: commit-graph.c:2000 +#: commit-graph.c:2002 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" "misslyckades tolka incheckning %s från objektdatabasen för incheckningsgraf" -#: commit-graph.c:2007 +#: commit-graph.c:2009 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "rot-trädets OID för incheckningen %s i incheckningsgrafen är %s != %s" -#: commit-graph.c:2017 +#: commit-graph.c:2019 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "incheckningsgrafens föräldralista för incheckningen %s är för lång" -#: commit-graph.c:2026 +#: commit-graph.c:2028 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "incheckningsgrafens förälder för %s är %s != %s" -#: commit-graph.c:2039 +#: commit-graph.c:2041 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" "incheckningsgrafens föräldralista för incheckningen %s avslutas för tidigt" -#: commit-graph.c:2044 +#: commit-graph.c:2046 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -1653,7 +1653,7 @@ msgstr "" "incheckningsgrafen har generationsnummer noll för incheckningen %s, men icke-" "noll på annan plats" -#: commit-graph.c:2048 +#: commit-graph.c:2050 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -1661,12 +1661,12 @@ msgstr "" "incheckningsgrafen har generationsnummer skilt från noll för incheckningen " "%s, men noll på annan plats" -#: commit-graph.c:2063 +#: commit-graph.c:2065 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "incheckningsgrafens generation för incheckningen %s är %u != %u" -#: commit-graph.c:2069 +#: commit-graph.c:2071 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" @@ -1705,289 +1705,289 @@ msgstr "relativa konfigureringsinkluderingar måste komma från filer" msgid "relative config include conditionals must come from files" msgstr "relativa konfigureringsinkluderingsvillkor måste komma från filer" -#: config.c:375 +#: config.c:376 #, c-format msgid "key does not contain a section: %s" msgstr "nyckeln innehåller inte ett stycke: %s" -#: config.c:381 +#: config.c:382 #, c-format msgid "key does not contain variable name: %s" msgstr "nyckeln innehåller inte variabelnamn: %s" -#: config.c:405 sequencer.c:2463 +#: config.c:406 sequencer.c:2463 #, c-format msgid "invalid key: %s" msgstr "felaktig nyckel: %s" -#: config.c:411 +#: config.c:412 #, c-format msgid "invalid key (newline): %s" msgstr "ogiltig nyckel (nyradstecken): %s" -#: config.c:447 config.c:459 +#: config.c:448 config.c:460 #, c-format msgid "bogus config parameter: %s" msgstr "falsk konfigureringsparameter: %s" -#: config.c:494 +#: config.c:495 #, c-format msgid "bogus format in %s" msgstr "felaktigt format i %s" -#: config.c:820 +#: config.c:821 #, c-format msgid "bad config line %d in blob %s" msgstr "felaktig konfigurationsfil rad %d i blob:en %s" -#: config.c:824 +#: config.c:825 #, c-format msgid "bad config line %d in file %s" msgstr "felaktig konfigurationsfil rad %d i filen %s" -#: config.c:828 +#: config.c:829 #, c-format msgid "bad config line %d in standard input" msgstr "felaktig konfigurationsfil rad %d i standard in" -#: config.c:832 +#: config.c:833 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s" -#: config.c:836 +#: config.c:837 #, c-format msgid "bad config line %d in command line %s" msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s" -#: config.c:840 +#: config.c:841 #, c-format msgid "bad config line %d in %s" msgstr "felaktig konfigurationsfil rad %d i %s" -#: config.c:977 +#: config.c:978 msgid "out of range" msgstr "utanför intervallet" -#: config.c:977 +#: config.c:978 msgid "invalid unit" msgstr "ogiltig enhet" -#: config.c:978 +#: config.c:979 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s" -#: config.c:997 +#: config.c:998 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "" "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i blob:en %s: %s" -#: config.c:1000 +#: config.c:1001 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i filen %s: %s" -#: config.c:1003 +#: config.c:1004 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i standard in: %s" -#: config.c:1006 +#: config.c:1007 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i undermodul-blob:" "en %s: %s" -#: config.c:1009 +#: config.c:1010 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i kommandoraden " "%s: %s" -#: config.c:1012 +#: config.c:1013 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: %s" -#: config.c:1107 +#: config.c:1108 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "misslyckades expandera användarkatalog i: \"%s\"" -#: config.c:1116 +#: config.c:1117 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel" -#: config.c:1207 +#: config.c:1208 #, c-format msgid "abbrev length out of range: %d" msgstr "förkortningslängd utanför intervallet: %d" -#: config.c:1221 config.c:1232 +#: config.c:1222 config.c:1233 #, c-format msgid "bad zlib compression level %d" msgstr "felaktigt zlib-komprimeringsgrad %d" -#: config.c:1324 +#: config.c:1325 msgid "core.commentChar should only be one character" msgstr "core.commentChar kan bara vara ett tecken" -#: config.c:1357 +#: config.c:1358 #, c-format msgid "invalid mode for object creation: %s" msgstr "felaktigt läge för skapande av objekt: %s" -#: config.c:1429 +#: config.c:1430 #, c-format msgid "malformed value for %s" msgstr "felformat värde för %s" -#: config.c:1455 +#: config.c:1456 #, c-format msgid "malformed value for %s: %s" msgstr "felformat värde för %s: %s" -#: config.c:1456 +#: config.c:1457 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "måste vara en av nothing, matching, simple, upstream eller current" -#: config.c:1517 builtin/pack-objects.c:3399 +#: config.c:1518 builtin/pack-objects.c:3410 #, c-format msgid "bad pack compression level %d" msgstr "felaktig paketkomprimeringsgrad %d" -#: config.c:1638 +#: config.c:1639 #, c-format msgid "unable to load config blob object '%s'" msgstr "kunde inte läsa konfigurerings-blobobjektet \"%s\"" -#: config.c:1641 +#: config.c:1642 #, c-format msgid "reference '%s' does not point to a blob" msgstr "referensen \"%s\" pekar inte på en blob" -#: config.c:1658 +#: config.c:1659 #, c-format msgid "unable to resolve config blob '%s'" msgstr "kan inte slå upp konfigurerings-bloben \"%s\"" -#: config.c:1688 +#: config.c:1689 #, c-format msgid "failed to parse %s" msgstr "kunde inte tolka %s" -#: config.c:1744 +#: config.c:1745 msgid "unable to parse command-line config" msgstr "kan inte tolka kommandoradskonfiguration" -#: config.c:2093 +#: config.c:2094 msgid "unknown error occurred while reading the configuration files" msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna" -#: config.c:2263 +#: config.c:2264 #, c-format msgid "Invalid %s: '%s'" msgstr "Felaktigt %s: \"%s\"" -#: config.c:2306 +#: config.c:2307 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "" "okänt värde \"%s\" för core.untrackedCache; använder standardvärdet \"keep\"" -#: config.c:2332 +#: config.c:2333 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "värdet \"%d\" för splitIndex.maxPercentage borde vara mellan 0 och 100" -#: config.c:2378 +#: config.c:2379 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration" -#: config.c:2380 +#: config.c:2381 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" på rad %d" -#: config.c:2461 +#: config.c:2462 #, c-format msgid "invalid section name '%s'" msgstr "felaktigt sektionsnamn \"%s\"" -#: config.c:2493 +#: config.c:2494 #, c-format msgid "%s has multiple values" msgstr "%s har flera värden" -#: config.c:2522 +#: config.c:2523 #, c-format msgid "failed to write new configuration file %s" msgstr "kan inte skriva nya konfigurationsfilen \"%s\"" -#: config.c:2774 config.c:3098 +#: config.c:2775 config.c:3099 #, c-format msgid "could not lock config file %s" msgstr "kunde inte låsa konfigurationsfilen %s" -#: config.c:2785 +#: config.c:2786 #, c-format msgid "opening %s" msgstr "öppnar %s" -#: config.c:2820 builtin/config.c:328 +#: config.c:2821 builtin/config.c:328 #, c-format msgid "invalid pattern: %s" msgstr "ogiltigt mönster: %s" -#: config.c:2845 +#: config.c:2846 #, c-format msgid "invalid config file %s" msgstr "ogiltig konfigurationsfil: \"%s\"" -#: config.c:2858 config.c:3111 +#: config.c:2859 config.c:3112 #, c-format msgid "fstat on %s failed" msgstr "fstat misslyckades på %s" -#: config.c:2869 +#: config.c:2870 #, c-format msgid "unable to mmap '%s'" msgstr "kunde inte utföra mmap på \"%s\"" -#: config.c:2878 config.c:3116 +#: config.c:2879 config.c:3117 #, c-format msgid "chmod on %s failed" msgstr "chmod misslyckades på %s" -#: config.c:2963 config.c:3213 +#: config.c:2964 config.c:3214 #, c-format msgid "could not write config file %s" msgstr "kunde inte skriva konfigurationsfilen %s" -#: config.c:2997 +#: config.c:2998 #, c-format msgid "could not set '%s' to '%s'" msgstr "kunde inte ställa in \"%s\" till \"%s\"" -#: config.c:2999 builtin/remote.c:782 +#: config.c:3000 builtin/remote.c:782 #, c-format msgid "could not unset '%s'" msgstr "kunde inte ta bort inställning för \"%s\"" -#: config.c:3089 +#: config.c:3090 #, c-format msgid "invalid section name: %s" msgstr "felaktigt namn på stycke: %s" -#: config.c:3256 +#: config.c:3257 #, c-format msgid "missing value for '%s'" msgstr "värde saknas för \"%s\"" @@ -2563,7 +2563,7 @@ msgstr "Formatflaggor för diff-utdata" msgid "generate patch" msgstr "skapar patch" -#: diff.c:5275 builtin/log.c:182 +#: diff.c:5275 builtin/log.c:172 msgid "suppress diff output" msgstr "undertryck diff-utdata" @@ -3812,7 +3812,7 @@ msgstr "namnbyte" msgid "renamed" msgstr "namnbytt" -#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3093 +#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Vägrar förlora lortig fil vid \"%s\"" @@ -3903,52 +3903,52 @@ msgstr "" "VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har " "bytt namn." -#: merge-recursive.c:2937 +#: merge-recursive.c:2938 #, c-format msgid "cannot read object %s" msgstr "kan inte läsa objektet %s" -#: merge-recursive.c:2940 +#: merge-recursive.c:2941 #, c-format msgid "object %s is not a blob" msgstr "objektet %s är inte en blob" -#: merge-recursive.c:3004 +#: merge-recursive.c:3005 msgid "modify" msgstr "ändra" -#: merge-recursive.c:3004 +#: merge-recursive.c:3005 msgid "modified" msgstr "ändrad" -#: merge-recursive.c:3016 +#: merge-recursive.c:3017 msgid "content" msgstr "innehåll" -#: merge-recursive.c:3020 +#: merge-recursive.c:3021 msgid "add/add" msgstr "tillägg/tillägg" -#: merge-recursive.c:3043 +#: merge-recursive.c:3044 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Hoppade över %s (sammanslagen samma som befintlig)" -#: merge-recursive.c:3065 git-submodule.sh:937 +#: merge-recursive.c:3066 git-submodule.sh:937 msgid "submodule" msgstr "undermodul" -#: merge-recursive.c:3066 +#: merge-recursive.c:3067 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s" -#: merge-recursive.c:3096 +#: merge-recursive.c:3097 #, c-format msgid "Adding as %s instead" msgstr "Lägger till som %s istället" -#: merge-recursive.c:3178 +#: merge-recursive.c:3179 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -3957,7 +3957,7 @@ msgstr "" "Uppdaterad sökväg: %s lade till %s inuti en katalog som bytte namn i %s; " "flyttar den till %s." -#: merge-recursive.c:3181 +#: merge-recursive.c:3182 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -3966,7 +3966,7 @@ msgstr "" "KONFLIKT (filplacering): %s lade till %s inuti en katalog som bytte namn i " "%s, föreslår att den bör flyttas till%s." -#: merge-recursive.c:3185 +#: merge-recursive.c:3186 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -3975,7 +3975,7 @@ msgstr "" "Uppdaterad sökväg: %s bytte namn till %s i %s, inuti en katalog som bytte " "namn i %s; flyttar den till %s." -#: merge-recursive.c:3188 +#: merge-recursive.c:3189 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -3984,36 +3984,36 @@ msgstr "" "KONFLIKT (filplacering): %s bytte namn till %s i %s, inuti en katalog som " "bytte namn i %s; flyttar den till %s." -#: merge-recursive.c:3302 +#: merge-recursive.c:3303 #, c-format msgid "Removing %s" msgstr "Tar bort %s" -#: merge-recursive.c:3325 +#: merge-recursive.c:3326 msgid "file/directory" msgstr "fil/katalog" -#: merge-recursive.c:3330 +#: merge-recursive.c:3331 msgid "directory/file" msgstr "katalog/fil" -#: merge-recursive.c:3337 +#: merge-recursive.c:3338 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "KONFLIKT (%s): Det finns en katalog med namnet %s i %s. Lägger till %s som %s" -#: merge-recursive.c:3346 +#: merge-recursive.c:3347 #, c-format msgid "Adding %s" msgstr "Lägger till %s" -#: merge-recursive.c:3355 +#: merge-recursive.c:3356 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "KONFLIKT (tillägg/tillägg): Sammanslagningskonflikt i %s" -#: merge-recursive.c:3393 +#: merge-recursive.c:3394 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4023,36 +4023,36 @@ msgstr "" "sammanslagning:\n" " %s" -#: merge-recursive.c:3404 +#: merge-recursive.c:3405 msgid "Already up to date!" msgstr "Redan à jour!" -#: merge-recursive.c:3413 +#: merge-recursive.c:3414 #, c-format msgid "merging of trees %s and %s failed" msgstr "sammanslagning av träden %s och %s misslyckades" -#: merge-recursive.c:3512 +#: merge-recursive.c:3513 msgid "Merging:" msgstr "Slår ihop:" -#: merge-recursive.c:3525 +#: merge-recursive.c:3526 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "hittade %u gemensam förfader:" msgstr[1] "hittade %u gemensamma förfäder:" -#: merge-recursive.c:3564 +#: merge-recursive.c:3565 msgid "merge returned no commit" msgstr "sammanslagningen returnerade ingen incheckning" -#: merge-recursive.c:3630 +#: merge-recursive.c:3631 #, c-format msgid "Could not parse object '%s'" msgstr "Kunde inte tolka objektet \"%s\"" -#: merge-recursive.c:3646 builtin/merge.c:698 builtin/merge.c:869 +#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." @@ -5610,7 +5610,7 @@ msgstr "kan inte ta bort lös länk \"%s\"" msgid "Recorded preimage for '%s'" msgstr "Sparade förhandsbild för \"%s\"" -#: rerere.c:881 submodule.c:2023 builtin/log.c:1790 +#: rerere.c:881 submodule.c:2023 builtin/log.c:1773 #: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 #, c-format msgid "could not create directory '%s'" @@ -6837,195 +6837,195 @@ msgstr "referensarkivet \"%s\" är ympat" msgid "invalid line while parsing alternate refs: %s" msgstr "felaktig rad vid tolkning av alternativa referenser: %s" -#: sha1-file.c:943 +#: sha1-file.c:944 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "försök att utföra \"mmap\" på %<PRIuMAX> över gränsen %<PRIuMAX>" -#: sha1-file.c:968 +#: sha1-file.c:969 msgid "mmap failed" msgstr "mmap misslyckades" -#: sha1-file.c:1132 +#: sha1-file.c:1133 #, c-format msgid "object file %s is empty" msgstr "objektfilen %s är tom" -#: sha1-file.c:1256 sha1-file.c:2395 +#: sha1-file.c:1257 sha1-file.c:2396 #, c-format msgid "corrupt loose object '%s'" msgstr "trasigt löst objekt \"%s\"" -#: sha1-file.c:1258 sha1-file.c:2399 +#: sha1-file.c:1259 sha1-file.c:2400 #, c-format msgid "garbage at end of loose object '%s'" msgstr "skräp i slutet av löst objekt \"%s\"" -#: sha1-file.c:1300 +#: sha1-file.c:1301 msgid "invalid object type" msgstr "felaktig objekttyp" -#: sha1-file.c:1384 +#: sha1-file.c:1385 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "kan inte packa upp %s-huvud med --allow-unknown-type" -#: sha1-file.c:1387 +#: sha1-file.c:1388 #, c-format msgid "unable to unpack %s header" msgstr "kan inte packa upp %s-huvudet" -#: sha1-file.c:1393 +#: sha1-file.c:1394 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "kan inte tolka %s-huvud med --allow-unknown-type" -#: sha1-file.c:1396 +#: sha1-file.c:1397 #, c-format msgid "unable to parse %s header" msgstr "kan inte tolka %s-huvud" -#: sha1-file.c:1587 +#: sha1-file.c:1588 #, c-format msgid "failed to read object %s" msgstr "misslyckades läsa objektet %s" -#: sha1-file.c:1591 +#: sha1-file.c:1592 #, c-format msgid "replacement %s not found for %s" msgstr "ersättningen %s hittades inte för %s" -#: sha1-file.c:1595 +#: sha1-file.c:1596 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "löst objekt %s (lagrat i %s) är trasigt" -#: sha1-file.c:1599 +#: sha1-file.c:1600 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "packat objekt %s (lagrat i %s) är trasigt" -#: sha1-file.c:1702 +#: sha1-file.c:1703 #, c-format msgid "unable to write file %s" msgstr "kunde inte skriva filen %s" -#: sha1-file.c:1709 +#: sha1-file.c:1710 #, c-format msgid "unable to set permission to '%s'" msgstr "kan inte sätta behörigheten till \"%s\"" -#: sha1-file.c:1716 +#: sha1-file.c:1717 msgid "file write error" msgstr "fel vid skrivning av fil" -#: sha1-file.c:1735 +#: sha1-file.c:1736 msgid "error when closing loose object file" msgstr "fel vid stängning av fil för löst objekt" -#: sha1-file.c:1800 +#: sha1-file.c:1801 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" "otillräcklig behörighet för att lägga till objekt till arkivdatabasen %s" -#: sha1-file.c:1802 +#: sha1-file.c:1803 msgid "unable to create temporary file" msgstr "kan inte skapa temporär fil" -#: sha1-file.c:1826 +#: sha1-file.c:1827 msgid "unable to write loose object file" msgstr "kunde inte skriva fil för löst objekt" -#: sha1-file.c:1832 +#: sha1-file.c:1833 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "kan inte utföra \"deflate\" på nytt objekt %s (%d)" -#: sha1-file.c:1836 +#: sha1-file.c:1837 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "\"deflateend\" på objektet %s misslyckades (%d)" -#: sha1-file.c:1840 +#: sha1-file.c:1841 #, c-format msgid "confused by unstable object source data for %s" msgstr "förvirrad av instabil objektkälldata för %s" -#: sha1-file.c:1850 builtin/pack-objects.c:920 +#: sha1-file.c:1851 builtin/pack-objects.c:925 #, c-format msgid "failed utime() on %s" msgstr "\"utime()\" misslyckades på %s" -#: sha1-file.c:1925 +#: sha1-file.c:1926 #, c-format msgid "cannot read object for %s" msgstr "kan inte läsa objekt för %s" -#: sha1-file.c:1965 +#: sha1-file.c:1966 msgid "corrupt commit" msgstr "trasik incheckning" -#: sha1-file.c:1973 +#: sha1-file.c:1974 msgid "corrupt tag" msgstr "trasig tagg" -#: sha1-file.c:2072 +#: sha1-file.c:2073 #, c-format msgid "read error while indexing %s" msgstr "läsfel vid indexering av %s" -#: sha1-file.c:2075 +#: sha1-file.c:2076 #, c-format msgid "short read while indexing %s" msgstr "för lite lästes vid indexering av %s" -#: sha1-file.c:2148 sha1-file.c:2157 +#: sha1-file.c:2149 sha1-file.c:2158 #, c-format msgid "%s: failed to insert into database" msgstr "%s: misslyckades lägga in i databasen" -#: sha1-file.c:2163 +#: sha1-file.c:2164 #, c-format msgid "%s: unsupported file type" msgstr "%s: filtypen stöds ej" -#: sha1-file.c:2187 +#: sha1-file.c:2188 #, c-format msgid "%s is not a valid object" msgstr "%s är inte ett giltigt objekt" -#: sha1-file.c:2189 +#: sha1-file.c:2190 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s är inte ett giltigt \"%s\"-objekt" -#: sha1-file.c:2216 builtin/index-pack.c:155 +#: sha1-file.c:2217 builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "kan inte öppna %s" -#: sha1-file.c:2406 sha1-file.c:2458 +#: sha1-file.c:2407 sha1-file.c:2459 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "hash stämmer inte för %s (förväntade %s)" -#: sha1-file.c:2430 +#: sha1-file.c:2431 #, c-format msgid "unable to mmap %s" msgstr "kan inte utföra \"mmap\" för %s" -#: sha1-file.c:2435 +#: sha1-file.c:2436 #, c-format msgid "unable to unpack header of %s" msgstr "kan inte packa upp huvud för %s" -#: sha1-file.c:2441 +#: sha1-file.c:2442 #, c-format msgid "unable to parse header of %s" msgstr "kan inte tolka huvud för %s" -#: sha1-file.c:2452 +#: sha1-file.c:2453 #, c-format msgid "unable to unpack contents of %s" msgstr "kan inte tolka innehåll i %s" @@ -8836,7 +8836,7 @@ msgid "allow fall back on 3way merging if needed" msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt" #: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:307 builtin/stash.c:806 +#: builtin/repack.c:296 builtin/stash.c:806 msgid "be quiet" msgstr "var tyst" @@ -8881,14 +8881,14 @@ msgstr "sänd det genom git-apply" #: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671 #: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249 #: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418 -#: builtin/repack.c:318 builtin/repack.c:322 builtin/repack.c:324 +#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313 #: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 #: parse-options.h:141 parse-options.h:162 parse-options.h:312 msgid "n" msgstr "n" #: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38 -#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:39 +#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38 msgid "format" msgstr "format" @@ -9200,7 +9200,8 @@ msgstr "felaktigt HEAD - Jag behöver ett HEAD" #: builtin/bisect--helper.c:526 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." -msgstr "misslyckades checka ut \"%s\". Försök \"git bisect reset <giltig_gren>\"." +msgstr "" +"misslyckades checka ut \"%s\". Försök \"git bisect reset <giltig_gren>\"." # cogito-relaterat #: builtin/bisect--helper.c:547 @@ -9387,7 +9388,7 @@ msgstr "Visa författarens e-post istället för namn (Standard: av)" msgid "Ignore whitespace differences" msgstr "Ignorera ändringar i blanksteg" -#: builtin/blame.c:861 builtin/log.c:1646 +#: builtin/blame.c:861 builtin/log.c:1629 msgid "rev" msgstr "rev" @@ -9783,7 +9784,7 @@ msgid "sorting and filtering are case insensitive" msgstr "sortering och filtrering skiljer gemener och VERSALER" #: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438 -#: builtin/verify-tag.c:39 +#: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "format att använda för utdata" @@ -10460,7 +10461,7 @@ msgstr "tvinga förloppsrapportering" msgid "perform a 3-way merge with the new branch" msgstr "utför en 3-vägssammanslagning för den nya grenen" -#: builtin/checkout.c:1439 builtin/log.c:1634 parse-options.h:318 +#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318 msgid "style" msgstr "stil" @@ -10541,7 +10542,8 @@ msgstr "felaktig sökvägsangivelse" #: builtin/checkout.c:1638 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" -msgstr "\"%s\" är inte en incheckning och grenen \"%s\" kan inte skapas från den" +msgstr "" +"\"%s\" är inte en incheckning och grenen \"%s\" kan inte skapas från den" #: builtin/checkout.c:1642 #, c-format @@ -10628,8 +10630,8 @@ msgid "throw away local modifications" msgstr "kasta bort lokala ändringar" #: builtin/checkout.c:1772 -msgid "where the checkout from" -msgstr "källa till utcheckning" +msgid "which tree-ish to checkout from" +msgstr "vilken träd-igt att checka ut från" #: builtin/checkout.c:1774 msgid "restore the index" @@ -10802,7 +10804,7 @@ msgid "remove whole directories" msgstr "ta bort hela kataloger" #: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548 -#: builtin/grep.c:899 builtin/log.c:186 builtin/log.c:188 +#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178 #: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415 #: builtin/show-ref.c:179 msgid "pattern" @@ -10899,7 +10901,7 @@ msgid "use --reference only while cloning" msgstr "använd --reference endast under kloningen" #: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3308 builtin/repack.c:330 +#: builtin/pack-objects.c:3314 builtin/repack.c:319 msgid "name" msgstr "namn" @@ -10924,7 +10926,7 @@ msgstr "djup" msgid "create a shallow clone of that depth" msgstr "skapa en grund klon på detta djup" -#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3297 +#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303 msgid "time" msgstr "tid" @@ -11106,7 +11108,7 @@ msgstr "flaggorna --bare och --separate-git-dir är inkompatibla." msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:977 builtin/fetch.c:1653 +#: builtin/clone.c:977 builtin/fetch.c:1660 #, c-format msgid "depth %s is not a positive number" msgstr "djupet %s är inte ett positivt tal" @@ -11228,7 +11230,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "duplicerad förälder %s ignorerades" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:542 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525 #, c-format msgid "not a valid object name %s" msgstr "objektnamnet är inte giltigt: %s" @@ -11718,7 +11720,7 @@ msgstr "" msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)" -#: builtin/commit.c:1506 builtin/log.c:1581 builtin/merge.c:289 +#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289 #: builtin/pull.c:163 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "lägg till Signed-off-by:" @@ -11840,7 +11842,7 @@ msgstr "" #: builtin/commit-graph.c:54 builtin/commit-graph.c:100 #: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163 -#: builtin/log.c:1601 +#: builtin/log.c:1584 msgid "dir" msgstr "kat" @@ -12591,7 +12593,7 @@ msgstr "Använd done-funktionen för att avsluta strömmen" msgid "Skip output of blob data" msgstr "Hoppa över skrivning av blob-data" -#: builtin/fast-export.c:1145 builtin/log.c:1649 +#: builtin/fast-export.c:1145 builtin/log.c:1632 msgid "refspec" msgstr "referensspecifikation" @@ -12791,22 +12793,46 @@ msgstr "tvingad uppdatering" msgid "non-fast-forward" msgstr "ej snabbspolad" -#: builtin/fetch.c:879 +#: builtin/fetch.c:854 +msgid "" +"Fetch normally indicates which branches had a forced update,\n" +"but that check has been disabled. To re-enable, use '--show-forced-updates'\n" +"flag or run 'git config fetch.showForcedUpdates true'." +msgstr "" +"Fetch visar normalt vilka grenar som tvångsuppdaterats, men testet har " +"slagits\n" +"av. För att slå på igen, använd flaggan \"--show-forced-updates\" eller kör\n" +"\"git config fetch.showForcedUpdates true\"." + +#: builtin/fetch.c:858 +#, c-format +msgid "" +"It took %.2f seconds to check forced updates. You can use\n" +"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates " +"false'\n" +" to avoid this check.\n" +msgstr "" +"Det tog %.2f sekunder att se efter tvångsuppdateringar. Du kan använda\n" +"\"--no-show-forced-updates\" eller köra \"git config fetch." +"showForcedUpdates\n" +"false\" för att undvika testet.\n" + +#: builtin/fetch.c:888 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s sände inte alla nödvändiga objekt\n" -#: builtin/fetch.c:900 +#: builtin/fetch.c:909 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "avvisa %s då grunda rötter inte kan uppdateras" -#: builtin/fetch.c:991 builtin/fetch.c:1124 +#: builtin/fetch.c:1000 builtin/fetch.c:1131 #, c-format msgid "From %.*s\n" msgstr "Från %.*s\n" -#: builtin/fetch.c:1002 +#: builtin/fetch.c:1011 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -12815,81 +12841,50 @@ msgstr "" "vissa lokala referenser kunde inte uppdateras; testa att köra\n" " \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt" -#: builtin/fetch.c:1008 -msgid "" -"Fetch normally indicates which branches had a forced update, but that check " -"has been disabled." -msgstr "" -"Hämtning visar vanligtvis vilka grenar som har en tvingad uppdatering, men " -"det testet har slagits av." - -#: builtin/fetch.c:1009 -msgid "" -"To re-enable, use '--show-forced-updates' flag or run 'git config fetch." -"showForcedUpdates true'." -msgstr "" -"För att slå på igen, använd flaggan \"--show-forced-updates\" eller kör " -"\"git config fetch.showForcedUpdates true\"." - -#: builtin/fetch.c:1011 -#, c-format -msgid "" -"It took %.2f seconds to check forced updates. You can use '--no-show-forced-" -"updates'\n" -msgstr "" -"Det tog %.2f sekunder att se efter tvingade uppdateringar. Du kan använda " -"\"--no-show-forced-updates\"\n" - -#: builtin/fetch.c:1013 -msgid "" -"or run 'git config fetch.showForcedUpdates false' to avoid this check.\n" -msgstr "" -"eller kör \"git config fetch.showForcedUpdates false\" för undvika testet.\n" - -#: builtin/fetch.c:1094 +#: builtin/fetch.c:1101 #, c-format msgid " (%s will become dangling)" msgstr " (%s kommer bli dinglande)" -#: builtin/fetch.c:1095 +#: builtin/fetch.c:1102 #, c-format msgid " (%s has become dangling)" msgstr " (%s har blivit dinglande)" -#: builtin/fetch.c:1127 +#: builtin/fetch.c:1134 msgid "[deleted]" msgstr "[borttagen]" -#: builtin/fetch.c:1128 builtin/remote.c:1036 +#: builtin/fetch.c:1135 builtin/remote.c:1036 msgid "(none)" msgstr "(ingen)" -#: builtin/fetch.c:1151 +#: builtin/fetch.c:1158 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv" -#: builtin/fetch.c:1170 +#: builtin/fetch.c:1177 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s" -#: builtin/fetch.c:1173 +#: builtin/fetch.c:1180 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Flaggan \"%s\" ignoreras för %s\n" -#: builtin/fetch.c:1477 +#: builtin/fetch.c:1484 #, c-format msgid "Fetching %s\n" msgstr "Hämtar %s\n" -#: builtin/fetch.c:1479 builtin/remote.c:100 +#: builtin/fetch.c:1486 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "Kunde inte hämta %s" -#: builtin/fetch.c:1525 +#: builtin/fetch.c:1532 msgid "" "--filter can only be used with the remote configured in extensions." "partialClone" @@ -12897,7 +12892,7 @@ msgstr "" "--filter kan endast användas med fjärren konfigurerad i extensions." "partialClone" -#: builtin/fetch.c:1549 +#: builtin/fetch.c:1556 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -12905,44 +12900,44 @@ msgstr "" "Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n" "fjärrarkiv som nya incheckningar skall hämtas från." -#: builtin/fetch.c:1586 +#: builtin/fetch.c:1593 msgid "You need to specify a tag name." msgstr "Du måste ange namnet på en tagg." -#: builtin/fetch.c:1637 +#: builtin/fetch.c:1644 msgid "Negative depth in --deepen is not supported" msgstr "Negativa djup stöds inte i --deepen" -#: builtin/fetch.c:1639 +#: builtin/fetch.c:1646 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen och --depth är ömsesidigt uteslutande" -#: builtin/fetch.c:1644 +#: builtin/fetch.c:1651 msgid "--depth and --unshallow cannot be used together" msgstr "--depth och --unshallow kan inte användas samtidigt" -#: builtin/fetch.c:1646 +#: builtin/fetch.c:1653 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow kan inte användas på ett komplett arkiv" -#: builtin/fetch.c:1662 +#: builtin/fetch.c:1669 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet på ett arkiv som argument" -#: builtin/fetch.c:1664 +#: builtin/fetch.c:1671 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kan inte anges med referensspecifikationer" -#: builtin/fetch.c:1673 +#: builtin/fetch.c:1680 #, c-format msgid "No such remote or remote group: %s" msgstr "Fjärren eller fjärrgruppen finns inte: %s" -#: builtin/fetch.c:1680 +#: builtin/fetch.c:1687 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Kan inte hämta från grupp och ange referensspecifikationer" -#: builtin/fetch.c:1696 +#: builtin/fetch.c:1703 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -13402,7 +13397,7 @@ msgstr "felaktigt antal trådar angivet (%d) för %s" #. grep.threads #. #: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727 -#: builtin/pack-objects.c:2722 +#: builtin/pack-objects.c:2728 #, c-format msgid "no threads support, ignoring %s" msgstr "trådstöd saknas, ignorerar %s" @@ -13627,11 +13622,11 @@ msgstr "kan inte slå upp revision: %s" msgid "invalid option combination, ignoring --threads" msgstr "ogiltig kombination av flaggor, ignorerar --threads" -#: builtin/grep.c:1068 builtin/pack-objects.c:3405 +#: builtin/grep.c:1068 builtin/pack-objects.c:3416 msgid "no threads support, ignoring --threads" msgstr "trådstöd saknas, ignorerar --threads" -#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2719 +#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725 #, c-format msgid "invalid number of threads specified (%d)" msgstr "felaktigt antal trådar angivet (%d)" @@ -13837,7 +13832,7 @@ msgstr "indataläsfel" msgid "used more bytes than were available" msgstr "använde fler byte än tillgängligt" -#: builtin/index-pack.c:288 builtin/pack-objects.c:600 +#: builtin/index-pack.c:288 builtin/pack-objects.c:604 msgid "pack too large for current definition of off_t" msgstr "paket för stort för nuvarande definition av off_t" @@ -13903,8 +13898,8 @@ msgstr "allvarlig inflate-inkonsekvens" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !" -#: builtin/index-pack.c:738 builtin/pack-objects.c:153 -#: builtin/pack-objects.c:213 builtin/pack-objects.c:307 +#: builtin/index-pack.c:738 builtin/pack-objects.c:157 +#: builtin/pack-objects.c:217 builtin/pack-objects.c:311 #, c-format msgid "unable to read %s" msgstr "kunde inte läsa %s" @@ -13965,7 +13960,7 @@ msgstr "förvirrad bortom vanvett i parse_pack_objects()" msgid "Resolving deltas" msgstr "Analyserar delta" -#: builtin/index-pack.c:1205 builtin/pack-objects.c:2491 +#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497 #, c-format msgid "unable to create thread: %s" msgstr "kunde inte skapa tråd: %s" @@ -14030,7 +14025,7 @@ msgstr "kan inte spara paketfil" msgid "cannot store index file" msgstr "kan inte spara indexfil" -#: builtin/index-pack.c:1525 builtin/pack-objects.c:2730 +#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "felaktig pack.indexversion=%<PRIu32>" @@ -14277,128 +14272,108 @@ msgstr "git show [<flaggor>] <objekt>..." msgid "invalid --decorate option: %s" msgstr "ogiltig flagga för --decorate: %s" -#: builtin/log.c:160 -msgid "" -"log.mailmap is not set; its implicit value will change in an\n" -"upcoming release. To squelch this message and preserve current\n" -"behaviour, set the log.mailmap configuration value to false.\n" -"\n" -"To squelch this message and adopt the new behaviour now, set the\n" -"log.mailmap configuration value to true.\n" -"\n" -"See 'git help config' and search for 'log.mailmap' for further information." -msgstr "" -"log.mailmap har inte satts: förvalet kommer ändras i en kommande\n" -"version. För att dölja det här meddelandet och behålla nuvarande\n" -"beteende, sätt konfigurationsvariabeln log.mailmap till false.\n" -"\n" -"För att dölja det här meddelandet och använda det nya beteendet,\n" -"sätt konfigurationsvariabeln log.mailmap till true.\n" -"\n" -"Se \"git help config\" och sök efter \"log.mailmap\" för mer information." - -#: builtin/log.c:183 +#: builtin/log.c:173 msgid "show source" msgstr "visa källkod" -#: builtin/log.c:184 +#: builtin/log.c:174 msgid "Use mail map file" msgstr "Använd e-postmappningsfil" -#: builtin/log.c:186 +#: builtin/log.c:176 msgid "only decorate refs that match <pattern>" msgstr "dekorera endast referenser som motsvarar <mönster>" -#: builtin/log.c:188 +#: builtin/log.c:178 msgid "do not decorate refs that match <pattern>" msgstr "dekorera inte referenser som motsvarar <mönster>" -#: builtin/log.c:189 +#: builtin/log.c:179 msgid "decorate options" msgstr "dekoreringsflaggor" -#: builtin/log.c:192 +#: builtin/log.c:182 msgid "Process line range n,m in file, counting from 1" msgstr "Behandla radintervallet n,m i filen, med början på 1" -#: builtin/log.c:297 +#: builtin/log.c:280 #, c-format msgid "Final output: %d %s\n" msgstr "Slututdata: %d %s\n" -#: builtin/log.c:551 +#: builtin/log.c:534 #, c-format msgid "git show %s: bad file" msgstr "git show %s: felaktig fil" -#: builtin/log.c:566 builtin/log.c:660 +#: builtin/log.c:549 builtin/log.c:643 #, c-format msgid "could not read object %s" msgstr "kunde inte läsa objektet %s" -#: builtin/log.c:685 +#: builtin/log.c:668 #, c-format msgid "unknown type: %d" msgstr "okänd typ: %d" -#: builtin/log.c:808 +#: builtin/log.c:791 msgid "format.headers without value" msgstr "format.headers utan värde" -#: builtin/log.c:925 +#: builtin/log.c:908 msgid "name of output directory is too long" msgstr "namnet på utdatakatalogen är för långt" -#: builtin/log.c:941 +#: builtin/log.c:924 #, c-format msgid "cannot open patch file %s" msgstr "kan inte öppna patchfilen %s" -#: builtin/log.c:958 +#: builtin/log.c:941 msgid "need exactly one range" msgstr "behöver precis ett intervall" -#: builtin/log.c:968 +#: builtin/log.c:951 msgid "not a range" msgstr "inte ett intervall" -#: builtin/log.c:1091 +#: builtin/log.c:1074 msgid "cover letter needs email format" msgstr "omslagsbrevet behöver e-postformat" -#: builtin/log.c:1097 +#: builtin/log.c:1080 msgid "failed to create cover-letter file" msgstr "misslyckades skapa fil för omslagsbrev" -#: builtin/log.c:1176 +#: builtin/log.c:1159 #, c-format msgid "insane in-reply-to: %s" msgstr "tokigt in-reply-to: %s" -#: builtin/log.c:1203 +#: builtin/log.c:1186 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]" -#: builtin/log.c:1261 +#: builtin/log.c:1244 msgid "two output directories?" msgstr "två utdatakataloger?" -#: builtin/log.c:1372 builtin/log.c:2116 builtin/log.c:2118 builtin/log.c:2130 +#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113 #, c-format msgid "unknown commit %s" msgstr "okänd incheckning %s" -#: builtin/log.c:1382 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "misslyckades slå upp \"%s\" som en giltig referens" -#: builtin/log.c:1387 +#: builtin/log.c:1370 msgid "could not find exact merge base" msgstr "kunde inte hitta exakt sammanslagningsbas" -#: builtin/log.c:1391 +#: builtin/log.c:1374 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" @@ -14408,267 +14383,267 @@ msgstr "" "använd git branch --set-upstream-to för att spåra en fjärrgren.\n" "Eller så kan du ange basincheckning med --base=<bas-inchecknings-id> manuellt" -#: builtin/log.c:1411 +#: builtin/log.c:1394 msgid "failed to find exact merge base" msgstr "kunde inte hitta exakt sammanslagningsbas" -#: builtin/log.c:1422 +#: builtin/log.c:1405 msgid "base commit should be the ancestor of revision list" msgstr "basincheckningen bör vara förfader till revisionslistan" -#: builtin/log.c:1426 +#: builtin/log.c:1409 msgid "base commit shouldn't be in revision list" msgstr "basincheckningen bör inte vara i revisionslistan" -#: builtin/log.c:1479 +#: builtin/log.c:1462 msgid "cannot get patch id" msgstr "kan inte hämta patch-id" -#: builtin/log.c:1531 +#: builtin/log.c:1514 msgid "failed to infer range-diff ranges" msgstr "misslyckades räkna ut intervall range-diff" -#: builtin/log.c:1576 +#: builtin/log.c:1559 msgid "use [PATCH n/m] even with a single patch" msgstr "använd [PATCH n/m] även för en ensam patch" -#: builtin/log.c:1579 +#: builtin/log.c:1562 msgid "use [PATCH] even with multiple patches" msgstr "använd [PATCH] även för flera patchar" -#: builtin/log.c:1583 +#: builtin/log.c:1566 msgid "print patches to standard out" msgstr "skriv patcharna på standard ut" -#: builtin/log.c:1585 +#: builtin/log.c:1568 msgid "generate a cover letter" msgstr "generera ett följebrev" -#: builtin/log.c:1587 +#: builtin/log.c:1570 msgid "use simple number sequence for output file names" msgstr "använd enkel nummersekvens för utdatafilnamn" -#: builtin/log.c:1588 +#: builtin/log.c:1571 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1589 +#: builtin/log.c:1572 msgid "use <sfx> instead of '.patch'" msgstr "använd <sfx> istället för \".patch\"" -#: builtin/log.c:1591 +#: builtin/log.c:1574 msgid "start numbering patches at <n> instead of 1" msgstr "börja numrera patchar på <n> istället för 1" -#: builtin/log.c:1593 +#: builtin/log.c:1576 msgid "mark the series as Nth re-roll" msgstr "markera serien som N:te försök" -#: builtin/log.c:1595 +#: builtin/log.c:1578 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Använd [RFC PATCH] istället för [PATCH]" -#: builtin/log.c:1598 +#: builtin/log.c:1581 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Använd [<prefix>] istället för [PATCH]" -#: builtin/log.c:1601 +#: builtin/log.c:1584 msgid "store resulting files in <dir>" msgstr "spara filerna i <katalog>" -#: builtin/log.c:1604 +#: builtin/log.c:1587 msgid "don't strip/add [PATCH]" msgstr "ta inte bort eller lägg till [PATCH]" -#: builtin/log.c:1607 +#: builtin/log.c:1590 msgid "don't output binary diffs" msgstr "skriv inte binära diffar" -#: builtin/log.c:1609 +#: builtin/log.c:1592 msgid "output all-zero hash in From header" msgstr "använd hashvärde med nollor i From-huvud" -#: builtin/log.c:1611 +#: builtin/log.c:1594 msgid "don't include a patch matching a commit upstream" msgstr "ta inte med patchar som motsvarar en uppströmsincheckning" -#: builtin/log.c:1613 +#: builtin/log.c:1596 msgid "show patch format instead of default (patch + stat)" msgstr "visa patchformat istället för standard (patch + stat)" -#: builtin/log.c:1615 +#: builtin/log.c:1598 msgid "Messaging" msgstr "E-post" -#: builtin/log.c:1616 +#: builtin/log.c:1599 msgid "header" msgstr "huvud" -#: builtin/log.c:1617 +#: builtin/log.c:1600 msgid "add email header" msgstr "lägg till e-posthuvud" -#: builtin/log.c:1618 builtin/log.c:1620 +#: builtin/log.c:1601 builtin/log.c:1603 msgid "email" msgstr "epost" -#: builtin/log.c:1618 +#: builtin/log.c:1601 msgid "add To: header" msgstr "lägg till mottagarhuvud (\"To:\")" -#: builtin/log.c:1620 +#: builtin/log.c:1603 msgid "add Cc: header" msgstr "lägg till kopiehuvud (\"Cc:\")" -#: builtin/log.c:1622 +#: builtin/log.c:1605 msgid "ident" msgstr "ident" -#: builtin/log.c:1623 +#: builtin/log.c:1606 msgid "set From address to <ident> (or committer ident if absent)" msgstr "sätt Från-adress till <ident> (eller incheckare om ident saknas)" -#: builtin/log.c:1625 +#: builtin/log.c:1608 msgid "message-id" msgstr "meddelande-id" -#: builtin/log.c:1626 +#: builtin/log.c:1609 msgid "make first mail a reply to <message-id>" msgstr "gör det första brevet ett svar till <meddelande-id>" -#: builtin/log.c:1627 builtin/log.c:1630 +#: builtin/log.c:1610 builtin/log.c:1613 msgid "boundary" msgstr "gräns" -#: builtin/log.c:1628 +#: builtin/log.c:1611 msgid "attach the patch" msgstr "bifoga patchen" -#: builtin/log.c:1631 +#: builtin/log.c:1614 msgid "inline the patch" msgstr "gör patchen ett inline-objekt" -#: builtin/log.c:1635 +#: builtin/log.c:1618 msgid "enable message threading, styles: shallow, deep" msgstr "aktivera brevtrådning, typer: shallow, deep" -#: builtin/log.c:1637 +#: builtin/log.c:1620 msgid "signature" msgstr "signatur" -#: builtin/log.c:1638 +#: builtin/log.c:1621 msgid "add a signature" msgstr "lägg till signatur" -#: builtin/log.c:1639 +#: builtin/log.c:1622 msgid "base-commit" msgstr "basincheckning" -#: builtin/log.c:1640 +#: builtin/log.c:1623 msgid "add prerequisite tree info to the patch series" msgstr "lägg till förhandskrävd trädinfo i patchserien" -#: builtin/log.c:1642 +#: builtin/log.c:1625 msgid "add a signature from a file" msgstr "lägg till signatur från fil" -#: builtin/log.c:1643 +#: builtin/log.c:1626 msgid "don't print the patch filenames" msgstr "visa inte filnamn för patchar" -#: builtin/log.c:1645 +#: builtin/log.c:1628 msgid "show progress while generating patches" msgstr "visa förloppsindikator medan patchar skapas" -#: builtin/log.c:1647 +#: builtin/log.c:1630 msgid "show changes against <rev> in cover letter or single patch" msgstr "visa ändringar mot <rev> i omslagsbrev eller ensam patch" -#: builtin/log.c:1650 +#: builtin/log.c:1633 msgid "show changes against <refspec> in cover letter or single patch" msgstr "visa ändringar mot <refspec> i omslagsbrev eller ensam patch" -#: builtin/log.c:1652 +#: builtin/log.c:1635 msgid "percentage by which creation is weighted" msgstr "procent som skapelse vägs med" -#: builtin/log.c:1727 +#: builtin/log.c:1710 #, c-format msgid "invalid ident line: %s" msgstr "ogiltig ident-rad: %s" -#: builtin/log.c:1742 +#: builtin/log.c:1725 msgid "-n and -k are mutually exclusive" msgstr "-n och -k kan inte användas samtidigt" -#: builtin/log.c:1744 +#: builtin/log.c:1727 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt" -#: builtin/log.c:1752 +#: builtin/log.c:1735 msgid "--name-only does not make sense" msgstr "kan inte använda --name-only" -#: builtin/log.c:1754 +#: builtin/log.c:1737 msgid "--name-status does not make sense" msgstr "kan inte använda --name-status" -#: builtin/log.c:1756 +#: builtin/log.c:1739 msgid "--check does not make sense" msgstr "kan inte använda --check" -#: builtin/log.c:1788 +#: builtin/log.c:1771 msgid "standard output, or directory, which one?" msgstr "standard ut, eller katalog, vilken skall det vara?" -#: builtin/log.c:1877 +#: builtin/log.c:1860 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff kräver --cover-letter eller ensam patch" -#: builtin/log.c:1881 +#: builtin/log.c:1864 msgid "Interdiff:" msgstr "Interdiff:" -#: builtin/log.c:1882 +#: builtin/log.c:1865 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff mot v%d:" -#: builtin/log.c:1888 +#: builtin/log.c:1871 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor kräver --range-diff" -#: builtin/log.c:1892 +#: builtin/log.c:1875 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff kräver --cover-letter eller ensam patch" -#: builtin/log.c:1900 +#: builtin/log.c:1883 msgid "Range-diff:" msgstr "Intervall-diff:" -#: builtin/log.c:1901 +#: builtin/log.c:1884 #, c-format msgid "Range-diff against v%d:" msgstr "Intervall-diff mot v%d:" -#: builtin/log.c:1912 +#: builtin/log.c:1895 #, c-format msgid "unable to read signature file '%s'" msgstr "kunde inte läsa signaturfil \"%s\"" -#: builtin/log.c:1948 +#: builtin/log.c:1931 msgid "Generating patches" msgstr "Skapar patchar" -#: builtin/log.c:1992 +#: builtin/log.c:1975 msgid "failed to create output files" msgstr "misslyckades skapa utdatafiler" -#: builtin/log.c:2051 +#: builtin/log.c:2034 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]" -#: builtin/log.c:2105 +#: builtin/log.c:2088 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -15499,7 +15474,7 @@ msgstr "%s, källa=%s, mål=%s" msgid "Renaming %s to %s\n" msgstr "Byter namn på %s till %s\n" -#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:520 +#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510 #, c-format msgid "renaming '%s' failed" msgstr "misslyckades byta namn på \"%s\"" @@ -15976,125 +15951,125 @@ msgid "" msgstr "" "git pack-objects [<flaggor>...] <basnamn> [< <reflista> | < <objektlista>]" -#: builtin/pack-objects.c:424 +#: builtin/pack-objects.c:428 #, c-format msgid "bad packed object CRC for %s" msgstr "felaktig CRC för packat objekt %s" -#: builtin/pack-objects.c:435 +#: builtin/pack-objects.c:439 #, c-format msgid "corrupt packed object for %s" msgstr "trasigt packat objekt för %s" -#: builtin/pack-objects.c:566 +#: builtin/pack-objects.c:570 #, c-format msgid "recursive delta detected for object %s" msgstr "rekursivt delta upptäcktes för objektet %s" -#: builtin/pack-objects.c:777 +#: builtin/pack-objects.c:781 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "ordnade %u objekt, förväntade %<PRIu32>" -#: builtin/pack-objects.c:790 +#: builtin/pack-objects.c:794 #, c-format msgid "packfile is invalid: %s" msgstr "packfil är ogiltig: %s" -#: builtin/pack-objects.c:794 +#: builtin/pack-objects.c:798 #, c-format msgid "unable to open packfile for reuse: %s" msgstr "kan inte öppna packfil för återanvändning: %s" -#: builtin/pack-objects.c:798 +#: builtin/pack-objects.c:802 msgid "unable to seek in reused packfile" msgstr "kan inte söka i återanvänd packfil" -#: builtin/pack-objects.c:809 +#: builtin/pack-objects.c:813 msgid "unable to read from reused packfile" msgstr "kan inte läsa från återanvänd packfil" -#: builtin/pack-objects.c:837 +#: builtin/pack-objects.c:841 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "inaktiverar skrivning av bitkarta, paket delas på grund av pack.packSizeLimit" -#: builtin/pack-objects.c:850 +#: builtin/pack-objects.c:854 msgid "Writing objects" msgstr "Skriver objekt" -#: builtin/pack-objects.c:912 builtin/update-index.c:89 +#: builtin/pack-objects.c:917 builtin/update-index.c:89 #, c-format msgid "failed to stat %s" msgstr "misslyckades ta status på %s" -#: builtin/pack-objects.c:965 +#: builtin/pack-objects.c:970 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "skrev %<PRIu32> objekt medan %<PRIu32> förväntades" -#: builtin/pack-objects.c:1161 +#: builtin/pack-objects.c:1166 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "inaktiverar skrivning av bitkarta då några objekt inte packas" -#: builtin/pack-objects.c:1591 +#: builtin/pack-objects.c:1597 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "deltabasoffset utanför gränsen i pack för %s" -#: builtin/pack-objects.c:1600 +#: builtin/pack-objects.c:1606 #, c-format msgid "delta base offset out of bound for %s" msgstr "deltabasoffset utanför gränsvärden för %s" -#: builtin/pack-objects.c:1869 +#: builtin/pack-objects.c:1875 msgid "Counting objects" msgstr "Räknar objekt" -#: builtin/pack-objects.c:1999 +#: builtin/pack-objects.c:2005 #, c-format msgid "unable to get size of %s" msgstr "kan inte hämta storlek på %s" -#: builtin/pack-objects.c:2014 +#: builtin/pack-objects.c:2020 #, c-format msgid "unable to parse object header of %s" msgstr "kunde inte tolka objekthuvud för %s" -#: builtin/pack-objects.c:2084 builtin/pack-objects.c:2100 -#: builtin/pack-objects.c:2110 +#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106 +#: builtin/pack-objects.c:2116 #, c-format msgid "object %s cannot be read" msgstr "objektet %s kunde inte läsas" -#: builtin/pack-objects.c:2087 builtin/pack-objects.c:2114 +#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "objektet %s har inkonsistent objektlängd (%<PRIuMAX> mot %<PRIuMAX>)" -#: builtin/pack-objects.c:2124 +#: builtin/pack-objects.c:2130 msgid "suboptimal pack - out of memory" msgstr "icke-optimalt pack - minnet slut" -#: builtin/pack-objects.c:2450 +#: builtin/pack-objects.c:2456 #, c-format msgid "Delta compression using up to %d threads" msgstr "Deltakomprimering använder upp till %d trådar" -#: builtin/pack-objects.c:2582 +#: builtin/pack-objects.c:2588 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "kan inte packa objekt nåbara från taggen %s" -#: builtin/pack-objects.c:2669 +#: builtin/pack-objects.c:2675 msgid "Compressing objects" msgstr "Komprimerar objekt" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2681 msgid "inconsistency with delta count" msgstr "deltaräknaren är inkonsekvent" -#: builtin/pack-objects.c:2756 +#: builtin/pack-objects.c:2762 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -16103,7 +16078,7 @@ msgstr "" "förväntade kant-objekt-id, fick skräp:\n" " %s" -#: builtin/pack-objects.c:2762 +#: builtin/pack-objects.c:2768 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -16112,239 +16087,243 @@ msgstr "" "förväntade objekt-id, fick skräp:\n" " %s" -#: builtin/pack-objects.c:2860 +#: builtin/pack-objects.c:2866 msgid "invalid value for --missing" msgstr "ogiltigt värde för --missing" -#: builtin/pack-objects.c:2919 builtin/pack-objects.c:3027 +#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033 msgid "cannot open pack index" msgstr "kan inte öppna paketfilen" -#: builtin/pack-objects.c:2950 +#: builtin/pack-objects.c:2956 #, c-format msgid "loose object at %s could not be examined" msgstr "lösa objekt på %s kunde inte underökas" -#: builtin/pack-objects.c:3035 +#: builtin/pack-objects.c:3041 msgid "unable to force loose object" msgstr "kan inte tvinga lösa objekt" -#: builtin/pack-objects.c:3127 +#: builtin/pack-objects.c:3133 #, c-format msgid "not a rev '%s'" msgstr "inte en referens \"%s\"" -#: builtin/pack-objects.c:3130 +#: builtin/pack-objects.c:3136 #, c-format msgid "bad revision '%s'" msgstr "felaktig revision \"%s\"" -#: builtin/pack-objects.c:3155 +#: builtin/pack-objects.c:3161 msgid "unable to add recent objects" msgstr "kan inte lägga till nya objekt" -#: builtin/pack-objects.c:3208 +#: builtin/pack-objects.c:3214 #, c-format msgid "unsupported index version %s" msgstr "indexversionen %s stöds ej" -#: builtin/pack-objects.c:3212 +#: builtin/pack-objects.c:3218 #, c-format msgid "bad index version '%s'" msgstr "felaktig indexversion \"%s\"" -#: builtin/pack-objects.c:3242 +#: builtin/pack-objects.c:3248 msgid "do not show progress meter" msgstr "visa inte förloppsindikator" -#: builtin/pack-objects.c:3244 +#: builtin/pack-objects.c:3250 msgid "show progress meter" msgstr "visa förloppsindikator" -#: builtin/pack-objects.c:3246 +#: builtin/pack-objects.c:3252 msgid "show progress meter during object writing phase" msgstr "visa förloppsindikator under objektskrivningsfasen" -#: builtin/pack-objects.c:3249 +#: builtin/pack-objects.c:3255 msgid "similar to --all-progress when progress meter is shown" msgstr "som --all-progress när förloppsindikatorn visas" -#: builtin/pack-objects.c:3250 +#: builtin/pack-objects.c:3256 msgid "<version>[,<offset>]" msgstr "<version>[,<offset>]" -#: builtin/pack-objects.c:3251 +#: builtin/pack-objects.c:3257 msgid "write the pack index file in the specified idx format version" msgstr "skriv paketindexfilen i angiven indexformatversion" -#: builtin/pack-objects.c:3254 +#: builtin/pack-objects.c:3260 msgid "maximum size of each output pack file" msgstr "maximal storlek på varje utdatapaketfil" -#: builtin/pack-objects.c:3256 +#: builtin/pack-objects.c:3262 msgid "ignore borrowed objects from alternate object store" msgstr "ignorera lånade objekt från alternativa objektlager" -#: builtin/pack-objects.c:3258 +#: builtin/pack-objects.c:3264 msgid "ignore packed objects" msgstr "ignorera packade objekt" -#: builtin/pack-objects.c:3260 +#: builtin/pack-objects.c:3266 msgid "limit pack window by objects" msgstr "begränsa paketfönster efter objekt" -#: builtin/pack-objects.c:3262 +#: builtin/pack-objects.c:3268 msgid "limit pack window by memory in addition to object limit" msgstr "begränsa paketfönster efter minne förutom objektgräns" -#: builtin/pack-objects.c:3264 +#: builtin/pack-objects.c:3270 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "maximal längd på deltakedja tillåten i slutligt paket" -#: builtin/pack-objects.c:3266 +#: builtin/pack-objects.c:3272 msgid "reuse existing deltas" msgstr "återanvänd befintliga delta" -#: builtin/pack-objects.c:3268 +#: builtin/pack-objects.c:3274 msgid "reuse existing objects" msgstr "återanvänd befintliga objekt" -#: builtin/pack-objects.c:3270 +#: builtin/pack-objects.c:3276 msgid "use OFS_DELTA objects" msgstr "använd OFS_DELTA-objekt" -#: builtin/pack-objects.c:3272 +#: builtin/pack-objects.c:3278 msgid "use threads when searching for best delta matches" msgstr "använd trådar vid sökning efter bästa deltaträffar" -#: builtin/pack-objects.c:3274 +#: builtin/pack-objects.c:3280 msgid "do not create an empty pack output" msgstr "försök inte skapa tom paketutdata" -#: builtin/pack-objects.c:3276 +#: builtin/pack-objects.c:3282 msgid "read revision arguments from standard input" msgstr "läs revisionsargument från standard in" -#: builtin/pack-objects.c:3278 +#: builtin/pack-objects.c:3284 msgid "limit the objects to those that are not yet packed" msgstr "begränsa objekt till dem som ännu inte packats" -#: builtin/pack-objects.c:3281 +#: builtin/pack-objects.c:3287 msgid "include objects reachable from any reference" msgstr "inkludera objekt som kan nås från någon referens" -#: builtin/pack-objects.c:3284 +#: builtin/pack-objects.c:3290 msgid "include objects referred by reflog entries" msgstr "inkludera objekt som refereras från referensloggposter" -#: builtin/pack-objects.c:3287 +#: builtin/pack-objects.c:3293 msgid "include objects referred to by the index" msgstr "inkludera objekt som refereras från indexet" -#: builtin/pack-objects.c:3290 +#: builtin/pack-objects.c:3296 msgid "output pack to stdout" msgstr "skriv paket på standard ut" -#: builtin/pack-objects.c:3292 +#: builtin/pack-objects.c:3298 msgid "include tag objects that refer to objects to be packed" msgstr "inkludera taggobjekt som refererar objekt som skall packas" -#: builtin/pack-objects.c:3294 +#: builtin/pack-objects.c:3300 msgid "keep unreachable objects" msgstr "behåll onåbara objekt" -#: builtin/pack-objects.c:3296 +#: builtin/pack-objects.c:3302 msgid "pack loose unreachable objects" msgstr "packa lösa onåbara objekt" -#: builtin/pack-objects.c:3298 +#: builtin/pack-objects.c:3304 msgid "unpack unreachable objects newer than <time>" msgstr "packa upp onåbara objekt nyare än <tid>" -#: builtin/pack-objects.c:3301 +#: builtin/pack-objects.c:3307 msgid "use the sparse reachability algorithm" msgstr "använd gles-nåbarhetsalgoritmen" -#: builtin/pack-objects.c:3303 +#: builtin/pack-objects.c:3309 msgid "create thin packs" msgstr "skapa tunna paket" -#: builtin/pack-objects.c:3305 +#: builtin/pack-objects.c:3311 msgid "create packs suitable for shallow fetches" msgstr "skapa packfiler lämpade för grunda hämtningar" -#: builtin/pack-objects.c:3307 +#: builtin/pack-objects.c:3313 msgid "ignore packs that have companion .keep file" msgstr "ignorera paket som har tillhörande .keep-fil" -#: builtin/pack-objects.c:3309 +#: builtin/pack-objects.c:3315 msgid "ignore this pack" msgstr "ignorera detta paket" -#: builtin/pack-objects.c:3311 +#: builtin/pack-objects.c:3317 msgid "pack compression level" msgstr "komprimeringsgrad för paket" -#: builtin/pack-objects.c:3313 +#: builtin/pack-objects.c:3319 msgid "do not hide commits by grafts" msgstr "göm inte incheckningar med ympningar (\"grafts\")" -#: builtin/pack-objects.c:3315 +#: builtin/pack-objects.c:3321 msgid "use a bitmap index if available to speed up counting objects" msgstr "använd bitkartindex om tillgängligt för att räkna objekt snabbare" -#: builtin/pack-objects.c:3317 +#: builtin/pack-objects.c:3323 msgid "write a bitmap index together with the pack index" msgstr "använd bitkartindex tillsammans med packindexet" -#: builtin/pack-objects.c:3320 +#: builtin/pack-objects.c:3327 +msgid "write a bitmap index if possible" +msgstr "skriv bitkartindex om möjligt" + +#: builtin/pack-objects.c:3331 msgid "handling for missing objects" msgstr "hantering av saknade objekt" -#: builtin/pack-objects.c:3323 +#: builtin/pack-objects.c:3334 msgid "do not pack objects in promisor packfiles" msgstr "packa inte objekt i kontraktspackfiler" -#: builtin/pack-objects.c:3325 +#: builtin/pack-objects.c:3336 msgid "respect islands during delta compression" msgstr "respektera öar under deltakomprimering" -#: builtin/pack-objects.c:3350 +#: builtin/pack-objects.c:3361 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "deltakedjedjupet %d är för djupt, påtvingar %d" -#: builtin/pack-objects.c:3355 +#: builtin/pack-objects.c:3366 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "pack.deltaCacheLimit är för högt, påtvingar %d" -#: builtin/pack-objects.c:3409 +#: builtin/pack-objects.c:3420 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" "--max-pack-size kan inte användas för att bygga ett paket som skall överföras" -#: builtin/pack-objects.c:3411 +#: builtin/pack-objects.c:3422 msgid "minimum pack size limit is 1 MiB" msgstr "minsta packstorlek är 1 MiB" -#: builtin/pack-objects.c:3416 +#: builtin/pack-objects.c:3427 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin kan inte användas för att bygga ett indexerbart paket" -#: builtin/pack-objects.c:3419 +#: builtin/pack-objects.c:3430 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable och -unpack-unreachable kan inte användas samtidigt" -#: builtin/pack-objects.c:3425 +#: builtin/pack-objects.c:3436 msgid "cannot use --filter without --stdout" msgstr "kan inte använda --filter utan --stdout" -#: builtin/pack-objects.c:3486 +#: builtin/pack-objects.c:3497 msgid "Enumerating objects" msgstr "Räknar upp objekt" -#: builtin/pack-objects.c:3516 +#: builtin/pack-objects.c:3527 #, c-format msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" msgstr "" @@ -18264,112 +18243,112 @@ msgstr "" "Använd --no-write-bitmap-index eller inaktivera inställningen\n" "pack.writebitmaps" -#: builtin/repack.c:201 +#: builtin/repack.c:190 msgid "could not start pack-objects to repack promisor objects" msgstr "kunde inte starta pack-objects för att packa om kontraktsobjekt" -#: builtin/repack.c:240 builtin/repack.c:418 +#: builtin/repack.c:229 builtin/repack.c:408 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" "repack: Förväntar kompletta hex-objekt-ID-rader endast från pack-objects." -#: builtin/repack.c:257 +#: builtin/repack.c:246 msgid "could not finish pack-objects to repack promisor objects" msgstr "kunde inte avsluta pack-objects för att packa om kontraktsobjekt" -#: builtin/repack.c:295 +#: builtin/repack.c:284 msgid "pack everything in a single pack" msgstr "packa allt i ett enda paket" -#: builtin/repack.c:297 +#: builtin/repack.c:286 msgid "same as -a, and turn unreachable objects loose" msgstr "samma som -a, och gör onåbara objekt lösa" -#: builtin/repack.c:300 +#: builtin/repack.c:289 msgid "remove redundant packs, and run git-prune-packed" msgstr "ta bort överflödiga paket, och kör git-prune-packed" -#: builtin/repack.c:302 +#: builtin/repack.c:291 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "sänd --no-reuse-delta till git-pack-objects" -#: builtin/repack.c:304 +#: builtin/repack.c:293 msgid "pass --no-reuse-object to git-pack-objects" msgstr "sänd --no-reuse-object till git-pack-objects" -#: builtin/repack.c:306 +#: builtin/repack.c:295 msgid "do not run git-update-server-info" msgstr "kör inte git-update-server-info" -#: builtin/repack.c:309 +#: builtin/repack.c:298 msgid "pass --local to git-pack-objects" msgstr "sänd --local till git-pack-objects" -#: builtin/repack.c:311 +#: builtin/repack.c:300 msgid "write bitmap index" msgstr "skriv bitkartindex" -#: builtin/repack.c:313 +#: builtin/repack.c:302 msgid "pass --delta-islands to git-pack-objects" msgstr "sänd --delta-islands till git-pack-objects" -#: builtin/repack.c:314 +#: builtin/repack.c:303 msgid "approxidate" msgstr "cirkadatum" -#: builtin/repack.c:315 +#: builtin/repack.c:304 msgid "with -A, do not loosen objects older than this" msgstr "med -A, lös inte upp objekt äldre än detta" -#: builtin/repack.c:317 +#: builtin/repack.c:306 msgid "with -a, repack unreachable objects" msgstr "med -a, packa om onåbara objekt" -#: builtin/repack.c:319 +#: builtin/repack.c:308 msgid "size of the window used for delta compression" msgstr "storlek på fönster använt för deltakomprimering" -#: builtin/repack.c:320 builtin/repack.c:326 +#: builtin/repack.c:309 builtin/repack.c:315 msgid "bytes" msgstr "byte" -#: builtin/repack.c:321 +#: builtin/repack.c:310 msgid "same as the above, but limit memory size instead of entries count" msgstr "samma som ovan, men begränsa minnesstorleken istället för postantal" -#: builtin/repack.c:323 +#: builtin/repack.c:312 msgid "limits the maximum delta depth" msgstr "begränsa maximalt deltadjup" -#: builtin/repack.c:325 +#: builtin/repack.c:314 msgid "limits the maximum number of threads" msgstr "begränsar maximalt antal trådar" -#: builtin/repack.c:327 +#: builtin/repack.c:316 msgid "maximum size of each packfile" msgstr "maximal storlek på varje paketfil" -#: builtin/repack.c:329 +#: builtin/repack.c:318 msgid "repack objects in packs marked with .keep" msgstr "packa om objekt i paket märkta med .keep" -#: builtin/repack.c:331 +#: builtin/repack.c:320 msgid "do not repack this pack" msgstr "packa inte om detta paket" -#: builtin/repack.c:341 +#: builtin/repack.c:330 msgid "cannot delete packs in a precious-objects repo" msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv" -#: builtin/repack.c:345 +#: builtin/repack.c:334 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable och -A kan inte användas samtidigt" -#: builtin/repack.c:427 +#: builtin/repack.c:417 msgid "Nothing new to pack." msgstr "Inget nytt att packa." -#: builtin/repack.c:488 +#: builtin/repack.c:478 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -18388,7 +18367,7 @@ msgstr "" "VARNING: namnet misslyckades också.\n" "VARNING: Byt namn på dem i %s manuellt:\n" -#: builtin/repack.c:536 +#: builtin/repack.c:526 #, c-format msgid "failed to remove '%s'" msgstr "misslyckades ta bort \"%s\"" @@ -20471,15 +20450,15 @@ msgstr "testa inte <katalog>/.git/ om <katalog> inte är en Git-katalog" msgid "interrupt transfer after <n> seconds of inactivity" msgstr "avbryt överföringen efter <n> sekunders inaktivitet" -#: builtin/verify-commit.c:20 +#: builtin/verify-commit.c:19 msgid "git verify-commit [-v | --verbose] <commit>..." msgstr "git verify-commit [-v | --verbose] <incheckning>..." -#: builtin/verify-commit.c:69 +#: builtin/verify-commit.c:68 msgid "print commit contents" msgstr "visa innehåll för incheckning" -#: builtin/verify-commit.c:70 builtin/verify-tag.c:38 +#: builtin/verify-commit.c:69 builtin/verify-tag.c:37 msgid "print raw gpg status output" msgstr "visa råa gpg-statusdata" @@ -20495,11 +20474,11 @@ msgstr "pratsam" msgid "show statistics only" msgstr "visa endast statistik" -#: builtin/verify-tag.c:19 +#: builtin/verify-tag.c:18 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." msgstr "git verify-tag [-v | --verbose] [--format=<format] <tagg>..." -#: builtin/verify-tag.c:37 +#: builtin/verify-tag.c:36 msgid "print tag contents" msgstr "visa innehåll för tag" @@ -20940,17 +20919,17 @@ msgstr "okänt skrivfel på standard ut" msgid "close failed on standard output" msgstr "stäng misslyckades på standard ut" -#: git.c:796 +#: git.c:793 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "alias-slinga detekterades: expansionen av \"%s\" avslutas aldrig:%s" -#: git.c:846 +#: git.c:843 #, c-format msgid "cannot handle %s as a builtin" msgstr "kan inte hantera %s som inbyggd" -#: git.c:859 +#: git.c:856 #, c-format msgid "" "usage: %s\n" @@ -20959,13 +20938,13 @@ msgstr "" "användning: %s\n" "\n" -#: git.c:879 +#: git.c:876 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "" "expandering av alias \"%s\" misslyckades; \"%s\" är inte ett git-kommando\n" -#: git.c:891 +#: git.c:888 #, c-format msgid "failed to run command '%s': %s\n" msgstr "misslyckades köra kommandot \"%s\": %s\n" @@ -21170,11 +21149,11 @@ msgstr "fältnamn att sortera på" msgid "update the index with reused conflict resolution if possible" msgstr "uppdatera indexet med återanvänd konfliktlösning om möjligt" -#: wt-status.h:68 +#: wt-status.h:67 msgid "HEAD detached at " msgstr "HEAD frånkopplad vid " -#: wt-status.h:69 +#: wt-status.h:68 msgid "HEAD detached from " msgstr "HEAD frånkopplad från " @@ -23524,6 +23503,39 @@ msgstr "" msgid "Do you really want to send %s? [y|N]: " msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " +#~ msgid "" +#~ "Fetch normally indicates which branches had a forced update, but that " +#~ "check has been disabled." +#~ msgstr "" +#~ "Hämtning visar vanligtvis vilka grenar som har en tvingad uppdatering, " +#~ "men det testet har slagits av." + +#~ msgid "" +#~ "or run 'git config fetch.showForcedUpdates false' to avoid this check.\n" +#~ msgstr "" +#~ "eller kör \"git config fetch.showForcedUpdates false\" för undvika " +#~ "testet.\n" + +#~ msgid "" +#~ "log.mailmap is not set; its implicit value will change in an\n" +#~ "upcoming release. To squelch this message and preserve current\n" +#~ "behaviour, set the log.mailmap configuration value to false.\n" +#~ "\n" +#~ "To squelch this message and adopt the new behaviour now, set the\n" +#~ "log.mailmap configuration value to true.\n" +#~ "\n" +#~ "See 'git help config' and search for 'log.mailmap' for further " +#~ "information." +#~ msgstr "" +#~ "log.mailmap har inte satts: förvalet kommer ändras i en kommande\n" +#~ "version. För att dölja det här meddelandet och behålla nuvarande\n" +#~ "beteende, sätt konfigurationsvariabeln log.mailmap till false.\n" +#~ "\n" +#~ "För att dölja det här meddelandet och använda det nya beteendet,\n" +#~ "sätt konfigurationsvariabeln log.mailmap till true.\n" +#~ "\n" +#~ "Se \"git help config\" och sök efter \"log.mailmap\" för mer information." + #~ msgid "Server supports multi_ack_detailed" #~ msgstr "Servern stöder \"multi_ack_detailed\"" |