diff options
| -rw-r--r-- | po/bg.po | 4040 | ||||
| -rw-r--r-- | po/ca.po | 384 | ||||
| -rw-r--r-- | po/de.po | 6 | ||||
| -rw-r--r-- | po/es.po | 5088 | ||||
| -rw-r--r-- | po/fr.po | 4024 | ||||
| -rw-r--r-- | po/git.pot | 3924 | ||||
| -rw-r--r-- | po/sv.po | 4028 | ||||
| -rw-r--r-- | po/zh_CN.po | 36 |
8 files changed, 11238 insertions, 10292 deletions
@@ -1,7 +1,7 @@ # Bulgarian translation of git po-file. -# Copyright (C) 2014, 2015, 2016, 2017 Alexander Shopov <ash@kambanaria.org>. +# Copyright (C) 2014, 2015, 2016, 2017, 2018 Alexander Shopov <ash@kambanaria.org>. # This file is distributed under the same license as the git package. -# Alexander Shopov <ash@kambanaria.org>, 2014, 2015, 2016, 2017. +# Alexander Shopov <ash@kambanaria.org>, 2014, 2015, 2016, 2017, 2018. # # ======================== # DICTIONARY TO MERGE IN GIT GUI @@ -84,6 +84,10 @@ # split index разделяне на индекса # truncate отрязвам # format string форматиращ низ +# hook кука +# ignored (file) игнориран, понякога - пропуснат +# manual, man page ръководство +# guide въведение # ------------------------ # „$var“ - може да не сработва за shell има gettext и eval_gettext - проверка - намират се лесно по „$ # ------------------------ @@ -96,8 +100,8 @@ msgid "" msgstr "" "Project-Id-Version: git master\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2017-10-08 09:48+0800\n" -"PO-Revision-Date: 2017-10-14 11:52+0200\n" +"POT-Creation-Date: 2017-12-31 10:45+0800\n" +"PO-Revision-Date: 2018-01-01 21:46+0100\n" "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" "Language: bg\n" @@ -106,37 +110,37 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: advice.c:58 +#: advice.c:62 #, c-format msgid "hint: %.*s\n" msgstr "Подсказка: %.*s\n" -#: advice.c:86 +#: advice.c:90 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "Отбирането на подавания е блокирано от неслети файлове." -#: advice.c:88 +#: advice.c:92 msgid "Committing is not possible because you have unmerged files." msgstr "Подаването е блокирано от неслети файлове." -#: advice.c:90 +#: advice.c:94 msgid "Merging is not possible because you have unmerged files." msgstr "Сливането е блокирано от неслети файлове." -#: advice.c:92 +#: advice.c:96 msgid "Pulling is not possible because you have unmerged files." msgstr "Издърпването е блокирано от неслети файлове." -#: advice.c:94 +#: advice.c:98 msgid "Reverting is not possible because you have unmerged files." msgstr "Отмяната е блокирана от неслети файлове." -#: advice.c:96 +#: advice.c:100 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "Действието „%s“ е блокирано от неслети файлове." -#: advice.c:104 +#: advice.c:108 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." @@ -144,23 +148,23 @@ msgstr "" "Редактирайте ги в работното дърво, и тогава ползвайте „git add/rm ФАЙЛ“,\n" "за да отбележите коригирането им. След това извършете подаването." -#: advice.c:112 +#: advice.c:116 msgid "Exiting because of an unresolved conflict." msgstr "Изход от програмата заради некоригиран конфликт." -#: advice.c:117 builtin/merge.c:1211 +#: advice.c:121 builtin/merge.c:1213 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува)." -#: advice.c:119 +#: advice.c:123 msgid "Please, commit your changes before merging." msgstr "Промените трябва да се подадат преди сливане." -#: advice.c:120 +#: advice.c:124 msgid "Exiting because of unfinished merge." msgstr "Изход от програмата заради незавършено сливане." -#: advice.c:126 +#: advice.c:130 #, c-format msgid "" "Note: checking out '%s'.\n" @@ -184,7 +188,7 @@ msgstr "" "\n" "Ако искате да създадете нов клон, за да запазите подаванията си, можете да\n" "направите това като зададете име на клон към опцията „-b“ на командата\n" -"„commit“. Например:\n" +"„commit“. Например:\n" "\n" " git checkout -b ИМЕ_НА_НОВ_КЛОН\n" "\n" @@ -199,90 +203,90 @@ msgstr "непозната опция за знаците за интервал msgid "unrecognized whitespace ignore option '%s'" msgstr "непозната опция за игнориране на знаците за интервали „%s“" -#: apply.c:125 +#: apply.c:122 msgid "--reject and --3way cannot be used together." msgstr "опциите „--reject“ и „--3way“ са несъвместими" -#: apply.c:127 +#: apply.c:124 msgid "--cached and --3way cannot be used together." msgstr "опциите „--cached“ и „--3way“ са несъвместими" -#: apply.c:130 +#: apply.c:127 msgid "--3way outside a repository" msgstr "като „--3way“, но извън хранилище" -#: apply.c:141 +#: apply.c:138 msgid "--index outside a repository" msgstr "като „--index“, но извън хранилище" -#: apply.c:144 +#: apply.c:141 msgid "--cached outside a repository" msgstr "като „--cached“, но извън хранилище" -#: apply.c:845 +#: apply.c:821 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Регулярният израз за времето „%s“ не може за бъде компилиран" -#: apply.c:854 +#: apply.c:830 #, c-format msgid "regexec returned %d for input: %s" msgstr "Регулярният израз върна %d при подадена последователност „%s“ на входа" -#: apply.c:928 +#: apply.c:904 #, c-format msgid "unable to find filename in patch at line %d" msgstr "Липсва име на файл на ред %d от кръпката" -#: apply.c:966 +#: apply.c:942 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" "git apply: лош изход от командата „git-diff“ — на ред %2$d се очакваше „/dev/" "null“, а бе получен „%1$s“" -#: apply.c:972 +#: apply.c:948 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" "git apply: лош изход от командата „git-diff“ — на ред %d бе получено " "неправилно име на нов файл" -#: apply.c:973 +#: apply.c:949 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" "git apply: лош изход от командата „git-diff“ — на ред %d бе получено " "неправилно име на стар файл" -#: apply.c:978 +#: apply.c:954 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" "git apply: лош изход от командата „git-diff“ — на ред %d се очакваше „/dev/" "null“" -#: apply.c:1007 +#: apply.c:983 #, c-format msgid "invalid mode on line %d: %s" msgstr "грешен режим на ред №%d: %s" -#: apply.c:1325 +#: apply.c:1301 #, c-format msgid "inconsistent header lines %d and %d" msgstr "несъвместими заглавни части на редове №%d и №%d" -#: apply.c:1497 +#: apply.c:1473 #, c-format msgid "recount: unexpected line: %.*s" msgstr "при повторното преброяване бе получен неочакван ред: „%.*s“" -#: apply.c:1566 +#: apply.c:1542 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "част от кръпка без заглавна част на ред %d: %.*s" -#: apply.c:1586 +#: apply.c:1562 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -297,71 +301,71 @@ msgstr[1] "" "След съкращаването на първите %d части от компонентите на пътя, в заглавната " "част на „git diff“ липсва информация за име на файл (ред: %d)" -#: apply.c:1599 +#: apply.c:1575 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" "в заглавната част на „git diff“ липсва информация за име на файл (ред: %d)" -#: apply.c:1787 +#: apply.c:1763 msgid "new file depends on old contents" msgstr "новият файл зависи от старото съдържание на файла" -#: apply.c:1789 +#: apply.c:1765 msgid "deleted file still has contents" msgstr "изтритият файл не е празен" -#: apply.c:1823 +#: apply.c:1799 #, c-format msgid "corrupt patch at line %d" msgstr "грешка в кръпката на ред %d" -#: apply.c:1860 +#: apply.c:1836 #, c-format msgid "new file %s depends on old contents" msgstr "новият файл „%s“ зависи от старото съдържание на файла" -#: apply.c:1862 +#: apply.c:1838 #, c-format msgid "deleted file %s still has contents" msgstr "изтритият файл „%s“ не е празен" -#: apply.c:1865 +#: apply.c:1841 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "● предупреждение: файлът „%s“ вече е празен, но не е изтрит" -#: apply.c:2012 +#: apply.c:1988 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "грешка в двоичната кръпка на ред %d: %.*s" -#: apply.c:2049 +#: apply.c:2025 #, c-format msgid "unrecognized binary patch at line %d" msgstr "неразпозната двоичната кръпка на ред %d" -#: apply.c:2209 +#: apply.c:2185 #, c-format msgid "patch with only garbage at line %d" msgstr "кръпката е с изцяло повредени данни на ред %d" -#: apply.c:2295 +#: apply.c:2271 #, c-format msgid "unable to read symlink %s" msgstr "символната връзка „%s“ не може да бъде прочетена" -#: apply.c:2299 +#: apply.c:2275 #, c-format msgid "unable to open or read %s" msgstr "файлът „%s“ не може да бъде отворен или прочетен" -#: apply.c:2958 +#: apply.c:2934 #, c-format msgid "invalid start of line: '%c'" msgstr "неправилно начало на ред: „%c“" -#: apply.c:3077 +#: apply.c:3055 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." @@ -370,13 +374,13 @@ msgstr[0] "" msgstr[1] "" "%d-то парче код бе успешно приложено на ред %d (отместване от %d реда)." -#: apply.c:3089 +#: apply.c:3067 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" "Контекстът е намален на (%ld/%ld) за прилагането на парчето код на ред %d" -#: apply.c:3095 +#: apply.c:3073 #, c-format msgid "" "while searching for:\n" @@ -385,316 +389,316 @@ msgstr "" "при търсене за:\n" "%.*s" -#: apply.c:3117 +#: apply.c:3095 #, c-format msgid "missing binary patch data for '%s'" msgstr "липсват данните за двоичната кръпка за „%s“" -#: apply.c:3125 +#: apply.c:3103 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "двоичната кръпка не може да се приложи в обратна посока, когато обратното " "парче за „%s“ липсва" -#: apply.c:3171 +#: apply.c:3149 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "към „%s“ не може да се приложи двоична кръпка без пълен индекс" -#: apply.c:3181 +#: apply.c:3159 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "кръпката съответства на „%s“ (%s), който не съвпада по съдържание." -#: apply.c:3189 +#: apply.c:3167 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "кръпката съответства на „%s“, който трябва да е празен, но не е" -#: apply.c:3207 +#: apply.c:3185 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "" "необходимият резултат след операцията — „%s“ за „%s“ не може да бъде " "прочетен" -#: apply.c:3220 +#: apply.c:3198 #, c-format msgid "binary patch does not apply to '%s'" msgstr "двоичната кръпка не може да бъде приложена върху „%s“" -#: apply.c:3226 +#: apply.c:3204 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "двоичната кръпка за „%s“ води до неправилни резултати (очакваше се: „%s“, а " "бе получено: „%s“)" -#: apply.c:3247 +#: apply.c:3225 #, c-format msgid "patch failed: %s:%ld" msgstr "неуспешно прилагане на кръпка: „%s:%ld“" -#: apply.c:3369 +#: apply.c:3347 #, c-format msgid "cannot checkout %s" msgstr "„%s“ не може да се изтегли" -#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277 +#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277 #, c-format msgid "failed to read %s" msgstr "файлът „%s“ не може да бъде прочетен" -#: apply.c:3426 +#: apply.c:3404 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "изчитане на „%s“ след проследяване на символна връзка" -#: apply.c:3455 apply.c:3695 +#: apply.c:3433 apply.c:3673 #, c-format msgid "path %s has been renamed/deleted" msgstr "обектът с път „%s“ е преименуван или изтрит" -#: apply.c:3538 apply.c:3709 +#: apply.c:3516 apply.c:3687 #, c-format msgid "%s: does not exist in index" msgstr "„%s“ не съществува в индекса" -#: apply.c:3547 apply.c:3717 +#: apply.c:3525 apply.c:3695 #, c-format msgid "%s: does not match index" msgstr "„%s“ не съответства на индекса" -#: apply.c:3582 +#: apply.c:3560 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" "в хранилището липсват необходимите обекти BLOB, за да се премине към тройно " "сливане." -#: apply.c:3585 +#: apply.c:3563 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Преминаване към тройно сливане…\n" -#: apply.c:3601 apply.c:3605 +#: apply.c:3579 apply.c:3583 #, c-format msgid "cannot read the current contents of '%s'" msgstr "текущото съдържание на „%s“ не може да бъде прочетено" -#: apply.c:3617 +#: apply.c:3595 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Неуспешно преминаване към тройно сливане…\n" -#: apply.c:3631 +#: apply.c:3609 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Конфликти при прилагането на кръпката към „%s“.\n" -#: apply.c:3636 +#: apply.c:3614 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Кръпката бе приложена чисто към „%s“.\n" -#: apply.c:3662 +#: apply.c:3640 msgid "removal patch leaves file contents" msgstr "изтриващата кръпка оставя файла непразен" -#: apply.c:3734 +#: apply.c:3712 #, c-format msgid "%s: wrong type" msgstr "„%s“: неправилен вид" -#: apply.c:3736 +#: apply.c:3714 #, c-format msgid "%s has type %o, expected %o" msgstr "„%s“ е от вид „%o“, а се очакваше „%o“" -#: apply.c:3886 apply.c:3888 +#: apply.c:3864 apply.c:3866 #, c-format msgid "invalid path '%s'" msgstr "неправилен път: „%s“" -#: apply.c:3944 +#: apply.c:3922 #, c-format msgid "%s: already exists in index" msgstr "„%s“: вече съществува в индекса" -#: apply.c:3947 +#: apply.c:3925 #, c-format msgid "%s: already exists in working directory" msgstr "„%s“: вече съществува в работното дърво" -#: apply.c:3967 +#: apply.c:3945 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "новите права за достъп (%o) на „%s“ не съвпадат със старите (%o)" -#: apply.c:3972 +#: apply.c:3950 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" "новите права за достъп (%o) на „%s“ не съвпадат със старите (%o) на „%s“" -#: apply.c:3992 +#: apply.c:3970 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "засегнатият файл „%s“ е след символна връзка" -#: apply.c:3996 +#: apply.c:3974 #, c-format msgid "%s: patch does not apply" msgstr "Кръпката „%s“ не може да бъде приложена" -#: apply.c:4011 +#: apply.c:3989 #, c-format msgid "Checking patch %s..." msgstr "Проверяване на кръпката „%s“…" -#: apply.c:4102 +#: apply.c:4080 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "" "информацията за сумата по SHA1 за подмодула липсва или не е достатъчна (%s)." -#: apply.c:4109 +#: apply.c:4087 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "смяна на режима на достъпа на „%s“, който не е в текущия връх „HEAD“" -#: apply.c:4112 +#: apply.c:4090 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "информацията за сумата по SHA1 липсва или не е достатъчна (%s)." -#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148 +#: apply.c:4095 builtin/checkout.c:236 builtin/reset.c:148 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "неуспешно създаване на запис в кеша чрез „make_cache_entry“ за „%s“" -#: apply.c:4121 +#: apply.c:4099 #, c-format msgid "could not add %s to temporary index" msgstr "„%s“ не може да се добави към временния индекс" -#: apply.c:4131 +#: apply.c:4109 #, c-format msgid "could not write temporary index to %s" msgstr "временният индекс не може да се запази в „%s“" -#: apply.c:4269 +#: apply.c:4247 #, c-format msgid "unable to remove %s from index" msgstr "„%s“ не може да се извади от индекса" -#: apply.c:4304 +#: apply.c:4282 #, c-format msgid "corrupt patch for submodule %s" msgstr "повредена кръпка за модула „%s“" -#: apply.c:4310 +#: apply.c:4288 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" "не може да се получи информация чрез „stat“ за новосъздадения файл „%s“" -#: apply.c:4318 +#: apply.c:4296 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" "не може да се за създаде мястото за съхранение на новосъздадения файл „%s“" -#: apply.c:4324 apply.c:4468 +#: apply.c:4302 apply.c:4446 #, c-format msgid "unable to add cache entry for %s" msgstr "не може да се добави запис в кеша за „%s“" -#: apply.c:4365 +#: apply.c:4343 #, c-format msgid "failed to write to '%s'" msgstr "в „%s“ не може да се пише" -#: apply.c:4369 +#: apply.c:4347 #, c-format msgid "closing file '%s'" msgstr "затваряне на файла „%s“" -#: apply.c:4439 +#: apply.c:4417 #, c-format msgid "unable to write file '%s' mode %o" msgstr "файлът „%s“ не може да се запише с режим на достъп „%o“" -#: apply.c:4537 +#: apply.c:4515 #, c-format msgid "Applied patch %s cleanly." msgstr "Кръпката „%s“ бе приложена чисто." -#: apply.c:4545 +#: apply.c:4523 msgid "internal error" msgstr "вътрешна грешка" -#: apply.c:4548 +#: apply.c:4526 #, 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:4559 +#: apply.c:4537 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "съкращаване на името на файла с отхвърлените парчета на „ %.*s.rej“" -#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010 +#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011 #, c-format msgid "cannot open %s" msgstr "„%s“ не може да бъде отворен" -#: apply.c:4581 +#: apply.c:4559 #, c-format msgid "Hunk #%d applied cleanly." msgstr "%d-то парче бе успешно приложено." -#: apply.c:4585 +#: apply.c:4563 #, c-format msgid "Rejected hunk #%d." msgstr "%d-то парче бе отхвърлено." -#: apply.c:4695 +#: apply.c:4673 #, c-format msgid "Skipped patch '%s'." msgstr "Пропусната кръпка: „%s“" -#: apply.c:4703 +#: apply.c:4681 msgid "unrecognized input" msgstr "непознат вход" -#: apply.c:4722 +#: apply.c:4700 msgid "unable to read index file" msgstr "индексът не може да бъде записан" -#: apply.c:4859 +#: apply.c:4837 #, c-format msgid "can't open patch '%s': %s" msgstr "кръпката „%s“ не може да бъде отворена: %s" -#: apply.c:4886 +#: apply.c:4864 #, 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:4870 apply.c:4885 #, 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:4878 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." @@ -703,139 +707,140 @@ msgstr[0] "" msgstr[1] "" "Добавени са %d реда след корекцията на грешките в знаците за интервали." -#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390 +#: apply.c:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "Новият индекс не може да бъде записан" -#: apply.c:4947 apply.c:4950 builtin/am.c:2256 builtin/am.c:2259 -#: builtin/clone.c:116 builtin/fetch.c:115 builtin/pull.c:187 -#: builtin/submodule--helper.c:301 builtin/submodule--helper.c:622 -#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:992 -#: builtin/submodule--helper.c:995 builtin/submodule--helper.c:1212 +#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260 +#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193 +#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860 +#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230 +#: builtin/submodule--helper.c:1233 builtin/submodule--helper.c:1450 #: git-add--interactive.perl:197 msgid "path" msgstr "път" -#: apply.c:4948 +#: apply.c:4922 msgid "don't apply changes matching the given path" msgstr "без прилагане на промените напасващи на дадения път" -#: apply.c:4951 +#: apply.c:4925 msgid "apply changes matching the given path" msgstr "прилагане на промените напасващи на дадения път" -#: apply.c:4953 builtin/am.c:2265 +#: apply.c:4927 builtin/am.c:2266 msgid "num" msgstr "БРОЙ" -#: apply.c:4954 +#: apply.c:4928 msgid "remove <num> leading slashes from traditional diff paths" msgstr "премахване на този БРОЙ водещи елементи от пътищата в разликата" -#: apply.c:4957 +#: apply.c:4931 msgid "ignore additions made by the patch" msgstr "игнориране на редовете добавени от тази кръпка" -#: apply.c:4959 +#: apply.c:4933 msgid "instead of applying the patch, output diffstat for the input" msgstr "извеждане на статистика на промените без прилагане на кръпката" -#: apply.c:4963 +#: apply.c:4937 msgid "show number of added and deleted lines in decimal notation" msgstr "извеждане на броя на добавените и изтритите редове" -#: apply.c:4965 +#: apply.c:4939 msgid "instead of applying the patch, output a summary for the input" msgstr "извеждане на статистика на входните данни без прилагане на кръпката" -#: apply.c:4967 +#: apply.c:4941 msgid "instead of applying the patch, see if the patch is applicable" msgstr "проверка дали кръпката може да се приложи, без действително прилагане" -#: apply.c:4969 +#: apply.c:4943 msgid "make sure the patch is applicable to the current index" msgstr "проверка дали кръпката може да бъде приложена към текущия индекс" -#: apply.c:4971 +#: apply.c:4945 msgid "apply a patch without touching the working tree" msgstr "прилагане на кръпката без промяна на работното дърво" -#: apply.c:4973 +#: apply.c:4947 msgid "accept a patch that touches outside the working area" msgstr "прилагане на кръпка, която променя и файлове извън работното дърво" -#: apply.c:4975 +#: apply.c:4949 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" "кръпката да бъде приложена. Опцията се комбинира с „--check“/„--stat“/„--" "summary“" -#: apply.c:4977 +#: apply.c:4951 msgid "attempt three-way merge if a patch does not apply" msgstr "пробване с тройно сливане, ако кръпката не може да се приложи директно" -#: apply.c:4979 +#: apply.c:4953 msgid "build a temporary index based on embedded index information" msgstr "" "създаване на временен индекс на база на включената информация за индекса" -#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513 +#: apply.c:4956 builtin/checkout-index.c:168 builtin/ls-files.c:515 msgid "paths are separated with NUL character" msgstr "разделяне на пътищата с нулевия знак „NUL“" -#: apply.c:4984 +#: apply.c:4958 msgid "ensure at least <n> lines of context match" msgstr "да се осигури контекст от поне такъв БРОЙ съвпадащи редове" -#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95 +#: apply.c:4959 builtin/am.c:2245 builtin/interpret-trailers.c:95 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99 +#: builtin/pack-objects.c:3009 msgid "action" msgstr "действие" -#: apply.c:4986 +#: apply.c:4960 msgid "detect new or modified lines that have whitespace errors" msgstr "засичане на нови или променени редове с грешки в знаците за интервали" -#: apply.c:4989 apply.c:4992 +#: apply.c:4963 apply.c:4966 msgid "ignore changes in whitespace when finding context" msgstr "" "игнориране на промените в знаците за интервали при откриване на контекста" -#: apply.c:4995 +#: apply.c:4969 msgid "apply the patch in reverse" msgstr "прилагане на кръпката в обратна посока" -#: apply.c:4997 +#: apply.c:4971 msgid "don't expect at least one line of context" msgstr "без изискване на дори и един ред контекст" -#: apply.c:4999 +#: apply.c:4973 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "оставяне на отхвърлените парчета във файлове с разширение „.rej“" -#: apply.c:5001 +#: apply.c:4975 msgid "allow overlapping hunks" msgstr "позволяване на застъпващи се парчета" -#: apply.c:5002 builtin/add.c:272 builtin/check-ignore.c:21 -#: builtin/commit.c:1347 builtin/count-objects.c:96 builtin/fsck.c:640 -#: builtin/log.c:1889 builtin/mv.c:123 builtin/read-tree.c:125 +#: apply.c:4976 builtin/add.c:292 builtin/check-ignore.c:21 +#: builtin/commit.c:1361 builtin/count-objects.c:96 builtin/fsck.c:640 +#: builtin/log.c:1896 builtin/mv.c:123 builtin/read-tree.c:125 msgid "be verbose" msgstr "повече подробности" -#: apply.c:5004 +#: apply.c:4978 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "пренебрегване на неправилно липсващ знак за нов ред в края на файл" -#: apply.c:5007 +#: apply.c:4981 msgid "do not trust the line counts in the hunk headers" msgstr "без доверяване на номерата на редовете в заглавните части на парчетата" -#: apply.c:5009 builtin/am.c:2253 +#: apply.c:4983 builtin/am.c:2254 msgid "root" msgstr "НАЧАЛНА_ДИРЕКТОРИЯ" -#: apply.c:5010 +#: apply.c:4984 msgid "prepend <root> to all filenames" msgstr "добавяне на тази НАЧАЛНА_ДИРЕКТОРИЯ към имената на всички файлове" @@ -858,7 +863,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote ХРАНИЛИЩЕ [--exec КОМАНДА] --list" -#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299 +#: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "пътят „%s“ не съвпада с никой файл" @@ -871,7 +876,7 @@ msgstr "ФОРМАТ" msgid "archive format" msgstr "ФОРМАТ на архива" -#: archive.c:437 builtin/log.c:1452 +#: archive.c:437 builtin/log.c:1459 msgid "prefix" msgstr "ПРЕФИКС" @@ -879,9 +884,9 @@ msgstr "ПРЕФИКС" msgid "prepend prefix to each pathname in the archive" msgstr "добавяне на този ПРЕФИКС към всеки път в архива" -#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61 -#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:859 -#: builtin/hash-object.c:102 builtin/ls-files.c:547 builtin/ls-files.c:550 +#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:62 +#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:861 +#: builtin/hash-object.c:102 builtin/ls-files.c:551 builtin/ls-files.c:554 #: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120 #: parse-options.h:153 msgid "file" @@ -916,7 +921,7 @@ msgid "list supported archive formats" msgstr "извеждане на списъка с поддържаните формати" #: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109 -#: builtin/submodule--helper.c:634 builtin/submodule--helper.c:1001 +#: builtin/submodule--helper.c:872 builtin/submodule--helper.c:1239 msgid "repo" msgstr "хранилище" @@ -967,22 +972,22 @@ msgstr "" "Отрицателните шаблони се игнорират в атрибутите на git.\n" "Ако ви трябва начална удивителна, ползвайте „\\!“." -#: bisect.c:447 +#: bisect.c:458 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Неправилно цитирано съдържание във файла „%s“: %s" -#: bisect.c:655 +#: bisect.c:666 #, c-format msgid "We cannot bisect more!\n" msgstr "Повече не може да се търси двоично!\n" -#: bisect.c:708 +#: bisect.c:720 #, c-format msgid "Not a valid commit name %s" msgstr "Неправилно име на подаване „%s“" -#: bisect.c:732 +#: bisect.c:744 #, c-format msgid "" "The merge base %s is bad.\n" @@ -991,7 +996,7 @@ msgstr "" "Неправилна база за сливане: %s.\n" "Следователно грешката е коригирана между „%s“ и [%s].\n" -#: bisect.c:737 +#: bisect.c:749 #, c-format msgid "" "The merge base %s is new.\n" @@ -1000,7 +1005,7 @@ msgstr "" "Нова база за сливане: %s.\n" "Свойството е променено между „%s“ и [%s].\n" -#: bisect.c:742 +#: bisect.c:754 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1009,7 +1014,7 @@ msgstr "" "Базата за сливане „%s“ е %s.\n" "Следователно първото %s подаване е между „%s“ и [%s].\n" -#: bisect.c:750 +#: bisect.c:762 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1020,7 +1025,7 @@ msgstr "" "Двоичното търсене с git bisect няма да работи правилно.\n" "Дали не сте объркали указателите „%s“ и „%s“?\n" -#: bisect.c:763 +#: bisect.c:775 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1031,36 +1036,36 @@ msgstr "" "Не може да сме сигурни, че първото %s подаване е между „%s“ и „%s“.\n" "Двоичното търсене продължава." -#: bisect.c:798 +#: bisect.c:810 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Двоично търсене: трябва да се провери база за сливане\n" -#: bisect.c:850 +#: bisect.c:862 #, c-format msgid "a %s revision is needed" msgstr "необходима е версия „%s“" -#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234 +#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234 #, c-format msgid "could not create file '%s'" msgstr "файлът „%s“ не може да бъде създаден" -#: bisect.c:918 +#: bisect.c:930 #, c-format msgid "could not read file '%s'" msgstr "файлът „%s“ не може да бъде прочетен" -#: bisect.c:948 +#: bisect.c:960 msgid "reading bisect refs failed" msgstr "неуспешно прочитане на указателите за двоично търсене" -#: bisect.c:968 +#: bisect.c:979 #, c-format msgid "%s was both %s and %s\n" msgstr "„%s“ e както „%s“, така и „%s“\n" -#: bisect.c:976 +#: bisect.c:987 #, c-format msgid "" "No testable commit found.\n" @@ -1069,7 +1074,7 @@ msgstr "" "Липсва подходящо за тестване подаване.\n" "Проверете параметрите за пътищата.\n" -#: bisect.c:995 +#: bisect.c:1006 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1079,7 +1084,7 @@ msgstr[1] "(приблизително %d стъпки)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1001 +#: bisect.c:1012 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" @@ -1100,9 +1105,9 @@ msgstr "" "Едновременното задаване на опциите „--reverse“ и „--first-parent“ изисква " "указването на крайно подаване" -#: blame.c:1797 bundle.c:169 ref-filter.c:1932 sequencer.c:1168 -#: sequencer.c:2351 builtin/commit.c:1065 builtin/log.c:357 builtin/log.c:911 -#: builtin/log.c:1361 builtin/log.c:1690 builtin/log.c:1938 builtin/merge.c:369 +#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1179 +#: sequencer.c:2367 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918 +#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369 #: builtin/shortlog.c:191 msgid "revision walk setup failed" msgstr "неуспешно настройване на обхождането на версиите" @@ -1194,31 +1199,31 @@ msgstr "Настройките за следения клон не могат д msgid "Not tracking: ambiguous information for ref %s" msgstr "Няма следене: информацията за указателя „%s“ не е еднозначна" -#: branch.c:185 +#: branch.c:189 #, c-format msgid "'%s' is not a valid branch name." msgstr "„%s“ не е позволено име за клон." -#: branch.c:190 +#: branch.c:208 #, c-format msgid "A branch named '%s' already exists." msgstr "Вече съществува клон с име „%s“." -#: branch.c:197 +#: branch.c:213 msgid "Cannot force update the current branch." msgstr "Текущият клон не може да бъде принудително обновен." -#: branch.c:217 +#: branch.c:233 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "Зададените настройки за следенето са грешни — началото „%s“ не е клон." -#: branch.c:219 +#: branch.c:235 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "заявеният отдалечен клон „%s“ не съществува" -#: branch.c:221 +#: branch.c:237 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -1237,27 +1242,27 @@ msgstr "" "може да използвате „git push -u“, за да настроите към кой клон да се " "изтласква." -#: branch.c:264 +#: branch.c:280 #, c-format msgid "Not a valid object name: '%s'." msgstr "Неправилно име на обект: „%s“" -#: branch.c:284 +#: branch.c:300 #, c-format msgid "Ambiguous object name: '%s'." msgstr "Името на обект не е еднозначно: „%s“" -#: branch.c:289 +#: branch.c:305 #, c-format msgid "Not a valid branch point: '%s'." msgstr "Неправилно място за начало на клон: „%s“" -#: branch.c:343 +#: branch.c:359 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "„%s“ вече е изтеглен в „%s“" -#: branch.c:366 +#: branch.c:382 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "Указателят „HEAD“ на работното дърво „%s“ не е обновен" @@ -1272,9 +1277,8 @@ msgstr "Файлът „%s“ не изглежда да е пратка на gi msgid "unrecognized header: %s%s (%d)" msgstr "непозната заглавна част: %s%s (%d)" -#: bundle.c:88 sequencer.c:1346 sequencer.c:1793 sequencer.c:2500 -#: sequencer.c:2583 sequencer.c:2609 sequencer.c:2687 sequencer.c:2807 -#: sequencer.c:2949 builtin/commit.c:782 +#: bundle.c:88 sequencer.c:1357 sequencer.c:1804 sequencer.c:2631 +#: sequencer.c:2657 sequencer.c:2748 sequencer.c:2850 builtin/commit.c:782 #, c-format msgid "could not open '%s'" msgstr "„%s“ не може да се отвори" @@ -1319,7 +1323,7 @@ msgid "ref '%s' is excluded by the rev-list options" msgstr "" "указателят „%s“ не е бил включен поради опциите зададени на „git rev-list“" -#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296 +#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296 #, c-format msgid "unrecognized argument: %s" msgstr "непознат аргумент: %s" @@ -1342,8 +1346,8 @@ msgstr "Командата „git index-pack“ не завърши успешн msgid "invalid color value: %.*s" msgstr "неправилна стойност за цвят: %.*s" -#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465 -#: builtin/am.c:1467 builtin/am.c:2105 +#: commit.c:41 sequencer.c:1611 builtin/am.c:421 builtin/am.c:465 +#: builtin/am.c:1471 builtin/am.c:2106 #, c-format msgid "could not parse %s" msgstr "„%s“ не може да се анализира" @@ -1353,7 +1357,7 @@ msgstr "„%s“ не може да се анализира" msgid "%s %s is not a commit!" msgstr "%s %s не е подаване!" -#: commit.c:1517 +#: commit.c:1524 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" @@ -1363,169 +1367,174 @@ msgstr "" "Може да поправите подаването заедно със съобщението или може да\n" "зададете ползваното кодиране в настройката „i18n.commitencoding“.\n" -#: compat/obstack.c:406 compat/obstack.c:408 +#: compat/obstack.c:405 compat/obstack.c:407 msgid "memory exhausted" msgstr "паметта свърши" -#: config.c:187 +#: config.c:186 msgid "relative config include conditionals must come from files" msgstr "относителните условни изрази за вмъкване трябва да идват от файлове" -#: config.c:721 +#: config.c:720 #, c-format msgid "bad config line %d in blob %s" msgstr "неправилен ред за настройки %d в BLOB „%s“" -#: config.c:725 +#: config.c:724 #, c-format msgid "bad config line %d in file %s" msgstr "неправилен ред за настройки %d във файла „%s“" -#: config.c:729 +#: config.c:728 #, c-format msgid "bad config line %d in standard input" msgstr "неправилен ред за настройки %d на стандартния вход" -#: config.c:733 +#: config.c:732 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "неправилен ред за настройки %d в BLOB за подмодул „%s“" -#: config.c:737 +#: config.c:736 #, c-format msgid "bad config line %d in command line %s" msgstr "неправилен ред за настройки %d на командния ред „%s“" -#: config.c:741 +#: config.c:740 #, c-format msgid "bad config line %d in %s" msgstr "неправилен ред за настройки %d в „%s“" -#: config.c:869 +#: config.c:868 msgid "out of range" msgstr "извън диапазона" -#: config.c:869 +#: config.c:868 msgid "invalid unit" msgstr "неправилна мерна единица" -#: config.c:875 +#: config.c:874 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "неправилна числова стойност „%s“ за „%s“: %s" -#: config.c:880 +#: config.c:879 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "неправилна числова стойност „%s“ за „%s“ в BLOB „%s“: %s" -#: config.c:883 +#: config.c:882 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "неправилна числова стойност „%s“ за „%s“ във файла „%s“: %s" -#: config.c:886 +#: config.c:885 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "неправилна числова стойност „%s“ за „%s“ на стандартния вход: %s" -#: config.c:889 +#: config.c:888 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "неправилна числова стойност „%s“ за „%s“ в BLOB от подмодул „%s“: %s" -#: config.c:892 +#: config.c:891 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "неправилна числова стойност „%s“ за „%s“ на командния ред „%s“: %s" -#: config.c:895 +#: config.c:894 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "неправилна числова стойност „%s“ за „%s“ в %s: %s" -#: config.c:990 +#: config.c:989 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "домашната папка на потребителя не може да бъде открита: „%s“" -#: config.c:1085 config.c:1096 +#: config.c:998 +#, c-format +msgid "'%s' for '%s' is not a valid timestamp" +msgstr "„%s“ не е правилна стойност за време за „%s“" + +#: config.c:1094 config.c:1105 #, c-format msgid "bad zlib compression level %d" msgstr "неправилно ниво на компресиране: %d" -#: config.c:1213 +#: config.c:1222 #, c-format msgid "invalid mode for object creation: %s" msgstr "неправилен режим за създаването на обекти: %s" -#: config.c:1372 +#: config.c:1378 #, c-format msgid "bad pack compression level %d" msgstr "неправилно ниво на компресиране при пакетиране: %d" -#: config.c:1568 +#: config.c:1574 msgid "unable to parse command-line config" msgstr "неправилни настройки от командния ред" -#: config.c:1900 +#: config.c:1906 msgid "unknown error occurred while reading the configuration files" msgstr "неочаквана грешка при изчитането на конфигурационните файлове" -#: config.c:2087 +#: config.c:2093 #, c-format msgid "Invalid %s: '%s'" msgstr "Неправилен %s: „%s“" -#: config.c:2130 +#: config.c:2136 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "" -"непозната стойност „%s“ за настройката „core.untrackedCache“. Ще се ползва " +"непозната стойност „%s“ за настройката „core.untrackedCache“. Ще се ползва " "стандартната стойност „keep“ (запазване)" -#: config.c:2156 +#: config.c:2162 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" "стойността на „splitIndex.maxPercentChange“ трябва да е между 1 и 100, а не " "%d" -#: config.c:2167 +#: config.c:2187 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "неразпозната стойност „%s“ от командния ред" -#: config.c:2169 +#: config.c:2189 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "неправилна настройка „%s“ във файла „%s“ на ред №%d" -#: config.c:2228 +#: config.c:2248 #, c-format msgid "%s has multiple values" msgstr "зададени са няколко стойности за „%s“" -#: config.c:2571 config.c:2789 +#: config.c:2591 config.c:2808 #, c-format msgid "fstat on %s failed" msgstr "неуспешно изпълнение на „fstat“ върху „%s“" -#: config.c:2678 +#: config.c:2698 #, c-format msgid "could not set '%s' to '%s'" msgstr "„%s“ не може да се зададе да е „%s“" -#: config.c:2680 builtin/remote.c:776 +#: config.c:2700 builtin/remote.c:776 #, c-format msgid "could not unset '%s'" msgstr "„%s“ не може да се премахне" -#: connect.c:50 +#: connect.c:52 msgid "The remote end hung up upon initial contact" msgstr "Отдалеченото хранилище прекъсна връзката веднага след отварянето ѝ" -#: connect.c:52 +#: connect.c:54 msgid "" "Could not read from remote repository.\n" "\n" @@ -1658,7 +1667,7 @@ msgstr[1] "преди %<PRIuMAX> години" msgid "failed to read orderfile '%s'" msgstr "файлът с подредбата на съответствията „%s“ не може да бъде прочетен" -#: diffcore-rename.c:536 +#: diffcore-rename.c:535 msgid "Performing inexact rename detection" msgstr "Търсене на преименувания на обекти съчетани с промени" @@ -1693,7 +1702,7 @@ msgstr "" msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Непозната стойност „%s“ за настройката „diff.submodule“" -#: diff.c:398 +#: diff.c:401 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -1702,23 +1711,23 @@ msgstr "" "Грешки в настройката „diff.dirstat“:\n" "%s" -#: diff.c:3861 +#: diff.c:3799 #, c-format msgid "external diff died, stopping at %s" msgstr "" "външната програма за разлики завърши неуспешно. Спиране на работата при „%s“" -#: diff.c:4189 +#: diff.c:4127 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" "Опциите „--name-only“, „--name-status“, „--check“ и „-s“ са несъвместими " "една с друга" -#: diff.c:4279 +#: diff.c:4215 msgid "--follow requires exactly one pathspec" msgstr "Опцията „--follow“ изисква точно един път" -#: diff.c:4445 +#: diff.c:4381 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -1727,52 +1736,57 @@ msgstr "" "Неразпознат параметър към опцията „--dirstat/-X“:\n" "%s" -#: diff.c:4459 +#: diff.c:4395 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Неразпознат параметър към опцията „--submodule“: „%s“" -#: diff.c:5505 +#: diff.c:5446 msgid "inexact rename detection was skipped due to too many files." msgstr "" "търсенето на преименувания на обекти съчетани с промени се прескача поради " "многото файлове." -#: diff.c:5508 +#: diff.c:5449 msgid "only found copies from modified paths due to too many files." msgstr "" "установени са точните копия на променените пътища поради многото файлове." -#: diff.c:5511 +#: diff.c:5452 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "задайте променливата „%s“ да е поне %d и отново изпълнете командата." -#: dir.c:1983 +#: dir.c:2100 msgid "failed to get kernel name and information" msgstr "името и версията на ядрото не бяха получени" -#: dir.c:2102 +#: dir.c:2219 msgid "Untracked cache is disabled on this system or location." msgstr "" "Кеша за неследените файлове е изключен на тази система или местоположение." -#: dir.c:2885 dir.c:2890 +#: dir.c:3002 dir.c:3007 #, c-format msgid "could not create directories for %s" msgstr "директориите за „%s“ не може да бъдат създадени" -#: dir.c:2915 +#: dir.c:3032 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "директорията на git не може да се мигрира от „%s“ до „%s“" -#: entry.c:176 +#: editor.c:61 +#, c-format +msgid "hint: Waiting for your editor to close the file...%c" +msgstr "Подсказка: чака се редакторът ви да затвори файла …%c" + +#: entry.c:177 msgid "Filtering content" msgstr "Филтриране на съдържанието" -#: entry.c:417 +#: entry.c:435 #, c-format msgid "could not stat file '%s'" msgstr "неуспешно изпълнение на „stat“ върху файла „%s“" @@ -1843,7 +1857,7 @@ msgstr "неправилно подаване: „%s“" msgid "giving up" msgstr "преустановяване" -#: fetch-pack.c:534 progress.c:242 +#: fetch-pack.c:534 progress.c:229 msgid "done" msgstr "действието завърши" @@ -1857,104 +1871,104 @@ msgstr "получено бе %s (%d) %s" msgid "Marking %s as complete" msgstr "Отбелязване на „%s“ като пълно" -#: fetch-pack.c:776 +#: fetch-pack.c:777 #, c-format msgid "already have %s (%s)" msgstr "вече има „%s“ (%s)" -#: fetch-pack.c:814 +#: fetch-pack.c:815 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: не може да се създаде процес за демултиплексора" -#: fetch-pack.c:822 +#: fetch-pack.c:823 msgid "protocol error: bad pack header" msgstr "протоколна грешка: неправилна заглавна част на пакет" -#: fetch-pack.c:878 +#: fetch-pack.c:879 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: не може да се създаде процес за „%s“" -#: fetch-pack.c:894 +#: fetch-pack.c:895 #, c-format msgid "%s failed" msgstr "неуспешно изпълнение на „%s“" -#: fetch-pack.c:896 +#: fetch-pack.c:897 msgid "error in sideband demultiplexer" msgstr "грешка в демултиплексора" -#: fetch-pack.c:923 +#: fetch-pack.c:924 msgid "Server does not support shallow clients" msgstr "Сървърът не поддържа плитки клиенти" -#: fetch-pack.c:927 +#: fetch-pack.c:928 msgid "Server supports multi_ack_detailed" msgstr "Сървърът поддържа „multi_ack_detailed“" -#: fetch-pack.c:930 +#: fetch-pack.c:931 msgid "Server supports no-done" msgstr "Сървърът поддържа „no-done“" -#: fetch-pack.c:936 +#: fetch-pack.c:937 msgid "Server supports multi_ack" msgstr "Сървърът поддържа „multi_ack“" -#: fetch-pack.c:940 +#: fetch-pack.c:941 msgid "Server supports side-band-64k" msgstr "Сървърът поддържа „side-band-64k“" -#: fetch-pack.c:944 +#: fetch-pack.c:945 msgid "Server supports side-band" msgstr "Сървърът поддържа „side-band“" -#: fetch-pack.c:948 +#: fetch-pack.c:949 msgid "Server supports allow-tip-sha1-in-want" msgstr "Сървърът поддържа „allow-tip-sha1-in-want“" -#: fetch-pack.c:952 +#: fetch-pack.c:953 msgid "Server supports allow-reachable-sha1-in-want" msgstr "Сървърът поддържа „allow-reachable-sha1-in-want“" -#: fetch-pack.c:962 +#: fetch-pack.c:963 msgid "Server supports ofs-delta" msgstr "Сървърът поддържа „ofs-delta“" -#: fetch-pack.c:969 +#: fetch-pack.c:970 #, c-format msgid "Server version is %.*s" msgstr "Версията на сървъра е: %.*s" -#: fetch-pack.c:975 +#: fetch-pack.c:976 msgid "Server does not support --shallow-since" msgstr "Сървърът не поддържа опцията „--shallow-since“" -#: fetch-pack.c:979 +#: fetch-pack.c:980 msgid "Server does not support --shallow-exclude" msgstr "Сървърът не поддържа опцията „--shallow-exclude“" -#: fetch-pack.c:981 +#: fetch-pack.c:982 msgid "Server does not support --deepen" msgstr "Сървърът не поддържа опцията „--deepen“" -#: fetch-pack.c:992 +#: fetch-pack.c:993 msgid "no common commits" msgstr "няма общи подавания" -#: fetch-pack.c:1004 +#: fetch-pack.c:1005 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: неуспешно доставяне." -#: fetch-pack.c:1166 +#: fetch-pack.c:1167 msgid "no matching remote head" msgstr "не може да бъде открит подходящ връх от отдалеченото хранилище" -#: fetch-pack.c:1188 +#: fetch-pack.c:1189 #, c-format msgid "no such remote ref %s" msgstr "такъв отдалечен указател няма: %s" -#: fetch-pack.c:1191 +#: fetch-pack.c:1192 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Сървърът не позволява заявка за необявен „%s“" @@ -1977,17 +1991,17 @@ msgstr "Програмата не успя да запише самостоят msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "прескачане на неправилния цвят „%.*s“ в „log.graphColors“" -#: grep.c:1970 +#: grep.c:2017 #, c-format msgid "'%s': unable to read %s" msgstr "„%s“: файлът сочен от „%s“ не може да бъде прочетен" -#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134 +#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134 #, c-format msgid "failed to stat '%s'" msgstr "не може да бъде получена информация чрез „stat“ за „%s“" -#: grep.c:1998 +#: grep.c:2045 #, c-format msgid "'%s': short read" msgstr "„%s“: изчитането върна по-малко байтове от очакваното" @@ -2061,12 +2075,12 @@ msgstr[1] "" msgid "git version [<options>]" msgstr "git version [ОПЦИЯ…]" -#: help.c:456 +#: help.c:462 #, c-format msgid "%s: %s - %s" msgstr "%s: %s — %s" -#: help.c:460 +#: help.c:466 msgid "" "\n" "Did you mean this?" @@ -2142,6 +2156,15 @@ msgstr "името съдържа само непозволени знаци: msgid "invalid date format: %s" msgstr "неправилен формат на дата: %s" +#: list-objects-filter-options.c:30 +msgid "multiple object filter types cannot be combined" +msgstr "не може да комбинирате филтри по различен вид обекти" + +#: list-objects-filter-options.c:41 list-objects-filter-options.c:68 +#, c-format +msgid "invalid filter-spec expression '%s'" +msgstr "указан е неправилен израз за филтър: „%s“" + #: lockfile.c:151 #, c-format msgid "" @@ -2170,8 +2193,8 @@ msgstr "Файлът-ключалка „%s.lock“ не може да бъде msgid "failed to read the cache" msgstr "кешът не може да бъде прочетен" -#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380 -#: builtin/checkout.c:595 builtin/clone.c:754 +#: merge.c:95 builtin/am.c:1980 builtin/am.c:2014 builtin/checkout.c:379 +#: builtin/checkout.c:600 builtin/clone.c:754 msgid "unable to write new index file" msgstr "неуспешно записване на новия индекс" @@ -2370,7 +2393,7 @@ msgstr "Прескачане на „%s“ (слетият резултат е msgid "Auto-merging %s" msgstr "Автоматично сливане на „%s“" -#: merge-recursive.c:1775 git-submodule.sh:944 +#: merge-recursive.c:1775 git-submodule.sh:932 msgid "submodule" msgstr "ПОДМОДУЛ" @@ -2392,48 +2415,48 @@ msgstr "файл/директория" msgid "directory/file" msgstr "директория/файл" -#: merge-recursive.c:1908 +#: merge-recursive.c:1909 #, 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:1917 +#: merge-recursive.c:1918 #, c-format msgid "Adding %s" msgstr "Добавяне на „%s“" -#: merge-recursive.c:1954 +#: merge-recursive.c:1955 msgid "Already up to date!" msgstr "Вече е обновено!" -#: merge-recursive.c:1963 +#: merge-recursive.c:1964 #, c-format msgid "merging of trees %s and %s failed" msgstr "неуспешно сливане на дърветата „%s“ и „%s“" -#: merge-recursive.c:2060 +#: merge-recursive.c:2061 msgid "Merging:" msgstr "Сливане:" -#: merge-recursive.c:2073 +#: merge-recursive.c:2074 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "открит е %u общ предшественик:" msgstr[1] "открити са %u общи предшественици:" -#: merge-recursive.c:2112 +#: merge-recursive.c:2113 msgid "merge returned no commit" msgstr "сливането не върна подаване" -#: merge-recursive.c:2175 +#: merge-recursive.c:2176 #, c-format msgid "Could not parse object '%s'" msgstr "Неуспешен анализ на обекта „%s“" -#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814 +#: merge-recursive.c:2190 builtin/merge.c:656 builtin/merge.c:815 msgid "Unable to write index." msgstr "Индексът не може да бъде прочетен" @@ -2614,16 +2637,7 @@ msgstr "„%s“ (клавиш: „%c“)" msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: магическите пътища не се поддържат от командата „%s“" -#: pathspec.c:571 -msgid "" -"empty strings as pathspecs will be made invalid in upcoming releases. please " -"use . instead if you meant to match all paths" -msgstr "" -"възможно е празните низове да се окажат неправилни шаблони за пътища в " -"следващи версии на Git. Ако искате съвпадение с всички пътища, използвайте: " -"„.“" - -#: pathspec.c:595 +#: pathspec.c:592 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "пътят „%s“ е след символна връзка" @@ -2632,7 +2646,7 @@ msgstr "пътят „%s“ е след символна връзка" msgid "unable to parse --pretty format" msgstr "аргументът към опцията „--pretty“ не може да се анализира" -#: read-cache.c:1443 +#: read-cache.c:1472 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -2641,7 +2655,7 @@ msgstr "" "Зададена е неправилна стойност на настройката „index.version“.\n" "Ще се ползва версия %i" -#: read-cache.c:1453 +#: read-cache.c:1482 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -2651,52 +2665,52 @@ msgstr "" "„GIT_INDEX_VERSION“.\n" "Ще се ползва версия %i" -#: read-cache.c:2316 builtin/merge.c:1046 +#: read-cache.c:2370 sequencer.c:2725 wrapper.c:658 builtin/merge.c:1048 #, c-format msgid "could not close '%s'" msgstr "„%s“ не може да се затвори" -#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077 +#: read-cache.c:2442 sequencer.c:1366 sequencer.c:2093 #, c-format msgid "could not stat '%s'" msgstr "неуспешно изпълнение на „stat“ върху „%s“" -#: read-cache.c:2407 +#: read-cache.c:2455 #, c-format msgid "unable to open git dir: %s" msgstr "не може да се отвори директорията на git: %s" -#: read-cache.c:2419 +#: read-cache.c:2467 #, c-format msgid "unable to unlink: %s" msgstr "неуспешно изтриване на „%s“" -#: refs.c:638 +#: refs.c:706 #, c-format msgid "Could not open '%s' for writing" msgstr "„%s“ не може да бъде отворен за запис" -#: refs.c:1779 +#: refs.c:1850 msgid "ref updates forbidden inside quarantine environment" msgstr "обновяванията на указатели са забранени в среди под карантина" -#: refs/files-backend.c:1136 +#: refs/files-backend.c:1189 #, c-format msgid "could not remove reference %s" msgstr "Указателят „%s“ не може да бъде изтрит" -#: refs/files-backend.c:1150 refs/packed-backend.c:1430 -#: refs/packed-backend.c:1440 +#: refs/files-backend.c:1203 refs/packed-backend.c:1524 +#: refs/packed-backend.c:1534 #, c-format msgid "could not delete reference %s: %s" msgstr "Указателят „%s“ не може да бъде изтрит: %s" -#: refs/files-backend.c:1153 refs/packed-backend.c:1443 +#: refs/files-backend.c:1206 refs/packed-backend.c:1537 #, c-format msgid "could not delete references: %s" msgstr "Указателите не може да бъдат изтрити: %s" -#: ref-filter.c:35 wt-status.c:1811 +#: ref-filter.c:35 wt-status.c:1816 msgid "gone" msgstr "изтрит" @@ -2715,157 +2729,157 @@ msgstr "назад с %d" msgid "ahead %d, behind %d" msgstr "напред с %d, назад с %d" -#: ref-filter.c:104 +#: ref-filter.c:107 #, c-format msgid "expected format: %%(color:<color>)" msgstr "очакван формат: %%(color:ЦВЯТ)" -#: ref-filter.c:106 +#: ref-filter.c:109 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "непознат цвят: %%(color:%s)" -#: ref-filter.c:126 +#: ref-filter.c:129 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "очаква се цяло число за „refname:lstrip=%s“" -#: ref-filter.c:130 +#: ref-filter.c:133 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "очаква се цяло число за „refname:rstrip=%s“" -#: ref-filter.c:132 +#: ref-filter.c:135 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "непознат аргумент за „%%(%s)“: %s" -#: ref-filter.c:172 +#: ref-filter.c:184 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) не приема аргументи" -#: ref-filter.c:179 +#: ref-filter.c:191 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) не приема аргументи" -#: ref-filter.c:186 +#: ref-filter.c:209 #, c-format -msgid "%%(trailers) does not take arguments" -msgstr "%%(trailers) не приема аргументи" +msgid "unknown %%(trailers) argument: %s" +msgstr "непознат аргумент „%%(trailers)“: %s" -#: ref-filter.c:205 +#: ref-filter.c:232 #, c-format msgid "positive value expected contents:lines=%s" msgstr "очаква се положителна стойност за „contents:lines=%s“" -#: ref-filter.c:207 +#: ref-filter.c:234 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "непознат аргумент за %%(contents): %s" -#: ref-filter.c:220 +#: ref-filter.c:247 #, c-format msgid "positive value expected objectname:short=%s" msgstr "очаква се положителна стойност за „objectname:short=%s“" -#: ref-filter.c:224 +#: ref-filter.c:251 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "непознат аргумент за %%(objectname): %s" -#: ref-filter.c:251 +#: ref-filter.c:278 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "очакван формат: %%(align:ШИРОЧИНА,ПОЗИЦИЯ)" -#: ref-filter.c:263 +#: ref-filter.c:290 #, c-format msgid "unrecognized position:%s" msgstr "непозната позиция: %s" -#: ref-filter.c:267 +#: ref-filter.c:294 #, c-format msgid "unrecognized width:%s" msgstr "непозната широчина: %s" -#: ref-filter.c:273 +#: ref-filter.c:300 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "непознат аргумент за %%(align): %s" -#: ref-filter.c:277 +#: ref-filter.c:304 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "очаква се положителна широчина с лексемата „%%(align)“" -#: ref-filter.c:292 +#: ref-filter.c:319 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "непознат аргумент за „%%(if)“: %s" -#: ref-filter.c:382 +#: ref-filter.c:409 #, c-format msgid "malformed field name: %.*s" msgstr "неправилно име на обект: „%.*s“" -#: ref-filter.c:408 +#: ref-filter.c:435 #, c-format msgid "unknown field name: %.*s" msgstr "непознато име на обект: „%.*s“" -#: ref-filter.c:520 +#: ref-filter.c:547 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "формат: лексемата %%(if) е използвана без съответната ѝ %%(then)" -#: ref-filter.c:580 +#: ref-filter.c:607 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "формат: лексемата %%(then) е използвана без съответната ѝ %%(if)" -#: ref-filter.c:582 +#: ref-filter.c:609 #, c-format msgid "format: %%(then) atom used more than once" msgstr "формат: лексемата %%(then) е използвана повече от един път" -#: ref-filter.c:584 +#: ref-filter.c:611 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "формат: лексемата %%(then) е използвана след %%(else)" -#: ref-filter.c:610 +#: ref-filter.c:637 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "формат: лексемата %%(else) е използвана без съответната ѝ %%(if)" -#: ref-filter.c:612 +#: ref-filter.c:639 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "формат: лексемата %%(else) е използвана без съответната ѝ %%(then)" -#: ref-filter.c:614 +#: ref-filter.c:641 #, c-format msgid "format: %%(else) atom used more than once" msgstr "формат: лексемата %%(else) е използвана повече от един път" -#: ref-filter.c:627 +#: ref-filter.c:654 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "формат: лексемата %%(end) е използвана без съответната ѝ" -#: ref-filter.c:682 +#: ref-filter.c:709 #, c-format msgid "malformed format string %s" msgstr "неправилен форматиращ низ „%s“" -#: ref-filter.c:1268 +#: ref-filter.c:1313 #, c-format msgid "(no branch, rebasing %s)" msgstr "(извън клон, пребазиране на „%s“)" -#: ref-filter.c:1271 +#: ref-filter.c:1316 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(извън клон, двоично търсене от „%s“)" @@ -2873,7 +2887,7 @@ msgstr "(извън клон, двоично търсене от „%s“)" #. TRANSLATORS: make sure this matches "HEAD #. detached at " in wt-status.c #. -#: ref-filter.c:1279 +#: ref-filter.c:1324 #, c-format msgid "(HEAD detached at %s)" msgstr "(Указателят „HEAD“ не е свързан и е при „%s“)" @@ -2881,139 +2895,139 @@ msgstr "(Указателят „HEAD“ не е свързан и е при „ #. TRANSLATORS: make sure this matches "HEAD #. detached from " in wt-status.c #. -#: ref-filter.c:1286 +#: ref-filter.c:1331 #, c-format msgid "(HEAD detached from %s)" msgstr "Указателят „HEAD“ не е свързан и е отделѐн от „%s“" -#: ref-filter.c:1290 +#: ref-filter.c:1335 msgid "(no branch)" msgstr "(извън клон)" -#: ref-filter.c:1439 ref-filter.c:1470 +#: ref-filter.c:1488 ref-filter.c:1519 #, c-format msgid "missing object %s for %s" msgstr "обектът „%s“ липсва за „%s“" -#: ref-filter.c:1442 ref-filter.c:1473 +#: ref-filter.c:1491 ref-filter.c:1522 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "неуспешно анализиране чрез „parse_object_buffer“ на „%s“ за „%s“" -#: ref-filter.c:1773 +#: ref-filter.c:1822 #, c-format msgid "malformed object at '%s'" msgstr "обект със сгрешен формат при „%s“" -#: ref-filter.c:1840 +#: ref-filter.c:1889 #, c-format msgid "ignoring ref with broken name %s" msgstr "игнориране на указателя с грешно име „%s“" -#: ref-filter.c:1845 +#: ref-filter.c:1894 #, c-format msgid "ignoring broken ref %s" msgstr "игнориране на повредения указател „%s“" -#: ref-filter.c:2107 +#: ref-filter.c:2156 #, c-format msgid "format: %%(end) atom missing" msgstr "грешка във форма̀та: липсва лексемата %%(end)" -#: ref-filter.c:2201 +#: ref-filter.c:2250 #, c-format msgid "malformed object name %s" msgstr "неправилно име на обект „%s“" -#: remote.c:750 +#: remote.c:780 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Невъзможно е да се доставят едновременно и „%s“, и „%s“ към „%s“" -#: remote.c:754 +#: remote.c:784 #, c-format msgid "%s usually tracks %s, not %s" msgstr "„%s“ обикновено следи „%s“, а не „%s“" -#: remote.c:758 +#: remote.c:788 #, c-format msgid "%s tracks both %s and %s" msgstr "„%s“ следи както „%s“, така и „%s“" -#: remote.c:766 +#: remote.c:796 msgid "Internal error" msgstr "Вътрешна грешка" -#: remote.c:1681 remote.c:1783 +#: remote.c:1711 remote.c:1813 msgid "HEAD does not point to a branch" msgstr "Указателят „HEAD“ не сочи към клон" -#: remote.c:1690 +#: remote.c:1720 #, c-format msgid "no such branch: '%s'" msgstr "няма клон на име „%s“" -#: remote.c:1693 +#: remote.c:1723 #, c-format msgid "no upstream configured for branch '%s'" msgstr "не е зададен клон-източник за клона „%s“" -#: remote.c:1699 +#: remote.c:1729 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "клонът-източник „%s“ не е съхранен като следящ клон" -#: remote.c:1714 +#: remote.c:1744 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "липсва локален следящ клон за местоположението за изтласкване „%s“ в " "хранилището „%s“" -#: remote.c:1726 +#: remote.c:1756 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "няма информация клонът „%s“ да следи някой друг" -#: remote.c:1737 +#: remote.c:1767 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "указателят за изтласкване на „%s“ не включва „%s“" -#: remote.c:1750 +#: remote.c:1780 msgid "push has no destination (push.default is 'nothing')" msgstr "указателят за изтласкване не включва цел („push.default“ е „nothing“)" -#: remote.c:1772 +#: remote.c:1802 msgid "cannot resolve 'simple' push to a single destination" msgstr "простото (simple) изтласкване не съответства на една цел" -#: remote.c:2076 +#: remote.c:2106 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Този клон следи „%s“, но следеният клон е изтрит.\n" -#: remote.c:2080 +#: remote.c:2110 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (за да коригирате това, използвайте „git branch --unset-upstream“)\n" -#: remote.c:2083 +#: remote.c:2113 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Клонът е актуализиран към „%s“.\n" -#: remote.c:2087 +#: remote.c:2117 #, 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:2093 +#: remote.c:2123 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (публикувайте локалните си промени чрез „git push“)\n" -#: remote.c:2096 +#: remote.c:2126 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -3021,11 +3035,11 @@ msgid_plural "" msgstr[0] "Клонът ви е с %2$d подаване зад „%1$s“ и може да бъде превъртян.\n" msgstr[1] "Клонът ви е с %2$d подавания зад „%1$s“ и може да бъде превъртян.\n" -#: remote.c:2104 +#: remote.c:2134 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (обновете локалния си клон чрез „git pull“)\n" -#: remote.c:2107 +#: remote.c:2137 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -3040,27 +3054,37 @@ msgstr[1] "" "Текущият клон се е отделил от „%s“,\n" "двата имат съответно по %d и %d несъвпадащи подавания.\n" -#: remote.c:2117 +#: remote.c:2147 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (слейте отдалечения клон в локалния чрез „git pull“)\n" -#: revision.c:2256 +#: revision.c:2268 msgid "your current branch appears to be broken" msgstr "Текущият клон е повреден" -#: revision.c:2259 +#: revision.c:2271 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "Текущият клон „%s“ е без подавания " -#: revision.c:2453 +#: revision.c:2465 msgid "--first-parent is incompatible with --bisect" msgstr "опциите „--first-parent“ и „--bisect“ са несъвместими" -#: run-command.c:644 +#: run-command.c:645 msgid "open /dev/null failed" msgstr "неуспешно отваряне на „/dev/null“" +#: run-command.c:1188 +#, c-format +msgid "" +"The '%s' hook was ignored because it's not set as executable.\n" +"You can disable this warning with `git config advice.ignoredHook false`." +msgstr "" +"Куката „%s“ се прескача, защото липсват права за изпълнение.\n" +"За да изключите това предупреждение, изпълнете:\n" +" git config advice.ignoredHook false" + #: send-pack.c:151 #, c-format msgid "unable to parse remote unpack status: %s" @@ -3131,13 +3155,13 @@ msgstr "" "пътища с „git add ПЪТ…“ или „git rm ПЪТ…“, след което\n" "подайте резултата с командата „git commit'“." -#: sequencer.c:297 sequencer.c:1704 +#: sequencer.c:297 sequencer.c:1715 #, c-format msgid "could not lock '%s'" msgstr "„%s“ не може да се заключи" -#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723 -#: sequencer.c:2733 sequencer.c:2749 +#: sequencer.c:300 sequencer.c:1592 sequencer.c:1720 sequencer.c:1734 +#: sequencer.c:2723 sequencer.c:2794 wrapper.c:656 #, c-format msgid "could not write to '%s'" msgstr "в „%s“ не може да се пише" @@ -3147,13 +3171,13 @@ msgstr "в „%s“ не може да се пише" msgid "could not write eol to '%s'" msgstr "краят на ред не може да се запише в „%s“" -#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711 +#: sequencer.c:308 sequencer.c:1597 sequencer.c:1722 #, c-format msgid "failed to finalize '%s'." msgstr "„%s“ не може да се завърши." -#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259 -#: builtin/commit.c:754 builtin/merge.c:1044 +#: sequencer.c:332 sequencer.c:829 sequencer.c:1618 builtin/am.c:259 +#: builtin/commit.c:754 builtin/merge.c:1046 #, c-format msgid "could not read '%s'" msgstr "файлът „%s“ не може да бъде прочетен" @@ -3175,20 +3199,20 @@ msgstr "%s: превъртане" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:474 +#: sequencer.c:477 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: новият индекс не може да бъде запазен" -#: sequencer.c:493 +#: sequencer.c:496 msgid "could not resolve HEAD commit\n" msgstr "подаването сочено от указателя „HEAD“ не може да бъде открито\n" -#: sequencer.c:513 +#: sequencer.c:516 msgid "unable to update cache tree\n" msgstr "дървото на кеша не може да бъде обновено\n" -#: sequencer.c:597 +#: sequencer.c:600 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -3217,17 +3241,17 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:699 +#: sequencer.c:702 #, c-format msgid "could not parse commit %s\n" msgstr "подаването „%s“ не може да бъде анализирано\n" -#: sequencer.c:704 +#: sequencer.c:707 #, c-format msgid "could not parse parent commit %s\n" msgstr "родителското подаване „%s“ не може да бъде анализирано\n" -#: sequencer.c:826 +#: sequencer.c:836 #, c-format msgid "" "unexpected 1st line of squash message:\n" @@ -3238,7 +3262,7 @@ msgstr "" "\n" " %.*s" -#: sequencer.c:832 +#: sequencer.c:842 #, c-format msgid "" "invalid 1st line of squash message:\n" @@ -3249,240 +3273,240 @@ msgstr "" "\n" " %.*s" -#: sequencer.c:838 sequencer.c:863 +#: sequencer.c:848 sequencer.c:873 #, c-format msgid "This is a combination of %d commits." msgstr "Това е обединение от %d подавания" -#: sequencer.c:847 sequencer.c:2681 +#: sequencer.c:857 sequencer.c:2742 msgid "need a HEAD to fixup" msgstr "За смачкване ви трябва указател „HEAD“" -#: sequencer.c:849 +#: sequencer.c:859 msgid "could not read HEAD" msgstr "указателят „HEAD“ не може да се прочете" -#: sequencer.c:851 +#: sequencer.c:861 msgid "could not read HEAD's commit message" msgstr "" "съобщението за подаване към указателя „HEAD“ не може да бъде прочетено: %s" -#: sequencer.c:857 +#: sequencer.c:867 #, c-format msgid "cannot write '%s'" msgstr "„%s“ не може да се запази" -#: sequencer.c:866 git-rebase--interactive.sh:446 +#: sequencer.c:876 git-rebase--interactive.sh:446 msgid "This is the 1st commit message:" msgstr "Това е 1-то съобщение при подаване:" -#: sequencer.c:874 +#: sequencer.c:884 #, c-format msgid "could not read commit message of %s" msgstr "съобщението за подаване към „%s“ не може да бъде прочетено" -#: sequencer.c:881 +#: sequencer.c:891 #, c-format msgid "This is the commit message #%d:" msgstr "Това е съобщение при подаване №%d:" -#: sequencer.c:886 +#: sequencer.c:896 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Съобщение при подаване №%d ще бъде прескочено:" -#: sequencer.c:891 +#: sequencer.c:901 #, c-format msgid "unknown command: %d" msgstr "непозната команда: %d" -#: sequencer.c:957 +#: sequencer.c:967 msgid "your index file is unmerged." msgstr "индексът не е слят." -#: sequencer.c:975 +#: sequencer.c:986 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "подаването „%s“ е сливане, но не е дадена опцията „-m“" -#: sequencer.c:983 +#: sequencer.c:994 #, c-format msgid "commit %s does not have parent %d" msgstr "подаването „%s“ няма родител %d" -#: sequencer.c:987 +#: sequencer.c:998 #, c-format msgid "mainline was specified but commit %s is not a merge." msgstr "указано е базово подаване, но подаването „%s“ не е сливане." -#: sequencer.c:993 +#: sequencer.c:1004 #, 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:1014 +#: sequencer.c:1025 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: неразпозната стойност за родителското подаване „%s“" -#: sequencer.c:1077 sequencer.c:1853 +#: sequencer.c:1088 sequencer.c:1864 #, c-format msgid "could not rename '%s' to '%s'" msgstr "„%s“ не може да се преименува на „%s“" -#: sequencer.c:1128 +#: sequencer.c:1139 #, c-format msgid "could not revert %s... %s" msgstr "подаването „%s“… не може да бъде отменено: „%s“" -#: sequencer.c:1129 +#: sequencer.c:1140 #, c-format msgid "could not apply %s... %s" msgstr "подаването „%s“… не може да бъде приложено: „%s“" -#: sequencer.c:1171 +#: sequencer.c:1182 msgid "empty commit set passed" msgstr "зададено е празно множество от подавания" -#: sequencer.c:1181 +#: sequencer.c:1192 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: неуспешно изчитане на индекса" -#: sequencer.c:1188 +#: sequencer.c:1198 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: неуспешно обновяване на индекса" -#: sequencer.c:1308 +#: sequencer.c:1319 #, c-format msgid "invalid line %d: %.*s" msgstr "неправилен ред %d: %.*s" -#: sequencer.c:1316 +#: sequencer.c:1327 #, c-format msgid "cannot '%s' without a previous commit" msgstr "Без предишно подаване не може да се изпълни „%s“" -#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614 -#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951 +#: sequencer.c:1360 sequencer.c:2522 sequencer.c:2557 sequencer.c:2636 +#: sequencer.c:2662 sequencer.c:2752 sequencer.c:2853 #, c-format msgid "could not read '%s'." msgstr "от „%s“ не може да се чете." -#: sequencer.c:1361 +#: sequencer.c:1372 msgid "please fix this using 'git rebase --edit-todo'." msgstr "коригирайте това чрез „git rebase --edit-todo“." -#: sequencer.c:1363 +#: sequencer.c:1374 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "неизползваем файл с описание на предстоящите действия: „%s“" -#: sequencer.c:1368 +#: sequencer.c:1379 msgid "no commits parsed." msgstr "никое от подаванията не може да се разпознае." -#: sequencer.c:1379 +#: sequencer.c:1390 msgid "cannot cherry-pick during a revert." msgstr "" "по време на отмяна на подаване не може да се извърши отбиране на подаване." -#: sequencer.c:1381 +#: sequencer.c:1392 msgid "cannot revert during a cherry-pick." msgstr "по време на отбиране не може да се извърши отмяна на подаване." -#: sequencer.c:1448 +#: sequencer.c:1459 #, c-format msgid "invalid key: %s" msgstr "неправилен ключ: „%s“" -#: sequencer.c:1451 +#: sequencer.c:1462 #, c-format msgid "invalid value for %s: %s" msgstr "неправилна стойност за „%s“: „%s“" -#: sequencer.c:1517 +#: sequencer.c:1528 #, c-format msgid "malformed options sheet: '%s'" msgstr "неправилен файл с опции: „%s“" -#: sequencer.c:1555 +#: sequencer.c:1566 msgid "a cherry-pick or revert is already in progress" msgstr "" "в момента вече се извършва отбиране на подавания или пребазиране на клона" -#: sequencer.c:1556 +#: sequencer.c:1567 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "използвайте „git cherry-pick (--continue | --quit | --abort)“" -#: sequencer.c:1559 +#: sequencer.c:1570 #, c-format msgid "could not create sequencer directory '%s'" msgstr "директорията за секвенсора „%s“ не може да бъде създадена" -#: sequencer.c:1574 +#: sequencer.c:1585 msgid "could not lock HEAD" msgstr "указателят „HEAD“ не може да се заключи" -#: sequencer.c:1632 sequencer.c:2211 +#: sequencer.c:1643 sequencer.c:2227 msgid "no cherry-pick or revert in progress" msgstr "" "в момента не се извършва отбиране на подавания или пребазиране на клона" -#: sequencer.c:1634 +#: sequencer.c:1645 msgid "cannot resolve HEAD" msgstr "Подаването сочено от указателя „HEAD“ не може да бъде открито" -#: sequencer.c:1636 sequencer.c:1671 +#: sequencer.c:1647 sequencer.c:1682 msgid "cannot abort from a branch yet to be born" msgstr "" "действието не може да бъде преустановено, когато сте на клон, който тепърва " "предстои да бъде създаден" -#: sequencer.c:1657 builtin/grep.c:711 +#: sequencer.c:1668 builtin/grep.c:713 #, c-format msgid "cannot open '%s'" msgstr "„%s“ не може да бъде отворен" -#: sequencer.c:1659 +#: sequencer.c:1670 #, c-format msgid "cannot read '%s': %s" msgstr "„%s“ не може да бъде прочетен: %s" -#: sequencer.c:1660 +#: sequencer.c:1671 msgid "unexpected end of file" msgstr "неочакван край на файл" -#: sequencer.c:1666 +#: sequencer.c:1677 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" "запазеният преди започването на отбирането файл за указателя „HEAD“ — „%s“ е " "повреден" -#: sequencer.c:1677 +#: sequencer.c:1688 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" "Изглежда указателят „HEAD“ е променен. Проверете към какво сочи.\n" "Не се правят промени." -#: sequencer.c:1818 sequencer.c:2109 +#: sequencer.c:1829 sequencer.c:2125 msgid "cannot read HEAD" msgstr "указателят „HEAD“ не може да бъде прочетен" -#: sequencer.c:1858 builtin/difftool.c:640 +#: sequencer.c:1869 builtin/difftool.c:639 #, c-format msgid "could not copy '%s' to '%s'" msgstr "„%s“ не може да се копира като „%s“" -#: sequencer.c:1874 +#: sequencer.c:1888 msgid "could not read index" msgstr "индексът не може да бъде прочетен" -#: sequencer.c:1879 +#: sequencer.c:1893 #, c-format msgid "" "execution failed: %s\n" @@ -3497,11 +3521,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:1885 +#: sequencer.c:1899 msgid "and made changes to the index and/or the working tree\n" msgstr "и промени индекса и/или работното дърво\n" -#: sequencer.c:1891 +#: sequencer.c:1905 #, c-format msgid "" "execution succeeded: %s\n" @@ -3518,17 +3542,17 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:1948 +#: sequencer.c:1964 #, c-format msgid "Applied autostash.\n" msgstr "Автоматично скатаното е приложено.\n" -#: sequencer.c:1960 +#: sequencer.c:1976 #, c-format msgid "cannot store %s" msgstr "„%s“ не може да бъде запазен" -#: sequencer.c:1963 git-rebase.sh:175 +#: sequencer.c:1979 git-rebase.sh:175 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -3539,57 +3563,57 @@ msgstr "" "надеждно скатани. Можете да пробвате да ги приложите чрез „git stash pop“\n" "или да ги изхвърлите чрез „git stash drop“, когато поискате.\n" -#: sequencer.c:2045 +#: sequencer.c:2061 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Спиране при „%s“… %.*s\n" -#: sequencer.c:2087 +#: sequencer.c:2103 #, c-format msgid "unknown command %d" msgstr "непозната команда %d" -#: sequencer.c:2117 +#: sequencer.c:2133 msgid "could not read orig-head" msgstr "указателят за „orig-head“ не може да се прочете" -#: sequencer.c:2122 sequencer.c:2678 +#: sequencer.c:2138 sequencer.c:2739 msgid "could not read 'onto'" msgstr "указателят за „onto“ не може да се прочете" -#: sequencer.c:2129 +#: sequencer.c:2145 #, c-format msgid "could not update %s" msgstr "„%s“ не може да се обнови" -#: sequencer.c:2136 +#: sequencer.c:2152 #, c-format msgid "could not update HEAD to %s" msgstr "„HEAD“ не може да бъде обновен до „%s“" -#: sequencer.c:2220 +#: sequencer.c:2236 msgid "cannot rebase: You have unstaged changes." msgstr "не може да пребазирате, защото има промени, които не са в индекса." -#: sequencer.c:2225 +#: sequencer.c:2241 msgid "could not remove CHERRY_PICK_HEAD" msgstr "указателят „CHERRY_PICK_HEAD“ не може да бъде изтрит" -#: sequencer.c:2234 +#: sequencer.c:2250 msgid "cannot amend non-existing commit" msgstr "несъществуващо подаване не може да се поправи" -#: sequencer.c:2236 +#: sequencer.c:2252 #, c-format msgid "invalid file: '%s'" msgstr "неправилен файл: „%s“" -#: sequencer.c:2238 +#: sequencer.c:2254 #, c-format msgid "invalid contents: '%s'" msgstr "неправилно съдържание: „%s“" -#: sequencer.c:2241 +#: sequencer.c:2257 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -3599,50 +3623,46 @@ msgstr "" "В работното дърво има неподадени промени. Първо ги подайте, а след това\n" "отново изпълнете „git rebase --continue“." -#: sequencer.c:2251 +#: sequencer.c:2267 msgid "could not commit staged changes." msgstr "промените в индекса не могат да бъдат подадени." -#: sequencer.c:2331 +#: sequencer.c:2347 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: не може да се отбере „%s“" -#: sequencer.c:2335 +#: sequencer.c:2351 #, c-format msgid "%s: bad revision" msgstr "%s: неправилна версия" -#: sequencer.c:2368 +#: sequencer.c:2384 msgid "can't revert as initial commit" msgstr "първоначалното подаване не може да бъде отменено" -#: sequencer.c:2471 +#: sequencer.c:2489 msgid "make_script: unhandled options" msgstr "make_script: неподдържани опции" -#: sequencer.c:2474 +#: sequencer.c:2492 msgid "make_script: error preparing revisions" msgstr "make_script: грешка при подготовката на версии" -#: sequencer.c:2510 +#: sequencer.c:2526 sequencer.c:2561 #, c-format msgid "unusable todo list: '%s'" msgstr "неуспешно изтриване на списъка за изпълнение: „%s“" -#: sequencer.c:2516 +#: sequencer.c:2609 #, c-format -msgid "unable to open '%s' for writing" -msgstr "„%s“ не може да бъде отворен за запис" - -#: sequencer.c:2561 -#, c-format -msgid "unrecognized setting %s for optionrebase.missingCommitsCheck. Ignoring." +msgid "" +"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." msgstr "" -"Непозната стойност „%s“ за настройката „optionrebase.missingCommitsCheck“. " +"Непозната стойност „%s“ за настройката „rebase.missingCommitsCheck“. " "Настройката се прескача." -#: sequencer.c:2641 +#: sequencer.c:2689 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -3651,7 +3671,7 @@ msgstr "" "Предупреждение: някои подавания може да са пропуснати.\n" "Пропуснати подавания (новите са най-отгоре):\n" -#: sequencer.c:2648 +#: sequencer.c:2696 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -3668,7 +3688,7 @@ msgstr "" "предупреждение)\n" "или „error“ (считане за грешка).\n" -#: sequencer.c:2660 +#: sequencer.c:2708 #, c-format msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" @@ -3679,31 +3699,21 @@ msgstr "" "continue“ след това.\n" "Може и да преустановите пребазирането с командата „git rebase --abort“.\n" -#: sequencer.c:2708 -#, c-format -msgid "could not parse commit '%s'" -msgstr "подаването „%s“ не може да бъде анализирано" - -#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395 -#: builtin/am.c:775 +#: sequencer.c:2721 sequencer.c:2788 wrapper.c:225 wrapper.c:395 +#: builtin/am.c:779 #, c-format msgid "could not open '%s' for writing" msgstr "„%s“ не може да бъде отворен за запис" -#: sequencer.c:2756 +#: sequencer.c:2769 #, c-format -msgid "could not truncate '%s'" -msgstr "неуспешно отрязване чрез „truncate“ върху „%s“" +msgid "could not parse commit '%s'" +msgstr "подаването „%s“ не може да бъде анализирано" -#: sequencer.c:2848 +#: sequencer.c:2891 msgid "the script was already rearranged." msgstr "скриптът вече е преподреден." -#: sequencer.c:2953 -#, c-format -msgid "could not finish '%s'" -msgstr "„%s“ не може да се завърши" - #: setup.c:171 #, c-format msgid "" @@ -3740,36 +3750,36 @@ msgstr "" "\n" " git КОМАНДА [ВЕРСИЯ…] -- [ФАЙЛ…]" -#: setup.c:499 +#: setup.c:501 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Очаква се версия на хранилището на git <= %d, а не %d" -#: setup.c:507 +#: setup.c:509 msgid "unknown repository extensions found:" msgstr "открити са непознати разширения в хранилището:" -#: setup.c:806 +#: setup.c:811 #, c-format msgid "Not a git repository (or any of the parent directories): %s" msgstr "" "Нито тази, нито която и да е от по-горните директории, не е хранилище на " "git: %s" -#: setup.c:808 builtin/index-pack.c:1653 +#: setup.c:813 builtin/index-pack.c:1653 msgid "Cannot come back to cwd" msgstr "Процесът не може да се върне към предишната работна директория" -#: setup.c:1046 +#: setup.c:1052 msgid "Unable to read current working directory" msgstr "Текущата работна директория не може да бъде прочетена" -#: setup.c:1058 setup.c:1064 +#: setup.c:1064 setup.c:1070 #, c-format msgid "Cannot change to '%s'" msgstr "Не може да се влезе в директорията „%s“" -#: setup.c:1077 +#: setup.c:1083 #, c-format msgid "" "Not a git repository (or any parent up to mount point %s)\n" @@ -3780,7 +3790,7 @@ msgstr "" "Git работи в рамките на една файлова система, защото променливата на средата " "„GIT_DISCOVERY_ACROSS_FILESYSTEM“ не е зададена." -#: setup.c:1159 +#: setup.c:1167 #, c-format msgid "" "Problem with core.sharedRepository filemode value (0%.3o).\n" @@ -3790,41 +3800,41 @@ msgstr "" "(0%.3o).\n" "Собственикът на файла трябва да има права за писане и четене." -#: sha1_file.c:528 +#: sha1_file.c:598 #, c-format msgid "path '%s' does not exist" msgstr "пътят „%s“ не съществува." -#: sha1_file.c:554 +#: sha1_file.c:624 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "все още не се поддържа еталонно хранилище „%s“ като свързано." -#: sha1_file.c:560 +#: sha1_file.c:630 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "еталонното хранилище „%s“ не е локално" -#: sha1_file.c:566 +#: sha1_file.c:636 #, c-format msgid "reference repository '%s' is shallow" msgstr "еталонното хранилище „%s“ е плитко" -#: sha1_file.c:574 +#: sha1_file.c:644 #, c-format msgid "reference repository '%s' is grafted" msgstr "еталонното хранилище „%s“ е с присаждане" -#: sha1_name.c:420 +#: sha1_name.c:422 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "късият SHA1 „%s“ не е еднозначен" -#: sha1_name.c:431 +#: sha1_name.c:433 msgid "The candidates are:" msgstr "Възможностите са:" -#: sha1_name.c:590 +#: sha1_name.c:693 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" @@ -3840,79 +3850,79 @@ msgstr "" "шестнадесетични знака, защото стандартно те ще бъдат прескачани.\n" "Възможно е такива указатели да са създадени случайно. Например:\n" "\n" -" git checkout -b $BRANCH $(git rev-parse…)\n" +" git checkout -b $BRANCH $(git rev-parse…)\n" "\n" "където стойността на променливата на средата BRANCH е празна, при което се\n" -"създава подобен указател. Прегледайте тези указатели и ги изтрийте. Можете " +"създава подобен указател. Прегледайте тези указатели и ги изтрийте. Можете " "да\n" "спрете това съобщение като изпълните командата:\n" "„git config advice.objectNameWarning false“" -#: submodule.c:93 submodule.c:127 +#: submodule.c:96 submodule.c:130 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" "Неслетите файлове „.gitmodules“ не могат да бъдат променяни. Първо " "коригирайте конфликтите" -#: submodule.c:97 submodule.c:131 +#: submodule.c:100 submodule.c:134 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "Във файла „.gitmodules“ липсва раздел за директория „path=%s“" -#: submodule.c:105 +#: submodule.c:108 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Записът „%s“ във файла „.gitmodules“ не може да бъде променен" -#: submodule.c:138 +#: submodule.c:141 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "Записът „%s“ във файла „.gitmodules“ не може да бъде изтрит" -#: submodule.c:149 +#: submodule.c:152 msgid "staging updated .gitmodules failed" msgstr "неуспешно добавяне на променения файл „.gitmodules“ в индекса" -#: submodule.c:309 +#: submodule.c:312 #, c-format msgid "in unpopulated submodule '%s'" msgstr "в неподготвения подмодул „%s“" -#: submodule.c:340 +#: submodule.c:343 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Пътят „%s“ е в подмодула „%.*s“" -#: submodule.c:799 +#: submodule.c:833 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "записът за подмодула „%s“ (%s) е %s, а не подаване!" -#: submodule.c:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149 +#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387 msgid "Failed to resolve HEAD as a valid ref." msgstr "Не може да се открие към какво сочи указателят „HEAD“" -#: submodule.c:1304 +#: submodule.c:1370 #, c-format msgid "'%s' not recognized as a git repository" msgstr "„%s“ не е хранилище на git" -#: submodule.c:1442 +#: submodule.c:1508 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "командата „git status“ не може да се изпълни в подмодула „%s“" -#: submodule.c:1455 +#: submodule.c:1521 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "командата „git status“ не може да се изпълни в подмодула „%s“" -#: submodule.c:1548 +#: submodule.c:1614 #, c-format msgid "submodule '%s' has dirty index" msgstr "индексът на подмодула „%s“ не е чист" -#: submodule.c:1809 +#: submodule.c:1876 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -3920,18 +3930,18 @@ msgstr "" "не се поддържа „relocate_gitdir“ за подмодула „%s“, който има повече от едно " "работно дърво" -#: submodule.c:1821 submodule.c:1877 +#: submodule.c:1888 submodule.c:1944 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "името на подмодула „%s“ не може да бъде намерено" -#: submodule.c:1825 builtin/submodule--helper.c:671 -#: builtin/submodule--helper.c:681 +#: submodule.c:1892 builtin/submodule--helper.c:909 +#: builtin/submodule--helper.c:919 #, c-format msgid "could not create directory '%s'" msgstr "Директорията „%s“ не може да бъде създадена" -#: submodule.c:1828 +#: submodule.c:1895 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -3942,20 +3952,20 @@ msgstr "" "„%s“ към\n" "„%s“\n" -#: submodule.c:1912 +#: submodule.c:1979 #, c-format msgid "could not recurse into submodule '%s'" msgstr "неуспешна обработка на поддиректориите в подмодула „%s“" -#: submodule.c:1956 +#: submodule.c:2023 msgid "could not start ls-files in .." msgstr "„ls-stat“ не може да се стартира в „..“" -#: submodule.c:1976 +#: submodule.c:2043 msgid "BUG: returned path string doesn't match cwd?" msgstr "ГРЕШКА: полученият низ за пътя не съвпада с върнатото от „cwd“" -#: submodule.c:1995 +#: submodule.c:2062 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "„ls-tree“ завърши с неочакван изходен код: %d" @@ -4023,17 +4033,17 @@ msgstr "временният файл не може да се отвори" msgid "could not rename temporary file to %s" msgstr "временният файл не може да се преименува на „%s“" -#: transport.c:62 +#: transport.c:63 #, c-format msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "Клонът „%s“ ще следи „%s“ от „%s“\n" -#: transport.c:151 +#: transport.c:152 #, c-format msgid "transport: invalid depth option '%s'" msgstr "transport: неправилна опция за дълбочина: %s" -#: transport.c:888 +#: transport.c:904 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -4042,7 +4052,7 @@ msgstr "" "Следните пътища за подмодули съдържат промени,\n" "които липсват от всички отдалечени хранилища:\n" -#: transport.c:892 +#: transport.c:908 #, c-format msgid "" "\n" @@ -4067,11 +4077,11 @@ msgstr "" " git push\n" "\n" -#: transport.c:900 +#: transport.c:916 msgid "Aborting." msgstr "Преустановяване на действието." -#: transport-helper.c:1071 +#: transport-helper.c:1074 #, c-format msgid "Could not read ref %s" msgstr "Указателят „%s“ не може да се прочете." @@ -4092,7 +4102,7 @@ msgstr "празно име на файл в запис в дърво" msgid "too-short tree file" msgstr "прекалено кратък файл-дърво" -#: unpack-trees.c:106 +#: unpack-trees.c:107 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -4101,7 +4111,7 @@ msgstr "" "Изтеглянето ще презапише локалните промени на тези файлове:\n" "%%sПодайте или скатайте промените, за да преминете към нов клон." -#: unpack-trees.c:108 +#: unpack-trees.c:109 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -4110,7 +4120,7 @@ msgstr "" "Изтеглянето ще презапише локалните промени на тези файлове:\n" "%%s" -#: unpack-trees.c:111 +#: unpack-trees.c:112 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4119,7 +4129,7 @@ msgstr "" "Сливането ще презапише локалните промени на тези файлове:\n" "%%sПодайте или скатайте промените, за да слеете." -#: unpack-trees.c:113 +#: unpack-trees.c:114 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4128,7 +4138,7 @@ msgstr "" "Сливането ще презапише локалните промени на тези файлове:\n" "%%s" -#: unpack-trees.c:116 +#: unpack-trees.c:117 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -4137,7 +4147,7 @@ msgstr "" "„%s“ ще презапише локалните промени на тези файлове:\n" "%%sПодайте или скатайте промените, за да извършите „%s“." -#: unpack-trees.c:118 +#: unpack-trees.c:119 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -4146,7 +4156,7 @@ msgstr "" "„%s“ ще презапише локалните промени на тези файлове:\n" "%%s" -#: unpack-trees.c:123 +#: unpack-trees.c:124 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -4155,7 +4165,7 @@ msgstr "" "Обновяването на следните директории ще изтрие неследените файлове в тях:\n" "%s" -#: unpack-trees.c:127 +#: unpack-trees.c:128 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -4164,7 +4174,7 @@ msgstr "" "Изтеглянето ще изтрие тези неследени файлове в работното дърво:\n" "%%sПреместете ги или ги изтрийте, за да преминете на друг клон." -#: unpack-trees.c:129 +#: unpack-trees.c:130 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -4173,7 +4183,7 @@ msgstr "" "Изтеглянето ще изтрие тези неследени файлове в работното дърво:\n" "%%s" -#: unpack-trees.c:132 +#: unpack-trees.c:133 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -4182,7 +4192,7 @@ msgstr "" "Сливането ще изтрие тези неследени файлове в работното дърво:\n" "%%sПреместете ги или ги изтрийте, за да слеете." -#: unpack-trees.c:134 +#: unpack-trees.c:135 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -4191,7 +4201,7 @@ msgstr "" "Сливането ще изтрие тези неследени файлове в работното дърво:\n" "%%s" -#: unpack-trees.c:137 +#: unpack-trees.c:138 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -4200,7 +4210,7 @@ msgstr "" "„%s“ ще изтрие тези неследени файлове в работното дърво:\n" "%%sПреместете ги или ги изтрийте, за да извършите „%s“." -#: unpack-trees.c:139 +#: unpack-trees.c:140 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -4209,7 +4219,7 @@ msgstr "" "„%s“ ще изтрие тези неследени файлове в работното дърво:\n" "%%s" -#: unpack-trees.c:144 +#: unpack-trees.c:145 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -4219,7 +4229,7 @@ msgstr "" "Изтеглянето ще презапише тези неследени файлове в работното дърво:\n" "%%sПреместете ги или ги изтрийте, за да смените клон." -#: unpack-trees.c:146 +#: unpack-trees.c:147 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -4229,7 +4239,7 @@ msgstr "" "Изтеглянето ще презапише тези неследени файлове в работното дърво:\n" "%%s" -#: unpack-trees.c:149 +#: unpack-trees.c:150 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -4238,7 +4248,7 @@ msgstr "" "Сливането ще презапише тези неследени файлове в работното дърво:\n" "%%sПреместете ги или ги изтрийте, за да слеете." -#: unpack-trees.c:151 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -4247,7 +4257,7 @@ msgstr "" "Сливането ще презапише тези неследени файлове в работното дърво:\n" "%%s" -#: unpack-trees.c:154 +#: unpack-trees.c:155 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -4256,7 +4266,7 @@ msgstr "" "„%s“ ще презапише тези неследени файлове в работното дърво:\n" "%%sПреместете ги или ги изтрийте, за да извършите „%s“." -#: unpack-trees.c:156 +#: unpack-trees.c:157 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -4265,12 +4275,12 @@ msgstr "" "„%s“ ще презапише тези неследени файлове в работното дърво:\n" "%%s" -#: unpack-trees.c:163 +#: unpack-trees.c:164 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "Записът за „%s“ съвпада с този за „%s“. Не може да се присвои." -#: unpack-trees.c:166 +#: unpack-trees.c:167 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" @@ -4280,7 +4290,7 @@ msgstr "" "актуални:\n" "%s" -#: unpack-trees.c:168 +#: unpack-trees.c:169 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -4291,7 +4301,7 @@ msgstr "" "дърво:\n" "%s" -#: unpack-trees.c:170 +#: unpack-trees.c:171 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -4302,7 +4312,7 @@ msgstr "" "дърво:\n" "%s" -#: unpack-trees.c:172 +#: unpack-trees.c:173 #, c-format msgid "" "Cannot update submodule:\n" @@ -4311,12 +4321,12 @@ msgstr "" "Подмодулът не може да бъде обновен:\n" "„%s“" -#: unpack-trees.c:249 +#: unpack-trees.c:250 #, c-format msgid "Aborting\n" msgstr "Преустановяване на действието\n" -#: unpack-trees.c:331 +#: unpack-trees.c:332 msgid "Checking out files" msgstr "Изтегляне на файлове" @@ -4359,8 +4369,8 @@ msgstr "„%s“ не може да бъде прочетен" msgid "could not open '%s' for reading and writing" msgstr "„%s“ не може да бъде отворен и за четене, и за запис" -#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766 -#: builtin/am.c:858 builtin/merge.c:1041 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770 +#: builtin/am.c:862 builtin/merge.c:1043 #, c-format msgid "could not open '%s' for reading" msgstr "файлът не може да бъде прочетен: „%s“" @@ -4374,16 +4384,6 @@ msgstr "няма достъп до „%s“" msgid "unable to get current working directory" msgstr "текущата работна директория е недостъпна" -#: wrapper.c:656 -#, c-format -msgid "could not write to %s" -msgstr "„%s“ не може да бъде записан" - -#: wrapper.c:658 -#, c-format -msgid "could not close %s" -msgstr "„%s“ не може да се затвори" - #: wt-status.c:150 msgid "Unmerged paths:" msgstr "Неслети пътища:" @@ -4414,11 +4414,11 @@ msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" " (използвайте „git rm ФАЙЛ…“, за да укажете разрешаването на конфликта)" -#: wt-status.c:198 wt-status.c:979 +#: wt-status.c:198 wt-status.c:984 msgid "Changes to be committed:" msgstr "Промени, които ще бъдат подадени:" -#: wt-status.c:216 wt-status.c:988 +#: wt-status.c:216 wt-status.c:993 msgid "Changes not staged for commit:" msgstr "Промени, които не са в индекса за подаване:" @@ -4523,22 +4523,22 @@ msgstr "променено съдържание, " msgid "untracked content, " msgstr "неследено съдържание, " -#: wt-status.c:819 +#: wt-status.c:824 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "Има %d скатаване." msgstr[1] "Има %d скатавания." -#: wt-status.c:851 +#: wt-status.c:856 msgid "Submodules changed but not updated:" msgstr "Подмодулите са променени, но не са обновени:" -#: wt-status.c:853 +#: wt-status.c:858 msgid "Submodule changes to be committed:" msgstr "Промени в подмодулите за подаване:" -#: wt-status.c:935 +#: wt-status.c:940 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -4546,241 +4546,241 @@ msgstr "" "Не променяйте и не изтривайте горния ред.\n" "Всичко отдолу ще бъде изтрито." -#: wt-status.c:1048 +#: wt-status.c:1053 msgid "You have unmerged paths." msgstr "Някои пътища не са слети." -#: wt-status.c:1051 +#: wt-status.c:1056 msgid " (fix conflicts and run \"git commit\")" msgstr " (коригирайте конфликтите и изпълнете „git commit“)" -#: wt-status.c:1053 +#: wt-status.c:1058 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (използвайте „git merge --abort“, за да преустановите сливането)" -#: wt-status.c:1058 +#: wt-status.c:1063 msgid "All conflicts fixed but you are still merging." msgstr "Всички конфликти са решени, но продължавате сливането." -#: wt-status.c:1061 +#: wt-status.c:1066 msgid " (use \"git commit\" to conclude merge)" msgstr " (използвайте „git commit“, за да завършите сливането)" -#: wt-status.c:1071 +#: wt-status.c:1076 msgid "You are in the middle of an am session." msgstr "В момента прилагате поредица от кръпки чрез „git am“." -#: wt-status.c:1074 +#: wt-status.c:1079 msgid "The current patch is empty." msgstr "Текущата кръпка е празна." -#: wt-status.c:1078 +#: wt-status.c:1083 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (коригирайте конфликтите и изпълнете „git am --continue“)" -#: wt-status.c:1080 +#: wt-status.c:1085 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (използвайте „git am --skip“, за да пропуснете тази кръпка)" -#: wt-status.c:1082 +#: wt-status.c:1087 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" " (използвайте „git am --abort“, за да възстановите първоначалния клон)" -#: wt-status.c:1214 +#: wt-status.c:1219 msgid "git-rebase-todo is missing." msgstr "„git-rebase-todo“ липсва." -#: wt-status.c:1216 +#: wt-status.c:1221 msgid "No commands done." msgstr "Не са изпълнени команди." -#: wt-status.c:1219 +#: wt-status.c:1224 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Последна изпълнена команда (изпълнена е общо %d команда):" msgstr[1] "Последна изпълнена команда (изпълнени са общо %d команди):" -#: wt-status.c:1230 +#: wt-status.c:1235 #, c-format msgid " (see more in file %s)" msgstr " повече информация има във файла „%s“)" -#: wt-status.c:1235 +#: wt-status.c:1240 msgid "No commands remaining." msgstr "Не остават повече команди." -#: wt-status.c:1238 +#: wt-status.c:1243 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Следваща команда за изпълнение (остава още %d команда):" msgstr[1] "Следваща команда за изпълнение (остават още %d команди):" -#: wt-status.c:1246 +#: wt-status.c:1251 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr "" " (използвайте „git rebase --edit-todo“, за да разгледате и редактирате)" -#: wt-status.c:1259 +#: wt-status.c:1264 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "В момента пребазирате клона „%s“ върху „%s“." -#: wt-status.c:1264 +#: wt-status.c:1269 msgid "You are currently rebasing." msgstr "В момента пребазирате." -#: wt-status.c:1278 +#: wt-status.c:1283 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (коригирайте конфликтите и използвайте „git rebase --continue“)" -#: wt-status.c:1280 +#: wt-status.c:1285 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (използвайте „git rebase --skip“, за да пропуснете тази кръпка)" -#: wt-status.c:1282 +#: wt-status.c:1287 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" " (използвайте „git rebase --abort“, за да възстановите първоначалния клон)" -#: wt-status.c:1288 +#: wt-status.c:1293 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (всички конфликти са коригирани: изпълнете „git rebase --continue“)" -#: wt-status.c:1292 +#: wt-status.c:1297 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "В момента разделяте подаване докато пребазирате клона „%s“ върху „%s“." -#: wt-status.c:1297 +#: wt-status.c:1302 msgid "You are currently splitting a commit during a rebase." msgstr "В момента разделяте подаване докато пребазирате." -#: wt-status.c:1300 +#: wt-status.c:1305 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (След като работното ви дърво стане чисто, използвайте „git rebase --" "continue“)" -#: wt-status.c:1304 +#: wt-status.c:1309 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "В момента редактирате подаване докато пребазирате клона „%s“ върху „%s“." -#: wt-status.c:1309 +#: wt-status.c:1314 msgid "You are currently editing a commit during a rebase." msgstr "В момента редактирате подаване докато пребазирате." -#: wt-status.c:1312 +#: wt-status.c:1317 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" " (използвайте „git commit --amend“, за да редактирате текущото подаване)" -#: wt-status.c:1314 +#: wt-status.c:1319 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (използвайте „git rebase --continue“, след като завършите промените си)" -#: wt-status.c:1324 +#: wt-status.c:1329 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "В момента отбирате подаването „%s“." -#: wt-status.c:1329 +#: wt-status.c:1334 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (коригирайте конфликтите и изпълнете „git cherry-pick --continue“)" -#: wt-status.c:1332 +#: wt-status.c:1337 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (всички конфликти са коригирани, изпълнете „git cherry-pick --continue“)" -#: wt-status.c:1334 +#: wt-status.c:1339 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (използвайте „git cherry-pick --abort“, за да отмените всички действия с " "отбиране)" -#: wt-status.c:1343 +#: wt-status.c:1348 #, c-format msgid "You are currently reverting commit %s." msgstr "В момента отменяте подаване „%s“." -#: wt-status.c:1348 +#: wt-status.c:1353 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (коригирайте конфликтите и изпълнете „git revert --continue“)" -#: wt-status.c:1351 +#: wt-status.c:1356 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (всички конфликти са коригирани, изпълнете „git revert --continue“)" -#: wt-status.c:1353 +#: wt-status.c:1358 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" " (използвайте „git revert --abort“, за да преустановите отмяната на " "подаване)" -#: wt-status.c:1364 +#: wt-status.c:1369 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "В момента търсите двоично, като сте стартирали от клон „%s“." -#: wt-status.c:1368 +#: wt-status.c:1373 msgid "You are currently bisecting." msgstr "В момента търсите двоично." -#: wt-status.c:1371 +#: wt-status.c:1376 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" " (използвайте „git bisect reset“, за да се върнете към първоначалното " "състояние и клон)" -#: wt-status.c:1568 +#: wt-status.c:1573 msgid "On branch " msgstr "На клон " -#: wt-status.c:1574 +#: wt-status.c:1579 msgid "interactive rebase in progress; onto " msgstr "извършвате интерактивно пребазиране върху " -#: wt-status.c:1576 +#: wt-status.c:1581 msgid "rebase in progress; onto " msgstr "извършвате пребазиране върху " -#: wt-status.c:1581 +#: wt-status.c:1586 msgid "HEAD detached at " msgstr "Указателят „HEAD“ не е свързан и е при " -#: wt-status.c:1583 +#: wt-status.c:1588 msgid "HEAD detached from " msgstr "Указателят „HEAD“ не е свързан и е отделѐн от " -#: wt-status.c:1586 +#: wt-status.c:1591 msgid "Not currently on any branch." msgstr "Извън всички клони." -#: wt-status.c:1606 +#: wt-status.c:1611 msgid "Initial commit" msgstr "Първоначално подаване" -#: wt-status.c:1607 +#: wt-status.c:1612 msgid "No commits yet" msgstr "Все още липсват подавания" -#: wt-status.c:1621 +#: wt-status.c:1626 msgid "Untracked files" msgstr "Неследени файлове" -#: wt-status.c:1623 +#: wt-status.c:1628 msgid "Ignored files" msgstr "Игнорирани файлове" -#: wt-status.c:1627 +#: wt-status.c:1632 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -4792,32 +4792,32 @@ msgstr "" "изпълнението, но не трябва да забравяте ръчно да добавяте новите файлове.\n" "За повече подробности погледнете „git status help“." -#: wt-status.c:1633 +#: wt-status.c:1638 #, c-format msgid "Untracked files not listed%s" msgstr "Неследените файлове не са изведени%s" -#: wt-status.c:1635 +#: wt-status.c:1640 msgid " (use -u option to show untracked files)" msgstr " (използвайте опцията „-u“, за да изведете неследените файлове)" -#: wt-status.c:1641 +#: wt-status.c:1646 msgid "No changes" msgstr "Няма промени" -#: wt-status.c:1646 +#: wt-status.c:1651 #, 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:1649 +#: wt-status.c:1654 #, c-format msgid "no changes added to commit\n" msgstr "към индекса за подаване не са добавени промени\n" -#: wt-status.c:1652 +#: wt-status.c:1657 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -4826,62 +4826,62 @@ msgstr "" "към индекса за подаване не са добавени промени, но има нови файлове " "(използвайте „git add“, за да започне тяхното следене)\n" -#: wt-status.c:1655 +#: wt-status.c:1660 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "към индекса за подаване не са добавени промени, но има нови файлове\n" -#: wt-status.c:1658 +#: wt-status.c:1663 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "липсват каквито и да е промени (създайте или копирайте файлове и използвайте " "„git add“, за да започне тяхното следене)\n" -#: wt-status.c:1661 wt-status.c:1666 +#: wt-status.c:1666 wt-status.c:1671 #, c-format msgid "nothing to commit\n" msgstr "липсват каквито и да е промени\n" -#: wt-status.c:1664 +#: wt-status.c:1669 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "липсват каквито и да е промени (използвайте опцията „-u“, за да се изведат и " "неследените файлове)\n" -#: wt-status.c:1668 +#: wt-status.c:1673 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "липсват каквито и да е промени, работното дърво е чисто\n" -#: wt-status.c:1780 +#: wt-status.c:1785 msgid "No commits yet on " msgstr "Все още липсват подавания в " -#: wt-status.c:1784 +#: wt-status.c:1789 msgid "HEAD (no branch)" msgstr "HEAD (извън клон)" -#: wt-status.c:1813 wt-status.c:1821 +#: wt-status.c:1818 wt-status.c:1826 msgid "behind " msgstr "назад с " -#: wt-status.c:1816 wt-status.c:1819 +#: wt-status.c:1821 wt-status.c:1824 msgid "ahead " msgstr "напред с " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2311 +#: wt-status.c:2318 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "не може да извършите „%s“, защото има промени, които не са в индекса." -#: wt-status.c:2317 +#: wt-status.c:2324 msgid "additionally, your index contains uncommitted changes." msgstr "освен това в индекса има неподадени промени." -#: wt-status.c:2319 +#: wt-status.c:2326 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "не може да извършите „%s“, защото в индекса има неподадени промени." @@ -4895,128 +4895,132 @@ msgstr "неуспешно изтриване на „%s“" msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [ОПЦИЯ…] [--] ПЪТ…" -#: builtin/add.c:82 +#: builtin/add.c:83 #, c-format msgid "unexpected diff status %c" msgstr "неочакван изходен код при генериране на разлика: %c" -#: builtin/add.c:87 builtin/commit.c:291 +#: builtin/add.c:88 builtin/commit.c:291 msgid "updating files failed" msgstr "неуспешно обновяване на файловете" -#: builtin/add.c:97 +#: builtin/add.c:98 #, c-format msgid "remove '%s'\n" msgstr "изтриване на „%s“\n" -#: builtin/add.c:153 +#: builtin/add.c:173 msgid "Unstaged changes after refreshing the index:" msgstr "Промени, които и след обновяването на индекса не са добавени към него:" -#: builtin/add.c:213 builtin/rev-parse.c:888 +#: builtin/add.c:233 builtin/rev-parse.c:888 msgid "Could not read the index" msgstr "Индексът не може да бъде прочетен" -#: builtin/add.c:224 +#: builtin/add.c:244 #, c-format msgid "Could not open '%s' for writing." msgstr "Файлът „%s“ не може да бъде отворен за запис." -#: builtin/add.c:228 +#: builtin/add.c:248 msgid "Could not write patch" msgstr "Кръпката не може да бъде записана" -#: builtin/add.c:231 +#: builtin/add.c:251 msgid "editing patch failed" msgstr "неуспешно редактиране на кръпка" -#: builtin/add.c:234 +#: builtin/add.c:254 #, c-format msgid "Could not stat '%s'" msgstr "Не може да се получи информация чрез „stat“ за файла „%s“" -#: builtin/add.c:236 +#: builtin/add.c:256 msgid "Empty patch. Aborted." msgstr "Празна кръпка, преустановяване на действието." -#: builtin/add.c:241 +#: builtin/add.c:261 #, c-format msgid "Could not apply '%s'" msgstr "Кръпката „%s“ не може да бъде приложена" -#: builtin/add.c:251 +#: builtin/add.c:271 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Следните пътища ще бъдат игнорирани според някой от файловете „.gitignore“:\n" -#: builtin/add.c:271 builtin/clean.c:910 builtin/fetch.c:132 builtin/mv.c:124 -#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529 +#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124 +#: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541 #: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164 msgid "dry run" msgstr "пробно изпълнение" -#: builtin/add.c:274 +#: builtin/add.c:294 msgid "interactive picking" msgstr "интерактивно отбиране на промени" -#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310 +#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310 msgid "select hunks interactively" msgstr "интерактивен избор на парчета код" -#: builtin/add.c:276 +#: builtin/add.c:296 msgid "edit current diff and apply" msgstr "редактиране на текущата разлика и прилагане" -#: builtin/add.c:277 +#: builtin/add.c:297 msgid "allow adding otherwise ignored files" msgstr "добавяне и на иначе игнорираните файлове" -#: builtin/add.c:278 +#: builtin/add.c:298 msgid "update tracked files" msgstr "обновяване на следените файлове" -#: builtin/add.c:279 +#: builtin/add.c:299 +msgid "renormalize EOL of tracked files (implies -u)" +msgstr "уеднаквяване на знаците за край на файл (включва опцията „-u“)" + +#: builtin/add.c:300 msgid "record only the fact that the path will be added later" msgstr "отбелязване само на факта, че пътят ще бъде добавен по-късно" -#: builtin/add.c:280 +#: builtin/add.c:301 msgid "add changes from all tracked and untracked files" msgstr "добавяне на всички промени в следените и неследените файлове" -#: builtin/add.c:283 +#: builtin/add.c:304 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" "игнориране на пътищата, които са изтрити от работното дърво (същото като „--" "no-all“)" -#: builtin/add.c:285 +#: builtin/add.c:306 msgid "don't add, only refresh the index" msgstr "без добавяне на нови файлове, само обновяване на индекса" -#: builtin/add.c:286 +#: builtin/add.c:307 msgid "just skip files which cannot be added because of errors" msgstr "" "прескачане на файловете, които не могат да бъдат добавени поради грешки" -#: builtin/add.c:287 +#: builtin/add.c:308 msgid "check if - even missing - files are ignored in dry run" msgstr "" "проверка, че при пробно изпълнение всички файлове, дори и изтритите, се " "игнорират" -#: builtin/add.c:288 builtin/update-index.c:954 +#: builtin/add.c:309 builtin/update-index.c:964 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/add.c:288 builtin/update-index.c:955 +#: builtin/add.c:309 builtin/update-index.c:965 msgid "override the executable bit of the listed files" msgstr "изрично задаване на стойността на флага дали файлът е изпълним" -#: builtin/add.c:290 +#: builtin/add.c:311 msgid "warn when adding an embedded repository" msgstr "предупреждаване при добавяне на вградено хранилище" -#: builtin/add.c:305 +#: builtin/add.c:326 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -5033,8 +5037,10 @@ msgid "" "\n" "See \"git help submodule\" for more information." msgstr "" -"Изтеглили сте допълнително хранилище в текущото. Когато клонирате обхващащото\n" -"хранилище няма да получите вграденото, защото външното хранилище няма представа\n" +"Изтеглили сте допълнително хранилище в текущото. Когато клонирате " +"обхващащото\n" +"хранилище няма да получите вграденото, защото външното хранилище няма " +"представа\n" "за вътрешното. За да добавите подмодул, изпълнете:\n" "\n" " git submodule add АДРЕС %s\n" @@ -5045,47 +5051,47 @@ msgstr "" "\n" "За повече информация погледнете „git help submodule“." -#: builtin/add.c:333 +#: builtin/add.c:354 #, c-format msgid "adding embedded git repository: %s" msgstr "добавяне на вградено хранилище: %s" -#: builtin/add.c:351 +#: builtin/add.c:372 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Използвайте опцията „-f“, за да ги добавите наистина.\n" -#: builtin/add.c:359 +#: builtin/add.c:380 msgid "adding files failed" msgstr "неуспешно добавяне на файлове" -#: builtin/add.c:396 +#: builtin/add.c:417 msgid "-A and -u are mutually incompatible" msgstr "опциите „-A“ и „-u“ са несъвместими" -#: builtin/add.c:403 +#: builtin/add.c:424 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "Опцията „--ignore-missing“ е съвместима само с „--dry-run“" -#: builtin/add.c:407 +#: builtin/add.c:428 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "параметърът към „--chmod“ — „%s“ може да е или „-x“, или „+x“" -#: builtin/add.c:422 +#: builtin/add.c:443 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Нищо не е зададено и нищо не е добавено.\n" -#: builtin/add.c:423 +#: builtin/add.c:444 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Вероятно искахте да използвате „git add .“?\n" -#: builtin/add.c:428 builtin/check-ignore.c:176 builtin/checkout.c:282 -#: builtin/checkout.c:479 builtin/clean.c:957 builtin/commit.c:350 -#: builtin/mv.c:143 builtin/reset.c:249 builtin/rm.c:271 -#: builtin/submodule--helper.c:243 +#: builtin/add.c:449 builtin/check-ignore.c:176 builtin/checkout.c:281 +#: builtin/checkout.c:484 builtin/clean.c:958 builtin/commit.c:350 +#: builtin/diff-tree.c:114 builtin/mv.c:143 builtin/reset.c:249 +#: builtin/rm.c:271 builtin/submodule--helper.c:311 msgid "index file corrupt" msgstr "файлът с индекса е повреден" @@ -5112,85 +5118,85 @@ msgstr "Бележката не може да се копира от „%s“ к msgid "fseek failed" msgstr "неуспешно изпълнение на „fseek“" -#: builtin/am.c:786 +#: builtin/am.c:790 #, c-format msgid "could not parse patch '%s'" msgstr "кръпката „%s“ не може да се анализира" -#: builtin/am.c:851 +#: builtin/am.c:855 msgid "Only one StGIT patch series can be applied at once" msgstr "" "Само една серия кръпки от „StGIT“ може да бъде прилагана в даден момент" -#: builtin/am.c:899 +#: builtin/am.c:903 msgid "invalid timestamp" msgstr "неправилна стойност за време" -#: builtin/am.c:904 builtin/am.c:916 +#: builtin/am.c:908 builtin/am.c:920 msgid "invalid Date line" msgstr "неправилен ред за дата „Date“" -#: builtin/am.c:911 +#: builtin/am.c:915 msgid "invalid timezone offset" msgstr "неправилно отместване на часовия пояс" -#: builtin/am.c:1004 +#: builtin/am.c:1008 msgid "Patch format detection failed." msgstr "Форматът на кръпката не може да бъде определен." -#: builtin/am.c:1009 builtin/clone.c:402 +#: builtin/am.c:1013 builtin/clone.c:402 #, c-format msgid "failed to create directory '%s'" msgstr "директорията „%s“ не може да бъде създадена" -#: builtin/am.c:1013 +#: builtin/am.c:1017 msgid "Failed to split patches." msgstr "Кръпките не могат да бъдат разделени." -#: builtin/am.c:1142 builtin/commit.c:376 +#: builtin/am.c:1146 builtin/commit.c:376 msgid "unable to write index file" msgstr "индексът не може да бъде записан" -#: builtin/am.c:1193 +#: builtin/am.c:1197 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "След коригирането на този проблем изпълнете „%s --continue“." -#: builtin/am.c:1194 +#: builtin/am.c:1198 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Ако предпочитате да прескочите тази кръпка, изпълнете „%s --skip“." -#: builtin/am.c:1195 +#: builtin/am.c:1199 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "За да се върнете към първоначалното състояние, изпълнете „%s --abort“." -#: builtin/am.c:1302 +#: builtin/am.c:1306 msgid "Patch is empty." msgstr "Кръпката е празна." -#: builtin/am.c:1368 +#: builtin/am.c:1372 #, c-format msgid "invalid ident line: %.*s" msgstr "грешен ред с идентичност: %.*s" -#: builtin/am.c:1390 +#: builtin/am.c:1394 #, c-format msgid "unable to parse commit %s" msgstr "подаването не може да бъде анализирано: %s" -#: builtin/am.c:1584 +#: builtin/am.c:1587 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "В хранилището липсват необходимите обекти BLOB, за да се премине към тройно " "сливане." -#: builtin/am.c:1586 +#: builtin/am.c:1589 msgid "Using index info to reconstruct a base tree..." msgstr "Базовото дърво се реконструира от информацията в индекса…" -#: builtin/am.c:1605 +#: builtin/am.c:1608 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -5198,39 +5204,39 @@ msgstr "" "Кръпката не може да се приложи към обектите BLOB в индекса.\n" "Да не би да сте я редактирали на ръка?" -#: builtin/am.c:1611 +#: builtin/am.c:1614 msgid "Falling back to patching base and 3-way merge..." msgstr "Преминаване към прилагане на кръпка към базата и тройно сливане…" -#: builtin/am.c:1636 +#: builtin/am.c:1639 msgid "Failed to merge in the changes." msgstr "Неуспешно сливане на промените." -#: builtin/am.c:1660 builtin/merge.c:641 +#: builtin/am.c:1663 builtin/merge.c:642 msgid "git write-tree failed to write a tree" msgstr "Командата „git write-tree“ не успя да запише обект-дърво" -#: builtin/am.c:1667 +#: builtin/am.c:1670 msgid "applying to an empty history" msgstr "прилагане върху празна история" -#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824 -#: builtin/merge.c:849 +#: builtin/am.c:1683 builtin/commit.c:1798 builtin/merge.c:825 +#: builtin/merge.c:850 msgid "failed to write commit object" msgstr "обектът за подаването не може да бъде записан" -#: builtin/am.c:1713 builtin/am.c:1717 +#: builtin/am.c:1716 builtin/am.c:1720 #, c-format msgid "cannot resume: %s does not exist." msgstr "не може да се продължи — „%s“ не съществува." -#: builtin/am.c:1733 +#: builtin/am.c:1736 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "За интерактивно изпълнение е необходимо стандартният\n" "вход да е свързан с терминал, а в момента не е." -#: builtin/am.c:1738 +#: builtin/am.c:1741 msgid "Commit Body is:" msgstr "Тялото на кръпката за прилагане е:" @@ -5238,38 +5244,38 @@ msgstr "Тялото на кръпката за прилагане е:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1748 +#: builtin/am.c:1751 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" "Прилагане? „y“ — да/„n“ — не/„e“ — редактиране/„v“ — преглед/„a“ — приемане " "на всичко:" -#: builtin/am.c:1798 +#: builtin/am.c:1801 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "" "Индексът не е чист: кръпките не могат да бъдат приложени (замърсени са: %s)" -#: builtin/am.c:1838 builtin/am.c:1910 +#: builtin/am.c:1841 builtin/am.c:1913 #, c-format msgid "Applying: %.*s" msgstr "Прилагане: %.*s" -#: builtin/am.c:1854 +#: builtin/am.c:1857 msgid "No changes -- Patch already applied." msgstr "Без промени — кръпката вече е приложена." -#: builtin/am.c:1862 +#: builtin/am.c:1865 #, c-format msgid "Patch failed at %s %.*s" msgstr "Неуспешно прилагане на кръпка при %s %.*s“" -#: builtin/am.c:1868 +#: builtin/am.c:1871 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "Дубликат на проблемната кръпка се намира в: %s" -#: builtin/am.c:1913 +#: builtin/am.c:1916 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -5279,7 +5285,7 @@ msgstr "" "Ако няма друга промяна за включване в индекса, най-вероятно някоя друга\n" "кръпка е довела до същите промени и в такъв случай просто пропуснете тази." -#: builtin/am.c:1920 +#: builtin/am.c:1923 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -5290,17 +5296,17 @@ msgstr "" "След корекция на конфликтите изпълнете „git add“ върху поправените файлове.\n" "За да приемете „изтрити от тях“, изпълнете „git rm“ върху изтритите файлове." -#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332 +#: builtin/am.c:2030 builtin/am.c:2034 builtin/am.c:2046 builtin/reset.c:332 #: builtin/reset.c:340 #, c-format msgid "Could not parse object '%s'." msgstr "„%s“ не е разпознат като обект." -#: builtin/am.c:2081 +#: builtin/am.c:2082 msgid "failed to clean index" msgstr "индексът не може да бъде изчистен" -#: builtin/am.c:2116 +#: builtin/am.c:2117 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -5311,138 +5317,138 @@ msgstr "" "сочи към\n" "„ORIG_HEAD“" -#: builtin/am.c:2179 +#: builtin/am.c:2180 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Неправилна стойност за „--patch-format“: „%s“" -#: builtin/am.c:2212 +#: builtin/am.c:2213 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [ОПЦИЯ…] [(ФАЙЛ_С_ПОЩА|ДИРЕКТОРИЯ_С_ПОЩА)…]" -#: builtin/am.c:2213 +#: builtin/am.c:2214 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [ОПЦИЯ…] (--continue | --quit | --abort)" -#: builtin/am.c:2219 +#: builtin/am.c:2220 msgid "run interactively" msgstr "интерактивна работа" -#: builtin/am.c:2221 +#: builtin/am.c:2222 msgid "historical option -- no-op" msgstr "изоставена опция, съществува по исторически причини, нищо не прави" -#: builtin/am.c:2223 +#: builtin/am.c:2224 msgid "allow fall back on 3way merging if needed" msgstr "да се преминава към тройно сливане при нужда." -#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57 +#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57 #: builtin/repack.c:180 msgid "be quiet" msgstr "без извеждане на информация" -#: builtin/am.c:2226 +#: builtin/am.c:2227 msgid "add a Signed-off-by line to the commit message" msgstr "добавяне на ред за подпис „Signed-off-by“ в съобщението за подаване" -#: builtin/am.c:2229 +#: builtin/am.c:2230 msgid "recode into utf8 (default)" msgstr "прекодиране в UTF-8 (стандартно)" -#: builtin/am.c:2231 +#: builtin/am.c:2232 msgid "pass -k flag to git-mailinfo" msgstr "подаване на опцията „-k“ на командата „git-mailinfo“" -#: builtin/am.c:2233 +#: builtin/am.c:2234 msgid "pass -b flag to git-mailinfo" msgstr "подаване на опцията „-b“ на командата „git-mailinfo“" -#: builtin/am.c:2235 +#: builtin/am.c:2236 msgid "pass -m flag to git-mailinfo" msgstr "подаване на опцията „-m“ на командата „git-mailinfo“" -#: builtin/am.c:2237 +#: builtin/am.c:2238 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "" "подаване на опцията „--keep-cr“ на командата „git-mailsplit“ за формат „mbox“" -#: builtin/am.c:2240 +#: builtin/am.c:2241 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "без подаване на опцията „--keep-cr“ на командата „git-mailsplit“ независимо " "от „am.keepcr“" -#: builtin/am.c:2243 +#: builtin/am.c:2244 msgid "strip everything before a scissors line" msgstr "пропускане на всичко преди реда за отрязване" -#: builtin/am.c:2245 builtin/am.c:2248 builtin/am.c:2251 builtin/am.c:2254 -#: builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263 builtin/am.c:2266 -#: builtin/am.c:2272 +#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255 +#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 +#: builtin/am.c:2273 msgid "pass it through git-apply" msgstr "прекарване през „git-apply“" -#: builtin/am.c:2262 builtin/fmt-merge-msg.c:664 builtin/fmt-merge-msg.c:667 -#: builtin/grep.c:843 builtin/merge.c:205 builtin/pull.c:142 builtin/pull.c:197 +#: builtin/am.c:2263 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668 +#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203 #: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195 #: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377 #: parse-options.h:132 parse-options.h:134 parse-options.h:245 msgid "n" msgstr "БРОЙ" -#: builtin/am.c:2268 builtin/branch.c:622 builtin/for-each-ref.c:38 +#: builtin/am.c:2269 builtin/branch.c:629 builtin/for-each-ref.c:38 #: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39 msgid "format" msgstr "ФОРМАТ" -#: builtin/am.c:2269 +#: builtin/am.c:2270 msgid "format the patch(es) are in" msgstr "формат на кръпките" -#: builtin/am.c:2275 +#: builtin/am.c:2276 msgid "override error message when patch failure occurs" msgstr "избрано от вас съобщение за грешка при прилагане на кръпки" -#: builtin/am.c:2277 +#: builtin/am.c:2278 msgid "continue applying patches after resolving a conflict" msgstr "продължаване на прилагането на кръпки след коригирането на конфликт" -#: builtin/am.c:2280 +#: builtin/am.c:2281 msgid "synonyms for --continue" msgstr "синоними на „--continue“" -#: builtin/am.c:2283 +#: builtin/am.c:2284 msgid "skip the current patch" msgstr "прескачане на текущата кръпка" -#: builtin/am.c:2286 +#: builtin/am.c:2287 msgid "restore the original branch and abort the patching operation." msgstr "" "възстановяване на първоначалното състояние на клона и преустановяване на " "прилагането на кръпката." -#: builtin/am.c:2290 +#: builtin/am.c:2291 msgid "lie about committer date" msgstr "дата за подаване различна от първоначалната" -#: builtin/am.c:2292 +#: builtin/am.c:2293 msgid "use current timestamp for author date" msgstr "използване на текущото време като това за автор" -#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236 -#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392 +#: builtin/am.c:2295 builtin/commit.c:1636 builtin/merge.c:236 +#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392 msgid "key-id" msgstr "ИДЕНТИФИКАТОР_НА_КЛЮЧ" -#: builtin/am.c:2295 +#: builtin/am.c:2296 msgid "GPG-sign commits" msgstr "подписване на подаванията с GPG" -#: builtin/am.c:2298 +#: builtin/am.c:2299 msgid "(internal use for git-rebase)" msgstr "(ползва се вътрешно за „git-rebase“)" -#: builtin/am.c:2316 +#: builtin/am.c:2317 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." @@ -5450,18 +5456,18 @@ msgstr "" "Опциите „-b“/„--binary“ отдавна не правят нищо и\n" "ще бъдат премахнати в бъдеще. Не ги ползвайте." -#: builtin/am.c:2323 +#: builtin/am.c:2324 msgid "failed to read the index" msgstr "неуспешно изчитане на индекса" -#: builtin/am.c:2338 +#: builtin/am.c:2339 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" "предишната директория за пребазиране „%s“ все още съществува, а е зададен " "файл „mbox“." -#: builtin/am.c:2362 +#: builtin/am.c:2363 #, c-format msgid "" "Stray %s directory found.\n" @@ -5470,7 +5476,7 @@ msgstr "" "Открита е излишна директория „%s“.\n" "Можете да я изтриете с командата „git am --abort“." -#: builtin/am.c:2368 +#: builtin/am.c:2369 msgid "Resolve operation not in progress, we are not resuming." msgstr "В момента не тече операция по коригиране и няма как да се продължи." @@ -5508,19 +5514,70 @@ msgstr "git archive: протоколна грешка" msgid "git archive: expected a flush" msgstr "git archive: очакваше се изчистване на буферите чрез „flush“" -#: builtin/bisect--helper.c:7 +#: builtin/bisect--helper.c:12 msgid "git bisect--helper --next-all [--no-checkout]" msgstr "git bisect--helper --next-all [--no-checkout]" -#: builtin/bisect--helper.c:17 +#: builtin/bisect--helper.c:13 +msgid "git bisect--helper --write-terms <bad_term> <good_term>" +msgstr "git bisect--helper --write-terms ЛОШО ДОБРО" + +#: builtin/bisect--helper.c:14 +msgid "git bisect--helper --bisect-clean-state" +msgstr "git bisect--helper --bisect-clean-state" + +#: builtin/bisect--helper.c:46 +#, c-format +msgid "'%s' is not a valid term" +msgstr "„%s“ е неправилна управляваща дума" + +#: builtin/bisect--helper.c:50 +#, c-format +msgid "can't use the builtin command '%s' as a term" +msgstr "„%s“ е вградена команда и не може да се използва като управляваща дума" + +#: builtin/bisect--helper.c:60 +#, c-format +msgid "can't change the meaning of the term '%s'" +msgstr "не може да смените значението на управляващата дума „%s“" + +#: builtin/bisect--helper.c:71 +msgid "please use two different terms" +msgstr "използвайте две различни управляващи думи" + +#: builtin/bisect--helper.c:78 +msgid "could not open the file BISECT_TERMS" +msgstr "файлът „BISECT_TERMS“ не може да се отвори" + +#: builtin/bisect--helper.c:120 msgid "perform 'git bisect next'" msgstr "извършване на „git bisect next“" -#: builtin/bisect--helper.c:19 +#: builtin/bisect--helper.c:122 +msgid "write the terms to .git/BISECT_TERMS" +msgstr "запазване на управляващите думи в „“.git/BISECT_TERMS„“" + +#: builtin/bisect--helper.c:124 +msgid "cleanup the bisection state" +msgstr "изчистване на състоянието на двоичното търсене" + +#: builtin/bisect--helper.c:126 +msgid "check for expected revs" +msgstr "проверка за очакваните версии" + +#: builtin/bisect--helper.c:128 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "" "обновяване на указателя „BISECT_HEAD“ вместо да се използва текущото подаване" +#: builtin/bisect--helper.c:143 +msgid "--write-terms requires two arguments" +msgstr "опцията „--write-terms“ изисква точно два аргумента" + +#: builtin/bisect--helper.c:147 +msgid "--bisect-clean-state requires no arguments" +msgstr "опцията „--bisect-clean-state“ не приема аргументи" + #: builtin/blame.c:27 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [ОПЦИЯ…] [ОПЦИЯ_ЗА_ВЕРСИЯТА…] [ВЕРСИЯ] [--] ФАЙЛ" @@ -5797,52 +5854,52 @@ msgstr "Клонът „%s“ се пребазира върху „%s“" msgid "Branch %s is being bisected at %s" msgstr "Търси се двоично в клона „%s“ при „%s“" -#: builtin/branch.c:470 +#: builtin/branch.c:471 msgid "cannot copy the current branch while not on any." msgstr "не можете да копирате текущия клон, защото сте извън който и да е клон" -#: builtin/branch.c:472 +#: builtin/branch.c:473 msgid "cannot rename the current branch while not on any." msgstr "" "не можете да преименувате текущия клон, защото сте извън който и да е клон" -#: builtin/branch.c:483 +#: builtin/branch.c:484 #, c-format msgid "Invalid branch name: '%s'" msgstr "Неправилно име на клон: „%s“" -#: builtin/branch.c:504 +#: builtin/branch.c:511 msgid "Branch rename failed" msgstr "Неуспешно преименуване на клон" -#: builtin/branch.c:506 +#: builtin/branch.c:513 msgid "Branch copy failed" msgstr "Неуспешно копиране на клон" -#: builtin/branch.c:510 +#: builtin/branch.c:517 #, c-format -msgid "Copied a misnamed branch '%s' away" +msgid "Created a copy of a misnamed branch '%s'" msgstr "Клонът с неправилно име „%s“ е копиран" -#: builtin/branch.c:513 +#: builtin/branch.c:520 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Клонът с неправилно име „%s“ е преименуван" -#: builtin/branch.c:519 +#: builtin/branch.c:526 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Клонът е преименуван на „%s“, но указателят „HEAD“ не е обновен" -#: builtin/branch.c:528 +#: builtin/branch.c:535 msgid "Branch is renamed, but update of config-file failed" msgstr "Клонът е преименуван, но конфигурационният файл не е обновен" -#: builtin/branch.c:530 +#: builtin/branch.c:537 msgid "Branch is copied, but update of config-file failed" msgstr "Клонът е копиран, но конфигурационният файл не е обновен" -#: builtin/branch.c:546 +#: builtin/branch.c:553 #, c-format msgid "" "Please edit the description for the branch\n" @@ -5850,190 +5907,190 @@ msgid "" "Lines starting with '%c' will be stripped.\n" msgstr "" "Въведете описание на клона.\n" -" %s\n" +" %s\n" "Редовете, които започват с „%c“, ще бъдат пропуснати.\n" -#: builtin/branch.c:579 +#: builtin/branch.c:586 msgid "Generic options" msgstr "Общи настройки" -#: builtin/branch.c:581 +#: builtin/branch.c:588 msgid "show hash and subject, give twice for upstream branch" msgstr "" "извеждане на хеша и темата. Повтарянето на опцията прибавя отдалечените " "клони" -#: builtin/branch.c:582 +#: builtin/branch.c:589 msgid "suppress informational messages" msgstr "без информационни съобщения" -#: builtin/branch.c:583 +#: builtin/branch.c:590 msgid "set up tracking mode (see git-pull(1))" msgstr "задаване на режима на следене (виж git-pull(1))" -#: builtin/branch.c:585 +#: builtin/branch.c:592 msgid "do not use" msgstr "да не се ползва" -#: builtin/branch.c:587 +#: builtin/branch.c:594 msgid "upstream" msgstr "клон-източник" -#: builtin/branch.c:587 +#: builtin/branch.c:594 msgid "change the upstream info" msgstr "смяна на клона-източник" -#: builtin/branch.c:588 +#: builtin/branch.c:595 msgid "Unset the upstream info" msgstr "без клон-източник" -#: builtin/branch.c:589 +#: builtin/branch.c:596 msgid "use colored output" msgstr "цветен изход" -#: builtin/branch.c:590 +#: builtin/branch.c:597 msgid "act on remote-tracking branches" msgstr "действие върху следящите клони" -#: builtin/branch.c:592 builtin/branch.c:594 +#: builtin/branch.c:599 builtin/branch.c:601 msgid "print only branches that contain the commit" msgstr "извеждане само на клоните, които съдържат това ПОДАВАНЕ" -#: builtin/branch.c:593 builtin/branch.c:595 +#: builtin/branch.c:600 builtin/branch.c:602 msgid "print only branches that don't contain the commit" msgstr "извеждане само на клоните, които не съдържат това ПОДАВАНЕ" -#: builtin/branch.c:598 +#: builtin/branch.c:605 msgid "Specific git-branch actions:" msgstr "Специални действия на „git-branch“:" -#: builtin/branch.c:599 +#: builtin/branch.c:606 msgid "list both remote-tracking and local branches" msgstr "извеждане както на следящите, така и на локалните клони" -#: builtin/branch.c:601 +#: builtin/branch.c:608 msgid "delete fully merged branch" msgstr "изтриване на клони, които са напълно слети" -#: builtin/branch.c:602 +#: builtin/branch.c:609 msgid "delete branch (even if not merged)" msgstr "изтриване и на клони, които не са напълно слети" -#: builtin/branch.c:603 +#: builtin/branch.c:610 msgid "move/rename a branch and its reflog" msgstr "" "преместване/преименуване на клон и принадлежащият му журнал на указателите" -#: builtin/branch.c:604 +#: builtin/branch.c:611 msgid "move/rename a branch, even if target exists" msgstr "преместване/преименуване на клон, дори ако има вече клон с такова име" -#: builtin/branch.c:605 +#: builtin/branch.c:612 msgid "copy a branch and its reflog" msgstr "копиране на клон и принадлежащия му журнал на указателите" -#: builtin/branch.c:606 +#: builtin/branch.c:613 msgid "copy a branch, even if target exists" msgstr "копиране на клон, дори ако има вече клон с такова име" -#: builtin/branch.c:607 +#: builtin/branch.c:614 msgid "list branch names" msgstr "извеждане на имената на клоните" -#: builtin/branch.c:608 +#: builtin/branch.c:615 msgid "create the branch's reflog" msgstr "създаване на журнала на указателите на клона" -#: builtin/branch.c:610 +#: builtin/branch.c:617 msgid "edit the description for the branch" msgstr "редактиране на описанието на клона" -#: builtin/branch.c:611 +#: builtin/branch.c:618 msgid "force creation, move/rename, deletion" msgstr "принудително създаване, преместване, преименуване, изтриване" -#: builtin/branch.c:612 +#: builtin/branch.c:619 msgid "print only branches that are merged" msgstr "извеждане само на слетите клони" -#: builtin/branch.c:613 +#: builtin/branch.c:620 msgid "print only branches that are not merged" msgstr "извеждане само на неслетите клони" -#: builtin/branch.c:614 +#: builtin/branch.c:621 msgid "list branches in columns" msgstr "извеждане по колони" -#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405 +#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405 msgid "key" msgstr "КЛЮЧ" -#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406 +#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406 msgid "field name to sort on" msgstr "име на полето, по което да е подредбата" -#: builtin/branch.c:618 builtin/for-each-ref.c:43 builtin/notes.c:408 +#: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408 #: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574 #: builtin/tag.c:408 msgid "object" msgstr "ОБЕКТ" -#: builtin/branch.c:619 +#: builtin/branch.c:626 msgid "print only branches of the object" msgstr "извеждане само на клоните на ОБЕКТА" -#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415 +#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415 msgid "sorting and filtering are case insensitive" msgstr "подредбата и филтрирането третират еднакво малките и главните букви" -#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413 +#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413 #: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "ФОРМАТ за изхода" -#: builtin/branch.c:645 builtin/clone.c:729 +#: builtin/branch.c:652 builtin/clone.c:730 msgid "HEAD not found below refs/heads!" msgstr "В директорията „refs/heads“ липсва файл „HEAD“" -#: builtin/branch.c:668 +#: builtin/branch.c:675 msgid "--column and --verbose are incompatible" msgstr "Опциите „--column“ и „--verbose“ са несъвместими" -#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741 +#: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751 msgid "branch name required" msgstr "Необходимо е име на клон" -#: builtin/branch.c:708 +#: builtin/branch.c:718 msgid "Cannot give description to detached HEAD" msgstr "Не може да зададете описание на несвързан „HEAD“" -#: builtin/branch.c:713 +#: builtin/branch.c:723 msgid "cannot edit description of more than one branch" msgstr "Не може да редактирате описанието на повече от един клон едновременно" -#: builtin/branch.c:720 +#: builtin/branch.c:730 #, c-format msgid "No commit on branch '%s' yet." msgstr "В клона „%s“ все още няма подавания." -#: builtin/branch.c:723 +#: builtin/branch.c:733 #, c-format msgid "No branch named '%s'." msgstr "Липсва клон на име „%s“." -#: builtin/branch.c:738 +#: builtin/branch.c:748 msgid "too many branches for a copy operation" msgstr "прекалено много клони за копиране" -#: builtin/branch.c:747 +#: builtin/branch.c:757 msgid "too many arguments for a rename operation" msgstr "прекалено много аргументи към командата за преименуване" -#: builtin/branch.c:752 +#: builtin/branch.c:762 msgid "too many arguments to set new upstream" msgstr "прекалено много аргументи към командата за следене" -#: builtin/branch.c:756 +#: builtin/branch.c:766 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -6041,39 +6098,35 @@ msgstr "" "Следеното от „HEAD“ не може да се зададе да е „%s“, защото то не сочи към " "никой клон." -#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800 +#: builtin/branch.c:769 builtin/branch.c:791 builtin/branch.c:807 #, c-format msgid "no such branch '%s'" msgstr "Няма клон на име „%s“." -#: builtin/branch.c:763 +#: builtin/branch.c:773 #, c-format msgid "branch '%s' does not exist" msgstr "Не съществува клон на име „%s“." -#: builtin/branch.c:775 +#: builtin/branch.c:785 msgid "too many arguments to unset upstream" msgstr "прекалено много аргументи към командата за спиране на следене" -#: builtin/branch.c:779 +#: builtin/branch.c:789 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "Следеното от „HEAD“ не може да махне, защото то не сочи към никой клон." -#: builtin/branch.c:785 +#: builtin/branch.c:795 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Няма информация клонът „%s“ да следи някой друг" -#: builtin/branch.c:797 -msgid "it does not make sense to create 'HEAD' manually" -msgstr "Няма никакъв смисъл ръчно да създавате „HEAD“." - -#: builtin/branch.c:803 +#: builtin/branch.c:810 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "Опциите „-a“ и „-r“ на „git branch“ са несъвместими с име на клон" -#: builtin/branch.c:806 +#: builtin/branch.c:813 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -6143,7 +6196,7 @@ msgid "for blob objects, run filters on object's content" msgstr "" "да се стартират програмите за преобразуване на съдържанието на обектите BLOB" -#: builtin/cat-file.c:569 git-submodule.sh:943 +#: builtin/cat-file.c:569 git-submodule.sh:931 msgid "blob" msgstr "обект BLOB" @@ -6202,7 +6255,7 @@ msgstr "изчитане на имената на файловете от ста msgid "terminate input and output records by a NUL character" msgstr "разделяне на входните и изходните записи с нулевия знак „NUL“" -#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358 +#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358 msgid "suppress progress reporting" msgstr "без показване на напредъка" @@ -6259,161 +6312,161 @@ msgstr "не са указани контакти" msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [ОПЦИЯ…] [--] [ФАЙЛ…]" -#: builtin/checkout-index.c:145 +#: builtin/checkout-index.c:143 msgid "stage should be between 1 and 3 or all" msgstr "етапът трябва да е „1“, „2“, „3“ или „all“ (всички)" -#: builtin/checkout-index.c:161 +#: builtin/checkout-index.c:159 msgid "check out all files in the index" msgstr "изтегляне на всички файлове в индекса" -#: builtin/checkout-index.c:162 +#: builtin/checkout-index.c:160 msgid "force overwrite of existing files" msgstr "презаписване на файловете, дори и да съществуват" -#: builtin/checkout-index.c:164 +#: builtin/checkout-index.c:162 msgid "no warning for existing files and files not in index" msgstr "без предупреждения при липсващи файлове и файлове не в индекса" -#: builtin/checkout-index.c:166 +#: builtin/checkout-index.c:164 msgid "don't checkout new files" msgstr "без изтегляне на нови файлове" -#: builtin/checkout-index.c:168 +#: builtin/checkout-index.c:166 msgid "update stat information in the index file" msgstr "обновяване на информацията получена чрез „stat“ за файловете в индекса" -#: builtin/checkout-index.c:172 +#: builtin/checkout-index.c:170 msgid "read list of paths from the standard input" msgstr "изчитане на пътищата от стандартния вход" -#: builtin/checkout-index.c:174 +#: builtin/checkout-index.c:172 msgid "write the content to temporary files" msgstr "записване на съдържанието във временни файлове" -#: builtin/checkout-index.c:175 builtin/column.c:31 -#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631 -#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999 -#: builtin/worktree.c:498 +#: builtin/checkout-index.c:173 builtin/column.c:31 +#: builtin/submodule--helper.c:866 builtin/submodule--helper.c:869 +#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1237 +#: builtin/worktree.c:552 msgid "string" msgstr "НИЗ" -#: builtin/checkout-index.c:176 +#: builtin/checkout-index.c:174 msgid "when creating files, prepend <string>" msgstr "при създаването на нови файлове да се добавя префикса НИЗ" -#: builtin/checkout-index.c:178 +#: builtin/checkout-index.c:176 msgid "copy out the files from named stage" msgstr "копиране на файловете от това състояние на сливане" -#: builtin/checkout.c:26 +#: builtin/checkout.c:27 msgid "git checkout [<options>] <branch>" msgstr "git checkout [ОПЦИЯ…] КЛОН" -#: builtin/checkout.c:27 +#: builtin/checkout.c:28 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [ОПЦИЯ…] [КЛОН] -- ФАЙЛ…" -#: builtin/checkout.c:135 builtin/checkout.c:168 +#: builtin/checkout.c:136 builtin/checkout.c:169 #, c-format msgid "path '%s' does not have our version" msgstr "вашата версия липсва в пътя „%s“" -#: builtin/checkout.c:137 builtin/checkout.c:170 +#: builtin/checkout.c:138 builtin/checkout.c:171 #, c-format msgid "path '%s' does not have their version" msgstr "чуждата версия липсва в пътя „%s“" -#: builtin/checkout.c:153 +#: builtin/checkout.c:154 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "някоя от необходимите версии липсва в пътя „%s“" -#: builtin/checkout.c:197 +#: builtin/checkout.c:198 #, c-format msgid "path '%s' does not have necessary versions" msgstr "някоя от необходимите версии липсва в пътя „%s“" -#: builtin/checkout.c:214 +#: builtin/checkout.c:215 #, c-format msgid "path '%s': cannot merge" msgstr "пътят „%s“ не може да бъде слян" -#: builtin/checkout.c:231 +#: builtin/checkout.c:232 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Резултатът за „%s“ не може да бъде слян" -#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259 -#: builtin/checkout.c:262 +#: builtin/checkout.c:254 builtin/checkout.c:257 builtin/checkout.c:260 +#: builtin/checkout.c:263 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "Опцията „%s“ е несъвместима с обновяването на пътища" -#: builtin/checkout.c:265 builtin/checkout.c:268 +#: builtin/checkout.c:266 builtin/checkout.c:269 #, c-format msgid "'%s' cannot be used with %s" msgstr "Опцията „%s“ е несъвместима с „%s“" -#: builtin/checkout.c:271 +#: builtin/checkout.c:272 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Невъзможно е едновременно да обновявате пътища и да преминете към клона „%s“." -#: builtin/checkout.c:342 builtin/checkout.c:349 +#: builtin/checkout.c:341 builtin/checkout.c:348 #, c-format msgid "path '%s' is unmerged" msgstr "пътят „%s“ не е слят" -#: builtin/checkout.c:501 +#: builtin/checkout.c:506 msgid "you need to resolve your current index first" msgstr "първо трябва да коригирате индекса си" -#: builtin/checkout.c:632 +#: builtin/checkout.c:637 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Журналът на указателите за „%s“ не може да се проследи: %s\n" -#: builtin/checkout.c:673 +#: builtin/checkout.c:678 msgid "HEAD is now at" msgstr "Указателят „HEAD“ в момента сочи към" -#: builtin/checkout.c:677 builtin/clone.c:683 +#: builtin/checkout.c:682 builtin/clone.c:684 msgid "unable to update HEAD" msgstr "Указателят „HEAD“ не може да бъде обновен" -#: builtin/checkout.c:681 +#: builtin/checkout.c:686 #, c-format msgid "Reset branch '%s'\n" msgstr "Зануляване на клона „%s“\n" -#: builtin/checkout.c:684 +#: builtin/checkout.c:689 #, c-format msgid "Already on '%s'\n" msgstr "Вече сте на „%s“\n" -#: builtin/checkout.c:688 +#: builtin/checkout.c:693 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Преминаване към клона „%s“ и зануляване на промените\n" -#: builtin/checkout.c:690 builtin/checkout.c:1086 +#: builtin/checkout.c:695 builtin/checkout.c:1051 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Преминахте към новия клон „%s“\n" -#: builtin/checkout.c:692 +#: builtin/checkout.c:697 #, c-format msgid "Switched to branch '%s'\n" msgstr "Преминахте към клона „%s“\n" -#: builtin/checkout.c:743 +#: builtin/checkout.c:748 #, c-format msgid " ... and %d more.\n" msgstr "… и още %d.\n" -#: builtin/checkout.c:749 +#: builtin/checkout.c:754 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -6435,7 +6488,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:768 +#: builtin/checkout.c:773 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -6462,164 +6515,164 @@ msgstr[1] "" " git branch ИМЕ_НА_НОВИЯ_КЛОН %s\n" "\n" -#: builtin/checkout.c:809 +#: builtin/checkout.c:814 msgid "internal error in revision walk" msgstr "вътрешна грешка при обхождането на версиите" -#: builtin/checkout.c:813 +#: builtin/checkout.c:818 msgid "Previous HEAD position was" msgstr "Преди това „HEAD“ сочеше към" -#: builtin/checkout.c:843 builtin/checkout.c:1081 +#: builtin/checkout.c:848 builtin/checkout.c:1046 msgid "You are on a branch yet to be born" msgstr "В момента сте на клон, който предстои да бъде създаден" -#: builtin/checkout.c:987 +#: builtin/checkout.c:952 #, c-format msgid "only one reference expected, %d given." msgstr "очакваше се един указател, а сте подали %d." -#: builtin/checkout.c:1027 builtin/worktree.c:233 +#: builtin/checkout.c:992 builtin/worktree.c:247 #, c-format msgid "invalid reference: %s" msgstr "неправилен указател: %s" -#: builtin/checkout.c:1056 +#: builtin/checkout.c:1021 #, c-format msgid "reference is not a tree: %s" msgstr "указателят не сочи към обект-дърво: %s" -#: builtin/checkout.c:1095 +#: builtin/checkout.c:1060 msgid "paths cannot be used with switching branches" msgstr "задаването на път е несъвместимо с преминаването от един клон към друг" -#: builtin/checkout.c:1098 builtin/checkout.c:1102 +#: builtin/checkout.c:1063 builtin/checkout.c:1067 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "опцията „%s“ е несъвместима с преминаването от един клон към друг" -#: builtin/checkout.c:1106 builtin/checkout.c:1109 builtin/checkout.c:1114 -#: builtin/checkout.c:1117 +#: builtin/checkout.c:1071 builtin/checkout.c:1074 builtin/checkout.c:1079 +#: builtin/checkout.c:1082 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "опцията „%s“ е несъвместима с „%s“" -#: builtin/checkout.c:1122 +#: builtin/checkout.c:1087 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" "За да преминете към клон, подайте указател, който сочи към подаване. „%s“ " "не е такъв" -#: builtin/checkout.c:1154 builtin/checkout.c:1156 builtin/clone.c:114 -#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:346 -#: builtin/worktree.c:348 +#: builtin/checkout.c:1119 builtin/checkout.c:1121 builtin/clone.c:114 +#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:369 +#: builtin/worktree.c:371 msgid "branch" msgstr "клон" -#: builtin/checkout.c:1155 +#: builtin/checkout.c:1120 msgid "create and checkout a new branch" msgstr "създаване и преминаване към нов клон" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1122 msgid "create/reset and checkout a branch" msgstr "създаване/зануляване на клон и преминаване към него" -#: builtin/checkout.c:1158 +#: builtin/checkout.c:1123 msgid "create reflog for new branch" msgstr "създаване на журнал на указателите за нов клон" -#: builtin/checkout.c:1159 builtin/worktree.c:350 +#: builtin/checkout.c:1124 builtin/worktree.c:373 msgid "detach HEAD at named commit" msgstr "отделяне на указателя „HEAD“ към указаното подаване" -#: builtin/checkout.c:1160 +#: builtin/checkout.c:1125 msgid "set upstream info for new branch" msgstr "задаване на кой клон бива следен при създаването на новия клон" -#: builtin/checkout.c:1162 +#: builtin/checkout.c:1127 msgid "new-branch" msgstr "НОВ_КЛОН" -#: builtin/checkout.c:1162 +#: builtin/checkout.c:1127 msgid "new unparented branch" msgstr "нов клон без родител" -#: builtin/checkout.c:1163 +#: builtin/checkout.c:1128 msgid "checkout our version for unmerged files" msgstr "изтегляне на вашата версия на неслетите файлове" -#: builtin/checkout.c:1165 +#: builtin/checkout.c:1130 msgid "checkout their version for unmerged files" msgstr "изтегляне на чуждата версия на неслетите файлове" -#: builtin/checkout.c:1167 +#: builtin/checkout.c:1132 msgid "force checkout (throw away local modifications)" msgstr "принудително изтегляне (вашите промени ще бъдат занулени)" -#: builtin/checkout.c:1168 +#: builtin/checkout.c:1133 msgid "perform a 3-way merge with the new branch" msgstr "извършване на тройно сливане с новия клон" -#: builtin/checkout.c:1169 builtin/merge.c:238 +#: builtin/checkout.c:1134 builtin/merge.c:238 msgid "update ignored files (default)" msgstr "обновяване на игнорираните файлове (стандартно)" -#: builtin/checkout.c:1170 builtin/log.c:1489 parse-options.h:251 +#: builtin/checkout.c:1135 builtin/log.c:1496 parse-options.h:251 msgid "style" msgstr "СТИЛ" -#: builtin/checkout.c:1171 +#: builtin/checkout.c:1136 msgid "conflict style (merge or diff3)" msgstr "действие при конфликт (сливане или тройна разлика)" -#: builtin/checkout.c:1174 +#: builtin/checkout.c:1139 msgid "do not limit pathspecs to sparse entries only" msgstr "без ограничаване на изброените пътища само до частично изтеглените" -#: builtin/checkout.c:1176 +#: builtin/checkout.c:1141 msgid "second guess 'git checkout <no-such-branch>'" msgstr "" "опит за отгатване на име на клон след неуспешен опит с „git checkout " "НЕСЪЩЕСТВУВАЩ_КЛОН“" -#: builtin/checkout.c:1178 +#: builtin/checkout.c:1143 msgid "do not check if another worktree is holding the given ref" msgstr "без проверка дали друго работно дърво държи указателя" -#: builtin/checkout.c:1182 builtin/clone.c:81 builtin/fetch.c:136 -#: builtin/merge.c:235 builtin/pull.c:120 builtin/push.c:544 +#: builtin/checkout.c:1147 builtin/clone.c:81 builtin/fetch.c:137 +#: builtin/merge.c:235 builtin/pull.c:123 builtin/push.c:556 #: builtin/send-pack.c:173 msgid "force progress reporting" msgstr "извеждане на напредъка" -#: builtin/checkout.c:1212 +#: builtin/checkout.c:1177 msgid "-b, -B and --orphan are mutually exclusive" msgstr "Опциите „-b“, „-B“ и „--orphan“ са несъвместими една с друга" -#: builtin/checkout.c:1229 +#: builtin/checkout.c:1194 msgid "--track needs a branch name" msgstr "опцията „--track“ изисква име на клон" -#: builtin/checkout.c:1234 +#: builtin/checkout.c:1199 msgid "Missing branch name; try -b" msgstr "Липсва име на клон, използвайте опцията „-b“" -#: builtin/checkout.c:1270 +#: builtin/checkout.c:1235 msgid "invalid path specification" msgstr "указан е неправилен път" -#: builtin/checkout.c:1277 +#: builtin/checkout.c:1242 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "„%s“ не е подаване, затова от него не може да се създаде клон „%s“" -#: builtin/checkout.c:1281 +#: builtin/checkout.c:1246 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: опцията „--detach“ не приема аргумент-път „%s“" -#: builtin/checkout.c:1285 +#: builtin/checkout.c:1250 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -6657,7 +6710,7 @@ msgstr "Хранилището „%s“ ще бъде прескочено\n" msgid "failed to remove %s" msgstr "файлът „%s“ не може да бъде изтрит" -#: builtin/clean.c:301 git-add--interactive.perl:572 +#: builtin/clean.c:302 git-add--interactive.perl:572 #, c-format msgid "" "Prompt help:\n" @@ -6670,7 +6723,7 @@ msgstr "" "ПРЕФИКС — избор на единствен обект по този уникален префикс\n" " — (празно) нищо да не се избира\n" -#: builtin/clean.c:305 git-add--interactive.perl:581 +#: builtin/clean.c:306 git-add--interactive.perl:581 #, c-format msgid "" "Prompt help:\n" @@ -6691,39 +6744,39 @@ msgstr "" "* — избиране на всички обекти\n" " — (празно) завършване на избирането\n" -#: builtin/clean.c:521 git-add--interactive.perl:547 +#: builtin/clean.c:522 git-add--interactive.perl:547 #: git-add--interactive.perl:552 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Неправилен избор (%s).\n" -#: builtin/clean.c:663 +#: builtin/clean.c:664 #, c-format msgid "Input ignore patterns>> " msgstr "Шаблони за игнорирани елементи≫ " -#: builtin/clean.c:700 +#: builtin/clean.c:701 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "ПРЕДУПРЕЖДЕНИЕ: Никой обект не напасва на „%s“" -#: builtin/clean.c:721 +#: builtin/clean.c:722 msgid "Select items to delete" msgstr "Избиране на обекти за изтриване" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:762 +#: builtin/clean.c:763 #, c-format msgid "Remove %s [y/N]? " msgstr "Да се изтрие ли „%s“? „y“ — да, „N“ — НЕ" # -#: builtin/clean.c:787 git-add--interactive.perl:1616 +#: builtin/clean.c:788 git-add--interactive.perl:1616 #, c-format msgid "Bye.\n" msgstr "Изход.\n" -#: builtin/clean.c:795 +#: builtin/clean.c:796 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -6741,63 +6794,64 @@ msgstr "" "help — този край\n" "? — подсказка за шаблоните" -#: builtin/clean.c:822 git-add--interactive.perl:1692 +#: builtin/clean.c:823 git-add--interactive.perl:1692 msgid "*** Commands ***" msgstr "●●● Команди ●●●" -#: builtin/clean.c:823 git-add--interactive.perl:1689 +#: builtin/clean.c:824 git-add--interactive.perl:1689 msgid "What now" msgstr "Избор на следващо действие" -#: builtin/clean.c:831 +#: builtin/clean.c:832 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Следният обект ще бъде изтрит:" msgstr[1] "Следните обекти ще бъдат изтрити:" -#: builtin/clean.c:847 +#: builtin/clean.c:848 msgid "No more files to clean, exiting." msgstr "Файловете за изчистване свършиха. Изход от програмата." -#: builtin/clean.c:909 +#: builtin/clean.c:910 msgid "do not print names of files removed" msgstr "без извеждане на имената на файловете, които ще бъдат изтрити" -#: builtin/clean.c:911 +#: builtin/clean.c:912 msgid "force" msgstr "принудително изтриване" -#: builtin/clean.c:912 +#: builtin/clean.c:913 msgid "interactive cleaning" msgstr "интерактивно изтриване" -#: builtin/clean.c:914 +#: builtin/clean.c:915 msgid "remove whole directories" msgstr "изтриване на цели директории" -#: builtin/clean.c:915 builtin/describe.c:463 builtin/describe.c:465 -#: builtin/grep.c:861 builtin/ls-files.c:544 builtin/name-rev.c:397 -#: builtin/name-rev.c:399 builtin/show-ref.c:176 +#: builtin/clean.c:916 builtin/describe.c:530 builtin/describe.c:532 +#: builtin/grep.c:863 builtin/log.c:155 builtin/log.c:157 +#: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399 +#: builtin/show-ref.c:176 msgid "pattern" msgstr "ШАБЛОН" -#: builtin/clean.c:916 +#: builtin/clean.c:917 msgid "add <pattern> to ignore rules" msgstr "добавяне на ШАБЛОН от файлове, които да не се трият" -#: builtin/clean.c:917 +#: builtin/clean.c:918 msgid "remove ignored files, too" msgstr "изтриване и на игнорираните файлове" -#: builtin/clean.c:919 +#: builtin/clean.c:920 msgid "remove only ignored files" msgstr "изтриване само на игнорирани файлове" -#: builtin/clean.c:937 +#: builtin/clean.c:938 msgid "-x and -X cannot be used together" msgstr "опциите „-x“ и „-X“ са несъвместими" -#: builtin/clean.c:941 +#: builtin/clean.c:942 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -6805,7 +6859,7 @@ msgstr "" "Настройката „clean.requireForce“ е зададена като истина, което изисква някоя " "от опциите „-i“, „-n“ или „-f“. Няма да се извърши изчистване" -#: builtin/clean.c:944 +#: builtin/clean.c:945 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -6863,8 +6917,8 @@ msgstr "директория с шаблони" msgid "directory from which templates will be used" msgstr "директория, която съдържа шаблоните, които да се ползват" -#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:635 -#: builtin/submodule--helper.c:1002 +#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:873 +#: builtin/submodule--helper.c:1240 msgid "reference repository" msgstr "еталонно хранилище" @@ -6888,8 +6942,8 @@ msgstr "изтегляне на този КЛОН, а не соченият от msgid "path to git-upload-pack on the remote" msgstr "път към командата „git-upload-pack“ на отдалеченото хранилище" -#: builtin/clone.c:118 builtin/fetch.c:137 builtin/grep.c:804 -#: builtin/pull.c:205 +#: builtin/clone.c:118 builtin/fetch.c:138 builtin/grep.c:806 +#: builtin/pull.c:211 msgid "depth" msgstr "ДЪЛБОЧИНА" @@ -6897,7 +6951,7 @@ msgstr "ДЪЛБОЧИНА" msgid "create a shallow clone of that depth" msgstr "плитко клониране до тази ДЪЛБОЧИНА" -#: builtin/clone.c:120 builtin/fetch.c:139 builtin/pack-objects.c:2938 +#: builtin/clone.c:120 builtin/fetch.c:140 builtin/pack-objects.c:2991 #: parse-options.h:142 msgid "time" msgstr "ВРЕМЕ" @@ -6906,11 +6960,11 @@ msgstr "ВРЕМЕ" msgid "create a shallow clone since a specific time" msgstr "плитко клониране до момент във времето" -#: builtin/clone.c:122 builtin/fetch.c:141 +#: builtin/clone.c:122 builtin/fetch.c:142 msgid "revision" msgstr "версия" -#: builtin/clone.c:123 builtin/fetch.c:142 +#: builtin/clone.c:123 builtin/fetch.c:143 msgid "deepen history of shallow clone, excluding rev" msgstr "задълбочаване на историята на плитко хранилище до изключващ указател" @@ -6945,11 +6999,13 @@ msgstr "КЛЮЧ=СТОЙНОСТ" msgid "set config inside the new repository" msgstr "задаване на настройките на новото хранилище" -#: builtin/clone.c:134 builtin/fetch.c:159 builtin/push.c:555 +#: builtin/clone.c:134 builtin/fetch.c:160 builtin/pull.c:224 +#: builtin/push.c:567 msgid "use IPv4 addresses only" msgstr "само адреси IPv4" -#: builtin/clone.c:136 builtin/fetch.c:161 builtin/push.c:557 +#: builtin/clone.c:136 builtin/fetch.c:162 builtin/pull.c:227 +#: builtin/push.c:569 msgid "use IPv6 addresses only" msgstr "само адреси IPv6" @@ -6992,12 +7048,12 @@ msgstr "връзката „%s“ не може да бъде създадена msgid "failed to copy file to '%s'" msgstr "файлът не може да бъде копиран като „%s“" -#: builtin/clone.c:471 +#: builtin/clone.c:472 #, c-format msgid "done.\n" msgstr "действието завърши.\n" -#: builtin/clone.c:483 +#: builtin/clone.c:484 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -7008,23 +7064,23 @@ msgstr "" "клон в момента са изтеглени с командата „git status“. Можете да\n" "завършите изтеглянето на клона с командата „git checkout -f HEAD“.\n" -#: builtin/clone.c:560 +#: builtin/clone.c:561 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" "Клонът „%s“ от отдалеченото хранилище, което клонирате,\n" "и който следва да бъде изтеглен, не съществува." -#: builtin/clone.c:655 +#: builtin/clone.c:656 msgid "remote did not send all necessary objects" msgstr "отдалеченото хранилище не изпрати всички необходими обекти." -#: builtin/clone.c:671 +#: builtin/clone.c:672 #, c-format msgid "unable to update %s" msgstr "обектът „%s“ не може да бъде обновен" -#: builtin/clone.c:720 +#: builtin/clone.c:721 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "указателят „HEAD“ от отдалеченото хранилище сочи към нещо,\n" @@ -7046,7 +7102,7 @@ msgstr "не може да се извърши пакетиране за изч msgid "cannot unlink temporary alternates file" msgstr "временният файл за алтернативни обекти не може да бъде изтрит" -#: builtin/clone.c:894 builtin/receive-pack.c:1944 +#: builtin/clone.c:894 builtin/receive-pack.c:1945 msgid "Too many arguments." msgstr "Прекалено много аргументи." @@ -7068,7 +7124,7 @@ msgstr "опциите „--bare“ и „--separate-git-dir“ са несъв msgid "repository '%s' does not exist" msgstr "не съществува хранилище „%s“" -#: builtin/clone.c:933 builtin/fetch.c:1360 +#: builtin/clone.c:933 builtin/fetch.c:1358 #, c-format msgid "depth %s is not a positive number" msgstr "дълбочината трябва да е положително цяло число, а не „%s“" @@ -7084,7 +7140,7 @@ msgid "working tree '%s' already exists." msgstr "в „%s“ вече съществува работно дърво." #: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270 -#: builtin/worktree.c:240 builtin/worktree.c:270 +#: builtin/worktree.c:253 builtin/worktree.c:283 #, c-format msgid "could not create leading directories of '%s'" msgstr "родителските директории на „%s“ не могат да бъдат създадени" @@ -7138,17 +7194,12 @@ msgstr "клонираното хранилище е плитко, затова msgid "--local is ignored" msgstr "опцията „--local“ се прескача" -#: builtin/clone.c:1087 -#, c-format -msgid "Don't know how to clone %s" -msgstr "Не се поддържа клониране на връзки от вида „%s“ " - -#: builtin/clone.c:1142 builtin/clone.c:1150 +#: builtin/clone.c:1139 builtin/clone.c:1147 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Отдалеченият клон „%s“ липсва в клонираното хранилище „%s“" -#: builtin/clone.c:1153 +#: builtin/clone.c:1150 msgid "You appear to have cloned an empty repository." msgstr "Изглежда клонирахте празно хранилище." @@ -7207,7 +7258,8 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" "Името и адресът за е-поща са настроени автоматично на базата на името на\n" -"потребителя и името на машината. Проверете дали са верни. Можете да спрете\n" +"потребителя и името на машината. Проверете дали са верни. Можете да " +"спрете\n" "това съобщение като изрично зададете стойностите. Изпълнете следната " "команда\n" "и следвайте инструкциите в текстовия ви редактор, за да редактирате\n" @@ -7234,7 +7286,8 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" "Името и адресът за е-поща са настроени автоматично на базата на името на\n" -"потребителя и името на машината. Проверете дали са верни. Можете да спрете\n" +"потребителя и името на машината. Проверете дали са верни. Можете да " +"спрете\n" "това съобщение като изрично зададете стойностите:\n" "\n" " git config --global user.name \"Вашето Име\"\n" @@ -7354,7 +7407,7 @@ msgstr "" "не може да се избере знак за коментар — в текущото съобщение за подаване са " "използвани всички подобни знаци" -#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1100 +#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1114 #, c-format msgid "could not lookup commit %s" msgstr "следното подаване не може да бъде открито: %s" @@ -7455,134 +7508,144 @@ msgstr "%sПодаващ: %.*s <%.*s>" msgid "Cannot read index" msgstr "Индексът не може да бъде прочетен" -#: builtin/commit.c:958 +#: builtin/commit.c:959 msgid "Error building trees" msgstr "Грешка при изграждане на дърветата" -#: builtin/commit.c:972 builtin/tag.c:252 +#: builtin/commit.c:973 builtin/tag.c:252 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Подайте съобщението с някоя от опциите „-m“ или „-F“.\n" -#: builtin/commit.c:1075 +#: builtin/commit.c:1076 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "Опцията „--author '%s'“ не отговаря на форма̀та „Име <е-поща>“ и не съвпада с " "никой автор" -#: builtin/commit.c:1090 builtin/commit.c:1335 +#: builtin/commit.c:1090 +#, c-format +msgid "Invalid ignored mode '%s'" +msgstr "Неправилен режим за игнорираните файлове: „%s“" + +#: builtin/commit.c:1104 builtin/commit.c:1349 #, c-format msgid "Invalid untracked files mode '%s'" -msgstr "Неправилна стойност за неследените файлове: „%s“" +msgstr "Неправилен режим за неследените файлове: „%s“" -#: builtin/commit.c:1128 +#: builtin/commit.c:1142 msgid "--long and -z are incompatible" msgstr "Опциите „--long“ и „-z“ са несъвместими." -#: builtin/commit.c:1158 +#: builtin/commit.c:1172 msgid "Using both --reset-author and --author does not make sense" msgstr "Опциите „--reset-author“ и „--author“ са несъвместими." -#: builtin/commit.c:1167 +#: builtin/commit.c:1181 msgid "You have nothing to amend." msgstr "Няма какво да бъде поправено." -#: builtin/commit.c:1170 +#: builtin/commit.c:1184 msgid "You are in the middle of a merge -- cannot amend." msgstr "В момента се извършва сливане, не можете да поправяте." -#: builtin/commit.c:1172 +#: builtin/commit.c:1186 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "В момента се извършва отбиране на подаване, не можете да поправяте." -#: builtin/commit.c:1175 +#: builtin/commit.c:1189 msgid "Options --squash and --fixup cannot be used together" msgstr "Опциите „--squash“ и „--fixup“ са несъвместими." -#: builtin/commit.c:1185 +#: builtin/commit.c:1199 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Опциите „-c“, „-C“, „-F“ и „--fixup““ са несъвместими." -#: builtin/commit.c:1187 +#: builtin/commit.c:1201 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "Опцията „-m“ е несъвместима с „-c“, „-C“, „-F“ и „--fixup“." -#: builtin/commit.c:1195 +#: builtin/commit.c:1209 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" "Опцията „--reset-author“ може да се използва само заедно с „-C“, „-c“ или\n" "„--amend“." -#: builtin/commit.c:1212 +#: builtin/commit.c:1226 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Опциите „--include“, „--only“, „--all“, „--interactive“ и „--patch“ са\n" "несъвместими." -#: builtin/commit.c:1214 +#: builtin/commit.c:1228 msgid "No paths with --include/--only does not make sense." msgstr "Опциите „--include“ и „--only“ изискват аргументи." -#: builtin/commit.c:1226 builtin/tag.c:535 +#: builtin/commit.c:1240 builtin/tag.c:535 #, c-format msgid "Invalid cleanup mode %s" msgstr "Несъществуващ режим на изчистване „%s“" -#: builtin/commit.c:1231 +#: builtin/commit.c:1245 msgid "Paths with -a does not make sense." msgstr "Опцията „-a“ е несъвместима със задаването на пътища." -#: builtin/commit.c:1349 builtin/commit.c:1626 +#: builtin/commit.c:1363 builtin/commit.c:1648 msgid "show status concisely" msgstr "кратка информация за състоянието" -#: builtin/commit.c:1351 builtin/commit.c:1628 +#: builtin/commit.c:1365 builtin/commit.c:1650 msgid "show branch information" msgstr "информация за клоните" -#: builtin/commit.c:1353 +#: builtin/commit.c:1367 msgid "show stash information" msgstr "информация за скатаното" -#: builtin/commit.c:1355 +#: builtin/commit.c:1369 msgid "version" msgstr "версия" -#: builtin/commit.c:1355 builtin/commit.c:1630 builtin/push.c:530 -#: builtin/worktree.c:469 +#: builtin/commit.c:1369 builtin/commit.c:1652 builtin/push.c:542 +#: builtin/worktree.c:523 msgid "machine-readable output" msgstr "формат на изхода за четене от програма" -#: builtin/commit.c:1358 builtin/commit.c:1632 +#: builtin/commit.c:1372 builtin/commit.c:1654 msgid "show status in long format (default)" msgstr "подробна информация за състоянието (стандартно)" -#: builtin/commit.c:1361 builtin/commit.c:1635 +#: builtin/commit.c:1375 builtin/commit.c:1657 msgid "terminate entries with NUL" msgstr "разделяне на елементите с нулевия знак „NUL“" -#: builtin/commit.c:1363 builtin/commit.c:1638 builtin/fast-export.c:999 -#: builtin/fast-export.c:1002 builtin/tag.c:390 +#: builtin/commit.c:1377 builtin/commit.c:1381 builtin/commit.c:1660 +#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:390 msgid "mode" msgstr "РЕЖИМ" -#: builtin/commit.c:1364 builtin/commit.c:1638 +#: builtin/commit.c:1378 builtin/commit.c:1660 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "извеждане на неследените файлове. Възможните РЕЖИМи са „all“ (подробна " "информация), „normal“ (кратка информация), „no“ (без неследените файлове). " "Стандартният РЕЖИМ е: „all“." -#: builtin/commit.c:1367 -msgid "show ignored files" -msgstr "извеждане на игнорираните файлове" +#: builtin/commit.c:1382 +msgid "" +"show ignored files, optional modes: traditional, matching, no. (Default: " +"traditional)" +msgstr "" +"извеждане на игнорираните файлове. Възможните РЕЖИМи са " +"„traditional“ (традиционен), „matching“ (напасващи), „no“ (без игнорираните " +"файлове). Стандартният РЕЖИМ е: „traditional“." -#: builtin/commit.c:1368 parse-options.h:155 +#: builtin/commit.c:1384 parse-options.h:155 msgid "when" msgstr "КОГА" -#: builtin/commit.c:1369 +#: builtin/commit.c:1385 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -7591,206 +7654,216 @@ msgstr "" "една от „all“ (всички), „dirty“ (тези с неподадени промени), " "„untracked“ (неследени)" -#: builtin/commit.c:1371 +#: builtin/commit.c:1387 msgid "list untracked files in columns" msgstr "извеждане на неследените файлове в колони" -#: builtin/commit.c:1449 +#: builtin/commit.c:1406 +msgid "Unsupported combination of ignored and untracked-files arguments" +msgstr "Неподдържана комбинация от аргументи за игнорирани и неследени файлове" + +#: builtin/commit.c:1469 msgid "couldn't look up newly created commit" msgstr "току що създаденото подаване не може да бъде открито" -#: builtin/commit.c:1451 +#: builtin/commit.c:1471 msgid "could not parse newly created commit" msgstr "току що създаденото подаване не може да бъде анализирано" -#: builtin/commit.c:1496 +#: builtin/commit.c:1516 +msgid "unable to resolve HEAD after creating commit" +msgstr "" +"състоянието сочено от указателя „HEAD“ не може да бъде открито след " +"подаването" + +#: builtin/commit.c:1518 msgid "detached HEAD" msgstr "несвързан връх „HEAD“" -#: builtin/commit.c:1499 +#: builtin/commit.c:1521 msgid " (root-commit)" msgstr " (начално подаване)" -#: builtin/commit.c:1596 +#: builtin/commit.c:1618 msgid "suppress summary after successful commit" msgstr "без информация след успешно подаване" -#: builtin/commit.c:1597 +#: builtin/commit.c:1619 msgid "show diff in commit message template" msgstr "добавяне на разликата към шаблона за съобщението при подаване" -#: builtin/commit.c:1599 +#: builtin/commit.c:1621 msgid "Commit message options" msgstr "Опции за съобщението при подаване" -#: builtin/commit.c:1600 builtin/tag.c:388 +#: builtin/commit.c:1622 builtin/tag.c:388 msgid "read message from file" msgstr "взимане на съобщението от ФАЙЛ" -#: builtin/commit.c:1601 +#: builtin/commit.c:1623 msgid "author" msgstr "АВТОР" -#: builtin/commit.c:1601 +#: builtin/commit.c:1623 msgid "override author for commit" msgstr "задаване на АВТОР за подаването" -#: builtin/commit.c:1602 builtin/gc.c:359 +#: builtin/commit.c:1624 builtin/gc.c:359 msgid "date" msgstr "ДАТА" -#: builtin/commit.c:1602 +#: builtin/commit.c:1624 msgid "override date for commit" msgstr "задаване на ДАТА за подаването" -#: builtin/commit.c:1603 builtin/merge.c:225 builtin/notes.c:402 +#: builtin/commit.c:1625 builtin/merge.c:225 builtin/notes.c:402 #: builtin/notes.c:565 builtin/tag.c:386 msgid "message" msgstr "СЪОБЩЕНИЕ" -#: builtin/commit.c:1603 +#: builtin/commit.c:1625 msgid "commit message" msgstr "СЪОБЩЕНИЕ при подаване" -#: builtin/commit.c:1604 builtin/commit.c:1605 builtin/commit.c:1606 -#: builtin/commit.c:1607 parse-options.h:257 ref-filter.h:92 +#: builtin/commit.c:1626 builtin/commit.c:1627 builtin/commit.c:1628 +#: builtin/commit.c:1629 parse-options.h:257 ref-filter.h:92 msgid "commit" msgstr "ПОДАВАНЕ" -#: builtin/commit.c:1604 +#: builtin/commit.c:1626 msgid "reuse and edit message from specified commit" msgstr "преизползване и редактиране на съобщението от указаното ПОДАВАНЕ" -#: builtin/commit.c:1605 +#: builtin/commit.c:1627 msgid "reuse message from specified commit" msgstr "преизползване на съобщението от указаното ПОДАВАНЕ" -#: builtin/commit.c:1606 +#: builtin/commit.c:1628 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "използване на автоматичното съобщение при смачкване за вкарване на указаното " "ПОДАВАНЕ в предното без следа" -#: builtin/commit.c:1607 +#: builtin/commit.c:1629 msgid "use autosquash formatted message to squash specified commit" msgstr "" "използване на автоматичното съобщение при смачкване за смачкване на " "указаното ПОДАВАНЕ в предното" -#: builtin/commit.c:1608 +#: builtin/commit.c:1630 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" "смяна на автора да съвпада с подаващия (използва се с „-C“/„-c“/„--amend“)" -#: builtin/commit.c:1609 builtin/log.c:1436 builtin/merge.c:239 -#: builtin/revert.c:105 +#: builtin/commit.c:1631 builtin/log.c:1443 builtin/merge.c:239 +#: builtin/pull.c:149 builtin/revert.c:105 msgid "add Signed-off-by:" msgstr "добавяне на поле за подпис — „Signed-off-by:“" -#: builtin/commit.c:1610 +#: builtin/commit.c:1632 msgid "use specified template file" msgstr "използване на указания шаблонен ФАЙЛ" -#: builtin/commit.c:1611 +#: builtin/commit.c:1633 msgid "force edit of commit" msgstr "редактиране на подаване" -#: builtin/commit.c:1612 +#: builtin/commit.c:1634 msgid "default" msgstr "стандартно" -#: builtin/commit.c:1612 builtin/tag.c:391 +#: builtin/commit.c:1634 builtin/tag.c:391 msgid "how to strip spaces and #comments from message" msgstr "кои празни знаци и #коментари да се махат от съобщенията" -#: builtin/commit.c:1613 +#: builtin/commit.c:1635 msgid "include status in commit message template" msgstr "вмъкване на състоянието в шаблона за съобщението при подаване" -#: builtin/commit.c:1615 builtin/merge.c:237 builtin/pull.c:173 +#: builtin/commit.c:1637 builtin/merge.c:237 builtin/pull.c:179 #: builtin/revert.c:113 msgid "GPG sign commit" msgstr "подписване на подаването с GPG" -#: builtin/commit.c:1618 +#: builtin/commit.c:1640 msgid "Commit contents options" msgstr "Опции за избор на файлове при подаване" -#: builtin/commit.c:1619 +#: builtin/commit.c:1641 msgid "commit all changed files" msgstr "подаване на всички променени файлове" -#: builtin/commit.c:1620 +#: builtin/commit.c:1642 msgid "add specified files to index for commit" msgstr "добавяне на указаните файлове към индекса за подаване" -#: builtin/commit.c:1621 +#: builtin/commit.c:1643 msgid "interactively add files" msgstr "интерактивно добавяне на файлове" -#: builtin/commit.c:1622 +#: builtin/commit.c:1644 msgid "interactively add changes" msgstr "интерактивно добавяне на промени" -#: builtin/commit.c:1623 +#: builtin/commit.c:1645 msgid "commit only specified files" msgstr "подаване само на указаните файлове" -#: builtin/commit.c:1624 +#: builtin/commit.c:1646 msgid "bypass pre-commit and commit-msg hooks" msgstr "" "без изпълнение на куките преди подаване и при промяна на съобщението за " "подаване (pre-commit и commit-msg)" -#: builtin/commit.c:1625 +#: builtin/commit.c:1647 msgid "show what would be committed" msgstr "отпечатване на това, което би било подадено" -#: builtin/commit.c:1636 +#: builtin/commit.c:1658 msgid "amend previous commit" msgstr "поправяне на предишното подаване" -#: builtin/commit.c:1637 +#: builtin/commit.c:1659 msgid "bypass post-rewrite hook" msgstr "без изпълнение на куката след презаписване (post-rewrite)" -#: builtin/commit.c:1642 +#: builtin/commit.c:1664 msgid "ok to record an empty change" msgstr "позволяване на празни подавания" -#: builtin/commit.c:1644 +#: builtin/commit.c:1666 msgid "ok to record a change with an empty message" msgstr "позволяване на подавания с празни съобщения" -#: builtin/commit.c:1674 +#: builtin/commit.c:1696 msgid "could not parse HEAD commit" msgstr "върховото подаване „HEAD“ не може да бъде прочетено" -#: builtin/commit.c:1719 +#: builtin/commit.c:1741 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Повреден файл за върха за сливането „MERGE_HEAD“ (%s)" -#: builtin/commit.c:1726 +#: builtin/commit.c:1748 msgid "could not read MERGE_MODE" msgstr "режимът на сливане „MERGE_MODE“ не може да бъде прочетен" -#: builtin/commit.c:1745 +#: builtin/commit.c:1767 #, c-format msgid "could not read commit message: %s" msgstr "съобщението за подаване не може да бъде прочетено: %s" -#: builtin/commit.c:1756 +#: builtin/commit.c:1778 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Неизвършване на подаване поради празно съобщение.\n" -#: builtin/commit.c:1761 +#: builtin/commit.c:1783 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Неизвършване на подаване поради нередактирано съобщение.\n" -#: builtin/commit.c:1809 +#: builtin/commit.c:1831 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -7804,146 +7877,150 @@ msgstr "" msgid "git config [<options>]" msgstr "git config [ОПЦИЯ…]" -#: builtin/config.c:57 +#: builtin/config.c:58 msgid "Config file location" msgstr "Местоположение на конфигурационния файл" -#: builtin/config.c:58 +#: builtin/config.c:59 msgid "use global config file" msgstr "използване на глобалния конфигурационен файл" -#: builtin/config.c:59 +#: builtin/config.c:60 msgid "use system config file" msgstr "използване на системния конфигурационен файл" -#: builtin/config.c:60 +#: builtin/config.c:61 msgid "use repository config file" msgstr "използване на конфигурационния файл на хранилището" -#: builtin/config.c:61 +#: builtin/config.c:62 msgid "use given config file" msgstr "използване на зададения конфигурационен ФАЙЛ" -#: builtin/config.c:62 +#: builtin/config.c:63 msgid "blob-id" msgstr "ИДЕНТИФИКАТОР" -#: builtin/config.c:62 +#: builtin/config.c:63 msgid "read config from given blob object" msgstr "" "изчитане на конфигурацията от BLOB с този ИДЕНТИФИКАТОР на съдържанието" -#: builtin/config.c:63 +#: builtin/config.c:64 msgid "Action" msgstr "Действие" -#: builtin/config.c:64 +#: builtin/config.c:65 msgid "get value: name [value-regex]" msgstr "извеждане на стойност: ИМЕ [РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]" -#: builtin/config.c:65 +#: builtin/config.c:66 msgid "get all values: key [value-regex]" msgstr "извеждане на всички стойности: ключ [РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]" -#: builtin/config.c:66 +#: builtin/config.c:67 msgid "get values for regexp: name-regex [value-regex]" msgstr "" "извеждане на стойностите за РЕГУЛЯРНия_ИЗРАЗ: РЕГУЛЯРЕН_ИЗРАЗ_ЗА_ИМЕТО " "[РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]" -#: builtin/config.c:67 +#: builtin/config.c:68 msgid "get value specific for the URL: section[.var] URL" msgstr "извеждане на стойността за указания адрес: РАЗДЕЛ[.ПРОМЕНЛИВА] АДРЕС" -#: builtin/config.c:68 +#: builtin/config.c:69 msgid "replace all matching variables: name value [value_regex]" msgstr "" "замяна на всички съвпадащи променливи: ИМЕ СТОЙНОСТ " "[РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]" -#: builtin/config.c:69 +#: builtin/config.c:70 msgid "add a new variable: name value" msgstr "добавяне на нова променлива: ИМЕ СТОЙНОСТ" -#: builtin/config.c:70 +#: builtin/config.c:71 msgid "remove a variable: name [value-regex]" msgstr "изтриване на променлива: ИМЕ [РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]" -#: builtin/config.c:71 +#: builtin/config.c:72 msgid "remove all matches: name [value-regex]" msgstr "изтриване на всички съвпадащи: ИМЕ [РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]" -#: builtin/config.c:72 +#: builtin/config.c:73 msgid "rename section: old-name new-name" msgstr "преименуване на раздел: СТАРО_ИМЕ НОВО_ИМЕ" -#: builtin/config.c:73 +#: builtin/config.c:74 msgid "remove a section: name" msgstr "изтриване на раздел: ИМЕ" -#: builtin/config.c:74 +#: builtin/config.c:75 msgid "list all" msgstr "изброяване на всички" -#: builtin/config.c:75 +#: builtin/config.c:76 msgid "open an editor" msgstr "отваряне на редактор" -#: builtin/config.c:76 +#: builtin/config.c:77 msgid "find the color configured: slot [default]" msgstr "извеждане на зададения цвят: номер [стандартно]" -#: builtin/config.c:77 +#: builtin/config.c:78 msgid "find the color setting: slot [stdout-is-tty]" msgstr "извеждане на зададения цвят: номер (стандартният изход е терминал)" -#: builtin/config.c:78 +#: builtin/config.c:79 msgid "Type" msgstr "Вид" -#: builtin/config.c:79 +#: builtin/config.c:80 msgid "value is \"true\" or \"false\"" msgstr "СТОЙНОСТТА е „true“ (истина) или „false“ (лъжа)" -#: builtin/config.c:80 +#: builtin/config.c:81 msgid "value is decimal number" msgstr "СТОЙНОСТТА е цяло, десетично число" -#: builtin/config.c:81 +#: builtin/config.c:82 msgid "value is --bool or --int" msgstr "СТОЙНОСТТА е „--bool“ (булева) или „--int“ (десетично цяло число)" -#: builtin/config.c:82 +#: builtin/config.c:83 msgid "value is a path (file or directory name)" msgstr "СТОЙНОСТТА е път (до файл или директория)" -#: builtin/config.c:83 +#: builtin/config.c:84 +msgid "value is an expiry date" +msgstr "стойността е период на валидност/запазване" + +#: builtin/config.c:85 msgid "Other" msgstr "Други" -#: builtin/config.c:84 +#: builtin/config.c:86 msgid "terminate values with NUL byte" msgstr "разделяне на стойностите с нулевия знак „NUL“" -#: builtin/config.c:85 +#: builtin/config.c:87 msgid "show variable names only" msgstr "извеждане на имената на променливите" -#: builtin/config.c:86 +#: builtin/config.c:88 msgid "respect include directives on lookup" msgstr "при търсене да се уважат и директивите за включване" -#: builtin/config.c:87 +#: builtin/config.c:89 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" "извеждане на мястото на задаване на настройката (файл, стандартен вход, " "обект BLOB, команден ред)" -#: builtin/config.c:327 +#: builtin/config.c:335 msgid "unable to parse default color value" msgstr "неразпозната стойност на стандартния цвят" -#: builtin/config.c:471 +#: builtin/config.c:479 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -7958,16 +8035,16 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:499 +#: builtin/config.c:507 msgid "--local can only be used inside a git repository" msgstr "„--local“ може да се използва само в хранилище" -#: builtin/config.c:624 +#: builtin/config.c:632 #, c-format msgid "cannot create configuration file %s" msgstr "конфигурационният файл „%s“ не може да бъде създаден" -#: builtin/config.c:637 +#: builtin/config.c:645 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -7985,67 +8062,57 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "извеждане на размерите на обектите във формат лесно четим от хора" -#: builtin/describe.c:19 +#: builtin/describe.c:22 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [ОПЦИЯ…] УКАЗАТЕЛ_КЪМ_ПОДАВАНЕ…" -#: builtin/describe.c:20 +#: builtin/describe.c:23 msgid "git describe [<options>] --dirty" msgstr "git describe [ОПЦИЯ…] --dirty" -#: builtin/describe.c:54 +#: builtin/describe.c:57 msgid "head" msgstr "основно" -#: builtin/describe.c:54 +#: builtin/describe.c:57 msgid "lightweight" msgstr "кратко" -#: builtin/describe.c:54 +#: builtin/describe.c:57 msgid "annotated" msgstr "анотирано" -#: builtin/describe.c:264 +#: builtin/describe.c:267 #, c-format msgid "annotated tag %s not available" msgstr "не съществува анотиран етикет „%s“" -#: builtin/describe.c:268 +#: builtin/describe.c:271 #, c-format msgid "annotated tag %s has no embedded name" msgstr "в анотирания етикет „%s“ липсва вградено име" -#: builtin/describe.c:270 +#: builtin/describe.c:273 #, c-format msgid "tag '%s' is really '%s' here" msgstr "етикетът „%s“ тук е всъщност „%s“" -#: builtin/describe.c:297 builtin/log.c:493 -#, c-format -msgid "Not a valid object name %s" -msgstr "Неправилно име на обект „%s“" - -#: builtin/describe.c:300 -#, c-format -msgid "%s is not a valid '%s' object" -msgstr "„%s“ е неправилен обект „%s“" - -#: builtin/describe.c:317 +#: builtin/describe.c:314 #, c-format msgid "no tag exactly matches '%s'" msgstr "никой етикет не напасва точно „%s“" -#: builtin/describe.c:319 +#: builtin/describe.c:316 #, c-format -msgid "searching to describe %s\n" -msgstr "търсене за описание на „%s“\n" +msgid "No exact match on refs or tags, searching to describe\n" +msgstr "Никоя версия и етикет не напасват точно. Търси се по описание\n" -#: builtin/describe.c:366 +#: builtin/describe.c:363 #, c-format msgid "finished search at %s\n" msgstr "търсенето приключи при „%s“\n" -#: builtin/describe.c:393 +#: builtin/describe.c:389 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -8054,7 +8121,7 @@ msgstr "" "Никой анотиран етикет не описва „%s“.\n" "Съществуват и неанотирани етикети. Пробвайте с опцията „--tags“." -#: builtin/describe.c:397 +#: builtin/describe.c:393 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -8063,12 +8130,12 @@ msgstr "" "Никой етикет не описва „%s“.\n" "Пробвайте с опцията „--always“ или създайте етикети." -#: builtin/describe.c:427 +#: builtin/describe.c:423 #, c-format msgid "traversed %lu commits\n" msgstr "претърсени са %lu подавания\n" -#: builtin/describe.c:430 +#: builtin/describe.c:426 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -8077,78 +8144,93 @@ msgstr "" "открити са над %i етикета, изведени са последните %i,\n" "търсенето бе прекратено при „%s“.\n" -#: builtin/describe.c:452 +#: builtin/describe.c:494 +#, c-format +msgid "describe %s\n" +msgstr "описание на „%s“\n" + +#: builtin/describe.c:497 builtin/log.c:500 +#, c-format +msgid "Not a valid object name %s" +msgstr "Неправилно име на обект „%s“" + +#: builtin/describe.c:505 +#, c-format +msgid "%s is neither a commit nor blob" +msgstr "„%s“ не е нито подаване, нито обект BLOB" + +#: builtin/describe.c:519 msgid "find the tag that comes after the commit" msgstr "откриване на етикета, който следва подаване" -#: builtin/describe.c:453 +#: builtin/describe.c:520 msgid "debug search strategy on stderr" msgstr "" "извеждане на информация за трасиране на стратегията за търсене на " "стандартната грешка" -#: builtin/describe.c:454 +#: builtin/describe.c:521 msgid "use any ref" msgstr "използване на произволен указател" -#: builtin/describe.c:455 +#: builtin/describe.c:522 msgid "use any tag, even unannotated" msgstr "използване на всеки етикет — включително и неанотираните" -#: builtin/describe.c:456 +#: builtin/describe.c:523 msgid "always use long format" msgstr "винаги да се ползва дългият формат" -#: builtin/describe.c:457 +#: builtin/describe.c:524 msgid "only follow first parent" msgstr "проследяване само на първия родител" -#: builtin/describe.c:460 +#: builtin/describe.c:527 msgid "only output exact matches" msgstr "извеждане само на точните съвпадения" -#: builtin/describe.c:462 +#: builtin/describe.c:529 msgid "consider <n> most recent tags (default: 10)" msgstr "да се търси само в този БРОЙ последни етикети (стандартно: 10)" -#: builtin/describe.c:464 +#: builtin/describe.c:531 msgid "only consider tags matching <pattern>" msgstr "да се търси само измежду етикетите напасващи този ШАБЛОН" -#: builtin/describe.c:466 +#: builtin/describe.c:533 msgid "do not consider tags matching <pattern>" msgstr "да не се търси измежду етикетите напасващи този ШАБЛОН" -#: builtin/describe.c:468 builtin/name-rev.c:406 +#: builtin/describe.c:535 builtin/name-rev.c:406 msgid "show abbreviated commit object as fallback" msgstr "извеждане на съкратено име на обект като резервен вариант" -#: builtin/describe.c:469 builtin/describe.c:472 +#: builtin/describe.c:536 builtin/describe.c:539 msgid "mark" msgstr "МАРКЕР" -#: builtin/describe.c:470 +#: builtin/describe.c:537 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "добавяне на такъв МАРКЕР на работното дърво (стандартно е „-dirty“)" -#: builtin/describe.c:473 +#: builtin/describe.c:540 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "" "добавяне на такъв МАРКЕР на счупеното работно дърво (стандартно е „-broken“)" -#: builtin/describe.c:491 +#: builtin/describe.c:558 msgid "--long is incompatible with --abbrev=0" msgstr "Опциите „--long“ и „--abbrev=0“ са несъвместими" -#: builtin/describe.c:520 +#: builtin/describe.c:587 msgid "No names found, cannot describe anything." msgstr "Не са открити имена — нищо не може да бъде описано." -#: builtin/describe.c:563 +#: builtin/describe.c:637 msgid "--dirty is incompatible with commit-ishes" msgstr "опцията „--dirty“ е несъвместима с указател към подаване" -#: builtin/describe.c:565 +#: builtin/describe.c:639 msgid "--broken is incompatible with commit-ishes" msgstr "опцията „--broken“ е несъвместима с указател към подаване" @@ -8157,26 +8239,26 @@ msgstr "опцията „--broken“ е несъвместима с указа msgid "'%s': not a regular file or symlink" msgstr "„%s“: не е нито обикновен файл, нито символна връзка" -#: builtin/diff.c:235 +#: builtin/diff.c:234 #, c-format msgid "invalid option: %s" msgstr "неправилна опция: %s" -#: builtin/diff.c:357 +#: builtin/diff.c:356 msgid "Not a git repository" msgstr "Не е хранилище на Git" -#: builtin/diff.c:400 +#: builtin/diff.c:399 #, c-format msgid "invalid object '%s' given." msgstr "зададен е неправилен обект „%s“." -#: builtin/diff.c:409 +#: builtin/diff.c:408 #, c-format msgid "more than two blobs given: '%s'" msgstr "зададени са повече от 2 обекта BLOB: „%s“" -#: builtin/diff.c:414 +#: builtin/diff.c:413 #, c-format msgid "unhandled object '%s' given." msgstr "зададен е неподдържан обект „%s“." @@ -8213,55 +8295,55 @@ msgstr "" "комбинираните формати на разликите („-c“ и „--cc“) не се поддържат\n" "в режима за разлики върху директории („-d“ и „--dir-diff“)." -#: builtin/difftool.c:633 +#: builtin/difftool.c:632 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "и двата файла са променени: „%s“ и „%s“." -#: builtin/difftool.c:635 +#: builtin/difftool.c:634 msgid "working tree file has been left." msgstr "работното дърво е изоставено." -#: builtin/difftool.c:646 +#: builtin/difftool.c:645 #, c-format msgid "temporary files exist in '%s'." msgstr "в „%s“ има временни файлове." -#: builtin/difftool.c:647 +#: builtin/difftool.c:646 msgid "you may want to cleanup or recover these." msgstr "възможно е да ги изчистите или възстановите" -#: builtin/difftool.c:696 +#: builtin/difftool.c:695 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "използвайте „diff.guitool“ вместо „diff.tool“" -#: builtin/difftool.c:698 +#: builtin/difftool.c:697 msgid "perform a full-directory diff" msgstr "разлика по директории" -#: builtin/difftool.c:700 +#: builtin/difftool.c:699 msgid "do not prompt before launching a diff tool" msgstr "стартиране на ПРОГРАМАта за разлики без предупреждение" -#: builtin/difftool.c:706 +#: builtin/difftool.c:705 msgid "use symlinks in dir-diff mode" msgstr "следване на символните връзки при разлика по директории" -#: builtin/difftool.c:707 +#: builtin/difftool.c:706 msgid "<tool>" msgstr "ПРОГРАМА" -#: builtin/difftool.c:708 +#: builtin/difftool.c:707 msgid "use the specified diff tool" msgstr "използване на указаната ПРОГРАМА" -#: builtin/difftool.c:710 +#: builtin/difftool.c:709 msgid "print a list of diff tools that may be used with `--tool`" msgstr "" "извеждане на списък с всички ПРОГРАМи, които може да се ползват с опцията „--" "tool“" -#: builtin/difftool.c:713 +#: builtin/difftool.c:712 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -8269,19 +8351,19 @@ msgstr "" "„git-difftool“ да спре работа, когато стартираната ПРОГРАМА завърши с " "ненулев код" -#: builtin/difftool.c:715 +#: builtin/difftool.c:714 msgid "<command>" msgstr "КОМАНДА" -#: builtin/difftool.c:716 +#: builtin/difftool.c:715 msgid "specify a custom command for viewing diffs" msgstr "команда за разглеждане на разлики" -#: builtin/difftool.c:740 +#: builtin/difftool.c:739 msgid "no <tool> given for --tool=<tool>" msgstr "не е зададена програма за „--tool=ПРОГРАМА“" -#: builtin/difftool.c:747 +#: builtin/difftool.c:746 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "не е зададена команда за „--extcmd=КОМАНДА“" @@ -8337,95 +8419,95 @@ msgstr "Прилагане на УКАЗАТЕЛя_НА_ВЕРСИЯ към из msgid "anonymize output" msgstr "анонимизиране на извежданата информация" -#: builtin/fetch.c:23 +#: builtin/fetch.c:24 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [ОПЦИЯ…] [ХРАНИЛИЩЕ [УКАЗАТЕЛ…]]" -#: builtin/fetch.c:24 +#: builtin/fetch.c:25 msgid "git fetch [<options>] <group>" msgstr "git fetch [ОПЦИЯ…] ГРУПА" -#: builtin/fetch.c:25 +#: builtin/fetch.c:26 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [ОПЦИЯ…] [(ХРАНИЛИЩЕ | ГРУПА)…]" -#: builtin/fetch.c:26 +#: builtin/fetch.c:27 msgid "git fetch --all [<options>]" msgstr "git fetch --all [ОПЦИЯ…]" -#: builtin/fetch.c:112 builtin/pull.c:182 +#: builtin/fetch.c:113 builtin/pull.c:188 msgid "fetch from all remotes" msgstr "доставяне от всички отдалечени хранилища" -#: builtin/fetch.c:114 builtin/pull.c:185 +#: builtin/fetch.c:115 builtin/pull.c:191 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "добавяне към „.git/FETCH_HEAD“ вместо замяна" -#: builtin/fetch.c:116 builtin/pull.c:188 +#: builtin/fetch.c:117 builtin/pull.c:194 msgid "path to upload pack on remote end" msgstr "отдалечен път, където да се качи пакетът" -#: builtin/fetch.c:117 builtin/pull.c:190 +#: builtin/fetch.c:118 builtin/pull.c:196 msgid "force overwrite of local branch" msgstr "принудително презаписване на локалния клон" -#: builtin/fetch.c:119 +#: builtin/fetch.c:120 msgid "fetch from multiple remotes" msgstr "доставяне от множество отдалечени хранилища" -#: builtin/fetch.c:121 builtin/pull.c:192 +#: builtin/fetch.c:122 builtin/pull.c:198 msgid "fetch all tags and associated objects" msgstr "доставяне на всички етикети и принадлежащи обекти" -#: builtin/fetch.c:123 +#: builtin/fetch.c:124 msgid "do not fetch all tags (--no-tags)" msgstr "без доставянето на всички етикети „--no-tags“" -#: builtin/fetch.c:125 +#: builtin/fetch.c:126 msgid "number of submodules fetched in parallel" msgstr "брой подмодули доставени паралелно" -#: builtin/fetch.c:127 builtin/pull.c:195 +#: builtin/fetch.c:128 builtin/pull.c:201 msgid "prune remote-tracking branches no longer on remote" msgstr "окастряне на клоните следящи вече несъществуващи отдалечени клони" -#: builtin/fetch.c:128 builtin/fetch.c:151 builtin/pull.c:123 +#: builtin/fetch.c:129 builtin/fetch.c:152 builtin/pull.c:126 msgid "on-demand" msgstr "ПРИ НУЖДА" -#: builtin/fetch.c:129 +#: builtin/fetch.c:130 msgid "control recursive fetching of submodules" msgstr "управление на рекурсивното доставяне на подмодулите" -#: builtin/fetch.c:133 builtin/pull.c:203 +#: builtin/fetch.c:134 builtin/pull.c:209 msgid "keep downloaded pack" msgstr "запазване на изтеглените пакети с обекти" -#: builtin/fetch.c:135 +#: builtin/fetch.c:136 msgid "allow updating of HEAD ref" msgstr "позволяване на обновяването на указателя „HEAD“" -#: builtin/fetch.c:138 builtin/fetch.c:144 builtin/pull.c:206 +#: builtin/fetch.c:139 builtin/fetch.c:145 builtin/pull.c:212 msgid "deepen history of shallow clone" msgstr "задълбочаване на историята на плитко хранилище" -#: builtin/fetch.c:140 +#: builtin/fetch.c:141 msgid "deepen history of shallow repository based on time" msgstr "задълбочаване на историята на плитко хранилище до определено време" -#: builtin/fetch.c:146 builtin/pull.c:209 +#: builtin/fetch.c:147 builtin/pull.c:215 msgid "convert to a complete repository" msgstr "превръщане в пълно хранилище" -#: builtin/fetch.c:148 builtin/log.c:1456 +#: builtin/fetch.c:149 builtin/log.c:1463 msgid "dir" msgstr "директория" -#: builtin/fetch.c:149 +#: builtin/fetch.c:150 msgid "prepend this to submodule path output" msgstr "добавяне на това пред пътя на подмодула" -#: builtin/fetch.c:152 +#: builtin/fetch.c:153 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -8433,91 +8515,91 @@ msgstr "" "стандартно рекурсивно изтегляне на подмодулите (файловете с настройки са с " "приоритет)" -#: builtin/fetch.c:156 builtin/pull.c:212 +#: builtin/fetch.c:157 builtin/pull.c:218 msgid "accept refs that update .git/shallow" msgstr "приемане на указатели, които обновяват „.git/shallow“" -#: builtin/fetch.c:157 builtin/pull.c:214 +#: builtin/fetch.c:158 builtin/pull.c:220 msgid "refmap" msgstr "КАРТА_С_УКАЗАТЕЛИ" -#: builtin/fetch.c:158 builtin/pull.c:215 +#: builtin/fetch.c:159 builtin/pull.c:221 msgid "specify fetch refmap" msgstr "указване на КАРТАта_С_УКАЗАТЕЛИ за доставяне" -#: builtin/fetch.c:416 +#: builtin/fetch.c:417 msgid "Couldn't find remote ref HEAD" msgstr "Указателят „HEAD“ в отдалеченото хранилище не може да бъде открит" -#: builtin/fetch.c:534 +#: builtin/fetch.c:535 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "настройката „fetch.output“ е с неправилна стойност „%s“" -#: builtin/fetch.c:627 +#: builtin/fetch.c:628 #, c-format msgid "object %s not found" msgstr "обектът „%s“ липсва" -#: builtin/fetch.c:631 +#: builtin/fetch.c:632 msgid "[up to date]" msgstr "[актуализиран]" -#: builtin/fetch.c:644 builtin/fetch.c:724 +#: builtin/fetch.c:645 builtin/fetch.c:725 msgid "[rejected]" msgstr "[отхвърлен]" -#: builtin/fetch.c:645 +#: builtin/fetch.c:646 msgid "can't fetch in current branch" msgstr "в текущия клон не може да се доставя" -#: builtin/fetch.c:654 +#: builtin/fetch.c:655 msgid "[tag update]" msgstr "[обновяване на етикетите]" -#: builtin/fetch.c:655 builtin/fetch.c:688 builtin/fetch.c:704 -#: builtin/fetch.c:719 +#: builtin/fetch.c:656 builtin/fetch.c:689 builtin/fetch.c:705 +#: builtin/fetch.c:720 msgid "unable to update local ref" msgstr "локален указател не може да бъде обновен" -#: builtin/fetch.c:674 +#: builtin/fetch.c:675 msgid "[new tag]" msgstr "[нов етикет]" -#: builtin/fetch.c:677 +#: builtin/fetch.c:678 msgid "[new branch]" msgstr "[нов клон]" -#: builtin/fetch.c:680 +#: builtin/fetch.c:681 msgid "[new ref]" msgstr "[нов указател]" -#: builtin/fetch.c:719 +#: builtin/fetch.c:720 msgid "forced update" msgstr "принудително обновяване" -#: builtin/fetch.c:724 +#: builtin/fetch.c:725 msgid "non-fast-forward" msgstr "същинско сливане" -#: builtin/fetch.c:769 +#: builtin/fetch.c:770 #, c-format msgid "%s did not send all necessary objects\n" msgstr "хранилището „%s“ не изпрати всички необходими обекти\n" -#: builtin/fetch.c:789 +#: builtin/fetch.c:790 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" "отхвърляне на върха „%s“, защото плитките хранилища не могат да бъдат " "обновявани" -#: builtin/fetch.c:877 builtin/fetch.c:973 +#: builtin/fetch.c:878 builtin/fetch.c:974 #, c-format msgid "From %.*s\n" msgstr "От %.*s\n" -#: builtin/fetch.c:888 +#: builtin/fetch.c:889 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -8527,55 +8609,50 @@ msgstr "" "„git remote prune %s“, за да премахнете остарелите клони, които\n" "предизвикват конфликта" -#: builtin/fetch.c:943 +#: builtin/fetch.c:944 #, c-format msgid " (%s will become dangling)" msgstr " (обектът „%s“ ще се окаже извън клон)" -#: builtin/fetch.c:944 +#: builtin/fetch.c:945 #, c-format msgid " (%s has become dangling)" msgstr " (обектът „%s“ вече е извън клон)" -#: builtin/fetch.c:976 +#: builtin/fetch.c:977 msgid "[deleted]" msgstr "[изтрит]" -#: builtin/fetch.c:977 builtin/remote.c:1024 +#: builtin/fetch.c:978 builtin/remote.c:1024 msgid "(none)" msgstr "(нищо)" -#: builtin/fetch.c:1000 +#: builtin/fetch.c:1001 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Не може да доставите в текущия клон „%s“ на хранилище, което не е голо" -#: builtin/fetch.c:1019 +#: builtin/fetch.c:1020 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Стойността „%2$s“ за опцията „%1$s“ не е съвместима с „%3$s“" -#: builtin/fetch.c:1022 +#: builtin/fetch.c:1023 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Опцията „%s“ се прескача при „%s“\n" -#: builtin/fetch.c:1098 -#, c-format -msgid "Don't know how to fetch from %s" -msgstr "Не се поддържа доставяне от „%s“" - -#: builtin/fetch.c:1258 +#: builtin/fetch.c:1256 #, c-format msgid "Fetching %s\n" msgstr "Доставяне на „%s“\n" -#: builtin/fetch.c:1260 builtin/remote.c:97 +#: builtin/fetch.c:1258 builtin/remote.c:97 #, c-format msgid "Could not fetch %s" msgstr "„%s“ не може да се достави" -#: builtin/fetch.c:1278 +#: builtin/fetch.c:1276 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -8583,41 +8660,41 @@ msgstr "" "Не сте указали отдалечено хранилище. Задайте или адрес, или име\n" "на отдалечено хранилище, откъдето да се доставят новите версии." -#: builtin/fetch.c:1301 +#: builtin/fetch.c:1299 msgid "You need to specify a tag name." msgstr "Трябва да укажете име на етикет." -#: builtin/fetch.c:1344 +#: builtin/fetch.c:1342 msgid "Negative depth in --deepen is not supported" msgstr "Отрицателна дълбочина като аргумент на „--deepen“ не се поддържа" -#: builtin/fetch.c:1346 +#: builtin/fetch.c:1344 msgid "--deepen and --depth are mutually exclusive" msgstr "Опциите „--deepen“ и „--depth“ са несъвместими една с друга" -#: builtin/fetch.c:1351 +#: builtin/fetch.c:1349 msgid "--depth and --unshallow cannot be used together" msgstr "опциите „--depth“ и „--unshallow“ са несъвместими" -#: builtin/fetch.c:1353 +#: builtin/fetch.c:1351 msgid "--unshallow on a complete repository does not make sense" msgstr "не можете да използвате опцията „--unshallow“ върху пълно хранилище" -#: builtin/fetch.c:1366 +#: builtin/fetch.c:1364 msgid "fetch --all does not take a repository argument" msgstr "към „git fetch --all“ не можете да добавите аргумент — хранилище" -#: builtin/fetch.c:1368 +#: builtin/fetch.c:1366 msgid "fetch --all does not make sense with refspecs" msgstr "" "към „git fetch --all“ не можете да добавите аргумент — указател на версия" -#: builtin/fetch.c:1379 +#: builtin/fetch.c:1377 #, c-format msgid "No such remote or remote group: %s" msgstr "Няма нито отдалечено хранилище, нито група от хранилища на име „%s“" -#: builtin/fetch.c:1387 +#: builtin/fetch.c:1385 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Указването на група и указването на версия са несъвместими" @@ -8627,25 +8704,25 @@ msgid "" msgstr "" "git fmt-merge-msg [-m СЪОБЩЕНИЕ] [--log[=БРОЙ] | --no-log] [--file ФАЙЛ]" -#: builtin/fmt-merge-msg.c:665 +#: builtin/fmt-merge-msg.c:666 msgid "populate log with at most <n> entries from shortlog" msgstr "" "вмъкване на журнал състоящ се от не повече от БРОЙ записа от съкратения " "журнал" -#: builtin/fmt-merge-msg.c:668 +#: builtin/fmt-merge-msg.c:669 msgid "alias for --log (deprecated)" msgstr "синоним на „--log“ (остаряло)" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:672 msgid "text" msgstr "ТЕКСТ" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:673 msgid "use <text> as start of message" msgstr "за начало на съобщението да се ползва ТЕКСТ" -#: builtin/fmt-merge-msg.c:673 +#: builtin/fmt-merge-msg.c:674 msgid "file to read from" msgstr "файл, от който да се чете" @@ -8877,255 +8954,255 @@ msgstr "зададен е неправилен брой нишки (%d) за %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1693 +#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1688 #, c-format msgid "no threads support, ignoring %s" msgstr "липсва поддръжка за нишки. „%s“ ще се пренебрегне" -#: builtin/grep.c:451 builtin/grep.c:571 builtin/grep.c:613 +#: builtin/grep.c:453 builtin/grep.c:573 builtin/grep.c:615 #, c-format msgid "unable to read tree (%s)" msgstr "дървото не може да бъде прочетено (%s)" -#: builtin/grep.c:628 +#: builtin/grep.c:630 #, c-format msgid "unable to grep from object of type %s" msgstr "не може да се изпълни „grep“ от обект от вида %s" -#: builtin/grep.c:694 +#: builtin/grep.c:696 #, c-format msgid "switch `%c' expects a numerical value" msgstr "опцията „%c“ очаква число за аргумент" -#: builtin/grep.c:781 +#: builtin/grep.c:783 msgid "search in index instead of in the work tree" msgstr "търсене в индекса, а не в работното дърво" -#: builtin/grep.c:783 +#: builtin/grep.c:785 msgid "find in contents not managed by git" msgstr "търсене и във файловете, които не са под управлението на git" -#: builtin/grep.c:785 +#: builtin/grep.c:787 msgid "search in both tracked and untracked files" msgstr "търсене и в следените, и в неследените файлове" -#: builtin/grep.c:787 +#: builtin/grep.c:789 msgid "ignore files specified via '.gitignore'" msgstr "игнориране на файловете указани в „.gitignore“" -#: builtin/grep.c:789 +#: builtin/grep.c:791 msgid "recursively search in each submodule" msgstr "рекурсивно търсене във всички подмодули" -#: builtin/grep.c:792 +#: builtin/grep.c:794 msgid "show non-matching lines" msgstr "извеждане на редовете, които не съвпадат" -#: builtin/grep.c:794 +#: builtin/grep.c:796 msgid "case insensitive matching" msgstr "без значение на регистъра на буквите (главни/малки)" -#: builtin/grep.c:796 +#: builtin/grep.c:798 msgid "match patterns only at word boundaries" msgstr "напасване на шаблоните само по границите на думите" -#: builtin/grep.c:798 +#: builtin/grep.c:800 msgid "process binary files as text" msgstr "обработване на двоичните файлове като текстови" -#: builtin/grep.c:800 +#: builtin/grep.c:802 msgid "don't match patterns in binary files" msgstr "прескачане на двоичните файлове" -#: builtin/grep.c:803 +#: builtin/grep.c:805 msgid "process binary files with textconv filters" msgstr "" "обработване на двоичните файлове чрез филтри за преобразуване към текст" -#: builtin/grep.c:805 +#: builtin/grep.c:807 msgid "descend at most <depth> levels" msgstr "навлизане максимално на тази ДЪЛБОЧИНА в дървото" -#: builtin/grep.c:809 +#: builtin/grep.c:811 msgid "use extended POSIX regular expressions" msgstr "разширени регулярни изрази по POSIX" -#: builtin/grep.c:812 +#: builtin/grep.c:814 msgid "use basic POSIX regular expressions (default)" msgstr "основни регулярни изрази по POSIX (стандартно)" -#: builtin/grep.c:815 +#: builtin/grep.c:817 msgid "interpret patterns as fixed strings" msgstr "шаблоните са дословни низове" -#: builtin/grep.c:818 +#: builtin/grep.c:820 msgid "use Perl-compatible regular expressions" msgstr "регулярни изрази на Perl" -#: builtin/grep.c:821 +#: builtin/grep.c:823 msgid "show line numbers" msgstr "извеждане на номерата на редовете" -#: builtin/grep.c:822 +#: builtin/grep.c:824 msgid "don't show filenames" msgstr "без извеждане на имената на файловете" -#: builtin/grep.c:823 +#: builtin/grep.c:825 msgid "show filenames" msgstr "извеждане на имената на файловете" -#: builtin/grep.c:825 +#: builtin/grep.c:827 msgid "show filenames relative to top directory" msgstr "" "извеждане на относителните имена на файловете спрямо основната директория на " "хранилището" -#: builtin/grep.c:827 +#: builtin/grep.c:829 msgid "show only filenames instead of matching lines" msgstr "извеждане само на имената на файловете без напасващите редове" -#: builtin/grep.c:829 +#: builtin/grep.c:831 msgid "synonym for --files-with-matches" msgstr "синоним на „--files-with-matches“" -#: builtin/grep.c:832 +#: builtin/grep.c:834 msgid "show only the names of files without match" msgstr "" "извеждане само на имената на файловете, които не съдържат ред, напасващ на " "шаблона" -#: builtin/grep.c:834 +#: builtin/grep.c:836 msgid "print NUL after filenames" msgstr "извеждане на нулевия знак „NUL“ след всяко име на файл" -#: builtin/grep.c:836 +#: builtin/grep.c:838 msgid "show the number of matches instead of matching lines" msgstr "извеждане на броя на съвпаденията вместо напасващите редове" -#: builtin/grep.c:837 +#: builtin/grep.c:839 msgid "highlight matches" msgstr "оцветяване на напасванията" -#: builtin/grep.c:839 +#: builtin/grep.c:841 msgid "print empty line between matches from different files" msgstr "извеждане на празен ред между напасванията от различни файлове" -#: builtin/grep.c:841 +#: builtin/grep.c:843 msgid "show filename only once above matches from same file" msgstr "" "извеждане на името на файла само веднъж за всички напасвания от този файл" -#: builtin/grep.c:844 +#: builtin/grep.c:846 msgid "show <n> context lines before and after matches" msgstr "извеждане на такъв БРОЙ редове преди и след напасванията" -#: builtin/grep.c:847 +#: builtin/grep.c:849 msgid "show <n> context lines before matches" msgstr "извеждане на такъв БРОЙ редове преди напасванията" -#: builtin/grep.c:849 +#: builtin/grep.c:851 msgid "show <n> context lines after matches" msgstr "извеждане на такъв БРОЙ редове след напасванията" -#: builtin/grep.c:851 +#: builtin/grep.c:853 msgid "use <n> worker threads" msgstr "използване на такъв БРОЙ работещи нишки" -#: builtin/grep.c:852 +#: builtin/grep.c:854 msgid "shortcut for -C NUM" msgstr "синоним на „-C БРОЙ“" -#: builtin/grep.c:855 +#: builtin/grep.c:857 msgid "show a line with the function name before matches" msgstr "извеждане на ред с името на функцията, в която е напаснат шаблона" -#: builtin/grep.c:857 +#: builtin/grep.c:859 msgid "show the surrounding function" msgstr "извеждане на обхващащата функция" -#: builtin/grep.c:860 +#: builtin/grep.c:862 msgid "read patterns from file" msgstr "изчитане на шаблоните от ФАЙЛ" -#: builtin/grep.c:862 +#: builtin/grep.c:864 msgid "match <pattern>" msgstr "напасване на ШАБЛОН" -#: builtin/grep.c:864 +#: builtin/grep.c:866 msgid "combine patterns specified with -e" msgstr "комбиниране на шаблоните указани с опцията „-e“" -#: builtin/grep.c:876 +#: builtin/grep.c:878 msgid "indicate hit with exit status without output" msgstr "" "без извеждане на стандартния изход. Изходният код указва наличието на " "напасване" -#: builtin/grep.c:878 +#: builtin/grep.c:880 msgid "show only matches from files that match all patterns" msgstr "" "извеждане на редове само от файловете, които напасват на всички шаблони" -#: builtin/grep.c:880 +#: builtin/grep.c:882 msgid "show parse tree for grep expression" msgstr "извеждане на дървото за анализ на регулярния израз" -#: builtin/grep.c:884 +#: builtin/grep.c:886 msgid "pager" msgstr "програма за преглед по страници" -#: builtin/grep.c:884 +#: builtin/grep.c:886 msgid "show matching files in the pager" msgstr "извеждане на съвпадащите файлове в програма за преглед по страници" -#: builtin/grep.c:887 +#: builtin/grep.c:889 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" "позволяване на стартирането на grep(1) (текущият компилат пренебрегва тази " "опция)" -#: builtin/grep.c:950 +#: builtin/grep.c:952 msgid "no pattern given." msgstr "липсва шаблон." -#: builtin/grep.c:982 +#: builtin/grep.c:984 msgid "--no-index or --untracked cannot be used with revs" msgstr "опциите „--cached“ и „--untracked“ са несъвместими с версии." -#: builtin/grep.c:989 +#: builtin/grep.c:991 #, c-format msgid "unable to resolve revision: %s" msgstr "версията „%s“ не може бъде открита" -#: builtin/grep.c:1023 builtin/index-pack.c:1491 +#: builtin/grep.c:1026 builtin/index-pack.c:1491 #, c-format msgid "invalid number of threads specified (%d)" msgstr "зададен е неправилен брой нишки: %d" -#: builtin/grep.c:1028 +#: builtin/grep.c:1031 msgid "no threads support, ignoring --threads" msgstr "липсва поддръжка за нишки. „--threads“ ще се пренебрегне" -#: builtin/grep.c:1052 +#: builtin/grep.c:1055 msgid "--open-files-in-pager only works on the worktree" msgstr "" "опцията „--open-files-in-pager“ е съвместима само с търсене в работното дърво" -#: builtin/grep.c:1075 +#: builtin/grep.c:1078 msgid "option not supported with --recurse-submodules." msgstr "опцията е несъвместима с „--recurse-submodules“." -#: builtin/grep.c:1081 +#: builtin/grep.c:1084 msgid "--cached or --untracked cannot be used with --no-index." msgstr "опциите „--cached“ и „--untracked“ са несъвместими с „--no-index“." -#: builtin/grep.c:1087 +#: builtin/grep.c:1090 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" "опциите „--(no-)exclude-standard“ са несъвместими с търсене по следени " "файлове." -#: builtin/grep.c:1095 +#: builtin/grep.c:1098 msgid "both --cached and trees are given." msgstr "опцията „--cached“ е несъвместима със задаване на дърво." @@ -9178,11 +9255,11 @@ msgstr "показване на всички налични команди" #: builtin/help.c:44 msgid "exclude guides" -msgstr "без пътеводетели" +msgstr "без въведения" #: builtin/help.c:45 msgid "print list of useful guides" -msgstr "показване на списък с пътеводители" +msgstr "показване на списък с въведения" #: builtin/help.c:46 msgid "show man page" @@ -9262,7 +9339,7 @@ msgstr "Указване на атрибути към път" #: builtin/help.c:408 msgid "Everyday Git With 20 Commands Or So" -msgstr "Ежедневието в Git в рамките на 20-ина команди" +msgstr "Ежедневието в Git в рамките на двайсетина команди" #: builtin/help.c:409 msgid "A Git glossary" @@ -9290,7 +9367,7 @@ msgstr "Общ преглед на препоръчваните начини з #: builtin/help.c:426 msgid "The common Git guides are:\n" -msgstr "Популярните пътеводители в Git са:\n" +msgstr "Популярните въведения в Git са:\n" #: builtin/help.c:444 #, c-format @@ -9413,8 +9490,8 @@ msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" "СЪВПАДЕНИЕ НА СТОЙНОСТИТЕ ЗА СУМИТЕ ЗА SHA1: „%s“ НА ДВА РАЗЛИЧНИ ОБЕКТА!" -#: builtin/index-pack.c:752 builtin/pack-objects.c:168 -#: builtin/pack-objects.c:262 +#: builtin/index-pack.c:752 builtin/pack-objects.c:179 +#: builtin/pack-objects.c:273 #, c-format msgid "unable to read %s" msgstr "обектът „%s“ не може да бъде прочетен" @@ -9586,21 +9663,21 @@ msgstr[1] "дължината на веригата е %d: %lu обекта" msgid "packfile name '%s' does not end with '.pack'" msgstr "името на пакетния файл „%s“ не завършва на „.pack“" -#: builtin/index-pack.c:1705 builtin/index-pack.c:1708 -#: builtin/index-pack.c:1724 builtin/index-pack.c:1728 +#: builtin/index-pack.c:1700 builtin/index-pack.c:1703 +#: builtin/index-pack.c:1719 builtin/index-pack.c:1723 #, c-format msgid "bad %s" msgstr "неправилна стойност „%s“" -#: builtin/index-pack.c:1744 +#: builtin/index-pack.c:1739 msgid "--fix-thin cannot be used without --stdin" msgstr "опцията „--fix-thin“ изисква „--stdin“" -#: builtin/index-pack.c:1746 +#: builtin/index-pack.c:1741 msgid "--stdin requires a git repository" msgstr "„--stdin“ изисква хранилище на git" -#: builtin/index-pack.c:1754 +#: builtin/index-pack.c:1749 msgid "--verify with no packfile name given" msgstr "опцията „--verify“ изисква име на пакетен файл" @@ -9753,7 +9830,7 @@ msgstr "действие, ако епилог вече съществува" #: builtin/interpret-trailers.c:100 msgid "action if trailer is missing" -msgstr "действи при липсващ епилог" +msgstr "действие при липсващ епилог" #: builtin/interpret-trailers.c:102 msgid "output only the trailers" @@ -9777,7 +9854,7 @@ msgstr "епилог" #: builtin/interpret-trailers.c:108 msgid "trailer(s) to add" -msgstr "епилог(зи) за добавяне" +msgstr "епилози за добавяне" #: builtin/interpret-trailers.c:117 msgid "--trailer with --only-input does not make sense" @@ -9800,103 +9877,111 @@ msgstr "git show [ОПЦИЯ…] ОБЕКТ…" msgid "invalid --decorate option: %s" msgstr "неправилна опция „--decorate“: %s" -#: builtin/log.c:148 +#: builtin/log.c:151 msgid "suppress diff output" msgstr "без извеждане на разликите" -#: builtin/log.c:149 +#: builtin/log.c:152 msgid "show source" msgstr "извеждане на изходния код" -#: builtin/log.c:150 +#: builtin/log.c:153 msgid "Use mail map file" msgstr "" "Използване на файл за съответствията на имената и адресите на е-поща („." "mailmap“)" -#: builtin/log.c:151 +#: builtin/log.c:155 +msgid "only decorate refs that match <pattern>" +msgstr "специален формат само на указателите напасващи на ШАБЛОНа" + +#: builtin/log.c:157 +msgid "do not decorate refs that match <pattern>" +msgstr "без специален формат на указателите напасващи на ШАБЛОНа" + +#: builtin/log.c:158 msgid "decorate options" msgstr "настройки на форма̀та на извежданата информация" -#: builtin/log.c:154 +#: builtin/log.c:161 msgid "Process line range n,m in file, counting from 1" msgstr "" "Обработване само на редовете във файла в диапазона от n до m включително. " "Броенето започва от 1" -#: builtin/log.c:250 +#: builtin/log.c:257 #, c-format msgid "Final output: %d %s\n" msgstr "Резултат: %d %s\n" -#: builtin/log.c:501 +#: builtin/log.c:508 #, c-format msgid "git show %s: bad file" msgstr "git show %s: повреден файл" -#: builtin/log.c:516 builtin/log.c:610 +#: builtin/log.c:523 builtin/log.c:617 #, c-format msgid "Could not read object %s" msgstr "Обектът не може да бъде прочетен: %s" -#: builtin/log.c:634 +#: builtin/log.c:641 #, c-format msgid "Unknown type: %d" msgstr "Неизвестен вид: %d" -#: builtin/log.c:755 +#: builtin/log.c:762 msgid "format.headers without value" msgstr "не е зададена стойност на „format.headers“" -#: builtin/log.c:856 +#: builtin/log.c:863 msgid "name of output directory is too long" msgstr "прекалено дълго име на директорията за изходната информация" -#: builtin/log.c:872 +#: builtin/log.c:879 #, c-format msgid "Cannot open patch file %s" msgstr "Файлът-кръпка „%s“ не може да бъде отворен" -#: builtin/log.c:889 +#: builtin/log.c:896 msgid "Need exactly one range." msgstr "Трябва да зададете точно един диапазон." -#: builtin/log.c:899 +#: builtin/log.c:906 msgid "Not a range." msgstr "Не е диапазон." -#: builtin/log.c:1005 +#: builtin/log.c:1012 msgid "Cover letter needs email format" msgstr "Придружаващото писмо трябва да е форматирано като е-писмо" -#: builtin/log.c:1085 +#: builtin/log.c:1092 #, c-format msgid "insane in-reply-to: %s" msgstr "неправилен формат на заглавната част за отговор „in-reply-to“: %s" -#: builtin/log.c:1112 +#: builtin/log.c:1119 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [ОПЦИЯ…] [ОТ | ДИАПАЗОН_НА_ВЕРСИИТЕ]" -#: builtin/log.c:1162 +#: builtin/log.c:1169 msgid "Two output directories?" msgstr "Можете да укажете максимум една директория за изход." -#: builtin/log.c:1269 builtin/log.c:1920 builtin/log.c:1922 builtin/log.c:1934 +#: builtin/log.c:1276 builtin/log.c:1927 builtin/log.c:1929 builtin/log.c:1941 #, c-format msgid "Unknown commit %s" msgstr "Непознато подаване „%s“" -#: builtin/log.c:1279 builtin/notes.c:887 builtin/tag.c:516 +#: builtin/log.c:1286 builtin/notes.c:887 builtin/tag.c:516 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Не може да се открие към какво сочи „%s“." -#: builtin/log.c:1284 +#: builtin/log.c:1291 msgid "Could not find exact merge base." msgstr "Точната база за сливане не може да се открие." -#: builtin/log.c:1288 +#: builtin/log.c:1295 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" @@ -9906,234 +9991,234 @@ msgstr "" "зададете, използвайте „git branch --set-upstream-to“.\n" "Можете ръчно да зададете базово подаване чрез „--base=<base-commit-id>“." -#: builtin/log.c:1308 +#: builtin/log.c:1315 msgid "Failed to find exact merge base" msgstr "Точната база при сливане не може да бъде открита" -#: builtin/log.c:1319 +#: builtin/log.c:1326 msgid "base commit should be the ancestor of revision list" msgstr "базовото подаване трябва да е предшественикът на списъка с версиите" -#: builtin/log.c:1323 +#: builtin/log.c:1330 msgid "base commit shouldn't be in revision list" msgstr "базовото подаване не може да е в списъка с версиите" -#: builtin/log.c:1372 +#: builtin/log.c:1379 msgid "cannot get patch id" msgstr "идентификаторът на кръпката не може да бъде получен" -#: builtin/log.c:1431 +#: builtin/log.c:1438 msgid "use [PATCH n/m] even with a single patch" msgstr "номерация „[PATCH n/m]“ дори и при единствена кръпка" -#: builtin/log.c:1434 +#: builtin/log.c:1441 msgid "use [PATCH] even with multiple patches" msgstr "номерация „[PATCH]“ дори и при множество кръпки" -#: builtin/log.c:1438 +#: builtin/log.c:1445 msgid "print patches to standard out" msgstr "извеждане на кръпките на стандартния изход" -#: builtin/log.c:1440 +#: builtin/log.c:1447 msgid "generate a cover letter" msgstr "създаване на придружаващо писмо" -#: builtin/log.c:1442 +#: builtin/log.c:1449 msgid "use simple number sequence for output file names" msgstr "проста числова последователност за имената на файловете-кръпки" -#: builtin/log.c:1443 +#: builtin/log.c:1450 msgid "sfx" msgstr "ЗНАЦИ" -#: builtin/log.c:1444 +#: builtin/log.c:1451 msgid "use <sfx> instead of '.patch'" msgstr "използване на тези ЗНАЦИ за суфикс вместо „.patch“" -#: builtin/log.c:1446 +#: builtin/log.c:1453 msgid "start numbering patches at <n> instead of 1" msgstr "номерирането на кръпките да започва от този БРОЙ, а не с 1" -#: builtin/log.c:1448 +#: builtin/log.c:1455 msgid "mark the series as Nth re-roll" msgstr "отбелязване, че това е N-тата поредна редакция на поредицата от кръпки" -#: builtin/log.c:1450 +#: builtin/log.c:1457 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Използване на „[RFC PATCH]“ вместо „[PATCH]“" -#: builtin/log.c:1453 +#: builtin/log.c:1460 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Използване на този „[ПРЕФИКС]“ вместо „[PATCH]“" -#: builtin/log.c:1456 +#: builtin/log.c:1463 msgid "store resulting files in <dir>" msgstr "запазване на изходните файлове в тази ДИРЕКТОРИЯ" -#: builtin/log.c:1459 +#: builtin/log.c:1466 msgid "don't strip/add [PATCH]" msgstr "без добавяне/махане на префикса „[PATCH]“" -#: builtin/log.c:1462 +#: builtin/log.c:1469 msgid "don't output binary diffs" msgstr "без извеждане на разлики между двоични файлове" -#: builtin/log.c:1464 +#: builtin/log.c:1471 msgid "output all-zero hash in From header" msgstr "в заглавната част „From:“ (от) хешът да е само от нули" -#: builtin/log.c:1466 +#: builtin/log.c:1473 msgid "don't include a patch matching a commit upstream" msgstr "да не се включват кръпки, които присъстват в следения клон" -#: builtin/log.c:1468 +#: builtin/log.c:1475 msgid "show patch format instead of default (patch + stat)" msgstr "" "извеждане във формат за кръпки, а на в стандартния (кръпка и статистика)" -#: builtin/log.c:1470 +#: builtin/log.c:1477 msgid "Messaging" msgstr "Опции при изпращане" -#: builtin/log.c:1471 +#: builtin/log.c:1478 msgid "header" msgstr "ЗАГЛАВНА_ЧАСТ" -#: builtin/log.c:1472 +#: builtin/log.c:1479 msgid "add email header" msgstr "добавяне на тази ЗАГЛАВНА_ЧАСТ" -#: builtin/log.c:1473 builtin/log.c:1475 +#: builtin/log.c:1480 builtin/log.c:1482 msgid "email" msgstr "Е-ПОЩА" -#: builtin/log.c:1473 +#: builtin/log.c:1480 msgid "add To: header" msgstr "добавяне на заглавна част „To:“ (до)" -#: builtin/log.c:1475 +#: builtin/log.c:1482 msgid "add Cc: header" msgstr "добавяне на заглавна част „Cc:“ (и до)" -#: builtin/log.c:1477 +#: builtin/log.c:1484 msgid "ident" msgstr "ИДЕНТИЧНОСТ" -#: builtin/log.c:1478 +#: builtin/log.c:1485 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "задаване на адреса в заглавната част „From“ (от) да е тази ИДЕНТИЧНОСТ. Ако " "не е зададена такава, се взима адреса на подаващия" -#: builtin/log.c:1480 +#: builtin/log.c:1487 msgid "message-id" msgstr "ИДЕНТИФИКАТОР_НА_СЪОБЩЕНИЕ" -#: builtin/log.c:1481 +#: builtin/log.c:1488 msgid "make first mail a reply to <message-id>" msgstr "" "първото съобщение да е в отговор на е-писмото с този " "ИДЕНТИФИКАТОР_НА_СЪОБЩЕНИЕ" -#: builtin/log.c:1482 builtin/log.c:1485 +#: builtin/log.c:1489 builtin/log.c:1492 msgid "boundary" msgstr "граница" -#: builtin/log.c:1483 +#: builtin/log.c:1490 msgid "attach the patch" msgstr "прикрепяне на кръпката" -#: builtin/log.c:1486 +#: builtin/log.c:1493 msgid "inline the patch" msgstr "включване на кръпката в текста на писмата" -#: builtin/log.c:1490 +#: builtin/log.c:1497 msgid "enable message threading, styles: shallow, deep" msgstr "" "използване на нишки за съобщенията. СТИЛът е „shallow“ (плитък) или " "„deep“ (дълбок)" -#: builtin/log.c:1492 +#: builtin/log.c:1499 msgid "signature" msgstr "подпис" -#: builtin/log.c:1493 +#: builtin/log.c:1500 msgid "add a signature" msgstr "добавяне на поле за подпис" -#: builtin/log.c:1494 +#: builtin/log.c:1501 msgid "base-commit" msgstr "БАЗОВО_ПОДАВАНЕ" -#: builtin/log.c:1495 +#: builtin/log.c:1502 msgid "add prerequisite tree info to the patch series" msgstr "добавяне на необходимото БАЗово дърво към серията кръпки" -#: builtin/log.c:1497 +#: builtin/log.c:1504 msgid "add a signature from a file" msgstr "добавяне на подпис от файл" -#: builtin/log.c:1498 +#: builtin/log.c:1505 msgid "don't print the patch filenames" msgstr "без извеждане на имената на кръпките" -#: builtin/log.c:1500 +#: builtin/log.c:1507 msgid "show progress while generating patches" msgstr "извеждане на напредъка във фазата на създаване на кръпките" -#: builtin/log.c:1575 +#: builtin/log.c:1582 #, c-format msgid "invalid ident line: %s" msgstr "грешна идентичност: %s" -#: builtin/log.c:1590 +#: builtin/log.c:1597 msgid "-n and -k are mutually exclusive." msgstr "опциите „-n“ и „-k“ са несъвместими." -#: builtin/log.c:1592 +#: builtin/log.c:1599 msgid "--subject-prefix/--rfc and -k are mutually exclusive." msgstr "опциите „--subject-prefix“/„-rfc“ и „-k“ са несъвместими." -#: builtin/log.c:1600 +#: builtin/log.c:1607 msgid "--name-only does not make sense" msgstr "опцията „--name-only“ е несъвместима с генерирането на кръпки" -#: builtin/log.c:1602 +#: builtin/log.c:1609 msgid "--name-status does not make sense" msgstr "опцията „--name-status“ е несъвместима с генерирането на кръпки" -#: builtin/log.c:1604 +#: builtin/log.c:1611 msgid "--check does not make sense" msgstr "опцията „--check“ е несъвместима с генерирането на кръпки" -#: builtin/log.c:1634 +#: builtin/log.c:1641 msgid "standard output, or directory, which one?" msgstr "" "изходът може да или стандартният, или да е в директория, но не и двете." -#: builtin/log.c:1636 +#: builtin/log.c:1643 #, c-format msgid "Could not create directory '%s'" msgstr "Директорията „%s“ не може да бъде създадена" -#: builtin/log.c:1729 +#: builtin/log.c:1736 #, c-format msgid "unable to read signature file '%s'" msgstr "файлът „%s“ с подпис не може да бъде прочетен" -#: builtin/log.c:1761 +#: builtin/log.c:1768 msgid "Generating patches" msgstr "Създаване на кръпки" -#: builtin/log.c:1805 +#: builtin/log.c:1812 msgid "Failed to create output files" msgstr "Изходните файлове не могат да бъдат създадени" -#: builtin/log.c:1855 +#: builtin/log.c:1862 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [ОТДАЛЕЧЕН_КЛОН [ВРЪХ [ПРЕДЕЛ]]]" -#: builtin/log.c:1909 +#: builtin/log.c:1916 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -10141,105 +10226,109 @@ msgstr "" "Следеният отдалечен клон не бе открит, затова изрично задайте " "ОТДАЛЕЧЕН_КЛОН.\n" -#: builtin/ls-files.c:466 +#: builtin/ls-files.c:468 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [ОПЦИЯ…] [ФАЙЛ…]" -#: builtin/ls-files.c:515 +#: builtin/ls-files.c:517 msgid "identify the file status with tags" msgstr "извеждане на състоянието на файловете с еднобуквени флагове" -#: builtin/ls-files.c:517 +#: builtin/ls-files.c:519 msgid "use lowercase letters for 'assume unchanged' files" msgstr "малки букви за файловете, които да се счетат за непроменени" -#: builtin/ls-files.c:519 +#: builtin/ls-files.c:521 +msgid "use lowercase letters for 'fsmonitor clean' files" +msgstr "малки букви за файловете за командата „fsmonitor clean“" + +#: builtin/ls-files.c:523 msgid "show cached files in the output (default)" msgstr "извеждане на кешираните файлове (стандартно)" -#: builtin/ls-files.c:521 +#: builtin/ls-files.c:525 msgid "show deleted files in the output" msgstr "извеждане на изтритите файлове" -#: builtin/ls-files.c:523 +#: builtin/ls-files.c:527 msgid "show modified files in the output" msgstr "извеждане на променените файлове" -#: builtin/ls-files.c:525 +#: builtin/ls-files.c:529 msgid "show other files in the output" msgstr "извеждане на другите файлове" -#: builtin/ls-files.c:527 +#: builtin/ls-files.c:531 msgid "show ignored files in the output" msgstr "извеждане на игнорираните файлове" -#: builtin/ls-files.c:530 +#: builtin/ls-files.c:534 msgid "show staged contents' object name in the output" msgstr "извеждане на името на обекта за съдържанието на индекса" -#: builtin/ls-files.c:532 +#: builtin/ls-files.c:536 msgid "show files on the filesystem that need to be removed" msgstr "извеждане на файловете, които трябва да бъдат изтрити" -#: builtin/ls-files.c:534 +#: builtin/ls-files.c:538 msgid "show 'other' directories' names only" msgstr "извеждане само на името на другите (неследените) директории" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:540 msgid "show line endings of files" msgstr "извеждане на знаците за край на ред във файловете" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:542 msgid "don't show empty directories" msgstr "без извеждане на празните директории" -#: builtin/ls-files.c:541 +#: builtin/ls-files.c:545 msgid "show unmerged files in the output" msgstr "извеждане на неслетите файлове" -#: builtin/ls-files.c:543 +#: builtin/ls-files.c:547 msgid "show resolve-undo information" msgstr "извеждане на информацията за отмяна на разрешените подавания" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:549 msgid "skip files matching pattern" msgstr "прескачане на файловете напасващи ШАБЛОНа" -#: builtin/ls-files.c:548 +#: builtin/ls-files.c:552 msgid "exclude patterns are read from <file>" msgstr "шаблоните за игнориране да се прочетат от този ФАЙЛ" -#: builtin/ls-files.c:551 +#: builtin/ls-files.c:555 msgid "read additional per-directory exclude patterns in <file>" msgstr "" "изчитане на допълнителните шаблони за игнориране по директория от този ФАЙЛ" -#: builtin/ls-files.c:553 +#: builtin/ls-files.c:557 msgid "add the standard git exclusions" msgstr "добавяне на стандартно игнорираните от Git файлове" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:560 msgid "make the output relative to the project top directory" msgstr "пътищата да са относителни спрямо основната директория на проекта" -#: builtin/ls-files.c:559 +#: builtin/ls-files.c:563 msgid "recurse through submodules" msgstr "рекурсивно обхождане подмодулите" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:565 msgid "if any <file> is not in the index, treat this as an error" msgstr "грешка, ако някой от тези ФАЙЛове не е в индекса" -#: builtin/ls-files.c:562 +#: builtin/ls-files.c:566 msgid "tree-ish" msgstr "УКАЗАТЕЛ_КЪМ_ДЪРВО" -#: builtin/ls-files.c:563 +#: builtin/ls-files.c:567 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "считане, че пътищата изтрити след УКАЗАТЕЛя_КЪМ_ДЪРВО все още съществуват" -#: builtin/ls-files.c:565 +#: builtin/ls-files.c:569 msgid "show debugging data" msgstr "извеждане на информацията за изчистване на грешки" @@ -10363,33 +10452,33 @@ msgstr "Наличните стратегии са:" msgid "Available custom strategies are:" msgstr "Допълнителните стратегии са:" -#: builtin/merge.c:200 builtin/pull.c:134 +#: builtin/merge.c:200 builtin/pull.c:137 msgid "do not show a diffstat at the end of the merge" msgstr "без извеждане на статистиката след завършване на сливане" -#: builtin/merge.c:203 builtin/pull.c:137 +#: builtin/merge.c:203 builtin/pull.c:140 msgid "show a diffstat at the end of the merge" msgstr "извеждане на статистиката след завършване на сливане" -#: builtin/merge.c:204 builtin/pull.c:140 +#: builtin/merge.c:204 builtin/pull.c:143 msgid "(synonym to --stat)" msgstr "(синоним на „--stat“)" -#: builtin/merge.c:206 builtin/pull.c:143 +#: builtin/merge.c:206 builtin/pull.c:146 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "добавяне (на максимум такъв БРОЙ) записи от съкратения журнал в съобщението " "за подаване" -#: builtin/merge.c:209 builtin/pull.c:146 +#: builtin/merge.c:209 builtin/pull.c:152 msgid "create a single commit instead of doing a merge" msgstr "създаване на едно подаване вместо извършване на сливане" -#: builtin/merge.c:211 builtin/pull.c:149 +#: builtin/merge.c:211 builtin/pull.c:155 msgid "perform a commit if the merge succeeds (default)" msgstr "извършване на подаване при успешно сливане (стандартно действие)" -#: builtin/merge.c:213 builtin/pull.c:152 +#: builtin/merge.c:213 builtin/pull.c:158 msgid "edit message before committing" msgstr "редактиране на съобщението преди подаване" @@ -10397,28 +10486,28 @@ msgstr "редактиране на съобщението преди подав msgid "allow fast-forward (default)" msgstr "позволяване на превъртане (стандартно действие)" -#: builtin/merge.c:216 builtin/pull.c:158 +#: builtin/merge.c:216 builtin/pull.c:164 msgid "abort if fast-forward is not possible" msgstr "преустановяване, ако превъртането е невъзможно" -#: builtin/merge.c:220 builtin/pull.c:161 +#: builtin/merge.c:220 builtin/pull.c:167 msgid "verify that the named commit has a valid GPG signature" msgstr "проверка, че указаното подаване е с правилен подпис на GPG" -#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:165 +#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:171 #: builtin/revert.c:109 msgid "strategy" msgstr "СТРАТЕГИЯ" -#: builtin/merge.c:222 builtin/pull.c:166 +#: builtin/merge.c:222 builtin/pull.c:172 msgid "merge strategy to use" msgstr "СТРАТЕГИЯ за сливане, която да се ползва" -#: builtin/merge.c:223 builtin/pull.c:169 +#: builtin/merge.c:223 builtin/pull.c:175 msgid "option=value" msgstr "ОПЦИЯ=СТОЙНОСТ" -#: builtin/merge.c:224 builtin/pull.c:170 +#: builtin/merge.c:224 builtin/pull.c:176 msgid "option for selected merge strategy" msgstr "ОПЦИЯ за избраната стратегия за сливане" @@ -10434,7 +10523,7 @@ msgstr "преустановяване на текущото сливане" msgid "continue the current in-progress merge" msgstr "продължаване на текущото сливане" -#: builtin/merge.c:234 builtin/pull.c:177 +#: builtin/merge.c:234 builtin/pull.c:183 msgid "allow merging unrelated histories" msgstr "позволяване на сливане на независими истории" @@ -10475,43 +10564,43 @@ msgid "No merge message -- not updating HEAD\n" msgstr "" "Липсва съобщение при подаване — указателят „HEAD“ няма да бъде обновен\n" -#: builtin/merge.c:456 +#: builtin/merge.c:455 #, c-format msgid "'%s' does not point to a commit" msgstr "„%s“ не сочи към подаване" -#: builtin/merge.c:546 +#: builtin/merge.c:545 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Неправилен низ за настройката „branch.%s.mergeoptions“: „%s“" -#: builtin/merge.c:666 +#: builtin/merge.c:667 msgid "Not handling anything other than two heads merge." msgstr "Поддържа се само сливане на точно две истории." -#: builtin/merge.c:680 +#: builtin/merge.c:681 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Непозната опция за рекурсивното сливане „merge-recursive“: „-X%s“" -#: builtin/merge.c:695 +#: builtin/merge.c:696 #, c-format msgid "unable to write %s" msgstr "„%s“ не може да бъде записан" -#: builtin/merge.c:747 +#: builtin/merge.c:748 #, c-format msgid "Could not read from '%s'" msgstr "От „%s“ не може да се чете" -#: builtin/merge.c:756 +#: builtin/merge.c:757 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Сливането няма да бъде подадено. За завършването му и подаването му " "използвайте командата „git commit“.\n" -#: builtin/merge.c:762 +#: builtin/merge.c:763 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -10526,72 +10615,72 @@ msgstr "" "Редовете, които започват с „%c“ ще бъдат пропуснати, а празно съобщение\n" "преустановява подаването.\n" -#: builtin/merge.c:798 +#: builtin/merge.c:799 msgid "Empty commit message." msgstr "Празно съобщение при подаване." -#: builtin/merge.c:818 +#: builtin/merge.c:819 #, c-format msgid "Wonderful.\n" msgstr "Първият етап на сливането завърши.\n" -#: builtin/merge.c:871 +#: builtin/merge.c:872 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Неуспешно автоматично сливане — коригирайте конфликтите и подайте " "резултата.\n" -#: builtin/merge.c:910 +#: builtin/merge.c:911 msgid "No current branch." msgstr "Няма текущ клон." -#: builtin/merge.c:912 +#: builtin/merge.c:913 msgid "No remote for the current branch." msgstr "Текущият клон не следи никой." -#: builtin/merge.c:914 +#: builtin/merge.c:915 msgid "No default upstream defined for the current branch." msgstr "Текущият клон не следи никой клон." -#: builtin/merge.c:919 +#: builtin/merge.c:920 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Никой клон не следи клона „%s“ от хранилището „%s“" -#: builtin/merge.c:972 +#: builtin/merge.c:973 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Неправилна стойност „%s“ в средата „%s“" -#: builtin/merge.c:1073 +#: builtin/merge.c:1075 #, c-format msgid "not something we can merge in %s: %s" msgstr "не може да се слее в „%s“: %s" -#: builtin/merge.c:1107 +#: builtin/merge.c:1109 msgid "not something we can merge" msgstr "не може да се слее" -#: builtin/merge.c:1172 +#: builtin/merge.c:1174 msgid "--abort expects no arguments" msgstr "опцията „--abort“ не приема аргументи" -#: builtin/merge.c:1176 +#: builtin/merge.c:1178 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" "Не може да преустановите сливане, защото в момента не се извършва такова " "(липсва указател „MERGE_HEAD“)." -#: builtin/merge.c:1188 +#: builtin/merge.c:1190 msgid "--continue expects no arguments" msgstr "опцията „--continue“ не приема аргументи" -#: builtin/merge.c:1192 +#: builtin/merge.c:1194 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "В момента не се извършва сливане (липсва указател „MERGE_HEAD“)." -#: builtin/merge.c:1208 +#: builtin/merge.c:1210 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10599,7 +10688,7 @@ msgstr "" "Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува).\n" "Подайте промените си, преди да започнете ново сливане." -#: builtin/merge.c:1215 +#: builtin/merge.c:1217 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10607,121 +10696,121 @@ msgstr "" "Не сте завършили отбиране на подаване (указателят „CHERRY_PICK_HEAD“\n" "съществува). Подайте промените си, преди да започнете ново сливане." -#: builtin/merge.c:1218 +#: builtin/merge.c:1220 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" "Не сте завършили отбиране на подаване (указателят „CHERRY_PICK_HEAD“\n" "съществува)." -#: builtin/merge.c:1227 +#: builtin/merge.c:1229 msgid "You cannot combine --squash with --no-ff." msgstr "Опцията „--squash“ е несъвместима с „--no-ff“." -#: builtin/merge.c:1235 +#: builtin/merge.c:1237 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "Не е указано подаване и настройката „merge.defaultToUpstream“ не е зададена." -#: builtin/merge.c:1252 +#: builtin/merge.c:1254 msgid "Squash commit into empty head not supported yet" msgstr "Подаване със смачкване във връх без история все още не се поддържа" -#: builtin/merge.c:1254 +#: builtin/merge.c:1256 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" "Понеже върхът е без история, всички сливания са превъртания, не може да се " "извърши същинско сливане изисквано от опцията „--no-ff“" -#: builtin/merge.c:1259 +#: builtin/merge.c:1261 #, c-format msgid "%s - not something we can merge" msgstr "„%s“ — не е нещо, което може да се слее" -#: builtin/merge.c:1261 +#: builtin/merge.c:1263 msgid "Can merge only exactly one commit into empty head" msgstr "Можете да слеете точно едно подаване във връх без история" -#: builtin/merge.c:1295 +#: builtin/merge.c:1297 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "Подаването „%s“ е с недоверен подпис от GPG, който твърди, че е на „%s“." -#: builtin/merge.c:1298 +#: builtin/merge.c:1300 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" "Подаването „%s“ е с неправилен подпис от GPG, който твърди, че е на „%s“." -#: builtin/merge.c:1301 +#: builtin/merge.c:1303 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Подаването „%s“ е без подпис от GPG." -#: builtin/merge.c:1304 +#: builtin/merge.c:1306 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Подаването „%s“ е с коректен подпис от GPG на „%s“.\n" -#: builtin/merge.c:1366 +#: builtin/merge.c:1368 msgid "refusing to merge unrelated histories" msgstr "независими истории не може да се слеят" -#: builtin/merge.c:1375 +#: builtin/merge.c:1377 msgid "Already up to date." msgstr "Вече е обновено." -#: builtin/merge.c:1385 +#: builtin/merge.c:1387 #, c-format msgid "Updating %s..%s\n" msgstr "Обновяване „%s..%s“\n" -#: builtin/merge.c:1426 +#: builtin/merge.c:1428 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Проба със сливане в рамките на индекса…\n" -#: builtin/merge.c:1433 +#: builtin/merge.c:1435 #, c-format msgid "Nope.\n" msgstr "Неуспешно сливане.\n" -#: builtin/merge.c:1458 +#: builtin/merge.c:1460 msgid "Already up to date. Yeeah!" msgstr "Вече е обновено!" -#: builtin/merge.c:1464 +#: builtin/merge.c:1466 msgid "Not possible to fast-forward, aborting." msgstr "Не може да се извърши превъртане, преустановяване на действието." -#: builtin/merge.c:1487 builtin/merge.c:1566 +#: builtin/merge.c:1489 builtin/merge.c:1568 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Привеждане на дървото към първоначалното…\n" -#: builtin/merge.c:1491 +#: builtin/merge.c:1493 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Пробване със стратегията за сливане „%s“…\n" -#: builtin/merge.c:1557 +#: builtin/merge.c:1559 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Никоя стратегия за сливане не може да извърши сливането.\n" -#: builtin/merge.c:1559 +#: builtin/merge.c:1561 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Неуспешно сливане със стратегия „%s“.\n" -#: builtin/merge.c:1568 +#: builtin/merge.c:1570 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" "Ползва се стратегията „%s“, която ще подготви дървото за коригиране на " "ръка.\n" -#: builtin/merge.c:1580 +#: builtin/merge.c:1582 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -10748,24 +10837,24 @@ msgstr "git merge-base --is-ancestor ПОДАВАНЕ_1 ПОДАВАНЕ_2" msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point УКАЗАТЕЛ [ПОДАВАНЕ]" -#: builtin/merge-base.c:218 +#: builtin/merge-base.c:220 msgid "output all common ancestors" msgstr "извеждане на всички общи предшественици" -#: builtin/merge-base.c:220 +#: builtin/merge-base.c:222 msgid "find ancestors for a single n-way merge" msgstr "" "откриване на предшествениците за еднократно сливане на множество истории" -#: builtin/merge-base.c:222 +#: builtin/merge-base.c:224 msgid "list revs not reachable from others" msgstr "извеждане на недостижимите от другите указатели" -#: builtin/merge-base.c:224 +#: builtin/merge-base.c:226 msgid "is the first one ancestor of the other?" msgstr "ПОДАВАНЕ_1 предшественик ли е на ПОДАВАНЕ_2?" -#: builtin/merge-base.c:226 +#: builtin/merge-base.c:228 msgid "find where <commit> forked from reflog of <ref>" msgstr "откриване къде ПОДАВАНЕто се е отклонило от историята на УКАЗАТЕЛя" @@ -11049,8 +11138,8 @@ msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "git notes [--ref УКАЗАТЕЛ_ЗА_БЕЛЕЖКА] remove [ОБЕКТ…]" #: builtin/notes.c:36 -msgid "git notes [--ref <notes-ref>] prune [-n | -v]" -msgstr "git notes [--ref УКАЗАТЕЛ_ЗА_БЕЛЕЖКА] prune [-n | -v]" +msgid "git notes [--ref <notes-ref>] prune [-n] [-v]" +msgstr "git notes [--ref УКАЗАТЕЛ_ЗА_БЕЛЕЖКА] prune [-n] [-v]" #: builtin/notes.c:37 msgid "git notes [--ref <notes-ref>] get-ref" @@ -11398,7 +11487,7 @@ msgstr "опитът за изтриването на несъществуващ msgid "read object names from the standard input" msgstr "изчитане на имената на обектите от стандартния вход" -#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:146 +#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:158 msgid "do not remove, show only" msgstr "само извеждане без действително окастряне" @@ -11419,205 +11508,213 @@ msgstr "да се използва бележката сочена от този msgid "unknown subcommand: %s" msgstr "непозната подкоманда: %s" -#: builtin/pack-objects.c:31 +#: builtin/pack-objects.c:33 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [ОПЦИЯ…] [< СПИСЪК_С_УКАЗАТЕЛИ | < СПИСЪК_С_ОБЕКТИ]" -#: builtin/pack-objects.c:32 +#: builtin/pack-objects.c:34 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [ОПЦИЯ…] ПРЕФИКС_НА_ИМЕТО [< СПИСЪК_С_УКАЗАТЕЛИ | < " "СПИСЪК_С_ОБЕКТИ]" -#: builtin/pack-objects.c:181 builtin/pack-objects.c:184 +#: builtin/pack-objects.c:192 builtin/pack-objects.c:195 #, c-format msgid "deflate error (%d)" msgstr "грешка при декомпресиране с „deflate“ (%d)" -#: builtin/pack-objects.c:777 +#: builtin/pack-objects.c:788 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "изключване на записването на битовата маска, пакетите са разделени поради " "стойността на „pack.packSizeLimit“" -#: builtin/pack-objects.c:790 +#: builtin/pack-objects.c:801 msgid "Writing objects" msgstr "Записване на обектите" -#: builtin/pack-objects.c:1070 +#: builtin/pack-objects.c:1081 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "изключване на записването на битовата маска, защото някои обекти няма да се " "пакетират" -#: builtin/pack-objects.c:2440 +#: builtin/pack-objects.c:2451 msgid "Compressing objects" msgstr "Компресиране на обектите" -#: builtin/pack-objects.c:2849 +#: builtin/pack-objects.c:2599 +msgid "invalid value for --missing" +msgstr "неправилна стойност за „--missing“" + +#: builtin/pack-objects.c:2902 #, c-format msgid "unsupported index version %s" msgstr "неподдържана версия на индекса „%s“" -#: builtin/pack-objects.c:2853 +#: builtin/pack-objects.c:2906 #, c-format msgid "bad index version '%s'" msgstr "неправилна версия на индекса „%s“" -#: builtin/pack-objects.c:2883 +#: builtin/pack-objects.c:2936 msgid "do not show progress meter" msgstr "без извеждане на напредъка" -#: builtin/pack-objects.c:2885 +#: builtin/pack-objects.c:2938 msgid "show progress meter" msgstr "извеждане на напредъка" -#: builtin/pack-objects.c:2887 +#: builtin/pack-objects.c:2940 msgid "show progress meter during object writing phase" msgstr "извеждане на напредъка във фазата на запазване на обектите" -#: builtin/pack-objects.c:2890 +#: builtin/pack-objects.c:2943 msgid "similar to --all-progress when progress meter is shown" msgstr "" "същото действие като опцията „--all-progress“ при извеждането на напредъка" -#: builtin/pack-objects.c:2891 +#: builtin/pack-objects.c:2944 msgid "version[,offset]" msgstr "ВЕРСИЯ[,ОТМЕСТВАНЕ]" -#: builtin/pack-objects.c:2892 +#: builtin/pack-objects.c:2945 msgid "write the pack index file in the specified idx format version" msgstr "" "запазване на индекса на пакетните файлове във форма̀та с указаната версия" -#: builtin/pack-objects.c:2895 +#: builtin/pack-objects.c:2948 msgid "maximum size of each output pack file" msgstr "максимален размер на всеки пакетен файл" -#: builtin/pack-objects.c:2897 +#: builtin/pack-objects.c:2950 msgid "ignore borrowed objects from alternate object store" msgstr "игнориране на обектите заети от други хранилища на обекти" -#: builtin/pack-objects.c:2899 +#: builtin/pack-objects.c:2952 msgid "ignore packed objects" msgstr "игнориране на пакетираните обекти" -#: builtin/pack-objects.c:2901 +#: builtin/pack-objects.c:2954 msgid "limit pack window by objects" msgstr "ограничаване на прозореца за пакетиране по брой обекти" -#: builtin/pack-objects.c:2903 +#: builtin/pack-objects.c:2956 msgid "limit pack window by memory in addition to object limit" msgstr "" "ограничаване на прозореца за пакетиране и по памет освен по брой обекти" -#: builtin/pack-objects.c:2905 +#: builtin/pack-objects.c:2958 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" "максимална дължина на веригата от разлики, която е позволена в пакетния файл" -#: builtin/pack-objects.c:2907 +#: builtin/pack-objects.c:2960 msgid "reuse existing deltas" msgstr "преизползване на съществуващите разлики" -#: builtin/pack-objects.c:2909 +#: builtin/pack-objects.c:2962 msgid "reuse existing objects" msgstr "преизползване на съществуващите обекти" -#: builtin/pack-objects.c:2911 +#: builtin/pack-objects.c:2964 msgid "use OFS_DELTA objects" msgstr "използване на обекти „OFS_DELTA“" -#: builtin/pack-objects.c:2913 +#: builtin/pack-objects.c:2966 msgid "use threads when searching for best delta matches" msgstr "" "стартиране на нишки за претърсване на най-добрите съвпадения на разликите" -#: builtin/pack-objects.c:2915 +#: builtin/pack-objects.c:2968 msgid "do not create an empty pack output" msgstr "без създаване на празен пакетен файл" -#: builtin/pack-objects.c:2917 +#: builtin/pack-objects.c:2970 msgid "read revision arguments from standard input" msgstr "изчитане на версиите от стандартния вход" -#: builtin/pack-objects.c:2919 +#: builtin/pack-objects.c:2972 msgid "limit the objects to those that are not yet packed" msgstr "ограничаване до все още непакетираните обекти" -#: builtin/pack-objects.c:2922 +#: builtin/pack-objects.c:2975 msgid "include objects reachable from any reference" msgstr "" "включване на всички обекти, които могат да се достигнат от произволен " "указател" -#: builtin/pack-objects.c:2925 +#: builtin/pack-objects.c:2978 msgid "include objects referred by reflog entries" msgstr "включване и на обектите сочени от записите в журнала на указателите" -#: builtin/pack-objects.c:2928 +#: builtin/pack-objects.c:2981 msgid "include objects referred to by the index" msgstr "включване и на обектите сочени от индекса" -#: builtin/pack-objects.c:2931 +#: builtin/pack-objects.c:2984 msgid "output pack to stdout" msgstr "извеждане на пакета на стандартния изход" -#: builtin/pack-objects.c:2933 +#: builtin/pack-objects.c:2986 msgid "include tag objects that refer to objects to be packed" msgstr "" "включване и на обектите-етикети, които сочат към обектите, които ще бъдат " "пакетирани" -#: builtin/pack-objects.c:2935 +#: builtin/pack-objects.c:2988 msgid "keep unreachable objects" msgstr "запазване на недостижимите обекти" -#: builtin/pack-objects.c:2937 +#: builtin/pack-objects.c:2990 msgid "pack loose unreachable objects" msgstr "пакетиране и на недостижимите обекти" -#: builtin/pack-objects.c:2939 +#: builtin/pack-objects.c:2992 msgid "unpack unreachable objects newer than <time>" msgstr "разпакетиране на недостижимите обекти, които са по-нови от това ВРЕМЕ" -#: builtin/pack-objects.c:2942 +#: builtin/pack-objects.c:2995 msgid "create thin packs" msgstr "създаване на съкратени пакети" -#: builtin/pack-objects.c:2944 +#: builtin/pack-objects.c:2997 msgid "create packs suitable for shallow fetches" msgstr "пакетиране подходящо за плитко доставяне" -#: builtin/pack-objects.c:2946 +#: builtin/pack-objects.c:2999 msgid "ignore packs that have companion .keep file" msgstr "игнориране на пакетите, които са придружени от файл „.keep“" -#: builtin/pack-objects.c:2948 +#: builtin/pack-objects.c:3001 msgid "pack compression level" msgstr "ниво на компресиране при пакетиране" -#: builtin/pack-objects.c:2950 +#: builtin/pack-objects.c:3003 msgid "do not hide commits by grafts" msgstr "" "извеждане на всички родители — дори и тези, които нормално са скрити при " "присажданията" -#: builtin/pack-objects.c:2952 +#: builtin/pack-objects.c:3005 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "използване на съществуващи индекси на база битови маски за ускоряване на " "преброяването на обектите" -#: builtin/pack-objects.c:2954 +#: builtin/pack-objects.c:3007 msgid "write a bitmap index together with the pack index" msgstr "" "запазване и на индекс на база побитова маска, заедно с индекса за пакета" -#: builtin/pack-objects.c:3081 +#: builtin/pack-objects.c:3010 +msgid "handling for missing objects" +msgstr "как да се обработват липсващите обекти" + +#: builtin/pack-objects.c:3144 msgid "Counting objects" msgstr "Преброяване на обектите" @@ -11642,8 +11739,8 @@ msgid "Removing duplicate objects" msgstr "Изтриване на повтарящите се обекти" #: builtin/prune.c:11 -msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" -msgstr "git prune [-n] [-v] [--expire ВРЕМЕ] [--] [ВРЪХ…]" +msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" +msgstr "git prune [-n] [-v] [--progress] [--expire ВРЕМЕ] [--] [ВРЪХ…]" #: builtin/prune.c:106 msgid "report pruned objects" @@ -11666,40 +11763,40 @@ msgstr "Неправилна стойност за „%s“: „%s“" msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git push [ОПЦИЯ…] [ХРАНИЛИЩЕ [УКАЗАТЕЛ_НА_ВЕРСИЯ…]]" -#: builtin/pull.c:124 +#: builtin/pull.c:127 msgid "control for recursive fetching of submodules" msgstr "управление на рекурсивното доставяне на подмодулите" -#: builtin/pull.c:128 +#: builtin/pull.c:131 msgid "Options related to merging" msgstr "Опции при сливане" -#: builtin/pull.c:131 +#: builtin/pull.c:134 msgid "incorporate changes by rebasing rather than merging" msgstr "внасяне на промените чрез пребазиране, а не чрез сливане" -#: builtin/pull.c:155 builtin/rebase--helper.c:21 builtin/revert.c:121 +#: builtin/pull.c:161 builtin/rebase--helper.c:23 builtin/revert.c:121 msgid "allow fast-forward" msgstr "позволяване на превъртания" -#: builtin/pull.c:164 +#: builtin/pull.c:170 msgid "automatically stash/stash pop before and after rebase" msgstr "автоматично скатаване/прилагане на скатаното преди и след пребазиране" -#: builtin/pull.c:180 +#: builtin/pull.c:186 msgid "Options related to fetching" msgstr "Опции при доставяне" -#: builtin/pull.c:198 +#: builtin/pull.c:204 msgid "number of submodules pulled in parallel" msgstr "брой подмодули издърпани паралелно" -#: builtin/pull.c:287 +#: builtin/pull.c:299 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Неправилна стойност за „pull.ff“: „%s“" -#: builtin/pull.c:403 +#: builtin/pull.c:415 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -11707,14 +11804,14 @@ msgstr "" "Между указателите, които току що доставихте, няма подходящ кандидат, върху " "който да пребазирате." -#: builtin/pull.c:405 +#: builtin/pull.c:417 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "Между указателите, които току що доставихте, няма подходящ кандидат, който " "да слеете." -#: builtin/pull.c:406 +#: builtin/pull.c:418 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -11722,7 +11819,7 @@ msgstr "" "Най вероятно сте подали шаблон за указатели, който не е напаснал с нищо в " "отдалеченото хранилище." -#: builtin/pull.c:409 +#: builtin/pull.c:421 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -11733,44 +11830,44 @@ msgstr "" "Понеже това не е хранилището по подразбиране на текущия клон, трябва\n" "да укажете отдалечения клон на командния ред." -#: builtin/pull.c:414 git-parse-remote.sh:73 +#: builtin/pull.c:426 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Извън всички клони." -#: builtin/pull.c:416 builtin/pull.c:431 git-parse-remote.sh:79 +#: builtin/pull.c:428 builtin/pull.c:443 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Укажете върху кой клон искате да пребазирате." -#: builtin/pull.c:418 builtin/pull.c:433 git-parse-remote.sh:82 +#: builtin/pull.c:430 builtin/pull.c:445 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Укажете кой клон искате да слеете." -#: builtin/pull.c:419 builtin/pull.c:434 +#: builtin/pull.c:431 builtin/pull.c:446 msgid "See git-pull(1) for details." msgstr "За повече информация погледнете ръководството „git-pull(1)“" -#: builtin/pull.c:421 builtin/pull.c:427 builtin/pull.c:436 +#: builtin/pull.c:433 builtin/pull.c:439 builtin/pull.c:448 #: git-parse-remote.sh:64 msgid "<remote>" msgstr "ОТДАЛЕЧЕНО_ХРАНИЛИЩЕ" -#: builtin/pull.c:421 builtin/pull.c:436 builtin/pull.c:441 git-rebase.sh:466 +#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:466 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "КЛОН" -#: builtin/pull.c:429 git-parse-remote.sh:75 +#: builtin/pull.c:441 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "Текущият клон не следи никой." -#: builtin/pull.c:438 git-parse-remote.sh:95 +#: builtin/pull.c:450 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:443 +#: builtin/pull.c:455 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -11779,27 +11876,27 @@ msgstr "" "За сливане е указан отдалеченият указател „%s“,\n" "но такъв не е доставен." -#: builtin/pull.c:796 +#: builtin/pull.c:817 msgid "ignoring --verify-signatures for rebase" msgstr "без „--verify-signatures“ при пребазиране" -#: builtin/pull.c:844 +#: builtin/pull.c:865 msgid "--[no-]autostash option is only valid with --rebase." msgstr "опцията „--[no-]autostash“ изисква „--rebase“" -#: builtin/pull.c:852 +#: builtin/pull.c:873 msgid "Updating an unborn branch with changes added to the index." msgstr "Обновяване на все още несъздаден клон с промените от индекса" -#: builtin/pull.c:855 +#: builtin/pull.c:876 msgid "pull with rebase" msgstr "издърпване с пребазиране" -#: builtin/pull.c:856 +#: builtin/pull.c:877 msgid "please commit or stash them." msgstr "трябва да подадете или скатаете промените." -#: builtin/pull.c:881 +#: builtin/pull.c:902 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -11809,7 +11906,7 @@ msgstr "" "доставянето обнови върха на текущия клон. Работното\n" "ви копие бе превъртяно от подаване „%s“." -#: builtin/pull.c:886 +#: builtin/pull.c:907 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -11826,15 +11923,15 @@ msgstr "" " $ git reset --hard\n" "за връщане към нормално състояние." -#: builtin/pull.c:901 +#: builtin/pull.c:922 msgid "Cannot merge multiple branches into empty head." msgstr "Не може да сливате множество клони в празен върхов указател." -#: builtin/pull.c:905 +#: builtin/pull.c:926 msgid "Cannot rebase onto multiple branches." msgstr "Не може да пребазирате върху повече от един клон." -#: builtin/pull.c:912 +#: builtin/pull.c:933 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "пребазирането е невъзможно заради локално записаните промени по подмодулите" @@ -11843,15 +11940,15 @@ msgstr "" msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [ОПЦИЯ…] [ХРАНИЛИЩЕ [УКАЗАТЕЛ_НА_ВЕРСИЯ…]]" -#: builtin/push.c:90 +#: builtin/push.c:92 msgid "tag shorthand without <tag>" msgstr "съкращение за етикет без ЕТИКЕТ" -#: builtin/push.c:100 +#: builtin/push.c:102 msgid "--delete only accepts plain target ref names" msgstr "опцията „--delete“ приема за цел само прости имена на указатели" -#: builtin/push.c:144 +#: builtin/push.c:146 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -11860,7 +11957,7 @@ msgstr "" "За да включите тази опция за постоянно, погледнете документацията за " "настройката „push.default“ в „git help config“." -#: builtin/push.c:147 +#: builtin/push.c:149 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -11885,7 +11982,7 @@ msgstr "" " git push %s %s\n" "%s" -#: builtin/push.c:162 +#: builtin/push.c:164 #, c-format msgid "" "You are not currently on a branch.\n" @@ -11899,7 +11996,7 @@ msgstr "" "\n" " git push %s HEAD:ИМЕ_НА_ОТДАЛЕЧЕНИЯ_КЛОН\n" -#: builtin/push.c:176 +#: builtin/push.c:178 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -11913,14 +12010,14 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:184 +#: builtin/push.c:186 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" "Текущият клон „%s“ следи няколко отдалечени клона, не можете просто да " "изтласкате." -#: builtin/push.c:187 +#: builtin/push.c:189 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -11932,14 +12029,14 @@ msgstr "" "Трябва да укажете коя версия да се изтласка, за обновяване на отдалечения " "клон." -#: builtin/push.c:246 +#: builtin/push.c:248 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "Не сте указали версия за подаване, а настройката „push.default“ е " "„nothing“ (нищо без изрично указана версия да не се изтласква)" -#: builtin/push.c:253 +#: builtin/push.c:255 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -11948,12 +12045,12 @@ msgid "" msgstr "" "Обновяването е отхвърлено, защото върхът на текущия ви клон е преди върха " "на\n" -"отдалечения клон. Внесете отдалечените промени (напр. с командата „git " +"отдалечения клон. Внесете отдалечените промени (напр. с командата „git " "pull…“),\n" "преди отново да изтласкате промените. За повече информация вижте раздела\n" "„Note about fast-forwards“ в страницата от ръководството „git push --help“." -#: builtin/push.c:259 +#: builtin/push.c:261 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -11961,12 +12058,12 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "Обновяването е отхвърлено, защото върхът на изтласквания клон е преди върха\n" -"на отдалечения клон. Проверете клона и внесете отдалечените промени (напр.\n" +"на отдалечения клон. Преминете към клона и внесете отдалечените промени (напр.\n" "с командата „git pull…“), преди отново да изтласкате промените. За повече\n" "информация погледнете раздела „Note about fast-forwards“ в страницата от\n" "ръководството „git push --help“." -#: builtin/push.c:265 +#: builtin/push.c:267 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -11985,14 +12082,14 @@ msgstr "" "страницата\n" "от ръководството „git push --help“." -#: builtin/push.c:272 +#: builtin/push.c:274 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" "Изтласкването е отхвърлено, защото в отдалеченото хранилище съществува " "етикет,\n" "който ще припокриете с етикет от вашето хранилище." -#: builtin/push.c:275 +#: builtin/push.c:277 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -12002,22 +12099,22 @@ msgstr "" "указател, който вече сочи към обект, който не е подаване, както и тепърва\n" "да го промените да сочи към подобен обект.\n" -#: builtin/push.c:335 +#: builtin/push.c:337 #, c-format msgid "Pushing to %s\n" msgstr "Изтласкване към „%s“\n" -#: builtin/push.c:339 +#: builtin/push.c:341 #, c-format msgid "failed to push some refs to '%s'" msgstr "част от указателите не бяха изтласкани към „%s“" -#: builtin/push.c:370 +#: builtin/push.c:372 #, c-format msgid "bad repository '%s'" msgstr "неправилно указано хранилище „%s“" -#: builtin/push.c:371 +#: builtin/push.c:373 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -12039,115 +12136,115 @@ msgstr "" "\n" " git push ИМЕ\n" -#: builtin/push.c:389 +#: builtin/push.c:391 msgid "--all and --tags are incompatible" msgstr "опциите „--all“ и „--tags“ са несъвместими" -#: builtin/push.c:390 +#: builtin/push.c:392 msgid "--all can't be combined with refspecs" msgstr "опцията „--all“ е несъвместима с указването на версия" -#: builtin/push.c:395 +#: builtin/push.c:397 msgid "--mirror and --tags are incompatible" msgstr "опциите „--mirror“ и „--tags“ са несъвместими" -#: builtin/push.c:396 +#: builtin/push.c:398 msgid "--mirror can't be combined with refspecs" msgstr "опцията „--mirror“ е несъвместима с указването на версия" -#: builtin/push.c:401 +#: builtin/push.c:403 msgid "--all and --mirror are incompatible" msgstr "опциите „--all“ и „--mirror“ са несъвместими" -#: builtin/push.c:523 +#: builtin/push.c:535 msgid "repository" msgstr "хранилище" -#: builtin/push.c:524 builtin/send-pack.c:163 +#: builtin/push.c:536 builtin/send-pack.c:163 msgid "push all refs" msgstr "изтласкване на всички указатели" -#: builtin/push.c:525 builtin/send-pack.c:165 +#: builtin/push.c:537 builtin/send-pack.c:165 msgid "mirror all refs" msgstr "огледално копие на всички указатели" -#: builtin/push.c:527 +#: builtin/push.c:539 msgid "delete refs" msgstr "изтриване на указателите" -#: builtin/push.c:528 +#: builtin/push.c:540 msgid "push tags (can't be used with --all or --mirror)" msgstr "изтласкване на етикетите (несъвместимо с опциите „--all“ и „--mirror“)" -#: builtin/push.c:531 builtin/send-pack.c:166 +#: builtin/push.c:543 builtin/send-pack.c:166 msgid "force updates" msgstr "принудително обновяване" -#: builtin/push.c:533 builtin/send-pack.c:180 +#: builtin/push.c:545 builtin/send-pack.c:180 msgid "refname>:<expect" msgstr "УКАЗАТЕЛ>:<ОЧАКВАНА_СТОЙНОСТ" -#: builtin/push.c:534 builtin/send-pack.c:181 +#: builtin/push.c:546 builtin/send-pack.c:181 msgid "require old value of ref to be at this value" msgstr "УКАЗАТЕЛят трябва първоначално да е с тази ОЧАКВАНА_СТОЙНОСТ" -#: builtin/push.c:537 +#: builtin/push.c:549 msgid "control recursive pushing of submodules" msgstr "управление на рекурсивното изтласкване на подмодулите" -#: builtin/push.c:539 builtin/send-pack.c:174 +#: builtin/push.c:551 builtin/send-pack.c:174 msgid "use thin pack" msgstr "използване на съкратени пакети" -#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160 +#: builtin/push.c:552 builtin/push.c:553 builtin/send-pack.c:160 #: builtin/send-pack.c:161 msgid "receive pack program" msgstr "програма за получаването на пакети" -#: builtin/push.c:542 +#: builtin/push.c:554 msgid "set upstream for git pull/status" msgstr "задаване на отдалеченото хранилище за командите „git pull/status“" -#: builtin/push.c:545 +#: builtin/push.c:557 msgid "prune locally removed refs" msgstr "окастряне на указателите, които са премахнати от локалното хранилище" -#: builtin/push.c:547 +#: builtin/push.c:559 msgid "bypass pre-push hook" msgstr "без изпълнение на куката преди изтласкване (pre-push)" -#: builtin/push.c:548 +#: builtin/push.c:560 msgid "push missing but relevant tags" msgstr "" "изтласкване на липсващите в отдалеченото хранилище, но свързани с текущото " "изтласкване, етикети" -#: builtin/push.c:551 builtin/send-pack.c:168 +#: builtin/push.c:563 builtin/send-pack.c:168 msgid "GPG sign the push" msgstr "подписване на изтласкването с GPG" -#: builtin/push.c:553 builtin/send-pack.c:175 +#: builtin/push.c:565 builtin/send-pack.c:175 msgid "request atomic transaction on remote side" msgstr "изискване на атомарни операции от отсрещната страна" -#: builtin/push.c:554 builtin/send-pack.c:171 +#: builtin/push.c:566 builtin/send-pack.c:171 msgid "server-specific" msgstr "специфични за сървъра" -#: builtin/push.c:554 builtin/send-pack.c:172 +#: builtin/push.c:566 builtin/send-pack.c:172 msgid "option to transmit" msgstr "опция за пренос" -#: builtin/push.c:568 +#: builtin/push.c:583 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" "опцията „--delete“ е несъвместима с опциите „--all“, „--mirror“ и „--tags“" -#: builtin/push.c:570 +#: builtin/push.c:585 msgid "--delete doesn't make sense without any refs" msgstr "опцията „--delete“ изисква поне един указател на версия" -#: builtin/push.c:589 +#: builtin/push.c:604 msgid "push options must not have new line characters" msgstr "опциите за изтласкване не трябва да съдържат знак за нов ред" @@ -12230,49 +12327,53 @@ msgstr "изчистване на грешки в командата „unpack-t msgid "git rebase--helper [<options>]" msgstr "git rebase--helper [ОПЦИЯ…]" -#: builtin/rebase--helper.c:22 +#: builtin/rebase--helper.c:24 msgid "keep empty commits" msgstr "запазване на празните подавания" -#: builtin/rebase--helper.c:23 +#: builtin/rebase--helper.c:25 msgid "continue rebase" msgstr "продължаване на пребазирането" -#: builtin/rebase--helper.c:25 +#: builtin/rebase--helper.c:27 msgid "abort rebase" msgstr "преустановяване на пребазирането" -#: builtin/rebase--helper.c:28 +#: builtin/rebase--helper.c:30 msgid "make rebase script" msgstr "създаване на скрипт за пребазиране" -#: builtin/rebase--helper.c:30 -msgid "shorten SHA-1s in the todo list" -msgstr "съкратени суми по SHA1 в списъка за изпълнение" - #: builtin/rebase--helper.c:32 -msgid "expand SHA-1s in the todo list" -msgstr "пълни суми по SHA1 в списъка за изпълнение" +msgid "shorten commit ids in the todo list" +msgstr "съкратени идентификатори в списъка за изпълнение" #: builtin/rebase--helper.c:34 +msgid "expand commit ids in the todo list" +msgstr "пълни идентификатори в списъка за изпълнение" + +#: builtin/rebase--helper.c:36 msgid "check the todo list" msgstr "проверка на списъка за изпълнение" -#: builtin/rebase--helper.c:36 +#: builtin/rebase--helper.c:38 msgid "skip unnecessary picks" msgstr "прескачане на излишните команди за отбиране" -#: builtin/rebase--helper.c:38 +#: builtin/rebase--helper.c:40 msgid "rearrange fixup/squash lines" msgstr "" "преподреждане на редовете за сливане на подаванията със и без смени на " "съобщението" -#: builtin/receive-pack.c:29 +#: builtin/rebase--helper.c:42 +msgid "insert exec commands in todo list" +msgstr "вмъкване на командите за изпълнение в списъка за изпълнение" + +#: builtin/receive-pack.c:30 msgid "git receive-pack <git-dir>" msgstr "git receive-pack ДИРЕКТОРИЯ_НА_GIT" -#: builtin/receive-pack.c:839 +#: builtin/receive-pack.c:840 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" @@ -12305,7 +12406,7 @@ msgstr "" "За да заглушите това съобщение, като запазите стандартното поведение,\n" "задайте настройката „receive.denyCurrentBranch“ да е „refuse“ (отказ)." -#: builtin/receive-pack.c:859 +#: builtin/receive-pack.c:860 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" @@ -12326,20 +12427,15 @@ msgstr "" "За да заглушите това съобщение, задайте настройката\n" "„receive.denyDeleteCurrent“ да е „refuse“ (отказ)." -#: builtin/receive-pack.c:1932 +#: builtin/receive-pack.c:1933 msgid "quiet" msgstr "без извеждане на информация" -#: builtin/receive-pack.c:1946 +#: builtin/receive-pack.c:1947 msgid "You must specify a directory." msgstr "Трябва да укажете директория." -#: builtin/reflog.c:424 -#, c-format -msgid "'%s' for '%s' is not a valid timestamp" -msgstr "„%s“ не е правилна стойност за време за „%s“" - -#: builtin/reflog.c:541 builtin/reflog.c:546 +#: builtin/reflog.c:531 builtin/reflog.c:536 #, c-format msgid "'%s' is not a valid timestamp" msgstr "„%s“ не е правилна стойност за време" @@ -12870,7 +12966,7 @@ msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." msgstr "" -"Постепенното препакетиране е несъвместимо с индекси на база битови маски. \n" +"Постепенното препакетиране е несъвместимо с индекси на база битови маски.\n" "Ползвайте опцията --no-write-bitmap-index или изключете настройката\n" "„pack.writebitmaps“." @@ -12963,7 +13059,7 @@ msgstr "пакетите в хранилище с важни обекти не msgid "--keep-unreachable and -A are incompatible" msgstr "Опциите „--keep-unreachable“ и „-A“ са несъвместими" -#: builtin/repack.c:406 builtin/worktree.c:134 +#: builtin/repack.c:406 builtin/worktree.c:146 #, c-format msgid "failed to remove '%s'" msgstr "директорията „%s“ не може да бъде изтрита" @@ -13192,10 +13288,23 @@ msgstr "Индексът не може да бъде занулен към ве msgid "Could not write new index file." msgstr "Новият индекс не може да бъде записан." -#: builtin/rev-list.c:361 +#: builtin/rev-list.c:399 +msgid "object filtering requires --objects" +msgstr "филтрирането на обекти изисква опцията „--objects“" + +#: builtin/rev-list.c:402 +#, c-format +msgid "invalid sparse value '%s'" +msgstr "неправилна частична стойност: %s" + +#: builtin/rev-list.c:442 msgid "rev-list does not support display of notes" msgstr "командата „rev-list“ не поддържа извеждането на бележки" +#: builtin/rev-list.c:445 +msgid "cannot combine --use-bitmap-index with object filtering" +msgstr "опцията „--use-bitmap-index“ е несъвместима с филтриране на обектите" + #: builtin/rev-parse.c:402 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [ОПЦИЯ…] -- [АРГУМЕНТ…]" @@ -13657,35 +13766,35 @@ msgstr "пропускане на всички редове, които запо msgid "prepend comment character and space to each line" msgstr "добавяне на „# “ в началото на всеки ред" -#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1094 +#: builtin/submodule--helper.c:34 builtin/submodule--helper.c:1332 #, c-format msgid "No such ref: %s" msgstr "Такъв указател няма: %s" -#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1103 +#: builtin/submodule--helper.c:41 builtin/submodule--helper.c:1341 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Очаква се пълно име на указател, а не „%s“" -#: builtin/submodule--helper.c:71 +#: builtin/submodule--helper.c:81 #, c-format msgid "cannot strip one component off url '%s'" msgstr "не може да се махне компонент от адреса „%s“" -#: builtin/submodule--helper.c:302 builtin/submodule--helper.c:623 +#: builtin/submodule--helper.c:370 builtin/submodule--helper.c:861 msgid "alternative anchor for relative paths" msgstr "директория за определянето на относителните пътища" -#: builtin/submodule--helper.c:307 +#: builtin/submodule--helper.c:375 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=ПЪТ] [ПЪТ…]" -#: builtin/submodule--helper.c:350 builtin/submodule--helper.c:374 +#: builtin/submodule--helper.c:426 builtin/submodule--helper.c:449 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "Във файла „.gitmodules“ не е открит адрес за пътя към подмодул „%s“" -#: builtin/submodule--helper.c:389 +#: builtin/submodule--helper.c:464 #, c-format msgid "" "could not lookup configuration '%s'. Assuming this repository is its own " @@ -13694,81 +13803,111 @@ msgstr "" "настройката „%s“ липсва. Приема се, че това хранилище е правилният източник " "за себе си." -#: builtin/submodule--helper.c:400 +#: builtin/submodule--helper.c:475 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Неуспешно регистриране на адрес за пътя към подмодул „%s“" -#: builtin/submodule--helper.c:404 +#: builtin/submodule--helper.c:479 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Регистриран е подмодул „%s“ (%s) за пътя към подмодул „%s“\n" -#: builtin/submodule--helper.c:414 +#: builtin/submodule--helper.c:489 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "ПРЕДУПРЕЖДЕНИЕ: препоръчва се режим на обновяване за подмодула „%s“\n" -#: builtin/submodule--helper.c:421 +#: builtin/submodule--helper.c:496 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" "Неуспешно регистриране на режима на обновяване за пътя към подмодул „%s“" -#: builtin/submodule--helper.c:437 +#: builtin/submodule--helper.c:518 msgid "Suppress output for initializing a submodule" msgstr "Без извеждане на информация при инициализирането на подмодул" -#: builtin/submodule--helper.c:442 +#: builtin/submodule--helper.c:523 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper name [ПЪТ]" -#: builtin/submodule--helper.c:470 -msgid "git submodule--helper name <path>" -msgstr "git submodule--helper name ПЪТ" - -#: builtin/submodule--helper.c:475 +#: builtin/submodule--helper.c:591 builtin/submodule--helper.c:713 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "Във файла „.gitmodules“ липсва информация за пътя „%s“" -#: builtin/submodule--helper.c:558 builtin/submodule--helper.c:561 +#: builtin/submodule--helper.c:626 +#, c-format +msgid "could not resolve HEAD ref inside the submodule '%s'" +msgstr "указателят сочен от „HEAD“ в подмодула „%s“ не може да бъде открит" + +#: builtin/submodule--helper.c:653 +#, c-format +msgid "failed to recurse into submodule '%s'" +msgstr "неуспешно рекурсивно обхождане на подмодула „%s“" + +#: builtin/submodule--helper.c:677 +msgid "Suppress submodule status output" +msgstr "Заглушаване на изхода за състоянието на подмодула" + +#: builtin/submodule--helper.c:678 +msgid "" +"Use commit stored in the index instead of the one stored in the submodule " +"HEAD" +msgstr "" +"Използване на подаването указано в индекса, а не това от указателя „HEAD“ на " +"подмодула" + +#: builtin/submodule--helper.c:679 +msgid "recurse into nested submodules" +msgstr "рекурсивно обхождане на подмодулите" + +#: builtin/submodule--helper.c:684 +msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" +msgstr "git submodule status [--quiet] [--cached] [--recursive] [ПЪТ…]" + +#: builtin/submodule--helper.c:708 +msgid "git submodule--helper name <path>" +msgstr "git submodule--helper name ПЪТ" + +#: builtin/submodule--helper.c:796 builtin/submodule--helper.c:799 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "към подмодула „%s“ не може да се добави алтернативен източник: %s" -#: builtin/submodule--helper.c:597 +#: builtin/submodule--helper.c:835 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "" "Непозната стойност „%s“ за настройката „submodule.alternateErrorStrategy“" -#: builtin/submodule--helper.c:604 +#: builtin/submodule--helper.c:842 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Непозната стойност „%s“ за настройката „submodule.alternateLocation“" -#: builtin/submodule--helper.c:626 +#: builtin/submodule--helper.c:864 msgid "where the new submodule will be cloned to" msgstr "къде да се клонира новият подмодул" -#: builtin/submodule--helper.c:629 +#: builtin/submodule--helper.c:867 msgid "name of the new submodule" msgstr "име на новия подмодул" -#: builtin/submodule--helper.c:632 +#: builtin/submodule--helper.c:870 msgid "url where to clone the submodule from" msgstr "адрес, от който да се клонира новият подмодул" -#: builtin/submodule--helper.c:638 +#: builtin/submodule--helper.c:876 msgid "depth for shallow clones" msgstr "дълбочина на плитките хранилища" -#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:1012 +#: builtin/submodule--helper.c:879 builtin/submodule--helper.c:1250 msgid "force cloning progress" msgstr "извеждане на напредъка на клонирането" -#: builtin/submodule--helper.c:646 +#: builtin/submodule--helper.c:884 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -13776,85 +13915,85 @@ msgstr "" "git submodule--helper clone [--prefix=ПЪТ] [--quiet] [--reference ХРАНИЛИЩЕ] " "[--name ИМЕ] [--depth ДЪЛБОЧИНА] --url АДРЕС --path ПЪТ…" -#: builtin/submodule--helper.c:677 +#: builtin/submodule--helper.c:915 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "Неуспешно клониране на адреса „%s“ в пътя „%s“ като подмодул" -#: builtin/submodule--helper.c:692 +#: builtin/submodule--helper.c:930 #, c-format msgid "could not get submodule directory for '%s'" msgstr "директорията на подмодула „%s“ не може да бъде получена" -#: builtin/submodule--helper.c:757 +#: builtin/submodule--helper.c:995 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Пътят на подмодула „%s“ не е инициализиран" -#: builtin/submodule--helper.c:761 +#: builtin/submodule--helper.c:999 msgid "Maybe you want to use 'update --init'?" msgstr "Вероятно искахте да използвате „update --init“?" -#: builtin/submodule--helper.c:790 +#: builtin/submodule--helper.c:1028 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Прескачане на неслетия подмодул „%s“" -#: builtin/submodule--helper.c:819 +#: builtin/submodule--helper.c:1057 #, c-format msgid "Skipping submodule '%s'" msgstr "Прескачане на подмодула „%s“" -#: builtin/submodule--helper.c:952 +#: builtin/submodule--helper.c:1190 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Неуспешен опит за клониране на „%s“. Насрочен е втори опит" -#: builtin/submodule--helper.c:963 +#: builtin/submodule--helper.c:1201 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "" "Втори неуспешен опит за клониране на „%s“. Действието се преустановява" -#: builtin/submodule--helper.c:993 builtin/submodule--helper.c:1213 +#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1451 msgid "path into the working tree" msgstr "път към работното дърво" -#: builtin/submodule--helper.c:996 +#: builtin/submodule--helper.c:1234 msgid "path into the working tree, across nested submodule boundaries" msgstr "път към работното дърво, през границите на вложените подмодули" -#: builtin/submodule--helper.c:1000 +#: builtin/submodule--helper.c:1238 msgid "rebase, merge, checkout or none" msgstr "" "„rebase“ (пребазиране), „merge“ (сливане), „checkout“ (изтегляне) или " "„none“ (нищо да не се прави)" -#: builtin/submodule--helper.c:1004 +#: builtin/submodule--helper.c:1242 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "Плитко клониране, отрязано до указания брой версии" -#: builtin/submodule--helper.c:1007 +#: builtin/submodule--helper.c:1245 msgid "parallel jobs" msgstr "брой паралелни процеси" -#: builtin/submodule--helper.c:1009 +#: builtin/submodule--helper.c:1247 msgid "whether the initial clone should follow the shallow recommendation" msgstr "дали първоначалното клониране да е плитко, както се препоръчва" -#: builtin/submodule--helper.c:1010 +#: builtin/submodule--helper.c:1248 msgid "don't print cloning progress" msgstr "без извеждане на напредъка на клонирането" -#: builtin/submodule--helper.c:1017 +#: builtin/submodule--helper.c:1255 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update_clone [--prefix=ПЪТ] [ПЪТ…]" -#: builtin/submodule--helper.c:1030 +#: builtin/submodule--helper.c:1268 msgid "bad value for update parameter" msgstr "неправилен параметър към опцията „--update“" -#: builtin/submodule--helper.c:1098 +#: builtin/submodule--helper.c:1336 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -13863,20 +14002,20 @@ msgstr "" "Клонът на подмодула „%s“ е настроен да наследява клона от обхващащия проект, " "но той не е на никой клон" -#: builtin/submodule--helper.c:1214 +#: builtin/submodule--helper.c:1452 msgid "recurse into submodules" msgstr "рекурсивно обхождане подмодулите" -#: builtin/submodule--helper.c:1220 +#: builtin/submodule--helper.c:1458 msgid "git submodule--helper embed-git-dir [<path>...]" msgstr "git submodule--helper name embed-git-dir [ПЪТ…]" -#: builtin/submodule--helper.c:1278 +#: builtin/submodule--helper.c:1517 #, c-format msgid "%s doesn't support --super-prefix" msgstr "„%s“ не поддържа опцията „--super-prefix“" -#: builtin/submodule--helper.c:1284 +#: builtin/submodule--helper.c:1523 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "„%s“ не е подкоманда на „submodule--helper“" @@ -14116,207 +14255,223 @@ msgstr "Обновен етикет „%s“ (бе „%s“)\n" msgid "Unpacking objects" msgstr "Разпакетиране на обектите" -#: builtin/update-index.c:80 +#: builtin/update-index.c:82 #, c-format msgid "failed to create directory %s" msgstr "директорията „%s“ не може да бъде създадена" -#: builtin/update-index.c:86 +#: builtin/update-index.c:88 #, c-format msgid "failed to stat %s" msgstr "не може да бъде получена информация чрез „stat“ за „%s“" -#: builtin/update-index.c:96 +#: builtin/update-index.c:98 #, c-format msgid "failed to create file %s" msgstr "файлът „%s“ не може да бъде създаден" -#: builtin/update-index.c:104 +#: builtin/update-index.c:106 #, c-format msgid "failed to delete file %s" msgstr "файлът „%s“ не може да бъде изтрит" -#: builtin/update-index.c:111 builtin/update-index.c:217 +#: builtin/update-index.c:113 builtin/update-index.c:219 #, c-format msgid "failed to delete directory %s" msgstr "директорията „%s“ не може да бъде изтрита" -#: builtin/update-index.c:136 +#: builtin/update-index.c:138 #, c-format msgid "Testing mtime in '%s' " msgstr "Проверка на времето на промяна (mtime) на файла „%s“" -#: builtin/update-index.c:150 +#: builtin/update-index.c:152 msgid "directory stat info does not change after adding a new file" msgstr "" "информацията получена чрез „stat“ за директорията не се променя след " "добавянето на нов файл" -#: builtin/update-index.c:163 +#: builtin/update-index.c:165 msgid "directory stat info does not change after adding a new directory" msgstr "" "информацията получена чрез „stat“ за директорията не се променя след " "добавянето на нова директория" -#: builtin/update-index.c:176 +#: builtin/update-index.c:178 msgid "directory stat info changes after updating a file" msgstr "" "информацията получена чрез „stat“ за директорията се променя след " "обновяването на нов файл" -#: builtin/update-index.c:187 +#: builtin/update-index.c:189 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "" "информацията получена чрез „stat“ за директорията се променя след добавянето " "на файл в поддиректория" -#: builtin/update-index.c:198 +#: builtin/update-index.c:200 msgid "directory stat info does not change after deleting a file" msgstr "" "информацията получена чрез „stat“ за директорията не се променя след " "изтриването на файл" -#: builtin/update-index.c:211 +#: builtin/update-index.c:213 msgid "directory stat info does not change after deleting a directory" msgstr "" "информацията получена чрез „stat“ за директорията не се променя след " "изтриването на директория" -#: builtin/update-index.c:218 +#: builtin/update-index.c:220 msgid " OK" msgstr " Добре" -#: builtin/update-index.c:571 +#: builtin/update-index.c:579 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [ОПЦИЯ…] [--] [ФАЙЛ…]" -#: builtin/update-index.c:926 +#: builtin/update-index.c:936 msgid "continue refresh even when index needs update" msgstr "" "продължаване с обновяването, дори когато индексът трябва да бъде обновен" -#: builtin/update-index.c:929 +#: builtin/update-index.c:939 msgid "refresh: ignore submodules" msgstr "подмодулите да се игнорират при обновяването" -#: builtin/update-index.c:932 +#: builtin/update-index.c:942 msgid "do not ignore new files" msgstr "новите файлове да не се игнорират" -#: builtin/update-index.c:934 +#: builtin/update-index.c:944 msgid "let files replace directories and vice-versa" msgstr "файлове да могат да заменят директории и обратно" -#: builtin/update-index.c:936 +#: builtin/update-index.c:946 msgid "notice files missing from worktree" msgstr "предупреждаване при липсващи в работното дърво файлове" -#: builtin/update-index.c:938 +#: builtin/update-index.c:948 msgid "refresh even if index contains unmerged entries" msgstr "обновяване дори и индексът да съдържа неслети обекти" -#: builtin/update-index.c:941 +#: builtin/update-index.c:951 msgid "refresh stat information" msgstr "обновяване на информацията от функцията „stat“" -#: builtin/update-index.c:945 +#: builtin/update-index.c:955 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "" "като опцията „--refresh“, но да се проверят и обектите, които са били приети " "за непроменени" -#: builtin/update-index.c:949 +#: builtin/update-index.c:959 msgid "<mode>,<object>,<path>" msgstr "РЕЖИМ,ОБЕКТ,ПЪТ" -#: builtin/update-index.c:950 +#: builtin/update-index.c:960 msgid "add the specified entry to the index" msgstr "добавяне на изброените обекти към индекса" -#: builtin/update-index.c:959 +#: builtin/update-index.c:969 msgid "mark files as \"not changing\"" msgstr "задаване на флаг, че файлът не се променя" -#: builtin/update-index.c:962 +#: builtin/update-index.c:972 msgid "clear assumed-unchanged bit" msgstr "изчистване на флага, че файлът не се променя" -#: builtin/update-index.c:965 +#: builtin/update-index.c:975 msgid "mark files as \"index-only\"" msgstr "задаване на флаг, че файловете са само за индекса" -#: builtin/update-index.c:968 +#: builtin/update-index.c:978 msgid "clear skip-worktree bit" msgstr "изчистване на флага, че файловете са само за индекса" -#: builtin/update-index.c:971 +#: builtin/update-index.c:981 msgid "add to index only; do not add content to object database" msgstr "добавяне само към индекса без добавяне към базата от данни за обектите" -#: builtin/update-index.c:973 +#: builtin/update-index.c:983 msgid "remove named paths even if present in worktree" msgstr "изтриване на указаните пътища, дори и да съществуват в работното дърво" -#: builtin/update-index.c:975 +#: builtin/update-index.c:985 msgid "with --stdin: input lines are terminated by null bytes" msgstr "" "при комбиниране с опцията „--stdin“ — входните редове са разделени с нулевия " "байт" -#: builtin/update-index.c:977 +#: builtin/update-index.c:987 msgid "read list of paths to be updated from standard input" msgstr "изчитане на списъка с пътища за обновяване от стандартния вход" -#: builtin/update-index.c:981 +#: builtin/update-index.c:991 msgid "add entries from standard input to the index" msgstr "добавяне на елементите от стандартния вход към индекса" -#: builtin/update-index.c:985 +#: builtin/update-index.c:995 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" "възстановяване на състоянието преди сливане или нужда от обновяване за " "изброените пътища" -#: builtin/update-index.c:989 +#: builtin/update-index.c:999 msgid "only update entries that differ from HEAD" msgstr "добавяне само на съдържанието, което се различава от това в „HEAD“" -#: builtin/update-index.c:993 +#: builtin/update-index.c:1003 msgid "ignore files missing from worktree" msgstr "игнориране на файловете, които липсват в работното дърво" -#: builtin/update-index.c:996 +#: builtin/update-index.c:1006 msgid "report actions to standard output" msgstr "извеждане на действията на стандартния изход" -#: builtin/update-index.c:998 +#: builtin/update-index.c:1008 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" "забравяне на записаната информация за неразрешени конфликти — за командите " "от потребителско ниво" -#: builtin/update-index.c:1002 +#: builtin/update-index.c:1012 msgid "write index in this format" msgstr "записване на индекса в този формат" -#: builtin/update-index.c:1004 +#: builtin/update-index.c:1014 msgid "enable or disable split index" msgstr "включване или изключване на разделянето на индекса" -#: builtin/update-index.c:1006 +#: builtin/update-index.c:1016 msgid "enable/disable untracked cache" msgstr "включване/изключване на кеша за неследените файлове" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1018 msgid "test if the filesystem supports untracked cache" msgstr "проверка дали файловата система поддържа кеш за неследени файлове" -#: builtin/update-index.c:1010 +#: builtin/update-index.c:1020 msgid "enable untracked cache without testing the filesystem" msgstr "" "включване на кеша за неследените файлове без проверка на файловата система" -#: builtin/update-index.c:1107 +#: builtin/update-index.c:1022 +msgid "write out the index even if is not flagged as changed" +msgstr "запис на индекса, дори да не е отбелязан като променен" + +#: builtin/update-index.c:1024 +msgid "enable or disable file system monitor" +msgstr "включване или изключване на наблюдението на файловата система" + +#: builtin/update-index.c:1026 +msgid "mark files as fsmonitor valid" +msgstr "отбелязване на файловете, че могат да се следят чрез файловата система" + +#: builtin/update-index.c:1029 +msgid "clear fsmonitor valid bit" +msgstr "изчистване на флага за следенето чрез файловата система" + +#: builtin/update-index.c:1127 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -14324,7 +14479,7 @@ msgstr "" "Настройката „core.splitIndex“ е зададена на „false“ (лъжа). Сменете я или я " "изтрийте, за да включите разделянето на индекса" -#: builtin/update-index.c:1116 +#: builtin/update-index.c:1136 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -14332,7 +14487,7 @@ msgstr "" "Настройката „core.splitIndex“ е зададена на „true“ (истина). Сменете я или " "я изтрийте, за да изключите разделянето на индекса." -#: builtin/update-index.c:1127 +#: builtin/update-index.c:1147 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -14340,11 +14495,11 @@ msgstr "" "Настройката „core.untrackedCache“ е зададена на „true“ (истина). Сменете я " "или я изтрийте, за да изключите кеша за неследените файлове" -#: builtin/update-index.c:1131 +#: builtin/update-index.c:1151 msgid "Untracked cache disabled" msgstr "Кешът за неследените файлове е изключен" -#: builtin/update-index.c:1139 +#: builtin/update-index.c:1159 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -14352,11 +14507,32 @@ msgstr "" "Настройката „core.untrackedCache“ е зададена на „false“ (лъжа). Сменете я " "или я изтрийте, за да включите кеша за неследените файлове" -#: builtin/update-index.c:1143 +#: builtin/update-index.c:1163 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Кешът за неследените файлове е включен за „%s“" +#: builtin/update-index.c:1171 +msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" +msgstr "" +"Настройката „core.fsmonitor“ не е зададена. Задайте я, за да включите " +"следенето чрез файловата система." + +#: builtin/update-index.c:1175 +msgid "fsmonitor enabled" +msgstr "следенето чрез файловата система е включено" + +#: builtin/update-index.c:1178 +msgid "" +"core.fsmonitor is set; remove it if you really want to disable fsmonitor" +msgstr "" +"Настройката „core.fsmonitor“ е зададена. Изтрийте я, за да изключите " +"следенето чрез файловата система." + +#: builtin/update-index.c:1182 +msgid "fsmonitor disabled" +msgstr "следенето чрез файловата система е изключено" + #: builtin/update-ref.c:10 msgid "git update-ref [<options>] -d <refname> [<old-val>]" msgstr "git update-ref [ОПЦИЯ…] -d ИМЕ_НА_УКАЗАТЕЛ [СТАРА_СТОЙНОСТ]" @@ -14427,43 +14603,43 @@ msgstr "git verify-tag [-v | --verbose] [--format=ФОРМАТ] ЕТИКЕТ…" msgid "print tag contents" msgstr "извеждане на съдържанието на ЕТИКЕТи" -#: builtin/worktree.c:16 +#: builtin/worktree.c:17 msgid "git worktree add [<options>] <path> [<branch>]" msgstr "git worktree add [ОПЦИЯ…] ПЪТ [КЛОН]" -#: builtin/worktree.c:17 +#: builtin/worktree.c:18 msgid "git worktree list [<options>]" msgstr "git worktree list [ОПЦИЯ…]" -#: builtin/worktree.c:18 +#: builtin/worktree.c:19 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [ОПЦИЯ…] [ПЪТ]" -#: builtin/worktree.c:19 +#: builtin/worktree.c:20 msgid "git worktree prune [<options>]" msgstr "git worktree prune [ОПЦИЯ…]" -#: builtin/worktree.c:20 +#: builtin/worktree.c:21 msgid "git worktree unlock <path>" msgstr "git worktree unlock [ПЪТ]" -#: builtin/worktree.c:46 +#: builtin/worktree.c:58 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Изтриване на „worktrees/%s“: не е правилна поддиректория" -#: builtin/worktree.c:52 +#: builtin/worktree.c:64 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Изтриване на „worktrees/%s“: файлът „gitdir“ не съществува" -#: builtin/worktree.c:57 builtin/worktree.c:66 +#: builtin/worktree.c:69 builtin/worktree.c:78 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "" "Изтриване на „worktrees/%s“: файлът „gitdir“ (%s) не може да бъде прочетен" -#: builtin/worktree.c:76 +#: builtin/worktree.c:88 #, c-format msgid "" "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " @@ -14472,89 +14648,101 @@ msgstr "" "Изтриване на „worktrees/%s“: изчитането върна по-малко байтове от очакваното " "(очаквани: %<PRIuMAX> байта, получени: %<PRIuMAX>)" -#: builtin/worktree.c:84 +#: builtin/worktree.c:96 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Изтриване на „worktrees/%s“: неправилен файл „gitdir“" -#: builtin/worktree.c:100 +#: builtin/worktree.c:112 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "" "Изтриване на „worktrees/%s“: файлът „gitdir“ сочи несъществуващо " "местоположение" -#: builtin/worktree.c:147 +#: builtin/worktree.c:159 msgid "report pruned working trees" msgstr "докладване на окастрените работни дървета" -#: builtin/worktree.c:149 +#: builtin/worktree.c:161 msgid "expire working trees older than <time>" msgstr "обявяване на работните копия по-стари от това ВРЕМЕ за остарели" -#: builtin/worktree.c:223 +#: builtin/worktree.c:236 #, c-format msgid "'%s' already exists" msgstr "„%s“ вече съществува" -#: builtin/worktree.c:254 +#: builtin/worktree.c:267 #, c-format msgid "could not create directory of '%s'" msgstr "директорията „%s“ не може да бъде създадена" -#: builtin/worktree.c:293 +#: builtin/worktree.c:306 #, c-format msgid "Preparing %s (identifier %s)" msgstr "Подготвяне на %s (идентификатор %s)" -#: builtin/worktree.c:345 +#: builtin/worktree.c:368 msgid "checkout <branch> even if already checked out in other worktree" msgstr "Изтегляне КЛОНа, дори и да е изтеглен в друго работно дърво" -#: builtin/worktree.c:347 +#: builtin/worktree.c:370 msgid "create a new branch" msgstr "създаване на нов клон" -#: builtin/worktree.c:349 +#: builtin/worktree.c:372 msgid "create or reset a branch" msgstr "създаване или зануляване на клони" -#: builtin/worktree.c:351 +#: builtin/worktree.c:374 msgid "populate the new working tree" msgstr "подготвяне на новото работно дърво" -#: builtin/worktree.c:352 +#: builtin/worktree.c:375 msgid "keep the new working tree locked" msgstr "новото работно дърво да остане заключено" -#: builtin/worktree.c:360 +#: builtin/worktree.c:377 +msgid "set up tracking mode (see git-branch(1))" +msgstr "задаване на режима на следене (виж git-branch(1))" + +#: builtin/worktree.c:380 +msgid "try to match the new branch name with a remote-tracking branch" +msgstr "опит за напасване на името на новия клон с това на следящ клон" + +#: builtin/worktree.c:388 msgid "-b, -B, and --detach are mutually exclusive" msgstr "Опциите „-b“, „-B“ и „--detach“ са несъвместими една с друга" -#: builtin/worktree.c:499 +#: builtin/worktree.c:453 +msgid "--[no-]track can only be used if a new branch is created" +msgstr "„--[no-]track“ може да се използва само при създаването на нов клон" + +#: builtin/worktree.c:553 msgid "reason for locking" msgstr "причина за заключване" -#: builtin/worktree.c:511 builtin/worktree.c:544 +#: builtin/worktree.c:565 builtin/worktree.c:598 #, c-format msgid "'%s' is not a working tree" msgstr "„%s“ не е работно дърво" -#: builtin/worktree.c:513 builtin/worktree.c:546 +#: builtin/worktree.c:567 builtin/worktree.c:600 msgid "The main working tree cannot be locked or unlocked" msgstr "Основното дърво не може да се отключи или заключи" -#: builtin/worktree.c:518 +#: builtin/worktree.c:572 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "„%s“ вече е заключено, защото „%s“" -#: builtin/worktree.c:520 +#: builtin/worktree.c:574 #, c-format msgid "'%s' is already locked" msgstr "„%s“ вече е заключено" -#: builtin/worktree.c:548 +#: builtin/worktree.c:602 #, c-format msgid "'%s' is not locked" msgstr "„%s“ не е заключено" @@ -14575,24 +14763,24 @@ msgstr "запис на обект-дърво за поддиректорият msgid "only useful for debugging" msgstr "само за изчистване на грешки" -#: upload-pack.c:23 +#: upload-pack.c:24 msgid "git upload-pack [<options>] <dir>" msgstr "git upload-repack [ОПЦИЯ…] ДИРЕКТОРИЯ" -#: upload-pack.c:1040 +#: upload-pack.c:1041 msgid "quit after a single request/response exchange" msgstr "изход след първоначалната размяна на заявка и отговор" -#: upload-pack.c:1042 +#: upload-pack.c:1043 msgid "exit immediately after initial ref advertisement" msgstr "изход след първоначалната обява на указатели" -#: upload-pack.c:1044 +#: upload-pack.c:1045 msgid "do not try <directory>/.git/ if <directory> is no Git directory" msgstr "" "да не се търси „ДИРЕКТОРИЯ/.git/“, ако ДИРЕКТОРИЯта не е под контрола на Git" -#: upload-pack.c:1046 +#: upload-pack.c:1047 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "трансферът да се преустанови след този БРОЙ секунди" @@ -14621,28 +14809,30 @@ msgid "" "concept guides. See 'git help <command>' or 'git help <concept>'\n" "to read about a specific subcommand or concept." msgstr "" -"„git help -a“ извежда наличните подкоманди, а „git help -g“ извежда наличните\n" -"ръководства. За помощ за специфична КОМАНДА ползвайте „git help КОМАНДА“, а за\n" +"„git help -a“ извежда наличните подкоманди, а „git help -g“ извежда " +"наличните\n" +"въведения. За помощ за специфична КОМАНДА ползвайте „git help КОМАНДА“, а " +"за\n" "някое определено ПОНЯТИЕ използвайте „git help ПОНЯТИЕ“.\n" "\n" "Български превод на книгата „Pro Git“ от Чакън и Страуб:\n" "http://i-can.eu/progit2-bg/progit.html" -#: http.c:338 +#: http.c:339 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "" -"отрицателна стойност за „http.postbuffer“. Ще се ползва стандартната: %d" +"отрицателна стойност за „http.postbuffer“. Ще се ползва стандартната: %d" -#: http.c:359 +#: http.c:360 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "Управлението на делегирането не се поддържа от cURL < 7.22.0" -#: http.c:368 +#: http.c:369 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "Задаването на постоянен публичен ключ не се поддържа от cURL < 7.44.0" -#: http.c:1768 +#: http.c:1791 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -14658,6 +14848,14 @@ msgstr "" msgid "redirecting to %s" msgstr "пренасочване към „%s“" +#: list-objects-filter-options.h:54 +msgid "args" +msgstr "АРГУМЕНТИ" + +#: list-objects-filter-options.h:55 +msgid "object filtering" +msgstr "филтриране по вид на обекта" + #: common-cmds.h:9 msgid "start a working area (see also: git help tutorial)" msgstr "създаване на работно дърво (погледнете: „git help tutorial“)" @@ -14837,27 +15035,27 @@ msgstr "Неправилен указател „HEAD“" msgid "Bad bisect_write argument: $state" msgstr "Неправилен аргумент на функцията „bisect_write“: „${state}“" -#: git-bisect.sh:262 +#: git-bisect.sh:246 #, sh-format msgid "Bad rev input: $arg" msgstr "Неправилна версия: „${arg}“" -#: git-bisect.sh:281 +#: git-bisect.sh:265 #, sh-format msgid "Bad rev input: $bisected_head" msgstr "Неправилна версия: „$bisected_head“" -#: git-bisect.sh:290 +#: git-bisect.sh:274 #, sh-format msgid "Bad rev input: $rev" msgstr "Неправилна версия: „${rev}“" -#: git-bisect.sh:299 +#: git-bisect.sh:283 #, sh-format msgid "'git bisect $TERM_BAD' can take only one argument." msgstr "Командата „git bisect ${TERM_BAD}“ приема само един аргумент." -#: git-bisect.sh:322 +#: git-bisect.sh:306 #, sh-format msgid "Warning: bisecting only with a $TERM_BAD commit." msgstr "ПРЕДУПРЕЖДЕНИЕ: двоично търсене само по ${TERM_BAD} подаване." @@ -14865,11 +15063,11 @@ msgstr "ПРЕДУПРЕЖДЕНИЕ: двоично търсене само п #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. -#: git-bisect.sh:328 +#: git-bisect.sh:312 msgid "Are you sure [Y/n]? " msgstr "Да се продължи ли? „Y“ — ДА, „n“ — не" -#: git-bisect.sh:340 +#: git-bisect.sh:324 #, sh-format msgid "" "You need to give me at least one $bad_syn and one $good_syn revision.\n" @@ -14880,7 +15078,7 @@ msgstr "" "направи съответно и чрез командите „git bisect ${bad_syn}“ и „git bisect " "${good_syn}“.)" -#: git-bisect.sh:343 +#: git-bisect.sh:327 #, sh-format msgid "" "You need to start by \"git bisect start\".\n" @@ -14892,16 +15090,16 @@ msgstr "" "направи съответно и чрез командите „git bisect ${bad_syn}“ и „git bisect " "${good_syn}“.)" -#: git-bisect.sh:414 git-bisect.sh:546 +#: git-bisect.sh:398 git-bisect.sh:512 msgid "We are not bisecting." msgstr "В момента не се извършва двоично търсене." -#: git-bisect.sh:421 +#: git-bisect.sh:405 #, sh-format msgid "'$invalid' is not a valid commit" msgstr "„${invalid}“ е неправилно подаване" -#: git-bisect.sh:430 +#: git-bisect.sh:414 #, sh-format msgid "" "Could not check out original HEAD '$branch'.\n" @@ -14910,28 +15108,32 @@ msgstr "" "Първоначално указаният клон „${branch}“ в указателя „HEAD“ не може да бъде\n" "изтеглен. Пробвайте да изпълните командата „git bisect reset ПОДАВАНЕ“." -#: git-bisect.sh:458 +#: git-bisect.sh:422 msgid "No logfile given" msgstr "Не е зададен журнален файл" -#: git-bisect.sh:459 +#: git-bisect.sh:423 #, sh-format msgid "cannot read $file for replaying" msgstr "" "Журналният файл „${file}“ не може да бъде прочетен, за да се изпълнят " "командите от него наново" -#: git-bisect.sh:480 +#: git-bisect.sh:444 msgid "?? what are you talking about?" msgstr "" "Непозната команда. Възможните варианти са: „start“, „good“, „bad“, „skip“" -#: git-bisect.sh:492 +#: git-bisect.sh:453 +msgid "bisect run failed: no command provided." +msgstr "неуспешно двоично търсене, не е зададена команда." + +#: git-bisect.sh:458 #, sh-format msgid "running $command" msgstr "изпълнение на командата „${command}“" -#: git-bisect.sh:499 +#: git-bisect.sh:465 #, sh-format msgid "" "bisect run failed:\n" @@ -14941,11 +15143,11 @@ msgstr "" "изходният код от командата „${command}“ е ${res} — това е извън интервала " "[0, 128)" -#: git-bisect.sh:525 +#: git-bisect.sh:491 msgid "bisect run cannot continue any more" msgstr "двоичното търсене не може да продължи" -#: git-bisect.sh:531 +#: git-bisect.sh:497 #, sh-format msgid "" "bisect run failed:\n" @@ -14954,42 +15156,22 @@ msgstr "" "неуспешно двоично търсене:\n" "функцията „bisect_state ${state}“ завърши с код за грешка ${res}" -#: git-bisect.sh:538 +#: git-bisect.sh:504 msgid "bisect run success" msgstr "успешно двоично търсене" -#: git-bisect.sh:565 -msgid "please use two different terms" -msgstr "използвайте две различни управляващи думи" - -#: git-bisect.sh:575 -#, sh-format -msgid "'$term' is not a valid term" -msgstr "„${term}“ не е правилна управляваща дума" - -#: git-bisect.sh:578 -#, sh-format -msgid "can't use the builtin command '$term' as a term" -msgstr "" -"„${term}“ е вградена команда и не може да се използва като управляваща дума" - -#: git-bisect.sh:587 git-bisect.sh:593 -#, sh-format -msgid "can't change the meaning of term '$term'" -msgstr "не може да смените значението на управляващата дума „${term}“" - -#: git-bisect.sh:606 +#: git-bisect.sh:533 #, sh-format msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect." msgstr "" "Неправилна команда: в момента се изпълнява двоично търсене по ${TERM_BAD}/" "${TERM_GOOD}." -#: git-bisect.sh:636 +#: git-bisect.sh:567 msgid "no terms defined" msgstr "не са указани управляващи думи" -#: git-bisect.sh:653 +#: git-bisect.sh:584 #, sh-format msgid "" "invalid argument $arg for 'git bisect terms'.\n" @@ -15069,7 +15251,7 @@ msgid "The pre-rebase hook refused to rebase." msgstr "Куката за изпълнение преди пребазиране отхвърли пребазирането." #: git-rebase.sh:219 -msgid "It looks like git-am is in progress. Cannot rebase." +msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "" "Изглежда, че сега се прилагат кръпки чрез командата „git-am“. Не може да " "пребазирате в момента." @@ -15118,7 +15300,7 @@ msgstr "" #: git-rebase.sh:480 #, sh-format -msgid "invalid upstream $upstream_name" +msgid "invalid upstream '$upstream_name'" msgstr "неправилна основа за сравнение „${upstream_name}“" #: git-rebase.sh:504 @@ -15138,47 +15320,57 @@ msgstr "указателят „${onto_name}“ не сочи към никак msgid "Does not point to a valid commit: $onto_name" msgstr "Указателят „${onto_name}“ не сочи към подаване" -#: git-rebase.sh:539 +#: git-rebase.sh:542 #, sh-format -msgid "fatal: no such branch: $branch_name" +msgid "fatal: no such branch/commit '$branch_name'" msgstr "ФАТАЛНА ГРЕШКА: не съществува клон „${branch_name}“" -#: git-rebase.sh:572 +#: git-rebase.sh:575 msgid "Cannot autostash" msgstr "Не може да се скатае автоматично" -#: git-rebase.sh:577 +#: git-rebase.sh:580 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Автоматично скатано: „${stash_abbrev}“" -#: git-rebase.sh:581 +#: git-rebase.sh:584 msgid "Please commit or stash them." msgstr "Промените трябва или да се подадат, или да се скатаят." -#: git-rebase.sh:601 +#: git-rebase.sh:607 +#, sh-format +msgid "HEAD is up to date." +msgstr "Указателят „HEAD“ е напълно актуален" + +#: git-rebase.sh:609 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "Текущият клон „${branch_name}“ е напълно актуален." -#: git-rebase.sh:605 +#: git-rebase.sh:617 +#, sh-format +msgid "HEAD is up to date, rebase forced." +msgstr "Указателят „HEAD“ е напълно актуален. Пребазирането е принудително." + +#: git-rebase.sh:619 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "" "Текущият клон „${branch_name}“ е напълно актуален. Пребазирането е " "принудително." -#: git-rebase.sh:616 +#: git-rebase.sh:631 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Промените от „${mb}“ към „${onto}“:" -#: git-rebase.sh:625 +#: git-rebase.sh:640 msgid "First, rewinding head to replay your work on top of it..." msgstr "" "Първо, указателят „HEAD“ започва да сочи към базата, върху която пребазирате…" -#: git-rebase.sh:635 +#: git-rebase.sh:650 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "Превъртане на „${branch_name}“ върху „${onto_name}“." @@ -15187,163 +15379,149 @@ msgstr "Превъртане на „${branch_name}“ върху „${onto_name msgid "git stash clear with parameters is unimplemented" msgstr "Командата „git stash clear“ не поддържа аргументи" -#: git-stash.sh:102 +#: git-stash.sh:108 msgid "You do not have the initial commit yet" msgstr "Все още липсва първоначално подаване" -#: git-stash.sh:117 +#: git-stash.sh:123 msgid "Cannot save the current index state" msgstr "Състоянието на текущия индекс не може да бъде запазено" -#: git-stash.sh:132 +#: git-stash.sh:138 msgid "Cannot save the untracked files" msgstr "Неследените файлове не могат да се запазят" -#: git-stash.sh:152 git-stash.sh:165 +#: git-stash.sh:158 git-stash.sh:171 msgid "Cannot save the current worktree state" msgstr "Състоянието на работното дърво не може да бъде запазено" -#: git-stash.sh:169 +#: git-stash.sh:175 msgid "No changes selected" msgstr "Не са избрани никакви промени" -#: git-stash.sh:172 +#: git-stash.sh:178 msgid "Cannot remove temporary index (can't happen)" msgstr "Временният индекс не може да бъде изтрит" -#: git-stash.sh:185 +#: git-stash.sh:191 msgid "Cannot record working tree state" msgstr "Състоянието на работното дърво не може да бъде запазено" -#: git-stash.sh:217 +#: git-stash.sh:229 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "" "Указателят „${ref_stash}“ не може да бъде обновен да сочи към „${w_commit}“" -#. TRANSLATORS: $option is an invalid option, like -#. `--blah-blah'. The 7 spaces at the beginning of the -#. second line correspond to "error: ". So you should line -#. up the second line with however many characters the -#. translation of "error: " takes in your language. E.g. in -#. English this is: -#. -#. $ git stash save --blah-blah 2>&1 | head -n 2 -#. error: unknown option for 'stash save': --blah-blah -#. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:273 +#: git-stash.sh:281 #, sh-format -msgid "" -"error: unknown option for 'stash save': $option\n" -" To provide a message, use git stash save -- '$option'" -msgstr "" -"грешка: командата „git stash save“ не поддържа опция „${option}“\n" -" За да зададете съобщение, изпълнете „git stash save -- '${option}'“" +msgid "error: unknown option for 'stash push': $option" +msgstr "ГРЕШКА: командата „stash push“ не приема опцията „$option“" -#: git-stash.sh:288 +#: git-stash.sh:295 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "Опцията „--patch“ е несъвместима с „--include-untracked“ и „--all“" -#: git-stash.sh:296 +#: git-stash.sh:303 msgid "No local changes to save" msgstr "Няма никакви локални промени за скатаване" -#: git-stash.sh:301 +#: git-stash.sh:308 msgid "Cannot initialize stash" msgstr "Скатаването не може да стартира" -#: git-stash.sh:305 +#: git-stash.sh:312 msgid "Cannot save the current status" msgstr "Текущото състояние не може да бъде запазено" -#: git-stash.sh:306 +#: git-stash.sh:313 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "" "Състоянието на работната директория и индекса са запазени: „$stash_msg“" -#: git-stash.sh:334 +#: git-stash.sh:341 msgid "Cannot remove worktree changes" msgstr "Промените в работното дърво не могат да бъдат занулени" -#: git-stash.sh:482 +#: git-stash.sh:489 #, sh-format msgid "unknown option: $opt" msgstr "непозната опция: ${opt}" -#: git-stash.sh:495 +#: git-stash.sh:502 msgid "No stash entries found." msgstr "Не е открито нищо скатано." -#: git-stash.sh:502 +#: git-stash.sh:509 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Указани са прекалено много версии: „${REV}“" -#: git-stash.sh:517 +#: git-stash.sh:524 #, sh-format msgid "$reference is not a valid reference" msgstr "Указателят „${reference}“ е грешен" -#: git-stash.sh:545 +#: git-stash.sh:552 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "„${args}“ не е подаване, приличащо на нещо скатано" -#: git-stash.sh:556 +#: git-stash.sh:563 #, sh-format msgid "'$args' is not a stash reference" msgstr "„${args}“ не е указател към нещо скатано" -#: git-stash.sh:564 +#: git-stash.sh:571 msgid "unable to refresh index" msgstr "индексът не може да бъде обновен" -#: git-stash.sh:568 +#: git-stash.sh:575 msgid "Cannot apply a stash in the middle of a merge" msgstr "По време на сливане не може да приложите нещо скатано" -#: git-stash.sh:576 +#: git-stash.sh:583 msgid "Conflicts in index. Try without --index." msgstr "" "В индекса има конфликти. Пробвайте да изпълните командата без опцията „--" "index“." -#: git-stash.sh:578 +#: git-stash.sh:585 msgid "Could not save index tree" msgstr "Дървото сочено от индекса не може да бъде запазено" -#: git-stash.sh:587 +#: git-stash.sh:594 msgid "Could not restore untracked files from stash entry" msgstr "Неследени файлове не могат да се възстановят от скатаното" -#: git-stash.sh:612 +#: git-stash.sh:619 msgid "Cannot unstage modified files" msgstr "Променените файлове не могат да бъдат извадени от индекса" -#: git-stash.sh:627 +#: git-stash.sh:634 msgid "Index was not unstashed." msgstr "Индексът не е скатан." -#: git-stash.sh:641 +#: git-stash.sh:648 msgid "The stash entry is kept in case you need it again." msgstr "Скатаното е запазено в случай, че ви потрябва отново" -#: git-stash.sh:650 +#: git-stash.sh:657 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Изтрито е скатаното „${REV}“ ($s)" -#: git-stash.sh:651 +#: git-stash.sh:658 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "Скатаното „${REV}“ не може да бъде изтрито" -#: git-stash.sh:659 +#: git-stash.sh:666 msgid "No branch name specified" msgstr "Не е указано име на клон" -#: git-stash.sh:738 +#: git-stash.sh:745 msgid "(To restore them type \"git stash apply\")" msgstr "(За да ги възстановите, изпълнете командата „git stash apply“)" @@ -15584,41 +15762,35 @@ msgid "Failed to recurse into submodule path '$displaypath'" msgstr "" "Неуспешна обработка на поддиректориите в пътя към подмодул „${displaypath}“" -#: git-submodule.sh:840 +#: git-submodule.sh:828 msgid "The --cached option cannot be used with the --files option" msgstr "Опциите „--cached“ и „--files“ са несъвместими" -#: git-submodule.sh:892 +#: git-submodule.sh:880 #, sh-format msgid "unexpected mode $mod_dst" msgstr "неочакван режим „${mod_dst}“" -#: git-submodule.sh:912 +#: git-submodule.sh:900 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr "" " ПРЕДУПРЕЖДЕНИЕ: „${display_name}“ не съдържа подаването „${sha1_src}“" -#: git-submodule.sh:915 +#: git-submodule.sh:903 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr "" " ПРЕДУПРЕЖДЕНИЕ: „${display_name}“ не съдържа подаването „${sha1_dst}“" -#: git-submodule.sh:918 +#: git-submodule.sh:906 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" " ПРЕДУПРЕЖДЕНИЕ: „${display_name}“ не съдържа никое от подаванията " "„${sha1_src}“ и „${sha1_dst}“" -#: git-submodule.sh:1064 -#, sh-format -msgid "Failed to recurse into submodule path '$sm_path'" -msgstr "" -"Неуспешна обработка на поддиректориите в пътя към подмодул „${sm_path}“" - -#: git-submodule.sh:1136 +#: git-submodule.sh:1077 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Синхронизиране на адреса за пътя към подмодул „${displaypath}“" @@ -15854,15 +16026,15 @@ msgstr "Коригирайте това чрез „git rebase --edit-todo“." msgid "Successfully rebased and updated $head_name." msgstr "Успешно пребазиране и обновяване на „$head_name“." -#: git-rebase--interactive.sh:749 +#: git-rebase--interactive.sh:728 msgid "could not detach HEAD" msgstr "указателят „HEAD“ не може да се отдели" -#: git-rebase--interactive.sh:784 +#: git-rebase--interactive.sh:763 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "Указателят „CHERRY_PICK_HEAD“ не може да бъде изтрит" -#: git-rebase--interactive.sh:789 +#: git-rebase--interactive.sh:768 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -15892,11 +16064,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--interactive.sh:806 +#: git-rebase--interactive.sh:785 msgid "Error trying to find the author identity to amend commit" msgstr "Не може да бъде открит автор за поправянето на подаването" -#: git-rebase--interactive.sh:811 +#: git-rebase--interactive.sh:790 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -15904,11 +16076,11 @@ msgstr "" "В работното дърво има неподадени промени. Първо ги подайте, а след това\n" "отново изпълнете „git rebase --continue“." -#: git-rebase--interactive.sh:816 git-rebase--interactive.sh:820 +#: git-rebase--interactive.sh:795 git-rebase--interactive.sh:799 msgid "Could not commit staged changes." msgstr "Промените в индекса не могат да бъдат подадени." -#: git-rebase--interactive.sh:848 +#: git-rebase--interactive.sh:827 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -15922,33 +16094,33 @@ msgstr "" " git rebase --continue\n" "\n" -#: git-rebase--interactive.sh:856 git-rebase--interactive.sh:1015 +#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:994 msgid "Could not execute editor" msgstr "Текстовият редактор не може да бъде стартиран" -#: git-rebase--interactive.sh:869 +#: git-rebase--interactive.sh:848 #, sh-format msgid "Could not checkout $switch_to" msgstr "„$switch_to“ не може да се изтегли" -#: git-rebase--interactive.sh:874 +#: git-rebase--interactive.sh:853 msgid "No HEAD?" msgstr "Липсва указател „HEAD“" -#: git-rebase--interactive.sh:875 +#: git-rebase--interactive.sh:854 #, sh-format msgid "Could not create temporary $state_dir" msgstr "Временната директория „$state_dir“ не може да бъде създадена" -#: git-rebase--interactive.sh:877 +#: git-rebase--interactive.sh:856 msgid "Could not mark as interactive" msgstr "Пребазирането не е интерактивно" -#: git-rebase--interactive.sh:887 git-rebase--interactive.sh:892 +#: git-rebase--interactive.sh:866 git-rebase--interactive.sh:871 msgid "Could not init rewritten commits" msgstr "Списъкът с презаписаните подавания не може да бъде създаден" -#: git-rebase--interactive.sh:993 +#: git-rebase--interactive.sh:972 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" @@ -15957,7 +16129,7 @@ msgstr[0] "" msgstr[1] "" "Пребазиране на $shortrevisions върху $shortonto ($todocount команди)" -#: git-rebase--interactive.sh:998 +#: git-rebase--interactive.sh:977 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -15967,7 +16139,7 @@ msgstr "" "Ако изтриете всичко, пребазирането ще бъде преустановено.\n" "\n" -#: git-rebase--interactive.sh:1005 +#: git-rebase--interactive.sh:984 msgid "Note that empty commits are commented out" msgstr "Празните подавания са коментирани" @@ -16208,7 +16380,7 @@ msgstr "" msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" -"Редактираното парче не може да се приложи. Да се продължи ли с " +"Редактираното парче не може да се приложи. Да се продължи ли с " "редактирането? (текущите редакции ще се отменят при отказ!): „y“ (да)/ " "„n“ (не)? " @@ -16719,7 +16891,7 @@ msgstr "„%s“ не може да се отвори: %s" #: git-send-email.perl:745 msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n" msgstr "" -"Полетата „To“/„Cc“/„Bcc“ все още не се интерпретират. Те бяха прескочени\n" +"Полетата „To“/„Cc“/„Bcc“ все още не се интерпретират. Те бяха прескочени\n" #: git-send-email.perl:754 msgid "Summary email is empty, skipping it\n" @@ -16771,7 +16943,7 @@ msgstr "" "Идентификатор на съобщение „Message-ID“, което да се използва за обявяването " "на отговор „In-Reply-To“ (незадължително поле)" -#: git-send-email.perl:927 git-send-email.perl:935 +#: git-send-email.perl:929 git-send-email.perl:937 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "ГРЕШКА: не може да се извлече адрес от „%s“\n" @@ -16779,18 +16951,18 @@ msgstr "ГРЕШКА: не може да се извлече адрес от „ #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:939 +#: git-send-email.perl:941 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "" "Какво да се направи с този адрес? „q“ (спиране), „d“ (изтриване), " "„e“ (редактиране): " -#: git-send-email.perl:1260 +#: git-send-email.perl:1262 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "Пътят към сертификат „%s“ не съществува." -#: git-send-email.perl:1335 +#: git-send-email.perl:1337 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -16818,131 +16990,131 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1350 +#: git-send-email.perl:1352 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): " msgstr "" "Изпращане на е-писмото? „y“ (да), „n“ (не), „q“ (изход), „a“ (всичко): " -#: git-send-email.perl:1353 +#: git-send-email.perl:1355 msgid "Send this email reply required" msgstr "Изискване на отговор към това е-писмо" -#: git-send-email.perl:1379 +#: git-send-email.perl:1381 msgid "The required SMTP server is not properly defined." msgstr "Сървърът за SMTP не е настроен правилно." -#: git-send-email.perl:1426 +#: git-send-email.perl:1428 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Сървърът не поддържа „STARTTLS“! %s" -#: git-send-email.perl:1431 git-send-email.perl:1435 +#: git-send-email.perl:1433 git-send-email.perl:1437 #, perl-format msgid "STARTTLS failed! %s" msgstr "Неуспешно изпълнение на STARTTLS! %s" -#: git-send-email.perl:1445 +#: git-send-email.perl:1447 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" -"Подсистемата за SMTP не може да се инициализира. Проверете настройките и " +"Подсистемата за SMTP не може да се инициализира. Проверете настройките и " "използвайте опцията: „--smtp-debug“." -#: git-send-email.perl:1463 +#: git-send-email.perl:1465 #, perl-format msgid "Failed to send %s\n" msgstr "„%s“ не може да бъде изпратен\n" -#: git-send-email.perl:1466 +#: git-send-email.perl:1468 #, perl-format msgid "Dry-Sent %s\n" msgstr "Проба за изпращане на „%s“\n" -#: git-send-email.perl:1466 +#: git-send-email.perl:1468 #, perl-format msgid "Sent %s\n" msgstr "Изпращане на „%s“\n" -#: git-send-email.perl:1468 +#: git-send-email.perl:1470 msgid "Dry-OK. Log says:\n" -msgstr "Успех при пробата. От журнала:\n" +msgstr "Успех при пробата. От журнала:\n" -#: git-send-email.perl:1468 +#: git-send-email.perl:1470 msgid "OK. Log says:\n" -msgstr "Успех. От журнала:\n" +msgstr "Успех. От журнала:\n" -#: git-send-email.perl:1480 +#: git-send-email.perl:1482 msgid "Result: " msgstr "Резултат: " -#: git-send-email.perl:1483 +#: git-send-email.perl:1485 msgid "Result: OK\n" msgstr "Резултат: успех\n" -#: git-send-email.perl:1496 +#: git-send-email.perl:1498 #, perl-format msgid "can't open file %s" msgstr "файлът „%s“ не може да бъде отворен" -#: git-send-email.perl:1543 git-send-email.perl:1563 +#: git-send-email.perl:1545 git-send-email.perl:1565 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Добавяне на „як: %s“ от ред „%s“\n" -#: git-send-email.perl:1549 +#: git-send-email.perl:1551 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) Добавяне на „до: %s“ от ред „%s“\n" -#: git-send-email.perl:1597 +#: git-send-email.perl:1599 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(не-mbox) Добавяне на „як: %s“ от ред „%s“\n" -#: git-send-email.perl:1622 +#: git-send-email.perl:1624 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(тяло) Добавяне на „як: %s“ от ред „%s“\n" -#: git-send-email.perl:1728 +#: git-send-email.perl:1730 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Не може да бъде се изпълни „%s“" -#: git-send-email.perl:1735 +#: git-send-email.perl:1737 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Добавяне на „%s: %s“ от: „%s“\n" -#: git-send-email.perl:1739 +#: git-send-email.perl:1741 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) програмният канал не може да се затвори за изпълнението на „%s“" -#: git-send-email.perl:1766 +#: git-send-email.perl:1768 msgid "cannot send message as 7bit" msgstr "съобщението не може да се изпрати чрез 7 битови знаци" -#: git-send-email.perl:1774 +#: git-send-email.perl:1776 msgid "invalid transfer encoding" msgstr "неправилно кодиране за пренос" -#: git-send-email.perl:1812 git-send-email.perl:1863 git-send-email.perl:1873 +#: git-send-email.perl:1814 git-send-email.perl:1865 git-send-email.perl:1875 #, perl-format msgid "unable to open %s: %s\n" msgstr "„%s“ не може да се отвори: %s\n" -#: git-send-email.perl:1815 +#: git-send-email.perl:1817 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "„%s“: кръпката съдържа ред с над 988 знака" -#: git-send-email.perl:1831 +#: git-send-email.perl:1833 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "„%s“ се пропуска, защото е с разширение за архивен файл: „%s“.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1835 +#: git-send-email.perl:1837 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Наистина ли искате да изпратите „%s“? [y|N]: " @@ -39,7 +39,7 @@ # cherry pick | «cherry pick» # rebase | «rebase» # stage | «stage» -# stash | «sta» +# stash | «stash» # squash | «squash» # trailer | «trailer» # unstage | «unstage» @@ -107,7 +107,7 @@ msgstr "No heu conclòs la vostra fusió (MERGE_HEAD existeix)." #: advice.c:119 msgid "Please, commit your changes before merging." -msgstr "Si us plau, cometeu els vostres canvis abans de fusionar." +msgstr "Cometeu els vostres canvis abans de fusionar." #: advice.c:120 msgid "Exiting because of unfinished merge." @@ -189,24 +189,24 @@ msgstr "no s'ha pogut trobar el nom de fitxer en el pedaç a la línia %d" #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" -"git apply: git-diff dolent - /dev/null esperat, %s rebut en la línia %d" +"git apply: git-diff incorrecte - s'esperava /dev/null, s'ha rebut %s en la línia %d" #: apply.c:972 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" -"git apply: git-diff dolent - nom de fitxer nou inconsistent en la línia %d" +"git apply: git-diff incorrecte - nom de fitxer nou inconsistent en la línia %d" #: apply.c:973 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" -"git apply: git-diff dolent - nom de fitxer antic inconsistent en la línia %d" +"git apply: git-diff incorrecte - nom de fitxer antic inconsistent en la línia %d" #: apply.c:978 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" -msgstr "git apply: git-diff dolent - /dev/null esperat en la línia %d" +msgstr "git apply: git-diff incorrecte - s'esperava /dev/null en la línia %d" #: apply.c:1007 #, c-format @@ -371,7 +371,7 @@ msgstr "el pedaç binari no s'aplica a «%s»" #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -"el pedaç binari a «%s» crea un resultat incorrecte (esperant %s, %s rebut)" +"el pedaç binari a «%s» crea un resultat incorrecte (s'esperava %s, s'ha rebut %s)" #: apply.c:3247 #, c-format @@ -876,7 +876,7 @@ msgstr "Opció inesperada --remote" #: archive.c:470 msgid "Option --exec can only be used together with --remote" -msgstr "L'opció --exec només es pot usar junt amb --remote" +msgstr "L'opció --exec només es pot usar juntament amb --remote" #: archive.c:472 msgid "Unexpected option --output" @@ -966,7 +966,7 @@ msgid "" "We continue anyway." msgstr "" "s'ha d'ometre la base de fusió entre %s i [%s].\n" -"Llavors, no podem estar segurs de que la primera comissió %s sigui entre %s " +"Llavors, no podem estar segurs que la primera comissió %s sigui entre %s " "i %s.\n" "Continuem de totes maneres." @@ -1006,7 +1006,7 @@ msgid "" "Maybe you started with bad path parameters?\n" msgstr "" "No s'ha trobat cap comissió comprovable.\n" -"Potser heu començat amb paràmetres de camí dolents?\n" +"Potser heu començat amb paràmetres de camí incorrectes?\n" #: bisect.c:995 #, c-format @@ -1180,11 +1180,11 @@ msgstr "" "\n" "Si teniu pensat basar el vostre treball en una branca\n" "font que ja existeix al remot, pot ser que necessiteu\n" -"executar \"git fetch\" per a obtenir-la.\n" +"executar «git fetch» per a obtenir-la.\n" "\n" "Si teniu pensat pujar una branca local nova que seguirà\n" "la seva contrapart remota, pot ser que vulgueu usar\n" -"\"git push -u\" per a establir la configuració font\n" +"«git push -u» per a establir la configuració font\n" "mentre pugeu." #: branch.c:264 @@ -1397,7 +1397,7 @@ msgstr "" #: config.c:895 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" -msgstr "valor de configuració numèric dolent «%s» per «%s» en %s: %s" +msgstr "valor de configuració numèric incorrecte «%s» per «%s» en %s: %s" #: config.c:990 #, c-format @@ -1407,7 +1407,7 @@ msgstr "s'ha produït un error en expandir el directori d'usuari en: «%s»" #: config.c:1085 config.c:1096 #, c-format msgid "bad zlib compression level %d" -msgstr "nivell de compressió de zlib dolent %d" +msgstr "nivell de compressió de zlib incorrecte %d" #: config.c:1213 #, c-format @@ -1485,7 +1485,7 @@ msgid "" msgstr "" "No s'ha pogut llegir del dipòsit remot.\n" "\n" -"Si us plau, assegureu-vos que tingueu els permisos\n" +"Assegureu-vos que tingueu els permisos\n" "d'accés correctes i que el dipòsit existeixi." #: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141 @@ -1707,7 +1707,7 @@ msgstr "" #: dir.c:2885 dir.c:2890 #, c-format msgid "could not create directories for %s" -msgstr "no s'ha pogut crear directoris per %s" +msgstr "no s'han pogut crear directoris per %s" #: dir.c:2915 #, c-format @@ -1729,7 +1729,7 @@ msgstr "git fetch-pack: llista superficial esperada" #: fetch-pack.c:264 msgid "git fetch-pack: expected ACK/NAK, got EOF" -msgstr "git fetch-pack: ACK/NAK esperat, EOF rebut" +msgstr "git fetch-pack: s'esperava ACK/NAK, s'ha rebut EOF" #: fetch-pack.c:283 builtin/archive.c:63 #, c-format @@ -1739,7 +1739,7 @@ msgstr "error remot: %s" #: fetch-pack.c:284 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" -msgstr "git fetch-pack: ACK/NAK esperat, «%s» rebut" +msgstr "git fetch-pack: s'esperava ACK/NAK, s'ha rebut «%s»" #: fetch-pack.c:336 msgid "--stateless-rpc requires multi_ack_detailed" @@ -1778,7 +1778,7 @@ msgstr "s'esperava shallow/unshallow, s'ha rebut %s" #: fetch-pack.c:477 #, c-format msgid "got %s %d %s" -msgstr "%s %d %s rebut" +msgstr "s'ha rebut %s %d %s" #: fetch-pack.c:491 #, c-format @@ -1921,7 +1921,7 @@ msgstr "s'ha produït un error en escriure la signatura separada a «%s»" #: graph.c:97 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" -msgstr "ignora el color invàlid '%.*s' en log.graphColors" +msgstr "ignora el color no vàlid «%.*s» en log.graphColors" #: grep.c:1970 #, c-format @@ -1974,12 +1974,12 @@ msgstr "" #: help.c:363 #, c-format msgid "Continuing under the assumption that you meant '%s'." -msgstr "Es continua amb l'assumpció de que volíeu dir «%s»." +msgstr "El procés continuarà, pressuposant que volíeu dir «%s»." #: help.c:368 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." -msgstr "Es continua en %0.1f segons, assumint que volíeu dir «%s»." +msgstr "El procés continuarà en %0.1f segons, pressuposant que volíeu dir «%s»." #: help.c:376 #, c-format @@ -2038,7 +2038,7 @@ msgid "" "\n" msgstr "" "\n" -"*** Si us plau, digueu-me qui sou.\n" +"*** Digueu-me qui sou.\n" "\n" "Executeu\n" "\n" @@ -2058,8 +2058,7 @@ msgstr "" #, c-format msgid "unable to auto-detect email address (got '%s')" msgstr "" -"no s'ha pogut detectar automàticament una adreça de correu vàlida («%s» " -"rebut)" +"no s'ha pogut detectar automàticament una adreça electrònica vàlida (s'ha rebut «%s»)" #: ident.c:381 msgid "no name was given and auto-detection is disabled" @@ -2069,7 +2068,7 @@ msgstr "" #: ident.c:387 #, c-format msgid "unable to auto-detect name (got '%s')" -msgstr "no s'ha pogut detectar automàticament el nom («%s» rebut)" +msgstr "no s'ha pogut detectar automàticament el nom (s'ha rebut «%s»)" #: ident.c:395 #, c-format @@ -2100,10 +2099,10 @@ msgstr "" "No s'ha pogut crear '%s.lock': %s.\n" "\n" "Sembla que un altre procés de git s'està executant en aquest\n" -"dipòsit, per exemple, un editor obert per 'git commit'. Si us\n" -"plau, assegureu-vos que tots els processos s'hagin terminat i\n" +"dipòsit, per exemple, un editor obert per 'git commit'. \n" +"Assegureu-vos que tots els processos s'hagin terminat i\n" "llavors proveu de nou. Si encara falla, pot ser que un procés de\n" -"git ha tingut una pana:\n" +"git ha tingut un error:\n" "elimineu el fitxer manualment per a continuar." #: lockfile.c:159 @@ -2358,7 +2357,7 @@ msgstr "la fusió dels arbres %s i %s ha fallat" #: merge-recursive.c:2060 msgid "Merging:" -msgstr "Fusionant:" +msgstr "S'està fusionant:" #: merge-recursive.c:2073 #, c-format @@ -2388,7 +2387,7 @@ msgid "" "commit/abort the previous merge before you start a new notes merge." msgstr "" "No heu acabat la vostra fusió de notes prèvia (%s existeix).\n" -"Si us plau, useu 'git notes merge --commit' o 'git notes merge --abort' per " +"Useu «git notes merge --commit» o «git notes merge --abort» per " "a cometre/avortar la fusió prèvia abans de començar una fusió de notes nova." #: notes-merge.c:279 @@ -2484,7 +2483,7 @@ msgstr "" #: pathspec.c:147 msgid "Only one 'attr:' specification is allowed." -msgstr "només es permet una especificació 'attr:'." +msgstr "Només es permet una especificació 'attr:'." #: pathspec.c:150 msgid "attr spec must not be empty" @@ -2555,7 +2554,7 @@ msgid "" "use . instead if you meant to match all paths" msgstr "" "es faran no vàlides les cadenes buides com especificacions de camí en " -"versions futures. Si us plau, useu . en lloc d'això si volíeu coincidir amb " +"versions futures. Useu . en lloc d'això si volíeu coincidir amb " "tots els camins" #: pathspec.c:595 @@ -2628,7 +2627,7 @@ msgstr "no s'ha pogut suprimir la referència %s: %s" #: refs/files-backend.c:1153 refs/packed-backend.c:1443 #, c-format msgid "could not delete references: %s" -msgstr "no s'ha pogut suprimir les referències: %s" +msgstr "no s'han pogut suprimir les referències: %s" #: ref-filter.c:35 wt-status.c:1811 msgid "gone" @@ -3311,7 +3310,7 @@ msgstr "no s'ha pogut llegir «%s»." #: sequencer.c:1361 msgid "please fix this using 'git rebase --edit-todo'." -msgstr "si us plau, corregiu-ho això usant 'git rebase --edit-todo'." +msgstr "corregiu-ho usant «git rebase --edit-todo»." #: sequencer.c:1363 #, c-format @@ -3487,7 +3486,7 @@ msgstr "no s'ha pogut llegir 'onto'" #: sequencer.c:2129 #, c-format msgid "could not update %s" -msgstr "no s'ha pogut analitzar %s" +msgstr "no s'ha pogut actualitzar %s" #: sequencer.c:2136 #, c-format @@ -3523,12 +3522,12 @@ msgid "" "first and then run 'git rebase --continue' again." msgstr "" "\n" -"Teniu canvis no comesos en el vostre arbre de treball. Si us plau,\n" -"primer cometeu-los i després executeu 'git rebase --continue' de nou." +"Teniu canvis no comesos en el vostre arbre de treball. \n" +"Primer cometeu-los i després executeu 'git rebase --continue' de nou." #: sequencer.c:2251 msgid "could not commit staged changes." -msgstr "No s'ha pogut cometre els canvis «staged»." +msgstr "No s'han pogut cometre els canvis «staged»." #: sequencer.c:2331 #, c-format @@ -3538,7 +3537,7 @@ msgstr "%s: no es pot fer «cherry pick» a %s" #: sequencer.c:2335 #, c-format msgid "%s: bad revision" -msgstr "%s: revisió dolenta" +msgstr "%s: revisió incorrecta" #: sequencer.c:2368 msgid "can't revert as initial commit" @@ -3550,7 +3549,7 @@ msgstr "make_script: opcions no gestionades" #: sequencer.c:2474 msgid "make_script: error preparing revisions" -msgstr "make_script: s'ha produït un error preparant les revisions" +msgstr "make_script: s'ha produït un error en preparar les revisions" #: sequencer.c:2510 #, c-format @@ -3766,10 +3765,10 @@ msgstr "" "\n" " git checkout -b $br $(git rev-parse ...)\n" "\n" -"on \"$br\" és d'alguna manera buida i una referència de 40 caràcters\n" -"hexadecimals. Si us plau, examineu aquestes referències i potser\n" +"on «$br» és d'alguna manera buida i una referència de 40 caràcters\n" +"hexadecimals. Examineu aquestes referències i potser\n" "suprimiu-les. Desactiveu aquest missatge executant\n" -"\"git config advice.objectNameWarning false\"" +"«git config advice.objectNameWarning false»" #: submodule.c:93 submodule.c:127 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" @@ -3804,7 +3803,7 @@ msgstr "al submòdul no populat «%s»" #: submodule.c:340 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" -msgstr "L'especificació «%s» és en el submòdul '%.*s'" +msgstr "L'especificació «%s» és en el submòdul «%.*s»" #: submodule.c:799 #, c-format @@ -3823,7 +3822,7 @@ msgstr "«%s» no reconegut com un dipòsit git" #: submodule.c:1442 #, c-format msgid "could not start 'git status' in submodule '%s'" -msgstr "no s'ha pogut iniciar 'git status' al submòdul «%s»" +msgstr "no s'ha pogut iniciar «git status» al submòdul «%s»" #: submodule.c:1455 #, c-format @@ -3861,7 +3860,7 @@ msgid "" "'%s' to\n" "'%s'\n" msgstr "" -"S'està migrant el directori de '%s%s' des de\n" +"S'està migrant el directori de «%s%s» des de\n" "«%s» a\n" "«%s»\n" @@ -3981,7 +3980,7 @@ msgid "" "\n" msgstr "" "\n" -"Si us plau, intenteu\n" +"Intenteu\n" "\n" "\tgit push --recurse-submodules=on-demand\n" "\n" @@ -4024,7 +4023,7 @@ msgid "" msgstr "" "Els vostres canvis locals als fitxers següents se sobreescriurien per " "agafar:\n" -"%%sSi us plau, cometeu els vostres canvis o feu «stash» abans de canviar de " +"%%sCometeu els vostres canvis o feu «stash» abans de canviar de " "branca." #: unpack-trees.c:108 @@ -4045,7 +4044,7 @@ msgid "" msgstr "" "Els vostres canvis locals als fitxers següents se sobreescriurien per " "fusionar:\n" -"%%sSi us plau, cometeu els vostres canvis o feu «stash» abans de fusionar." +"%%sCometeu els vostres canvis o feu «stash» abans de fusionar." #: unpack-trees.c:113 #, c-format @@ -4064,7 +4063,7 @@ msgid "" "%%sPlease commit your changes or stash them before you %s." msgstr "" "Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n" -"%%sSi us plau, cometeu els vostres canvis o feu «stash» abans de %s." +"%%sCometeu els vostres canvis o feu «stash» abans de %s." #: unpack-trees.c:118 #, c-format @@ -4092,7 +4091,7 @@ msgid "" msgstr "" "Els següents fitxers no seguits en l'arbre de treball s'eliminarien per " "agafar:\n" -"%%sSi us plau, moveu-los o elimineu-los abans de canviar de branca." +"%%sMoveu-los o elimineu-los abans de canviar de branca." #: unpack-trees.c:129 #, c-format @@ -4112,7 +4111,7 @@ msgid "" msgstr "" "Els següents fitxers no seguits en l'arbre de treball s'eliminarien per " "fusionar:\n" -"%%sSi us plau, moveu-los o elimineu-los abans de fusionar." +"%%sMoveu-los o elimineu-los abans de fusionar." #: unpack-trees.c:134 #, c-format @@ -4131,7 +4130,7 @@ msgid "" "%%sPlease move or remove them before you %s." msgstr "" "Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n" -"%%sSi us plau, moveu-los o elimineu-los abans de %s." +"%%sMoveu-los o elimineu-los abans de %s." #: unpack-trees.c:139 #, c-format @@ -4151,7 +4150,7 @@ msgid "" msgstr "" "Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per " "agafar:\n" -"%%sSi us plau, moveu-los o elimineu-los abans de canviar de branca." +"%%sMoveu-los o elimineu-los abans de canviar de branca." #: unpack-trees.c:146 #, c-format @@ -4172,7 +4171,7 @@ msgid "" msgstr "" "Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per " "fusionar:\n" -"%%sSi us plau, moveu-los o elimineu-los abans de fusionar." +"%%sMoveu-los o elimineu-los abans de fusionar." #: unpack-trees.c:151 #, c-format @@ -4192,7 +4191,7 @@ msgid "" msgstr "" "Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per " "%s:\n" -"%%sSi us plau, moveu-los o elimineu-los abans de %s." +"%%sMoveu-los o elimineu-los abans de %s." #: unpack-trees.c:156 #, c-format @@ -4680,11 +4679,11 @@ msgstr "En la branca " #: wt-status.c:1574 msgid "interactive rebase in progress; onto " -msgstr "«rebase» interactiu en progrés; sobre " +msgstr "«rebase» interactiu en curs; sobre " #: wt-status.c:1576 msgid "rebase in progress; onto " -msgstr "«rebase» en progrés; sobre " +msgstr "«rebase» en curs; sobre " #: wt-status.c:1581 msgid "HEAD detached at " @@ -4996,7 +4995,7 @@ msgstr "-A i -u són mútuament incompatibles" #: builtin/add.c:403 msgid "Option --ignore-missing can only be used together with --dry-run" -msgstr "L'opció --ignore-missing només es pot usar junt amb --dry-run" +msgstr "L'opció --ignore-missing només es pot usar juntament amb --dry-run" #: builtin/add.c:407 #, c-format @@ -5011,7 +5010,7 @@ msgstr "No s'ha especificat res, no s'ha afegit res.\n" #: builtin/add.c:423 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" -msgstr "Potser volíeu dir 'git add .'?\n" +msgstr "Potser volíeu dir «git add .»?\n" #: builtin/add.c:428 builtin/check-ignore.c:176 builtin/checkout.c:282 #: builtin/checkout.c:479 builtin/clean.c:957 builtin/commit.c:350 @@ -5272,7 +5271,7 @@ msgstr "silenciós" #: builtin/am.c:2226 msgid "add a Signed-off-by line to the commit message" -msgstr "afegeix una línia Signed-off-by al missatge de comissió" +msgstr "afegeix una línia «Signed-off-by» al missatge de comissió" #: builtin/am.c:2229 msgid "recode into utf8 (default)" @@ -5280,24 +5279,24 @@ msgstr "recodifica en utf8 (per defecte)" #: builtin/am.c:2231 msgid "pass -k flag to git-mailinfo" -msgstr "passa la bandera -k al git-mailinfo" +msgstr "passa l'indicador -k a git-mailinfo" #: builtin/am.c:2233 msgid "pass -b flag to git-mailinfo" -msgstr "passa la bandera -b al git-mailinfo" +msgstr "passa l'indicador -b a git-mailinfo" #: builtin/am.c:2235 msgid "pass -m flag to git-mailinfo" -msgstr "passa la bandera -m al git-mailinfo" +msgstr "passa l'indicador -m a git-mailinfo" #: builtin/am.c:2237 msgid "pass --keep-cr flag to git-mailsplit for mbox format" -msgstr "passa la bandera --keep-cr al git-mailsplit per al format mbox" +msgstr "passa l'indicador --keep-cr a git-mailsplit per al format mbox" #: builtin/am.c:2240 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" -"no passis la bandera --keep-cr al git-mailsplit independent de am.keepcr" +"no passis l'indicador --keep-cr a git-mailsplit independent d'am.keepcr" #: builtin/am.c:2243 msgid "strip everything before a scissors line" @@ -5307,7 +5306,7 @@ msgstr "elimina tot abans d'una línia de tisores" #: builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263 builtin/am.c:2266 #: builtin/am.c:2272 msgid "pass it through git-apply" -msgstr "passa-ho a través del git-apply" +msgstr "passa-ho a través de git-apply" #: builtin/am.c:2262 builtin/fmt-merge-msg.c:664 builtin/fmt-merge-msg.c:667 #: builtin/grep.c:843 builtin/merge.c:205 builtin/pull.c:142 builtin/pull.c:197 @@ -5329,7 +5328,7 @@ msgstr "el format en el qual estan els pedaços" #: builtin/am.c:2275 msgid "override error message when patch failure occurs" msgstr "" -"passa per alt el missatge d'error quan s'ocorre una fallada en apedaçar" +"passa per alt el missatge d'error si falla l'aplicació del pedaç" #: builtin/am.c:2277 msgid "continue applying patches after resolving a conflict" @@ -5366,7 +5365,7 @@ msgstr "signa les comissions amb GPG" #: builtin/am.c:2298 msgid "(internal use for git-rebase)" -msgstr "(ús intern per al git-rebase)" +msgstr "(ús intern per a git-rebase)" #: builtin/am.c:2316 msgid "" @@ -5374,7 +5373,7 @@ msgid "" "it will be removed. Please do not use it anymore." msgstr "" "Fa molt que l'opció -b/--binary no ha fet res, i\n" -"s'eliminarà. Si us plau, no l'useu més." +"s'eliminarà. No l'useu més." #: builtin/am.c:2323 msgid "failed to read the index" @@ -5419,7 +5418,7 @@ msgstr "git archive: Remot sense URL" #: builtin/archive.c:58 msgid "git archive: expected ACK/NAK, got EOF" -msgstr "git archive: ACK/NAK esperat, EOF rebut" +msgstr "git archive: s'esperava ACK/NAK, s'ha rebut EOF" #: builtin/archive.c:61 #, c-format @@ -5517,7 +5516,7 @@ msgstr "Omet el nom d'autor i la marca de temps (Per defecte: desactivat)" #: builtin/blame.c:682 msgid "Show author email instead of name (Default: off)" msgstr "" -"Mostra l'adreça de correu electrònic de l'autor en lloc del nom (Per " +"Mostra l'adreça electrònica de l'autor en lloc del nom (Per " "defecte: desactivat)" #: builtin/blame.c:683 @@ -5766,7 +5765,7 @@ msgid "" " %s\n" "Lines starting with '%c' will be stripped.\n" msgstr "" -"Si us plau, editeu la descripció de la branca\n" +"Editeu la descripció de la branca\n" " %s\n" "S'eliminaran les línies que comencin amb '%c'.\n" @@ -6125,7 +6124,7 @@ msgstr "ignora l'índex en comprovar" #: builtin/check-ignore.c:158 msgid "cannot specify pathnames with --stdin" -msgstr "no es pot especificar noms de camí amb --stdin" +msgstr "no es poden especificar noms de camí amb --stdin" #: builtin/check-ignore.c:161 msgid "-z only makes sense with --stdin" @@ -6141,7 +6140,7 @@ msgstr "--quiet només és vàlid amb un sol nom de camí" #: builtin/check-ignore.c:169 msgid "cannot have both --quiet and --verbose" -msgstr "no es pot tenir ambdós --quiet i --verbose" +msgstr "no es poden especificar --quiet i --verbose alhora" #: builtin/check-ignore.c:172 msgid "--non-matching is only valid with --verbose" @@ -6628,7 +6627,7 @@ msgstr "Voleu eliminar %s [y/N]? " #: builtin/clean.c:787 git-add--interactive.perl:1616 #, c-format msgid "Bye.\n" -msgstr "Adéu.\n" +msgstr "Adeu.\n" #: builtin/clean.c:795 msgid "" @@ -6709,7 +6708,7 @@ msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" -"clean.requireForce està establerta a veritat i ni -i, -n ni -f s'han " +"clean.requireForce està establerta en cert i ni -i, -n ni -f s'han " "indicat; refusant netejar" #: builtin/clean.c:944 @@ -6717,7 +6716,7 @@ msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "" -"clean.requireForce és per defecte veritat i ni -i, -n ni -f s'han indicat; " +"clean.requireForce és per defecte cert i ni -i, -n ni -f s'han indicat; " "refusant netejar" #: builtin/clone.c:39 @@ -6861,7 +6860,7 @@ msgid "" "Please specify a directory on the command line" msgstr "" "No s'ha pogut endevinar cap nom de directori.\n" -"Si us plau, especifiqueu un directori en la línia d'ordres" +"Especifiqueu un directori en la línia d'ordres" #: builtin/clone.c:326 #, c-format @@ -6935,7 +6934,7 @@ msgstr "no s'ha pogut agafar l'arbre de treball" #: builtin/clone.c:796 msgid "unable to write parameters to config file" -msgstr "no s'ha pogut escriure els paràmetres al fitxer de configuració" +msgstr "no s'han pogut escriure els paràmetres al fitxer de configuració" #: builtin/clone.c:859 msgid "cannot repack to clean up" @@ -7101,9 +7100,9 @@ msgid "" "\n" " git commit --amend --reset-author\n" msgstr "" -"S'han configurat el vostre nom i adreça de correu electrònic\n" -"automàticament basats en el vostre nom d'usuari i nom de màquina. Si\n" -"us plau, comproveu que siguin correctes. Podeu suprimir aquest\n" +"S'han configurat el vostre nom i adreça electrònica\n" +"automàticament basats en el vostre nom d'usuari i nom de màquina. \n" +"Comproveu que siguin correctes. Podeu suprimir aquest\n" "missatge establint-los explícitament. Executeu l'ordre següent i\n" "seguiu les instruccions en el vostre editor per editar el vostre\n" "fitxer de configuració:\n" @@ -7127,9 +7126,9 @@ msgid "" "\n" " git commit --amend --reset-author\n" msgstr "" -"S'han configurat el vostre nom i adreça de correu electrònic\n" -"automàticament basats en el vostre nom d'usuari i nom de màquina. Si\n" -"us plau, comproveu que siguin correctes. Podeu suprimir aquest\n" +"S'han configurat el vostre nom i adreça electrònica\n" +"automàticament basats en el vostre nom d'usuari i nom de màquina. \n" +"Comproveu que siguin correctes. Podeu suprimir aquest\n" "missatge establint-los explícitament:\n" "\n" " git config --global user.name \"El Vostre Nom\"\n" @@ -7167,7 +7166,7 @@ msgstr "" #: builtin/commit.c:86 msgid "Otherwise, please use 'git reset'\n" -msgstr "D'altra manera, si us plau, useu 'git reset'\n" +msgstr "D'altra manera, useu «git reset»\n" #: builtin/commit.c:89 msgid "" @@ -7289,7 +7288,7 @@ msgid "" msgstr "" "\n" "Sembla que podeu estar cometent una fusió.\n" -"Si això no és correcte, si us plau, elimineu el fitxer\n" +"Si això no és correcte, elimineu el fitxer\n" "\t%s\n" "i intenteu-ho de nou.\n" @@ -7304,7 +7303,7 @@ msgid "" msgstr "" "\n" "Sembla que podeu estar cometent un «cherry pick».\n" -"Si això no és correcte, si us plau, elimineu el fitxer\n" +"Si això no és correcte, elimineu el fitxer\n" "\t%s\n" "i intenteu-ho de nou.\n" @@ -7314,7 +7313,7 @@ msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" -"Si us plau, introduïu el missatge de comissió dels vostres canvis.\n" +"Introduïu el missatge de comissió dels vostres canvis.\n" "S'ignoraran les línies començant amb '%c', i un missatge de\n" "comissió buit avorta la comissió.\n" @@ -7325,7 +7324,7 @@ msgid "" "with '%c' will be kept; you may remove them yourself if you want to.\n" "An empty message aborts the commit.\n" msgstr "" -"Si us plau, introduïu el missatge de comissió dels vostres canvis.\n" +"Introduïu el missatge de comissió dels vostres canvis.\n" "Es mantindran les línies que comencin amb '%c'; podeu eliminar-les " "vosaltres\n" "mateixos si voleu. Un missatge buit avorta la comissió.\n" @@ -7356,13 +7355,13 @@ msgstr "Error en construir arbres" #: builtin/commit.c:972 builtin/tag.c:252 #, c-format msgid "Please supply the message using either -m or -F option.\n" -msgstr "Si us plau, proveïu el missatge usant l'opció -m o l'opció -F.\n" +msgstr "Especifiqueu el missatge usant l'opció -m o l'opció -F.\n" #: builtin/commit.c:1075 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" -"--author «%s» no és 'Nom <adreça-de-correu-electrònic>' i no coincideix amb\n" +"--author «%s» no és «Nom <adreça-electrònica>» i no coincideix amb\n" "cap autor existent" #: builtin/commit.c:1090 builtin/commit.c:1335 @@ -7567,7 +7566,7 @@ msgstr "" #: builtin/commit.c:1608 msgid "the commit is authored by me now (used with -C/-c/--amend)" -msgstr "l'autor de la comissió ja sóc jo (s'usa amb -C/-c/--amend)" +msgstr "l'autor de la comissió ja soc jo (s'usa amb -C/-c/--amend)" #: builtin/commit.c:1609 builtin/log.c:1436 builtin/merge.c:239 #: builtin/revert.c:105 @@ -7684,7 +7683,7 @@ msgstr "" "S'ha actualitzat el dipòsit, però no es pot escriure el\n" "fitxer new_index. Comproveu que el disc no estigui ple i\n" "que la quota no estigui excedida, i després\n" -"\"git reset HEAD\" per a recuperar." +"«git reset HEAD» per a recuperar." #: builtin/config.c:10 msgid "git config [<options>]" @@ -7836,7 +7835,7 @@ msgid "" msgstr "" "# Això és el fitxer de configuració del Git de l'usuari.\n" "[user]\n" -"# Si us plau, adapteu i descomenteu les línies següents:\n" +"# Adapteu i descomenteu les línies següents:\n" "#\tname = %s\n" "#\temail = %s\n" @@ -7855,7 +7854,7 @@ msgid "" "cannot overwrite multiple values with a single value\n" " Use a regexp, --add or --replace-all to change %s." msgstr "" -"no es pot sobreescriure múltiples valors amb un sol valor\n" +"no es poden sobreescriure múltiples valors amb un sol valor\n" " Useu una expressió regular, --add o --replace-all per a canviar %s." #: builtin/count-objects.c:88 @@ -8143,7 +8142,7 @@ msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" msgstr "" -"fes que 'git-difftool' surti quan l'eina de diff invocada torna un codi de sortida diferent a zero" +"fes que 'git-difftool' surti quan l'eina de diff invocada torna un codi de sortida diferent de zero" #: builtin/difftool.c:715 msgid "<command>" @@ -8454,7 +8453,7 @@ msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "" -"Cap dipòsit remot especificat. Si us plau, especifiqueu un URL o\n" +"Cap dipòsit remot especificat. Especifiqueu un URL o\n" "un nom remot del qual es deuen obtenir les revisions noves." #: builtin/fetch.c:1301 @@ -8535,7 +8534,7 @@ msgstr "git for-each-ref [(--merged | --no-merged) [<comissió>]]" #: builtin/for-each-ref.c:13 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" msgstr "" -"git for-each-ref [--contains [<comissió>]] [--no-contains [<comissió>]]" +"git for-each-ref [--contains [<comissió>]] [--no-contains [<comissió>]]" #: builtin/for-each-ref.c:28 msgid "quote placeholders suitably for shells" @@ -8665,7 +8664,7 @@ msgid "" "\n" "%s" msgstr "" -"L'última execució de gc ha informat el següent. Si us plau, corregiu\n" +"L'última execució de gc ha informat el següent. Corregiu\n" "la causa primordial i elimineu %s.\n" "No es realitzarà la neteja automàtica fins que s'elimini el fitxer.\n" "\n" @@ -8759,7 +8758,7 @@ msgstr "no es pot fer grep des d'un objecte de tipus %s" #: builtin/grep.c:694 #, c-format msgid "switch `%c' expects a numerical value" -msgstr "l'opció `%c' espera un valor numèric" +msgstr "l'opció «%c» espera un valor numèric" #: builtin/grep.c:781 msgid "search in index instead of in the work tree" @@ -8811,7 +8810,7 @@ msgstr "descendeix com a màxim <profunditat> nivells" #: builtin/grep.c:809 msgid "use extended POSIX regular expressions" -msgstr "usa les expressions regulars POSIX esteses" +msgstr "usa les expressions regulars POSIX ampliades" #: builtin/grep.c:812 msgid "use basic POSIX regular expressions (default)" @@ -8927,7 +8926,7 @@ msgstr "" #: builtin/grep.c:880 msgid "show parse tree for grep expression" -msgstr "mostra l'arbre d'anàlisis de l'expressió de grep" +msgstr "mostra l'arbre d'anàlisi de l'expressió grep" #: builtin/grep.c:884 msgid "pager" @@ -9084,7 +9083,7 @@ msgid "" "Please consider using 'man.<tool>.cmd' instead." msgstr "" "«%s»: camí a un visualitzador de manuals no compatible.\n" -"Si us plau, considereu usar 'man.<eina>.cmd' en lloc d'això." +"Considereu usar 'man.<eina>.cmd' en lloc d'això." #: builtin/help.c:223 #, c-format @@ -9093,7 +9092,7 @@ msgid "" "Please consider using 'man.<tool>.path' instead." msgstr "" "«%s»: ordre per a un visualitzador de manuals compatible.\n" -"Si us plau, considereu usar 'man.<eina>.path' en lloc d'això." +"Considereu usar 'man.<eina>.path' en lloc d'això." #: builtin/help.c:340 #, c-format @@ -9172,7 +9171,7 @@ msgstr "no s'ha rebut l'objecte esperat %s" #: builtin/index-pack.c:229 #, c-format msgid "object %s: expected type %s, found %s" -msgstr "objecte %s: tipus %s esperat, %s trobat" +msgstr "objecte %s: s'esperava el tipus %s, s'ha trobat %s" #: builtin/index-pack.c:271 #, c-format @@ -9223,7 +9222,7 @@ msgstr "la versió de paquet %<PRIu32> no és compatible" #: builtin/index-pack.c:359 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" -msgstr "el paquet té un objecte dolent a la posició %<PRIuMAX>: %s" +msgstr "el paquet té un objecte incorrecte a la posició %<PRIuMAX>: %s" #: builtin/index-pack.c:480 #, c-format @@ -9396,7 +9395,7 @@ msgstr "no es pot emmagatzemar el fitxer d'índex" #: builtin/index-pack.c:1485 #, c-format msgid "bad pack.indexversion=%<PRIu32>" -msgstr "pack.indexversion=%<PRIu32> dolent" +msgstr "pack.indexversion=%<PRIu32> incorrecte" #: builtin/index-pack.c:1553 #, c-format @@ -9431,7 +9430,7 @@ msgstr "el nom del fitxer de paquet «%s» no acaba amb '.pack'" #: builtin/index-pack.c:1724 builtin/index-pack.c:1728 #, c-format msgid "bad %s" -msgstr "%s dolent" +msgstr "%s incorrecte" #: builtin/index-pack.c:1744 msgid "--fix-thin cannot be used without --stdin" @@ -9488,7 +9487,7 @@ msgstr "no s'han trobat les plantilles %s" #: builtin/init-db.c:135 #, c-format msgid "not copying templates from '%s': %s" -msgstr "no s'està copiant plantilles de «%s»: %s" +msgstr "no s'estan copiant plantilles de «%s»: %s" #: builtin/init-db.c:328 #, c-format @@ -9607,7 +9606,7 @@ msgstr "uneix els valors continus amb espais en blanc" #: builtin/interpret-trailers.c:105 msgid "set parsing options" -msgstr "estableix les opcions d'anàlisis" +msgstr "estableix les opcions d'anàlisi" #: builtin/interpret-trailers.c:107 msgid "trailer" @@ -9666,7 +9665,7 @@ msgstr "Sortida final: %d %s\n" #: builtin/log.c:501 #, c-format msgid "git show %s: bad file" -msgstr "git show %s: fitxer dolent" +msgstr "git show %s: fitxer incorrecte" #: builtin/log.c:516 builtin/log.c:610 #, c-format @@ -9738,7 +9737,7 @@ msgid "" msgstr "" "S'ha produït un error en obtenir la font. Si voleu registrar la comissió " "base\n" -"automàticament, si us plau, useu git branch --set-upstream-to per a\n" +"automàticament, useu git branch --set-upstream-to per a\n" "seguir una branca remota. O podeu especificar la comissió base manualment\n" "amb --base=<id-de-comissió-base>." @@ -9874,7 +9873,7 @@ msgstr "límit" #: builtin/log.c:1483 msgid "attach the patch" -msgstr "ajunta el pedaç" +msgstr "adjunta el pedaç" #: builtin/log.c:1486 msgid "inline the patch" @@ -9968,7 +9967,7 @@ msgstr "git cherry [-v] [<font> [<cap> [<límit>]]]" msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "" -"No s'ha pogut trobar una branca remota seguida. Si us plau, especifiqueu " +"No s'ha pogut trobar una branca remota seguida. Especifiqueu " "<font> manualment.\n" #: builtin/ls-files.c:466 @@ -10176,7 +10175,7 @@ msgstr "git merge --continue" #: builtin/merge.c:107 msgid "switch `m' requires a value" -msgstr "l'opció `m' requereix un valor" +msgstr "l'opció «m» requereix un valor" #: builtin/merge.c:144 #, c-format @@ -10311,7 +10310,7 @@ msgstr "«%s» no assenyala una comissió" #: builtin/merge.c:546 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" -msgstr "Cadena branch.%s.mergeoptions dolenta: %s" +msgstr "Cadena branch.%s.mergeoptions incorrecta: %s" #: builtin/merge.c:666 msgid "Not handling anything other than two heads merge." @@ -10347,7 +10346,7 @@ msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "" -"Si us plau, introduïu un missatge de comissió per a explicar per què\n" +"Introduïu un missatge de comissió per a explicar per què\n" "aquesta fusió és necessària, especialment si fusiona una font\n" "actualitzada a una branca temàtica.\n" "\n" @@ -10390,7 +10389,7 @@ msgstr "No hi ha cap branca amb seguiment remot per a %s de %s" #: builtin/merge.c:972 #, c-format msgid "Bad value '%s' in environment '%s'" -msgstr "Valor dolent «%s» en l'entorn «%s»" +msgstr "Valor incorrecte «%s» en l'entorn «%s»" #: builtin/merge.c:1073 #, c-format @@ -10415,7 +10414,7 @@ msgstr "--continue no accepta paràmetres" #: builtin/merge.c:1192 msgid "There is no merge in progress (MERGE_HEAD missing)." -msgstr "No hi ha fusió en progrés (manca MERGE_HEAD)." +msgstr "No hi ha cap fusió en curs (manca MERGE_HEAD)." #: builtin/merge.c:1208 msgid "" @@ -10423,7 +10422,7 @@ msgid "" "Please, commit your changes before you merge." msgstr "" "No heu conclòs la vostra fusió (MERGE_HEAD existeix).\n" -"Si us plau, cometeu els vostres canvis abans de fusionar." +"Cometeu els vostres canvis abans de fusionar." #: builtin/merge.c:1215 msgid "" @@ -10431,7 +10430,7 @@ msgid "" "Please, commit your changes before you merge." msgstr "" "No heu conclòs el vostre «cherry pick» (CHERRY_PICK_HEAD existeix).\n" -"Si us plau, cometeu els vostres canvis abans de fusionar." +"Cometeu els vostres canvis abans de fusionar." #: builtin/merge.c:1218 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." @@ -10472,7 +10471,7 @@ msgstr "La comissió %s té una signatura GPG no fiable, suposadament de %s." #: builtin/merge.c:1298 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." -msgstr "La comissió %s té una signatura GPG dolenta suposadament de %s." +msgstr "La comissió %s té una signatura GPG incorrecta suposadament de %s." #: builtin/merge.c:1301 #, c-format @@ -10687,7 +10686,7 @@ msgstr "El directori %s és en l'índex i no hi ha cap submòdul?" #: builtin/mv.c:85 builtin/rm.c:289 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" -"Si us plau, «stage» els vostres canvis a .gitmodules o feu «stash» dels " +"Feu «stage» dels vostres canvis a .gitmodules o feu «stash» dels " "mateixos per a procedir" #: builtin/mv.c:103 @@ -10715,7 +10714,7 @@ msgstr "S'està comprovant el canvi de nom de «%s» a «%s»\n" #: builtin/mv.c:182 msgid "bad source" -msgstr "font dolenta" +msgstr "font incorrecta" #: builtin/mv.c:185 msgid "can not move directory into itself" @@ -10811,7 +10810,7 @@ msgstr "permet imprimir els noms `undefined` (per defecte)" #: builtin/name-rev.c:410 msgid "dereference tags in the input (internal use)" -msgstr "dereferencia les etiquetes en l'entrada (ús intern)" +msgstr "desreferencia les etiquetes en l'entrada (ús intern)" #: builtin/notes.c:26 msgid "git notes [--ref <notes-ref>] [list [<object>]]" @@ -10947,7 +10946,7 @@ msgstr "S'ha produït un error en finalitzar 'show' per a l'objecte «%s»" #: builtin/notes.c:195 msgid "please supply the note contents using either -m or -F option" msgstr "" -"si us plau, proveïu els continguts de la nota fent servir l'opció -m o " +"especifiqueu el contingut de la nota fent servir l'opció -m o " "l'opció -F" #: builtin/notes.c:204 @@ -10984,7 +10983,7 @@ msgstr "s'ha produït un error en llegir l'objecte «%s»." #: builtin/notes.c:262 #, c-format msgid "cannot read note data from non-blob object '%s'." -msgstr "no es pot llegir les dades de node de l'objecte no de blob «%s»." +msgstr "no es poden llegir les dades de node de l'objecte no de blob «%s»." #: builtin/notes.c:302 #, c-format @@ -11092,7 +11091,7 @@ msgid "" "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" msgstr "" "Es desaconsellen les opcions -m/-F/-c/-C en favor de la subordre 'edit'.\n" -"Si us plau, useu 'git notes add -f -m/-F/-c/-C' en lloc d'això.\n" +"Useu «git notes add -f -m/-F/-c/-C» en lloc d'això.\n" #: builtin/notes.c:688 msgid "failed to delete ref NOTES_MERGE_PARTIAL" @@ -11281,7 +11280,7 @@ msgstr "versió d'índex no compatible %s" #: builtin/pack-objects.c:2853 #, c-format msgid "bad index version '%s'" -msgstr "versió d'índex dolenta «%s»" +msgstr "versió d'índex incorrecta «%s»" #: builtin/pack-objects.c:2883 msgid "do not show progress meter" @@ -11316,7 +11315,7 @@ msgstr "mida màxima de cada fitxer de paquet de sortida" #: builtin/pack-objects.c:2897 msgid "ignore borrowed objects from alternate object store" msgstr "" -"ignora els objectes prestats d'un emmagatzemament d'objectes alternatiu" +"ignora els objectes prestats d'un emmagatzematge d'objectes alternatiu" #: builtin/pack-objects.c:2899 msgid "ignore packed objects" @@ -11427,7 +11426,7 @@ msgstr "" #: builtin/pack-objects.c:2954 msgid "write a bitmap index together with the pack index" -msgstr "escriu un índex de mapa de bits junt amb l'índex de paquet" +msgstr "escriu un índex de mapa de bits juntament amb l'índex de paquet" #: builtin/pack-objects.c:3081 msgid "Counting objects" @@ -11551,11 +11550,11 @@ msgstr "Actualment no sou en cap branca." #: builtin/pull.c:416 builtin/pull.c:431 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." -msgstr "Si us plau, especifiqueu sobre què branca voleu fer «rebase»." +msgstr "Especifiqueu sobre què branca voleu fer «rebase»." #: builtin/pull.c:418 builtin/pull.c:433 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." -msgstr "Si us plau, especifiqueu amb quina branca voleu fusionar." +msgstr "Especifiqueu amb quina branca voleu fusionar." #: builtin/pull.c:419 builtin/pull.c:434 msgid "See git-pull(1) for details." @@ -11610,7 +11609,7 @@ msgstr "baixar fent «rebase»" #: builtin/pull.c:856 msgid "please commit or stash them." -msgstr "si us plau, cometeu-los o emmagatzemeu-los." +msgstr "cometeu-los o emmagatzemeu-los." #: builtin/pull.c:881 #, c-format @@ -11820,7 +11819,7 @@ msgstr "s'ha produït un error en pujar algunes referències a «%s»" #: builtin/push.c:370 #, c-format msgid "bad repository '%s'" -msgstr "dipòsit dolent «%s»" +msgstr "dipòsit incorrecte «%s»" #: builtin/push.c:371 msgid "" @@ -12234,8 +12233,8 @@ msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" msgstr "" -"--mirror és perillós i està en desús; si us\n" -"\t plau, useu --mirror=fetch o\n" +"--mirror és perillós i està en desús; \n" +"\t useu --mirror=fetch o\n" "\t --mirror=push en lloc d'això" #: builtin/remote.c:144 @@ -12329,7 +12328,7 @@ msgstr "" "No s'està actualitzant l'especificació de referències d'obtenció no per " "defecte\n" "\t%s\n" -"\tSi us plau, actualitzeu la configuració manualment si és necessari." +"\tActualitzeu la configuració manualment si és necessari." #: builtin/remote.c:697 #, c-format @@ -12509,19 +12508,19 @@ msgstr " (estat no consultat)" #: builtin/remote.c:1195 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" -msgstr[0] " Branca local configurada per a 'git pull':" -msgstr[1] " Branques locals configurades per a 'git pull':" +msgstr[0] " Branca local configurada per a «git pull»:" +msgstr[1] " Branques locals configurades per a «git pull»:" #: builtin/remote.c:1203 msgid " Local refs will be mirrored by 'git push'" -msgstr " 'git push' reflectirà les referències locals" +msgstr " «git push» reflectirà les referències locals" #: builtin/remote.c:1209 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" -msgstr[0] " Referència local configurada per a 'git push'%s:" -msgstr[1] " Referències locals configurades per a 'git push'%s:" +msgstr[0] " Referència local configurada per a «git push»%s:" +msgstr[1] " Referències locals configurades per a «git push»%s:" #: builtin/remote.c:1230 msgid "set refs/remotes/<name>/HEAD according to remote" @@ -12538,7 +12537,7 @@ msgstr "No es pot determinar el HEAD remot" #: builtin/remote.c:1249 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" -"Múltiples branques de HEAD remotes. Si us plau, trieu-ne una explícitament " +"Múltiples branques de HEAD remotes. Trieu-ne una explícitament " "amb:" #: builtin/remote.c:1259 @@ -12626,7 +12625,7 @@ msgstr "afegeix URL" #: builtin/remote.c:1526 msgid "delete URLs" -msgstr "suprimeix URLs" +msgstr "suprimeix els URL" #: builtin/remote.c:1533 msgid "--add --delete doesn't make sense" @@ -12664,7 +12663,7 @@ msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." msgstr "" -"Els re-empaquetaments incrementals són incompatibles amb els índexs de bitmaps. Useu\n" +"Els reempaquetaments incrementals són incompatibles amb els índexs de bitmaps. Useu\n" "--no-write-bitmap-index o inhabiliteu el paràmetre de configuració pack.writebitmaps." #: builtin/repack.c:168 @@ -12743,7 +12742,7 @@ msgstr "reempaqueta els objectes en paquets marcats amb .keep" #: builtin/repack.c:210 msgid "cannot delete packs in a precious-objects repo" -msgstr "no es pot suprimir paquets en un dipòsit d'objectes preciosos" +msgstr "no es poden suprimir paquets en un dipòsit d'objectes preciosos" #: builtin/repack.c:214 msgid "--keep-unreachable and -A are incompatible" @@ -12782,7 +12781,7 @@ msgstr "No és un nom d'objecte vàlid: «%s»" #: builtin/replace.c:361 #, c-format msgid "bad mergetag in commit '%s'" -msgstr "etiqueta de fusió dolenta en la comissió «%s»" +msgstr "etiqueta de fusió incorrecta en la comissió «%s»" #: builtin/replace.c:363 #, c-format @@ -12986,7 +12985,7 @@ msgstr "git rev-parse --parseopt [<opcions>] -- [<paràmetres>...]" #: builtin/rev-parse.c:407 msgid "keep the `--` passed as an arg" -msgstr "retén el `--` passat com a paràmetre" +msgstr "retén el «--» passat com a paràmetre" #: builtin/rev-parse.c:409 msgid "stop parsing after the first non-option argument" @@ -13211,7 +13210,7 @@ msgstr "git shortlog [<opcions>] [<rang-de-revisions>] [[--] [<camí>...]]" #: builtin/shortlog.c:263 msgid "Group by committer rather than author" -msgstr "Agrupa per «comiitter» en comptes de per autor" +msgstr "Agrupa per «comitter» en comptes de per autor" #: builtin/shortlog.c:265 msgid "sort output according to the number of commits per author" @@ -13224,7 +13223,7 @@ msgstr "" #: builtin/shortlog.c:269 msgid "Show the email address of each author" -msgstr "Mostra l'adreça de correu electrònic de cada autor" +msgstr "Mostra l'adreça electrònica de cada autor" #: builtin/shortlog.c:270 msgid "w[,i1[,i2]]" @@ -13242,9 +13241,9 @@ msgid "" "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" msgstr "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" -"\t\t [--current] [--color[=<quan>] | --no-color] [--sparse]\n" -"\t\t [--more=<n> | --list | --independent | --merge-base]\n" -"\t\t [--no-name | --sha1-name] [--topics] [(<revisió> | <glob>)...]" +"\t\t[--current] [--color[=<quan>] | --no-color] [--sparse]\n" +"\t\t[--more=<n> | --list | --independent | --merge-base]\n" +"\t\t[--no-name | --sha1-name] [--topics] [(<revisió> | <glob>)...]" #: builtin/show-branch.c:16 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" @@ -13401,7 +13400,7 @@ msgstr "mostra la referència HEAD, encara que es filtrés" #: builtin/show-ref.c:168 msgid "dereference tags into object IDs" -msgstr "desreferencia les etiquetes a IDs d'objecte" +msgstr "desreferencia les etiquetes a ID d'objecte" #: builtin/show-ref.c:170 msgid "only show SHA1 hash using <n> digits" @@ -13625,7 +13624,7 @@ msgstr "git submodule--helper update_clone [--prefix=<camí>] [<camí>...]" #: builtin/submodule--helper.c:1030 msgid "bad value for update parameter" -msgstr "valor dolent per al paràmetre update" +msgstr "valor incorrecte per al paràmetre update" #: builtin/submodule--helper.c:1098 #, c-format @@ -13642,7 +13641,7 @@ msgstr "inclou recursivament als submòduls" #: builtin/submodule--helper.c:1220 msgid "git submodule--helper embed-git-dir [<path>...]" -msgstr "git submodule--helper embed-git-dir [<camí>]" +msgstr "git submodule--helper embed-git-dir [<camí>...]" #: builtin/submodule--helper.c:1278 #, c-format @@ -13756,7 +13755,7 @@ msgstr "no s'ha pogut escriure el fitxer d'etiqueta" #: builtin/tag.c:215 msgid "bad object type." -msgstr "el tipus d'objecte és dolent." +msgstr "el tipus d'objecte és incorrecte." #: builtin/tag.c:261 msgid "no tag message?" @@ -14570,7 +14569,7 @@ msgstr "'$arg' no sembla una revisió vàlida" #: git-bisect.sh:154 msgid "Bad HEAD - I need a HEAD" -msgstr "HEAD dolent - Cal un HEAD" +msgstr "HEAD incorrecte - Cal un HEAD" #: git-bisect.sh:167 #, sh-format @@ -14586,12 +14585,12 @@ msgstr "no es bisecarà en un arbre en el qual s'ha fet cg-seek" #: git-bisect.sh:181 msgid "Bad HEAD - strange symbolic ref" -msgstr "HEAD dolent - referència simbòlica estranya" +msgstr "HEAD incorrecte - referència simbòlica estranya" #: git-bisect.sh:233 #, sh-format msgid "Bad bisect_write argument: $state" -msgstr "Paràmetre bisect_write dolent: $state" +msgstr "Paràmetre bisect_write incorrecte: $state" #: git-bisect.sh:262 #, sh-format @@ -14709,7 +14708,7 @@ msgstr "pas de bisecció reeixit" #: git-bisect.sh:565 msgid "please use two different terms" -msgstr "si us plau, useu dos termes distintes" +msgstr "useu dos termes distintes" #: git-bisect.sh:575 #, sh-format @@ -14795,11 +14794,11 @@ msgid "" "abort\"." msgstr "" "Resolgueu tots els conflictes manualment, marqueu-los com a resolts amb\n" -"\"git add/rm <fitxers amb conflicte>\", llavors executeu \"git rebase --" -"continue\".\n" -"Podeu en comptes ometre aquesta comissió: executeu \"git rebase --skip\".\n" -"Per a avortar i tornar a l'estat anterior abans de l'ordre \"git rebase\", " -"executeu \"git rebase --abort\"." +"«git add/rm <fitxers amb conflicte>», llavors executeu «git rebase --" +"continue».\n" +"Podeu en comptes ometre aquesta comissió: executeu «git rebase --skip».\n" +"Per a avortar i tornar a l'estat anterior abans de l'ordre «git rebase», " +"executeu «git rebase --abort»." #: git-rebase.sh:160 git-rebase.sh:402 #, sh-format @@ -14857,9 +14856,9 @@ msgid "" msgstr "" "Sembla que ja hi ha un directori $state_dir_base, i\n" "em pregunto si esteu enmig d'un altre «rebase». Si aquest és el\n" -"cas, si us plau, proveu\n" +"cas, proveu\n" "\t$cmd_live_rebase\n" -"Si no és el cas, si us plau,\n" +"Si no és el cas, \n" "\t$cmd_clear_stale_rebase\n" "i executeu-me de nou. M'aturo per si encara hi teniu alguna cosa\n" "de valor." @@ -14900,7 +14899,7 @@ msgstr "S'ha creat un magatzem automàtic: $stash_abbrev" #: git-rebase.sh:581 msgid "Please commit or stash them." -msgstr "Si us plau, cometeu-los o emmagatzemeu-los." +msgstr "Cometeu-los o emmagatzemeu-los." #: git-rebase.sh:601 #, sh-format @@ -14941,7 +14940,7 @@ msgstr "No es pot desar l'estat d'índex actual" #: git-stash.sh:132 msgid "Cannot save the untracked files" -msgstr "No es pot desar els fitxers no seguits" +msgstr "No es poden desar els fitxers no seguits" #: git-stash.sh:152 git-stash.sh:165 msgid "Cannot save the current worktree state" @@ -15055,7 +15054,7 @@ msgstr "No s'ha pogut desar l'arbre d'índex" #: git-stash.sh:587 msgid "Could not restore untracked files from stash entry" -msgstr "No s'ha pogut restaurar els fitxers no seguits des del «stash»" +msgstr "No s'han pogut restaurar els fitxers no seguits des del «stash»" #: git-stash.sh:612 msgid "Cannot unstage modified files" @@ -15575,7 +15574,7 @@ msgstr "Ordre desconeguda: $command $sha1 $rest" #: git-rebase--interactive.sh:669 msgid "Please fix this using 'git rebase --edit-todo'." -msgstr "Si us plau, arregleu això usant 'git rebase --edit-todo'." +msgstr "Corregiu-ho usant «git rebase --edit-todo»." #: git-rebase--interactive.sh:704 #, sh-format @@ -15632,12 +15631,12 @@ msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." msgstr "" -"Teniu canvis no comesos en el vostre arbre de treball. Si us plau,\n" -"primer cometeu-los i després executeu 'git rebase --continue' de nou." +"Teniu canvis no comesos en el vostre arbre de treball. \n" +"Primer cometeu-los i després executeu «git rebase --continue» de nou." #: git-rebase--interactive.sh:816 git-rebase--interactive.sh:820 msgid "Could not commit staged changes." -msgstr "No s'ha pogut cometre els canvis «staged»." +msgstr "No s'han pogut cometre els canvis «staged»." #: git-rebase--interactive.sh:848 msgid "" @@ -15677,7 +15676,7 @@ msgstr "No s'ha pogut marcar com a interactiu" #: git-rebase--interactive.sh:887 git-rebase--interactive.sh:892 msgid "Could not init rewritten commits" -msgstr "No s'ha pogut iniciar les comissions reescrites" +msgstr "No s'han pogut iniciar les comissions reescrites" #: git-rebase--interactive.sh:993 #, sh-format @@ -15723,7 +15722,7 @@ msgstr "No es pot fer «rebase»: teniu canvis «unstaged»." #: git-sh-setup.sh:223 msgid "Cannot rewrite branches: You have unstaged changes." -msgstr "No es pot reescriure branques: Teniu canvis «unstaged»." +msgstr "No es poden reescriure branques: Teniu canvis «unstaged»." #: git-sh-setup.sh:226 msgid "Cannot pull with rebase: You have unstaged changes." @@ -16056,7 +16055,7 @@ msgstr "Els trossos seleccionats no apliquen a l'índex\n" #: git-add--interactive.perl:1220 msgid "Apply them to the worktree anyway? " -msgstr "Voleu aplicar-los igualment a l'arbre de treball" +msgstr "Voleu aplicar-los igualment a l'arbre de treball? " #: git-add--interactive.perl:1223 msgid "Nothing was applied.\n" @@ -16102,7 +16101,7 @@ msgstr "Canvia el mode de «stash» [y,n,q,a,d,/%s,?]? " #: git-add--interactive.perl:1311 #, perl-format msgid "Stash deletion [y,n,q,a,d,/%s,?]? " -msgstr "Suprimeix «stage» [y,n,q,a,d,/%s,?]? " +msgstr "Suprimeix «stash» [y,n,q,a,d,/%s,?]? " #: git-add--interactive.perl:1312 #, perl-format @@ -16153,7 +16152,7 @@ msgstr "Descarta l'esborrat des de l'arbre de treball [y,n,q,a,d,/%s,?]? " #: git-add--interactive.perl:1327 #, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? " -msgstr "Descarta aquest tros des de l'arbre de treball [y,n,q,a,d,/%s,?]?" +msgstr "Descarta aquest tros des de l'arbre de treball [y,n,q,a,d,/%s,?]?" #: git-add--interactive.perl:1330 #, perl-format @@ -16192,11 +16191,11 @@ msgstr "Aplica aquest tros a l'índex i l'arbre de treball [y,n,q,a,d,/%s,?]? " #: git-add--interactive.perl:1440 msgid "go to which hunk (<ret> to see more)? " -msgstr "vés a quin tros (<ret> per veure'n més)? " +msgstr "ves a quin tros (<ret> per veure'n més)? " #: git-add--interactive.perl:1442 msgid "go to which hunk? " -msgstr "vés a quin tros? " +msgstr "ves a quin tros? " #: git-add--interactive.perl:1451 #, perl-format @@ -16356,7 +16355,7 @@ msgstr "" #: git-send-email.perl:616 #, perl-format msgid "Failed to opendir %s: %s" -msgstr "S'ha produït un error a l'obrir el directori %s: %s" +msgstr "S'ha produït un error en obrir el directori %s: %s" #: git-send-email.perl:640 #, perl-format @@ -16445,7 +16444,6 @@ msgid "" "has the template subject '*** SUBJECT HERE ***'. Pass --force if you really " "want to send.\n" msgstr "" - "S'ha refusat a enviar perquè el pedaç\n" "\t%s\n" "perquè la plantilla té l'assumpte '*** SUBJECT HERE ***'. Passeu --force si realment " @@ -16477,7 +16475,7 @@ msgstr "error: no s'ha pogut extreure una adreça vàlida de: %s\n" #. at this point. #: git-send-email.perl:939 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " -msgstr "Què fer amb aquesta adreça? ([q]surt|[d]escarta|[e]dita): " +msgstr "Què cal fer amb aquesta adreça? ([q]surt|[d]escarta|[e]dita): " #: git-send-email.perl:1260 #, perl-format @@ -16497,7 +16495,7 @@ msgid "" " run 'git config --global sendemail.confirm auto'.\n" "\n" msgstr "" -" La llista de Cc de sobre s'ha estès amb adreces addicionals\n" +" La llista de Cc de sobre s'ha ampliat amb adreces addicionals\n" " trobades al missatge de la comissió del pedaç. Per defecte, \n" " send-email pregunta abans d'enviar el missatge quan això succeeix.\n" " Aquest comportament està controlat pel paràmetre de configuració\n" @@ -16517,7 +16515,7 @@ msgstr "Voleu enviar aquest correu electrònic? ([y]sí|[n]o|[q]surt|[a]tot): " #: git-send-email.perl:1353 msgid "Send this email reply required" -msgstr "Requereix contestació a l'enviar correu" +msgstr "Requereix resposta en enviar el correu" #: git-send-email.perl:1379 msgid "The required SMTP server is not properly defined." @@ -16588,7 +16586,7 @@ msgstr "(mbox) S'està afegint a: %s des de la línia «%s»\n" #: git-send-email.perl:1597 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" -msgstr "(mbox) S'està afegint cc: %s des de la línia «%s»\n" +msgstr "(no mbox) S'està afegint cc: %s des de la línia «%s»\n" #: git-send-email.perl:1622 #, perl-format @@ -16616,7 +16614,7 @@ msgstr "no es pot enviar el missatge en 7 bits" #: git-send-email.perl:1774 msgid "invalid transfer encoding" -msgstr "codificació de transferència invàlida" +msgstr "codificació de transferència no vàlida" #: git-send-email.perl:1812 git-send-email.perl:1863 git-send-email.perl:1873 #, perl-format @@ -2925,7 +2925,7 @@ msgstr " (benutzen Sie \"git branch --unset-upstream\" zum Beheben)\n" #: remote.c:2083 #, c-format msgid "Your branch is up to date with '%s'.\n" -msgstr "Ihr Branch ist auf dem selben Stand wie '%s'.\n" +msgstr "Ihr Branch ist auf demselben Stand wie '%s'.\n" #: remote.c:2087 #, c-format @@ -10874,7 +10874,7 @@ msgstr "Kann nicht überschreiben" #: builtin/mv.c:239 msgid "multiple sources for the same target" -msgstr "mehrere Quellen für das selbe Ziel" +msgstr "mehrere Quellen für dasselbe Ziel" #: builtin/mv.c:241 msgid "destination directory does not exist" @@ -11827,7 +11827,7 @@ msgstr "" "\n" " git push %s HEAD:%s\n" "\n" -"Um auf den Branch mit dem selben Namen im Remote-Repository zu versenden,\n" +"Um auf den Branch mit demselben Namen im Remote-Repository zu versenden,\n" "benutzen Sie:\n" "\n" " git push %s %s\n" @@ -1,5 +1,5 @@ # Spanish translations for Git. -# Copyright (C) 2017 Christopher Diaz Riveros <christopher.diaz.riv@gmail.com> +# Copyright (C) 2018 Christopher Diaz Riveros <christopher.diaz.riv@gmail.com> # This file is distributed under the same license as the Git package. # Christopher Diaz Riveros <christopher.diaz.riv@gmail.com>, 2017. # @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2017-10-17 09:44+0800\n" -"PO-Revision-Date: 2017-10-16 21:15-0500\n" +"POT-Creation-Date: 2017-12-31 10:45+0800\n" +"PO-Revision-Date: 2018-01-04 15:57-0500\n" "Last-Translator: christopher.diaz.riv@gmail.com\n" "Language-Team: CodeLabora <codelabora@gmail.com>\n" "Language: es\n" @@ -16,40 +16,40 @@ 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 1.8.5\n" +"X-Generator: Poedit 1.8.7\n" -#: advice.c:58 +#: advice.c:62 #, c-format msgid "hint: %.*s\n" msgstr "ayuda: %.*s\n" -#: advice.c:86 +#: advice.c:90 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" "No es posible ejecutar cherry-picking porque tienes archivos sin fusionar." -#: advice.c:88 +#: advice.c:92 msgid "Committing is not possible because you have unmerged files." msgstr "No es posible realizar un commit porque tienes archivos sin fusionar." -#: advice.c:90 +#: advice.c:94 msgid "Merging is not possible because you have unmerged files." msgstr "No es posible hacer merge porque tienes archivos sin fusionar." -#: advice.c:92 +#: advice.c:96 msgid "Pulling is not possible because you have unmerged files." msgstr "No es posible hacer pull porque tienes archivos sin fusionar." -#: advice.c:94 +#: advice.c:98 msgid "Reverting is not possible because you have unmerged files." msgstr "No es posible revertir porque tienes archivos sin fusionar." -#: advice.c:96 +#: advice.c:100 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "No es posible %s porque tienes archivos sin fusionar." -#: advice.c:104 +#: advice.c:108 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." @@ -57,23 +57,23 @@ msgstr "" "Corrígelos en el árbol de trabajo y entonces usa 'git add/rm <archivo>',\n" "como sea apropiado, para marcar la resolución y realizar un commit." -#: advice.c:112 +#: advice.c:116 msgid "Exiting because of an unresolved conflict." msgstr "Saliendo porque existe un conflicto sin resolver." -#: advice.c:117 builtin/merge.c:1211 +#: advice.c:121 builtin/merge.c:1213 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "No has concluido tu fusión (MERGE_HEAD existe)." -#: advice.c:119 +#: advice.c:123 msgid "Please, commit your changes before merging." msgstr "Por favor, realiza un commit antes de fusionar." -#: advice.c:120 +#: advice.c:124 msgid "Exiting because of unfinished merge." -msgstr "Saliendo por una fusion inconclusa." +msgstr "Saliendo por una fusión inconclusa." -#: advice.c:126 +#: advice.c:130 #, c-format msgid "" "Note: checking out '%s'.\n" @@ -105,96 +105,96 @@ msgstr "" #: apply.c:58 #, c-format msgid "unrecognized whitespace option '%s'" -msgstr "opcion de espacios en blanco no reconocida '%s'" +msgstr "opción de espacios en blanco no reconocida '%s'" #: apply.c:74 #, c-format msgid "unrecognized whitespace ignore option '%s'" -msgstr "opcion de ignorar espacios en blanco no reconocida '%s'" +msgstr "opción de ignorar espacios en blanco no reconocida '%s'" -#: apply.c:125 +#: apply.c:122 msgid "--reject and --3way cannot be used together." msgstr "--reject y --3way no se pueden utilizar juntas." -#: apply.c:127 +#: apply.c:124 msgid "--cached and --3way cannot be used together." msgstr "--cached y --3way no se pueden utilizar juntas." -#: apply.c:130 +#: apply.c:127 msgid "--3way outside a repository" msgstr "--3way esta fuera de un repositorio" -#: apply.c:141 +#: apply.c:138 msgid "--index outside a repository" msgstr "--index esta fuera de un repositorio" -#: apply.c:144 +#: apply.c:141 msgid "--cached outside a repository" msgstr "--cached esta fuera de un repositorio" -#: apply.c:845 +#: apply.c:821 #, c-format msgid "Cannot prepare timestamp regexp %s" -msgstr "No se puede preparar una marca de tiempo para la expresion regular %s" +msgstr "No se puede preparar una marca de tiempo para la expresión regular %s" -#: apply.c:854 +#: apply.c:830 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec retorno %d para la entrada: %s" -#: apply.c:928 +#: apply.c:904 #, c-format msgid "unable to find filename in patch at line %d" msgstr "" -"no se puede encontrar el nombre del archivo en el parche en la linea %d" +"no se puede encontrar el nombre del archivo en el parche en la línea %d" -#: apply.c:966 +#: apply.c:942 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" -"git apply: mal git-diff - se esperaba /dev/null, se encontro %s en la linea " +"git apply: mal git-diff - se esperaba /dev/null, se encontró %s en la línea " "%d" -#: apply.c:972 +#: apply.c:948 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" -"git apply: mal git-diff - nuevo nombre de archivo inconsistente en la linea " +"git apply: mal git-diff - nuevo nombre de archivo inconsistente en la línea " "%d" -#: apply.c:973 +#: apply.c:949 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" -"git apply: mal git-diff - viejo nombre de archivo inconsistente en la linea " +"git apply: mal git-diff - viejo nombre de archivo inconsistente en la línea " "%d" -#: apply.c:978 +#: apply.c:954 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" -msgstr "git apply: mal git-diff - se esperaba /dev/null en la linea %d" +msgstr "git apply: mal git-diff - se esperaba /dev/null en la línea %d" -#: apply.c:1007 +#: apply.c:983 #, c-format msgid "invalid mode on line %d: %s" -msgstr "modo invalido en la linea %d: %s" +msgstr "modo inválido en la línea %d: %s" -#: apply.c:1325 +#: apply.c:1301 #, c-format msgid "inconsistent header lines %d and %d" -msgstr "header inconsistente en las lineas %d y %d" +msgstr "header inconsistente en las líneas %d y %d" -#: apply.c:1497 +#: apply.c:1473 #, c-format msgid "recount: unexpected line: %.*s" -msgstr "recount: linea inesperada: %.*s" +msgstr "recount: línea inesperada: %.*s" -#: apply.c:1566 +#: apply.c:1542 #, c-format msgid "patch fragment without header at line %d: %.*s" -msgstr "fragmento de parche sin header en la linea %d: %.*s" +msgstr "fragmento de parche sin header en la línea %d: %.*s" -#: apply.c:1586 +#: apply.c:1562 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -203,89 +203,89 @@ msgid_plural "" "git diff header lacks filename information when removing %d leading pathname " "components (line %d)" msgstr[0] "" -"al header de git diff carece de informacion del nombre del archivo %d cuando " -"lo remueve de la ruta principalcomponente (linea %d)" +"al header de git diff carece de información del nombre del archivo %d cuando " +"lo remueve de la ruta principalcomponente (línea %d)" msgstr[1] "" -"los headers de git diff carecen de informacion de los nombres de los " -"archivos %d cuando los remueven de la ruta principalcomponentes (linea %d)" +"los headers de git diff carecen de información de los nombres de los " +"archivos %d cuando los remueven de la ruta principalcomponentes (línea %d)" -#: apply.c:1599 +#: apply.c:1575 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" -"el header de git diff carece de informacion del nombre del archivo (linea %d)" +"el header de git diff carece de información del nombre del archivo (línea %d)" -#: apply.c:1787 +#: apply.c:1763 msgid "new file depends on old contents" msgstr "el nuevo archivo depende de contenidos viejos" -#: apply.c:1789 +#: apply.c:1765 msgid "deleted file still has contents" -msgstr "el archivo eliminado todavia tiene contenido" +msgstr "el archivo eliminado todavía tiene contenido" -#: apply.c:1823 +#: apply.c:1799 #, c-format msgid "corrupt patch at line %d" -msgstr "parche corrupto en la linea %d" +msgstr "parche corrupto en la línea %d" -#: apply.c:1860 +#: apply.c:1836 #, c-format msgid "new file %s depends on old contents" msgstr "nuevo archivo %s depende en contenidos viejos" -#: apply.c:1862 +#: apply.c:1838 #, c-format msgid "deleted file %s still has contents" -msgstr "el archivo borrado %s todavia tiene contenido" +msgstr "el archivo borrado %s todavía tiene contenido" -#: apply.c:1865 +#: apply.c:1841 #, c-format msgid "** warning: file %s becomes empty but is not deleted" -msgstr "** peligro: el archivo %s esta vacio pero no es borrado" +msgstr "** peligro: el archivo %s esta vacío pero no es borrado" -#: apply.c:2012 +#: apply.c:1988 #, c-format msgid "corrupt binary patch at line %d: %.*s" -msgstr "parche binario corrupto en la linea %d: %.*s" +msgstr "parche binario corrupto en la línea %d: %.*s" -#: apply.c:2049 +#: apply.c:2025 #, c-format msgid "unrecognized binary patch at line %d" -msgstr "parche binario no reconocido en la linea %d" +msgstr "parche binario no reconocido en la línea %d" -#: apply.c:2209 +#: apply.c:2185 #, c-format msgid "patch with only garbage at line %d" -msgstr "parche que solo contiene basura en la linea %d" +msgstr "parche que solo contiene basura en la línea %d" -#: apply.c:2295 +#: apply.c:2271 #, c-format msgid "unable to read symlink %s" -msgstr "no es posible leer el symlink %s" +msgstr "no es posible leer el enlace simbólico %s" -#: apply.c:2299 +#: apply.c:2275 #, c-format msgid "unable to open or read %s" msgstr "no es posible abrir o leer %s" -#: apply.c:2958 +#: apply.c:2934 #, c-format msgid "invalid start of line: '%c'" -msgstr "comienzo invalido de linea: '%c'" +msgstr "comienzo invalido de línea: '%c'" -#: apply.c:3077 +#: apply.c:3055 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." -msgstr[0] "Hunk #%d tuvo exito en %d (%d linea compensada)." -msgstr[1] "Hunk #%d tuvo exito en %d (%d lineas compensadas)." +msgstr[0] "Hunk #%d tuvo éxito en %d (%d línea compensada)." +msgstr[1] "Hunk #%d tuvo exito en %d (%d líneas compensadas)." -#: apply.c:3089 +#: apply.c:3067 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Contexto reducido a (%ld/%ld) para aplicar el fragmento en %d" -#: apply.c:3095 +#: apply.c:3073 #, c-format msgid "" "while searching for:\n" @@ -294,23 +294,23 @@ msgstr "" "Mientras se busca:\n" "%.*s" -#: apply.c:3117 +#: apply.c:3095 #, c-format msgid "missing binary patch data for '%s'" msgstr "data perdida en parche binario para '%s'" -#: apply.c:3125 +#: apply.c:3103 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "no se puede revertir-aplicar un parche binario sin el hunk revertido a '%s'" -#: apply.c:3171 +#: apply.c:3149 #, c-format msgid "cannot apply binary patch to '%s' without full index line" -msgstr "no se puede aplcar el parche binario a '%s' sin un indice completo" +msgstr "no se puede aplicar el parche binario a '%s' sin un índice completo" -#: apply.c:3181 +#: apply.c:3159 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -318,437 +318,438 @@ msgstr "" "el parche aplica a '%s' (%s), lo cual no concuerda con los contenidos " "actuales." -#: apply.c:3189 +#: apply.c:3167 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" -msgstr "el parche aplica a un '%s' vacio, pero este no lo esta" +msgstr "el parche aplica a un '%s' vacío, pero este no lo esta" -#: apply.c:3207 +#: apply.c:3185 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "la postimagen necesaria %s para '%s' no se puede leer" -#: apply.c:3220 +#: apply.c:3198 #, c-format msgid "binary patch does not apply to '%s'" msgstr "el parche binario no aplica para '%s'" -#: apply.c:3226 +#: apply.c:3204 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "el parche binario para '%s' crea un resultado incorrecto (saliendo %s, se " "obtuvo %s)" -#: apply.c:3247 +#: apply.c:3225 #, c-format msgid "patch failed: %s:%ld" msgstr "el parche fallo: %s:%ld" -#: apply.c:3369 +#: apply.c:3347 #, c-format msgid "cannot checkout %s" msgstr "no se puede hacer checkout a %s" -#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277 +#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277 #, c-format msgid "failed to read %s" msgstr "no se pudo leer %s" -#: apply.c:3426 +#: apply.c:3404 #, c-format msgid "reading from '%s' beyond a symbolic link" -msgstr "leyendo de '%s' tras un symbolic link" +msgstr "leyendo de '%s' tras un enlace simbólico" -#: apply.c:3455 apply.c:3695 +#: apply.c:3433 apply.c:3673 #, c-format msgid "path %s has been renamed/deleted" msgstr "la ruta %s ha sido renombrada/suprimida" -#: apply.c:3538 apply.c:3709 +#: apply.c:3516 apply.c:3687 #, c-format msgid "%s: does not exist in index" msgstr "%s: no existe en el indice" -#: apply.c:3547 apply.c:3717 +#: apply.c:3525 apply.c:3695 #, c-format msgid "%s: does not match index" msgstr "%s: no concuerda con el indice" -#: apply.c:3582 +#: apply.c:3560 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" "el repositorio carece del blob necesario para regresar en un merge de tres-" "vias" -#: apply.c:3585 +#: apply.c:3563 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Retrocediendo en un merge de tres-vias...\n" -#: apply.c:3601 apply.c:3605 +#: apply.c:3579 apply.c:3583 #, c-format msgid "cannot read the current contents of '%s'" msgstr "no se pueden leer los contenidos actuales de '%s'" -#: apply.c:3617 +#: apply.c:3595 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Fallo el merge en retroceso de tres-vias...\n" -#: apply.c:3631 +#: apply.c:3609 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Parche aplicado a '%s' con conflictos.\n" -#: apply.c:3636 +#: apply.c:3614 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Parche aplicado a '%s' limpiamente\n" -#: apply.c:3662 +#: apply.c:3640 msgid "removal patch leaves file contents" -msgstr "parche de remocion deja contenidos en el archivo" +msgstr "parche de remoción deja contenidos en el archivo" -#: apply.c:3734 +#: apply.c:3712 #, c-format msgid "%s: wrong type" msgstr "%s: tipo incorrecto" -#: apply.c:3736 +#: apply.c:3714 #, c-format msgid "%s has type %o, expected %o" msgstr "%s tiene tipo %o, se esperaba %o" -#: apply.c:3886 apply.c:3888 +#: apply.c:3864 apply.c:3866 #, c-format msgid "invalid path '%s'" msgstr "ruta invalida '%s'" -#: apply.c:3944 +#: apply.c:3922 #, c-format msgid "%s: already exists in index" msgstr "%s: ya existe en el indice" -#: apply.c:3947 +#: apply.c:3925 #, c-format msgid "%s: already exists in working directory" msgstr "%s: ya existe en el directorio de trabajo" -#: apply.c:3967 +#: apply.c:3945 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o)" -#: apply.c:3972 +#: apply.c:3950 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o) de %s" -#: apply.c:3992 +#: apply.c:3970 #, c-format msgid "affected file '%s' is beyond a symbolic link" -msgstr "archivo afectado '%s' esta tras un symbolic link" +msgstr "archivo afectado '%s' esta tras un enlace simbólico" -#: apply.c:3996 +#: apply.c:3974 #, c-format msgid "%s: patch does not apply" msgstr "%s: el parche no aplica" -#: apply.c:4011 +#: apply.c:3989 #, c-format msgid "Checking patch %s..." msgstr "Revisando el parche %s..." -#: apply.c:4102 +#: apply.c:4080 #, c-format msgid "sha1 information is lacking or useless for submodule %s" -msgstr "falta informacion del sha1 o es inutil para el submodulo %s" +msgstr "falta información del sha1 o es inútil para el submodulo %s" -#: apply.c:4109 +#: apply.c:4087 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "modo cambiado para %s, el cual no se encuentra en el HEAD actual" -#: apply.c:4112 +#: apply.c:4090 #, c-format msgid "sha1 information is lacking or useless (%s)." -msgstr "falta informacion sha1 o es inutil (%s)." +msgstr "falta información sha1 o es inútil (%s)." -#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148 +#: apply.c:4095 builtin/checkout.c:236 builtin/reset.c:148 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry fallo para la ruta '%s'" -#: apply.c:4121 +#: apply.c:4099 #, c-format msgid "could not add %s to temporary index" -msgstr "no se pudo anadir %s al indice temporal" +msgstr "no se pudo anadir %s al índice temporal" -#: apply.c:4131 +#: apply.c:4109 #, c-format msgid "could not write temporary index to %s" -msgstr "no se pudo escribir un indice temporal para %s" +msgstr "no se pudo escribir un índice temporal para %s" -#: apply.c:4269 +#: apply.c:4247 #, c-format msgid "unable to remove %s from index" msgstr "no se puede remover %s del indice" -#: apply.c:4304 +#: apply.c:4282 #, c-format msgid "corrupt patch for submodule %s" msgstr "parche corrupto para el submodulo %s" -#: apply.c:4310 +#: apply.c:4288 #, c-format msgid "unable to stat newly created file '%s'" -msgstr "no es posible establecer el archivo recien creado '%s'" +msgstr "no es posible establecer el archivo recién creado '%s'" -#: apply.c:4318 +#: apply.c:4296 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -"no es posible crear una copia de seguridad para el archivo recien creado %s" +"no es posible crear una copia de seguridad para el archivo recién creado %s" -#: apply.c:4324 apply.c:4468 +#: apply.c:4302 apply.c:4446 #, c-format msgid "unable to add cache entry for %s" msgstr "no es posible agregar una entrada en el cache para %s" -#: apply.c:4365 +#: apply.c:4343 #, c-format msgid "failed to write to '%s'" msgstr "fallo escribir para '%s'" -#: apply.c:4369 +#: apply.c:4347 #, c-format msgid "closing file '%s'" msgstr "cerrando archivo '%s'" -#: apply.c:4439 +#: apply.c:4417 #, c-format msgid "unable to write file '%s' mode %o" msgstr "no es posible escribir el archivo '%s' modo %o" -#: apply.c:4537 +#: apply.c:4515 #, c-format msgid "Applied patch %s cleanly." msgstr "Parche %s aplicado limpiamente" -#: apply.c:4545 +#: apply.c:4523 msgid "internal error" msgstr "Error interno" -#: apply.c:4548 +#: apply.c:4526 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Aplicando parche %%s con %d rechazo..." msgstr[1] "Aplicando parche %%s con %d rechazos..." -#: apply.c:4559 +#: apply.c:4537 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "truncando el nombre de archivo .rej a %.*s.rej " -#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010 +#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011 #, c-format msgid "cannot open %s" msgstr "no se puede abrir %s" -#: apply.c:4581 +#: apply.c:4559 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Hunk #%d aplicado limpiamente" -#: apply.c:4585 +#: apply.c:4563 #, c-format msgid "Rejected hunk #%d." msgstr "hunk #%d rechazado" -#: apply.c:4695 +#: apply.c:4673 #, c-format msgid "Skipped patch '%s'." msgstr "Parche '%s' saltado." -#: apply.c:4703 +#: apply.c:4681 msgid "unrecognized input" msgstr "input no reconocido" -#: apply.c:4722 +#: apply.c:4700 msgid "unable to read index file" msgstr "no es posible leer el archivo indice" -#: apply.c:4859 +#: apply.c:4837 #, c-format msgid "can't open patch '%s': %s" msgstr "no se puede abrir el parche '%s': %s" -#: apply.c:4886 +#: apply.c:4864 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "%d error de espacios en blanco aplastado" msgstr[1] "%d errores de espacios en blanco aplastados" -#: apply.c:4892 apply.c:4907 +#: apply.c:4870 apply.c:4885 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." -msgstr[0] "%d linea agrega errores de espacios en blanco." -msgstr[1] "%d lineas agregan erroes de espacios en blanco." +msgstr[0] "%d línea agrega errores de espacios en blanco." +msgstr[1] "%d líneas agregan erroes de espacios en blanco." -#: apply.c:4900 +#: apply.c:4878 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "" -"%d linea aplicada despues de arreglar los errores de espacios en blanco." +"%d línea aplicada después de arreglar los errores de espacios en blanco." msgstr[1] "" -"%d lineas aplicadas despues de arreglar los errores de espacios en blanco." +"%d líneas aplicadas despues de arreglar los errores de espacios en blanco." -#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390 +#: apply.c:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "No es posible escribir el archivo indice" -#: apply.c:4947 apply.c:4950 builtin/am.c:2256 builtin/am.c:2259 -#: builtin/clone.c:116 builtin/fetch.c:115 builtin/pull.c:187 -#: builtin/submodule--helper.c:301 builtin/submodule--helper.c:622 -#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:992 -#: builtin/submodule--helper.c:995 builtin/submodule--helper.c:1212 +#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260 +#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193 +#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860 +#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230 +#: builtin/submodule--helper.c:1233 builtin/submodule--helper.c:1450 #: git-add--interactive.perl:197 msgid "path" msgstr "ruta" -#: apply.c:4948 +#: apply.c:4922 msgid "don't apply changes matching the given path" msgstr "no aplicar cambios que concuerden con la ruta suministrada" -#: apply.c:4951 +#: apply.c:4925 msgid "apply changes matching the given path" msgstr "aplicar cambios que concuerden con la ruta suministrada" -#: apply.c:4953 builtin/am.c:2265 +#: apply.c:4927 builtin/am.c:2266 msgid "num" msgstr "num" -#: apply.c:4954 +#: apply.c:4928 msgid "remove <num> leading slashes from traditional diff paths" msgstr "remover <num> slashes iniciales de las rutas diff tradicionales" -#: apply.c:4957 +#: apply.c:4931 msgid "ignore additions made by the patch" msgstr "ignorar adiciones hechas por el parche" -#: apply.c:4959 +#: apply.c:4933 msgid "instead of applying the patch, output diffstat for the input" -msgstr "en lugar de aplicar elparche, mostrar diffstat para la entrada" +msgstr "en lugar de aplicar el parche, mostrar diffstat para la entrada" -#: apply.c:4963 +#: apply.c:4937 msgid "show number of added and deleted lines in decimal notation" -msgstr "mostrar el numero de lineas agregadas y elminadas en notacion decimal" +msgstr "mostrar el numero de líneas agregadas y eliminadas en notación decimal" -#: apply.c:4965 +#: apply.c:4939 msgid "instead of applying the patch, output a summary for the input" msgstr "en lugar de aplicar el parche, mostrar un resumen para la entrada" -#: apply.c:4967 +#: apply.c:4941 msgid "instead of applying the patch, see if the patch is applicable" msgstr "en lugar de aplicar el parche, ver si el parche es aplicable" -#: apply.c:4969 +#: apply.c:4943 msgid "make sure the patch is applicable to the current index" -msgstr "asegurar que el parche es aplicable al indice actual" +msgstr "asegurar que el parche es aplicable al índice actual" -#: apply.c:4971 +#: apply.c:4945 msgid "apply a patch without touching the working tree" -msgstr "aplicar un parche sin tocar el arbol de trabajo" +msgstr "aplicar un parche sin tocar el árbol de trabajo" -#: apply.c:4973 +#: apply.c:4947 msgid "accept a patch that touches outside the working area" -msgstr "aceptar un parche que toca fuera del area de trabajo" +msgstr "aceptar un parche que toca fuera del área de trabajo" -#: apply.c:4975 +#: apply.c:4949 msgid "also apply the patch (use with --stat/--summary/--check)" -msgstr "tambien aplicar el parche ( usar con --stat/--summary/--check" +msgstr "también aplicar el parche ( usar con --stat/--summary/--check" -#: apply.c:4977 +#: apply.c:4951 msgid "attempt three-way merge if a patch does not apply" msgstr "intentar merge de tres-vias si el parche no aplica" -#: apply.c:4979 +#: apply.c:4953 msgid "build a temporary index based on embedded index information" msgstr "" -"construir un indice temporal basado en la informacion del indice incrustado" +"construir un índice temporal basado en la información del índice incrustado" -#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513 +#: apply.c:4956 builtin/checkout-index.c:168 builtin/ls-files.c:515 msgid "paths are separated with NUL character" -msgstr "rutas estan separadas con un caracter NULL " +msgstr "rutas están separadas con un carácter NULL " -#: apply.c:4984 +#: apply.c:4958 msgid "ensure at least <n> lines of context match" -msgstr "asegure que por lo menos <n> lineas del contexto concuerden" +msgstr "asegure que por lo menos <n> líneas del contexto concuerden" -#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95 +#: apply.c:4959 builtin/am.c:2245 builtin/interpret-trailers.c:95 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99 +#: builtin/pack-objects.c:3009 msgid "action" -msgstr "accion" +msgstr "acción" -#: apply.c:4986 +#: apply.c:4960 msgid "detect new or modified lines that have whitespace errors" msgstr "" -"detectar lineas nuevas o modificadas que contienen errores de espacios en " +"detectar líneas nuevas o modificadas que contienen errores de espacios en " "blanco" -#: apply.c:4989 apply.c:4992 +#: apply.c:4963 apply.c:4966 msgid "ignore changes in whitespace when finding context" msgstr "" "ignorar cambios en los espacios en blanco cuando se encuentra el contexto" -#: apply.c:4995 +#: apply.c:4969 msgid "apply the patch in reverse" msgstr "aplicar el parche en reversa" -#: apply.c:4997 +#: apply.c:4971 msgid "don't expect at least one line of context" -msgstr "no espera al menos una linea del contexto" +msgstr "no espera al menos una línea del contexto" -#: apply.c:4999 +#: apply.c:4973 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "dejar los hunks rechazados en los archivos *.rej correspontientes" -#: apply.c:5001 +#: apply.c:4975 msgid "allow overlapping hunks" msgstr "permitir solapamiento de hunks" -#: apply.c:5002 builtin/add.c:272 builtin/check-ignore.c:21 -#: builtin/commit.c:1347 builtin/count-objects.c:96 builtin/fsck.c:640 -#: builtin/log.c:1889 builtin/mv.c:123 builtin/read-tree.c:125 +#: apply.c:4976 builtin/add.c:292 builtin/check-ignore.c:21 +#: builtin/commit.c:1361 builtin/count-objects.c:96 builtin/fsck.c:640 +#: builtin/log.c:1896 builtin/mv.c:123 builtin/read-tree.c:125 msgid "be verbose" msgstr "ser verboso" -#: apply.c:5004 +#: apply.c:4978 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -"tolerar nuevas lineas faltantes detectadas incorrectamente al final del " +"tolerar nuevas líneas faltantes detectadas incorrectamente al final del " "archivo" -#: apply.c:5007 +#: apply.c:4981 msgid "do not trust the line counts in the hunk headers" -msgstr "no confiar en el conteo de lineas en los headers del hunk" +msgstr "no confiar en el conteo de líneas en los headers del hunk" -#: apply.c:5009 builtin/am.c:2253 +#: apply.c:4983 builtin/am.c:2254 msgid "root" msgstr "raiz" -#: apply.c:5010 +#: apply.c:4984 msgid "prepend <root> to all filenames" msgstr "anteponer <root> a todos los nombres de archivos" #: archive.c:13 msgid "git archive [<options>] <tree-ish> [<path>...]" -msgstr "git archive [<opciones>] <parte-del-arbol> [<ruta>...]" +msgstr "git archive [<opciones>] <parte-del-árbol> [<ruta>...]" #: archive.c:14 msgid "git archive --list" @@ -759,16 +760,16 @@ msgid "" "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" "git archive --remote <repo> [--exec <comando> ] [<opciones>] <parte-del-" -"arbol> [<ruta>...]" +"árbol> [<ruta>...]" #: archive.c:16 msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <repo> [--exec <comando>] --list" -#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299 +#: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" -msgstr "ruta especificada '%s' no concordo con ninguna carpeta" +msgstr "ruta especificada '%s' no concordó con ninguna carpeta" #: archive.c:436 msgid "fmt" @@ -778,7 +779,7 @@ msgstr "fmt" msgid "archive format" msgstr "formato del archivo" -#: archive.c:437 builtin/log.c:1452 +#: archive.c:437 builtin/log.c:1459 msgid "prefix" msgstr "prefijo" @@ -786,9 +787,9 @@ msgstr "prefijo" msgid "prepend prefix to each pathname in the archive" msgstr "anteponer prefijo a cada ruta en el archivo" -#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61 -#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:859 -#: builtin/hash-object.c:102 builtin/ls-files.c:547 builtin/ls-files.c:550 +#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:62 +#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:861 +#: builtin/hash-object.c:102 builtin/ls-files.c:551 builtin/ls-files.c:554 #: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120 #: parse-options.h:153 msgid "file" @@ -823,7 +824,7 @@ msgid "list supported archive formats" msgstr "listar los formatos de carpeta soportados" #: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109 -#: builtin/submodule--helper.c:634 builtin/submodule--helper.c:1001 +#: builtin/submodule--helper.c:872 builtin/submodule--helper.c:1239 msgid "repo" msgstr "repo" @@ -841,15 +842,15 @@ msgstr "ruta para el comando git-upload-archivo remoto " #: archive.c:468 msgid "Unexpected option --remote" -msgstr "opcion inesperada --remote" +msgstr "opción inesperada --remote" #: archive.c:470 msgid "Option --exec can only be used together with --remote" -msgstr "Opcion --exec solo puede ser utilizada con --remote" +msgstr "Opción --exec solo puede ser utilizada con --remote" #: archive.c:472 msgid "Unexpected option --output" -msgstr "Opcion inesperada --output" +msgstr "Opción inesperada --output" #: archive.c:494 #, c-format @@ -859,7 +860,7 @@ msgstr "Formato de carpeta desconocido '%s'" #: archive.c:501 #, c-format msgid "Argument not supported for format '%s': -%d" -msgstr "Argumento no soprtado para formato '%s': -%d" +msgstr "Argumento no soportado para formato '%s': -%d" #: attr.c:218 #, c-format @@ -872,62 +873,62 @@ msgid "" "Use '\\!' for literal leading exclamation." msgstr "" "Los patrones negativos son ignorados en los atributos de git\n" -"Usa '\\!' para comenzar literalmente con exclamacion." +"Usa '\\!' para comenzar literalmente con exclamación." -#: bisect.c:447 +#: bisect.c:458 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Revisa las comillas en el archivo '%s': %s" -#: bisect.c:655 +#: bisect.c:666 #, c-format msgid "We cannot bisect more!\n" msgstr "No podemos bisecar mas!\n" -#: bisect.c:708 +#: bisect.c:720 #, c-format msgid "Not a valid commit name %s" msgstr "No es un nombre de commit valido %s" -#: bisect.c:732 +#: bisect.c:744 #, c-format msgid "" "The merge base %s is bad.\n" "This means the bug has been fixed between %s and [%s].\n" msgstr "" -"La base de fusion %s esta mal.\n" +"La base de fisión %s esta mal.\n" "Esto quiere decir que el bug ha sido arreglado enter %s y [%s].\n" -#: bisect.c:737 +#: bisect.c:749 #, c-format msgid "" "The merge base %s is new.\n" "The property has changed between %s and [%s].\n" msgstr "" -"La base de fusion %s es nueva.\n" +"La base de fisión %s es nueva.\n" "Esta propiedad ha cambiado entre %s y [%s].\n" -#: bisect.c:742 +#: bisect.c:754 #, c-format msgid "" "The merge base %s is %s.\n" "This means the first '%s' commit is between %s and [%s].\n" msgstr "" -"La base de fusion %s es %s.\n" +"La base de fisión %s es %s.\n" "Esto quiere decir que el primer '%s' commit esta entre %s y [%s].\n" -#: bisect.c:750 +#: bisect.c:762 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" "git bisect cannot work properly in this case.\n" "Maybe you mistook %s and %s revs?\n" msgstr "" -"Algunas %s revisiones no son ancestros de la revision %s.\n" +"Algunas %s revisiones no son ancestros de la revisión %s.\n" "git bisect no puede trabajar bien en este caso.\n" -"Tal vez confundio la revision %s y %s?\n" +"Tal vez confundió la revisión %s y %s?\n" -#: bisect.c:763 +#: bisect.c:775 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -938,45 +939,45 @@ msgstr "" "Asi que no podemos estar seguros que el primer %s commit esta entre%s y %s.\n" "Vamos a continuar de todas maneras." -#: bisect.c:798 +#: bisect.c:810 #, c-format msgid "Bisecting: a merge base must be tested\n" -msgstr "Bisectando: una base de fusion debe ser probada\n" +msgstr "Bisectando: una base de fisión debe ser probada\n" -#: bisect.c:850 +#: bisect.c:862 #, c-format msgid "a %s revision is needed" -msgstr "una %s revision es necesaria" +msgstr "una %s revisión es necesaria" -#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234 +#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234 #, c-format msgid "could not create file '%s'" msgstr "no se pudo crear el archivo '%s'" -#: bisect.c:918 +#: bisect.c:930 #, c-format msgid "could not read file '%s'" msgstr "no se pudo leer el archivo '%s'" -#: bisect.c:948 +#: bisect.c:960 msgid "reading bisect refs failed" msgstr "fallo leer las refs de bisect" -#: bisect.c:968 +#: bisect.c:979 #, c-format msgid "%s was both %s and %s\n" msgstr "%s fue tanto %s como %s\n" -#: bisect.c:976 +#: bisect.c:987 #, c-format msgid "" "No testable commit found.\n" "Maybe you started with bad path parameters?\n" msgstr "" -"No se encontró confirmación que se pueda probar.\n" +"No se encontró commit que se pueda probar.\n" "¿Quizás iniciaste con parámetros de rutas incorrectos?\n" -#: bisect.c:995 +#: bisect.c:1006 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -986,11 +987,11 @@ msgstr[1] "(aproximadamente %d pasos)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1001 +#: bisect.c:1012 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" -msgstr[0] "Bisectando: falta %d revision por probar despues de esto %s\n" +msgstr[0] "Bisectando: falta %d revisión por probar después de esto %s\n" msgstr[1] "Bisectando: faltan %d revisiones por probar despues de esto %s\n" #: blame.c:1757 @@ -1006,12 +1007,12 @@ msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse y --first-parent juntos requieren especificar el ultimo commit" -#: blame.c:1797 bundle.c:169 ref-filter.c:1947 sequencer.c:1168 -#: sequencer.c:2351 builtin/commit.c:1065 builtin/log.c:357 builtin/log.c:911 -#: builtin/log.c:1361 builtin/log.c:1690 builtin/log.c:1938 builtin/merge.c:369 +#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1179 +#: sequencer.c:2367 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918 +#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369 #: builtin/shortlog.c:191 msgid "revision walk setup failed" -msgstr "fallo la configuracion del camino de revision" +msgstr "fallo la configuración del camino de revisión" #: blame.c:1815 msgid "" @@ -1040,7 +1041,7 @@ msgid "" msgstr "" "\n" "Tras arreglar la causa del error puedes intentar arreglar\n" -"la infomacion del rastreo remoto invocando\n" +"la infamación del rastreo remoto invocando\n" "\"git branch --set-upstream-to=%s%s%s\"." #: branch.c:67 @@ -1100,40 +1101,40 @@ msgstr "" #: branch.c:119 msgid "Unable to write upstream branch configuration" -msgstr "No es posible escribir la configuracion de la rama upstream" +msgstr "No es posible escribir la configuración de la rama upstream" #: branch.c:156 #, c-format msgid "Not tracking: ambiguous information for ref %s" -msgstr "No rastreando: informacion ambigua para la referencia %s" +msgstr "No rastreando: información ambigua para la referencia %s" -#: branch.c:185 +#: branch.c:189 #, c-format msgid "'%s' is not a valid branch name." msgstr "'%s' no es un nombre valido de rama." -#: branch.c:190 +#: branch.c:208 #, c-format msgid "A branch named '%s' already exists." msgstr "Una rama llamada '%s' ya existe." -#: branch.c:197 +#: branch.c:213 msgid "Cannot force update the current branch." -msgstr "No se puede forzar la actualizacion de la rama actual." +msgstr "No se puede forzar la actualización de la rama actual." -#: branch.c:217 +#: branch.c:233 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "" -"No se puede configurar el rastreo de informacion; el punto de partida '%s' " +"No se puede configurar el rastreo de información; el punto de partida '%s' " "no es una rama" -#: branch.c:219 +#: branch.c:235 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "la rama de upstream solicitada '%s' no existe" -#: branch.c:221 +#: branch.c:237 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -1154,30 +1155,30 @@ msgstr "" "\"git push -u\" para configurar tu upstream predeterminado cuando realizas " "el push." -#: branch.c:264 +#: branch.c:280 #, c-format msgid "Not a valid object name: '%s'." msgstr "Nombre de objeto no valido: '%s'." -#: branch.c:284 +#: branch.c:300 #, c-format msgid "Ambiguous object name: '%s'." msgstr "Nombre de objeto ambiguo: '%s'." -#: branch.c:289 +#: branch.c:305 #, c-format msgid "Not a valid branch point: '%s'." msgstr "Punto de rama no valido: '%s'." -#: branch.c:343 +#: branch.c:359 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s' ya ha sido marcado en '%s'" -#: branch.c:366 +#: branch.c:382 #, c-format msgid "HEAD of working tree %s is not updated" -msgstr "la HEAD del arbol de trabajo %s no esta actualizada" +msgstr "la HEAD del árbol de trabajo %s no esta actualizada" #: bundle.c:34 #, c-format @@ -1189,16 +1190,15 @@ msgstr "'%s' no se ve como un archivo bundle v2" msgid "unrecognized header: %s%s (%d)" msgstr "header no reconocido %s%s (%d)" -#: bundle.c:88 sequencer.c:1346 sequencer.c:1793 sequencer.c:2500 -#: sequencer.c:2583 sequencer.c:2609 sequencer.c:2687 sequencer.c:2807 -#: sequencer.c:2949 builtin/commit.c:782 +#: bundle.c:88 sequencer.c:1357 sequencer.c:1804 sequencer.c:2631 +#: sequencer.c:2657 sequencer.c:2748 sequencer.c:2850 builtin/commit.c:782 #, c-format msgid "could not open '%s'" msgstr "no se pudo abrir '%s'" #: bundle.c:140 msgid "Repository lacks these prerequisite commits:" -msgstr "Al repositorio le falta estos commits prerequisito:" +msgstr "Al repositorio le falta estos commits prerrequisito:" #: bundle.c:193 #, c-format @@ -1235,7 +1235,7 @@ msgstr "rev-list muerio" msgid "ref '%s' is excluded by the rev-list options" msgstr "referencia '%s' es excluida por las opciones de rev-list" -#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296 +#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296 #, c-format msgid "unrecognized argument: %s" msgstr "argumento no reconocido: %s" @@ -1258,192 +1258,197 @@ msgstr "index-pack murio" msgid "invalid color value: %.*s" msgstr "color inválido: %.*s" -#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465 -#: builtin/am.c:1467 builtin/am.c:2105 +#: commit.c:41 sequencer.c:1611 builtin/am.c:421 builtin/am.c:465 +#: builtin/am.c:1471 builtin/am.c:2106 #, c-format msgid "could not parse %s" -msgstr "no se puede anazliar %s" +msgstr "no se puede analizar %s" #: commit.c:43 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s no es un commit!" -#: commit.c:1517 +#: commit.c:1524 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" "variable i18n.commitencoding to the encoding your project uses.\n" msgstr "" "Peligro: el mensaje del commit no se ajusta a UTF-8.\n" -"Tal vez quiera enmendarlo despues de arreglar el mensaje, o arreglar la\n" -"variable de configuracion i18n.commitencoding para el codificacion que usa " +"Tal vez quiera enmendarlo después de arreglar el mensaje, o arreglar la\n" +"variable de configuración i18n.commitencoding para la codificación que usa " "su proyecto.\n" -#: compat/obstack.c:406 compat/obstack.c:408 +#: compat/obstack.c:405 compat/obstack.c:407 msgid "memory exhausted" msgstr "memoria agotada" -#: config.c:187 +#: config.c:186 msgid "relative config include conditionals must come from files" msgstr "" -"la configuracion relativa incluye condicionales que deben venir de archivos" +"la configuración relativa incluye condicionales que deben venir de archivos" -#: config.c:721 +#: config.c:720 #, c-format msgid "bad config line %d in blob %s" -msgstr "mala linea de config %d en el blob %s" +msgstr "mala línea de config %d en el blob %s" -#: config.c:725 +#: config.c:724 #, c-format msgid "bad config line %d in file %s" -msgstr "mala linea de config %d en el archivo %s" +msgstr "mala línea de config %d en el archivo %s" -#: config.c:729 +#: config.c:728 #, c-format msgid "bad config line %d in standard input" -msgstr "mala linea de config %d en la entrada standard" +msgstr "mala línea de config %d en la entrada standard" -#: config.c:733 +#: config.c:732 #, c-format msgid "bad config line %d in submodule-blob %s" -msgstr "mala linea de config %d en el submodulo-blob %s" +msgstr "mala línea de config %d en el submodulo-blob %s" -#: config.c:737 +#: config.c:736 #, c-format msgid "bad config line %d in command line %s" -msgstr "mala linea de config %d en la linea de comando %s" +msgstr "mala línea de config %d en la línea de comando %s" -#: config.c:741 +#: config.c:740 #, c-format msgid "bad config line %d in %s" -msgstr "mala linea de config %d en %s" +msgstr "mala línea de config %d en %s" -#: config.c:869 +#: config.c:868 msgid "out of range" msgstr "fuera de rango" -#: config.c:869 +#: config.c:868 msgid "invalid unit" msgstr "unidad invalida" -#: config.c:875 +#: config.c:874 #, c-format msgid "bad numeric config value '%s' for '%s': %s" -msgstr "mal valor de config numerica '%s' para '%s': %s" +msgstr "mal valor de config numérica '%s' para '%s': %s" -#: config.c:880 +#: config.c:879 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" -msgstr "mal valor de config numerica '%s' para '%s' en el blob %s: %s" +msgstr "mal valor de config numérica '%s' para '%s' en el blob %s: %s" -#: config.c:883 +#: config.c:882 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" -msgstr "mal valor de config numerica '%s' para '%s' en el archivo %s: %s" +msgstr "mal valor de config numérica '%s' para '%s' en el archivo %s: %s" -#: config.c:886 +#: config.c:885 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" -msgstr "mal valor de config numerica '%s' para '%s' en la entrada standard: %s" +msgstr "mal valor de config numérica '%s' para '%s' en la entrada standard: %s" -#: config.c:889 +#: config.c:888 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" -"mal valor de config numerica '%s' para '%s' en el submodulo-blob %s: %s" +"mal valor de config numérica '%s' para '%s' en el submodulo-blob %s: %s" -#: config.c:892 +#: config.c:891 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" -"mal valor de config numerica '%s' para '%s' en la linea de comando %s: %s" +"mal valor de config numérica '%s' para '%s' en la línea de comando %s: %s" -#: config.c:895 +#: config.c:894 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" -msgstr "mal valor de config numerica '%s' para '%s' en %s: %s" +msgstr "mal valor de config numérica '%s' para '%s' en %s: %s" -#: config.c:990 +#: config.c:989 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "fallo al expandir el directorio de usuario en: '%s'" -#: config.c:1085 config.c:1096 +#: config.c:998 +#, c-format +msgid "'%s' for '%s' is not a valid timestamp" +msgstr "'%s' para '%s' no es una marca de tiempo válida" + +#: config.c:1094 config.c:1105 #, c-format msgid "bad zlib compression level %d" -msgstr "mala compresion zlib en nivel %d" +msgstr "mala compresión zlib en nivel %d" -#: config.c:1213 +#: config.c:1222 #, c-format msgid "invalid mode for object creation: %s" -msgstr "modo invalido de creacion de objetos: %s" +msgstr "modo invalido de creación de objetos: %s" -#: config.c:1372 +#: config.c:1378 #, c-format msgid "bad pack compression level %d" -msgstr "mala compresion pack en el nivel %d" +msgstr "mala compresión pack en el nivel %d" -#: config.c:1568 +#: config.c:1574 msgid "unable to parse command-line config" -msgstr "no es posible analizar la configuracion de la linea de comando" +msgstr "no es posible analizar la configuración de la línea de comando" -#: config.c:1900 +#: config.c:1906 msgid "unknown error occurred while reading the configuration files" msgstr "" -"error desconocido ocurrio mientras se leian los archivos de configuracion" +"error desconocido ocurrió mientras se leían los archivos de configuración" -#: config.c:2087 +#: config.c:2093 #, c-format msgid "Invalid %s: '%s'" msgstr "Invalido %s: '%s'" -#: config.c:2130 +#: config.c:2136 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "" "valor core.untrackedCache '%s' desconocido; usando valor por defecto 'keep'" -#: config.c:2156 +#: config.c:2162 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "valor splitIndex.maxPercentChange '%d' debe estar entre 0 y 100" -#: config.c:2167 +#: config.c:2187 #, c-format msgid "unable to parse '%s' from command-line config" -msgstr "no es posible analizar '%s' de la configuracion de la linea de comando" +msgstr "no es posible analizar '%s' de la configuración de la línea de comando" -#: config.c:2169 +#: config.c:2189 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" -msgstr "mala variable de config '%s' en el archivo '%s' en la linea %d" +msgstr "mala variable de config '%s' en el archivo '%s' en la línea %d" -#: config.c:2228 +#: config.c:2248 #, c-format msgid "%s has multiple values" -msgstr "%s tiene multiples valores" +msgstr "%s tiene múltiples valores" -#: config.c:2571 config.c:2789 +#: config.c:2591 config.c:2808 #, c-format msgid "fstat on %s failed" msgstr "fstat en %s fallo" -#: config.c:2678 +#: config.c:2698 #, c-format msgid "could not set '%s' to '%s'" msgstr "no se pudo configurar '%s' a '%s'" -#: config.c:2680 builtin/remote.c:776 +#: config.c:2700 builtin/remote.c:776 #, c-format msgid "could not unset '%s'" msgstr "no se pudo desactivar '%s'" -#: connect.c:50 +#: connect.c:52 msgid "The remote end hung up upon initial contact" -msgstr "El remoto se colgo en el contacto inicial" +msgstr "El remoto se colgó en el contacto inicial" -#: connect.c:52 +#: connect.c:54 msgid "" "Could not read from remote repository.\n" "\n" @@ -1452,7 +1457,7 @@ msgid "" msgstr "" "No se pudo leer del repositorio remoto.\n" "\n" -"Por favor asegurese que tiene los permisos de acceso correctos\n" +"Por favor asegúrese que tiene los permisos de acceso correctos\n" "y que el repositorio existe." #: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141 @@ -1478,7 +1483,8 @@ msgid "" "The file will have its original line endings in your working directory." msgstr "" "CRLF sera remplazado por LF en %s.\n" -"El archivo tendra sus finals de linea originales en tu directorio de trabajo." +"El archivo tendrá sus finales de línea originales en tu directorio de " +"trabajo." #: convert.c:209 #, c-format @@ -1492,7 +1498,7 @@ msgid "" "The file will have its original line endings in your working directory." msgstr "" "LF sera reemplazado por CRLF en %s.\n" -"El archivo tendra sus finales de linea originales en tu directorio de " +"El archivo tendrá sus finales de línea originales en tu directorio de " "trabajo." #: convert.c:219 @@ -1573,14 +1579,14 @@ msgstr[1] "hace %<PRIuMAX> años" msgid "failed to read orderfile '%s'" msgstr "fallo al leer orden de archivos '%s'" -#: diffcore-rename.c:536 +#: diffcore-rename.c:535 msgid "Performing inexact rename detection" -msgstr "Realizando una deteccion de cambios de nombre inexacta" +msgstr "Realizando una detección de cambios de nombre inexacta" #: diff.c:74 #, c-format msgid "option '%s' requires a value" -msgstr "opcion '%s' requiere un valor" +msgstr "opción '%s' requiere un valor" #: diff.c:152 #, c-format @@ -1590,7 +1596,7 @@ msgstr " Fallo al analizar dirstat porcentaje de corte '%s'\n" #: diff.c:157 #, c-format msgid " Unknown dirstat parameter '%s'\n" -msgstr " parametro '%s' de dirstat desconocido\n" +msgstr " parámetro '%s' de dirstat desconocido\n" #: diff.c:281 msgid "" @@ -1605,7 +1611,7 @@ msgstr "" msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "valor para la variable de config 'diff.submodule' desconocido: '%s'" -#: diff.c:398 +#: diff.c:401 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -1614,44 +1620,44 @@ msgstr "" "Errores en la variable de config 'diff.dirstat' encontrados:\n" "%s" -#: diff.c:3861 +#: diff.c:3799 #, c-format msgid "external diff died, stopping at %s" -msgstr "digg externo murio, deteniendo en %s" +msgstr "digg externo murió, deteniendo en %s" -#: diff.c:4189 +#: diff.c:4127 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check y -s son mutuamente exclusivas" -#: diff.c:4279 +#: diff.c:4215 msgid "--follow requires exactly one pathspec" msgstr "--follow requiere exactamente un pathspec" -#: diff.c:4445 +#: diff.c:4381 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -"Fallo al analizar parametro de opcion --dirstat/-X:\n" +"Fallo al analizar parámetro de opción --dirstat/-X:\n" "%s" -#: diff.c:4459 +#: diff.c:4395 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" -msgstr "Fallo al analizar parametro de opcion --submodule: '%s'" +msgstr "Fallo al analizar parámetro de opción --submodule: '%s'" -#: diff.c:5505 +#: diff.c:5446 msgid "inexact rename detection was skipped due to too many files." msgstr "" -"deteccion de cambio de nombre inexacta fue saltada por haber muchos archivos" +"detección de cambio de nombre inexacta fue saltada por haber muchos archivos" -#: diff.c:5508 +#: diff.c:5449 msgid "only found copies from modified paths due to too many files." msgstr "" "solo se encontraron copias de rutas modificadas por haber muchos archivos" -#: diff.c:5511 +#: diff.c:5452 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -1659,29 +1665,34 @@ msgstr "" "tal vez quiera configurar la variable %s para por lo menos %d y volver a " "intentar el comando." -#: dir.c:1983 +#: dir.c:2100 msgid "failed to get kernel name and information" -msgstr "fallo al conseguir la informacion y nombre del kernel" +msgstr "fallo al conseguir la información y nombre del kernel" -#: dir.c:2102 +#: dir.c:2219 msgid "Untracked cache is disabled on this system or location." -msgstr "Untracked cache esta desactivado en este sistema o ubicacion" +msgstr "Untracked cache esta desactivado en este sistema o ubicación" -#: dir.c:2885 dir.c:2890 +#: dir.c:3002 dir.c:3007 #, c-format msgid "could not create directories for %s" msgstr "no se pudo crear directorios para %s" -#: dir.c:2915 +#: dir.c:3032 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "no se pudo migrar el directorio git de '%s' a '%s'" -#: entry.c:176 +#: editor.c:61 +#, c-format +msgid "hint: Waiting for your editor to close the file...%c" +msgstr "ayuda: Esperando que tu editor cierre el archivo ...%c" + +#: entry.c:177 msgid "Filtering content" msgstr "Filtrando contenido" -#: entry.c:433 +#: entry.c:435 #, c-format msgid "could not stat file '%s'" msgstr "no se pudo establecer el archivo '%s'" @@ -1711,7 +1722,7 @@ msgstr "--stateless-rpc requiere multi_ack_detailed" #: fetch-pack.c:422 #, c-format msgid "invalid shallow line: %s" -msgstr "linea poco profunda invalida: %s" +msgstr "línea poco profunda invalida: %s" #: fetch-pack.c:428 #, c-format @@ -1752,7 +1763,7 @@ msgstr "commit inválido %s" msgid "giving up" msgstr "rindiendose" -#: fetch-pack.c:534 progress.c:242 +#: fetch-pack.c:534 progress.c:229 msgid "done" msgstr "listo" @@ -1766,104 +1777,104 @@ msgstr "se obtuvo %s (%d) %s" msgid "Marking %s as complete" msgstr "Marcando %s como completa" -#: fetch-pack.c:776 +#: fetch-pack.c:777 #, c-format msgid "already have %s (%s)" msgstr "ya se tiene %s (%s)" -#: fetch-pack.c:814 +#: fetch-pack.c:815 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: no se puede extraer un demultiplexor de banda lateral" -#: fetch-pack.c:822 +#: fetch-pack.c:823 msgid "protocol error: bad pack header" msgstr "error de protocolo: mal paquete de header" -#: fetch-pack.c:878 +#: fetch-pack.c:879 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: no se puede quitar %s" -#: fetch-pack.c:894 +#: fetch-pack.c:895 #, c-format msgid "%s failed" msgstr "%s fallo" -#: fetch-pack.c:896 +#: fetch-pack.c:897 msgid "error in sideband demultiplexer" msgstr "error en demultiplexor de banda lateral" -#: fetch-pack.c:923 +#: fetch-pack.c:924 msgid "Server does not support shallow clients" msgstr "Servidor no soporta clientes superficiales" -#: fetch-pack.c:927 +#: fetch-pack.c:928 msgid "Server supports multi_ack_detailed" msgstr "Servidor soporta ulti_ack_detailed" -#: fetch-pack.c:930 +#: fetch-pack.c:931 msgid "Server supports no-done" msgstr "Servidor soporta no-done" -#: fetch-pack.c:936 +#: fetch-pack.c:937 msgid "Server supports multi_ack" msgstr "Servidor soporta multi_ack" -#: fetch-pack.c:940 +#: fetch-pack.c:941 msgid "Server supports side-band-64k" msgstr "Servidor soporta side-band-64k" -#: fetch-pack.c:944 +#: fetch-pack.c:945 msgid "Server supports side-band" msgstr "Servidor soporta side-band" -#: fetch-pack.c:948 +#: fetch-pack.c:949 msgid "Server supports allow-tip-sha1-in-want" msgstr "Servidor soporta allow-tip-sha1-in-want" -#: fetch-pack.c:952 +#: fetch-pack.c:953 msgid "Server supports allow-reachable-sha1-in-want" msgstr "Servidor soporta allow-reachable-sha1-in-want" -#: fetch-pack.c:962 +#: fetch-pack.c:963 msgid "Server supports ofs-delta" msgstr "Servidor soporta ofs-delta" -#: fetch-pack.c:969 +#: fetch-pack.c:970 #, c-format msgid "Server version is %.*s" -msgstr "Version de servidor es %.*s" +msgstr "Versión de servidor es %.*s" -#: fetch-pack.c:975 +#: fetch-pack.c:976 msgid "Server does not support --shallow-since" msgstr "Servidor no soporta --shalow-since" -#: fetch-pack.c:979 +#: fetch-pack.c:980 msgid "Server does not support --shallow-exclude" msgstr "Servidor no soporta --shalow-exclude" -#: fetch-pack.c:981 +#: fetch-pack.c:982 msgid "Server does not support --deepen" msgstr "Servidor no soporta --deepen" -#: fetch-pack.c:992 +#: fetch-pack.c:993 msgid "no common commits" msgstr "no hay commits comunes" -#: fetch-pack.c:1004 +#: fetch-pack.c:1005 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: fetch fallo" -#: fetch-pack.c:1166 +#: fetch-pack.c:1167 msgid "no matching remote head" msgstr "no concuerda el head remoto" -#: fetch-pack.c:1188 +#: fetch-pack.c:1189 #, c-format msgid "no such remote ref %s" msgstr "no existe ref remota %s" -#: fetch-pack.c:1191 +#: fetch-pack.c:1192 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Servidor no permite solicitudes de objetos inadvertidos %s" @@ -1886,17 +1897,17 @@ msgstr "fallo al escribir la firma separada para '%s'" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "ignora color invalido '%.*s' en log.graphColors" -#: grep.c:1970 +#: grep.c:2017 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': no es posible leer %s" -#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134 +#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134 #, c-format msgid "failed to stat '%s'" msgstr "fallo al marcar '%s'" -#: grep.c:1998 +#: grep.c:2045 #, c-format msgid "'%s': short read" msgstr "'%s': lectura corta" @@ -1920,12 +1931,12 @@ msgid "" "'%s' appears to be a git command, but we were not\n" "able to execute it. Maybe git-%s is broken?" msgstr "" -"'%s' parece ser un commando de git, pero no hemos\n" +"'%s' parece ser un comando de git, pero no hemos\n" "podido ejecutarlo. Tal vez git-%s se ha roto?" #: help.c:336 msgid "Uh oh. Your system reports no Git commands at all." -msgstr "Oh oh. Tu sistema no reporta ningun comando de Git" +msgstr "Oh oh. Tu sistema no reporta ningún comando de Git" #: help.c:358 #, c-format @@ -1945,7 +1956,7 @@ msgstr "Continuando en %0.1f segundos, asumiendo que tu dijiste '%s'." #: help.c:376 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." -msgstr "git: '%s'no es un commando de git. Mira 'git --help'." +msgstr "git: '%s'no es un comando de git. Mira 'git --help'." #: help.c:380 msgid "" @@ -1963,14 +1974,14 @@ msgstr[1] "" #: help.c:395 msgid "git version [<options>]" -msgstr "git version [<opciones>]" +msgstr "git versión [<opciones>]" -#: help.c:456 +#: help.c:462 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:460 +#: help.c:466 msgid "" "\n" "Did you mean this?" @@ -1999,7 +2010,7 @@ msgid "" "\n" msgstr "" "\n" -"*** Por favor cuentame quien eres.\n" +"*** Por favor cuéntame quien eres.\n" "\n" "Corre\n" "\n" @@ -2012,17 +2023,16 @@ msgstr "" #: ident.c:366 msgid "no email was given and auto-detection is disabled" -msgstr "no se entrego ningun email y la deteccion automatica esta desactivada" +msgstr "no se entrego ningún email y la detección automática esta desactivada" #: ident.c:371 #, c-format msgid "unable to auto-detect email address (got '%s')" -msgstr "no es posible auto-detectar la direccion de correo (se obtuvo '%s')" +msgstr "no es posible auto-detectar la dirección de correo (se obtuvo '%s')" #: ident.c:381 msgid "no name was given and auto-detection is disabled" -msgstr "" -"no se entreogo ningun nombre y la deteccion automatica esta desactivada" +msgstr "no se entrego ningún nombre y la detección automática esta desactivada" #: ident.c:387 #, c-format @@ -2032,7 +2042,7 @@ msgstr "no es posible auto-detectar el nombre (se obtuvo '%s')" #: ident.c:395 #, c-format msgid "empty ident name (for <%s>) not allowed" -msgstr "no se puede tener un nombre vacio (para <%s>)" +msgstr "no se puede tener un nombre vacío (para <%s>)" #: ident.c:401 #, c-format @@ -2044,6 +2054,15 @@ msgstr "el nombre consiste solo de caracteres no permitidos: %s" msgid "invalid date format: %s" msgstr "formato de fecha invalido: %s" +#: list-objects-filter-options.c:30 +msgid "multiple object filter types cannot be combined" +msgstr "no se pueden combinar múltiples tipos de objeto filtro" + +#: list-objects-filter-options.c:41 list-objects-filter-options.c:68 +#, c-format +msgid "invalid filter-spec expression '%s'" +msgstr "expresión filter-spec inválida '%s'" + #: lockfile.c:151 #, c-format msgid "" @@ -2058,9 +2077,9 @@ msgstr "" "No se puede crear '%s.lock': %s.\n" "\n" "Otro proceso git parece estar corriendo en el repositorio, es decir\n" -"un editor abierto con 'git commit'. Por favor asegurese de que todos los " +"un editor abierto con 'git commit'. Por favor asegúrese de que todos los " "procesos\n" -"estan terminados y vuelve a intentar. Si el fallo permanece, un proceso git\n" +"están terminados y vuelve a intentar. Si el fallo permanece, un proceso git\n" "puede haber roto el repositorio antes:\n" "borra el archivo manualmente para continuar." @@ -2073,8 +2092,8 @@ msgstr "No se pudo crear '%s.lock': %s" msgid "failed to read the cache" msgstr "fallo al leer la cache" -#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380 -#: builtin/checkout.c:595 builtin/clone.c:754 +#: merge.c:95 builtin/am.c:1980 builtin/am.c:2014 builtin/checkout.c:379 +#: builtin/checkout.c:600 builtin/clone.c:754 msgid "unable to write new index file" msgstr "no es posible escribir el archivo indice" @@ -2089,7 +2108,7 @@ msgstr "addinfo_cache fallo para la ruta '%s'" #: merge-recursive.c:329 msgid "error building trees" -msgstr "error construyendo arboles" +msgstr "error construyendo árboles" #: merge-recursive.c:752 #, c-format @@ -2128,7 +2147,7 @@ msgstr "fallo al abrir '%s': %s" #: merge-recursive.c:865 #, c-format msgid "failed to symlink '%s': %s" -msgstr "fallo al crear symlink '%s': %s" +msgstr "fallo al crear el enlace simbólico '%s': %s" #: merge-recursive.c:870 #, c-format @@ -2137,7 +2156,7 @@ msgstr "no se que hacer con %06o %s '%s'" #: merge-recursive.c:1010 msgid "Failed to execute internal merge" -msgstr "Fallo al ejectura fusion interna" +msgstr "Fallo al ejecutar la fusión interna" #: merge-recursive.c:1014 #, c-format @@ -2150,8 +2169,8 @@ msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree." msgstr "" -"CONFLICTO (%s/borrar): %s borrado en %s y %s en %s. Falta version %s de %s " -"en el arbol" +"CONFLICTO (%s/borrar): %s borrado en %s y %s en %s. Falta versión %s de %s " +"en el árbol" #: merge-recursive.c:1122 #, c-format @@ -2159,8 +2178,8 @@ msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " "left in tree." msgstr "" -"CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Version %s de %s " -"permanece en el arbol" +"CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s " +"permanece en el árbol" #: merge-recursive.c:1129 #, c-format @@ -2177,8 +2196,8 @@ msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " "left in tree at %s." msgstr "" -"CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Version %s de %s " -"permanece en el arbol en %s." +"CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s " +"permanece en el árbol en %s." #: merge-recursive.c:1168 msgid "rename" @@ -2270,7 +2289,7 @@ msgstr "Saltado %s (fusionado como existente)" msgid "Auto-merging %s" msgstr "Auto-fusionando %s" -#: merge-recursive.c:1775 git-submodule.sh:944 +#: merge-recursive.c:1775 git-submodule.sh:932 msgid "submodule" msgstr "submódulo" @@ -2292,48 +2311,48 @@ msgstr "archivo/directorio" msgid "directory/file" msgstr "directorio/archivo" -#: merge-recursive.c:1908 +#: merge-recursive.c:1909 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "CONFLICTO (%s): Hay un directorio con el nombre %s en %s. Agregando %s como " "%s" -#: merge-recursive.c:1917 +#: merge-recursive.c:1918 #, c-format msgid "Adding %s" msgstr "Agregando %s" -#: merge-recursive.c:1954 +#: merge-recursive.c:1955 msgid "Already up to date!" msgstr "¡Ya está actualizado!" -#: merge-recursive.c:1963 +#: merge-recursive.c:1964 #, c-format msgid "merging of trees %s and %s failed" msgstr "falló la fusión de los árboles %s y %s" -#: merge-recursive.c:2060 +#: merge-recursive.c:2061 msgid "Merging:" msgstr "Fusionando:" -#: merge-recursive.c:2073 +#: merge-recursive.c:2074 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "se encontró %u ancestro común:" msgstr[1] "se encontraron %u ancestros comunes:" -#: merge-recursive.c:2112 +#: merge-recursive.c:2113 msgid "merge returned no commit" -msgstr "la fusión no devolvió ninguna confirmación" +msgstr "la fusión no devolvió ningun commit" -#: merge-recursive.c:2175 +#: merge-recursive.c:2176 #, c-format msgid "Could not parse object '%s'" msgstr "No se pudo analizar el objeto '%s'" -#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814 +#: merge-recursive.c:2190 builtin/merge.c:656 builtin/merge.c:815 msgid "Unable to write index." msgstr "Incapaz de escribir el índice." @@ -2344,20 +2363,20 @@ msgid "" "Please, use 'git notes merge --commit' or 'git notes merge --abort' to " "commit/abort the previous merge before you start a new notes merge." msgstr "" -"No has concluido tus notas previas de fusion (%s existe).\n" +"No has concluido tus notas previas de fusión (%s existe).\n" "Por favor, usa 'git notes merge --commit' o 'git notes merge --abort' para " -"confirmar/abortar la fusion previa antes de que puedas comenzar una nueva " -"nota de fusion." +"confirmar/abortar la fusión previa antes de que puedas comenzar una nueva " +"nota de fusión." #: notes-merge.c:279 #, c-format msgid "You have not concluded your notes merge (%s exists)." -msgstr "No has terminado tus notas de fusion (%s existe)." +msgstr "No has terminado tus notas de fusión (%s existe)." #: notes-utils.c:42 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "" -"No se puede realizar commit, notas del arbol no inicializadas o no " +"No se puede realizar commit, notas del árbol no inicializadas o no " "referenciadas." #: notes-utils.c:101 @@ -2439,15 +2458,15 @@ msgstr "No se pudo hacer que %s fuera escribible por el grupo" #: pathspec.c:129 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "" -"Caracter de escape '\\' no permitido como ultimo caracter en el valor attr" +"Carácter de escape '\\' no permitido como ultimo carácter en el valor attr" #: pathspec.c:147 msgid "Only one 'attr:' specification is allowed." -msgstr "Solo una especificacion 'attr' es permitida." +msgstr "Solo una especificación 'attr' es permitida." #: pathspec.c:150 msgid "attr spec must not be empty" -msgstr "especificacion attr no puede estar vacia" +msgstr "especificación attr no puede estar vacia" #: pathspec.c:193 #, c-format @@ -2506,15 +2525,7 @@ msgstr "'%s' (nemotecnico: '%c')" msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: magic pathspec no soportado por este comando: %s" -#: pathspec.c:571 -msgid "" -"empty strings as pathspecs will be made invalid in upcoming releases. please " -"use . instead if you meant to match all paths" -msgstr "" -"los strings vacíos como pathspecs serán inválidas en las próximas versiones. " -"por favor use . si quería hacer coincidir todas las rutas" - -#: pathspec.c:595 +#: pathspec.c:592 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "el patrón de ruta '%s' está detrás de un enlace simbólico" @@ -2523,7 +2534,7 @@ msgstr "el patrón de ruta '%s' está detrás de un enlace simbólico" msgid "unable to parse --pretty format" msgstr "incapaz de analizar el formato --pretty" -#: read-cache.c:1443 +#: read-cache.c:1472 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -2532,7 +2543,7 @@ msgstr "" "index.version configurado, pero el valor no es válido.\n" "Usando versión %i" -#: read-cache.c:1453 +#: read-cache.c:1482 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -2541,52 +2552,52 @@ msgstr "" "GIT_INDEX_VERSION configurado, pero el valor no es válido.\n" "Usando versión %i" -#: read-cache.c:2316 builtin/merge.c:1046 +#: read-cache.c:2370 sequencer.c:2725 wrapper.c:658 builtin/merge.c:1048 #, c-format msgid "could not close '%s'" msgstr "no se pudo cerrar '%s'" -#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077 +#: read-cache.c:2442 sequencer.c:1366 sequencer.c:2093 #, c-format msgid "could not stat '%s'" msgstr "no se pudo definir '%s'" -#: read-cache.c:2407 +#: read-cache.c:2455 #, c-format msgid "unable to open git dir: %s" msgstr "no es posible abrir el directorio de git: %s" -#: read-cache.c:2419 +#: read-cache.c:2467 #, c-format msgid "unable to unlink: %s" msgstr "no es posible remover el vinculo: %s" -#: refs.c:638 +#: refs.c:706 #, c-format msgid "Could not open '%s' for writing" msgstr "No sepudo abrir '%s' para escritura" -#: refs.c:1792 +#: refs.c:1850 msgid "ref updates forbidden inside quarantine environment" msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena" -#: refs/files-backend.c:1136 +#: refs/files-backend.c:1189 #, c-format msgid "could not remove reference %s" msgstr "no se pudo remover la referencia %s" -#: refs/files-backend.c:1150 refs/packed-backend.c:1430 -#: refs/packed-backend.c:1440 +#: refs/files-backend.c:1203 refs/packed-backend.c:1524 +#: refs/packed-backend.c:1534 #, c-format msgid "could not delete reference %s: %s" msgstr "no se pudo eliminar la referencia %s: %s" -#: refs/files-backend.c:1153 refs/packed-backend.c:1443 +#: refs/files-backend.c:1206 refs/packed-backend.c:1537 #, c-format msgid "could not delete references: %s" msgstr "no se pudo eliminar la referencia: %s" -#: ref-filter.c:35 wt-status.c:1811 +#: ref-filter.c:35 wt-status.c:1816 msgid "gone" msgstr "desaparecido" @@ -2598,164 +2609,164 @@ msgstr "adelante %d" #: ref-filter.c:37 #, c-format msgid "behind %d" -msgstr "detras %d" +msgstr "detrás %d" #: ref-filter.c:38 #, c-format msgid "ahead %d, behind %d" -msgstr "delante %d, detras %d" +msgstr "delante %d, detrás %d" -#: ref-filter.c:105 +#: ref-filter.c:107 #, c-format msgid "expected format: %%(color:<color>)" msgstr "formato esperado: %%(color:<color>)" -#: ref-filter.c:107 +#: ref-filter.c:109 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "color no reconocido: %%(color:%s)" -#: ref-filter.c:127 +#: ref-filter.c:129 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "valor entero esperado refname:lstrip=%s" -#: ref-filter.c:131 +#: ref-filter.c:133 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "valor entero esperado refname:rstrip=%s" -#: ref-filter.c:133 +#: ref-filter.c:135 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "argumento: %s no reconocido %%(%s)" -#: ref-filter.c:173 +#: ref-filter.c:184 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) no toma ningún argumento" -#: ref-filter.c:180 +#: ref-filter.c:191 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) no toma ningún argumento" -#: ref-filter.c:198 +#: ref-filter.c:209 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "%%(trailers) desconocidos, argumento: %s" -#: ref-filter.c:221 +#: ref-filter.c:232 #, c-format msgid "positive value expected contents:lines=%s" msgstr "valor positivo esperado contents:lines=%s" -#: ref-filter.c:223 +#: ref-filter.c:234 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "argumento %s no reconocido %%(contents)" -#: ref-filter.c:236 +#: ref-filter.c:247 #, c-format msgid "positive value expected objectname:short=%s" msgstr "valor positivo esperado objectname:short=%s" -#: ref-filter.c:240 +#: ref-filter.c:251 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "argumento: %s no reconocido %%(objectname)" -#: ref-filter.c:267 +#: ref-filter.c:278 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "formato esperado: %%(align:<ancho>,<posición>)" -#: ref-filter.c:279 +#: ref-filter.c:290 #, c-format msgid "unrecognized position:%s" msgstr "posición desconocida: %s" -#: ref-filter.c:283 +#: ref-filter.c:294 #, c-format msgid "unrecognized width:%s" msgstr "ancho desconocido: %s" -#: ref-filter.c:289 +#: ref-filter.c:300 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "argumento no reconocido para %%(align): %s" -#: ref-filter.c:293 +#: ref-filter.c:304 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "se esperaba un ancho positivo con el átomo %%(align)" -#: ref-filter.c:308 +#: ref-filter.c:319 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "argumento: %s no reconocido %%(if)" -#: ref-filter.c:398 +#: ref-filter.c:409 #, c-format msgid "malformed field name: %.*s" msgstr "nombre malformado de campo: %.*s" -#: ref-filter.c:424 +#: ref-filter.c:435 #, c-format msgid "unknown field name: %.*s" msgstr "nombre de campo desconocido: %.*s" -#: ref-filter.c:536 +#: ref-filter.c:547 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" -msgstr "formato: atomo %%(if) usado sin un atomo %%(then)" +msgstr "formato: átomo %%(if) usado sin un átomo %%(then)" -#: ref-filter.c:596 +#: ref-filter.c:607 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" -msgstr "formato: atomo %%(then) usado sin atomo %%(if)" +msgstr "formato: átomo %%(then) usado sin átomo %%(if)" -#: ref-filter.c:598 +#: ref-filter.c:609 #, c-format msgid "format: %%(then) atom used more than once" -msgstr "formato: atomo %%(then) usado mas de una vez" +msgstr "formato: átomo %%(then) usado mas de una vez" -#: ref-filter.c:600 +#: ref-filter.c:611 #, c-format msgid "format: %%(then) atom used after %%(else)" -msgstr "formato: atomo %%(then) usado despues de %%(else)" +msgstr "formato: átomo %%(then) usado después de %%(else)" -#: ref-filter.c:626 +#: ref-filter.c:637 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" -msgstr "formato: atomo %%(else) usado sin un atomo %%(if)" +msgstr "formato: átomo %%(else) usado sin un átomo %%(if)" -#: ref-filter.c:628 +#: ref-filter.c:639 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" -msgstr "formato: atomo %%(else) usado sin un atomo %%(then) " +msgstr "formato: átomo %%(else) usado sin un átomo %%(then) " -#: ref-filter.c:630 +#: ref-filter.c:641 #, c-format msgid "format: %%(else) atom used more than once" -msgstr "formato: atomo %%(else) usado mas de una vez" +msgstr "formato: átomo %%(else) usado mas de una vez" -#: ref-filter.c:643 +#: ref-filter.c:654 #, c-format msgid "format: %%(end) atom used without corresponding atom" -msgstr "formato: atomo %%(end) usado sin atomo correspondiente" +msgstr "formato: átomo %%(end) usado sin átomo correspondiente" -#: ref-filter.c:698 +#: ref-filter.c:709 #, c-format msgid "malformed format string %s" msgstr "formato de cadena malformado %s" -#: ref-filter.c:1283 +#: ref-filter.c:1313 #, c-format msgid "(no branch, rebasing %s)" msgstr "(no hay rama, rebasando %s)" -#: ref-filter.c:1286 +#: ref-filter.c:1316 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(no hay rama, comenzando bisectado en %s)" @@ -2763,162 +2774,160 @@ msgstr "(no hay rama, comenzando bisectado en %s)" #. TRANSLATORS: make sure this matches "HEAD #. detached at " in wt-status.c #. -#: ref-filter.c:1294 +#: ref-filter.c:1324 #, c-format msgid "(HEAD detached at %s)" -msgstr "(HEAD desascoplado en %s)" +msgstr "(HEAD desacoplado en %s)" #. TRANSLATORS: make sure this matches "HEAD #. detached from " in wt-status.c #. -#: ref-filter.c:1301 +#: ref-filter.c:1331 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD desacoplado de %s)" -#: ref-filter.c:1305 +#: ref-filter.c:1335 msgid "(no branch)" msgstr "(sin rama)" -#: ref-filter.c:1454 ref-filter.c:1485 +#: ref-filter.c:1488 ref-filter.c:1519 #, c-format msgid "missing object %s for %s" msgstr "objeto %s faltante para %s" -#: ref-filter.c:1457 ref-filter.c:1488 +#: ref-filter.c:1491 ref-filter.c:1522 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer falló en %s para %s" -#: ref-filter.c:1788 +#: ref-filter.c:1822 #, c-format msgid "malformed object at '%s'" msgstr "objeto malformado en '%s'" -#: ref-filter.c:1855 +#: ref-filter.c:1889 #, c-format msgid "ignoring ref with broken name %s" msgstr "ignorando referencia con nombre roto %s" -#: ref-filter.c:1860 +#: ref-filter.c:1894 #, c-format msgid "ignoring broken ref %s" msgstr "ignorando referencia rota %s" -#: ref-filter.c:2122 +#: ref-filter.c:2156 #, c-format msgid "format: %%(end) atom missing" -msgstr "formato: falta atomo %%(end)" +msgstr "formato: falta átomo %%(end)" -#: ref-filter.c:2216 +#: ref-filter.c:2250 #, c-format msgid "malformed object name %s" msgstr "nombre de objeto malformado %s" -#: remote.c:750 +#: remote.c:780 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "No se pueden traer ambos %s y %s a %s" -#: remote.c:754 +#: remote.c:784 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s por lo general hace seguimiento a %s, no a %s" -#: remote.c:758 +#: remote.c:788 #, c-format msgid "%s tracks both %s and %s" msgstr "%s hace seguimiento tanto a %s como a %s" -#: remote.c:766 +#: remote.c:796 msgid "Internal error" msgstr "Error interno" -#: remote.c:1681 remote.c:1783 +#: remote.c:1711 remote.c:1813 msgid "HEAD does not point to a branch" msgstr "HEAD no apunta a ninguna rama" -#: remote.c:1690 +#: remote.c:1720 #, c-format msgid "no such branch: '%s'" msgstr "no existe tal rama: '%s'" -#: remote.c:1693 +#: remote.c:1723 #, c-format msgid "no upstream configured for branch '%s'" msgstr "no se ha configurado upstream para la rama '%s'" -#: remote.c:1699 +#: remote.c:1729 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "la rama '%s' de upstream no es guardad como rama de rastreo remoto" -#: remote.c:1714 +#: remote.c:1744 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "destino de push '%s' en el remoto '%s' no tiene una rama de rastreo local" -#: remote.c:1726 +#: remote.c:1756 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "la rama '%s' no tiene remoto para enviar" -#: remote.c:1737 +#: remote.c:1767 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "refspecs del push para '%s' no incluyen '%s'" -#: remote.c:1750 +#: remote.c:1780 msgid "push has no destination (push.default is 'nothing')" msgstr "push no tiene destino (push.default es 'nada')" -#: remote.c:1772 +#: remote.c:1802 msgid "cannot resolve 'simple' push to a single destination" msgstr "no se puede resolver push 'simple' para un destino unico" -#: remote.c:2076 +#: remote.c:2106 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "tu rama esta basada en '%s', pero upstream ha desaparecido.\n" -#: remote.c:2080 +#: remote.c:2110 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (usa \"git branch --unset-upstream\" para arreglar)\n" -#: remote.c:2083 +#: remote.c:2113 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Tu rama está actualizada con '%s'.\n" -#: remote.c:2087 +#: remote.c:2117 #, 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] "Tu rama está adelantada a '%s' por %d confirmación.\n" -msgstr[1] "Tu rama está adelantada a '%s' por %d confirmaciones.\n" +msgstr[0] "Tu rama está adelantada a '%s' por %d commit.\n" +msgstr[1] "Tu rama está adelantada a '%s' por %d commits.\n" -#: remote.c:2093 +#: remote.c:2123 msgid " (use \"git push\" to publish your local commits)\n" -msgstr " (usa \"git push\" para publicar tus confirmaciones locales)\n" +msgstr " (usa \"git push\" para publicar tus commits locales)\n" -#: remote.c:2096 +#: remote.c:2126 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" msgstr[0] "" -"Tu rama está detrás de '%s' por %d confirmación, y puede ser avanzada " -"rápido.\n" +"Tu rama está detrás de '%s' por %d commit, y puede ser avanzada rápido.\n" msgstr[1] "" -"Tu rama está detrás de '%s' por %d confirmaciones, y puede ser avanzada " -"rápido.\n" +"Tu rama está detrás de '%s' por %d commits, y puede ser avanzada rápido.\n" -#: remote.c:2104 +#: remote.c:2134 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (usa \"git pull\" para actualizar tu rama local)\n" -#: remote.c:2107 +#: remote.c:2137 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -2933,27 +2942,37 @@ msgstr[1] "" "Tu rama y '%s' han divergido,\n" "y tienen %d y %d commits diferentes cada una respectivamente.\n" -#: remote.c:2117 +#: remote.c:2147 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (usa \"git pull\" para fusionar la rama remota en la tuya)\n" -#: revision.c:2256 +#: revision.c:2268 msgid "your current branch appears to be broken" msgstr "tu rama actual parece estar rota" -#: revision.c:2259 +#: revision.c:2271 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "tu rama actual '%s' no tiene ningún commit todavía" -#: revision.c:2453 +#: revision.c:2465 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent es incompatible con --bisect" -#: run-command.c:644 +#: run-command.c:645 msgid "open /dev/null failed" msgstr "falló al abrir /dev/null" +#: run-command.c:1188 +#, c-format +msgid "" +"The '%s' hook was ignored because it's not set as executable.\n" +"You can disable this warning with `git config advice.ignoredHook false`." +msgstr "" +"El hook '%s' fue ifnorado porque no ha sido configurado como ejecutable.\n" +"Puedes desactivar esta advertencias con `git config advice.ignoredHook " +"false`." + #: send-pack.c:151 #, c-format msgid "unable to parse remote unpack status: %s" @@ -3003,7 +3022,7 @@ msgstr "rebase -i" #: sequencer.c:224 #, c-format msgid "Unknown action: %d" -msgstr "Accion desconocida: %d" +msgstr "Acción desconocida: %d" #: sequencer.c:281 msgid "" @@ -3023,13 +3042,13 @@ msgstr "" "con 'git add <rutas>' o 'git rm <rutas>'\n" "y haz un commit del resultado con 'git commit'" -#: sequencer.c:297 sequencer.c:1704 +#: sequencer.c:297 sequencer.c:1715 #, c-format msgid "could not lock '%s'" msgstr "No se pudo bloquear '%s'" -#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723 -#: sequencer.c:2733 sequencer.c:2749 +#: sequencer.c:300 sequencer.c:1592 sequencer.c:1720 sequencer.c:1734 +#: sequencer.c:2723 sequencer.c:2794 wrapper.c:656 #, c-format msgid "could not write to '%s'" msgstr "No se pudo escribir en '%s'" @@ -3039,13 +3058,13 @@ msgstr "No se pudo escribir en '%s'" msgid "could not write eol to '%s'" msgstr "No se pudo escribir EOL en '%s'" -#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711 +#: sequencer.c:308 sequencer.c:1597 sequencer.c:1722 #, c-format msgid "failed to finalize '%s'." msgstr "Fallo al finalizar '%s'." -#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259 -#: builtin/commit.c:754 builtin/merge.c:1044 +#: sequencer.c:332 sequencer.c:829 sequencer.c:1618 builtin/am.c:259 +#: builtin/commit.c:754 builtin/merge.c:1046 #, c-format msgid "could not read '%s'" msgstr "No se pudo leer '%s'" @@ -3053,7 +3072,7 @@ msgstr "No se pudo leer '%s'" #: sequencer.c:358 #, c-format msgid "your local changes would be overwritten by %s." -msgstr "Tus cambios locales seran sobreescritos por %s." +msgstr "Tus cambios locales serán sobreescritos por %s." #: sequencer.c:362 msgid "commit your changes or stash them to proceed." @@ -3067,20 +3086,20 @@ msgstr "%s: avance rápido" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:474 +#: sequencer.c:477 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Incapaz de escribir el nuevo archivo índice" -#: sequencer.c:493 +#: sequencer.c:496 msgid "could not resolve HEAD commit\n" msgstr "No se pudo resolver el commit de HEAD\n" -#: sequencer.c:513 +#: sequencer.c:516 msgid "unable to update cache tree\n" msgstr "no es posible actualizar el árbol de la caché\n" -#: sequencer.c:597 +#: sequencer.c:600 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -3096,13 +3115,13 @@ msgid "" "\n" " git rebase --continue\n" msgstr "" -"se ha aplicado un stage a los cambios en el arbol de trabajo\n" -"si estos cambios estan destinados a ser aplastados en el commit previo, " +"se ha aplicado un stage a los cambios en el árbol de trabajo\n" +"si estos cambios están destinados a ser aplastados en el commit previo, " "ejecuta:\n" "\n" " git commit --amend %s\n" "\n" -"Si estos cambios estan destinados a un nuevo commit, ejecuta:\n" +"Si estos cambios están destinados a un nuevo commit, ejecuta:\n" "\n" " git commit %s\n" "\n" @@ -3110,17 +3129,17 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:699 +#: sequencer.c:702 #, c-format msgid "could not parse commit %s\n" msgstr "No se pudo analizar commit %s.\n" -#: sequencer.c:704 +#: sequencer.c:707 #, c-format msgid "could not parse parent commit %s\n" msgstr "No se pudo analizar el commit padre %s\n" -#: sequencer.c:826 +#: sequencer.c:836 #, c-format msgid "" "unexpected 1st line of squash message:\n" @@ -3131,7 +3150,7 @@ msgstr "" "\n" "\t%.*s" -#: sequencer.c:832 +#: sequencer.c:842 #, c-format msgid "" "invalid 1st line of squash message:\n" @@ -3142,230 +3161,230 @@ msgstr "" "\n" "\t%.*s" -#: sequencer.c:838 sequencer.c:863 +#: sequencer.c:848 sequencer.c:873 #, c-format msgid "This is a combination of %d commits." -msgstr "Esta es una combinacion de %d commits." +msgstr "Esta es una combinación de %d commits." -#: sequencer.c:847 sequencer.c:2681 +#: sequencer.c:857 sequencer.c:2742 msgid "need a HEAD to fixup" msgstr "se necesita un HEAD para arreglar" -#: sequencer.c:849 +#: sequencer.c:859 msgid "could not read HEAD" msgstr "no se pudo leer HEAD" -#: sequencer.c:851 +#: sequencer.c:861 msgid "could not read HEAD's commit message" msgstr "no se pudo leer el mensaje de commit de HEAD" -#: sequencer.c:857 +#: sequencer.c:867 #, c-format msgid "cannot write '%s'" msgstr "no se puede escribir '%s'" -#: sequencer.c:866 git-rebase--interactive.sh:446 +#: sequencer.c:876 git-rebase--interactive.sh:446 msgid "This is the 1st commit message:" -msgstr "Este es el mensaje de la 1ra confirmación:" +msgstr "Este es el mensaje del 1er commit:" -#: sequencer.c:874 +#: sequencer.c:884 #, c-format msgid "could not read commit message of %s" msgstr "no se puede leer el mensaje del commit de %s" -#: sequencer.c:881 +#: sequencer.c:891 #, c-format msgid "This is the commit message #%d:" msgstr "este es el mensaje del commit #%d:" -#: sequencer.c:886 +#: sequencer.c:896 #, c-format msgid "The commit message #%d will be skipped:" msgstr "El mensaje del commit #%d sera saltado: " -#: sequencer.c:891 +#: sequencer.c:901 #, c-format msgid "unknown command: %d" msgstr "comando desconocido: %d" -#: sequencer.c:957 +#: sequencer.c:967 msgid "your index file is unmerged." -msgstr "tu archivo indice no esta fusionado." +msgstr "tu archivo índice no esta fusionado." -#: sequencer.c:975 +#: sequencer.c:986 #, c-format msgid "commit %s is a merge but no -m option was given." -msgstr "el commit %s es una fusion pero no se entrego la opcion -m." +msgstr "el commit %s es una fusión pero no se entrego la opción -m." -#: sequencer.c:983 +#: sequencer.c:994 #, c-format msgid "commit %s does not have parent %d" msgstr "el commit %s no tiene un padre %d" -#: sequencer.c:987 +#: sequencer.c:998 #, c-format msgid "mainline was specified but commit %s is not a merge." -msgstr "linea principal especificada pero el commit %s no es una fusion." +msgstr "línea principal especificada pero el commit %s no es una fusión." -#: sequencer.c:993 +#: sequencer.c:1004 #, c-format msgid "cannot get commit message for %s" msgstr "no se puede obtener el mensaje de commit para %s" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1014 +#: sequencer.c:1025 #, c-format msgid "%s: cannot parse parent commit %s" -msgstr "%s: no se puede analizar la confirmación padre %s" +msgstr "%s: no se puede analizar el commit padre %s" -#: sequencer.c:1077 sequencer.c:1853 +#: sequencer.c:1088 sequencer.c:1864 #, c-format msgid "could not rename '%s' to '%s'" msgstr "No se puede renombrar '%s' a '%s'" -#: sequencer.c:1128 +#: sequencer.c:1139 #, c-format msgid "could not revert %s... %s" msgstr "no se pudo revertir %s... %s" -#: sequencer.c:1129 +#: sequencer.c:1140 #, c-format msgid "could not apply %s... %s" msgstr "no se pudo aplicar %s... %s" -#: sequencer.c:1171 +#: sequencer.c:1182 msgid "empty commit set passed" -msgstr "conjunto de confirmación vacío aprobado" +msgstr "conjunto de commits vacío entregado" -#: sequencer.c:1181 +#: sequencer.c:1192 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: fallo al leer el índice" -#: sequencer.c:1188 +#: sequencer.c:1198 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: fallo al refrescar el índice" -#: sequencer.c:1308 +#: sequencer.c:1319 #, c-format msgid "invalid line %d: %.*s" msgstr "línea inválida %d: %.*s" -#: sequencer.c:1316 +#: sequencer.c:1327 #, c-format msgid "cannot '%s' without a previous commit" msgstr "no se puede '%s' sin un commit previo" -#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614 -#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951 +#: sequencer.c:1360 sequencer.c:2522 sequencer.c:2557 sequencer.c:2636 +#: sequencer.c:2662 sequencer.c:2752 sequencer.c:2853 #, c-format msgid "could not read '%s'." msgstr "no se puede leer '%s'." -#: sequencer.c:1361 +#: sequencer.c:1372 msgid "please fix this using 'git rebase --edit-todo'." msgstr "por favor arregle esto usando 'git rebase --edit-todo'." -#: sequencer.c:1363 +#: sequencer.c:1374 #, c-format msgid "unusable instruction sheet: '%s'" -msgstr "hoja de instrucciones inutilizable: '%s'" +msgstr "hoja de instrucciones inutilízale: '%s'" -#: sequencer.c:1368 +#: sequencer.c:1379 msgid "no commits parsed." -msgstr "ningun commit analizado." +msgstr "ningún commit analizado." -#: sequencer.c:1379 +#: sequencer.c:1390 msgid "cannot cherry-pick during a revert." msgstr "no se puede realizar cherry-pick durante un revert." -#: sequencer.c:1381 +#: sequencer.c:1392 msgid "cannot revert during a cherry-pick." msgstr "no se puede realizar un revert durante un cherry-pick" -#: sequencer.c:1448 +#: sequencer.c:1459 #, c-format msgid "invalid key: %s" msgstr "llave invalida: %s" -#: sequencer.c:1451 +#: sequencer.c:1462 #, c-format msgid "invalid value for %s: %s" msgstr "valor invalido para %s: %s" -#: sequencer.c:1517 +#: sequencer.c:1528 #, c-format msgid "malformed options sheet: '%s'" msgstr "hoja de opciones mal formada: '%s'" -#: sequencer.c:1555 +#: sequencer.c:1566 msgid "a cherry-pick or revert is already in progress" msgstr "un cherry-pick o rever ya esta en progreso" -#: sequencer.c:1556 +#: sequencer.c:1567 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "intenta \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:1559 +#: sequencer.c:1570 #, c-format msgid "could not create sequencer directory '%s'" msgstr "no se pudo crear un directorio secuenciador '%s' " -#: sequencer.c:1574 +#: sequencer.c:1585 msgid "could not lock HEAD" msgstr "no se pudo bloquear HEAD" -#: sequencer.c:1632 sequencer.c:2211 +#: sequencer.c:1643 sequencer.c:2227 msgid "no cherry-pick or revert in progress" -msgstr "ningun cherry-pick o revert en progreso" +msgstr "ningún cherry-pick o revert en progreso" -#: sequencer.c:1634 +#: sequencer.c:1645 msgid "cannot resolve HEAD" msgstr "no se puede resolver HEAD" -#: sequencer.c:1636 sequencer.c:1671 +#: sequencer.c:1647 sequencer.c:1682 msgid "cannot abort from a branch yet to be born" msgstr "no se puede abortar de una rama por nacer" -#: sequencer.c:1657 builtin/grep.c:711 +#: sequencer.c:1668 builtin/grep.c:713 #, c-format msgid "cannot open '%s'" msgstr "no se puede abrir '%s'" -#: sequencer.c:1659 +#: sequencer.c:1670 #, c-format msgid "cannot read '%s': %s" msgstr "no se puede leer '%s': %s" -#: sequencer.c:1660 +#: sequencer.c:1671 msgid "unexpected end of file" msgstr "final de archivo inesperado" -#: sequencer.c:1666 +#: sequencer.c:1677 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" -msgstr "archiv HEAD de pre-cherry-pick guardado '%s' esta corrompido" +msgstr "archivo HEAD de pre-cherry-pick guardado '%s' esta corrupto" -#: sequencer.c:1677 +#: sequencer.c:1688 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "Parece que se ha movido HEAD. No se hace rebobinado, revise su HEAD!" -#: sequencer.c:1818 sequencer.c:2109 +#: sequencer.c:1829 sequencer.c:2125 msgid "cannot read HEAD" msgstr "no se puede leer HEAD" -#: sequencer.c:1858 builtin/difftool.c:640 +#: sequencer.c:1869 builtin/difftool.c:639 #, c-format msgid "could not copy '%s' to '%s'" msgstr "no se pudo copiar '%s' a '%s'" -#: sequencer.c:1874 +#: sequencer.c:1888 msgid "could not read index" msgstr "no se pudo leer indice" -#: sequencer.c:1879 +#: sequencer.c:1893 #, c-format msgid "" "execution failed: %s\n" @@ -3374,17 +3393,17 @@ msgid "" " git rebase --continue\n" "\n" msgstr "" -"ejecucion fallida: %s\n" +"ejecución fallida: %s\n" "%sse puede arreglar el problema , y luego ejecutar\n" "\n" " git rebase --continue\n" "\n" -#: sequencer.c:1885 +#: sequencer.c:1899 msgid "and made changes to the index and/or the working tree\n" -msgstr "y se hicieron cambios al indice y/o arbol de trabajo\n" +msgstr "y se hicieron cambios al índice y/o árbol de trabajo\n" -#: sequencer.c:1891 +#: sequencer.c:1905 #, c-format msgid "" "execution succeeded: %s\n" @@ -3394,24 +3413,24 @@ msgid "" " git rebase --continue\n" "\n" msgstr "" -"ejecucion exitosa: %s\n" -"pero todavia quedan cambios para el indice o arbol de trabajo.\n" +"ejecución exitosa: %s\n" +"pero todavía quedan cambios para el índice o árbol de trabajo.\n" "Realiza un commit o stash con tus cambios, y luego ejecuta\n" "\n" " git rebase --continue\n" "\n" -#: sequencer.c:1948 +#: sequencer.c:1964 #, c-format msgid "Applied autostash.\n" msgstr "Autostash aplicado.\n" -#: sequencer.c:1960 +#: sequencer.c:1976 #, c-format msgid "cannot store %s" msgstr "no se puede guardar %s" -#: sequencer.c:1963 git-rebase.sh:175 +#: sequencer.c:1979 git-rebase.sh:175 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -3423,111 +3442,106 @@ msgstr "" "Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier " "momento.\n" -#: sequencer.c:2045 +#: sequencer.c:2061 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Detenido en %s... %.*s\n" -#: sequencer.c:2087 +#: sequencer.c:2103 #, c-format msgid "unknown command %d" msgstr "comando desconocido %d" -#: sequencer.c:2117 +#: sequencer.c:2133 msgid "could not read orig-head" msgstr "no se puede leer orig-head" -#: sequencer.c:2122 sequencer.c:2678 +#: sequencer.c:2138 sequencer.c:2739 msgid "could not read 'onto'" msgstr "no se puede leer 'onto'" -#: sequencer.c:2129 +#: sequencer.c:2145 #, c-format msgid "could not update %s" msgstr "no se puede actualizar %s" -#: sequencer.c:2136 +#: sequencer.c:2152 #, c-format msgid "could not update HEAD to %s" msgstr "no se puede actualizar HEAD a %s" -#: sequencer.c:2220 +#: sequencer.c:2236 msgid "cannot rebase: You have unstaged changes." -msgstr "no se puede realziar rebase: Tienes cambios fuera del area de stage." +msgstr "no se puede realizar rebase: Tienes cambios fuera del área de stage." -#: sequencer.c:2225 +#: sequencer.c:2241 msgid "could not remove CHERRY_PICK_HEAD" msgstr "no se puede remover CHERRY_PICK_HEAD" -#: sequencer.c:2234 +#: sequencer.c:2250 msgid "cannot amend non-existing commit" msgstr "no se puede arreglar un commit no existente" -#: sequencer.c:2236 +#: sequencer.c:2252 #, c-format msgid "invalid file: '%s'" msgstr "archivo invalido: '%s'" -#: sequencer.c:2238 +#: sequencer.c:2254 #, c-format msgid "invalid contents: '%s'" msgstr "contenido inválido: '%s'" -#: sequencer.c:2241 +#: sequencer.c:2257 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" "first and then run 'git rebase --continue' again." msgstr "" "\n" -"Tienes cambios fuera de un commit en tu arbol de trabajo. Por favor, realiza " +"Tienes cambios fuera de un commit en tu árbol de trabajo. Por favor, realiza " "un commit con estos\n" "primero y luego ejecuta 'git rebase --continue' de nuevo." -#: sequencer.c:2251 +#: sequencer.c:2267 msgid "could not commit staged changes." -msgstr "no se pudo realiar commit con los cambios en el area de stage." +msgstr "no se pudo realizar el commit con los cambios en el área de stage." -#: sequencer.c:2331 +#: sequencer.c:2347 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: no se puede aplicar cherry-pick a un %s" -#: sequencer.c:2335 +#: sequencer.c:2351 #, c-format msgid "%s: bad revision" msgstr "%s: mala revision" -#: sequencer.c:2368 +#: sequencer.c:2384 msgid "can't revert as initial commit" msgstr "no se puede revertir como commit inicial" -#: sequencer.c:2471 +#: sequencer.c:2489 msgid "make_script: unhandled options" msgstr "make_script: opciones desconocidas" -#: sequencer.c:2474 +#: sequencer.c:2492 msgid "make_script: error preparing revisions" msgstr "make_script: error preparando revisiones" -#: sequencer.c:2510 +#: sequencer.c:2526 sequencer.c:2561 #, c-format msgid "unusable todo list: '%s'" -msgstr "lista de pendientes inutilizable: '%s'" +msgstr "lista de pendientes inutilízale: '%s'" -#: sequencer.c:2516 -#, c-format -msgid "unable to open '%s' for writing" -msgstr "No se pudo abrir '%s' para escritura" - -#: sequencer.c:2561 +#: sequencer.c:2609 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." msgstr "" -"Opción %s no reconocida para la opción rebase.missingCommitsCheck. Ingorando." +"Opción %s no reconocida para la opción rebase.missingCommitsCheck. Ignorando." -#: sequencer.c:2641 +#: sequencer.c:2689 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -3536,7 +3550,7 @@ msgstr "" "Peligro: algunos commits pueden haber sido botados de forma accidental.\n" "Commits botados (empezando con el mas nuevo):\n" -#: sequencer.c:2648 +#: sequencer.c:2696 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -3554,7 +3568,7 @@ msgstr "" "Los posibles comportamientos son: ignore,warn,error.\n" "\n" -#: sequencer.c:2660 +#: sequencer.c:2708 #, c-format msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" @@ -3565,38 +3579,28 @@ msgstr "" "rebase --continue'.\n" "O se puede abortar el rebase con 'git rebase --abort'.\n" -#: sequencer.c:2708 -#, c-format -msgid "could not parse commit '%s'" -msgstr "No se pudo analizar commit '%s'" - -#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395 -#: builtin/am.c:775 +#: sequencer.c:2721 sequencer.c:2788 wrapper.c:225 wrapper.c:395 +#: builtin/am.c:779 #, c-format msgid "could not open '%s' for writing" msgstr "no se pudo abrir '%s' para escritura" -#: sequencer.c:2756 +#: sequencer.c:2769 #, c-format -msgid "could not truncate '%s'" -msgstr "no se pudo truncar '%s'" +msgid "could not parse commit '%s'" +msgstr "No se pudo analizar commit '%s'" -#: sequencer.c:2848 +#: sequencer.c:2891 msgid "the script was already rearranged." msgstr "este script ya fue reorganizado." -#: sequencer.c:2953 -#, c-format -msgid "could not finish '%s'" -msgstr "no se pudo finalizar '%s'" - #: setup.c:171 #, 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 "" -"%s: no existe la ruta en el arbol de trabajo.\n" +"%s: no existe la ruta en el árbol de trabajo.\n" "Use 'git <comando> -- <ruta>...' para especificar rutas que no existen " "localmente." @@ -3623,35 +3627,35 @@ msgstr "" "Use '--' para separar rutas de revisiones, de esta manera:\n" "'git <comando> [<revisión>...] -- [<archivo>...]'" -#: setup.c:499 +#: setup.c:501 #, c-format msgid "Expected git repo version <= %d, found %d" -msgstr "Se esperaba version de git repo <= %d, encontrada %d" +msgstr "Se esperaba versión de git repo <= %d, encontrada %d" -#: setup.c:507 +#: setup.c:509 msgid "unknown repository extensions found:" -msgstr "se encontro extension de repositorio desconocida:" +msgstr "se encontró extensión de repositorio desconocida:" -#: setup.c:806 +#: setup.c:811 #, c-format msgid "Not a git repository (or any of the parent directories): %s" msgstr "" "No es un repositorio git (ni ninguno de los directorios superiores): %s" -#: setup.c:808 builtin/index-pack.c:1653 +#: setup.c:813 builtin/index-pack.c:1653 msgid "Cannot come back to cwd" msgstr "No se puede regresar a cwd" -#: setup.c:1046 +#: setup.c:1052 msgid "Unable to read current working directory" msgstr "Incapaz de leer el directorio de trabajo actual" -#: setup.c:1058 setup.c:1064 +#: setup.c:1064 setup.c:1070 #, c-format msgid "Cannot change to '%s'" msgstr "No se puede cambiar a '%s'" -#: setup.c:1077 +#: setup.c:1083 #, c-format msgid "" "Not a git repository (or any parent up to mount point %s)\n" @@ -3661,7 +3665,7 @@ msgstr "" "Parando en el límite del sistema de archivos " "(GIT_DISCOVERY_ACROSS_FILESYSTEM no establecido)." -#: setup.c:1159 +#: setup.c:1167 #, c-format msgid "" "Problem with core.sharedRepository filemode value (0%.3o).\n" @@ -3670,43 +3674,43 @@ msgstr "" "Problema con el valor del modo de archivo core.sharedRepository (0%.3o).\n" "El dueño de los archivos tiene que tener permisos de lectura y escritura." -#: sha1_file.c:528 +#: sha1_file.c:598 #, c-format msgid "path '%s' does not exist" msgstr "ruta '%s' no existe" -#: sha1_file.c:554 +#: sha1_file.c:624 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" "repositorio de referencia '%s' como un checkout vinculado no es soportado " "todavía." -#: sha1_file.c:560 +#: sha1_file.c:630 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "repositorio de referencia '%s' no es un repositorio local." -#: sha1_file.c:566 +#: sha1_file.c:636 #, c-format msgid "reference repository '%s' is shallow" msgstr "repositorio de referencia '%s' es superficial (shallow)" -#: sha1_file.c:574 +#: sha1_file.c:644 #, c-format msgid "reference repository '%s' is grafted" msgstr "repositorio de referencia '% s' está injertado" -#: sha1_name.c:420 +#: sha1_name.c:422 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "SHA1 %s corta es ambigua" -#: sha1_name.c:431 +#: sha1_name.c:433 msgid "The candidates are:" msgstr "Los candidatos son:" -#: sha1_name.c:590 +#: sha1_name.c:693 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" @@ -3724,75 +3728,75 @@ msgstr "" "\n" " git checkout -b $br $(git rev-parse ...)\n" "\n" -"donde \"$br\" est'a de alguna manera vacía y una ref de 40-hex es creada. " -"Por favor\n" +"donde \"$br\" está de alguna manera vacía y una ref de 40-hex es creada. Por " +"favor\n" "examine estas refs y tal vez bórrelas. Silencie este mensaje \n" "ejecutando \"git config advice.objectNameWarning false\"" -#: submodule.c:93 submodule.c:127 +#: submodule.c:96 submodule.c:130 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" "No se puede cambiar .gitmodules no fusionados, resuelva este problema primero" -#: submodule.c:97 submodule.c:131 +#: submodule.c:100 submodule.c:134 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "No se pudo encontrar la sección en .gitmodules donde path=%s" -#: submodule.c:105 +#: submodule.c:108 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "No se pudo actualizar la entrada %s de .gitmodules" -#: submodule.c:138 +#: submodule.c:141 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "No se pudo remover la entrada %s de .gitmodules" -#: submodule.c:149 +#: submodule.c:152 msgid "staging updated .gitmodules failed" msgstr "falló realizar stage a los .gitmodules actualizados" -#: submodule.c:309 +#: submodule.c:312 #, c-format msgid "in unpopulated submodule '%s'" msgstr "en el submódulo no poblado '%s'" -#: submodule.c:340 +#: submodule.c:343 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "El patrón de ruta '%s' está en el submódulo '%.*s'" -#: submodule.c:799 +#: submodule.c:833 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "entrada de submódulo '%s' (%s) es un %s, no un commit" -#: submodule.c:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149 +#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387 msgid "Failed to resolve HEAD as a valid ref." msgstr "Fallo al resolver HEAD como un ref valido." -#: submodule.c:1304 +#: submodule.c:1370 #, c-format msgid "'%s' not recognized as a git repository" msgstr "'%s' no reconocido como un repositorio git" -#: submodule.c:1442 +#: submodule.c:1508 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "no se pudo comenzar 'git status' en el submódulo '%s'" -#: submodule.c:1455 +#: submodule.c:1521 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "no se pudo ejecutar 'git status' en el submódulo '%s'" -#: submodule.c:1548 +#: submodule.c:1614 #, c-format msgid "submodule '%s' has dirty index" msgstr "submódulo '%s' tiene un índice corrupto" -#: submodule.c:1809 +#: submodule.c:1876 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -3800,18 +3804,18 @@ msgstr "" "relocate_gitdir para el submódulo '%s' con más de un árbol de trabajo no " "soportado" -#: submodule.c:1821 submodule.c:1877 +#: submodule.c:1888 submodule.c:1944 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "no se pudo resolver el nombre para el submódulo '%s'" -#: submodule.c:1825 builtin/submodule--helper.c:671 -#: builtin/submodule--helper.c:681 +#: submodule.c:1892 builtin/submodule--helper.c:909 +#: builtin/submodule--helper.c:919 #, c-format msgid "could not create directory '%s'" msgstr "no se pudo crear el directorio '%s'" -#: submodule.c:1828 +#: submodule.c:1895 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -3822,20 +3826,20 @@ msgstr "" "'%s' hacia\n" "'%s'\n" -#: submodule.c:1912 +#: submodule.c:1979 #, c-format msgid "could not recurse into submodule '%s'" msgstr "No pudo recursar en el submódulo '%s'" -#: submodule.c:1956 +#: submodule.c:2023 msgid "could not start ls-files in .." msgstr "no se pudo comenzar ls-files en .." -#: submodule.c:1976 +#: submodule.c:2043 msgid "BUG: returned path string doesn't match cwd?" msgstr "BUG: string de ruta recibido no concuerda con cwd?" -#: submodule.c:1995 +#: submodule.c:2062 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree retornó un código %d inesperado" @@ -3903,17 +3907,17 @@ msgstr "no se pudo abrir el archivo temporal" msgid "could not rename temporary file to %s" msgstr "no se pudo renombrar el archivo temporal a %s" -#: transport.c:62 +#: transport.c:63 #, c-format msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "Configurará upstream de '%s' a '%s' de '%s'\n" -#: transport.c:151 +#: transport.c:152 #, c-format msgid "transport: invalid depth option '%s'" msgstr "transport: opción inválida '%s'" -#: transport.c:888 +#: transport.c:904 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -3922,7 +3926,7 @@ msgstr "" "La siguiente ruta de submódulo contiene cambios que no\n" "pueden ser encontrados en ningún remoto:\n" -#: transport.c:892 +#: transport.c:908 #, c-format msgid "" "\n" @@ -3949,18 +3953,18 @@ msgstr "" "para hacer un push al remoto.\n" "\n" -#: transport.c:900 +#: transport.c:916 msgid "Aborting." msgstr "Abortando." -#: transport-helper.c:1071 +#: transport-helper.c:1074 #, c-format msgid "Could not read ref %s" msgstr "No se pudo leer la referencia %s" #: tree-walk.c:31 msgid "too-short tree object" -msgstr "objeto de arbol muy corto" +msgstr "objeto de árbol muy corto" #: tree-walk.c:37 msgid "malformed mode in tree entry" @@ -3974,7 +3978,7 @@ msgstr "nombre de archivo vacío en la entrada de árbol" msgid "too-short tree file" msgstr "archivo de árbol muy corto" -#: unpack-trees.c:106 +#: unpack-trees.c:107 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3985,17 +3989,17 @@ msgstr "" "%%sPor favor, confirma tus cambios o salvaguárdalos antes de intercambiar " "ramas." -#: unpack-trees.c:108 +#: unpack-trees.c:109 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%s" msgstr "" -"Los cambios locales de los siguientes archivos seran sobreescritos por " +"Los cambios locales de los siguientes archivos serán sobreescritos por " "checkout:\n" "%%s" -#: unpack-trees.c:111 +#: unpack-trees.c:112 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4005,17 +4009,17 @@ msgstr "" "fusionar:\n" "%%sPor favor, confirma tus cambios o salvaguárdalos antes de fusionar." -#: unpack-trees.c:113 +#: unpack-trees.c:114 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%s" msgstr "" -"Los cambios locales de los siguientes archivos seran sobreescritos por " +"Los cambios locales de los siguientes archivos serán sobreescritos por " "merge:\n" "%%s" -#: unpack-trees.c:116 +#: unpack-trees.c:117 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -4024,16 +4028,16 @@ msgstr "" "Los cambios locales de los siguientes archivos serán sobrescritos al %s:\n" "%%sPor favor, confirma tus cambios o salvaguárdalos antes de %s." -#: unpack-trees.c:118 +#: unpack-trees.c:119 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%s" msgstr "" -"Los cambios locales de los siguientes archivos seran sobreescritos por %s:\n" +"Los cambios locales de los siguientes archivos serán sobreescritos por %s:\n" "%%s" -#: unpack-trees.c:123 +#: unpack-trees.c:124 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -4043,7 +4047,7 @@ msgstr "" "seguimiento en ellos:\n" "%s" -#: unpack-trees.c:127 +#: unpack-trees.c:128 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -4053,7 +4057,7 @@ msgstr "" "removidos al actualizar el árbol de trabajo:\n" "%%sPor favor, muévelos o elimínalos antes de intercambiar ramas." -#: unpack-trees.c:129 +#: unpack-trees.c:130 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -4063,7 +4067,7 @@ msgstr "" "al actualizar el árbol de trabajo:\n" "%%s" -#: unpack-trees.c:132 +#: unpack-trees.c:133 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -4073,7 +4077,7 @@ msgstr "" "removidos al fusionar:\n" "%%sPor favor, muévelos o elimínalos antes de fusionar." -#: unpack-trees.c:134 +#: unpack-trees.c:135 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -4083,7 +4087,7 @@ msgstr "" "al fusionar:\n" "%%s" -#: unpack-trees.c:137 +#: unpack-trees.c:138 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -4093,7 +4097,7 @@ msgstr "" "removidos al %s:\n" "%%sPor favor, muévelos o elimínalos antes de %s." -#: unpack-trees.c:139 +#: unpack-trees.c:140 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -4103,7 +4107,7 @@ msgstr "" "removidos al ejecutar %s:\n" "%%s" -#: unpack-trees.c:144 +#: unpack-trees.c:145 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -4114,7 +4118,7 @@ msgstr "" "sobrescritos al actualizar el árbol de trabajo:\n" "%%sPor favor, muévelos o elimínalos antes de intercambiar ramas." -#: unpack-trees.c:146 +#: unpack-trees.c:147 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -4125,7 +4129,7 @@ msgstr "" "sobrescritos al actualizar el árbol de trabajo:\n" "%%s" -#: unpack-trees.c:149 +#: unpack-trees.c:150 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -4135,7 +4139,7 @@ msgstr "" "sobrescritos al fusionar:\n" "%%sPor favor, muévelos o elimínalos antes de fusionar." -#: unpack-trees.c:151 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -4145,7 +4149,7 @@ msgstr "" "sobrescritos al fusionar:\n" "%%s" -#: unpack-trees.c:154 +#: unpack-trees.c:155 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -4155,22 +4159,22 @@ msgstr "" "sobrescritos al %s:\n" "%%sPor favor, muévelos o elimínalos antes de %s." -#: unpack-trees.c:156 +#: unpack-trees.c:157 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%s" msgstr "" -"Los siguientes archivos no rastreados en el arbol de trabajo seran removidos " +"Los siguientes archivos no rastreados en el árbol de trabajo serán removidos " "por %s:\n" "%%s" -#: unpack-trees.c:163 +#: unpack-trees.c:164 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." -msgstr "Entrda '%s' se superpone con '%s'. No se pueden unir" +msgstr "Entrada '%s' se superpone con '%s'. No se pueden unir" -#: unpack-trees.c:166 +#: unpack-trees.c:167 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" @@ -4180,7 +4184,7 @@ msgstr "" "actualizadas:\n" "%s" -#: unpack-trees.c:168 +#: unpack-trees.c:169 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -4191,7 +4195,7 @@ msgstr "" "actualización sparse checkout:\n" "%s" -#: unpack-trees.c:170 +#: unpack-trees.c:171 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -4202,7 +4206,7 @@ msgstr "" "actualización sparse checkout:\n" "%s" -#: unpack-trees.c:172 +#: unpack-trees.c:173 #, c-format msgid "" "Cannot update submodule:\n" @@ -4211,12 +4215,12 @@ msgstr "" "No se puede actualizar le submodulo:\n" "%s" -#: unpack-trees.c:249 +#: unpack-trees.c:250 #, c-format msgid "Aborting\n" msgstr "Abortando\n" -#: unpack-trees.c:331 +#: unpack-trees.c:332 msgid "Checking out files" msgstr "Revisando archivos" @@ -4259,8 +4263,8 @@ msgstr "fallo al leer '%s'" msgid "could not open '%s' for reading and writing" msgstr "no se pudo abrir '%s' para lectura y escritura" -#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766 -#: builtin/am.c:858 builtin/merge.c:1041 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770 +#: builtin/am.c:862 builtin/merge.c:1043 #, c-format msgid "could not open '%s' for reading" msgstr "no se pudo abrir '%s' para lectura" @@ -4274,16 +4278,6 @@ msgstr "no es posible acceder '%s'" msgid "unable to get current working directory" msgstr "no es posible obtener el directorio de trabajo actual" -#: wrapper.c:656 -#, c-format -msgid "could not write to %s" -msgstr "no se pudo escribir en %s" - -#: wrapper.c:658 -#, c-format -msgid "could not close %s" -msgstr "no se pudo cerrar %s" - #: wt-status.c:150 msgid "Unmerged paths:" msgstr "rutas no fusionadas:" @@ -4291,31 +4285,31 @@ msgstr "rutas no fusionadas:" #: wt-status.c:177 wt-status.c:204 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" -msgstr " (usa \"git reset %s <archivo>...\" para sacar del area de stage)" +msgstr " (usa \"git reset %s <archivo>...\" para sacar del área de stage)" #: wt-status.c:179 wt-status.c:206 msgid " (use \"git rm --cached <file>...\" to unstage)" -msgstr " (usa \"git rm --cached <archivo>...\" para sacar del area de stage)" +msgstr " (usa \"git rm --cached <archivo>...\" para sacar del área de stage)" #: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" -msgstr " (usa \"git add <archivo>...\" para marcar una resolucion)" +msgstr " (usa \"git add <archivo>...\" para marcar una resolución)" #: wt-status.c:185 wt-status.c:189 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" " (usa \"git add/rm <archivo>...\" como una forma apropiada de marcar la " -"resolucion)" +"resolución)" #: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" -msgstr " (usa \"git rm <file>...\" para marcar la resolucion)" +msgstr " (usa \"git rm <file>...\" para marcar la resolución)" -#: wt-status.c:198 wt-status.c:979 +#: wt-status.c:198 wt-status.c:984 msgid "Changes to be committed:" msgstr "Cambios a ser confirmados:" -#: wt-status.c:216 wt-status.c:988 +#: wt-status.c:216 wt-status.c:993 msgid "Changes not staged for commit:" msgstr "Cambios no rastreados para el commit:" @@ -4327,7 +4321,7 @@ msgstr "" #: wt-status.c:222 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" -" (usa \"git add/rm <archivo>...\" para actuailzar a lo que se le va a hacer " +" (usa \"git add/rm <archivo>...\" para actualizar a lo que se le va a hacer " "commit)" #: wt-status.c:223 @@ -4407,7 +4401,7 @@ msgstr "desconocido:" #: wt-status.c:288 msgid "unmerged:" -msgstr "desfusionado:" +msgstr "des-fusionado:" #: wt-status.c:370 msgid "new commits, " @@ -4421,130 +4415,130 @@ msgstr "contenido modificado, " msgid "untracked content, " msgstr "contenido no rastreado, " -#: wt-status.c:819 +#: wt-status.c:824 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "Tu stash actualmente tine %d entrada" msgstr[1] "Tu stash actualmente tiene %d entradas" -#: wt-status.c:851 +#: wt-status.c:856 msgid "Submodules changed but not updated:" msgstr "Submodulos cambiados pero no actualizados:" -#: wt-status.c:853 +#: wt-status.c:858 msgid "Submodule changes to be committed:" msgstr "Submodulos cambiados listos para realizar commit:" -#: wt-status.c:935 +#: wt-status.c:940 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." msgstr "" -"No modifique o borre la linea de encima.\n" +"No modifique o borre la línea de encima.\n" "Todo lo que este por abajo será removido." -#: wt-status.c:1048 +#: wt-status.c:1053 msgid "You have unmerged paths." msgstr "tienes rutas no fusionadas" -#: wt-status.c:1051 +#: wt-status.c:1056 msgid " (fix conflicts and run \"git commit\")" msgstr " (arregla los conflictos y corre \"git commit\"" -#: wt-status.c:1053 +#: wt-status.c:1058 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (usa \"git merge --abort\" para abortar la fusion)" -#: wt-status.c:1058 +#: wt-status.c:1063 msgid "All conflicts fixed but you are still merging." msgstr "Todos los conflictos resueltos pero sigues fusionando." -#: wt-status.c:1061 +#: wt-status.c:1066 msgid " (use \"git commit\" to conclude merge)" -msgstr " (usa \"git commit\" para concluir la fusion)" +msgstr " (usa \"git commit\" para concluir la fusión)" -#: wt-status.c:1071 +#: wt-status.c:1076 msgid "You are in the middle of an am session." -msgstr "Estas en medio de una sesion am." +msgstr "Estas en medio de una sesión am." -#: wt-status.c:1074 +#: wt-status.c:1079 msgid "The current patch is empty." -msgstr "El parche actual esta vacio." +msgstr "El parche actual esta vacío." -#: wt-status.c:1078 +#: wt-status.c:1083 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (arregla los conflictos y luego corre \"git am --continue\"" -#: wt-status.c:1080 +#: wt-status.c:1085 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (usa \"git am --skip\" para saltar este parche)" -#: wt-status.c:1082 +#: wt-status.c:1087 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (usa \"git am --abort\" para restaurar la rama original)" -#: wt-status.c:1214 +#: wt-status.c:1219 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo no esta presente." -#: wt-status.c:1216 +#: wt-status.c:1221 msgid "No commands done." msgstr "No se realizaron los comandos." -#: wt-status.c:1219 +#: wt-status.c:1224 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "El ultimo comando realizado (%d comando realizado):" msgstr[1] "Los ultimos comandos realizados (%d comandos realizados):" -#: wt-status.c:1230 +#: wt-status.c:1235 #, c-format msgid " (see more in file %s)" msgstr " (ver mas en el archivo %s)" -#: wt-status.c:1235 +#: wt-status.c:1240 msgid "No commands remaining." msgstr "No quedan mas comandos." -#: wt-status.c:1238 +#: wt-status.c:1243 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Siguiente comando a realizar (%d comando restante)" msgstr[1] "Siguiente comandos a realizar (%d comandos faltantes=" -#: wt-status.c:1246 +#: wt-status.c:1251 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (usa \"git rebase --edit-todo\" para ver y editar)" -#: wt-status.c:1259 +#: wt-status.c:1264 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Estas aplicando un rebase de la rama '%s' en '%s." -#: wt-status.c:1264 +#: wt-status.c:1269 msgid "You are currently rebasing." msgstr "Estas aplicando un rebase." -#: wt-status.c:1278 +#: wt-status.c:1283 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (corrige los conflictos y ejecuta \"git rebase --continue\")" -#: wt-status.c:1280 +#: wt-status.c:1285 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (usa \"git rebase --skip\" para omitir este parche)" -#: wt-status.c:1282 +#: wt-status.c:1287 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (usa \"git rebase --abort\" para volver a tu rama original)" -#: wt-status.c:1288 +#: wt-status.c:1293 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (todos los conflictos corregidos: ejecuta \"git rebase --continue\")" -#: wt-status.c:1292 +#: wt-status.c:1297 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -4552,128 +4546,128 @@ msgstr "" "Estas dividiendo un commit mientras aplicas un rebase de la rama '%s' en " "'%s'." -#: wt-status.c:1297 +#: wt-status.c:1302 msgid "You are currently splitting a commit during a rebase." msgstr "Estas dividiendo un commit durante un rebase." -#: wt-status.c:1300 +#: wt-status.c:1305 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Una vez que tu directorio de trabajo esté limpio, ejecuta \"git rebase --" "continue\")" -#: wt-status.c:1304 +#: wt-status.c:1309 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Estas editando un commit mientras se aplica un rebase de la rama '%s' en " "'%s'." -#: wt-status.c:1309 +#: wt-status.c:1314 msgid "You are currently editing a commit during a rebase." msgstr "Estas editando un commit durante un rebase." -#: wt-status.c:1312 +#: wt-status.c:1317 msgid " (use \"git commit --amend\" to amend the current commit)" -msgstr " (usa \"git commit --amend\" para enmendar la confirmación actual)" +msgstr " (usa \"git commit --amend\" para enmendar el commit actual)" -#: wt-status.c:1314 +#: wt-status.c:1319 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (usa \"git rebase --continue\" una vez que estés satisfecho con tus " "cambios)" -#: wt-status.c:1324 +#: wt-status.c:1329 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Estas realizando un cherry-picking en el commit %s." -#: wt-status.c:1329 +#: wt-status.c:1334 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (corrige los conflictos y ejecuta \"git cherry-pick --continue\")" -#: wt-status.c:1332 +#: wt-status.c:1337 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (todos los conflictos corregidos: ejecuta \"git cherry-pick --continue\")" -#: wt-status.c:1334 +#: wt-status.c:1339 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" -" (use \"git cherry-pick --abort\" para cancelar la operacion cherry-pick)" +" (use \"git cherry-pick --abort\" para cancelar la operación cherry-pick)" -#: wt-status.c:1343 +#: wt-status.c:1348 #, c-format msgid "You are currently reverting commit %s." msgstr "Estas revirtiendo el commit %s." -#: wt-status.c:1348 +#: wt-status.c:1353 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (corrige los conflictos y ejecuta \"git revert --continue\")" -#: wt-status.c:1351 +#: wt-status.c:1356 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (todos los conflictos corregidos: ejecuta \"git revert --continue\")" -#: wt-status.c:1353 +#: wt-status.c:1358 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (usa \"git revert --abort\" para cancelar la operación de revertir)" -#: wt-status.c:1364 +#: wt-status.c:1369 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Estas aplicando un bisect, comenzando en la rama '%s'." -#: wt-status.c:1368 +#: wt-status.c:1373 msgid "You are currently bisecting." msgstr "Estas aplicando un bisect." -#: wt-status.c:1371 +#: wt-status.c:1376 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (usa \"git bisect reset\" para volver a la rama original)" -#: wt-status.c:1568 +#: wt-status.c:1573 msgid "On branch " msgstr "En la rama " -#: wt-status.c:1574 +#: wt-status.c:1579 msgid "interactive rebase in progress; onto " msgstr "rebase interactivo en progreso; en" -#: wt-status.c:1576 +#: wt-status.c:1581 msgid "rebase in progress; onto " msgstr "rebase en progreso; en" -#: wt-status.c:1581 +#: wt-status.c:1586 msgid "HEAD detached at " msgstr "HEAD desacoplada en" -#: wt-status.c:1583 +#: wt-status.c:1588 msgid "HEAD detached from " msgstr "HEAD desacoplada de" -#: wt-status.c:1586 +#: wt-status.c:1591 msgid "Not currently on any branch." msgstr "Actualmente no estás en ninguna rama." -#: wt-status.c:1606 +#: wt-status.c:1611 msgid "Initial commit" msgstr "Confirmación inicial" -#: wt-status.c:1607 +#: wt-status.c:1612 msgid "No commits yet" msgstr "No hay commits todavia" -#: wt-status.c:1621 +#: wt-status.c:1626 msgid "Untracked files" msgstr "Archivos sin seguimiento" -#: wt-status.c:1623 +#: wt-status.c:1628 msgid "Ignored files" msgstr "Archivos ignorados" -#: wt-status.c:1627 +#: wt-status.c:1632 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -4684,100 +4678,99 @@ msgstr "" "puede acelerarlo, pero tiene que ser cuidadoso de no olvidar agregar\n" "nuevos archivos usted mismo (vea 'git help status')." -#: wt-status.c:1633 +#: wt-status.c:1638 #, c-format msgid "Untracked files not listed%s" msgstr "Archivos no rastreados no son mostrados %s" -#: wt-status.c:1635 +#: wt-status.c:1640 msgid " (use -u option to show untracked files)" msgstr " (usa la opción -u para mostrar los archivos sin seguimiento)" -#: wt-status.c:1641 +#: wt-status.c:1646 msgid "No changes" msgstr "Sin cambios" -#: wt-status.c:1646 +#: wt-status.c:1651 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -"sin cambios agregados a la confirmación (usa \"git add\" y/o \"git commit -a" -"\")\n" +"sin cambios agregados al commit (usa \"git add\" y/o \"git commit -a\")\n" -#: wt-status.c:1649 +#: wt-status.c:1654 #, c-format msgid "no changes added to commit\n" msgstr "no se agregaron cambios al commit\n" -#: wt-status.c:1652 +#: wt-status.c:1657 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -"no hay nada agregado a la confirmación pero hay archivos sin seguimiento " -"presentes (usa \"git add\" para hacerles seguimiento)\n" +"no hay nada agregado al commit pero hay archivos sin seguimiento presentes " +"(usa \"git add\" para hacerles seguimiento)\n" -#: wt-status.c:1655 +#: wt-status.c:1660 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" "no hay nada agregado para confirmar, pero hay archivos sin seguimiento " "presentes\n" -#: wt-status.c:1658 +#: wt-status.c:1663 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "no hay nada para confirmar (crea/copia archivos y usa \"git add\" para " "hacerles seguimiento)\n" -#: wt-status.c:1661 wt-status.c:1666 +#: wt-status.c:1666 wt-status.c:1671 #, c-format msgid "nothing to commit\n" msgstr "nada para hacer commit\n" -#: wt-status.c:1664 +#: wt-status.c:1669 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "nada para hacer commit (usa -u para mostrar los archivos no rastreados)\n" -#: wt-status.c:1668 +#: wt-status.c:1673 #, c-format msgid "nothing to commit, working tree clean\n" -msgstr "nada para hacer comit, el arbol de trabajo esta limpio\n" +msgstr "nada para hacer commit, el árbol de trabajo esta limpio\n" -#: wt-status.c:1780 +#: wt-status.c:1785 msgid "No commits yet on " -msgstr "No hay commits todavia en " +msgstr "No hay commits todavía en " -#: wt-status.c:1784 +#: wt-status.c:1789 msgid "HEAD (no branch)" msgstr "HEAD (sin rama)" -#: wt-status.c:1813 wt-status.c:1821 +#: wt-status.c:1818 wt-status.c:1826 msgid "behind " msgstr "detras" -#: wt-status.c:1816 wt-status.c:1819 +#: wt-status.c:1821 wt-status.c:1824 msgid "ahead " msgstr "adelante" #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2311 +#: wt-status.c:2318 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "no se puede %s: Tienes cambios sin marcar." -#: wt-status.c:2317 +#: wt-status.c:2324 msgid "additionally, your index contains uncommitted changes." -msgstr "adicionalmente, tu indice contiene cambios que no estan en un commit." +msgstr "adicionalmente, tu índice contiene cambios que no están en un commit." -#: wt-status.c:2319 +#: wt-status.c:2326 #, c-format msgid "cannot %s: Your index contains uncommitted changes." -msgstr "no se puede %s: Tu indice contiene cambios que no estan en un commit." +msgstr "no se puede %s: Tu índice contiene cambios que no están en un commit." #: compat/precompose_utf8.c:58 builtin/clone.c:437 #, c-format @@ -4786,125 +4779,129 @@ msgstr "fallo al desvincular '%s'" #: builtin/add.c:24 msgid "git add [<options>] [--] <pathspec>..." -msgstr "git add [<opcion>] [--] <especificacion-de-ruta>..." +msgstr "git add [<opción>] [--] <especificación-de-ruta>..." -#: builtin/add.c:82 +#: builtin/add.c:83 #, c-format msgid "unexpected diff status %c" msgstr "diff status inesperado %c" -#: builtin/add.c:87 builtin/commit.c:291 +#: builtin/add.c:88 builtin/commit.c:291 msgid "updating files failed" -msgstr "fallo la actualizacion de carpetas" +msgstr "fallo la actualización de carpetas" -#: builtin/add.c:97 +#: builtin/add.c:98 #, c-format msgid "remove '%s'\n" msgstr "remover '%s'\n" -#: builtin/add.c:153 +#: builtin/add.c:173 msgid "Unstaged changes after refreshing the index:" msgstr "Cambios fuera del área de stage tras refrescar el índice:" -#: builtin/add.c:213 builtin/rev-parse.c:888 +#: builtin/add.c:233 builtin/rev-parse.c:888 msgid "Could not read the index" msgstr "No se pudo leer el indice" -#: builtin/add.c:224 +#: builtin/add.c:244 #, c-format msgid "Could not open '%s' for writing." msgstr "No se pudo abrir '%s' para escritura." -#: builtin/add.c:228 +#: builtin/add.c:248 msgid "Could not write patch" msgstr "No se puede escribir el parche" -#: builtin/add.c:231 +#: builtin/add.c:251 msgid "editing patch failed" -msgstr "fallo la edicion del parche" +msgstr "fallo la edición del parche" -#: builtin/add.c:234 +#: builtin/add.c:254 #, c-format msgid "Could not stat '%s'" msgstr "No se pudo definir '%s'" -#: builtin/add.c:236 +#: builtin/add.c:256 msgid "Empty patch. Aborted." -msgstr "Parche vacio. Abortado." +msgstr "Parche vacío. Abortado." -#: builtin/add.c:241 +#: builtin/add.c:261 #, c-format msgid "Could not apply '%s'" msgstr "No se pudo aplicar '%s'" -#: builtin/add.c:251 +#: builtin/add.c:271 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Las siguientes rutas son ignoradas por uno de tus archivos .gitignore:\n" -#: builtin/add.c:271 builtin/clean.c:910 builtin/fetch.c:132 builtin/mv.c:124 -#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529 +#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124 +#: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541 #: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164 msgid "dry run" -msgstr "dry run ( ejecucion en seco)" +msgstr "dry run ( ejecución en seco)" -#: builtin/add.c:274 +#: builtin/add.c:294 msgid "interactive picking" -msgstr "seleccion interactiva" +msgstr "selección interactiva" -#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310 +#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310 msgid "select hunks interactively" msgstr "elegir hunks de forma interactiva" -#: builtin/add.c:276 +#: builtin/add.c:296 msgid "edit current diff and apply" msgstr "editar diff actual y aplicar" -#: builtin/add.c:277 +#: builtin/add.c:297 msgid "allow adding otherwise ignored files" msgstr "permitir agregar caso contrario ignorar archivos" -#: builtin/add.c:278 +#: builtin/add.c:298 msgid "update tracked files" msgstr "actualizado las carpetas rastreadas" -#: builtin/add.c:279 +#: builtin/add.c:299 +msgid "renormalize EOL of tracked files (implies -u)" +msgstr "renormalizar EOL de los archivos rastreados (implica -u)" + +#: builtin/add.c:300 msgid "record only the fact that the path will be added later" msgstr "grabar solo el hecho de que la ruta será agregada después" -#: builtin/add.c:280 +#: builtin/add.c:301 msgid "add changes from all tracked and untracked files" msgstr "agregar los cambios de todas las carpetas con y sin seguimiento" -#: builtin/add.c:283 +#: builtin/add.c:304 msgid "ignore paths removed in the working tree (same as --no-all)" -msgstr "ignorar rutas removidas en el arbol de trabajo (lo mismo que --no-all)" +msgstr "ignorar rutas removidas en el árbol de trabajo (lo mismo que --no-all)" -#: builtin/add.c:285 +#: builtin/add.c:306 msgid "don't add, only refresh the index" msgstr "no agregar, solo actualizar el indice" -#: builtin/add.c:286 +#: builtin/add.c:307 msgid "just skip files which cannot be added because of errors" msgstr "saltar las carpetas que no pueden ser agregadas a causa de errores" -#: builtin/add.c:287 +#: builtin/add.c:308 msgid "check if - even missing - files are ignored in dry run" msgstr "comprobar si - incluso los archivos que faltan - se ignoran en dry run" -#: builtin/add.c:288 builtin/update-index.c:954 +#: builtin/add.c:309 builtin/update-index.c:964 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/add.c:288 builtin/update-index.c:955 +#: builtin/add.c:309 builtin/update-index.c:965 msgid "override the executable bit of the listed files" msgstr "sobrescribir el bit ejecutable de los archivos listados" -#: builtin/add.c:290 +#: builtin/add.c:311 msgid "warn when adding an embedded repository" msgstr "avisar cuando se agrega un repositorio incrustado" -#: builtin/add.c:305 +#: builtin/add.c:326 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -4922,62 +4919,62 @@ msgid "" "See \"git help submodule\" for more information." msgstr "" "Se ha agregado otro repositorio de git dentro del repositorio actual.\n" -"Clones del repositorio exterior no tendran el contenido del \n" -"repositorio embebido y no sabran como obtenerla.\n" -"Si queria agregar un submodulo, use:\n" +"Clones del repositorio exterior no tendrán el contenido del \n" +"repositorio embebido y no sabrán como obtenerla.\n" +"Si quería agregar un submodulo, use:\n" "\n" "\tgit submodule add <url> %s\n" "\n" -"Si se agrego esta ruta por error, puede removerla desde el indice \n" +"Si se agrego esta ruta por error, puede removerla desde el índice \n" "usando:\n" "\n" "\tgit rm --cached %s\n" "\n" -"Vea \"git help submodule\" para mas informacion." +"Vea \"git help submodule\" para mas información." -#: builtin/add.c:333 +#: builtin/add.c:354 #, c-format msgid "adding embedded git repository: %s" msgstr "agregando repositorio embebido: %s" -#: builtin/add.c:351 +#: builtin/add.c:372 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Use -f si realmente quiere agregarlos.\n" -#: builtin/add.c:359 +#: builtin/add.c:380 msgid "adding files failed" msgstr "fallo al agregar archivos" -#: builtin/add.c:396 +#: builtin/add.c:417 msgid "-A and -u are mutually incompatible" msgstr "-A y -u son mutuamente incompatibles" -#: builtin/add.c:403 +#: builtin/add.c:424 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "Opción --ignore-missing solo puede ser usada junto a --dry-run" -#: builtin/add.c:407 +#: builtin/add.c:428 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "El parámetro '%s' para --chmod debe ser -x ó +x" -#: builtin/add.c:422 +#: builtin/add.c:443 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Nada especificado, nada agregado.\n" -#: builtin/add.c:423 +#: builtin/add.c:444 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Tal vez quiso decir 'git add .'?\n" -#: builtin/add.c:428 builtin/check-ignore.c:176 builtin/checkout.c:282 -#: builtin/checkout.c:479 builtin/clean.c:957 builtin/commit.c:350 -#: builtin/mv.c:143 builtin/reset.c:249 builtin/rm.c:271 -#: builtin/submodule--helper.c:243 +#: builtin/add.c:449 builtin/check-ignore.c:176 builtin/checkout.c:281 +#: builtin/checkout.c:484 builtin/clean.c:958 builtin/commit.c:350 +#: builtin/diff-tree.c:114 builtin/mv.c:143 builtin/reset.c:249 +#: builtin/rm.c:271 builtin/submodule--helper.c:311 msgid "index file corrupt" -msgstr "archivo indice corrompido" +msgstr "archivo índice corrompido" #: builtin/am.c:414 msgid "could not parse author script" @@ -4991,7 +4988,7 @@ msgstr "'%s' fue borrado por el hook de applypatch-msg" #: builtin/am.c:539 #, c-format msgid "Malformed input line: '%s'." -msgstr "linea mal formada: '%s'." +msgstr "línea mal formada: '%s'." #: builtin/am.c:576 #, c-format @@ -5002,86 +4999,86 @@ msgstr "Fallo al copiar notas de '%s' a '%s'" msgid "fseek failed" msgstr "fall de fseek" -#: builtin/am.c:786 +#: builtin/am.c:790 #, c-format msgid "could not parse patch '%s'" msgstr "no se pudo analizar el parche '%s'" -#: builtin/am.c:851 +#: builtin/am.c:855 msgid "Only one StGIT patch series can be applied at once" msgstr "Solo un parche StGIT puede ser aplicado de una vez " -#: builtin/am.c:899 +#: builtin/am.c:903 msgid "invalid timestamp" msgstr "timestamp invalido" -#: builtin/am.c:904 builtin/am.c:916 +#: builtin/am.c:908 builtin/am.c:920 msgid "invalid Date line" -msgstr "linea Date invalida" +msgstr "línea Date invalida" -#: builtin/am.c:911 +#: builtin/am.c:915 msgid "invalid timezone offset" msgstr "offset de zona horaria inválido" -#: builtin/am.c:1004 +#: builtin/am.c:1008 msgid "Patch format detection failed." msgstr "Falló al detectar el formato del parche." -#: builtin/am.c:1009 builtin/clone.c:402 +#: builtin/am.c:1013 builtin/clone.c:402 #, c-format msgid "failed to create directory '%s'" msgstr "fallo al crear el directorio '%s'" -#: builtin/am.c:1013 +#: builtin/am.c:1017 msgid "Failed to split patches." msgstr "Fallo al dividir parches" -#: builtin/am.c:1142 builtin/commit.c:376 +#: builtin/am.c:1146 builtin/commit.c:376 msgid "unable to write index file" msgstr "no es posible escribir en el archivo indice" -#: builtin/am.c:1193 +#: builtin/am.c:1197 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Cuando haya resuelto este problema, ejecute \"%s --continue\"." -#: builtin/am.c:1194 +#: builtin/am.c:1198 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Si prefieres saltar este parche, ejecuta \"%s --skip\"." -#: builtin/am.c:1195 +#: builtin/am.c:1199 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "Para restaurar la rama original y detener el parchado, ejecutar \"%s --abort" "\"." -#: builtin/am.c:1302 +#: builtin/am.c:1306 msgid "Patch is empty." -msgstr "El parche esta vacio." +msgstr "El parche esta vacío." -#: builtin/am.c:1368 +#: builtin/am.c:1372 #, c-format msgid "invalid ident line: %.*s" msgstr "sangría no válida: %.*s" -#: builtin/am.c:1390 +#: builtin/am.c:1394 #, c-format msgid "unable to parse commit %s" msgstr "no es posible analizar el commit %s" -#: builtin/am.c:1584 +#: builtin/am.c:1587 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Repositorio carece de los blobs necesarios para retroceder en una fusión de " "3-vías" -#: builtin/am.c:1586 +#: builtin/am.c:1589 msgid "Using index info to reconstruct a base tree..." msgstr "Usando la información del índice para reconstruir un árbol base..." -#: builtin/am.c:1605 +#: builtin/am.c:1608 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -5089,37 +5086,37 @@ msgstr "" "Editaste el parche a mano?\n" "No aplica a blobs guardados en su índice." -#: builtin/am.c:1611 +#: builtin/am.c:1614 msgid "Falling back to patching base and 3-way merge..." msgstr "Retrocediento para parchar base y fusión de 3-vías..." -#: builtin/am.c:1636 +#: builtin/am.c:1639 msgid "Failed to merge in the changes." msgstr "Falló al fusionar en los cambios." -#: builtin/am.c:1660 builtin/merge.c:641 +#: builtin/am.c:1663 builtin/merge.c:642 msgid "git write-tree failed to write a tree" msgstr "git write-tree falló al escribir el árbol" -#: builtin/am.c:1667 +#: builtin/am.c:1670 msgid "applying to an empty history" msgstr "aplicando a un historial vacio" -#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824 -#: builtin/merge.c:849 +#: builtin/am.c:1683 builtin/commit.c:1798 builtin/merge.c:825 +#: builtin/merge.c:850 msgid "failed to write commit object" msgstr "fallo al escribir el objeto commit" -#: builtin/am.c:1713 builtin/am.c:1717 +#: builtin/am.c:1716 builtin/am.c:1720 #, c-format msgid "cannot resume: %s does not exist." msgstr "no se puede continuar: %s no existe" -#: builtin/am.c:1733 +#: builtin/am.c:1736 msgid "cannot be interactive without stdin connected to a terminal." msgstr "no se puede ser interactivo sin stdin conectado a un terminal" -#: builtin/am.c:1738 +#: builtin/am.c:1741 msgid "Commit Body is:" msgstr "Cuerpo de commit es:" @@ -5127,45 +5124,45 @@ msgstr "Cuerpo de commit es:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1748 +#: builtin/am.c:1751 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Aplicar? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " -#: builtin/am.c:1798 +#: builtin/am.c:1801 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Índice sucio: no se puede aplicar parches (sucio: %s)" -#: builtin/am.c:1838 builtin/am.c:1910 +#: builtin/am.c:1841 builtin/am.c:1913 #, c-format msgid "Applying: %.*s" msgstr "Aplicando: %.*s" -#: builtin/am.c:1854 +#: builtin/am.c:1857 msgid "No changes -- Patch already applied." msgstr "Sin cambios -- parche ya aplicado." -#: builtin/am.c:1862 +#: builtin/am.c:1865 #, c-format msgid "Patch failed at %s %.*s" msgstr "El parche fallo en %s %.*s" -#: builtin/am.c:1868 +#: builtin/am.c:1871 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "La copia del parche que fallido se encuentra en: %s" -#: builtin/am.c:1913 +#: builtin/am.c:1916 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 "" "Sin cambios - olvidaste usar 'git add'?\n" -"Si no hay nada en el area de stage, las posibilidad es que algo mas\n" +"Si no hay nada en el área de stage, las posibilidad es que algo mas\n" "ya haya introducido el mismo cambio; tal vez quieras omitir este parche." -#: builtin/am.c:1920 +#: builtin/am.c:1923 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -5178,17 +5175,17 @@ msgstr "" "Tal vez ejecute `git rm` en el archivo para aceptar \"borrado por ellos\" en " "él." -#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332 +#: builtin/am.c:2030 builtin/am.c:2034 builtin/am.c:2046 builtin/reset.c:332 #: builtin/reset.c:340 #, c-format msgid "Could not parse object '%s'." msgstr "No se pudo analizar el objeto '%s'." -#: builtin/am.c:2081 +#: builtin/am.c:2082 msgid "failed to clean index" msgstr "fallo al limpiar el indice" -#: builtin/am.c:2116 +#: builtin/am.c:2117 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -5196,134 +5193,134 @@ msgstr "" "Parece haber movido HEAD desde el último fallo 'am'.\n" "No rebobinando a ORIG_HEAD " -#: builtin/am.c:2179 +#: builtin/am.c:2180 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "valor invalido para --patch-format: %s" -#: builtin/am.c:2212 +#: builtin/am.c:2213 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<opciones>] [(<mbox> | <Directorio-de-correo>)...]" -#: builtin/am.c:2213 +#: builtin/am.c:2214 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<opciones>] (--continue | --skip | --abort)" -#: builtin/am.c:2219 +#: builtin/am.c:2220 msgid "run interactively" msgstr "ejecutar de manera interactiva" -#: builtin/am.c:2221 +#: builtin/am.c:2222 msgid "historical option -- no-op" -msgstr "opcion historica -- no-op" +msgstr "opción histórica -- no-op" -#: builtin/am.c:2223 +#: builtin/am.c:2224 msgid "allow fall back on 3way merging if needed" msgstr "permitir retroceso en fusión de 3-vías si es necesario" -#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57 +#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57 #: builtin/repack.c:180 msgid "be quiet" msgstr "ser silencioso" -#: builtin/am.c:2226 +#: builtin/am.c:2227 msgid "add a Signed-off-by line to the commit message" msgstr "agregar una línea \"Firmado-por\" al mensaje del commit" -#: builtin/am.c:2229 +#: builtin/am.c:2230 msgid "recode into utf8 (default)" msgstr "recodificar en utf8 (default)" -#: builtin/am.c:2231 +#: builtin/am.c:2232 msgid "pass -k flag to git-mailinfo" msgstr "pasar flag -k a git-mailinfo" -#: builtin/am.c:2233 +#: builtin/am.c:2234 msgid "pass -b flag to git-mailinfo" msgstr "pasar flag -b a git-mailinfo" -#: builtin/am.c:2235 +#: builtin/am.c:2236 msgid "pass -m flag to git-mailinfo" msgstr "pasar flag -m a git-mailinfo" -#: builtin/am.c:2237 +#: builtin/am.c:2238 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "pasar flag --keep-cr a git-mailsplit para formato mbox" -#: builtin/am.c:2240 +#: builtin/am.c:2241 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "no pasar flag --keep-cr a git-mailsplit independientemente de am.keepcr" -#: builtin/am.c:2243 +#: builtin/am.c:2244 msgid "strip everything before a scissors line" msgstr "descubrir todo antes de una línea de tijeras" -#: builtin/am.c:2245 builtin/am.c:2248 builtin/am.c:2251 builtin/am.c:2254 -#: builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263 builtin/am.c:2266 -#: builtin/am.c:2272 +#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255 +#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 +#: builtin/am.c:2273 msgid "pass it through git-apply" msgstr "pasarlo a través de git-apply" -#: builtin/am.c:2262 builtin/fmt-merge-msg.c:664 builtin/fmt-merge-msg.c:667 -#: builtin/grep.c:843 builtin/merge.c:205 builtin/pull.c:142 builtin/pull.c:197 +#: builtin/am.c:2263 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668 +#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203 #: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195 #: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377 #: parse-options.h:132 parse-options.h:134 parse-options.h:245 msgid "n" msgstr "n" -#: builtin/am.c:2268 builtin/branch.c:622 builtin/for-each-ref.c:38 +#: builtin/am.c:2269 builtin/branch.c:629 builtin/for-each-ref.c:38 #: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39 msgid "format" msgstr "formato" -#: builtin/am.c:2269 +#: builtin/am.c:2270 msgid "format the patch(es) are in" msgstr "formatear el parche(s)" -#: builtin/am.c:2275 +#: builtin/am.c:2276 msgid "override error message when patch failure occurs" msgstr "sobrescribir mensajes de error cuando fallos de parchado ocurran" -#: builtin/am.c:2277 +#: builtin/am.c:2278 msgid "continue applying patches after resolving a conflict" msgstr "continuar aplicando los parches tras resolver conflictos" -#: builtin/am.c:2280 +#: builtin/am.c:2281 msgid "synonyms for --continue" -msgstr "sinonimos para --continue" +msgstr "sinónimos para --continue" -#: builtin/am.c:2283 +#: builtin/am.c:2284 msgid "skip the current patch" msgstr "saltar el parche actual" -#: builtin/am.c:2286 +#: builtin/am.c:2287 msgid "restore the original branch and abort the patching operation." msgstr "restaurar la rama original y abortar la operación de parchado." -#: builtin/am.c:2290 +#: builtin/am.c:2291 msgid "lie about committer date" msgstr "mentir sobre la fecha del committer" -#: builtin/am.c:2292 +#: builtin/am.c:2293 msgid "use current timestamp for author date" msgstr "usar el timestamp actual para la fecha del autor" -#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236 -#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392 +#: builtin/am.c:2295 builtin/commit.c:1636 builtin/merge.c:236 +#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2295 +#: builtin/am.c:2296 msgid "GPG-sign commits" msgstr "commits con firma GPG" -#: builtin/am.c:2298 +#: builtin/am.c:2299 msgid "(internal use for git-rebase)" msgstr "(uso interno para git-rebase)" -#: builtin/am.c:2316 +#: builtin/am.c:2317 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." @@ -5331,16 +5328,16 @@ msgstr "" "La opción -b/--binary ha estado deshabilitada por mucho tiempo, y\n" "será removida. Por favor no la use más." -#: builtin/am.c:2323 +#: builtin/am.c:2324 msgid "failed to read the index" msgstr "fallo al leer el indice" -#: builtin/am.c:2338 +#: builtin/am.c:2339 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "directorio de rebase previo %s todavía existe en el mbox dado." -#: builtin/am.c:2362 +#: builtin/am.c:2363 #, c-format msgid "" "Stray %s directory found.\n" @@ -5349,7 +5346,7 @@ msgstr "" "Directorio extraviado %s encontrado.\n" "Use \"git am --abort\" para borrarlo." -#: builtin/am.c:2368 +#: builtin/am.c:2369 msgid "Resolve operation not in progress, we are not resuming." msgstr "Operación de resolución no está en progreso, no vamos a continuar." @@ -5364,7 +5361,7 @@ msgstr "no se pudo crear el archivo comprimido '%s'" #: builtin/archive.c:20 msgid "could not redirect output" -msgstr "no se pudo redireccionar la salida" +msgstr "no se pudo direccionar la salida" #: builtin/archive.c:37 msgid "git archive: Remote with no URL" @@ -5387,25 +5384,76 @@ msgstr "git archive: error de protocolo" msgid "git archive: expected a flush" msgstr "git archive: se esperaba un flush" -#: builtin/bisect--helper.c:7 +#: builtin/bisect--helper.c:12 msgid "git bisect--helper --next-all [--no-checkout]" msgstr "git bisect--helper --next-all [--no-checkout]" -#: builtin/bisect--helper.c:17 +#: builtin/bisect--helper.c:13 +msgid "git bisect--helper --write-terms <bad_term> <good_term>" +msgstr "git bisect--helper --write-terms <mal_término> <buen_término>" + +#: builtin/bisect--helper.c:14 +msgid "git bisect--helper --bisect-clean-state" +msgstr "git bisect--helper --bisect-clean-state" + +#: builtin/bisect--helper.c:46 +#, c-format +msgid "'%s' is not a valid term" +msgstr "'%s' no es un término válido." + +#: builtin/bisect--helper.c:50 +#, c-format +msgid "can't use the builtin command '%s' as a term" +msgstr "no se puede usar el comando nativo '%s' como un término" + +#: builtin/bisect--helper.c:60 +#, c-format +msgid "can't change the meaning of the term '%s'" +msgstr "no se puede cambiar el significado del término '%s'" + +#: builtin/bisect--helper.c:71 +msgid "please use two different terms" +msgstr "por favor use dos términos diferentes" + +#: builtin/bisect--helper.c:78 +msgid "could not open the file BISECT_TERMS" +msgstr "no se pudo abrir el archivo BISECT_TERMS" + +#: builtin/bisect--helper.c:120 msgid "perform 'git bisect next'" msgstr "realiza 'git bisect next'" -#: builtin/bisect--helper.c:19 +#: builtin/bisect--helper.c:122 +msgid "write the terms to .git/BISECT_TERMS" +msgstr "escribe los términos a .git/BISECT_TERMS" + +#: builtin/bisect--helper.c:124 +msgid "cleanup the bisection state" +msgstr "limpiar el estado de bisección" + +#: builtin/bisect--helper.c:126 +msgid "check for expected revs" +msgstr "revisar por revs esperados" + +#: builtin/bisect--helper.c:128 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "actualiza BISECT_HEAD en lugar de revisar el commit actual" +#: builtin/bisect--helper.c:143 +msgid "--write-terms requires two arguments" +msgstr "--write-terms requiere dos argumentos" + +#: builtin/bisect--helper.c:147 +msgid "--bisect-clean-state requires no arguments" +msgstr "--bisect-clean-state no requiere argumentos" + #: builtin/blame.c:27 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<opciones>] [<opciones-rev>] [<revision>] [--] <archivo>" #: builtin/blame.c:32 msgid "<rev-opts> are documented in git-rev-list(1)" -msgstr "<rev-opts> estan documentadas en git-rev-list(1)" +msgstr "<rev-opts> están documentadas en git-rev-list(1)" #: builtin/blame.c:668 msgid "Show blame entries as we find them, incrementally" @@ -5421,7 +5469,7 @@ msgstr "No tratar commits raíces como extremos (Default: off)" #: builtin/blame.c:671 msgid "Show work cost statistics" -msgstr "Mostrar estadisticas de costo de trabajo" +msgstr "Mostrar estadísticas de costo de trabajo" #: builtin/blame.c:672 msgid "Force progress reporting" @@ -5596,7 +5644,7 @@ msgstr "" #: builtin/branch.c:181 msgid "Update of config-file failed" -msgstr "Fallo de actualizacion de config-file" +msgstr "Fallo de actualización de config-file" #: builtin/branch.c:212 msgid "cannot use -a with -d" @@ -5655,55 +5703,55 @@ msgstr "Rama %s está siendo rebasada en %s" msgid "Branch %s is being bisected at %s" msgstr "Rama %s está siendo bisecada en %s" -#: builtin/branch.c:470 +#: builtin/branch.c:471 msgid "cannot copy the current branch while not on any." msgstr "no se puede copiar la rama actual mientras no se está en ninguna." -#: builtin/branch.c:472 +#: builtin/branch.c:473 msgid "cannot rename the current branch while not on any." msgstr "no se puede renombrar la rama actual mientras no se está en ninguna." -#: builtin/branch.c:483 +#: builtin/branch.c:484 #, c-format msgid "Invalid branch name: '%s'" msgstr "Nombre de rama invalido: '%s'" -#: builtin/branch.c:504 +#: builtin/branch.c:511 msgid "Branch rename failed" msgstr "Cambio de nombre de rama fallido" -#: builtin/branch.c:506 +#: builtin/branch.c:513 msgid "Branch copy failed" msgstr "Copiado de rama fallido" -#: builtin/branch.c:510 +#: builtin/branch.c:517 #, c-format -msgid "Copied a misnamed branch '%s' away" -msgstr "Copiada una rama mal llamada '%s' afuera" +msgid "Created a copy of a misnamed branch '%s'" +msgstr "Copia creada de la rama malnombrada '%s' " -#: builtin/branch.c:513 +#: builtin/branch.c:520 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Rama mal llamada '%s' renombrada" -#: builtin/branch.c:519 +#: builtin/branch.c:526 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "¡Rama renombrada a %s, pero HEAD no está actualizado!" -#: builtin/branch.c:528 +#: builtin/branch.c:535 msgid "Branch is renamed, but update of config-file failed" msgstr "" "La rama está renombrada, pero falló la actualización del archivo de " "configuración" -#: builtin/branch.c:530 +#: builtin/branch.c:537 msgid "Branch is copied, but update of config-file failed" msgstr "" "La rama está copiada, pero falló la actualización del archivo de " "configuración" -#: builtin/branch.c:546 +#: builtin/branch.c:553 #, c-format msgid "" "Please edit the description for the branch\n" @@ -5714,184 +5762,184 @@ msgstr "" "%s\n" "Las líneas que comiencen con '%c' serán removidas.\n" -#: builtin/branch.c:579 +#: builtin/branch.c:586 msgid "Generic options" msgstr "Opciones genericas" -#: builtin/branch.c:581 +#: builtin/branch.c:588 msgid "show hash and subject, give twice for upstream branch" msgstr "mostrar hash y tema, dar dos veces para rama upstream" -#: builtin/branch.c:582 +#: builtin/branch.c:589 msgid "suppress informational messages" msgstr "Suprimir mensajes informativos" -#: builtin/branch.c:583 +#: builtin/branch.c:590 msgid "set up tracking mode (see git-pull(1))" msgstr "configurando modo tracking (mirar git-pull(1))" -#: builtin/branch.c:585 +#: builtin/branch.c:592 msgid "do not use" msgstr "no usar" -#: builtin/branch.c:587 +#: builtin/branch.c:594 msgid "upstream" msgstr "upstream" -#: builtin/branch.c:587 +#: builtin/branch.c:594 msgid "change the upstream info" msgstr "cambiar info de upstream" -#: builtin/branch.c:588 +#: builtin/branch.c:595 msgid "Unset the upstream info" msgstr "Desconfigurando la info de upstream" -#: builtin/branch.c:589 +#: builtin/branch.c:596 msgid "use colored output" msgstr "usar salida con colores" -#: builtin/branch.c:590 +#: builtin/branch.c:597 msgid "act on remote-tracking branches" msgstr "actuar en ramas de traqueo remoto" -#: builtin/branch.c:592 builtin/branch.c:594 +#: builtin/branch.c:599 builtin/branch.c:601 msgid "print only branches that contain the commit" msgstr "mostrar solo ramas que contienen el commit" -#: builtin/branch.c:593 builtin/branch.c:595 +#: builtin/branch.c:600 builtin/branch.c:602 msgid "print only branches that don't contain the commit" msgstr "mostrar solo ramas que no contienen el commit" -#: builtin/branch.c:598 +#: builtin/branch.c:605 msgid "Specific git-branch actions:" msgstr "Acciones específicas de git-branch:" -#: builtin/branch.c:599 +#: builtin/branch.c:606 msgid "list both remote-tracking and local branches" msgstr "listar ramas de remote-tracking y locales" -#: builtin/branch.c:601 +#: builtin/branch.c:608 msgid "delete fully merged branch" msgstr "borrar ramas totalmente fusionadas" -#: builtin/branch.c:602 +#: builtin/branch.c:609 msgid "delete branch (even if not merged)" msgstr "borar rama (incluso si no esta fusionada)" -#: builtin/branch.c:603 +#: builtin/branch.c:610 msgid "move/rename a branch and its reflog" msgstr "mover/renombrar una rama y su reflog" -#: builtin/branch.c:604 +#: builtin/branch.c:611 msgid "move/rename a branch, even if target exists" msgstr "mover/renombrar una rama, incluso si el destino existe" -#: builtin/branch.c:605 +#: builtin/branch.c:612 msgid "copy a branch and its reflog" msgstr "copiar una rama y su reflog" -#: builtin/branch.c:606 +#: builtin/branch.c:613 msgid "copy a branch, even if target exists" msgstr "copiar una rama, incluso si el objetivo existe" -#: builtin/branch.c:607 +#: builtin/branch.c:614 msgid "list branch names" msgstr "listar nombres de ramas" -#: builtin/branch.c:608 +#: builtin/branch.c:615 msgid "create the branch's reflog" msgstr "crea el reflog de la rama" -#: builtin/branch.c:610 +#: builtin/branch.c:617 msgid "edit the description for the branch" -msgstr "edita la descripcion de la rama" +msgstr "edita la descripción de la rama" -#: builtin/branch.c:611 +#: builtin/branch.c:618 msgid "force creation, move/rename, deletion" -msgstr "fuerza la creacion,movimiento/renombrado,borrado" +msgstr "fuerza la creación,movimiento/renombrado,borrado" -#: builtin/branch.c:612 +#: builtin/branch.c:619 msgid "print only branches that are merged" msgstr "muestra solo ramas que han sido fusionadas" -#: builtin/branch.c:613 +#: builtin/branch.c:620 msgid "print only branches that are not merged" msgstr "muestra solo ramas que no han sido fusionadas" -#: builtin/branch.c:614 +#: builtin/branch.c:621 msgid "list branches in columns" msgstr "muestra las ramas en columnas" -#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405 +#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405 msgid "key" msgstr "clave" -#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406 +#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406 msgid "field name to sort on" msgstr "nombre del campo por el cuál ordenar" -#: builtin/branch.c:618 builtin/for-each-ref.c:43 builtin/notes.c:408 +#: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408 #: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574 #: builtin/tag.c:408 msgid "object" msgstr "objeto" -#: builtin/branch.c:619 +#: builtin/branch.c:626 msgid "print only branches of the object" msgstr "imprimir sólo las ramas del objeto" -#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415 +#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415 msgid "sorting and filtering are case insensitive" -msgstr "ordenamiento y filstrado son case-insensitive" +msgstr "ordenamiento y filtrado son case-insensitive" -#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413 +#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413 #: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "formato para usar para el output" -#: builtin/branch.c:645 builtin/clone.c:729 +#: builtin/branch.c:652 builtin/clone.c:730 msgid "HEAD not found below refs/heads!" msgstr "HEAD no encontrado abajo de refs/heads!" -#: builtin/branch.c:668 +#: builtin/branch.c:675 msgid "--column and --verbose are incompatible" msgstr "--column y --verbose son incompatibles" -#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741 +#: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751 msgid "branch name required" msgstr "se necesita el nombre de la rama" -#: builtin/branch.c:708 +#: builtin/branch.c:718 msgid "Cannot give description to detached HEAD" msgstr "No se puede dar descripción al HEAD desacoplado" -#: builtin/branch.c:713 +#: builtin/branch.c:723 msgid "cannot edit description of more than one branch" msgstr "no se puede editar la descripción de más de una rama" -#: builtin/branch.c:720 +#: builtin/branch.c:730 #, c-format msgid "No commit on branch '%s' yet." -msgstr "Aún no hay confirmaciones en la rama '%s'." +msgstr "Aún no hay commits en la rama '%s'." -#: builtin/branch.c:723 +#: builtin/branch.c:733 #, c-format msgid "No branch named '%s'." msgstr "No hay ninguna rama llamada '%s'." -#: builtin/branch.c:738 +#: builtin/branch.c:748 msgid "too many branches for a copy operation" msgstr "demasiadas ramas para una operación de copiado" -#: builtin/branch.c:747 +#: builtin/branch.c:757 msgid "too many arguments for a rename operation" msgstr "demasiados argumentos para una operación de renombrado" -#: builtin/branch.c:752 +#: builtin/branch.c:762 msgid "too many arguments to set new upstream" msgstr "demasiados argumentos para configurar un nuevo upstream" -#: builtin/branch.c:756 +#: builtin/branch.c:766 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -5899,41 +5947,37 @@ msgstr "" "no se pudo configurar upstream de HEAD a %s cuando este no apunta a ninguna " "rama." -#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800 +#: builtin/branch.c:769 builtin/branch.c:791 builtin/branch.c:807 #, c-format msgid "no such branch '%s'" msgstr "no hay tal rama '%s'" -#: builtin/branch.c:763 +#: builtin/branch.c:773 #, c-format msgid "branch '%s' does not exist" msgstr "la rama '%s' no existe" -#: builtin/branch.c:775 +#: builtin/branch.c:785 msgid "too many arguments to unset upstream" msgstr "demasiados argumentos para desconfigurar upstream" -#: builtin/branch.c:779 +#: builtin/branch.c:789 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "no se puede desconfigurar upstream de HEAD cuando este no apunta a ninguna " "rama." -#: builtin/branch.c:785 +#: builtin/branch.c:795 #, c-format msgid "Branch '%s' has no upstream information" -msgstr "Rama '%s' no tiene informacion de upstream" - -#: builtin/branch.c:797 -msgid "it does not make sense to create 'HEAD' manually" -msgstr "No tiene sentido crear 'HEAD' manualmente" +msgstr "Rama '%s' no tiene información de upstream" -#: builtin/branch.c:803 +#: builtin/branch.c:810 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "opciones -a y -r para 'git branch' no tienen sentido con un nombre de rama" -#: builtin/branch.c:806 +#: builtin/branch.c:813 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -5980,7 +6024,7 @@ msgstr "mostrar el tipo del objeto" #: builtin/cat-file.c:561 msgid "show object size" -msgstr "mostrar el tamanio del objeto" +msgstr "mostrar el tamaño del objeto" #: builtin/cat-file.c:563 msgid "exit with zero when there's no error" @@ -5998,7 +6042,7 @@ msgstr "para objetos blob, ejecuta textconv en el contenido del objeto" msgid "for blob objects, run filters on object's content" msgstr "para objetos blob, ejecuta filters en el contenido del objeto" -#: builtin/cat-file.c:569 git-submodule.sh:943 +#: builtin/cat-file.c:569 git-submodule.sh:931 msgid "blob" msgstr "blob" @@ -6024,7 +6068,8 @@ msgstr "mostrar info de los objetos alimentados por standard input" #: builtin/cat-file.c:581 msgid "follow in-tree symlinks (used with --batch or --batch-check)" -msgstr "seguir symlinks en el árbol (usado con --batch o --batch-check)" +msgstr "" +"seguir los enlaces simbólicos en el árbol (usado con --batch o --batch-check)" #: builtin/cat-file.c:583 msgid "show all objects with --batch or --batch-check" @@ -6052,9 +6097,9 @@ msgstr "leer nombres de archivos de stdin" #: builtin/check-attr.c:24 builtin/check-ignore.c:26 msgid "terminate input and output records by a NUL character" -msgstr "terminar registros de entrada y salida con un caracter NUL" +msgstr "terminar registros de entrada y salida con un carácter NUL" -#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358 +#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358 msgid "suppress progress reporting" msgstr "suprimir el reporte de progreso" @@ -6111,162 +6156,162 @@ msgstr "contactos no especificados" msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [<opciones>] [--] [<archivo>...]" -#: builtin/checkout-index.c:145 +#: builtin/checkout-index.c:143 msgid "stage should be between 1 and 3 or all" msgstr "stage tiene que estar entre 1 y 3 o all" -#: builtin/checkout-index.c:161 +#: builtin/checkout-index.c:159 msgid "check out all files in the index" msgstr "revisar todos los archivos en el indice" -#: builtin/checkout-index.c:162 +#: builtin/checkout-index.c:160 msgid "force overwrite of existing files" msgstr "forzar sobreescritura de los archivos existentes" -#: builtin/checkout-index.c:164 +#: builtin/checkout-index.c:162 msgid "no warning for existing files and files not in index" msgstr "" "no hay advertencias para los archivos existentes y los archivos no están en " "el índice" -#: builtin/checkout-index.c:166 +#: builtin/checkout-index.c:164 msgid "don't checkout new files" msgstr "no revisar archivos nuevos" -#: builtin/checkout-index.c:168 +#: builtin/checkout-index.c:166 msgid "update stat information in the index file" msgstr "actualizar información de estado en el archivo índice" -#: builtin/checkout-index.c:172 +#: builtin/checkout-index.c:170 msgid "read list of paths from the standard input" msgstr "leer lista de rutas desde standard input" -#: builtin/checkout-index.c:174 +#: builtin/checkout-index.c:172 msgid "write the content to temporary files" msgstr "escribir el contenido en un archivo temporal" -#: builtin/checkout-index.c:175 builtin/column.c:31 -#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631 -#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999 -#: builtin/worktree.c:498 +#: builtin/checkout-index.c:173 builtin/column.c:31 +#: builtin/submodule--helper.c:866 builtin/submodule--helper.c:869 +#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1237 +#: builtin/worktree.c:552 msgid "string" msgstr "string" -#: builtin/checkout-index.c:176 +#: builtin/checkout-index.c:174 msgid "when creating files, prepend <string>" msgstr "cuando cree archivos, anteponer <string>" -#: builtin/checkout-index.c:178 +#: builtin/checkout-index.c:176 msgid "copy out the files from named stage" msgstr "copiar los archivos del stage nombrado" -#: builtin/checkout.c:26 +#: builtin/checkout.c:27 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<opciones>] <rama>" -#: builtin/checkout.c:27 +#: builtin/checkout.c:28 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<opciones>] [<rama>] -- <archivo>..." -#: builtin/checkout.c:135 builtin/checkout.c:168 +#: builtin/checkout.c:136 builtin/checkout.c:169 #, c-format msgid "path '%s' does not have our version" msgstr "ruta '%s' no tiene nuestra versión" -#: builtin/checkout.c:137 builtin/checkout.c:170 +#: builtin/checkout.c:138 builtin/checkout.c:171 #, c-format msgid "path '%s' does not have their version" msgstr "ruta '%s' no tiene su versión" -#: builtin/checkout.c:153 +#: builtin/checkout.c:154 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "ruta '%s' no tiene todas las versiones necesarias" -#: builtin/checkout.c:197 +#: builtin/checkout.c:198 #, c-format msgid "path '%s' does not have necessary versions" msgstr "ruta '%s' no tiene versiones necesarias" -#: builtin/checkout.c:214 +#: builtin/checkout.c:215 #, c-format msgid "path '%s': cannot merge" msgstr "ruta '%s': no se puede fusionar" -#: builtin/checkout.c:231 +#: builtin/checkout.c:232 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Incapaz de agregar resultados de fusión a '%s'" -#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259 -#: builtin/checkout.c:262 +#: builtin/checkout.c:254 builtin/checkout.c:257 builtin/checkout.c:260 +#: builtin/checkout.c:263 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' no puede ser usada con rutas actualizadas" -#: builtin/checkout.c:265 builtin/checkout.c:268 +#: builtin/checkout.c:266 builtin/checkout.c:269 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' no puede ser usado con %s" -#: builtin/checkout.c:271 +#: builtin/checkout.c:272 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "no se puede actualizar rutas y cambiar a la rama '%s' al mismo tiempo." -#: builtin/checkout.c:342 builtin/checkout.c:349 +#: builtin/checkout.c:341 builtin/checkout.c:348 #, c-format msgid "path '%s' is unmerged" msgstr "ruta '%s' no esta fusionada" -#: builtin/checkout.c:501 +#: builtin/checkout.c:506 msgid "you need to resolve your current index first" msgstr "necesita resolver su índice actual primero" -#: builtin/checkout.c:632 +#: builtin/checkout.c:637 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "No se puede hacer reflog para '%s': %s\n" -#: builtin/checkout.c:673 +#: builtin/checkout.c:678 msgid "HEAD is now at" msgstr "HEAD está ahora en" -#: builtin/checkout.c:677 builtin/clone.c:683 +#: builtin/checkout.c:682 builtin/clone.c:684 msgid "unable to update HEAD" msgstr "no es posible actualizar HEAD" -#: builtin/checkout.c:681 +#: builtin/checkout.c:686 #, c-format msgid "Reset branch '%s'\n" msgstr "Reiniciar rama '%s'\n" -#: builtin/checkout.c:684 +#: builtin/checkout.c:689 #, c-format msgid "Already on '%s'\n" msgstr "Ya en '%s'\n" -#: builtin/checkout.c:688 +#: builtin/checkout.c:693 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Rama reiniciada y cambiada a '%s'\n" -#: builtin/checkout.c:690 builtin/checkout.c:1086 +#: builtin/checkout.c:695 builtin/checkout.c:1051 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Cambiado a nueva rama '%s'\n" -#: builtin/checkout.c:692 +#: builtin/checkout.c:697 #, c-format msgid "Switched to branch '%s'\n" msgstr "Cambiado a rama '%s'\n" -#: builtin/checkout.c:743 +#: builtin/checkout.c:748 #, c-format msgid " ... and %d more.\n" msgstr " ... y %d más.\n" -#: builtin/checkout.c:749 +#: builtin/checkout.c:754 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -6289,7 +6334,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:768 +#: builtin/checkout.c:773 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -6316,160 +6361,160 @@ msgstr[1] "" " git branch <nombre-de-rama> %s\n" "\n" -#: builtin/checkout.c:809 +#: builtin/checkout.c:814 msgid "internal error in revision walk" msgstr "error interno en camino de reivison" -#: builtin/checkout.c:813 +#: builtin/checkout.c:818 msgid "Previous HEAD position was" -msgstr "La posicion previa de HEAD era" +msgstr "La posición previa de HEAD era" -#: builtin/checkout.c:843 builtin/checkout.c:1081 +#: builtin/checkout.c:848 builtin/checkout.c:1046 msgid "You are on a branch yet to be born" msgstr "Estas en una rama por nacer" -#: builtin/checkout.c:987 +#: builtin/checkout.c:952 #, c-format msgid "only one reference expected, %d given." msgstr "solo una referencia esperada, %d entregadas." -#: builtin/checkout.c:1027 builtin/worktree.c:233 +#: builtin/checkout.c:992 builtin/worktree.c:247 #, c-format msgid "invalid reference: %s" msgstr "referencia invalida: %s" -#: builtin/checkout.c:1056 +#: builtin/checkout.c:1021 #, c-format msgid "reference is not a tree: %s" -msgstr "la referencia no es n arbol: %s" +msgstr "la referencia no es n árbol: %s" -#: builtin/checkout.c:1095 +#: builtin/checkout.c:1060 msgid "paths cannot be used with switching branches" msgstr "rutas no pueden ser usadas con cambios de rama" -#: builtin/checkout.c:1098 builtin/checkout.c:1102 +#: builtin/checkout.c:1063 builtin/checkout.c:1067 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' no puede ser usado con cambios de ramas" -#: builtin/checkout.c:1106 builtin/checkout.c:1109 builtin/checkout.c:1114 -#: builtin/checkout.c:1117 +#: builtin/checkout.c:1071 builtin/checkout.c:1074 builtin/checkout.c:1079 +#: builtin/checkout.c:1082 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' no puede ser usado con '%s'" -#: builtin/checkout.c:1122 +#: builtin/checkout.c:1087 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "No se puede cambiar rama a un '%s' sin commits" -#: builtin/checkout.c:1154 builtin/checkout.c:1156 builtin/clone.c:114 -#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:346 -#: builtin/worktree.c:348 +#: builtin/checkout.c:1119 builtin/checkout.c:1121 builtin/clone.c:114 +#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:369 +#: builtin/worktree.c:371 msgid "branch" msgstr "rama" -#: builtin/checkout.c:1155 +#: builtin/checkout.c:1120 msgid "create and checkout a new branch" msgstr "crear y hacer checkout a una nueva rama" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1122 msgid "create/reset and checkout a branch" msgstr "crear/reiniciar y hacer checkout a una rama" -#: builtin/checkout.c:1158 +#: builtin/checkout.c:1123 msgid "create reflog for new branch" msgstr "crear un reflog para una nueva rama" -#: builtin/checkout.c:1159 builtin/worktree.c:350 +#: builtin/checkout.c:1124 builtin/worktree.c:373 msgid "detach HEAD at named commit" msgstr "desacoplar HEAD en el commit nombrado" -#: builtin/checkout.c:1160 +#: builtin/checkout.c:1125 msgid "set upstream info for new branch" msgstr "configurar info de upstream para una rama nueva" -#: builtin/checkout.c:1162 +#: builtin/checkout.c:1127 msgid "new-branch" msgstr "nueva-rama" -#: builtin/checkout.c:1162 +#: builtin/checkout.c:1127 msgid "new unparented branch" msgstr "nueva rama no emparentada" -#: builtin/checkout.c:1163 +#: builtin/checkout.c:1128 msgid "checkout our version for unmerged files" -msgstr "hacer checkout a nuestra version para archivos sin fusionar" +msgstr "hacer checkout a nuestra versión para archivos sin fusionar" -#: builtin/checkout.c:1165 +#: builtin/checkout.c:1130 msgid "checkout their version for unmerged files" -msgstr "hacer checkout a su version para los archivos sin fusionar" +msgstr "hacer checkout a su versión para los archivos sin fusionar" -#: builtin/checkout.c:1167 +#: builtin/checkout.c:1132 msgid "force checkout (throw away local modifications)" msgstr "forzar el checkout (descartar modificaciones locales)" -#: builtin/checkout.c:1168 +#: builtin/checkout.c:1133 msgid "perform a 3-way merge with the new branch" -msgstr "realizar una fusion de tres vias con la rama nueva" +msgstr "realizar una fusión de tres vías con la rama nueva" -#: builtin/checkout.c:1169 builtin/merge.c:238 +#: builtin/checkout.c:1134 builtin/merge.c:238 msgid "update ignored files (default)" msgstr "actualizar archivos ignorados (default)" -#: builtin/checkout.c:1170 builtin/log.c:1489 parse-options.h:251 +#: builtin/checkout.c:1135 builtin/log.c:1496 parse-options.h:251 msgid "style" msgstr "estilo" -#: builtin/checkout.c:1171 +#: builtin/checkout.c:1136 msgid "conflict style (merge or diff3)" msgstr "conflicto de estilos (merge o diff3)" -#: builtin/checkout.c:1174 +#: builtin/checkout.c:1139 msgid "do not limit pathspecs to sparse entries only" msgstr "no limitar pathspecs a dispersar entradas solamente" -#: builtin/checkout.c:1176 +#: builtin/checkout.c:1141 msgid "second guess 'git checkout <no-such-branch>'" msgstr "segunda opción 'git checkout <no-hay-tal-rama>'" -#: builtin/checkout.c:1178 +#: builtin/checkout.c:1143 msgid "do not check if another worktree is holding the given ref" msgstr "no revise si otro árbol de trabajo contiene la ref entregada" -#: builtin/checkout.c:1182 builtin/clone.c:81 builtin/fetch.c:136 -#: builtin/merge.c:235 builtin/pull.c:120 builtin/push.c:544 +#: builtin/checkout.c:1147 builtin/clone.c:81 builtin/fetch.c:137 +#: builtin/merge.c:235 builtin/pull.c:123 builtin/push.c:556 #: builtin/send-pack.c:173 msgid "force progress reporting" msgstr "forzar el reporte de progreso" -#: builtin/checkout.c:1212 +#: builtin/checkout.c:1177 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B y --orphan son mutuamente exclusivas" -#: builtin/checkout.c:1229 +#: builtin/checkout.c:1194 msgid "--track needs a branch name" msgstr "--track necesita el nombre de una rama" -#: builtin/checkout.c:1234 +#: builtin/checkout.c:1199 msgid "Missing branch name; try -b" msgstr "Falta nombre de rama; prueba -b" -#: builtin/checkout.c:1270 +#: builtin/checkout.c:1235 msgid "invalid path specification" -msgstr "Especificacion de ruta invalida" +msgstr "Especificación de ruta invalida" -#: builtin/checkout.c:1277 +#: builtin/checkout.c:1242 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "'%s' no es un commit y una rama '%s' no puede ser creada desde este" -#: builtin/checkout.c:1281 +#: builtin/checkout.c:1246 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach no toma un argumento de ruta '%s'" -#: builtin/checkout.c:1285 +#: builtin/checkout.c:1250 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -6508,7 +6553,7 @@ msgstr "Se saltara repositorio %s\n" msgid "failed to remove %s" msgstr "fallo al borrar %s" -#: builtin/clean.c:301 git-add--interactive.perl:572 +#: builtin/clean.c:302 git-add--interactive.perl:572 #, c-format msgid "" "Prompt help:\n" @@ -6516,12 +6561,12 @@ msgid "" "foo - select item based on unique prefix\n" " - (empty) select nothing\n" msgstr "" -"Ayuda rapida:\n" +"Ayuda rápida:\n" "1 - selecciona un objeto por numero\n" -"foo - selecciona un objeto basado en un prefijo unico\n" -" - (vacio) no elegir nada\n" +"foo - selecciona un objeto basado en un prefijo único\n" +" - (vacío) no elegir nada\n" -#: builtin/clean.c:305 git-add--interactive.perl:581 +#: builtin/clean.c:306 git-add--interactive.perl:581 #, c-format msgid "" "Prompt help:\n" @@ -6533,47 +6578,47 @@ msgid "" "* - choose all items\n" " - (empty) finish selecting\n" msgstr "" -"Ayuda rapida:\n" -"1 - selecciona un objeto unico\n" -"3-5 - selecciona un rango de objtos\n" -"2-3,6-9 - selecciona multiples rangos\n" -"foo - selecciona un objeto basado en un prefijo unico\n" -"-... - deseleccionar objetos especificados\n" +"Ayuda rápida:\n" +"1 - selecciona un objeto único\n" +"3-5 - selecciona un rango de objetos\n" +"2-3,6-9 - selecciona múltiples rangos\n" +"foo - selecciona un objeto basado en un prefijo único\n" +"-... - de-seleccionar objetos especificados\n" "* - escoger todos los objetos\n" -" - (vacio) terminar seleccion\n" +" - (vacío) terminar selección\n" -#: builtin/clean.c:521 git-add--interactive.perl:547 +#: builtin/clean.c:522 git-add--interactive.perl:547 #: git-add--interactive.perl:552 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Ahh (%s)?\n" -#: builtin/clean.c:663 +#: builtin/clean.c:664 #, c-format msgid "Input ignore patterns>> " msgstr "Input ignora los patrones >> " -#: builtin/clean.c:700 +#: builtin/clean.c:701 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "PELIGRO: No se puede encontrar objetos que concuerden con: %s" -#: builtin/clean.c:721 +#: builtin/clean.c:722 msgid "Select items to delete" msgstr "Seleccionar objetos para borrar" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:762 +#: builtin/clean.c:763 #, c-format msgid "Remove %s [y/N]? " msgstr "Borrar %s [y/N]? " -#: builtin/clean.c:787 git-add--interactive.perl:1616 +#: builtin/clean.c:788 git-add--interactive.perl:1616 #, c-format msgid "Bye.\n" -msgstr "Bye.\n" +msgstr "Adiós.\n" -#: builtin/clean.c:795 +#: builtin/clean.c:796 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -6584,70 +6629,71 @@ msgid "" "? - help for prompt selection" msgstr "" "clean - comenzar la limpieza\n" -"filtrar por patron - excluye objetos del borrado \n" -"elegir por numeros - selecciona objetos a ser borrados por numero\n" +"filtrar por patrón - excluye objetos del borrado \n" +"elegir por números - selecciona objetos a ser borrados por numero\n" "preguntar cada uno - confirmar cada borrado (como \"rm -i\")\n" "quit - parar limpieza\n" "help - esta ventana\n" -"? - ayuda para seleccion de opciones" +"? - ayuda para selección de opciones" -#: builtin/clean.c:822 git-add--interactive.perl:1692 +#: builtin/clean.c:823 git-add--interactive.perl:1692 msgid "*** Commands ***" msgstr "*** Comandos ***" -#: builtin/clean.c:823 git-add--interactive.perl:1689 +#: builtin/clean.c:824 git-add--interactive.perl:1689 msgid "What now" msgstr "Ahora que" -#: builtin/clean.c:831 +#: builtin/clean.c:832 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" -msgstr[0] "Se removera el siguiente objeto" -msgstr[1] "Se removeran los siguientes objetos:" +msgstr[0] "Se removerá el siguiente objeto" +msgstr[1] "Se removerán los siguientes objetos:" -#: builtin/clean.c:847 +#: builtin/clean.c:848 msgid "No more files to clean, exiting." msgstr "No hay mas archivos para limpiar, saliendo." -#: builtin/clean.c:909 +#: builtin/clean.c:910 msgid "do not print names of files removed" msgstr "no imprimir nombres de archivos borrados" -#: builtin/clean.c:911 +#: builtin/clean.c:912 msgid "force" msgstr "forzar" -#: builtin/clean.c:912 +#: builtin/clean.c:913 msgid "interactive cleaning" msgstr "limpieza interactiva" -#: builtin/clean.c:914 +#: builtin/clean.c:915 msgid "remove whole directories" msgstr "borrar directorios completos" -#: builtin/clean.c:915 builtin/describe.c:463 builtin/describe.c:465 -#: builtin/grep.c:861 builtin/ls-files.c:544 builtin/name-rev.c:397 -#: builtin/name-rev.c:399 builtin/show-ref.c:176 +#: builtin/clean.c:916 builtin/describe.c:530 builtin/describe.c:532 +#: builtin/grep.c:863 builtin/log.c:155 builtin/log.c:157 +#: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399 +#: builtin/show-ref.c:176 msgid "pattern" msgstr "patron" -#: builtin/clean.c:916 +#: builtin/clean.c:917 msgid "add <pattern> to ignore rules" -msgstr "agregar <patron> para ignorar reglas" +msgstr "agregar <patrón> para ignorar reglas" -#: builtin/clean.c:917 +#: builtin/clean.c:918 msgid "remove ignored files, too" msgstr "borrar archivos ignorados, tambien" -#: builtin/clean.c:919 +#: builtin/clean.c:920 msgid "remove only ignored files" msgstr "borrar solo archivos ignorados" -#: builtin/clean.c:937 +#: builtin/clean.c:938 msgid "-x and -X cannot be used together" msgstr "-x y -X no pueden ser usadas juntas" -#: builtin/clean.c:941 +#: builtin/clean.c:942 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -6655,7 +6701,7 @@ msgstr "" "clean.requireForce configurado como true y ninguno -i, -n, ni -f entregados; " "rehusando el clean" -#: builtin/clean.c:944 +#: builtin/clean.c:945 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -6677,7 +6723,7 @@ msgstr "crear un repositorio vacio" #: builtin/clone.c:88 msgid "create a mirror repository (implies bare)" -msgstr "crear un repositorio espejo (implica vacio)" +msgstr "crear un repositorio espejo (implica vacío)" #: builtin/clone.c:90 msgid "to clone from a local repository" @@ -6709,16 +6755,16 @@ msgstr "directorio-template" #: builtin/clone.c:105 builtin/init-db.c:477 msgid "directory from which templates will be used" -msgstr "directorio del cual los templates seran usados" +msgstr "directorio del cual los templates serán usados" -#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:635 -#: builtin/submodule--helper.c:1002 +#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:873 +#: builtin/submodule--helper.c:1240 msgid "reference repository" msgstr "repositorio de referencia" #: builtin/clone.c:111 msgid "use --reference only while cloning" -msgstr "usa--reference sólo al clonar" +msgstr "usa--reference solamente si estas clonado" #: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44 msgid "name" @@ -6736,8 +6782,8 @@ msgstr "checkout <rama> en lugar de HEAD remota" msgid "path to git-upload-pack on the remote" msgstr "ruta para git-upload-pack en el remoto" -#: builtin/clone.c:118 builtin/fetch.c:137 builtin/grep.c:804 -#: builtin/pull.c:205 +#: builtin/clone.c:118 builtin/fetch.c:138 builtin/grep.c:806 +#: builtin/pull.c:211 msgid "depth" msgstr "profundidad" @@ -6745,7 +6791,7 @@ msgstr "profundidad" msgid "create a shallow clone of that depth" msgstr "crear un clon superficial para esa profundidad" -#: builtin/clone.c:120 builtin/fetch.c:139 builtin/pack-objects.c:2938 +#: builtin/clone.c:120 builtin/fetch.c:140 builtin/pack-objects.c:2991 #: parse-options.h:142 msgid "time" msgstr "tiempo" @@ -6754,11 +6800,11 @@ msgstr "tiempo" msgid "create a shallow clone since a specific time" msgstr "crear un clon superficial desde el tiempo específico" -#: builtin/clone.c:122 builtin/fetch.c:141 +#: builtin/clone.c:122 builtin/fetch.c:142 msgid "revision" msgstr "revision" -#: builtin/clone.c:123 builtin/fetch.c:142 +#: builtin/clone.c:123 builtin/fetch.c:143 msgid "deepen history of shallow clone, excluding rev" msgstr "ahondando historia de clon superficial, excluyendo rev" @@ -6790,11 +6836,13 @@ msgstr "llave=valor" msgid "set config inside the new repository" msgstr "configurar config dentro del nuevo repositorio" -#: builtin/clone.c:134 builtin/fetch.c:159 builtin/push.c:555 +#: builtin/clone.c:134 builtin/fetch.c:160 builtin/pull.c:224 +#: builtin/push.c:567 msgid "use IPv4 addresses only" msgstr "solo usar direcciones IPv4" -#: builtin/clone.c:136 builtin/fetch.c:161 builtin/push.c:557 +#: builtin/clone.c:136 builtin/fetch.c:162 builtin/pull.c:227 +#: builtin/push.c:569 msgid "use IPv6 addresses only" msgstr "solo usar direcciones IPv6" @@ -6836,12 +6884,12 @@ msgstr "fallo al crear link '%s'" msgid "failed to copy file to '%s'" msgstr "fallo al copiar archivo a '%s'" -#: builtin/clone.c:471 +#: builtin/clone.c:472 #, c-format msgid "done.\n" msgstr "hecho.\n" -#: builtin/clone.c:483 +#: builtin/clone.c:484 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -6851,32 +6899,32 @@ msgstr "" "Puede inspeccionar a qué se hizo checkout con 'git status'\n" "y volver a intentarlo con 'git checkout -f HEAD'\n" -#: builtin/clone.c:560 +#: builtin/clone.c:561 #, c-format msgid "Could not find remote branch %s to clone." msgstr "No se pudo encontrar la rama remota %s para clonar" -#: builtin/clone.c:655 +#: builtin/clone.c:656 msgid "remote did not send all necessary objects" msgstr "remoto no mando todos los objetos necsarios" -#: builtin/clone.c:671 +#: builtin/clone.c:672 #, c-format msgid "unable to update %s" msgstr "incapaz de actualizar %s" -#: builtin/clone.c:720 +#: builtin/clone.c:721 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "HEAD remoto refiere a un ref inexistente, no se puede hacer checkout.\n" #: builtin/clone.c:751 msgid "unable to checkout working tree" -msgstr "no es posible realizar checkout en el arbol de trabajo" +msgstr "no es posible realizar checkout en el árbol de trabajo" #: builtin/clone.c:796 msgid "unable to write parameters to config file" -msgstr "no es posible escribir parametors al arhivo config" +msgstr "no es posible escribir parámetros al archivo config" #: builtin/clone.c:859 msgid "cannot repack to clean up" @@ -6886,7 +6934,7 @@ msgstr "no se puede reempaquetar para limpiar" msgid "cannot unlink temporary alternates file" msgstr "no se puede desvincular archivos alternos temporales" -#: builtin/clone.c:894 builtin/receive-pack.c:1944 +#: builtin/clone.c:894 builtin/receive-pack.c:1945 msgid "Too many arguments." msgstr "Muchos argumentos." @@ -6908,7 +6956,7 @@ msgstr "--bare y --separate-git-dir son incompatibles." msgid "repository '%s' does not exist" msgstr "repositorio '%s' no existe" -#: builtin/clone.c:933 builtin/fetch.c:1360 +#: builtin/clone.c:933 builtin/fetch.c:1358 #, c-format msgid "depth %s is not a positive number" msgstr "profundidad %s no es un numero positivo" @@ -6924,7 +6972,7 @@ msgid "working tree '%s' already exists." msgstr "directorio de trabajo '%s' ya existe." #: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270 -#: builtin/worktree.c:240 builtin/worktree.c:270 +#: builtin/worktree.c:253 builtin/worktree.c:283 #, c-format msgid "could not create leading directories of '%s'" msgstr "no se pudo crear directorios principales de '%s'" @@ -6932,7 +6980,7 @@ msgstr "no se pudo crear directorios principales de '%s'" #: builtin/clone.c:971 #, c-format msgid "could not create work tree dir '%s'" -msgstr "no se pudo crear un arbol de trabajo '%s'" +msgstr "no se pudo crear un árbol de trabajo '%s'" #: builtin/clone.c:983 #, c-format @@ -6972,17 +7020,12 @@ msgstr "repositorio fuente es superficial, ignorando --local" msgid "--local is ignored" msgstr "--local es ignorado" -#: builtin/clone.c:1087 -#, c-format -msgid "Don't know how to clone %s" -msgstr "No se sabe como clonar %s" - -#: builtin/clone.c:1142 builtin/clone.c:1150 +#: builtin/clone.c:1139 builtin/clone.c:1147 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Rama remota %s no encontrada en upstream %s" -#: builtin/clone.c:1153 +#: builtin/clone.c:1150 msgid "You appear to have cloned an empty repository." msgstr "Pareces haber clonado un repositorio sin contenido." @@ -7020,11 +7063,11 @@ msgstr "--command debe ser el primer argumento" #: builtin/commit.c:39 msgid "git commit [<options>] [--] <pathspec>..." -msgstr "git commit [<opciones>] [--] <especificacion-de-ruta>..." +msgstr "git commit [<opciones>] [--] <especificación-de-ruta>..." #: builtin/commit.c:44 msgid "git status [<options>] [--] <pathspec>..." -msgstr "git status [<opciones>] [--] <especificacion-de-ruta>..." +msgstr "git status [<opciones>] [--] <especificación-de-ruta>..." #: builtin/commit.c:49 msgid "" @@ -7040,12 +7083,12 @@ msgid "" "\n" " git commit --amend --reset-author\n" msgstr "" -"Tu nombre y correo fueron configurados automaticamente basados\n" +"Tu nombre y correo fueron configurados automáticamente basados\n" "en tu usuario y nombre de host. Por favor verifica que son correctos.\n" -"Tu puedes suprimir este mensaje configurandolos de forma explicita. Ejecuta " +"Tu puedes suprimir este mensaje configurándolos de forma explicita. Ejecuta " "el \n" "siguiente comando y sigue las instrucciones de tu editor\n" -" para modificar tu archivo de configuracion:\n" +" para modificar tu archivo de configuración:\n" "\n" " git config --global --edit\n" "\n" @@ -7066,9 +7109,9 @@ msgid "" "\n" " git commit --amend --reset-author\n" msgstr "" -"Tu nombre y correo fueron configurados automaticamente basados\n" +"Tu nombre y correo fueron configurados automáticamente basados\n" "en tu usuario y nombre de host. Por favor verifica que son correctos.\n" -"Tu puedes suprimir este mensaje configurandolos de forma explicita: \n" +"Tu puedes suprimir este mensaje configurándolos de forma explicita: \n" "\n" " git config --global user.name \"Tu nombre\"\n" " git config --global user.email you@example.com\n" @@ -7095,8 +7138,8 @@ msgid "" " git commit --allow-empty\n" "\n" msgstr "" -"El cherry-pick anterior ahora esta vacio, posiblemente por un conflicto de " -"resolucion.\n" +"El cherry-pick anterior ahora esta vacío, posiblemente por un conflicto de " +"resolución.\n" "Si desea realizar un commit de todas maneras, use:\n" "\n" " git commit --allow-empty\n" @@ -7128,19 +7171,19 @@ msgstr "fallo al desempaquetar objeto del árbol HEAD" #: builtin/commit.c:359 msgid "unable to create temporary index" -msgstr "no es posible crear un indice temporal" +msgstr "no es posible crear un índice temporal" #: builtin/commit.c:365 msgid "interactive add failed" -msgstr "adicion interactiva fallida" +msgstr "adición interactiva fallida" #: builtin/commit.c:378 msgid "unable to update temporary index" -msgstr "no es posible actualizar el indice temporal" +msgstr "no es posible actualizar el índice temporal" #: builtin/commit.c:380 msgid "Failed to update main cache tree" -msgstr "Fallo al actualizar el cache principal del arbol" +msgstr "Fallo al actualizar el cache principal del árbol" #: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478 msgid "unable to write new_index file" @@ -7148,7 +7191,7 @@ msgstr "no es posible escribir archiv new_index" #: builtin/commit.c:461 msgid "cannot do a partial commit during a merge." -msgstr "no se puede realizar un commit parcial durante una fusion." +msgstr "no se puede realizar un commit parcial durante una fusión." #: builtin/commit.c:463 msgid "cannot do a partial commit during a cherry-pick." @@ -7156,11 +7199,11 @@ msgstr "no se puede realizar un commit parcial durante un cherry-pick." #: builtin/commit.c:471 msgid "cannot read the index" -msgstr "no se puede leer el indice." +msgstr "no se puede leer el índice." #: builtin/commit.c:490 msgid "unable to write temporary index file" -msgstr "no es posible escribir el indice temporal " +msgstr "no es posible escribir el índice temporal " #: builtin/commit.c:587 #, c-format @@ -7170,21 +7213,21 @@ msgstr "falta header de autor al commit '%s'" #: builtin/commit.c:589 #, c-format msgid "commit '%s' has malformed author line" -msgstr "el commit '%s' tiene una linea de autor mal formada" +msgstr "el commit '%s' tiene una línea de autor mal formada" #: builtin/commit.c:608 msgid "malformed --author parameter" -msgstr "parametro --author mal formado" +msgstr "malformado - parámetro de autor" #: builtin/commit.c:660 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "" -"no es posible seleccionar un caracter de comentario que no es usado\n" +"no es posible seleccionar un carácter de comentario que no es usado\n" "en el mensaje de commit actual" -#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1100 +#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1114 #, c-format msgid "could not lookup commit %s" msgstr "no se pudo revisar el commit %s" @@ -7213,7 +7256,7 @@ msgstr "no se pudo leer MERGE_MSG" #: builtin/commit.c:801 msgid "could not write commit template" -msgstr "no se pudo escribit el template del commit" +msgstr "no se pudo escribir el template del commit" #: builtin/commit.c:819 #, c-format @@ -7225,7 +7268,7 @@ msgid "" "and try again.\n" msgstr "" "\n" -"Parece que estas haciendo un commit con una fusion dentro.\n" +"Parece que estas haciendo un commit con una fusión dentro.\n" "Si esto no es correcto, por favor remueve el archivo\n" "\t%s\n" "y vuelve a intentar.\n" @@ -7286,130 +7329,139 @@ msgstr "%sCommitter: %.*s <%.*s>" msgid "Cannot read index" msgstr "No se puede leer el índice" -#: builtin/commit.c:958 +#: builtin/commit.c:959 msgid "Error building trees" msgstr "Error al construir los árboles" -#: builtin/commit.c:972 builtin/tag.c:252 +#: builtin/commit.c:973 builtin/tag.c:252 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Por favor suministra el mensaje usando las opciones -m o -F.\n" -#: builtin/commit.c:1075 +#: builtin/commit.c:1076 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' no está en el formato 'Name <email>' y no concuerda con ningún " "autor existente" -#: builtin/commit.c:1090 builtin/commit.c:1335 +#: builtin/commit.c:1090 +#, c-format +msgid "Invalid ignored mode '%s'" +msgstr "Modo ignorado inválido '%s'" + +#: builtin/commit.c:1104 builtin/commit.c:1349 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Modo inválido de los archivos no rastreados '%s'" -#: builtin/commit.c:1128 +#: builtin/commit.c:1142 msgid "--long and -z are incompatible" msgstr "--long y -z son incompatibles" -#: builtin/commit.c:1158 +#: builtin/commit.c:1172 msgid "Using both --reset-author and --author does not make sense" msgstr "Usar ambos --reset-author y --author no tiene sentido" -#: builtin/commit.c:1167 +#: builtin/commit.c:1181 msgid "You have nothing to amend." msgstr "No tienes nada que enmendar." -#: builtin/commit.c:1170 +#: builtin/commit.c:1184 msgid "You are in the middle of a merge -- cannot amend." msgstr "Estás en medio de una fusión -- no puedes enmendar." -#: builtin/commit.c:1172 +#: builtin/commit.c:1186 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Está en medio de un cherry-pick -- no se puede enmendar." -#: builtin/commit.c:1175 +#: builtin/commit.c:1189 msgid "Options --squash and --fixup cannot be used together" msgstr "Opciones --squash y --fixup no pueden ser usadas juntas" -#: builtin/commit.c:1185 +#: builtin/commit.c:1199 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Solo uno de -c/-C/-F/--fixup puede ser usardo." -#: builtin/commit.c:1187 +#: builtin/commit.c:1201 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "La opción -m no puede ser combinada con -c/-C/-F/--fixup." -#: builtin/commit.c:1195 +#: builtin/commit.c:1209 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author sólo puede ser usada con -C, -c o --amend." -#: builtin/commit.c:1212 +#: builtin/commit.c:1226 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Solo uno de --include/--only/--all/--interactive/--patch puede ser usado." -#: builtin/commit.c:1214 +#: builtin/commit.c:1228 msgid "No paths with --include/--only does not make sense." msgstr "No hay rutas con --include/--only no tiene sentido." -#: builtin/commit.c:1226 builtin/tag.c:535 +#: builtin/commit.c:1240 builtin/tag.c:535 #, c-format msgid "Invalid cleanup mode %s" msgstr "Modo cleanup invalido %s" -#: builtin/commit.c:1231 +#: builtin/commit.c:1245 msgid "Paths with -a does not make sense." msgstr "Rutas con -a no tiene sentido." -#: builtin/commit.c:1349 builtin/commit.c:1626 +#: builtin/commit.c:1363 builtin/commit.c:1648 msgid "show status concisely" msgstr "mostrar status de manera concisa" -#: builtin/commit.c:1351 builtin/commit.c:1628 +#: builtin/commit.c:1365 builtin/commit.c:1650 msgid "show branch information" -msgstr "mostrar informacion de la rama" +msgstr "mostrar información de la rama" -#: builtin/commit.c:1353 +#: builtin/commit.c:1367 msgid "show stash information" -msgstr "mostrar informacion del stash" +msgstr "mostrar información del stash" -#: builtin/commit.c:1355 +#: builtin/commit.c:1369 msgid "version" msgstr "version" -#: builtin/commit.c:1355 builtin/commit.c:1630 builtin/push.c:530 -#: builtin/worktree.c:469 +#: builtin/commit.c:1369 builtin/commit.c:1652 builtin/push.c:542 +#: builtin/worktree.c:523 msgid "machine-readable output" msgstr "output formato-maquina" -#: builtin/commit.c:1358 builtin/commit.c:1632 +#: builtin/commit.c:1372 builtin/commit.c:1654 msgid "show status in long format (default)" msgstr "mostrar status en formato largo (default)" -#: builtin/commit.c:1361 builtin/commit.c:1635 +#: builtin/commit.c:1375 builtin/commit.c:1657 msgid "terminate entries with NUL" msgstr "terminar entradas con NUL" -#: builtin/commit.c:1363 builtin/commit.c:1638 builtin/fast-export.c:999 -#: builtin/fast-export.c:1002 builtin/tag.c:390 +#: builtin/commit.c:1377 builtin/commit.c:1381 builtin/commit.c:1660 +#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:390 msgid "mode" msgstr "modo" -#: builtin/commit.c:1364 builtin/commit.c:1638 +#: builtin/commit.c:1378 builtin/commit.c:1660 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "mostrar archivos sin seguimiento, modos opcionales: all, normal, no. " "(Predeterminado: all)" -#: builtin/commit.c:1367 -msgid "show ignored files" -msgstr "mostrar archivos ignorados" +#: builtin/commit.c:1382 +msgid "" +"show ignored files, optional modes: traditional, matching, no. (Default: " +"traditional)" +msgstr "" +"mostrar archivos ignorados, modos opcionales: traditional, matching, no. " +"(Predeterminado: traditional)" -#: builtin/commit.c:1368 parse-options.h:155 +#: builtin/commit.c:1384 parse-options.h:155 msgid "when" msgstr "cuando" -#: builtin/commit.c:1369 +#: builtin/commit.c:1385 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -7417,204 +7469,211 @@ msgstr "" "ignorar cambios en submodulos, opcional cuando: all,dirty,untracked. " "(Default: all)" -#: builtin/commit.c:1371 +#: builtin/commit.c:1387 msgid "list untracked files in columns" msgstr "listar en columnas los archivos sin seguimiento" -#: builtin/commit.c:1449 +#: builtin/commit.c:1406 +msgid "Unsupported combination of ignored and untracked-files arguments" +msgstr "" +"Combinación de argumentos de archivos ignorados y no rastreados no soportada" + +#: builtin/commit.c:1469 msgid "couldn't look up newly created commit" msgstr "no se pudo revisar el commit recién creado" -#: builtin/commit.c:1451 +#: builtin/commit.c:1471 msgid "could not parse newly created commit" msgstr "no se pudo analizar el commit recién creado" -#: builtin/commit.c:1496 +#: builtin/commit.c:1516 +msgid "unable to resolve HEAD after creating commit" +msgstr "No se pudo resolver HEAD tras crear el commit" + +#: builtin/commit.c:1518 msgid "detached HEAD" msgstr "HEAD desacoplado" -#: builtin/commit.c:1499 +#: builtin/commit.c:1521 msgid " (root-commit)" msgstr "(commit-raiz)" -#: builtin/commit.c:1596 +#: builtin/commit.c:1618 msgid "suppress summary after successful commit" msgstr "suprime summary tras un commit exitoso" -#: builtin/commit.c:1597 +#: builtin/commit.c:1619 msgid "show diff in commit message template" msgstr "mostrar diff en el template del mensaje de commit" -#: builtin/commit.c:1599 +#: builtin/commit.c:1621 msgid "Commit message options" -msgstr "Opciones para el mensaje de la confirmación" +msgstr "Opciones para el mensaje del commit" -#: builtin/commit.c:1600 builtin/tag.c:388 +#: builtin/commit.c:1622 builtin/tag.c:388 msgid "read message from file" msgstr "leer mensaje desde un archivo" -#: builtin/commit.c:1601 +#: builtin/commit.c:1623 msgid "author" msgstr "autor" -#: builtin/commit.c:1601 +#: builtin/commit.c:1623 msgid "override author for commit" -msgstr "sobrescribe el autor de la confirmación" +msgstr "sobrescribe el autor del commit" -#: builtin/commit.c:1602 builtin/gc.c:359 +#: builtin/commit.c:1624 builtin/gc.c:359 msgid "date" msgstr "fecha" -#: builtin/commit.c:1602 +#: builtin/commit.c:1624 msgid "override date for commit" -msgstr "sobrescribe la fecha de la confirmación" +msgstr "sobrescribe la fecha del commit" -#: builtin/commit.c:1603 builtin/merge.c:225 builtin/notes.c:402 +#: builtin/commit.c:1625 builtin/merge.c:225 builtin/notes.c:402 #: builtin/notes.c:565 builtin/tag.c:386 msgid "message" msgstr "mensaje" -#: builtin/commit.c:1603 +#: builtin/commit.c:1625 msgid "commit message" -msgstr "mensaje de la confirmación" +msgstr "mensaje del commit" -#: builtin/commit.c:1604 builtin/commit.c:1605 builtin/commit.c:1606 -#: builtin/commit.c:1607 parse-options.h:257 ref-filter.h:92 +#: builtin/commit.c:1626 builtin/commit.c:1627 builtin/commit.c:1628 +#: builtin/commit.c:1629 parse-options.h:257 ref-filter.h:92 msgid "commit" msgstr "confirmar" -#: builtin/commit.c:1604 +#: builtin/commit.c:1626 msgid "reuse and edit message from specified commit" msgstr "reusar y editar el mensaje de un commit especifico" -#: builtin/commit.c:1605 +#: builtin/commit.c:1627 msgid "reuse message from specified commit" msgstr "reusar el mensaje de un commit especifico" -#: builtin/commit.c:1606 +#: builtin/commit.c:1628 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "usar mensaje de formato autosquash para arreglar el commit especificado" -#: builtin/commit.c:1607 +#: builtin/commit.c:1629 msgid "use autosquash formatted message to squash specified commit" msgstr "" "usar el mensaje de formato autosquash para realizar squash al commit " "especificado" -#: builtin/commit.c:1608 +#: builtin/commit.c:1630 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "el autor del commit soy yo ahora (usado con -C/-c/--amend)" -#: builtin/commit.c:1609 builtin/log.c:1436 builtin/merge.c:239 -#: builtin/revert.c:105 +#: builtin/commit.c:1631 builtin/log.c:1443 builtin/merge.c:239 +#: builtin/pull.c:149 builtin/revert.c:105 msgid "add Signed-off-by:" msgstr "agregar Signed-off-by: (firmado por)" -#: builtin/commit.c:1610 +#: builtin/commit.c:1632 msgid "use specified template file" -msgstr "usar archivo template especificado" +msgstr "usar archivo de template especificado" -#: builtin/commit.c:1611 +#: builtin/commit.c:1633 msgid "force edit of commit" -msgstr "forzar la edición de la confirmación" +msgstr "forzar la edición del commit" -#: builtin/commit.c:1612 +#: builtin/commit.c:1634 msgid "default" msgstr "default" -#: builtin/commit.c:1612 builtin/tag.c:391 +#: builtin/commit.c:1634 builtin/tag.c:391 msgid "how to strip spaces and #comments from message" msgstr "cómo quitar espacios y #comentarios de mensajes" -#: builtin/commit.c:1613 +#: builtin/commit.c:1635 msgid "include status in commit message template" msgstr "incluir status en el template del mensaje de commit" -#: builtin/commit.c:1615 builtin/merge.c:237 builtin/pull.c:173 +#: builtin/commit.c:1637 builtin/merge.c:237 builtin/pull.c:179 #: builtin/revert.c:113 msgid "GPG sign commit" -msgstr "firmar confirmación con GPG" +msgstr "firmar commit con GPG" -#: builtin/commit.c:1618 +#: builtin/commit.c:1640 msgid "Commit contents options" -msgstr "Opciones para el contenido de la confirmación" +msgstr "Opciones para el contenido del commit" -#: builtin/commit.c:1619 +#: builtin/commit.c:1641 msgid "commit all changed files" msgstr "confirmar todos los archivos cambiados" -#: builtin/commit.c:1620 +#: builtin/commit.c:1642 msgid "add specified files to index for commit" msgstr "agregar archivos específicos al índice para confirmar" -#: builtin/commit.c:1621 +#: builtin/commit.c:1643 msgid "interactively add files" msgstr "agregar archivos interactivamente" -#: builtin/commit.c:1622 +#: builtin/commit.c:1644 msgid "interactively add changes" msgstr "agregar cambios interactivamente" -#: builtin/commit.c:1623 +#: builtin/commit.c:1645 msgid "commit only specified files" msgstr "sólo confirmar archivos específicos" -#: builtin/commit.c:1624 +#: builtin/commit.c:1646 msgid "bypass pre-commit and commit-msg hooks" -msgstr "" -"evitar los capturadores (hooks) de pre-confirmación (pre-commit) y mensaje " -"de confirmación (commit-msg)" +msgstr "evitar los capturadores (hooks) de pre-commit y commit-msg" -#: builtin/commit.c:1625 +#: builtin/commit.c:1647 msgid "show what would be committed" -msgstr "mostrar lo que sería confirmado" +msgstr "mostrar lo que sería incluído en el commit" -#: builtin/commit.c:1636 +#: builtin/commit.c:1658 msgid "amend previous commit" -msgstr "enmendar confirmación previa" +msgstr "enmendar commit previo" -#: builtin/commit.c:1637 +#: builtin/commit.c:1659 msgid "bypass post-rewrite hook" msgstr "gancho bypass post reescritura" -#: builtin/commit.c:1642 +#: builtin/commit.c:1664 msgid "ok to record an empty change" msgstr "ok al grabar un cambio vacio" -#: builtin/commit.c:1644 +#: builtin/commit.c:1666 msgid "ok to record a change with an empty message" msgstr "ok al grabar un cambio con un mensaje vacio" -#: builtin/commit.c:1674 +#: builtin/commit.c:1696 msgid "could not parse HEAD commit" msgstr "no se pudo analizar el commit de HEAD" -#: builtin/commit.c:1719 +#: builtin/commit.c:1741 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Archivo MERGE_HEAD (%s) corrupto" -#: builtin/commit.c:1726 +#: builtin/commit.c:1748 msgid "could not read MERGE_MODE" msgstr "no se pudo leer MERGE_MODE" -#: builtin/commit.c:1745 +#: builtin/commit.c:1767 #, c-format msgid "could not read commit message: %s" msgstr "no se pudo leer el mensaje de commit: %s" -#: builtin/commit.c:1756 +#: builtin/commit.c:1778 #, c-format msgid "Aborting commit due to empty commit message.\n" -msgstr "Abortando confirmación debido que el mensaje está en blanco.\n" +msgstr "Abortando commit debido que el mensaje está en blanco.\n" -#: builtin/commit.c:1761 +#: builtin/commit.c:1783 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Abortando commit; no se ha editado el mensaje\n" -#: builtin/commit.c:1809 +#: builtin/commit.c:1831 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -7628,140 +7687,144 @@ msgstr "" msgid "git config [<options>]" msgstr "git config [<opciones>]" -#: builtin/config.c:57 +#: builtin/config.c:58 msgid "Config file location" -msgstr "ubicacion del archivo config" +msgstr "ubicación del archivo config" -#: builtin/config.c:58 +#: builtin/config.c:59 msgid "use global config file" msgstr "usar archivo de config global" -#: builtin/config.c:59 +#: builtin/config.c:60 msgid "use system config file" msgstr "usar archivo de config del sistema" -#: builtin/config.c:60 +#: builtin/config.c:61 msgid "use repository config file" msgstr "usar archivo de config del repositorio" -#: builtin/config.c:61 +#: builtin/config.c:62 msgid "use given config file" msgstr "usar archivo config especificado" -#: builtin/config.c:62 +#: builtin/config.c:63 msgid "blob-id" msgstr "blob-id" -#: builtin/config.c:62 +#: builtin/config.c:63 msgid "read config from given blob object" msgstr "leer config del objeto blob suministrado" -#: builtin/config.c:63 +#: builtin/config.c:64 msgid "Action" -msgstr "Accion" +msgstr "Acción" -#: builtin/config.c:64 +#: builtin/config.c:65 msgid "get value: name [value-regex]" msgstr "obtener valor: nombre [valor-regex]" -#: builtin/config.c:65 +#: builtin/config.c:66 msgid "get all values: key [value-regex]" msgstr "obtener todos los valores: llave [valores-regex]" -#: builtin/config.c:66 +#: builtin/config.c:67 msgid "get values for regexp: name-regex [value-regex]" msgstr "obtener valores para una regexp: nombre-regex [valor-regex]" -#: builtin/config.c:67 +#: builtin/config.c:68 msgid "get value specific for the URL: section[.var] URL" -msgstr "obtener valor especifico para el URL: seccion[.var] URL" +msgstr "obtener valor especifico para el URL: sección[.var] URL" -#: builtin/config.c:68 +#: builtin/config.c:69 msgid "replace all matching variables: name value [value_regex]" msgstr "" "remplazar todas las variables que concuerden: nombre valor [valor_regex]" -#: builtin/config.c:69 +#: builtin/config.c:70 msgid "add a new variable: name value" msgstr "agregar nueva variable: nombre valor " -#: builtin/config.c:70 +#: builtin/config.c:71 msgid "remove a variable: name [value-regex]" msgstr "borrar una variable. nombre [valor-regex]" -#: builtin/config.c:71 +#: builtin/config.c:72 msgid "remove all matches: name [value-regex]" msgstr "borrar todas las concurrencias: nombre [valor-regex]" -#: builtin/config.c:72 +#: builtin/config.c:73 msgid "rename section: old-name new-name" -msgstr "renombrar seccion: nombre-viejo nombre-nuevo" +msgstr "renombrar sección: nombre-viejo nombre-nuevo" -#: builtin/config.c:73 +#: builtin/config.c:74 msgid "remove a section: name" -msgstr "borrar una seccion: nombre" +msgstr "borrar una sección: nombre" -#: builtin/config.c:74 +#: builtin/config.c:75 msgid "list all" msgstr "listar todo" -#: builtin/config.c:75 +#: builtin/config.c:76 msgid "open an editor" msgstr "abrir el editor" -#: builtin/config.c:76 +#: builtin/config.c:77 msgid "find the color configured: slot [default]" msgstr "encontrar el color configurado: slot [default]" -#: builtin/config.c:77 +#: builtin/config.c:78 msgid "find the color setting: slot [stdout-is-tty]" msgstr "encontrar las opciones del color: slot [stdout-es-tty]" -#: builtin/config.c:78 +#: builtin/config.c:79 msgid "Type" msgstr "Tipo" -#: builtin/config.c:79 +#: builtin/config.c:80 msgid "value is \"true\" or \"false\"" msgstr "valor es \"true\" o \"false\"" -#: builtin/config.c:80 +#: builtin/config.c:81 msgid "value is decimal number" msgstr "valor es un numero decimal" -#: builtin/config.c:81 +#: builtin/config.c:82 msgid "value is --bool or --int" msgstr "valor es --bool o --int" -#: builtin/config.c:82 +#: builtin/config.c:83 msgid "value is a path (file or directory name)" msgstr "valor es una ruta (archivo o nombre de directorio)" -#: builtin/config.c:83 +#: builtin/config.c:84 +msgid "value is an expiry date" +msgstr "valor es una fecha de expiración" + +#: builtin/config.c:85 msgid "Other" msgstr "Otro" -#: builtin/config.c:84 +#: builtin/config.c:86 msgid "terminate values with NUL byte" msgstr "Terminar valores con un byte NUL" -#: builtin/config.c:85 +#: builtin/config.c:87 msgid "show variable names only" msgstr "mostrar solo nombres de variables" -#: builtin/config.c:86 +#: builtin/config.c:88 msgid "respect include directives on lookup" msgstr "respetar directivas include en la busqueda" -#: builtin/config.c:87 +#: builtin/config.c:89 msgid "show origin of config (file, standard input, blob, command line)" -msgstr "mostrar el origen de configuracion (archivo, stdin, blob, comando)" +msgstr "mostrar el origen de configuración (archivo, stdin, blob, comando)" -#: builtin/config.c:327 +#: builtin/config.c:335 msgid "unable to parse default color value" msgstr "no es posible analizar el valor default de color " -#: builtin/config.c:471 +#: builtin/config.c:479 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -7776,16 +7839,16 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:499 +#: builtin/config.c:507 msgid "--local can only be used inside a git repository" msgstr "--local solo puedo ser usado dentro de un repositorio" -#: builtin/config.c:624 +#: builtin/config.c:632 #, c-format msgid "cannot create configuration file %s" msgstr "no se puede crear el archivo de configuración %s" -#: builtin/config.c:637 +#: builtin/config.c:645 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -7802,67 +7865,57 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "mostrar tamaños en formato legible para humano" -#: builtin/describe.c:19 +#: builtin/describe.c:22 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<opciones>] [<commit-ish>...]" -#: builtin/describe.c:20 +#: builtin/describe.c:23 msgid "git describe [<options>] --dirty" msgstr "git describe [<opciones>] --dirty" -#: builtin/describe.c:54 +#: builtin/describe.c:57 msgid "head" msgstr "head" -#: builtin/describe.c:54 +#: builtin/describe.c:57 msgid "lightweight" msgstr "ligero" -#: builtin/describe.c:54 +#: builtin/describe.c:57 msgid "annotated" msgstr "anotado" -#: builtin/describe.c:264 +#: builtin/describe.c:267 #, c-format msgid "annotated tag %s not available" msgstr "tag anotado %s no disponible" -#: builtin/describe.c:268 +#: builtin/describe.c:271 #, c-format msgid "annotated tag %s has no embedded name" msgstr "tag anotado %s no tiene nombre embebido " -#: builtin/describe.c:270 +#: builtin/describe.c:273 #, c-format msgid "tag '%s' is really '%s' here" msgstr "tag '%s' es realmente '%s' aquí" -#: builtin/describe.c:297 builtin/log.c:493 -#, c-format -msgid "Not a valid object name %s" -msgstr "Nombre de objeto %s no válido" - -#: builtin/describe.c:300 -#, c-format -msgid "%s is not a valid '%s' object" -msgstr "%s no es un objeto '%s' válido" - -#: builtin/describe.c:317 +#: builtin/describe.c:314 #, c-format msgid "no tag exactly matches '%s'" msgstr "no hay tag que concuerde exactamente con '%s'" -#: builtin/describe.c:319 +#: builtin/describe.c:316 #, c-format -msgid "searching to describe %s\n" -msgstr "buscanado para describir %s\n" +msgid "No exact match on refs or tags, searching to describe\n" +msgstr "No hay coincidencia exacta en refs o tags, buscando en describe\n" -#: builtin/describe.c:366 +#: builtin/describe.c:363 #, c-format msgid "finished search at %s\n" -msgstr "busqueda finalizada a las %s\n" +msgstr "búsqueda finalizada a las %s\n" -#: builtin/describe.c:393 +#: builtin/describe.c:389 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -7871,7 +7924,7 @@ msgstr "" "No hay tags anotados que puedan describir '%s'.\n" "Sin embargo, hubieron tags no anotados: intente --tags." -#: builtin/describe.c:397 +#: builtin/describe.c:393 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -7880,12 +7933,12 @@ msgstr "" "Ningún tag puede describit '%s'.\n" "Intente --always, o cree algunos tags." -#: builtin/describe.c:427 +#: builtin/describe.c:423 #, c-format msgid "traversed %lu commits\n" msgstr "%lu commits cruzados\n" -#: builtin/describe.c:430 +#: builtin/describe.c:426 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -7894,75 +7947,90 @@ msgstr "" "se encontró más de %i tags; se mostró %i más reciente\n" "fin de la búsqueda en %s\n" -#: builtin/describe.c:452 +#: builtin/describe.c:494 +#, c-format +msgid "describe %s\n" +msgstr "describe %s\n" + +#: builtin/describe.c:497 builtin/log.c:500 +#, c-format +msgid "Not a valid object name %s" +msgstr "Nombre de objeto %s no válido" + +#: builtin/describe.c:505 +#, c-format +msgid "%s is neither a commit nor blob" +msgstr "%s no es un commit ni un blob" + +#: builtin/describe.c:519 msgid "find the tag that comes after the commit" msgstr "encontrar el tag que viene después del commit" -#: builtin/describe.c:453 +#: builtin/describe.c:520 msgid "debug search strategy on stderr" msgstr "hacer debug a la estrategia de búsqueda en stderr" -#: builtin/describe.c:454 +#: builtin/describe.c:521 msgid "use any ref" msgstr "use cualquier ref" -#: builtin/describe.c:455 +#: builtin/describe.c:522 msgid "use any tag, even unannotated" msgstr "use cualquier tag, incluso los no anotados" -#: builtin/describe.c:456 +#: builtin/describe.c:523 msgid "always use long format" msgstr "siempre usar formato largo" -#: builtin/describe.c:457 +#: builtin/describe.c:524 msgid "only follow first parent" msgstr "solo seguir el primer patrón" -#: builtin/describe.c:460 +#: builtin/describe.c:527 msgid "only output exact matches" msgstr "solo mostrar concordancias exactas" -#: builtin/describe.c:462 +#: builtin/describe.c:529 msgid "consider <n> most recent tags (default: 10)" msgstr "considerar <n> tags más recientes (default:10)" -#: builtin/describe.c:464 +#: builtin/describe.c:531 msgid "only consider tags matching <pattern>" msgstr "solo considerar tags que concuerden con <patrón>" -#: builtin/describe.c:466 +#: builtin/describe.c:533 msgid "do not consider tags matching <pattern>" msgstr "no considerar tags que concuerden con <patrón>" -#: builtin/describe.c:468 builtin/name-rev.c:406 +#: builtin/describe.c:535 builtin/name-rev.c:406 msgid "show abbreviated commit object as fallback" msgstr "mostrar el objeto commit abreviado como fallback" -#: builtin/describe.c:469 builtin/describe.c:472 +#: builtin/describe.c:536 builtin/describe.c:539 msgid "mark" msgstr "marca" -#: builtin/describe.c:470 +#: builtin/describe.c:537 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "adjuntar <marca> en el árbol de trabajo sucio (default: \"-dirty\")" -#: builtin/describe.c:473 +#: builtin/describe.c:540 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "adjuntar <marca> en un árbol de trbajo roto (default: \"-broken\")" -#: builtin/describe.c:491 +#: builtin/describe.c:558 msgid "--long is incompatible with --abbrev=0" msgstr "--long es incompatible con --abbrev=0" -#: builtin/describe.c:520 +#: builtin/describe.c:587 msgid "No names found, cannot describe anything." msgstr "No se encontraron nombres, no se puede describir nada." -#: builtin/describe.c:563 +#: builtin/describe.c:637 msgid "--dirty is incompatible with commit-ishes" -msgstr "--dirty es imcompatible con commit-ismos" +msgstr "--dirty es incompatible con commit-ismos" -#: builtin/describe.c:565 +#: builtin/describe.c:639 msgid "--broken is incompatible with commit-ishes" msgstr "--broken es incompatible con commit-ismos" @@ -7971,26 +8039,26 @@ msgstr "--broken es incompatible con commit-ismos" msgid "'%s': not a regular file or symlink" msgstr "'%s': no es un archivo regular o un enlace simbólico" -#: builtin/diff.c:235 +#: builtin/diff.c:234 #, c-format msgid "invalid option: %s" msgstr "opción inválida: %s" -#: builtin/diff.c:357 +#: builtin/diff.c:356 msgid "Not a git repository" msgstr "No es un repositorio git" -#: builtin/diff.c:400 +#: builtin/diff.c:399 #, c-format msgid "invalid object '%s' given." msgstr "objeto '%s' entregado no es válido" -#: builtin/diff.c:409 +#: builtin/diff.c:408 #, c-format msgid "more than two blobs given: '%s'" msgstr "más de dos blobs entregados: '%s'" -#: builtin/diff.c:414 +#: builtin/diff.c:413 #, c-format msgid "unhandled object '%s' given." msgstr "objeto no manejado '%s' entregado." @@ -8027,54 +8095,54 @@ msgstr "" "formatos combinados de diff ('-c' y '--cc') no soportados en\n" "modo diff para directorio('-d' y '--dir-diff')." -#: builtin/difftool.c:633 +#: builtin/difftool.c:632 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "ambos archivos modificados: '%s' y '%s'." -#: builtin/difftool.c:635 +#: builtin/difftool.c:634 msgid "working tree file has been left." msgstr "archivo del árbol de trabajo ha sido dejado." -#: builtin/difftool.c:646 +#: builtin/difftool.c:645 #, c-format msgid "temporary files exist in '%s'." msgstr "archivo temporal existe en '%s'." -#: builtin/difftool.c:647 +#: builtin/difftool.c:646 msgid "you may want to cleanup or recover these." msgstr "tal vez desee limpiar o recuperar estos." -#: builtin/difftool.c:696 +#: builtin/difftool.c:695 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "use `diff.guitool` en lugar de `diff.tool`" -#: builtin/difftool.c:698 +#: builtin/difftool.c:697 msgid "perform a full-directory diff" msgstr "realizar un diff de todo el directorio" -#: builtin/difftool.c:700 +#: builtin/difftool.c:699 msgid "do not prompt before launching a diff tool" msgstr "no mostrar antes de lanzar una herramienta de diff" -#: builtin/difftool.c:706 +#: builtin/difftool.c:705 msgid "use symlinks in dir-diff mode" -msgstr "usar symlinks en modo dir-diff" +msgstr "usar enlaces simbólicos en modo dir-diff" -#: builtin/difftool.c:707 +#: builtin/difftool.c:706 msgid "<tool>" msgstr "<herramienta>" -#: builtin/difftool.c:708 +#: builtin/difftool.c:707 msgid "use the specified diff tool" msgstr "usar la herramienta de diff especificada" -#: builtin/difftool.c:710 +#: builtin/difftool.c:709 msgid "print a list of diff tools that may be used with `--tool`" msgstr "" "mostrar una lista de herramientas de diff que pueden ser usadas con `--tool`" -#: builtin/difftool.c:713 +#: builtin/difftool.c:712 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -8082,19 +8150,19 @@ msgstr "" "hacer que 'git-difftool' salga cuando una herramienta de diff retorne un " "código de salida distinto de cero" -#: builtin/difftool.c:715 +#: builtin/difftool.c:714 msgid "<command>" msgstr "<comando>" -#: builtin/difftool.c:716 +#: builtin/difftool.c:715 msgid "specify a custom command for viewing diffs" msgstr "especificar un comando personalizado para ver diffs" -#: builtin/difftool.c:740 +#: builtin/difftool.c:739 msgid "no <tool> given for --tool=<tool>" -msgstr "no se ha entragado <herramienta> para --tool=<herramienta>" +msgstr "no se ha proporcionado <herramienta> para --tool=<herramienta>" -#: builtin/difftool.c:747 +#: builtin/difftool.c:746 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "no se ha entregado <comando> para --extcmd=<comando>" @@ -8150,95 +8218,95 @@ msgstr "Aplicar refspec para los refs exportados" msgid "anonymize output" msgstr "anonimizar la salida" -#: builtin/fetch.c:23 +#: builtin/fetch.c:24 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<opciones>] [<repositorio> [<refspec>...]]" -#: builtin/fetch.c:24 +#: builtin/fetch.c:25 msgid "git fetch [<options>] <group>" msgstr "git fetch [<opciones>] <grupo>" -#: builtin/fetch.c:25 +#: builtin/fetch.c:26 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<opciones>] [(<repositorio> | <grupo>)...]" -#: builtin/fetch.c:26 +#: builtin/fetch.c:27 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<opciones>]" -#: builtin/fetch.c:112 builtin/pull.c:182 +#: builtin/fetch.c:113 builtin/pull.c:188 msgid "fetch from all remotes" msgstr "extraer de todos los remotos" -#: builtin/fetch.c:114 builtin/pull.c:185 +#: builtin/fetch.c:115 builtin/pull.c:191 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "adjuntar a .git/FETCH_HEAD en lugar de sobrescribir" -#: builtin/fetch.c:116 builtin/pull.c:188 +#: builtin/fetch.c:117 builtin/pull.c:194 msgid "path to upload pack on remote end" msgstr "ruta para cargar el paquete al final del remoto" -#: builtin/fetch.c:117 builtin/pull.c:190 +#: builtin/fetch.c:118 builtin/pull.c:196 msgid "force overwrite of local branch" msgstr "forzar sobrescritura de la rama local" -#: builtin/fetch.c:119 +#: builtin/fetch.c:120 msgid "fetch from multiple remotes" msgstr "extraer de múltiples remotos" -#: builtin/fetch.c:121 builtin/pull.c:192 +#: builtin/fetch.c:122 builtin/pull.c:198 msgid "fetch all tags and associated objects" msgstr "extraer todos los tags y objetos asociados" -#: builtin/fetch.c:123 +#: builtin/fetch.c:124 msgid "do not fetch all tags (--no-tags)" msgstr "no extraer todos los tags (--no-tags)" -#: builtin/fetch.c:125 +#: builtin/fetch.c:126 msgid "number of submodules fetched in parallel" msgstr "número de submódulos extraídos en paralelo" -#: builtin/fetch.c:127 builtin/pull.c:195 +#: builtin/fetch.c:128 builtin/pull.c:201 msgid "prune remote-tracking branches no longer on remote" msgstr "Limpiar ramas remotas rastreadas que ya no están en el remoto" -#: builtin/fetch.c:128 builtin/fetch.c:151 builtin/pull.c:123 +#: builtin/fetch.c:129 builtin/fetch.c:152 builtin/pull.c:126 msgid "on-demand" msgstr "en demanda" -#: builtin/fetch.c:129 +#: builtin/fetch.c:130 msgid "control recursive fetching of submodules" msgstr "controlar extracción recursiva de submódulos" -#: builtin/fetch.c:133 builtin/pull.c:203 +#: builtin/fetch.c:134 builtin/pull.c:209 msgid "keep downloaded pack" msgstr "mantener el paquete descargado" -#: builtin/fetch.c:135 +#: builtin/fetch.c:136 msgid "allow updating of HEAD ref" msgstr "permitir actualizar la ref HEAD" -#: builtin/fetch.c:138 builtin/fetch.c:144 builtin/pull.c:206 +#: builtin/fetch.c:139 builtin/fetch.c:145 builtin/pull.c:212 msgid "deepen history of shallow clone" msgstr "historia profunda de un clon superficial" -#: builtin/fetch.c:140 +#: builtin/fetch.c:141 msgid "deepen history of shallow repository based on time" msgstr "historia profunda de un repositorio superficial basado en tiempo" -#: builtin/fetch.c:146 builtin/pull.c:209 +#: builtin/fetch.c:147 builtin/pull.c:215 msgid "convert to a complete repository" msgstr "convertir a un repositorio completo" -#: builtin/fetch.c:148 builtin/log.c:1456 +#: builtin/fetch.c:149 builtin/log.c:1463 msgid "dir" msgstr "dir" -#: builtin/fetch.c:149 +#: builtin/fetch.c:150 msgid "prepend this to submodule path output" msgstr "anteponer esto a salida de la ruta del submódulo " -#: builtin/fetch.c:152 +#: builtin/fetch.c:153 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -8246,89 +8314,89 @@ msgstr "" "default para extracción recursiva de submódulos (menor prioridad que " "archivos de configuración)" -#: builtin/fetch.c:156 builtin/pull.c:212 +#: builtin/fetch.c:157 builtin/pull.c:218 msgid "accept refs that update .git/shallow" msgstr "aceptar refs que actualicen .git/shallow" -#: builtin/fetch.c:157 builtin/pull.c:214 +#: builtin/fetch.c:158 builtin/pull.c:220 msgid "refmap" msgstr "refmap" -#: builtin/fetch.c:158 builtin/pull.c:215 +#: builtin/fetch.c:159 builtin/pull.c:221 msgid "specify fetch refmap" msgstr "especificar extracción de refmap" -#: builtin/fetch.c:416 +#: builtin/fetch.c:417 msgid "Couldn't find remote ref HEAD" msgstr "No se puedo encontrar ref remota HEAD" -#: builtin/fetch.c:534 +#: builtin/fetch.c:535 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "la configuración fetch.output contiene el valor inválido %s" -#: builtin/fetch.c:627 +#: builtin/fetch.c:628 #, c-format msgid "object %s not found" msgstr "objeto %s no encontrado" -#: builtin/fetch.c:631 +#: builtin/fetch.c:632 msgid "[up to date]" msgstr "[actualizado]" -#: builtin/fetch.c:644 builtin/fetch.c:724 +#: builtin/fetch.c:645 builtin/fetch.c:725 msgid "[rejected]" msgstr "[rechazado]" -#: builtin/fetch.c:645 +#: builtin/fetch.c:646 msgid "can't fetch in current branch" msgstr "no se puede traer en la rama actual" -#: builtin/fetch.c:654 +#: builtin/fetch.c:655 msgid "[tag update]" -msgstr "[actualización de etiqueta]" +msgstr "[actualización de tag]" -#: builtin/fetch.c:655 builtin/fetch.c:688 builtin/fetch.c:704 -#: builtin/fetch.c:719 +#: builtin/fetch.c:656 builtin/fetch.c:689 builtin/fetch.c:705 +#: builtin/fetch.c:720 msgid "unable to update local ref" msgstr "no se posible actualizar el ref local" -#: builtin/fetch.c:674 +#: builtin/fetch.c:675 msgid "[new tag]" -msgstr "[nueva etiqueta]" +msgstr "[nuevo tag]" -#: builtin/fetch.c:677 +#: builtin/fetch.c:678 msgid "[new branch]" msgstr "[nueva rama]" -#: builtin/fetch.c:680 +#: builtin/fetch.c:681 msgid "[new ref]" msgstr "[nueva referencia]" -#: builtin/fetch.c:719 +#: builtin/fetch.c:720 msgid "forced update" msgstr "actualización forzada" -#: builtin/fetch.c:724 +#: builtin/fetch.c:725 msgid "non-fast-forward" msgstr "avance lento" -#: builtin/fetch.c:769 +#: builtin/fetch.c:770 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s no envió todos los objetos necesarios\n" -#: builtin/fetch.c:789 +#: builtin/fetch.c:790 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "rechazado %s porque raíces superficiales no pueden ser actualizadas" -#: builtin/fetch.c:877 builtin/fetch.c:973 +#: builtin/fetch.c:878 builtin/fetch.c:974 #, c-format msgid "From %.*s\n" msgstr "Desde %.*s\n" -#: builtin/fetch.c:888 +#: builtin/fetch.c:889 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -8337,55 +8405,50 @@ msgstr "" "algunos refs locales no pudieron ser actualizados; intente ejecutar\n" " 'git remote prune %s' para remover cualquier rama vieja o conflictiva" -#: builtin/fetch.c:943 +#: builtin/fetch.c:944 #, c-format msgid " (%s will become dangling)" msgstr " (%s se pondrá colgado)" -#: builtin/fetch.c:944 +#: builtin/fetch.c:945 #, c-format msgid " (%s has become dangling)" msgstr " (%s se ha colgado)" -#: builtin/fetch.c:976 +#: builtin/fetch.c:977 msgid "[deleted]" msgstr "[eliminado]" -#: builtin/fetch.c:977 builtin/remote.c:1024 +#: builtin/fetch.c:978 builtin/remote.c:1024 msgid "(none)" msgstr "(nada)" -#: builtin/fetch.c:1000 +#: builtin/fetch.c:1001 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Rehusando extraer en la rama actual %s de un repositorio no vacío" -#: builtin/fetch.c:1019 +#: builtin/fetch.c:1020 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Opción \"%s\" valor \"%s\" no es válido para %s" -#: builtin/fetch.c:1022 +#: builtin/fetch.c:1023 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Opción \"%s\" es ignorada por %s\n" -#: builtin/fetch.c:1098 -#, c-format -msgid "Don't know how to fetch from %s" -msgstr "No se sabe como extraer de %s" - -#: builtin/fetch.c:1258 +#: builtin/fetch.c:1256 #, c-format msgid "Fetching %s\n" msgstr "Extrayendo %s\n" -#: builtin/fetch.c:1260 builtin/remote.c:97 +#: builtin/fetch.c:1258 builtin/remote.c:97 #, c-format msgid "Could not fetch %s" msgstr "No se pudo extraer %s" -#: builtin/fetch.c:1278 +#: builtin/fetch.c:1276 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -8393,40 +8456,40 @@ msgstr "" "No hay repositorio remoto especificado. Por favor, especifique un URL o un\n" "nombre remoto del cual las nuevas revisiones deben ser extraídas." -#: builtin/fetch.c:1301 +#: builtin/fetch.c:1299 msgid "You need to specify a tag name." msgstr "Tiene que especificar un nombre de tag." -#: builtin/fetch.c:1344 +#: builtin/fetch.c:1342 msgid "Negative depth in --deepen is not supported" -msgstr "Profundidad negativa en --deepen no es soportada" +msgstr "Profundidad negativa en --deepen no soportada" -#: builtin/fetch.c:1346 +#: builtin/fetch.c:1344 msgid "--deepen and --depth are mutually exclusive" msgstr "--depen y --depth son mutuamente exclusivas" -#: builtin/fetch.c:1351 +#: builtin/fetch.c:1349 msgid "--depth and --unshallow cannot be used together" msgstr "--depth y --unshallow no pueden ser usadas juntas" -#: builtin/fetch.c:1353 +#: builtin/fetch.c:1351 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow no tiene sentido en un repositorio completo" -#: builtin/fetch.c:1366 +#: builtin/fetch.c:1364 msgid "fetch --all does not take a repository argument" msgstr "fetch --all no toma un argumento de repositorio" -#: builtin/fetch.c:1368 +#: builtin/fetch.c:1366 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all no tiene sentido con refspecs" -#: builtin/fetch.c:1379 +#: builtin/fetch.c:1377 #, c-format msgid "No such remote or remote group: %s" msgstr "No existe el remoto o grupo remoto: %s" -#: builtin/fetch.c:1387 +#: builtin/fetch.c:1385 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Extraer un grupo y especificar un refspecs no tiene sentido" @@ -8436,23 +8499,23 @@ msgid "" msgstr "" "git fmt-merge-msg [-m <mensaje>] [--log[=<n>] | --no-log] [--file <archivo>]" -#: builtin/fmt-merge-msg.c:665 +#: builtin/fmt-merge-msg.c:666 msgid "populate log with at most <n> entries from shortlog" msgstr "poblar el log con máximo <n> entradas del shorlog" -#: builtin/fmt-merge-msg.c:668 +#: builtin/fmt-merge-msg.c:669 msgid "alias for --log (deprecated)" msgstr "alias para --log (deprecado)" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:672 msgid "text" msgstr "texto" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:673 msgid "use <text> as start of message" msgstr "use <text> como comienzo de mensaje" -#: builtin/fmt-merge-msg.c:673 +#: builtin/fmt-merge-msg.c:674 msgid "file to read from" msgstr "archivo del cual leer" @@ -8599,7 +8662,7 @@ msgid "" "\n" "%s" msgstr "" -"El último gc reportó lo siguiente. Por favor corriga la causa\n" +"El último gc reportó lo siguiente. Por favor corrige la causa\n" "y remueva %s.\n" "Limpieza automática no se realizará hasta que el archivo sea removido.\n" "\n" @@ -8676,245 +8739,245 @@ msgstr "número inválido de hilos especificado (%d) para %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1693 +#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1688 #, c-format msgid "no threads support, ignoring %s" msgstr "no hay soporte para hilos, ignorando %s" -#: builtin/grep.c:451 builtin/grep.c:571 builtin/grep.c:613 +#: builtin/grep.c:453 builtin/grep.c:573 builtin/grep.c:615 #, c-format msgid "unable to read tree (%s)" msgstr "no es posible leer el árbol (%s)" -#: builtin/grep.c:628 +#: builtin/grep.c:630 #, c-format msgid "unable to grep from object of type %s" msgstr "no es posible realizar grep del objeto de tipo %s" -#: builtin/grep.c:694 +#: builtin/grep.c:696 #, c-format msgid "switch `%c' expects a numerical value" msgstr "switch `%c' espera un valor numérico" -#: builtin/grep.c:781 +#: builtin/grep.c:783 msgid "search in index instead of in the work tree" msgstr "buscar en el índice en lugar del árbol de trabajo" -#: builtin/grep.c:783 +#: builtin/grep.c:785 msgid "find in contents not managed by git" msgstr "encontrar en contenidos no manejados por git" -#: builtin/grep.c:785 +#: builtin/grep.c:787 msgid "search in both tracked and untracked files" msgstr "buscar en archivos rastreados y no rastreados" -#: builtin/grep.c:787 +#: builtin/grep.c:789 msgid "ignore files specified via '.gitignore'" -msgstr "ingnorar archivos especificados via '.gitignore'" +msgstr "ignorar archivos especificados via '.gitignore'" -#: builtin/grep.c:789 +#: builtin/grep.c:791 msgid "recursively search in each submodule" msgstr "búsqueda recursiva en cada submódulo" -#: builtin/grep.c:792 +#: builtin/grep.c:794 msgid "show non-matching lines" msgstr "mostrar líneas que no concuerdan" -#: builtin/grep.c:794 +#: builtin/grep.c:796 msgid "case insensitive matching" msgstr "búsqueda insensible a mayúsculas" -#: builtin/grep.c:796 +#: builtin/grep.c:798 msgid "match patterns only at word boundaries" msgstr "concordar patrón solo a los límites de las palabras" -#: builtin/grep.c:798 +#: builtin/grep.c:800 msgid "process binary files as text" msgstr "procesar archivos binarios como texto" -#: builtin/grep.c:800 +#: builtin/grep.c:802 msgid "don't match patterns in binary files" msgstr "no concordar patrones en archivos binarios" -#: builtin/grep.c:803 +#: builtin/grep.c:805 msgid "process binary files with textconv filters" msgstr "procesar archivos binarios con filtros textconv " -#: builtin/grep.c:805 +#: builtin/grep.c:807 msgid "descend at most <depth> levels" msgstr "descender como máximo <valor-de-profundiad> niveles" -#: builtin/grep.c:809 +#: builtin/grep.c:811 msgid "use extended POSIX regular expressions" msgstr "usar expresiones regulares POSIX extendidas" -#: builtin/grep.c:812 +#: builtin/grep.c:814 msgid "use basic POSIX regular expressions (default)" msgstr "usar expresiones regulares POSIX (default)" -#: builtin/grep.c:815 +#: builtin/grep.c:817 msgid "interpret patterns as fixed strings" msgstr "interpretar patrones como strings arreglados" -#: builtin/grep.c:818 +#: builtin/grep.c:820 msgid "use Perl-compatible regular expressions" msgstr "usar expresiones regulares compatibles con Perl" -#: builtin/grep.c:821 +#: builtin/grep.c:823 msgid "show line numbers" msgstr "mostrar números de línea" -#: builtin/grep.c:822 +#: builtin/grep.c:824 msgid "don't show filenames" msgstr "no mostrar nombres de archivo" -#: builtin/grep.c:823 +#: builtin/grep.c:825 msgid "show filenames" msgstr "mostrar nombres de archivo" -#: builtin/grep.c:825 +#: builtin/grep.c:827 msgid "show filenames relative to top directory" msgstr "mostrar nombres de archivo relativos al directorio superior" -#: builtin/grep.c:827 +#: builtin/grep.c:829 msgid "show only filenames instead of matching lines" msgstr "mostrar solo nombres de archivos en lugar de líneas encontradas" -#: builtin/grep.c:829 +#: builtin/grep.c:831 msgid "synonym for --files-with-matches" msgstr "sinónimo para --files-with-matches" -#: builtin/grep.c:832 +#: builtin/grep.c:834 msgid "show only the names of files without match" msgstr "mostrar solo los nombres de archivos sin coincidencias" -#: builtin/grep.c:834 +#: builtin/grep.c:836 msgid "print NUL after filenames" msgstr "imprimir NUL después del nombre de archivo" -#: builtin/grep.c:836 +#: builtin/grep.c:838 msgid "show the number of matches instead of matching lines" msgstr "Mostrar el número de concordancias en lugar de las líneas concordantes" -#: builtin/grep.c:837 +#: builtin/grep.c:839 msgid "highlight matches" msgstr "resaltar concordancias" -#: builtin/grep.c:839 +#: builtin/grep.c:841 msgid "print empty line between matches from different files" -msgstr "emprimir una línea vacía entre concordancias de diferentes archivos" +msgstr "imprimir una línea vacía entre coincidencias de diferentes archivos" -#: builtin/grep.c:841 +#: builtin/grep.c:843 msgid "show filename only once above matches from same file" msgstr "" "mostrar el nombre de archivo solo una vez para concordancias en el mismo " "archivo" -#: builtin/grep.c:844 +#: builtin/grep.c:846 msgid "show <n> context lines before and after matches" msgstr "mostrar <n> líneas de contexto antes y después de la concordancia" -#: builtin/grep.c:847 +#: builtin/grep.c:849 msgid "show <n> context lines before matches" msgstr "mostrar <n> líneas de contexto antes de las concordancias" -#: builtin/grep.c:849 +#: builtin/grep.c:851 msgid "show <n> context lines after matches" msgstr "mostrar <n> líneas de context después de las concordancias" -#: builtin/grep.c:851 +#: builtin/grep.c:853 msgid "use <n> worker threads" msgstr "usar <n> hilos de trabajo" -#: builtin/grep.c:852 +#: builtin/grep.c:854 msgid "shortcut for -C NUM" msgstr "atajo para -C NUM" -#: builtin/grep.c:855 +#: builtin/grep.c:857 msgid "show a line with the function name before matches" msgstr "" "mostrar una línea con el nombre de la función antes de las concordancias" -#: builtin/grep.c:857 +#: builtin/grep.c:859 msgid "show the surrounding function" msgstr "mostrar la función circundante" -#: builtin/grep.c:860 +#: builtin/grep.c:862 msgid "read patterns from file" msgstr "leer patrones del archivo" -#: builtin/grep.c:862 +#: builtin/grep.c:864 msgid "match <pattern>" msgstr "concordar <patrón>" -#: builtin/grep.c:864 +#: builtin/grep.c:866 msgid "combine patterns specified with -e" msgstr "combinar patrones especificados con -e" -#: builtin/grep.c:876 +#: builtin/grep.c:878 msgid "indicate hit with exit status without output" msgstr "indicar concordancia con exit status sin output" -#: builtin/grep.c:878 +#: builtin/grep.c:880 msgid "show only matches from files that match all patterns" msgstr "" "mostrar solo concordancias con archivos que concuerdan todos los patrones" -#: builtin/grep.c:880 +#: builtin/grep.c:882 msgid "show parse tree for grep expression" msgstr "mostrar árbol analizado para la expresión grep" -#: builtin/grep.c:884 +#: builtin/grep.c:886 msgid "pager" msgstr "paginador" -#: builtin/grep.c:884 +#: builtin/grep.c:886 msgid "show matching files in the pager" msgstr "mostrar archivos concordantes en el paginador" -#: builtin/grep.c:887 +#: builtin/grep.c:889 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permitir el llamado de grep(1) (ignorado por esta build)" -#: builtin/grep.c:950 +#: builtin/grep.c:952 msgid "no pattern given." msgstr "no se ha entregado patrón" -#: builtin/grep.c:982 +#: builtin/grep.c:984 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index o --untracked no se puede usar con revs" -#: builtin/grep.c:989 +#: builtin/grep.c:991 #, c-format msgid "unable to resolve revision: %s" msgstr "no se posible resolver revisión: %s" -#: builtin/grep.c:1023 builtin/index-pack.c:1491 +#: builtin/grep.c:1026 builtin/index-pack.c:1491 #, c-format msgid "invalid number of threads specified (%d)" msgstr "número inválido de hilos especificado (%d)" -#: builtin/grep.c:1028 +#: builtin/grep.c:1031 msgid "no threads support, ignoring --threads" msgstr "no se soportan hilos, ignorando --threads" -#: builtin/grep.c:1052 +#: builtin/grep.c:1055 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager solo funciona en el árbol de trabajo" -#: builtin/grep.c:1075 +#: builtin/grep.c:1078 msgid "option not supported with --recurse-submodules." msgstr "opción no soportada con --recurse-submodules." -#: builtin/grep.c:1081 +#: builtin/grep.c:1084 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached o --untracked no pueden ser usadas con --no-index." -#: builtin/grep.c:1087 +#: builtin/grep.c:1090 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard no puede ser usada para contenido rastreado." -#: builtin/grep.c:1095 +#: builtin/grep.c:1098 msgid "both --cached and trees are given." msgstr "--cached y árboles han sido entregados." @@ -9000,12 +9063,12 @@ msgstr "Fallo al iniciar emacsclient." #: builtin/help.c:107 msgid "Failed to parse emacsclient version." -msgstr "Fallo al analizar la version de emacsclient." +msgstr "Fallo al analizar la versión de emacsclient." #: builtin/help.c:115 #, c-format msgid "emacsclient version '%d' too old (< 22)." -msgstr "la version '%d' de emacsclient es muy antigua (<22)." +msgstr "la versión '%d' de emacsclient es muy antigua (<22)." #: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173 #, c-format @@ -9037,15 +9100,15 @@ msgstr "'%s': visualizador de man desconocido" #: builtin/help.c:357 msgid "no man viewer handled the request" -msgstr "ningun visualizador de manual proceso la peticion" +msgstr "ningun visualizador de manual proceso la petición" #: builtin/help.c:365 msgid "no info viewer handled the request" -msgstr "ningun visualizador de info manejo la peticion" +msgstr "ningún vizor de info manejo la peticion" #: builtin/help.c:407 msgid "Defining attributes per path" -msgstr "Defininiendo atributos por ruta" +msgstr "Definiendo atributos por ruta" #: builtin/help.c:408 msgid "Everyday Git With 20 Commands Or So" @@ -9069,15 +9132,15 @@ msgstr "Especificando revisiones y rangos para Git" #: builtin/help.c:413 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" -msgstr "Un tutorial de introduccion para Git ( para versiones 1.5.1 o mayores)" +msgstr "Un tutorial de introducción para Git ( para versiones 1.5.1 o mayores)" #: builtin/help.c:414 msgid "An overview of recommended workflows with Git" -msgstr "Un repaso de flujos de trabajo recomendadoes con Git" +msgstr "Una visión general de flujos de trabajo recomendados con Git" #: builtin/help.c:426 msgid "The common Git guides are:\n" -msgstr "Las guias communes de Git son:\n" +msgstr "Las guías comunes de Git son:\n" #: builtin/help.c:444 #, c-format @@ -9130,7 +9193,7 @@ msgstr "se usaron más bytes de los disponibles" #: builtin/index-pack.c:301 msgid "pack too large for current definition of off_t" -msgstr "paquete muy grande para la difinición actual de off_t" +msgstr "paquete muy grande para la definición actual de off_t" #: builtin/index-pack.c:304 builtin/unpack-objects.c:93 msgid "pack exceeds maximum allowed size" @@ -9197,10 +9260,10 @@ msgstr "inconsistencia seria en inflate" #: builtin/index-pack.c:817 builtin/index-pack.c:826 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" -msgstr "COLLISIÓN SHA1 ENCONTRADA CON %s !" +msgstr "COLISIÓN DE TIPO SHA1 ENCONTRADA CON %s !" -#: builtin/index-pack.c:752 builtin/pack-objects.c:168 -#: builtin/pack-objects.c:262 +#: builtin/index-pack.c:752 builtin/pack-objects.c:179 +#: builtin/pack-objects.c:273 #, c-format msgid "unable to read %s" msgstr "no se posible leer %s" @@ -9360,21 +9423,21 @@ msgstr[1] "largo de cadena = %d: %lu objetos" msgid "packfile name '%s' does not end with '.pack'" msgstr "nombre '%s' de archivo de paquete no termina con '.pack'" -#: builtin/index-pack.c:1705 builtin/index-pack.c:1708 -#: builtin/index-pack.c:1724 builtin/index-pack.c:1728 +#: builtin/index-pack.c:1700 builtin/index-pack.c:1703 +#: builtin/index-pack.c:1719 builtin/index-pack.c:1723 #, c-format msgid "bad %s" msgstr "mal %s" -#: builtin/index-pack.c:1744 +#: builtin/index-pack.c:1739 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin no puede ser usada sin --stdin" -#: builtin/index-pack.c:1746 +#: builtin/index-pack.c:1741 msgid "--stdin requires a git repository" msgstr "--stdin requiere un repositorio git" -#: builtin/index-pack.c:1754 +#: builtin/index-pack.c:1749 msgid "--verify with no packfile name given" msgstr "--verify no recibió ningún nombre de archivo de paquete" @@ -9572,99 +9635,107 @@ msgstr "git show [<opciones>] <objeto>..." msgid "invalid --decorate option: %s" msgstr "opción --decorate inválida: %s" -#: builtin/log.c:148 +#: builtin/log.c:151 msgid "suppress diff output" msgstr "suprimir salida de diff" -#: builtin/log.c:149 +#: builtin/log.c:152 msgid "show source" msgstr "mostrar fuente" -#: builtin/log.c:150 +#: builtin/log.c:153 msgid "Use mail map file" msgstr "usar archivo de mapa de mail" -#: builtin/log.c:151 +#: builtin/log.c:155 +msgid "only decorate refs that match <pattern>" +msgstr "solo decorar refs que concuerden con <patrón>" + +#: builtin/log.c:157 +msgid "do not decorate refs that match <pattern>" +msgstr "no decorar refs que concuerden con <patrón>" + +#: builtin/log.c:158 msgid "decorate options" msgstr "opciones de decorado" -#: builtin/log.c:154 +#: builtin/log.c:161 msgid "Process line range n,m in file, counting from 1" msgstr "Procesar rango de líneas n,m en archivo, contando desde 1" -#: builtin/log.c:250 +#: builtin/log.c:257 #, c-format msgid "Final output: %d %s\n" msgstr "Salida final: %d %s\n" -#: builtin/log.c:501 +#: builtin/log.c:508 #, c-format msgid "git show %s: bad file" msgstr "git show %s: mal archivo" -#: builtin/log.c:516 builtin/log.c:610 +#: builtin/log.c:523 builtin/log.c:617 #, c-format msgid "Could not read object %s" msgstr "No se pudo leer objeto %s" -#: builtin/log.c:634 +#: builtin/log.c:641 #, c-format msgid "Unknown type: %d" msgstr "Tipo desconocido: %d" -#: builtin/log.c:755 +#: builtin/log.c:762 msgid "format.headers without value" msgstr "formate.headers. sin valor" -#: builtin/log.c:856 +#: builtin/log.c:863 msgid "name of output directory is too long" msgstr "nombre del directorio de salida es muy largo" -#: builtin/log.c:872 +#: builtin/log.c:879 #, c-format msgid "Cannot open patch file %s" msgstr "No se puede abrir archivo patch %s" -#: builtin/log.c:889 +#: builtin/log.c:896 msgid "Need exactly one range." msgstr "Exactamente un rango necesario." -#: builtin/log.c:899 +#: builtin/log.c:906 msgid "Not a range." msgstr "No es un rango." -#: builtin/log.c:1005 +#: builtin/log.c:1012 msgid "Cover letter needs email format" msgstr "Letras de portada necesita formato email" -#: builtin/log.c:1085 +#: builtin/log.c:1092 #, c-format msgid "insane in-reply-to: %s" msgstr "insano in-reply-to: %s" -#: builtin/log.c:1112 +#: builtin/log.c:1119 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<opciones>] [<desde> | <rango-de-revisiones>]" -#: builtin/log.c:1162 +#: builtin/log.c:1169 msgid "Two output directories?" msgstr "dos directorios de salida?" -#: builtin/log.c:1269 builtin/log.c:1920 builtin/log.c:1922 builtin/log.c:1934 +#: builtin/log.c:1276 builtin/log.c:1927 builtin/log.c:1929 builtin/log.c:1941 #, c-format msgid "Unknown commit %s" msgstr "Commit desconocido %s" -#: builtin/log.c:1279 builtin/notes.c:887 builtin/tag.c:516 +#: builtin/log.c:1286 builtin/notes.c:887 builtin/tag.c:516 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Falló al resolver '%s' como una ref válida." -#: builtin/log.c:1284 +#: builtin/log.c:1291 msgid "Could not find exact merge base." msgstr "No se pudo encontrar una base de fusión." -#: builtin/log.c:1288 +#: builtin/log.c:1295 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" @@ -9676,229 +9747,230 @@ msgstr "" "O puede especificar un commit base mediante --base=<id-commit-base> " "manualmente." -#: builtin/log.c:1308 +#: builtin/log.c:1315 msgid "Failed to find exact merge base" msgstr "Fallo al encontrar una base de fusión exacta" -#: builtin/log.c:1319 +#: builtin/log.c:1326 msgid "base commit should be the ancestor of revision list" msgstr "el commit base debe ser el ancestro de la lista de revisión" -#: builtin/log.c:1323 +#: builtin/log.c:1330 msgid "base commit shouldn't be in revision list" msgstr "el commit base no debe estar en la lista de revisión" -#: builtin/log.c:1372 +#: builtin/log.c:1379 msgid "cannot get patch id" msgstr "no se puede obtener id de patch" -#: builtin/log.c:1431 +#: builtin/log.c:1438 msgid "use [PATCH n/m] even with a single patch" msgstr "use [PATCH n/m] incluso con un único parche" -#: builtin/log.c:1434 +#: builtin/log.c:1441 msgid "use [PATCH] even with multiple patches" msgstr "use [PATCH] incluso con múltiples parches" -#: builtin/log.c:1438 +#: builtin/log.c:1445 msgid "print patches to standard out" msgstr "mostrar parches en standard out" -#: builtin/log.c:1440 +#: builtin/log.c:1447 msgid "generate a cover letter" msgstr "generar letra de cover" -#: builtin/log.c:1442 +#: builtin/log.c:1449 msgid "use simple number sequence for output file names" msgstr "" "usar una secuencia simple de números para salida de nombres de archivos" -#: builtin/log.c:1443 +#: builtin/log.c:1450 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1444 +#: builtin/log.c:1451 msgid "use <sfx> instead of '.patch'" msgstr "use <sfx> en lugar de '.patch'" -#: builtin/log.c:1446 +#: builtin/log.c:1453 msgid "start numbering patches at <n> instead of 1" msgstr "comenzar a numerar los parches desde <n> en lugar de 1" -#: builtin/log.c:1448 +#: builtin/log.c:1455 msgid "mark the series as Nth re-roll" msgstr "marcar las series como Nth re-roll" -#: builtin/log.c:1450 +#: builtin/log.c:1457 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Use [RFC PATCH] en lugar de [PATCH]" -#: builtin/log.c:1453 +#: builtin/log.c:1460 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Use [<prefijo>] en lugar de [PATCH]" -#: builtin/log.c:1456 +#: builtin/log.c:1463 msgid "store resulting files in <dir>" msgstr "guardar archivos resultantes en <dir>" -#: builtin/log.c:1459 +#: builtin/log.c:1466 msgid "don't strip/add [PATCH]" msgstr "no cortar/agregar [PATCH]" -#: builtin/log.c:1462 +#: builtin/log.c:1469 msgid "don't output binary diffs" msgstr "no mostrar diffs binarios" -#: builtin/log.c:1464 +#: builtin/log.c:1471 msgid "output all-zero hash in From header" msgstr "salida como hash de todos-ceros en la cabecera From " -#: builtin/log.c:1466 +#: builtin/log.c:1473 msgid "don't include a patch matching a commit upstream" msgstr "no incluya un parche que coincida con un commit en upstream" -#: builtin/log.c:1468 +#: builtin/log.c:1475 msgid "show patch format instead of default (patch + stat)" msgstr "mostrar formato de parche en lugar del default (parche + stat)" -#: builtin/log.c:1470 +#: builtin/log.c:1477 msgid "Messaging" msgstr "Mensajeando" -#: builtin/log.c:1471 +#: builtin/log.c:1478 msgid "header" msgstr "cabezal" -#: builtin/log.c:1472 +#: builtin/log.c:1479 msgid "add email header" msgstr "agregar cabecera email" -#: builtin/log.c:1473 builtin/log.c:1475 +#: builtin/log.c:1480 builtin/log.c:1482 msgid "email" msgstr "email" -#: builtin/log.c:1473 +#: builtin/log.c:1480 msgid "add To: header" msgstr "agregar cabecera To:" -#: builtin/log.c:1475 +#: builtin/log.c:1482 msgid "add Cc: header" msgstr "agregar cabecera Cc:" -#: builtin/log.c:1477 +#: builtin/log.c:1484 msgid "ident" msgstr "ident" -#: builtin/log.c:1478 +#: builtin/log.c:1485 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "configurar dirección From a <ident> ( o identidad de committer si está " "ausente)" -#: builtin/log.c:1480 +#: builtin/log.c:1487 msgid "message-id" msgstr "id de mensaje" -#: builtin/log.c:1481 +#: builtin/log.c:1488 msgid "make first mail a reply to <message-id>" msgstr "hacer primer mail una respuesta a <id de mensaje>" -#: builtin/log.c:1482 builtin/log.c:1485 +#: builtin/log.c:1489 builtin/log.c:1492 msgid "boundary" msgstr "límite" -#: builtin/log.c:1483 +#: builtin/log.c:1490 msgid "attach the patch" msgstr "adjuntar el parche" -#: builtin/log.c:1486 +#: builtin/log.c:1493 msgid "inline the patch" msgstr "poner el parche en línea" -#: builtin/log.c:1490 +#: builtin/log.c:1497 msgid "enable message threading, styles: shallow, deep" msgstr "habilitar hilos de mensajes, estilos: superficial, profundo" -#: builtin/log.c:1492 +#: builtin/log.c:1499 msgid "signature" msgstr "firma" -#: builtin/log.c:1493 +#: builtin/log.c:1500 msgid "add a signature" msgstr "agregar una firma" -#: builtin/log.c:1494 +#: builtin/log.c:1501 msgid "base-commit" msgstr "commit-base" -#: builtin/log.c:1495 +#: builtin/log.c:1502 msgid "add prerequisite tree info to the patch series" -msgstr "agregar pre requisito información de árbol a la serie de parches" +msgstr "" +"agregar información de árbol de requisitos previos a la serie de parches" -#: builtin/log.c:1497 +#: builtin/log.c:1504 msgid "add a signature from a file" msgstr "agregar una firma de un archivo" -#: builtin/log.c:1498 +#: builtin/log.c:1505 msgid "don't print the patch filenames" msgstr "no mostrar los nombres de archivos de los parches" -#: builtin/log.c:1500 +#: builtin/log.c:1507 msgid "show progress while generating patches" msgstr "mostrar medidor de progreso mientras se generan los parches" -#: builtin/log.c:1575 +#: builtin/log.c:1582 #, c-format msgid "invalid ident line: %s" -msgstr "línea de ident inválida: %s" +msgstr "línea de identificación inválida: %s" -#: builtin/log.c:1590 +#: builtin/log.c:1597 msgid "-n and -k are mutually exclusive." msgstr "-n y -k son mutuamente exclusivas." -#: builtin/log.c:1592 +#: builtin/log.c:1599 msgid "--subject-prefix/--rfc and -k are mutually exclusive." msgstr "--subject-prefix/--rfc y -k son mutuamente exclusivos." -#: builtin/log.c:1600 +#: builtin/log.c:1607 msgid "--name-only does not make sense" msgstr "--name-only no tiene sentido" -#: builtin/log.c:1602 +#: builtin/log.c:1609 msgid "--name-status does not make sense" msgstr "--name-status no tiene sentido" -#: builtin/log.c:1604 +#: builtin/log.c:1611 msgid "--check does not make sense" msgstr "--check no tiene sentido" -#: builtin/log.c:1634 +#: builtin/log.c:1641 msgid "standard output, or directory, which one?" msgstr "salida standard, o directorio, cual? " -#: builtin/log.c:1636 +#: builtin/log.c:1643 #, c-format msgid "Could not create directory '%s'" msgstr "No se pudo crear el directorio '%s'" -#: builtin/log.c:1729 +#: builtin/log.c:1736 #, c-format msgid "unable to read signature file '%s'" msgstr "no se puede leer la firma del archivo '%s'" -#: builtin/log.c:1761 +#: builtin/log.c:1768 msgid "Generating patches" msgstr "Generando parches" -#: builtin/log.c:1805 +#: builtin/log.c:1812 msgid "Failed to create output files" msgstr "Falló al crear los archivos de salida" -#: builtin/log.c:1855 +#: builtin/log.c:1862 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<upstream> [<head> [<límite>]]]" -#: builtin/log.c:1909 +#: builtin/log.c:1916 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -9906,107 +9978,111 @@ msgstr "" "No se pudo encontrar una rama remota rastreada, por favor especifique " "<upstream> manualmente.\n" -#: builtin/ls-files.c:466 +#: builtin/ls-files.c:468 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<opciones>] [<archivo>...]" -#: builtin/ls-files.c:515 +#: builtin/ls-files.c:517 msgid "identify the file status with tags" msgstr "identifique el estado del archivo con tags" -#: builtin/ls-files.c:517 +#: builtin/ls-files.c:519 msgid "use lowercase letters for 'assume unchanged' files" msgstr "usar letras minúsculas para archivos 'asumidos sin cambios'" -#: builtin/ls-files.c:519 +#: builtin/ls-files.c:521 +msgid "use lowercase letters for 'fsmonitor clean' files" +msgstr "usar letras minúsculas para archivos de 'fsmonitor clean'" + +#: builtin/ls-files.c:523 msgid "show cached files in the output (default)" msgstr "mostrar archivos en caché en la salida (default)" -#: builtin/ls-files.c:521 +#: builtin/ls-files.c:525 msgid "show deleted files in the output" msgstr "mostrar archivos borrados en la salida" -#: builtin/ls-files.c:523 +#: builtin/ls-files.c:527 msgid "show modified files in the output" msgstr "mostrar archivos modificados en la salida" -#: builtin/ls-files.c:525 +#: builtin/ls-files.c:529 msgid "show other files in the output" msgstr "mostrar otros archivos en la salida" -#: builtin/ls-files.c:527 +#: builtin/ls-files.c:531 msgid "show ignored files in the output" msgstr "mostrar archivos ignorados en la salida" -#: builtin/ls-files.c:530 +#: builtin/ls-files.c:534 msgid "show staged contents' object name in the output" msgstr "" "mostrar contenido de nombres de objetos en el área de stage en la salida" -#: builtin/ls-files.c:532 +#: builtin/ls-files.c:536 msgid "show files on the filesystem that need to be removed" msgstr "mostrar archivos en el filesystem que necesitan ser borrados" -#: builtin/ls-files.c:534 +#: builtin/ls-files.c:538 msgid "show 'other' directories' names only" msgstr "mostrar solo nombres de 'directorios otros'" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:540 msgid "show line endings of files" msgstr "mostrar finales de línea de archivos" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:542 msgid "don't show empty directories" msgstr "no mostrar directorios vacíos" -#: builtin/ls-files.c:541 +#: builtin/ls-files.c:545 msgid "show unmerged files in the output" msgstr "mostrar archivos no fusionados en la salida" -#: builtin/ls-files.c:543 +#: builtin/ls-files.c:547 msgid "show resolve-undo information" msgstr "mostrar información resolver-deshacer" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:549 msgid "skip files matching pattern" msgstr "saltar archivos que concuerden con el patrón" -#: builtin/ls-files.c:548 +#: builtin/ls-files.c:552 msgid "exclude patterns are read from <file>" msgstr "excluir patrones leídos de <archivo>" -#: builtin/ls-files.c:551 +#: builtin/ls-files.c:555 msgid "read additional per-directory exclude patterns in <file>" msgstr "" "leer patrones de exclusión de manera adicional por directorio en <archivo>" -#: builtin/ls-files.c:553 +#: builtin/ls-files.c:557 msgid "add the standard git exclusions" msgstr "agregar las exclusiones standard de git" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:560 msgid "make the output relative to the project top directory" msgstr "hacer la salidad relativa al directorio principal del proyecto" -#: builtin/ls-files.c:559 +#: builtin/ls-files.c:563 msgid "recurse through submodules" msgstr "recurrir a través de submódulos" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:565 msgid "if any <file> is not in the index, treat this as an error" msgstr "si cualquier <archivo> no está en el índice, tratarlo como un error" -#: builtin/ls-files.c:562 +#: builtin/ls-files.c:566 msgid "tree-ish" -msgstr "arbol-ismo" +msgstr "árbol-ismo" -#: builtin/ls-files.c:563 +#: builtin/ls-files.c:567 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" -"fingir que las rutas han sido borradas ya que todavía hay <arbol-ismos> " +"fingir que las rutas han sido borradas ya que todavía hay <árbol-ismos> " "presentes" -#: builtin/ls-files.c:565 +#: builtin/ls-files.c:569 msgid "show debugging data" msgstr "mostrar data de debug" @@ -10058,7 +10134,7 @@ msgstr "mostrar ref subyacente en adición al objeto apuntado por él" #: builtin/ls-tree.c:29 msgid "git ls-tree [<options>] <tree-ish> [<path>...]" -msgstr "git ls-tree [<opciones>] <arbol-ismo> [<ruta>...]" +msgstr "git ls-tree [<opciones>] <árbol-ismo> [<ruta>...]" #: builtin/ls-tree.c:127 msgid "only show trees" @@ -10129,33 +10205,33 @@ msgstr "Estrategias disponibles son:" msgid "Available custom strategies are:" msgstr "Estrategias personalizadas disponibles son:" -#: builtin/merge.c:200 builtin/pull.c:134 +#: builtin/merge.c:200 builtin/pull.c:137 msgid "do not show a diffstat at the end of the merge" msgstr "no mostrar un diffstat al final de la fusión" -#: builtin/merge.c:203 builtin/pull.c:137 +#: builtin/merge.c:203 builtin/pull.c:140 msgid "show a diffstat at the end of the merge" msgstr "mostrar un diffstat al final de la fusión" -#: builtin/merge.c:204 builtin/pull.c:140 +#: builtin/merge.c:204 builtin/pull.c:143 msgid "(synonym to --stat)" msgstr "(sinónimo para --stat)" -#: builtin/merge.c:206 builtin/pull.c:143 +#: builtin/merge.c:206 builtin/pull.c:146 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "agregar (como máximo <n>) entradas del shortlog al mensaje del commit de " "fusión" -#: builtin/merge.c:209 builtin/pull.c:146 +#: builtin/merge.c:209 builtin/pull.c:152 msgid "create a single commit instead of doing a merge" msgstr "crear un commit único en lugar de hacer una fusión" -#: builtin/merge.c:211 builtin/pull.c:149 +#: builtin/merge.c:211 builtin/pull.c:155 msgid "perform a commit if the merge succeeds (default)" msgstr "realizar un commit si la fusión es exitosa (default)" -#: builtin/merge.c:213 builtin/pull.c:152 +#: builtin/merge.c:213 builtin/pull.c:158 msgid "edit message before committing" msgstr "editar mensaje antes de realizar commit" @@ -10163,28 +10239,28 @@ msgstr "editar mensaje antes de realizar commit" msgid "allow fast-forward (default)" msgstr "permitir fast-forwars (default)" -#: builtin/merge.c:216 builtin/pull.c:158 +#: builtin/merge.c:216 builtin/pull.c:164 msgid "abort if fast-forward is not possible" msgstr "abortar si fast-forward no es posible" -#: builtin/merge.c:220 builtin/pull.c:161 +#: builtin/merge.c:220 builtin/pull.c:167 msgid "verify that the named commit has a valid GPG signature" msgstr "verificar que el commit nombrado tiene una firma GPG válida" -#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:165 +#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:171 #: builtin/revert.c:109 msgid "strategy" msgstr "estrategia" -#: builtin/merge.c:222 builtin/pull.c:166 +#: builtin/merge.c:222 builtin/pull.c:172 msgid "merge strategy to use" msgstr "estrategia de fusión para usar" -#: builtin/merge.c:223 builtin/pull.c:169 +#: builtin/merge.c:223 builtin/pull.c:175 msgid "option=value" msgstr "opción=valor" -#: builtin/merge.c:224 builtin/pull.c:170 +#: builtin/merge.c:224 builtin/pull.c:176 msgid "option for selected merge strategy" msgstr "opción para la estrategia de fusión seleccionada" @@ -10200,7 +10276,7 @@ msgstr "abortar la fusión en progreso actual" msgid "continue the current in-progress merge" msgstr "continuar la fusión en progreso actual" -#: builtin/merge.c:234 builtin/pull.c:177 +#: builtin/merge.c:234 builtin/pull.c:183 msgid "allow merging unrelated histories" msgstr "permitir fusionar historias no relacionadas" @@ -10239,43 +10315,43 @@ msgstr "Commit de squash -- no actualizando HEAD\n" msgid "No merge message -- not updating HEAD\n" msgstr "No hay mensaje de fusión -- no actualizando HEAD\n" -#: builtin/merge.c:456 +#: builtin/merge.c:455 #, c-format msgid "'%s' does not point to a commit" -msgstr "'%s' no apunta a ninguna confirmación" +msgstr "'%s' no apunta a ningun commit" -#: builtin/merge.c:546 +#: builtin/merge.c:545 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Mal string branch.%s.mergeoptions: %s" -#: builtin/merge.c:666 +#: builtin/merge.c:667 msgid "Not handling anything other than two heads merge." msgstr "No manejando nada más que fusión de dos heads." -#: builtin/merge.c:680 +#: builtin/merge.c:681 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Opción desconocida para merge-recursive: -X%s" -#: builtin/merge.c:695 +#: builtin/merge.c:696 #, c-format msgid "unable to write %s" -msgstr "no es posible escribit %s" +msgstr "no es posible escribir %s" -#: builtin/merge.c:747 +#: builtin/merge.c:748 #, c-format msgid "Could not read from '%s'" msgstr "No se puedo leer de '%s'" -#: builtin/merge.c:756 +#: builtin/merge.c:757 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "No se realiza commit de la fusión; use 'git commit' para completar la " "fusión.\n" -#: builtin/merge.c:762 +#: builtin/merge.c:763 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -10292,70 +10368,70 @@ msgstr "" "Líneas comenzando con '%c' serán ignoradas, y un mensaje vacío aborta\n" "el commit.\n" -#: builtin/merge.c:798 +#: builtin/merge.c:799 msgid "Empty commit message." msgstr "Mensaje de commit vacío." -#: builtin/merge.c:818 +#: builtin/merge.c:819 #, c-format msgid "Wonderful.\n" msgstr "Maravilloso.\n" -#: builtin/merge.c:871 +#: builtin/merge.c:872 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Fusión automática falló; arregle los conflictos y luego realice un commit " "con el resultado.\n" -#: builtin/merge.c:910 +#: builtin/merge.c:911 msgid "No current branch." msgstr "No rama actual." -#: builtin/merge.c:912 +#: builtin/merge.c:913 msgid "No remote for the current branch." msgstr "No hay remoto para la rama actual." -#: builtin/merge.c:914 +#: builtin/merge.c:915 msgid "No default upstream defined for the current branch." -msgstr "No hay upstream default definido para la rama actual." +msgstr "Por defecto, no hay un upstream definido para la rama actual." -#: builtin/merge.c:919 +#: builtin/merge.c:920 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "No hay rama de rastreo remoto para %s de %s" -#: builtin/merge.c:972 +#: builtin/merge.c:973 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Mal valor '%s' en el entorno '%s'" -#: builtin/merge.c:1073 +#: builtin/merge.c:1075 #, c-format msgid "not something we can merge in %s: %s" msgstr "nada que podamos fusionar en %s: %s" -#: builtin/merge.c:1107 +#: builtin/merge.c:1109 msgid "not something we can merge" msgstr "nada que podamos fusionar" -#: builtin/merge.c:1172 +#: builtin/merge.c:1174 msgid "--abort expects no arguments" msgstr "--abort no espera argumentos" -#: builtin/merge.c:1176 +#: builtin/merge.c:1178 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "No hay una fusión para abortar (falta MERGE_HEAD)" -#: builtin/merge.c:1188 +#: builtin/merge.c:1190 msgid "--continue expects no arguments" msgstr "--continue no espera argumentos" -#: builtin/merge.c:1192 +#: builtin/merge.c:1194 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "No hay fusión en progreso (falta MERGE_HEAD)." -#: builtin/merge.c:1208 +#: builtin/merge.c:1210 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10363,7 +10439,7 @@ msgstr "" "No ha concluido la fusión (existe MERGE_HEAD).\n" "Por favor, realice un commit con los cambios antes de fusionar." -#: builtin/merge.c:1215 +#: builtin/merge.c:1217 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10371,113 +10447,113 @@ msgstr "" "No ha concluido el cherry-pick (existe CHERRY_PICK_HEAD).\n" "Por favor, realice un commit con los cambios antes de fusionar." -#: builtin/merge.c:1218 +#: builtin/merge.c:1220 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "No ha concluido el cherry-pick (existe CHERRY_PICK_HEAD)." -#: builtin/merge.c:1227 +#: builtin/merge.c:1229 msgid "You cannot combine --squash with --no-ff." msgstr "No se puede combinar --squash con --no-ff." -#: builtin/merge.c:1235 +#: builtin/merge.c:1237 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "No hay commit especificado y merge.defaultToUpstream no está configurado." -#: builtin/merge.c:1252 +#: builtin/merge.c:1254 msgid "Squash commit into empty head not supported yet" msgstr "Commit aplastado dentro de un head vacío no es soportado todavía" -#: builtin/merge.c:1254 +#: builtin/merge.c:1256 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Commit no fast-forward no tiene sentido dentro de un head vacío" -#: builtin/merge.c:1259 +#: builtin/merge.c:1261 #, c-format msgid "%s - not something we can merge" msgstr "%s - nada que podamos fusionar" -#: builtin/merge.c:1261 +#: builtin/merge.c:1263 msgid "Can merge only exactly one commit into empty head" msgstr "Solo se puede fusionar exactamente un commit en un head vacío" -#: builtin/merge.c:1295 +#: builtin/merge.c:1297 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "Commit %s tiene una firma GPG no confiable, pretendidamente por %s." -#: builtin/merge.c:1298 +#: builtin/merge.c:1300 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "Commit %s tiene una mala firma GPG pretendidamente por %s." -#: builtin/merge.c:1301 +#: builtin/merge.c:1303 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Commit %s no tiene una firma GPG." -#: builtin/merge.c:1304 +#: builtin/merge.c:1306 #, c-format msgid "Commit %s has a good GPG signature by %s\n" -msgstr "Commit %s titene una buena firma GPG por %s\n" +msgstr "El Commit %s tiene una buena firma GPG por %s\n" -#: builtin/merge.c:1366 +#: builtin/merge.c:1368 msgid "refusing to merge unrelated histories" msgstr "rehusando fusionar historias no relacionadas" -#: builtin/merge.c:1375 +#: builtin/merge.c:1377 msgid "Already up to date." msgstr "Ya está actualizado." -#: builtin/merge.c:1385 +#: builtin/merge.c:1387 #, c-format msgid "Updating %s..%s\n" msgstr "Actualizando %s..%s\n" -#: builtin/merge.c:1426 +#: builtin/merge.c:1428 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Intentando fusión en índice realmente trivial...\n" -#: builtin/merge.c:1433 +#: builtin/merge.c:1435 #, c-format msgid "Nope.\n" msgstr "Nop.\n" -#: builtin/merge.c:1458 +#: builtin/merge.c:1460 msgid "Already up to date. Yeeah!" msgstr "Ya está actualizado. ¡Oh, yeaahh!" -#: builtin/merge.c:1464 +#: builtin/merge.c:1466 msgid "Not possible to fast-forward, aborting." msgstr "No es posible hacer fast-forward, abortando." -#: builtin/merge.c:1487 builtin/merge.c:1566 +#: builtin/merge.c:1489 builtin/merge.c:1568 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Rebobinando el árbol a original...\n" -#: builtin/merge.c:1491 +#: builtin/merge.c:1493 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Intentando estrategia de fusión %s...\n" -#: builtin/merge.c:1557 +#: builtin/merge.c:1559 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ninguna estrategia de fusión manejó la fusión.\n" -#: builtin/merge.c:1559 +#: builtin/merge.c:1561 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Fusionar con estrategia %s falló.\n" -#: builtin/merge.c:1568 +#: builtin/merge.c:1570 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Usando el %s para preparar resolución a mano.\n" -#: builtin/merge.c:1580 +#: builtin/merge.c:1582 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -10503,23 +10579,23 @@ msgstr "git merge-base --is-ancestor <commit> <commit>" msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point <ref> [<commit>]" -#: builtin/merge-base.c:218 +#: builtin/merge-base.c:220 msgid "output all common ancestors" msgstr "mostrar todos los ancestros comunes" -#: builtin/merge-base.c:220 +#: builtin/merge-base.c:222 msgid "find ancestors for a single n-way merge" msgstr "encontrar ancestros para una única fusión de n-vías " -#: builtin/merge-base.c:222 +#: builtin/merge-base.c:224 msgid "list revs not reachable from others" msgstr "listar revs no alcanzables desde otros" -#: builtin/merge-base.c:224 +#: builtin/merge-base.c:226 msgid "is the first one ancestor of the other?" msgstr "es el primer ancestro del otro?" -#: builtin/merge-base.c:226 +#: builtin/merge-base.c:228 msgid "find where <commit> forked from reflog of <ref>" msgstr "encontrar donde <commit> forjó del reflog de <ref>" @@ -10706,7 +10782,7 @@ msgstr "fallo al renombrar '%s'" #: builtin/name-rev.c:338 msgid "git name-rev [<options>] <commit>..." -msgstr "git name-rev [<opciones>] <confirmación>..." +msgstr "git name-rev [<opciones>] <commit>..." #: builtin/name-rev.c:339 msgid "git name-rev [<options>] --all" @@ -10722,7 +10798,7 @@ msgstr "imprimir sólo nombres (sin SHA-1)" #: builtin/name-rev.c:396 msgid "only use tags to name the commits" -msgstr "sólo usar etiquetas para nombrar confirmaciones" +msgstr "sólo usar tags para nombrar commits" #: builtin/name-rev.c:398 msgid "only use refs matching <pattern>" @@ -10734,8 +10810,7 @@ msgstr "ignorar refs que concuerden con <patrón>" #: builtin/name-rev.c:402 msgid "list all commits reachable from all refs" -msgstr "" -"listar todas las confirmaciones alcanzables desde todas las referencias" +msgstr "listar todos los commits alcanzables desde todas las referencias" #: builtin/name-rev.c:403 msgid "read from stdin" @@ -10747,7 +10822,7 @@ msgstr "permitir imprimir nombres `undefined` (predeterminado)" #: builtin/name-rev.c:410 msgid "dereference tags in the input (internal use)" -msgstr "desreferenciar etiquetas en la entrada (uso interno)" +msgstr "desreferenciar tags en la entrada (uso interno)" #: builtin/notes.c:26 msgid "git notes [--ref <notes-ref>] [list [<object>]]" @@ -10804,8 +10879,8 @@ msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "git notes [--ref <referencia-de-notas>] remove [<objeto>...]" #: builtin/notes.c:36 -msgid "git notes [--ref <notes-ref>] prune [-n | -v]" -msgstr "git notes [--ref <referencia-de-notas>] prune [-n | -v]" +msgid "git notes [--ref <notes-ref>] prune [-n] [-v]" +msgstr "git notes [--ref <referencia-de-notas>] prune [-n] [-v]" #: builtin/notes.c:37 msgid "git notes [--ref <notes-ref>] get-ref" @@ -11104,7 +11179,7 @@ msgstr "no se pueden mezclar --commit, --abort ó -s/--strategy" #: builtin/notes.c:802 msgid "must specify a notes ref to merge" -msgstr "debe espeficiar una ref de notas a fusionar" +msgstr "debe especificar una ref de notas a fusionar" #: builtin/notes.c:826 #, c-format @@ -11145,7 +11220,7 @@ msgstr "intentar remover una nota no existente no es un error" msgid "read object names from the standard input" msgstr "leer nombres de objetos de standard input" -#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:146 +#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:158 msgid "do not remove, show only" msgstr "no remover, solo mostrar" @@ -11166,194 +11241,202 @@ msgstr "usar notas desde <referencia-de-notas>" msgid "unknown subcommand: %s" msgstr "subcomando desconocido: %s" -#: builtin/pack-objects.c:31 +#: builtin/pack-objects.c:33 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [<opciones>...] [< <lista-de-ref> | < <lista-de-" "objetos>]" -#: builtin/pack-objects.c:32 +#: builtin/pack-objects.c:34 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [<opciones>...] <nombre-base> [< <lista-de-refs> | < <lista-" "de-objetos>]" -#: builtin/pack-objects.c:181 builtin/pack-objects.c:184 +#: builtin/pack-objects.c:192 builtin/pack-objects.c:195 #, c-format msgid "deflate error (%d)" msgstr "error al desinflar (%d)" -#: builtin/pack-objects.c:777 +#: builtin/pack-objects.c:788 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "deshabilitando escritura bitmap, paquetes son divididos debido a pack." "packSizeLimit" -#: builtin/pack-objects.c:790 +#: builtin/pack-objects.c:801 msgid "Writing objects" msgstr "Escribiendo objetos" -#: builtin/pack-objects.c:1070 +#: builtin/pack-objects.c:1081 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "deshabilitando escritura bitmap, ya que algunos objetos no están siendo " "empaquetados" -#: builtin/pack-objects.c:2440 +#: builtin/pack-objects.c:2451 msgid "Compressing objects" msgstr "Comprimiendo objetos" -#: builtin/pack-objects.c:2849 +#: builtin/pack-objects.c:2599 +msgid "invalid value for --missing" +msgstr "valor inválido para --missing" + +#: builtin/pack-objects.c:2902 #, c-format msgid "unsupported index version %s" msgstr "versión de índice no soportada %s" -#: builtin/pack-objects.c:2853 +#: builtin/pack-objects.c:2906 #, c-format msgid "bad index version '%s'" msgstr "mala versión del índice '%s'" -#: builtin/pack-objects.c:2883 +#: builtin/pack-objects.c:2936 msgid "do not show progress meter" msgstr "no mostrar medidor de progreso" -#: builtin/pack-objects.c:2885 +#: builtin/pack-objects.c:2938 msgid "show progress meter" msgstr "mostrar medidor de progreso" -#: builtin/pack-objects.c:2887 +#: builtin/pack-objects.c:2940 msgid "show progress meter during object writing phase" msgstr "mostrar medidor de progreso durante la fase de escritura de objeto" -#: builtin/pack-objects.c:2890 +#: builtin/pack-objects.c:2943 msgid "similar to --all-progress when progress meter is shown" msgstr "similar a --all-progress cuando medidor de progreso es mostrado" -#: builtin/pack-objects.c:2891 +#: builtin/pack-objects.c:2944 msgid "version[,offset]" msgstr "versión[,offset]" -#: builtin/pack-objects.c:2892 +#: builtin/pack-objects.c:2945 msgid "write the pack index file in the specified idx format version" msgstr "" "escribir el índice de paquete en la versión de formato idx especificado" -#: builtin/pack-objects.c:2895 +#: builtin/pack-objects.c:2948 msgid "maximum size of each output pack file" msgstr "tamaño máximo de cada paquete resultante" -#: builtin/pack-objects.c:2897 +#: builtin/pack-objects.c:2950 msgid "ignore borrowed objects from alternate object store" msgstr "ignorar objetos prestados de otros almacenes de objetos" -#: builtin/pack-objects.c:2899 +#: builtin/pack-objects.c:2952 msgid "ignore packed objects" msgstr "ignorar objetos paquete" -#: builtin/pack-objects.c:2901 +#: builtin/pack-objects.c:2954 msgid "limit pack window by objects" msgstr "limitar ventana de paquete por objetos" -#: builtin/pack-objects.c:2903 +#: builtin/pack-objects.c:2956 msgid "limit pack window by memory in addition to object limit" msgstr "limitar ventana de paquete por memoria en adición a límite de objetos" -#: builtin/pack-objects.c:2905 +#: builtin/pack-objects.c:2958 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "longitud máxima de cadena delta permitida en el paquete resultante" -#: builtin/pack-objects.c:2907 +#: builtin/pack-objects.c:2960 msgid "reuse existing deltas" msgstr "reusar deltas existentes" -#: builtin/pack-objects.c:2909 +#: builtin/pack-objects.c:2962 msgid "reuse existing objects" msgstr "reutilizar objetos existentes" -#: builtin/pack-objects.c:2911 +#: builtin/pack-objects.c:2964 msgid "use OFS_DELTA objects" msgstr "usar objetos OFS_DELTA" -#: builtin/pack-objects.c:2913 +#: builtin/pack-objects.c:2966 msgid "use threads when searching for best delta matches" msgstr "usar hilos cuando se busque para mejores concordancias de delta" -#: builtin/pack-objects.c:2915 +#: builtin/pack-objects.c:2968 msgid "do not create an empty pack output" msgstr "no crear un paquete resultante vacío" -#: builtin/pack-objects.c:2917 +#: builtin/pack-objects.c:2970 msgid "read revision arguments from standard input" msgstr "leer argumentos de revisión de standard input" -#: builtin/pack-objects.c:2919 +#: builtin/pack-objects.c:2972 msgid "limit the objects to those that are not yet packed" msgstr "limitar los objetos a aquellos que no han sido empaquetados todavía" -#: builtin/pack-objects.c:2922 +#: builtin/pack-objects.c:2975 msgid "include objects reachable from any reference" msgstr "incluir objetos alcanzables por cualquier referencia" -#: builtin/pack-objects.c:2925 +#: builtin/pack-objects.c:2978 msgid "include objects referred by reflog entries" msgstr "incluir objetos referidos por entradas de reflog" -#: builtin/pack-objects.c:2928 +#: builtin/pack-objects.c:2981 msgid "include objects referred to by the index" msgstr "incluir objetos referidos por el índice" -#: builtin/pack-objects.c:2931 +#: builtin/pack-objects.c:2984 msgid "output pack to stdout" msgstr "mostrar paquete en stdout" -#: builtin/pack-objects.c:2933 +#: builtin/pack-objects.c:2986 msgid "include tag objects that refer to objects to be packed" msgstr "incluir objetos tag que refieren a objetos a ser empaquetados" -#: builtin/pack-objects.c:2935 +#: builtin/pack-objects.c:2988 msgid "keep unreachable objects" msgstr "mantener objetos inalcanzables" -#: builtin/pack-objects.c:2937 +#: builtin/pack-objects.c:2990 msgid "pack loose unreachable objects" msgstr "empaquetar objetos sueltos inalcanzables" -#: builtin/pack-objects.c:2939 +#: builtin/pack-objects.c:2992 msgid "unpack unreachable objects newer than <time>" msgstr "desempaquetar objetos inalcanzables más nuevos que <tiempo>" -#: builtin/pack-objects.c:2942 +#: builtin/pack-objects.c:2995 msgid "create thin packs" msgstr "crear paquetes delgados" -#: builtin/pack-objects.c:2944 +#: builtin/pack-objects.c:2997 msgid "create packs suitable for shallow fetches" msgstr "crear paquetes adecuados para fetches superficiales" -#: builtin/pack-objects.c:2946 +#: builtin/pack-objects.c:2999 msgid "ignore packs that have companion .keep file" msgstr "ignorar paquetes que tienen un archivo .keep acompañante" -#: builtin/pack-objects.c:2948 +#: builtin/pack-objects.c:3001 msgid "pack compression level" msgstr "nivel de compresión del paquete" -#: builtin/pack-objects.c:2950 +#: builtin/pack-objects.c:3003 msgid "do not hide commits by grafts" msgstr "no ocultar commits por injertos" -#: builtin/pack-objects.c:2952 +#: builtin/pack-objects.c:3005 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "usar un índice bitmap si está disponible para acelerar la cuenta de objetos" -#: builtin/pack-objects.c:2954 +#: builtin/pack-objects.c:3007 msgid "write a bitmap index together with the pack index" msgstr "escribir un índice de bitmap junto al índice de paquete" -#: builtin/pack-objects.c:3081 +#: builtin/pack-objects.c:3010 +msgid "handling for missing objects" +msgstr "manejo de objetos perdidos" + +#: builtin/pack-objects.c:3144 msgid "Counting objects" msgstr "Contando objetos" @@ -11378,8 +11461,8 @@ msgid "Removing duplicate objects" msgstr "Removiendo objetos duplicados" #: builtin/prune.c:11 -msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" -msgstr "git prune [-n] [-v] [--expire <tiempo>] [--] [<head>...]" +msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" +msgstr "git prune [-n] [-v] [--progress] [--expire <tiempo>] [--] [<head>...]" #: builtin/prune.c:106 msgid "report pruned objects" @@ -11401,54 +11484,54 @@ msgstr "Valor inválido para %s: %s" #: builtin/pull.c:76 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "" -"git pull [<opciones>] [<repositorio> [<especificacion-de-referencia>...]]" +"git pull [<opciones>] [<repositorio> [<especificación-de-referencia>...]]" -#: builtin/pull.c:124 +#: builtin/pull.c:127 msgid "control for recursive fetching of submodules" msgstr "control de fetch recursivo en submódulos" -#: builtin/pull.c:128 +#: builtin/pull.c:131 msgid "Options related to merging" msgstr "Opciones relacionadas a fusión" -#: builtin/pull.c:131 +#: builtin/pull.c:134 msgid "incorporate changes by rebasing rather than merging" msgstr "incorporar cambios por rebase en lugar de fusión" -#: builtin/pull.c:155 builtin/rebase--helper.c:21 builtin/revert.c:121 +#: builtin/pull.c:161 builtin/rebase--helper.c:23 builtin/revert.c:121 msgid "allow fast-forward" msgstr "permitir fast-forward" -#: builtin/pull.c:164 +#: builtin/pull.c:170 msgid "automatically stash/stash pop before and after rebase" msgstr "ejecutar automáticamente stash/stash pop antes y después de rebase" -#: builtin/pull.c:180 +#: builtin/pull.c:186 msgid "Options related to fetching" msgstr "Opciones relacionadas a fetch" -#: builtin/pull.c:198 +#: builtin/pull.c:204 msgid "number of submodules pulled in parallel" -msgstr "número de submódules que realizan pull en paralelo" +msgstr "número de submódulos que realizan pull en paralelo" -#: builtin/pull.c:287 +#: builtin/pull.c:299 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "valor inválido para pull.ff: %s" -#: builtin/pull.c:403 +#: builtin/pull.c:415 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "No hay candidato para rebasar entre las refs que has bajado con fetch." -#: builtin/pull.c:405 +#: builtin/pull.c:417 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "No hay candidatos para fusionar entre las refs que has bajado con fetch." -#: builtin/pull.c:406 +#: builtin/pull.c:418 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -11457,7 +11540,7 @@ msgstr "" "tiene\n" "concordancia en el final remoto." -#: builtin/pull.c:409 +#: builtin/pull.c:421 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -11468,44 +11551,44 @@ msgstr "" "una rama. Porque este no es el remoto configurado por default\n" "para tu rama actual, tienes que especificar una rama en la línea de comando." -#: builtin/pull.c:414 git-parse-remote.sh:73 +#: builtin/pull.c:426 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "No te encuentras actualmente en la rama." -#: builtin/pull.c:416 builtin/pull.c:431 git-parse-remote.sh:79 +#: builtin/pull.c:428 builtin/pull.c:443 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Por favor especifica a qué rama quieres rebasar." -#: builtin/pull.c:418 builtin/pull.c:433 git-parse-remote.sh:82 +#: builtin/pull.c:430 builtin/pull.c:445 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Por favor especifica a qué rama quieres fusionar." -#: builtin/pull.c:419 builtin/pull.c:434 +#: builtin/pull.c:431 builtin/pull.c:446 msgid "See git-pull(1) for details." msgstr "Ver git-pull(1) para detalles." -#: builtin/pull.c:421 builtin/pull.c:427 builtin/pull.c:436 +#: builtin/pull.c:433 builtin/pull.c:439 builtin/pull.c:448 #: git-parse-remote.sh:64 msgid "<remote>" msgstr "<remoto>" -#: builtin/pull.c:421 builtin/pull.c:436 builtin/pull.c:441 git-rebase.sh:466 +#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:466 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<rama>" -#: builtin/pull.c:429 git-parse-remote.sh:75 +#: builtin/pull.c:441 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "No hay información de rastreo para la rama actual." -#: builtin/pull.c:438 git-parse-remote.sh:95 +#: builtin/pull.c:450 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" "Si deseas configurar el rastreo de información para esta rama, puedes " "hacerlo con:" -#: builtin/pull.c:443 +#: builtin/pull.c:455 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -11514,27 +11597,27 @@ msgstr "" "Tu configuración especifica fusionar con la ref '%s'\n" "de tu remoto, pero no se pudo hacer fetch a esa ref." -#: builtin/pull.c:796 +#: builtin/pull.c:817 msgid "ignoring --verify-signatures for rebase" msgstr "ignorando --verify-signatures para rebase" -#: builtin/pull.c:844 +#: builtin/pull.c:865 msgid "--[no-]autostash option is only valid with --rebase." msgstr "La opción --[no-]autostash sólo es válida con --rebase." -#: builtin/pull.c:852 +#: builtin/pull.c:873 msgid "Updating an unborn branch with changes added to the index." msgstr "Actualizando una rama no nata con cambios agregados al índice." -#: builtin/pull.c:855 +#: builtin/pull.c:876 msgid "pull with rebase" msgstr "pull con rebase" -#: builtin/pull.c:856 +#: builtin/pull.c:877 msgid "please commit or stash them." msgstr "por favor realiza un commit o un stash con ellos." -#: builtin/pull.c:881 +#: builtin/pull.c:902 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -11545,7 +11628,7 @@ msgstr "" "realizando fast-forward al árbol de trabajo\n" "desde commit %s." -#: builtin/pull.c:886 +#: builtin/pull.c:907 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -11562,15 +11645,15 @@ msgstr "" "$ git reset --hard\n" "para recuperar." -#: builtin/pull.c:901 +#: builtin/pull.c:922 msgid "Cannot merge multiple branches into empty head." msgstr "No se puede fusionar múltiples ramas en un head vacío." -#: builtin/pull.c:905 +#: builtin/pull.c:926 msgid "Cannot rebase onto multiple branches." -msgstr "No se puede rebasar en multiples ramas." +msgstr "No se puede rebasar en múltiples ramas." -#: builtin/pull.c:912 +#: builtin/pull.c:933 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "no se puede rebasar con modificaciones de submódulos grabadas localmente" @@ -11578,26 +11661,26 @@ msgstr "" #: builtin/push.c:17 msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "" -"git push [<opciones>] [<repositorio> [<especificaciones-de-refrencia>...]]" +"git push [<opciones>] [<repositorio> [<especificaciones-de-referencia>...]]" -#: builtin/push.c:90 +#: builtin/push.c:92 msgid "tag shorthand without <tag>" msgstr "taquigrafía de tag sin <tag>" -#: builtin/push.c:100 +#: builtin/push.c:102 msgid "--delete only accepts plain target ref names" msgstr "--delete solo acepta como objetivos nombres de ref planos" -#: builtin/push.c:144 +#: builtin/push.c:146 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." msgstr "" "\n" -"Para elegir si la opcion es permanente, mira push.default en 'git help " +"Para elegir si la opción es permanente, mira push.default en 'git help " "config'." -#: builtin/push.c:147 +#: builtin/push.c:149 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -11622,7 +11705,7 @@ msgstr "" "\tgit push %s %s\n" "%s" -#: builtin/push.c:162 +#: builtin/push.c:164 #, c-format msgid "" "You are not currently on a branch.\n" @@ -11637,7 +11720,7 @@ msgstr "" "\n" "\tgit push %s HEAD:<nombre-de-rama-remota>\n" -#: builtin/push.c:176 +#: builtin/push.c:178 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -11651,12 +11734,12 @@ msgstr "" "\n" "\tgit push --set-upstream %s %s\n" -#: builtin/push.c:184 +#: builtin/push.c:186 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "La rama actual %s tiene múltiples ramas upstream, rechazando el push." -#: builtin/push.c:187 +#: builtin/push.c:189 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -11667,13 +11750,13 @@ msgstr "" "su rama actual '%s', sin decirme qué poner en el push\n" "para actualizar en qué rama de remoto." -#: builtin/push.c:246 +#: builtin/push.c:248 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "No se especificó ningún refspecs para hacer push, y push.default es \"nada\"." -#: builtin/push.c:253 +#: builtin/push.c:255 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -11681,11 +11764,11 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "Actualizaciones fueron rechazadas porque la punta de tu rama actual esta\n" -"detras de su contraparte remota. Integra los cambios remotos (es decir\n" +"detrás de su contraparte remota. Integra los cambios remotos (es decir\n" "'git pull ...') antes de hacer push de nuevo.\n" "Mira 'Note about fast-forwards' en 'git push --help' para mas detalles." -#: builtin/push.c:259 +#: builtin/push.c:261 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -11698,7 +11781,7 @@ msgstr "" "(ejem. 'git pull ...') antes de volver a hacer push.\n" "Vea las 'Notes about fast-forwards' en 'git push --help' para más detalles." -#: builtin/push.c:265 +#: builtin/push.c:267 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -11707,17 +11790,17 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "Actualizaciones fueron rechazadas porque el remoto contiene trabajo que\n" -"no existe localmente. Esto es causado usuallmente por otro repositorio \n" +"no existe localmente. Esto es causado usualmente por otro repositorio \n" "realizando push a la misma ref. Quizás quiera integrar primero los cambios\n" -"remotos (ejem. 'git pull ...') antes de volver a hacer push.\n" +"remotos (ej. 'git pull ...') antes de volver a hacer push.\n" "Vea 'Notes about fast-forwards0 en 'git push --help' para detalles." -#: builtin/push.c:272 +#: builtin/push.c:274 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" "Actualizaciones fueron rechazadas porque el tag ya existe en el remoto." -#: builtin/push.c:275 +#: builtin/push.c:277 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -11727,22 +11810,22 @@ msgstr "" "o actualizar un ref remoto para hacer que apunte a un objeto no-commit,\n" "sin usar la opción '--force'.\n" -#: builtin/push.c:335 +#: builtin/push.c:337 #, c-format msgid "Pushing to %s\n" -msgstr "Hacienod push a %s\n" +msgstr "Haciendo push a %s\n" -#: builtin/push.c:339 +#: builtin/push.c:341 #, c-format msgid "failed to push some refs to '%s'" msgstr "fallo el push de algunas referencias a '%s'" -#: builtin/push.c:370 +#: builtin/push.c:372 #, c-format msgid "bad repository '%s'" msgstr "mal repositorio '%s'" -#: builtin/push.c:371 +#: builtin/push.c:373 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -11755,8 +11838,8 @@ msgid "" " git push <name>\n" msgstr "" "No se ha configurado un destino para el push.\n" -"Puedes o especificar una URL desde la linea de comandos o configurar " -"unrepositorio remoto usando\n" +"Puedes o especificar una URL desde la línea de comandos o configurar un " +"repositorio remoto usando\n" "\n" " git remote add <nombre> <url>\n" "\n" @@ -11764,112 +11847,112 @@ msgstr "" "\n" " git push <nombre>\n" -#: builtin/push.c:389 +#: builtin/push.c:391 msgid "--all and --tags are incompatible" msgstr "--all y --tags son incompatibles" -#: builtin/push.c:390 +#: builtin/push.c:392 msgid "--all can't be combined with refspecs" msgstr "--all no puede ser combinada con refspecs" -#: builtin/push.c:395 +#: builtin/push.c:397 msgid "--mirror and --tags are incompatible" msgstr "--mirror y --tags son incompatibles" -#: builtin/push.c:396 +#: builtin/push.c:398 msgid "--mirror can't be combined with refspecs" msgstr "--mirror no puede ser combinado con refspecs" -#: builtin/push.c:401 +#: builtin/push.c:403 msgid "--all and --mirror are incompatible" msgstr "--all y --mirror son incompatibles" -#: builtin/push.c:523 +#: builtin/push.c:535 msgid "repository" msgstr "repositorio" -#: builtin/push.c:524 builtin/send-pack.c:163 +#: builtin/push.c:536 builtin/send-pack.c:163 msgid "push all refs" msgstr "realizar push a todas las refs" -#: builtin/push.c:525 builtin/send-pack.c:165 +#: builtin/push.c:537 builtin/send-pack.c:165 msgid "mirror all refs" msgstr "realizar mirror a todas las refs" -#: builtin/push.c:527 +#: builtin/push.c:539 msgid "delete refs" msgstr "borrar refs" -#: builtin/push.c:528 +#: builtin/push.c:540 msgid "push tags (can't be used with --all or --mirror)" msgstr "realizar push a tags (no puede ser usado con --all o --mirror)" -#: builtin/push.c:531 builtin/send-pack.c:166 +#: builtin/push.c:543 builtin/send-pack.c:166 msgid "force updates" msgstr "forzar actualizaciones" -#: builtin/push.c:533 builtin/send-pack.c:180 +#: builtin/push.c:545 builtin/send-pack.c:180 msgid "refname>:<expect" msgstr "refname>:<expect" -#: builtin/push.c:534 builtin/send-pack.c:181 +#: builtin/push.c:546 builtin/send-pack.c:181 msgid "require old value of ref to be at this value" msgstr "requiere haber valor viejo de ref en este valor" -#: builtin/push.c:537 +#: builtin/push.c:549 msgid "control recursive pushing of submodules" msgstr "controlar push recursivo de submódulos" -#: builtin/push.c:539 builtin/send-pack.c:174 +#: builtin/push.c:551 builtin/send-pack.c:174 msgid "use thin pack" msgstr "usar empaquetado delgado" -#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160 +#: builtin/push.c:552 builtin/push.c:553 builtin/send-pack.c:160 #: builtin/send-pack.c:161 msgid "receive pack program" msgstr "recibir programa de paquete" -#: builtin/push.c:542 +#: builtin/push.c:554 msgid "set upstream for git pull/status" msgstr "configurar upstream para git pulll/status" -#: builtin/push.c:545 +#: builtin/push.c:557 msgid "prune locally removed refs" msgstr "recortando refs removidas localmente" -#: builtin/push.c:547 +#: builtin/push.c:559 msgid "bypass pre-push hook" msgstr "hacer un bypass al hook pre-push" -#: builtin/push.c:548 +#: builtin/push.c:560 msgid "push missing but relevant tags" msgstr "realizar push de tags faltantes pero relevantes" -#: builtin/push.c:551 builtin/send-pack.c:168 +#: builtin/push.c:563 builtin/send-pack.c:168 msgid "GPG sign the push" msgstr "firmar con GPG el push" -#: builtin/push.c:553 builtin/send-pack.c:175 +#: builtin/push.c:565 builtin/send-pack.c:175 msgid "request atomic transaction on remote side" msgstr "solicitar transacción atómica en el lado remoto" -#: builtin/push.c:554 builtin/send-pack.c:171 +#: builtin/push.c:566 builtin/send-pack.c:171 msgid "server-specific" msgstr "especifico-de-servidor" -#: builtin/push.c:554 builtin/send-pack.c:172 +#: builtin/push.c:566 builtin/send-pack.c:172 msgid "option to transmit" msgstr "opción para trasmitir" -#: builtin/push.c:568 +#: builtin/push.c:583 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete es incompatible con --all, --mirror y --tags" -#: builtin/push.c:570 +#: builtin/push.c:585 msgid "--delete doesn't make sense without any refs" msgstr "--delete no tiene sentido sin ninguna referencia" -#: builtin/push.c:589 +#: builtin/push.c:604 msgid "push options must not have new line characters" msgstr "opciones de push no pueden tener caracteres de línea nueva" @@ -11881,8 +11964,8 @@ msgid "" msgstr "" "git read-tree [(-m [--trivial] [--aggressive] | --reset | --" "prefix=<prefijo>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-" -"sparse-checkout] [--index-output=<archivo>] (--empty | <arbol-ismo1> [<arbol-" -"ismo2> [<arbol-ismo3>]])" +"sparse-checkout] [--index-output=<archivo>] (--empty | <árbol-ismo1> [<árbol-" +"ismo2> [<árbol-ismo3>]])" #: builtin/read-tree.c:121 msgid "write resulting index to <file>" @@ -11952,47 +12035,51 @@ msgstr "debug de árboles-desempacados" msgid "git rebase--helper [<options>]" msgstr "git rebase--helper [<opciones>]" -#: builtin/rebase--helper.c:22 +#: builtin/rebase--helper.c:24 msgid "keep empty commits" msgstr "mantener commits vacíos" -#: builtin/rebase--helper.c:23 +#: builtin/rebase--helper.c:25 msgid "continue rebase" msgstr "continuar rebase" -#: builtin/rebase--helper.c:25 +#: builtin/rebase--helper.c:27 msgid "abort rebase" msgstr "abortar rebase" -#: builtin/rebase--helper.c:28 +#: builtin/rebase--helper.c:30 msgid "make rebase script" msgstr "generar script de rebase" -#: builtin/rebase--helper.c:30 -msgid "shorten SHA-1s in the todo list" -msgstr "SHA-1s cortos en la lista de pendientes" - #: builtin/rebase--helper.c:32 -msgid "expand SHA-1s in the todo list" -msgstr "SHA-1s expandidos en la lista de pendientes" +msgid "shorten commit ids in the todo list" +msgstr "ids de commits cortos en la lista de pendientes" #: builtin/rebase--helper.c:34 +msgid "expand commit ids in the todo list" +msgstr "expandir ids de commits en la lista de pendientes" + +#: builtin/rebase--helper.c:36 msgid "check the todo list" msgstr "revisar la lista de pendientes" -#: builtin/rebase--helper.c:36 +#: builtin/rebase--helper.c:38 msgid "skip unnecessary picks" msgstr "saltar los picks innecesarios" -#: builtin/rebase--helper.c:38 +#: builtin/rebase--helper.c:40 msgid "rearrange fixup/squash lines" msgstr "reorganizar líneas fixup/squash" -#: builtin/receive-pack.c:29 +#: builtin/rebase--helper.c:42 +msgid "insert exec commands in todo list" +msgstr "insertar comando exec en la lista de pendientes" + +#: builtin/receive-pack.c:30 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-dir>" -#: builtin/receive-pack.c:839 +#: builtin/receive-pack.c:840 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" @@ -12008,7 +12095,7 @@ msgid "" "To squelch this message and still keep the default behaviour, set\n" "'receive.denyCurrentBranch' configuration variable to 'refuse'." msgstr "" -"Por default, actualizar la rama actual en un repositorio no vacío\n" +"Por defecto, actualizar la rama actual en un repositorio no vacío\n" "está denegado, porque eso haría el índice y el árbol de trabajo " "inconsistentes\n" "con lo que ya se ha hecho push, y requeriría 'git reset --hard' para " @@ -12025,7 +12112,7 @@ msgstr "" "Para suprimir este mensaje y mantener el comportamiento predeterminado,\n" "configure 'receive.denyCurrentBranch' a 'refuse'." -#: builtin/receive-pack.c:859 +#: builtin/receive-pack.c:860 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" @@ -12036,8 +12123,8 @@ msgid "" "\n" "To squelch this message, you can set it to 'refuse'." msgstr "" -"Por default, borrar la rama actual está denegado, porque el siguiente\n" -"'git clone' no serultará en ningún archivo revisado, causando confusión.\n" +"Por defecto, borrar la rama actual está prohibido, porque el siguiente\n" +"'git clone' no resultara en ningún archivo revisado, causando confusión.\n" "\n" "Se puede configurar la variable 'receive.denyDeleteCurrent' a 'warn' o " "'ignore'\n" @@ -12046,20 +12133,15 @@ msgstr "" "\n" "Para suprimir este mensaje, puede configurarlo en 'refuse'." -#: builtin/receive-pack.c:1932 +#: builtin/receive-pack.c:1933 msgid "quiet" msgstr "tranquilo" -#: builtin/receive-pack.c:1946 +#: builtin/receive-pack.c:1947 msgid "You must specify a directory." msgstr "Se tiene que especificar un directorio." -#: builtin/reflog.c:424 -#, c-format -msgid "'%s' for '%s' is not a valid timestamp" -msgstr "'%s' para '%s' no es una marca de tiempo válida" - -#: builtin/reflog.c:541 builtin/reflog.c:546 +#: builtin/reflog.c:531 builtin/reflog.c:536 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' no es una marca de tiempo válida" @@ -12667,7 +12749,7 @@ msgstr "no se pueden borrar paquetes en un repositorio de objetos-preciosos" msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable y -A son incompatibles" -#: builtin/repack.c:406 builtin/worktree.c:134 +#: builtin/repack.c:406 builtin/worktree.c:146 #, c-format msgid "failed to remove '%s'" msgstr "falló al remover '%s'" @@ -12774,11 +12856,11 @@ msgstr "" #: builtin/reset.c:30 msgid "git reset [-q] [<tree-ish>] [--] <paths>..." -msgstr "git reset [-q] [<arbol-ismo>] [--] <rutas>..." +msgstr "git reset [-q] [<árbol-ismo>] [--] <rutas>..." #: builtin/reset.c:31 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" -msgstr "git reset --patch [<arbol-ismo>] [--] [<rutas>...]" +msgstr "git reset --patch [<árbol-ismo>] [--] [<rutas>...]" #: builtin/reset.c:37 msgid "mixed" @@ -12894,10 +12976,23 @@ msgstr "No se puede reiniciar el índice a la revisión '%s'." msgid "Could not write new index file." msgstr "No se puede escribir un nuevo archivo índice." -#: builtin/rev-list.c:361 +#: builtin/rev-list.c:399 +msgid "object filtering requires --objects" +msgstr "filtrado de objetos requiere --objects" + +#: builtin/rev-list.c:402 +#, c-format +msgid "invalid sparse value '%s'" +msgstr "valor disperso inválido: '%s'" + +#: builtin/rev-list.c:442 msgid "rev-list does not support display of notes" msgstr "rev-list no soporta mostrar notas" +#: builtin/rev-list.c:445 +msgid "cannot combine --use-bitmap-index with object filtering" +msgstr "no se puede combinar --use-bitmap-index con objetos de filtrado" + #: builtin/rev-parse.c:402 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<opciones>] -- [<args>...]" @@ -13078,7 +13173,7 @@ msgstr "permitir remover de forma recursiva" #: builtin/rm.c:248 msgid "exit with a zero status even if nothing matched" -msgstr "salir con stado cero incluso si nada concuerda" +msgstr "salir con estado cero incluso si nada coincide" #: builtin/rm.c:307 #, c-format @@ -13197,7 +13292,7 @@ msgstr "mostrar <n> commits más tras encontrar el ancestro común" #: builtin/show-branch.c:634 msgid "synonym to more=-1" -msgstr "sinonimo de más=-1" +msgstr "sinónimo de más=-1" #: builtin/show-branch.c:635 msgid "suppress naming strings" @@ -13341,41 +13436,41 @@ msgstr "git stripspace [-c | --comment-lines]" #: builtin/stripspace.c:36 msgid "skip and remove all lines starting with comment character" msgstr "" -"saltar y borrar todas las líneas que comienzan con un caracter de comentario" +"saltar y borrar todas las líneas que comienzan con un carácter de comentario" #: builtin/stripspace.c:39 msgid "prepend comment character and space to each line" -msgstr "anteponer caracter de comentario y espacio a cada línea" +msgstr "anteponer carácter de comentario y espacio a cada línea" -#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1094 +#: builtin/submodule--helper.c:34 builtin/submodule--helper.c:1332 #, c-format msgid "No such ref: %s" msgstr "No existe ref: %s" -#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1103 +#: builtin/submodule--helper.c:41 builtin/submodule--helper.c:1341 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Se esperaba un nombre de ref completo, se obtuvo %s" -#: builtin/submodule--helper.c:71 +#: builtin/submodule--helper.c:81 #, c-format msgid "cannot strip one component off url '%s'" msgstr "no se puede quitar un componente del url '%s'" -#: builtin/submodule--helper.c:302 builtin/submodule--helper.c:623 +#: builtin/submodule--helper.c:370 builtin/submodule--helper.c:861 msgid "alternative anchor for relative paths" msgstr "ancho alternativo para rutas relativas" -#: builtin/submodule--helper.c:307 +#: builtin/submodule--helper.c:375 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<ruta>] [<ruta>...]" -#: builtin/submodule--helper.c:350 builtin/submodule--helper.c:374 +#: builtin/submodule--helper.c:426 builtin/submodule--helper.c:449 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "No se encontró url para la ruta del submódulo '%s' en .gitmodules" -#: builtin/submodule--helper.c:389 +#: builtin/submodule--helper.c:464 #, c-format msgid "" "could not lookup configuration '%s'. Assuming this repository is its own " @@ -13384,82 +13479,112 @@ msgstr "" "no se pudo encontrar configuración '%s'. Asumiendo que este repositorio es " "su propio upstream autoritativo." -#: builtin/submodule--helper.c:400 +#: builtin/submodule--helper.c:475 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Falló al registrar el url para la ruta del submódulo '%s'" -#: builtin/submodule--helper.c:404 +#: builtin/submodule--helper.c:479 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Submódulo '%s' (%s) registrado para ruta '%s'\n" -#: builtin/submodule--helper.c:414 +#: builtin/submodule--helper.c:489 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "" "peligro: modo de actualización de comandos sugerido para el submódulo '%s'\n" -#: builtin/submodule--helper.c:421 +#: builtin/submodule--helper.c:496 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" "Error al registrar el modo de actualización para la ruta del submódulo '%s'" -#: builtin/submodule--helper.c:437 +#: builtin/submodule--helper.c:518 msgid "Suppress output for initializing a submodule" msgstr "suprime la salida para inicializar un submódulo" -#: builtin/submodule--helper.c:442 +#: builtin/submodule--helper.c:523 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper init [<ruta>]" -#: builtin/submodule--helper.c:470 -msgid "git submodule--helper name <path>" -msgstr "git submodule--helper name <ruta>" - -#: builtin/submodule--helper.c:475 +#: builtin/submodule--helper.c:591 builtin/submodule--helper.c:713 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "" "No se ha encontrado mapeo de submódulos en .gitmodules para la ruta '%s'" -#: builtin/submodule--helper.c:558 builtin/submodule--helper.c:561 +#: builtin/submodule--helper.c:626 +#, c-format +msgid "could not resolve HEAD ref inside the submodule '%s'" +msgstr "No pudo resolver ref de HEAD dentro del submódulo '%s'" + +#: builtin/submodule--helper.c:653 +#, c-format +msgid "failed to recurse into submodule '%s'" +msgstr "falló al recursar en el submódulo '%s'" + +#: builtin/submodule--helper.c:677 +msgid "Suppress submodule status output" +msgstr "Suprimir output del estado del submódulo " + +#: builtin/submodule--helper.c:678 +msgid "" +"Use commit stored in the index instead of the one stored in the submodule " +"HEAD" +msgstr "" +"Usar el commit guardado en el índice en lugar del guardado en el submódulo " +"HEAD" + +#: builtin/submodule--helper.c:679 +msgid "recurse into nested submodules" +msgstr "recursar en submódulos anidados" + +#: builtin/submodule--helper.c:684 +msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" +msgstr "git submodule status [--quiet] [--cached] [--recursive] [<ruta>...]" + +#: builtin/submodule--helper.c:708 +msgid "git submodule--helper name <path>" +msgstr "git submodule--helper name <ruta>" + +#: builtin/submodule--helper.c:796 builtin/submodule--helper.c:799 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "submódulo '%s' no puede agregar alterno: %s" -#: builtin/submodule--helper.c:597 +#: builtin/submodule--helper.c:835 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Valor '%s' para submodule.alternateErrorStrategy no es reconocido" -#: builtin/submodule--helper.c:604 +#: builtin/submodule--helper.c:842 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Valor '%s' para submodule.alternateLocation no es reconocido" -#: builtin/submodule--helper.c:626 +#: builtin/submodule--helper.c:864 msgid "where the new submodule will be cloned to" msgstr "a donde el nuevo submódulo será clonado" -#: builtin/submodule--helper.c:629 +#: builtin/submodule--helper.c:867 msgid "name of the new submodule" msgstr "nombre del nuevo submódulo" -#: builtin/submodule--helper.c:632 +#: builtin/submodule--helper.c:870 msgid "url where to clone the submodule from" msgstr "url de dónde clonar el submódulo" -#: builtin/submodule--helper.c:638 +#: builtin/submodule--helper.c:876 msgid "depth for shallow clones" msgstr "profundidad para clones superficiales" -#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:1012 +#: builtin/submodule--helper.c:879 builtin/submodule--helper.c:1250 msgid "force cloning progress" msgstr "forzar el proceso de clonado" -#: builtin/submodule--helper.c:646 +#: builtin/submodule--helper.c:884 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -13468,83 +13593,83 @@ msgstr "" "<repositorio>] [--name <nombre>] [--depth <profundidad>] --url <url> --path " "<ruta>" -#: builtin/submodule--helper.c:677 +#: builtin/submodule--helper.c:915 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "clon de '%s' en la ruta de submódulo '%s' falló" -#: builtin/submodule--helper.c:692 +#: builtin/submodule--helper.c:930 #, c-format msgid "could not get submodule directory for '%s'" msgstr "no se pudo obtener el directorio de submódulo para '%s'" -#: builtin/submodule--helper.c:757 +#: builtin/submodule--helper.c:995 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Ruta de submódulo '%s' no inicializada" -#: builtin/submodule--helper.c:761 +#: builtin/submodule--helper.c:999 msgid "Maybe you want to use 'update --init'?" msgstr "Tal vez quiere usar 'update --init'?" -#: builtin/submodule--helper.c:790 +#: builtin/submodule--helper.c:1028 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Saltando submódulo %s no fusionado" -#: builtin/submodule--helper.c:819 +#: builtin/submodule--helper.c:1057 #, c-format msgid "Skipping submodule '%s'" msgstr "Saltando submódulo '%s'" -#: builtin/submodule--helper.c:952 +#: builtin/submodule--helper.c:1190 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Falló al clonar '%s'. Reintento programado" -#: builtin/submodule--helper.c:963 +#: builtin/submodule--helper.c:1201 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Falló al clonar '%s' una segunda vez, abortando" -#: builtin/submodule--helper.c:993 builtin/submodule--helper.c:1213 +#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1451 msgid "path into the working tree" msgstr "ruta hacia el árbol de trabajo" -#: builtin/submodule--helper.c:996 +#: builtin/submodule--helper.c:1234 msgid "path into the working tree, across nested submodule boundaries" msgstr "" "ruta hacia el árbol de trabajo, a través de extremos de submódulos anidados" -#: builtin/submodule--helper.c:1000 +#: builtin/submodule--helper.c:1238 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout o none" -#: builtin/submodule--helper.c:1004 +#: builtin/submodule--helper.c:1242 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "Crea un clon superficial truncado al número especificado de revisión" -#: builtin/submodule--helper.c:1007 +#: builtin/submodule--helper.c:1245 msgid "parallel jobs" msgstr "trabajos paralelos" -#: builtin/submodule--helper.c:1009 +#: builtin/submodule--helper.c:1247 msgid "whether the initial clone should follow the shallow recommendation" msgstr "si el clon inicial debe seguir la recomendación superficial" -#: builtin/submodule--helper.c:1010 +#: builtin/submodule--helper.c:1248 msgid "don't print cloning progress" msgstr "no mostrar el progreso de clonado" -#: builtin/submodule--helper.c:1017 +#: builtin/submodule--helper.c:1255 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update_clone [--prefix=<ruta>] [<ruta>...]" -#: builtin/submodule--helper.c:1030 +#: builtin/submodule--helper.c:1268 msgid "bad value for update parameter" msgstr "mal valor para parámetro update" -#: builtin/submodule--helper.c:1098 +#: builtin/submodule--helper.c:1336 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -13553,20 +13678,20 @@ msgstr "" "Rama de submódulo (%s) configurada para heredar rama del superproyecto, " "pero el superproyecto no está en ninguna rama" -#: builtin/submodule--helper.c:1214 +#: builtin/submodule--helper.c:1452 msgid "recurse into submodules" msgstr "recurrir a submódulos" -#: builtin/submodule--helper.c:1220 +#: builtin/submodule--helper.c:1458 msgid "git submodule--helper embed-git-dir [<path>...]" msgstr "git submodule--helper embed-git-dir [<ruta>...]" -#: builtin/submodule--helper.c:1278 +#: builtin/submodule--helper.c:1517 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s no soporta --super-prefix" -#: builtin/submodule--helper.c:1284 +#: builtin/submodule--helper.c:1523 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' no es un comando submodule--helper valido" @@ -13605,11 +13730,11 @@ msgid "" "[<head>]" msgstr "" "git tag [-a | -s | -u <id-de-clave>] [-f] [-m <mensaje> | -F <archivo>] " -"<nombre-de-etiqueta> [<head>]" +"<nombre-de-tag> [<head>]" #: builtin/tag.c:25 msgid "git tag -d <tagname>..." -msgstr "git tag -d <nombre-de-etiqueta>..." +msgstr "git tag -d <nombre-de-tag>..." #: builtin/tag.c:26 msgid "" @@ -13628,7 +13753,7 @@ msgstr "git tag -v [--format=<formato>] <nombre-de-tag>..." #: builtin/tag.c:86 #, c-format msgid "tag '%s' not found." -msgstr "etiqueta '%s' no encontrada." +msgstr "tag '%s' no encontrado." #: builtin/tag.c:102 #, c-format @@ -13644,7 +13769,7 @@ msgid "" "Lines starting with '%c' will be ignored.\n" msgstr "" "\n" -"Escribe un mensaje para la etiqueta:\n" +"Escribe un mensaje para la tag:\n" " %s\n" "Las líneas que comienzan con '%c' serán ignoradas.\n" @@ -13658,18 +13783,18 @@ msgid "" "want to.\n" msgstr "" "\n" -"Escribe un mensaje para la etiqueta:\n" +"Escribe un mensaje para la tag:\n" " %s\n" "Las líneas que comienzan con '%c' serán conservadas; puedes eliminarlas por " "ti mismo si quieres hacerlo.\n" #: builtin/tag.c:189 msgid "unable to sign the tag" -msgstr "incapaz de firmar etiqueta" +msgstr "incapaz de firmar tag" #: builtin/tag.c:191 msgid "unable to write tag file" -msgstr "incapaz de escribir el archivo de etiqueta" +msgstr "incapaz de escribir el archivo de tag" #: builtin/tag.c:215 msgid "bad object type." @@ -13677,52 +13802,52 @@ msgstr "tipo de objeto erróneo." #: builtin/tag.c:261 msgid "no tag message?" -msgstr "¿Sin mensaje de etiqueta?" +msgstr "¿Sin mensaje de tag?" #: builtin/tag.c:268 #, c-format msgid "The tag message has been left in %s\n" -msgstr "El mensaje de la etiqueta ha sido dejado en %s\n" +msgstr "El mensaje del tag ha sido dejado en %s\n" #: builtin/tag.c:376 msgid "list tag names" -msgstr "listar nombres de etiquetas" +msgstr "listar nombres de tags" #: builtin/tag.c:378 msgid "print <n> lines of each tag message" -msgstr "imprimir <n> líneas de cada mensaje de etiqueta" +msgstr "imprimir <n> líneas de cada mensaje de tag" #: builtin/tag.c:380 msgid "delete tags" -msgstr "eliminar etiquetas" +msgstr "eliminar tags" #: builtin/tag.c:381 msgid "verify tags" -msgstr "verificar etiquetas" +msgstr "verificar tags" #: builtin/tag.c:383 msgid "Tag creation options" -msgstr "Opciones de creación de etiquetas" +msgstr "Opciones de creación de tags" #: builtin/tag.c:385 msgid "annotated tag, needs a message" -msgstr "etiquetas anotadas necesitan un mensaje" +msgstr "tags anotadas necesitan un mensaje" #: builtin/tag.c:387 msgid "tag message" -msgstr "mensaje de etiqueta" +msgstr "mensaje de tag" #: builtin/tag.c:389 msgid "annotated and GPG-signed tag" -msgstr "etiqueta anotada y firmada con GPG" +msgstr "tag anotado y firmado con GPG" #: builtin/tag.c:393 msgid "use another key to sign the tag" -msgstr "usar otra clave para firmar la etiqueta" +msgstr "usar otra clave para firmar el tag" #: builtin/tag.c:394 msgid "replace the tag if exists" -msgstr "remplazar etiqueta si existe" +msgstr "remplazar tag si existe" #: builtin/tag.c:395 builtin/update-ref.c:368 msgid "create a reflog" @@ -13730,11 +13855,11 @@ msgstr "crear un reflog" #: builtin/tag.c:397 msgid "Tag listing options" -msgstr "Opciones de listado de etiqueta" +msgstr "Opciones de listado de tag" #: builtin/tag.c:398 msgid "show tag list in columns" -msgstr "mostrar lista de etiquetas en columnas" +msgstr "mostrar lista de tags en columnas" #: builtin/tag.c:399 builtin/tag.c:401 msgid "print only tags that contain the commit" @@ -13746,15 +13871,15 @@ msgstr "mostrar solo tags que no contienen el commit" #: builtin/tag.c:403 msgid "print only tags that are merged" -msgstr "sólo imprimir las etiquetas que están fusionadas" +msgstr "sólo imprimir las tags que están fusionadas" #: builtin/tag.c:404 msgid "print only tags that are not merged" -msgstr "sólo imprimir las etiquetas que no están fusionadas" +msgstr "sólo imprimir las tags que no están fusionadas" #: builtin/tag.c:409 msgid "print only tags of the object" -msgstr "sólo imprimir etiquetas de el objeto" +msgstr "sólo imprimir tags de el objeto" #: builtin/tag.c:453 msgid "--column and -n are incompatible" @@ -13770,7 +13895,7 @@ msgstr "opción --contains solo es permitido en modo lista" #: builtin/tag.c:479 msgid "--no-contains option is only allowed in list mode" -msgstr "opción --no-contains solo es permitida en moso lista" +msgstr "opción --no-contains solo es permitida en modo lista" #: builtin/tag.c:481 msgid "--points-at option is only allowed in list mode" @@ -13791,12 +13916,12 @@ msgstr "demasiados parámetros" #: builtin/tag.c:519 #, c-format msgid "'%s' is not a valid tag name." -msgstr "'%s' no es un nombre de etiqueta válido." +msgstr "'%s' no es un nombre de tag válido." #: builtin/tag.c:524 #, c-format msgid "tag '%s' already exists" -msgstr "la etiqueta '%s' ya existe" +msgstr "el tag '%s' ya existe" #: builtin/tag.c:554 #, c-format @@ -13807,190 +13932,208 @@ msgstr "Etiqueta '%s' actualizada (era %s)\n" msgid "Unpacking objects" msgstr "Desempaquetando objetos" -#: builtin/update-index.c:80 +#: builtin/update-index.c:82 #, c-format msgid "failed to create directory %s" msgstr "fallo al crear directorio %s" -#: builtin/update-index.c:86 +#: builtin/update-index.c:88 #, c-format msgid "failed to stat %s" msgstr "fallo al iniciar %s" -#: builtin/update-index.c:96 +#: builtin/update-index.c:98 #, c-format msgid "failed to create file %s" msgstr "fallo al crear el archivo %s" -#: builtin/update-index.c:104 +#: builtin/update-index.c:106 #, c-format msgid "failed to delete file %s" msgstr "fallo al eliminar el archivo %s" -#: builtin/update-index.c:111 builtin/update-index.c:217 +#: builtin/update-index.c:113 builtin/update-index.c:219 #, c-format msgid "failed to delete directory %s" msgstr "fallo al eliminar directorio %s" -#: builtin/update-index.c:136 +#: builtin/update-index.c:138 #, c-format msgid "Testing mtime in '%s' " msgstr "Probando mtime en '%s' " -#: builtin/update-index.c:150 +#: builtin/update-index.c:152 msgid "directory stat info does not change after adding a new file" msgstr "info de estado del directorio no cambia tras agregar un nuevo archivo" -#: builtin/update-index.c:163 +#: builtin/update-index.c:165 msgid "directory stat info does not change after adding a new directory" msgstr "" "info de estado del directorio no cambia tras agregar un nuevo directorio" -#: builtin/update-index.c:176 +#: builtin/update-index.c:178 msgid "directory stat info changes after updating a file" msgstr "info de estado del directorio cambia tras actualizar un archivo" -#: builtin/update-index.c:187 +#: builtin/update-index.c:189 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "" "info de estado del directorio cambia tras agregar un archivo dentro del " "subdirectorio" -#: builtin/update-index.c:198 +#: builtin/update-index.c:200 msgid "directory stat info does not change after deleting a file" msgstr "info de estado del directorio no cambia tras borrar un archivo" -#: builtin/update-index.c:211 +#: builtin/update-index.c:213 msgid "directory stat info does not change after deleting a directory" msgstr "info de estado del directorio no cambia tras borrar un directorio" -#: builtin/update-index.c:218 +#: builtin/update-index.c:220 msgid " OK" msgstr " OK" -#: builtin/update-index.c:571 +#: builtin/update-index.c:579 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<opciones>] [--] [<archivo>...]" -#: builtin/update-index.c:926 +#: builtin/update-index.c:936 msgid "continue refresh even when index needs update" -msgstr "continuar refresh incluso cuando el índice necesita actualizar" +msgstr "" +"continuar refresh (Actualización) incluso cuando el índice necesita " +"actualización" -#: builtin/update-index.c:929 +#: builtin/update-index.c:939 msgid "refresh: ignore submodules" msgstr "refresh: ignora submódulos" -#: builtin/update-index.c:932 +#: builtin/update-index.c:942 msgid "do not ignore new files" msgstr "no ignorar archivos nuevos" -#: builtin/update-index.c:934 +#: builtin/update-index.c:944 msgid "let files replace directories and vice-versa" msgstr "permitir que archivos remplacen directorios y vice-versa" -#: builtin/update-index.c:936 +#: builtin/update-index.c:946 msgid "notice files missing from worktree" msgstr "avisar de archivos faltando en el árbol de trabajo" -#: builtin/update-index.c:938 +#: builtin/update-index.c:948 msgid "refresh even if index contains unmerged entries" msgstr "ejecutar refresh incluso si el índice contiene entradas sin cambios" -#: builtin/update-index.c:941 +#: builtin/update-index.c:951 msgid "refresh stat information" msgstr "refresh información de estado" -#: builtin/update-index.c:945 +#: builtin/update-index.c:955 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "como --refresh, pero ignora configuración assume-unchanged" -#: builtin/update-index.c:949 +#: builtin/update-index.c:959 msgid "<mode>,<object>,<path>" msgstr "<modo>,<objeto>,<ruta>" -#: builtin/update-index.c:950 +#: builtin/update-index.c:960 msgid "add the specified entry to the index" msgstr "agregar la entrada especificada al índice" -#: builtin/update-index.c:959 +#: builtin/update-index.c:969 msgid "mark files as \"not changing\"" msgstr "marcar archivos como \"not changing\"" -#: builtin/update-index.c:962 +#: builtin/update-index.c:972 msgid "clear assumed-unchanged bit" msgstr "limpiar bit assumed-unchanged" -#: builtin/update-index.c:965 +#: builtin/update-index.c:975 msgid "mark files as \"index-only\"" msgstr "marcar archivos como \"index-only\"" -#: builtin/update-index.c:968 +#: builtin/update-index.c:978 msgid "clear skip-worktree bit" msgstr "limpiar bit skip-worktree" -#: builtin/update-index.c:971 +#: builtin/update-index.c:981 msgid "add to index only; do not add content to object database" msgstr "" "agregar solo al índice; no agregar contenido a la base de datos de objetos" -#: builtin/update-index.c:973 +#: builtin/update-index.c:983 msgid "remove named paths even if present in worktree" msgstr "" "remover rutas nombradas incluso si están presentes en el árbol de trabajo" -#: builtin/update-index.c:975 +#: builtin/update-index.c:985 msgid "with --stdin: input lines are terminated by null bytes" -msgstr "con --stdin: línas de entrada son terminadas con bytes null" +msgstr "con --stdin: las lineas de entrada son terminadas con bytes nulos" -#: builtin/update-index.c:977 +#: builtin/update-index.c:987 msgid "read list of paths to be updated from standard input" msgstr "leer la lista de rutas para ser actualizada desde standard input" -#: builtin/update-index.c:981 +#: builtin/update-index.c:991 msgid "add entries from standard input to the index" msgstr "agregar entradas de standard input al índice" -#: builtin/update-index.c:985 +#: builtin/update-index.c:995 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "repoblar stages #2 y #3 para las rutas listadas" -#: builtin/update-index.c:989 +#: builtin/update-index.c:999 msgid "only update entries that differ from HEAD" msgstr "solo actualizar entradas que difieren de HEAD" -#: builtin/update-index.c:993 +#: builtin/update-index.c:1003 msgid "ignore files missing from worktree" msgstr "ignorar archivos faltantes en el árbol de trabajo" -#: builtin/update-index.c:996 +#: builtin/update-index.c:1006 msgid "report actions to standard output" msgstr "reportar acciones por standard output" -#: builtin/update-index.c:998 +#: builtin/update-index.c:1008 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(para porcelanas) olvidar conflictos sin resolver guardados" -#: builtin/update-index.c:1002 +#: builtin/update-index.c:1012 msgid "write index in this format" msgstr "escribir índice en este formato" -#: builtin/update-index.c:1004 +#: builtin/update-index.c:1014 msgid "enable or disable split index" msgstr "activar o desactivar índice dividido" -#: builtin/update-index.c:1006 +#: builtin/update-index.c:1016 msgid "enable/disable untracked cache" msgstr "habilitar o deshabilitar caché no rastreado" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1018 msgid "test if the filesystem supports untracked cache" msgstr "probar si el filesystem soporta caché no rastreado" -#: builtin/update-index.c:1010 +#: builtin/update-index.c:1020 msgid "enable untracked cache without testing the filesystem" msgstr "habilitar caché no rastreado sin probar el filesystem" -#: builtin/update-index.c:1107 +#: builtin/update-index.c:1022 +msgid "write out the index even if is not flagged as changed" +msgstr "escribir el índice incluso si no está marcado como cambiado" + +#: builtin/update-index.c:1024 +msgid "enable or disable file system monitor" +msgstr "activar o desactivar monitor de sistema de archivos" + +#: builtin/update-index.c:1026 +msgid "mark files as fsmonitor valid" +msgstr "marcar archivos como válidos para fsmonitor" + +#: builtin/update-index.c:1029 +msgid "clear fsmonitor valid bit" +msgstr "limpia el bit de validación fsmonitor" + +#: builtin/update-index.c:1127 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -13998,7 +14141,7 @@ msgstr "" "core.splitIndex está configurado en false; remuévelo o cámbialo, si " "realmente quieres habilitar el índice partido" -#: builtin/update-index.c:1116 +#: builtin/update-index.c:1136 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -14006,7 +14149,7 @@ msgstr "" "core.splitIndex está configurado en true; remuévelo o cámbialo, si realmente " "quieres deshabilitar el índice partido" -#: builtin/update-index.c:1127 +#: builtin/update-index.c:1147 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -14014,11 +14157,11 @@ msgstr "" "core.untrackedCache está configurado en true; remuévelo o cámbialo, si " "realmente quieres deshabilitar el chaché no rastreado" -#: builtin/update-index.c:1131 +#: builtin/update-index.c:1151 msgid "Untracked cache disabled" msgstr "Caché no rastreado deshabilitado" -#: builtin/update-index.c:1139 +#: builtin/update-index.c:1159 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -14026,11 +14169,32 @@ msgstr "" "core.untrackedCache está configurado en false; remuévelo o cámbialo, si " "realmente quieres habilitar el caché no rastreado" -#: builtin/update-index.c:1143 +#: builtin/update-index.c:1163 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Caché no rastreado habilitado para '%s'" +#: builtin/update-index.c:1171 +msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" +msgstr "" +"core.fsmonitor no está configurado; actívalo si realmente quieres habilitar " +"fsmonitor" + +#: builtin/update-index.c:1175 +msgid "fsmonitor enabled" +msgstr "fsmonitor activado" + +#: builtin/update-index.c:1178 +msgid "" +"core.fsmonitor is set; remove it if you really want to disable fsmonitor" +msgstr "" +"core.fsmonitor está configurado; remuévelo si realmente quieres deshabilitar " +"el fsmonitor" + +#: builtin/update-index.c:1182 +msgid "fsmonitor disabled" +msgstr "fsmonitor desactivado" + #: builtin/update-ref.c:10 msgid "git update-ref [<options>] -d <refname> [<old-val>]" msgstr "git update-ref [<opciones>] -d <nombre-referencia> [<valor-anterior>]" @@ -14067,15 +14231,15 @@ msgstr "git update-server-info [--force]" #: builtin/update-server-info.c:15 msgid "update the info files from scratch" -msgstr "actualiza el archivo info desde cero" +msgstr "actualiza los archivos info desde cero" #: builtin/verify-commit.c:18 msgid "git verify-commit [-v | --verbose] <commit>..." -msgstr "git verify-commit [-v | --verbose] <confirmación>..." +msgstr "git verify-commit [-v | --verbose] <commit>..." #: builtin/verify-commit.c:73 msgid "print commit contents" -msgstr "imprimir contenido de la confirmación" +msgstr "imprimir contenido del commit" #: builtin/verify-commit.c:74 builtin/verify-tag.c:38 msgid "print raw gpg status output" @@ -14099,44 +14263,44 @@ msgstr "git verify-tag [-v | --verbose] [--format=<formato>] <tag>..." #: builtin/verify-tag.c:37 msgid "print tag contents" -msgstr "imprimir contenido de la etiqueta" +msgstr "imprimir contenido del tag" -#: builtin/worktree.c:16 +#: builtin/worktree.c:17 msgid "git worktree add [<options>] <path> [<branch>]" msgstr "git worktree add [<opciones>] <ruta> [<rama>]" -#: builtin/worktree.c:17 +#: builtin/worktree.c:18 msgid "git worktree list [<options>]" msgstr "git worktree list [<opciones>]" -#: builtin/worktree.c:18 +#: builtin/worktree.c:19 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<opciones>] <ruta>" -#: builtin/worktree.c:19 +#: builtin/worktree.c:20 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<opciones>]" -#: builtin/worktree.c:20 +#: builtin/worktree.c:21 msgid "git worktree unlock <path>" msgstr "git worktree unlock <ruta>" -#: builtin/worktree.c:46 +#: builtin/worktree.c:58 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Removiendo el worktrees/%s: no es un directorio válido" -#: builtin/worktree.c:52 +#: builtin/worktree.c:64 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Removiendo worktrees/%s: archivo gitdir no existe" -#: builtin/worktree.c:57 builtin/worktree.c:66 +#: builtin/worktree.c:69 builtin/worktree.c:78 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "Removiendo worktrees/%s: no es posible leer el archivo gitdir (%s)" -#: builtin/worktree.c:76 +#: builtin/worktree.c:88 #, c-format msgid "" "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " @@ -14145,90 +14309,103 @@ msgstr "" "Removiendo árboles de trabajo/%s: lectura corta (se esperan %<PRIuMAX> " "bytes, %<PRIuMAX> leídos)" -#: builtin/worktree.c:84 +#: builtin/worktree.c:96 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Removiendo worktrees/%s: archivo gitdir inválido" -#: builtin/worktree.c:100 +#: builtin/worktree.c:112 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "" "Removiendo worktrees/%s: archivo gitdir apunta a una ubicación no existente" -#: builtin/worktree.c:147 +#: builtin/worktree.c:159 msgid "report pruned working trees" msgstr "reporta árboles de trabajo recortados" -#: builtin/worktree.c:149 +#: builtin/worktree.c:161 msgid "expire working trees older than <time>" msgstr "expirar árboles de trabajo más viejos a <tiempo>" -#: builtin/worktree.c:223 +#: builtin/worktree.c:236 #, c-format msgid "'%s' already exists" msgstr "'%s' ya existe" -#: builtin/worktree.c:254 +#: builtin/worktree.c:267 #, c-format msgid "could not create directory of '%s'" msgstr "no se pudo crear directorio de '%s'" -#: builtin/worktree.c:293 +#: builtin/worktree.c:306 #, c-format msgid "Preparing %s (identifier %s)" msgstr "Preparando %s (identificador %s)" -#: builtin/worktree.c:345 +#: builtin/worktree.c:368 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "hacer checkout a <rama> incluso si ya ha hecho checkout en otro árbol de " "trabajo" -#: builtin/worktree.c:347 +#: builtin/worktree.c:370 msgid "create a new branch" msgstr "crear una nueva rama" -#: builtin/worktree.c:349 +#: builtin/worktree.c:372 msgid "create or reset a branch" msgstr "crear o restablecer una rama" -#: builtin/worktree.c:351 +#: builtin/worktree.c:374 msgid "populate the new working tree" msgstr "popular el nuevo árbol de trabajo" -#: builtin/worktree.c:352 +#: builtin/worktree.c:375 msgid "keep the new working tree locked" msgstr "mantener el nuevo árbol de trabajo bloqueado" -#: builtin/worktree.c:360 +#: builtin/worktree.c:377 +msgid "set up tracking mode (see git-branch(1))" +msgstr "configurando modo tracking (mirar git-branch(1))" + +#: builtin/worktree.c:380 +msgid "try to match the new branch name with a remote-tracking branch" +msgstr "" +"intentar emparejar el nuevo nombre de rama con una rama de rastreo remoto" + +#: builtin/worktree.c:388 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B, y --detach son mutuamente exclusivas" -#: builtin/worktree.c:499 +#: builtin/worktree.c:453 +msgid "--[no-]track can only be used if a new branch is created" +msgstr "--[no-]track solo puede ser usado si una nueva rama es creada" + +#: builtin/worktree.c:553 msgid "reason for locking" msgstr "razón para bloquear" -#: builtin/worktree.c:511 builtin/worktree.c:544 +#: builtin/worktree.c:565 builtin/worktree.c:598 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' no es un árbol de trabajo" -#: builtin/worktree.c:513 builtin/worktree.c:546 +#: builtin/worktree.c:567 builtin/worktree.c:600 msgid "The main working tree cannot be locked or unlocked" msgstr "El árbol de trabajo principal no puede ser bloqueado ni desbloqueado" -#: builtin/worktree.c:518 +#: builtin/worktree.c:572 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' ya está bloqueado; razón: %s" -#: builtin/worktree.c:520 +#: builtin/worktree.c:574 #, c-format msgid "'%s' is already locked" msgstr "'%s' ya está bloqueado" -#: builtin/worktree.c:548 +#: builtin/worktree.c:602 #, c-format msgid "'%s' is not locked" msgstr "'%s' no está bloqueado" @@ -14243,29 +14420,29 @@ msgstr "<prefijo>/" #: builtin/write-tree.c:28 msgid "write tree object for a subdirectory <prefix>" -msgstr "escribit objeto árbol para un subdirectorio <prefijo>" +msgstr "escribir objeto de árbol para un subdirectorio <prefijo>" #: builtin/write-tree.c:31 msgid "only useful for debugging" msgstr "sólo útil para depurar" -#: upload-pack.c:23 +#: upload-pack.c:24 msgid "git upload-pack [<options>] <dir>" msgstr "git upload-pack [<opciones>] <directorio>" -#: upload-pack.c:1040 +#: upload-pack.c:1041 msgid "quit after a single request/response exchange" msgstr "sale después de un intercambio petición/respuesta único" -#: upload-pack.c:1042 +#: upload-pack.c:1043 msgid "exit immediately after initial ref advertisement" msgstr "salir inmediatamente tras el anuncio inicial de ref" -#: upload-pack.c:1044 +#: upload-pack.c:1045 msgid "do not try <directory>/.git/ if <directory> is no Git directory" msgstr "no intente <directorio>/.git/ si <directorio> no es un directorio Git" -#: upload-pack.c:1046 +#: upload-pack.c:1047 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "interrumpir transferencia tras <n> segundos de inactividad" @@ -14297,20 +14474,20 @@ msgstr "" "guías de concepto. Consulte 'git help <command>' o 'git help <concepto>'\n" "para leer sobre un subcomando o concepto específico." -#: http.c:338 +#: http.c:339 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "valor negativo para http.postbuffer; poniendo el default a %d" -#: http.c:359 +#: http.c:360 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "Delegación de control no es soportada con cURL < 7.22.0" -#: http.c:368 +#: http.c:369 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "Fijación de llave pública no es soportada con cURL < 7.44.0" -#: http.c:1768 +#: http.c:1791 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -14326,17 +14503,25 @@ msgstr "" msgid "redirecting to %s" msgstr "redirigiendo a %s" +#: list-objects-filter-options.h:54 +msgid "args" +msgstr "args" + +#: list-objects-filter-options.h:55 +msgid "object filtering" +msgstr "filtrado de objeto" + #: common-cmds.h:9 msgid "start a working area (see also: git help tutorial)" -msgstr "comienza un area de trabajo (mira tambien: git help tutorial)" +msgstr "comienza un área de trabajo (ver también: git help tutorial)" #: common-cmds.h:10 msgid "work on the current change (see also: git help everyday)" -msgstr "trabaja en los cambios actuales (mira tambien: git help everyday)" +msgstr "trabaja en los cambios actuales (ver también: git help everyday)" #: common-cmds.h:11 msgid "examine the history and state (see also: git help revisions)" -msgstr "examina el historial y el estado (mira tambien: git help revisions)" +msgstr "examina el historial y el estado (ver también: git help revisions)" #: common-cmds.h:12 msgid "grow, mark and tweak your common history" @@ -14344,7 +14529,7 @@ msgstr "crece, marca y ajusta tu historial comun" #: common-cmds.h:13 msgid "collaborate (see also: git help workflows)" -msgstr "colabora (mira tambien: git help workflows)" +msgstr "colabora (mira también: git help workflows)" #: common-cmds.h:17 msgid "Add file contents to the index" @@ -14352,7 +14537,7 @@ msgstr "Agrega contenido de carpetas al indice" #: common-cmds.h:18 msgid "Use binary search to find the commit that introduced a bug" -msgstr "usa busqueqda binaria para encontrar el commit que introdujo el bug" +msgstr "use la búsqueda binaria para encontrar el commit que introdujo el bug" #: common-cmds.h:19 msgid "List, create, or delete branches" @@ -14360,7 +14545,7 @@ msgstr "Lista, crea, o borra ramas" #: common-cmds.h:20 msgid "Switch branches or restore working tree files" -msgstr "Cambia ramas o restaura los archivos de tu arbol de trabajo" +msgstr "Cambia ramas o restaura los archivos de tu árbol de trabajo" #: common-cmds.h:21 msgid "Clone a repository into a new directory" @@ -14372,7 +14557,7 @@ msgstr "Graba los cambios en tu repositorio" #: common-cmds.h:23 msgid "Show changes between commits, commit and working tree, etc" -msgstr "Muestra los cambios entre commits, commit y arbol de trabajo, etc" +msgstr "Muestra los cambios entre commits, commit y árbol de trabajo, etc" #: common-cmds.h:24 msgid "Download objects and refs from another repository" @@ -14380,15 +14565,15 @@ msgstr "Descarga objetos y referencias de otro repositorio" #: common-cmds.h:25 msgid "Print lines matching a pattern" -msgstr "Imprime las lineas que concuerdan con el patron" +msgstr "Imprime las líneas que concuerdan con el patron" #: common-cmds.h:26 msgid "Create an empty Git repository or reinitialize an existing one" -msgstr "Crea un repositorio de Git vacio o reinicia el que ya existe" +msgstr "Crea un repositorio de Git vacío o reinicia el que ya existe" #: common-cmds.h:27 msgid "Show commit logs" -msgstr "Muestra los logs de commits" +msgstr "Muestra los logs de los commits" #: common-cmds.h:28 msgid "Join two or more development histories together" @@ -14396,7 +14581,7 @@ msgstr "Junta dos o mas historiales de desarrollo juntos" #: common-cmds.h:29 msgid "Move or rename a file, a directory, or a symlink" -msgstr "Mueve o cambia el nombre a archivos, directorios o vinculos simbolicos" +msgstr "Mueve o cambia el nombre a archivos, directorios o enlaces simbolicos" #: common-cmds.h:30 msgid "Fetch from and integrate with another repository or a local branch" @@ -14416,7 +14601,7 @@ msgstr "Reinicia el HEAD actual a un estado especifico" #: common-cmds.h:34 msgid "Remove files from the working tree and from the index" -msgstr "Borra archivos del arblo de trabajo y del indice" +msgstr "Borra archivos del árbol de trabajo y del indice" #: common-cmds.h:35 msgid "Show various types of objects" @@ -14424,7 +14609,7 @@ msgstr "Muestra varios tipos de objetos" #: common-cmds.h:36 msgid "Show the working tree status" -msgstr "Muestra el estado del arblo de trabajo" +msgstr "Muestra el estado del árbol de trabajo" #: common-cmds.h:37 msgid "Create, list, delete or verify a tag object signed with GPG" @@ -14432,7 +14617,7 @@ msgstr "Crea, lista, borra o verifica un tag de objeto firmado con GPG" #: parse-options.h:145 msgid "expiry-date" -msgstr "fecha de expiracion" +msgstr "fecha de expiración" #: parse-options.h:160 msgid "no-op (backward compatibility)" @@ -14501,27 +14686,27 @@ msgstr "Mal HEAD - ref simbólico extraño" msgid "Bad bisect_write argument: $state" msgstr "Mal argumento bisect_write: $state" -#: git-bisect.sh:262 +#: git-bisect.sh:246 #, sh-format msgid "Bad rev input: $arg" msgstr "Mala entrada rev: $arg" -#: git-bisect.sh:281 +#: git-bisect.sh:265 #, sh-format msgid "Bad rev input: $bisected_head" msgstr "Mala entrada rev: $bisected_head" -#: git-bisect.sh:290 +#: git-bisect.sh:274 #, sh-format msgid "Bad rev input: $rev" msgstr "Mala entrada rev: $rev" -#: git-bisect.sh:299 +#: git-bisect.sh:283 #, sh-format msgid "'git bisect $TERM_BAD' can take only one argument." msgstr "'git bisect $TERM_BAD' solo puede tomar un argumento." -#: git-bisect.sh:322 +#: git-bisect.sh:306 #, sh-format msgid "Warning: bisecting only with a $TERM_BAD commit." msgstr "Peligro: bisectando solo con un $TERM_BAD commit." @@ -14529,11 +14714,11 @@ msgstr "Peligro: bisectando solo con un $TERM_BAD commit." #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. -#: git-bisect.sh:328 +#: git-bisect.sh:312 msgid "Are you sure [Y/n]? " msgstr "¿Estás seguro [Y/n]?" -#: git-bisect.sh:340 +#: git-bisect.sh:324 #, sh-format msgid "" "You need to give me at least one $bad_syn and one $good_syn revision.\n" @@ -14542,7 +14727,7 @@ msgstr "" "Tiene que dar al menos un $bad_syn y un $good_syn revision.\n" "(Puede ver \"git bisect $bad_syn\" y \"git bisect $good_syn\" para eso.)" -#: git-bisect.sh:343 +#: git-bisect.sh:327 #, sh-format msgid "" "You need to start by \"git bisect start\".\n" @@ -14553,16 +14738,16 @@ msgstr "" "Después tiene que entregar al menos un $good_syn y un $bad_syn revision.\n" "(Puede usar \"git bisect $bad_syn\" y \"git bisect $good_syn\" para eso.)" -#: git-bisect.sh:414 git-bisect.sh:546 +#: git-bisect.sh:398 git-bisect.sh:512 msgid "We are not bisecting." msgstr "No estamos bisectando." -#: git-bisect.sh:421 +#: git-bisect.sh:405 #, sh-format msgid "'$invalid' is not a valid commit" -msgstr "'$invalid' no es una confirmación válida" +msgstr "'$invalid' no es un commit válido" -#: git-bisect.sh:430 +#: git-bisect.sh:414 #, sh-format msgid "" "Could not check out original HEAD '$branch'.\n" @@ -14571,25 +14756,29 @@ msgstr "" "No se pudo revisar el HEAD original '$branch'.\n" "Intente 'git bisect reset <commit>'." -#: git-bisect.sh:458 +#: git-bisect.sh:422 msgid "No logfile given" -msgstr "No se entrogó logfile" +msgstr "Ningún logfile proporcionado" -#: git-bisect.sh:459 +#: git-bisect.sh:423 #, sh-format msgid "cannot read $file for replaying" msgstr "no se puede leer $file para reproducir" -#: git-bisect.sh:480 +#: git-bisect.sh:444 msgid "?? what are you talking about?" msgstr "?? ¿De qué estás hablando?" -#: git-bisect.sh:492 +#: git-bisect.sh:453 +msgid "bisect run failed: no command provided." +msgstr "bisect falló: no se proveyó comando" + +#: git-bisect.sh:458 #, sh-format msgid "running $command" msgstr "ejecutando $command" -#: git-bisect.sh:499 +#: git-bisect.sh:465 #, sh-format msgid "" "bisect run failed:\n" @@ -14598,11 +14787,11 @@ msgstr "" "bisect falló:\n" "código de salida $res de '$command' es <0 o >=128" -#: git-bisect.sh:525 +#: git-bisect.sh:491 msgid "bisect run cannot continue any more" msgstr "bisect no puede seguir continuando" -#: git-bisect.sh:531 +#: git-bisect.sh:497 #, sh-format msgid "" "bisect run failed:\n" @@ -14611,40 +14800,21 @@ msgstr "" "bisect falló:\n" "'bisect_state $state' salió con código de error $res" -#: git-bisect.sh:538 +#: git-bisect.sh:504 msgid "bisect run success" msgstr "bisect exitoso" -#: git-bisect.sh:565 -msgid "please use two different terms" -msgstr "por favor use dos terminos diferentes" - -#: git-bisect.sh:575 -#, sh-format -msgid "'$term' is not a valid term" -msgstr "'$term' no es un término válido" - -#: git-bisect.sh:578 -#, sh-format -msgid "can't use the builtin command '$term' as a term" -msgstr "no se puede usar el comando builtin '$term' como un término" - -#: git-bisect.sh:587 git-bisect.sh:593 -#, sh-format -msgid "can't change the meaning of term '$term'" -msgstr "no se puede cambiar el significado del término '$term'" - -#: git-bisect.sh:606 +#: git-bisect.sh:533 #, sh-format msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect." msgstr "" "Comando inválido: actualmente se encuentra en un bisect $TERM_BAD/$TERM_GOOD" -#: git-bisect.sh:636 +#: git-bisect.sh:567 msgid "no terms defined" msgstr "no hay términos definidos" -#: git-bisect.sh:653 +#: git-bisect.sh:584 #, sh-format msgid "" "invalid argument $arg for 'git bisect terms'.\n" @@ -14728,8 +14898,8 @@ msgid "The pre-rebase hook refused to rebase." msgstr "El hook pre-rebase rechazó el rebase." #: git-rebase.sh:219 -msgid "It looks like git-am is in progress. Cannot rebase." -msgstr "Parece que git-am está en progreso. No se puede hacer rebase." +msgid "It looks like 'git am' is in progress. Cannot rebase." +msgstr "Parece que 'git am' está en progreso. No se puede rebasar." #: git-rebase.sh:363 msgid "No rebase in progress?" @@ -14775,8 +14945,8 @@ msgstr "" #: git-rebase.sh:480 #, sh-format -msgid "invalid upstream $upstream_name" -msgstr "upstream inválido $upstream_name" +msgid "invalid upstream '$upstream_name'" +msgstr "upstream inválido '$upstream_name'" #: git-rebase.sh:504 #, sh-format @@ -14791,47 +14961,57 @@ msgstr "$onto_name: no hay base de fusión" #: git-rebase.sh:516 #, sh-format msgid "Does not point to a valid commit: $onto_name" -msgstr "No apunta a una confirmación válida: $onto_name" +msgstr "No apunta a un commit válido: $onto_name" -#: git-rebase.sh:539 +#: git-rebase.sh:542 #, sh-format -msgid "fatal: no such branch: $branch_name" -msgstr "fatal: no existe la rama: $branch_name" +msgid "fatal: no such branch/commit '$branch_name'" +msgstr "fatal: no existe la rama/commit: '$branch_name'" -#: git-rebase.sh:572 +#: git-rebase.sh:575 msgid "Cannot autostash" msgstr "No se puede ejecutar autostash" -#: git-rebase.sh:577 +#: git-rebase.sh:580 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Autostash creado: $stash_abbrev" -#: git-rebase.sh:581 +#: git-rebase.sh:584 msgid "Please commit or stash them." msgstr "Por favor, confírmalos o salvaguárdalos." -#: git-rebase.sh:601 +#: git-rebase.sh:607 +#, sh-format +msgid "HEAD is up to date." +msgstr "HEAD está actualizado" + +#: git-rebase.sh:609 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "La rama actual $branch_name está actualizada." -#: git-rebase.sh:605 +#: git-rebase.sh:617 +#, sh-format +msgid "HEAD is up to date, rebase forced." +msgstr "HEAD está actualizado, rebase forzado." + +#: git-rebase.sh:619 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "Rama actual $branch_name está actualizada, rebase forzado." -#: git-rebase.sh:616 +#: git-rebase.sh:631 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Cambios desde $mb a $onto:" -#: git-rebase.sh:625 +#: git-rebase.sh:640 msgid "First, rewinding head to replay your work on top of it..." msgstr "" "Primero, rebobinando head para reproducir tu trabajo en la cima de él..." -#: git-rebase.sh:635 +#: git-rebase.sh:650 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "Avance rápido de $branch_name a $onto_name." @@ -14840,159 +15020,145 @@ msgstr "Avance rápido de $branch_name a $onto_name." msgid "git stash clear with parameters is unimplemented" msgstr "git stash clear con parámetros no está implementado" -#: git-stash.sh:102 +#: git-stash.sh:108 msgid "You do not have the initial commit yet" -msgstr "Aún no tienes una confirmación inicial." +msgstr "Aún no tienes un commit inicial." -#: git-stash.sh:117 +#: git-stash.sh:123 msgid "Cannot save the current index state" msgstr "No se puede guardar el estado actual del índice" -#: git-stash.sh:132 +#: git-stash.sh:138 msgid "Cannot save the untracked files" msgstr "No se pueden guardar los archivos no rastreados" -#: git-stash.sh:152 git-stash.sh:165 +#: git-stash.sh:158 git-stash.sh:171 msgid "Cannot save the current worktree state" msgstr "No se puede guardar el estado actual del árbol de trabajo" -#: git-stash.sh:169 +#: git-stash.sh:175 msgid "No changes selected" msgstr "Sin cambios seleccionados" -#: git-stash.sh:172 +#: git-stash.sh:178 msgid "Cannot remove temporary index (can't happen)" msgstr "No se puede remover el índice temporal (no puede suceder)" -#: git-stash.sh:185 +#: git-stash.sh:191 msgid "Cannot record working tree state" msgstr "No se puede grabar el estado del árbol de trabajo" -#: git-stash.sh:217 +#: git-stash.sh:229 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "No se puede actualizar $ref_stash con $w_commit" -#. TRANSLATORS: $option is an invalid option, like -#. `--blah-blah'. The 7 spaces at the beginning of the -#. second line correspond to "error: ". So you should line -#. up the second line with however many characters the -#. translation of "error: " takes in your language. E.g. in -#. English this is: -#. -#. $ git stash save --blah-blah 2>&1 | head -n 2 -#. error: unknown option for 'stash save': --blah-blah -#. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:273 +#: git-stash.sh:281 #, sh-format -msgid "" -"error: unknown option for 'stash save': $option\n" -" To provide a message, use git stash save -- '$option'" -msgstr "" -"error: opción desconocida para 'stash save': $option\n" -" Esto provee un mensaje , use git stash save -- '$option'" +msgid "error: unknown option for 'stash push': $option" +msgstr "error: opción desconocida para 'stash pus': $option" -#: git-stash.sh:288 +#: git-stash.sh:295 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "No se puede usar --patch y --include-untracked o --all al mismo tiempo" -#: git-stash.sh:296 +#: git-stash.sh:303 msgid "No local changes to save" msgstr "No hay cambios locales para guardar" -#: git-stash.sh:301 +#: git-stash.sh:308 msgid "Cannot initialize stash" msgstr "No se puede inicializar stash" -#: git-stash.sh:305 +#: git-stash.sh:312 msgid "Cannot save the current status" msgstr "No se puede guardar el estado actual" -#: git-stash.sh:306 +#: git-stash.sh:313 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "Directorio de trabajo guardado y estado de índice $stash_msg" -#: git-stash.sh:334 +#: git-stash.sh:341 msgid "Cannot remove worktree changes" msgstr "No se pueden remover cambios del árbol de trabajo" -#: git-stash.sh:482 +#: git-stash.sh:489 #, sh-format msgid "unknown option: $opt" msgstr "opción desconocida: $opt" -#: git-stash.sh:495 +#: git-stash.sh:502 msgid "No stash entries found." msgstr "No se encontraron entradas de stash." -#: git-stash.sh:502 +#: git-stash.sh:509 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Se especificaron demasiadas revisiones: $REV" -#: git-stash.sh:517 +#: git-stash.sh:524 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference no es una referencia válida" -#: git-stash.sh:545 +#: git-stash.sh:552 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args' no es un commit estilo stash" -#: git-stash.sh:556 +#: git-stash.sh:563 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args' no es una referencia stash" -#: git-stash.sh:564 +#: git-stash.sh:571 msgid "unable to refresh index" msgstr "incapaz de refrescar el índice" -#: git-stash.sh:568 +#: git-stash.sh:575 msgid "Cannot apply a stash in the middle of a merge" msgstr "No se puede aplicar un stash en medio de una fusión" -#: git-stash.sh:576 +#: git-stash.sh:583 msgid "Conflicts in index. Try without --index." msgstr "Conflictos en índice. Intente sin --index." -#: git-stash.sh:578 +#: git-stash.sh:585 msgid "Could not save index tree" msgstr "No se puede guardar el índice del árbol" -#: git-stash.sh:587 +#: git-stash.sh:594 msgid "Could not restore untracked files from stash entry" msgstr "No se pueden restaurar archivos no rastreados de la entrada stash" -#: git-stash.sh:612 +#: git-stash.sh:619 msgid "Cannot unstage modified files" msgstr "No se puede sacar de stage archivos modificados" -#: git-stash.sh:627 +#: git-stash.sh:634 msgid "Index was not unstashed." msgstr "El índice no fue sacado de stash." -#: git-stash.sh:641 +#: git-stash.sh:648 msgid "The stash entry is kept in case you need it again." msgstr "La entrada de stash se guardó en caso de ser necesario nuevamente." -#: git-stash.sh:650 +#: git-stash.sh:657 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Botado ${REV} ($s)" -#: git-stash.sh:651 +#: git-stash.sh:658 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: No se pudo borrar entrada stash" -#: git-stash.sh:659 +#: git-stash.sh:666 msgid "No branch name specified" msgstr "No se especificó el nombre de la rama." -#: git-stash.sh:738 +#: git-stash.sh:745 msgid "(To restore them type \"git stash apply\")" msgstr "(Para restaurarlos, escribe \"git stash apply\")" @@ -15227,38 +15393,32 @@ msgstr "Ruta de submódulo '$displaypath': '$command $sha1'" msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Falló al recurrir en la ruta de submódulo '$displaypath'" -#: git-submodule.sh:840 +#: git-submodule.sh:828 msgid "The --cached option cannot be used with the --files option" msgstr "La opción --cached no puede ser usada con la opción --files" -#: git-submodule.sh:892 +#: git-submodule.sh:880 #, sh-format msgid "unexpected mode $mod_dst" msgstr "modo $mod_dst inesperado" -#: git-submodule.sh:912 +#: git-submodule.sh:900 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" -msgstr " Advertencia: $display_name no contiene la confirmación $sha1_src" +msgstr " Advertencia: $display_name no contiene el commit $sha1_src" -#: git-submodule.sh:915 +#: git-submodule.sh:903 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" -msgstr " Advertencia: $display_name no contiene la confirmación $sha1_dst" +msgstr " Advertencia: $display_name no contiene el commit $sha1_dst" -#: git-submodule.sh:918 +#: git-submodule.sh:906 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" -"Advertencia: $display_name no contiene las confirmaciones $sha1_src y " -"$sha1_dst" +"Advertencia: $display_name no contiene los commits $sha1_src y $sha1_dst" -#: git-submodule.sh:1064 -#, sh-format -msgid "Failed to recurse into submodule path '$sm_path'" -msgstr "Falló al recurrir en la ruta de submódulo '$sm_path'" - -#: git-submodule.sh:1136 +#: git-submodule.sh:1077 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Sincronizando url de submódulo para '$displaypath'" @@ -15306,8 +15466,7 @@ msgid "" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" msgstr "" "\n" -"No eliminar ninguna línea. Usa 'drop' explícitamente para eliminar una " -"confirmación.\n" +"No eliminar ninguna línea. Usa 'drop' explícitamente para borrar un commit \n" #: git-rebase--interactive.sh:175 msgid "" @@ -15344,7 +15503,7 @@ msgstr "$sha1: no es un commit que pueda ser cogido" #: git-rebase--interactive.sh:275 #, sh-format msgid "Invalid commit name: $sha1" -msgstr "Nombre de confirmación inválido: $sha1" +msgstr "Nombre de commit inválido: $sha1" #: git-rebase--interactive.sh:317 msgid "Cannot write current commit's replacement sha1" @@ -15383,19 +15542,19 @@ msgstr "No se pudo coger $sha1" #: git-rebase--interactive.sh:417 #, sh-format msgid "This is the commit message #${n}:" -msgstr "Este es el mensaje de la confirmación #${n}:" +msgstr "Este es el mensaje del commit #${n}:" #: git-rebase--interactive.sh:422 #, sh-format msgid "The commit message #${n} will be skipped:" -msgstr "El mensaje de confirmación #${n} será ignorado:" +msgstr "El mensaje del commit #${n} será ignorado:" #: git-rebase--interactive.sh:433 #, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." -msgstr[0] "Esta es una combinación de $count confirmación." -msgstr[1] "Esta es la combinación de $count confirmaciones." +msgstr[0] "Esta es una combinación de $count commit." +msgstr[1] "Esta es la combinación de $count commits." #: git-rebase--interactive.sh:442 #, sh-format @@ -15404,7 +15563,7 @@ msgstr "No se puede escribir $fixup_msg" #: git-rebase--interactive.sh:445 msgid "This is a combination of 2 commits." -msgstr "Esto es una combinación de 2 confirmaciones." +msgstr "Esto es una combinación de 2 commits." #: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529 #: git-rebase--interactive.sh:532 @@ -15437,7 +15596,7 @@ msgstr "Detenido en $sha1_abbrev... $rest" #: git-rebase--interactive.sh:590 #, sh-format msgid "Cannot '$squash_style' without a previous commit" -msgstr "no se puede '$squash_style' sin una confirmación previa" +msgstr "no se puede '$squash_style' sin un commit previo" #: git-rebase--interactive.sh:632 #, sh-format @@ -15493,15 +15652,15 @@ msgstr "Por favor, corrige esto usando 'git rebase --edit-todo'." msgid "Successfully rebased and updated $head_name." msgstr "$head_name rebasado y actualizado satisfactoriamente." -#: git-rebase--interactive.sh:749 +#: git-rebase--interactive.sh:728 msgid "could not detach HEAD" msgstr "No se puede desacoplar HEAD" -#: git-rebase--interactive.sh:784 +#: git-rebase--interactive.sh:763 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "No se pudo remover CHERRY_PICK_HEAD" -#: git-rebase--interactive.sh:789 +#: git-rebase--interactive.sh:768 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -15518,26 +15677,26 @@ msgid "" "\n" " git rebase --continue\n" msgstr "" -"TIene cambios en el area de stage de su arbol de trabajo.\n" -"Si estos cambios estan destinados a \n" +"Tiene cambios en el área de stage de su árbol de trabajo.\n" +"Si estos cambios están destinados a \n" "ser aplastados en el commit previo, ejecute:\n" "\n" " git commit --amend $gpg_sign_opt_quoted\n" "\n" -"Si estos estan destinados a ir en un nuevo comit, ejecute:\n" +"Si estos están destinados a ir en un nuevo commit, ejecute:\n" "\n" " git commit $gpg_sign_opt_quoted\n" "\n" -"En ambos casos, cuando termite, continue con:\n" +"En ambos casos, cuando termine, continue con:\n" "\n" " git rebase --continue\n" -#: git-rebase--interactive.sh:806 +#: git-rebase--interactive.sh:785 msgid "Error trying to find the author identity to amend commit" msgstr "" "Error tratando de encontrar la identidad del autor para remediar el commit " -#: git-rebase--interactive.sh:811 +#: git-rebase--interactive.sh:790 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -15545,11 +15704,11 @@ msgstr "" "Tienes cambios sin confirmar en tu árbol de trabajo. Por favor, confírmalos\n" "primero y entonces ejecuta 'git rebase --continue' de nuevo." -#: git-rebase--interactive.sh:816 git-rebase--interactive.sh:820 +#: git-rebase--interactive.sh:795 git-rebase--interactive.sh:799 msgid "Could not commit staged changes." -msgstr "No se pudo realizar el commit con los cambios en el area de stage" +msgstr "No se pudo realizar el commit con los cambios en el área de stage" -#: git-rebase--interactive.sh:848 +#: git-rebase--interactive.sh:827 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -15559,44 +15718,44 @@ msgid "" msgstr "" "\n" "Esta editando el archivo TODO de un rebase interactivo.\n" -"Para continuar el rebase despues de editar, ejecute:\n" +"Para continuar el rebase después de editar, ejecute:\n" " git rebase --continue\n" "\n" -#: git-rebase--interactive.sh:856 git-rebase--interactive.sh:1015 +#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:994 msgid "Could not execute editor" msgstr "No se pudo ejecutar el editor" -#: git-rebase--interactive.sh:869 +#: git-rebase--interactive.sh:848 #, sh-format msgid "Could not checkout $switch_to" msgstr "No se pudo actualizar el árbol de trabajo a $switch_to" -#: git-rebase--interactive.sh:874 +#: git-rebase--interactive.sh:853 msgid "No HEAD?" msgstr "¿Sin HEAD?" -#: git-rebase--interactive.sh:875 +#: git-rebase--interactive.sh:854 #, sh-format msgid "Could not create temporary $state_dir" msgstr "No se pudo crear $state_dir temporalmente" -#: git-rebase--interactive.sh:877 +#: git-rebase--interactive.sh:856 msgid "Could not mark as interactive" msgstr "No se pudo marcar como interactivo" -#: git-rebase--interactive.sh:887 git-rebase--interactive.sh:892 +#: git-rebase--interactive.sh:866 git-rebase--interactive.sh:871 msgid "Could not init rewritten commits" msgstr "No se puede inicializar los commits reescritos" -#: git-rebase--interactive.sh:993 +#: git-rebase--interactive.sh:972 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "Rebase $shortrevisions en $shortonto ($todocount comando)" msgstr[1] "Rebase $shortrevisions en $shortonto ($todocount comandos)" -#: git-rebase--interactive.sh:998 +#: git-rebase--interactive.sh:977 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -15606,9 +15765,9 @@ msgstr "" "Como sea, si se remueve todo, el rebase sera abortado.\n" "\n" -#: git-rebase--interactive.sh:1005 +#: git-rebase--interactive.sh:984 msgid "Note that empty commits are commented out" -msgstr "Nota que los commits vacios estan comentados" +msgstr "Tenga en cuenta que los commits vacíos están comentados" #: git-sh-setup.sh:89 git-sh-setup.sh:94 #, sh-format @@ -15624,40 +15783,40 @@ msgstr "" #: git-sh-setup.sh:199 git-sh-setup.sh:206 #, sh-format msgid "fatal: $program_name cannot be used without a working tree." -msgstr "fatal: $program_name no puede ser usado sin un arbol de trabajo." +msgstr "fatal: $program_name no puede ser usado sin un árbol de trabajo." #: git-sh-setup.sh:220 msgid "Cannot rebase: You have unstaged changes." msgstr "" -"No se puede aplicar rebase: Tienes cambios que no estan en el area de stage." +"No se puede aplicar rebase: Tienes cambios que no están en el área de stage." #: git-sh-setup.sh:223 msgid "Cannot rewrite branches: You have unstaged changes." msgstr "" -"No se puede reescribir las ramas: Tienes cambios que no estan en el area de " +"No se puede reescribir las ramas: Tienes cambios que no están en el área de " "stage" #: git-sh-setup.sh:226 msgid "Cannot pull with rebase: You have unstaged changes." msgstr "" -"No se puede aplicar pull con rebase: Tienes cambios que no estan en el area " +"No se puede aplicar pull con rebase: Tienes cambios que no están en el área " "de stage." #: git-sh-setup.sh:229 #, sh-format msgid "Cannot $action: You have unstaged changes." -msgstr "No se puede $action: Tienes cambios que no estan en el area de stage" +msgstr "No se puede $action: Tienes cambios que no están en el área de stage" #: git-sh-setup.sh:242 msgid "Cannot rebase: Your index contains uncommitted changes." msgstr "" -"No se puede hacer rebase: Tu indice contiene cambios que no estan en un " +"No se puede hacer rebase: Tu índice contiene cambios que no están en un " "commit." #: git-sh-setup.sh:245 msgid "Cannot pull with rebase: Your index contains uncommitted changes." msgstr "" -"No se puede hacer pull con rebase: Tu indice contiene cambios que no estan " +"No se puede hacer pull con rebase: Tu índice contiene cambios que no están " "en un commit." #: git-sh-setup.sh:248 @@ -15667,7 +15826,7 @@ msgstr "No se puede $action: El índice contiene cambios sin confirmar." #: git-sh-setup.sh:252 msgid "Additionally, your index contains uncommitted changes." -msgstr "Adicionalmente, tu indice contiene cambios que no estan en un commit." +msgstr "Adicionalmente, tu índice contiene cambios que no están en un commit." #: git-sh-setup.sh:372 msgid "You need to run this command from the toplevel of the working tree." @@ -15760,7 +15919,7 @@ msgid "" "marked for staging." msgstr "" "Si el parche aplica limpiamente, el hunk editado sera marcado\n" -"inmediatamente para el area de stage." +"inmediatamente para el área de stage." #: git-add--interactive.perl:988 msgid "" @@ -15776,7 +15935,7 @@ msgid "" "marked for unstaging." msgstr "" "Si el parche aplica limpiamente, el hunk editado sera marcado\n" -"inmediatamente para sacar del area de stage." +"inmediatamente para sacar del área de stage." #: git-add--interactive.perl:994 git-add--interactive.perl:1003 msgid "" @@ -15797,11 +15956,11 @@ msgstr "" #: git-add--interactive.perl:1013 #, perl-format msgid "failed to open hunk edit file for writing: %s" -msgstr "fallo al abrir el archivo de edicion del hunk para escritura: %s" +msgstr "fallo al abrir el archivo de adición del hunk para escritura: %s" #: git-add--interactive.perl:1014 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" -msgstr "Modo de edicion manual de hunk -- vea abajo para una guia rapida.\n" +msgstr "Modo de edición manual de hunk -- vea abajo para una guía rápida.\n" #: git-add--interactive.perl:1020 #, perl-format @@ -15812,9 +15971,9 @@ msgid "" "Lines starting with %s will be removed.\n" msgstr "" "---\n" -"Para remover '%s' lineas, haga de ellas lineas ' ' (contexto).\n" -"Para remover '%s' lineas, borrelas.\n" -"Lineas comenzando con %s seran removidas.\n" +"Para remover '%s' líneas, haga de ellas líneas ' ' (contexto).\n" +"Para remover '%s' líneas, bórrelas.\n" +"Lineas comenzando con %s serán removidas.\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. #: git-add--interactive.perl:1028 @@ -15824,13 +15983,13 @@ msgid "" "aborted and the hunk is left unchanged.\n" msgstr "" "Si esto no aplica de manera limpia, se le da la oportunidad de \n" -"editar nuevamente. Si todas las lineas del hunk son removidas, entonces \n" -"la edicion es abortada y el hunk queda sin cambios.\n" +"editar nuevamente. Si todas las líneas del hunk son removidas, entonces \n" +"la edición es abortada y el hunk queda sin cambios.\n" #: git-add--interactive.perl:1042 #, perl-format msgid "failed to open hunk edit file for reading: %s" -msgstr "fallo al abrir el archivo de edicion del hunk para lectura: %s" +msgstr "fallo al abrir el archivo de edición del hunk para lectura: %s" #. TRANSLATORS: do not translate [y/n] #. The program will only accept that input @@ -15881,7 +16040,7 @@ msgid "" "a - unstage this hunk and all later hunks in the file\n" "d - do not unstage this hunk or any of the later hunks in the file" msgstr "" -"y - sacar deste hunk del area de stage\n" +"y - sacar desde hunk del área de stage\n" "n - no sacar este hunk del area de stage\n" "q - quit; no sacar del area de stage este hunk o ninguno de los restantes\n" "a - sacar del area de stage este hunk y todos los posteriores en el archivo\n" @@ -15910,8 +16069,8 @@ msgid "" "a - discard this hunk and all later hunks in the file\n" "d - do not discard this hunk or any of the later hunks in the file" msgstr "" -"y - descartar este hunk del arbol de trabajo\n" -"n - no descartar este hunk del arbol de trabajo\n" +"y - descartar este hunk del árbol de trabajo\n" +"n - no descartar este hunk del árbol de trabajo\n" "q - quit; no descartar este hunk o ninguno de los que restantes\n" "a - descartar este hunk y todos los posteriores en este archivo\n" "d - no descartar este hunk o ninguno de los posteriores en el archivo" @@ -15924,8 +16083,8 @@ msgid "" "a - discard this hunk and all later hunks in the file\n" "d - do not discard this hunk or any of the later hunks in the file" msgstr "" -"y - descartar este hunk del indice y el arbol de trabajo\n" -"n - no descartar este hunk del indice ni el arbol de trabajo\n" +"y - descartar este hunk del índice y el árbol de trabajo\n" +"n - no descartar este hunk del índice ni el árbol de trabajo\n" "q - quit; no descartar este hunk o ninguno de los que quedan\n" "a - descartar este hunk y todos los posteriores en este archivo\n" "d - no descartar este hunk o ninguno posterior en el archivo" @@ -15938,8 +16097,8 @@ msgid "" "a - apply this hunk and all later hunks in the file\n" "d - do not apply this hunk or any of the later hunks in the file" msgstr "" -"y - aplicar este hunk al indice y al arbol de trabajo\n" -"n - no aplicar este hunk al indice y al arbol de trabajo\n" +"y - aplicar este hunk al indice y al árbol de trabajo\n" +"n - no aplicar este hunk al indice y al árbol de trabajo\n" "q - quit; no aplicar este hunk o ninguno de los restantes\n" "a - aplicar este hunk y todos los posteriores en el archivo\n" "d - no aplicar este hunk o ninguno de los siguientes en este archivo" @@ -15959,20 +16118,20 @@ msgstr "" "g - selecciona un hunk a donde ir\n" "/ - buscar un hunk que concuerde el regex\n" "j - dejar este hunk por definir, ver siguiente hunk por definir\n" -"J - dejar este hunk por definird, ver siguiente hunk\n" +"J - dejar este hunk por definir, ver siguiente hunk\n" "k - dejar este hunk por definir, ver hunk previo por definir\n" "K - dejar este hunk por definir, ver hunk previo\n" -"s - dividir el hunk actual en hunks mas pequenos\n" +"s - dividir el hunk actual en hunks mas pequeños\n" "e - editar manualmente el hunk actual\n" "? - imprimir ayuda\n" #: git-add--interactive.perl:1219 msgid "The selected hunks do not apply to the index!\n" -msgstr "Los hunks seleccionados no aplican al indice!\n" +msgstr "Los hunks seleccionados no aplican al índice!\n" #: git-add--interactive.perl:1220 msgid "Apply them to the worktree anyway? " -msgstr "Aplicarlos al arbol de trabajo de todas maneras?" +msgstr "Aplicarlos al árbol de trabajo de todas maneras?" #: git-add--interactive.perl:1223 msgid "Nothing was applied.\n" @@ -15993,7 +16152,7 @@ msgstr "Sin cambios.\n" #: git-add--interactive.perl:1253 msgid "Patch update" -msgstr "Actualizacion de parche" +msgstr "Actualización del parche" #: git-add--interactive.perl:1305 #, perl-format @@ -16043,66 +16202,66 @@ msgstr "Sacar este hunk del stage [y,n,q,a,d,/%s,?]? " #: git-add--interactive.perl:1320 #, perl-format msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? " -msgstr "Aplicarcambio de modo al indice [y,n,q,a,d,/%s,?]? " +msgstr "Aplicar cambio de modo al índice [y,n,q,a,d,/%s,?]? " #: git-add--interactive.perl:1321 #, perl-format msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? " -msgstr "Aplicar borrado al indice [y,n,q,a,d,/%s,?]? " +msgstr "Aplicar borrado al índice [y,n,q,a,d,/%s,?]? " #: git-add--interactive.perl:1322 #, perl-format msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? " -msgstr "Aplicar este hunk al indice [y,n,q,a,d,/%s,?]? " +msgstr "Aplicar este hunk al índice [y,n,q,a,d,/%s,?]? " #: git-add--interactive.perl:1325 #, perl-format msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? " -msgstr "Descartar cambio de modo del arbol de trabajo [y,n,q,a,d,/%s,?]? " +msgstr "Descartar cambio de modo del árbol de trabajo [y,n,q,a,d,/%s,?]? " #: git-add--interactive.perl:1326 #, perl-format msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? " -msgstr "Descartar borrado del arbol de trabajo [y,n,q,a,d,/%s,?]? " +msgstr "Descartar borrado del árbol de trabajo [y,n,q,a,d,/%s,?]? " #: git-add--interactive.perl:1327 #, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? " -msgstr "Descartar este hunk del arbol de trabajo [y,n,q,a,d,/%s,?]? " +msgstr "Descartar este hunk del árbol de trabajo [y,n,q,a,d,/%s,?]? " #: git-add--interactive.perl:1330 #, perl-format msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? " msgstr "" -"Descartar cambio de modo del indice y el arbol de trabajo [y,n,q,a,d,/%s,?]? " +"Descartar cambio de modo del índice y el árbol de trabajo [y,n,q,a,d,/%s,?]? " #: git-add--interactive.perl:1331 #, perl-format msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? " -msgstr "Descartar borrado del indice y el arbol de trabajo [y,n,q,a,d,/%s,?]? " +msgstr "Descartar borrado del índice y el árbol de trabajo [y,n,q,a,d,/%s,?]? " #: git-add--interactive.perl:1332 #, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? " msgstr "" -"Descartar este hunk del indice y el arbol de trabajo [y,n,q,a,d,/%s,?]? " +"Descartar este hunk del índice y el árbol de trabajo [y,n,q,a,d,/%s,?]? " #: git-add--interactive.perl:1335 #, perl-format msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? " msgstr "" -"Aplicar cambio de modo para el indice y el arbol de trabajo [y,n,q,a,d,/" +"Aplicar cambio de modo para el índice y el árbol de trabajo [y,n,q,a,d,/" "%s,?]? " #: git-add--interactive.perl:1336 #, perl-format msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? " -msgstr "Aplicar borrado al indice y al arbol de trabajo [y,n,q,a,d,/%s,?]? " +msgstr "Aplicar borrado al índice y al árbol de trabajo [y,n,q,a,d,/%s,?]? " #: git-add--interactive.perl:1337 #, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? " -msgstr "Aplicar este hunk al indice y arbol de trabajo [y,n,q,a,d,/%s,?]? " +msgstr "Aplicar este hunk al índice y árbol de trabajo [y,n,q,a,d,/%s,?]? " #: git-add--interactive.perl:1440 msgid "go to which hunk (<ret> to see more)? " @@ -16131,11 +16290,11 @@ msgstr "buscar para regexp?" #: git-add--interactive.perl:1495 #, perl-format msgid "Malformed search regexp %s: %s\n" -msgstr "regexp para la busqueda mal formado %s: %s\n" +msgstr "regexp para la búsqueda mal formado %s: %s\n" #: git-add--interactive.perl:1505 msgid "No hunk matches the given pattern\n" -msgstr "No hay hunks que concuerden con el patron entregado.\n" +msgstr "No hay hunks que concuerden con el patrón entregado.\n" #: git-add--interactive.perl:1517 git-add--interactive.perl:1539 msgid "No previous hunk\n" @@ -16154,7 +16313,7 @@ msgstr[1] "Cortar en %d hunks.\n" #: git-add--interactive.perl:1605 msgid "Review diff" -msgstr "Revision de diff" +msgstr "Revisión de diff" #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. @@ -16168,11 +16327,11 @@ msgid "" "add untracked - add contents of untracked files to the staged set of " "changes\n" msgstr "" -"status - muestra las rutas con cambioss\n" -"update - agrega el estado del arbol de trabajo al set de cambios en " -"el area de stage\n" -"revert - revierte los cambios en el area de stage de regreso a la " -"version HEAD\n" +"status - muestra las rutas con cambios\n" +"update - agrega el estado del árbol de trabajo al set de cambios en " +"el área de stage\n" +"revert - revierte los cambios en el área de stage de regreso a la " +"versión HEAD\n" "patch - selecciona los hunks y actualiza de forma selectiva\n" "diff - mirar la diff entre HEAD y el indice\n" "add untracked - agrega contenidos de archivos no rastreados al grupo de " @@ -16211,7 +16370,7 @@ msgstr "el editor se cerro inapropiadamente, abortando todo" msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "" -"'%s' contiene una version intermedia del correo que se estaba generando.\n" +"'%s' contiene una versión intermedia del correo que se estaba generando.\n" #: git-send-email.perl:295 #, perl-format @@ -16234,7 +16393,7 @@ msgstr "campo --suppress-cc desconocido: '%s'\n" #: git-send-email.perl:476 #, perl-format msgid "Unknown --confirm setting: '%s'\n" -msgstr "Configuracion --confirm desconocida: '%s'\n" +msgstr "Configuración --confirm desconocida: '%s'\n" #: git-send-email.perl:504 #, perl-format @@ -16249,12 +16408,12 @@ msgstr "peligro: `:include:` no soportado: %s\n" #: git-send-email.perl:508 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" -msgstr "peligro: redireccion `/file` or `|pipe` no soportada : %s\n" +msgstr "Advertencia: redirección `/file` o `|pipe` no soportada : %s\n" #: git-send-email.perl:513 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" -msgstr "peligro: linea sendmail no reconocida: %s\n" +msgstr "Advertencia: línea sendmail no reconocida: %s\n" #: git-send-email.perl:595 #, perl-format @@ -16265,11 +16424,11 @@ msgid "" " * Saying \"./%s\" if you mean a file; or\n" " * Giving --format-patch option if you mean a range.\n" msgstr "" -"Archivo '%s' existe pero podria ser el rango de commits \n" -"para producir los parches. Por favor elimina la ambiguedad...\n" +"Archivo '%s' existe pero podría ser el rango de commits \n" +"para producir los parches. Por favor elimina la ambigüedad...\n" "\n" " * Diciendo \"./%s\" si se quiere decir un archivo; o\n" -" * Agregando la opcion --format-patch si se quiere decir un rango.\n" +" * Agregando la opción --format-patch si se quiere decir un rango.\n" #: git-send-email.perl:616 #, perl-format @@ -16298,12 +16457,12 @@ msgstr "" #: git-send-email.perl:664 #, perl-format msgid "No subject line in %s?" -msgstr "No hay linea de subject en %s?" +msgstr "No hay línea de subject en %s?" #: git-send-email.perl:674 #, perl-format msgid "Failed to open for writing %s: %s" -msgstr "Fallo al abir para escritura %s: %s" +msgstr "Fallo al abrir para escritura %s: %s" #: git-send-email.perl:684 msgid "" @@ -16332,11 +16491,11 @@ msgstr "Fallo al abrir %s: %s" #: git-send-email.perl:745 msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n" msgstr "" -"Campos Para/Cc/Bcc no han sido interpretados todavia, han sido ignorados\n" +"Campos Para/Cc/Bcc no han sido interpretados todavía, han sido ignorados\n" #: git-send-email.perl:754 msgid "Summary email is empty, skipping it\n" -msgstr "Archivo de resumen esta vacio, saltando al siguiente\n" +msgstr "Archivo de resumen esta vacío, saltando al siguiente\n" #. TRANSLATORS: please keep [y/N] as is. #: git-send-email.perl:786 @@ -16354,7 +16513,7 @@ msgstr "" #: git-send-email.perl:820 msgid "Which 8bit encoding should I declare [UTF-8]? " -msgstr "Que codificacion de 8bit deberia declarar [UTF-8]?" +msgstr "Que codificación de 8bit debería declarar [UTF-8]?" #: git-send-email.perl:828 #, perl-format @@ -16384,24 +16543,24 @@ msgstr "" "que id de mensaje sera usado como En-Respuesta-Para en el primer email (si " "existe alguno)?" -#: git-send-email.perl:927 git-send-email.perl:935 +#: git-send-email.perl:929 git-send-email.perl:937 #, perl-format msgid "error: unable to extract a valid address from: %s\n" -msgstr "error: no es posible extraer una direccion valida de %s\n" +msgstr "error: no es posible extraer una dirección valida de %s\n" #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:939 +#: git-send-email.perl:941 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " -msgstr "Que hacer con esta direccion? ([q]salir|[d]botar|[e]ditar):" +msgstr "Que hacer con esta dirección? ([q]salir|[d]botar|[e]ditar):" -#: git-send-email.perl:1260 +#: git-send-email.perl:1262 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "ruta CA \"%s\" no existe" -#: git-send-email.perl:1335 +#: git-send-email.perl:1337 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -16417,10 +16576,10 @@ msgstr "" "La lista Cc ha sido expandida por direcciones adicionales\n" "encontradas en el mensaje de commit parchado.. Por defecto\n" "send-email se muestra antes de mandar cualquier cada vez que esto sucede.\n" -"Este comportamiento is controlado por el valor de configuracion sendemail." +"Este comportamiento is controlado por el valor de configuración sendemail." "confirm.\n" "\n" -"Para mas informacion, corre 'git sen-email --help'.\n" +"Para mas información, corre 'git sen-email --help'.\n" "Para mantener el comportamiento actual, pero evitar este mensaje,\n" "corre 'git config --global sendemail.confirm auto'.\n" "\n" @@ -16428,134 +16587,187 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1350 +#: git-send-email.perl:1352 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): " msgstr "Mandar este email? ([y]si||[n]o|[q]salir|[a]todo):" -#: git-send-email.perl:1353 +#: git-send-email.perl:1355 msgid "Send this email reply required" msgstr "Necesitas mandar esta respuesta de email" -#: git-send-email.perl:1379 +#: git-send-email.perl:1381 msgid "The required SMTP server is not properly defined." msgstr "El servidor SMTP no esta definido adecuadamente." -#: git-send-email.perl:1426 +#: git-send-email.perl:1428 #, perl-format msgid "Server does not support STARTTLS! %s" -msgstr "Servidor no soporta STARTLS! %s" +msgstr "Servidor no soporta STARTTLS! %s" -#: git-send-email.perl:1431 git-send-email.perl:1435 +#: git-send-email.perl:1433 git-send-email.perl:1437 #, perl-format msgid "STARTTLS failed! %s" msgstr "fallo de STARTTLS! %s" -#: git-send-email.perl:1445 +#: git-send-email.perl:1447 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" "No es posible inicializar SMTP adecuadamente. Verificar config y usar ---" "smtp-debug." -#: git-send-email.perl:1463 +#: git-send-email.perl:1465 #, perl-format msgid "Failed to send %s\n" msgstr "Fallo al enviar %s\n" -#: git-send-email.perl:1466 +#: git-send-email.perl:1468 #, perl-format msgid "Dry-Sent %s\n" msgstr "Dry-Sent %s\n" -#: git-send-email.perl:1466 +#: git-send-email.perl:1468 #, perl-format msgid "Sent %s\n" msgstr "Enviado %s\n" -#: git-send-email.perl:1468 +#: git-send-email.perl:1470 msgid "Dry-OK. Log says:\n" msgstr "Dry-OK. Log dice:\n" -#: git-send-email.perl:1468 +#: git-send-email.perl:1470 msgid "OK. Log says:\n" msgstr "OK. Log dice:\n" -#: git-send-email.perl:1480 +#: git-send-email.perl:1482 msgid "Result: " msgstr "Resultado:" -#: git-send-email.perl:1483 +#: git-send-email.perl:1485 msgid "Result: OK\n" msgstr "Resultado: OK\n" -#: git-send-email.perl:1496 +#: git-send-email.perl:1498 #, perl-format msgid "can't open file %s" msgstr "no se puede abrir el archivo %s" -#: git-send-email.perl:1543 git-send-email.perl:1563 +#: git-send-email.perl:1545 git-send-email.perl:1565 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" -msgstr "(mbox) Agregando cc: %s de linea '%s'\n" +msgstr "(mbox) Agregando cc: %s de línea '%s'\n" -#: git-send-email.perl:1549 +#: git-send-email.perl:1551 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" -msgstr "(mbox) Agregando para: %s de la linea '%s'\n" +msgstr "(mbox) Agregando para: %s de la línea '%s'\n" -#: git-send-email.perl:1597 +#: git-send-email.perl:1599 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" -msgstr "(non-mbox) Agregando cc: %s de la linea '%s'\n" +msgstr "(non-mbox) Agregando cc: %s de la línea '%s'\n" -#: git-send-email.perl:1622 +#: git-send-email.perl:1624 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" -msgstr "(body) Agregando cc: %s de la linea '%s'\n" +msgstr "(body) Agregando cc: %s de la línea '%s'\n" -#: git-send-email.perl:1728 +#: git-send-email.perl:1730 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) no se pudo ejecutar '%s'" -#: git-send-email.perl:1735 +#: git-send-email.perl:1737 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Agregando %s: %s de: '%s'\n" -#: git-send-email.perl:1739 +#: git-send-email.perl:1741 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) fallo al cerrar el pipe para '%s'" -#: git-send-email.perl:1766 +#: git-send-email.perl:1768 msgid "cannot send message as 7bit" msgstr "no se puede mandar mensaje como 7bit" -#: git-send-email.perl:1774 +#: git-send-email.perl:1776 msgid "invalid transfer encoding" -msgstr "codificacion de transferencia invalida" +msgstr "codificación de transferencia invalida" -#: git-send-email.perl:1812 git-send-email.perl:1863 git-send-email.perl:1873 +#: git-send-email.perl:1814 git-send-email.perl:1865 git-send-email.perl:1875 #, perl-format msgid "unable to open %s: %s\n" msgstr "no es posible abrir %s: %s\n" -#: git-send-email.perl:1815 +#: git-send-email.perl:1817 #, perl-format msgid "%s: patch contains a line longer than 998 characters" -msgstr "%s: el parche contiene una linea con mas de 998 caracteres" +msgstr "%s: el parche contiene una línea con mas de 998 caracteres" -#: git-send-email.perl:1831 +#: git-send-email.perl:1833 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "Saltando %s con el sufijo de backup '%s'.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1835 +#: git-send-email.perl:1837 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Realmente deseas mandar %s?[y|N]" +#~ msgid "" +#~ "empty strings as pathspecs will be made invalid in upcoming releases. " +#~ "please use . instead if you meant to match all paths" +#~ msgstr "" +#~ "los strings vacíos como pathspecs serán inválidas en las próximas " +#~ "versiones. por favor use . si quería hacer coincidir todas las rutas" + +#~ msgid "unable to open '%s' for writing" +#~ msgstr "No se pudo abrir '%s' para escritura" + +#~ msgid "could not truncate '%s'" +#~ msgstr "no se pudo truncar '%s'" + +#~ msgid "could not finish '%s'" +#~ msgstr "no se pudo finalizar '%s'" + +#~ msgid "could not write to %s" +#~ msgstr "no se pudo escribir en %s" + +#~ msgid "could not close %s" +#~ msgstr "no se pudo cerrar %s" + +#~ msgid "Copied a misnamed branch '%s' away" +#~ msgstr "Copiada una rama mal llamada '%s' afuera" + +#~ msgid "it does not make sense to create 'HEAD' manually" +#~ msgstr "No tiene sentido crear 'HEAD' manualmente" + +#~ msgid "Don't know how to clone %s" +#~ msgstr "No se sabe como clonar %s" + +#~ msgid "show ignored files" +#~ msgstr "mostrar archivos ignorados" + +#~ msgid "%s is not a valid '%s' object" +#~ msgstr "%s no es un objeto '%s' válido" + +#~ msgid "Don't know how to fetch from %s" +#~ msgstr "No se sabe como extraer de %s" + +#~ msgid "'$term' is not a valid term" +#~ msgstr "'$term' no es un término válido" + +#~ msgid "" +#~ "error: unknown option for 'stash save': $option\n" +#~ " To provide a message, use git stash save -- '$option'" +#~ msgstr "" +#~ "error: opción desconocida para 'stash save': $option\n" +#~ " Esto provee un mensaje , use git stash save -- '$option'" + +#~ msgid "Failed to recurse into submodule path '$sm_path'" +#~ msgstr "Falló al recurrir en la ruta de submódulo '$sm_path'" + #~ msgid "%%(trailers) does not take arguments" #~ msgstr "%%(trailers) no toma argumentos" @@ -1,7 +1,7 @@ # French translations for Git. -# Copyright (C) 2015 Jean-Noël Avila <jn.avila@free.fr> +# Copyright (C) 2018 Jean-Noël Avila <jn.avila@free.fr> # This file is distributed under the same license as the Git package. -# Jean-Noël Avila <jn.avila@free.fr>, 2016. +# Jean-Noël Avila <jn.avila@free.fr>, 2018. # Sébastien Helleu <flashcode@flashtux.org>, 2013. # # French translations of common Git words used in this file: @@ -74,8 +74,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2017-10-17 09:44+0800\n" -"PO-Revision-Date: 2017-10-18 20:28+0200\n" +"POT-Creation-Date: 2017-12-31 10:45+0800\n" +"PO-Revision-Date: 2018-01-02 22:06+0100\n" "Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n" "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n" "Language: fr\n" @@ -84,37 +84,37 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n<=1 ?0 : 1;\n" -#: advice.c:58 +#: advice.c:62 #, c-format msgid "hint: %.*s\n" msgstr "astuce: %.*s\n" -#: advice.c:86 +#: advice.c:90 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "Impossible de picorer car vous avez des fichiers non fusionnés." -#: advice.c:88 +#: advice.c:92 msgid "Committing is not possible because you have unmerged files." msgstr "Impossible de valider car vous avez des fichiers non fusionnés." -#: advice.c:90 +#: advice.c:94 msgid "Merging is not possible because you have unmerged files." msgstr "Impossible de fusionner car vous avez des fichiers non fusionnés." -#: advice.c:92 +#: advice.c:96 msgid "Pulling is not possible because you have unmerged files." msgstr "Impossible de tirer car vous avez des fichiers non fusionnés." -#: advice.c:94 +#: advice.c:98 msgid "Reverting is not possible because you have unmerged files." msgstr "Impossible d'annuler car vous avez des fichiers non fusionnés." -#: advice.c:96 +#: advice.c:100 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "%s n'est pas possible car vous avez des fichiers non fusionnés." -#: advice.c:104 +#: advice.c:108 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." @@ -122,23 +122,23 @@ msgstr "" "Corrigez-les puis lancez 'git add/rm <fichier>'\n" "si nécessaire pour marquer la résolution et valider." -#: advice.c:112 +#: advice.c:116 msgid "Exiting because of an unresolved conflict." msgstr "Abandon à cause de conflit non résolu." -#: advice.c:117 builtin/merge.c:1211 +#: advice.c:121 builtin/merge.c:1213 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)." -#: advice.c:119 +#: advice.c:123 msgid "Please, commit your changes before merging." msgstr "Veuillez valider vos changements avant de fusionner." -#: advice.c:120 +#: advice.c:124 msgid "Exiting because of unfinished merge." msgstr "Abandon à cause d'une fusion non terminée." -#: advice.c:126 +#: advice.c:130 #, c-format msgid "" "Note: checking out '%s'.\n" @@ -180,89 +180,89 @@ msgstr "option d'espace non reconnue '%s'" msgid "unrecognized whitespace ignore option '%s'" msgstr "option d'ignorance d'espace non reconnue '%s'" -#: apply.c:125 +#: apply.c:122 msgid "--reject and --3way cannot be used together." msgstr "--reject et --3way ne peuvent pas être utilisés ensemble." -#: apply.c:127 +#: apply.c:124 msgid "--cached and --3way cannot be used together." msgstr "--cached et --3way ne peuvent pas être utilisés ensemble." -#: apply.c:130 +#: apply.c:127 msgid "--3way outside a repository" msgstr "--3way hors d'un dépôt" -#: apply.c:141 +#: apply.c:138 msgid "--index outside a repository" msgstr "--index hors d'un dépôt" -#: apply.c:144 +#: apply.c:141 msgid "--cached outside a repository" msgstr "--cached hors d'un dépôt" -#: apply.c:845 +#: apply.c:821 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Impossible de préparer la regexp d'horodatage %s" -#: apply.c:854 +#: apply.c:830 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec a retourné %d pour l'entrée : %s" -#: apply.c:928 +#: apply.c:904 #, c-format msgid "unable to find filename in patch at line %d" msgstr "nom de fichier du patch introuvable à la ligne %d" -#: apply.c:966 +#: apply.c:942 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" "git apply : mauvais format de git-diff - /dev/null attendu, %s trouvé à la " "ligne %d" -#: apply.c:972 +#: apply.c:948 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" "git apply : mauvais format de git-diff - nouveau nom de fichier inconsistant " "à la ligne %d" -#: apply.c:973 +#: apply.c:949 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" "git apply : mauvais format de git-diff - ancien nom de fichier inconsistant " "à la ligne %d" -#: apply.c:978 +#: apply.c:954 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" "git apply : mauvais format de git-diff - /dev/null attendu à la ligne %d" -#: apply.c:1007 +#: apply.c:983 #, c-format msgid "invalid mode on line %d: %s" msgstr "mode invalide dans la ligne %d : %s" -#: apply.c:1325 +#: apply.c:1301 #, c-format msgid "inconsistent header lines %d and %d" msgstr "lignes d'entête inconsistantes %d et %d" -#: apply.c:1497 +#: apply.c:1473 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recomptage : ligne inattendue : %.*s" -#: apply.c:1566 +#: apply.c:1542 #, 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:1586 +#: apply.c:1562 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -277,83 +277,83 @@ 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:1599 +#: apply.c:1575 #, 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:1787 +#: apply.c:1763 msgid "new file depends on old contents" msgstr "le nouveau fichier dépend de contenus anciens" -#: apply.c:1789 +#: apply.c:1765 msgid "deleted file still has contents" msgstr "le fichier supprimé a encore du contenu" -#: apply.c:1823 +#: apply.c:1799 #, c-format msgid "corrupt patch at line %d" msgstr "patch corrompu à la ligne %d" -#: apply.c:1860 +#: apply.c:1836 #, c-format msgid "new file %s depends on old contents" msgstr "le nouveau fichier %s dépend de contenus anciens" -#: apply.c:1862 +#: apply.c:1838 #, c-format msgid "deleted file %s still has contents" msgstr "le fichier supprimé %s a encore du contenu" -#: apply.c:1865 +#: apply.c:1841 #, 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:2012 +#: apply.c:1988 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "patch binaire corrompu à la ligne %d : %.*s" -#: apply.c:2049 +#: apply.c:2025 #, c-format msgid "unrecognized binary patch at line %d" msgstr "patch binaire non reconnu à la ligne %d" -#: apply.c:2209 +#: apply.c:2185 #, c-format msgid "patch with only garbage at line %d" msgstr "patch totalement incompréhensible à la ligne %d" -#: apply.c:2295 +#: apply.c:2271 #, c-format msgid "unable to read symlink %s" msgstr "lecture du lien symbolique %s impossible" -#: apply.c:2299 +#: apply.c:2275 #, c-format msgid "unable to open or read %s" msgstr "ouverture ou lecture de %s impossible" -#: apply.c:2958 +#: apply.c:2934 #, c-format msgid "invalid start of line: '%c'" msgstr "début de ligne invalide : '%c'" -#: apply.c:3077 +#: apply.c:3055 #, 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:3089 +#: apply.c:3067 #, 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:3095 +#: apply.c:3073 #, c-format msgid "" "while searching for:\n" @@ -362,457 +362,458 @@ msgstr "" "pendant la recherche de :\n" "%.*s" -#: apply.c:3117 +#: apply.c:3095 #, c-format msgid "missing binary patch data for '%s'" msgstr "données de patch binaire manquantes pour '%s'" -#: apply.c:3125 +#: apply.c:3103 #, 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:3171 +#: apply.c:3149 #, 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:3181 +#: apply.c:3159 #, 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:3189 +#: apply.c:3167 #, 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:3207 +#: apply.c:3185 #, 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:3220 +#: apply.c:3198 #, c-format msgid "binary patch does not apply to '%s'" msgstr "le patch binaire ne s'applique par correctement à '%s'" -#: apply.c:3226 +#: apply.c:3204 #, 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:3247 +#: apply.c:3225 #, c-format msgid "patch failed: %s:%ld" msgstr "le patch a échoué : %s:%ld" -#: apply.c:3369 +#: apply.c:3347 #, c-format msgid "cannot checkout %s" msgstr "extraction de %s impossible" -#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277 +#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277 #, c-format msgid "failed to read %s" msgstr "échec de la lecture de %s" -#: apply.c:3426 +#: apply.c:3404 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "lecture depuis '%s' au-delà d'un lien symbolique" -#: apply.c:3455 apply.c:3695 +#: apply.c:3433 apply.c:3673 #, c-format msgid "path %s has been renamed/deleted" msgstr "le chemin %s a été renommé/supprimé" -#: apply.c:3538 apply.c:3709 +#: apply.c:3516 apply.c:3687 #, c-format msgid "%s: does not exist in index" msgstr "%s : n'existe pas dans l'index" -#: apply.c:3547 apply.c:3717 +#: apply.c:3525 apply.c:3695 #, c-format msgid "%s: does not match index" msgstr "%s : ne correspond pas à l'index" -#: apply.c:3582 +#: 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:3585 +#: apply.c:3563 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Retour à une fusion à 3 points…\n" -#: apply.c:3601 apply.c:3605 +#: 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:3617 +#: apply.c:3595 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Echec du retour à une fusion à 3 points…\n" -#: apply.c:3631 +#: apply.c:3609 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Patch %s appliqué avec des conflits.\n" -#: apply.c:3636 +#: apply.c:3614 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Patch %s appliqué proprement.\n" -#: apply.c:3662 +#: apply.c:3640 msgid "removal patch leaves file contents" msgstr "le patch de suppression laisse un contenu dans le fichier" -#: apply.c:3734 +#: apply.c:3712 #, c-format msgid "%s: wrong type" msgstr "%s : type erroné" -#: apply.c:3736 +#: apply.c:3714 #, c-format msgid "%s has type %o, expected %o" msgstr "%s est de type %o, mais %o attendu" -#: apply.c:3886 apply.c:3888 +#: apply.c:3864 apply.c:3866 #, c-format msgid "invalid path '%s'" msgstr "chemin invalide '%s'" -#: apply.c:3944 +#: apply.c:3922 #, c-format msgid "%s: already exists in index" msgstr "%s : existe déjà dans l'index" -#: apply.c:3947 +#: apply.c:3925 #, c-format msgid "%s: already exists in working directory" msgstr "%s : existe déjà dans la copie de travail" -#: apply.c:3967 +#: apply.c:3945 #, 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:3972 +#: apply.c:3950 #, 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:3992 +#: apply.c:3970 #, 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:3996 +#: apply.c:3974 #, c-format msgid "%s: patch does not apply" msgstr "%s : le patch ne s'applique pas" -#: apply.c:4011 +#: apply.c:3989 #, c-format msgid "Checking patch %s..." msgstr "Vérification du patch %s..." -#: apply.c:4102 +#: apply.c:4080 #, 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:4109 +#: apply.c:4087 #, 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:4112 +#: apply.c:4090 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "l'information de sha1 est manquante ou inutilisable (%s)." -#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148 +#: apply.c:4095 builtin/checkout.c:236 builtin/reset.c:148 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "échec de make_cache_entry pour le chemin '%s'" -#: apply.c:4121 +#: apply.c:4099 #, c-format msgid "could not add %s to temporary index" msgstr "impossible d'ajouter %s à l'index temporaire" -#: apply.c:4131 +#: apply.c:4109 #, c-format msgid "could not write temporary index to %s" msgstr "impossible d'écrire l'index temporaire dans %s" -#: apply.c:4269 +#: apply.c:4247 #, c-format msgid "unable to remove %s from index" msgstr "suppression de %s dans l'index impossible" -#: apply.c:4304 +#: apply.c:4282 #, c-format msgid "corrupt patch for submodule %s" msgstr "patch corrompu pour le sous-module %s" -#: apply.c:4310 +#: apply.c:4288 #, c-format msgid "unable to stat newly created file '%s'" msgstr "stat du fichier nouvellement créé '%s' impossible" -#: apply.c:4318 +#: apply.c:4296 #, 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:4324 apply.c:4468 +#: apply.c:4302 apply.c:4446 #, c-format msgid "unable to add cache entry for %s" msgstr "ajout de l'élément de cache %s impossible" -#: apply.c:4365 +#: apply.c:4343 #, c-format msgid "failed to write to '%s'" msgstr "échec de l'écriture dans '%s'" -#: apply.c:4369 +#: apply.c:4347 #, c-format msgid "closing file '%s'" msgstr "fermeture du fichier '%s'" -#: apply.c:4439 +#: apply.c:4417 #, c-format msgid "unable to write file '%s' mode %o" msgstr "écriture du fichier '%s' mode %o impossible" -#: apply.c:4537 +#: apply.c:4515 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s appliqué proprement." -#: apply.c:4545 +#: apply.c:4523 msgid "internal error" msgstr "erreur interne" -#: apply.c:4548 +#: apply.c:4526 #, 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:4559 +#: apply.c:4537 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "troncature du nom de fichier .rej en %.*s.rej" -#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010 +#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011 #, c-format msgid "cannot open %s" msgstr "impossible d'ouvrir %s" -#: apply.c:4581 +#: apply.c:4559 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Section n°%d appliquée proprement." -#: apply.c:4585 +#: apply.c:4563 #, c-format msgid "Rejected hunk #%d." msgstr "Section n°%d rejetée." -#: apply.c:4695 +#: apply.c:4673 #, c-format msgid "Skipped patch '%s'." msgstr "Chemin '%s' non traité." -#: apply.c:4703 +#: apply.c:4681 msgid "unrecognized input" msgstr "entrée non reconnue" -#: apply.c:4722 +#: apply.c:4700 msgid "unable to read index file" msgstr "lecture du fichier d'index impossible" -#: apply.c:4859 +#: apply.c:4837 #, c-format msgid "can't open patch '%s': %s" msgstr "ouverture impossible du patch '%s' :%s" -#: apply.c:4886 +#: apply.c:4864 #, 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:4870 apply.c:4885 #, 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:4878 #, 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:515 builtin/mv.c:298 builtin/rm.c:390 +#: apply.c:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "Impossible d'écrire le nouveau fichier d'index" -#: apply.c:4947 apply.c:4950 builtin/am.c:2256 builtin/am.c:2259 -#: builtin/clone.c:116 builtin/fetch.c:115 builtin/pull.c:187 -#: builtin/submodule--helper.c:301 builtin/submodule--helper.c:622 -#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:992 -#: builtin/submodule--helper.c:995 builtin/submodule--helper.c:1212 +#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260 +#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193 +#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860 +#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230 +#: builtin/submodule--helper.c:1233 builtin/submodule--helper.c:1450 #: git-add--interactive.perl:197 msgid "path" msgstr "chemin" -#: apply.c:4948 +#: apply.c:4922 msgid "don't apply changes matching the given path" msgstr "ne pas appliquer les modifications qui correspondent au chemin donné" -#: apply.c:4951 +#: apply.c:4925 msgid "apply changes matching the given path" msgstr "appliquer les modifications qui correspondent au chemin donné" -#: apply.c:4953 builtin/am.c:2265 +#: apply.c:4927 builtin/am.c:2266 msgid "num" msgstr "num" -#: apply.c:4954 +#: apply.c:4928 msgid "remove <num> leading slashes from traditional diff paths" msgstr "supprimer <num> barres obliques des chemins traditionnels de diff" -#: apply.c:4957 +#: apply.c:4931 msgid "ignore additions made by the patch" msgstr "ignorer les additions réalisées par le patch" -#: apply.c:4959 +#: apply.c:4933 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:4963 +#: apply.c:4937 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:4965 +#: apply.c:4939 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:4967 +#: apply.c:4941 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:4969 +#: apply.c:4943 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:4971 +#: apply.c:4945 msgid "apply a patch without touching the working tree" msgstr "appliquer les patch sans toucher à la copie de travail" -#: apply.c:4973 +#: apply.c:4947 msgid "accept a patch that touches outside the working area" msgstr "accepter un patch qui touche hors de la copie de travail" -#: apply.c:4975 +#: apply.c:4949 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "appliquer aussi le patch (à utiliser avec ---stat/--summary/--check)" -#: apply.c:4977 +#: apply.c:4951 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:4979 +#: apply.c:4953 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:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513 +#: apply.c:4956 builtin/checkout-index.c:168 builtin/ls-files.c:515 msgid "paths are separated with NUL character" msgstr "les chemins sont séparés par un caractère NUL" -#: apply.c:4984 +#: apply.c:4958 msgid "ensure at least <n> lines of context match" msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte" -#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95 +#: apply.c:4959 builtin/am.c:2245 builtin/interpret-trailers.c:95 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99 +#: builtin/pack-objects.c:3009 msgid "action" msgstr "action" -#: apply.c:4986 +#: apply.c:4960 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:4989 apply.c:4992 +#: apply.c:4963 apply.c:4966 msgid "ignore changes in whitespace when finding context" msgstr "ignorer des modifications d'espace lors de la recherche de contexte" -#: apply.c:4995 +#: apply.c:4969 msgid "apply the patch in reverse" msgstr "appliquer le patch en sens inverse" -#: apply.c:4997 +#: apply.c:4971 msgid "don't expect at least one line of context" msgstr "ne pas s'attendre à au moins une ligne de contexte" -#: apply.c:4999 +#: apply.c:4973 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants" -#: apply.c:5001 +#: apply.c:4975 msgid "allow overlapping hunks" msgstr "accepter les recouvrements de sections" -#: apply.c:5002 builtin/add.c:272 builtin/check-ignore.c:21 -#: builtin/commit.c:1347 builtin/count-objects.c:96 builtin/fsck.c:640 -#: builtin/log.c:1889 builtin/mv.c:123 builtin/read-tree.c:125 +#: apply.c:4976 builtin/add.c:292 builtin/check-ignore.c:21 +#: builtin/commit.c:1361 builtin/count-objects.c:96 builtin/fsck.c:640 +#: builtin/log.c:1896 builtin/mv.c:123 builtin/read-tree.c:125 msgid "be verbose" msgstr "mode verbeux" -#: apply.c:5004 +#: apply.c:4978 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:5007 +#: apply.c:4981 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:5009 builtin/am.c:2253 +#: apply.c:4983 builtin/am.c:2254 msgid "root" msgstr "racine" -#: apply.c:5010 +#: apply.c:4984 msgid "prepend <root> to all filenames" msgstr "préfixer tous les noms de fichier avec <root>" @@ -835,7 +836,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <dépôt> [--exec <commande>] --list" -#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299 +#: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "le chemin '%s' ne correspond à aucun fichier" @@ -848,7 +849,7 @@ msgstr "fmt" msgid "archive format" msgstr "format d'archive" -#: archive.c:437 builtin/log.c:1452 +#: archive.c:437 builtin/log.c:1459 msgid "prefix" msgstr "préfixe" @@ -856,9 +857,9 @@ msgstr "préfixe" msgid "prepend prefix to each pathname in the archive" msgstr "préfixer chaque chemin de fichier dans l'archive" -#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61 -#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:859 -#: builtin/hash-object.c:102 builtin/ls-files.c:547 builtin/ls-files.c:550 +#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:62 +#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:861 +#: builtin/hash-object.c:102 builtin/ls-files.c:551 builtin/ls-files.c:554 #: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120 #: parse-options.h:153 msgid "file" @@ -893,7 +894,7 @@ msgid "list supported archive formats" msgstr "afficher les formats d'archive supportés" #: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109 -#: builtin/submodule--helper.c:634 builtin/submodule--helper.c:1001 +#: builtin/submodule--helper.c:872 builtin/submodule--helper.c:1239 msgid "repo" msgstr "dépôt" @@ -944,22 +945,22 @@ msgstr "" "Les motifs de négation sont ignorés dans les attributs git\n" "Utilisez '\\!' pour un point d'exclamation littéral." -#: bisect.c:447 +#: bisect.c:458 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Contenu mal cité dans le fichier '%s' : %s" -#: bisect.c:655 +#: bisect.c:666 #, c-format msgid "We cannot bisect more!\n" msgstr "Impossible de pousser la bissection plus loin !\n" -#: bisect.c:708 +#: bisect.c:720 #, c-format msgid "Not a valid commit name %s" msgstr "%s n'est pas un nom de commit valide" -#: bisect.c:732 +#: bisect.c:744 #, c-format msgid "" "The merge base %s is bad.\n" @@ -968,7 +969,7 @@ msgstr "" "La base de fusion %s est mauvaise.\n" "Cela signifie que le bogue été corrigé entre %s et [%s].\n" -#: bisect.c:737 +#: bisect.c:749 #, c-format msgid "" "The merge base %s is new.\n" @@ -977,7 +978,7 @@ msgstr "" "La base de fusion %s est nouvelle.\n" "La propriété a changé entre %s et [%s].\n" -#: bisect.c:742 +#: bisect.c:754 #, c-format msgid "" "The merge base %s is %s.\n" @@ -986,7 +987,7 @@ msgstr "" "La base de fusion %s est %s.\n" "Ceci signifie que le premier commit '%s' est entre %s et [%s].\n" -#: bisect.c:750 +#: bisect.c:762 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -997,7 +998,7 @@ msgstr "" "git bisect ne peut pas fonctionner correctement dans ce cas.\n" "Peut-être les révisions %s et %s ne sont-elles pas les bonnes ?\n" -#: bisect.c:763 +#: bisect.c:775 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1009,36 +1010,36 @@ msgstr "" "et %s.\n" "On continue tout de même." -#: bisect.c:798 +#: bisect.c:810 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Bissection : une base de fusion doit être testée\n" -#: bisect.c:850 +#: bisect.c:862 #, c-format msgid "a %s revision is needed" msgstr "une révision %s est nécessaire" -#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234 +#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234 #, c-format msgid "could not create file '%s'" msgstr "impossible de créer le fichier '%s'" -#: bisect.c:918 +#: bisect.c:930 #, c-format msgid "could not read file '%s'" msgstr "impossible de lire le fichier '%s'" -#: bisect.c:948 +#: bisect.c:960 msgid "reading bisect refs failed" msgstr "impossible de lire les références de bissection" -#: bisect.c:968 +#: bisect.c:979 #, c-format msgid "%s was both %s and %s\n" msgstr "%s était à la fois %s et %s\n" -#: bisect.c:976 +#: bisect.c:987 #, c-format msgid "" "No testable commit found.\n" @@ -1047,7 +1048,7 @@ msgstr "" "Aucun commit testable n'a été trouvé\n" "Peut-être avez-vous démarré avec un mauvais paramètre de chemin ?\n" -#: bisect.c:995 +#: bisect.c:1006 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1057,7 +1058,7 @@ msgstr[1] "(à peu près %d étapes)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1001 +#: bisect.c:1012 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" @@ -1078,9 +1079,9 @@ msgstr "" "--reverse et --first-parent ensemble nécessitent la spécification d'un " "dernier commit" -#: blame.c:1797 bundle.c:169 ref-filter.c:1947 sequencer.c:1168 -#: sequencer.c:2351 builtin/commit.c:1065 builtin/log.c:357 builtin/log.c:911 -#: builtin/log.c:1361 builtin/log.c:1690 builtin/log.c:1938 builtin/merge.c:369 +#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1179 +#: sequencer.c:2367 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918 +#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369 #: builtin/shortlog.c:191 msgid "revision walk setup failed" msgstr "échec de la préparation du parcours des révisions" @@ -1179,33 +1180,33 @@ msgstr "Échec de l'écriture de la configuration de branche amont" msgid "Not tracking: ambiguous information for ref %s" msgstr "Pas de suivi : information ambiguë pour la référence %s" -#: branch.c:185 +#: branch.c:189 #, c-format msgid "'%s' is not a valid branch name." msgstr "'%s' n'est pas un nom de branche valide." -#: branch.c:190 +#: branch.c:208 #, c-format msgid "A branch named '%s' already exists." msgstr "Une branche nommée '%s' existe déjà." -#: branch.c:197 +#: branch.c:213 msgid "Cannot force update the current branch." msgstr "Impossible de forcer la mise à jour de la branche courante." -#: branch.c:217 +#: branch.c:233 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "" "Impossible de paramétrer le suivi de branche ; le point de départ '%s' n'est " "pas une branche." -#: branch.c:219 +#: branch.c:235 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "la branche amont demandée '%s' n'existe pas" -#: branch.c:221 +#: branch.c:237 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -1225,27 +1226,27 @@ msgstr "" "sa jumelle distante, vous pouvez utiliser \"git push -u\"\n" "pour paramétrer le suivi distant en même temps que vous poussez." -#: branch.c:264 +#: branch.c:280 #, c-format msgid "Not a valid object name: '%s'." msgstr "Nom d'objet invalide : '%s'." -#: branch.c:284 +#: branch.c:300 #, c-format msgid "Ambiguous object name: '%s'." msgstr "Nom d'objet ambigu : '%s'." -#: branch.c:289 +#: branch.c:305 #, c-format msgid "Not a valid branch point: '%s'." msgstr "Point d'embranchement invalide : '%s'." -#: branch.c:343 +#: branch.c:359 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s' est déjà extrait dans '%s'" -#: branch.c:366 +#: branch.c:382 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "la HEAD de la copie de travail %s n'est pas mise à jour" @@ -1260,9 +1261,8 @@ 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:88 sequencer.c:1346 sequencer.c:1793 sequencer.c:2500 -#: sequencer.c:2583 sequencer.c:2609 sequencer.c:2687 sequencer.c:2807 -#: sequencer.c:2949 builtin/commit.c:782 +#: bundle.c:88 sequencer.c:1357 sequencer.c:1804 sequencer.c:2631 +#: sequencer.c:2657 sequencer.c:2748 sequencer.c:2850 builtin/commit.c:782 #, c-format msgid "could not open '%s'" msgstr "impossible d'ouvrir '%s'" @@ -1306,7 +1306,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:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296 +#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296 #, c-format msgid "unrecognized argument: %s" msgstr "argument non reconnu : %s" @@ -1329,8 +1329,8 @@ msgstr "l'index de groupe a disparu" msgid "invalid color value: %.*s" msgstr "Valeur invalide de couleur : %.*s" -#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465 -#: builtin/am.c:1467 builtin/am.c:2105 +#: commit.c:41 sequencer.c:1611 builtin/am.c:421 builtin/am.c:465 +#: builtin/am.c:1471 builtin/am.c:2106 #, c-format msgid "could not parse %s" msgstr "impossible d'analyser %s" @@ -1340,7 +1340,7 @@ msgstr "impossible d'analyser %s" msgid "%s %s is not a commit!" msgstr "%s %s n'est pas un commit !" -#: commit.c:1517 +#: commit.c:1524 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" @@ -1352,184 +1352,189 @@ msgstr "" "variable de configuration i18n.commitencoding à l'encodage utilisé par votre " "projet.\n" -#: compat/obstack.c:406 compat/obstack.c:408 +#: compat/obstack.c:405 compat/obstack.c:407 msgid "memory exhausted" msgstr "plus de mémoire" -#: config.c:187 +#: config.c:186 msgid "relative config include conditionals must come from files" msgstr "" "les conditions d'inclusion de configuration relative doivent venir de " "fichiers" -#: config.c:721 +#: config.c:720 #, c-format msgid "bad config line %d in blob %s" msgstr "ligne %d de config incorrecte dans le blob %s" -#: config.c:725 +#: config.c:724 #, c-format msgid "bad config line %d in file %s" msgstr "ligne %d de config incorrecte dans le fichier %s" -#: config.c:729 +#: config.c:728 #, c-format msgid "bad config line %d in standard input" msgstr "ligne %d de config incorrecte dans l'entrée standard" -#: config.c:733 +#: config.c:732 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "ligne %d de config incorrecte dans le blob de sous-module %s" -#: config.c:737 +#: config.c:736 #, c-format msgid "bad config line %d in command line %s" msgstr "ligne %d de config incorrecte dans la ligne de commande %s" -#: config.c:741 +#: config.c:740 #, c-format msgid "bad config line %d in %s" msgstr "ligne %d de config incorrecte dans %s" -#: config.c:869 +#: config.c:868 msgid "out of range" msgstr "hors plage" -#: config.c:869 +#: config.c:868 msgid "invalid unit" msgstr "unité invalide" -#: config.c:875 +#: config.c:874 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s" -#: config.c:880 +#: config.c:879 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob " "%s : %s" -#: config.c:883 +#: config.c:882 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans le fichier " "%s : %s" -#: config.c:886 +#: config.c:885 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans l'entrée " "standard : %s" -#: config.c:889 +#: config.c:888 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob de " "sous-module %s : %s" -#: config.c:892 +#: config.c:891 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans la ligne de " "commande %s : %s" -#: config.c:895 +#: config.c:894 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans %s : %s" -#: config.c:990 +#: config.c:989 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "impossible d'étendre le répertoire utilisateur dans : '%s'" -#: config.c:1085 config.c:1096 +#: config.c:998 +#, c-format +msgid "'%s' for '%s' is not a valid timestamp" +msgstr "'%s' pour '%s' n'est pas un horodatage valide" + +#: config.c:1094 config.c:1105 #, c-format msgid "bad zlib compression level %d" msgstr "niveau de compression zlib incorrect %d" -#: config.c:1213 +#: config.c:1222 #, c-format msgid "invalid mode for object creation: %s" msgstr "mode invalide pour la création d'objet : %s" -#: config.c:1372 +#: config.c:1378 #, c-format msgid "bad pack compression level %d" msgstr "niveau de compression du paquet %d" -#: config.c:1568 +#: config.c:1574 msgid "unable to parse command-line config" msgstr "lecture de la configuration de ligne de commande impossible" -#: config.c:1900 +#: config.c:1906 msgid "unknown error occurred while reading the configuration files" msgstr "erreur inconnue pendant la lecture des fichiers de configuration" -#: config.c:2087 +#: config.c:2093 #, c-format msgid "Invalid %s: '%s'" msgstr "%s invalide : '%s'" -#: config.c:2130 +#: config.c:2136 #, 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:2156 +#: config.c:2162 #, 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:2167 +#: config.c:2187 #, 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:2169 +#: config.c:2189 #, 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:2228 +#: config.c:2248 #, c-format msgid "%s has multiple values" msgstr "%s a des valeurs multiples" -#: config.c:2571 config.c:2789 +#: config.c:2591 config.c:2808 #, c-format msgid "fstat on %s failed" msgstr "échec de fstat sur %s" -#: config.c:2678 +#: config.c:2698 #, c-format msgid "could not set '%s' to '%s'" msgstr "impossible de régler '%s' à '%s'" -#: config.c:2680 builtin/remote.c:776 +#: config.c:2700 builtin/remote.c:776 #, c-format msgid "could not unset '%s'" msgstr "impossible de désinitialiser '%s'" -#: connect.c:50 +#: connect.c:52 msgid "The remote end hung up upon initial contact" msgstr "L'hôte distant a fermé la connexion lors du contact initial" -#: connect.c:52 +#: connect.c:54 msgid "" "Could not read from remote repository.\n" "\n" @@ -1660,7 +1665,7 @@ msgstr[1] "il y a %<PRIuMAX> ans" msgid "failed to read orderfile '%s'" msgstr "impossible de lire le fichier de commande '%s'" -#: diffcore-rename.c:536 +#: diffcore-rename.c:535 msgid "Performing inexact rename detection" msgstr "Détection de renommage inexact en cours" @@ -1694,7 +1699,7 @@ msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" "Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'" -#: diff.c:398 +#: diff.c:401 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -1703,20 +1708,20 @@ msgstr "" "Erreurs dans la variable de configuration 'diff.dirstat' :\n" "%s" -#: diff.c:3861 +#: diff.c:3799 #, c-format msgid "external diff died, stopping at %s" msgstr "l'application de diff externe a disparu, arrêt à %s" -#: diff.c:4189 +#: diff.c:4127 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check et -s sont mutuellement exclusifs" -#: diff.c:4279 +#: diff.c:4215 msgid "--follow requires exactly one pathspec" msgstr "--follow a besoin d'une spécification de chemin unique" -#: diff.c:4445 +#: diff.c:4381 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -1725,24 +1730,24 @@ msgstr "" "Impossible d'analyser le paramètre de l'option --dirstat/-X :\n" "%s" -#: diff.c:4459 +#: diff.c:4395 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Impossible d'analyser le paramètre de l'option --submodule : '%s'" -#: diff.c:5505 +#: diff.c:5446 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:5508 +#: diff.c:5449 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:5511 +#: diff.c:5452 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -1750,29 +1755,34 @@ msgstr "" "vous souhaitez peut-être régler la variable %s à au moins %d et réessayer le " "commande." -#: dir.c:1983 +#: dir.c:2100 msgid "failed to get kernel name and information" msgstr "echec de l'obtention d'information de kernel" -#: dir.c:2102 +#: dir.c:2219 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:2885 dir.c:2890 +#: dir.c:3002 dir.c:3007 #, c-format msgid "could not create directories for %s" msgstr "impossible de créer les répertoires pour %s" -#: dir.c:2915 +#: dir.c:3032 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "impossible de migrer le répertoire git de '%s' vers '%s'" -#: entry.c:176 +#: editor.c:61 +#, c-format +msgid "hint: Waiting for your editor to close the file...%c" +msgstr "suggestion : en attente de la fermeture du fichier par votre éditeur de texte…%c" + +#: entry.c:177 msgid "Filtering content" msgstr "Filtrage du contenu" -#: entry.c:433 +#: entry.c:435 #, c-format msgid "could not stat file '%s'" msgstr "impossible de stat le fichier '%s'" @@ -1843,7 +1853,7 @@ msgstr "commit invalide %s" msgid "giving up" msgstr "abandon" -#: fetch-pack.c:534 progress.c:242 +#: fetch-pack.c:534 progress.c:229 msgid "done" msgstr "fait" @@ -1857,104 +1867,104 @@ msgstr "%s trouvé (%d) %s" msgid "Marking %s as complete" msgstr "Marquage de %s comme terminé" -#: fetch-pack.c:776 +#: fetch-pack.c:777 #, c-format msgid "already have %s (%s)" msgstr "%s déjà possédé (%s)" -#: fetch-pack.c:814 +#: fetch-pack.c:815 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack : impossible de dupliquer le démultiplexeur latéral" -#: fetch-pack.c:822 +#: fetch-pack.c:823 msgid "protocol error: bad pack header" msgstr "erreur de protocole : mauvais entête de paquet" -#: fetch-pack.c:878 +#: fetch-pack.c:879 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack : impossible de dupliquer %s" -#: fetch-pack.c:894 +#: fetch-pack.c:895 #, c-format msgid "%s failed" msgstr "échec de %s" -#: fetch-pack.c:896 +#: fetch-pack.c:897 msgid "error in sideband demultiplexer" msgstr "erreur dans le démultiplexer latéral" -#: fetch-pack.c:923 +#: fetch-pack.c:924 msgid "Server does not support shallow clients" msgstr "Le serveur ne supporte les clients superficiels" -#: fetch-pack.c:927 +#: fetch-pack.c:928 msgid "Server supports multi_ack_detailed" msgstr "Le serveur supporte multi_ack_detailed" -#: fetch-pack.c:930 +#: fetch-pack.c:931 msgid "Server supports no-done" msgstr "Le serveur support no-done" -#: fetch-pack.c:936 +#: fetch-pack.c:937 msgid "Server supports multi_ack" msgstr "Le serveur supporte multi_ack" -#: fetch-pack.c:940 +#: fetch-pack.c:941 msgid "Server supports side-band-64k" msgstr "Le serveur supporte side-band-64k" -#: fetch-pack.c:944 +#: fetch-pack.c:945 msgid "Server supports side-band" msgstr "Le serveru supporte side-band" -#: fetch-pack.c:948 +#: fetch-pack.c:949 msgid "Server supports allow-tip-sha1-in-want" msgstr "Le serveur supporte allow-tip-sha1-in-want" -#: fetch-pack.c:952 +#: fetch-pack.c:953 msgid "Server supports allow-reachable-sha1-in-want" msgstr "Le serveur supporte allow-reachable-sha1-in-want" -#: fetch-pack.c:962 +#: fetch-pack.c:963 msgid "Server supports ofs-delta" msgstr "Le serveur support ofs-delta" -#: fetch-pack.c:969 +#: fetch-pack.c:970 #, c-format msgid "Server version is %.*s" msgstr "La version du serveur est %.*s" -#: fetch-pack.c:975 +#: fetch-pack.c:976 msgid "Server does not support --shallow-since" msgstr "Le receveur ne gère pas --shallow-since" -#: fetch-pack.c:979 +#: fetch-pack.c:980 msgid "Server does not support --shallow-exclude" msgstr "Le receveur ne gère pas --shallow-exclude" -#: fetch-pack.c:981 +#: fetch-pack.c:982 msgid "Server does not support --deepen" msgstr "Le receveur ne gère pas --deepen" -#: fetch-pack.c:992 +#: fetch-pack.c:993 msgid "no common commits" msgstr "pas de commit commun" -#: fetch-pack.c:1004 +#: fetch-pack.c:1005 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack : échec de le récupération." -#: fetch-pack.c:1166 +#: fetch-pack.c:1167 msgid "no matching remote head" msgstr "pas de HEAD distante correspondante" -#: fetch-pack.c:1188 +#: fetch-pack.c:1189 #, c-format msgid "no such remote ref %s" msgstr "référence distante inconnue %s" -#: fetch-pack.c:1191 +#: fetch-pack.c:1192 #, 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é" @@ -1977,17 +1987,17 @@ 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:1970 +#: grep.c:2017 #, c-format msgid "'%s': unable to read %s" msgstr "'%s' : lecture de %s impossible" -#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134 +#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134 #, c-format msgid "failed to stat '%s'" msgstr "échec du stat de '%s'" -#: grep.c:1998 +#: grep.c:2045 #, c-format msgid "'%s': short read" msgstr "'%s' : lecture tronquée" @@ -2058,12 +2068,12 @@ msgstr[1] "" msgid "git version [<options>]" msgstr "git version [<options>]" -#: help.c:456 +#: help.c:462 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:460 +#: help.c:466 msgid "" "\n" "Did you mean this?" @@ -2136,6 +2146,15 @@ 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-filter-options.c:30 +msgid "multiple object filter types cannot be combined" +msgstr "impossible de combiner des types multiples de filtre d'objets" + +#: list-objects-filter-options.c:41 list-objects-filter-options.c:68 +#, c-format +msgid "invalid filter-spec expression '%s'" +msgstr "expression de filtre invalide : '%s'" + #: lockfile.c:151 #, c-format msgid "" @@ -2164,8 +2183,8 @@ msgstr "Impossible de créer '%s.lock' : %s" msgid "failed to read the cache" msgstr "impossible de lire le cache" -#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380 -#: builtin/checkout.c:595 builtin/clone.c:754 +#: merge.c:95 builtin/am.c:1980 builtin/am.c:2014 builtin/checkout.c:379 +#: builtin/checkout.c:600 builtin/clone.c:754 msgid "unable to write new index file" msgstr "impossible d'écrire le nouveau fichier d'index" @@ -2361,7 +2380,7 @@ msgstr "%s sauté (fusion identique à l'existant)" msgid "Auto-merging %s" msgstr "Fusion automatique de %s" -#: merge-recursive.c:1775 git-submodule.sh:944 +#: merge-recursive.c:1775 git-submodule.sh:932 msgid "submodule" msgstr "sous-module" @@ -2383,47 +2402,47 @@ msgstr "fichier/répertoire" msgid "directory/file" msgstr "répertoire/fichier" -#: merge-recursive.c:1908 +#: merge-recursive.c:1909 #, 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:1917 +#: merge-recursive.c:1918 #, c-format msgid "Adding %s" msgstr "Ajout de %s" -#: merge-recursive.c:1954 +#: merge-recursive.c:1955 msgid "Already up to date!" msgstr "Déjà à jour !" -#: merge-recursive.c:1963 +#: merge-recursive.c:1964 #, c-format msgid "merging of trees %s and %s failed" msgstr "échec de fusion des arbres %s et %s" -#: merge-recursive.c:2060 +#: merge-recursive.c:2061 msgid "Merging:" msgstr "Fusion :" -#: merge-recursive.c:2073 +#: merge-recursive.c:2074 #, 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:2112 +#: merge-recursive.c:2113 msgid "merge returned no commit" msgstr "la fusion n'a pas retourné de commit" -#: merge-recursive.c:2175 +#: merge-recursive.c:2176 #, c-format msgid "Could not parse object '%s'" msgstr "Impossible d'analyser l'objet '%s'" -#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814 +#: merge-recursive.c:2190 builtin/merge.c:656 builtin/merge.c:815 msgid "Unable to write index." msgstr "Impossible d'écrire l'index." @@ -2596,16 +2615,7 @@ msgstr "" "%s : le spécificateur magique de chemin n'est pas supporté par cette " "commande : %s" -#: pathspec.c:571 -msgid "" -"empty strings as pathspecs will be made invalid in upcoming releases. please " -"use . instead if you meant to match all paths" -msgstr "" -"les chaines de caractères vides comme spécificateurs de chemin seront " -"invalides dans les prochaines versions. Veuillez utiliser . à la place pour " -"correspondre à tous le chemins" - -#: pathspec.c:595 +#: pathspec.c:592 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "le chemin '%s' est au-delà d'un lien symbolique" @@ -2614,7 +2624,7 @@ msgstr "le chemin '%s' est au-delà d'un lien symbolique" msgid "unable to parse --pretty format" msgstr "impossible d'analyser le format --pretty" -#: read-cache.c:1443 +#: read-cache.c:1472 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -2623,7 +2633,7 @@ msgstr "" "version d'index renseignée, mais la valeur est invalide.\n" "Utilisation de la version %i" -#: read-cache.c:1453 +#: read-cache.c:1482 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -2632,53 +2642,53 @@ msgstr "" "GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n" "Utilisation de la version %i" -#: read-cache.c:2316 builtin/merge.c:1046 +#: read-cache.c:2370 sequencer.c:2725 wrapper.c:658 builtin/merge.c:1048 #, c-format msgid "could not close '%s'" msgstr "impossible de fermer '%s'" -#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077 +#: read-cache.c:2442 sequencer.c:1366 sequencer.c:2093 #, c-format msgid "could not stat '%s'" msgstr "stat impossible de '%s'" -#: read-cache.c:2407 +#: read-cache.c:2455 #, c-format msgid "unable to open git dir: %s" msgstr "impossible d'ouvrir le répertoire git : %s" -#: read-cache.c:2419 +#: read-cache.c:2467 #, c-format msgid "unable to unlink: %s" msgstr "échec lors de l'unlink : %s" -#: refs.c:638 +#: refs.c:706 #, c-format msgid "Could not open '%s' for writing" msgstr "Impossible d'ouvrir '%s' en écriture" -#: refs.c:1792 +#: refs.c:1850 msgid "ref updates forbidden inside quarantine environment" msgstr "mises à jour des références interdites en environnement de quarantaine" -#: refs/files-backend.c:1136 +#: refs/files-backend.c:1189 #, c-format msgid "could not remove reference %s" msgstr "impossible de supprimer la référence %s" -#: refs/files-backend.c:1150 refs/packed-backend.c:1430 -#: refs/packed-backend.c:1440 +#: refs/files-backend.c:1203 refs/packed-backend.c:1524 +#: refs/packed-backend.c:1534 #, c-format msgid "could not delete reference %s: %s" msgstr "Impossible de supprimer la référence %s : %s" -#: refs/files-backend.c:1153 refs/packed-backend.c:1443 +#: refs/files-backend.c:1206 refs/packed-backend.c:1537 #, c-format msgid "could not delete references: %s" msgstr "impossible de supprimer les références : %s" # à priori on parle d'une branche ici -#: ref-filter.c:35 wt-status.c:1811 +#: ref-filter.c:35 wt-status.c:1816 msgid "gone" msgstr "disparue" @@ -2697,157 +2707,157 @@ msgstr "en retard de %d" msgid "ahead %d, behind %d" msgstr "en avance de %d, en retard de %d" -#: ref-filter.c:105 +#: ref-filter.c:107 #, c-format msgid "expected format: %%(color:<color>)" msgstr "format attendu : %%(color:<couleur>)" -#: ref-filter.c:107 +#: ref-filter.c:109 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "couleur non reconnue : %%(color:%s)" -#: ref-filter.c:127 +#: ref-filter.c:129 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Valeur entière attendue refname:lstrip=%s" -#: ref-filter.c:131 +#: ref-filter.c:133 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Valeur entière attendue refname:rstrip=%s" -#: ref-filter.c:133 +#: ref-filter.c:135 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "argument %%(%s) non reconnu : %s" -#: ref-filter.c:173 +#: ref-filter.c:184 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) n'accepte pas d'argument" -#: ref-filter.c:180 +#: ref-filter.c:191 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) n'accepte pas d'argument" -#: ref-filter.c:198 +#: ref-filter.c:209 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "argument %%(trailers) inconnu : %s" -#: ref-filter.c:221 +#: ref-filter.c:232 #, c-format msgid "positive value expected contents:lines=%s" msgstr "valeur positive attendue contents:lines=%s" -#: ref-filter.c:223 +#: ref-filter.c:234 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "argument %%(contents) non reconnu : %s" -#: ref-filter.c:236 +#: ref-filter.c:247 #, c-format msgid "positive value expected objectname:short=%s" msgstr "valeur positive attendue objectname:short=%s" -#: ref-filter.c:240 +#: ref-filter.c:251 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "argument %%(objectname) non reconnu : %s" -#: ref-filter.c:267 +#: ref-filter.c:278 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "format attendu : %%(align:<largeur>,<position>)" -#: ref-filter.c:279 +#: ref-filter.c:290 #, c-format msgid "unrecognized position:%s" msgstr "position non reconnue : %s" -#: ref-filter.c:283 +#: ref-filter.c:294 #, c-format msgid "unrecognized width:%s" msgstr "largeur non reconnue : %s" -#: ref-filter.c:289 +#: ref-filter.c:300 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "argument %%(align) non reconnu : %s" -#: ref-filter.c:293 +#: ref-filter.c:304 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "valeur positive attendue avec l'atome %%(align)" -#: ref-filter.c:308 +#: ref-filter.c:319 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "argument %%(if) non reconnu : %s" -#: ref-filter.c:398 +#: ref-filter.c:409 #, c-format msgid "malformed field name: %.*s" msgstr "nom de champ malformé %.*s" -#: ref-filter.c:424 +#: ref-filter.c:435 #, c-format msgid "unknown field name: %.*s" msgstr "nom de champ inconnu : %.*s" -#: ref-filter.c:536 +#: ref-filter.c:547 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "format : atome %%(if) utilisé sans un atome %%(then)" -#: ref-filter.c:596 +#: ref-filter.c:607 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "format : atome %%(then) utilisé sans un atome %%(if)" -#: ref-filter.c:598 +#: ref-filter.c:609 #, c-format msgid "format: %%(then) atom used more than once" msgstr "format : atome %%(then) utilisé plus d'une fois" -#: ref-filter.c:600 +#: ref-filter.c:611 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "format: atome %%(then) utilisé après %%(else)" -#: ref-filter.c:626 +#: ref-filter.c:637 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "format : atome %%(else) utilisé sans un atome %%(if)" -#: ref-filter.c:628 +#: ref-filter.c:639 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "format : atome %%(else) utilisé sans un atome %%(then)" -#: ref-filter.c:630 +#: ref-filter.c:641 #, c-format msgid "format: %%(else) atom used more than once" msgstr "format : atome %%(else) utilisé plus d'une fois" -#: ref-filter.c:643 +#: ref-filter.c:654 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "format : atome %%(end) utilisé sans atome correspondant" -#: ref-filter.c:698 +#: ref-filter.c:709 #, c-format msgid "malformed format string %s" msgstr "Chaîne de formatage mal formée %s" -#: ref-filter.c:1283 +#: ref-filter.c:1313 #, c-format msgid "(no branch, rebasing %s)" msgstr "(aucune branche, rebasage de %s)" -#: ref-filter.c:1286 +#: ref-filter.c:1316 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(aucune branche, bisect a démarré sur %s)" @@ -2855,7 +2865,7 @@ msgstr "(aucune branche, bisect a démarré sur %s)" #. TRANSLATORS: make sure this matches "HEAD #. detached at " in wt-status.c #. -#: ref-filter.c:1294 +#: ref-filter.c:1324 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD détachée sur %s)" @@ -2863,140 +2873,140 @@ msgstr "(HEAD détachée sur %s)" #. TRANSLATORS: make sure this matches "HEAD #. detached from " in wt-status.c #. -#: ref-filter.c:1301 +#: ref-filter.c:1331 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD détachée depuis %s)" -#: ref-filter.c:1305 +#: ref-filter.c:1335 msgid "(no branch)" msgstr "(aucune branche)" -#: ref-filter.c:1454 ref-filter.c:1485 +#: ref-filter.c:1488 ref-filter.c:1519 #, c-format msgid "missing object %s for %s" msgstr "objet manquant %s pour %s" -#: ref-filter.c:1457 ref-filter.c:1488 +#: ref-filter.c:1491 ref-filter.c:1522 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "echec de parse_object_buffer sur %s pour %s" -#: ref-filter.c:1788 +#: ref-filter.c:1822 #, c-format msgid "malformed object at '%s'" msgstr "objet malformé à '%s'" -#: ref-filter.c:1855 +#: ref-filter.c:1889 #, c-format msgid "ignoring ref with broken name %s" msgstr "réf avec un nom cassé %s ignoré" -#: ref-filter.c:1860 +#: ref-filter.c:1894 #, c-format msgid "ignoring broken ref %s" msgstr "réf cassé %s ignoré" -#: ref-filter.c:2122 +#: ref-filter.c:2156 #, c-format msgid "format: %%(end) atom missing" msgstr "format: atome %%(end) manquant" -#: ref-filter.c:2216 +#: ref-filter.c:2250 #, c-format msgid "malformed object name %s" msgstr "nom d'objet malformé %s" -#: remote.c:750 +#: remote.c:780 #, 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:754 +#: remote.c:784 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s suit habituellement %s, pas %s" -#: remote.c:758 +#: remote.c:788 #, c-format msgid "%s tracks both %s and %s" msgstr "%s suit à la fois %s et %s" -#: remote.c:766 +#: remote.c:796 msgid "Internal error" msgstr "Erreur interne" -#: remote.c:1681 remote.c:1783 +#: remote.c:1711 remote.c:1813 msgid "HEAD does not point to a branch" msgstr "HEAD ne pointe pas sur une branche" -#: remote.c:1690 +#: remote.c:1720 #, c-format msgid "no such branch: '%s'" msgstr "pas de branche '%s'" -#: remote.c:1693 +#: remote.c:1723 #, c-format msgid "no upstream configured for branch '%s'" msgstr "aucune branche amont configurée pour la branche '%s'" -#: remote.c:1699 +#: remote.c:1729 #, 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:1714 +#: remote.c:1744 #, 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:1726 +#: remote.c:1756 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "la branche '%s' n'a aucune branche distante de poussée" -#: remote.c:1737 +#: remote.c:1767 #, 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:1750 +#: remote.c:1780 msgid "push has no destination (push.default is 'nothing')" msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')" -#: remote.c:1772 +#: remote.c:1802 msgid "cannot resolve 'simple' push to a single destination" msgstr "" "impossible de résoudre une poussée 'simple' pour une destination unique" -#: remote.c:2076 +#: remote.c:2106 #, 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:2080 +#: remote.c:2110 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n" -#: remote.c:2083 +#: remote.c:2113 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Votre branche est à jour avec '%s'.\n" -#: remote.c:2087 +#: remote.c:2117 #, 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:2093 +#: remote.c:2123 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n" -#: remote.c:2096 +#: remote.c:2126 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -3008,11 +3018,11 @@ msgstr[1] "" "Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour " "en avance rapide.\n" -#: remote.c:2104 +#: remote.c:2134 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (utilisez \"git pull\" pour mettre à jour votre branche locale)\n" -#: remote.c:2107 +#: remote.c:2137 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -3027,28 +3037,37 @@ msgstr[1] "" "Votre branche et '%s' ont divergé,\n" "et ont %d et %d commits différents chacune respectivement.\n" -#: remote.c:2117 +#: remote.c:2147 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" -#: revision.c:2256 +#: revision.c:2268 msgid "your current branch appears to be broken" msgstr "votre branche actuelle semble cassée" -#: revision.c:2259 +#: revision.c:2271 #, 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:2453 +#: revision.c:2465 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent est incompatible avec --bisect" -#: run-command.c:644 +#: run-command.c:645 msgid "open /dev/null failed" msgstr "échec de l'ouverture de /dev/null" +#: run-command.c:1188 +#, c-format +msgid "" +"The '%s' hook was ignored because it's not set as executable.\n" +"You can disable this warning with `git config advice.ignoredHook false`." +msgstr "" +"Le crochet '%s' a été ignoré parce qu'il n'est pas marqué comme exécutable.\n" +"Vous pouvez désactiver cet avertissement avec `git config advice.ignoredHook false`." + #: send-pack.c:151 #, c-format msgid "unable to parse remote unpack status: %s" @@ -3118,13 +3137,13 @@ msgstr "" "avec 'git add <chemins>' ou 'git rm <chemins>'\n" "puis validez le résultat avec 'git commit'" -#: sequencer.c:297 sequencer.c:1704 +#: sequencer.c:297 sequencer.c:1715 #, c-format msgid "could not lock '%s'" msgstr "impossible de verrouiller '%s'" -#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723 -#: sequencer.c:2733 sequencer.c:2749 +#: sequencer.c:300 sequencer.c:1592 sequencer.c:1720 sequencer.c:1734 +#: sequencer.c:2723 sequencer.c:2794 wrapper.c:656 #, c-format msgid "could not write to '%s'" msgstr "impossible d'écrire dans '%s'" @@ -3134,13 +3153,13 @@ msgstr "impossible d'écrire dans '%s'" msgid "could not write eol to '%s'" msgstr "impossible d'écrire la fin de ligne dans '%s'" -#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711 +#: sequencer.c:308 sequencer.c:1597 sequencer.c:1722 #, c-format msgid "failed to finalize '%s'." msgstr "échec lors de la finalisation de '%s'." -#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259 -#: builtin/commit.c:754 builtin/merge.c:1044 +#: sequencer.c:332 sequencer.c:829 sequencer.c:1618 builtin/am.c:259 +#: builtin/commit.c:754 builtin/merge.c:1046 #, c-format msgid "could not read '%s'" msgstr "impossible de lire '%s'" @@ -3162,20 +3181,20 @@ msgstr "%s : avance rapide" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:474 +#: sequencer.c:477 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Impossible d'écrire le nouveau fichier index" -#: sequencer.c:493 +#: sequencer.c:496 msgid "could not resolve HEAD commit\n" msgstr "impossible de résoudre le commit HEAD\n" -#: sequencer.c:513 +#: sequencer.c:516 msgid "unable to update cache tree\n" msgstr "impossible de mettre à jour l'arbre de cache\n" -#: sequencer.c:597 +#: sequencer.c:600 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -3204,17 +3223,17 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:699 +#: sequencer.c:702 #, c-format msgid "could not parse commit %s\n" msgstr "impossible d'analyser le commit %s\n" -#: sequencer.c:704 +#: sequencer.c:707 #, c-format msgid "could not parse parent commit %s\n" msgstr "impossible d'analyser le commit parent %s\n" -#: sequencer.c:826 +#: sequencer.c:836 #, c-format msgid "" "unexpected 1st line of squash message:\n" @@ -3225,7 +3244,7 @@ msgstr "" "\n" "\t%.*s" -#: sequencer.c:832 +#: sequencer.c:842 #, c-format msgid "" "invalid 1st line of squash message:\n" @@ -3236,233 +3255,233 @@ msgstr "" "\n" "\t%.*s" -#: sequencer.c:838 sequencer.c:863 +#: sequencer.c:848 sequencer.c:873 #, c-format msgid "This is a combination of %d commits." msgstr "Ceci est la combinaison de %d commits." -#: sequencer.c:847 sequencer.c:2681 +#: sequencer.c:857 sequencer.c:2742 msgid "need a HEAD to fixup" msgstr "une HEAD est nécessaire à la correction" -#: sequencer.c:849 +#: sequencer.c:859 msgid "could not read HEAD" msgstr "Impossible de lire HEAD" -#: sequencer.c:851 +#: sequencer.c:861 msgid "could not read HEAD's commit message" msgstr "impossible de lire le message de validation de HEAD" -#: sequencer.c:857 +#: sequencer.c:867 #, c-format msgid "cannot write '%s'" msgstr "impossible d'écrire '%s'" -#: sequencer.c:866 git-rebase--interactive.sh:446 +#: sequencer.c:876 git-rebase--interactive.sh:446 msgid "This is the 1st commit message:" msgstr "Ceci est le premier message de validation :" -#: sequencer.c:874 +#: sequencer.c:884 #, c-format msgid "could not read commit message of %s" msgstr "impossible de lire le message de validation de %s" -#: sequencer.c:881 +#: sequencer.c:891 #, c-format msgid "This is the commit message #%d:" msgstr "Ceci est le message de validation numéro %d :" -#: sequencer.c:886 +#: sequencer.c:896 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Le message de validation %d sera ignoré :" -#: sequencer.c:891 +#: sequencer.c:901 #, c-format msgid "unknown command: %d" msgstr "commande inconnue : %d" -#: sequencer.c:957 +#: sequencer.c:967 msgid "your index file is unmerged." msgstr "votre fichier d'index n'est pas fusionné." -#: sequencer.c:975 +#: sequencer.c:986 #, 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:983 +#: sequencer.c:994 #, c-format msgid "commit %s does not have parent %d" msgstr "le commit %s n'a pas de parent %d" -#: sequencer.c:987 +#: sequencer.c:998 #, c-format msgid "mainline was specified but commit %s is not a merge." msgstr "" "une branche principale a été spécifiée mais le commit %s n'est pas une " "fusion." -#: sequencer.c:993 +#: sequencer.c:1004 #, 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:1014 +#: sequencer.c:1025 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s : impossible d'analyser le commit parent %s" -#: sequencer.c:1077 sequencer.c:1853 +#: sequencer.c:1088 sequencer.c:1864 #, c-format msgid "could not rename '%s' to '%s'" msgstr "impossible de renommer '%s' en '%s'" -#: sequencer.c:1128 +#: sequencer.c:1139 #, c-format msgid "could not revert %s... %s" msgstr "impossible d'annuler %s... %s" -#: sequencer.c:1129 +#: sequencer.c:1140 #, c-format msgid "could not apply %s... %s" msgstr "impossible d'appliquer %s... %s" -#: sequencer.c:1171 +#: sequencer.c:1182 msgid "empty commit set passed" msgstr "l'ensemble de commits spécifié est vide" -#: sequencer.c:1181 +#: sequencer.c:1192 #, c-format msgid "git %s: failed to read the index" msgstr "git %s : échec à la lecture de l'index" -#: sequencer.c:1188 +#: sequencer.c:1198 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s : échec du rafraîchissement de l'index" -#: sequencer.c:1308 +#: sequencer.c:1319 #, c-format msgid "invalid line %d: %.*s" msgstr "ligne %d invalide : %.*s" -#: sequencer.c:1316 +#: sequencer.c:1327 #, c-format msgid "cannot '%s' without a previous commit" msgstr "'%s' impossible avec le commit précédent" -#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614 -#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951 +#: sequencer.c:1360 sequencer.c:2522 sequencer.c:2557 sequencer.c:2636 +#: sequencer.c:2662 sequencer.c:2752 sequencer.c:2853 #, c-format msgid "could not read '%s'." msgstr "impossible de lire '%s'." -#: sequencer.c:1361 +#: sequencer.c:1372 msgid "please fix this using 'git rebase --edit-todo'." msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'." -#: sequencer.c:1363 +#: sequencer.c:1374 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "feuille d'instruction inutilisable : '%s'" -#: sequencer.c:1368 +#: sequencer.c:1379 msgid "no commits parsed." msgstr "aucun commit analysé." -#: sequencer.c:1379 +#: sequencer.c:1390 msgid "cannot cherry-pick during a revert." msgstr "impossible de picorer pendant l'annulation d'un commit." -#: sequencer.c:1381 +#: sequencer.c:1392 msgid "cannot revert during a cherry-pick." msgstr "impossible d'annuler un commit pendant un picorage." -#: sequencer.c:1448 +#: sequencer.c:1459 #, c-format msgid "invalid key: %s" msgstr "clé invalide : %s" -#: sequencer.c:1451 +#: sequencer.c:1462 #, c-format msgid "invalid value for %s: %s" msgstr "valeur invalide pour %s : %s" -#: sequencer.c:1517 +#: sequencer.c:1528 #, c-format msgid "malformed options sheet: '%s'" msgstr "feuille d'options malformée : %s" -#: sequencer.c:1555 +#: sequencer.c:1566 msgid "a cherry-pick or revert is already in progress" msgstr "un picorage ou un retour est déjà en cours" -#: sequencer.c:1556 +#: sequencer.c:1567 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\"" -#: sequencer.c:1559 +#: sequencer.c:1570 #, c-format msgid "could not create sequencer directory '%s'" msgstr "impossible de créer le répertoire de séquenceur '%s'" -#: sequencer.c:1574 +#: sequencer.c:1585 msgid "could not lock HEAD" msgstr "impossible de verrouiller HEAD" -#: sequencer.c:1632 sequencer.c:2211 +#: sequencer.c:1643 sequencer.c:2227 msgid "no cherry-pick or revert in progress" msgstr "aucun picorage ou retour en cours" -#: sequencer.c:1634 +#: sequencer.c:1645 msgid "cannot resolve HEAD" msgstr "impossible de résoudre HEAD" -#: sequencer.c:1636 sequencer.c:1671 +#: sequencer.c:1647 sequencer.c:1682 msgid "cannot abort from a branch yet to be born" msgstr "impossible d'abandonner depuis une branche non encore créée" -#: sequencer.c:1657 builtin/grep.c:711 +#: sequencer.c:1668 builtin/grep.c:713 #, c-format msgid "cannot open '%s'" msgstr "impossible d'ouvrir '%s'" -#: sequencer.c:1659 +#: sequencer.c:1670 #, c-format msgid "cannot read '%s': %s" msgstr "impossible de lire '%s' : %s" -#: sequencer.c:1660 +#: sequencer.c:1671 msgid "unexpected end of file" msgstr "fin de fichier inattendue" -#: sequencer.c:1666 +#: sequencer.c:1677 #, 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:1677 +#: sequencer.c:1688 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:1818 sequencer.c:2109 +#: sequencer.c:1829 sequencer.c:2125 msgid "cannot read HEAD" msgstr "impossible de lire HEAD" -#: sequencer.c:1858 builtin/difftool.c:640 +#: sequencer.c:1869 builtin/difftool.c:639 #, c-format msgid "could not copy '%s' to '%s'" msgstr "impossible de copier '%s' vers '%s'" -#: sequencer.c:1874 +#: sequencer.c:1888 msgid "could not read index" msgstr "impossible de lire l'index" -#: sequencer.c:1879 +#: sequencer.c:1893 #, c-format msgid "" "execution failed: %s\n" @@ -3477,11 +3496,11 @@ msgstr "" "git rebase --continue\n" "\n" -#: sequencer.c:1885 +#: sequencer.c:1899 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:1891 +#: sequencer.c:1905 #, c-format msgid "" "execution succeeded: %s\n" @@ -3498,17 +3517,17 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:1948 +#: sequencer.c:1964 #, c-format msgid "Applied autostash.\n" msgstr "Autoremisage appliqué.\n" -#: sequencer.c:1960 +#: sequencer.c:1976 #, c-format msgid "cannot store %s" msgstr "impossible de stocker %s" -#: sequencer.c:1963 git-rebase.sh:175 +#: sequencer.c:1979 git-rebase.sh:175 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -3519,57 +3538,57 @@ 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:2045 +#: sequencer.c:2061 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "arrêt à %s... %.*s\n" -#: sequencer.c:2087 +#: sequencer.c:2103 #, c-format msgid "unknown command %d" msgstr "commande inconnue %d" -#: sequencer.c:2117 +#: sequencer.c:2133 msgid "could not read orig-head" msgstr "impossible de lire orig-head" -#: sequencer.c:2122 sequencer.c:2678 +#: sequencer.c:2138 sequencer.c:2739 msgid "could not read 'onto'" msgstr "impossible de lire 'onto'" -#: sequencer.c:2129 +#: sequencer.c:2145 #, c-format msgid "could not update %s" msgstr "impossible de mettre à jour %s" -#: sequencer.c:2136 +#: sequencer.c:2152 #, c-format msgid "could not update HEAD to %s" msgstr "impossible de mettre à jour HEAD sur %s" -#: sequencer.c:2220 +#: sequencer.c:2236 msgid "cannot rebase: You have unstaged changes." msgstr "impossible de rebaser : vous avez des modifications non indexées." -#: sequencer.c:2225 +#: sequencer.c:2241 msgid "could not remove CHERRY_PICK_HEAD" msgstr "impossible de supprimer CHERRY_PICK_HEAD" -#: sequencer.c:2234 +#: sequencer.c:2250 msgid "cannot amend non-existing commit" msgstr "impossible de corriger un commit non-existant" -#: sequencer.c:2236 +#: sequencer.c:2252 #, c-format msgid "invalid file: '%s'" msgstr "fichier invalide : '%s'" -#: sequencer.c:2238 +#: sequencer.c:2254 #, c-format msgid "invalid contents: '%s'" msgstr "contenu invalide : '%s'" -#: sequencer.c:2241 +#: sequencer.c:2257 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -3579,50 +3598,45 @@ 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:2251 +#: sequencer.c:2267 msgid "could not commit staged changes." msgstr "impossible de valider les modifications indexées." -#: sequencer.c:2331 +#: sequencer.c:2347 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s : impossible de picorer un %s" -#: sequencer.c:2335 +#: sequencer.c:2351 #, c-format msgid "%s: bad revision" msgstr "%s : mauvaise révision" -#: sequencer.c:2368 +#: sequencer.c:2384 msgid "can't revert as initial commit" msgstr "impossible d'annuler en tant que commit initial" -#: sequencer.c:2471 +#: sequencer.c:2489 msgid "make_script: unhandled options" msgstr "make_script : options non gérées" -#: sequencer.c:2474 +#: sequencer.c:2492 msgid "make_script: error preparing revisions" msgstr "make_script : erreur lors de la préparation des révisions" -#: sequencer.c:2510 +#: sequencer.c:2526 sequencer.c:2561 #, c-format msgid "unusable todo list: '%s'" msgstr "liste à faire inutilisable : '%s'" -#: sequencer.c:2516 -#, c-format -msgid "unable to open '%s' for writing" -msgstr "impossible d'ouvrir '%s' en écriture" - -#: sequencer.c:2561 +#: sequencer.c:2609 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." msgstr "" "paramètre non reconnu %s pour l'option rebase.missingCommitsCheck. Ignoré." -#: sequencer.c:2641 +#: sequencer.c:2689 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -3631,7 +3645,7 @@ msgstr "" "Attention : certains commits ont pu être accidentellement supprimés.\n" "Commits supprimés (du plus jeune au plus vieux) :\n" -#: sequencer.c:2648 +#: sequencer.c:2696 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -3649,7 +3663,7 @@ msgstr "" "Les comportements disponibles sont : ignore, warn, error.\n" "\n" -#: sequencer.c:2660 +#: sequencer.c:2708 #, c-format msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" @@ -3660,31 +3674,21 @@ msgstr "" "rebase --continue'.\n" "Ou vous pouvez abandonner le rebasage avec 'git rebase --abort'.\n" -#: sequencer.c:2708 -#, c-format -msgid "could not parse commit '%s'" -msgstr "impossible d'analyser le commit '%s'" - -#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395 -#: builtin/am.c:775 +#: sequencer.c:2721 sequencer.c:2788 wrapper.c:225 wrapper.c:395 +#: builtin/am.c:779 #, c-format msgid "could not open '%s' for writing" msgstr "impossible d'ouvrir '%s' en écriture" -#: sequencer.c:2756 +#: sequencer.c:2769 #, c-format -msgid "could not truncate '%s'" -msgstr "impossible de tronquer '%s'" +msgid "could not parse commit '%s'" +msgstr "impossible d'analyser le commit '%s'" -#: sequencer.c:2848 +#: sequencer.c:2891 msgid "the script was already rearranged." msgstr "le script a déjà été réarrangé." -#: sequencer.c:2953 -#, c-format -msgid "could not finish '%s'" -msgstr "impossible de finir '%s'" - #: setup.c:171 #, c-format msgid "" @@ -3717,34 +3721,34 @@ msgstr "" "Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n" "'git <commande> [<révision>...] -- [<chemin>...]'" -#: setup.c:499 +#: setup.c:501 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Version attendue du dépôt git <= %d, %d trouvée" -#: setup.c:507 +#: setup.c:509 msgid "unknown repository extensions found:" msgstr "extensions de dépôt inconnues trouvées :" -#: setup.c:806 +#: setup.c:811 #, 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:808 builtin/index-pack.c:1653 +#: setup.c:813 builtin/index-pack.c:1653 msgid "Cannot come back to cwd" msgstr "Impossible de revenir au répertoire de travail courant" -#: setup.c:1046 +#: setup.c:1052 msgid "Unable to read current working directory" msgstr "Impossible d'accéder au répertoire de travail courant" -#: setup.c:1058 setup.c:1064 +#: setup.c:1064 setup.c:1070 #, c-format msgid "Cannot change to '%s'" msgstr "Impossible de modifié en '%s'" -#: setup.c:1077 +#: setup.c:1083 #, c-format msgid "" "Not a git repository (or any parent up to mount point %s)\n" @@ -3755,7 +3759,7 @@ msgstr "" "Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM " "n'est pas activé)." -#: setup.c:1159 +#: setup.c:1167 #, c-format msgid "" "Problem with core.sharedRepository filemode value (0%.3o).\n" @@ -3765,43 +3769,43 @@ msgstr "" "Le propriétaire des fichiers doit toujours avoir les droits en lecture et " "écriture." -#: sha1_file.c:528 +#: sha1_file.c:598 #, c-format msgid "path '%s' does not exist" msgstr "le chemin '%s' n'existe pas" -#: sha1_file.c:554 +#: sha1_file.c:624 #, 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:560 +#: sha1_file.c:630 #, 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:566 +#: sha1_file.c:636 #, c-format msgid "reference repository '%s' is shallow" msgstr "le dépôt de référence '%s' est superficiel" -#: sha1_file.c:574 +#: sha1_file.c:644 #, c-format msgid "reference repository '%s' is grafted" msgstr "le dépôt de référence '%s' est greffé" -#: sha1_name.c:420 +#: sha1_name.c:422 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "le SHA1 court %s est ambigu" -#: sha1_name.c:431 +#: sha1_name.c:433 msgid "The candidates are:" msgstr "Les candidats sont :" -#: sha1_name.c:590 +#: sha1_name.c:693 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" @@ -3826,72 +3830,72 @@ msgstr "" "message\n" "en lançant \"git config advice.objectNameWarning false\"" -#: submodule.c:93 submodule.c:127 +#: submodule.c:96 submodule.c:130 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" "Modification impossible de .gitmodules non fusionné, résolvez les conflits " "d'abord" -#: submodule.c:97 submodule.c:131 +#: submodule.c:100 submodule.c:134 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "Impossible de trouver une section où path=%s dans .gitmodules" -#: submodule.c:105 +#: submodule.c:108 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Impossible de mettre à jour l'élément %s de .gitmodules" # ici %s est un chemin -#: submodule.c:138 +#: submodule.c:141 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "Impossible de supprimer l'élément de .gitmodules pour %s" -#: submodule.c:149 +#: submodule.c:152 msgid "staging updated .gitmodules failed" msgstr "échec de la mise en index du .gitmodules mis à jour" -#: submodule.c:309 +#: submodule.c:312 #, c-format msgid "in unpopulated submodule '%s'" msgstr "dans le sous-module '%s' non populé" -#: submodule.c:340 +#: submodule.c:343 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Le chemin '%s' est dans le sous-module '%.*s'" -#: submodule.c:799 +#: submodule.c:833 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "l'entrée de sous-module '%s' (%s) est un %s, pas un commit" -#: submodule.c:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149 +#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387 msgid "Failed to resolve HEAD as a valid ref." msgstr "Échec de résolution de HEAD comme référence valide." -#: submodule.c:1304 +#: submodule.c:1370 #, c-format msgid "'%s' not recognized as a git repository" msgstr "'%s' n'est pas reconnu comme dépôt git" -#: submodule.c:1442 +#: submodule.c:1508 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "impossible de démarrer 'git status' dans le sous-module '%s'" -#: submodule.c:1455 +#: submodule.c:1521 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "impossible de lancer 'git status' dans le sous-module '%s'" -#: submodule.c:1548 +#: submodule.c:1614 #, c-format msgid "submodule '%s' has dirty index" msgstr "le sous-module '%s' a un index sale" -#: submodule.c:1809 +#: submodule.c:1876 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -3899,18 +3903,18 @@ msgstr "" "relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail " "n'est pas supporté" -#: submodule.c:1821 submodule.c:1877 +#: submodule.c:1888 submodule.c:1944 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "impossible de trouve le nom pour le sous-module '%s'" -#: submodule.c:1825 builtin/submodule--helper.c:671 -#: builtin/submodule--helper.c:681 +#: submodule.c:1892 builtin/submodule--helper.c:909 +#: builtin/submodule--helper.c:919 #, c-format msgid "could not create directory '%s'" msgstr "impossible de créer le répertoire '%s'" -#: submodule.c:1828 +#: submodule.c:1895 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -3921,20 +3925,20 @@ msgstr "" "'%s' sur\n" "'%s'\n" -#: submodule.c:1912 +#: submodule.c:1979 #, c-format msgid "could not recurse into submodule '%s'" msgstr "récursion impossible dans le sous-module '%s'" -#: submodule.c:1956 +#: submodule.c:2023 msgid "could not start ls-files in .." msgstr "impossible de démarrer ls-files dans .." -#: submodule.c:1976 +#: submodule.c:2043 msgid "BUG: returned path string doesn't match cwd?" msgstr "BUG : le chemin renvoyé ne correspond pas à cwd ?" -#: submodule.c:1995 +#: submodule.c:2062 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree a renvoyé un code de retour inattendu %d" @@ -4002,17 +4006,17 @@ msgstr "impossible de créer un fichier temporaire" msgid "could not rename temporary file to %s" msgstr "impossible de renommer un fichier temporaire en %s" -#: transport.c:62 +#: transport.c:63 #, c-format 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:151 +#: transport.c:152 #, c-format msgid "transport: invalid depth option '%s'" msgstr "transport : option de profondeur invalide '%s'" -#: transport.c:888 +#: transport.c:904 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -4021,7 +4025,7 @@ msgstr "" "Les chemins suivant de sous-module contiennent des modifications\n" "qui ne peuvent être trouvées sur aucun distant :\n" -#: transport.c:892 +#: transport.c:908 #, c-format msgid "" "\n" @@ -4048,11 +4052,11 @@ msgstr "" "pour les pousser vers un serveur distant.\n" "\n" -#: transport.c:900 +#: transport.c:916 msgid "Aborting." msgstr "Abandon." -#: transport-helper.c:1071 +#: transport-helper.c:1074 #, c-format msgid "Could not read ref %s" msgstr "impossible de lire la réf %s" @@ -4073,7 +4077,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:106 +#: unpack-trees.c:107 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -4084,7 +4088,7 @@ msgstr "" "%%sVeuillez valider ou remiser vos modifications avant de basculer de " "branche." -#: unpack-trees.c:108 +#: unpack-trees.c:109 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -4094,7 +4098,7 @@ msgstr "" "l'extraction :\n" "%%s" -#: unpack-trees.c:111 +#: unpack-trees.c:112 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4104,7 +4108,7 @@ msgstr "" "fusion :\n" "%%sVeuillez valider ou remiser vos modifications avant la fusion." -#: unpack-trees.c:113 +#: unpack-trees.c:114 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4114,7 +4118,7 @@ msgstr "" "fusion :\n" "%%s" -#: unpack-trees.c:116 +#: unpack-trees.c:117 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -4123,7 +4127,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:118 +#: unpack-trees.c:119 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -4132,7 +4136,7 @@ msgstr "" "Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n" "%%s" -#: unpack-trees.c:123 +#: unpack-trees.c:124 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -4142,7 +4146,7 @@ msgstr "" "contenus :\n" "%s" -#: unpack-trees.c:127 +#: unpack-trees.c:128 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -4152,7 +4156,7 @@ msgstr "" "l'extraction :\n" "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche." -#: unpack-trees.c:129 +#: unpack-trees.c:130 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -4161,7 +4165,7 @@ msgstr "" "Les fichiers suivants non suivis seraient effacés par l'extraction :\n" "%%s" -#: unpack-trees.c:132 +#: unpack-trees.c:133 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -4171,7 +4175,7 @@ msgstr "" "la fusion :\n" "%%sVeuillez renommer ou effacer ces fichiers avant la fusion." -#: unpack-trees.c:134 +#: unpack-trees.c:135 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -4180,7 +4184,7 @@ msgstr "" "Les fichiers suivants non suivis seraient effacés par la fusion :\n" "%%s" -#: unpack-trees.c:137 +#: unpack-trees.c:138 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -4190,7 +4194,7 @@ msgstr "" "%s :\n" "%%sVeuillez renommer ou effacer ces fichiers avant %s." -#: unpack-trees.c:139 +#: unpack-trees.c:140 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -4199,7 +4203,7 @@ msgstr "" "Les fichiers suivants non suivis seraient effacés par %s :\n" "%%s" -#: unpack-trees.c:144 +#: unpack-trees.c:145 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -4210,7 +4214,7 @@ msgstr "" "l'extraction :\n" "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche." -#: unpack-trees.c:146 +#: unpack-trees.c:147 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -4220,7 +4224,7 @@ msgstr "" "Les fichiers suivants non suivis seraient écrasés par l'extraction :\n" "%%s" -#: unpack-trees.c:149 +#: unpack-trees.c:150 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -4230,7 +4234,7 @@ msgstr "" "la fusion :\n" "%%sVeuillez renommer ou effacer ces fichiers avant la fusion." -#: unpack-trees.c:151 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -4239,7 +4243,7 @@ msgstr "" "Les fichiers suivants non suivis seraient écrasés par la fusion :\n" "%%s" -#: unpack-trees.c:154 +#: unpack-trees.c:155 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -4249,7 +4253,7 @@ msgstr "" "%s :\n" "%%sVeuillez renommer ou effacer ces fichiers avant %s." -#: unpack-trees.c:156 +#: unpack-trees.c:157 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -4258,12 +4262,12 @@ msgstr "" "Les fichiers suivants non suivis seraient écrasés par %s :\n" "%%s" -#: unpack-trees.c:163 +#: unpack-trees.c:164 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "L'entrée '%s' surcharge avec '%s'. Affectation impossible." -#: unpack-trees.c:166 +#: unpack-trees.c:167 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" @@ -4273,7 +4277,7 @@ msgstr "" "pas à jour :\n" "%s" -#: unpack-trees.c:168 +#: unpack-trees.c:169 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -4284,7 +4288,7 @@ msgstr "" "jour par l'extraction creuse :\n" "%s" -#: unpack-trees.c:170 +#: unpack-trees.c:171 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -4295,7 +4299,7 @@ msgstr "" "à jour par extraction creuse :\n" "%s" -#: unpack-trees.c:172 +#: unpack-trees.c:173 #, c-format msgid "" "Cannot update submodule:\n" @@ -4304,12 +4308,12 @@ msgstr "" "Mise à jour impossible pour le sous-module :\n" "%s" -#: unpack-trees.c:249 +#: unpack-trees.c:250 #, c-format msgid "Aborting\n" msgstr "Abandon\n" -#: unpack-trees.c:331 +#: unpack-trees.c:332 msgid "Checking out files" msgstr "Extraction des fichiers" @@ -4352,8 +4356,8 @@ msgstr "échec de la lecture de '%s'" msgid "could not open '%s' for reading and writing" msgstr "impossible d'ouvrir '%s' en lecture/écriture" -#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766 -#: builtin/am.c:858 builtin/merge.c:1041 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770 +#: builtin/am.c:862 builtin/merge.c:1043 #, c-format msgid "could not open '%s' for reading" msgstr "impossible d'ouvrir '%s' en lecture" @@ -4367,16 +4371,6 @@ msgstr "impossible d'accéder à '%s'" msgid "unable to get current working directory" msgstr "impossible d'accéder au répertoire de travail courant" -#: wrapper.c:656 -#, c-format -msgid "could not write to %s" -msgstr "Impossible d'écrire dans %s" - -#: wrapper.c:658 -#, c-format -msgid "could not close %s" -msgstr "impossible de fermer %s" - #: wt-status.c:150 msgid "Unmerged paths:" msgstr "Chemins non fusionnés :" @@ -4404,11 +4398,11 @@ msgstr "" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (utilisez \"git rm <fichier>...\" pour marquer comme résolu)" -#: wt-status.c:198 wt-status.c:979 +#: wt-status.c:198 wt-status.c:984 msgid "Changes to be committed:" msgstr "Modifications qui seront validées :" -#: wt-status.c:216 wt-status.c:988 +#: wt-status.c:216 wt-status.c:993 msgid "Changes not staged for commit:" msgstr "Modifications qui ne seront pas validées :" @@ -4513,22 +4507,22 @@ msgstr "contenu modifié, " msgid "untracked content, " msgstr "contenu non suivi, " -#: wt-status.c:819 +#: wt-status.c:824 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "Votre remisage contient actuellement %d entrée" msgstr[1] "Votre remisage contient actuellement %d entrées" -#: wt-status.c:851 +#: wt-status.c:856 msgid "Submodules changed but not updated:" msgstr "Sous-modules modifiés mais non mis à jour :" -#: wt-status.c:853 +#: wt-status.c:858 msgid "Submodule changes to be committed:" msgstr "Changements du sous-module à valider :" -#: wt-status.c:935 +#: wt-status.c:940 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -4536,107 +4530,107 @@ msgstr "" "Ne touchez pas à la ligne ci-dessus.\n" "Tout ce qui suit sera éliminé." -#: wt-status.c:1048 +#: wt-status.c:1053 msgid "You have unmerged paths." msgstr "Vous avez des chemins non fusionnés." -#: wt-status.c:1051 +#: wt-status.c:1056 msgid " (fix conflicts and run \"git commit\")" msgstr " (réglez les conflits puis lancez \"git commit\")" -#: wt-status.c:1053 +#: wt-status.c:1058 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (utilisez \"git merge --abort\" pour annuler la fusion)" -#: wt-status.c:1058 +#: wt-status.c:1063 msgid "All conflicts fixed but you are still merging." msgstr "Tous les conflits sont réglés mais la fusion n'est pas terminée." -#: wt-status.c:1061 +#: wt-status.c:1066 msgid " (use \"git commit\" to conclude merge)" msgstr " (utilisez \"git commit\" pour terminer la fusion)" -#: wt-status.c:1071 +#: wt-status.c:1076 msgid "You are in the middle of an am session." msgstr "Vous êtes au milieu d'une session am." -#: wt-status.c:1074 +#: wt-status.c:1079 msgid "The current patch is empty." msgstr "Le patch actuel est vide." -#: wt-status.c:1078 +#: wt-status.c:1083 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (réglez les conflits puis lancez \"git am --continue\")" -#: wt-status.c:1080 +#: wt-status.c:1085 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (utilisez \"git am --skip\" pour sauter ce patch)" -#: wt-status.c:1082 +#: wt-status.c:1087 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)" -#: wt-status.c:1214 +#: wt-status.c:1219 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo est manquant." -#: wt-status.c:1216 +#: wt-status.c:1221 msgid "No commands done." msgstr "Aucune commande réalisée." -#: wt-status.c:1219 +#: wt-status.c:1224 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Dernière commande effectuée (%d commande effectuée) :" msgstr[1] "Dernières commandes effectuées (%d commandes effectuées) :" -#: wt-status.c:1230 +#: wt-status.c:1235 #, c-format msgid " (see more in file %s)" msgstr " (voir plus dans le fichier %s)" -#: wt-status.c:1235 +#: wt-status.c:1240 msgid "No commands remaining." msgstr "Aucune commande restante." -#: wt-status.c:1238 +#: wt-status.c:1243 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Prochaine commande à effectuer (%d commande restante) :" msgstr[1] "Prochaines commandes à effectuer (%d commandes restantes) :" -#: wt-status.c:1246 +#: wt-status.c:1251 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (utilisez \"git rebase --edit-todo\" pour voir et éditer)" -#: wt-status.c:1259 +#: wt-status.c:1264 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Vous êtes en train de rebaser la branche '%s' sur '%s'." -#: wt-status.c:1264 +#: wt-status.c:1269 msgid "You are currently rebasing." msgstr "Vous êtes en train de rebaser." -#: wt-status.c:1278 +#: wt-status.c:1283 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (réglez les conflits puis lancez \"git rebase --continue\")" -#: wt-status.c:1280 +#: wt-status.c:1285 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (utilisez \"git rebase --skip\" pour sauter ce patch)" -#: wt-status.c:1282 +#: wt-status.c:1287 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (utilisez \"git rebase --abort\" pour extraire la branche d'origine)" -#: wt-status.c:1288 +#: wt-status.c:1293 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (tous les conflits sont réglés : lancez \"git rebase --continue\")" -#: wt-status.c:1292 +#: wt-status.c:1297 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -4644,128 +4638,128 @@ msgstr "" "Vous êtes actuellement en train de fractionner un commit pendant un rebasage " "de la branche '%s' sur '%s'." -#: wt-status.c:1297 +#: wt-status.c:1302 msgid "You are currently splitting a commit during a rebase." msgstr "" "Vous êtes actuellement en train de fractionner un commit pendant un rebasage." -#: wt-status.c:1300 +#: wt-status.c:1305 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Une fois la copie de travail nettoyée, lancez \"git rebase --continue\")" -#: wt-status.c:1304 +#: wt-status.c:1309 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Vous êtes actuellement en train d'éditer un commit pendant un rebasage de la " "branche '%s' sur '%s'." -#: wt-status.c:1309 +#: wt-status.c:1314 msgid "You are currently editing a commit during a rebase." msgstr "" "Vous êtes actuellement en train d'éditer un commit pendant un rebasage." -#: wt-status.c:1312 +#: wt-status.c:1317 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)" -#: wt-status.c:1314 +#: wt-status.c:1319 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (utilisez \"git rebase --continue\" quand vous avez effectué toutes vos " "modifications)" -#: wt-status.c:1324 +#: wt-status.c:1329 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Vous êtes actuellement en train de picorer le commit %s." -#: wt-status.c:1329 +#: wt-status.c:1334 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (réglez les conflits puis lancez \"git cherry-pick --continue\")" -#: wt-status.c:1332 +#: wt-status.c:1337 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (tous les conflits sont réglés : lancez \"git cherry-pick --continue\")" -#: wt-status.c:1334 +#: wt-status.c:1339 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:1343 +#: wt-status.c:1348 #, c-format msgid "You are currently reverting commit %s." msgstr "Vous êtes actuellement en train de rétablir le commit %s." -#: wt-status.c:1348 +#: wt-status.c:1353 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (réglez les conflits puis lancez \"git revert --continue\")" -#: wt-status.c:1351 +#: wt-status.c:1356 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")" -#: wt-status.c:1353 +#: wt-status.c:1358 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)" -#: wt-status.c:1364 +#: wt-status.c:1369 #, 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:1368 +#: wt-status.c:1373 msgid "You are currently bisecting." msgstr "Vous êtes en cours de bissection." -#: wt-status.c:1371 +#: wt-status.c:1376 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:1568 +#: wt-status.c:1573 msgid "On branch " msgstr "Sur la branche " -#: wt-status.c:1574 +#: wt-status.c:1579 msgid "interactive rebase in progress; onto " msgstr "rebasage interactif en cours ; sur " -#: wt-status.c:1576 +#: wt-status.c:1581 msgid "rebase in progress; onto " msgstr "rebasage en cours ; sur " -#: wt-status.c:1581 +#: wt-status.c:1586 msgid "HEAD detached at " msgstr "HEAD détachée sur " -#: wt-status.c:1583 +#: wt-status.c:1588 msgid "HEAD detached from " msgstr "HEAD détachée depuis " -#: wt-status.c:1586 +#: wt-status.c:1591 msgid "Not currently on any branch." msgstr "Actuellement sur aucun branche." -#: wt-status.c:1606 +#: wt-status.c:1611 msgid "Initial commit" msgstr "Validation initiale" -#: wt-status.c:1607 +#: wt-status.c:1612 msgid "No commits yet" msgstr "Aucun commit" -#: wt-status.c:1621 +#: wt-status.c:1626 msgid "Untracked files" msgstr "Fichiers non suivis" -#: wt-status.c:1623 +#: wt-status.c:1628 msgid "Ignored files" msgstr "Fichiers ignorés" -#: wt-status.c:1627 +#: wt-status.c:1632 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -4777,32 +4771,32 @@ msgstr "" "oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help " "status')." -#: wt-status.c:1633 +#: wt-status.c:1638 #, c-format msgid "Untracked files not listed%s" msgstr "Fichiers non suivis non affichés%s" -#: wt-status.c:1635 +#: wt-status.c:1640 msgid " (use -u option to show untracked files)" msgstr " (utilisez -u pour afficher les fichiers non suivis)" -#: wt-status.c:1641 +#: wt-status.c:1646 msgid "No changes" msgstr "Aucune modification" -#: wt-status.c:1646 +#: wt-status.c:1651 #, 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:1649 +#: wt-status.c:1654 #, c-format msgid "no changes added to commit\n" msgstr "aucune modification ajoutée à la validation\n" -#: wt-status.c:1652 +#: wt-status.c:1657 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -4811,62 +4805,62 @@ 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:1655 +#: wt-status.c:1660 #, 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:1658 +#: wt-status.c:1663 #, 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:1661 wt-status.c:1666 +#: wt-status.c:1666 wt-status.c:1671 #, c-format msgid "nothing to commit\n" msgstr "rien à valider\n" -#: wt-status.c:1664 +#: wt-status.c:1669 #, 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:1668 +#: wt-status.c:1673 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "rien à valider, la copie de travail est propre\n" -#: wt-status.c:1780 +#: wt-status.c:1785 msgid "No commits yet on " msgstr "Encore aucun commit sur " -#: wt-status.c:1784 +#: wt-status.c:1789 msgid "HEAD (no branch)" msgstr "HEAD (aucune branche)" -#: wt-status.c:1813 wt-status.c:1821 +#: wt-status.c:1818 wt-status.c:1826 msgid "behind " msgstr "derrière " -#: wt-status.c:1816 wt-status.c:1819 +#: wt-status.c:1821 wt-status.c:1824 msgid "ahead " msgstr "devant " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2311 +#: wt-status.c:2318 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "Impossible de %s : vous avez des modifications non indexées." -#: wt-status.c:2317 +#: wt-status.c:2324 msgid "additionally, your index contains uncommitted changes." msgstr "de plus, votre index contient des modifications non validées." -#: wt-status.c:2319 +#: wt-status.c:2326 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "%s impossible : votre index contient des modifications non validées." @@ -4880,126 +4874,130 @@ msgstr "échec lors de l'unlink de '%s'" msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<options>] [--] <chemin>..." -#: builtin/add.c:82 +#: builtin/add.c:83 #, c-format msgid "unexpected diff status %c" msgstr "état de diff inattendu %c" -#: builtin/add.c:87 builtin/commit.c:291 +#: builtin/add.c:88 builtin/commit.c:291 msgid "updating files failed" msgstr "échec de la mise à jour des fichiers" -#: builtin/add.c:97 +#: builtin/add.c:98 #, c-format msgid "remove '%s'\n" msgstr "suppression de '%s'\n" -#: builtin/add.c:153 +#: builtin/add.c:173 msgid "Unstaged changes after refreshing the index:" msgstr "Modifications non indexées après rafraîchissement de l'index :" -#: builtin/add.c:213 builtin/rev-parse.c:888 +#: builtin/add.c:233 builtin/rev-parse.c:888 msgid "Could not read the index" msgstr "Impossible de lire l'index" -#: builtin/add.c:224 +#: builtin/add.c:244 #, c-format msgid "Could not open '%s' for writing." msgstr "Impossible d'ouvrir '%s' en écriture." -#: builtin/add.c:228 +#: builtin/add.c:248 msgid "Could not write patch" msgstr "Impossible d'écrire le patch" -#: builtin/add.c:231 +#: builtin/add.c:251 msgid "editing patch failed" msgstr "échec de l'édition du patch" -#: builtin/add.c:234 +#: builtin/add.c:254 #, c-format msgid "Could not stat '%s'" msgstr "Stat de '%s' impossible" -#: builtin/add.c:236 +#: builtin/add.c:256 msgid "Empty patch. Aborted." msgstr "Patch vide. Abandon." -#: builtin/add.c:241 +#: builtin/add.c:261 #, c-format msgid "Could not apply '%s'" msgstr "Impossible d'appliquer '%s'" -#: builtin/add.c:251 +#: builtin/add.c:271 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:271 builtin/clean.c:910 builtin/fetch.c:132 builtin/mv.c:124 -#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529 +#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124 +#: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541 #: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164 msgid "dry run" msgstr "simuler l'action" -#: builtin/add.c:274 +#: builtin/add.c:294 msgid "interactive picking" msgstr "sélection interactive" -#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310 +#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310 msgid "select hunks interactively" msgstr "sélection interactive des sections" -#: builtin/add.c:276 +#: builtin/add.c:296 msgid "edit current diff and apply" msgstr "édition du diff actuel et application" -#: builtin/add.c:277 +#: builtin/add.c:297 msgid "allow adding otherwise ignored files" msgstr "permettre l'ajout de fichiers ignorés" -#: builtin/add.c:278 +#: builtin/add.c:298 msgid "update tracked files" msgstr "mettre à jour les fichiers suivis" -#: builtin/add.c:279 +#: builtin/add.c:299 +msgid "renormalize EOL of tracked files (implies -u)" +msgstr "renormaliser les fins de lignes (EOL) des fichiers suivis (implique -u)" + +#: builtin/add.c:300 msgid "record only the fact that the path will be added later" msgstr "enregistrer seulement le fait que le chemin sera ajouté plus tard" -#: builtin/add.c:280 +#: builtin/add.c:301 msgid "add changes from all tracked and untracked files" msgstr "ajouter les modifications de tous les fichiers suivis et non suivis" -#: builtin/add.c:283 +#: builtin/add.c:304 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" "ignorer les chemins effacés dans la copie de travail (identique à --no-all)" -#: builtin/add.c:285 +#: builtin/add.c:306 msgid "don't add, only refresh the index" msgstr "ne pas ajouter, juste rafraîchir l'index" -#: builtin/add.c:286 +#: builtin/add.c:307 msgid "just skip files which cannot be added because of errors" msgstr "" "sauter seulement les fichiers qui ne peuvent pas être ajoutés du fait " "d'erreurs" -#: builtin/add.c:287 +#: builtin/add.c:308 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:288 builtin/update-index.c:954 +#: builtin/add.c:309 builtin/update-index.c:964 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/add.c:288 builtin/update-index.c:955 +#: builtin/add.c:309 builtin/update-index.c:965 msgid "override the executable bit of the listed files" msgstr "outrepasser le bit exécutable pour les fichiers listés" -#: builtin/add.c:290 +#: builtin/add.c:311 msgid "warn when adding an embedded repository" msgstr "avertir lors de l'ajout d'un dépôt embarqué" -#: builtin/add.c:305 +#: builtin/add.c:326 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -5030,48 +5028,48 @@ msgstr "" "\n" "Référez-vous à \"git help submodule\" pour plus d'information." -#: builtin/add.c:333 +#: builtin/add.c:354 #, c-format msgid "adding embedded git repository: %s" msgstr "dépôt git embarqué ajouté : %s" -#: builtin/add.c:351 +#: builtin/add.c:372 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Utilisez -f si vous voulez réellement les ajouter.\n" -#: builtin/add.c:359 +#: builtin/add.c:380 msgid "adding files failed" msgstr "échec de l'ajout de fichiers" -#: builtin/add.c:396 +#: builtin/add.c:417 msgid "-A and -u are mutually incompatible" msgstr "-A et -u sont mutuellement incompatibles" -#: builtin/add.c:403 +#: builtin/add.c:424 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" "L'option --ignore-missing ne peut être utilisée qu'en complément de --dry-run" -#: builtin/add.c:407 +#: builtin/add.c:428 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "Le paramètre '%s' de --chmod doit être soit -x soit +x" -#: builtin/add.c:422 +#: builtin/add.c:443 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Rien de spécifié, rien n'a été ajouté.\n" -#: builtin/add.c:423 +#: builtin/add.c:444 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Vous vouliez sûrement dire 'git add .' ?\n" -#: builtin/add.c:428 builtin/check-ignore.c:176 builtin/checkout.c:282 -#: builtin/checkout.c:479 builtin/clean.c:957 builtin/commit.c:350 -#: builtin/mv.c:143 builtin/reset.c:249 builtin/rm.c:271 -#: builtin/submodule--helper.c:243 +#: builtin/add.c:449 builtin/check-ignore.c:176 builtin/checkout.c:281 +#: builtin/checkout.c:484 builtin/clean.c:958 builtin/commit.c:350 +#: builtin/diff-tree.c:114 builtin/mv.c:143 builtin/reset.c:249 +#: builtin/rm.c:271 builtin/submodule--helper.c:311 msgid "index file corrupt" msgstr "fichier d'index corrompu" @@ -5098,87 +5096,87 @@ msgstr "Impossible de copier les notes de '%s' vers '%s'" msgid "fseek failed" msgstr "échec de fseek" -#: builtin/am.c:786 +#: builtin/am.c:790 #, c-format msgid "could not parse patch '%s'" msgstr "impossible d'analyser le patch '%s'" -#: builtin/am.c:851 +#: builtin/am.c:855 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:899 +#: builtin/am.c:903 msgid "invalid timestamp" msgstr "horodatage invalide" -#: builtin/am.c:904 builtin/am.c:916 +#: builtin/am.c:908 builtin/am.c:920 msgid "invalid Date line" msgstr "ligne de Date invalide" -#: builtin/am.c:911 +#: builtin/am.c:915 msgid "invalid timezone offset" msgstr "décalage horaire invalide" -#: builtin/am.c:1004 +#: builtin/am.c:1008 msgid "Patch format detection failed." msgstr "Échec de détection du format du patch." -#: builtin/am.c:1009 builtin/clone.c:402 +#: builtin/am.c:1013 builtin/clone.c:402 #, c-format msgid "failed to create directory '%s'" msgstr "échec de la création du répertoire '%s'" -#: builtin/am.c:1013 +#: builtin/am.c:1017 msgid "Failed to split patches." msgstr "Échec de découpage des patchs." -#: builtin/am.c:1142 builtin/commit.c:376 +#: builtin/am.c:1146 builtin/commit.c:376 msgid "unable to write index file" msgstr "impossible d'écrire le fichier d'index" -#: builtin/am.c:1193 +#: builtin/am.c:1197 #, 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:1194 +#: builtin/am.c:1198 #, 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:1195 +#: builtin/am.c:1199 #, 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:1302 +#: builtin/am.c:1306 msgid "Patch is empty." msgstr "Le patch actuel est vide." -#: builtin/am.c:1368 +#: builtin/am.c:1372 #, c-format msgid "invalid ident line: %.*s" msgstr "ligne d'identification invalide : %.*s" -#: builtin/am.c:1390 +#: builtin/am.c:1394 #, c-format msgid "unable to parse commit %s" msgstr "impossible d'analyser le commit %s" -#: builtin/am.c:1584 +#: builtin/am.c:1587 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:1586 +#: builtin/am.c:1589 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:1605 +#: builtin/am.c:1608 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -5186,38 +5184,38 @@ msgstr "" "Avez-vous édité le patch à la main ?\n" "Il ne s'applique pas aux blobs enregistrés dans son index." -#: builtin/am.c:1611 +#: builtin/am.c:1614 msgid "Falling back to patching base and 3-way merge..." msgstr "Retour à un patch de la base et fusion à 3 points..." -#: builtin/am.c:1636 +#: builtin/am.c:1639 msgid "Failed to merge in the changes." msgstr "Échec d'intégration des modifications." -#: builtin/am.c:1660 builtin/merge.c:641 +#: builtin/am.c:1663 builtin/merge.c:642 msgid "git write-tree failed to write a tree" msgstr "git write-tree a échoué à écrire un arbre" -#: builtin/am.c:1667 +#: builtin/am.c:1670 msgid "applying to an empty history" msgstr "application à un historique vide" -#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824 -#: builtin/merge.c:849 +#: builtin/am.c:1683 builtin/commit.c:1798 builtin/merge.c:825 +#: builtin/merge.c:850 msgid "failed to write commit object" msgstr "échec de l'écriture de l'objet commit" -#: builtin/am.c:1713 builtin/am.c:1717 +#: builtin/am.c:1716 builtin/am.c:1720 #, c-format msgid "cannot resume: %s does not exist." msgstr "impossible de continuer : %s n'existe pas." -#: builtin/am.c:1733 +#: builtin/am.c:1736 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "impossible d'être interactif sans entrée standard connectée à un terminal." -#: builtin/am.c:1738 +#: builtin/am.c:1741 msgid "Commit Body is:" msgstr "Le corps de la validation est :" @@ -5225,35 +5223,35 @@ msgstr "Le corps de la validation est :" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1748 +#: builtin/am.c:1751 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:1798 +#: builtin/am.c:1801 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)" -#: builtin/am.c:1838 builtin/am.c:1910 +#: builtin/am.c:1841 builtin/am.c:1913 #, c-format msgid "Applying: %.*s" msgstr "Application de %.*s" -#: builtin/am.c:1854 +#: builtin/am.c:1857 msgid "No changes -- Patch already applied." msgstr "Pas de changement -- Patch déjà appliqué." -#: builtin/am.c:1862 +#: builtin/am.c:1865 #, c-format msgid "Patch failed at %s %.*s" msgstr "le patch a échoué à %s %.*s" -#: builtin/am.c:1868 +#: builtin/am.c:1871 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "La copie du patch qui a échoué se trouve dans : %s" -#: builtin/am.c:1913 +#: builtin/am.c:1916 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -5264,7 +5262,7 @@ msgstr "" "introduit les mêmes changements ; vous pourriez avoir envie de sauter ce " "patch." -#: builtin/am.c:1920 +#: builtin/am.c:1923 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -5277,17 +5275,17 @@ msgstr "" "Vous pouvez lancer 'git rm' sur un fichier \"supprimé par eux\" pour " "accepter son état." -#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332 +#: builtin/am.c:2030 builtin/am.c:2034 builtin/am.c:2046 builtin/reset.c:332 #: builtin/reset.c:340 #, c-format msgid "Could not parse object '%s'." msgstr "Impossible d'analyser l'objet '%s'." -#: builtin/am.c:2081 +#: builtin/am.c:2082 msgid "failed to clean index" msgstr "échec du nettoyage de l'index" -#: builtin/am.c:2116 +#: builtin/am.c:2117 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -5295,135 +5293,135 @@ msgstr "" "Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n" "Pas de retour à ORIG_HEAD" -#: builtin/am.c:2179 +#: builtin/am.c:2180 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valeur invalide pour --patch-format : %s" -#: builtin/am.c:2212 +#: builtin/am.c:2213 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<options>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2213 +#: builtin/am.c:2214 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<options>] (--continue | --quit | --abort)" -#: builtin/am.c:2219 +#: builtin/am.c:2220 msgid "run interactively" msgstr "exécution interactive" -#: builtin/am.c:2221 +#: builtin/am.c:2222 msgid "historical option -- no-op" msgstr "option historique -- no-op" -#: builtin/am.c:2223 +#: builtin/am.c:2224 msgid "allow fall back on 3way merging if needed" msgstr "permettre de revenir à une fusion à 3 points si nécessaire" -#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57 +#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57 #: builtin/repack.c:180 msgid "be quiet" msgstr "être silencieux" -#: builtin/am.c:2226 +#: builtin/am.c:2227 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:2229 +#: builtin/am.c:2230 msgid "recode into utf8 (default)" msgstr "recoder en utf-8 (par défaut)" -#: builtin/am.c:2231 +#: builtin/am.c:2232 msgid "pass -k flag to git-mailinfo" msgstr "passer l'option -k à git-mailinfo" -#: builtin/am.c:2233 +#: builtin/am.c:2234 msgid "pass -b flag to git-mailinfo" msgstr "passer l'option -b à git-mailinfo" -#: builtin/am.c:2235 +#: builtin/am.c:2236 msgid "pass -m flag to git-mailinfo" msgstr "passer l'option -m à git-mailinfo" -#: builtin/am.c:2237 +#: builtin/am.c:2238 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:2240 +#: builtin/am.c:2241 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:2243 +#: builtin/am.c:2244 msgid "strip everything before a scissors line" msgstr "retirer tout le contenu avant la ligne des ciseaux" -#: builtin/am.c:2245 builtin/am.c:2248 builtin/am.c:2251 builtin/am.c:2254 -#: builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263 builtin/am.c:2266 -#: builtin/am.c:2272 +#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255 +#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 +#: builtin/am.c:2273 msgid "pass it through git-apply" msgstr "le passer jusqu'à git-apply" -#: builtin/am.c:2262 builtin/fmt-merge-msg.c:664 builtin/fmt-merge-msg.c:667 -#: builtin/grep.c:843 builtin/merge.c:205 builtin/pull.c:142 builtin/pull.c:197 +#: builtin/am.c:2263 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668 +#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203 #: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195 #: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377 #: parse-options.h:132 parse-options.h:134 parse-options.h:245 msgid "n" msgstr "n" -#: builtin/am.c:2268 builtin/branch.c:622 builtin/for-each-ref.c:38 +#: builtin/am.c:2269 builtin/branch.c:629 builtin/for-each-ref.c:38 #: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39 msgid "format" msgstr "format" -#: builtin/am.c:2269 +#: builtin/am.c:2270 msgid "format the patch(es) are in" msgstr "format de présentation des patchs" -#: builtin/am.c:2275 +#: builtin/am.c:2276 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:2277 +#: builtin/am.c:2278 msgid "continue applying patches after resolving a conflict" msgstr "continuer à appliquer les patchs après résolution d'un conflit" -#: builtin/am.c:2280 +#: builtin/am.c:2281 msgid "synonyms for --continue" msgstr "synonymes de --continue" -#: builtin/am.c:2283 +#: builtin/am.c:2284 msgid "skip the current patch" msgstr "sauter le patch courant" -#: builtin/am.c:2286 +#: builtin/am.c:2287 msgid "restore the original branch and abort the patching operation." msgstr "" "restaurer la branche originale et abandonner les applications de patch." -#: builtin/am.c:2290 +#: builtin/am.c:2291 msgid "lie about committer date" msgstr "mentir sur la date de validation" -#: builtin/am.c:2292 +#: builtin/am.c:2293 msgid "use current timestamp for author date" msgstr "utiliser l'horodatage actuel pour la date d'auteur" -#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236 -#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392 +#: builtin/am.c:2295 builtin/commit.c:1636 builtin/merge.c:236 +#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392 msgid "key-id" msgstr "id-clé" -#: builtin/am.c:2295 +#: builtin/am.c:2296 msgid "GPG-sign commits" msgstr "signer les commits avec GPG" -#: builtin/am.c:2298 +#: builtin/am.c:2299 msgid "(internal use for git-rebase)" msgstr "(utilisation interne pour git-rebase)" -#: builtin/am.c:2316 +#: builtin/am.c:2317 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." @@ -5431,17 +5429,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:2323 +#: builtin/am.c:2324 msgid "failed to read the index" msgstr "échec à la lecture de l'index" -#: builtin/am.c:2338 +#: builtin/am.c:2339 #, 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:2362 +#: builtin/am.c:2363 #, c-format msgid "" "Stray %s directory found.\n" @@ -5450,7 +5448,7 @@ msgstr "" "Répertoire abandonné %s trouvé.\n" "Utilisez \"git am --abort\" pour le supprimer." -#: builtin/am.c:2368 +#: builtin/am.c:2369 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 " @@ -5490,21 +5488,72 @@ msgstr "git archive : erreur de protocole" msgid "git archive: expected a flush" msgstr "git archive : vidage attendu" -#: builtin/bisect--helper.c:7 +#: builtin/bisect--helper.c:12 msgid "git bisect--helper --next-all [--no-checkout]" msgstr "git bisect --helper --next-all [--no-checkout]" -#: builtin/bisect--helper.c:17 +#: builtin/bisect--helper.c:13 +msgid "git bisect--helper --write-terms <bad_term> <good_term>" +msgstr "git bisect--helper --write-terms <terme-pour-mauvais> <terme-pour-bon>" + +#: builtin/bisect--helper.c:14 +msgid "git bisect--helper --bisect-clean-state" +msgstr "git bisect--helper --bisect-clean-state" + +#: builtin/bisect--helper.c:46 +#, c-format +msgid "'%s' is not a valid term" +msgstr "'%s' n'est pas un terme valide" + +#: builtin/bisect--helper.c:50 +#, c-format +msgid "can't use the builtin command '%s' as a term" +msgstr "impossible d'utiliser la commande incluse '%s' comme terme" + +#: builtin/bisect--helper.c:60 +#, c-format +msgid "can't change the meaning of the term '%s'" +msgstr "impossible de modifier la signification du terme '%s'" + +#: builtin/bisect--helper.c:71 +msgid "please use two different terms" +msgstr "veuillez utiliser deux termes différents" + +#: builtin/bisect--helper.c:78 +msgid "could not open the file BISECT_TERMS" +msgstr "impossible d'ouvrir le fichier BISECT_TERMS" + +#: builtin/bisect--helper.c:120 msgid "perform 'git bisect next'" msgstr "effectuer 'git bisect next'" -#: builtin/bisect--helper.c:19 +#: builtin/bisect--helper.c:122 +msgid "write the terms to .git/BISECT_TERMS" +msgstr "écrire les termes dans .git/BISECT_TERMS" + +#: builtin/bisect--helper.c:124 +msgid "cleanup the bisection state" +msgstr "vérifier l'état de la bissection" + +#: builtin/bisect--helper.c:126 +msgid "check for expected revs" +msgstr "vérifier si des révisions sont attendues" + +#: builtin/bisect--helper.c:128 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "mettre à jour BISECT_HEAD au lieu d'extraire le commit actuel" +#: builtin/bisect--helper.c:143 +msgid "--write-terms requires two arguments" +msgstr "--write-terms exige deux arguments" + +#: builtin/bisect--helper.c:147 +msgid "--bisect-clean-state requires no arguments" +msgstr "--bisect-clean-state ne supporte aucun argument" + #: builtin/blame.c:27 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" -msgstr "git blame [<options>] [<options-de-révision>] [<rev>] [--] <fichier>" +msgstr "git blame [<options>] [<rev-opts>] [<rev>] [--] <fichier>" #: builtin/blame.c:32 msgid "<rev-opts> are documented in git-rev-list(1)" @@ -5768,55 +5817,55 @@ msgstr "La branche %s est en cours de rebasage sur %s" msgid "Branch %s is being bisected at %s" msgstr "La branche %s est en cours de bissection sur %s" -#: builtin/branch.c:470 +#: builtin/branch.c:471 msgid "cannot copy the current branch while not on any." msgstr "impossible de copier la branche actuelle, il n'y en a pas." -#: builtin/branch.c:472 +#: builtin/branch.c:473 msgid "cannot rename the current branch while not on any." msgstr "impossible de renommer la branche actuelle, il n'y en a pas." -#: builtin/branch.c:483 +#: builtin/branch.c:484 #, c-format msgid "Invalid branch name: '%s'" msgstr "Nom de branche invalide : '%s'" -#: builtin/branch.c:504 +#: builtin/branch.c:511 msgid "Branch rename failed" msgstr "Échec de renommage de la branche" -#: builtin/branch.c:506 +#: builtin/branch.c:513 msgid "Branch copy failed" msgstr "Échec de copie de la branche" -#: builtin/branch.c:510 +#: builtin/branch.c:517 #, c-format -msgid "Copied a misnamed branch '%s' away" -msgstr "Copie d'une branche mal nommée '%s'" +msgid "Created a copy of a misnamed branch '%s'" +msgstr "Création d'une copie d'une branche mal nommée '%s'" -#: builtin/branch.c:513 +#: builtin/branch.c:520 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Renommage d'une branche mal nommée '%s'" -#: builtin/branch.c:519 +#: builtin/branch.c:526 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "La branche a été renommée en %s, mais HEAD n'est pas mise à jour !" -#: builtin/branch.c:528 +#: builtin/branch.c:535 msgid "Branch is renamed, but update of config-file failed" msgstr "" "La branche est renommée, mais la mise à jour du fichier de configuration a " "échoué" -#: builtin/branch.c:530 +#: builtin/branch.c:537 msgid "Branch is copied, but update of config-file failed" msgstr "" "La branche est copiée, mais la mise à jour du fichier de configuration a " "échoué" -#: builtin/branch.c:546 +#: builtin/branch.c:553 #, c-format msgid "" "Please edit the description for the branch\n" @@ -5827,184 +5876,184 @@ msgstr "" " %s\n" "Les lignes commençant par '%c' seront ignorées.\n" -#: builtin/branch.c:579 +#: builtin/branch.c:586 msgid "Generic options" msgstr "Options génériques" -#: builtin/branch.c:581 +#: builtin/branch.c:588 msgid "show hash and subject, give twice for upstream branch" msgstr "afficher le hachage et le sujet, doublé pour la branche amont" -#: builtin/branch.c:582 +#: builtin/branch.c:589 msgid "suppress informational messages" msgstr "supprimer les messages d'information" -#: builtin/branch.c:583 +#: builtin/branch.c:590 msgid "set up tracking mode (see git-pull(1))" msgstr "régler le mode de suivi (voir git-pull(1))" -#: builtin/branch.c:585 +#: builtin/branch.c:592 msgid "do not use" msgstr "ne pas utiliser" -#: builtin/branch.c:587 +#: builtin/branch.c:594 msgid "upstream" msgstr "amont" -#: builtin/branch.c:587 +#: builtin/branch.c:594 msgid "change the upstream info" msgstr "modifier l'information amont" -#: builtin/branch.c:588 +#: builtin/branch.c:595 msgid "Unset the upstream info" msgstr "Désactiver l'information amont" -#: builtin/branch.c:589 +#: builtin/branch.c:596 msgid "use colored output" msgstr "utiliser la coloration dans la sortie" -#: builtin/branch.c:590 +#: builtin/branch.c:597 msgid "act on remote-tracking branches" msgstr "agir sur les branches de suivi distantes" -#: builtin/branch.c:592 builtin/branch.c:594 +#: builtin/branch.c:599 builtin/branch.c:601 msgid "print only branches that contain the commit" msgstr "afficher seulement les branches qui contiennent le commit" -#: builtin/branch.c:593 builtin/branch.c:595 +#: builtin/branch.c:600 builtin/branch.c:602 msgid "print only branches that don't contain the commit" msgstr "afficher seulement les branches qui ne contiennent pas le commit" -#: builtin/branch.c:598 +#: builtin/branch.c:605 msgid "Specific git-branch actions:" msgstr "Actions spécifiques à git-branch :" -#: builtin/branch.c:599 +#: builtin/branch.c:606 msgid "list both remote-tracking and local branches" msgstr "afficher à la fois les branches de suivi et les branches locales" -#: builtin/branch.c:601 +#: builtin/branch.c:608 msgid "delete fully merged branch" msgstr "supprimer une branche totalement fusionnée" -#: builtin/branch.c:602 +#: builtin/branch.c:609 msgid "delete branch (even if not merged)" msgstr "supprimer une branche (même non fusionnée)" -#: builtin/branch.c:603 +#: builtin/branch.c:610 msgid "move/rename a branch and its reflog" msgstr "déplacer/renommer une branche et son reflog" -#: builtin/branch.c:604 +#: builtin/branch.c:611 msgid "move/rename a branch, even if target exists" msgstr "déplacer/renommer une branche, même si la cible existe" -#: builtin/branch.c:605 +#: builtin/branch.c:612 msgid "copy a branch and its reflog" msgstr "copier une branche et son reflog" -#: builtin/branch.c:606 +#: builtin/branch.c:613 msgid "copy a branch, even if target exists" msgstr "copier une branche, même si la cible existe" -#: builtin/branch.c:607 +#: builtin/branch.c:614 msgid "list branch names" msgstr "afficher les noms des branches" -#: builtin/branch.c:608 +#: builtin/branch.c:615 msgid "create the branch's reflog" msgstr "créer le reflog de la branche" -#: builtin/branch.c:610 +#: builtin/branch.c:617 msgid "edit the description for the branch" msgstr "éditer la description de la branche" -#: builtin/branch.c:611 +#: builtin/branch.c:618 msgid "force creation, move/rename, deletion" msgstr "forcer la création, le déplacement/renommage, ou la suppression" -#: builtin/branch.c:612 +#: builtin/branch.c:619 msgid "print only branches that are merged" msgstr "afficher seulement les branches qui sont fusionnées" -#: builtin/branch.c:613 +#: builtin/branch.c:620 msgid "print only branches that are not merged" msgstr "afficher seulement les branches qui ne sont pas fusionnées" -#: builtin/branch.c:614 +#: builtin/branch.c:621 msgid "list branches in columns" msgstr "afficher les branches en colonnes" -#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405 +#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405 msgid "key" msgstr "clé" -#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406 +#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406 msgid "field name to sort on" msgstr "nom du champ servant à trier" -#: builtin/branch.c:618 builtin/for-each-ref.c:43 builtin/notes.c:408 +#: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408 #: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574 #: builtin/tag.c:408 msgid "object" msgstr "objet" -#: builtin/branch.c:619 +#: builtin/branch.c:626 msgid "print only branches of the object" msgstr "afficher seulement les branches de l'objet" -#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415 +#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415 msgid "sorting and filtering are case insensitive" msgstr "le tri et le filtrage sont non-sensibles à la casse" -#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413 +#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413 #: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "format à utiliser pour la sortie" -#: builtin/branch.c:645 builtin/clone.c:729 +#: builtin/branch.c:652 builtin/clone.c:730 msgid "HEAD not found below refs/heads!" msgstr "HEAD non trouvée sous refs/heads !" -#: builtin/branch.c:668 +#: builtin/branch.c:675 msgid "--column and --verbose are incompatible" msgstr "--column et --verbose sont incompatibles" -#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741 +#: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751 msgid "branch name required" msgstr "le nom de branche est requis" -#: builtin/branch.c:708 +#: builtin/branch.c:718 msgid "Cannot give description to detached HEAD" msgstr "Impossible de décrire une HEAD détachée" -#: builtin/branch.c:713 +#: builtin/branch.c:723 msgid "cannot edit description of more than one branch" msgstr "impossible d'éditer la description de plus d'une branche" -#: builtin/branch.c:720 +#: builtin/branch.c:730 #, c-format msgid "No commit on branch '%s' yet." msgstr "Aucun commit sur la branche '%s'." -#: builtin/branch.c:723 +#: builtin/branch.c:733 #, c-format msgid "No branch named '%s'." msgstr "Aucune branche nommée '%s'." -#: builtin/branch.c:738 +#: builtin/branch.c:748 msgid "too many branches for a copy operation" msgstr "trop de branches pour une opération de copie" -#: builtin/branch.c:747 +#: builtin/branch.c:757 msgid "too many arguments for a rename operation" msgstr "trop d'arguments pour une opération de renommage" -#: builtin/branch.c:752 +#: builtin/branch.c:762 msgid "too many arguments to set new upstream" msgstr "trop d'arguments pour spécifier une branche amont" -#: builtin/branch.c:756 +#: builtin/branch.c:766 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -6012,41 +6061,37 @@ msgstr "" "impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur " "aucune branche." -#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800 +#: builtin/branch.c:769 builtin/branch.c:791 builtin/branch.c:807 #, c-format msgid "no such branch '%s'" msgstr "pas de branche '%s'" -#: builtin/branch.c:763 +#: builtin/branch.c:773 #, c-format msgid "branch '%s' does not exist" msgstr "la branche '%s' n'existe pas" -#: builtin/branch.c:775 +#: builtin/branch.c:785 msgid "too many arguments to unset upstream" msgstr "trop d'arguments pour désactiver un amont" -#: builtin/branch.c:779 +#: builtin/branch.c:789 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "impossible de désactiver une branche amont de HEAD quand elle ne pointe sur " "aucune branche." -#: builtin/branch.c:785 +#: builtin/branch.c:795 #, c-format msgid "Branch '%s' has no upstream information" msgstr "La branche '%s' n'a aucune information de branche amont" -#: builtin/branch.c:797 -msgid "it does not make sense to create 'HEAD' manually" -msgstr "créer manuellement 'HEAD' n'a pas de sens" - -#: builtin/branch.c:803 +#: builtin/branch.c:810 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "les options -a et -r de 'git branch' n'ont pas de sens avec un nom de branche" -#: builtin/branch.c:806 +#: builtin/branch.c:813 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -6111,7 +6156,7 @@ msgstr "pour les objets blob, lancer textconv sur le contenu de l'objet" 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:569 git-submodule.sh:943 +#: builtin/cat-file.c:569 git-submodule.sh:931 msgid "blob" msgstr "blob" @@ -6171,7 +6216,7 @@ 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:20 builtin/checkout.c:1153 builtin/gc.c:358 +#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358 msgid "suppress progress reporting" msgstr "supprimer l'état d'avancement" @@ -6228,164 +6273,164 @@ msgstr "aucun contact spécifié" msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [<options>] [--] [<fichier>...]" -#: builtin/checkout-index.c:145 +#: builtin/checkout-index.c:143 msgid "stage should be between 1 and 3 or all" msgstr "stage doit valoir entre 1 et 3, ou all" -#: builtin/checkout-index.c:161 +#: builtin/checkout-index.c:159 msgid "check out all files in the index" msgstr "extraire tous les fichiers présents dans l'index" -#: builtin/checkout-index.c:162 +#: builtin/checkout-index.c:160 msgid "force overwrite of existing files" msgstr "forcer l'écrasement des fichiers existants" -#: builtin/checkout-index.c:164 +#: builtin/checkout-index.c:162 msgid "no warning for existing files and files not in index" msgstr "" "pas d'avertissement pour les fichiers existants et les fichiers absents de " "l'index" -#: builtin/checkout-index.c:166 +#: builtin/checkout-index.c:164 msgid "don't checkout new files" msgstr "ne pas extraire les nouveaux fichiers" -#: builtin/checkout-index.c:168 +#: builtin/checkout-index.c:166 msgid "update stat information in the index file" msgstr "mettre à jour l'information de stat dans le fichier d'index" -#: builtin/checkout-index.c:172 +#: builtin/checkout-index.c:170 msgid "read list of paths from the standard input" msgstr "lire la liste des chemins depuis l'entrée standard" -#: builtin/checkout-index.c:174 +#: builtin/checkout-index.c:172 msgid "write the content to temporary files" msgstr "écrire le contenu dans des fichiers temporaires" -#: builtin/checkout-index.c:175 builtin/column.c:31 -#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631 -#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999 -#: builtin/worktree.c:498 +#: builtin/checkout-index.c:173 builtin/column.c:31 +#: builtin/submodule--helper.c:866 builtin/submodule--helper.c:869 +#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1237 +#: builtin/worktree.c:552 msgid "string" msgstr "chaîne" -#: builtin/checkout-index.c:176 +#: builtin/checkout-index.c:174 msgid "when creating files, prepend <string>" msgstr "lors de la création de fichiers, préfixer par <chaîne>" -#: builtin/checkout-index.c:178 +#: builtin/checkout-index.c:176 msgid "copy out the files from named stage" msgstr "copier les fichiers depuis l'index nommé" -#: builtin/checkout.c:26 +#: builtin/checkout.c:27 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<options>] <branche>" -#: builtin/checkout.c:27 +#: builtin/checkout.c:28 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<options>] [<branche>] -- <fichier>..." -#: builtin/checkout.c:135 builtin/checkout.c:168 +#: builtin/checkout.c:136 builtin/checkout.c:169 #, c-format msgid "path '%s' does not have our version" msgstr "le chemin '%s' n'a pas notre version" -#: builtin/checkout.c:137 builtin/checkout.c:170 +#: builtin/checkout.c:138 builtin/checkout.c:171 #, c-format msgid "path '%s' does not have their version" msgstr "le chemin '%s' n'a pas leur version" -#: builtin/checkout.c:153 +#: builtin/checkout.c:154 #, 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:197 +#: builtin/checkout.c:198 #, c-format msgid "path '%s' does not have necessary versions" msgstr "le chemin '%s' n'a pas les versions nécessaires" -#: builtin/checkout.c:214 +#: builtin/checkout.c:215 #, c-format msgid "path '%s': cannot merge" msgstr "chemin '%s' : impossible de fusionner" -#: builtin/checkout.c:231 +#: builtin/checkout.c:232 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Impossible d'ajouter le résultat de fusion pour '%s'" -#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259 -#: builtin/checkout.c:262 +#: builtin/checkout.c:254 builtin/checkout.c:257 builtin/checkout.c:260 +#: builtin/checkout.c:263 #, 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:265 builtin/checkout.c:268 +#: builtin/checkout.c:266 builtin/checkout.c:269 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' ne peut pas être utilisé avec %s" -#: builtin/checkout.c:271 +#: builtin/checkout.c:272 #, 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:342 builtin/checkout.c:349 +#: builtin/checkout.c:341 builtin/checkout.c:348 #, c-format msgid "path '%s' is unmerged" msgstr "le chemin '%s' n'est pas fusionné" -#: builtin/checkout.c:501 +#: builtin/checkout.c:506 msgid "you need to resolve your current index first" msgstr "vous devez d'abord résoudre votre index courant" -#: builtin/checkout.c:632 +#: builtin/checkout.c:637 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Impossible de faire un reflog pour '%s' : %s\n" -#: builtin/checkout.c:673 +#: builtin/checkout.c:678 msgid "HEAD is now at" msgstr "HEAD est maintenant sur" -#: builtin/checkout.c:677 builtin/clone.c:683 +#: builtin/checkout.c:682 builtin/clone.c:684 msgid "unable to update HEAD" msgstr "impossible de mettre à jour HEAD" -#: builtin/checkout.c:681 +#: builtin/checkout.c:686 #, c-format msgid "Reset branch '%s'\n" msgstr "Remise à zéro de la branche '%s'\n" -#: builtin/checkout.c:684 +#: builtin/checkout.c:689 #, c-format msgid "Already on '%s'\n" msgstr "Déjà sur '%s'\n" -#: builtin/checkout.c:688 +#: builtin/checkout.c:693 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Basculement et remise à zéro de la branche '%s'\n" -#: builtin/checkout.c:690 builtin/checkout.c:1086 +#: builtin/checkout.c:695 builtin/checkout.c:1051 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Basculement sur la nouvelle branche '%s'\n" -#: builtin/checkout.c:692 +#: builtin/checkout.c:697 #, c-format msgid "Switched to branch '%s'\n" msgstr "Basculement sur la branche '%s'\n" -#: builtin/checkout.c:743 +#: builtin/checkout.c:748 #, c-format msgid " ... and %d more.\n" msgstr " ... et %d en plus.\n" -#: builtin/checkout.c:749 +#: builtin/checkout.c:754 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -6408,7 +6453,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:768 +#: builtin/checkout.c:773 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -6437,162 +6482,162 @@ msgstr[1] "" "git branch <nouvelle-branche> %s\n" "\n" -#: builtin/checkout.c:809 +#: builtin/checkout.c:814 msgid "internal error in revision walk" msgstr "erreur interne lors du parcours des révisions" -#: builtin/checkout.c:813 +#: builtin/checkout.c:818 msgid "Previous HEAD position was" msgstr "La position précédente de HEAD était sur" -#: builtin/checkout.c:843 builtin/checkout.c:1081 +#: builtin/checkout.c:848 builtin/checkout.c:1046 msgid "You are on a branch yet to be born" msgstr "Vous êtes sur une branche qui doit encore naître" -#: builtin/checkout.c:987 +#: builtin/checkout.c:952 #, c-format msgid "only one reference expected, %d given." msgstr "une seule référence attendue, %d fournies." -#: builtin/checkout.c:1027 builtin/worktree.c:233 +#: builtin/checkout.c:992 builtin/worktree.c:247 #, c-format msgid "invalid reference: %s" msgstr "référence invalide : %s" -#: builtin/checkout.c:1056 +#: builtin/checkout.c:1021 #, c-format msgid "reference is not a tree: %s" msgstr "la référence n'est pas un arbre : %s" -#: builtin/checkout.c:1095 +#: builtin/checkout.c:1060 msgid "paths cannot be used with switching branches" msgstr "impossible d'utiliser des chemins avec un basculement de branches" -#: builtin/checkout.c:1098 builtin/checkout.c:1102 +#: builtin/checkout.c:1063 builtin/checkout.c:1067 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' ne peut pas être utilisé avec un basculement de branches" -#: builtin/checkout.c:1106 builtin/checkout.c:1109 builtin/checkout.c:1114 -#: builtin/checkout.c:1117 +#: builtin/checkout.c:1071 builtin/checkout.c:1074 builtin/checkout.c:1079 +#: builtin/checkout.c:1082 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' ne peut pas être utilisé avec '%s'" -#: builtin/checkout.c:1122 +#: builtin/checkout.c:1087 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Impossible de basculer de branche vers '%s' qui n'est pas un commit" -#: builtin/checkout.c:1154 builtin/checkout.c:1156 builtin/clone.c:114 -#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:346 -#: builtin/worktree.c:348 +#: builtin/checkout.c:1119 builtin/checkout.c:1121 builtin/clone.c:114 +#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:369 +#: builtin/worktree.c:371 msgid "branch" msgstr "branche" -#: builtin/checkout.c:1155 +#: builtin/checkout.c:1120 msgid "create and checkout a new branch" msgstr "créer et extraire une nouvelle branche" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1122 msgid "create/reset and checkout a branch" msgstr "créer/réinitialiser et extraire une branche" -#: builtin/checkout.c:1158 +#: builtin/checkout.c:1123 msgid "create reflog for new branch" msgstr "créer un reflog pour une nouvelle branche" -#: builtin/checkout.c:1159 builtin/worktree.c:350 +#: builtin/checkout.c:1124 builtin/worktree.c:373 msgid "detach HEAD at named commit" msgstr "détacher la HEAD au commit nommé" -#: builtin/checkout.c:1160 +#: builtin/checkout.c:1125 msgid "set upstream info for new branch" msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche" -#: builtin/checkout.c:1162 +#: builtin/checkout.c:1127 msgid "new-branch" msgstr "nouvelle branche" -#: builtin/checkout.c:1162 +#: builtin/checkout.c:1127 msgid "new unparented branch" msgstr "nouvelle branche sans parent" -#: builtin/checkout.c:1163 +#: builtin/checkout.c:1128 msgid "checkout our version for unmerged files" msgstr "extraire notre version pour les fichiers non fusionnés" -#: builtin/checkout.c:1165 +#: builtin/checkout.c:1130 msgid "checkout their version for unmerged files" msgstr "extraire leur version pour les fichiers non fusionnés" -#: builtin/checkout.c:1167 +#: builtin/checkout.c:1132 msgid "force checkout (throw away local modifications)" msgstr "forcer l'extraction (laisser tomber les modifications locales)" -#: builtin/checkout.c:1168 +#: builtin/checkout.c:1133 msgid "perform a 3-way merge with the new branch" msgstr "effectuer une fusion à 3 points avec la nouvelle branche" -#: builtin/checkout.c:1169 builtin/merge.c:238 +#: builtin/checkout.c:1134 builtin/merge.c:238 msgid "update ignored files (default)" msgstr "mettre à jour les fichiers ignorés (par défaut)" -#: builtin/checkout.c:1170 builtin/log.c:1489 parse-options.h:251 +#: builtin/checkout.c:1135 builtin/log.c:1496 parse-options.h:251 msgid "style" msgstr "style" -#: builtin/checkout.c:1171 +#: builtin/checkout.c:1136 msgid "conflict style (merge or diff3)" msgstr "style de conflit (merge (fusion) ou diff3)" -#: builtin/checkout.c:1174 +#: builtin/checkout.c:1139 msgid "do not limit pathspecs to sparse entries only" msgstr "ne pas limiter les spécificateurs de chemins aux seuls éléments creux" -#: builtin/checkout.c:1176 +#: builtin/checkout.c:1141 msgid "second guess 'git checkout <no-such-branch>'" msgstr "réessayer d'interpréter 'git checkout <branche-inexistante>'" -#: builtin/checkout.c:1178 +#: builtin/checkout.c:1143 msgid "do not check if another worktree is holding the given ref" msgstr "" "ne pas vérifier si une autre copie de travail contient le référence fournie" -#: builtin/checkout.c:1182 builtin/clone.c:81 builtin/fetch.c:136 -#: builtin/merge.c:235 builtin/pull.c:120 builtin/push.c:544 +#: builtin/checkout.c:1147 builtin/clone.c:81 builtin/fetch.c:137 +#: builtin/merge.c:235 builtin/pull.c:123 builtin/push.c:556 #: builtin/send-pack.c:173 msgid "force progress reporting" msgstr "forcer l'affichage de l'état d'avancement" -#: builtin/checkout.c:1212 +#: builtin/checkout.c:1177 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B et --orphan sont mutuellement exclusifs" -#: builtin/checkout.c:1229 +#: builtin/checkout.c:1194 msgid "--track needs a branch name" msgstr "--track requiert un nom de branche" -#: builtin/checkout.c:1234 +#: builtin/checkout.c:1199 msgid "Missing branch name; try -b" msgstr "Nom de branche manquant ; essayez -b" -#: builtin/checkout.c:1270 +#: builtin/checkout.c:1235 msgid "invalid path specification" msgstr "spécification de chemin invalide" -#: builtin/checkout.c:1277 +#: builtin/checkout.c:1242 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" "'%s' n'est pas un commit et une branche '%s' ne peut pas en être créée depuis" -#: builtin/checkout.c:1281 +#: builtin/checkout.c:1246 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'" -#: builtin/checkout.c:1285 +#: builtin/checkout.c:1250 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -6631,7 +6676,7 @@ msgstr "Ignorerait le dépôt %s\n" msgid "failed to remove %s" msgstr "échec de la suppression de %s" -#: builtin/clean.c:301 git-add--interactive.perl:572 +#: builtin/clean.c:302 git-add--interactive.perl:572 #, c-format msgid "" "Prompt help:\n" @@ -6644,7 +6689,7 @@ msgstr "" "foo - sélectionner un élément par un préfixe unique\n" " - (vide) ne rien sélectionner\n" -#: builtin/clean.c:305 git-add--interactive.perl:581 +#: builtin/clean.c:306 git-add--interactive.perl:581 #, c-format msgid "" "Prompt help:\n" @@ -6665,38 +6710,38 @@ msgstr "" "* - choisir tous les éléments\n" " - (vide) terminer la sélection\n" -#: builtin/clean.c:521 git-add--interactive.perl:547 +#: builtin/clean.c:522 git-add--interactive.perl:547 #: git-add--interactive.perl:552 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Hein (%s) ?\n" -#: builtin/clean.c:663 +#: builtin/clean.c:664 #, c-format msgid "Input ignore patterns>> " msgstr "Entrez les motifs à ignorer>> " -#: builtin/clean.c:700 +#: builtin/clean.c:701 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s" -#: builtin/clean.c:721 +#: builtin/clean.c:722 msgid "Select items to delete" msgstr "Sélectionner les éléments à supprimer" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:762 +#: builtin/clean.c:763 #, c-format msgid "Remove %s [y/N]? " msgstr "Supprimer %s [y/N] ? " -#: builtin/clean.c:787 git-add--interactive.perl:1616 +#: builtin/clean.c:788 git-add--interactive.perl:1616 #, c-format msgid "Bye.\n" msgstr "Au revoir.\n" -#: builtin/clean.c:795 +#: builtin/clean.c:796 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -6714,63 +6759,64 @@ msgstr "" "help - cet écran\n" "? - aide pour la sélection en ligne" -#: builtin/clean.c:822 git-add--interactive.perl:1692 +#: builtin/clean.c:823 git-add--interactive.perl:1692 msgid "*** Commands ***" msgstr "*** Commandes ***" -#: builtin/clean.c:823 git-add--interactive.perl:1689 +#: builtin/clean.c:824 git-add--interactive.perl:1689 msgid "What now" msgstr "Et maintenant ?" -#: builtin/clean.c:831 +#: builtin/clean.c:832 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:847 +#: builtin/clean.c:848 msgid "No more files to clean, exiting." msgstr "Plus de fichier à nettoyer, sortie." -#: builtin/clean.c:909 +#: builtin/clean.c:910 msgid "do not print names of files removed" msgstr "ne pas afficher les noms des fichiers supprimés" -#: builtin/clean.c:911 +#: builtin/clean.c:912 msgid "force" msgstr "forcer" -#: builtin/clean.c:912 +#: builtin/clean.c:913 msgid "interactive cleaning" msgstr "nettoyage interactif" -#: builtin/clean.c:914 +#: builtin/clean.c:915 msgid "remove whole directories" msgstr "supprimer les répertoires entiers" -#: builtin/clean.c:915 builtin/describe.c:463 builtin/describe.c:465 -#: builtin/grep.c:861 builtin/ls-files.c:544 builtin/name-rev.c:397 -#: builtin/name-rev.c:399 builtin/show-ref.c:176 +#: builtin/clean.c:916 builtin/describe.c:530 builtin/describe.c:532 +#: builtin/grep.c:863 builtin/log.c:155 builtin/log.c:157 +#: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399 +#: builtin/show-ref.c:176 msgid "pattern" msgstr "motif" -#: builtin/clean.c:916 +#: builtin/clean.c:917 msgid "add <pattern> to ignore rules" msgstr "ajouter <motif> aux règles ignore" -#: builtin/clean.c:917 +#: builtin/clean.c:918 msgid "remove ignored files, too" msgstr "supprimer les fichiers ignorés, aussi" -#: builtin/clean.c:919 +#: builtin/clean.c:920 msgid "remove only ignored files" msgstr "supprimer seulement les fichiers ignorés" -#: builtin/clean.c:937 +#: builtin/clean.c:938 msgid "-x and -X cannot be used together" msgstr "-x et -X ne peuvent pas être utilisés ensemble" -#: builtin/clean.c:941 +#: builtin/clean.c:942 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -6778,7 +6824,7 @@ msgstr "" "clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de " "nettoyer" -#: builtin/clean.c:944 +#: builtin/clean.c:945 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -6834,8 +6880,8 @@ msgstr "répertoire-modèle" msgid "directory from which templates will be used" msgstr "répertoire depuis lequel les modèles vont être utilisés" -#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:635 -#: builtin/submodule--helper.c:1002 +#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:873 +#: builtin/submodule--helper.c:1240 msgid "reference repository" msgstr "dépôt de référence" @@ -6859,8 +6905,8 @@ msgstr "extraire <branche> au lieu de la HEAD du répertoire distant" msgid "path to git-upload-pack on the remote" msgstr "chemin vers git-upload-pack sur le serveur distant" -#: builtin/clone.c:118 builtin/fetch.c:137 builtin/grep.c:804 -#: builtin/pull.c:205 +#: builtin/clone.c:118 builtin/fetch.c:138 builtin/grep.c:806 +#: builtin/pull.c:211 msgid "depth" msgstr "profondeur" @@ -6868,7 +6914,7 @@ msgstr "profondeur" msgid "create a shallow clone of that depth" msgstr "créer un clone superficiel de cette profondeur" -#: builtin/clone.c:120 builtin/fetch.c:139 builtin/pack-objects.c:2938 +#: builtin/clone.c:120 builtin/fetch.c:140 builtin/pack-objects.c:2991 #: parse-options.h:142 msgid "time" msgstr "heure" @@ -6877,11 +6923,11 @@ msgstr "heure" msgid "create a shallow clone since a specific time" msgstr "créer un clone superficiel depuis une date spécifique" -#: builtin/clone.c:122 builtin/fetch.c:141 +#: builtin/clone.c:122 builtin/fetch.c:142 msgid "revision" msgstr "révision" -#: builtin/clone.c:123 builtin/fetch.c:142 +#: builtin/clone.c:123 builtin/fetch.c:143 msgid "deepen history of shallow clone, excluding rev" msgstr "" "approfondir l'historique d'un clone superficiel en excluant une révision" @@ -6916,11 +6962,13 @@ msgstr "clé=valeur" msgid "set config inside the new repository" msgstr "régler la configuration dans le nouveau dépôt" -#: builtin/clone.c:134 builtin/fetch.c:159 builtin/push.c:555 +#: builtin/clone.c:134 builtin/fetch.c:160 builtin/pull.c:224 +#: builtin/push.c:567 msgid "use IPv4 addresses only" msgstr "n'utiliser que des adresses IPv4" -#: builtin/clone.c:136 builtin/fetch.c:161 builtin/push.c:557 +#: builtin/clone.c:136 builtin/fetch.c:162 builtin/pull.c:227 +#: builtin/push.c:569 msgid "use IPv6 addresses only" msgstr "n'utiliser que des adresses IPv6" @@ -6962,12 +7010,12 @@ msgstr "échec de la création du lien '%s'" msgid "failed to copy file to '%s'" msgstr "échec de la copie vers '%s'" -#: builtin/clone.c:471 +#: builtin/clone.c:472 #, c-format msgid "done.\n" msgstr "fait.\n" -#: builtin/clone.c:483 +#: builtin/clone.c:484 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -6977,21 +7025,21 @@ msgstr "" "Vous pouvez inspecter ce qui a été extrait avec 'git status'\n" "et réessayer l'extraction avec 'git checkout -f HEAD'\n" -#: builtin/clone.c:560 +#: builtin/clone.c:561 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Impossible de trouver la branche distante '%s' à cloner." -#: builtin/clone.c:655 +#: builtin/clone.c:656 msgid "remote did not send all necessary objects" msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires" -#: builtin/clone.c:671 +#: builtin/clone.c:672 #, c-format msgid "unable to update %s" msgstr "impossible de mettre à jour %s" -#: builtin/clone.c:720 +#: builtin/clone.c:721 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 " @@ -7013,7 +7061,7 @@ msgstr "impossible de remballer pour nettoyer" msgid "cannot unlink temporary alternates file" msgstr "impossible de unlinker le fichier temporaire alternates" -#: builtin/clone.c:894 builtin/receive-pack.c:1944 +#: builtin/clone.c:894 builtin/receive-pack.c:1945 msgid "Too many arguments." msgstr "Trop d'arguments." @@ -7035,7 +7083,7 @@ msgstr "--bare et --separate-git-dir sont incompatibles." msgid "repository '%s' does not exist" msgstr "le dépôt '%s' n'existe pas" -#: builtin/clone.c:933 builtin/fetch.c:1360 +#: builtin/clone.c:933 builtin/fetch.c:1358 #, c-format msgid "depth %s is not a positive number" msgstr "la profondeur %s n'est pas un entier positif" @@ -7052,7 +7100,7 @@ msgid "working tree '%s' already exists." msgstr "la copie de travail '%s' existe déjà." #: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270 -#: builtin/worktree.c:240 builtin/worktree.c:270 +#: builtin/worktree.c:253 builtin/worktree.c:283 #, c-format msgid "could not create leading directories of '%s'" msgstr "impossible de créer les répertoires de premier niveau dans '%s'" @@ -7105,17 +7153,12 @@ msgstr "le dépôt source est superficiel, option --local ignorée" msgid "--local is ignored" msgstr "--local est ignoré" -#: builtin/clone.c:1087 -#, c-format -msgid "Don't know how to clone %s" -msgstr "Je ne sais pas cloner %s" - -#: builtin/clone.c:1142 builtin/clone.c:1150 +#: builtin/clone.c:1139 builtin/clone.c:1147 #, 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:1153 +#: builtin/clone.c:1150 msgid "You appear to have cloned an empty repository." msgstr "Vous semblez avoir cloné un dépôt vide." @@ -7321,7 +7364,7 @@ msgstr "" "impossible de sélectionner un caractère de commentaire\n" "qui n'est pas utilisé dans le message de validation actuel" -#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1100 +#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1114 #, c-format msgid "could not lookup commit %s" msgstr "impossible de rechercher le commit %s" @@ -7422,131 +7465,138 @@ msgstr "%sValidateur : %.*s <%.*s>" msgid "Cannot read index" msgstr "Impossible de lire l'index" -#: builtin/commit.c:958 +#: builtin/commit.c:959 msgid "Error building trees" msgstr "Erreur lors de la construction des arbres" -#: builtin/commit.c:972 builtin/tag.c:252 +#: builtin/commit.c:973 builtin/tag.c:252 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n" -#: builtin/commit.c:1075 +#: builtin/commit.c:1076 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' n'est pas de la forme 'Nom <email>' ni ne correspond à aucun " "auteur existant" -#: builtin/commit.c:1090 builtin/commit.c:1335 +#: builtin/commit.c:1090 +#, c-format +msgid "Invalid ignored mode '%s'" +msgstr "Mode de fichier ignoré invalide '%s'" + +#: builtin/commit.c:1104 builtin/commit.c:1349 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Mode de fichier non suivi invalide '%s'" -#: builtin/commit.c:1128 +#: builtin/commit.c:1142 msgid "--long and -z are incompatible" msgstr "--long et -z sont incompatibles" -#: builtin/commit.c:1158 +#: builtin/commit.c:1172 msgid "Using both --reset-author and --author does not make sense" msgstr "L'utilisation simultanée de --reset-author et --author n'a pas de sens" -#: builtin/commit.c:1167 +#: builtin/commit.c:1181 msgid "You have nothing to amend." msgstr "Il n'y a rien à corriger." -#: builtin/commit.c:1170 +#: builtin/commit.c:1184 msgid "You are in the middle of a merge -- cannot amend." msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)." -#: builtin/commit.c:1172 +#: builtin/commit.c:1186 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Vous êtes en plein picorage -- impossible de corriger (amend)." -#: builtin/commit.c:1175 +#: builtin/commit.c:1189 msgid "Options --squash and --fixup cannot be used together" msgstr "Les options --squash et --fixup ne peuvent pas être utilisées ensemble" -#: builtin/commit.c:1185 +#: builtin/commit.c:1199 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Une seule option parmi -c/-C/-F/--fixup peut être utilisée." -#: builtin/commit.c:1187 +#: builtin/commit.c:1201 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F/--fixup." -#: builtin/commit.c:1195 +#: builtin/commit.c:1209 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author ne peut être utilisé qu'avec -C, -c ou --amend." -#: builtin/commit.c:1212 +#: builtin/commit.c:1226 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Une seule option parmi --include/--only/--all/--interactive/--patch peut " "être utilisée." -#: builtin/commit.c:1214 +#: builtin/commit.c:1228 msgid "No paths with --include/--only does not make sense." msgstr "Aucun chemin avec les options --include/--only n'a pas de sens." -#: builtin/commit.c:1226 builtin/tag.c:535 +#: builtin/commit.c:1240 builtin/tag.c:535 #, c-format msgid "Invalid cleanup mode %s" msgstr "Mode de nettoyage invalide %s" -#: builtin/commit.c:1231 +#: builtin/commit.c:1245 msgid "Paths with -a does not make sense." msgstr "Spécifier des chemins avec l'option -a n'a pas de sens." -#: builtin/commit.c:1349 builtin/commit.c:1626 +#: builtin/commit.c:1363 builtin/commit.c:1648 msgid "show status concisely" msgstr "afficher l'état avec concision" -#: builtin/commit.c:1351 builtin/commit.c:1628 +#: builtin/commit.c:1365 builtin/commit.c:1650 msgid "show branch information" msgstr "afficher l'information de branche" -#: builtin/commit.c:1353 +#: builtin/commit.c:1367 msgid "show stash information" msgstr "afficher l'information de remisage" -#: builtin/commit.c:1355 +#: builtin/commit.c:1369 msgid "version" msgstr "version" -#: builtin/commit.c:1355 builtin/commit.c:1630 builtin/push.c:530 -#: builtin/worktree.c:469 +#: builtin/commit.c:1369 builtin/commit.c:1652 builtin/push.c:542 +#: builtin/worktree.c:523 msgid "machine-readable output" msgstr "sortie pour traitement automatique" -#: builtin/commit.c:1358 builtin/commit.c:1632 +#: builtin/commit.c:1372 builtin/commit.c:1654 msgid "show status in long format (default)" msgstr "afficher l'état en format long (par défaut)" -#: builtin/commit.c:1361 builtin/commit.c:1635 +#: builtin/commit.c:1375 builtin/commit.c:1657 msgid "terminate entries with NUL" msgstr "terminer les éléments par NUL" -#: builtin/commit.c:1363 builtin/commit.c:1638 builtin/fast-export.c:999 -#: builtin/fast-export.c:1002 builtin/tag.c:390 +#: builtin/commit.c:1377 builtin/commit.c:1381 builtin/commit.c:1660 +#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:390 msgid "mode" msgstr "mode" -#: builtin/commit.c:1364 builtin/commit.c:1638 +#: builtin/commit.c:1378 builtin/commit.c:1660 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, " "no. (Défaut : all)" -#: builtin/commit.c:1367 -msgid "show ignored files" -msgstr "afficher les fichiers ignorés" +#: builtin/commit.c:1382 +msgid "" +"show ignored files, optional modes: traditional, matching, no. (Default: " +"traditional)" +msgstr "afficher les fichiers ignorés, \"mode\" facultatif : traditional (traditionnel), matching (correspondant), no. (Défaut : traditional)" -#: builtin/commit.c:1368 parse-options.h:155 +#: builtin/commit.c:1384 parse-options.h:155 msgid "when" msgstr "quand" -#: builtin/commit.c:1369 +#: builtin/commit.c:1385 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -7554,202 +7604,210 @@ msgstr "" "ignorer les modifications dans les sous-modules, \"quand\" facultatif : all " "(tous), dirty (sale), untracked (non suivi). (Défaut : all)" -#: builtin/commit.c:1371 +#: builtin/commit.c:1387 msgid "list untracked files in columns" msgstr "afficher les fichiers non suivis en colonnes" -#: builtin/commit.c:1449 +#: builtin/commit.c:1406 +msgid "Unsupported combination of ignored and untracked-files arguments" +msgstr "Combinaison non supportée d'arguments sur les fichiers ignorés et non-suivis" + +#: builtin/commit.c:1469 msgid "couldn't look up newly created commit" msgstr "impossible de retrouver le commit nouvellement créé" -#: builtin/commit.c:1451 +#: builtin/commit.c:1471 msgid "could not parse newly created commit" msgstr "impossible d'analyser le commit nouvellement créé" -#: builtin/commit.c:1496 +#: builtin/commit.c:1516 +msgid "unable to resolve HEAD after creating commit" +msgstr "impossible de résoudre HEAD après création du commit" + +#: builtin/commit.c:1518 msgid "detached HEAD" msgstr "HEAD détachée" -#: builtin/commit.c:1499 +#: builtin/commit.c:1521 msgid " (root-commit)" msgstr " (commit racine)" -#: builtin/commit.c:1596 +#: builtin/commit.c:1618 msgid "suppress summary after successful commit" msgstr "supprimer le résumé après une validation réussie" -#: builtin/commit.c:1597 +#: builtin/commit.c:1619 msgid "show diff in commit message template" msgstr "afficher les diff dans le modèle de message de validation" -#: builtin/commit.c:1599 +#: builtin/commit.c:1621 msgid "Commit message options" msgstr "Options du message de validation" -#: builtin/commit.c:1600 builtin/tag.c:388 +#: builtin/commit.c:1622 builtin/tag.c:388 msgid "read message from file" msgstr "lire le message depuis un fichier" -#: builtin/commit.c:1601 +#: builtin/commit.c:1623 msgid "author" msgstr "auteur" -#: builtin/commit.c:1601 +#: builtin/commit.c:1623 msgid "override author for commit" msgstr "remplacer l'auteur pour la validation" -#: builtin/commit.c:1602 builtin/gc.c:359 +#: builtin/commit.c:1624 builtin/gc.c:359 msgid "date" msgstr "date" -#: builtin/commit.c:1602 +#: builtin/commit.c:1624 msgid "override date for commit" msgstr "remplacer la date pour la validation" -#: builtin/commit.c:1603 builtin/merge.c:225 builtin/notes.c:402 +#: builtin/commit.c:1625 builtin/merge.c:225 builtin/notes.c:402 #: builtin/notes.c:565 builtin/tag.c:386 msgid "message" msgstr "message" -#: builtin/commit.c:1603 +#: builtin/commit.c:1625 msgid "commit message" msgstr "message de validation" -#: builtin/commit.c:1604 builtin/commit.c:1605 builtin/commit.c:1606 -#: builtin/commit.c:1607 parse-options.h:257 ref-filter.h:92 +#: builtin/commit.c:1626 builtin/commit.c:1627 builtin/commit.c:1628 +#: builtin/commit.c:1629 parse-options.h:257 ref-filter.h:92 msgid "commit" msgstr "commit" -#: builtin/commit.c:1604 +#: builtin/commit.c:1626 msgid "reuse and edit message from specified commit" msgstr "réutiliser et éditer le message du commit spécifié" -#: builtin/commit.c:1605 +#: builtin/commit.c:1627 msgid "reuse message from specified commit" msgstr "réutiliser le message du commit spécifié" -#: builtin/commit.c:1606 +#: builtin/commit.c:1628 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "utiliser un message au format autosquash pour corriger le commit spécifié" -#: builtin/commit.c:1607 +#: builtin/commit.c:1629 msgid "use autosquash formatted message to squash specified commit" msgstr "" "utiliser un message au format autosquash pour compresser le commit spécifié" -#: builtin/commit.c:1608 +#: builtin/commit.c:1630 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:1609 builtin/log.c:1436 builtin/merge.c:239 -#: builtin/revert.c:105 +#: builtin/commit.c:1631 builtin/log.c:1443 builtin/merge.c:239 +#: builtin/pull.c:149 builtin/revert.c:105 msgid "add Signed-off-by:" msgstr "ajouter une entrée Signed-off-by :" -#: builtin/commit.c:1610 +#: builtin/commit.c:1632 msgid "use specified template file" msgstr "utiliser le fichier de modèle spécifié" -#: builtin/commit.c:1611 +#: builtin/commit.c:1633 msgid "force edit of commit" msgstr "forcer l'édition du commit" -#: builtin/commit.c:1612 +#: builtin/commit.c:1634 msgid "default" msgstr "défaut" -#: builtin/commit.c:1612 builtin/tag.c:391 +#: builtin/commit.c:1634 builtin/tag.c:391 msgid "how to strip spaces and #comments from message" msgstr "comment éliminer les espaces et les commentaires # du message" -#: builtin/commit.c:1613 +#: builtin/commit.c:1635 msgid "include status in commit message template" msgstr "inclure l'état dans le modèle de message de validation" -#: builtin/commit.c:1615 builtin/merge.c:237 builtin/pull.c:173 +#: builtin/commit.c:1637 builtin/merge.c:237 builtin/pull.c:179 #: builtin/revert.c:113 msgid "GPG sign commit" msgstr "signer la validation avec GPG" -#: builtin/commit.c:1618 +#: builtin/commit.c:1640 msgid "Commit contents options" msgstr "Valider les options des contenus" -#: builtin/commit.c:1619 +#: builtin/commit.c:1641 msgid "commit all changed files" msgstr "valider tous les fichiers modifiés" -#: builtin/commit.c:1620 +#: builtin/commit.c:1642 msgid "add specified files to index for commit" msgstr "ajouter les fichiers spécifiés à l'index pour la validation" -#: builtin/commit.c:1621 +#: builtin/commit.c:1643 msgid "interactively add files" msgstr "ajouter des fichiers en mode interactif" -#: builtin/commit.c:1622 +#: builtin/commit.c:1644 msgid "interactively add changes" msgstr "ajouter les modifications en mode interactif" -#: builtin/commit.c:1623 +#: builtin/commit.c:1645 msgid "commit only specified files" msgstr "valider seulement les fichiers spécifiés" -#: builtin/commit.c:1624 +#: builtin/commit.c:1646 msgid "bypass pre-commit and commit-msg hooks" msgstr "éviter d'utiliser les crochets pre-commit et commit-msg" -#: builtin/commit.c:1625 +#: builtin/commit.c:1647 msgid "show what would be committed" msgstr "afficher ce qui serait validé" -#: builtin/commit.c:1636 +#: builtin/commit.c:1658 msgid "amend previous commit" msgstr "corriger la validation précédente" -#: builtin/commit.c:1637 +#: builtin/commit.c:1659 msgid "bypass post-rewrite hook" msgstr "éviter d'utiliser le crochet post-rewrite" -#: builtin/commit.c:1642 +#: builtin/commit.c:1664 msgid "ok to record an empty change" msgstr "accepter d'enregistrer une modification vide" -#: builtin/commit.c:1644 +#: builtin/commit.c:1666 msgid "ok to record a change with an empty message" msgstr "accepter d'enregistrer une modification avec un message vide" -#: builtin/commit.c:1674 +#: builtin/commit.c:1696 msgid "could not parse HEAD commit" msgstr "impossible d'analyser le commit HEAD" -#: builtin/commit.c:1719 +#: builtin/commit.c:1741 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Fichier MERGE_HEAD corrompu (%s)" -#: builtin/commit.c:1726 +#: builtin/commit.c:1748 msgid "could not read MERGE_MODE" msgstr "impossible de lire MERGE_MODE" -#: builtin/commit.c:1745 +#: builtin/commit.c:1767 #, c-format msgid "could not read commit message: %s" msgstr "impossible de lire le message de validation : %s" -#: builtin/commit.c:1756 +#: builtin/commit.c:1778 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Abandon de la validation dû à un message de validation vide.\n" -#: builtin/commit.c:1761 +#: builtin/commit.c:1783 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Abandon de la validation ; vous n'avez pas édité le message\n" -#: builtin/commit.c:1809 +#: builtin/commit.c:1831 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -7763,142 +7821,146 @@ msgstr "" msgid "git config [<options>]" msgstr "git config [<options>]" -#: builtin/config.c:57 +#: builtin/config.c:58 msgid "Config file location" msgstr "Emplacement du fichier de configuration" -#: builtin/config.c:58 +#: builtin/config.c:59 msgid "use global config file" msgstr "utiliser les fichier de configuration global" -#: builtin/config.c:59 +#: builtin/config.c:60 msgid "use system config file" msgstr "utiliser le fichier de configuration du système" -#: builtin/config.c:60 +#: builtin/config.c:61 msgid "use repository config file" msgstr "utiliser le fichier de configuration du dépôt" -#: builtin/config.c:61 +#: builtin/config.c:62 msgid "use given config file" msgstr "utiliser le fichier de configuration spécifié" -#: builtin/config.c:62 +#: builtin/config.c:63 msgid "blob-id" msgstr "blob-id" -#: builtin/config.c:62 +#: builtin/config.c:63 msgid "read config from given blob object" msgstr "lire la configuration depuis l'objet blob fourni" -#: builtin/config.c:63 +#: builtin/config.c:64 msgid "Action" msgstr "Action" -#: builtin/config.c:64 +#: builtin/config.c:65 msgid "get value: name [value-regex]" msgstr "obtenir la valeur : nom [regex-de-valeur]" -#: builtin/config.c:65 +#: builtin/config.c:66 msgid "get all values: key [value-regex]" msgstr "obtenir toutes les valeurs : clé [regex-de-valeur]" -#: builtin/config.c:66 +#: builtin/config.c:67 msgid "get values for regexp: name-regex [value-regex]" msgstr "obtenir les valeur pour la regexp : regex-de-nom [regex-de-valeur]" -#: builtin/config.c:67 +#: builtin/config.c:68 msgid "get value specific for the URL: section[.var] URL" msgstr "obtenir la valeur spécifique pour l'URL : section[.var] URL" -#: builtin/config.c:68 +#: builtin/config.c:69 msgid "replace all matching variables: name value [value_regex]" msgstr "" "remplacer toutes les variables correspondant : nom valeur [regex-de-valeur]" -#: builtin/config.c:69 +#: builtin/config.c:70 msgid "add a new variable: name value" msgstr "ajouter une nouvelle variable : nom valeur" -#: builtin/config.c:70 +#: builtin/config.c:71 msgid "remove a variable: name [value-regex]" msgstr "supprimer une variable : nom [regex-de-valeur]" -#: builtin/config.c:71 +#: builtin/config.c:72 msgid "remove all matches: name [value-regex]" msgstr "supprimer toutes les correspondances nom [regex-de-valeur]" -#: builtin/config.c:72 +#: builtin/config.c:73 msgid "rename section: old-name new-name" msgstr "renommer une section : ancien-nom nouveau-nom" -#: builtin/config.c:73 +#: builtin/config.c:74 msgid "remove a section: name" msgstr "supprimer une section : nom" -#: builtin/config.c:74 +#: builtin/config.c:75 msgid "list all" msgstr "afficher tout" -#: builtin/config.c:75 +#: builtin/config.c:76 msgid "open an editor" msgstr "ouvrir un éditeur" -#: builtin/config.c:76 +#: builtin/config.c:77 msgid "find the color configured: slot [default]" msgstr "trouver la couleur configurée : slot [par défaut]" -#: builtin/config.c:77 +#: builtin/config.c:78 msgid "find the color setting: slot [stdout-is-tty]" msgstr "trouver le réglage de la couleur : slot [stdout-est-tty]" -#: builtin/config.c:78 +#: builtin/config.c:79 msgid "Type" msgstr "Type" -#: builtin/config.c:79 +#: builtin/config.c:80 msgid "value is \"true\" or \"false\"" msgstr "la valeur est \"true\" (vrai) ou \"false\" (faux)" -#: builtin/config.c:80 +#: builtin/config.c:81 msgid "value is decimal number" msgstr "la valeur est un nombre décimal" -#: builtin/config.c:81 +#: builtin/config.c:82 msgid "value is --bool or --int" msgstr "la valeur est --bool ou --int" -#: builtin/config.c:82 +#: builtin/config.c:83 msgid "value is a path (file or directory name)" msgstr "la valeur est un chemin (vers un fichier ou un répertoire)" -#: builtin/config.c:83 +#: builtin/config.c:84 +msgid "value is an expiry date" +msgstr "la valeur est une date d'expiration" + +#: builtin/config.c:85 msgid "Other" msgstr "Autre" -#: builtin/config.c:84 +#: builtin/config.c:86 msgid "terminate values with NUL byte" msgstr "terminer les valeurs avec un caractère NUL" -#: builtin/config.c:85 +#: builtin/config.c:87 msgid "show variable names only" msgstr "n'afficher que les noms de variable" -#: builtin/config.c:86 +#: builtin/config.c:88 msgid "respect include directives on lookup" msgstr "respecter les directives d'inclusion lors de la recherche" -#: builtin/config.c:87 +#: builtin/config.c:89 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" "afficher l'origine de la configuration (fichier, entrée standard, blob, " "ligne de commande)" -#: builtin/config.c:327 +#: builtin/config.c:335 msgid "unable to parse default color value" msgstr "impossible de lire la valeur de couleur par défaut" -#: builtin/config.c:471 +#: builtin/config.c:479 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -7913,16 +7975,16 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:499 +#: builtin/config.c:507 msgid "--local can only be used inside a git repository" msgstr "--local ne peut être utilisé qu'à l'intérieur d'un dépôt git" -#: builtin/config.c:624 +#: builtin/config.c:632 #, c-format msgid "cannot create configuration file %s" msgstr "création impossible du fichier de configuration '%s'" -#: builtin/config.c:637 +#: builtin/config.c:645 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -7939,67 +8001,57 @@ 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:19 +#: builtin/describe.c:22 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<options>] <commit ou apparenté>*" -#: builtin/describe.c:20 +#: builtin/describe.c:23 msgid "git describe [<options>] --dirty" msgstr "git describe [<options>] --dirty" -#: builtin/describe.c:54 +#: builtin/describe.c:57 msgid "head" msgstr "tête" -#: builtin/describe.c:54 +#: builtin/describe.c:57 msgid "lightweight" msgstr "léger" -#: builtin/describe.c:54 +#: builtin/describe.c:57 msgid "annotated" msgstr "annoté" -#: builtin/describe.c:264 +#: builtin/describe.c:267 #, c-format msgid "annotated tag %s not available" msgstr "l'étiquette annotée %s n'est pas disponible" -#: builtin/describe.c:268 +#: builtin/describe.c:271 #, 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:270 +#: builtin/describe.c:273 #, c-format msgid "tag '%s' is really '%s' here" msgstr "l'étiquette '%s' est en fait '%s'" -#: builtin/describe.c:297 builtin/log.c:493 -#, c-format -msgid "Not a valid object name %s" -msgstr "%s n'est pas un nom d'objet valide" - -#: builtin/describe.c:300 -#, c-format -msgid "%s is not a valid '%s' object" -msgstr "%s n'est pas un objet '%s' valide" - -#: builtin/describe.c:317 +#: builtin/describe.c:314 #, c-format msgid "no tag exactly matches '%s'" msgstr "aucune étiquette ne correspond parfaitement à '%s'" -#: builtin/describe.c:319 +#: builtin/describe.c:316 #, c-format -msgid "searching to describe %s\n" -msgstr "recherche de la description de %s\n" +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:366 +#: builtin/describe.c:363 #, c-format msgid "finished search at %s\n" msgstr "recherche terminée à %s\n" -#: builtin/describe.c:393 +#: builtin/describe.c:389 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -8008,7 +8060,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:397 +#: builtin/describe.c:393 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -8017,12 +8069,12 @@ msgstr "" "Aucune étiquette ne peut décrire '%s'.\n" "Essayez --always, ou créez des étiquettes." -#: builtin/describe.c:427 +#: builtin/describe.c:423 #, c-format msgid "traversed %lu commits\n" msgstr "%lu commits parcourus\n" -#: builtin/describe.c:430 +#: builtin/describe.c:426 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -8032,77 +8084,92 @@ msgstr "" "affichées\n" "abandon de la recherche à %s\n" -#: builtin/describe.c:452 +#: builtin/describe.c:494 +#, c-format +msgid "describe %s\n" +msgstr "décrire %s\n" + +#: builtin/describe.c:497 builtin/log.c:500 +#, c-format +msgid "Not a valid object name %s" +msgstr "%s n'est pas un nom d'objet valide" + +#: builtin/describe.c:505 +#, c-format +msgid "%s is neither a commit nor blob" +msgstr "%s n'est ni un commit ni un blob" + +#: builtin/describe.c:519 msgid "find the tag that comes after the commit" msgstr "rechercher l'étiquette qui suit le commit" -#: builtin/describe.c:453 +#: builtin/describe.c:520 msgid "debug search strategy on stderr" msgstr "déboguer la stratégie de recherche sur stderr" -#: builtin/describe.c:454 +#: builtin/describe.c:521 msgid "use any ref" msgstr "utiliser n'importe quelle référence" -#: builtin/describe.c:455 +#: builtin/describe.c:522 msgid "use any tag, even unannotated" msgstr "utiliser n'importe quelle étiquette, même non-annotée" -#: builtin/describe.c:456 +#: builtin/describe.c:523 msgid "always use long format" msgstr "toujours utiliser le format long" -#: builtin/describe.c:457 +#: builtin/describe.c:524 msgid "only follow first parent" msgstr "ne suivre que le premier parent" -#: builtin/describe.c:460 +#: builtin/describe.c:527 msgid "only output exact matches" msgstr "n'afficher que les correspondances exactes" -#: builtin/describe.c:462 +#: builtin/describe.c:529 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:464 +#: builtin/describe.c:531 msgid "only consider tags matching <pattern>" msgstr "ne considérer que les étiquettes correspondant à <motif>" -#: builtin/describe.c:466 +#: builtin/describe.c:533 msgid "do not consider tags matching <pattern>" msgstr "ne pas considérer les étiquettes correspondant à <motif>" -#: builtin/describe.c:468 builtin/name-rev.c:406 +#: builtin/describe.c:535 builtin/name-rev.c:406 msgid "show abbreviated commit object as fallback" msgstr "afficher les objets commits abrégés en dernier recours" -#: builtin/describe.c:469 builtin/describe.c:472 +#: builtin/describe.c:536 builtin/describe.c:539 msgid "mark" msgstr "marque" -#: builtin/describe.c:470 +#: builtin/describe.c:537 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:473 +#: builtin/describe.c:540 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:491 +#: builtin/describe.c:558 msgid "--long is incompatible with --abbrev=0" msgstr "--long et --abbrev=0 sont incompatibles" -#: builtin/describe.c:520 +#: builtin/describe.c:587 msgid "No names found, cannot describe anything." msgstr "aucun nom trouvé, impossible de décrire quoi que ce soit." -#: builtin/describe.c:563 +#: builtin/describe.c:637 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty est incompatible avec la spécification de commits ou assimilés" -#: builtin/describe.c:565 +#: builtin/describe.c:639 msgid "--broken is incompatible with commit-ishes" msgstr "--broken est incompatible avec les commits ou assimilés" @@ -8111,26 +8178,26 @@ msgstr "--broken est incompatible avec les commits ou assimilés" msgid "'%s': not a regular file or symlink" msgstr "'%s' : n'est pas un fichier régulier ni un lien symbolique" -#: builtin/diff.c:235 +#: builtin/diff.c:234 #, c-format msgid "invalid option: %s" msgstr "option invalide : %s" -#: builtin/diff.c:357 +#: builtin/diff.c:356 msgid "Not a git repository" msgstr "Ce n'est pas un dépôt git !" -#: builtin/diff.c:400 +#: builtin/diff.c:399 #, c-format msgid "invalid object '%s' given." msgstr "objet spécifié '%s' invalide." -#: builtin/diff.c:409 +#: builtin/diff.c:408 #, c-format msgid "more than two blobs given: '%s'" msgstr "plus de deux blobs spécifiés : '%s'" -#: builtin/diff.c:414 +#: builtin/diff.c:413 #, c-format msgid "unhandled object '%s' given." msgstr "objet non géré '%s' spécifié." @@ -8167,53 +8234,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:633 +#: builtin/difftool.c:632 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "les deux fichiers sont modifiés : '%s' et '%s'." -#: builtin/difftool.c:635 +#: builtin/difftool.c:634 msgid "working tree file has been left." msgstr "le fichier dans l'arbre de travail a été laissé." -#: builtin/difftool.c:646 +#: builtin/difftool.c:645 #, c-format msgid "temporary files exist in '%s'." msgstr "des fichiers temporaires existent dans '%s'." -#: builtin/difftool.c:647 +#: builtin/difftool.c:646 msgid "you may want to cleanup or recover these." msgstr "vous pourriez souhaiter les nettoyer ou les récupérer." -#: builtin/difftool.c:696 +#: builtin/difftool.c:695 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "utiliser `diff.guitool` au lieu de `diff.tool`" -#: builtin/difftool.c:698 +#: builtin/difftool.c:697 msgid "perform a full-directory diff" msgstr "réalise un diff de répertoire complet" -#: builtin/difftool.c:700 +#: builtin/difftool.c:699 msgid "do not prompt before launching a diff tool" msgstr "ne pas confirmer avant de lancer l'outil de diff" -#: builtin/difftool.c:706 +#: builtin/difftool.c:705 msgid "use symlinks in dir-diff mode" msgstr "utiliser les liens symboliques en mode de diff de répertoire" -#: builtin/difftool.c:707 +#: builtin/difftool.c:706 msgid "<tool>" msgstr "<outil>" -#: builtin/difftool.c:708 +#: builtin/difftool.c:707 msgid "use the specified diff tool" msgstr "utiliser l'outil de diff spécifié" -#: builtin/difftool.c:710 +#: builtin/difftool.c:709 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:713 +#: builtin/difftool.c:712 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -8221,19 +8288,19 @@ msgstr "" "provoque la fin de 'git-difftool' si l'outil de diff invoqué renvoie un code " "non-nul" -#: builtin/difftool.c:715 +#: builtin/difftool.c:714 msgid "<command>" msgstr "<commande>" -#: builtin/difftool.c:716 +#: builtin/difftool.c:715 msgid "specify a custom command for viewing diffs" msgstr "spécifier une commande personnalisée pour visualiser les différences" -#: builtin/difftool.c:740 +#: builtin/difftool.c:739 msgid "no <tool> given for --tool=<tool>" msgstr "pas d'<outil> spécifié pour --tool=<outil>" -#: builtin/difftool.c:747 +#: builtin/difftool.c:746 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "pas de <commande> spécifié pour --extcmd=<commande>" @@ -8290,97 +8357,97 @@ msgstr "Appliquer le spécificateur de référence aux références exportées" msgid "anonymize output" msgstr "anonymise la sortie" -#: builtin/fetch.c:23 +#: builtin/fetch.c:24 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<options>] [<dépôt> [<spécification-de-référence>...]]" -#: builtin/fetch.c:24 +#: builtin/fetch.c:25 msgid "git fetch [<options>] <group>" msgstr "git fetch [<options>] <groupe>" -#: builtin/fetch.c:25 +#: builtin/fetch.c:26 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]" -#: builtin/fetch.c:26 +#: builtin/fetch.c:27 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<options>]" -#: builtin/fetch.c:112 builtin/pull.c:182 +#: builtin/fetch.c:113 builtin/pull.c:188 msgid "fetch from all remotes" msgstr "récupérer depuis tous les dépôts distants" -#: builtin/fetch.c:114 builtin/pull.c:185 +#: builtin/fetch.c:115 builtin/pull.c:191 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser" -#: builtin/fetch.c:116 builtin/pull.c:188 +#: builtin/fetch.c:117 builtin/pull.c:194 msgid "path to upload pack on remote end" msgstr "chemin vers lequel télécharger le paquet sur le poste distant" -#: builtin/fetch.c:117 builtin/pull.c:190 +#: builtin/fetch.c:118 builtin/pull.c:196 msgid "force overwrite of local branch" msgstr "forcer l'écrasement de la branche locale" -#: builtin/fetch.c:119 +#: builtin/fetch.c:120 msgid "fetch from multiple remotes" msgstr "récupérer depuis plusieurs dépôts distants" -#: builtin/fetch.c:121 builtin/pull.c:192 +#: builtin/fetch.c:122 builtin/pull.c:198 msgid "fetch all tags and associated objects" msgstr "récupérer toutes les étiquettes et leurs objets associés" -#: builtin/fetch.c:123 +#: builtin/fetch.c:124 msgid "do not fetch all tags (--no-tags)" msgstr "ne pas récupérer toutes les étiquettes (--no-tags)" -#: builtin/fetch.c:125 +#: builtin/fetch.c:126 msgid "number of submodules fetched in parallel" msgstr "nombre de sous-modules récupérés en parallèle" -#: builtin/fetch.c:127 builtin/pull.c:195 +#: builtin/fetch.c:128 builtin/pull.c:201 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:128 builtin/fetch.c:151 builtin/pull.c:123 +#: builtin/fetch.c:129 builtin/fetch.c:152 builtin/pull.c:126 msgid "on-demand" msgstr "à la demande" -#: builtin/fetch.c:129 +#: builtin/fetch.c:130 msgid "control recursive fetching of submodules" msgstr "contrôler la récupération récursive dans les sous-modules" -#: builtin/fetch.c:133 builtin/pull.c:203 +#: builtin/fetch.c:134 builtin/pull.c:209 msgid "keep downloaded pack" msgstr "conserver le paquet téléchargé" -#: builtin/fetch.c:135 +#: builtin/fetch.c:136 msgid "allow updating of HEAD ref" msgstr "permettre la mise à jour de la référence HEAD" -#: builtin/fetch.c:138 builtin/fetch.c:144 builtin/pull.c:206 +#: builtin/fetch.c:139 builtin/fetch.c:145 builtin/pull.c:212 msgid "deepen history of shallow clone" msgstr "approfondir l'historique d'un clone superficiel" -#: builtin/fetch.c:140 +#: builtin/fetch.c:141 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:146 builtin/pull.c:209 +#: builtin/fetch.c:147 builtin/pull.c:215 msgid "convert to a complete repository" msgstr "convertir en un dépôt complet" -#: builtin/fetch.c:148 builtin/log.c:1456 +#: builtin/fetch.c:149 builtin/log.c:1463 msgid "dir" msgstr "répertoire" -#: builtin/fetch.c:149 +#: builtin/fetch.c:150 msgid "prepend this to submodule path output" msgstr "préfixer ceci à la sortie du chemin du sous-module" -#: builtin/fetch.c:152 +#: builtin/fetch.c:153 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -8388,91 +8455,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:156 builtin/pull.c:212 +#: builtin/fetch.c:157 builtin/pull.c:218 msgid "accept refs that update .git/shallow" msgstr "accepter les références qui mettent à jour .git/shallow" -#: builtin/fetch.c:157 builtin/pull.c:214 +#: builtin/fetch.c:158 builtin/pull.c:220 msgid "refmap" msgstr "correspondance de référence" -#: builtin/fetch.c:158 builtin/pull.c:215 +#: builtin/fetch.c:159 builtin/pull.c:221 msgid "specify fetch refmap" msgstr "spécifier une correspondance de référence pour la récupération" -#: builtin/fetch.c:416 +#: builtin/fetch.c:417 msgid "Couldn't find remote ref HEAD" msgstr "impossible de trouver la référence HEAD distante" -#: builtin/fetch.c:534 +#: builtin/fetch.c:535 #, 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:627 +#: builtin/fetch.c:628 #, c-format msgid "object %s not found" msgstr "objet %s non trouvé" -#: builtin/fetch.c:631 +#: builtin/fetch.c:632 msgid "[up to date]" msgstr "[à jour]" -#: builtin/fetch.c:644 builtin/fetch.c:724 +#: builtin/fetch.c:645 builtin/fetch.c:725 msgid "[rejected]" msgstr "[rejeté]" -#: builtin/fetch.c:645 +#: builtin/fetch.c:646 msgid "can't fetch in current branch" msgstr "impossible de récupérer dans la branche actuelle" -#: builtin/fetch.c:654 +#: builtin/fetch.c:655 msgid "[tag update]" msgstr "[mise à jour de l'étiquette]" -#: builtin/fetch.c:655 builtin/fetch.c:688 builtin/fetch.c:704 -#: builtin/fetch.c:719 +#: builtin/fetch.c:656 builtin/fetch.c:689 builtin/fetch.c:705 +#: builtin/fetch.c:720 msgid "unable to update local ref" msgstr "impossible de mettre à jour la référence locale" -#: builtin/fetch.c:674 +#: builtin/fetch.c:675 msgid "[new tag]" msgstr "[nouvelle étiquette]" -#: builtin/fetch.c:677 +#: builtin/fetch.c:678 msgid "[new branch]" msgstr "[nouvelle branche]" -#: builtin/fetch.c:680 +#: builtin/fetch.c:681 msgid "[new ref]" msgstr "[nouvelle référence]" -#: builtin/fetch.c:719 +#: builtin/fetch.c:720 msgid "forced update" msgstr "mise à jour forcée" -#: builtin/fetch.c:724 +#: builtin/fetch.c:725 msgid "non-fast-forward" msgstr "pas en avance rapide" -#: builtin/fetch.c:769 +#: builtin/fetch.c:770 #, 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:789 +#: builtin/fetch.c:790 #, 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:877 builtin/fetch.c:973 +#: builtin/fetch.c:878 builtin/fetch.c:974 #, c-format msgid "From %.*s\n" msgstr "Depuis %.*s\n" -#: builtin/fetch.c:888 +#: builtin/fetch.c:889 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -8481,55 +8548,50 @@ 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:943 +#: builtin/fetch.c:944 #, c-format msgid " (%s will become dangling)" msgstr " (%s sera en suspens)" -#: builtin/fetch.c:944 +#: builtin/fetch.c:945 #, c-format msgid " (%s has become dangling)" msgstr " (%s est devenu en suspens)" -#: builtin/fetch.c:976 +#: builtin/fetch.c:977 msgid "[deleted]" msgstr "[supprimé]" -#: builtin/fetch.c:977 builtin/remote.c:1024 +#: builtin/fetch.c:978 builtin/remote.c:1024 msgid "(none)" msgstr "(aucun(e))" -#: builtin/fetch.c:1000 +#: builtin/fetch.c:1001 #, 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:1019 +#: builtin/fetch.c:1020 #, 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:1022 +#: builtin/fetch.c:1023 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "L'option \"%s\" est ignorée pour %s\n" -#: builtin/fetch.c:1098 -#, c-format -msgid "Don't know how to fetch from %s" -msgstr "Je ne sais pas récupérer depuis %s" - -#: builtin/fetch.c:1258 +#: builtin/fetch.c:1256 #, c-format msgid "Fetching %s\n" msgstr "Récupération de %s\n" -#: builtin/fetch.c:1260 builtin/remote.c:97 +#: builtin/fetch.c:1258 builtin/remote.c:97 #, c-format msgid "Could not fetch %s" msgstr "Impossible de récupérer %s" -#: builtin/fetch.c:1278 +#: builtin/fetch.c:1276 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -8537,40 +8599,40 @@ 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:1301 +#: builtin/fetch.c:1299 msgid "You need to specify a tag name." msgstr "Vous devez spécifier un nom d'étiquette." -#: builtin/fetch.c:1344 +#: builtin/fetch.c:1342 msgid "Negative depth in --deepen is not supported" msgstr "Une profondeur négative dans --deepen n'est pas supportée" -#: builtin/fetch.c:1346 +#: builtin/fetch.c:1344 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen et --depth sont mutuellement exclusifs" -#: builtin/fetch.c:1351 +#: builtin/fetch.c:1349 msgid "--depth and --unshallow cannot be used together" msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble" -#: builtin/fetch.c:1353 +#: builtin/fetch.c:1351 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:1366 +#: builtin/fetch.c:1364 msgid "fetch --all does not take a repository argument" msgstr "fetch --all n'accepte pas d'argument de dépôt" -#: builtin/fetch.c:1368 +#: builtin/fetch.c:1366 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:1379 +#: builtin/fetch.c:1377 #, c-format msgid "No such remote or remote group: %s" msgstr "distant ou groupe distant inexistant : %s" -#: builtin/fetch.c:1387 +#: builtin/fetch.c:1385 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 " @@ -8582,23 +8644,23 @@ msgid "" msgstr "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <fichier>]" -#: builtin/fmt-merge-msg.c:665 +#: builtin/fmt-merge-msg.c:666 msgid "populate log with at most <n> entries from shortlog" msgstr "peupler le journal avec au plus <n> éléments depuis le journal court" -#: builtin/fmt-merge-msg.c:668 +#: builtin/fmt-merge-msg.c:669 msgid "alias for --log (deprecated)" msgstr "alias pour --log (obsolète)" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:672 msgid "text" msgstr "texte" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:673 msgid "use <text> as start of message" msgstr "utiliser <texte> comme début de message" -#: builtin/fmt-merge-msg.c:673 +#: builtin/fmt-merge-msg.c:674 msgid "file to read from" msgstr "fichier d'où lire" @@ -8826,250 +8888,250 @@ msgstr "nombre de fils spécifié invalide (%d) pour %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1693 +#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1688 #, c-format msgid "no threads support, ignoring %s" msgstr "pas de support des fils, ignore %s" -#: builtin/grep.c:451 builtin/grep.c:571 builtin/grep.c:613 +#: builtin/grep.c:453 builtin/grep.c:573 builtin/grep.c:615 #, c-format msgid "unable to read tree (%s)" msgstr "impossible de lire l'arbre (%s)" -#: builtin/grep.c:628 +#: builtin/grep.c:630 #, 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:694 +#: builtin/grep.c:696 #, c-format msgid "switch `%c' expects a numerical value" msgstr "l'option '%c' attend un valeur numérique" -#: builtin/grep.c:781 +#: builtin/grep.c:783 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:783 +#: builtin/grep.c:785 msgid "find in contents not managed by git" msgstr "rechercher dans les contenus non gérés par git" -#: builtin/grep.c:785 +#: builtin/grep.c:787 msgid "search in both tracked and untracked files" msgstr "rechercher dans les fichiers suivis et non-suivis" -#: builtin/grep.c:787 +#: builtin/grep.c:789 msgid "ignore files specified via '.gitignore'" msgstr "ignorer les fichiers spécifiés via '.gitignore'" -#: builtin/grep.c:789 +#: builtin/grep.c:791 msgid "recursively search in each submodule" msgstr "rechercher récursivement dans chaque sous-module" -#: builtin/grep.c:792 +#: builtin/grep.c:794 msgid "show non-matching lines" msgstr "afficher les lignes qui ne correspondent pas" -#: builtin/grep.c:794 +#: builtin/grep.c:796 msgid "case insensitive matching" msgstr "correspondance insensible à la casse" -#: builtin/grep.c:796 +#: builtin/grep.c:798 msgid "match patterns only at word boundaries" msgstr "rechercher les motifs aux séparateurs de mots" -#: builtin/grep.c:798 +#: builtin/grep.c:800 msgid "process binary files as text" msgstr "traiter les fichiers binaires comme texte" -#: builtin/grep.c:800 +#: builtin/grep.c:802 msgid "don't match patterns in binary files" msgstr "ne pas chercher les motifs dans les fichiers binaires" -#: builtin/grep.c:803 +#: builtin/grep.c:805 msgid "process binary files with textconv filters" msgstr "traiter les fichiers binaires avec les filtres textconv" -#: builtin/grep.c:805 +#: builtin/grep.c:807 msgid "descend at most <depth> levels" msgstr "descendre au plus de <profondeur> dans l'arborescence" -#: builtin/grep.c:809 +#: builtin/grep.c:811 msgid "use extended POSIX regular expressions" msgstr "utiliser des expressions régulières étendues POSIX" -#: builtin/grep.c:812 +#: builtin/grep.c:814 msgid "use basic POSIX regular expressions (default)" msgstr "utiliser des expressions régulières basiques POSIX (par défaut)" -#: builtin/grep.c:815 +#: builtin/grep.c:817 msgid "interpret patterns as fixed strings" msgstr "interpréter les motifs comme de chaînes fixes" -#: builtin/grep.c:818 +#: builtin/grep.c:820 msgid "use Perl-compatible regular expressions" msgstr "utiliser des expressions régulières compatibles avec Perl" -#: builtin/grep.c:821 +#: builtin/grep.c:823 msgid "show line numbers" msgstr "afficher les numéros de ligne" -#: builtin/grep.c:822 +#: builtin/grep.c:824 msgid "don't show filenames" msgstr "ne pas pas afficher les noms de fichier" -#: builtin/grep.c:823 +#: builtin/grep.c:825 msgid "show filenames" msgstr "afficher les noms de fichier" -#: builtin/grep.c:825 +#: builtin/grep.c:827 msgid "show filenames relative to top directory" msgstr "afficher les noms de fichiers relativement au répertoire de base" -#: builtin/grep.c:827 +#: builtin/grep.c:829 msgid "show only filenames instead of matching lines" msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant" -#: builtin/grep.c:829 +#: builtin/grep.c:831 msgid "synonym for --files-with-matches" msgstr "synonyme pour --files-with-matches" -#: builtin/grep.c:832 +#: builtin/grep.c:834 msgid "show only the names of files without match" msgstr "n'afficher que les noms des fichiers sans correspondance" -#: builtin/grep.c:834 +#: builtin/grep.c:836 msgid "print NUL after filenames" msgstr "imprimer une caractère NUL après le noms de fichier" -#: builtin/grep.c:836 +#: builtin/grep.c:838 msgid "show the number of matches instead of matching lines" msgstr "afficher le nombre de correspondances au lieu des lignes correspondant" -#: builtin/grep.c:837 +#: builtin/grep.c:839 msgid "highlight matches" msgstr "mettre en évidence les correspondances" -#: builtin/grep.c:839 +#: builtin/grep.c:841 msgid "print empty line between matches from different files" msgstr "" "imprimer une ligne vide entre les correspondances de fichiers différents" -#: builtin/grep.c:841 +#: builtin/grep.c:843 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:844 +#: builtin/grep.c:846 msgid "show <n> context lines before and after matches" msgstr "afficher <n> lignes de contexte avant et après les correspondances" -#: builtin/grep.c:847 +#: builtin/grep.c:849 msgid "show <n> context lines before matches" msgstr "afficher <n> lignes de contexte avant les correspondances" -#: builtin/grep.c:849 +#: builtin/grep.c:851 msgid "show <n> context lines after matches" msgstr "afficher <n> lignes de contexte après les correspondances" -#: builtin/grep.c:851 +#: builtin/grep.c:853 msgid "use <n> worker threads" msgstr "utiliser <n> fils de travail" -#: builtin/grep.c:852 +#: builtin/grep.c:854 msgid "shortcut for -C NUM" msgstr "raccourci pour -C NUM" -#: builtin/grep.c:855 +#: builtin/grep.c:857 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:857 +#: builtin/grep.c:859 msgid "show the surrounding function" msgstr "afficher la fonction contenante" -#: builtin/grep.c:860 +#: builtin/grep.c:862 msgid "read patterns from file" msgstr "lire les motifs depuis fichier" -#: builtin/grep.c:862 +#: builtin/grep.c:864 msgid "match <pattern>" msgstr "rechercher <motif>" -#: builtin/grep.c:864 +#: builtin/grep.c:866 msgid "combine patterns specified with -e" msgstr "combiner les motifs spécifiés par -e" -#: builtin/grep.c:876 +#: builtin/grep.c:878 msgid "indicate hit with exit status without output" msgstr "" "indiquer des correspondances avec le code de sortie mais sans rien afficher" -#: builtin/grep.c:878 +#: builtin/grep.c:880 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:880 +#: builtin/grep.c:882 msgid "show parse tree for grep expression" msgstr "afficher l'arbre d'analyse pour le motif grep" -#: builtin/grep.c:884 +#: builtin/grep.c:886 msgid "pager" msgstr "pagineur" -#: builtin/grep.c:884 +#: builtin/grep.c:886 msgid "show matching files in the pager" msgstr "afficher les fichiers correspondant dans le pagineur" -#: builtin/grep.c:887 +#: builtin/grep.c:889 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permettre l'appel de grep(1) (ignoré par ce build)" -#: builtin/grep.c:950 +#: builtin/grep.c:952 msgid "no pattern given." msgstr "aucun motif fourni." -#: builtin/grep.c:982 +#: builtin/grep.c:984 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:989 +#: builtin/grep.c:991 #, c-format msgid "unable to resolve revision: %s" msgstr "impossible de résoudre la révision : %s" -#: builtin/grep.c:1023 builtin/index-pack.c:1491 +#: builtin/grep.c:1026 builtin/index-pack.c:1491 #, c-format msgid "invalid number of threads specified (%d)" msgstr "nombre de fils spécifié invalide (%d)" -#: builtin/grep.c:1028 +#: builtin/grep.c:1031 msgid "no threads support, ignoring --threads" msgstr "pas de support des fils, ignore --threads" -#: builtin/grep.c:1052 +#: builtin/grep.c:1055 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:1075 +#: builtin/grep.c:1078 msgid "option not supported with --recurse-submodules." msgstr "option non supportée avec --recurse-submodules." -#: builtin/grep.c:1081 +#: builtin/grep.c:1084 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:1087 +#: builtin/grep.c:1090 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:1095 +#: builtin/grep.c:1098 msgid "both --cached and trees are given." msgstr "--cached et des arbres sont fournis en même temps." @@ -9355,8 +9417,8 @@ msgstr "grave incohérence dans la décompression (inflate)" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "COLLISION SHA1 TROUVÉE AVEC %s !" -#: builtin/index-pack.c:752 builtin/pack-objects.c:168 -#: builtin/pack-objects.c:262 +#: builtin/index-pack.c:752 builtin/pack-objects.c:179 +#: builtin/pack-objects.c:273 #, c-format msgid "unable to read %s" msgstr "impossible de lire %s" @@ -9517,21 +9579,21 @@ msgstr[1] "longueur chaînée = %d : %lu objets" msgid "packfile name '%s' does not end with '.pack'" msgstr "le nom de fichier paquet '%s' ne se termine pas par '.pack'" -#: builtin/index-pack.c:1705 builtin/index-pack.c:1708 -#: builtin/index-pack.c:1724 builtin/index-pack.c:1728 +#: builtin/index-pack.c:1700 builtin/index-pack.c:1703 +#: builtin/index-pack.c:1719 builtin/index-pack.c:1723 #, c-format msgid "bad %s" msgstr "mauvais %s" -#: builtin/index-pack.c:1744 +#: builtin/index-pack.c:1739 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin ne peut pas être utilisé sans --stdin" -#: builtin/index-pack.c:1746 +#: builtin/index-pack.c:1741 msgid "--stdin requires a git repository" msgstr "--stdin requiert un dépôt git" -#: builtin/index-pack.c:1754 +#: builtin/index-pack.c:1749 msgid "--verify with no packfile name given" msgstr "--verify sans nom de fichier paquet donné" @@ -9728,101 +9790,109 @@ msgstr "git show [<options>] <objet>..." msgid "invalid --decorate option: %s" msgstr "option --decorate invalide : %s" -#: builtin/log.c:148 +#: builtin/log.c:151 msgid "suppress diff output" msgstr "supprimer la sortie des différences" -#: builtin/log.c:149 +#: builtin/log.c:152 msgid "show source" msgstr "afficher la source" -#: builtin/log.c:150 +#: builtin/log.c:153 msgid "Use mail map file" msgstr "Utiliser le fichier de correspondance de mail" -#: builtin/log.c:151 +#: builtin/log.c:155 +msgid "only decorate refs that match <pattern>" +msgstr "décorer seulement les références correspondant à <motif>" + +#: builtin/log.c:157 +msgid "do not decorate refs that match <pattern>" +msgstr "ne pas décorer les références correspondant à <motif>" + +#: builtin/log.c:158 msgid "decorate options" msgstr "décorer les options" -#: builtin/log.c:154 +#: builtin/log.c:161 msgid "Process line range n,m in file, counting from 1" msgstr "" "Traiter seulement l'intervalle de lignes n,m du fichier en commençant le " "compte à 1" -#: builtin/log.c:250 +#: builtin/log.c:257 #, c-format msgid "Final output: %d %s\n" msgstr "Sortie finale : %d %s\n" -#: builtin/log.c:501 +#: builtin/log.c:508 #, c-format msgid "git show %s: bad file" msgstr "git show %s : fichier incorrect" -#: builtin/log.c:516 builtin/log.c:610 +#: builtin/log.c:523 builtin/log.c:617 #, c-format msgid "Could not read object %s" msgstr "Impossible de lire l'objet %s" -#: builtin/log.c:634 +#: builtin/log.c:641 #, c-format msgid "Unknown type: %d" msgstr "Type inconnu : %d" -#: builtin/log.c:755 +#: builtin/log.c:762 msgid "format.headers without value" msgstr "format.headers sans valeur" -#: builtin/log.c:856 +#: builtin/log.c:863 msgid "name of output directory is too long" msgstr "le nom du répertoire de sortie est trop long" -#: builtin/log.c:872 +#: builtin/log.c:879 #, c-format msgid "Cannot open patch file %s" msgstr "Impossible d'ouvrir le fichier correctif %s" -#: builtin/log.c:889 +#: builtin/log.c:896 msgid "Need exactly one range." msgstr "Exactement une plage nécessaire." -#: builtin/log.c:899 +#: builtin/log.c:906 msgid "Not a range." msgstr "Ceci n'est pas une plage." -#: builtin/log.c:1005 +#: builtin/log.c:1012 msgid "Cover letter needs email format" msgstr "La lettre de motivation doit être au format courriel" -#: builtin/log.c:1085 +#: builtin/log.c:1092 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to aberrant : %s" -#: builtin/log.c:1112 +#: builtin/log.c:1119 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]" -#: builtin/log.c:1162 +#: builtin/log.c:1169 msgid "Two output directories?" msgstr "Deux répertoires de sortie ?" -#: builtin/log.c:1269 builtin/log.c:1920 builtin/log.c:1922 builtin/log.c:1934 +#: builtin/log.c:1276 builtin/log.c:1927 builtin/log.c:1929 builtin/log.c:1941 #, c-format msgid "Unknown commit %s" msgstr "Commit inconnu %s" -#: builtin/log.c:1279 builtin/notes.c:887 builtin/tag.c:516 +#: builtin/log.c:1286 builtin/notes.c:887 builtin/tag.c:516 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Impossible de résoudre '%s' comme une référence valide." -#: builtin/log.c:1284 +#: builtin/log.c:1291 msgid "Could not find exact merge base." msgstr "Impossible de trouver la base de fusion exacte." -#: builtin/log.c:1288 +#: builtin/log.c:1295 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" @@ -9835,230 +9905,230 @@ msgstr "" "ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> " "manuellement." -#: builtin/log.c:1308 +#: builtin/log.c:1315 msgid "Failed to find exact merge base" msgstr "Impossible de trouver la base de fusion exacte" -#: builtin/log.c:1319 +#: builtin/log.c:1326 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:1323 +#: builtin/log.c:1330 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:1372 +#: builtin/log.c:1379 msgid "cannot get patch id" msgstr "impossible d'obtenir l'id du patch" -#: builtin/log.c:1431 +#: builtin/log.c:1438 msgid "use [PATCH n/m] even with a single patch" msgstr "utiliser [PATCH n/m] même avec un patch unique" -#: builtin/log.c:1434 +#: builtin/log.c:1441 msgid "use [PATCH] even with multiple patches" msgstr "utiliser [PATCH] même avec des patchs multiples" -#: builtin/log.c:1438 +#: builtin/log.c:1445 msgid "print patches to standard out" msgstr "afficher les patchs sur la sortie standard" -#: builtin/log.c:1440 +#: builtin/log.c:1447 msgid "generate a cover letter" msgstr "générer une lettre de motivation" -#: builtin/log.c:1442 +#: builtin/log.c:1449 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:1443 +#: builtin/log.c:1450 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1444 +#: builtin/log.c:1451 msgid "use <sfx> instead of '.patch'" msgstr "utiliser <sfx> au lieu de '.patch'" -#: builtin/log.c:1446 +#: builtin/log.c:1453 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:1448 +#: builtin/log.c:1455 msgid "mark the series as Nth re-roll" msgstr "marquer la série comme une Nième réédition" -#: builtin/log.c:1450 +#: builtin/log.c:1457 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "utiliser [RFC PATCH] au lieu de [PATCH]" -#: builtin/log.c:1453 +#: builtin/log.c:1460 msgid "Use [<prefix>] instead of [PATCH]" msgstr "utiliser [<préfixe>] au lieu de [PATCH]" -#: builtin/log.c:1456 +#: builtin/log.c:1463 msgid "store resulting files in <dir>" msgstr "stocker les fichiers résultats dans <répertoire>" -#: builtin/log.c:1459 +#: builtin/log.c:1466 msgid "don't strip/add [PATCH]" msgstr "ne pas retirer/ajouter [PATCH]" -#: builtin/log.c:1462 +#: builtin/log.c:1469 msgid "don't output binary diffs" msgstr "ne pas imprimer les diffs binaires" -#: builtin/log.c:1464 +#: builtin/log.c:1471 msgid "output all-zero hash in From header" msgstr "écrire une empreinte à zéro dans l'entête From" -#: builtin/log.c:1466 +#: builtin/log.c:1473 msgid "don't include a patch matching a commit upstream" msgstr "ne pas inclure un patch correspondant à un commit amont" -#: builtin/log.c:1468 +#: builtin/log.c:1475 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:1470 +#: builtin/log.c:1477 msgid "Messaging" msgstr "Communication" -#: builtin/log.c:1471 +#: builtin/log.c:1478 msgid "header" msgstr "en-tête" -#: builtin/log.c:1472 +#: builtin/log.c:1479 msgid "add email header" msgstr "ajouter l'en-tête de courriel" -#: builtin/log.c:1473 builtin/log.c:1475 +#: builtin/log.c:1480 builtin/log.c:1482 msgid "email" msgstr "courriel" -#: builtin/log.c:1473 +#: builtin/log.c:1480 msgid "add To: header" msgstr "ajouter l'en-tête \"To:\"" -#: builtin/log.c:1475 +#: builtin/log.c:1482 msgid "add Cc: header" msgstr "ajouter l'en-tête \"Cc:\"" -#: builtin/log.c:1477 +#: builtin/log.c:1484 msgid "ident" msgstr "ident" -#: builtin/log.c:1478 +#: builtin/log.c:1485 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:1480 +#: builtin/log.c:1487 msgid "message-id" msgstr "id-message" -#: builtin/log.c:1481 +#: builtin/log.c:1488 msgid "make first mail a reply to <message-id>" msgstr "répondre dans le premier message à <id-message>" -#: builtin/log.c:1482 builtin/log.c:1485 +#: builtin/log.c:1489 builtin/log.c:1492 msgid "boundary" msgstr "limite" -#: builtin/log.c:1483 +#: builtin/log.c:1490 msgid "attach the patch" msgstr "attacher le patch" -#: builtin/log.c:1486 +#: builtin/log.c:1493 msgid "inline the patch" msgstr "patch à l'intérieur" -#: builtin/log.c:1490 +#: builtin/log.c:1497 msgid "enable message threading, styles: shallow, deep" msgstr "" "activer l'enfilage de message, styles : shallow (superficiel), deep (profond)" -#: builtin/log.c:1492 +#: builtin/log.c:1499 msgid "signature" msgstr "signature" -#: builtin/log.c:1493 +#: builtin/log.c:1500 msgid "add a signature" msgstr "ajouter une signature" -#: builtin/log.c:1494 +#: builtin/log.c:1501 msgid "base-commit" msgstr "commit-de-base" -#: builtin/log.c:1495 +#: builtin/log.c:1502 msgid "add prerequisite tree info to the patch series" msgstr "Ajouter un arbre prérequis à la série de patchs" -#: builtin/log.c:1497 +#: builtin/log.c:1504 msgid "add a signature from a file" msgstr "ajouter une signature depuis un fichier" -#: builtin/log.c:1498 +#: builtin/log.c:1505 msgid "don't print the patch filenames" msgstr "ne pas afficher les noms de fichiers des patchs" -#: builtin/log.c:1500 +#: builtin/log.c:1507 msgid "show progress while generating patches" msgstr "" "afficher la barre de progression durant la phase de génération des patchs" -#: builtin/log.c:1575 +#: builtin/log.c:1582 #, c-format msgid "invalid ident line: %s" msgstr "ligne d'identification invalide : %s" -#: builtin/log.c:1590 +#: builtin/log.c:1597 msgid "-n and -k are mutually exclusive." msgstr "-n et -k sont mutuellement exclusifs." -#: builtin/log.c:1592 +#: builtin/log.c:1599 msgid "--subject-prefix/--rfc and -k are mutually exclusive." msgstr "--subject-prefix/--rfc et -k sont mutuellement exclusifs." -#: builtin/log.c:1600 +#: builtin/log.c:1607 msgid "--name-only does not make sense" msgstr "--name-only n'a pas de sens" -#: builtin/log.c:1602 +#: builtin/log.c:1609 msgid "--name-status does not make sense" msgstr "--name-status n'a pas de sens" -#: builtin/log.c:1604 +#: builtin/log.c:1611 msgid "--check does not make sense" msgstr "--check n'a pas de sens" -#: builtin/log.c:1634 +#: builtin/log.c:1641 msgid "standard output, or directory, which one?" msgstr "sortie standard, ou répertoire, lequel ?" -#: builtin/log.c:1636 +#: builtin/log.c:1643 #, c-format msgid "Could not create directory '%s'" msgstr "Impossible de créer le répertoire '%s'" -#: builtin/log.c:1729 +#: builtin/log.c:1736 #, c-format msgid "unable to read signature file '%s'" msgstr "lecture du fichier de signature '%s' impossible" -#: builtin/log.c:1761 +#: builtin/log.c:1768 msgid "Generating patches" msgstr "Génération des patchs" -#: builtin/log.c:1805 +#: builtin/log.c:1812 msgid "Failed to create output files" msgstr "Échec de création des fichiers en sortie" -#: builtin/log.c:1855 +#: builtin/log.c:1862 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]" -#: builtin/log.c:1909 +#: builtin/log.c:1916 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -10066,106 +10136,110 @@ msgstr "" "Impossible de trouver une branche distante suivie, merci de spécifier " "<branche_amont> manuellement.\n" -#: builtin/ls-files.c:466 +#: builtin/ls-files.c:468 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<options>] [<fichier>...]" -#: builtin/ls-files.c:515 +#: builtin/ls-files.c:517 msgid "identify the file status with tags" msgstr "identifier l'état de fichier avec les étiquettes" -#: builtin/ls-files.c:517 +#: builtin/ls-files.c:519 msgid "use lowercase letters for 'assume unchanged' files" -msgstr "utiliser des minuscules pour les fichier 'assumés inchangés'" +msgstr "utiliser des minuscules pour les fichiers 'assumés inchangés'" -#: builtin/ls-files.c:519 +#: builtin/ls-files.c:521 +msgid "use lowercase letters for 'fsmonitor clean' files" +msgstr "utiliser des minuscules pour les fichiers 'fsmonitor clean'" + +#: builtin/ls-files.c:523 msgid "show cached files in the output (default)" msgstr "afficher les fichiers mis en cache dans la sortie (défaut)" -#: builtin/ls-files.c:521 +#: builtin/ls-files.c:525 msgid "show deleted files in the output" msgstr "afficher les fichiers supprimés dans la sortie" -#: builtin/ls-files.c:523 +#: builtin/ls-files.c:527 msgid "show modified files in the output" msgstr "afficher les fichiers modifiés dans la sortie" -#: builtin/ls-files.c:525 +#: builtin/ls-files.c:529 msgid "show other files in the output" msgstr "afficher les autres fichiers dans la sortie" -#: builtin/ls-files.c:527 +#: builtin/ls-files.c:531 msgid "show ignored files in the output" msgstr "afficher les fichiers ignorés dans la sortie" -#: builtin/ls-files.c:530 +#: builtin/ls-files.c:534 msgid "show staged contents' object name in the output" msgstr "afficher les nom des objets indexés dans la sortie" -#: builtin/ls-files.c:532 +#: builtin/ls-files.c:536 msgid "show files on the filesystem that need to be removed" msgstr "" "afficher les fichiers du système de fichiers qui ont besoin d'être supprimés" -#: builtin/ls-files.c:534 +#: builtin/ls-files.c:538 msgid "show 'other' directories' names only" msgstr "afficher seulement les noms des répertoires 'other'" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:540 msgid "show line endings of files" msgstr "afficher les fins de lignes des fichiers" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:542 msgid "don't show empty directories" msgstr "ne pas afficher les répertoires vides" -#: builtin/ls-files.c:541 +#: builtin/ls-files.c:545 msgid "show unmerged files in the output" msgstr "afficher les fichiers non fusionnés dans la sortie" -#: builtin/ls-files.c:543 +#: builtin/ls-files.c:547 msgid "show resolve-undo information" msgstr "afficher l'information resolv-undo" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:549 msgid "skip files matching pattern" msgstr "sauter les fichiers correspondant au motif" -#: builtin/ls-files.c:548 +#: builtin/ls-files.c:552 msgid "exclude patterns are read from <file>" msgstr "les motifs d'exclusion sont lus depuis <fichier>" -#: builtin/ls-files.c:551 +#: builtin/ls-files.c:555 msgid "read additional per-directory exclude patterns in <file>" msgstr "lire des motifs d'exclusion additionnels par répertoire dans <fichier>" -#: builtin/ls-files.c:553 +#: builtin/ls-files.c:557 msgid "add the standard git exclusions" msgstr "ajouter les exclusions git standard" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:560 msgid "make the output relative to the project top directory" msgstr "afficher en relatif par rapport au répertoire racine du projet" -#: builtin/ls-files.c:559 +#: builtin/ls-files.c:563 msgid "recurse through submodules" msgstr "parcourir récursivement les sous-modules" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:565 msgid "if any <file> is not in the index, treat this as an error" msgstr "si un <fichier> n'est pas dans l'index, traiter cela comme une erreur" -#: builtin/ls-files.c:562 +#: builtin/ls-files.c:566 msgid "tree-ish" msgstr "arbre ou apparenté" -#: builtin/ls-files.c:563 +#: builtin/ls-files.c:567 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "considérer que les chemins supprimés depuis <arbre ou apparenté> sont " "toujours présents" -#: builtin/ls-files.c:565 +#: builtin/ls-files.c:569 msgid "show debugging data" msgstr "afficher les données de débogage" @@ -10291,33 +10365,33 @@ msgstr "Les stratégies disponibles sont :" msgid "Available custom strategies are:" msgstr "Les stratégies personnalisées sont :" -#: builtin/merge.c:200 builtin/pull.c:134 +#: builtin/merge.c:200 builtin/pull.c:137 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:203 builtin/pull.c:137 +#: builtin/merge.c:203 builtin/pull.c:140 msgid "show a diffstat at the end of the merge" msgstr "afficher un diffstat à la fin de la fusion" -#: builtin/merge.c:204 builtin/pull.c:140 +#: builtin/merge.c:204 builtin/pull.c:143 msgid "(synonym to --stat)" msgstr "(synonyme de --stat)" -#: builtin/merge.c:206 builtin/pull.c:143 +#: builtin/merge.c:206 builtin/pull.c:146 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:209 builtin/pull.c:146 +#: builtin/merge.c:209 builtin/pull.c:152 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:211 builtin/pull.c:149 +#: builtin/merge.c:211 builtin/pull.c:155 msgid "perform a commit if the merge succeeds (default)" msgstr "effectuer une validation si la fusion réussit (défaut)" -#: builtin/merge.c:213 builtin/pull.c:152 +#: builtin/merge.c:213 builtin/pull.c:158 msgid "edit message before committing" msgstr "éditer le message avant la validation" @@ -10325,28 +10399,28 @@ msgstr "éditer le message avant la validation" msgid "allow fast-forward (default)" msgstr "autoriser l'avance rapide (défaut)" -#: builtin/merge.c:216 builtin/pull.c:158 +#: builtin/merge.c:216 builtin/pull.c:164 msgid "abort if fast-forward is not possible" msgstr "abandonner si l'avance rapide n'est pas possible" -#: builtin/merge.c:220 builtin/pull.c:161 +#: builtin/merge.c:220 builtin/pull.c:167 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:221 builtin/notes.c:777 builtin/pull.c:165 +#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:171 #: builtin/revert.c:109 msgid "strategy" msgstr "stratégie" -#: builtin/merge.c:222 builtin/pull.c:166 +#: builtin/merge.c:222 builtin/pull.c:172 msgid "merge strategy to use" msgstr "stratégie de fusion à utiliser" -#: builtin/merge.c:223 builtin/pull.c:169 +#: builtin/merge.c:223 builtin/pull.c:175 msgid "option=value" msgstr "option=valeur" -#: builtin/merge.c:224 builtin/pull.c:170 +#: builtin/merge.c:224 builtin/pull.c:176 msgid "option for selected merge strategy" msgstr "option pour la stratégie de fusion sélectionnée" @@ -10363,7 +10437,7 @@ msgstr "abandonner la fusion en cours" msgid "continue the current in-progress merge" msgstr "continuer la fusion en cours" -#: builtin/merge.c:234 builtin/pull.c:177 +#: builtin/merge.c:234 builtin/pull.c:183 msgid "allow merging unrelated histories" msgstr "permettre la fusion d'historiques sans rapport" @@ -10402,43 +10476,43 @@ msgstr "Validation compressée -- HEAD non mise à jour\n" msgid "No merge message -- not updating HEAD\n" msgstr "Pas de message de fusion -- pas de mise à jour de HEAD\n" -#: builtin/merge.c:456 +#: builtin/merge.c:455 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' ne pointe pas sur un commit" -#: builtin/merge.c:546 +#: builtin/merge.c:545 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s" -#: builtin/merge.c:666 +#: builtin/merge.c:667 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:680 +#: builtin/merge.c:681 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Options inconnue pour merge-recursive : -X%s" -#: builtin/merge.c:695 +#: builtin/merge.c:696 #, c-format msgid "unable to write %s" msgstr "impossible d'écrire %s" -#: builtin/merge.c:747 +#: builtin/merge.c:748 #, c-format msgid "Could not read from '%s'" msgstr "Impossible de lire depuis '%s'" -#: builtin/merge.c:756 +#: builtin/merge.c:757 #, 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:762 +#: builtin/merge.c:763 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -10455,70 +10529,70 @@ msgstr "" "Les lignes commençant par '%c' seront ignorées, et un message vide\n" "abandonne la validation.\n" -#: builtin/merge.c:798 +#: builtin/merge.c:799 msgid "Empty commit message." msgstr "Message de validation vide." -#: builtin/merge.c:818 +#: builtin/merge.c:819 #, c-format msgid "Wonderful.\n" msgstr "Merveilleux.\n" -#: builtin/merge.c:871 +#: builtin/merge.c:872 #, 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:910 +#: builtin/merge.c:911 msgid "No current branch." msgstr "Pas de branche courante." -#: builtin/merge.c:912 +#: builtin/merge.c:913 msgid "No remote for the current branch." msgstr "Pas de branche distante pour la branche courante." -#: builtin/merge.c:914 +#: builtin/merge.c:915 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:919 +#: builtin/merge.c:920 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Pas de branche de suivi pour %s depuis %s" -#: builtin/merge.c:972 +#: builtin/merge.c:973 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Mauvaise valeur '%s' dans l'environnement '%s'" -#: builtin/merge.c:1073 +#: builtin/merge.c:1075 #, c-format msgid "not something we can merge in %s: %s" msgstr "pas possible de fusionner ceci dans %s : %s" -#: builtin/merge.c:1107 +#: builtin/merge.c:1109 msgid "not something we can merge" msgstr "pas possible de fusionner ceci" -#: builtin/merge.c:1172 +#: builtin/merge.c:1174 msgid "--abort expects no arguments" msgstr "--abort n'accepte pas d'argument" -#: builtin/merge.c:1176 +#: builtin/merge.c:1178 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:1188 +#: builtin/merge.c:1190 msgid "--continue expects no arguments" msgstr "--continue ne supporte aucun argument" -#: builtin/merge.c:1192 +#: builtin/merge.c:1194 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:1208 +#: builtin/merge.c:1210 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10526,7 +10600,7 @@ msgstr "" "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n" "Veuillez valider vos modifications avant de pouvoir fusionner." -#: builtin/merge.c:1215 +#: builtin/merge.c:1217 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10534,114 +10608,114 @@ msgstr "" "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n" "Veuillez valider vos modifications avant de pouvoir fusionner." -#: builtin/merge.c:1218 +#: builtin/merge.c:1220 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:1227 +#: builtin/merge.c:1229 msgid "You cannot combine --squash with --no-ff." msgstr "Vous ne pouvez pas combiner --squash avec --no-ff." -#: builtin/merge.c:1235 +#: builtin/merge.c:1237 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:1252 +#: builtin/merge.c:1254 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:1254 +#: builtin/merge.c:1256 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:1259 +#: builtin/merge.c:1261 #, c-format msgid "%s - not something we can merge" msgstr "%s - pas possible de fusionner ceci" -#: builtin/merge.c:1261 +#: builtin/merge.c:1263 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:1295 +#: builtin/merge.c:1297 #, 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." -#: builtin/merge.c:1298 +#: builtin/merge.c:1300 #, 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." -#: builtin/merge.c:1301 +#: builtin/merge.c:1303 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "La validation %s n'a pas de signature GPG." -#: builtin/merge.c:1304 +#: builtin/merge.c:1306 #, 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" -#: builtin/merge.c:1366 +#: builtin/merge.c:1368 msgid "refusing to merge unrelated histories" msgstr "refus de fusionner des historiques sans relation" -#: builtin/merge.c:1375 +#: builtin/merge.c:1377 msgid "Already up to date." msgstr "Déjà à jour." -#: builtin/merge.c:1385 +#: builtin/merge.c:1387 #, c-format msgid "Updating %s..%s\n" msgstr "Mise à jour %s..%s\n" -#: builtin/merge.c:1426 +#: builtin/merge.c:1428 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Essai de fusion vraiment triviale dans l'index...\n" -#: builtin/merge.c:1433 +#: builtin/merge.c:1435 #, c-format msgid "Nope.\n" msgstr "Non.\n" -#: builtin/merge.c:1458 +#: builtin/merge.c:1460 msgid "Already up to date. Yeeah!" msgstr "Déjà à jour. Ouais !" -#: builtin/merge.c:1464 +#: builtin/merge.c:1466 msgid "Not possible to fast-forward, aborting." msgstr "Pas possible d'avancer rapidement, abandon." -#: builtin/merge.c:1487 builtin/merge.c:1566 +#: builtin/merge.c:1489 builtin/merge.c:1568 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Retour de l'arbre à l'original...\n" -#: builtin/merge.c:1491 +#: builtin/merge.c:1493 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Essai de la stratégie de fusion %s...\n" -#: builtin/merge.c:1557 +#: builtin/merge.c:1559 #, 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:1559 +#: builtin/merge.c:1561 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "La fusion avec la stratégie %s a échoué.\n" -#: builtin/merge.c:1568 +#: builtin/merge.c:1570 #, 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:1580 +#: builtin/merge.c:1582 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -10667,23 +10741,23 @@ msgstr "git merge-base --is-ancestor <validation> <validation>" msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point <référence> [<validation>]" -#: builtin/merge-base.c:218 +#: builtin/merge-base.c:220 msgid "output all common ancestors" msgstr "afficher tous les ancêtres communs" -#: builtin/merge-base.c:220 +#: builtin/merge-base.c:222 msgid "find ancestors for a single n-way merge" msgstr "trouver les ancêtres pour une fusion simple à n points" -#: builtin/merge-base.c:222 +#: builtin/merge-base.c:224 msgid "list revs not reachable from others" msgstr "afficher les révisions inaccessibles depuis les autres" -#: builtin/merge-base.c:224 +#: builtin/merge-base.c:226 msgid "is the first one ancestor of the other?" msgstr "est le premier ancêtre de l'autre ?" -#: builtin/merge-base.c:226 +#: builtin/merge-base.c:228 msgid "find where <commit> forked from reflog of <ref>" msgstr "trouver où <validation> a divergé du reflog de <référence>" @@ -10966,8 +11040,8 @@ msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "git notes [--ref <références-notes>] remove [<objet>...]" #: builtin/notes.c:36 -msgid "git notes [--ref <notes-ref>] prune [-n | -v]" -msgstr "git notes [--ref <références-notes>] prune [-n | -v]" +msgid "git notes [--ref <notes-ref>] prune [-n] [-v]" +msgstr "git notes [--ref <référence-notes>] prune [-n] [-v]" #: builtin/notes.c:37 msgid "git notes [--ref <notes-ref>] get-ref" @@ -11309,7 +11383,7 @@ msgstr "" msgid "read object names from the standard input" msgstr "lire les noms d'objet depuis l'entrée standard" -#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:146 +#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:158 msgid "do not remove, show only" msgstr "ne pas supprimer, afficher seulement" @@ -11330,200 +11404,208 @@ msgstr "utiliser les notes depuis <références-notes>" msgid "unknown subcommand: %s" msgstr "sous-commande inconnue : %s" -#: builtin/pack-objects.c:31 +#: builtin/pack-objects.c:33 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [options...] [< <liste-références> | < <liste-" "objets>]" -#: builtin/pack-objects.c:32 +#: builtin/pack-objects.c:34 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [options...] base-name [< <liste-références> | < <liste-" "objets>]" -#: builtin/pack-objects.c:181 builtin/pack-objects.c:184 +#: builtin/pack-objects.c:192 builtin/pack-objects.c:195 #, c-format msgid "deflate error (%d)" msgstr "erreur de compression (%d)" -#: builtin/pack-objects.c:777 +#: builtin/pack-objects.c:788 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "désactivation de l'écriture en bitmap, les fichiers paquets sont scindés à " "cause de pack.packSizeLimit" -#: builtin/pack-objects.c:790 +#: builtin/pack-objects.c:801 msgid "Writing objects" msgstr "Écriture des objets" -#: builtin/pack-objects.c:1070 +#: builtin/pack-objects.c:1081 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:2440 +#: builtin/pack-objects.c:2451 msgid "Compressing objects" msgstr "Compression des objets" -#: builtin/pack-objects.c:2849 +#: builtin/pack-objects.c:2599 +msgid "invalid value for --missing" +msgstr "valeur invalide pour --missing" + +#: builtin/pack-objects.c:2902 #, c-format msgid "unsupported index version %s" msgstr "version d'index non supportée %s" -#: builtin/pack-objects.c:2853 +#: builtin/pack-objects.c:2906 #, c-format msgid "bad index version '%s'" msgstr "mauvaise version d'index '%s'" -#: builtin/pack-objects.c:2883 +#: builtin/pack-objects.c:2936 msgid "do not show progress meter" msgstr "ne pas afficher la barre de progression" -#: builtin/pack-objects.c:2885 +#: builtin/pack-objects.c:2938 msgid "show progress meter" msgstr "afficher la barre de progression" -#: builtin/pack-objects.c:2887 +#: builtin/pack-objects.c:2940 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:2890 +#: builtin/pack-objects.c:2943 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:2891 +#: builtin/pack-objects.c:2944 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2892 +#: builtin/pack-objects.c:2945 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:2895 +#: builtin/pack-objects.c:2948 msgid "maximum size of each output pack file" msgstr "taille maximum de chaque fichier paquet en sortie" -#: builtin/pack-objects.c:2897 +#: builtin/pack-objects.c:2950 msgid "ignore borrowed objects from alternate object store" msgstr "ignorer les objets empruntés à un autre magasin d'objets" -#: builtin/pack-objects.c:2899 +#: builtin/pack-objects.c:2952 msgid "ignore packed objects" msgstr "ignorer les objets empaquetés" -#: builtin/pack-objects.c:2901 +#: builtin/pack-objects.c:2954 msgid "limit pack window by objects" msgstr "limiter la fenêtre d'empaquetage par objets" -#: builtin/pack-objects.c:2903 +#: builtin/pack-objects.c:2956 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:2905 +#: builtin/pack-objects.c:2958 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:2907 +#: builtin/pack-objects.c:2960 msgid "reuse existing deltas" msgstr "réutiliser les deltas existants" -#: builtin/pack-objects.c:2909 +#: builtin/pack-objects.c:2962 msgid "reuse existing objects" msgstr "réutiliser les objets existants" -#: builtin/pack-objects.c:2911 +#: builtin/pack-objects.c:2964 msgid "use OFS_DELTA objects" msgstr "utiliser les objets OFS_DELTA" -#: builtin/pack-objects.c:2913 +#: builtin/pack-objects.c:2966 msgid "use threads when searching for best delta matches" msgstr "" "utiliser des fils lors de la recherche pour une meilleurs correspondance des " "deltas" -#: builtin/pack-objects.c:2915 +#: builtin/pack-objects.c:2968 msgid "do not create an empty pack output" msgstr "ne pas créer un paquet vide" -#: builtin/pack-objects.c:2917 +#: builtin/pack-objects.c:2970 msgid "read revision arguments from standard input" msgstr "lire les paramètres de révision depuis l'entrée standard" -#: builtin/pack-objects.c:2919 +#: builtin/pack-objects.c:2972 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:2922 +#: builtin/pack-objects.c:2975 msgid "include objects reachable from any reference" msgstr "inclure les objets accessibles depuis toute référence" -#: builtin/pack-objects.c:2925 +#: builtin/pack-objects.c:2978 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:2928 +#: builtin/pack-objects.c:2981 msgid "include objects referred to by the index" msgstr "inclure les objets référencés par l'index" -#: builtin/pack-objects.c:2931 +#: builtin/pack-objects.c:2984 msgid "output pack to stdout" msgstr "afficher l'empaquetage sur la sortie standard" -#: builtin/pack-objects.c:2933 +#: builtin/pack-objects.c:2986 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:2935 +#: builtin/pack-objects.c:2988 msgid "keep unreachable objects" msgstr "garder les objets inaccessibles" -#: builtin/pack-objects.c:2937 +#: builtin/pack-objects.c:2990 msgid "pack loose unreachable objects" msgstr "empaqueter les objets inaccessibles détachés" -#: builtin/pack-objects.c:2939 +#: builtin/pack-objects.c:2992 msgid "unpack unreachable objects newer than <time>" msgstr "dépaqueter les objets inaccessibles plus récents que <heure>" -#: builtin/pack-objects.c:2942 +#: builtin/pack-objects.c:2995 msgid "create thin packs" msgstr "créer des paquets légers" -#: builtin/pack-objects.c:2944 +#: builtin/pack-objects.c:2997 msgid "create packs suitable for shallow fetches" msgstr "créer des paquets permettant des récupérations superficielles" -#: builtin/pack-objects.c:2946 +#: builtin/pack-objects.c:2999 msgid "ignore packs that have companion .keep file" msgstr "ignorer les paquets qui ont un fichier .keep" -#: builtin/pack-objects.c:2948 +#: builtin/pack-objects.c:3001 msgid "pack compression level" msgstr "niveau de compression du paquet" -#: builtin/pack-objects.c:2950 +#: builtin/pack-objects.c:3003 msgid "do not hide commits by grafts" msgstr "ne pas cacher les validations par greffes" -#: builtin/pack-objects.c:2952 +#: builtin/pack-objects.c:3005 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:2954 +#: builtin/pack-objects.c:3007 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:3081 +#: builtin/pack-objects.c:3010 +msgid "handling for missing objects" +msgstr "gestion des objets manquants" + +#: builtin/pack-objects.c:3144 msgid "Counting objects" msgstr "Décompte des objets" @@ -11548,8 +11630,8 @@ msgid "Removing duplicate objects" msgstr "Suppression des objets dupliqués" #: builtin/prune.c:11 -msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" -msgstr "git prune [-n] [-v] [--expire <heure>] [--] [<head>...]" +msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" +msgstr "git prune [-n] [-v] [--progress] [--expire <heure>] [--] [<head>…]" #: builtin/prune.c:106 msgid "report pruned objects" @@ -11572,40 +11654,40 @@ 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:124 +#: builtin/pull.c:127 msgid "control for recursive fetching of submodules" msgstr "contrôler la récupération récursive dans les sous-modules" -#: builtin/pull.c:128 +#: builtin/pull.c:131 msgid "Options related to merging" msgstr "Options relatives à la fusion" -#: builtin/pull.c:131 +#: builtin/pull.c:134 msgid "incorporate changes by rebasing rather than merging" msgstr "incorporer les modifications en rebasant plutôt qu'en fusionnant" -#: builtin/pull.c:155 builtin/rebase--helper.c:21 builtin/revert.c:121 +#: builtin/pull.c:161 builtin/rebase--helper.c:23 builtin/revert.c:121 msgid "allow fast-forward" msgstr "autoriser l'avance rapide" -#: builtin/pull.c:164 +#: builtin/pull.c:170 msgid "automatically stash/stash pop before and after rebase" msgstr "remiser avant et réappliquer après le rebasage automatiquement" -#: builtin/pull.c:180 +#: builtin/pull.c:186 msgid "Options related to fetching" msgstr "Options relatives au rapatriement" -#: builtin/pull.c:198 +#: builtin/pull.c:204 msgid "number of submodules pulled in parallel" msgstr "nombre de sous-modules tirés en parallèle" -#: builtin/pull.c:287 +#: builtin/pull.c:299 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Valeur invalide pour pull.ff : %s" -#: builtin/pull.c:403 +#: builtin/pull.c:415 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -11613,14 +11695,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:405 +#: builtin/pull.c:417 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:406 +#: builtin/pull.c:418 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -11628,7 +11710,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:409 +#: builtin/pull.c:421 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -11640,44 +11722,44 @@ msgstr "" "configuration\n" "pour la branche actuelle, vous devez spécifier la branche avec la commande." -#: builtin/pull.c:414 git-parse-remote.sh:73 +#: builtin/pull.c:426 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Vous n'êtes actuellement sur aucune branche." -#: builtin/pull.c:416 builtin/pull.c:431 git-parse-remote.sh:79 +#: builtin/pull.c:428 builtin/pull.c:443 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:418 builtin/pull.c:433 git-parse-remote.sh:82 +#: builtin/pull.c:430 builtin/pull.c:445 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:419 builtin/pull.c:434 +#: builtin/pull.c:431 builtin/pull.c:446 msgid "See git-pull(1) for details." msgstr "Référez-vous à git-pull(1) pour de plus amples détails." -#: builtin/pull.c:421 builtin/pull.c:427 builtin/pull.c:436 +#: builtin/pull.c:433 builtin/pull.c:439 builtin/pull.c:448 #: git-parse-remote.sh:64 msgid "<remote>" msgstr "<distant>" -#: builtin/pull.c:421 builtin/pull.c:436 builtin/pull.c:441 git-rebase.sh:466 +#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:466 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<branche>" -#: builtin/pull.c:429 git-parse-remote.sh:75 +#: builtin/pull.c:441 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:438 git-parse-remote.sh:95 +#: builtin/pull.c:450 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:443 +#: builtin/pull.c:455 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -11687,29 +11769,29 @@ msgstr "" "'%s'\n" "du serveur distant, mais cette référence n'a pas été récupérée." -#: builtin/pull.c:796 +#: builtin/pull.c:817 msgid "ignoring --verify-signatures for rebase" msgstr "--verify-signatures est ignoré pour un rebasage" -#: builtin/pull.c:844 +#: builtin/pull.c:865 msgid "--[no-]autostash option is only valid with --rebase." msgstr "l'option --[no-]autostash n'est valide qu'avec --rebase." -#: builtin/pull.c:852 +#: builtin/pull.c:873 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:855 +#: builtin/pull.c:876 msgid "pull with rebase" msgstr "tirer avec un rebasage" -#: builtin/pull.c:856 +#: builtin/pull.c:877 msgid "please commit or stash them." msgstr "veuillez les valider ou les remiser." -#: builtin/pull.c:881 +#: builtin/pull.c:902 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -11720,7 +11802,7 @@ msgstr "" "avance rapide de votre copie de travail\n" "depuis le commit %s." -#: builtin/pull.c:886 +#: builtin/pull.c:907 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -11737,15 +11819,15 @@ msgstr "" "$ git reset --hard\n" "pour régénérer." -#: builtin/pull.c:901 +#: builtin/pull.c:922 msgid "Cannot merge multiple branches into empty head." msgstr "Impossible de fusionner de multiples branches sur une tête vide." -#: builtin/pull.c:905 +#: builtin/pull.c:926 msgid "Cannot rebase onto multiple branches." msgstr "Impossible de rebaser sur de multiples branches." -#: builtin/pull.c:912 +#: builtin/pull.c:933 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "impossible de rebaser avec des modifications de sous-modules enregistrées " @@ -11755,15 +11837,15 @@ msgstr "" msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<options>] [<dépôt> [<spécification-de-référence>...]]" -#: builtin/push.c:90 +#: builtin/push.c:92 msgid "tag shorthand without <tag>" msgstr "raccourci d'étiquette sans <étiquette>" -#: builtin/push.c:100 +#: builtin/push.c:102 msgid "--delete only accepts plain target ref names" msgstr "--delete accepte seulement des noms entiers de références cibles" -#: builtin/push.c:144 +#: builtin/push.c:146 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -11772,7 +11854,7 @@ msgstr "" "Pour choisir l'option de manière permanente, voir push.default dans 'git " "help config'." -#: builtin/push.c:147 +#: builtin/push.c:149 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -11797,7 +11879,7 @@ msgstr "" " git push %s %s\n" "%s" -#: builtin/push.c:162 +#: builtin/push.c:164 #, c-format msgid "" "You are not currently on a branch.\n" @@ -11812,7 +11894,7 @@ msgstr "" "\n" " git push %s HEAD:<nom-de-la-branche-amont>\n" -#: builtin/push.c:176 +#: builtin/push.c:178 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -11826,13 +11908,13 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:184 +#: builtin/push.c:186 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" "La branche courante %s a de multiples branches amont, impossible de pousser." -#: builtin/push.c:187 +#: builtin/push.c:189 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -11843,14 +11925,14 @@ msgstr "" "pas une branche amont de votre branche courante '%s', sans me dire\n" "quoi pousser pour mettre à jour quelle branche amont." -#: builtin/push.c:246 +#: builtin/push.c:248 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "Vous n'avez pas spécifié de spécifications de référence à pousser, et push." "default est \"nothing\"." -#: builtin/push.c:253 +#: builtin/push.c:255 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -11865,7 +11947,7 @@ msgstr "" "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus " "d'information." -#: builtin/push.c:259 +#: builtin/push.c:261 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -11880,7 +11962,7 @@ msgstr "" "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus " "d'information." -#: builtin/push.c:265 +#: builtin/push.c:267 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -11898,13 +11980,13 @@ msgstr "" "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus " "d'information." -#: builtin/push.c:272 +#: builtin/push.c:274 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" "Les mises à jour ont été rejetées car l'étiquette existe déjà dans la " "branche distante." -#: builtin/push.c:275 +#: builtin/push.c:277 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -11916,22 +11998,22 @@ msgstr "" "pointer\n" "vers un objet qui n'est pas un commit, sans utiliser l'option '--force'.\n" -#: builtin/push.c:335 +#: builtin/push.c:337 #, c-format msgid "Pushing to %s\n" msgstr "Poussée vers %s\n" -#: builtin/push.c:339 +#: builtin/push.c:341 #, c-format msgid "failed to push some refs to '%s'" msgstr "impossible de pousser des références vers '%s'" -#: builtin/push.c:370 +#: builtin/push.c:372 #, c-format msgid "bad repository '%s'" msgstr "mauvais dépôt '%s'" -#: builtin/push.c:371 +#: builtin/push.c:373 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -11953,113 +12035,113 @@ msgstr "" "\n" " git push <nom>\n" -#: builtin/push.c:389 +#: builtin/push.c:391 msgid "--all and --tags are incompatible" msgstr "--all et --tags sont incompatibles" -#: builtin/push.c:390 +#: builtin/push.c:392 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:395 +#: builtin/push.c:397 msgid "--mirror and --tags are incompatible" msgstr "--mirror et --tags sont incompatibles" -#: builtin/push.c:396 +#: builtin/push.c:398 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:401 +#: builtin/push.c:403 msgid "--all and --mirror are incompatible" msgstr "--all et --mirror sont incompatibles" -#: builtin/push.c:523 +#: builtin/push.c:535 msgid "repository" msgstr "dépôt" -#: builtin/push.c:524 builtin/send-pack.c:163 +#: builtin/push.c:536 builtin/send-pack.c:163 msgid "push all refs" msgstr "pousser toutes les références" -#: builtin/push.c:525 builtin/send-pack.c:165 +#: builtin/push.c:537 builtin/send-pack.c:165 msgid "mirror all refs" msgstr "refléter toutes les références" -#: builtin/push.c:527 +#: builtin/push.c:539 msgid "delete refs" msgstr "supprimer les références" -#: builtin/push.c:528 +#: builtin/push.c:540 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:531 builtin/send-pack.c:166 +#: builtin/push.c:543 builtin/send-pack.c:166 msgid "force updates" msgstr "forcer les mises à jour" -#: builtin/push.c:533 builtin/send-pack.c:180 +#: builtin/push.c:545 builtin/send-pack.c:180 msgid "refname>:<expect" msgstr "nom de référence>:<attendu" -#: builtin/push.c:534 builtin/send-pack.c:181 +#: builtin/push.c:546 builtin/send-pack.c:181 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:537 +#: builtin/push.c:549 msgid "control recursive pushing of submodules" msgstr "contrôler la poussée récursive des sous-modules" -#: builtin/push.c:539 builtin/send-pack.c:174 +#: builtin/push.c:551 builtin/send-pack.c:174 msgid "use thin pack" msgstr "utiliser un empaquetage léger" -#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160 +#: builtin/push.c:552 builtin/push.c:553 builtin/send-pack.c:160 #: builtin/send-pack.c:161 msgid "receive pack program" msgstr "recevoir le programme d'empaquetage" -#: builtin/push.c:542 +#: builtin/push.c:554 msgid "set upstream for git pull/status" msgstr "définir la branche amont pour git pull/status" -#: builtin/push.c:545 +#: builtin/push.c:557 msgid "prune locally removed refs" msgstr "éliminer les références locales supprimées" -#: builtin/push.c:547 +#: builtin/push.c:559 msgid "bypass pre-push hook" msgstr "éviter d'utiliser le crochet pre-push" -#: builtin/push.c:548 +#: builtin/push.c:560 msgid "push missing but relevant tags" msgstr "pousser les étiquettes manquantes mais pertinentes" -#: builtin/push.c:551 builtin/send-pack.c:168 +#: builtin/push.c:563 builtin/send-pack.c:168 msgid "GPG sign the push" msgstr "signer la poussée avec GPG" -#: builtin/push.c:553 builtin/send-pack.c:175 +#: builtin/push.c:565 builtin/send-pack.c:175 msgid "request atomic transaction on remote side" msgstr "demande une transaction atomique sur le serveur distant" -#: builtin/push.c:554 builtin/send-pack.c:171 +#: builtin/push.c:566 builtin/send-pack.c:171 msgid "server-specific" msgstr "spécifique au serveur" -#: builtin/push.c:554 builtin/send-pack.c:172 +#: builtin/push.c:566 builtin/send-pack.c:172 msgid "option to transmit" msgstr "option à transmettre" -#: builtin/push.c:568 +#: builtin/push.c:583 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete est incompatible avec --all, --mirror et --tags" -#: builtin/push.c:570 +#: builtin/push.c:585 msgid "--delete doesn't make sense without any refs" msgstr "--delete n'a pas de sens sans aucune référence" -#: builtin/push.c:589 +#: builtin/push.c:604 msgid "push options must not have new line characters" msgstr "" "les options de poussée ne peuvent pas contenir de caractères de nouvelle " @@ -12144,47 +12226,51 @@ msgstr "déboguer unpack-trees" msgid "git rebase--helper [<options>]" msgstr "git rebase-helper [<options>]" -#: builtin/rebase--helper.c:22 +#: builtin/rebase--helper.c:24 msgid "keep empty commits" msgstr "garder les validations vides" -#: builtin/rebase--helper.c:23 +#: builtin/rebase--helper.c:25 msgid "continue rebase" msgstr "continuer le rebasage" -#: builtin/rebase--helper.c:25 +#: builtin/rebase--helper.c:27 msgid "abort rebase" msgstr "abandonner le rebasage" -#: builtin/rebase--helper.c:28 +#: builtin/rebase--helper.c:30 msgid "make rebase script" msgstr "créer les script de rebasage" -#: builtin/rebase--helper.c:30 -msgid "shorten SHA-1s in the todo list" -msgstr "raccourcir les SHA-1 dans la liste à-faire" - #: builtin/rebase--helper.c:32 -msgid "expand SHA-1s in the todo list" -msgstr "étendre les SHA-1 dans la liste à-faire" +msgid "shorten commit ids in the todo list" +msgstr "raccourcir les identifiants de commits dans la liste à-faire" #: builtin/rebase--helper.c:34 +msgid "expand commit ids in the todo list" +msgstr "étendre les identifiants de commit dans la liste à-faire" + +#: builtin/rebase--helper.c:36 msgid "check the todo list" msgstr "vérifier la liste à-faire" -#: builtin/rebase--helper.c:36 +#: builtin/rebase--helper.c:38 msgid "skip unnecessary picks" msgstr "éviter les commandes de picorage non nécessaires" -#: builtin/rebase--helper.c:38 +#: builtin/rebase--helper.c:40 msgid "rearrange fixup/squash lines" msgstr "réarranger les lignes fixup/squash" -#: builtin/receive-pack.c:29 +#: builtin/rebase--helper.c:42 +msgid "insert exec commands in todo list" +msgstr "insérer les commandes exec dans la liste à-faire" + +#: builtin/receive-pack.c:30 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <répertoire-git>" -#: builtin/receive-pack.c:839 +#: builtin/receive-pack.c:840 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" @@ -12214,7 +12300,7 @@ msgstr "" "Pour éliminer ce message et conserver le comportement par défaut,\n" "réglez « receive.denyCurrentBranch » à 'refuse'." -#: builtin/receive-pack.c:859 +#: builtin/receive-pack.c:860 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" @@ -12234,20 +12320,15 @@ msgstr "" "\n" "Pour éliminer ce message, réglez-le à 'refuse'." -#: builtin/receive-pack.c:1932 +#: builtin/receive-pack.c:1933 msgid "quiet" msgstr "quiet" -#: builtin/receive-pack.c:1946 +#: builtin/receive-pack.c:1947 msgid "You must specify a directory." msgstr "Vous devez spécifier un répertoire." -#: builtin/reflog.c:424 -#, c-format -msgid "'%s' for '%s' is not a valid timestamp" -msgstr "'%s' pour '%s' n'est pas un horodatage valide" - -#: builtin/reflog.c:541 builtin/reflog.c:546 +#: builtin/reflog.c:531 builtin/reflog.c:536 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' n'est pas un horodatage valide" @@ -12863,7 +12944,7 @@ msgstr "impossible de supprimer les paquets dans un dépôt d'objets précieux" msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable et -A sont incompatibles" -#: builtin/repack.c:406 builtin/worktree.c:134 +#: builtin/repack.c:406 builtin/worktree.c:146 #, c-format msgid "failed to remove '%s'" msgstr "échec de la suppression de '%s'" @@ -13093,10 +13174,23 @@ 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:361 +#: builtin/rev-list.c:399 +msgid "object filtering requires --objects" +msgstr "le filtrage d'objet exige --objects" + +#: builtin/rev-list.c:402 +#, c-format +msgid "invalid sparse value '%s'" +msgstr "valeur invalide de 'sparse' '%s'" + +#: builtin/rev-list.c:442 msgid "rev-list does not support display of notes" msgstr "rev-list ne supporte l'affichage des notes" +#: builtin/rev-list.c:445 +msgid "cannot combine --use-bitmap-index with object filtering" +msgstr "impossible de combiner --use-bitmap-index avec le filtrage d'objet" + #: builtin/rev-parse.c:402 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<options>] -- [<arguments>...]" @@ -13558,35 +13652,35 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "ajouter devant chaque ligne le caractère de commentaire et un espace" -#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1094 +#: builtin/submodule--helper.c:34 builtin/submodule--helper.c:1332 #, c-format msgid "No such ref: %s" msgstr "Référence inexistante : %s" -#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1103 +#: builtin/submodule--helper.c:41 builtin/submodule--helper.c:1341 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Nom de référence complet attendu, %s obtenu" -#: builtin/submodule--helper.c:71 +#: builtin/submodule--helper.c:81 #, c-format msgid "cannot strip one component off url '%s'" msgstr "impossible de supprimer un composant de l'URL '%s'" -#: builtin/submodule--helper.c:302 builtin/submodule--helper.c:623 +#: builtin/submodule--helper.c:370 builtin/submodule--helper.c:861 msgid "alternative anchor for relative paths" msgstr "ancre alternative pour les chemins relatifs" -#: builtin/submodule--helper.c:307 +#: builtin/submodule--helper.c:375 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]" -#: builtin/submodule--helper.c:350 builtin/submodule--helper.c:374 +#: builtin/submodule--helper.c:426 builtin/submodule--helper.c:449 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "URL non trouvée pour le chemin de sous-module '%s' dans .gitmodules" -#: builtin/submodule--helper.c:389 +#: builtin/submodule--helper.c:464 #, c-format msgid "" "could not lookup configuration '%s'. Assuming this repository is its own " @@ -13595,86 +13689,114 @@ msgstr "" "impossible de trouver la configuration '%s'. Ce dépôt est considéré comme " "son propre amont d'autorité." -#: builtin/submodule--helper.c:400 +#: builtin/submodule--helper.c:475 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Échec d'enregistrement de l'URL pour le chemin de sous-module '%s'" -#: builtin/submodule--helper.c:404 +#: builtin/submodule--helper.c:479 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Sous-module '%s' (%s) enregistré pour le chemin '%s'\n" -#: builtin/submodule--helper.c:414 +#: builtin/submodule--helper.c:489 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "" "attention : nous vous suggérons de spécifier une commande de mode de mise à " "jour pour le sous-module '%s'\n" -#: builtin/submodule--helper.c:421 +#: builtin/submodule--helper.c:496 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" "Échec d'enregistrement du mode de mise à jour pour le chemin de sous-module " "'%s'" -#: builtin/submodule--helper.c:437 +#: builtin/submodule--helper.c:518 msgid "Suppress output for initializing a submodule" msgstr "Supprimer la sortie lors de l'initialisation d'un sous-module" -#: builtin/submodule--helper.c:442 +#: builtin/submodule--helper.c:523 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper init [<chemin>]" -#: builtin/submodule--helper.c:470 -msgid "git submodule--helper name <path>" -msgstr "git submodule--helper <nom> <chemin>" - -#: builtin/submodule--helper.c:475 +#: builtin/submodule--helper.c:591 builtin/submodule--helper.c:713 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "" "Pas de mise en correspondance du sous-module trouvé dans .gitmodules pour le " "chemin '%s'" -#: builtin/submodule--helper.c:558 builtin/submodule--helper.c:561 +#: builtin/submodule--helper.c:626 +#, c-format +msgid "could not resolve HEAD ref inside the submodule '%s'" +msgstr "impossible de résoudre HEAD dans le sous-module '%s'" + +#: builtin/submodule--helper.c:653 +#, c-format +msgid "failed to recurse into submodule '%s'" +msgstr "récursion impossible dans le sous-module '%s'" + +#: builtin/submodule--helper.c:677 +msgid "Suppress submodule status output" +msgstr "supprimer la sortie d'état du sous-module" + +#: builtin/submodule--helper.c:678 +msgid "" +"Use commit stored in the index instead of the one stored in the submodule " +"HEAD" +msgstr "Utiliser le commit stocké dans l'index au lieu de celui stocké dans la HEAD du sous-module" + +#: builtin/submodule--helper.c:679 +msgid "recurse into nested submodules" +msgstr "parcourir récursivement les sous-modules" + +#: builtin/submodule--helper.c:684 +msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" +msgstr "git submodule status [--quiet] [--cached] [--recursive] [<chemin>...]" + +#: builtin/submodule--helper.c:708 +msgid "git submodule--helper name <path>" +msgstr "git submodule--helper <nom> <chemin>" + +#: builtin/submodule--helper.c:796 builtin/submodule--helper.c:799 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "le sous-module '%s' ne peut pas ajouter d'alternative : %s" -#: builtin/submodule--helper.c:597 +#: builtin/submodule--helper.c:835 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "" "La valeur '%s' pour submodule.alternateErrorStrategy n'est pas reconnue" -#: builtin/submodule--helper.c:604 +#: builtin/submodule--helper.c:842 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "La valeur '%s' pour submodule.alternateLocation n'est pas reconnue" -#: builtin/submodule--helper.c:626 +#: builtin/submodule--helper.c:864 msgid "where the new submodule will be cloned to" msgstr "emplacement où le sous-module sera cloné" -#: builtin/submodule--helper.c:629 +#: builtin/submodule--helper.c:867 msgid "name of the new submodule" msgstr "nom du nouveau sous-module" -#: builtin/submodule--helper.c:632 +#: builtin/submodule--helper.c:870 msgid "url where to clone the submodule from" msgstr "URL depuis laquelle cloner le sous-module" -#: builtin/submodule--helper.c:638 +#: builtin/submodule--helper.c:876 msgid "depth for shallow clones" msgstr "profondeur de l'historique des clones superficiels" -#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:1012 +#: builtin/submodule--helper.c:879 builtin/submodule--helper.c:1250 msgid "force cloning progress" msgstr "forcer l'affichage de la progression du clonage" -#: builtin/submodule--helper.c:646 +#: builtin/submodule--helper.c:884 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -13682,83 +13804,83 @@ msgstr "" "git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference " "<dépôt>] [--name <nom>] [--depth <profondeur>] --url <url> --path <chemin>" -#: builtin/submodule--helper.c:677 +#: builtin/submodule--helper.c:915 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "Le clonage de '%s' dans le chemin de sous-module '%s' a échoué" -#: builtin/submodule--helper.c:692 +#: builtin/submodule--helper.c:930 #, c-format msgid "could not get submodule directory for '%s'" msgstr "impossible de créer le répertoire de sous-module pour '%s'" -#: builtin/submodule--helper.c:757 +#: builtin/submodule--helper.c:995 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Le chemin de sous-module '%s' n'est pas initialisé" -#: builtin/submodule--helper.c:761 +#: builtin/submodule--helper.c:999 msgid "Maybe you want to use 'update --init'?" msgstr "Vous voudriez sûrement utiliser 'update --init' ?" -#: builtin/submodule--helper.c:790 +#: builtin/submodule--helper.c:1028 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Sous-module non fusionné %s non traité" -#: builtin/submodule--helper.c:819 +#: builtin/submodule--helper.c:1057 #, c-format msgid "Skipping submodule '%s'" msgstr "Sous-module '%s' non traité" -#: builtin/submodule--helper.c:952 +#: builtin/submodule--helper.c:1190 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Impossible de cloner '%s'. Réessai prévu" -#: builtin/submodule--helper.c:963 +#: builtin/submodule--helper.c:1201 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Impossible de cloner '%s' pour la seconde fois, abandon" -#: builtin/submodule--helper.c:993 builtin/submodule--helper.c:1213 +#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1451 msgid "path into the working tree" msgstr "chemin dans la copie de travail" -#: builtin/submodule--helper.c:996 +#: builtin/submodule--helper.c:1234 msgid "path into the working tree, across nested submodule boundaries" msgstr "" "chemin dans la copie de travail, traversant les frontières de sous-modules" -#: builtin/submodule--helper.c:1000 +#: builtin/submodule--helper.c:1238 msgid "rebase, merge, checkout or none" msgstr "valeurs possibles : rebase, merge, checkout ou none" -#: builtin/submodule--helper.c:1004 +#: builtin/submodule--helper.c:1242 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "Créer un clone superficiel tronqué au nombre de révisions spécifié" -#: builtin/submodule--helper.c:1007 +#: builtin/submodule--helper.c:1245 msgid "parallel jobs" msgstr "jobs parallèles" -#: builtin/submodule--helper.c:1009 +#: builtin/submodule--helper.c:1247 msgid "whether the initial clone should follow the shallow recommendation" msgstr "spécifie si le clonage initial doit être aussi superficiel" -#: builtin/submodule--helper.c:1010 +#: builtin/submodule--helper.c:1248 msgid "don't print cloning progress" msgstr "ne pas afficher la progression du clonage" -#: builtin/submodule--helper.c:1017 +#: builtin/submodule--helper.c:1255 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update_clone [--prefix=<chemin>] [<chemin>...]" -#: builtin/submodule--helper.c:1030 +#: builtin/submodule--helper.c:1268 msgid "bad value for update parameter" msgstr "valeur invalide pour la mise à jour du paramètre" -#: builtin/submodule--helper.c:1098 +#: builtin/submodule--helper.c:1336 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -13767,20 +13889,20 @@ msgstr "" "la branche du sous-module %s est configurée pour hériter de la branche du " "superprojet, mais le superprojet n'est sur aucune branche" -#: builtin/submodule--helper.c:1214 +#: builtin/submodule--helper.c:1452 msgid "recurse into submodules" msgstr "parcourir récursivement les sous-modules" -#: builtin/submodule--helper.c:1220 +#: builtin/submodule--helper.c:1458 msgid "git submodule--helper embed-git-dir [<path>...]" msgstr "git submodule--helper embed-git-dir [<chemin>...]" -#: builtin/submodule--helper.c:1278 +#: builtin/submodule--helper.c:1517 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s ne gère pas --super-prefix" -#: builtin/submodule--helper.c:1284 +#: builtin/submodule--helper.c:1523 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' n'est pas une sous-commande valide de submodule--helper" @@ -14023,198 +14145,214 @@ msgstr "Étiquette '%s' mise à jour (elle était sur %s)\n" msgid "Unpacking objects" msgstr "Dépaquetage des objets" -#: builtin/update-index.c:80 +#: builtin/update-index.c:82 #, c-format msgid "failed to create directory %s" msgstr "échec de la création du répertoire %s" -#: builtin/update-index.c:86 +#: builtin/update-index.c:88 #, c-format msgid "failed to stat %s" msgstr "échec du stat de %s" -#: builtin/update-index.c:96 +#: builtin/update-index.c:98 #, c-format msgid "failed to create file %s" msgstr "échec de la création du fichier %s" -#: builtin/update-index.c:104 +#: builtin/update-index.c:106 #, c-format msgid "failed to delete file %s" msgstr "échec de la suppression du fichier %s" -#: builtin/update-index.c:111 builtin/update-index.c:217 +#: builtin/update-index.c:113 builtin/update-index.c:219 #, c-format msgid "failed to delete directory %s" msgstr "échec de la suppression du répertoire %s" -#: builtin/update-index.c:136 +#: builtin/update-index.c:138 #, c-format msgid "Testing mtime in '%s' " msgstr "Test du mtime dans '%s' " -#: builtin/update-index.c:150 +#: builtin/update-index.c:152 msgid "directory stat info does not change after adding a new file" msgstr "" "l'information de stat du répertoire ne change pas après ajout d'un fichier" -#: builtin/update-index.c:163 +#: builtin/update-index.c:165 msgid "directory stat info does not change after adding a new directory" msgstr "" "l'information de stat du répertoire ne change pas après ajout d'un répertoire" -#: builtin/update-index.c:176 +#: builtin/update-index.c:178 msgid "directory stat info changes after updating a file" msgstr "" "l'information de stat du répertoire change après mise à jour d'un fichier" -#: builtin/update-index.c:187 +#: builtin/update-index.c:189 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "" "l'information de stat du répertoire change après l'ajout d'un fichier dans " "un sous-répertoire" -#: builtin/update-index.c:198 +#: builtin/update-index.c:200 msgid "directory stat info does not change after deleting a file" msgstr "" "l'information de stat du répertoire ne change pas après la suppression d'un " "fichier<" -#: builtin/update-index.c:211 +#: builtin/update-index.c:213 msgid "directory stat info does not change after deleting a directory" msgstr "" "l'information de stat du répertoire ne change pas après la suppression d'un " "répertoire" -#: builtin/update-index.c:218 +#: builtin/update-index.c:220 msgid " OK" msgstr " OK" -#: builtin/update-index.c:571 +#: builtin/update-index.c:579 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<options>] [--] [<fichier>...]" -#: builtin/update-index.c:926 +#: builtin/update-index.c:936 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:929 +#: builtin/update-index.c:939 msgid "refresh: ignore submodules" msgstr "rafraîchir : ignorer les sous-modules" -#: builtin/update-index.c:932 +#: builtin/update-index.c:942 msgid "do not ignore new files" msgstr "ne pas ignorer les nouveaux fichiers" -#: builtin/update-index.c:934 +#: builtin/update-index.c:944 msgid "let files replace directories and vice-versa" msgstr "laisser les fichiers remplacer des répertoires et vice-versa" -#: builtin/update-index.c:936 +#: builtin/update-index.c:946 msgid "notice files missing from worktree" msgstr "aviser des fichiers manquants dans la copie de travail" -#: builtin/update-index.c:938 +#: builtin/update-index.c:948 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:941 +#: builtin/update-index.c:951 msgid "refresh stat information" msgstr "rafraîchir l'information de stat" -#: builtin/update-index.c:945 +#: builtin/update-index.c:955 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "comme --refresh, mais en ignorant l'option assume-unchanged" -#: builtin/update-index.c:949 +#: builtin/update-index.c:959 msgid "<mode>,<object>,<path>" msgstr "<mode>, <objet>, <chemin>" -#: builtin/update-index.c:950 +#: builtin/update-index.c:960 msgid "add the specified entry to the index" msgstr "ajouter l'élément spécifié dans l'index" -#: builtin/update-index.c:959 +#: builtin/update-index.c:969 msgid "mark files as \"not changing\"" msgstr "marquer les fichiers comme \"non changeants\"" -#: builtin/update-index.c:962 +#: builtin/update-index.c:972 msgid "clear assumed-unchanged bit" msgstr "mettre à zéro le bit supposé-non-modifié" -#: builtin/update-index.c:965 +#: builtin/update-index.c:975 msgid "mark files as \"index-only\"" msgstr "marquer les fichiers comme \"index seulement\"" -#: builtin/update-index.c:968 +#: builtin/update-index.c:978 msgid "clear skip-worktree bit" msgstr "mettre à zéro le bit sauter-la-copie-de travail" -#: builtin/update-index.c:971 +#: builtin/update-index.c:981 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:973 +#: builtin/update-index.c:983 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:975 +#: builtin/update-index.c:985 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:977 +#: builtin/update-index.c:987 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:981 +#: builtin/update-index.c:991 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:985 +#: builtin/update-index.c:995 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:989 +#: builtin/update-index.c:999 msgid "only update entries that differ from HEAD" msgstr "mettre à jour seulement les éléments qui diffèrent de HEAD" -#: builtin/update-index.c:993 +#: builtin/update-index.c:1003 msgid "ignore files missing from worktree" msgstr "ignorer les fichiers manquants dans la copie de travail" -#: builtin/update-index.c:996 +#: builtin/update-index.c:1006 msgid "report actions to standard output" msgstr "afficher les actions sur la sortie standard" -#: builtin/update-index.c:998 +#: builtin/update-index.c:1008 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(pour porcelaines) oublier les conflits sauvés et non résolus" -#: builtin/update-index.c:1002 +#: builtin/update-index.c:1012 msgid "write index in this format" msgstr "écrire l'index dans ce format" -#: builtin/update-index.c:1004 +#: builtin/update-index.c:1014 msgid "enable or disable split index" msgstr "activer ou désactiver l'index divisé" -#: builtin/update-index.c:1006 +#: builtin/update-index.c:1016 msgid "enable/disable untracked cache" msgstr "activer ou désactiver le cache de non-suivis" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1018 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:1010 +#: builtin/update-index.c:1020 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:1107 +#: builtin/update-index.c:1022 +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:1024 +msgid "enable or disable file system monitor" +msgstr "activer ou désactiver la surveillance du système de fichier (fsmonitor)" + +#: builtin/update-index.c:1026 +msgid "mark files as fsmonitor valid" +msgstr "marquer les fichiers comme valides pour fsmonitor" + +#: builtin/update-index.c:1029 +msgid "clear fsmonitor valid bit" +msgstr "effacer le bit de validité fsmonitor" + +#: builtin/update-index.c:1127 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -14222,7 +14360,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:1116 +#: builtin/update-index.c:1136 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -14230,7 +14368,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:1127 +#: builtin/update-index.c:1147 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -14238,11 +14376,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:1131 +#: builtin/update-index.c:1151 msgid "Untracked cache disabled" msgstr "Le cache non suivi est désactivé" -#: builtin/update-index.c:1139 +#: builtin/update-index.c:1159 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -14250,11 +14388,28 @@ 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:1143 +#: builtin/update-index.c:1163 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Le cache non suivi est activé pour '%s'" +#: builtin/update-index.c:1171 +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:1175 +msgid "fsmonitor enabled" +msgstr "fsmonitor activé" + +#: builtin/update-index.c:1178 +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:1182 +msgid "fsmonitor disabled" +msgstr "fsmonitor désactivé" + #: builtin/update-ref.c:10 msgid "git update-ref [<options>] -d <refname> [<old-val>]" msgstr "git update-ref [<options>] -d <nom-référence> [<ancienne-valeur>]" @@ -14325,43 +14480,43 @@ msgstr "git verify-tag [-v | --verbose] [--format=<format>] <étiquette>..." msgid "print tag contents" msgstr "afficher le contenu de l'étiquette" -#: builtin/worktree.c:16 +#: builtin/worktree.c:17 msgid "git worktree add [<options>] <path> [<branch>]" msgstr "git worktree add [<options>] <chemin> [<branche>]" -#: builtin/worktree.c:17 +#: builtin/worktree.c:18 msgid "git worktree list [<options>]" -msgstr "git worktree prune [<options>]" +msgstr "git worktree list [<options>]" -#: builtin/worktree.c:18 +#: builtin/worktree.c:19 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<options>] <chemin>" -#: builtin/worktree.c:19 +#: builtin/worktree.c:20 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<options>]" -#: builtin/worktree.c:20 +#: builtin/worktree.c:21 msgid "git worktree unlock <path>" msgstr "git worktree unlock <chemin>" -#: builtin/worktree.c:46 +#: builtin/worktree.c:58 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Suppression de worktrees/%s : répertoire invalide" -#: builtin/worktree.c:52 +#: builtin/worktree.c:64 #, 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:57 builtin/worktree.c:66 +#: builtin/worktree.c:69 builtin/worktree.c:78 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "" "Suppression de worktrees/%s : echec de la lecture du fichier gitdir (%s)" -#: builtin/worktree.c:76 +#: builtin/worktree.c:88 #, c-format msgid "" "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " @@ -14370,92 +14525,104 @@ msgstr "" "Suppression de worktrees/%s: lecture trop courte ( %<PRIuMAX> octets " "attendus, %<PRIuMAX> octets lus)" -#: builtin/worktree.c:84 +#: builtin/worktree.c:96 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Suppression de worktrees/%s : fichier gitdir invalide" -#: builtin/worktree.c:100 +#: builtin/worktree.c:112 #, 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:147 +#: builtin/worktree.c:159 msgid "report pruned working trees" msgstr "afficher les arbres de travail éliminés" -#: builtin/worktree.c:149 +#: builtin/worktree.c:161 msgid "expire working trees older than <time>" msgstr "faire expirer les arbres de travail plus vieux que <temps>" -#: builtin/worktree.c:223 +#: builtin/worktree.c:236 #, c-format msgid "'%s' already exists" msgstr "'%s' existe déjà" -#: builtin/worktree.c:254 +#: builtin/worktree.c:267 #, c-format msgid "could not create directory of '%s'" msgstr "impossible de créer le répertoire de '%s'" -#: builtin/worktree.c:293 +#: builtin/worktree.c:306 #, c-format msgid "Preparing %s (identifier %s)" msgstr "Préparation de %s (identifiant %s)" -#: builtin/worktree.c:345 +#: builtin/worktree.c:368 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:347 +#: builtin/worktree.c:370 msgid "create a new branch" msgstr "créer une nouvelle branche" -#: builtin/worktree.c:349 +#: builtin/worktree.c:372 msgid "create or reset a branch" msgstr "créer ou réinitialiser une branche" -#: builtin/worktree.c:351 +#: builtin/worktree.c:374 msgid "populate the new working tree" msgstr "remplissage de la nouvelle copie de travail" -#: builtin/worktree.c:352 +#: builtin/worktree.c:375 msgid "keep the new working tree locked" msgstr "conserver le verrou sur le nouvel arbre de travail" -#: builtin/worktree.c:360 +#: builtin/worktree.c:377 +msgid "set up tracking mode (see git-branch(1))" +msgstr "régler le mode de suivi (voir git-branch(1))" + +#: builtin/worktree.c:380 +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:388 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B et --detach sont mutuellement exclusifs" -#: builtin/worktree.c:499 +#: builtin/worktree.c:453 +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:553 msgid "reason for locking" msgstr "raison du verrouillage" -#: builtin/worktree.c:511 builtin/worktree.c:544 +#: builtin/worktree.c:565 builtin/worktree.c:598 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' n'est pas une copie de travail" -#: builtin/worktree.c:513 builtin/worktree.c:546 +#: builtin/worktree.c:567 builtin/worktree.c:600 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:518 +#: builtin/worktree.c:572 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' est déjà verrouillé, car '%s'" -#: builtin/worktree.c:520 +#: builtin/worktree.c:574 #, c-format msgid "'%s' is already locked" msgstr "'%s' est déjà verrouillé" -#: builtin/worktree.c:548 +#: builtin/worktree.c:602 #, c-format msgid "'%s' is not locked" msgstr "'%s' n'est pas verrouillé" @@ -14476,25 +14643,25 @@ msgstr "écrire l'objet arbre pour un sous-répertoire <préfixe>" msgid "only useful for debugging" msgstr "seulement utile pour le débogage" -#: upload-pack.c:23 +#: upload-pack.c:24 msgid "git upload-pack [<options>] <dir>" msgstr "git upload-pack [<options>] <répertoire>" -#: upload-pack.c:1040 +#: upload-pack.c:1041 msgid "quit after a single request/response exchange" msgstr "quitter après un unique échange requête/réponse" -#: upload-pack.c:1042 +#: upload-pack.c:1043 msgid "exit immediately after initial ref advertisement" msgstr "Sortir immédiatement après l'annonce initiale des références" -#: upload-pack.c:1044 +#: upload-pack.c:1045 msgid "do not try <directory>/.git/ if <directory> is no Git directory" msgstr "" "nes pas essayer <répertoire>/.git/ si <répertoire> n'est pas un répertoire " "Git" -#: upload-pack.c:1046 +#: upload-pack.c:1047 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "interrompre le transfert après <n> secondes d'inactivité" @@ -14525,21 +14692,21 @@ msgstr "" "quelques concepts. Voir 'git help <commande>' ou 'git help <concept>'\n" "pour en lire plus à propos d'une commande spécifique ou d'un concept." -#: http.c:338 +#: http.c:339 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "" "valeur négative pour http.postbuffer ; utilisation de la valeur par défaut %d" -#: http.c:359 +#: http.c:360 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "La délégation de commande n'est pas supporté avec cuRL < 7.22.0" -#: http.c:368 +#: http.c:369 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:1768 +#: http.c:1791 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -14555,6 +14722,14 @@ msgstr "" msgid "redirecting to %s" msgstr "redirection vers %s" +#: list-objects-filter-options.h:54 +msgid "args" +msgstr "args" + +#: list-objects-filter-options.h:55 +msgid "object filtering" +msgstr "filtrage d'objet" + #: common-cmds.h:9 msgid "start a working area (see also: git help tutorial)" msgstr "démarrer une zone de travail (voir aussi : git help tutorial)" @@ -14734,27 +14909,27 @@ msgstr "Mauvaise HEAD - référence symbolique douteuse" msgid "Bad bisect_write argument: $state" msgstr "Mauvais argument pour bisect_write : $state" -#: git-bisect.sh:262 +#: git-bisect.sh:246 #, sh-format msgid "Bad rev input: $arg" msgstr "Mauvaise révision en entrée : $arg" -#: git-bisect.sh:281 +#: git-bisect.sh:265 #, sh-format msgid "Bad rev input: $bisected_head" msgstr "Mauvaise révision en entrée : $bisected_head" -#: git-bisect.sh:290 +#: git-bisect.sh:274 #, sh-format msgid "Bad rev input: $rev" msgstr "Mauvaise révision en entrée : $rev" -#: git-bisect.sh:299 +#: git-bisect.sh:283 #, sh-format msgid "'git bisect $TERM_BAD' can take only one argument." msgstr "'git bisect $TERM_BAD' n'accepte qu'un seul argument." -#: git-bisect.sh:322 +#: git-bisect.sh:306 #, sh-format msgid "Warning: bisecting only with a $TERM_BAD commit." msgstr "Attention : bissection avec seulement une validation $TERM_BAD." @@ -14762,11 +14937,11 @@ msgstr "Attention : bissection avec seulement une validation $TERM_BAD." #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. -#: git-bisect.sh:328 +#: git-bisect.sh:312 msgid "Are you sure [Y/n]? " msgstr "Confirmez-vous [Y/n] ? " -#: git-bisect.sh:340 +#: git-bisect.sh:324 #, sh-format msgid "" "You need to give me at least one $bad_syn and one $good_syn revision.\n" @@ -14777,7 +14952,7 @@ msgstr "" "(Vous pouvez utiliser \"git bisect $bad_syn\" et \"git bisect $good_syn\" " "pour cela.)" -#: git-bisect.sh:343 +#: git-bisect.sh:327 #, sh-format msgid "" "You need to start by \"git bisect start\".\n" @@ -14790,16 +14965,16 @@ msgstr "" "(Vous pouvez utiliser \"git bisect $bad_syn\" et \"git bisect $good_syn\" " "pour cela.)" -#: git-bisect.sh:414 git-bisect.sh:546 +#: git-bisect.sh:398 git-bisect.sh:512 msgid "We are not bisecting." msgstr "Pas de bissection en cours." -#: git-bisect.sh:421 +#: git-bisect.sh:405 #, sh-format msgid "'$invalid' is not a valid commit" msgstr "'$invalid' n'est pas une validation valide" -#: git-bisect.sh:430 +#: git-bisect.sh:414 #, sh-format msgid "" "Could not check out original HEAD '$branch'.\n" @@ -14808,25 +14983,29 @@ msgstr "" "Échec d'extraction de la HEAD d'origine '$branch'.\n" "Essayez 'git bisect reset <commit>'." -#: git-bisect.sh:458 +#: git-bisect.sh:422 msgid "No logfile given" msgstr "Pas de fichier de log donné" -#: git-bisect.sh:459 +#: git-bisect.sh:423 #, sh-format msgid "cannot read $file for replaying" msgstr "impossible de lire $file pour rejouer" -#: git-bisect.sh:480 +#: git-bisect.sh:444 msgid "?? what are you talking about?" msgstr "?? de quoi parlez-vous ?" -#: git-bisect.sh:492 +#: git-bisect.sh:453 +msgid "bisect run failed: no command provided." +msgstr "la bissection a échoué : aucune commande fournie." + +#: git-bisect.sh:458 #, sh-format msgid "running $command" msgstr "lancement de $command" -#: git-bisect.sh:499 +#: git-bisect.sh:465 #, sh-format msgid "" "bisect run failed:\n" @@ -14835,11 +15014,11 @@ msgstr "" "la bissection a échoué :\n" "le code retour $res de '$command' est < 0 ou >= 128" -#: git-bisect.sh:525 +#: git-bisect.sh:491 msgid "bisect run cannot continue any more" msgstr "la bissection ne peut plus continuer" -#: git-bisect.sh:531 +#: git-bisect.sh:497 #, sh-format msgid "" "bisect run failed:\n" @@ -14848,41 +15027,22 @@ msgstr "" "la bissection a échoué :\n" "'bisect_state $state' a retourné le code erreur $res" -#: git-bisect.sh:538 +#: git-bisect.sh:504 msgid "bisect run success" msgstr "succès de la bissection" -#: git-bisect.sh:565 -msgid "please use two different terms" -msgstr "veuillez utiliser deux termes différents" - -#: git-bisect.sh:575 -#, sh-format -msgid "'$term' is not a valid term" -msgstr "'$term' n'est pas un terme valide" - -#: git-bisect.sh:578 -#, sh-format -msgid "can't use the builtin command '$term' as a term" -msgstr "impossible d'utiliser la commande incluse '$term' comme terme" - -#: git-bisect.sh:587 git-bisect.sh:593 -#, sh-format -msgid "can't change the meaning of term '$term'" -msgstr "impossible de modifier la signification du terme '$term'" - -#: git-bisect.sh:606 +#: git-bisect.sh:533 #, sh-format msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect." msgstr "" "Commande invalide : vous êtes actuellement dans une bissection $TERM_BAD/" "$TERM_GOOD." -#: git-bisect.sh:636 +#: git-bisect.sh:567 msgid "no terms defined" msgstr "aucun terme défini" -#: git-bisect.sh:653 +#: git-bisect.sh:584 #, sh-format msgid "" "invalid argument $arg for 'git bisect terms'.\n" @@ -14965,8 +15125,8 @@ msgid "The pre-rebase hook refused to rebase." msgstr "Le crochet pre-rebase a refusé de rebaser." #: git-rebase.sh:219 -msgid "It looks like git-am is in progress. Cannot rebase." -msgstr "Il semble que git-am soit en cours. Impossible de rebaser." +msgid "It looks like 'git am' is in progress. Cannot rebase." +msgstr "Il semble que 'git-am' soit en cours. Impossible de rebaser." #: git-rebase.sh:363 msgid "No rebase in progress?" @@ -15014,8 +15174,8 @@ msgstr "" #: git-rebase.sh:480 #, sh-format -msgid "invalid upstream $upstream_name" -msgstr "invalide $upstream_name en amont" +msgid "invalid upstream '$upstream_name'" +msgstr "invalide '$upstream_name' en amont" #: git-rebase.sh:504 #, sh-format @@ -15032,46 +15192,56 @@ msgstr "$onto_name : il n'y a pas de base de fusion" msgid "Does not point to a valid commit: $onto_name" msgstr "Ne pointe pas sur une validation valide : $onto_name" -#: git-rebase.sh:539 +#: git-rebase.sh:542 #, sh-format -msgid "fatal: no such branch: $branch_name" -msgstr "fatal : pas de branche : $branch_name" +msgid "fatal: no such branch/commit '$branch_name'" +msgstr "fatal : pas de branche ou commit '$branch_name'" -#: git-rebase.sh:572 +#: git-rebase.sh:575 msgid "Cannot autostash" msgstr "Autoremisage impossible" -#: git-rebase.sh:577 +#: git-rebase.sh:580 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Autoremisage créé : $stash_abbrev" -#: git-rebase.sh:581 +#: git-rebase.sh:584 msgid "Please commit or stash them." msgstr "Veuillez les valider ou les remiser." -#: git-rebase.sh:601 +#: git-rebase.sh:607 +#, sh-format +msgid "HEAD is up to date." +msgstr "HEAD est à jour." + +#: git-rebase.sh:609 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "La branche courante $branch_name est à jour." -#: git-rebase.sh:605 +#: git-rebase.sh:617 +#, sh-format +msgid "HEAD is up to date, rebase forced." +msgstr "HEAD est à jour, rebasage forcé." + +#: git-rebase.sh:619 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "La branche courante $branch_name est à jour, rebasage forcé." -#: git-rebase.sh:616 +#: git-rebase.sh:631 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Changements de $mb sur $onto :" -#: git-rebase.sh:625 +#: git-rebase.sh:640 msgid "First, rewinding head to replay your work on top of it..." msgstr "" "Rembobinage préalable de head pour pouvoir rejouer votre travail par-" "dessus..." -#: git-rebase.sh:635 +#: git-rebase.sh:650 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "$branch_name mise à jour en avance rapide sur $onto_name." @@ -15080,162 +15250,148 @@ msgstr "$branch_name mise à jour en avance rapide sur $onto_name." msgid "git stash clear with parameters is unimplemented" msgstr "git stash clear avec des paramètres n'est pas implémenté" -#: git-stash.sh:102 +#: git-stash.sh:108 msgid "You do not have the initial commit yet" msgstr "Vous n'avez pas encore la validation initiale" -#: git-stash.sh:117 +#: git-stash.sh:123 msgid "Cannot save the current index state" msgstr "Impossible de sauver l'état courant de l'index" -#: git-stash.sh:132 +#: git-stash.sh:138 msgid "Cannot save the untracked files" msgstr "Impossible de sauver les fichiers non-suivis" -#: git-stash.sh:152 git-stash.sh:165 +#: git-stash.sh:158 git-stash.sh:171 msgid "Cannot save the current worktree state" msgstr "Impossible de sauver l'état courant de la copie de travail" -#: git-stash.sh:169 +#: git-stash.sh:175 msgid "No changes selected" msgstr "Aucun changement sélectionné" -#: git-stash.sh:172 +#: git-stash.sh:178 msgid "Cannot remove temporary index (can't happen)" msgstr "Impossible de supprimer l'index temporaire (ne peut pas se produire)" -#: git-stash.sh:185 +#: git-stash.sh:191 msgid "Cannot record working tree state" msgstr "Impossible d'enregistrer l'état de la copie de travail" -#: git-stash.sh:217 +#: git-stash.sh:229 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "Impossible de mettre à jour $ref_stash avec $w_commit" -#. TRANSLATORS: $option is an invalid option, like -#. `--blah-blah'. The 7 spaces at the beginning of the -#. second line correspond to "error: ". So you should line -#. up the second line with however many characters the -#. translation of "error: " takes in your language. E.g. in -#. English this is: -#. -#. $ git stash save --blah-blah 2>&1 | head -n 2 -#. error: unknown option for 'stash save': --blah-blah -#. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:273 +#: git-stash.sh:281 #, sh-format -msgid "" -"error: unknown option for 'stash save': $option\n" -" To provide a message, use git stash save -- '$option'" -msgstr "" -"erreur: option inconnue pour 'stash save': $option\n" -" Pour fournir un message, utilisez git stash save -- '$option'" +msgid "error: unknown option for 'stash push': $option" +msgstr "erreur : option inconnue pour 'stash push' : $option" -#: git-stash.sh:288 +#: git-stash.sh:295 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" -#: git-stash.sh:296 +#: git-stash.sh:303 msgid "No local changes to save" msgstr "Pas de modifications locales à sauver" -#: git-stash.sh:301 +#: git-stash.sh:308 msgid "Cannot initialize stash" msgstr "Impossible d'initialiser le remisage" -#: git-stash.sh:305 +#: git-stash.sh:312 msgid "Cannot save the current status" msgstr "Impossible de sauver l'état courant" -#: git-stash.sh:306 +#: git-stash.sh:313 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "Copie de travail et état de l'index sauvegardés dans $stash_msg" -#: git-stash.sh:334 +#: git-stash.sh:341 msgid "Cannot remove worktree changes" msgstr "Impossible de supprimer les changements de la copie de travail" -#: git-stash.sh:482 +#: git-stash.sh:489 #, sh-format msgid "unknown option: $opt" msgstr "option inconnue : $opt" -#: git-stash.sh:495 +#: git-stash.sh:502 msgid "No stash entries found." msgstr "Aucune entrée de remisage trouvée." -#: git-stash.sh:502 +#: git-stash.sh:509 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Trop de révisions spécifiées : $REV" -#: git-stash.sh:517 +#: git-stash.sh:524 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference n'est pas une référence valide" -#: git-stash.sh:545 +#: git-stash.sh:552 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args' n'est pas une validation de type remisage" -#: git-stash.sh:556 +#: git-stash.sh:563 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args' n'est pas une référence de remisage" -#: git-stash.sh:564 +#: git-stash.sh:571 msgid "unable to refresh index" msgstr "impossible de rafraîchir l'index" -#: git-stash.sh:568 +#: git-stash.sh:575 msgid "Cannot apply a stash in the middle of a merge" msgstr "Impossible d'appliquer un remisage en cours de fusion" -#: git-stash.sh:576 +#: git-stash.sh:583 msgid "Conflicts in index. Try without --index." msgstr "Conflits dans l'index. Essayez sans --index." -#: git-stash.sh:578 +#: git-stash.sh:585 msgid "Could not save index tree" msgstr "Impossible de sauvegarder l'arbre d'index" -#: git-stash.sh:587 +#: git-stash.sh:594 msgid "Could not restore untracked files from stash entry" msgstr "" "Impossible de restaurer les fichiers non-suivis depuis l'entrée de remisage" -#: git-stash.sh:612 +#: git-stash.sh:619 msgid "Cannot unstage modified files" msgstr "Impossible de désindexer les fichiers modifiés" -#: git-stash.sh:627 +#: git-stash.sh:634 msgid "Index was not unstashed." msgstr "L'index n'a pas été sorti de remise." -#: git-stash.sh:641 +#: git-stash.sh:648 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." -#: git-stash.sh:650 +#: git-stash.sh:657 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "${REV} supprimé ($s)" -#: git-stash.sh:651 +#: git-stash.sh:658 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Impossible de supprimer l'élément de stash" -#: git-stash.sh:659 +#: git-stash.sh:666 msgid "No branch name specified" msgstr "Aucune branche spécifiée" -#: git-stash.sh:738 +#: git-stash.sh:745 msgid "(To restore them type \"git stash apply\")" msgstr "(Pour les restaurer tapez \"git stash apply\")" @@ -15474,38 +15630,33 @@ msgstr "Chemin de sous-module '$displaypath' : '$command $sha1'" msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Échec de parcours dans le chemin du sous-module '$displaypath'" -#: git-submodule.sh:840 +#: git-submodule.sh:828 msgid "The --cached option cannot be used with the --files option" msgstr "L'option --cached ne peut pas être utilisée avec l'option --files" -#: git-submodule.sh:892 +#: git-submodule.sh:880 #, sh-format msgid "unexpected mode $mod_dst" msgstr "mode $mod_dst inattendu" -#: git-submodule.sh:912 +#: git-submodule.sh:900 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Attention : $display_name ne contient pas la validation $sha1_src" -#: git-submodule.sh:915 +#: git-submodule.sh:903 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Attention : $display_name ne contient pas la validation $sha1_dst" -#: git-submodule.sh:918 +#: git-submodule.sh:906 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" " Attention : $display_name ne contient pas les validations $sha1_src et " "$sha1_dst" -#: git-submodule.sh:1064 -#, sh-format -msgid "Failed to recurse into submodule path '$sm_path'" -msgstr "Échec de parcours dans le chemin du sous-module '$sm_path'" - -#: git-submodule.sh:1136 +#: git-submodule.sh:1077 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Synchronisation de l'URL sous-module pour '$displaypath'" @@ -15739,15 +15890,15 @@ msgstr "Veuillez corriger ceci en utilisant 'git rebase --edit-todo'." msgid "Successfully rebased and updated $head_name." msgstr "Rebasage et mise à jour de $head_name avec succès." -#: git-rebase--interactive.sh:749 +#: git-rebase--interactive.sh:728 msgid "could not detach HEAD" msgstr "Impossible de détacher HEAD" -#: git-rebase--interactive.sh:784 +#: git-rebase--interactive.sh:763 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "Impossible de supprimer CHERRY_PICK_HEAD" -#: git-rebase--interactive.sh:789 +#: git-rebase--interactive.sh:768 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -15778,12 +15929,12 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--interactive.sh:806 +#: git-rebase--interactive.sh:785 msgid "Error trying to find the author identity to amend commit" msgstr "" "Erreur lors de la recherche de l'identité de l'auteur pour corriger le commit" -#: git-rebase--interactive.sh:811 +#: git-rebase--interactive.sh:790 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -15791,11 +15942,11 @@ msgstr "" "Vous avez des modifications non validées dans votre copie de travail.\n" "Veuillez les valider d'abord, puis relancer 'git rebase --continue'." -#: git-rebase--interactive.sh:816 git-rebase--interactive.sh:820 +#: git-rebase--interactive.sh:795 git-rebase--interactive.sh:799 msgid "Could not commit staged changes." msgstr "impossible de valider les modifications indexées." -#: git-rebase--interactive.sh:848 +#: git-rebase--interactive.sh:827 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -15810,40 +15961,40 @@ msgstr "" " git rebase --continue\n" "\n" -#: git-rebase--interactive.sh:856 git-rebase--interactive.sh:1015 +#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:994 msgid "Could not execute editor" msgstr "Impossible de lancer l'éditeur" -#: git-rebase--interactive.sh:869 +#: git-rebase--interactive.sh:848 #, sh-format msgid "Could not checkout $switch_to" msgstr "Impossible d'extraire $switch_to" -#: git-rebase--interactive.sh:874 +#: git-rebase--interactive.sh:853 msgid "No HEAD?" msgstr "Pas de HEAD ?" -#: git-rebase--interactive.sh:875 +#: git-rebase--interactive.sh:854 #, sh-format msgid "Could not create temporary $state_dir" msgstr "Impossible de créer un répertoire temporaire $state_dir" -#: git-rebase--interactive.sh:877 +#: git-rebase--interactive.sh:856 msgid "Could not mark as interactive" msgstr "Impossible de marquer comme interactif" -#: git-rebase--interactive.sh:887 git-rebase--interactive.sh:892 +#: git-rebase--interactive.sh:866 git-rebase--interactive.sh:871 msgid "Could not init rewritten commits" msgstr "Impossible d'initialiser les commits réécrits" -#: git-rebase--interactive.sh:993 +#: git-rebase--interactive.sh:972 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "Rebasage de $shortrevisions sur $shortonto ($todocount commande)" msgstr[1] "Rebasage de $shortrevisions sur $shortonto ($todocount commandes)" -#: git-rebase--interactive.sh:998 +#: git-rebase--interactive.sh:977 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -15853,7 +16004,7 @@ msgstr "" "Cependant, si vous effacez tout, le rebasage sera annulé.\n" "\n" -#: git-rebase--interactive.sh:1005 +#: git-rebase--interactive.sh:984 msgid "Note that empty commits are commented out" msgstr "Veuillez noter que les commits vides sont en commentaire" @@ -16634,7 +16785,7 @@ msgstr "" "Message-ID à utiliser comme In-Reply-To pour le premier courriel (s'il y en " "a) ? " -#: git-send-email.perl:927 git-send-email.perl:935 +#: git-send-email.perl:929 git-send-email.perl:937 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "erreur : impossible d'extraire une adresse valide depuis : %s\n" @@ -16642,16 +16793,16 @@ msgstr "erreur : impossible d'extraire une adresse valide depuis : %s\n" #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:939 +#: git-send-email.perl:941 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "Que faire de cette adresse ? ([q]uitter|[d]élaisser|[e]diter): " -#: git-send-email.perl:1260 +#: git-send-email.perl:1262 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "le chemin vers la CA \"%s\" n'existe pas" -#: git-send-email.perl:1335 +#: git-send-email.perl:1337 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -16678,134 +16829,188 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1350 +#: git-send-email.perl:1352 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): " msgstr "Envoyer ce courriel ? ([y]es|[n]o|[q]uit|[a]ll) : " -#: git-send-email.perl:1353 +#: git-send-email.perl:1355 msgid "Send this email reply required" msgstr "Une réponse est nécessaire" -#: git-send-email.perl:1379 +#: git-send-email.perl:1381 msgid "The required SMTP server is not properly defined." msgstr "Le serveur SMTP nécessaire n'est pas défini correctement." -#: git-send-email.perl:1426 +#: git-send-email.perl:1428 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Le serveur ne supporte pas STARTTLS ! %s" -#: git-send-email.perl:1431 git-send-email.perl:1435 +#: git-send-email.perl:1433 git-send-email.perl:1437 #, perl-format msgid "STARTTLS failed! %s" msgstr "echec de STARTTLS ! %s" -#: git-send-email.perl:1445 +#: git-send-email.perl:1447 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" "Impossible d'initialiser SMTP. Vérifiez la configuration et utilisez --smtp-" "debug." -#: git-send-email.perl:1463 +#: git-send-email.perl:1465 #, perl-format msgid "Failed to send %s\n" msgstr "échec de l'envoi de %s\n" -#: git-send-email.perl:1466 +#: git-send-email.perl:1468 #, perl-format msgid "Dry-Sent %s\n" msgstr "Envoi simulé de %s\n" -#: git-send-email.perl:1466 +#: git-send-email.perl:1468 #, perl-format msgid "Sent %s\n" msgstr "%s envoyé\n" -#: git-send-email.perl:1468 +#: git-send-email.perl:1470 msgid "Dry-OK. Log says:\n" msgstr "Simulation OK. Le journal indique :\n" -#: git-send-email.perl:1468 +#: git-send-email.perl:1470 msgid "OK. Log says:\n" msgstr "OK. Le journal indique :\n" -#: git-send-email.perl:1480 +#: git-send-email.perl:1482 msgid "Result: " msgstr "Résultat : " -#: git-send-email.perl:1483 +#: git-send-email.perl:1485 msgid "Result: OK\n" msgstr "Résultat : OK\n" -#: git-send-email.perl:1496 +#: git-send-email.perl:1498 #, perl-format msgid "can't open file %s" msgstr "impossible d'ouvrir le fichier %s" -#: git-send-email.perl:1543 git-send-email.perl:1563 +#: git-send-email.perl:1545 git-send-email.perl:1565 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Ajout de cc: %s depuis la ligne '%s'\n" -#: git-send-email.perl:1549 +#: git-send-email.perl:1551 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) Ajout de to: %s depuis la ligne '%s'\n" -#: git-send-email.perl:1597 +#: git-send-email.perl:1599 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) Ajout de cc: %s depuis la ligne '%s'\n" -#: git-send-email.perl:1622 +#: git-send-email.perl:1624 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(corps) Ajout de cc: %s depuis la ligne '%s'\n" -#: git-send-email.perl:1728 +#: git-send-email.perl:1730 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Impossible d'exécuter '%s'" -#: git-send-email.perl:1735 +#: git-send-email.perl:1737 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Ajout de %s : %s depuis : '%s'\n" -#: git-send-email.perl:1739 +#: git-send-email.perl:1741 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) échec de la fermeture du pipe vers '%s'" -#: git-send-email.perl:1766 +#: git-send-email.perl:1768 msgid "cannot send message as 7bit" msgstr "impossible d'envoyer un message comme 7bit" -#: git-send-email.perl:1774 +#: git-send-email.perl:1776 msgid "invalid transfer encoding" msgstr "codage de transfert invalide" -#: git-send-email.perl:1812 git-send-email.perl:1863 git-send-email.perl:1873 +#: git-send-email.perl:1814 git-send-email.perl:1865 git-send-email.perl:1875 #, perl-format msgid "unable to open %s: %s\n" msgstr "impossible d'ouvrir %s :%s\n" -#: git-send-email.perl:1815 +#: git-send-email.perl:1817 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "%s : le patch contient une ligne plus longue que 998 caractères" -#: git-send-email.perl:1831 +#: git-send-email.perl:1833 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1835 +#: git-send-email.perl:1837 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : " +#~ msgid "" +#~ "empty strings as pathspecs will be made invalid in upcoming releases. " +#~ "please use . instead if you meant to match all paths" +#~ msgstr "" +#~ "les chaines de caractères vides comme spécificateurs de chemin seront " +#~ "invalides dans les prochaines versions. Veuillez utiliser . à la place " +#~ "pour correspondre à tous le chemins" + +#~ msgid "unable to open '%s' for writing" +#~ msgstr "impossible d'ouvrir '%s' en écriture" + +#~ msgid "could not truncate '%s'" +#~ msgstr "impossible de tronquer '%s'" + +#~ msgid "could not finish '%s'" +#~ msgstr "impossible de finir '%s'" + +#~ msgid "could not write to %s" +#~ msgstr "Impossible d'écrire dans %s" + +#~ msgid "could not close %s" +#~ msgstr "impossible de fermer %s" + +#~ msgid "Copied a misnamed branch '%s' away" +#~ msgstr "Copie d'une branche mal nommée '%s'" + +#~ msgid "it does not make sense to create 'HEAD' manually" +#~ msgstr "créer manuellement 'HEAD' n'a pas de sens" + +#~ msgid "Don't know how to clone %s" +#~ msgstr "Je ne sais pas cloner %s" + +#~ msgid "show ignored files" +#~ msgstr "afficher les fichiers ignorés" + +#~ msgid "%s is not a valid '%s' object" +#~ msgstr "%s n'est pas un objet '%s' valide" + +#~ msgid "Don't know how to fetch from %s" +#~ msgstr "Je ne sais pas récupérer depuis %s" + +#~ msgid "'$term' is not a valid term" +#~ msgstr "'$term' n'est pas un terme valide" + +#~ msgid "" +#~ "error: unknown option for 'stash save': $option\n" +#~ " To provide a message, use git stash save -- '$option'" +#~ msgstr "" +#~ "erreur: option inconnue pour 'stash save': $option\n" +#~ " Pour fournir un message, utilisez git stash save -- '$option'" + +#~ msgid "Failed to recurse into submodule path '$sm_path'" +#~ msgstr "Échec de parcours dans le chemin du sous-module '$sm_path'" + #~ msgid "%%(trailers) does not take arguments" #~ msgstr "%%(trailers) n'accepte pas d'argument" @@ -16957,9 +17162,6 @@ msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : " #~ msgid "git merge [<options>] <msg> HEAD <commit>" #~ msgstr "git merge [<options>] <message> HEAD <commit>" -#~ msgid "'%s' is not a commit" -#~ msgstr "'%s' n'est pas une validation" - #~ msgid "cannot open file '%s'" #~ msgstr "impossible d'ouvrir le fichier '%s'" diff --git a/po/git.pot b/po/git.pot index d4e46e5e74..5d0b2354dc 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: 2017-10-17 09:44+0800\n" +"POT-Creation-Date: 2017-12-31 10:45+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" @@ -18,59 +18,59 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: advice.c:58 +#: advice.c:62 #, c-format msgid "hint: %.*s\n" msgstr "" -#: advice.c:86 +#: advice.c:90 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" -#: advice.c:88 +#: advice.c:92 msgid "Committing is not possible because you have unmerged files." msgstr "" -#: advice.c:90 +#: advice.c:94 msgid "Merging is not possible because you have unmerged files." msgstr "" -#: advice.c:92 +#: advice.c:96 msgid "Pulling is not possible because you have unmerged files." msgstr "" -#: advice.c:94 +#: advice.c:98 msgid "Reverting is not possible because you have unmerged files." msgstr "" -#: advice.c:96 +#: advice.c:100 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "" -#: advice.c:104 +#: advice.c:108 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." msgstr "" -#: advice.c:112 +#: advice.c:116 msgid "Exiting because of an unresolved conflict." msgstr "" -#: advice.c:117 builtin/merge.c:1211 +#: advice.c:121 builtin/merge.c:1213 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" -#: advice.c:119 +#: advice.c:123 msgid "Please, commit your changes before merging." msgstr "" -#: advice.c:120 +#: advice.c:124 msgid "Exiting because of unfinished merge." msgstr "" -#: advice.c:126 +#: advice.c:130 #, c-format msgid "" "Note: checking out '%s'.\n" @@ -96,82 +96,82 @@ msgstr "" msgid "unrecognized whitespace ignore option '%s'" msgstr "" -#: apply.c:125 +#: apply.c:122 msgid "--reject and --3way cannot be used together." msgstr "" -#: apply.c:127 +#: apply.c:124 msgid "--cached and --3way cannot be used together." msgstr "" -#: apply.c:130 +#: apply.c:127 msgid "--3way outside a repository" msgstr "" -#: apply.c:141 +#: apply.c:138 msgid "--index outside a repository" msgstr "" -#: apply.c:144 +#: apply.c:141 msgid "--cached outside a repository" msgstr "" -#: apply.c:845 +#: apply.c:821 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "" -#: apply.c:854 +#: apply.c:830 #, c-format msgid "regexec returned %d for input: %s" msgstr "" -#: apply.c:928 +#: apply.c:904 #, c-format msgid "unable to find filename in patch at line %d" msgstr "" -#: apply.c:966 +#: apply.c:942 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" -#: apply.c:972 +#: apply.c:948 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" -#: apply.c:973 +#: apply.c:949 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" -#: apply.c:978 +#: apply.c:954 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" -#: apply.c:1007 +#: apply.c:983 #, c-format msgid "invalid mode on line %d: %s" msgstr "" -#: apply.c:1325 +#: apply.c:1301 #, c-format msgid "inconsistent header lines %d and %d" msgstr "" -#: apply.c:1497 +#: apply.c:1473 #, c-format msgid "recount: unexpected line: %.*s" msgstr "" -#: apply.c:1566 +#: apply.c:1542 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "" -#: apply.c:1586 +#: apply.c:1562 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -182,521 +182,522 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: apply.c:1599 +#: apply.c:1575 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" -#: apply.c:1787 +#: apply.c:1763 msgid "new file depends on old contents" msgstr "" -#: apply.c:1789 +#: apply.c:1765 msgid "deleted file still has contents" msgstr "" -#: apply.c:1823 +#: apply.c:1799 #, c-format msgid "corrupt patch at line %d" msgstr "" -#: apply.c:1860 +#: apply.c:1836 #, c-format msgid "new file %s depends on old contents" msgstr "" -#: apply.c:1862 +#: apply.c:1838 #, c-format msgid "deleted file %s still has contents" msgstr "" -#: apply.c:1865 +#: apply.c:1841 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "" -#: apply.c:2012 +#: apply.c:1988 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "" -#: apply.c:2049 +#: apply.c:2025 #, c-format msgid "unrecognized binary patch at line %d" msgstr "" -#: apply.c:2209 +#: apply.c:2185 #, c-format msgid "patch with only garbage at line %d" msgstr "" -#: apply.c:2295 +#: apply.c:2271 #, c-format msgid "unable to read symlink %s" msgstr "" -#: apply.c:2299 +#: apply.c:2275 #, c-format msgid "unable to open or read %s" msgstr "" -#: apply.c:2958 +#: apply.c:2934 #, c-format msgid "invalid start of line: '%c'" msgstr "" -#: apply.c:3077 +#: apply.c:3055 #, 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:3089 +#: apply.c:3067 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: apply.c:3095 +#: apply.c:3073 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" -#: apply.c:3117 +#: apply.c:3095 #, c-format msgid "missing binary patch data for '%s'" msgstr "" -#: apply.c:3125 +#: apply.c:3103 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" -#: apply.c:3171 +#: apply.c:3149 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" -#: apply.c:3181 +#: apply.c:3159 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "" -#: apply.c:3189 +#: apply.c:3167 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "" -#: apply.c:3207 +#: apply.c:3185 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "" -#: apply.c:3220 +#: apply.c:3198 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" -#: apply.c:3226 +#: apply.c:3204 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: apply.c:3247 +#: apply.c:3225 #, c-format msgid "patch failed: %s:%ld" msgstr "" -#: apply.c:3369 +#: apply.c:3347 #, c-format msgid "cannot checkout %s" msgstr "" -#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277 +#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277 #, c-format msgid "failed to read %s" msgstr "" -#: apply.c:3426 +#: apply.c:3404 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "" -#: apply.c:3455 apply.c:3695 +#: apply.c:3433 apply.c:3673 #, c-format msgid "path %s has been renamed/deleted" msgstr "" -#: apply.c:3538 apply.c:3709 +#: apply.c:3516 apply.c:3687 #, c-format msgid "%s: does not exist in index" msgstr "" -#: apply.c:3547 apply.c:3717 +#: apply.c:3525 apply.c:3695 #, c-format msgid "%s: does not match index" msgstr "" -#: apply.c:3582 +#: apply.c:3560 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" -#: apply.c:3585 +#: apply.c:3563 #, c-format msgid "Falling back to three-way merge...\n" msgstr "" -#: apply.c:3601 apply.c:3605 +#: apply.c:3579 apply.c:3583 #, c-format msgid "cannot read the current contents of '%s'" msgstr "" -#: apply.c:3617 +#: apply.c:3595 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "" -#: apply.c:3631 +#: apply.c:3609 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "" -#: apply.c:3636 +#: apply.c:3614 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "" -#: apply.c:3662 +#: apply.c:3640 msgid "removal patch leaves file contents" msgstr "" -#: apply.c:3734 +#: apply.c:3712 #, c-format msgid "%s: wrong type" msgstr "" -#: apply.c:3736 +#: apply.c:3714 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: apply.c:3886 apply.c:3888 +#: apply.c:3864 apply.c:3866 #, c-format msgid "invalid path '%s'" msgstr "" -#: apply.c:3944 +#: apply.c:3922 #, c-format msgid "%s: already exists in index" msgstr "" -#: apply.c:3947 +#: apply.c:3925 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: apply.c:3967 +#: apply.c:3945 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: apply.c:3972 +#: apply.c:3950 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: apply.c:3992 +#: apply.c:3970 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "" -#: apply.c:3996 +#: apply.c:3974 #, c-format msgid "%s: patch does not apply" msgstr "" -#: apply.c:4011 +#: apply.c:3989 #, c-format msgid "Checking patch %s..." msgstr "" -#: apply.c:4102 +#: apply.c:4080 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "" -#: apply.c:4109 +#: apply.c:4087 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "" -#: apply.c:4112 +#: apply.c:4090 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "" -#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148 +#: apply.c:4095 builtin/checkout.c:236 builtin/reset.c:148 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: apply.c:4121 +#: apply.c:4099 #, c-format msgid "could not add %s to temporary index" msgstr "" -#: apply.c:4131 +#: apply.c:4109 #, c-format msgid "could not write temporary index to %s" msgstr "" -#: apply.c:4269 +#: apply.c:4247 #, c-format msgid "unable to remove %s from index" msgstr "" -#: apply.c:4304 +#: apply.c:4282 #, c-format msgid "corrupt patch for submodule %s" msgstr "" -#: apply.c:4310 +#: apply.c:4288 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: apply.c:4318 +#: apply.c:4296 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: apply.c:4324 apply.c:4468 +#: apply.c:4302 apply.c:4446 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: apply.c:4365 +#: apply.c:4343 #, c-format msgid "failed to write to '%s'" msgstr "" -#: apply.c:4369 +#: apply.c:4347 #, c-format msgid "closing file '%s'" msgstr "" -#: apply.c:4439 +#: apply.c:4417 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: apply.c:4537 +#: apply.c:4515 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: apply.c:4545 +#: apply.c:4523 msgid "internal error" msgstr "" -#: apply.c:4548 +#: apply.c:4526 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: apply.c:4559 +#: apply.c:4537 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010 +#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011 #, c-format msgid "cannot open %s" msgstr "" -#: apply.c:4581 +#: apply.c:4559 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: apply.c:4585 +#: apply.c:4563 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: apply.c:4695 +#: apply.c:4673 #, c-format msgid "Skipped patch '%s'." msgstr "" -#: apply.c:4703 +#: apply.c:4681 msgid "unrecognized input" msgstr "" -#: apply.c:4722 +#: apply.c:4700 msgid "unable to read index file" msgstr "" -#: apply.c:4859 +#: apply.c:4837 #, c-format msgid "can't open patch '%s': %s" msgstr "" -#: apply.c:4886 +#: apply.c:4864 #, 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:4870 apply.c:4885 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "" msgstr[1] "" -#: apply.c:4900 +#: apply.c:4878 #, 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:515 builtin/mv.c:298 builtin/rm.c:390 +#: apply.c:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "" -#: apply.c:4947 apply.c:4950 builtin/am.c:2256 builtin/am.c:2259 -#: builtin/clone.c:116 builtin/fetch.c:115 builtin/pull.c:187 -#: builtin/submodule--helper.c:301 builtin/submodule--helper.c:622 -#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:992 -#: builtin/submodule--helper.c:995 builtin/submodule--helper.c:1212 +#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260 +#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193 +#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860 +#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230 +#: builtin/submodule--helper.c:1233 builtin/submodule--helper.c:1450 #: git-add--interactive.perl:197 msgid "path" msgstr "" -#: apply.c:4948 +#: apply.c:4922 msgid "don't apply changes matching the given path" msgstr "" -#: apply.c:4951 +#: apply.c:4925 msgid "apply changes matching the given path" msgstr "" -#: apply.c:4953 builtin/am.c:2265 +#: apply.c:4927 builtin/am.c:2266 msgid "num" msgstr "" -#: apply.c:4954 +#: apply.c:4928 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" -#: apply.c:4957 +#: apply.c:4931 msgid "ignore additions made by the patch" msgstr "" -#: apply.c:4959 +#: apply.c:4933 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: apply.c:4963 +#: apply.c:4937 msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: apply.c:4965 +#: apply.c:4939 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: apply.c:4967 +#: apply.c:4941 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: apply.c:4969 +#: apply.c:4943 msgid "make sure the patch is applicable to the current index" msgstr "" -#: apply.c:4971 +#: apply.c:4945 msgid "apply a patch without touching the working tree" msgstr "" -#: apply.c:4973 +#: apply.c:4947 msgid "accept a patch that touches outside the working area" msgstr "" -#: apply.c:4975 +#: apply.c:4949 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: apply.c:4977 +#: apply.c:4951 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: apply.c:4979 +#: apply.c:4953 msgid "build a temporary index based on embedded index information" msgstr "" -#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513 +#: apply.c:4956 builtin/checkout-index.c:168 builtin/ls-files.c:515 msgid "paths are separated with NUL character" msgstr "" -#: apply.c:4984 +#: apply.c:4958 msgid "ensure at least <n> lines of context match" msgstr "" -#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95 +#: apply.c:4959 builtin/am.c:2245 builtin/interpret-trailers.c:95 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99 +#: builtin/pack-objects.c:3009 msgid "action" msgstr "" -#: apply.c:4986 +#: apply.c:4960 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: apply.c:4989 apply.c:4992 +#: apply.c:4963 apply.c:4966 msgid "ignore changes in whitespace when finding context" msgstr "" -#: apply.c:4995 +#: apply.c:4969 msgid "apply the patch in reverse" msgstr "" -#: apply.c:4997 +#: apply.c:4971 msgid "don't expect at least one line of context" msgstr "" -#: apply.c:4999 +#: apply.c:4973 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: apply.c:5001 +#: apply.c:4975 msgid "allow overlapping hunks" msgstr "" -#: apply.c:5002 builtin/add.c:272 builtin/check-ignore.c:21 -#: builtin/commit.c:1347 builtin/count-objects.c:96 builtin/fsck.c:640 -#: builtin/log.c:1889 builtin/mv.c:123 builtin/read-tree.c:125 +#: apply.c:4976 builtin/add.c:292 builtin/check-ignore.c:21 +#: builtin/commit.c:1361 builtin/count-objects.c:96 builtin/fsck.c:640 +#: builtin/log.c:1896 builtin/mv.c:123 builtin/read-tree.c:125 msgid "be verbose" msgstr "" -#: apply.c:5004 +#: apply.c:4978 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: apply.c:5007 +#: apply.c:4981 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: apply.c:5009 builtin/am.c:2253 +#: apply.c:4983 builtin/am.c:2254 msgid "root" msgstr "" -#: apply.c:5010 +#: apply.c:4984 msgid "prepend <root> to all filenames" msgstr "" @@ -717,7 +718,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "" -#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299 +#: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" @@ -730,7 +731,7 @@ msgstr "" msgid "archive format" msgstr "" -#: archive.c:437 builtin/log.c:1452 +#: archive.c:437 builtin/log.c:1459 msgid "prefix" msgstr "" @@ -738,9 +739,9 @@ msgstr "" msgid "prepend prefix to each pathname in the archive" msgstr "" -#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61 -#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:859 -#: builtin/hash-object.c:102 builtin/ls-files.c:547 builtin/ls-files.c:550 +#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:62 +#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:861 +#: builtin/hash-object.c:102 builtin/ls-files.c:551 builtin/ls-files.c:554 #: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120 #: parse-options.h:153 msgid "file" @@ -775,7 +776,7 @@ msgid "list supported archive formats" msgstr "" #: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109 -#: builtin/submodule--helper.c:634 builtin/submodule--helper.c:1001 +#: builtin/submodule--helper.c:872 builtin/submodule--helper.c:1239 msgid "repo" msgstr "" @@ -824,43 +825,43 @@ msgid "" "Use '\\!' for literal leading exclamation." msgstr "" -#: bisect.c:447 +#: bisect.c:458 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "" -#: bisect.c:655 +#: bisect.c:666 #, c-format msgid "We cannot bisect more!\n" msgstr "" -#: bisect.c:708 +#: bisect.c:720 #, c-format msgid "Not a valid commit name %s" msgstr "" -#: bisect.c:732 +#: bisect.c:744 #, c-format msgid "" "The merge base %s is bad.\n" "This means the bug has been fixed between %s and [%s].\n" msgstr "" -#: bisect.c:737 +#: bisect.c:749 #, c-format msgid "" "The merge base %s is new.\n" "The property has changed between %s and [%s].\n" msgstr "" -#: bisect.c:742 +#: bisect.c:754 #, c-format msgid "" "The merge base %s is %s.\n" "This means the first '%s' commit is between %s and [%s].\n" msgstr "" -#: bisect.c:750 +#: bisect.c:762 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -868,7 +869,7 @@ msgid "" "Maybe you mistook %s and %s revs?\n" msgstr "" -#: bisect.c:763 +#: bisect.c:775 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -876,43 +877,43 @@ msgid "" "We continue anyway." msgstr "" -#: bisect.c:798 +#: bisect.c:810 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "" -#: bisect.c:850 +#: bisect.c:862 #, c-format msgid "a %s revision is needed" msgstr "" -#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234 +#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234 #, c-format msgid "could not create file '%s'" msgstr "" -#: bisect.c:918 +#: bisect.c:930 #, c-format msgid "could not read file '%s'" msgstr "" -#: bisect.c:948 +#: bisect.c:960 msgid "reading bisect refs failed" msgstr "" -#: bisect.c:968 +#: bisect.c:979 #, c-format msgid "%s was both %s and %s\n" msgstr "" -#: bisect.c:976 +#: bisect.c:987 #, c-format msgid "" "No testable commit found.\n" "Maybe you started with bad path parameters?\n" msgstr "" -#: bisect.c:995 +#: bisect.c:1006 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -922,7 +923,7 @@ msgstr[1] "" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1001 +#: bisect.c:1012 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" @@ -941,9 +942,9 @@ msgstr "" msgid "--reverse and --first-parent together require specified latest commit" msgstr "" -#: blame.c:1797 bundle.c:169 ref-filter.c:1947 sequencer.c:1168 -#: sequencer.c:2351 builtin/commit.c:1065 builtin/log.c:357 builtin/log.c:911 -#: builtin/log.c:1361 builtin/log.c:1690 builtin/log.c:1938 builtin/merge.c:369 +#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1179 +#: sequencer.c:2367 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918 +#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369 #: builtin/shortlog.c:191 msgid "revision walk setup failed" msgstr "" @@ -1026,31 +1027,31 @@ msgstr "" msgid "Not tracking: ambiguous information for ref %s" msgstr "" -#: branch.c:185 +#: branch.c:189 #, c-format msgid "'%s' is not a valid branch name." msgstr "" -#: branch.c:190 +#: branch.c:208 #, c-format msgid "A branch named '%s' already exists." msgstr "" -#: branch.c:197 +#: branch.c:213 msgid "Cannot force update the current branch." msgstr "" -#: branch.c:217 +#: branch.c:233 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "" -#: branch.c:219 +#: branch.c:235 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "" -#: branch.c:221 +#: branch.c:237 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -1062,27 +1063,27 @@ msgid "" "\"git push -u\" to set the upstream config as you push." msgstr "" -#: branch.c:264 +#: branch.c:280 #, c-format msgid "Not a valid object name: '%s'." msgstr "" -#: branch.c:284 +#: branch.c:300 #, c-format msgid "Ambiguous object name: '%s'." msgstr "" -#: branch.c:289 +#: branch.c:305 #, c-format msgid "Not a valid branch point: '%s'." msgstr "" -#: branch.c:343 +#: branch.c:359 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "" -#: branch.c:366 +#: branch.c:382 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "" @@ -1097,9 +1098,8 @@ msgstr "" msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:88 sequencer.c:1346 sequencer.c:1793 sequencer.c:2500 -#: sequencer.c:2583 sequencer.c:2609 sequencer.c:2687 sequencer.c:2807 -#: sequencer.c:2949 builtin/commit.c:782 +#: bundle.c:88 sequencer.c:1357 sequencer.c:1804 sequencer.c:2631 +#: sequencer.c:2657 sequencer.c:2748 sequencer.c:2850 builtin/commit.c:782 #, c-format msgid "could not open '%s'" msgstr "" @@ -1143,7 +1143,7 @@ msgstr "" msgid "ref '%s' is excluded by the rev-list options" msgstr "" -#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296 +#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296 #, c-format msgid "unrecognized argument: %s" msgstr "" @@ -1166,8 +1166,8 @@ msgstr "" msgid "invalid color value: %.*s" msgstr "" -#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465 -#: builtin/am.c:1467 builtin/am.c:2105 +#: commit.c:41 sequencer.c:1611 builtin/am.c:421 builtin/am.c:465 +#: builtin/am.c:1471 builtin/am.c:2106 #, c-format msgid "could not parse %s" msgstr "" @@ -1177,172 +1177,177 @@ msgstr "" msgid "%s %s is not a commit!" msgstr "" -#: commit.c:1517 +#: commit.c:1524 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" "variable i18n.commitencoding to the encoding your project uses.\n" msgstr "" -#: compat/obstack.c:406 compat/obstack.c:408 +#: compat/obstack.c:405 compat/obstack.c:407 msgid "memory exhausted" msgstr "" -#: config.c:187 +#: config.c:186 msgid "relative config include conditionals must come from files" msgstr "" -#: config.c:721 +#: config.c:720 #, c-format msgid "bad config line %d in blob %s" msgstr "" -#: config.c:725 +#: config.c:724 #, c-format msgid "bad config line %d in file %s" msgstr "" -#: config.c:729 +#: config.c:728 #, c-format msgid "bad config line %d in standard input" msgstr "" -#: config.c:733 +#: config.c:732 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "" -#: config.c:737 +#: config.c:736 #, c-format msgid "bad config line %d in command line %s" msgstr "" -#: config.c:741 +#: config.c:740 #, c-format msgid "bad config line %d in %s" msgstr "" -#: config.c:869 +#: config.c:868 msgid "out of range" msgstr "" -#: config.c:869 +#: config.c:868 msgid "invalid unit" msgstr "" -#: config.c:875 +#: config.c:874 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "" -#: config.c:880 +#: config.c:879 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "" -#: config.c:883 +#: config.c:882 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" -#: config.c:886 +#: config.c:885 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" -#: config.c:889 +#: config.c:888 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" -#: config.c:892 +#: config.c:891 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" -#: config.c:895 +#: config.c:894 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "" -#: config.c:990 +#: config.c:989 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "" -#: config.c:1085 config.c:1096 +#: config.c:998 +#, c-format +msgid "'%s' for '%s' is not a valid timestamp" +msgstr "" + +#: config.c:1094 config.c:1105 #, c-format msgid "bad zlib compression level %d" msgstr "" -#: config.c:1213 +#: config.c:1222 #, c-format msgid "invalid mode for object creation: %s" msgstr "" -#: config.c:1372 +#: config.c:1378 #, c-format msgid "bad pack compression level %d" msgstr "" -#: config.c:1568 +#: config.c:1574 msgid "unable to parse command-line config" msgstr "" -#: config.c:1900 +#: config.c:1906 msgid "unknown error occurred while reading the configuration files" msgstr "" -#: config.c:2087 +#: config.c:2093 #, c-format msgid "Invalid %s: '%s'" msgstr "" -#: config.c:2130 +#: config.c:2136 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "" -#: config.c:2156 +#: config.c:2162 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" -#: config.c:2167 +#: config.c:2187 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" -#: config.c:2169 +#: config.c:2189 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" -#: config.c:2228 +#: config.c:2248 #, c-format msgid "%s has multiple values" msgstr "" -#: config.c:2571 config.c:2789 +#: config.c:2591 config.c:2808 #, c-format msgid "fstat on %s failed" msgstr "" -#: config.c:2678 +#: config.c:2698 #, c-format msgid "could not set '%s' to '%s'" msgstr "" -#: config.c:2680 builtin/remote.c:776 +#: config.c:2700 builtin/remote.c:776 #, c-format msgid "could not unset '%s'" msgstr "" -#: connect.c:50 +#: connect.c:52 msgid "The remote end hung up upon initial contact" msgstr "" -#: connect.c:52 +#: connect.c:54 msgid "" "Could not read from remote repository.\n" "\n" @@ -1463,7 +1468,7 @@ msgstr[1] "" msgid "failed to read orderfile '%s'" msgstr "" -#: diffcore-rename.c:536 +#: diffcore-rename.c:535 msgid "Performing inexact rename detection" msgstr "" @@ -1493,75 +1498,80 @@ msgstr "" msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" -#: diff.c:398 +#: diff.c:401 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" -#: diff.c:3861 +#: diff.c:3799 #, c-format msgid "external diff died, stopping at %s" msgstr "" -#: diff.c:4189 +#: diff.c:4127 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" -#: diff.c:4279 +#: diff.c:4215 msgid "--follow requires exactly one pathspec" msgstr "" -#: diff.c:4445 +#: diff.c:4381 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: diff.c:4459 +#: diff.c:4395 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "" -#: diff.c:5505 +#: diff.c:5446 msgid "inexact rename detection was skipped due to too many files." msgstr "" -#: diff.c:5508 +#: diff.c:5449 msgid "only found copies from modified paths due to too many files." msgstr "" -#: diff.c:5511 +#: diff.c:5452 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "" -#: dir.c:1983 +#: dir.c:2100 msgid "failed to get kernel name and information" msgstr "" -#: dir.c:2102 +#: dir.c:2219 msgid "Untracked cache is disabled on this system or location." msgstr "" -#: dir.c:2885 dir.c:2890 +#: dir.c:3002 dir.c:3007 #, c-format msgid "could not create directories for %s" msgstr "" -#: dir.c:2915 +#: dir.c:3032 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "" -#: entry.c:176 +#: editor.c:61 +#, c-format +msgid "hint: Waiting for your editor to close the file...%c" +msgstr "" + +#: entry.c:177 msgid "Filtering content" msgstr "" -#: entry.c:433 +#: entry.c:435 #, c-format msgid "could not stat file '%s'" msgstr "" @@ -1632,7 +1642,7 @@ msgstr "" msgid "giving up" msgstr "" -#: fetch-pack.c:534 progress.c:242 +#: fetch-pack.c:534 progress.c:229 msgid "done" msgstr "" @@ -1646,104 +1656,104 @@ msgstr "" msgid "Marking %s as complete" msgstr "" -#: fetch-pack.c:776 +#: fetch-pack.c:777 #, c-format msgid "already have %s (%s)" msgstr "" -#: fetch-pack.c:814 +#: fetch-pack.c:815 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "" -#: fetch-pack.c:822 +#: fetch-pack.c:823 msgid "protocol error: bad pack header" msgstr "" -#: fetch-pack.c:878 +#: fetch-pack.c:879 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "" -#: fetch-pack.c:894 +#: fetch-pack.c:895 #, c-format msgid "%s failed" msgstr "" -#: fetch-pack.c:896 +#: fetch-pack.c:897 msgid "error in sideband demultiplexer" msgstr "" -#: fetch-pack.c:923 +#: fetch-pack.c:924 msgid "Server does not support shallow clients" msgstr "" -#: fetch-pack.c:927 +#: fetch-pack.c:928 msgid "Server supports multi_ack_detailed" msgstr "" -#: fetch-pack.c:930 +#: fetch-pack.c:931 msgid "Server supports no-done" msgstr "" -#: fetch-pack.c:936 +#: fetch-pack.c:937 msgid "Server supports multi_ack" msgstr "" -#: fetch-pack.c:940 +#: fetch-pack.c:941 msgid "Server supports side-band-64k" msgstr "" -#: fetch-pack.c:944 +#: fetch-pack.c:945 msgid "Server supports side-band" msgstr "" -#: fetch-pack.c:948 +#: fetch-pack.c:949 msgid "Server supports allow-tip-sha1-in-want" msgstr "" -#: fetch-pack.c:952 +#: fetch-pack.c:953 msgid "Server supports allow-reachable-sha1-in-want" msgstr "" -#: fetch-pack.c:962 +#: fetch-pack.c:963 msgid "Server supports ofs-delta" msgstr "" -#: fetch-pack.c:969 +#: fetch-pack.c:970 #, c-format msgid "Server version is %.*s" msgstr "" -#: fetch-pack.c:975 +#: fetch-pack.c:976 msgid "Server does not support --shallow-since" msgstr "" -#: fetch-pack.c:979 +#: fetch-pack.c:980 msgid "Server does not support --shallow-exclude" msgstr "" -#: fetch-pack.c:981 +#: fetch-pack.c:982 msgid "Server does not support --deepen" msgstr "" -#: fetch-pack.c:992 +#: fetch-pack.c:993 msgid "no common commits" msgstr "" -#: fetch-pack.c:1004 +#: fetch-pack.c:1005 msgid "git fetch-pack: fetch failed." msgstr "" -#: fetch-pack.c:1166 +#: fetch-pack.c:1167 msgid "no matching remote head" msgstr "" -#: fetch-pack.c:1188 +#: fetch-pack.c:1189 #, c-format msgid "no such remote ref %s" msgstr "" -#: fetch-pack.c:1191 +#: fetch-pack.c:1192 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "" @@ -1766,17 +1776,17 @@ msgstr "" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "" -#: grep.c:1970 +#: grep.c:2017 #, c-format msgid "'%s': unable to read %s" msgstr "" -#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134 +#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134 #, c-format msgid "failed to stat '%s'" msgstr "" -#: grep.c:1998 +#: grep.c:2045 #, c-format msgid "'%s': short read" msgstr "" @@ -1839,12 +1849,12 @@ msgstr[1] "" msgid "git version [<options>]" msgstr "" -#: help.c:456 +#: help.c:462 #, c-format msgid "%s: %s - %s" msgstr "" -#: help.c:460 +#: help.c:466 msgid "" "\n" "Did you mean this?" @@ -1902,6 +1912,15 @@ msgstr "" msgid "invalid date format: %s" msgstr "" +#: list-objects-filter-options.c:30 +msgid "multiple object filter types cannot be combined" +msgstr "" + +#: list-objects-filter-options.c:41 list-objects-filter-options.c:68 +#, c-format +msgid "invalid filter-spec expression '%s'" +msgstr "" + #: lockfile.c:151 #, c-format msgid "" @@ -1923,8 +1942,8 @@ msgstr "" msgid "failed to read the cache" msgstr "" -#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380 -#: builtin/checkout.c:595 builtin/clone.c:754 +#: merge.c:95 builtin/am.c:1980 builtin/am.c:2014 builtin/checkout.c:379 +#: builtin/checkout.c:600 builtin/clone.c:754 msgid "unable to write new index file" msgstr "" @@ -2107,7 +2126,7 @@ msgstr "" msgid "Auto-merging %s" msgstr "" -#: merge-recursive.c:1775 git-submodule.sh:944 +#: merge-recursive.c:1775 git-submodule.sh:932 msgid "submodule" msgstr "" @@ -2129,46 +2148,46 @@ msgstr "" msgid "directory/file" msgstr "" -#: merge-recursive.c:1908 +#: merge-recursive.c:1909 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -#: merge-recursive.c:1917 +#: merge-recursive.c:1918 #, c-format msgid "Adding %s" msgstr "" -#: merge-recursive.c:1954 +#: merge-recursive.c:1955 msgid "Already up to date!" msgstr "" -#: merge-recursive.c:1963 +#: merge-recursive.c:1964 #, c-format msgid "merging of trees %s and %s failed" msgstr "" -#: merge-recursive.c:2060 +#: merge-recursive.c:2061 msgid "Merging:" msgstr "" -#: merge-recursive.c:2073 +#: merge-recursive.c:2074 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:2112 +#: merge-recursive.c:2113 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:2175 +#: merge-recursive.c:2176 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814 +#: merge-recursive.c:2190 builtin/merge.c:656 builtin/merge.c:815 msgid "Unable to write index." msgstr "" @@ -2329,13 +2348,7 @@ msgstr "" msgid "%s: pathspec magic not supported by this command: %s" msgstr "" -#: pathspec.c:571 -msgid "" -"empty strings as pathspecs will be made invalid in upcoming releases. please " -"use . instead if you meant to match all paths" -msgstr "" - -#: pathspec.c:595 +#: pathspec.c:592 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "" @@ -2344,66 +2357,66 @@ msgstr "" msgid "unable to parse --pretty format" msgstr "" -#: read-cache.c:1443 +#: read-cache.c:1472 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1453 +#: read-cache.c:1482 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:2316 builtin/merge.c:1046 +#: read-cache.c:2370 sequencer.c:2725 wrapper.c:658 builtin/merge.c:1048 #, c-format msgid "could not close '%s'" msgstr "" -#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077 +#: read-cache.c:2442 sequencer.c:1366 sequencer.c:2093 #, c-format msgid "could not stat '%s'" msgstr "" -#: read-cache.c:2407 +#: read-cache.c:2455 #, c-format msgid "unable to open git dir: %s" msgstr "" -#: read-cache.c:2419 +#: read-cache.c:2467 #, c-format msgid "unable to unlink: %s" msgstr "" -#: refs.c:638 +#: refs.c:706 #, c-format msgid "Could not open '%s' for writing" msgstr "" -#: refs.c:1792 +#: refs.c:1850 msgid "ref updates forbidden inside quarantine environment" msgstr "" -#: refs/files-backend.c:1136 +#: refs/files-backend.c:1189 #, c-format msgid "could not remove reference %s" msgstr "" -#: refs/files-backend.c:1150 refs/packed-backend.c:1430 -#: refs/packed-backend.c:1440 +#: refs/files-backend.c:1203 refs/packed-backend.c:1524 +#: refs/packed-backend.c:1534 #, c-format msgid "could not delete reference %s: %s" msgstr "" -#: refs/files-backend.c:1153 refs/packed-backend.c:1443 +#: refs/files-backend.c:1206 refs/packed-backend.c:1537 #, c-format msgid "could not delete references: %s" msgstr "" -#: ref-filter.c:35 wt-status.c:1811 +#: ref-filter.c:35 wt-status.c:1816 msgid "gone" msgstr "" @@ -2422,157 +2435,157 @@ msgstr "" msgid "ahead %d, behind %d" msgstr "" -#: ref-filter.c:105 +#: ref-filter.c:107 #, c-format msgid "expected format: %%(color:<color>)" msgstr "" -#: ref-filter.c:107 +#: ref-filter.c:109 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "" -#: ref-filter.c:127 +#: ref-filter.c:129 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "" -#: ref-filter.c:131 +#: ref-filter.c:133 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "" -#: ref-filter.c:133 +#: ref-filter.c:135 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "" -#: ref-filter.c:173 +#: ref-filter.c:184 #, c-format msgid "%%(body) does not take arguments" msgstr "" -#: ref-filter.c:180 +#: ref-filter.c:191 #, c-format msgid "%%(subject) does not take arguments" msgstr "" -#: ref-filter.c:198 +#: ref-filter.c:209 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "" -#: ref-filter.c:221 +#: ref-filter.c:232 #, c-format msgid "positive value expected contents:lines=%s" msgstr "" -#: ref-filter.c:223 +#: ref-filter.c:234 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "" -#: ref-filter.c:236 +#: ref-filter.c:247 #, c-format msgid "positive value expected objectname:short=%s" msgstr "" -#: ref-filter.c:240 +#: ref-filter.c:251 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "" -#: ref-filter.c:267 +#: ref-filter.c:278 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "" -#: ref-filter.c:279 +#: ref-filter.c:290 #, c-format msgid "unrecognized position:%s" msgstr "" -#: ref-filter.c:283 +#: ref-filter.c:294 #, c-format msgid "unrecognized width:%s" msgstr "" -#: ref-filter.c:289 +#: ref-filter.c:300 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "" -#: ref-filter.c:293 +#: ref-filter.c:304 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "" -#: ref-filter.c:308 +#: ref-filter.c:319 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "" -#: ref-filter.c:398 +#: ref-filter.c:409 #, c-format msgid "malformed field name: %.*s" msgstr "" -#: ref-filter.c:424 +#: ref-filter.c:435 #, c-format msgid "unknown field name: %.*s" msgstr "" -#: ref-filter.c:536 +#: ref-filter.c:547 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "" -#: ref-filter.c:596 +#: ref-filter.c:607 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "" -#: ref-filter.c:598 +#: ref-filter.c:609 #, c-format msgid "format: %%(then) atom used more than once" msgstr "" -#: ref-filter.c:600 +#: ref-filter.c:611 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "" -#: ref-filter.c:626 +#: ref-filter.c:637 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "" -#: ref-filter.c:628 +#: ref-filter.c:639 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "" -#: ref-filter.c:630 +#: ref-filter.c:641 #, c-format msgid "format: %%(else) atom used more than once" msgstr "" -#: ref-filter.c:643 +#: ref-filter.c:654 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "" -#: ref-filter.c:698 +#: ref-filter.c:709 #, c-format msgid "malformed format string %s" msgstr "" -#: ref-filter.c:1283 +#: ref-filter.c:1313 #, c-format msgid "(no branch, rebasing %s)" msgstr "" -#: ref-filter.c:1286 +#: ref-filter.c:1316 #, c-format msgid "(no branch, bisect started on %s)" msgstr "" @@ -2580,7 +2593,7 @@ msgstr "" #. TRANSLATORS: make sure this matches "HEAD #. detached at " in wt-status.c #. -#: ref-filter.c:1294 +#: ref-filter.c:1324 #, c-format msgid "(HEAD detached at %s)" msgstr "" @@ -2588,137 +2601,137 @@ msgstr "" #. TRANSLATORS: make sure this matches "HEAD #. detached from " in wt-status.c #. -#: ref-filter.c:1301 +#: ref-filter.c:1331 #, c-format msgid "(HEAD detached from %s)" msgstr "" -#: ref-filter.c:1305 +#: ref-filter.c:1335 msgid "(no branch)" msgstr "" -#: ref-filter.c:1454 ref-filter.c:1485 +#: ref-filter.c:1488 ref-filter.c:1519 #, c-format msgid "missing object %s for %s" msgstr "" -#: ref-filter.c:1457 ref-filter.c:1488 +#: ref-filter.c:1491 ref-filter.c:1522 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "" -#: ref-filter.c:1788 +#: ref-filter.c:1822 #, c-format msgid "malformed object at '%s'" msgstr "" -#: ref-filter.c:1855 +#: ref-filter.c:1889 #, c-format msgid "ignoring ref with broken name %s" msgstr "" -#: ref-filter.c:1860 +#: ref-filter.c:1894 #, c-format msgid "ignoring broken ref %s" msgstr "" -#: ref-filter.c:2122 +#: ref-filter.c:2156 #, c-format msgid "format: %%(end) atom missing" msgstr "" -#: ref-filter.c:2216 +#: ref-filter.c:2250 #, c-format msgid "malformed object name %s" msgstr "" -#: remote.c:750 +#: remote.c:780 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "" -#: remote.c:754 +#: remote.c:784 #, c-format msgid "%s usually tracks %s, not %s" msgstr "" -#: remote.c:758 +#: remote.c:788 #, c-format msgid "%s tracks both %s and %s" msgstr "" -#: remote.c:766 +#: remote.c:796 msgid "Internal error" msgstr "" -#: remote.c:1681 remote.c:1783 +#: remote.c:1711 remote.c:1813 msgid "HEAD does not point to a branch" msgstr "" -#: remote.c:1690 +#: remote.c:1720 #, c-format msgid "no such branch: '%s'" msgstr "" -#: remote.c:1693 +#: remote.c:1723 #, c-format msgid "no upstream configured for branch '%s'" msgstr "" -#: remote.c:1699 +#: remote.c:1729 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "" -#: remote.c:1714 +#: remote.c:1744 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" -#: remote.c:1726 +#: remote.c:1756 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "" -#: remote.c:1737 +#: remote.c:1767 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "" -#: remote.c:1750 +#: remote.c:1780 msgid "push has no destination (push.default is 'nothing')" msgstr "" -#: remote.c:1772 +#: remote.c:1802 msgid "cannot resolve 'simple' push to a single destination" msgstr "" -#: remote.c:2076 +#: remote.c:2106 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" -#: remote.c:2080 +#: remote.c:2110 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr "" -#: remote.c:2083 +#: remote.c:2113 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "" -#: remote.c:2087 +#: remote.c:2117 #, 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:2093 +#: remote.c:2123 msgid " (use \"git push\" to publish your local commits)\n" msgstr "" -#: remote.c:2096 +#: remote.c:2126 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -2726,11 +2739,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2104 +#: remote.c:2134 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" -#: remote.c:2107 +#: remote.c:2137 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -2741,27 +2754,34 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2117 +#: remote.c:2147 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" -#: revision.c:2256 +#: revision.c:2268 msgid "your current branch appears to be broken" msgstr "" -#: revision.c:2259 +#: revision.c:2271 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "" -#: revision.c:2453 +#: revision.c:2465 msgid "--first-parent is incompatible with --bisect" msgstr "" -#: run-command.c:644 +#: run-command.c:645 msgid "open /dev/null failed" msgstr "" +#: run-command.c:1188 +#, c-format +msgid "" +"The '%s' hook was ignored because it's not set as executable.\n" +"You can disable this warning with `git config advice.ignoredHook false`." +msgstr "" + #: send-pack.c:151 #, c-format msgid "unable to parse remote unpack status: %s" @@ -2824,13 +2844,13 @@ msgid "" "and commit the result with 'git commit'" msgstr "" -#: sequencer.c:297 sequencer.c:1704 +#: sequencer.c:297 sequencer.c:1715 #, c-format msgid "could not lock '%s'" msgstr "" -#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723 -#: sequencer.c:2733 sequencer.c:2749 +#: sequencer.c:300 sequencer.c:1592 sequencer.c:1720 sequencer.c:1734 +#: sequencer.c:2723 sequencer.c:2794 wrapper.c:656 #, c-format msgid "could not write to '%s'" msgstr "" @@ -2840,13 +2860,13 @@ msgstr "" msgid "could not write eol to '%s'" msgstr "" -#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711 +#: sequencer.c:308 sequencer.c:1597 sequencer.c:1722 #, c-format msgid "failed to finalize '%s'." msgstr "" -#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259 -#: builtin/commit.c:754 builtin/merge.c:1044 +#: sequencer.c:332 sequencer.c:829 sequencer.c:1618 builtin/am.c:259 +#: builtin/commit.c:754 builtin/merge.c:1046 #, c-format msgid "could not read '%s'" msgstr "" @@ -2868,20 +2888,20 @@ msgstr "" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:474 +#: sequencer.c:477 #, c-format msgid "%s: Unable to write new index file" msgstr "" -#: sequencer.c:493 +#: sequencer.c:496 msgid "could not resolve HEAD commit\n" msgstr "" -#: sequencer.c:513 +#: sequencer.c:516 msgid "unable to update cache tree\n" msgstr "" -#: sequencer.c:597 +#: sequencer.c:600 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -2898,17 +2918,17 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:699 +#: sequencer.c:702 #, c-format msgid "could not parse commit %s\n" msgstr "" -#: sequencer.c:704 +#: sequencer.c:707 #, c-format msgid "could not parse parent commit %s\n" msgstr "" -#: sequencer.c:826 +#: sequencer.c:836 #, c-format msgid "" "unexpected 1st line of squash message:\n" @@ -2916,7 +2936,7 @@ msgid "" "\t%.*s" msgstr "" -#: sequencer.c:832 +#: sequencer.c:842 #, c-format msgid "" "invalid 1st line of squash message:\n" @@ -2924,230 +2944,230 @@ msgid "" "\t%.*s" msgstr "" -#: sequencer.c:838 sequencer.c:863 +#: sequencer.c:848 sequencer.c:873 #, c-format msgid "This is a combination of %d commits." msgstr "" -#: sequencer.c:847 sequencer.c:2681 +#: sequencer.c:857 sequencer.c:2742 msgid "need a HEAD to fixup" msgstr "" -#: sequencer.c:849 +#: sequencer.c:859 msgid "could not read HEAD" msgstr "" -#: sequencer.c:851 +#: sequencer.c:861 msgid "could not read HEAD's commit message" msgstr "" -#: sequencer.c:857 +#: sequencer.c:867 #, c-format msgid "cannot write '%s'" msgstr "" -#: sequencer.c:866 git-rebase--interactive.sh:446 +#: sequencer.c:876 git-rebase--interactive.sh:446 msgid "This is the 1st commit message:" msgstr "" -#: sequencer.c:874 +#: sequencer.c:884 #, c-format msgid "could not read commit message of %s" msgstr "" -#: sequencer.c:881 +#: sequencer.c:891 #, c-format msgid "This is the commit message #%d:" msgstr "" -#: sequencer.c:886 +#: sequencer.c:896 #, c-format msgid "The commit message #%d will be skipped:" msgstr "" -#: sequencer.c:891 +#: sequencer.c:901 #, c-format msgid "unknown command: %d" msgstr "" -#: sequencer.c:957 +#: sequencer.c:967 msgid "your index file is unmerged." msgstr "" -#: sequencer.c:975 +#: sequencer.c:986 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:983 +#: sequencer.c:994 #, c-format msgid "commit %s does not have parent %d" msgstr "" -#: sequencer.c:987 +#: sequencer.c:998 #, c-format msgid "mainline was specified but commit %s is not a merge." msgstr "" -#: sequencer.c:993 +#: sequencer.c:1004 #, 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:1014 +#: sequencer.c:1025 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:1077 sequencer.c:1853 +#: sequencer.c:1088 sequencer.c:1864 #, c-format msgid "could not rename '%s' to '%s'" msgstr "" -#: sequencer.c:1128 +#: sequencer.c:1139 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:1129 +#: sequencer.c:1140 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:1171 +#: sequencer.c:1182 msgid "empty commit set passed" msgstr "" -#: sequencer.c:1181 +#: sequencer.c:1192 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:1188 +#: sequencer.c:1198 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:1308 +#: sequencer.c:1319 #, c-format msgid "invalid line %d: %.*s" msgstr "" -#: sequencer.c:1316 +#: sequencer.c:1327 #, c-format msgid "cannot '%s' without a previous commit" msgstr "" -#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614 -#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951 +#: sequencer.c:1360 sequencer.c:2522 sequencer.c:2557 sequencer.c:2636 +#: sequencer.c:2662 sequencer.c:2752 sequencer.c:2853 #, c-format msgid "could not read '%s'." msgstr "" -#: sequencer.c:1361 +#: sequencer.c:1372 msgid "please fix this using 'git rebase --edit-todo'." msgstr "" -#: sequencer.c:1363 +#: sequencer.c:1374 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "" -#: sequencer.c:1368 +#: sequencer.c:1379 msgid "no commits parsed." msgstr "" -#: sequencer.c:1379 +#: sequencer.c:1390 msgid "cannot cherry-pick during a revert." msgstr "" -#: sequencer.c:1381 +#: sequencer.c:1392 msgid "cannot revert during a cherry-pick." msgstr "" -#: sequencer.c:1448 +#: sequencer.c:1459 #, c-format msgid "invalid key: %s" msgstr "" -#: sequencer.c:1451 +#: sequencer.c:1462 #, c-format msgid "invalid value for %s: %s" msgstr "" -#: sequencer.c:1517 +#: sequencer.c:1528 #, c-format msgid "malformed options sheet: '%s'" msgstr "" -#: sequencer.c:1555 +#: sequencer.c:1566 msgid "a cherry-pick or revert is already in progress" msgstr "" -#: sequencer.c:1556 +#: sequencer.c:1567 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "" -#: sequencer.c:1559 +#: sequencer.c:1570 #, c-format msgid "could not create sequencer directory '%s'" msgstr "" -#: sequencer.c:1574 +#: sequencer.c:1585 msgid "could not lock HEAD" msgstr "" -#: sequencer.c:1632 sequencer.c:2211 +#: sequencer.c:1643 sequencer.c:2227 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:1634 +#: sequencer.c:1645 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:1636 sequencer.c:1671 +#: sequencer.c:1647 sequencer.c:1682 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:1657 builtin/grep.c:711 +#: sequencer.c:1668 builtin/grep.c:713 #, c-format msgid "cannot open '%s'" msgstr "" -#: sequencer.c:1659 +#: sequencer.c:1670 #, c-format msgid "cannot read '%s': %s" msgstr "" -#: sequencer.c:1660 +#: sequencer.c:1671 msgid "unexpected end of file" msgstr "" -#: sequencer.c:1666 +#: sequencer.c:1677 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:1677 +#: sequencer.c:1688 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" -#: sequencer.c:1818 sequencer.c:2109 +#: sequencer.c:1829 sequencer.c:2125 msgid "cannot read HEAD" msgstr "" -#: sequencer.c:1858 builtin/difftool.c:640 +#: sequencer.c:1869 builtin/difftool.c:639 #, c-format msgid "could not copy '%s' to '%s'" msgstr "" -#: sequencer.c:1874 +#: sequencer.c:1888 msgid "could not read index" msgstr "" -#: sequencer.c:1879 +#: sequencer.c:1893 #, c-format msgid "" "execution failed: %s\n" @@ -3157,11 +3177,11 @@ msgid "" "\n" msgstr "" -#: sequencer.c:1885 +#: sequencer.c:1899 msgid "and made changes to the index and/or the working tree\n" msgstr "" -#: sequencer.c:1891 +#: sequencer.c:1905 #, c-format msgid "" "execution succeeded: %s\n" @@ -3172,17 +3192,17 @@ msgid "" "\n" msgstr "" -#: sequencer.c:1948 +#: sequencer.c:1964 #, c-format msgid "Applied autostash.\n" msgstr "" -#: sequencer.c:1960 +#: sequencer.c:1976 #, c-format msgid "cannot store %s" msgstr "" -#: sequencer.c:1963 git-rebase.sh:175 +#: sequencer.c:1979 git-rebase.sh:175 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -3190,113 +3210,108 @@ msgid "" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -#: sequencer.c:2045 +#: sequencer.c:2061 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "" -#: sequencer.c:2087 +#: sequencer.c:2103 #, c-format msgid "unknown command %d" msgstr "" -#: sequencer.c:2117 +#: sequencer.c:2133 msgid "could not read orig-head" msgstr "" -#: sequencer.c:2122 sequencer.c:2678 +#: sequencer.c:2138 sequencer.c:2739 msgid "could not read 'onto'" msgstr "" -#: sequencer.c:2129 +#: sequencer.c:2145 #, c-format msgid "could not update %s" msgstr "" -#: sequencer.c:2136 +#: sequencer.c:2152 #, c-format msgid "could not update HEAD to %s" msgstr "" -#: sequencer.c:2220 +#: sequencer.c:2236 msgid "cannot rebase: You have unstaged changes." msgstr "" -#: sequencer.c:2225 +#: sequencer.c:2241 msgid "could not remove CHERRY_PICK_HEAD" msgstr "" -#: sequencer.c:2234 +#: sequencer.c:2250 msgid "cannot amend non-existing commit" msgstr "" -#: sequencer.c:2236 +#: sequencer.c:2252 #, c-format msgid "invalid file: '%s'" msgstr "" -#: sequencer.c:2238 +#: sequencer.c:2254 #, c-format msgid "invalid contents: '%s'" msgstr "" -#: sequencer.c:2241 +#: sequencer.c:2257 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:2251 +#: sequencer.c:2267 msgid "could not commit staged changes." msgstr "" -#: sequencer.c:2331 +#: sequencer.c:2347 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "" -#: sequencer.c:2335 +#: sequencer.c:2351 #, c-format msgid "%s: bad revision" msgstr "" -#: sequencer.c:2368 +#: sequencer.c:2384 msgid "can't revert as initial commit" msgstr "" -#: sequencer.c:2471 +#: sequencer.c:2489 msgid "make_script: unhandled options" msgstr "" -#: sequencer.c:2474 +#: sequencer.c:2492 msgid "make_script: error preparing revisions" msgstr "" -#: sequencer.c:2510 +#: sequencer.c:2526 sequencer.c:2561 #, c-format msgid "unusable todo list: '%s'" msgstr "" -#: sequencer.c:2516 -#, c-format -msgid "unable to open '%s' for writing" -msgstr "" - -#: sequencer.c:2561 +#: sequencer.c:2609 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." msgstr "" -#: sequencer.c:2641 +#: sequencer.c:2689 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" "Dropped commits (newer to older):\n" msgstr "" -#: sequencer.c:2648 +#: sequencer.c:2696 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -3307,7 +3322,7 @@ msgid "" "\n" msgstr "" -#: sequencer.c:2660 +#: sequencer.c:2708 #, c-format msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" @@ -3315,31 +3330,21 @@ msgid "" "Or you can abort the rebase with 'git rebase --abort'.\n" msgstr "" -#: sequencer.c:2708 -#, c-format -msgid "could not parse commit '%s'" -msgstr "" - -#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395 -#: builtin/am.c:775 +#: sequencer.c:2721 sequencer.c:2788 wrapper.c:225 wrapper.c:395 +#: builtin/am.c:779 #, c-format msgid "could not open '%s' for writing" msgstr "" -#: sequencer.c:2756 +#: sequencer.c:2769 #, c-format -msgid "could not truncate '%s'" +msgid "could not parse commit '%s'" msgstr "" -#: sequencer.c:2848 +#: sequencer.c:2891 msgid "the script was already rearranged." msgstr "" -#: sequencer.c:2953 -#, c-format -msgid "could not finish '%s'" -msgstr "" - #: setup.c:171 #, c-format msgid "" @@ -3363,82 +3368,82 @@ msgid "" "'git <command> [<revision>...] -- [<file>...]'" msgstr "" -#: setup.c:499 +#: setup.c:501 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "" -#: setup.c:507 +#: setup.c:509 msgid "unknown repository extensions found:" msgstr "" -#: setup.c:806 +#: setup.c:811 #, c-format msgid "Not a git repository (or any of the parent directories): %s" msgstr "" -#: setup.c:808 builtin/index-pack.c:1653 +#: setup.c:813 builtin/index-pack.c:1653 msgid "Cannot come back to cwd" msgstr "" -#: setup.c:1046 +#: setup.c:1052 msgid "Unable to read current working directory" msgstr "" -#: setup.c:1058 setup.c:1064 +#: setup.c:1064 setup.c:1070 #, c-format msgid "Cannot change to '%s'" msgstr "" -#: setup.c:1077 +#: setup.c:1083 #, 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:1159 +#: setup.c:1167 #, c-format msgid "" "Problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." msgstr "" -#: sha1_file.c:528 +#: sha1_file.c:598 #, c-format msgid "path '%s' does not exist" msgstr "" -#: sha1_file.c:554 +#: sha1_file.c:624 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" -#: sha1_file.c:560 +#: sha1_file.c:630 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "" -#: sha1_file.c:566 +#: sha1_file.c:636 #, c-format msgid "reference repository '%s' is shallow" msgstr "" -#: sha1_file.c:574 +#: sha1_file.c:644 #, c-format msgid "reference repository '%s' is grafted" msgstr "" -#: sha1_name.c:420 +#: sha1_name.c:422 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "" -#: sha1_name.c:431 +#: sha1_name.c:433 msgid "The candidates are:" msgstr "" -#: sha1_name.c:590 +#: sha1_name.c:693 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" @@ -3451,86 +3456,86 @@ msgid "" "running \"git config advice.objectNameWarning false\"" msgstr "" -#: submodule.c:93 submodule.c:127 +#: submodule.c:96 submodule.c:130 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" -#: submodule.c:97 submodule.c:131 +#: submodule.c:100 submodule.c:134 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "" -#: submodule.c:105 +#: submodule.c:108 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "" -#: submodule.c:138 +#: submodule.c:141 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "" -#: submodule.c:149 +#: submodule.c:152 msgid "staging updated .gitmodules failed" msgstr "" -#: submodule.c:309 +#: submodule.c:312 #, c-format msgid "in unpopulated submodule '%s'" msgstr "" -#: submodule.c:340 +#: submodule.c:343 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "" -#: submodule.c:799 +#: submodule.c:833 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "" -#: submodule.c:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149 +#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387 msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: submodule.c:1304 +#: submodule.c:1370 #, c-format msgid "'%s' not recognized as a git repository" msgstr "" -#: submodule.c:1442 +#: submodule.c:1508 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "" -#: submodule.c:1455 +#: submodule.c:1521 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "" -#: submodule.c:1548 +#: submodule.c:1614 #, c-format msgid "submodule '%s' has dirty index" msgstr "" -#: submodule.c:1809 +#: submodule.c:1876 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "" -#: submodule.c:1821 submodule.c:1877 +#: submodule.c:1888 submodule.c:1944 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "" -#: submodule.c:1825 builtin/submodule--helper.c:671 -#: builtin/submodule--helper.c:681 +#: submodule.c:1892 builtin/submodule--helper.c:909 +#: builtin/submodule--helper.c:919 #, c-format msgid "could not create directory '%s'" msgstr "" -#: submodule.c:1828 +#: submodule.c:1895 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -3538,20 +3543,20 @@ msgid "" "'%s'\n" msgstr "" -#: submodule.c:1912 +#: submodule.c:1979 #, c-format msgid "could not recurse into submodule '%s'" msgstr "" -#: submodule.c:1956 +#: submodule.c:2023 msgid "could not start ls-files in .." msgstr "" -#: submodule.c:1976 +#: submodule.c:2043 msgid "BUG: returned path string doesn't match cwd?" msgstr "" -#: submodule.c:1995 +#: submodule.c:2062 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "" @@ -3619,24 +3624,24 @@ msgstr "" msgid "could not rename temporary file to %s" msgstr "" -#: transport.c:62 +#: transport.c:63 #, c-format msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "" -#: transport.c:151 +#: transport.c:152 #, c-format msgid "transport: invalid depth option '%s'" msgstr "" -#: transport.c:888 +#: transport.c:904 #, c-format msgid "" "The following submodule paths contain changes that can\n" "not be found on any remote:\n" msgstr "" -#: transport.c:892 +#: transport.c:908 #, c-format msgid "" "\n" @@ -3652,11 +3657,11 @@ msgid "" "\n" msgstr "" -#: transport.c:900 +#: transport.c:916 msgid "Aborting." msgstr "" -#: transport-helper.c:1071 +#: transport-helper.c:1074 #, c-format msgid "Could not read ref %s" msgstr "" @@ -3677,98 +3682,98 @@ msgstr "" msgid "too-short tree file" msgstr "" -#: unpack-trees.c:106 +#: unpack-trees.c:107 #, 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:108 +#: unpack-trees.c:109 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%s" msgstr "" -#: unpack-trees.c:111 +#: unpack-trees.c:112 #, 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:113 +#: unpack-trees.c:114 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:116 +#: unpack-trees.c:117 #, 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:118 +#: unpack-trees.c:119 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:123 +#: unpack-trees.c:124 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" "%s" msgstr "" -#: unpack-trees.c:127 +#: unpack-trees.c:128 #, 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:129 +#: unpack-trees.c:130 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%s" msgstr "" -#: unpack-trees.c:132 +#: unpack-trees.c:133 #, 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:134 +#: unpack-trees.c:135 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:137 +#: unpack-trees.c:138 #, 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:139 +#: unpack-trees.c:140 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:144 +#: unpack-trees.c:145 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3776,7 +3781,7 @@ msgid "" "%%sPlease move or remove them before you switch branches." msgstr "" -#: unpack-trees.c:146 +#: unpack-trees.c:147 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3784,47 +3789,47 @@ msgid "" "%%s" msgstr "" -#: unpack-trees.c:149 +#: unpack-trees.c:150 #, 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:151 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:154 +#: unpack-trees.c:155 #, 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:156 +#: unpack-trees.c:157 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:163 +#: unpack-trees.c:164 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "" -#: unpack-trees.c:166 +#: unpack-trees.c:167 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" "%s" msgstr "" -#: unpack-trees.c:168 +#: unpack-trees.c:169 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -3832,7 +3837,7 @@ msgid "" "%s" msgstr "" -#: unpack-trees.c:170 +#: unpack-trees.c:171 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -3840,19 +3845,19 @@ msgid "" "%s" msgstr "" -#: unpack-trees.c:172 +#: unpack-trees.c:173 #, c-format msgid "" "Cannot update submodule:\n" "%s" msgstr "" -#: unpack-trees.c:249 +#: unpack-trees.c:250 #, c-format msgid "Aborting\n" msgstr "" -#: unpack-trees.c:331 +#: unpack-trees.c:332 msgid "Checking out files" msgstr "" @@ -3895,8 +3900,8 @@ msgstr "" msgid "could not open '%s' for reading and writing" msgstr "" -#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766 -#: builtin/am.c:858 builtin/merge.c:1041 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770 +#: builtin/am.c:862 builtin/merge.c:1043 #, c-format msgid "could not open '%s' for reading" msgstr "" @@ -3910,16 +3915,6 @@ msgstr "" msgid "unable to get current working directory" msgstr "" -#: wrapper.c:656 -#, c-format -msgid "could not write to %s" -msgstr "" - -#: wrapper.c:658 -#, c-format -msgid "could not close %s" -msgstr "" - #: wt-status.c:150 msgid "Unmerged paths:" msgstr "" @@ -3945,11 +3940,11 @@ msgstr "" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" -#: wt-status.c:198 wt-status.c:979 +#: wt-status.c:198 wt-status.c:984 msgid "Changes to be committed:" msgstr "" -#: wt-status.c:216 wt-status.c:988 +#: wt-status.c:216 wt-status.c:993 msgid "Changes not staged for commit:" msgstr "" @@ -4047,247 +4042,247 @@ msgstr "" msgid "untracked content, " msgstr "" -#: wt-status.c:819 +#: wt-status.c:824 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "" msgstr[1] "" -#: wt-status.c:851 +#: wt-status.c:856 msgid "Submodules changed but not updated:" msgstr "" -#: wt-status.c:853 +#: wt-status.c:858 msgid "Submodule changes to be committed:" msgstr "" -#: wt-status.c:935 +#: wt-status.c:940 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." msgstr "" -#: wt-status.c:1048 +#: wt-status.c:1053 msgid "You have unmerged paths." msgstr "" -#: wt-status.c:1051 +#: wt-status.c:1056 msgid " (fix conflicts and run \"git commit\")" msgstr "" -#: wt-status.c:1053 +#: wt-status.c:1058 msgid " (use \"git merge --abort\" to abort the merge)" msgstr "" -#: wt-status.c:1058 +#: wt-status.c:1063 msgid "All conflicts fixed but you are still merging." msgstr "" -#: wt-status.c:1061 +#: wt-status.c:1066 msgid " (use \"git commit\" to conclude merge)" msgstr "" -#: wt-status.c:1071 +#: wt-status.c:1076 msgid "You are in the middle of an am session." msgstr "" -#: wt-status.c:1074 +#: wt-status.c:1079 msgid "The current patch is empty." msgstr "" -#: wt-status.c:1078 +#: wt-status.c:1083 msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" -#: wt-status.c:1080 +#: wt-status.c:1085 msgid " (use \"git am --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1082 +#: wt-status.c:1087 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" -#: wt-status.c:1214 +#: wt-status.c:1219 msgid "git-rebase-todo is missing." msgstr "" -#: wt-status.c:1216 +#: wt-status.c:1221 msgid "No commands done." msgstr "" -#: wt-status.c:1219 +#: wt-status.c:1224 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "" msgstr[1] "" -#: wt-status.c:1230 +#: wt-status.c:1235 #, c-format msgid " (see more in file %s)" msgstr "" -#: wt-status.c:1235 +#: wt-status.c:1240 msgid "No commands remaining." msgstr "" -#: wt-status.c:1238 +#: wt-status.c:1243 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "" msgstr[1] "" -#: wt-status.c:1246 +#: wt-status.c:1251 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr "" -#: wt-status.c:1259 +#: wt-status.c:1264 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1264 +#: wt-status.c:1269 msgid "You are currently rebasing." msgstr "" -#: wt-status.c:1278 +#: wt-status.c:1283 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1280 +#: wt-status.c:1285 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1282 +#: wt-status.c:1287 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" -#: wt-status.c:1288 +#: wt-status.c:1293 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1292 +#: wt-status.c:1297 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1297 +#: wt-status.c:1302 msgid "You are currently splitting a commit during a rebase." msgstr "" -#: wt-status.c:1300 +#: wt-status.c:1305 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1304 +#: wt-status.c:1309 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1309 +#: wt-status.c:1314 msgid "You are currently editing a commit during a rebase." msgstr "" -#: wt-status.c:1312 +#: wt-status.c:1317 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" -#: wt-status.c:1314 +#: wt-status.c:1319 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -#: wt-status.c:1324 +#: wt-status.c:1329 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "" -#: wt-status.c:1329 +#: wt-status.c:1334 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1332 +#: wt-status.c:1337 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1334 +#: wt-status.c:1339 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" -#: wt-status.c:1343 +#: wt-status.c:1348 #, c-format msgid "You are currently reverting commit %s." msgstr "" -#: wt-status.c:1348 +#: wt-status.c:1353 msgid " (fix conflicts and run \"git revert --continue\")" msgstr "" -#: wt-status.c:1351 +#: wt-status.c:1356 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" -#: wt-status.c:1353 +#: wt-status.c:1358 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" -#: wt-status.c:1364 +#: wt-status.c:1369 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "" -#: wt-status.c:1368 +#: wt-status.c:1373 msgid "You are currently bisecting." msgstr "" -#: wt-status.c:1371 +#: wt-status.c:1376 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -#: wt-status.c:1568 +#: wt-status.c:1573 msgid "On branch " msgstr "" -#: wt-status.c:1574 +#: wt-status.c:1579 msgid "interactive rebase in progress; onto " msgstr "" -#: wt-status.c:1576 +#: wt-status.c:1581 msgid "rebase in progress; onto " msgstr "" -#: wt-status.c:1581 +#: wt-status.c:1586 msgid "HEAD detached at " msgstr "" -#: wt-status.c:1583 +#: wt-status.c:1588 msgid "HEAD detached from " msgstr "" -#: wt-status.c:1586 +#: wt-status.c:1591 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:1606 +#: wt-status.c:1611 msgid "Initial commit" msgstr "" -#: wt-status.c:1607 +#: wt-status.c:1612 msgid "No commits yet" msgstr "" -#: wt-status.c:1621 +#: wt-status.c:1626 msgid "Untracked files" msgstr "" -#: wt-status.c:1623 +#: wt-status.c:1628 msgid "Ignored files" msgstr "" -#: wt-status.c:1627 +#: wt-status.c:1632 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -4295,88 +4290,88 @@ msgid "" "new files yourself (see 'git help status')." msgstr "" -#: wt-status.c:1633 +#: wt-status.c:1638 #, c-format msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:1635 +#: wt-status.c:1640 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:1641 +#: wt-status.c:1646 msgid "No changes" msgstr "" -#: wt-status.c:1646 +#: wt-status.c:1651 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -#: wt-status.c:1649 +#: wt-status.c:1654 #, c-format msgid "no changes added to commit\n" msgstr "" -#: wt-status.c:1652 +#: wt-status.c:1657 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -#: wt-status.c:1655 +#: wt-status.c:1660 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" -#: wt-status.c:1658 +#: wt-status.c:1663 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -#: wt-status.c:1661 wt-status.c:1666 +#: wt-status.c:1666 wt-status.c:1671 #, c-format msgid "nothing to commit\n" msgstr "" -#: wt-status.c:1664 +#: wt-status.c:1669 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -#: wt-status.c:1668 +#: wt-status.c:1673 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "" -#: wt-status.c:1780 +#: wt-status.c:1785 msgid "No commits yet on " msgstr "" -#: wt-status.c:1784 +#: wt-status.c:1789 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:1813 wt-status.c:1821 +#: wt-status.c:1818 wt-status.c:1826 msgid "behind " msgstr "" -#: wt-status.c:1816 wt-status.c:1819 +#: wt-status.c:1821 wt-status.c:1824 msgid "ahead " msgstr "" #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2311 +#: wt-status.c:2318 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "" -#: wt-status.c:2317 +#: wt-status.c:2324 msgid "additionally, your index contains uncommitted changes." msgstr "" -#: wt-status.c:2319 +#: wt-status.c:2326 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "" @@ -4390,122 +4385,126 @@ msgstr "" msgid "git add [<options>] [--] <pathspec>..." msgstr "" -#: builtin/add.c:82 +#: builtin/add.c:83 #, c-format msgid "unexpected diff status %c" msgstr "" -#: builtin/add.c:87 builtin/commit.c:291 +#: builtin/add.c:88 builtin/commit.c:291 msgid "updating files failed" msgstr "" -#: builtin/add.c:97 +#: builtin/add.c:98 #, c-format msgid "remove '%s'\n" msgstr "" -#: builtin/add.c:153 +#: builtin/add.c:173 msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/add.c:213 builtin/rev-parse.c:888 +#: builtin/add.c:233 builtin/rev-parse.c:888 msgid "Could not read the index" msgstr "" -#: builtin/add.c:224 +#: builtin/add.c:244 #, c-format msgid "Could not open '%s' for writing." msgstr "" -#: builtin/add.c:228 +#: builtin/add.c:248 msgid "Could not write patch" msgstr "" -#: builtin/add.c:231 +#: builtin/add.c:251 msgid "editing patch failed" msgstr "" -#: builtin/add.c:234 +#: builtin/add.c:254 #, c-format msgid "Could not stat '%s'" msgstr "" -#: builtin/add.c:236 +#: builtin/add.c:256 msgid "Empty patch. Aborted." msgstr "" -#: builtin/add.c:241 +#: builtin/add.c:261 #, c-format msgid "Could not apply '%s'" msgstr "" -#: builtin/add.c:251 +#: builtin/add.c:271 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -#: builtin/add.c:271 builtin/clean.c:910 builtin/fetch.c:132 builtin/mv.c:124 -#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529 +#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124 +#: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541 #: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164 msgid "dry run" msgstr "" -#: builtin/add.c:274 +#: builtin/add.c:294 msgid "interactive picking" msgstr "" -#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310 +#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310 msgid "select hunks interactively" msgstr "" -#: builtin/add.c:276 +#: builtin/add.c:296 msgid "edit current diff and apply" msgstr "" -#: builtin/add.c:277 +#: builtin/add.c:297 msgid "allow adding otherwise ignored files" msgstr "" -#: builtin/add.c:278 +#: builtin/add.c:298 msgid "update tracked files" msgstr "" -#: builtin/add.c:279 +#: builtin/add.c:299 +msgid "renormalize EOL of tracked files (implies -u)" +msgstr "" + +#: builtin/add.c:300 msgid "record only the fact that the path will be added later" msgstr "" -#: builtin/add.c:280 +#: builtin/add.c:301 msgid "add changes from all tracked and untracked files" msgstr "" -#: builtin/add.c:283 +#: builtin/add.c:304 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" -#: builtin/add.c:285 +#: builtin/add.c:306 msgid "don't add, only refresh the index" msgstr "" -#: builtin/add.c:286 +#: builtin/add.c:307 msgid "just skip files which cannot be added because of errors" msgstr "" -#: builtin/add.c:287 +#: builtin/add.c:308 msgid "check if - even missing - files are ignored in dry run" msgstr "" -#: builtin/add.c:288 builtin/update-index.c:954 +#: builtin/add.c:309 builtin/update-index.c:964 msgid "(+/-)x" msgstr "" -#: builtin/add.c:288 builtin/update-index.c:955 +#: builtin/add.c:309 builtin/update-index.c:965 msgid "override the executable bit of the listed files" msgstr "" -#: builtin/add.c:290 +#: builtin/add.c:311 msgid "warn when adding an embedded repository" msgstr "" -#: builtin/add.c:305 +#: builtin/add.c:326 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -4523,47 +4522,47 @@ msgid "" "See \"git help submodule\" for more information." msgstr "" -#: builtin/add.c:333 +#: builtin/add.c:354 #, c-format msgid "adding embedded git repository: %s" msgstr "" -#: builtin/add.c:351 +#: builtin/add.c:372 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "" -#: builtin/add.c:359 +#: builtin/add.c:380 msgid "adding files failed" msgstr "" -#: builtin/add.c:396 +#: builtin/add.c:417 msgid "-A and -u are mutually incompatible" msgstr "" -#: builtin/add.c:403 +#: builtin/add.c:424 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" -#: builtin/add.c:407 +#: builtin/add.c:428 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "" -#: builtin/add.c:422 +#: builtin/add.c:443 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "" -#: builtin/add.c:423 +#: builtin/add.c:444 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" -#: builtin/add.c:428 builtin/check-ignore.c:176 builtin/checkout.c:282 -#: builtin/checkout.c:479 builtin/clean.c:957 builtin/commit.c:350 -#: builtin/mv.c:143 builtin/reset.c:249 builtin/rm.c:271 -#: builtin/submodule--helper.c:243 +#: builtin/add.c:449 builtin/check-ignore.c:176 builtin/checkout.c:281 +#: builtin/checkout.c:484 builtin/clean.c:958 builtin/commit.c:350 +#: builtin/diff-tree.c:114 builtin/mv.c:143 builtin/reset.c:249 +#: builtin/rm.c:271 builtin/submodule--helper.c:311 msgid "index file corrupt" msgstr "" @@ -4590,118 +4589,118 @@ msgstr "" msgid "fseek failed" msgstr "" -#: builtin/am.c:786 +#: builtin/am.c:790 #, c-format msgid "could not parse patch '%s'" msgstr "" -#: builtin/am.c:851 +#: builtin/am.c:855 msgid "Only one StGIT patch series can be applied at once" msgstr "" -#: builtin/am.c:899 +#: builtin/am.c:903 msgid "invalid timestamp" msgstr "" -#: builtin/am.c:904 builtin/am.c:916 +#: builtin/am.c:908 builtin/am.c:920 msgid "invalid Date line" msgstr "" -#: builtin/am.c:911 +#: builtin/am.c:915 msgid "invalid timezone offset" msgstr "" -#: builtin/am.c:1004 +#: builtin/am.c:1008 msgid "Patch format detection failed." msgstr "" -#: builtin/am.c:1009 builtin/clone.c:402 +#: builtin/am.c:1013 builtin/clone.c:402 #, c-format msgid "failed to create directory '%s'" msgstr "" -#: builtin/am.c:1013 +#: builtin/am.c:1017 msgid "Failed to split patches." msgstr "" -#: builtin/am.c:1142 builtin/commit.c:376 +#: builtin/am.c:1146 builtin/commit.c:376 msgid "unable to write index file" msgstr "" -#: builtin/am.c:1193 +#: builtin/am.c:1197 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "" -#: builtin/am.c:1194 +#: builtin/am.c:1198 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" -#: builtin/am.c:1195 +#: builtin/am.c:1199 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" -#: builtin/am.c:1302 +#: builtin/am.c:1306 msgid "Patch is empty." msgstr "" -#: builtin/am.c:1368 +#: builtin/am.c:1372 #, c-format msgid "invalid ident line: %.*s" msgstr "" -#: builtin/am.c:1390 +#: builtin/am.c:1394 #, c-format msgid "unable to parse commit %s" msgstr "" -#: builtin/am.c:1584 +#: builtin/am.c:1587 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" -#: builtin/am.c:1586 +#: builtin/am.c:1589 msgid "Using index info to reconstruct a base tree..." msgstr "" -#: builtin/am.c:1605 +#: builtin/am.c:1608 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" -#: builtin/am.c:1611 +#: builtin/am.c:1614 msgid "Falling back to patching base and 3-way merge..." msgstr "" -#: builtin/am.c:1636 +#: builtin/am.c:1639 msgid "Failed to merge in the changes." msgstr "" -#: builtin/am.c:1660 builtin/merge.c:641 +#: builtin/am.c:1663 builtin/merge.c:642 msgid "git write-tree failed to write a tree" msgstr "" -#: builtin/am.c:1667 +#: builtin/am.c:1670 msgid "applying to an empty history" msgstr "" -#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824 -#: builtin/merge.c:849 +#: builtin/am.c:1683 builtin/commit.c:1798 builtin/merge.c:825 +#: builtin/merge.c:850 msgid "failed to write commit object" msgstr "" -#: builtin/am.c:1713 builtin/am.c:1717 +#: builtin/am.c:1716 builtin/am.c:1720 #, c-format msgid "cannot resume: %s does not exist." msgstr "" -#: builtin/am.c:1733 +#: builtin/am.c:1736 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" -#: builtin/am.c:1738 +#: builtin/am.c:1741 msgid "Commit Body is:" msgstr "" @@ -4709,42 +4708,42 @@ msgstr "" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1748 +#: builtin/am.c:1751 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" -#: builtin/am.c:1798 +#: builtin/am.c:1801 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "" -#: builtin/am.c:1838 builtin/am.c:1910 +#: builtin/am.c:1841 builtin/am.c:1913 #, c-format msgid "Applying: %.*s" msgstr "" -#: builtin/am.c:1854 +#: builtin/am.c:1857 msgid "No changes -- Patch already applied." msgstr "" -#: builtin/am.c:1862 +#: builtin/am.c:1865 #, c-format msgid "Patch failed at %s %.*s" msgstr "" -#: builtin/am.c:1868 +#: builtin/am.c:1871 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "" -#: builtin/am.c:1913 +#: builtin/am.c:1916 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:1920 +#: builtin/am.c:1923 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -4752,171 +4751,171 @@ msgid "" "You might run `git rm` on a file to accept \"deleted by them\" for it." msgstr "" -#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332 +#: builtin/am.c:2030 builtin/am.c:2034 builtin/am.c:2046 builtin/reset.c:332 #: builtin/reset.c:340 #, c-format msgid "Could not parse object '%s'." msgstr "" -#: builtin/am.c:2081 +#: builtin/am.c:2082 msgid "failed to clean index" msgstr "" -#: builtin/am.c:2116 +#: builtin/am.c:2117 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "" -#: builtin/am.c:2179 +#: builtin/am.c:2180 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "" -#: builtin/am.c:2212 +#: builtin/am.c:2213 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "" -#: builtin/am.c:2213 +#: builtin/am.c:2214 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "" -#: builtin/am.c:2219 +#: builtin/am.c:2220 msgid "run interactively" msgstr "" -#: builtin/am.c:2221 +#: builtin/am.c:2222 msgid "historical option -- no-op" msgstr "" -#: builtin/am.c:2223 +#: builtin/am.c:2224 msgid "allow fall back on 3way merging if needed" msgstr "" -#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57 +#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57 #: builtin/repack.c:180 msgid "be quiet" msgstr "" -#: builtin/am.c:2226 +#: builtin/am.c:2227 msgid "add a Signed-off-by line to the commit message" msgstr "" -#: builtin/am.c:2229 +#: builtin/am.c:2230 msgid "recode into utf8 (default)" msgstr "" -#: builtin/am.c:2231 +#: builtin/am.c:2232 msgid "pass -k flag to git-mailinfo" msgstr "" -#: builtin/am.c:2233 +#: builtin/am.c:2234 msgid "pass -b flag to git-mailinfo" msgstr "" -#: builtin/am.c:2235 +#: builtin/am.c:2236 msgid "pass -m flag to git-mailinfo" msgstr "" -#: builtin/am.c:2237 +#: builtin/am.c:2238 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "" -#: builtin/am.c:2240 +#: builtin/am.c:2241 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" -#: builtin/am.c:2243 +#: builtin/am.c:2244 msgid "strip everything before a scissors line" msgstr "" -#: builtin/am.c:2245 builtin/am.c:2248 builtin/am.c:2251 builtin/am.c:2254 -#: builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263 builtin/am.c:2266 -#: builtin/am.c:2272 +#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255 +#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 +#: builtin/am.c:2273 msgid "pass it through git-apply" msgstr "" -#: builtin/am.c:2262 builtin/fmt-merge-msg.c:664 builtin/fmt-merge-msg.c:667 -#: builtin/grep.c:843 builtin/merge.c:205 builtin/pull.c:142 builtin/pull.c:197 +#: builtin/am.c:2263 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668 +#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203 #: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195 #: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377 #: parse-options.h:132 parse-options.h:134 parse-options.h:245 msgid "n" msgstr "" -#: builtin/am.c:2268 builtin/branch.c:622 builtin/for-each-ref.c:38 +#: builtin/am.c:2269 builtin/branch.c:629 builtin/for-each-ref.c:38 #: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39 msgid "format" msgstr "" -#: builtin/am.c:2269 +#: builtin/am.c:2270 msgid "format the patch(es) are in" msgstr "" -#: builtin/am.c:2275 +#: builtin/am.c:2276 msgid "override error message when patch failure occurs" msgstr "" -#: builtin/am.c:2277 +#: builtin/am.c:2278 msgid "continue applying patches after resolving a conflict" msgstr "" -#: builtin/am.c:2280 +#: builtin/am.c:2281 msgid "synonyms for --continue" msgstr "" -#: builtin/am.c:2283 +#: builtin/am.c:2284 msgid "skip the current patch" msgstr "" -#: builtin/am.c:2286 +#: builtin/am.c:2287 msgid "restore the original branch and abort the patching operation." msgstr "" -#: builtin/am.c:2290 +#: builtin/am.c:2291 msgid "lie about committer date" msgstr "" -#: builtin/am.c:2292 +#: builtin/am.c:2293 msgid "use current timestamp for author date" msgstr "" -#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236 -#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392 +#: builtin/am.c:2295 builtin/commit.c:1636 builtin/merge.c:236 +#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392 msgid "key-id" msgstr "" -#: builtin/am.c:2295 +#: builtin/am.c:2296 msgid "GPG-sign commits" msgstr "" -#: builtin/am.c:2298 +#: builtin/am.c:2299 msgid "(internal use for git-rebase)" msgstr "" -#: builtin/am.c:2316 +#: builtin/am.c:2317 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:2323 +#: builtin/am.c:2324 msgid "failed to read the index" msgstr "" -#: builtin/am.c:2338 +#: builtin/am.c:2339 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" -#: builtin/am.c:2362 +#: builtin/am.c:2363 #, c-format msgid "" "Stray %s directory found.\n" "Use \"git am --abort\" to remove it." msgstr "" -#: builtin/am.c:2368 +#: builtin/am.c:2369 msgid "Resolve operation not in progress, we are not resuming." msgstr "" @@ -4954,18 +4953,69 @@ msgstr "" msgid "git archive: expected a flush" msgstr "" -#: builtin/bisect--helper.c:7 +#: builtin/bisect--helper.c:12 msgid "git bisect--helper --next-all [--no-checkout]" msgstr "" -#: builtin/bisect--helper.c:17 +#: builtin/bisect--helper.c:13 +msgid "git bisect--helper --write-terms <bad_term> <good_term>" +msgstr "" + +#: builtin/bisect--helper.c:14 +msgid "git bisect--helper --bisect-clean-state" +msgstr "" + +#: builtin/bisect--helper.c:46 +#, c-format +msgid "'%s' is not a valid term" +msgstr "" + +#: builtin/bisect--helper.c:50 +#, c-format +msgid "can't use the builtin command '%s' as a term" +msgstr "" + +#: builtin/bisect--helper.c:60 +#, c-format +msgid "can't change the meaning of the term '%s'" +msgstr "" + +#: builtin/bisect--helper.c:71 +msgid "please use two different terms" +msgstr "" + +#: builtin/bisect--helper.c:78 +msgid "could not open the file BISECT_TERMS" +msgstr "" + +#: builtin/bisect--helper.c:120 msgid "perform 'git bisect next'" msgstr "" -#: builtin/bisect--helper.c:19 +#: builtin/bisect--helper.c:122 +msgid "write the terms to .git/BISECT_TERMS" +msgstr "" + +#: builtin/bisect--helper.c:124 +msgid "cleanup the bisection state" +msgstr "" + +#: builtin/bisect--helper.c:126 +msgid "check for expected revs" +msgstr "" + +#: builtin/bisect--helper.c:128 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "" +#: builtin/bisect--helper.c:143 +msgid "--write-terms requires two arguments" +msgstr "" + +#: builtin/bisect--helper.c:147 +msgid "--bisect-clean-state requires no arguments" +msgstr "" + #: builtin/blame.c:27 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "" @@ -5216,51 +5266,51 @@ msgstr "" msgid "Branch %s is being bisected at %s" msgstr "" -#: builtin/branch.c:470 +#: builtin/branch.c:471 msgid "cannot copy the current branch while not on any." msgstr "" -#: builtin/branch.c:472 +#: builtin/branch.c:473 msgid "cannot rename the current branch while not on any." msgstr "" -#: builtin/branch.c:483 +#: builtin/branch.c:484 #, c-format msgid "Invalid branch name: '%s'" msgstr "" -#: builtin/branch.c:504 +#: builtin/branch.c:511 msgid "Branch rename failed" msgstr "" -#: builtin/branch.c:506 +#: builtin/branch.c:513 msgid "Branch copy failed" msgstr "" -#: builtin/branch.c:510 +#: builtin/branch.c:517 #, c-format -msgid "Copied a misnamed branch '%s' away" +msgid "Created a copy of a misnamed branch '%s'" msgstr "" -#: builtin/branch.c:513 +#: builtin/branch.c:520 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "" -#: builtin/branch.c:519 +#: builtin/branch.c:526 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "" -#: builtin/branch.c:528 +#: builtin/branch.c:535 msgid "Branch is renamed, but update of config-file failed" msgstr "" -#: builtin/branch.c:530 +#: builtin/branch.c:537 msgid "Branch is copied, but update of config-file failed" msgstr "" -#: builtin/branch.c:546 +#: builtin/branch.c:553 #, c-format msgid "" "Please edit the description for the branch\n" @@ -5268,221 +5318,217 @@ msgid "" "Lines starting with '%c' will be stripped.\n" msgstr "" -#: builtin/branch.c:579 +#: builtin/branch.c:586 msgid "Generic options" msgstr "" -#: builtin/branch.c:581 +#: builtin/branch.c:588 msgid "show hash and subject, give twice for upstream branch" msgstr "" -#: builtin/branch.c:582 +#: builtin/branch.c:589 msgid "suppress informational messages" msgstr "" -#: builtin/branch.c:583 +#: builtin/branch.c:590 msgid "set up tracking mode (see git-pull(1))" msgstr "" -#: builtin/branch.c:585 +#: builtin/branch.c:592 msgid "do not use" msgstr "" -#: builtin/branch.c:587 +#: builtin/branch.c:594 msgid "upstream" msgstr "" -#: builtin/branch.c:587 +#: builtin/branch.c:594 msgid "change the upstream info" msgstr "" -#: builtin/branch.c:588 +#: builtin/branch.c:595 msgid "Unset the upstream info" msgstr "" -#: builtin/branch.c:589 +#: builtin/branch.c:596 msgid "use colored output" msgstr "" -#: builtin/branch.c:590 +#: builtin/branch.c:597 msgid "act on remote-tracking branches" msgstr "" -#: builtin/branch.c:592 builtin/branch.c:594 +#: builtin/branch.c:599 builtin/branch.c:601 msgid "print only branches that contain the commit" msgstr "" -#: builtin/branch.c:593 builtin/branch.c:595 +#: builtin/branch.c:600 builtin/branch.c:602 msgid "print only branches that don't contain the commit" msgstr "" -#: builtin/branch.c:598 +#: builtin/branch.c:605 msgid "Specific git-branch actions:" msgstr "" -#: builtin/branch.c:599 +#: builtin/branch.c:606 msgid "list both remote-tracking and local branches" msgstr "" -#: builtin/branch.c:601 +#: builtin/branch.c:608 msgid "delete fully merged branch" msgstr "" -#: builtin/branch.c:602 +#: builtin/branch.c:609 msgid "delete branch (even if not merged)" msgstr "" -#: builtin/branch.c:603 +#: builtin/branch.c:610 msgid "move/rename a branch and its reflog" msgstr "" -#: builtin/branch.c:604 +#: builtin/branch.c:611 msgid "move/rename a branch, even if target exists" msgstr "" -#: builtin/branch.c:605 +#: builtin/branch.c:612 msgid "copy a branch and its reflog" msgstr "" -#: builtin/branch.c:606 +#: builtin/branch.c:613 msgid "copy a branch, even if target exists" msgstr "" -#: builtin/branch.c:607 +#: builtin/branch.c:614 msgid "list branch names" msgstr "" -#: builtin/branch.c:608 +#: builtin/branch.c:615 msgid "create the branch's reflog" msgstr "" -#: builtin/branch.c:610 +#: builtin/branch.c:617 msgid "edit the description for the branch" msgstr "" -#: builtin/branch.c:611 +#: builtin/branch.c:618 msgid "force creation, move/rename, deletion" msgstr "" -#: builtin/branch.c:612 +#: builtin/branch.c:619 msgid "print only branches that are merged" msgstr "" -#: builtin/branch.c:613 +#: builtin/branch.c:620 msgid "print only branches that are not merged" msgstr "" -#: builtin/branch.c:614 +#: builtin/branch.c:621 msgid "list branches in columns" msgstr "" -#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405 +#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405 msgid "key" msgstr "" -#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406 +#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406 msgid "field name to sort on" msgstr "" -#: builtin/branch.c:618 builtin/for-each-ref.c:43 builtin/notes.c:408 +#: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408 #: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574 #: builtin/tag.c:408 msgid "object" msgstr "" -#: builtin/branch.c:619 +#: builtin/branch.c:626 msgid "print only branches of the object" msgstr "" -#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415 +#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415 msgid "sorting and filtering are case insensitive" msgstr "" -#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413 +#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413 #: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "" -#: builtin/branch.c:645 builtin/clone.c:729 +#: builtin/branch.c:652 builtin/clone.c:730 msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:668 +#: builtin/branch.c:675 msgid "--column and --verbose are incompatible" msgstr "" -#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741 +#: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751 msgid "branch name required" msgstr "" -#: builtin/branch.c:708 +#: builtin/branch.c:718 msgid "Cannot give description to detached HEAD" msgstr "" -#: builtin/branch.c:713 +#: builtin/branch.c:723 msgid "cannot edit description of more than one branch" msgstr "" -#: builtin/branch.c:720 +#: builtin/branch.c:730 #, c-format msgid "No commit on branch '%s' yet." msgstr "" -#: builtin/branch.c:723 +#: builtin/branch.c:733 #, c-format msgid "No branch named '%s'." msgstr "" -#: builtin/branch.c:738 +#: builtin/branch.c:748 msgid "too many branches for a copy operation" msgstr "" -#: builtin/branch.c:747 +#: builtin/branch.c:757 msgid "too many arguments for a rename operation" msgstr "" -#: builtin/branch.c:752 +#: builtin/branch.c:762 msgid "too many arguments to set new upstream" msgstr "" -#: builtin/branch.c:756 +#: builtin/branch.c:766 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" -#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800 +#: builtin/branch.c:769 builtin/branch.c:791 builtin/branch.c:807 #, c-format msgid "no such branch '%s'" msgstr "" -#: builtin/branch.c:763 +#: builtin/branch.c:773 #, c-format msgid "branch '%s' does not exist" msgstr "" -#: builtin/branch.c:775 +#: builtin/branch.c:785 msgid "too many arguments to unset upstream" msgstr "" -#: builtin/branch.c:779 +#: builtin/branch.c:789 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" -#: builtin/branch.c:785 +#: builtin/branch.c:795 #, c-format msgid "Branch '%s' has no upstream information" msgstr "" -#: builtin/branch.c:797 -msgid "it does not make sense to create 'HEAD' manually" -msgstr "" - -#: builtin/branch.c:803 +#: builtin/branch.c:810 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" -#: builtin/branch.c:806 +#: builtin/branch.c:813 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -5541,7 +5587,7 @@ msgstr "" msgid "for blob objects, run filters on object's content" msgstr "" -#: builtin/cat-file.c:569 git-submodule.sh:943 +#: builtin/cat-file.c:569 git-submodule.sh:931 msgid "blob" msgstr "" @@ -5597,7 +5643,7 @@ msgstr "" msgid "terminate input and output records by a NUL character" msgstr "" -#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358 +#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358 msgid "suppress progress reporting" msgstr "" @@ -5654,160 +5700,160 @@ msgstr "" msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "" -#: builtin/checkout-index.c:145 +#: builtin/checkout-index.c:143 msgid "stage should be between 1 and 3 or all" msgstr "" -#: builtin/checkout-index.c:161 +#: builtin/checkout-index.c:159 msgid "check out all files in the index" msgstr "" -#: builtin/checkout-index.c:162 +#: builtin/checkout-index.c:160 msgid "force overwrite of existing files" msgstr "" -#: builtin/checkout-index.c:164 +#: builtin/checkout-index.c:162 msgid "no warning for existing files and files not in index" msgstr "" -#: builtin/checkout-index.c:166 +#: builtin/checkout-index.c:164 msgid "don't checkout new files" msgstr "" -#: builtin/checkout-index.c:168 +#: builtin/checkout-index.c:166 msgid "update stat information in the index file" msgstr "" -#: builtin/checkout-index.c:172 +#: builtin/checkout-index.c:170 msgid "read list of paths from the standard input" msgstr "" -#: builtin/checkout-index.c:174 +#: builtin/checkout-index.c:172 msgid "write the content to temporary files" msgstr "" -#: builtin/checkout-index.c:175 builtin/column.c:31 -#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631 -#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999 -#: builtin/worktree.c:498 +#: builtin/checkout-index.c:173 builtin/column.c:31 +#: builtin/submodule--helper.c:866 builtin/submodule--helper.c:869 +#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1237 +#: builtin/worktree.c:552 msgid "string" msgstr "" -#: builtin/checkout-index.c:176 +#: builtin/checkout-index.c:174 msgid "when creating files, prepend <string>" msgstr "" -#: builtin/checkout-index.c:178 +#: builtin/checkout-index.c:176 msgid "copy out the files from named stage" msgstr "" -#: builtin/checkout.c:26 +#: builtin/checkout.c:27 msgid "git checkout [<options>] <branch>" msgstr "" -#: builtin/checkout.c:27 +#: builtin/checkout.c:28 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "" -#: builtin/checkout.c:135 builtin/checkout.c:168 +#: builtin/checkout.c:136 builtin/checkout.c:169 #, c-format msgid "path '%s' does not have our version" msgstr "" -#: builtin/checkout.c:137 builtin/checkout.c:170 +#: builtin/checkout.c:138 builtin/checkout.c:171 #, c-format msgid "path '%s' does not have their version" msgstr "" -#: builtin/checkout.c:153 +#: builtin/checkout.c:154 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "" -#: builtin/checkout.c:197 +#: builtin/checkout.c:198 #, c-format msgid "path '%s' does not have necessary versions" msgstr "" -#: builtin/checkout.c:214 +#: builtin/checkout.c:215 #, c-format msgid "path '%s': cannot merge" msgstr "" -#: builtin/checkout.c:231 +#: builtin/checkout.c:232 #, c-format msgid "Unable to add merge result for '%s'" msgstr "" -#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259 -#: builtin/checkout.c:262 +#: builtin/checkout.c:254 builtin/checkout.c:257 builtin/checkout.c:260 +#: builtin/checkout.c:263 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "" -#: builtin/checkout.c:265 builtin/checkout.c:268 +#: builtin/checkout.c:266 builtin/checkout.c:269 #, c-format msgid "'%s' cannot be used with %s" msgstr "" -#: builtin/checkout.c:271 +#: builtin/checkout.c:272 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" -#: builtin/checkout.c:342 builtin/checkout.c:349 +#: builtin/checkout.c:341 builtin/checkout.c:348 #, c-format msgid "path '%s' is unmerged" msgstr "" -#: builtin/checkout.c:501 +#: builtin/checkout.c:506 msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:632 +#: builtin/checkout.c:637 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "" -#: builtin/checkout.c:673 +#: builtin/checkout.c:678 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:677 builtin/clone.c:683 +#: builtin/checkout.c:682 builtin/clone.c:684 msgid "unable to update HEAD" msgstr "" -#: builtin/checkout.c:681 +#: builtin/checkout.c:686 #, c-format msgid "Reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:684 +#: builtin/checkout.c:689 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:688 +#: builtin/checkout.c:693 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:690 builtin/checkout.c:1086 +#: builtin/checkout.c:695 builtin/checkout.c:1051 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:692 +#: builtin/checkout.c:697 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:743 +#: builtin/checkout.c:748 #, c-format msgid " ... and %d more.\n" msgstr "" -#: builtin/checkout.c:749 +#: builtin/checkout.c:754 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -5822,7 +5868,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:768 +#: builtin/checkout.c:773 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -5839,160 +5885,160 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:809 +#: builtin/checkout.c:814 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:813 +#: builtin/checkout.c:818 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:843 builtin/checkout.c:1081 +#: builtin/checkout.c:848 builtin/checkout.c:1046 msgid "You are on a branch yet to be born" msgstr "" -#: builtin/checkout.c:987 +#: builtin/checkout.c:952 #, c-format msgid "only one reference expected, %d given." msgstr "" -#: builtin/checkout.c:1027 builtin/worktree.c:233 +#: builtin/checkout.c:992 builtin/worktree.c:247 #, c-format msgid "invalid reference: %s" msgstr "" -#: builtin/checkout.c:1056 +#: builtin/checkout.c:1021 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:1095 +#: builtin/checkout.c:1060 msgid "paths cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1098 builtin/checkout.c:1102 +#: builtin/checkout.c:1063 builtin/checkout.c:1067 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1106 builtin/checkout.c:1109 builtin/checkout.c:1114 -#: builtin/checkout.c:1117 +#: builtin/checkout.c:1071 builtin/checkout.c:1074 builtin/checkout.c:1079 +#: builtin/checkout.c:1082 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "" -#: builtin/checkout.c:1122 +#: builtin/checkout.c:1087 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" -#: builtin/checkout.c:1154 builtin/checkout.c:1156 builtin/clone.c:114 -#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:346 -#: builtin/worktree.c:348 +#: builtin/checkout.c:1119 builtin/checkout.c:1121 builtin/clone.c:114 +#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:369 +#: builtin/worktree.c:371 msgid "branch" msgstr "" -#: builtin/checkout.c:1155 +#: builtin/checkout.c:1120 msgid "create and checkout a new branch" msgstr "" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1122 msgid "create/reset and checkout a branch" msgstr "" -#: builtin/checkout.c:1158 +#: builtin/checkout.c:1123 msgid "create reflog for new branch" msgstr "" -#: builtin/checkout.c:1159 builtin/worktree.c:350 +#: builtin/checkout.c:1124 builtin/worktree.c:373 msgid "detach HEAD at named commit" msgstr "" -#: builtin/checkout.c:1160 +#: builtin/checkout.c:1125 msgid "set upstream info for new branch" msgstr "" -#: builtin/checkout.c:1162 +#: builtin/checkout.c:1127 msgid "new-branch" msgstr "" -#: builtin/checkout.c:1162 +#: builtin/checkout.c:1127 msgid "new unparented branch" msgstr "" -#: builtin/checkout.c:1163 +#: builtin/checkout.c:1128 msgid "checkout our version for unmerged files" msgstr "" -#: builtin/checkout.c:1165 +#: builtin/checkout.c:1130 msgid "checkout their version for unmerged files" msgstr "" -#: builtin/checkout.c:1167 +#: builtin/checkout.c:1132 msgid "force checkout (throw away local modifications)" msgstr "" -#: builtin/checkout.c:1168 +#: builtin/checkout.c:1133 msgid "perform a 3-way merge with the new branch" msgstr "" -#: builtin/checkout.c:1169 builtin/merge.c:238 +#: builtin/checkout.c:1134 builtin/merge.c:238 msgid "update ignored files (default)" msgstr "" -#: builtin/checkout.c:1170 builtin/log.c:1489 parse-options.h:251 +#: builtin/checkout.c:1135 builtin/log.c:1496 parse-options.h:251 msgid "style" msgstr "" -#: builtin/checkout.c:1171 +#: builtin/checkout.c:1136 msgid "conflict style (merge or diff3)" msgstr "" -#: builtin/checkout.c:1174 +#: builtin/checkout.c:1139 msgid "do not limit pathspecs to sparse entries only" msgstr "" -#: builtin/checkout.c:1176 +#: builtin/checkout.c:1141 msgid "second guess 'git checkout <no-such-branch>'" msgstr "" -#: builtin/checkout.c:1178 +#: builtin/checkout.c:1143 msgid "do not check if another worktree is holding the given ref" msgstr "" -#: builtin/checkout.c:1182 builtin/clone.c:81 builtin/fetch.c:136 -#: builtin/merge.c:235 builtin/pull.c:120 builtin/push.c:544 +#: builtin/checkout.c:1147 builtin/clone.c:81 builtin/fetch.c:137 +#: builtin/merge.c:235 builtin/pull.c:123 builtin/push.c:556 #: builtin/send-pack.c:173 msgid "force progress reporting" msgstr "" -#: builtin/checkout.c:1212 +#: builtin/checkout.c:1177 msgid "-b, -B and --orphan are mutually exclusive" msgstr "" -#: builtin/checkout.c:1229 +#: builtin/checkout.c:1194 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:1234 +#: builtin/checkout.c:1199 msgid "Missing branch name; try -b" msgstr "" -#: builtin/checkout.c:1270 +#: builtin/checkout.c:1235 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1277 +#: builtin/checkout.c:1242 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" -#: builtin/checkout.c:1281 +#: builtin/checkout.c:1246 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" -#: builtin/checkout.c:1285 +#: builtin/checkout.c:1250 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -6028,7 +6074,7 @@ msgstr "" msgid "failed to remove %s" msgstr "" -#: builtin/clean.c:301 git-add--interactive.perl:572 +#: builtin/clean.c:302 git-add--interactive.perl:572 #, c-format msgid "" "Prompt help:\n" @@ -6037,7 +6083,7 @@ msgid "" " - (empty) select nothing\n" msgstr "" -#: builtin/clean.c:305 git-add--interactive.perl:581 +#: builtin/clean.c:306 git-add--interactive.perl:581 #, c-format msgid "" "Prompt help:\n" @@ -6050,38 +6096,38 @@ msgid "" " - (empty) finish selecting\n" msgstr "" -#: builtin/clean.c:521 git-add--interactive.perl:547 +#: builtin/clean.c:522 git-add--interactive.perl:547 #: git-add--interactive.perl:552 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "" -#: builtin/clean.c:663 +#: builtin/clean.c:664 #, c-format msgid "Input ignore patterns>> " msgstr "" -#: builtin/clean.c:700 +#: builtin/clean.c:701 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "" -#: builtin/clean.c:721 +#: builtin/clean.c:722 msgid "Select items to delete" msgstr "" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:762 +#: builtin/clean.c:763 #, c-format msgid "Remove %s [y/N]? " msgstr "" -#: builtin/clean.c:787 git-add--interactive.perl:1616 +#: builtin/clean.c:788 git-add--interactive.perl:1616 #, c-format msgid "Bye.\n" msgstr "" -#: builtin/clean.c:795 +#: builtin/clean.c:796 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -6092,69 +6138,70 @@ msgid "" "? - help for prompt selection" msgstr "" -#: builtin/clean.c:822 git-add--interactive.perl:1692 +#: builtin/clean.c:823 git-add--interactive.perl:1692 msgid "*** Commands ***" msgstr "" -#: builtin/clean.c:823 git-add--interactive.perl:1689 +#: builtin/clean.c:824 git-add--interactive.perl:1689 msgid "What now" msgstr "" -#: builtin/clean.c:831 +#: builtin/clean.c:832 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "" msgstr[1] "" -#: builtin/clean.c:847 +#: builtin/clean.c:848 msgid "No more files to clean, exiting." msgstr "" -#: builtin/clean.c:909 +#: builtin/clean.c:910 msgid "do not print names of files removed" msgstr "" -#: builtin/clean.c:911 +#: builtin/clean.c:912 msgid "force" msgstr "" -#: builtin/clean.c:912 +#: builtin/clean.c:913 msgid "interactive cleaning" msgstr "" -#: builtin/clean.c:914 +#: builtin/clean.c:915 msgid "remove whole directories" msgstr "" -#: builtin/clean.c:915 builtin/describe.c:463 builtin/describe.c:465 -#: builtin/grep.c:861 builtin/ls-files.c:544 builtin/name-rev.c:397 -#: builtin/name-rev.c:399 builtin/show-ref.c:176 +#: builtin/clean.c:916 builtin/describe.c:530 builtin/describe.c:532 +#: builtin/grep.c:863 builtin/log.c:155 builtin/log.c:157 +#: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399 +#: builtin/show-ref.c:176 msgid "pattern" msgstr "" -#: builtin/clean.c:916 +#: builtin/clean.c:917 msgid "add <pattern> to ignore rules" msgstr "" -#: builtin/clean.c:917 +#: builtin/clean.c:918 msgid "remove ignored files, too" msgstr "" -#: builtin/clean.c:919 +#: builtin/clean.c:920 msgid "remove only ignored files" msgstr "" -#: builtin/clean.c:937 +#: builtin/clean.c:938 msgid "-x and -X cannot be used together" msgstr "" -#: builtin/clean.c:941 +#: builtin/clean.c:942 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" -#: builtin/clean.c:944 +#: builtin/clean.c:945 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -6208,8 +6255,8 @@ msgstr "" msgid "directory from which templates will be used" msgstr "" -#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:635 -#: builtin/submodule--helper.c:1002 +#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:873 +#: builtin/submodule--helper.c:1240 msgid "reference repository" msgstr "" @@ -6233,8 +6280,8 @@ msgstr "" msgid "path to git-upload-pack on the remote" msgstr "" -#: builtin/clone.c:118 builtin/fetch.c:137 builtin/grep.c:804 -#: builtin/pull.c:205 +#: builtin/clone.c:118 builtin/fetch.c:138 builtin/grep.c:806 +#: builtin/pull.c:211 msgid "depth" msgstr "" @@ -6242,7 +6289,7 @@ msgstr "" msgid "create a shallow clone of that depth" msgstr "" -#: builtin/clone.c:120 builtin/fetch.c:139 builtin/pack-objects.c:2938 +#: builtin/clone.c:120 builtin/fetch.c:140 builtin/pack-objects.c:2991 #: parse-options.h:142 msgid "time" msgstr "" @@ -6251,11 +6298,11 @@ msgstr "" msgid "create a shallow clone since a specific time" msgstr "" -#: builtin/clone.c:122 builtin/fetch.c:141 +#: builtin/clone.c:122 builtin/fetch.c:142 msgid "revision" msgstr "" -#: builtin/clone.c:123 builtin/fetch.c:142 +#: builtin/clone.c:123 builtin/fetch.c:143 msgid "deepen history of shallow clone, excluding rev" msgstr "" @@ -6287,11 +6334,13 @@ msgstr "" msgid "set config inside the new repository" msgstr "" -#: builtin/clone.c:134 builtin/fetch.c:159 builtin/push.c:555 +#: builtin/clone.c:134 builtin/fetch.c:160 builtin/pull.c:224 +#: builtin/push.c:567 msgid "use IPv4 addresses only" msgstr "" -#: builtin/clone.c:136 builtin/fetch.c:161 builtin/push.c:557 +#: builtin/clone.c:136 builtin/fetch.c:162 builtin/pull.c:227 +#: builtin/push.c:569 msgid "use IPv6 addresses only" msgstr "" @@ -6331,33 +6380,33 @@ msgstr "" msgid "failed to copy file to '%s'" msgstr "" -#: builtin/clone.c:471 +#: builtin/clone.c:472 #, c-format msgid "done.\n" msgstr "" -#: builtin/clone.c:483 +#: builtin/clone.c:484 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" "and retry the checkout with 'git checkout -f HEAD'\n" msgstr "" -#: builtin/clone.c:560 +#: builtin/clone.c:561 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" -#: builtin/clone.c:655 +#: builtin/clone.c:656 msgid "remote did not send all necessary objects" msgstr "" -#: builtin/clone.c:671 +#: builtin/clone.c:672 #, c-format msgid "unable to update %s" msgstr "" -#: builtin/clone.c:720 +#: builtin/clone.c:721 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" @@ -6377,7 +6426,7 @@ msgstr "" msgid "cannot unlink temporary alternates file" msgstr "" -#: builtin/clone.c:894 builtin/receive-pack.c:1944 +#: builtin/clone.c:894 builtin/receive-pack.c:1945 msgid "Too many arguments." msgstr "" @@ -6399,7 +6448,7 @@ msgstr "" msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:933 builtin/fetch.c:1360 +#: builtin/clone.c:933 builtin/fetch.c:1358 #, c-format msgid "depth %s is not a positive number" msgstr "" @@ -6415,7 +6464,7 @@ msgid "working tree '%s' already exists." msgstr "" #: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270 -#: builtin/worktree.c:240 builtin/worktree.c:270 +#: builtin/worktree.c:253 builtin/worktree.c:283 #, c-format msgid "could not create leading directories of '%s'" msgstr "" @@ -6461,17 +6510,12 @@ msgstr "" msgid "--local is ignored" msgstr "" -#: builtin/clone.c:1087 -#, c-format -msgid "Don't know how to clone %s" -msgstr "" - -#: builtin/clone.c:1142 builtin/clone.c:1150 +#: builtin/clone.c:1139 builtin/clone.c:1147 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:1153 +#: builtin/clone.c:1150 msgid "You appear to have cloned an empty repository." msgstr "" @@ -6634,7 +6678,7 @@ msgid "" "in the current commit message" msgstr "" -#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1100 +#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1114 #, c-format msgid "could not lookup commit %s" msgstr "" @@ -6719,323 +6763,338 @@ msgstr "" msgid "Cannot read index" msgstr "" -#: builtin/commit.c:958 +#: builtin/commit.c:959 msgid "Error building trees" msgstr "" -#: builtin/commit.c:972 builtin/tag.c:252 +#: builtin/commit.c:973 builtin/tag.c:252 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/commit.c:1075 +#: builtin/commit.c:1076 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" -#: builtin/commit.c:1090 builtin/commit.c:1335 +#: builtin/commit.c:1090 +#, c-format +msgid "Invalid ignored mode '%s'" +msgstr "" + +#: builtin/commit.c:1104 builtin/commit.c:1349 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:1128 +#: builtin/commit.c:1142 msgid "--long and -z are incompatible" msgstr "" -#: builtin/commit.c:1158 +#: builtin/commit.c:1172 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:1167 +#: builtin/commit.c:1181 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:1170 +#: builtin/commit.c:1184 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/commit.c:1172 +#: builtin/commit.c:1186 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/commit.c:1175 +#: builtin/commit.c:1189 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1185 +#: builtin/commit.c:1199 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:1187 +#: builtin/commit.c:1201 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "" -#: builtin/commit.c:1195 +#: builtin/commit.c:1209 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1212 +#: builtin/commit.c:1226 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:1214 +#: builtin/commit.c:1228 msgid "No paths with --include/--only does not make sense." msgstr "" -#: builtin/commit.c:1226 builtin/tag.c:535 +#: builtin/commit.c:1240 builtin/tag.c:535 #, c-format msgid "Invalid cleanup mode %s" msgstr "" -#: builtin/commit.c:1231 +#: builtin/commit.c:1245 msgid "Paths with -a does not make sense." msgstr "" -#: builtin/commit.c:1349 builtin/commit.c:1626 +#: builtin/commit.c:1363 builtin/commit.c:1648 msgid "show status concisely" msgstr "" -#: builtin/commit.c:1351 builtin/commit.c:1628 +#: builtin/commit.c:1365 builtin/commit.c:1650 msgid "show branch information" msgstr "" -#: builtin/commit.c:1353 +#: builtin/commit.c:1367 msgid "show stash information" msgstr "" -#: builtin/commit.c:1355 +#: builtin/commit.c:1369 msgid "version" msgstr "" -#: builtin/commit.c:1355 builtin/commit.c:1630 builtin/push.c:530 -#: builtin/worktree.c:469 +#: builtin/commit.c:1369 builtin/commit.c:1652 builtin/push.c:542 +#: builtin/worktree.c:523 msgid "machine-readable output" msgstr "" -#: builtin/commit.c:1358 builtin/commit.c:1632 +#: builtin/commit.c:1372 builtin/commit.c:1654 msgid "show status in long format (default)" msgstr "" -#: builtin/commit.c:1361 builtin/commit.c:1635 +#: builtin/commit.c:1375 builtin/commit.c:1657 msgid "terminate entries with NUL" msgstr "" -#: builtin/commit.c:1363 builtin/commit.c:1638 builtin/fast-export.c:999 -#: builtin/fast-export.c:1002 builtin/tag.c:390 +#: builtin/commit.c:1377 builtin/commit.c:1381 builtin/commit.c:1660 +#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:390 msgid "mode" msgstr "" -#: builtin/commit.c:1364 builtin/commit.c:1638 +#: builtin/commit.c:1378 builtin/commit.c:1660 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -#: builtin/commit.c:1367 -msgid "show ignored files" +#: builtin/commit.c:1382 +msgid "" +"show ignored files, optional modes: traditional, matching, no. (Default: " +"traditional)" msgstr "" -#: builtin/commit.c:1368 parse-options.h:155 +#: builtin/commit.c:1384 parse-options.h:155 msgid "when" msgstr "" -#: builtin/commit.c:1369 +#: builtin/commit.c:1385 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" -#: builtin/commit.c:1371 +#: builtin/commit.c:1387 msgid "list untracked files in columns" msgstr "" -#: builtin/commit.c:1449 +#: builtin/commit.c:1406 +msgid "Unsupported combination of ignored and untracked-files arguments" +msgstr "" + +#: builtin/commit.c:1469 msgid "couldn't look up newly created commit" msgstr "" -#: builtin/commit.c:1451 +#: builtin/commit.c:1471 msgid "could not parse newly created commit" msgstr "" -#: builtin/commit.c:1496 +#: builtin/commit.c:1516 +msgid "unable to resolve HEAD after creating commit" +msgstr "" + +#: builtin/commit.c:1518 msgid "detached HEAD" msgstr "" -#: builtin/commit.c:1499 +#: builtin/commit.c:1521 msgid " (root-commit)" msgstr "" -#: builtin/commit.c:1596 +#: builtin/commit.c:1618 msgid "suppress summary after successful commit" msgstr "" -#: builtin/commit.c:1597 +#: builtin/commit.c:1619 msgid "show diff in commit message template" msgstr "" -#: builtin/commit.c:1599 +#: builtin/commit.c:1621 msgid "Commit message options" msgstr "" -#: builtin/commit.c:1600 builtin/tag.c:388 +#: builtin/commit.c:1622 builtin/tag.c:388 msgid "read message from file" msgstr "" -#: builtin/commit.c:1601 +#: builtin/commit.c:1623 msgid "author" msgstr "" -#: builtin/commit.c:1601 +#: builtin/commit.c:1623 msgid "override author for commit" msgstr "" -#: builtin/commit.c:1602 builtin/gc.c:359 +#: builtin/commit.c:1624 builtin/gc.c:359 msgid "date" msgstr "" -#: builtin/commit.c:1602 +#: builtin/commit.c:1624 msgid "override date for commit" msgstr "" -#: builtin/commit.c:1603 builtin/merge.c:225 builtin/notes.c:402 +#: builtin/commit.c:1625 builtin/merge.c:225 builtin/notes.c:402 #: builtin/notes.c:565 builtin/tag.c:386 msgid "message" msgstr "" -#: builtin/commit.c:1603 +#: builtin/commit.c:1625 msgid "commit message" msgstr "" -#: builtin/commit.c:1604 builtin/commit.c:1605 builtin/commit.c:1606 -#: builtin/commit.c:1607 parse-options.h:257 ref-filter.h:92 +#: builtin/commit.c:1626 builtin/commit.c:1627 builtin/commit.c:1628 +#: builtin/commit.c:1629 parse-options.h:257 ref-filter.h:92 msgid "commit" msgstr "" -#: builtin/commit.c:1604 +#: builtin/commit.c:1626 msgid "reuse and edit message from specified commit" msgstr "" -#: builtin/commit.c:1605 +#: builtin/commit.c:1627 msgid "reuse message from specified commit" msgstr "" -#: builtin/commit.c:1606 +#: builtin/commit.c:1628 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -#: builtin/commit.c:1607 +#: builtin/commit.c:1629 msgid "use autosquash formatted message to squash specified commit" msgstr "" -#: builtin/commit.c:1608 +#: builtin/commit.c:1630 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1609 builtin/log.c:1436 builtin/merge.c:239 -#: builtin/revert.c:105 +#: builtin/commit.c:1631 builtin/log.c:1443 builtin/merge.c:239 +#: builtin/pull.c:149 builtin/revert.c:105 msgid "add Signed-off-by:" msgstr "" -#: builtin/commit.c:1610 +#: builtin/commit.c:1632 msgid "use specified template file" msgstr "" -#: builtin/commit.c:1611 +#: builtin/commit.c:1633 msgid "force edit of commit" msgstr "" -#: builtin/commit.c:1612 +#: builtin/commit.c:1634 msgid "default" msgstr "" -#: builtin/commit.c:1612 builtin/tag.c:391 +#: builtin/commit.c:1634 builtin/tag.c:391 msgid "how to strip spaces and #comments from message" msgstr "" -#: builtin/commit.c:1613 +#: builtin/commit.c:1635 msgid "include status in commit message template" msgstr "" -#: builtin/commit.c:1615 builtin/merge.c:237 builtin/pull.c:173 +#: builtin/commit.c:1637 builtin/merge.c:237 builtin/pull.c:179 #: builtin/revert.c:113 msgid "GPG sign commit" msgstr "" -#: builtin/commit.c:1618 +#: builtin/commit.c:1640 msgid "Commit contents options" msgstr "" -#: builtin/commit.c:1619 +#: builtin/commit.c:1641 msgid "commit all changed files" msgstr "" -#: builtin/commit.c:1620 +#: builtin/commit.c:1642 msgid "add specified files to index for commit" msgstr "" -#: builtin/commit.c:1621 +#: builtin/commit.c:1643 msgid "interactively add files" msgstr "" -#: builtin/commit.c:1622 +#: builtin/commit.c:1644 msgid "interactively add changes" msgstr "" -#: builtin/commit.c:1623 +#: builtin/commit.c:1645 msgid "commit only specified files" msgstr "" -#: builtin/commit.c:1624 +#: builtin/commit.c:1646 msgid "bypass pre-commit and commit-msg hooks" msgstr "" -#: builtin/commit.c:1625 +#: builtin/commit.c:1647 msgid "show what would be committed" msgstr "" -#: builtin/commit.c:1636 +#: builtin/commit.c:1658 msgid "amend previous commit" msgstr "" -#: builtin/commit.c:1637 +#: builtin/commit.c:1659 msgid "bypass post-rewrite hook" msgstr "" -#: builtin/commit.c:1642 +#: builtin/commit.c:1664 msgid "ok to record an empty change" msgstr "" -#: builtin/commit.c:1644 +#: builtin/commit.c:1666 msgid "ok to record a change with an empty message" msgstr "" -#: builtin/commit.c:1674 +#: builtin/commit.c:1696 msgid "could not parse HEAD commit" msgstr "" -#: builtin/commit.c:1719 +#: builtin/commit.c:1741 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1726 +#: builtin/commit.c:1748 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1745 +#: builtin/commit.c:1767 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1756 +#: builtin/commit.c:1778 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1761 +#: builtin/commit.c:1783 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1809 +#: builtin/commit.c:1831 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -7046,139 +7105,143 @@ msgstr "" msgid "git config [<options>]" msgstr "" -#: builtin/config.c:57 +#: builtin/config.c:58 msgid "Config file location" msgstr "" -#: builtin/config.c:58 +#: builtin/config.c:59 msgid "use global config file" msgstr "" -#: builtin/config.c:59 +#: builtin/config.c:60 msgid "use system config file" msgstr "" -#: builtin/config.c:60 +#: builtin/config.c:61 msgid "use repository config file" msgstr "" -#: builtin/config.c:61 +#: builtin/config.c:62 msgid "use given config file" msgstr "" -#: builtin/config.c:62 +#: builtin/config.c:63 msgid "blob-id" msgstr "" -#: builtin/config.c:62 +#: builtin/config.c:63 msgid "read config from given blob object" msgstr "" -#: builtin/config.c:63 +#: builtin/config.c:64 msgid "Action" msgstr "" -#: builtin/config.c:64 +#: builtin/config.c:65 msgid "get value: name [value-regex]" msgstr "" -#: builtin/config.c:65 +#: builtin/config.c:66 msgid "get all values: key [value-regex]" msgstr "" -#: builtin/config.c:66 +#: builtin/config.c:67 msgid "get values for regexp: name-regex [value-regex]" msgstr "" -#: builtin/config.c:67 +#: builtin/config.c:68 msgid "get value specific for the URL: section[.var] URL" msgstr "" -#: builtin/config.c:68 +#: builtin/config.c:69 msgid "replace all matching variables: name value [value_regex]" msgstr "" -#: builtin/config.c:69 +#: builtin/config.c:70 msgid "add a new variable: name value" msgstr "" -#: builtin/config.c:70 +#: builtin/config.c:71 msgid "remove a variable: name [value-regex]" msgstr "" -#: builtin/config.c:71 +#: builtin/config.c:72 msgid "remove all matches: name [value-regex]" msgstr "" -#: builtin/config.c:72 +#: builtin/config.c:73 msgid "rename section: old-name new-name" msgstr "" -#: builtin/config.c:73 +#: builtin/config.c:74 msgid "remove a section: name" msgstr "" -#: builtin/config.c:74 +#: builtin/config.c:75 msgid "list all" msgstr "" -#: builtin/config.c:75 +#: builtin/config.c:76 msgid "open an editor" msgstr "" -#: builtin/config.c:76 +#: builtin/config.c:77 msgid "find the color configured: slot [default]" msgstr "" -#: builtin/config.c:77 +#: builtin/config.c:78 msgid "find the color setting: slot [stdout-is-tty]" msgstr "" -#: builtin/config.c:78 +#: builtin/config.c:79 msgid "Type" msgstr "" -#: builtin/config.c:79 +#: builtin/config.c:80 msgid "value is \"true\" or \"false\"" msgstr "" -#: builtin/config.c:80 +#: builtin/config.c:81 msgid "value is decimal number" msgstr "" -#: builtin/config.c:81 +#: builtin/config.c:82 msgid "value is --bool or --int" msgstr "" -#: builtin/config.c:82 +#: builtin/config.c:83 msgid "value is a path (file or directory name)" msgstr "" -#: builtin/config.c:83 +#: builtin/config.c:84 +msgid "value is an expiry date" +msgstr "" + +#: builtin/config.c:85 msgid "Other" msgstr "" -#: builtin/config.c:84 +#: builtin/config.c:86 msgid "terminate values with NUL byte" msgstr "" -#: builtin/config.c:85 +#: builtin/config.c:87 msgid "show variable names only" msgstr "" -#: builtin/config.c:86 +#: builtin/config.c:88 msgid "respect include directives on lookup" msgstr "" -#: builtin/config.c:87 +#: builtin/config.c:89 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" -#: builtin/config.c:327 +#: builtin/config.c:335 msgid "unable to parse default color value" msgstr "" -#: builtin/config.c:471 +#: builtin/config.c:479 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -7188,16 +7251,16 @@ msgid "" "#\temail = %s\n" msgstr "" -#: builtin/config.c:499 +#: builtin/config.c:507 msgid "--local can only be used inside a git repository" msgstr "" -#: builtin/config.c:624 +#: builtin/config.c:632 #, c-format msgid "cannot create configuration file %s" msgstr "" -#: builtin/config.c:637 +#: builtin/config.c:645 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -7212,161 +7275,166 @@ msgstr "" msgid "print sizes in human readable format" msgstr "" -#: builtin/describe.c:19 +#: builtin/describe.c:22 msgid "git describe [<options>] [<commit-ish>...]" msgstr "" -#: builtin/describe.c:20 +#: builtin/describe.c:23 msgid "git describe [<options>] --dirty" msgstr "" -#: builtin/describe.c:54 +#: builtin/describe.c:57 msgid "head" msgstr "" -#: builtin/describe.c:54 +#: builtin/describe.c:57 msgid "lightweight" msgstr "" -#: builtin/describe.c:54 +#: builtin/describe.c:57 msgid "annotated" msgstr "" -#: builtin/describe.c:264 +#: builtin/describe.c:267 #, c-format msgid "annotated tag %s not available" msgstr "" -#: builtin/describe.c:268 +#: builtin/describe.c:271 #, c-format msgid "annotated tag %s has no embedded name" msgstr "" -#: builtin/describe.c:270 +#: builtin/describe.c:273 #, c-format msgid "tag '%s' is really '%s' here" msgstr "" -#: builtin/describe.c:297 builtin/log.c:493 -#, c-format -msgid "Not a valid object name %s" -msgstr "" - -#: builtin/describe.c:300 -#, c-format -msgid "%s is not a valid '%s' object" -msgstr "" - -#: builtin/describe.c:317 +#: builtin/describe.c:314 #, c-format msgid "no tag exactly matches '%s'" msgstr "" -#: builtin/describe.c:319 +#: builtin/describe.c:316 #, c-format -msgid "searching to describe %s\n" +msgid "No exact match on refs or tags, searching to describe\n" msgstr "" -#: builtin/describe.c:366 +#: builtin/describe.c:363 #, c-format msgid "finished search at %s\n" msgstr "" -#: builtin/describe.c:393 +#: builtin/describe.c:389 #, c-format msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "" -#: builtin/describe.c:397 +#: builtin/describe.c:393 #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" -#: builtin/describe.c:427 +#: builtin/describe.c:423 #, c-format msgid "traversed %lu commits\n" msgstr "" -#: builtin/describe.c:430 +#: builtin/describe.c:426 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "" -#: builtin/describe.c:452 +#: builtin/describe.c:494 +#, c-format +msgid "describe %s\n" +msgstr "" + +#: builtin/describe.c:497 builtin/log.c:500 +#, c-format +msgid "Not a valid object name %s" +msgstr "" + +#: builtin/describe.c:505 +#, c-format +msgid "%s is neither a commit nor blob" +msgstr "" + +#: builtin/describe.c:519 msgid "find the tag that comes after the commit" msgstr "" -#: builtin/describe.c:453 +#: builtin/describe.c:520 msgid "debug search strategy on stderr" msgstr "" -#: builtin/describe.c:454 +#: builtin/describe.c:521 msgid "use any ref" msgstr "" -#: builtin/describe.c:455 +#: builtin/describe.c:522 msgid "use any tag, even unannotated" msgstr "" -#: builtin/describe.c:456 +#: builtin/describe.c:523 msgid "always use long format" msgstr "" -#: builtin/describe.c:457 +#: builtin/describe.c:524 msgid "only follow first parent" msgstr "" -#: builtin/describe.c:460 +#: builtin/describe.c:527 msgid "only output exact matches" msgstr "" -#: builtin/describe.c:462 +#: builtin/describe.c:529 msgid "consider <n> most recent tags (default: 10)" msgstr "" -#: builtin/describe.c:464 +#: builtin/describe.c:531 msgid "only consider tags matching <pattern>" msgstr "" -#: builtin/describe.c:466 +#: builtin/describe.c:533 msgid "do not consider tags matching <pattern>" msgstr "" -#: builtin/describe.c:468 builtin/name-rev.c:406 +#: builtin/describe.c:535 builtin/name-rev.c:406 msgid "show abbreviated commit object as fallback" msgstr "" -#: builtin/describe.c:469 builtin/describe.c:472 +#: builtin/describe.c:536 builtin/describe.c:539 msgid "mark" msgstr "" -#: builtin/describe.c:470 +#: builtin/describe.c:537 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "" -#: builtin/describe.c:473 +#: builtin/describe.c:540 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "" -#: builtin/describe.c:491 +#: builtin/describe.c:558 msgid "--long is incompatible with --abbrev=0" msgstr "" -#: builtin/describe.c:520 +#: builtin/describe.c:587 msgid "No names found, cannot describe anything." msgstr "" -#: builtin/describe.c:563 +#: builtin/describe.c:637 msgid "--dirty is incompatible with commit-ishes" msgstr "" -#: builtin/describe.c:565 +#: builtin/describe.c:639 msgid "--broken is incompatible with commit-ishes" msgstr "" @@ -7375,26 +7443,26 @@ msgstr "" msgid "'%s': not a regular file or symlink" msgstr "" -#: builtin/diff.c:235 +#: builtin/diff.c:234 #, c-format msgid "invalid option: %s" msgstr "" -#: builtin/diff.c:357 +#: builtin/diff.c:356 msgid "Not a git repository" msgstr "" -#: builtin/diff.c:400 +#: builtin/diff.c:399 #, c-format msgid "invalid object '%s' given." msgstr "" -#: builtin/diff.c:409 +#: builtin/diff.c:408 #, c-format msgid "more than two blobs given: '%s'" msgstr "" -#: builtin/diff.c:414 +#: builtin/diff.c:413 #, c-format msgid "unhandled object '%s' given." msgstr "" @@ -7429,71 +7497,71 @@ msgid "" "directory diff mode('-d' and '--dir-diff')." msgstr "" -#: builtin/difftool.c:633 +#: builtin/difftool.c:632 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "" -#: builtin/difftool.c:635 +#: builtin/difftool.c:634 msgid "working tree file has been left." msgstr "" -#: builtin/difftool.c:646 +#: builtin/difftool.c:645 #, c-format msgid "temporary files exist in '%s'." msgstr "" -#: builtin/difftool.c:647 +#: builtin/difftool.c:646 msgid "you may want to cleanup or recover these." msgstr "" -#: builtin/difftool.c:696 +#: builtin/difftool.c:695 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "" -#: builtin/difftool.c:698 +#: builtin/difftool.c:697 msgid "perform a full-directory diff" msgstr "" -#: builtin/difftool.c:700 +#: builtin/difftool.c:699 msgid "do not prompt before launching a diff tool" msgstr "" -#: builtin/difftool.c:706 +#: builtin/difftool.c:705 msgid "use symlinks in dir-diff mode" msgstr "" -#: builtin/difftool.c:707 +#: builtin/difftool.c:706 msgid "<tool>" msgstr "" -#: builtin/difftool.c:708 +#: builtin/difftool.c:707 msgid "use the specified diff tool" msgstr "" -#: builtin/difftool.c:710 +#: builtin/difftool.c:709 msgid "print a list of diff tools that may be used with `--tool`" msgstr "" -#: builtin/difftool.c:713 +#: builtin/difftool.c:712 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" msgstr "" -#: builtin/difftool.c:715 +#: builtin/difftool.c:714 msgid "<command>" msgstr "" -#: builtin/difftool.c:716 +#: builtin/difftool.c:715 msgid "specify a custom command for viewing diffs" msgstr "" -#: builtin/difftool.c:740 +#: builtin/difftool.c:739 msgid "no <tool> given for --tool=<tool>" msgstr "" -#: builtin/difftool.c:747 +#: builtin/difftool.c:746 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "" @@ -7549,277 +7617,272 @@ msgstr "" msgid "anonymize output" msgstr "" -#: builtin/fetch.c:23 +#: builtin/fetch.c:24 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "" -#: builtin/fetch.c:24 +#: builtin/fetch.c:25 msgid "git fetch [<options>] <group>" msgstr "" -#: builtin/fetch.c:25 +#: builtin/fetch.c:26 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "" -#: builtin/fetch.c:26 +#: builtin/fetch.c:27 msgid "git fetch --all [<options>]" msgstr "" -#: builtin/fetch.c:112 builtin/pull.c:182 +#: builtin/fetch.c:113 builtin/pull.c:188 msgid "fetch from all remotes" msgstr "" -#: builtin/fetch.c:114 builtin/pull.c:185 +#: builtin/fetch.c:115 builtin/pull.c:191 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "" -#: builtin/fetch.c:116 builtin/pull.c:188 +#: builtin/fetch.c:117 builtin/pull.c:194 msgid "path to upload pack on remote end" msgstr "" -#: builtin/fetch.c:117 builtin/pull.c:190 +#: builtin/fetch.c:118 builtin/pull.c:196 msgid "force overwrite of local branch" msgstr "" -#: builtin/fetch.c:119 +#: builtin/fetch.c:120 msgid "fetch from multiple remotes" msgstr "" -#: builtin/fetch.c:121 builtin/pull.c:192 +#: builtin/fetch.c:122 builtin/pull.c:198 msgid "fetch all tags and associated objects" msgstr "" -#: builtin/fetch.c:123 +#: builtin/fetch.c:124 msgid "do not fetch all tags (--no-tags)" msgstr "" -#: builtin/fetch.c:125 +#: builtin/fetch.c:126 msgid "number of submodules fetched in parallel" msgstr "" -#: builtin/fetch.c:127 builtin/pull.c:195 +#: builtin/fetch.c:128 builtin/pull.c:201 msgid "prune remote-tracking branches no longer on remote" msgstr "" -#: builtin/fetch.c:128 builtin/fetch.c:151 builtin/pull.c:123 +#: builtin/fetch.c:129 builtin/fetch.c:152 builtin/pull.c:126 msgid "on-demand" msgstr "" -#: builtin/fetch.c:129 +#: builtin/fetch.c:130 msgid "control recursive fetching of submodules" msgstr "" -#: builtin/fetch.c:133 builtin/pull.c:203 +#: builtin/fetch.c:134 builtin/pull.c:209 msgid "keep downloaded pack" msgstr "" -#: builtin/fetch.c:135 +#: builtin/fetch.c:136 msgid "allow updating of HEAD ref" msgstr "" -#: builtin/fetch.c:138 builtin/fetch.c:144 builtin/pull.c:206 +#: builtin/fetch.c:139 builtin/fetch.c:145 builtin/pull.c:212 msgid "deepen history of shallow clone" msgstr "" -#: builtin/fetch.c:140 +#: builtin/fetch.c:141 msgid "deepen history of shallow repository based on time" msgstr "" -#: builtin/fetch.c:146 builtin/pull.c:209 +#: builtin/fetch.c:147 builtin/pull.c:215 msgid "convert to a complete repository" msgstr "" -#: builtin/fetch.c:148 builtin/log.c:1456 +#: builtin/fetch.c:149 builtin/log.c:1463 msgid "dir" msgstr "" -#: builtin/fetch.c:149 +#: builtin/fetch.c:150 msgid "prepend this to submodule path output" msgstr "" -#: builtin/fetch.c:152 +#: builtin/fetch.c:153 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "" -#: builtin/fetch.c:156 builtin/pull.c:212 +#: builtin/fetch.c:157 builtin/pull.c:218 msgid "accept refs that update .git/shallow" msgstr "" -#: builtin/fetch.c:157 builtin/pull.c:214 +#: builtin/fetch.c:158 builtin/pull.c:220 msgid "refmap" msgstr "" -#: builtin/fetch.c:158 builtin/pull.c:215 +#: builtin/fetch.c:159 builtin/pull.c:221 msgid "specify fetch refmap" msgstr "" -#: builtin/fetch.c:416 +#: builtin/fetch.c:417 msgid "Couldn't find remote ref HEAD" msgstr "" -#: builtin/fetch.c:534 +#: builtin/fetch.c:535 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "" -#: builtin/fetch.c:627 +#: builtin/fetch.c:628 #, c-format msgid "object %s not found" msgstr "" -#: builtin/fetch.c:631 +#: builtin/fetch.c:632 msgid "[up to date]" msgstr "" -#: builtin/fetch.c:644 builtin/fetch.c:724 +#: builtin/fetch.c:645 builtin/fetch.c:725 msgid "[rejected]" msgstr "" -#: builtin/fetch.c:645 +#: builtin/fetch.c:646 msgid "can't fetch in current branch" msgstr "" -#: builtin/fetch.c:654 +#: builtin/fetch.c:655 msgid "[tag update]" msgstr "" -#: builtin/fetch.c:655 builtin/fetch.c:688 builtin/fetch.c:704 -#: builtin/fetch.c:719 +#: builtin/fetch.c:656 builtin/fetch.c:689 builtin/fetch.c:705 +#: builtin/fetch.c:720 msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:674 +#: builtin/fetch.c:675 msgid "[new tag]" msgstr "" -#: builtin/fetch.c:677 +#: builtin/fetch.c:678 msgid "[new branch]" msgstr "" -#: builtin/fetch.c:680 +#: builtin/fetch.c:681 msgid "[new ref]" msgstr "" -#: builtin/fetch.c:719 +#: builtin/fetch.c:720 msgid "forced update" msgstr "" -#: builtin/fetch.c:724 +#: builtin/fetch.c:725 msgid "non-fast-forward" msgstr "" -#: builtin/fetch.c:769 +#: builtin/fetch.c:770 #, c-format msgid "%s did not send all necessary objects\n" msgstr "" -#: builtin/fetch.c:789 +#: builtin/fetch.c:790 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" -#: builtin/fetch.c:877 builtin/fetch.c:973 +#: builtin/fetch.c:878 builtin/fetch.c:974 #, c-format msgid "From %.*s\n" msgstr "" -#: builtin/fetch.c:888 +#: builtin/fetch.c:889 #, 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:943 +#: builtin/fetch.c:944 #, c-format msgid " (%s will become dangling)" msgstr "" -#: builtin/fetch.c:944 +#: builtin/fetch.c:945 #, c-format msgid " (%s has become dangling)" msgstr "" -#: builtin/fetch.c:976 +#: builtin/fetch.c:977 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:977 builtin/remote.c:1024 +#: builtin/fetch.c:978 builtin/remote.c:1024 msgid "(none)" msgstr "" -#: builtin/fetch.c:1000 +#: builtin/fetch.c:1001 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:1019 +#: builtin/fetch.c:1020 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/fetch.c:1022 +#: builtin/fetch.c:1023 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" -#: builtin/fetch.c:1098 -#, c-format -msgid "Don't know how to fetch from %s" -msgstr "" - -#: builtin/fetch.c:1258 +#: builtin/fetch.c:1256 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:1260 builtin/remote.c:97 +#: builtin/fetch.c:1258 builtin/remote.c:97 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:1278 +#: builtin/fetch.c:1276 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:1301 +#: builtin/fetch.c:1299 msgid "You need to specify a tag name." msgstr "" -#: builtin/fetch.c:1344 +#: builtin/fetch.c:1342 msgid "Negative depth in --deepen is not supported" msgstr "" -#: builtin/fetch.c:1346 +#: builtin/fetch.c:1344 msgid "--deepen and --depth are mutually exclusive" msgstr "" -#: builtin/fetch.c:1351 +#: builtin/fetch.c:1349 msgid "--depth and --unshallow cannot be used together" msgstr "" -#: builtin/fetch.c:1353 +#: builtin/fetch.c:1351 msgid "--unshallow on a complete repository does not make sense" msgstr "" -#: builtin/fetch.c:1366 +#: builtin/fetch.c:1364 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:1368 +#: builtin/fetch.c:1366 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:1379 +#: builtin/fetch.c:1377 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:1387 +#: builtin/fetch.c:1385 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" @@ -7828,23 +7891,23 @@ msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" -#: builtin/fmt-merge-msg.c:665 +#: builtin/fmt-merge-msg.c:666 msgid "populate log with at most <n> entries from shortlog" msgstr "" -#: builtin/fmt-merge-msg.c:668 +#: builtin/fmt-merge-msg.c:669 msgid "alias for --log (deprecated)" msgstr "" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:672 msgid "text" msgstr "" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:673 msgid "use <text> as start of message" msgstr "" -#: builtin/fmt-merge-msg.c:673 +#: builtin/fmt-merge-msg.c:674 msgid "file to read from" msgstr "" @@ -8057,241 +8120,241 @@ msgstr "" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1693 +#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1688 #, c-format msgid "no threads support, ignoring %s" msgstr "" -#: builtin/grep.c:451 builtin/grep.c:571 builtin/grep.c:613 +#: builtin/grep.c:453 builtin/grep.c:573 builtin/grep.c:615 #, c-format msgid "unable to read tree (%s)" msgstr "" -#: builtin/grep.c:628 +#: builtin/grep.c:630 #, c-format msgid "unable to grep from object of type %s" msgstr "" -#: builtin/grep.c:694 +#: builtin/grep.c:696 #, c-format msgid "switch `%c' expects a numerical value" msgstr "" -#: builtin/grep.c:781 +#: builtin/grep.c:783 msgid "search in index instead of in the work tree" msgstr "" -#: builtin/grep.c:783 +#: builtin/grep.c:785 msgid "find in contents not managed by git" msgstr "" -#: builtin/grep.c:785 +#: builtin/grep.c:787 msgid "search in both tracked and untracked files" msgstr "" -#: builtin/grep.c:787 +#: builtin/grep.c:789 msgid "ignore files specified via '.gitignore'" msgstr "" -#: builtin/grep.c:789 +#: builtin/grep.c:791 msgid "recursively search in each submodule" msgstr "" -#: builtin/grep.c:792 +#: builtin/grep.c:794 msgid "show non-matching lines" msgstr "" -#: builtin/grep.c:794 +#: builtin/grep.c:796 msgid "case insensitive matching" msgstr "" -#: builtin/grep.c:796 +#: builtin/grep.c:798 msgid "match patterns only at word boundaries" msgstr "" -#: builtin/grep.c:798 +#: builtin/grep.c:800 msgid "process binary files as text" msgstr "" -#: builtin/grep.c:800 +#: builtin/grep.c:802 msgid "don't match patterns in binary files" msgstr "" -#: builtin/grep.c:803 +#: builtin/grep.c:805 msgid "process binary files with textconv filters" msgstr "" -#: builtin/grep.c:805 +#: builtin/grep.c:807 msgid "descend at most <depth> levels" msgstr "" -#: builtin/grep.c:809 +#: builtin/grep.c:811 msgid "use extended POSIX regular expressions" msgstr "" -#: builtin/grep.c:812 +#: builtin/grep.c:814 msgid "use basic POSIX regular expressions (default)" msgstr "" -#: builtin/grep.c:815 +#: builtin/grep.c:817 msgid "interpret patterns as fixed strings" msgstr "" -#: builtin/grep.c:818 +#: builtin/grep.c:820 msgid "use Perl-compatible regular expressions" msgstr "" -#: builtin/grep.c:821 +#: builtin/grep.c:823 msgid "show line numbers" msgstr "" -#: builtin/grep.c:822 +#: builtin/grep.c:824 msgid "don't show filenames" msgstr "" -#: builtin/grep.c:823 +#: builtin/grep.c:825 msgid "show filenames" msgstr "" -#: builtin/grep.c:825 +#: builtin/grep.c:827 msgid "show filenames relative to top directory" msgstr "" -#: builtin/grep.c:827 +#: builtin/grep.c:829 msgid "show only filenames instead of matching lines" msgstr "" -#: builtin/grep.c:829 +#: builtin/grep.c:831 msgid "synonym for --files-with-matches" msgstr "" -#: builtin/grep.c:832 +#: builtin/grep.c:834 msgid "show only the names of files without match" msgstr "" -#: builtin/grep.c:834 +#: builtin/grep.c:836 msgid "print NUL after filenames" msgstr "" -#: builtin/grep.c:836 +#: builtin/grep.c:838 msgid "show the number of matches instead of matching lines" msgstr "" -#: builtin/grep.c:837 +#: builtin/grep.c:839 msgid "highlight matches" msgstr "" -#: builtin/grep.c:839 +#: builtin/grep.c:841 msgid "print empty line between matches from different files" msgstr "" -#: builtin/grep.c:841 +#: builtin/grep.c:843 msgid "show filename only once above matches from same file" msgstr "" -#: builtin/grep.c:844 +#: builtin/grep.c:846 msgid "show <n> context lines before and after matches" msgstr "" -#: builtin/grep.c:847 +#: builtin/grep.c:849 msgid "show <n> context lines before matches" msgstr "" -#: builtin/grep.c:849 +#: builtin/grep.c:851 msgid "show <n> context lines after matches" msgstr "" -#: builtin/grep.c:851 +#: builtin/grep.c:853 msgid "use <n> worker threads" msgstr "" -#: builtin/grep.c:852 +#: builtin/grep.c:854 msgid "shortcut for -C NUM" msgstr "" -#: builtin/grep.c:855 +#: builtin/grep.c:857 msgid "show a line with the function name before matches" msgstr "" -#: builtin/grep.c:857 +#: builtin/grep.c:859 msgid "show the surrounding function" msgstr "" -#: builtin/grep.c:860 +#: builtin/grep.c:862 msgid "read patterns from file" msgstr "" -#: builtin/grep.c:862 +#: builtin/grep.c:864 msgid "match <pattern>" msgstr "" -#: builtin/grep.c:864 +#: builtin/grep.c:866 msgid "combine patterns specified with -e" msgstr "" -#: builtin/grep.c:876 +#: builtin/grep.c:878 msgid "indicate hit with exit status without output" msgstr "" -#: builtin/grep.c:878 +#: builtin/grep.c:880 msgid "show only matches from files that match all patterns" msgstr "" -#: builtin/grep.c:880 +#: builtin/grep.c:882 msgid "show parse tree for grep expression" msgstr "" -#: builtin/grep.c:884 +#: builtin/grep.c:886 msgid "pager" msgstr "" -#: builtin/grep.c:884 +#: builtin/grep.c:886 msgid "show matching files in the pager" msgstr "" -#: builtin/grep.c:887 +#: builtin/grep.c:889 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" -#: builtin/grep.c:950 +#: builtin/grep.c:952 msgid "no pattern given." msgstr "" -#: builtin/grep.c:982 +#: builtin/grep.c:984 msgid "--no-index or --untracked cannot be used with revs" msgstr "" -#: builtin/grep.c:989 +#: builtin/grep.c:991 #, c-format msgid "unable to resolve revision: %s" msgstr "" -#: builtin/grep.c:1023 builtin/index-pack.c:1491 +#: builtin/grep.c:1026 builtin/index-pack.c:1491 #, c-format msgid "invalid number of threads specified (%d)" msgstr "" -#: builtin/grep.c:1028 +#: builtin/grep.c:1031 msgid "no threads support, ignoring --threads" msgstr "" -#: builtin/grep.c:1052 +#: builtin/grep.c:1055 msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/grep.c:1075 +#: builtin/grep.c:1078 msgid "option not supported with --recurse-submodules." msgstr "" -#: builtin/grep.c:1081 +#: builtin/grep.c:1084 msgid "--cached or --untracked cannot be used with --no-index." msgstr "" -#: builtin/grep.c:1087 +#: builtin/grep.c:1090 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" -#: builtin/grep.c:1095 +#: builtin/grep.c:1098 msgid "both --cached and trees are given." msgstr "" @@ -8568,8 +8631,8 @@ msgstr "" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" -#: builtin/index-pack.c:752 builtin/pack-objects.c:168 -#: builtin/pack-objects.c:262 +#: builtin/index-pack.c:752 builtin/pack-objects.c:179 +#: builtin/pack-objects.c:273 #, c-format msgid "unable to read %s" msgstr "" @@ -8729,21 +8792,21 @@ msgstr[1] "" msgid "packfile name '%s' does not end with '.pack'" msgstr "" -#: builtin/index-pack.c:1705 builtin/index-pack.c:1708 -#: builtin/index-pack.c:1724 builtin/index-pack.c:1728 +#: builtin/index-pack.c:1700 builtin/index-pack.c:1703 +#: builtin/index-pack.c:1719 builtin/index-pack.c:1723 #, c-format msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1744 +#: builtin/index-pack.c:1739 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1746 +#: builtin/index-pack.c:1741 msgid "--stdin requires a git repository" msgstr "" -#: builtin/index-pack.c:1754 +#: builtin/index-pack.c:1749 msgid "--verify with no packfile name given" msgstr "" @@ -8934,427 +8997,439 @@ msgstr "" msgid "invalid --decorate option: %s" msgstr "" -#: builtin/log.c:148 +#: builtin/log.c:151 msgid "suppress diff output" msgstr "" -#: builtin/log.c:149 +#: builtin/log.c:152 msgid "show source" msgstr "" -#: builtin/log.c:150 +#: builtin/log.c:153 msgid "Use mail map file" msgstr "" -#: builtin/log.c:151 +#: builtin/log.c:155 +msgid "only decorate refs that match <pattern>" +msgstr "" + +#: builtin/log.c:157 +msgid "do not decorate refs that match <pattern>" +msgstr "" + +#: builtin/log.c:158 msgid "decorate options" msgstr "" -#: builtin/log.c:154 +#: builtin/log.c:161 msgid "Process line range n,m in file, counting from 1" msgstr "" -#: builtin/log.c:250 +#: builtin/log.c:257 #, c-format msgid "Final output: %d %s\n" msgstr "" -#: builtin/log.c:501 +#: builtin/log.c:508 #, c-format msgid "git show %s: bad file" msgstr "" -#: builtin/log.c:516 builtin/log.c:610 +#: builtin/log.c:523 builtin/log.c:617 #, c-format msgid "Could not read object %s" msgstr "" -#: builtin/log.c:634 +#: builtin/log.c:641 #, c-format msgid "Unknown type: %d" msgstr "" -#: builtin/log.c:755 +#: builtin/log.c:762 msgid "format.headers without value" msgstr "" -#: builtin/log.c:856 +#: builtin/log.c:863 msgid "name of output directory is too long" msgstr "" -#: builtin/log.c:872 +#: builtin/log.c:879 #, c-format msgid "Cannot open patch file %s" msgstr "" -#: builtin/log.c:889 +#: builtin/log.c:896 msgid "Need exactly one range." msgstr "" -#: builtin/log.c:899 +#: builtin/log.c:906 msgid "Not a range." msgstr "" -#: builtin/log.c:1005 +#: builtin/log.c:1012 msgid "Cover letter needs email format" msgstr "" -#: builtin/log.c:1085 +#: builtin/log.c:1092 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:1112 +#: builtin/log.c:1119 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "" -#: builtin/log.c:1162 +#: builtin/log.c:1169 msgid "Two output directories?" msgstr "" -#: builtin/log.c:1269 builtin/log.c:1920 builtin/log.c:1922 builtin/log.c:1934 +#: builtin/log.c:1276 builtin/log.c:1927 builtin/log.c:1929 builtin/log.c:1941 #, c-format msgid "Unknown commit %s" msgstr "" -#: builtin/log.c:1279 builtin/notes.c:887 builtin/tag.c:516 +#: builtin/log.c:1286 builtin/notes.c:887 builtin/tag.c:516 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "" -#: builtin/log.c:1284 +#: builtin/log.c:1291 msgid "Could not find exact merge base." msgstr "" -#: builtin/log.c:1288 +#: builtin/log.c:1295 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:1308 +#: builtin/log.c:1315 msgid "Failed to find exact merge base" msgstr "" -#: builtin/log.c:1319 +#: builtin/log.c:1326 msgid "base commit should be the ancestor of revision list" msgstr "" -#: builtin/log.c:1323 +#: builtin/log.c:1330 msgid "base commit shouldn't be in revision list" msgstr "" -#: builtin/log.c:1372 +#: builtin/log.c:1379 msgid "cannot get patch id" msgstr "" -#: builtin/log.c:1431 +#: builtin/log.c:1438 msgid "use [PATCH n/m] even with a single patch" msgstr "" -#: builtin/log.c:1434 +#: builtin/log.c:1441 msgid "use [PATCH] even with multiple patches" msgstr "" -#: builtin/log.c:1438 +#: builtin/log.c:1445 msgid "print patches to standard out" msgstr "" -#: builtin/log.c:1440 +#: builtin/log.c:1447 msgid "generate a cover letter" msgstr "" -#: builtin/log.c:1442 +#: builtin/log.c:1449 msgid "use simple number sequence for output file names" msgstr "" -#: builtin/log.c:1443 +#: builtin/log.c:1450 msgid "sfx" msgstr "" -#: builtin/log.c:1444 +#: builtin/log.c:1451 msgid "use <sfx> instead of '.patch'" msgstr "" -#: builtin/log.c:1446 +#: builtin/log.c:1453 msgid "start numbering patches at <n> instead of 1" msgstr "" -#: builtin/log.c:1448 +#: builtin/log.c:1455 msgid "mark the series as Nth re-roll" msgstr "" -#: builtin/log.c:1450 +#: builtin/log.c:1457 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "" -#: builtin/log.c:1453 +#: builtin/log.c:1460 msgid "Use [<prefix>] instead of [PATCH]" msgstr "" -#: builtin/log.c:1456 +#: builtin/log.c:1463 msgid "store resulting files in <dir>" msgstr "" -#: builtin/log.c:1459 +#: builtin/log.c:1466 msgid "don't strip/add [PATCH]" msgstr "" -#: builtin/log.c:1462 +#: builtin/log.c:1469 msgid "don't output binary diffs" msgstr "" -#: builtin/log.c:1464 +#: builtin/log.c:1471 msgid "output all-zero hash in From header" msgstr "" -#: builtin/log.c:1466 +#: builtin/log.c:1473 msgid "don't include a patch matching a commit upstream" msgstr "" -#: builtin/log.c:1468 +#: builtin/log.c:1475 msgid "show patch format instead of default (patch + stat)" msgstr "" -#: builtin/log.c:1470 +#: builtin/log.c:1477 msgid "Messaging" msgstr "" -#: builtin/log.c:1471 +#: builtin/log.c:1478 msgid "header" msgstr "" -#: builtin/log.c:1472 +#: builtin/log.c:1479 msgid "add email header" msgstr "" -#: builtin/log.c:1473 builtin/log.c:1475 +#: builtin/log.c:1480 builtin/log.c:1482 msgid "email" msgstr "" -#: builtin/log.c:1473 +#: builtin/log.c:1480 msgid "add To: header" msgstr "" -#: builtin/log.c:1475 +#: builtin/log.c:1482 msgid "add Cc: header" msgstr "" -#: builtin/log.c:1477 +#: builtin/log.c:1484 msgid "ident" msgstr "" -#: builtin/log.c:1478 +#: builtin/log.c:1485 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" -#: builtin/log.c:1480 +#: builtin/log.c:1487 msgid "message-id" msgstr "" -#: builtin/log.c:1481 +#: builtin/log.c:1488 msgid "make first mail a reply to <message-id>" msgstr "" -#: builtin/log.c:1482 builtin/log.c:1485 +#: builtin/log.c:1489 builtin/log.c:1492 msgid "boundary" msgstr "" -#: builtin/log.c:1483 +#: builtin/log.c:1490 msgid "attach the patch" msgstr "" -#: builtin/log.c:1486 +#: builtin/log.c:1493 msgid "inline the patch" msgstr "" -#: builtin/log.c:1490 +#: builtin/log.c:1497 msgid "enable message threading, styles: shallow, deep" msgstr "" -#: builtin/log.c:1492 +#: builtin/log.c:1499 msgid "signature" msgstr "" -#: builtin/log.c:1493 +#: builtin/log.c:1500 msgid "add a signature" msgstr "" -#: builtin/log.c:1494 +#: builtin/log.c:1501 msgid "base-commit" msgstr "" -#: builtin/log.c:1495 +#: builtin/log.c:1502 msgid "add prerequisite tree info to the patch series" msgstr "" -#: builtin/log.c:1497 +#: builtin/log.c:1504 msgid "add a signature from a file" msgstr "" -#: builtin/log.c:1498 +#: builtin/log.c:1505 msgid "don't print the patch filenames" msgstr "" -#: builtin/log.c:1500 +#: builtin/log.c:1507 msgid "show progress while generating patches" msgstr "" -#: builtin/log.c:1575 +#: builtin/log.c:1582 #, c-format msgid "invalid ident line: %s" msgstr "" -#: builtin/log.c:1590 +#: builtin/log.c:1597 msgid "-n and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1592 +#: builtin/log.c:1599 msgid "--subject-prefix/--rfc and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1600 +#: builtin/log.c:1607 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1602 +#: builtin/log.c:1609 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1604 +#: builtin/log.c:1611 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1634 +#: builtin/log.c:1641 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:1636 +#: builtin/log.c:1643 #, c-format msgid "Could not create directory '%s'" msgstr "" -#: builtin/log.c:1729 +#: builtin/log.c:1736 #, c-format msgid "unable to read signature file '%s'" msgstr "" -#: builtin/log.c:1761 +#: builtin/log.c:1768 msgid "Generating patches" msgstr "" -#: builtin/log.c:1805 +#: builtin/log.c:1812 msgid "Failed to create output files" msgstr "" -#: builtin/log.c:1855 +#: builtin/log.c:1862 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "" -#: builtin/log.c:1909 +#: builtin/log.c:1916 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "" -#: builtin/ls-files.c:466 +#: builtin/ls-files.c:468 msgid "git ls-files [<options>] [<file>...]" msgstr "" -#: builtin/ls-files.c:515 +#: builtin/ls-files.c:517 msgid "identify the file status with tags" msgstr "" -#: builtin/ls-files.c:517 +#: builtin/ls-files.c:519 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" -#: builtin/ls-files.c:519 +#: builtin/ls-files.c:521 +msgid "use lowercase letters for 'fsmonitor clean' files" +msgstr "" + +#: builtin/ls-files.c:523 msgid "show cached files in the output (default)" msgstr "" -#: builtin/ls-files.c:521 +#: builtin/ls-files.c:525 msgid "show deleted files in the output" msgstr "" -#: builtin/ls-files.c:523 +#: builtin/ls-files.c:527 msgid "show modified files in the output" msgstr "" -#: builtin/ls-files.c:525 +#: builtin/ls-files.c:529 msgid "show other files in the output" msgstr "" -#: builtin/ls-files.c:527 +#: builtin/ls-files.c:531 msgid "show ignored files in the output" msgstr "" -#: builtin/ls-files.c:530 +#: builtin/ls-files.c:534 msgid "show staged contents' object name in the output" msgstr "" -#: builtin/ls-files.c:532 +#: builtin/ls-files.c:536 msgid "show files on the filesystem that need to be removed" msgstr "" -#: builtin/ls-files.c:534 +#: builtin/ls-files.c:538 msgid "show 'other' directories' names only" msgstr "" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:540 msgid "show line endings of files" msgstr "" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:542 msgid "don't show empty directories" msgstr "" -#: builtin/ls-files.c:541 +#: builtin/ls-files.c:545 msgid "show unmerged files in the output" msgstr "" -#: builtin/ls-files.c:543 +#: builtin/ls-files.c:547 msgid "show resolve-undo information" msgstr "" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:549 msgid "skip files matching pattern" msgstr "" -#: builtin/ls-files.c:548 +#: builtin/ls-files.c:552 msgid "exclude patterns are read from <file>" msgstr "" -#: builtin/ls-files.c:551 +#: builtin/ls-files.c:555 msgid "read additional per-directory exclude patterns in <file>" msgstr "" -#: builtin/ls-files.c:553 +#: builtin/ls-files.c:557 msgid "add the standard git exclusions" msgstr "" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:560 msgid "make the output relative to the project top directory" msgstr "" -#: builtin/ls-files.c:559 +#: builtin/ls-files.c:563 msgid "recurse through submodules" msgstr "" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:565 msgid "if any <file> is not in the index, treat this as an error" msgstr "" -#: builtin/ls-files.c:562 +#: builtin/ls-files.c:566 msgid "tree-ish" msgstr "" -#: builtin/ls-files.c:563 +#: builtin/ls-files.c:567 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" -#: builtin/ls-files.c:565 +#: builtin/ls-files.c:569 msgid "show debugging data" msgstr "" @@ -9473,31 +9548,31 @@ msgstr "" msgid "Available custom strategies are:" msgstr "" -#: builtin/merge.c:200 builtin/pull.c:134 +#: builtin/merge.c:200 builtin/pull.c:137 msgid "do not show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:203 builtin/pull.c:137 +#: builtin/merge.c:203 builtin/pull.c:140 msgid "show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:204 builtin/pull.c:140 +#: builtin/merge.c:204 builtin/pull.c:143 msgid "(synonym to --stat)" msgstr "" -#: builtin/merge.c:206 builtin/pull.c:143 +#: builtin/merge.c:206 builtin/pull.c:146 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" -#: builtin/merge.c:209 builtin/pull.c:146 +#: builtin/merge.c:209 builtin/pull.c:152 msgid "create a single commit instead of doing a merge" msgstr "" -#: builtin/merge.c:211 builtin/pull.c:149 +#: builtin/merge.c:211 builtin/pull.c:155 msgid "perform a commit if the merge succeeds (default)" msgstr "" -#: builtin/merge.c:213 builtin/pull.c:152 +#: builtin/merge.c:213 builtin/pull.c:158 msgid "edit message before committing" msgstr "" @@ -9505,28 +9580,28 @@ msgstr "" msgid "allow fast-forward (default)" msgstr "" -#: builtin/merge.c:216 builtin/pull.c:158 +#: builtin/merge.c:216 builtin/pull.c:164 msgid "abort if fast-forward is not possible" msgstr "" -#: builtin/merge.c:220 builtin/pull.c:161 +#: builtin/merge.c:220 builtin/pull.c:167 msgid "verify that the named commit has a valid GPG signature" msgstr "" -#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:165 +#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:171 #: builtin/revert.c:109 msgid "strategy" msgstr "" -#: builtin/merge.c:222 builtin/pull.c:166 +#: builtin/merge.c:222 builtin/pull.c:172 msgid "merge strategy to use" msgstr "" -#: builtin/merge.c:223 builtin/pull.c:169 +#: builtin/merge.c:223 builtin/pull.c:175 msgid "option=value" msgstr "" -#: builtin/merge.c:224 builtin/pull.c:170 +#: builtin/merge.c:224 builtin/pull.c:176 msgid "option for selected merge strategy" msgstr "" @@ -9542,7 +9617,7 @@ msgstr "" msgid "continue the current in-progress merge" msgstr "" -#: builtin/merge.c:234 builtin/pull.c:177 +#: builtin/merge.c:234 builtin/pull.c:183 msgid "allow merging unrelated histories" msgstr "" @@ -9581,41 +9656,41 @@ msgstr "" msgid "No merge message -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:456 +#: builtin/merge.c:455 #, c-format msgid "'%s' does not point to a commit" msgstr "" -#: builtin/merge.c:546 +#: builtin/merge.c:545 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" -#: builtin/merge.c:666 +#: builtin/merge.c:667 msgid "Not handling anything other than two heads merge." msgstr "" -#: builtin/merge.c:680 +#: builtin/merge.c:681 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" -#: builtin/merge.c:695 +#: builtin/merge.c:696 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:747 +#: builtin/merge.c:748 #, c-format msgid "Could not read from '%s'" msgstr "" -#: builtin/merge.c:756 +#: builtin/merge.c:757 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -#: builtin/merge.c:762 +#: builtin/merge.c:763 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -9625,185 +9700,185 @@ msgid "" "the commit.\n" msgstr "" -#: builtin/merge.c:798 +#: builtin/merge.c:799 msgid "Empty commit message." msgstr "" -#: builtin/merge.c:818 +#: builtin/merge.c:819 #, c-format msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:871 +#: builtin/merge.c:872 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:910 +#: builtin/merge.c:911 msgid "No current branch." msgstr "" -#: builtin/merge.c:912 +#: builtin/merge.c:913 msgid "No remote for the current branch." msgstr "" -#: builtin/merge.c:914 +#: builtin/merge.c:915 msgid "No default upstream defined for the current branch." msgstr "" -#: builtin/merge.c:919 +#: builtin/merge.c:920 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:972 +#: builtin/merge.c:973 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "" -#: builtin/merge.c:1073 +#: builtin/merge.c:1075 #, c-format msgid "not something we can merge in %s: %s" msgstr "" -#: builtin/merge.c:1107 +#: builtin/merge.c:1109 msgid "not something we can merge" msgstr "" -#: builtin/merge.c:1172 +#: builtin/merge.c:1174 msgid "--abort expects no arguments" msgstr "" -#: builtin/merge.c:1176 +#: builtin/merge.c:1178 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1188 +#: builtin/merge.c:1190 msgid "--continue expects no arguments" msgstr "" -#: builtin/merge.c:1192 +#: builtin/merge.c:1194 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1208 +#: builtin/merge.c:1210 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1215 +#: builtin/merge.c:1217 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1218 +#: builtin/merge.c:1220 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1227 +#: builtin/merge.c:1229 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1235 +#: builtin/merge.c:1237 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1252 +#: builtin/merge.c:1254 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1254 +#: builtin/merge.c:1256 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1259 +#: builtin/merge.c:1261 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1261 +#: builtin/merge.c:1263 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:1295 +#: builtin/merge.c:1297 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" -#: builtin/merge.c:1298 +#: builtin/merge.c:1300 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" -#: builtin/merge.c:1301 +#: builtin/merge.c:1303 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "" -#: builtin/merge.c:1304 +#: builtin/merge.c:1306 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "" -#: builtin/merge.c:1366 +#: builtin/merge.c:1368 msgid "refusing to merge unrelated histories" msgstr "" -#: builtin/merge.c:1375 +#: builtin/merge.c:1377 msgid "Already up to date." msgstr "" -#: builtin/merge.c:1385 +#: builtin/merge.c:1387 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1426 +#: builtin/merge.c:1428 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1433 +#: builtin/merge.c:1435 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1458 +#: builtin/merge.c:1460 msgid "Already up to date. Yeeah!" msgstr "" -#: builtin/merge.c:1464 +#: builtin/merge.c:1466 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1487 builtin/merge.c:1566 +#: builtin/merge.c:1489 builtin/merge.c:1568 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1491 +#: builtin/merge.c:1493 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1557 +#: builtin/merge.c:1559 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1559 +#: builtin/merge.c:1561 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1568 +#: builtin/merge.c:1570 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1580 +#: builtin/merge.c:1582 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -9828,23 +9903,23 @@ msgstr "" msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "" -#: builtin/merge-base.c:218 +#: builtin/merge-base.c:220 msgid "output all common ancestors" msgstr "" -#: builtin/merge-base.c:220 +#: builtin/merge-base.c:222 msgid "find ancestors for a single n-way merge" msgstr "" -#: builtin/merge-base.c:222 +#: builtin/merge-base.c:224 msgid "list revs not reachable from others" msgstr "" -#: builtin/merge-base.c:224 +#: builtin/merge-base.c:226 msgid "is the first one ancestor of the other?" msgstr "" -#: builtin/merge-base.c:226 +#: builtin/merge-base.c:228 msgid "find where <commit> forked from reflog of <ref>" msgstr "" @@ -10115,7 +10190,7 @@ msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "" #: builtin/notes.c:36 -msgid "git notes [--ref <notes-ref>] prune [-n | -v]" +msgid "git notes [--ref <notes-ref>] prune [-n] [-v]" msgstr "" #: builtin/notes.c:37 @@ -10444,7 +10519,7 @@ msgstr "" msgid "read object names from the standard input" msgstr "" -#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:146 +#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:158 msgid "do not remove, show only" msgstr "" @@ -10465,184 +10540,192 @@ msgstr "" msgid "unknown subcommand: %s" msgstr "" -#: builtin/pack-objects.c:31 +#: builtin/pack-objects.c:33 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" -#: builtin/pack-objects.c:32 +#: builtin/pack-objects.c:34 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" -#: builtin/pack-objects.c:181 builtin/pack-objects.c:184 +#: builtin/pack-objects.c:192 builtin/pack-objects.c:195 #, c-format msgid "deflate error (%d)" msgstr "" -#: builtin/pack-objects.c:777 +#: builtin/pack-objects.c:788 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" -#: builtin/pack-objects.c:790 +#: builtin/pack-objects.c:801 msgid "Writing objects" msgstr "" -#: builtin/pack-objects.c:1070 +#: builtin/pack-objects.c:1081 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" -#: builtin/pack-objects.c:2440 +#: builtin/pack-objects.c:2451 msgid "Compressing objects" msgstr "" -#: builtin/pack-objects.c:2849 +#: builtin/pack-objects.c:2599 +msgid "invalid value for --missing" +msgstr "" + +#: builtin/pack-objects.c:2902 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:2853 +#: builtin/pack-objects.c:2906 #, c-format msgid "bad index version '%s'" msgstr "" -#: builtin/pack-objects.c:2883 +#: builtin/pack-objects.c:2936 msgid "do not show progress meter" msgstr "" -#: builtin/pack-objects.c:2885 +#: builtin/pack-objects.c:2938 msgid "show progress meter" msgstr "" -#: builtin/pack-objects.c:2887 +#: builtin/pack-objects.c:2940 msgid "show progress meter during object writing phase" msgstr "" -#: builtin/pack-objects.c:2890 +#: builtin/pack-objects.c:2943 msgid "similar to --all-progress when progress meter is shown" msgstr "" -#: builtin/pack-objects.c:2891 +#: builtin/pack-objects.c:2944 msgid "version[,offset]" msgstr "" -#: builtin/pack-objects.c:2892 +#: builtin/pack-objects.c:2945 msgid "write the pack index file in the specified idx format version" msgstr "" -#: builtin/pack-objects.c:2895 +#: builtin/pack-objects.c:2948 msgid "maximum size of each output pack file" msgstr "" -#: builtin/pack-objects.c:2897 +#: builtin/pack-objects.c:2950 msgid "ignore borrowed objects from alternate object store" msgstr "" -#: builtin/pack-objects.c:2899 +#: builtin/pack-objects.c:2952 msgid "ignore packed objects" msgstr "" -#: builtin/pack-objects.c:2901 +#: builtin/pack-objects.c:2954 msgid "limit pack window by objects" msgstr "" -#: builtin/pack-objects.c:2903 +#: builtin/pack-objects.c:2956 msgid "limit pack window by memory in addition to object limit" msgstr "" -#: builtin/pack-objects.c:2905 +#: builtin/pack-objects.c:2958 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" -#: builtin/pack-objects.c:2907 +#: builtin/pack-objects.c:2960 msgid "reuse existing deltas" msgstr "" -#: builtin/pack-objects.c:2909 +#: builtin/pack-objects.c:2962 msgid "reuse existing objects" msgstr "" -#: builtin/pack-objects.c:2911 +#: builtin/pack-objects.c:2964 msgid "use OFS_DELTA objects" msgstr "" -#: builtin/pack-objects.c:2913 +#: builtin/pack-objects.c:2966 msgid "use threads when searching for best delta matches" msgstr "" -#: builtin/pack-objects.c:2915 +#: builtin/pack-objects.c:2968 msgid "do not create an empty pack output" msgstr "" -#: builtin/pack-objects.c:2917 +#: builtin/pack-objects.c:2970 msgid "read revision arguments from standard input" msgstr "" -#: builtin/pack-objects.c:2919 +#: builtin/pack-objects.c:2972 msgid "limit the objects to those that are not yet packed" msgstr "" -#: builtin/pack-objects.c:2922 +#: builtin/pack-objects.c:2975 msgid "include objects reachable from any reference" msgstr "" -#: builtin/pack-objects.c:2925 +#: builtin/pack-objects.c:2978 msgid "include objects referred by reflog entries" msgstr "" -#: builtin/pack-objects.c:2928 +#: builtin/pack-objects.c:2981 msgid "include objects referred to by the index" msgstr "" -#: builtin/pack-objects.c:2931 +#: builtin/pack-objects.c:2984 msgid "output pack to stdout" msgstr "" -#: builtin/pack-objects.c:2933 +#: builtin/pack-objects.c:2986 msgid "include tag objects that refer to objects to be packed" msgstr "" -#: builtin/pack-objects.c:2935 +#: builtin/pack-objects.c:2988 msgid "keep unreachable objects" msgstr "" -#: builtin/pack-objects.c:2937 +#: builtin/pack-objects.c:2990 msgid "pack loose unreachable objects" msgstr "" -#: builtin/pack-objects.c:2939 +#: builtin/pack-objects.c:2992 msgid "unpack unreachable objects newer than <time>" msgstr "" -#: builtin/pack-objects.c:2942 +#: builtin/pack-objects.c:2995 msgid "create thin packs" msgstr "" -#: builtin/pack-objects.c:2944 +#: builtin/pack-objects.c:2997 msgid "create packs suitable for shallow fetches" msgstr "" -#: builtin/pack-objects.c:2946 +#: builtin/pack-objects.c:2999 msgid "ignore packs that have companion .keep file" msgstr "" -#: builtin/pack-objects.c:2948 +#: builtin/pack-objects.c:3001 msgid "pack compression level" msgstr "" -#: builtin/pack-objects.c:2950 +#: builtin/pack-objects.c:3003 msgid "do not hide commits by grafts" msgstr "" -#: builtin/pack-objects.c:2952 +#: builtin/pack-objects.c:3005 msgid "use a bitmap index if available to speed up counting objects" msgstr "" -#: builtin/pack-objects.c:2954 +#: builtin/pack-objects.c:3007 msgid "write a bitmap index together with the pack index" msgstr "" -#: builtin/pack-objects.c:3081 +#: builtin/pack-objects.c:3010 +msgid "handling for missing objects" +msgstr "" + +#: builtin/pack-objects.c:3144 msgid "Counting objects" msgstr "" @@ -10667,7 +10750,7 @@ msgid "Removing duplicate objects" msgstr "" #: builtin/prune.c:11 -msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" +msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "" #: builtin/prune.c:106 @@ -10691,57 +10774,57 @@ msgstr "" msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "" -#: builtin/pull.c:124 +#: builtin/pull.c:127 msgid "control for recursive fetching of submodules" msgstr "" -#: builtin/pull.c:128 +#: builtin/pull.c:131 msgid "Options related to merging" msgstr "" -#: builtin/pull.c:131 +#: builtin/pull.c:134 msgid "incorporate changes by rebasing rather than merging" msgstr "" -#: builtin/pull.c:155 builtin/rebase--helper.c:21 builtin/revert.c:121 +#: builtin/pull.c:161 builtin/rebase--helper.c:23 builtin/revert.c:121 msgid "allow fast-forward" msgstr "" -#: builtin/pull.c:164 +#: builtin/pull.c:170 msgid "automatically stash/stash pop before and after rebase" msgstr "" -#: builtin/pull.c:180 +#: builtin/pull.c:186 msgid "Options related to fetching" msgstr "" -#: builtin/pull.c:198 +#: builtin/pull.c:204 msgid "number of submodules pulled in parallel" msgstr "" -#: builtin/pull.c:287 +#: builtin/pull.c:299 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "" -#: builtin/pull.c:403 +#: builtin/pull.c:415 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "" -#: builtin/pull.c:405 +#: builtin/pull.c:417 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" -#: builtin/pull.c:406 +#: builtin/pull.c:418 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "" -#: builtin/pull.c:409 +#: builtin/pull.c:421 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -10749,69 +10832,69 @@ msgid "" "for your current branch, you must specify a branch on the command line." msgstr "" -#: builtin/pull.c:414 git-parse-remote.sh:73 +#: builtin/pull.c:426 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "" -#: builtin/pull.c:416 builtin/pull.c:431 git-parse-remote.sh:79 +#: builtin/pull.c:428 builtin/pull.c:443 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "" -#: builtin/pull.c:418 builtin/pull.c:433 git-parse-remote.sh:82 +#: builtin/pull.c:430 builtin/pull.c:445 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "" -#: builtin/pull.c:419 builtin/pull.c:434 +#: builtin/pull.c:431 builtin/pull.c:446 msgid "See git-pull(1) for details." msgstr "" -#: builtin/pull.c:421 builtin/pull.c:427 builtin/pull.c:436 +#: builtin/pull.c:433 builtin/pull.c:439 builtin/pull.c:448 #: git-parse-remote.sh:64 msgid "<remote>" msgstr "" -#: builtin/pull.c:421 builtin/pull.c:436 builtin/pull.c:441 git-rebase.sh:466 +#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:466 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "" -#: builtin/pull.c:429 git-parse-remote.sh:75 +#: builtin/pull.c:441 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "" -#: builtin/pull.c:438 git-parse-remote.sh:95 +#: builtin/pull.c:450 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:443 +#: builtin/pull.c:455 #, 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:796 +#: builtin/pull.c:817 msgid "ignoring --verify-signatures for rebase" msgstr "" -#: builtin/pull.c:844 +#: builtin/pull.c:865 msgid "--[no-]autostash option is only valid with --rebase." msgstr "" -#: builtin/pull.c:852 +#: builtin/pull.c:873 msgid "Updating an unborn branch with changes added to the index." msgstr "" -#: builtin/pull.c:855 +#: builtin/pull.c:876 msgid "pull with rebase" msgstr "" -#: builtin/pull.c:856 +#: builtin/pull.c:877 msgid "please commit or stash them." msgstr "" -#: builtin/pull.c:881 +#: builtin/pull.c:902 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -10819,7 +10902,7 @@ msgid "" "commit %s." msgstr "" -#: builtin/pull.c:886 +#: builtin/pull.c:907 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -10830,15 +10913,15 @@ msgid "" "to recover." msgstr "" -#: builtin/pull.c:901 +#: builtin/pull.c:922 msgid "Cannot merge multiple branches into empty head." msgstr "" -#: builtin/pull.c:905 +#: builtin/pull.c:926 msgid "Cannot rebase onto multiple branches." msgstr "" -#: builtin/pull.c:912 +#: builtin/pull.c:933 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" @@ -10846,21 +10929,21 @@ msgstr "" msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "" -#: builtin/push.c:90 +#: builtin/push.c:92 msgid "tag shorthand without <tag>" msgstr "" -#: builtin/push.c:100 +#: builtin/push.c:102 msgid "--delete only accepts plain target ref names" msgstr "" -#: builtin/push.c:144 +#: builtin/push.c:146 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." msgstr "" -#: builtin/push.c:147 +#: builtin/push.c:149 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -10875,7 +10958,7 @@ msgid "" "%s" msgstr "" -#: builtin/push.c:162 +#: builtin/push.c:164 #, c-format msgid "" "You are not currently on a branch.\n" @@ -10885,7 +10968,7 @@ msgid "" " git push %s HEAD:<name-of-remote-branch>\n" msgstr "" -#: builtin/push.c:176 +#: builtin/push.c:178 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -10894,12 +10977,12 @@ msgid "" " git push --set-upstream %s %s\n" msgstr "" -#: builtin/push.c:184 +#: builtin/push.c:186 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" -#: builtin/push.c:187 +#: builtin/push.c:189 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -10907,12 +10990,12 @@ msgid "" "to update which remote branch." msgstr "" -#: builtin/push.c:246 +#: builtin/push.c:248 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" -#: builtin/push.c:253 +#: builtin/push.c:255 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -10920,7 +11003,7 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:259 +#: builtin/push.c:261 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -10928,7 +11011,7 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:265 +#: builtin/push.c:267 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -10937,33 +11020,33 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:272 +#: builtin/push.c:274 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" -#: builtin/push.c:275 +#: builtin/push.c:277 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" "without using the '--force' option.\n" msgstr "" -#: builtin/push.c:335 +#: builtin/push.c:337 #, c-format msgid "Pushing to %s\n" msgstr "" -#: builtin/push.c:339 +#: builtin/push.c:341 #, c-format msgid "failed to push some refs to '%s'" msgstr "" -#: builtin/push.c:370 +#: builtin/push.c:372 #, c-format msgid "bad repository '%s'" msgstr "" -#: builtin/push.c:371 +#: builtin/push.c:373 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -10976,112 +11059,112 @@ msgid "" " git push <name>\n" msgstr "" -#: builtin/push.c:389 +#: builtin/push.c:391 msgid "--all and --tags are incompatible" msgstr "" -#: builtin/push.c:390 +#: builtin/push.c:392 msgid "--all can't be combined with refspecs" msgstr "" -#: builtin/push.c:395 +#: builtin/push.c:397 msgid "--mirror and --tags are incompatible" msgstr "" -#: builtin/push.c:396 +#: builtin/push.c:398 msgid "--mirror can't be combined with refspecs" msgstr "" -#: builtin/push.c:401 +#: builtin/push.c:403 msgid "--all and --mirror are incompatible" msgstr "" -#: builtin/push.c:523 +#: builtin/push.c:535 msgid "repository" msgstr "" -#: builtin/push.c:524 builtin/send-pack.c:163 +#: builtin/push.c:536 builtin/send-pack.c:163 msgid "push all refs" msgstr "" -#: builtin/push.c:525 builtin/send-pack.c:165 +#: builtin/push.c:537 builtin/send-pack.c:165 msgid "mirror all refs" msgstr "" -#: builtin/push.c:527 +#: builtin/push.c:539 msgid "delete refs" msgstr "" -#: builtin/push.c:528 +#: builtin/push.c:540 msgid "push tags (can't be used with --all or --mirror)" msgstr "" -#: builtin/push.c:531 builtin/send-pack.c:166 +#: builtin/push.c:543 builtin/send-pack.c:166 msgid "force updates" msgstr "" -#: builtin/push.c:533 builtin/send-pack.c:180 +#: builtin/push.c:545 builtin/send-pack.c:180 msgid "refname>:<expect" msgstr "" -#: builtin/push.c:534 builtin/send-pack.c:181 +#: builtin/push.c:546 builtin/send-pack.c:181 msgid "require old value of ref to be at this value" msgstr "" -#: builtin/push.c:537 +#: builtin/push.c:549 msgid "control recursive pushing of submodules" msgstr "" -#: builtin/push.c:539 builtin/send-pack.c:174 +#: builtin/push.c:551 builtin/send-pack.c:174 msgid "use thin pack" msgstr "" -#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160 +#: builtin/push.c:552 builtin/push.c:553 builtin/send-pack.c:160 #: builtin/send-pack.c:161 msgid "receive pack program" msgstr "" -#: builtin/push.c:542 +#: builtin/push.c:554 msgid "set upstream for git pull/status" msgstr "" -#: builtin/push.c:545 +#: builtin/push.c:557 msgid "prune locally removed refs" msgstr "" -#: builtin/push.c:547 +#: builtin/push.c:559 msgid "bypass pre-push hook" msgstr "" -#: builtin/push.c:548 +#: builtin/push.c:560 msgid "push missing but relevant tags" msgstr "" -#: builtin/push.c:551 builtin/send-pack.c:168 +#: builtin/push.c:563 builtin/send-pack.c:168 msgid "GPG sign the push" msgstr "" -#: builtin/push.c:553 builtin/send-pack.c:175 +#: builtin/push.c:565 builtin/send-pack.c:175 msgid "request atomic transaction on remote side" msgstr "" -#: builtin/push.c:554 builtin/send-pack.c:171 +#: builtin/push.c:566 builtin/send-pack.c:171 msgid "server-specific" msgstr "" -#: builtin/push.c:554 builtin/send-pack.c:172 +#: builtin/push.c:566 builtin/send-pack.c:172 msgid "option to transmit" msgstr "" -#: builtin/push.c:568 +#: builtin/push.c:583 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" -#: builtin/push.c:570 +#: builtin/push.c:585 msgid "--delete doesn't make sense without any refs" msgstr "" -#: builtin/push.c:589 +#: builtin/push.c:604 msgid "push options must not have new line characters" msgstr "" @@ -11160,47 +11243,51 @@ msgstr "" msgid "git rebase--helper [<options>]" msgstr "" -#: builtin/rebase--helper.c:22 +#: builtin/rebase--helper.c:24 msgid "keep empty commits" msgstr "" -#: builtin/rebase--helper.c:23 +#: builtin/rebase--helper.c:25 msgid "continue rebase" msgstr "" -#: builtin/rebase--helper.c:25 +#: builtin/rebase--helper.c:27 msgid "abort rebase" msgstr "" -#: builtin/rebase--helper.c:28 -msgid "make rebase script" -msgstr "" - #: builtin/rebase--helper.c:30 -msgid "shorten SHA-1s in the todo list" +msgid "make rebase script" msgstr "" #: builtin/rebase--helper.c:32 -msgid "expand SHA-1s in the todo list" +msgid "shorten commit ids in the todo list" msgstr "" #: builtin/rebase--helper.c:34 -msgid "check the todo list" +msgid "expand commit ids in the todo list" msgstr "" #: builtin/rebase--helper.c:36 -msgid "skip unnecessary picks" +msgid "check the todo list" msgstr "" #: builtin/rebase--helper.c:38 +msgid "skip unnecessary picks" +msgstr "" + +#: builtin/rebase--helper.c:40 msgid "rearrange fixup/squash lines" msgstr "" -#: builtin/receive-pack.c:29 +#: builtin/rebase--helper.c:42 +msgid "insert exec commands in todo list" +msgstr "" + +#: builtin/receive-pack.c:30 msgid "git receive-pack <git-dir>" msgstr "" -#: builtin/receive-pack.c:839 +#: builtin/receive-pack.c:840 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" @@ -11217,7 +11304,7 @@ msgid "" "'receive.denyCurrentBranch' configuration variable to 'refuse'." msgstr "" -#: builtin/receive-pack.c:859 +#: builtin/receive-pack.c:860 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" @@ -11229,20 +11316,15 @@ msgid "" "To squelch this message, you can set it to 'refuse'." msgstr "" -#: builtin/receive-pack.c:1932 +#: builtin/receive-pack.c:1933 msgid "quiet" msgstr "" -#: builtin/receive-pack.c:1946 +#: builtin/receive-pack.c:1947 msgid "You must specify a directory." msgstr "" -#: builtin/reflog.c:424 -#, c-format -msgid "'%s' for '%s' is not a valid timestamp" -msgstr "" - -#: builtin/reflog.c:541 builtin/reflog.c:546 +#: builtin/reflog.c:531 builtin/reflog.c:536 #, c-format msgid "'%s' is not a valid timestamp" msgstr "" @@ -11830,7 +11912,7 @@ msgstr "" msgid "--keep-unreachable and -A are incompatible" msgstr "" -#: builtin/repack.c:406 builtin/worktree.c:134 +#: builtin/repack.c:406 builtin/worktree.c:146 #, c-format msgid "failed to remove '%s'" msgstr "" @@ -12052,10 +12134,23 @@ msgstr "" msgid "Could not write new index file." msgstr "" -#: builtin/rev-list.c:361 +#: builtin/rev-list.c:399 +msgid "object filtering requires --objects" +msgstr "" + +#: builtin/rev-list.c:402 +#, c-format +msgid "invalid sparse value '%s'" +msgstr "" + +#: builtin/rev-list.c:442 msgid "rev-list does not support display of notes" msgstr "" +#: builtin/rev-list.c:445 +msgid "cannot combine --use-bitmap-index with object filtering" +msgstr "" + #: builtin/rev-parse.c:402 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "" @@ -12479,215 +12574,243 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "" -#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1094 +#: builtin/submodule--helper.c:34 builtin/submodule--helper.c:1332 #, c-format msgid "No such ref: %s" msgstr "" -#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1103 +#: builtin/submodule--helper.c:41 builtin/submodule--helper.c:1341 #, c-format msgid "Expecting a full ref name, got %s" msgstr "" -#: builtin/submodule--helper.c:71 +#: builtin/submodule--helper.c:81 #, c-format msgid "cannot strip one component off url '%s'" msgstr "" -#: builtin/submodule--helper.c:302 builtin/submodule--helper.c:623 +#: builtin/submodule--helper.c:370 builtin/submodule--helper.c:861 msgid "alternative anchor for relative paths" msgstr "" -#: builtin/submodule--helper.c:307 +#: builtin/submodule--helper.c:375 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "" -#: builtin/submodule--helper.c:350 builtin/submodule--helper.c:374 +#: builtin/submodule--helper.c:426 builtin/submodule--helper.c:449 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "" -#: builtin/submodule--helper.c:389 +#: builtin/submodule--helper.c:464 #, c-format msgid "" "could not lookup configuration '%s'. Assuming this repository is its own " "authoritative upstream." msgstr "" -#: builtin/submodule--helper.c:400 +#: builtin/submodule--helper.c:475 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:404 +#: builtin/submodule--helper.c:479 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "" -#: builtin/submodule--helper.c:414 +#: builtin/submodule--helper.c:489 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "" -#: builtin/submodule--helper.c:421 +#: builtin/submodule--helper.c:496 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:437 +#: builtin/submodule--helper.c:518 msgid "Suppress output for initializing a submodule" msgstr "" -#: builtin/submodule--helper.c:442 +#: builtin/submodule--helper.c:523 msgid "git submodule--helper init [<path>]" msgstr "" -#: builtin/submodule--helper.c:470 -msgid "git submodule--helper name <path>" +#: builtin/submodule--helper.c:591 builtin/submodule--helper.c:713 +#, c-format +msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "" -#: builtin/submodule--helper.c:475 +#: builtin/submodule--helper.c:626 #, c-format -msgid "no submodule mapping found in .gitmodules for path '%s'" +msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:558 builtin/submodule--helper.c:561 +#: builtin/submodule--helper.c:653 +#, c-format +msgid "failed to recurse into submodule '%s'" +msgstr "" + +#: builtin/submodule--helper.c:677 +msgid "Suppress submodule status output" +msgstr "" + +#: builtin/submodule--helper.c:678 +msgid "" +"Use commit stored in the index instead of the one stored in the submodule " +"HEAD" +msgstr "" + +#: builtin/submodule--helper.c:679 +msgid "recurse into nested submodules" +msgstr "" + +#: builtin/submodule--helper.c:684 +msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" +msgstr "" + +#: builtin/submodule--helper.c:708 +msgid "git submodule--helper name <path>" +msgstr "" + +#: builtin/submodule--helper.c:796 builtin/submodule--helper.c:799 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "" -#: builtin/submodule--helper.c:597 +#: builtin/submodule--helper.c:835 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "" -#: builtin/submodule--helper.c:604 +#: builtin/submodule--helper.c:842 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "" -#: builtin/submodule--helper.c:626 +#: builtin/submodule--helper.c:864 msgid "where the new submodule will be cloned to" msgstr "" -#: builtin/submodule--helper.c:629 +#: builtin/submodule--helper.c:867 msgid "name of the new submodule" msgstr "" -#: builtin/submodule--helper.c:632 +#: builtin/submodule--helper.c:870 msgid "url where to clone the submodule from" msgstr "" -#: builtin/submodule--helper.c:638 +#: builtin/submodule--helper.c:876 msgid "depth for shallow clones" msgstr "" -#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:1012 +#: builtin/submodule--helper.c:879 builtin/submodule--helper.c:1250 msgid "force cloning progress" msgstr "" -#: builtin/submodule--helper.c:646 +#: builtin/submodule--helper.c:884 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" msgstr "" -#: builtin/submodule--helper.c:677 +#: builtin/submodule--helper.c:915 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "" -#: builtin/submodule--helper.c:692 +#: builtin/submodule--helper.c:930 #, c-format msgid "could not get submodule directory for '%s'" msgstr "" -#: builtin/submodule--helper.c:757 +#: builtin/submodule--helper.c:995 #, c-format msgid "Submodule path '%s' not initialized" msgstr "" -#: builtin/submodule--helper.c:761 +#: builtin/submodule--helper.c:999 msgid "Maybe you want to use 'update --init'?" msgstr "" -#: builtin/submodule--helper.c:790 +#: builtin/submodule--helper.c:1028 #, c-format msgid "Skipping unmerged submodule %s" msgstr "" -#: builtin/submodule--helper.c:819 +#: builtin/submodule--helper.c:1057 #, c-format msgid "Skipping submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:952 +#: builtin/submodule--helper.c:1190 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "" -#: builtin/submodule--helper.c:963 +#: builtin/submodule--helper.c:1201 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "" -#: builtin/submodule--helper.c:993 builtin/submodule--helper.c:1213 +#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1451 msgid "path into the working tree" msgstr "" -#: builtin/submodule--helper.c:996 +#: builtin/submodule--helper.c:1234 msgid "path into the working tree, across nested submodule boundaries" msgstr "" -#: builtin/submodule--helper.c:1000 +#: builtin/submodule--helper.c:1238 msgid "rebase, merge, checkout or none" msgstr "" -#: builtin/submodule--helper.c:1004 +#: builtin/submodule--helper.c:1242 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "" -#: builtin/submodule--helper.c:1007 +#: builtin/submodule--helper.c:1245 msgid "parallel jobs" msgstr "" -#: builtin/submodule--helper.c:1009 +#: builtin/submodule--helper.c:1247 msgid "whether the initial clone should follow the shallow recommendation" msgstr "" -#: builtin/submodule--helper.c:1010 +#: builtin/submodule--helper.c:1248 msgid "don't print cloning progress" msgstr "" -#: builtin/submodule--helper.c:1017 +#: builtin/submodule--helper.c:1255 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "" -#: builtin/submodule--helper.c:1030 +#: builtin/submodule--helper.c:1268 msgid "bad value for update parameter" msgstr "" -#: builtin/submodule--helper.c:1098 +#: builtin/submodule--helper.c:1336 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " "the superproject is not on any branch" msgstr "" -#: builtin/submodule--helper.c:1214 +#: builtin/submodule--helper.c:1452 msgid "recurse into submodules" msgstr "" -#: builtin/submodule--helper.c:1220 +#: builtin/submodule--helper.c:1458 msgid "git submodule--helper embed-git-dir [<path>...]" msgstr "" -#: builtin/submodule--helper.c:1278 +#: builtin/submodule--helper.c:1517 #, c-format msgid "%s doesn't support --super-prefix" msgstr "" -#: builtin/submodule--helper.c:1284 +#: builtin/submodule--helper.c:1523 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "" @@ -12914,217 +13037,250 @@ msgstr "" msgid "Unpacking objects" msgstr "" -#: builtin/update-index.c:80 +#: builtin/update-index.c:82 #, c-format msgid "failed to create directory %s" msgstr "" -#: builtin/update-index.c:86 +#: builtin/update-index.c:88 #, c-format msgid "failed to stat %s" msgstr "" -#: builtin/update-index.c:96 +#: builtin/update-index.c:98 #, c-format msgid "failed to create file %s" msgstr "" -#: builtin/update-index.c:104 +#: builtin/update-index.c:106 #, c-format msgid "failed to delete file %s" msgstr "" -#: builtin/update-index.c:111 builtin/update-index.c:217 +#: builtin/update-index.c:113 builtin/update-index.c:219 #, c-format msgid "failed to delete directory %s" msgstr "" -#: builtin/update-index.c:136 +#: builtin/update-index.c:138 #, c-format msgid "Testing mtime in '%s' " msgstr "" -#: builtin/update-index.c:150 +#: builtin/update-index.c:152 msgid "directory stat info does not change after adding a new file" msgstr "" -#: builtin/update-index.c:163 +#: builtin/update-index.c:165 msgid "directory stat info does not change after adding a new directory" msgstr "" -#: builtin/update-index.c:176 +#: builtin/update-index.c:178 msgid "directory stat info changes after updating a file" msgstr "" -#: builtin/update-index.c:187 +#: builtin/update-index.c:189 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "" -#: builtin/update-index.c:198 +#: builtin/update-index.c:200 msgid "directory stat info does not change after deleting a file" msgstr "" -#: builtin/update-index.c:211 +#: builtin/update-index.c:213 msgid "directory stat info does not change after deleting a directory" msgstr "" -#: builtin/update-index.c:218 +#: builtin/update-index.c:220 msgid " OK" msgstr "" -#: builtin/update-index.c:571 +#: builtin/update-index.c:579 msgid "git update-index [<options>] [--] [<file>...]" msgstr "" -#: builtin/update-index.c:926 +#: builtin/update-index.c:936 msgid "continue refresh even when index needs update" msgstr "" -#: builtin/update-index.c:929 +#: builtin/update-index.c:939 msgid "refresh: ignore submodules" msgstr "" -#: builtin/update-index.c:932 +#: builtin/update-index.c:942 msgid "do not ignore new files" msgstr "" -#: builtin/update-index.c:934 +#: builtin/update-index.c:944 msgid "let files replace directories and vice-versa" msgstr "" -#: builtin/update-index.c:936 +#: builtin/update-index.c:946 msgid "notice files missing from worktree" msgstr "" -#: builtin/update-index.c:938 +#: builtin/update-index.c:948 msgid "refresh even if index contains unmerged entries" msgstr "" -#: builtin/update-index.c:941 +#: builtin/update-index.c:951 msgid "refresh stat information" msgstr "" -#: builtin/update-index.c:945 +#: builtin/update-index.c:955 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "" -#: builtin/update-index.c:949 +#: builtin/update-index.c:959 msgid "<mode>,<object>,<path>" msgstr "" -#: builtin/update-index.c:950 +#: builtin/update-index.c:960 msgid "add the specified entry to the index" msgstr "" -#: builtin/update-index.c:959 +#: builtin/update-index.c:969 msgid "mark files as \"not changing\"" msgstr "" -#: builtin/update-index.c:962 +#: builtin/update-index.c:972 msgid "clear assumed-unchanged bit" msgstr "" -#: builtin/update-index.c:965 +#: builtin/update-index.c:975 msgid "mark files as \"index-only\"" msgstr "" -#: builtin/update-index.c:968 +#: builtin/update-index.c:978 msgid "clear skip-worktree bit" msgstr "" -#: builtin/update-index.c:971 +#: builtin/update-index.c:981 msgid "add to index only; do not add content to object database" msgstr "" -#: builtin/update-index.c:973 +#: builtin/update-index.c:983 msgid "remove named paths even if present in worktree" msgstr "" -#: builtin/update-index.c:975 +#: builtin/update-index.c:985 msgid "with --stdin: input lines are terminated by null bytes" msgstr "" -#: builtin/update-index.c:977 +#: builtin/update-index.c:987 msgid "read list of paths to be updated from standard input" msgstr "" -#: builtin/update-index.c:981 +#: builtin/update-index.c:991 msgid "add entries from standard input to the index" msgstr "" -#: builtin/update-index.c:985 +#: builtin/update-index.c:995 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" -#: builtin/update-index.c:989 +#: builtin/update-index.c:999 msgid "only update entries that differ from HEAD" msgstr "" -#: builtin/update-index.c:993 +#: builtin/update-index.c:1003 msgid "ignore files missing from worktree" msgstr "" -#: builtin/update-index.c:996 +#: builtin/update-index.c:1006 msgid "report actions to standard output" msgstr "" -#: builtin/update-index.c:998 +#: builtin/update-index.c:1008 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" -#: builtin/update-index.c:1002 +#: builtin/update-index.c:1012 msgid "write index in this format" msgstr "" -#: builtin/update-index.c:1004 +#: builtin/update-index.c:1014 msgid "enable or disable split index" msgstr "" -#: builtin/update-index.c:1006 +#: builtin/update-index.c:1016 msgid "enable/disable untracked cache" msgstr "" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1018 msgid "test if the filesystem supports untracked cache" msgstr "" -#: builtin/update-index.c:1010 +#: builtin/update-index.c:1020 msgid "enable untracked cache without testing the filesystem" msgstr "" -#: builtin/update-index.c:1107 +#: builtin/update-index.c:1022 +msgid "write out the index even if is not flagged as changed" +msgstr "" + +#: builtin/update-index.c:1024 +msgid "enable or disable file system monitor" +msgstr "" + +#: builtin/update-index.c:1026 +msgid "mark files as fsmonitor valid" +msgstr "" + +#: builtin/update-index.c:1029 +msgid "clear fsmonitor valid bit" +msgstr "" + +#: builtin/update-index.c:1127 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" msgstr "" -#: builtin/update-index.c:1116 +#: builtin/update-index.c:1136 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" msgstr "" -#: builtin/update-index.c:1127 +#: builtin/update-index.c:1147 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:1131 +#: builtin/update-index.c:1151 msgid "Untracked cache disabled" msgstr "" -#: builtin/update-index.c:1139 +#: builtin/update-index.c:1159 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:1143 +#: builtin/update-index.c:1163 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "" +#: builtin/update-index.c:1171 +msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" +msgstr "" + +#: builtin/update-index.c:1175 +msgid "fsmonitor enabled" +msgstr "" + +#: builtin/update-index.c:1178 +msgid "" +"core.fsmonitor is set; remove it if you really want to disable fsmonitor" +msgstr "" + +#: builtin/update-index.c:1182 +msgid "fsmonitor disabled" +msgstr "" + #: builtin/update-ref.c:10 msgid "git update-ref [<options>] -d <refname> [<old-val>]" msgstr "" @@ -13193,129 +13349,141 @@ msgstr "" msgid "print tag contents" msgstr "" -#: builtin/worktree.c:16 +#: builtin/worktree.c:17 msgid "git worktree add [<options>] <path> [<branch>]" msgstr "" -#: builtin/worktree.c:17 +#: builtin/worktree.c:18 msgid "git worktree list [<options>]" msgstr "" -#: builtin/worktree.c:18 +#: builtin/worktree.c:19 msgid "git worktree lock [<options>] <path>" msgstr "" -#: builtin/worktree.c:19 +#: builtin/worktree.c:20 msgid "git worktree prune [<options>]" msgstr "" -#: builtin/worktree.c:20 +#: builtin/worktree.c:21 msgid "git worktree unlock <path>" msgstr "" -#: builtin/worktree.c:46 +#: builtin/worktree.c:58 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "" -#: builtin/worktree.c:52 +#: builtin/worktree.c:64 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "" -#: builtin/worktree.c:57 builtin/worktree.c:66 +#: builtin/worktree.c:69 builtin/worktree.c:78 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "" -#: builtin/worktree.c:76 +#: builtin/worktree.c:88 #, c-format msgid "" "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " "%<PRIuMAX>)" msgstr "" -#: builtin/worktree.c:84 +#: builtin/worktree.c:96 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "" -#: builtin/worktree.c:100 +#: builtin/worktree.c:112 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "" -#: builtin/worktree.c:147 +#: builtin/worktree.c:159 msgid "report pruned working trees" msgstr "" -#: builtin/worktree.c:149 +#: builtin/worktree.c:161 msgid "expire working trees older than <time>" msgstr "" -#: builtin/worktree.c:223 +#: builtin/worktree.c:236 #, c-format msgid "'%s' already exists" msgstr "" -#: builtin/worktree.c:254 +#: builtin/worktree.c:267 #, c-format msgid "could not create directory of '%s'" msgstr "" -#: builtin/worktree.c:293 +#: builtin/worktree.c:306 #, c-format msgid "Preparing %s (identifier %s)" msgstr "" -#: builtin/worktree.c:345 +#: builtin/worktree.c:368 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" -#: builtin/worktree.c:347 +#: builtin/worktree.c:370 msgid "create a new branch" msgstr "" -#: builtin/worktree.c:349 +#: builtin/worktree.c:372 msgid "create or reset a branch" msgstr "" -#: builtin/worktree.c:351 +#: builtin/worktree.c:374 msgid "populate the new working tree" msgstr "" -#: builtin/worktree.c:352 +#: builtin/worktree.c:375 msgid "keep the new working tree locked" msgstr "" -#: builtin/worktree.c:360 +#: builtin/worktree.c:377 +msgid "set up tracking mode (see git-branch(1))" +msgstr "" + +#: builtin/worktree.c:380 +msgid "try to match the new branch name with a remote-tracking branch" +msgstr "" + +#: builtin/worktree.c:388 msgid "-b, -B, and --detach are mutually exclusive" msgstr "" -#: builtin/worktree.c:499 +#: builtin/worktree.c:453 +msgid "--[no-]track can only be used if a new branch is created" +msgstr "" + +#: builtin/worktree.c:553 msgid "reason for locking" msgstr "" -#: builtin/worktree.c:511 builtin/worktree.c:544 +#: builtin/worktree.c:565 builtin/worktree.c:598 #, c-format msgid "'%s' is not a working tree" msgstr "" -#: builtin/worktree.c:513 builtin/worktree.c:546 +#: builtin/worktree.c:567 builtin/worktree.c:600 msgid "The main working tree cannot be locked or unlocked" msgstr "" -#: builtin/worktree.c:518 +#: builtin/worktree.c:572 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "" -#: builtin/worktree.c:520 +#: builtin/worktree.c:574 #, c-format msgid "'%s' is already locked" msgstr "" -#: builtin/worktree.c:548 +#: builtin/worktree.c:602 #, c-format msgid "'%s' is not locked" msgstr "" @@ -13336,23 +13504,23 @@ msgstr "" msgid "only useful for debugging" msgstr "" -#: upload-pack.c:23 +#: upload-pack.c:24 msgid "git upload-pack [<options>] <dir>" msgstr "" -#: upload-pack.c:1040 +#: upload-pack.c:1041 msgid "quit after a single request/response exchange" msgstr "" -#: upload-pack.c:1042 +#: upload-pack.c:1043 msgid "exit immediately after initial ref advertisement" msgstr "" -#: upload-pack.c:1044 +#: upload-pack.c:1045 msgid "do not try <directory>/.git/ if <directory> is no Git directory" msgstr "" -#: upload-pack.c:1046 +#: upload-pack.c:1047 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "" @@ -13376,20 +13544,20 @@ msgid "" "to read about a specific subcommand or concept." msgstr "" -#: http.c:338 +#: http.c:339 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "" -#: http.c:359 +#: http.c:360 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "" -#: http.c:368 +#: http.c:369 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "" -#: http.c:1768 +#: http.c:1791 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -13402,6 +13570,14 @@ msgstr "" msgid "redirecting to %s" msgstr "" +#: list-objects-filter-options.h:54 +msgid "args" +msgstr "" + +#: list-objects-filter-options.h:55 +msgid "object filtering" +msgstr "" + #: common-cmds.h:9 msgid "start a working area (see also: git help tutorial)" msgstr "" @@ -13574,27 +13750,27 @@ msgstr "" msgid "Bad bisect_write argument: $state" msgstr "" -#: git-bisect.sh:262 +#: git-bisect.sh:246 #, sh-format msgid "Bad rev input: $arg" msgstr "" -#: git-bisect.sh:281 +#: git-bisect.sh:265 #, sh-format msgid "Bad rev input: $bisected_head" msgstr "" -#: git-bisect.sh:290 +#: git-bisect.sh:274 #, sh-format msgid "Bad rev input: $rev" msgstr "" -#: git-bisect.sh:299 +#: git-bisect.sh:283 #, sh-format msgid "'git bisect $TERM_BAD' can take only one argument." msgstr "" -#: git-bisect.sh:322 +#: git-bisect.sh:306 #, sh-format msgid "Warning: bisecting only with a $TERM_BAD commit." msgstr "" @@ -13602,18 +13778,18 @@ msgstr "" #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. -#: git-bisect.sh:328 +#: git-bisect.sh:312 msgid "Are you sure [Y/n]? " msgstr "" -#: git-bisect.sh:340 +#: git-bisect.sh:324 #, sh-format msgid "" "You need to give me at least one $bad_syn and one $good_syn revision.\n" "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" msgstr "" -#: git-bisect.sh:343 +#: git-bisect.sh:327 #, sh-format msgid "" "You need to start by \"git bisect start\".\n" @@ -13621,91 +13797,76 @@ msgid "" "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" msgstr "" -#: git-bisect.sh:414 git-bisect.sh:546 +#: git-bisect.sh:398 git-bisect.sh:512 msgid "We are not bisecting." msgstr "" -#: git-bisect.sh:421 +#: git-bisect.sh:405 #, sh-format msgid "'$invalid' is not a valid commit" msgstr "" -#: git-bisect.sh:430 +#: git-bisect.sh:414 #, sh-format msgid "" "Could not check out original HEAD '$branch'.\n" "Try 'git bisect reset <commit>'." msgstr "" -#: git-bisect.sh:458 +#: git-bisect.sh:422 msgid "No logfile given" msgstr "" -#: git-bisect.sh:459 +#: git-bisect.sh:423 #, sh-format msgid "cannot read $file for replaying" msgstr "" -#: git-bisect.sh:480 +#: git-bisect.sh:444 msgid "?? what are you talking about?" msgstr "" -#: git-bisect.sh:492 +#: git-bisect.sh:453 +msgid "bisect run failed: no command provided." +msgstr "" + +#: git-bisect.sh:458 #, sh-format msgid "running $command" msgstr "" -#: git-bisect.sh:499 +#: git-bisect.sh:465 #, sh-format msgid "" "bisect run failed:\n" "exit code $res from '$command' is < 0 or >= 128" msgstr "" -#: git-bisect.sh:525 +#: git-bisect.sh:491 msgid "bisect run cannot continue any more" msgstr "" -#: git-bisect.sh:531 +#: git-bisect.sh:497 #, sh-format msgid "" "bisect run failed:\n" "'bisect_state $state' exited with error code $res" msgstr "" -#: git-bisect.sh:538 +#: git-bisect.sh:504 msgid "bisect run success" msgstr "" -#: git-bisect.sh:565 -msgid "please use two different terms" -msgstr "" - -#: git-bisect.sh:575 -#, sh-format -msgid "'$term' is not a valid term" -msgstr "" - -#: git-bisect.sh:578 -#, sh-format -msgid "can't use the builtin command '$term' as a term" -msgstr "" - -#: git-bisect.sh:587 git-bisect.sh:593 -#, sh-format -msgid "can't change the meaning of term '$term'" -msgstr "" - -#: git-bisect.sh:606 +#: git-bisect.sh:533 #, sh-format msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect." msgstr "" -#: git-bisect.sh:636 +#: git-bisect.sh:567 msgid "no terms defined" msgstr "" -#: git-bisect.sh:653 +#: git-bisect.sh:584 #, sh-format msgid "" "invalid argument $arg for 'git bisect terms'.\n" @@ -13778,7 +13939,7 @@ msgid "The pre-rebase hook refused to rebase." msgstr "" #: git-rebase.sh:219 -msgid "It looks like git-am is in progress. Cannot rebase." +msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "" #: git-rebase.sh:363 @@ -13814,7 +13975,7 @@ msgstr "" #: git-rebase.sh:480 #, sh-format -msgid "invalid upstream $upstream_name" +msgid "invalid upstream '$upstream_name'" msgstr "" #: git-rebase.sh:504 @@ -13832,44 +13993,54 @@ msgstr "" msgid "Does not point to a valid commit: $onto_name" msgstr "" -#: git-rebase.sh:539 +#: git-rebase.sh:542 #, sh-format -msgid "fatal: no such branch: $branch_name" +msgid "fatal: no such branch/commit '$branch_name'" msgstr "" -#: git-rebase.sh:572 +#: git-rebase.sh:575 msgid "Cannot autostash" msgstr "" -#: git-rebase.sh:577 +#: git-rebase.sh:580 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "" -#: git-rebase.sh:581 +#: git-rebase.sh:584 msgid "Please commit or stash them." msgstr "" -#: git-rebase.sh:601 +#: git-rebase.sh:607 +#, sh-format +msgid "HEAD is up to date." +msgstr "" + +#: git-rebase.sh:609 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "" -#: git-rebase.sh:605 +#: git-rebase.sh:617 +#, sh-format +msgid "HEAD is up to date, rebase forced." +msgstr "" + +#: git-rebase.sh:619 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "" -#: git-rebase.sh:616 +#: git-rebase.sh:631 #, sh-format msgid "Changes from $mb to $onto:" msgstr "" -#: git-rebase.sh:625 +#: git-rebase.sh:640 msgid "First, rewinding head to replay your work on top of it..." msgstr "" -#: git-rebase.sh:635 +#: git-rebase.sh:650 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "" @@ -13878,157 +14049,145 @@ msgstr "" msgid "git stash clear with parameters is unimplemented" msgstr "" -#: git-stash.sh:102 +#: git-stash.sh:108 msgid "You do not have the initial commit yet" msgstr "" -#: git-stash.sh:117 +#: git-stash.sh:123 msgid "Cannot save the current index state" msgstr "" -#: git-stash.sh:132 +#: git-stash.sh:138 msgid "Cannot save the untracked files" msgstr "" -#: git-stash.sh:152 git-stash.sh:165 +#: git-stash.sh:158 git-stash.sh:171 msgid "Cannot save the current worktree state" msgstr "" -#: git-stash.sh:169 +#: git-stash.sh:175 msgid "No changes selected" msgstr "" -#: git-stash.sh:172 +#: git-stash.sh:178 msgid "Cannot remove temporary index (can't happen)" msgstr "" -#: git-stash.sh:185 +#: git-stash.sh:191 msgid "Cannot record working tree state" msgstr "" -#: git-stash.sh:217 +#: git-stash.sh:229 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "" -#. TRANSLATORS: $option is an invalid option, like -#. `--blah-blah'. The 7 spaces at the beginning of the -#. second line correspond to "error: ". So you should line -#. up the second line with however many characters the -#. translation of "error: " takes in your language. E.g. in -#. English this is: -#. -#. $ git stash save --blah-blah 2>&1 | head -n 2 -#. error: unknown option for 'stash save': --blah-blah -#. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:273 +#: git-stash.sh:281 #, sh-format -msgid "" -"error: unknown option for 'stash save': $option\n" -" To provide a message, use git stash save -- '$option'" +msgid "error: unknown option for 'stash push': $option" msgstr "" -#: git-stash.sh:288 +#: git-stash.sh:295 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "" -#: git-stash.sh:296 +#: git-stash.sh:303 msgid "No local changes to save" msgstr "" -#: git-stash.sh:301 +#: git-stash.sh:308 msgid "Cannot initialize stash" msgstr "" -#: git-stash.sh:305 +#: git-stash.sh:312 msgid "Cannot save the current status" msgstr "" -#: git-stash.sh:306 +#: git-stash.sh:313 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "" -#: git-stash.sh:334 +#: git-stash.sh:341 msgid "Cannot remove worktree changes" msgstr "" -#: git-stash.sh:482 +#: git-stash.sh:489 #, sh-format msgid "unknown option: $opt" msgstr "" -#: git-stash.sh:495 +#: git-stash.sh:502 msgid "No stash entries found." msgstr "" -#: git-stash.sh:502 +#: git-stash.sh:509 #, sh-format msgid "Too many revisions specified: $REV" msgstr "" -#: git-stash.sh:517 +#: git-stash.sh:524 #, sh-format msgid "$reference is not a valid reference" msgstr "" -#: git-stash.sh:545 +#: git-stash.sh:552 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "" -#: git-stash.sh:556 +#: git-stash.sh:563 #, sh-format msgid "'$args' is not a stash reference" msgstr "" -#: git-stash.sh:564 +#: git-stash.sh:571 msgid "unable to refresh index" msgstr "" -#: git-stash.sh:568 +#: git-stash.sh:575 msgid "Cannot apply a stash in the middle of a merge" msgstr "" -#: git-stash.sh:576 +#: git-stash.sh:583 msgid "Conflicts in index. Try without --index." msgstr "" -#: git-stash.sh:578 +#: git-stash.sh:585 msgid "Could not save index tree" msgstr "" -#: git-stash.sh:587 +#: git-stash.sh:594 msgid "Could not restore untracked files from stash entry" msgstr "" -#: git-stash.sh:612 +#: git-stash.sh:619 msgid "Cannot unstage modified files" msgstr "" -#: git-stash.sh:627 +#: git-stash.sh:634 msgid "Index was not unstashed." msgstr "" -#: git-stash.sh:641 +#: git-stash.sh:648 msgid "The stash entry is kept in case you need it again." msgstr "" -#: git-stash.sh:650 +#: git-stash.sh:657 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "" -#: git-stash.sh:651 +#: git-stash.sh:658 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "" -#: git-stash.sh:659 +#: git-stash.sh:666 msgid "No branch name specified" msgstr "" -#: git-stash.sh:738 +#: git-stash.sh:745 msgid "(To restore them type \"git stash apply\")" msgstr "" @@ -14233,36 +14392,31 @@ msgstr "" msgid "Failed to recurse into submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:840 +#: git-submodule.sh:828 msgid "The --cached option cannot be used with the --files option" msgstr "" -#: git-submodule.sh:892 +#: git-submodule.sh:880 #, sh-format msgid "unexpected mode $mod_dst" msgstr "" -#: git-submodule.sh:912 +#: git-submodule.sh:900 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr "" -#: git-submodule.sh:915 +#: git-submodule.sh:903 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr "" -#: git-submodule.sh:918 +#: git-submodule.sh:906 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" -#: git-submodule.sh:1064 -#, sh-format -msgid "Failed to recurse into submodule path '$sm_path'" -msgstr "" - -#: git-submodule.sh:1136 +#: git-submodule.sh:1077 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "" @@ -14458,15 +14612,15 @@ msgstr "" msgid "Successfully rebased and updated $head_name." msgstr "" -#: git-rebase--interactive.sh:749 +#: git-rebase--interactive.sh:728 msgid "could not detach HEAD" msgstr "" -#: git-rebase--interactive.sh:784 +#: git-rebase--interactive.sh:763 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "" -#: git-rebase--interactive.sh:789 +#: git-rebase--interactive.sh:768 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -14484,21 +14638,21 @@ msgid "" " git rebase --continue\n" msgstr "" -#: git-rebase--interactive.sh:806 +#: git-rebase--interactive.sh:785 msgid "Error trying to find the author identity to amend commit" msgstr "" -#: git-rebase--interactive.sh:811 +#: git-rebase--interactive.sh:790 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." msgstr "" -#: git-rebase--interactive.sh:816 git-rebase--interactive.sh:820 +#: git-rebase--interactive.sh:795 git-rebase--interactive.sh:799 msgid "Could not commit staged changes." msgstr "" -#: git-rebase--interactive.sh:848 +#: git-rebase--interactive.sh:827 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -14507,47 +14661,47 @@ msgid "" "\n" msgstr "" -#: git-rebase--interactive.sh:856 git-rebase--interactive.sh:1015 +#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:994 msgid "Could not execute editor" msgstr "" -#: git-rebase--interactive.sh:869 +#: git-rebase--interactive.sh:848 #, sh-format msgid "Could not checkout $switch_to" msgstr "" -#: git-rebase--interactive.sh:874 +#: git-rebase--interactive.sh:853 msgid "No HEAD?" msgstr "" -#: git-rebase--interactive.sh:875 +#: git-rebase--interactive.sh:854 #, sh-format msgid "Could not create temporary $state_dir" msgstr "" -#: git-rebase--interactive.sh:877 +#: git-rebase--interactive.sh:856 msgid "Could not mark as interactive" msgstr "" -#: git-rebase--interactive.sh:887 git-rebase--interactive.sh:892 +#: git-rebase--interactive.sh:866 git-rebase--interactive.sh:871 msgid "Could not init rewritten commits" msgstr "" -#: git-rebase--interactive.sh:993 +#: git-rebase--interactive.sh:972 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "" msgstr[1] "" -#: git-rebase--interactive.sh:998 +#: git-rebase--interactive.sh:977 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" "\n" msgstr "" -#: git-rebase--interactive.sh:1005 +#: git-rebase--interactive.sh:984 msgid "Note that empty commits are commented out" msgstr "" @@ -15211,7 +15365,7 @@ msgstr "" msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "" -#: git-send-email.perl:927 git-send-email.perl:935 +#: git-send-email.perl:929 git-send-email.perl:937 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "" @@ -15219,16 +15373,16 @@ msgstr "" #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:939 +#: git-send-email.perl:941 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "" -#: git-send-email.perl:1260 +#: git-send-email.perl:1262 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "" -#: git-send-email.perl:1335 +#: git-send-email.perl:1337 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -15245,128 +15399,128 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1350 +#: git-send-email.perl:1352 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): " msgstr "" -#: git-send-email.perl:1353 +#: git-send-email.perl:1355 msgid "Send this email reply required" msgstr "" -#: git-send-email.perl:1379 +#: git-send-email.perl:1381 msgid "The required SMTP server is not properly defined." msgstr "" -#: git-send-email.perl:1426 +#: git-send-email.perl:1428 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "" -#: git-send-email.perl:1431 git-send-email.perl:1435 +#: git-send-email.perl:1433 git-send-email.perl:1437 #, perl-format msgid "STARTTLS failed! %s" msgstr "" -#: git-send-email.perl:1445 +#: git-send-email.perl:1447 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" -#: git-send-email.perl:1463 +#: git-send-email.perl:1465 #, perl-format msgid "Failed to send %s\n" msgstr "" -#: git-send-email.perl:1466 +#: git-send-email.perl:1468 #, perl-format msgid "Dry-Sent %s\n" msgstr "" -#: git-send-email.perl:1466 +#: git-send-email.perl:1468 #, perl-format msgid "Sent %s\n" msgstr "" -#: git-send-email.perl:1468 +#: git-send-email.perl:1470 msgid "Dry-OK. Log says:\n" msgstr "" -#: git-send-email.perl:1468 +#: git-send-email.perl:1470 msgid "OK. Log says:\n" msgstr "" -#: git-send-email.perl:1480 +#: git-send-email.perl:1482 msgid "Result: " msgstr "" -#: git-send-email.perl:1483 +#: git-send-email.perl:1485 msgid "Result: OK\n" msgstr "" -#: git-send-email.perl:1496 +#: git-send-email.perl:1498 #, perl-format msgid "can't open file %s" msgstr "" -#: git-send-email.perl:1543 git-send-email.perl:1563 +#: git-send-email.perl:1545 git-send-email.perl:1565 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1549 +#: git-send-email.perl:1551 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1597 +#: git-send-email.perl:1599 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1622 +#: git-send-email.perl:1624 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1728 +#: git-send-email.perl:1730 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "" -#: git-send-email.perl:1735 +#: git-send-email.perl:1737 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "" -#: git-send-email.perl:1739 +#: git-send-email.perl:1741 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "" -#: git-send-email.perl:1766 +#: git-send-email.perl:1768 msgid "cannot send message as 7bit" msgstr "" -#: git-send-email.perl:1774 +#: git-send-email.perl:1776 msgid "invalid transfer encoding" msgstr "" -#: git-send-email.perl:1812 git-send-email.perl:1863 git-send-email.perl:1873 +#: git-send-email.perl:1814 git-send-email.perl:1865 git-send-email.perl:1875 #, perl-format msgid "unable to open %s: %s\n" msgstr "" -#: git-send-email.perl:1815 +#: git-send-email.perl:1817 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "" -#: git-send-email.perl:1831 +#: git-send-email.perl:1833 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1835 +#: git-send-email.perl:1837 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "" @@ -1,14 +1,14 @@ # Swedish translations for Git. -# Copyright (C) 2010-2017 Peter krefting <peter@softwolves.pp.se> +# Copyright (C) 2010-2018 Peter Krefting <peter@softwolves.pp.se> # This file is distributed under the same license as the Git package. -# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017. +# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018. # msgid "" msgstr "" -"Project-Id-Version: git 2.15.0\n" +"Project-Id-Version: git 2.16.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2017-10-17 09:44+0800\n" -"PO-Revision-Date: 2017-10-18 19:34+0100\n" +"POT-Creation-Date: 2017-12-31 10:45+0800\n" +"PO-Revision-Date: 2018-01-01 09:36+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -18,47 +18,47 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Gtranslator 2.91.7\n" -#: advice.c:58 +#: advice.c:62 #, c-format msgid "hint: %.*s\n" msgstr "tips: %.*s\n" -#: advice.c:86 +#: advice.c:90 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" "Du kan inte utföra en cherry-pick eftersom du har filer som inte slagits " "samman." -#: advice.c:88 +#: advice.c:92 msgid "Committing is not possible because you have unmerged files." msgstr "" "Du kan inte utföra en incheckning eftersom du har filer som inte slagits " "samman." -#: advice.c:90 +#: advice.c:94 msgid "Merging is not possible because you have unmerged files." msgstr "" "Du kan inte utföra en sammanslagning eftersom du har filer som inte slagits " "samman." -#: advice.c:92 +#: advice.c:96 msgid "Pulling is not possible because you have unmerged files." msgstr "" "Du kan inte utföra en \"pull\" eftersom du har filer som inte slagits samman." -#: advice.c:94 +#: advice.c:98 msgid "Reverting is not possible because you have unmerged files." msgstr "" "Du kan inte utföra en \"revert\" eftersom du har filer som inte slagits " "samman." -#: advice.c:96 +#: advice.c:100 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "" "Du kan inte utföra en \"%s\" eftersom du har filer som inte slagits samman." -#: advice.c:104 +#: advice.c:108 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." @@ -66,23 +66,23 @@ msgstr "" "Rätta dem i din arbetskatalog och använd sedan \"git add/rm <fil>\"\n" "som lämpligt för att ange lösning och checka in." -#: advice.c:112 +#: advice.c:116 msgid "Exiting because of an unresolved conflict." msgstr "Avslutar på grund av olöst konflikgt." -#: advice.c:117 builtin/merge.c:1211 +#: advice.c:121 builtin/merge.c:1213 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." -#: advice.c:119 +#: advice.c:123 msgid "Please, commit your changes before merging." msgstr "Checka in dina ändringar innan du utför sammanslagningen." -#: advice.c:120 +#: advice.c:124 msgid "Exiting because of unfinished merge." msgstr "Avslutar på grund av ofullbordad sammanslagning." -#: advice.c:126 +#: advice.c:130 #, c-format msgid "" "Note: checking out '%s'.\n" @@ -121,82 +121,82 @@ msgstr "okänt alternativ för whitespace: \"%s\"" msgid "unrecognized whitespace ignore option '%s'" msgstr "okänt alternativ för ignore-whitespace: \"%s\"" -#: apply.c:125 +#: apply.c:122 msgid "--reject and --3way cannot be used together." msgstr "--reject och --3way kan inte användas samtidigt." -#: apply.c:127 +#: apply.c:124 msgid "--cached and --3way cannot be used together." msgstr "--cached och --3way kan inte användas samtidigt." -#: apply.c:130 +#: apply.c:127 msgid "--3way outside a repository" msgstr "--3way utanför arkiv" -#: apply.c:141 +#: apply.c:138 msgid "--index outside a repository" msgstr "--index utanför arkiv" -#: apply.c:144 +#: apply.c:141 msgid "--cached outside a repository" msgstr "--cached utanför arkiv" -#: apply.c:845 +#: apply.c:821 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s" -#: apply.c:854 +#: apply.c:830 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec returnerade %d för indata: %s" -#: apply.c:928 +#: apply.c:904 #, c-format msgid "unable to find filename in patch at line %d" msgstr "kan inte hitta filnamn i patchen på rad %d" -#: apply.c:966 +#: apply.c:942 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git apply: dålig git-diff - förväntade /dev/null, fick %s på rad %d" -#: apply.c:972 +#: apply.c:948 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply: dålig git-diff - motsägande nytt filnamn på rad %d" -#: apply.c:973 +#: apply.c:949 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply: dålig git-diff - motsägande gammalt filnamn på rad %d" -#: apply.c:978 +#: apply.c:954 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: dålig git-diff - förväntade /dev/null på rad %d" -#: apply.c:1007 +#: apply.c:983 #, c-format msgid "invalid mode on line %d: %s" msgstr "ogiltigt läge på rad %d: %s" -#: apply.c:1325 +#: apply.c:1301 #, c-format msgid "inconsistent header lines %d and %d" msgstr "huvudet är inkonsekvent mellan rad %d och %d" -#: apply.c:1497 +#: apply.c:1473 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: förväntade rad: %.*s" -#: apply.c:1566 +#: apply.c:1542 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "patch-fragment utan huvud på rad %d: %.*s" -#: apply.c:1586 +#: apply.c:1562 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -212,82 +212,82 @@ msgstr[1] "" "sökvägskomponenter\n" "tas bort (rad %d)" -#: apply.c:1599 +#: apply.c:1575 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "git-diff-huvudet saknar filnamnsinformation (rad %d)" -#: apply.c:1787 +#: apply.c:1763 msgid "new file depends on old contents" msgstr "ny fil beror på gammalt innehåll" -#: apply.c:1789 +#: apply.c:1765 msgid "deleted file still has contents" msgstr "borttagen fil har fortfarande innehåll" -#: apply.c:1823 +#: apply.c:1799 #, c-format msgid "corrupt patch at line %d" msgstr "trasig patch på rad %d" -#: apply.c:1860 +#: apply.c:1836 #, c-format msgid "new file %s depends on old contents" msgstr "nya filen %s beror på gammalt innehåll" -#: apply.c:1862 +#: apply.c:1838 #, c-format msgid "deleted file %s still has contents" msgstr "borttagna filen %s har fortfarande innehåll" -#: apply.c:1865 +#: apply.c:1841 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** varning: filen %s blir tom men har inte tagits bort" -#: apply.c:2012 +#: apply.c:1988 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "trasig binärpatch på rad %d: %.*s" -#: apply.c:2049 +#: apply.c:2025 #, c-format msgid "unrecognized binary patch at line %d" msgstr "binärpatchen på rad %d känns inte igen" -#: apply.c:2209 +#: apply.c:2185 #, c-format msgid "patch with only garbage at line %d" msgstr "patch med bara skräp på rad %d" -#: apply.c:2295 +#: apply.c:2271 #, c-format msgid "unable to read symlink %s" msgstr "kunde inte läsa symboliska länken %s" -#: apply.c:2299 +#: apply.c:2275 #, c-format msgid "unable to open or read %s" msgstr "kunde inte öppna eller läsa %s" -#: apply.c:2958 +#: apply.c:2934 #, c-format msgid "invalid start of line: '%c'" msgstr "felaktig inledning på rad: \"%c\"" -#: apply.c:3077 +#: apply.c:3055 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "Stycke %d lyckades på %d (offset %d rad)." msgstr[1] "Stycke %d lyckades på %d (offset %d rader)." -#: apply.c:3089 +#: apply.c:3067 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Sammanhang reducerat till (%ld/%ld) för att tillämpa fragment vid %d" -#: apply.c:3095 +#: apply.c:3073 #, c-format msgid "" "while searching for:\n" @@ -296,25 +296,25 @@ msgstr "" "vid sökning efter:\n" "%.*s" -#: apply.c:3117 +#: apply.c:3095 #, c-format msgid "missing binary patch data for '%s'" msgstr "saknar binära patchdata för \"%s\"" -#: apply.c:3125 +#: apply.c:3103 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "kan inte applicera en binärpatch baklänges utan den omvända patchen för \"%s" "\"" -#: apply.c:3171 +#: apply.c:3149 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" "kan inte applicera binärpatch på \"%s\" utan den fullständiga indexraden" -#: apply.c:3181 +#: apply.c:3159 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -322,420 +322,421 @@ msgstr "" "patchen appliceras på \"%s\" (%s), som inte motsvarar det nuvarande " "innehållet." -#: apply.c:3189 +#: apply.c:3167 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "patchen appliceras på en tom \"%s\", men den är inte tom" -#: apply.c:3207 +#: apply.c:3185 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "nödvändig efterbild %s för \"%s\" kan inte läsas" -#: apply.c:3220 +#: apply.c:3198 #, c-format msgid "binary patch does not apply to '%s'" msgstr "binärpatchen kan inte tillämpas på \"%s\"" -#: apply.c:3226 +#: apply.c:3204 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "binärpatchen på \"%s\" ger felaktigt resultat (förväntade %s, fick %s)" -#: apply.c:3247 +#: apply.c:3225 #, c-format msgid "patch failed: %s:%ld" msgstr "patch misslyckades: %s:%ld" -#: apply.c:3369 +#: apply.c:3347 #, c-format msgid "cannot checkout %s" msgstr "kan inte checka ut %s" -#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277 +#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277 #, c-format msgid "failed to read %s" msgstr "misslyckades läsa %s" -#: apply.c:3426 +#: apply.c:3404 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "läser från \"%s\" som är på andra sidan av en symbolisk länk" -#: apply.c:3455 apply.c:3695 +#: apply.c:3433 apply.c:3673 #, c-format msgid "path %s has been renamed/deleted" msgstr "sökvägen %s har ändrat namn/tagits bort" -#: apply.c:3538 apply.c:3709 +#: apply.c:3516 apply.c:3687 #, c-format msgid "%s: does not exist in index" msgstr "%s: finns inte i indexet" -#: apply.c:3547 apply.c:3717 +#: apply.c:3525 apply.c:3695 #, c-format msgid "%s: does not match index" msgstr "%s: motsvarar inte indexet" -#: apply.c:3582 +#: apply.c:3560 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" "arkivet saknar objekt som behövs för att falla tillbaka på 3-" "vägssammanslagning." -#: apply.c:3585 +#: apply.c:3563 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Faller tillbaka på trevägssammanslagning...\n" -#: apply.c:3601 apply.c:3605 +#: apply.c:3579 apply.c:3583 #, c-format msgid "cannot read the current contents of '%s'" msgstr "kunde inte läsa aktuellt innehåll i \"%s\"" -#: apply.c:3617 +#: apply.c:3595 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Misslyckades falla tillbaka på trevägssammanslagning...\n" -#: apply.c:3631 +#: apply.c:3609 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Applicerade patchen på \"%s\" med konflikter.\n" -#: apply.c:3636 +#: apply.c:3614 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Tillämpade patchen på \"%s\" rent.\n" -#: apply.c:3662 +#: apply.c:3640 msgid "removal patch leaves file contents" msgstr "patch för borttagning lämnar kvar filinnehåll" -#: apply.c:3734 +#: apply.c:3712 #, c-format msgid "%s: wrong type" msgstr "%s: fel typ" -#: apply.c:3736 +#: apply.c:3714 #, c-format msgid "%s has type %o, expected %o" msgstr "%s har typen %o, förväntade %o" -#: apply.c:3886 apply.c:3888 +#: apply.c:3864 apply.c:3866 #, c-format msgid "invalid path '%s'" msgstr "ogiltig sökväg ”%s”" -#: apply.c:3944 +#: apply.c:3922 #, c-format msgid "%s: already exists in index" msgstr "%s: finns redan i indexet" -#: apply.c:3947 +#: apply.c:3925 #, c-format msgid "%s: already exists in working directory" msgstr "%s: finns redan i arbetskatalogen" -#: apply.c:3967 +#: apply.c:3945 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o)" -#: apply.c:3972 +#: apply.c:3950 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o) för %s" -#: apply.c:3992 +#: apply.c:3970 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "den berörda filen \"%s\" är på andra sidan av en symbolisk länk" -#: apply.c:3996 +#: apply.c:3974 #, c-format msgid "%s: patch does not apply" msgstr "%s: patchen kan inte tillämpas" -#: apply.c:4011 +#: apply.c:3989 #, c-format msgid "Checking patch %s..." msgstr "Kontrollerar patchen %s..." -#: apply.c:4102 +#: apply.c:4080 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "sha1-informationen saknas eller är oanvändbar för undermodulen %s" -#: apply.c:4109 +#: apply.c:4087 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "nytt läge för %s, som inte finns i nuvarande HEAD" -#: apply.c:4112 +#: apply.c:4090 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1-informationen saknas eller är oanvändbar (%s)." -#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148 +#: apply.c:4095 builtin/checkout.c:236 builtin/reset.c:148 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry misslyckades för sökvägen \"%s\"" -#: apply.c:4121 +#: apply.c:4099 #, c-format msgid "could not add %s to temporary index" msgstr "kunde inte lägga till %s till temporärt index" -#: apply.c:4131 +#: apply.c:4109 #, c-format msgid "could not write temporary index to %s" msgstr "kunde inte skriva temporärt index till %s" -#: apply.c:4269 +#: apply.c:4247 #, c-format msgid "unable to remove %s from index" msgstr "kan inte ta bort %s från indexet" -#: apply.c:4304 +#: apply.c:4282 #, c-format msgid "corrupt patch for submodule %s" msgstr "trasig patch för undermodulen %s" -#: apply.c:4310 +#: apply.c:4288 #, c-format msgid "unable to stat newly created file '%s'" msgstr "kan inte ta status på nyligen skapade filen \"%s\"" -#: apply.c:4318 +#: apply.c:4296 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s" -#: apply.c:4324 apply.c:4468 +#: apply.c:4302 apply.c:4446 #, c-format msgid "unable to add cache entry for %s" msgstr "kan inte lägga till cachepost för %s" -#: apply.c:4365 +#: apply.c:4343 #, c-format msgid "failed to write to '%s'" msgstr "misslyckades skriva till \"%s\"" -#: apply.c:4369 +#: apply.c:4347 #, c-format msgid "closing file '%s'" msgstr "stänger filen \"%s\"" -#: apply.c:4439 +#: apply.c:4417 #, c-format msgid "unable to write file '%s' mode %o" msgstr "kan inte skriva filen \"%s\" läge %o" -#: apply.c:4537 +#: apply.c:4515 #, c-format msgid "Applied patch %s cleanly." msgstr "Tillämpade patchen %s rent." -#: apply.c:4545 +#: apply.c:4523 msgid "internal error" msgstr "internt fel" -#: apply.c:4548 +#: apply.c:4526 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Tillämpade patchen %%s med %d refuserad..." msgstr[1] "Tillämpade patchen %%s med %d refuserade..." -#: apply.c:4559 +#: apply.c:4537 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "trunkerar .rej-filnamnet till %.*s.rej" -#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010 +#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011 #, c-format msgid "cannot open %s" msgstr "kan inte öppna %s" -#: apply.c:4581 +#: apply.c:4559 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Stycke %d tillämpades rent." -#: apply.c:4585 +#: apply.c:4563 #, c-format msgid "Rejected hunk #%d." msgstr "Refuserar stycke %d." -#: apply.c:4695 +#: apply.c:4673 #, c-format msgid "Skipped patch '%s'." msgstr "Ignorerar patch \"%s\"." -#: apply.c:4703 +#: apply.c:4681 msgid "unrecognized input" msgstr "indata känns inte igen" -#: apply.c:4722 +#: apply.c:4700 msgid "unable to read index file" msgstr "kan inte läsa indexfilen" -#: apply.c:4859 +#: apply.c:4837 #, c-format msgid "can't open patch '%s': %s" msgstr "kan inte öppna patchen \"%s\": %s" -#: apply.c:4886 +#: apply.c:4864 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "undertryckte %d fel i blanksteg" msgstr[1] "undertryckte %d fel i blanksteg" -#: apply.c:4892 apply.c:4907 +#: apply.c:4870 apply.c:4885 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d rad lägger till fel i blanksteg." msgstr[1] "%d rader lägger till fel i blanksteg." -#: apply.c:4900 +#: apply.c:4878 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "%d rad applicerade efter att ha rättat fel i blanksteg." msgstr[1] "%d rader applicerade efter att ha rättat fel i blanksteg." -#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390 +#: apply.c:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" -#: apply.c:4947 apply.c:4950 builtin/am.c:2256 builtin/am.c:2259 -#: builtin/clone.c:116 builtin/fetch.c:115 builtin/pull.c:187 -#: builtin/submodule--helper.c:301 builtin/submodule--helper.c:622 -#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:992 -#: builtin/submodule--helper.c:995 builtin/submodule--helper.c:1212 +#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260 +#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193 +#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860 +#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230 +#: builtin/submodule--helper.c:1233 builtin/submodule--helper.c:1450 #: git-add--interactive.perl:197 msgid "path" msgstr "sökväg" -#: apply.c:4948 +#: apply.c:4922 msgid "don't apply changes matching the given path" msgstr "tillämpa inte ändringar som motsvarar given sökväg" -#: apply.c:4951 +#: apply.c:4925 msgid "apply changes matching the given path" msgstr "tillämpa ändringar som motsvarar given sökväg" -#: apply.c:4953 builtin/am.c:2265 +#: apply.c:4927 builtin/am.c:2266 msgid "num" msgstr "antal" -#: apply.c:4954 +#: apply.c:4928 msgid "remove <num> leading slashes from traditional diff paths" msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar" -#: apply.c:4957 +#: apply.c:4931 msgid "ignore additions made by the patch" msgstr "ignorera tillägg gjorda av patchen" -#: apply.c:4959 +#: apply.c:4933 msgid "instead of applying the patch, output diffstat for the input" msgstr "istället för att tillämpa patchen, skriv ut diffstat för indata" -#: apply.c:4963 +#: apply.c:4937 msgid "show number of added and deleted lines in decimal notation" msgstr "visa antal tillagda och borttagna rader decimalt" -#: apply.c:4965 +#: apply.c:4939 msgid "instead of applying the patch, output a summary for the input" msgstr "istället för att tillämpa patchen, skriv ut en summering av indata" -#: apply.c:4967 +#: apply.c:4941 msgid "instead of applying the patch, see if the patch is applicable" msgstr "istället för att tillämpa patchen, se om patchen kan tillämpas" -#: apply.c:4969 +#: apply.c:4943 msgid "make sure the patch is applicable to the current index" msgstr "se till att patchen kan tillämpas på aktuellt index" -#: apply.c:4971 +#: apply.c:4945 msgid "apply a patch without touching the working tree" msgstr "tillämpa en patch utan att röra arbetskatalogen" -#: apply.c:4973 +#: apply.c:4947 msgid "accept a patch that touches outside the working area" msgstr "godta en patch som rör filer utanför arbetskatalogen" -#: apply.c:4975 +#: apply.c:4949 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "tillämpa också patchen (använd med --stat/--summary/--check)" -#: apply.c:4977 +#: apply.c:4951 msgid "attempt three-way merge if a patch does not apply" msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas" -#: apply.c:4979 +#: apply.c:4953 msgid "build a temporary index based on embedded index information" msgstr "bygg ett temporärt index baserat på inbyggd indexinformation" -#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513 +#: apply.c:4956 builtin/checkout-index.c:168 builtin/ls-files.c:515 msgid "paths are separated with NUL character" msgstr "sökvägar avdelas med NUL-tecken" -#: apply.c:4984 +#: apply.c:4958 msgid "ensure at least <n> lines of context match" msgstr "se till att åtminstone <n> rader sammanhang är lika" -#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95 +#: apply.c:4959 builtin/am.c:2245 builtin/interpret-trailers.c:95 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99 +#: builtin/pack-objects.c:3009 msgid "action" msgstr "åtgärd" -#: apply.c:4986 +#: apply.c:4960 msgid "detect new or modified lines that have whitespace errors" msgstr "detektera nya eller ändrade rader som har fel i blanktecken" -#: apply.c:4989 apply.c:4992 +#: apply.c:4963 apply.c:4966 msgid "ignore changes in whitespace when finding context" msgstr "ignorera ändringar i blanktecken för sammanhang" -#: apply.c:4995 +#: apply.c:4969 msgid "apply the patch in reverse" msgstr "tillämpa patchen baklänges" -#: apply.c:4997 +#: apply.c:4971 msgid "don't expect at least one line of context" msgstr "förvänta inte minst en rad sammanhang" -#: apply.c:4999 +#: apply.c:4973 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "lämna refuserade stycken i motsvarande *.rej-filer" -#: apply.c:5001 +#: apply.c:4975 msgid "allow overlapping hunks" msgstr "tillåt överlappande stycken" -#: apply.c:5002 builtin/add.c:272 builtin/check-ignore.c:21 -#: builtin/commit.c:1347 builtin/count-objects.c:96 builtin/fsck.c:640 -#: builtin/log.c:1889 builtin/mv.c:123 builtin/read-tree.c:125 +#: apply.c:4976 builtin/add.c:292 builtin/check-ignore.c:21 +#: builtin/commit.c:1361 builtin/count-objects.c:96 builtin/fsck.c:640 +#: builtin/log.c:1896 builtin/mv.c:123 builtin/read-tree.c:125 msgid "be verbose" msgstr "var pratsam" -#: apply.c:5004 +#: apply.c:4978 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut" -#: apply.c:5007 +#: apply.c:4981 msgid "do not trust the line counts in the hunk headers" msgstr "lite inte på antalet linjer i styckehuvuden" -#: apply.c:5009 builtin/am.c:2253 +#: apply.c:4983 builtin/am.c:2254 msgid "root" msgstr "rot" -#: apply.c:5010 +#: apply.c:4984 msgid "prepend <root> to all filenames" msgstr "lägg till <rot> i alla filnamn" @@ -758,7 +759,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <arkiv> [--exec <kmd>] --list" -#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299 +#: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer" @@ -771,7 +772,7 @@ msgstr "fmt" msgid "archive format" msgstr "arkivformat" -#: archive.c:437 builtin/log.c:1452 +#: archive.c:437 builtin/log.c:1459 msgid "prefix" msgstr "prefix" @@ -779,9 +780,9 @@ msgstr "prefix" msgid "prepend prefix to each pathname in the archive" msgstr "lägg till prefix till varje sökväg i arkivet" -#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61 -#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:859 -#: builtin/hash-object.c:102 builtin/ls-files.c:547 builtin/ls-files.c:550 +#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:62 +#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:861 +#: builtin/hash-object.c:102 builtin/ls-files.c:551 builtin/ls-files.c:554 #: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120 #: parse-options.h:153 msgid "file" @@ -816,7 +817,7 @@ msgid "list supported archive formats" msgstr "visa understödda arkivformat" #: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109 -#: builtin/submodule--helper.c:634 builtin/submodule--helper.c:1001 +#: builtin/submodule--helper.c:872 builtin/submodule--helper.c:1239 msgid "repo" msgstr "arkiv" @@ -867,22 +868,22 @@ msgstr "" "Negativa mönster ignoreras i git-attribut\n" "Använd '\\!' för att inleda med ett utropstecken." -#: bisect.c:447 +#: bisect.c:458 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Felaktigt citerat innehåll i filen \"%s\": %s" -#: bisect.c:655 +#: bisect.c:666 #, c-format msgid "We cannot bisect more!\n" msgstr "Det finns inte mer att göra \"bisect\" på!\n" -#: bisect.c:708 +#: bisect.c:720 #, c-format msgid "Not a valid commit name %s" msgstr "Namnet på incheckningen är inte giltigt: %s" -#: bisect.c:732 +#: bisect.c:744 #, c-format msgid "" "The merge base %s is bad.\n" @@ -891,7 +892,7 @@ msgstr "" "Sammanslagningsbasen %s är trasig.\n" "Det betyder att felet har rättats mellan %s och [%s].\n" -#: bisect.c:737 +#: bisect.c:749 #, c-format msgid "" "The merge base %s is new.\n" @@ -900,7 +901,7 @@ msgstr "" "Sammanslagningsbasen %s är ny.\n" "Egenskapen har ändrats mellan %s och [%s].\n" -#: bisect.c:742 +#: bisect.c:754 #, c-format msgid "" "The merge base %s is %s.\n" @@ -909,7 +910,7 @@ msgstr "" "Sammanslagningsbasen %s är %s.\n" "Det betyder att den första \"%s\" incheckningen är mellan %s och [%s].\n" -#: bisect.c:750 +#: bisect.c:762 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -920,7 +921,7 @@ msgstr "" "git bisect kan inte fungera korrekt i detta fall.\n" "Kanske du skrev fel %s- och %s-revisioner?\n" -#: bisect.c:763 +#: bisect.c:775 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -932,36 +933,36 @@ msgstr "" "%s.\n" "Vi fortsätter ändå." -#: bisect.c:798 +#: bisect.c:810 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Bisect: en sammanslagningsbas måste testas\n" -#: bisect.c:850 +#: bisect.c:862 #, c-format msgid "a %s revision is needed" msgstr "en %s-revision behövs" -#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234 +#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234 #, c-format msgid "could not create file '%s'" msgstr "kunde inte skapa filen \"%s\"" -#: bisect.c:918 +#: bisect.c:930 #, c-format msgid "could not read file '%s'" msgstr "kunde inte läsa filen \"%s\"" -#: bisect.c:948 +#: bisect.c:960 msgid "reading bisect refs failed" msgstr "misslyckades läsa bisect-referenser" -#: bisect.c:968 +#: bisect.c:979 #, c-format msgid "%s was both %s and %s\n" msgstr "%s var både %s och %s\n" -#: bisect.c:976 +#: bisect.c:987 #, c-format msgid "" "No testable commit found.\n" @@ -970,7 +971,7 @@ msgstr "" "Ingen testbar incheckning hittades.\n" "Kanske du startade med felaktiga sökvägsparametrar?\n" -#: bisect.c:995 +#: bisect.c:1006 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -980,7 +981,7 @@ msgstr[1] "(ungefär %d steg)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1001 +#: bisect.c:1012 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" @@ -1001,9 +1002,9 @@ msgstr "" "--reverse och --first-parent tillsammans kräver att du anger senaste " "incheckningen" -#: blame.c:1797 bundle.c:169 ref-filter.c:1947 sequencer.c:1168 -#: sequencer.c:2351 builtin/commit.c:1065 builtin/log.c:357 builtin/log.c:911 -#: builtin/log.c:1361 builtin/log.c:1690 builtin/log.c:1938 builtin/merge.c:369 +#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1179 +#: sequencer.c:2367 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918 +#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369 #: builtin/shortlog.c:191 msgid "revision walk setup failed" msgstr "misslyckades skapa revisionstraversering" @@ -1099,31 +1100,31 @@ msgstr "Kan inte skriva inställningar för uppströmsgren" msgid "Not tracking: ambiguous information for ref %s" msgstr "Spårar inte: tvetydig information för referensen %s" -#: branch.c:185 +#: branch.c:189 #, c-format msgid "'%s' is not a valid branch name." msgstr "\"%s\" är inte ett giltigt grennamn." -#: branch.c:190 +#: branch.c:208 #, c-format msgid "A branch named '%s' already exists." msgstr "Det finns redan en gren som heter ”%s”." -#: branch.c:197 +#: branch.c:213 msgid "Cannot force update the current branch." msgstr "Kan inte tvinga uppdatering av aktuell gren." -#: branch.c:217 +#: branch.c:233 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "Kan inte ställa in spårning; startpunkten \"%s\" är inte en gren." -#: branch.c:219 +#: branch.c:235 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "den efterfrågade uppströmsgrenen \"%s\" finns inte" -#: branch.c:221 +#: branch.c:237 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -1143,27 +1144,27 @@ msgstr "" "spåra dess fjärrmotsvarighet kan du använda \"git push -u\"\n" "för att ställa in uppströmskonfigurationen när du sänder in." -#: branch.c:264 +#: branch.c:280 #, c-format msgid "Not a valid object name: '%s'." msgstr "Objektnamnet är inte giltigt: \"%s\"." -#: branch.c:284 +#: branch.c:300 #, c-format msgid "Ambiguous object name: '%s'." msgstr "Objektnamnet är tvetydigt: \"%s\"." -#: branch.c:289 +#: branch.c:305 #, c-format msgid "Not a valid branch point: '%s'." msgstr "Avgreningspunkten är inte giltig: ”%s”." -#: branch.c:343 +#: branch.c:359 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "\"%s\" är redan utcheckad på \"%s\"" -#: branch.c:366 +#: branch.c:382 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "HEAD i arbetskatalogen %s har inte uppdaterats" @@ -1178,9 +1179,8 @@ msgstr "'%s' ser inte ut som en v2-bundle-fil" msgid "unrecognized header: %s%s (%d)" msgstr "okänt huvud: %s%s (%d)" -#: bundle.c:88 sequencer.c:1346 sequencer.c:1793 sequencer.c:2500 -#: sequencer.c:2583 sequencer.c:2609 sequencer.c:2687 sequencer.c:2807 -#: sequencer.c:2949 builtin/commit.c:782 +#: bundle.c:88 sequencer.c:1357 sequencer.c:1804 sequencer.c:2631 +#: sequencer.c:2657 sequencer.c:2748 sequencer.c:2850 builtin/commit.c:782 #, c-format msgid "could not open '%s'" msgstr "kunde inte öppna \"%s\"" @@ -1224,7 +1224,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:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296 +#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296 #, c-format msgid "unrecognized argument: %s" msgstr "okänt argument: %s" @@ -1247,8 +1247,8 @@ msgstr "index-pack dog" msgid "invalid color value: %.*s" msgstr "felaktigt färgvärde: %.*s" -#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465 -#: builtin/am.c:1467 builtin/am.c:2105 +#: commit.c:41 sequencer.c:1611 builtin/am.c:421 builtin/am.c:465 +#: builtin/am.c:1471 builtin/am.c:2106 #, c-format msgid "could not parse %s" msgstr "kunde inte tolka %s" @@ -1258,7 +1258,7 @@ msgstr "kunde inte tolka %s" msgid "%s %s is not a commit!" msgstr "%s %s är inte en incheckning!" -#: commit.c:1517 +#: commit.c:1524 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" @@ -1268,173 +1268,178 @@ msgstr "" "Uppdatera det efter att ha rättat meddelandet, eller ändra variabeln\n" "i18n.commitencoding till den teckenkodning som används i ditt projekt.\n" -#: compat/obstack.c:406 compat/obstack.c:408 +#: compat/obstack.c:405 compat/obstack.c:407 msgid "memory exhausted" msgstr "minnet slut" -#: config.c:187 +#: config.c:186 msgid "relative config include conditionals must come from files" msgstr "relativa konfigureringsinkluderingsvillkor måste komma från filer" -#: config.c:721 +#: config.c:720 #, c-format msgid "bad config line %d in blob %s" msgstr "felaktig konfigurationsfil rad %d i blob:en %s" -#: config.c:725 +#: config.c:724 #, c-format msgid "bad config line %d in file %s" msgstr "felaktig konfigurationsfil rad %d i filen %s" -#: config.c:729 +#: config.c:728 #, c-format msgid "bad config line %d in standard input" msgstr "felaktig konfigurationsfil rad %d i standard in" -#: config.c:733 +#: config.c:732 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s" -#: config.c:737 +#: config.c:736 #, c-format msgid "bad config line %d in command line %s" msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s" -#: config.c:741 +#: config.c:740 #, c-format msgid "bad config line %d in %s" msgstr "felaktig konfigurationsfil rad %d i %s" -#: config.c:869 +#: config.c:868 msgid "out of range" msgstr "utanför intervallet" -#: config.c:869 +#: config.c:868 msgid "invalid unit" msgstr "ogiltig enhet" -#: config.c:875 +#: config.c:874 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s" -#: config.c:880 +#: config.c:879 #, 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:883 +#: config.c:882 #, 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:886 +#: config.c:885 #, 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:889 +#: config.c:888 #, 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:892 +#: config.c:891 #, 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:895 +#: config.c:894 #, 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:990 +#: config.c:989 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "misslyckades expandera användarkatalog i: \"%s\"" -#: config.c:1085 config.c:1096 +#: config.c:998 +#, c-format +msgid "'%s' for '%s' is not a valid timestamp" +msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel" + +#: config.c:1094 config.c:1105 #, c-format msgid "bad zlib compression level %d" msgstr "felaktigt zlib-komprimeringsgrad %d" -#: config.c:1213 +#: config.c:1222 #, c-format msgid "invalid mode for object creation: %s" msgstr "felaktigt läge för skapande av objekt: %s" -#: config.c:1372 +#: config.c:1378 #, c-format msgid "bad pack compression level %d" msgstr "felaktig paketkomprimeringsgrad %d" -#: config.c:1568 +#: config.c:1574 msgid "unable to parse command-line config" msgstr "kan inte tolka kommandoradskonfiguration" -#: config.c:1900 +#: config.c:1906 msgid "unknown error occurred while reading the configuration files" msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna" -#: config.c:2087 +#: config.c:2093 #, c-format msgid "Invalid %s: '%s'" msgstr "Felaktigt %s: \"%s\"" -#: config.c:2130 +#: config.c:2136 #, 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:2156 +#: config.c:2162 #, 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:2167 +#: config.c:2187 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration" -#: config.c:2169 +#: config.c:2189 #, 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:2228 +#: config.c:2248 #, c-format msgid "%s has multiple values" msgstr "%s har flera värden" -#: config.c:2571 config.c:2789 +#: config.c:2591 config.c:2808 #, c-format msgid "fstat on %s failed" msgstr "fstat misslyckades på %s" -#: config.c:2678 +#: config.c:2698 #, c-format msgid "could not set '%s' to '%s'" msgstr "kunde inte ställa in \"%s\" till \"%s\"" -#: config.c:2680 builtin/remote.c:776 +#: config.c:2700 builtin/remote.c:776 #, c-format msgid "could not unset '%s'" msgstr "kunde inte ta bort inställning för \"%s\"" -#: connect.c:50 +#: connect.c:52 msgid "The remote end hung up upon initial contact" msgstr "Fjärren lade på vid inledande kontakt" -#: connect.c:52 +#: connect.c:54 msgid "" "Could not read from remote repository.\n" "\n" @@ -1565,7 +1570,7 @@ msgstr[1] "%<PRIuMAX> år sedan" msgid "failed to read orderfile '%s'" msgstr "kunde inte läsa orderfilen \"%s\"" -#: diffcore-rename.c:536 +#: diffcore-rename.c:535 msgid "Performing inexact rename detection" msgstr "Utför onöjaktig namnbytesdetektering" @@ -1597,7 +1602,7 @@ msgstr "" msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\"" -#: diff.c:398 +#: diff.c:401 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -1606,20 +1611,20 @@ msgstr "" "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" "%s" -#: diff.c:3861 +#: diff.c:3799 #, c-format msgid "external diff died, stopping at %s" msgstr "extern diff dog, stannar vid %s" -#: diff.c:4189 +#: diff.c:4127 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, -check och -s är ömsesidigt uteslutande" -#: diff.c:4279 +#: diff.c:4215 msgid "--follow requires exactly one pathspec" msgstr "--follow kräver exakt en sökvägsangivelse" -#: diff.c:4445 +#: diff.c:4381 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -1628,50 +1633,55 @@ msgstr "" "Misslyckades tolka argument till flaggan --dirstat/-X;\n" "%s" -#: diff.c:4459 +#: diff.c:4395 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\"" -#: diff.c:5505 +#: diff.c:5446 msgid "inexact rename detection was skipped due to too many files." msgstr "" "onöjaktig namnbytesdetektering utfördes inte på grund av för många filer." -#: diff.c:5508 +#: diff.c:5449 msgid "only found copies from modified paths due to too many files." msgstr "hittade bara kopior från ändrade sökvägar på grund av för många filer." -#: diff.c:5511 +#: diff.c:5452 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "" "du kan sätta variabeln %s till åtminstone %d och försöka kommandot på nytt." -#: dir.c:1983 +#: dir.c:2100 msgid "failed to get kernel name and information" msgstr "misslyckades hämta kärnans namn och information" -#: dir.c:2102 +#: dir.c:2219 msgid "Untracked cache is disabled on this system or location." msgstr "Ospårad cache är inaktiverad på systemet eller platsen." -#: dir.c:2885 dir.c:2890 +#: dir.c:3002 dir.c:3007 #, c-format msgid "could not create directories for %s" msgstr "kunde inte skapa kataloger för %s" -#: dir.c:2915 +#: dir.c:3032 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\"" -#: entry.c:176 +#: editor.c:61 +#, c-format +msgid "hint: Waiting for your editor to close the file...%c" +msgstr "tips: Väntar på att textredigeringsprogrammet skall stänga filen...%c" + +#: entry.c:177 msgid "Filtering content" msgstr "Filtrerar innehåll" -#: entry.c:433 +#: entry.c:435 #, c-format msgid "could not stat file '%s'" msgstr "kunde inte ta status på filen \"%s\"" @@ -1742,7 +1752,7 @@ msgstr "ogiltig incheckning %s" msgid "giving up" msgstr "ger upp" -#: fetch-pack.c:534 progress.c:242 +#: fetch-pack.c:534 progress.c:229 msgid "done" msgstr "klart" @@ -1756,104 +1766,104 @@ msgstr "fick %s (%d) %s" msgid "Marking %s as complete" msgstr "Markerar %s som komplett" -#: fetch-pack.c:776 +#: fetch-pack.c:777 #, c-format msgid "already have %s (%s)" msgstr "har redan %s (%s)" -#: fetch-pack.c:814 +#: fetch-pack.c:815 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare" -#: fetch-pack.c:822 +#: fetch-pack.c:823 msgid "protocol error: bad pack header" msgstr "protokollfel: felaktigt packhuvud" -#: fetch-pack.c:878 +#: fetch-pack.c:879 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-patch: kunde inte grena av %s" -#: fetch-pack.c:894 +#: fetch-pack.c:895 #, c-format msgid "%s failed" msgstr "%s misslyckades" -#: fetch-pack.c:896 +#: fetch-pack.c:897 msgid "error in sideband demultiplexer" msgstr "fel i sidbands-avmultiplexare" -#: fetch-pack.c:923 +#: fetch-pack.c:924 msgid "Server does not support shallow clients" msgstr "Servern stöder inte klienter med grunda arkiv" -#: fetch-pack.c:927 +#: fetch-pack.c:928 msgid "Server supports multi_ack_detailed" msgstr "Servern stöder \"multi_ack_detailed\"" -#: fetch-pack.c:930 +#: fetch-pack.c:931 msgid "Server supports no-done" msgstr "Servern stöder \"no-done\"" -#: fetch-pack.c:936 +#: fetch-pack.c:937 msgid "Server supports multi_ack" msgstr "Servern stöder \"multi_ack\"" -#: fetch-pack.c:940 +#: fetch-pack.c:941 msgid "Server supports side-band-64k" msgstr "Servern stöder \"side-band-64k\"" -#: fetch-pack.c:944 +#: fetch-pack.c:945 msgid "Server supports side-band" msgstr "Servern stöder \"side-band\"" -#: fetch-pack.c:948 +#: fetch-pack.c:949 msgid "Server supports allow-tip-sha1-in-want" msgstr "Servern stöder \"allow-tip-sha1-in-want\"" -#: fetch-pack.c:952 +#: fetch-pack.c:953 msgid "Server supports allow-reachable-sha1-in-want" msgstr "Servern stöder \"allow-reachable-sha1-in-want\"" -#: fetch-pack.c:962 +#: fetch-pack.c:963 msgid "Server supports ofs-delta" msgstr "Servern stöder \"ofs-delta\"" -#: fetch-pack.c:969 +#: fetch-pack.c:970 #, c-format msgid "Server version is %.*s" msgstr "Serverversionen är %.*s" -#: fetch-pack.c:975 +#: fetch-pack.c:976 msgid "Server does not support --shallow-since" msgstr "Servern stöder inte --shallow-since" -#: fetch-pack.c:979 +#: fetch-pack.c:980 msgid "Server does not support --shallow-exclude" msgstr "Servern stöder inte --shallow-exclude" -#: fetch-pack.c:981 +#: fetch-pack.c:982 msgid "Server does not support --deepen" msgstr "Servern stöder inte --deepen" -#: fetch-pack.c:992 +#: fetch-pack.c:993 msgid "no common commits" msgstr "inga gemensamma incheckningar" -#: fetch-pack.c:1004 +#: fetch-pack.c:1005 msgid "git fetch-pack: fetch failed." msgstr "git fetch-patch: hämtning misslyckades." -#: fetch-pack.c:1166 +#: fetch-pack.c:1167 msgid "no matching remote head" msgstr "inget motsvarande fjärrhuvud" -#: fetch-pack.c:1188 +#: fetch-pack.c:1189 #, c-format msgid "no such remote ref %s" msgstr "ingen sådan fjärreferens: %s" -#: fetch-pack.c:1191 +#: fetch-pack.c:1192 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Servern tillåter inte förfrågan om ej tillkännagivet objekt %s" @@ -1876,17 +1886,17 @@ msgstr "misslyckades skriva fristående signatur till \"%s\"" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "ignorera felaktig färg \"%.*s\" i log.graphColors" -#: grep.c:1970 +#: grep.c:2017 #, c-format msgid "'%s': unable to read %s" msgstr "\"%s\" kunde inte läsa %s" -#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134 +#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134 #, c-format msgid "failed to stat '%s'" msgstr "misslyckades ta status på \"%s\"" -#: grep.c:1998 +#: grep.c:2045 #, c-format msgid "'%s': short read" msgstr "\"%s\": kort läsning" @@ -1956,12 +1966,12 @@ msgstr[1] "" msgid "git version [<options>]" msgstr "git version [<flaggor>]" -#: help.c:456 +#: help.c:462 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:460 +#: help.c:466 msgid "" "\n" "Did you mean this?" @@ -2034,6 +2044,15 @@ msgstr "namnet består enbart av ej tillåtna tecken: %s" msgid "invalid date format: %s" msgstr "felaktigt datumformat: %s" +#: list-objects-filter-options.c:30 +msgid "multiple object filter types cannot be combined" +msgstr "flera objektfiltertyper kan inte kombineras" + +#: list-objects-filter-options.c:41 list-objects-filter-options.c:68 +#, c-format +msgid "invalid filter-spec expression '%s'" +msgstr "ogiltig filterspec-utryck \"%s\"" + #: lockfile.c:151 #, c-format msgid "" @@ -2063,8 +2082,8 @@ msgstr "Kunde inte skapa \"%s.lock\": %s" msgid "failed to read the cache" msgstr "misslyckades läsa cachen" -#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380 -#: builtin/checkout.c:595 builtin/clone.c:754 +#: merge.c:95 builtin/am.c:1980 builtin/am.c:2014 builtin/checkout.c:379 +#: builtin/checkout.c:600 builtin/clone.c:754 msgid "unable to write new index file" msgstr "kunde inte skriva ny indexfil" @@ -2258,7 +2277,7 @@ msgstr "Hoppade över %s (sammanslagen samma som befintlig)" msgid "Auto-merging %s" msgstr "Slår ihop %s automatiskt" -#: merge-recursive.c:1775 git-submodule.sh:944 +#: merge-recursive.c:1775 git-submodule.sh:932 msgid "submodule" msgstr "undermodul" @@ -2280,47 +2299,47 @@ msgstr "fil/katalog" msgid "directory/file" msgstr "katalog/fil" -#: merge-recursive.c:1908 +#: merge-recursive.c:1909 #, 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:1917 +#: merge-recursive.c:1918 #, c-format msgid "Adding %s" msgstr "Lägger till %s" -#: merge-recursive.c:1954 +#: merge-recursive.c:1955 msgid "Already up to date!" msgstr "Redan à jour!" -#: merge-recursive.c:1963 +#: merge-recursive.c:1964 #, c-format msgid "merging of trees %s and %s failed" msgstr "sammanslagning av träden %s och %s misslyckades" -#: merge-recursive.c:2060 +#: merge-recursive.c:2061 msgid "Merging:" msgstr "Slår ihop:" -#: merge-recursive.c:2073 +#: merge-recursive.c:2074 #, 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:2112 +#: merge-recursive.c:2113 msgid "merge returned no commit" msgstr "sammanslagningen returnerade ingen incheckning" -#: merge-recursive.c:2175 +#: merge-recursive.c:2176 #, c-format msgid "Could not parse object '%s'" msgstr "Kunde inte tolka objektet \"%s\"" -#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814 +#: merge-recursive.c:2190 builtin/merge.c:656 builtin/merge.c:815 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." @@ -2488,15 +2507,7 @@ msgstr "\"%s\" (minnesstöd: \"%c\")" msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: sökvägsuttrycket hanteras inte av det här kommandot: %s" -#: pathspec.c:571 -msgid "" -"empty strings as pathspecs will be made invalid in upcoming releases. please " -"use . instead if you meant to match all paths" -msgstr "" -"tomma strängar som sökvägsangivelser kommer bli ogiltiga i en kommande " -"utgåva. använd istället . om du vill träffa alla sökvägar" - -#: pathspec.c:595 +#: pathspec.c:592 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk" @@ -2505,7 +2516,7 @@ msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk" msgid "unable to parse --pretty format" msgstr "kunde inte tolka format för --pretty" -#: read-cache.c:1443 +#: read-cache.c:1472 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -2514,7 +2525,7 @@ msgstr "" "index.version satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:1453 +#: read-cache.c:1482 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -2523,52 +2534,52 @@ msgstr "" "GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:2316 builtin/merge.c:1046 +#: read-cache.c:2370 sequencer.c:2725 wrapper.c:658 builtin/merge.c:1048 #, c-format msgid "could not close '%s'" msgstr "kunde inte stänga \"%s\"" -#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077 +#: read-cache.c:2442 sequencer.c:1366 sequencer.c:2093 #, c-format msgid "could not stat '%s'" msgstr "kunde inte ta status på \"%s\"" -#: read-cache.c:2407 +#: read-cache.c:2455 #, c-format msgid "unable to open git dir: %s" msgstr "kunde inte öppna git-katalog: %s" -#: read-cache.c:2419 +#: read-cache.c:2467 #, c-format msgid "unable to unlink: %s" msgstr "misslyckades ta bort länken: %s" -#: refs.c:638 +#: refs.c:706 #, c-format msgid "Could not open '%s' for writing" msgstr "Kunde inte öppna \"%s\" för skrivning" -#: refs.c:1792 +#: refs.c:1850 msgid "ref updates forbidden inside quarantine environment" msgstr "referensuppdateringar förbjudna i karantänmiljö" -#: refs/files-backend.c:1136 +#: refs/files-backend.c:1189 #, c-format msgid "could not remove reference %s" msgstr "kunde inte ta bort referensen %s" -#: refs/files-backend.c:1150 refs/packed-backend.c:1430 -#: refs/packed-backend.c:1440 +#: refs/files-backend.c:1203 refs/packed-backend.c:1524 +#: refs/packed-backend.c:1534 #, c-format msgid "could not delete reference %s: %s" msgstr "kunde inte ta bort referensen %s: %s" -#: refs/files-backend.c:1153 refs/packed-backend.c:1443 +#: refs/files-backend.c:1206 refs/packed-backend.c:1537 #, c-format msgid "could not delete references: %s" msgstr "kunde inte ta bort referenser: %s" -#: ref-filter.c:35 wt-status.c:1811 +#: ref-filter.c:35 wt-status.c:1816 msgid "gone" msgstr "försvunnen" @@ -2587,157 +2598,157 @@ msgstr "bakom %d" msgid "ahead %d, behind %d" msgstr "före %d, bakom %d" -#: ref-filter.c:105 +#: ref-filter.c:107 #, c-format msgid "expected format: %%(color:<color>)" msgstr "förväntat format: %%(color:<color>)" -#: ref-filter.c:107 +#: ref-filter.c:109 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "okänd färg: %%(color:%s)" -#: ref-filter.c:127 +#: ref-filter.c:129 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Heltalsvärde förväntades refname:lstrip=%s" -#: ref-filter.c:131 +#: ref-filter.c:133 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Heltalsvärde förväntades refname:rstrip=%s" -#: ref-filter.c:133 +#: ref-filter.c:135 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "okänt %%(%s)-argument: %s" -#: ref-filter.c:173 +#: ref-filter.c:184 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) tar inte argument" -#: ref-filter.c:180 +#: ref-filter.c:191 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) tar inte argument" -#: ref-filter.c:198 +#: ref-filter.c:209 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "okänt %%(trailers)-argument: %s" -#: ref-filter.c:221 +#: ref-filter.c:232 #, c-format msgid "positive value expected contents:lines=%s" msgstr "positivt värde förväntat contents:lines=%s" -#: ref-filter.c:223 +#: ref-filter.c:234 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "okänt %%(contents)-argument: %s" -#: ref-filter.c:236 +#: ref-filter.c:247 #, c-format msgid "positive value expected objectname:short=%s" msgstr "positivt värde förväntat objectname:short=%s" -#: ref-filter.c:240 +#: ref-filter.c:251 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "okänt %%(objectname)-argument: %s" -#: ref-filter.c:267 +#: ref-filter.c:278 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "förväntat format: %%(align:<bredd>,<position>)" -#: ref-filter.c:279 +#: ref-filter.c:290 #, c-format msgid "unrecognized position:%s" msgstr "okänd position:%s" -#: ref-filter.c:283 +#: ref-filter.c:294 #, c-format msgid "unrecognized width:%s" msgstr "okänd bredd:%s" -#: ref-filter.c:289 +#: ref-filter.c:300 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "okänt %%(align)-argument: %s" -#: ref-filter.c:293 +#: ref-filter.c:304 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "positiv bredd förväntad med atomen %%(align)" -#: ref-filter.c:308 +#: ref-filter.c:319 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "okänt %%(if)-argument: %s" -#: ref-filter.c:398 +#: ref-filter.c:409 #, c-format msgid "malformed field name: %.*s" msgstr "felformat fältnamn: %.*s" -#: ref-filter.c:424 +#: ref-filter.c:435 #, c-format msgid "unknown field name: %.*s" msgstr "okänt fältnamn: %.*s" -#: ref-filter.c:536 +#: ref-filter.c:547 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "format: atomen %%(if) använd utan en %%(then)-atom" -#: ref-filter.c:596 +#: ref-filter.c:607 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "format: atomen %%(then) använd utan en %%(if)-atom" -#: ref-filter.c:598 +#: ref-filter.c:609 #, c-format msgid "format: %%(then) atom used more than once" msgstr "format: atomen %%(then) använd mer än en gång" -#: ref-filter.c:600 +#: ref-filter.c:611 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "format: atomen %%(then) använd efter %%(else)" -#: ref-filter.c:626 +#: ref-filter.c:637 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "format: atomen %%(else) använd utan en %%(if)-atom" -#: ref-filter.c:628 +#: ref-filter.c:639 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "format: atomen %%(else) använd utan en %%(then)-atom" -#: ref-filter.c:630 +#: ref-filter.c:641 #, c-format msgid "format: %%(else) atom used more than once" msgstr "format: atomen %%(else) använd mer än en gång" -#: ref-filter.c:643 +#: ref-filter.c:654 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "format: atomen %%(end) använd utan motsvarande atom" -#: ref-filter.c:698 +#: ref-filter.c:709 #, c-format msgid "malformed format string %s" msgstr "felformad formatsträng %s" -#: ref-filter.c:1283 +#: ref-filter.c:1313 #, c-format msgid "(no branch, rebasing %s)" msgstr "(ingen gren, ombaserar %s)" -#: ref-filter.c:1286 +#: ref-filter.c:1316 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(ingen gren, \"bisect\" startad på %s)" @@ -2745,7 +2756,7 @@ msgstr "(ingen gren, \"bisect\" startad på %s)" #. TRANSLATORS: make sure this matches "HEAD #. detached at " in wt-status.c #. -#: ref-filter.c:1294 +#: ref-filter.c:1324 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD frånkopplat vid %s)" @@ -2753,137 +2764,137 @@ msgstr "(HEAD frånkopplat vid %s)" #. TRANSLATORS: make sure this matches "HEAD #. detached from " in wt-status.c #. -#: ref-filter.c:1301 +#: ref-filter.c:1331 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD frånkopplat från %s)" -#: ref-filter.c:1305 +#: ref-filter.c:1335 msgid "(no branch)" msgstr "(ingen gren)" -#: ref-filter.c:1454 ref-filter.c:1485 +#: ref-filter.c:1488 ref-filter.c:1519 #, c-format msgid "missing object %s for %s" msgstr "objektet %s saknas för %s" -#: ref-filter.c:1457 ref-filter.c:1488 +#: ref-filter.c:1491 ref-filter.c:1522 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer misslyckades på %s för %s" -#: ref-filter.c:1788 +#: ref-filter.c:1822 #, c-format msgid "malformed object at '%s'" msgstr "felformat objekt vid \"%s\"" -#: ref-filter.c:1855 +#: ref-filter.c:1889 #, c-format msgid "ignoring ref with broken name %s" msgstr "ignorerar referens med trasigt namn %s" -#: ref-filter.c:1860 +#: ref-filter.c:1894 #, c-format msgid "ignoring broken ref %s" msgstr "ignorerar trasig referens %s" -#: ref-filter.c:2122 +#: ref-filter.c:2156 #, c-format msgid "format: %%(end) atom missing" msgstr "format: atomen %%(end) saknas" -#: ref-filter.c:2216 +#: ref-filter.c:2250 #, c-format msgid "malformed object name %s" msgstr "felformat objektnamn %s" -#: remote.c:750 +#: remote.c:780 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Kan inte hämta både %s och %s till %s" -#: remote.c:754 +#: remote.c:784 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s spårar vanligtvis %s, inte %s" -#: remote.c:758 +#: remote.c:788 #, c-format msgid "%s tracks both %s and %s" msgstr "%s spårar både %s och %s" -#: remote.c:766 +#: remote.c:796 msgid "Internal error" msgstr "Internt fel" -#: remote.c:1681 remote.c:1783 +#: remote.c:1711 remote.c:1813 msgid "HEAD does not point to a branch" msgstr "HEAD pekar inte på en gren" -#: remote.c:1690 +#: remote.c:1720 #, c-format msgid "no such branch: '%s'" msgstr "okänd gren: \"%s\"" -#: remote.c:1693 +#: remote.c:1723 #, c-format msgid "no upstream configured for branch '%s'" msgstr "ingen standarduppström angiven för grenen \"%s\"" -#: remote.c:1699 +#: remote.c:1729 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "uppströmsgrenen \"%s\" är inte lagrad som en fjärrspårande gren" -#: remote.c:1714 +#: remote.c:1744 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "push-målet \"%s\" på fjärren \"%s\" har ingen lokalt spårande gren" -#: remote.c:1726 +#: remote.c:1756 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "grenen \"%s\" har ingen fjärr för \"push\"" -#: remote.c:1737 +#: remote.c:1767 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\"" -#: remote.c:1750 +#: remote.c:1780 msgid "push has no destination (push.default is 'nothing')" msgstr "\"push\" har inget mål (push.default är \"ingenting\")" -#: remote.c:1772 +#: remote.c:1802 msgid "cannot resolve 'simple' push to a single destination" msgstr "\"enkel push\" motsvarar flera olika mål" -#: remote.c:2076 +#: remote.c:2106 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Din gren är baserad på \"%s\", men den har försvunnit uppströms.\n" -#: remote.c:2080 +#: remote.c:2110 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n" -#: remote.c:2083 +#: remote.c:2113 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Din gren är à jour med \"%s\".\n" -#: remote.c:2087 +#: remote.c:2117 #, 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] "Din gren ligger före \"%s\" med %d incheckning.\n" msgstr[1] "Din gren ligger före \"%s\" med %d incheckningar.\n" -#: remote.c:2093 +#: remote.c:2123 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (använd \"git push\" för att publicera dina lokala incheckningar)\n" -#: remote.c:2096 +#: remote.c:2126 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -2893,11 +2904,11 @@ msgstr[0] "" msgstr[1] "" "Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n" -#: remote.c:2104 +#: remote.c:2134 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (använd \"git pull\" för att uppdatera din lokala gren)\n" -#: remote.c:2107 +#: remote.c:2137 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -2912,27 +2923,36 @@ msgstr[1] "" "Din gren och \"%s\" har divergerat,\n" "och har %d respektive %d olika incheckningar.\n" -#: remote.c:2117 +#: remote.c:2147 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (använd \"git pull\" för att slå ihop fjärrgrenen med din egen)\n" -#: revision.c:2256 +#: revision.c:2268 msgid "your current branch appears to be broken" msgstr "din nuvarande gren verkar vara trasig" -#: revision.c:2259 +#: revision.c:2271 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "din nuvarande gren \"%s\" innehåller ännu inte några incheckningar" -#: revision.c:2453 +#: revision.c:2465 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent är inkompatibelt med --bisect" -#: run-command.c:644 +#: run-command.c:645 msgid "open /dev/null failed" msgstr "misslyckades öppna /dev/null" +#: run-command.c:1188 +#, c-format +msgid "" +"The '%s' hook was ignored because it's not set as executable.\n" +"You can disable this warning with `git config advice.ignoredHook false`." +msgstr "" +"Kroken \"%s\" ignorerades eftersom den inte är markerad som körbar.\n" +"Du kan inaktivera varningen med \"git config advice.ignoredHook false\"." + #: send-pack.c:151 #, c-format msgid "unable to parse remote unpack status: %s" @@ -3002,13 +3022,13 @@ msgstr "" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n" "och checka in resultatet med \"git commit\"" -#: sequencer.c:297 sequencer.c:1704 +#: sequencer.c:297 sequencer.c:1715 #, c-format msgid "could not lock '%s'" msgstr "kunde inte låsa \"%s\"" -#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723 -#: sequencer.c:2733 sequencer.c:2749 +#: sequencer.c:300 sequencer.c:1592 sequencer.c:1720 sequencer.c:1734 +#: sequencer.c:2723 sequencer.c:2794 wrapper.c:656 #, c-format msgid "could not write to '%s'" msgstr "kunde inte skriva till \"%s\"" @@ -3018,13 +3038,13 @@ msgstr "kunde inte skriva till \"%s\"" msgid "could not write eol to '%s'" msgstr "kunde inte skriva radslut till \"%s\"" -#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711 +#: sequencer.c:308 sequencer.c:1597 sequencer.c:1722 #, c-format msgid "failed to finalize '%s'." msgstr "misslyckades färdigställa \"%s\"." -#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259 -#: builtin/commit.c:754 builtin/merge.c:1044 +#: sequencer.c:332 sequencer.c:829 sequencer.c:1618 builtin/am.c:259 +#: builtin/commit.c:754 builtin/merge.c:1046 #, c-format msgid "could not read '%s'" msgstr "kunde inte läsa \"%s\"" @@ -3046,20 +3066,20 @@ msgstr "%s: snabbspola" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:474 +#: sequencer.c:477 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Kunde inte skriva ny indexfil" -#: sequencer.c:493 +#: sequencer.c:496 msgid "could not resolve HEAD commit\n" msgstr "kunde inte bestämma HEAD:s incheckning\n" -#: sequencer.c:513 +#: sequencer.c:516 msgid "unable to update cache tree\n" msgstr "kan inte uppdatera cacheträd\n" -#: sequencer.c:597 +#: sequencer.c:600 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -3088,17 +3108,17 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:699 +#: sequencer.c:702 #, c-format msgid "could not parse commit %s\n" msgstr "kunde inte tolka incheckningen %s\n" -#: sequencer.c:704 +#: sequencer.c:707 #, c-format msgid "could not parse parent commit %s\n" msgstr "kunde inte tolka föräldraincheckningen %s\n" -#: sequencer.c:826 +#: sequencer.c:836 #, c-format msgid "" "unexpected 1st line of squash message:\n" @@ -3109,7 +3129,7 @@ msgstr "" "\n" "\t%.*s" -#: sequencer.c:832 +#: sequencer.c:842 #, c-format msgid "" "invalid 1st line of squash message:\n" @@ -3120,232 +3140,232 @@ msgstr "" "\n" "\t%.*s" -#: sequencer.c:838 sequencer.c:863 +#: sequencer.c:848 sequencer.c:873 #, c-format msgid "This is a combination of %d commits." msgstr "Det här är en kombination av %d incheckningar." -#: sequencer.c:847 sequencer.c:2681 +#: sequencer.c:857 sequencer.c:2742 msgid "need a HEAD to fixup" msgstr "behöver en HEAD-incheckning att rätta" -#: sequencer.c:849 +#: sequencer.c:859 msgid "could not read HEAD" msgstr "kunde inte läsa HEAD" -#: sequencer.c:851 +#: sequencer.c:861 msgid "could not read HEAD's commit message" msgstr "kunde inte läsa HEAD:s incheckningsmeddelande" -#: sequencer.c:857 +#: sequencer.c:867 #, c-format msgid "cannot write '%s'" msgstr "kan inte skriva \"%s\"" -#: sequencer.c:866 git-rebase--interactive.sh:446 +#: sequencer.c:876 git-rebase--interactive.sh:446 msgid "This is the 1st commit message:" msgstr "Det här är 1:a incheckningsmeddelandet:" -#: sequencer.c:874 +#: sequencer.c:884 #, c-format msgid "could not read commit message of %s" msgstr "kunde inte läsa incheckningsmeddelande för %s" -#: sequencer.c:881 +#: sequencer.c:891 #, c-format msgid "This is the commit message #%d:" msgstr "Det här är incheckningsmeddelande %d:" -#: sequencer.c:886 +#: sequencer.c:896 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Incheckningsmeddelande %d kommer hoppas över:" -#: sequencer.c:891 +#: sequencer.c:901 #, c-format msgid "unknown command: %d" msgstr "okänt kommando: %d" -#: sequencer.c:957 +#: sequencer.c:967 msgid "your index file is unmerged." msgstr "din indexfil har inte slagits ihop." -#: sequencer.c:975 +#: sequencer.c:986 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "incheckning %s är en sammanslagning, men flaggan -m angavs inte." -#: sequencer.c:983 +#: sequencer.c:994 #, c-format msgid "commit %s does not have parent %d" msgstr "incheckning %s har inte förälder %d" -#: sequencer.c:987 +#: sequencer.c:998 #, c-format msgid "mainline was specified but commit %s is not a merge." msgstr "huvudlinje angavs, men incheckningen %s är inte en sammanslagning." -#: sequencer.c:993 +#: sequencer.c:1004 #, c-format msgid "cannot get commit message for %s" msgstr "kan inte hämta incheckningsmeddelande för %s" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1014 +#: sequencer.c:1025 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kan inte tolka föräldraincheckningen %s" -#: sequencer.c:1077 sequencer.c:1853 +#: sequencer.c:1088 sequencer.c:1864 #, c-format msgid "could not rename '%s' to '%s'" msgstr "kunde inte byta namn på \"%s\" till \"%s\"" -#: sequencer.c:1128 +#: sequencer.c:1139 #, c-format msgid "could not revert %s... %s" msgstr "kunde inte ångra %s... %s" -#: sequencer.c:1129 +#: sequencer.c:1140 #, c-format msgid "could not apply %s... %s" msgstr "kunde inte tillämpa %s... %s" -#: sequencer.c:1171 +#: sequencer.c:1182 msgid "empty commit set passed" msgstr "den angivna uppsättningen incheckningar är tom" -#: sequencer.c:1181 +#: sequencer.c:1192 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: misslyckades läsa indexet" -#: sequencer.c:1188 +#: sequencer.c:1198 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: misslyckades uppdatera indexet" -#: sequencer.c:1308 +#: sequencer.c:1319 #, c-format msgid "invalid line %d: %.*s" msgstr "ogiltig rad %d: %.*s" -#: sequencer.c:1316 +#: sequencer.c:1327 #, c-format msgid "cannot '%s' without a previous commit" msgstr "kan inte utföra \"%s\" utan en föregående incheckning" -#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614 -#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951 +#: sequencer.c:1360 sequencer.c:2522 sequencer.c:2557 sequencer.c:2636 +#: sequencer.c:2662 sequencer.c:2752 sequencer.c:2853 #, c-format msgid "could not read '%s'." msgstr "kunde inte läsa \"%s\"." -#: sequencer.c:1361 +#: sequencer.c:1372 msgid "please fix this using 'git rebase --edit-todo'." msgstr "rätta det med \"git rebase --edit-todo\"." -#: sequencer.c:1363 +#: sequencer.c:1374 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "oanvändbart manus: ”%s”" -#: sequencer.c:1368 +#: sequencer.c:1379 msgid "no commits parsed." msgstr "inga incheckningar lästes." -#: sequencer.c:1379 +#: sequencer.c:1390 msgid "cannot cherry-pick during a revert." msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"." -#: sequencer.c:1381 +#: sequencer.c:1392 msgid "cannot revert during a cherry-pick." msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"." -#: sequencer.c:1448 +#: sequencer.c:1459 #, c-format msgid "invalid key: %s" msgstr "felaktig nyckel: %s" -#: sequencer.c:1451 +#: sequencer.c:1462 #, c-format msgid "invalid value for %s: %s" msgstr "felaktigt värde för %s: %s" -#: sequencer.c:1517 +#: sequencer.c:1528 #, c-format msgid "malformed options sheet: '%s'" msgstr "trasigt manus: ”%s”" -#: sequencer.c:1555 +#: sequencer.c:1566 msgid "a cherry-pick or revert is already in progress" msgstr "en \"cherry-pick\" eller \"revert\" pågår redan" -#: sequencer.c:1556 +#: sequencer.c:1567 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:1559 +#: sequencer.c:1570 #, c-format msgid "could not create sequencer directory '%s'" msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\"" -#: sequencer.c:1574 +#: sequencer.c:1585 msgid "could not lock HEAD" msgstr "kunde inte låsa HEAD" -#: sequencer.c:1632 sequencer.c:2211 +#: sequencer.c:1643 sequencer.c:2227 msgid "no cherry-pick or revert in progress" msgstr "ingen \"cherry-pick\" eller \"revert\" pågår" -#: sequencer.c:1634 +#: sequencer.c:1645 msgid "cannot resolve HEAD" msgstr "kan inte bestämma HEAD" -#: sequencer.c:1636 sequencer.c:1671 +#: sequencer.c:1647 sequencer.c:1682 msgid "cannot abort from a branch yet to be born" msgstr "kan inte avbryta från en gren som ännu inte är född" -#: sequencer.c:1657 builtin/grep.c:711 +#: sequencer.c:1668 builtin/grep.c:713 #, c-format msgid "cannot open '%s'" msgstr "kan inte öppna \"%s\"" -#: sequencer.c:1659 +#: sequencer.c:1670 #, c-format msgid "cannot read '%s': %s" msgstr "kan inte läsa \"%s\": %s" -#: sequencer.c:1660 +#: sequencer.c:1671 msgid "unexpected end of file" msgstr "oväntat filslut" -#: sequencer.c:1666 +#: sequencer.c:1677 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "sparad HEAD-fil från före \"cherry-pick\", \"%s\", är trasig" -#: sequencer.c:1677 +#: sequencer.c:1688 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" "Du verkar ha flyttat HEAD.\n" "Spolar inte tillbaka, kontrollera HEAD!" -#: sequencer.c:1818 sequencer.c:2109 +#: sequencer.c:1829 sequencer.c:2125 msgid "cannot read HEAD" msgstr "kan inte läsa HEAD" -#: sequencer.c:1858 builtin/difftool.c:640 +#: sequencer.c:1869 builtin/difftool.c:639 #, c-format msgid "could not copy '%s' to '%s'" msgstr "kunde inte kopiera in \"%s\" till \"%s\"" -#: sequencer.c:1874 +#: sequencer.c:1888 msgid "could not read index" msgstr "kunde inte läsa indexet" -#: sequencer.c:1879 +#: sequencer.c:1893 #, c-format msgid "" "execution failed: %s\n" @@ -3360,11 +3380,11 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:1885 +#: sequencer.c:1899 msgid "and made changes to the index and/or the working tree\n" msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen\n" -#: sequencer.c:1891 +#: sequencer.c:1905 #, c-format msgid "" "execution succeeded: %s\n" @@ -3381,17 +3401,17 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:1948 +#: sequencer.c:1964 #, c-format msgid "Applied autostash.\n" msgstr "Tillämpade autostash.\n" -#: sequencer.c:1960 +#: sequencer.c:1976 #, c-format msgid "cannot store %s" msgstr "kan inte spara %s" -#: sequencer.c:1963 git-rebase.sh:175 +#: sequencer.c:1979 git-rebase.sh:175 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -3402,57 +3422,57 @@ msgstr "" "Dina ändringar är säkra i stashen.\n" "Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n" -#: sequencer.c:2045 +#: sequencer.c:2061 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Stoppade på %s... %.*s\n" -#: sequencer.c:2087 +#: sequencer.c:2103 #, c-format msgid "unknown command %d" msgstr "okänt kommando %d" -#: sequencer.c:2117 +#: sequencer.c:2133 msgid "could not read orig-head" msgstr "kunde inte läsa orig-head" -#: sequencer.c:2122 sequencer.c:2678 +#: sequencer.c:2138 sequencer.c:2739 msgid "could not read 'onto'" msgstr "kunde inte läsa \"onto\"" -#: sequencer.c:2129 +#: sequencer.c:2145 #, c-format msgid "could not update %s" msgstr "kunde inte uppdatera %s" -#: sequencer.c:2136 +#: sequencer.c:2152 #, c-format msgid "could not update HEAD to %s" msgstr "kunde inte uppdatera HEAD till %s" -#: sequencer.c:2220 +#: sequencer.c:2236 msgid "cannot rebase: You have unstaged changes." msgstr "kan inte ombasera: Du har oköade ändringar." -#: sequencer.c:2225 +#: sequencer.c:2241 msgid "could not remove CHERRY_PICK_HEAD" msgstr "kunde inte ta bort CHERRY_PICK_HEAD" -#: sequencer.c:2234 +#: sequencer.c:2250 msgid "cannot amend non-existing commit" msgstr "kan inte lägga till incheckning som inte finns" -#: sequencer.c:2236 +#: sequencer.c:2252 #, c-format msgid "invalid file: '%s'" msgstr "ogiltig fil: \"%s\"" -#: sequencer.c:2238 +#: sequencer.c:2254 #, c-format msgid "invalid contents: '%s'" msgstr "ogiltigt innehåll: \"%s\"" -#: sequencer.c:2241 +#: sequencer.c:2257 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -3462,50 +3482,45 @@ msgstr "" "Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n" "först och kör sedan \"git rebase --continute\" igen." -#: sequencer.c:2251 +#: sequencer.c:2267 msgid "could not commit staged changes." msgstr "kunde inte checka in köade ändringar." -#: sequencer.c:2331 +#: sequencer.c:2347 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: kan inte göra \"cherry-pick\" på typen ”%s”" -#: sequencer.c:2335 +#: sequencer.c:2351 #, c-format msgid "%s: bad revision" msgstr "%s: felaktig revision" -#: sequencer.c:2368 +#: sequencer.c:2384 msgid "can't revert as initial commit" msgstr "kan inte ångra som första incheckning" -#: sequencer.c:2471 +#: sequencer.c:2489 msgid "make_script: unhandled options" msgstr "make_script: flaggor som inte stöds" -#: sequencer.c:2474 +#: sequencer.c:2492 msgid "make_script: error preparing revisions" msgstr "make_script: fel när revisioner skulle förberedas" -#: sequencer.c:2510 +#: sequencer.c:2526 sequencer.c:2561 #, c-format msgid "unusable todo list: '%s'" msgstr "oanvändbar todo-lista: %s" -#: sequencer.c:2516 -#, c-format -msgid "unable to open '%s' for writing" -msgstr "kunde inte öppna \"%s\" för skrivning" - -#: sequencer.c:2561 +#: sequencer.c:2609 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." msgstr "" "okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar." -#: sequencer.c:2641 +#: sequencer.c:2689 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -3514,7 +3529,7 @@ msgstr "" "Varning: vissa incheckningar kan av misstag ha tappats.\n" "Tappade incheckningar (nyaste först):\n" -#: sequencer.c:2648 +#: sequencer.c:2696 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -3534,7 +3549,7 @@ msgstr "" "\" (fel).\n" "\n" -#: sequencer.c:2660 +#: sequencer.c:2708 #, c-format msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" @@ -3545,31 +3560,21 @@ msgstr "" "continue\".\n" "Avbryt ombaseringen med \"git rebase --abort\".\n" -#: sequencer.c:2708 -#, c-format -msgid "could not parse commit '%s'" -msgstr "kunde inte tolka incheckningen\" %s\"" - -#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395 -#: builtin/am.c:775 +#: sequencer.c:2721 sequencer.c:2788 wrapper.c:225 wrapper.c:395 +#: builtin/am.c:779 #, c-format msgid "could not open '%s' for writing" msgstr "kunde inte öppna \"%s\" för skrivning" -#: sequencer.c:2756 +#: sequencer.c:2769 #, c-format -msgid "could not truncate '%s'" -msgstr "kunde inte trunkera \"%s\"" +msgid "could not parse commit '%s'" +msgstr "kunde inte tolka incheckningen\" %s\"" -#: sequencer.c:2848 +#: sequencer.c:2891 msgid "the script was already rearranged." msgstr "skriptet har redan omordnats." -#: sequencer.c:2953 -#, c-format -msgid "could not finish '%s'" -msgstr "kunde inte avsluta \"%s\"" - #: setup.c:171 #, c-format msgid "" @@ -3603,34 +3608,34 @@ msgstr "" "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n" "\"git <kommando> [<revision>...] -- [<fil>...]\"" -#: setup.c:499 +#: setup.c:501 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Förväntade git-arkivversion <= %d, hittade %d" -#: setup.c:507 +#: setup.c:509 msgid "unknown repository extensions found:" msgstr "okända arkivutökningar hittades:" -#: setup.c:806 +#: setup.c:811 #, c-format msgid "Not a git repository (or any of the parent directories): %s" msgstr "Inte ett git-arkiv (eller någon av föräldrakatalogerna): %s" -#: setup.c:808 builtin/index-pack.c:1653 +#: setup.c:813 builtin/index-pack.c:1653 msgid "Cannot come back to cwd" msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)" -#: setup.c:1046 +#: setup.c:1052 msgid "Unable to read current working directory" msgstr "Kan inte läsa aktuell arbetskatalog" -#: setup.c:1058 setup.c:1064 +#: setup.c:1064 setup.c:1070 #, c-format msgid "Cannot change to '%s'" msgstr "Kan inte byta till \"%s\"" -#: setup.c:1077 +#: setup.c:1083 #, c-format msgid "" "Not a git repository (or any parent up to mount point %s)\n" @@ -3640,7 +3645,7 @@ msgstr "" "monteringspunkten %s)\n" "Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)." -#: setup.c:1159 +#: setup.c:1167 #, c-format msgid "" "Problem with core.sharedRepository filemode value (0%.3o).\n" @@ -3649,41 +3654,41 @@ msgstr "" "Problem med filläges-värdet i core.sharedRepository (0%.3o).\n" "Ägaren av filerna måste alltid ha läs- och skrivbehörighet." -#: sha1_file.c:528 +#: sha1_file.c:598 #, c-format msgid "path '%s' does not exist" msgstr "sökvägen \"%s\" finns inte" -#: sha1_file.c:554 +#: sha1_file.c:624 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "referensarkivet \"%s\" som en länkad utcheckning stöds inte ännu." -#: sha1_file.c:560 +#: sha1_file.c:630 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv." -#: sha1_file.c:566 +#: sha1_file.c:636 #, c-format msgid "reference repository '%s' is shallow" msgstr "referensarkivet \"%s\" är grunt" -#: sha1_file.c:574 +#: sha1_file.c:644 #, c-format msgid "reference repository '%s' is grafted" msgstr "referensarkivet \"%s\" är ympat" -#: sha1_name.c:420 +#: sha1_name.c:422 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "kort SHA1 %s är tvetydig" -#: sha1_name.c:431 +#: sha1_name.c:433 msgid "The candidates are:" msgstr "Kandidaterna är:" -#: sha1_name.c:590 +#: sha1_name.c:693 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" @@ -3705,71 +3710,71 @@ msgstr "" "Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n" "genom att köra \"git config advice.objectNameWarning false\"" -#: submodule.c:93 submodule.c:127 +#: submodule.c:96 submodule.c:130 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" "Kan inte ändra .gitmodules-fil som inte slagits ihop, lös " "sammanslagningskonflikter först" -#: submodule.c:97 submodule.c:131 +#: submodule.c:100 submodule.c:134 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "Hittade inte någon sektion i .gitmodules där sökväg=%s" -#: submodule.c:105 +#: submodule.c:108 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Kunde inte uppdatera .gitmodules-posten %s" -#: submodule.c:138 +#: submodule.c:141 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "Kunde inte ta bort .gitmodules-posten för %s" -#: submodule.c:149 +#: submodule.c:152 msgid "staging updated .gitmodules failed" msgstr "misslyckades köa uppdaterad .gitmodules" -#: submodule.c:309 +#: submodule.c:312 #, c-format msgid "in unpopulated submodule '%s'" msgstr "i ej utcheckad undermodul \"%s\"" -#: submodule.c:340 +#: submodule.c:343 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\"" -#: submodule.c:799 +#: submodule.c:833 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "undermodulposten \"%s\" (%s) är en %s, inte en incheckning" -#: submodule.c:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149 +#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387 msgid "Failed to resolve HEAD as a valid ref." msgstr "Misslyckades slå upp HEAD som giltig referens." -#: submodule.c:1304 +#: submodule.c:1370 #, c-format msgid "'%s' not recognized as a git repository" msgstr "\"%s\" känns inte igen som ett git-arkiv" -#: submodule.c:1442 +#: submodule.c:1508 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "kunde inte starta \"git status\" i undermodulen \"%s\"" -#: submodule.c:1455 +#: submodule.c:1521 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "kunde inte köra \"git status\" i undermodulen \"%s\"" -#: submodule.c:1548 +#: submodule.c:1614 #, c-format msgid "submodule '%s' has dirty index" msgstr "undermodulen \"%s\" har ett smutsigt index" -#: submodule.c:1809 +#: submodule.c:1876 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -3777,18 +3782,18 @@ msgstr "" "relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, " "stöds ej" -#: submodule.c:1821 submodule.c:1877 +#: submodule.c:1888 submodule.c:1944 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "kunde inte slå upp namnet för undermodulen \"%s\"" -#: submodule.c:1825 builtin/submodule--helper.c:671 -#: builtin/submodule--helper.c:681 +#: submodule.c:1892 builtin/submodule--helper.c:909 +#: builtin/submodule--helper.c:919 #, c-format msgid "could not create directory '%s'" msgstr "kunde inte skapa katalogen \"%s\"" -#: submodule.c:1828 +#: submodule.c:1895 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -3799,20 +3804,20 @@ msgstr "" "\"%s\" till\n" "\"%s\"\n" -#: submodule.c:1912 +#: submodule.c:1979 #, c-format msgid "could not recurse into submodule '%s'" msgstr "kunde inte rekursera in i undermodulen \"%s\"" -#: submodule.c:1956 +#: submodule.c:2023 msgid "could not start ls-files in .." msgstr "kunde inte starta ls-files i .." -#: submodule.c:1976 +#: submodule.c:2043 msgid "BUG: returned path string doesn't match cwd?" msgstr "BUG: returnerad sökvägssträng matchar inte cwd?" -#: submodule.c:1995 +#: submodule.c:2062 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree returnerade en oväntad returkod %d" @@ -3873,24 +3878,24 @@ msgstr "filen %s är inte skrivbar av användaren" #: trailer.c:1024 msgid "could not open temporary file" -msgstr "kunde inte öppna temporär file" +msgstr "kunde inte öppna temporär fil" #: trailer.c:1064 #, c-format msgid "could not rename temporary file to %s" msgstr "kunde inte byta namn på temporär fil till %s" -#: transport.c:62 +#: transport.c:63 #, c-format msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "Skulle sätta uppströms för \"%s\" till \"%s\" från \"%s\"\n" -#: transport.c:151 +#: transport.c:152 #, c-format msgid "transport: invalid depth option '%s'" msgstr "transport: ogiltig flagga för depth: ”%s”" -#: transport.c:888 +#: transport.c:904 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -3899,7 +3904,7 @@ msgstr "" "Följande undermodulsökvägar innehåller ändringar som\n" "inte kan hittas av fjärrarna:\n" -#: transport.c:892 +#: transport.c:908 #, c-format msgid "" "\n" @@ -3926,11 +3931,11 @@ msgstr "" "för att sända dem till fjärren.\n" "\n" -#: transport.c:900 +#: transport.c:916 msgid "Aborting." msgstr "Avbryter." -#: transport-helper.c:1071 +#: transport-helper.c:1074 #, c-format msgid "Could not read ref %s" msgstr "Kunde inte läsa referensen %s" @@ -3951,7 +3956,7 @@ msgstr "tomt filnamn i trädpost" msgid "too-short tree file" msgstr "trädfil för kort" -#: unpack-trees.c:106 +#: unpack-trees.c:107 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3960,7 +3965,7 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n" "%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren." -#: unpack-trees.c:108 +#: unpack-trees.c:109 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3969,7 +3974,7 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n" "%%s" -#: unpack-trees.c:111 +#: unpack-trees.c:112 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3979,7 +3984,7 @@ msgstr "" "sammanslagning:\n" "%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren." -#: unpack-trees.c:113 +#: unpack-trees.c:114 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3989,7 +3994,7 @@ msgstr "" "sammanslagning:\n" "%%s" -#: unpack-trees.c:116 +#: unpack-trees.c:117 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -3998,7 +4003,7 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n" "%%sChecka in dina ändringar eller använd \"stash\" innan du \"%s\"." -#: unpack-trees.c:118 +#: unpack-trees.c:119 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -4007,7 +4012,7 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n" "%%s" -#: unpack-trees.c:123 +#: unpack-trees.c:124 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -4017,7 +4022,7 @@ msgstr "" "dem:\n" "%s" -#: unpack-trees.c:127 +#: unpack-trees.c:128 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -4026,7 +4031,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n" "%%sFlytta eller ta bort dem innan du byter gren." -#: unpack-trees.c:129 +#: unpack-trees.c:130 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -4035,7 +4040,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n" "%%s" -#: unpack-trees.c:132 +#: unpack-trees.c:133 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -4045,7 +4050,7 @@ msgstr "" "sammanslagningen:\n" "%%sFlytta eller ta bort dem innan du slår samman." -#: unpack-trees.c:134 +#: unpack-trees.c:135 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -4055,7 +4060,7 @@ msgstr "" "sammanslagningen:\n" "%%s" -#: unpack-trees.c:137 +#: unpack-trees.c:138 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -4064,7 +4069,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n" "%%sFlytta eller ta bort dem innan du \"%s\"." -#: unpack-trees.c:139 +#: unpack-trees.c:140 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -4073,7 +4078,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n" "%%s" -#: unpack-trees.c:144 +#: unpack-trees.c:145 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -4084,7 +4089,7 @@ msgstr "" "utcheckningen:\n" "%%sFlytta eller ta bort dem innan du byter gren." -#: unpack-trees.c:146 +#: unpack-trees.c:147 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -4095,7 +4100,7 @@ msgstr "" "utcheckningen:\n" "%%s" -#: unpack-trees.c:149 +#: unpack-trees.c:150 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -4105,7 +4110,7 @@ msgstr "" "sammanslagningen:\n" "%%sFlytta eller ta bort dem innan du byter gren." -#: unpack-trees.c:151 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -4115,7 +4120,7 @@ msgstr "" "sammanslagningen:\n" "%%s" -#: unpack-trees.c:154 +#: unpack-trees.c:155 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -4124,7 +4129,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n" "%%sFlytta eller ta bort dem innan du \"%s\"." -#: unpack-trees.c:156 +#: unpack-trees.c:157 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -4133,12 +4138,12 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n" "%%s" -#: unpack-trees.c:163 +#: unpack-trees.c:164 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "Posten \"%s\" överlappar \"%s\". Kan inte binda." -#: unpack-trees.c:166 +#: unpack-trees.c:167 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" @@ -4147,7 +4152,7 @@ msgstr "" "Kan inte uppdatera gles utcheckning: följande poster är inte à jour:\n" "%s" -#: unpack-trees.c:168 +#: unpack-trees.c:169 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -4158,7 +4163,7 @@ msgstr "" "utcheckning:\n" "%s" -#: unpack-trees.c:170 +#: unpack-trees.c:171 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -4169,7 +4174,7 @@ msgstr "" "utcheckning:\n" "%s" -#: unpack-trees.c:172 +#: unpack-trees.c:173 #, c-format msgid "" "Cannot update submodule:\n" @@ -4178,12 +4183,12 @@ msgstr "" "Kan inte uppdatera undermodul:\n" "%s" -#: unpack-trees.c:249 +#: unpack-trees.c:250 #, c-format msgid "Aborting\n" msgstr "Avbryter\n" -#: unpack-trees.c:331 +#: unpack-trees.c:332 msgid "Checking out files" msgstr "Checkar ut filer" @@ -4226,8 +4231,8 @@ msgstr "misslyckades läsa \"%s\"" msgid "could not open '%s' for reading and writing" msgstr "kunde inte öppna \"%s\" för läsning och skrivning" -#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766 -#: builtin/am.c:858 builtin/merge.c:1041 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770 +#: builtin/am.c:862 builtin/merge.c:1043 #, c-format msgid "could not open '%s' for reading" msgstr "kunde inte öppna \"%s\" för läsning" @@ -4241,16 +4246,6 @@ msgstr "kan inte komma åt \"%s\"" msgid "unable to get current working directory" msgstr "kan inte hämta aktuell arbetskatalog" -#: wrapper.c:656 -#, c-format -msgid "could not write to %s" -msgstr "kunde inte skriva till %s" - -#: wrapper.c:658 -#, c-format -msgid "could not close %s" -msgstr "kunde inte stänga %s" - #: wt-status.c:150 msgid "Unmerged paths:" msgstr "Ej sammanslagna sökvägar:" @@ -4276,11 +4271,11 @@ msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning) msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (använd \"git rm <fil>...\" för att ange lösning)" -#: wt-status.c:198 wt-status.c:979 +#: wt-status.c:198 wt-status.c:984 msgid "Changes to be committed:" msgstr "Ändringar att checka in:" -#: wt-status.c:216 wt-status.c:988 +#: wt-status.c:216 wt-status.c:993 msgid "Changes not staged for commit:" msgstr "Ändringar ej i incheckningskön:" @@ -4384,22 +4379,22 @@ msgstr "ändrat innehåll, " msgid "untracked content, " msgstr "ospårat innehåll, " -#: wt-status.c:819 +#: wt-status.c:824 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "Stashen innehåller just nu %d post" msgstr[1] "Stashen innehåller just nu %d poster" -#: wt-status.c:851 +#: wt-status.c:856 msgid "Submodules changed but not updated:" msgstr "Undermoduler ändrade men inte uppdaterade:" -#: wt-status.c:853 +#: wt-status.c:858 msgid "Submodule changes to be committed:" msgstr "Undermodulers ändringar att checka in:" -#: wt-status.c:935 +#: wt-status.c:940 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -4407,107 +4402,107 @@ msgstr "" "Raden ovan får inte ändras eller tas bort.\n" "Allt under den kommer tas bort." -#: wt-status.c:1048 +#: wt-status.c:1053 msgid "You have unmerged paths." msgstr "Du har ej sammanslagna sökvägar." -#: wt-status.c:1051 +#: wt-status.c:1056 msgid " (fix conflicts and run \"git commit\")" msgstr " (rätta konflikter och kör \"git commit\")" -#: wt-status.c:1053 +#: wt-status.c:1058 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (använd \"git merge --abort\" för att avbryta sammanslagningen)" -#: wt-status.c:1058 +#: wt-status.c:1063 msgid "All conflicts fixed but you are still merging." msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning." -#: wt-status.c:1061 +#: wt-status.c:1066 msgid " (use \"git commit\" to conclude merge)" msgstr " (använd \"git commit\" för att slutföra sammanslagningen)" -#: wt-status.c:1071 +#: wt-status.c:1076 msgid "You are in the middle of an am session." msgstr "Du är i mitten av en körning av \"git am\"." -#: wt-status.c:1074 +#: wt-status.c:1079 msgid "The current patch is empty." msgstr "Aktuell patch är tom." -#: wt-status.c:1078 +#: wt-status.c:1083 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (rätta konflikter och kör sedan \"git am --continue\")" -#: wt-status.c:1080 +#: wt-status.c:1085 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (använd \"git am --skip\" för att hoppa över patchen)" -#: wt-status.c:1082 +#: wt-status.c:1087 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)" -#: wt-status.c:1214 +#: wt-status.c:1219 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo saknas." -#: wt-status.c:1216 +#: wt-status.c:1221 msgid "No commands done." msgstr "Inga kommandon utförda." -#: wt-status.c:1219 +#: wt-status.c:1224 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Sista kommandot utfört (%d kommando utfört):" msgstr[1] "Sista kommandot utfört (%d kommandon utfört):" -#: wt-status.c:1230 +#: wt-status.c:1235 #, c-format msgid " (see more in file %s)" msgstr " (se fler i filen %s)" -#: wt-status.c:1235 +#: wt-status.c:1240 msgid "No commands remaining." msgstr "Inga kommandon återstår." -#: wt-status.c:1238 +#: wt-status.c:1243 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Nästa kommando att utföra (%d kommando återstår):" msgstr[1] "Följande kommandon att utföra (%d kommandon återstår):" -#: wt-status.c:1246 +#: wt-status.c:1251 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (använd \"git rebase --edit-todo\" för att visa och redigera)" -#: wt-status.c:1259 +#: wt-status.c:1264 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"." -#: wt-status.c:1264 +#: wt-status.c:1269 msgid "You are currently rebasing." msgstr "Du håller på med en ombasering." -#: wt-status.c:1278 +#: wt-status.c:1283 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")" -#: wt-status.c:1280 +#: wt-status.c:1285 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)" -#: wt-status.c:1282 +#: wt-status.c:1287 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)" -#: wt-status.c:1288 +#: wt-status.c:1293 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (alla konflikter rättade: kör \"git rebase --continue\")" -#: wt-status.c:1292 +#: wt-status.c:1297 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -4515,126 +4510,126 @@ msgstr "" "Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" " "ovanpå \"%s\"." -#: wt-status.c:1297 +#: wt-status.c:1302 msgid "You are currently splitting a commit during a rebase." msgstr "Du håller på att dela upp en incheckning i en ombasering." -#: wt-status.c:1300 +#: wt-status.c:1305 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")" -#: wt-status.c:1304 +#: wt-status.c:1309 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Du håller på att redigera en incheckning medan du ombaserar grenen \"%s\" " "ovanpå \"%s\"." -#: wt-status.c:1309 +#: wt-status.c:1314 msgid "You are currently editing a commit during a rebase." msgstr "Du håller på att redigera en incheckning under en ombasering." -#: wt-status.c:1312 +#: wt-status.c:1317 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" " (använd \"git commit --amend\" för att lägga till på aktuell incheckning)" -#: wt-status.c:1314 +#: wt-status.c:1319 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändringar)" -#: wt-status.c:1324 +#: wt-status.c:1329 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Du håller på med en \"cherry-pick\" av incheckningen %s." -#: wt-status.c:1329 +#: wt-status.c:1334 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")" -#: wt-status.c:1332 +#: wt-status.c:1337 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")" -#: wt-status.c:1334 +#: wt-status.c:1339 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-" "operationen)" -#: wt-status.c:1343 +#: wt-status.c:1348 #, c-format msgid "You are currently reverting commit %s." msgstr "Du håller på med att ångra incheckningen %s." -#: wt-status.c:1348 +#: wt-status.c:1353 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (rätta konflikter och kör sedan \"git revert --continue\")" -#: wt-status.c:1351 +#: wt-status.c:1356 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (alla konflikter rättade: kör \"git revert --continue\")" -#: wt-status.c:1353 +#: wt-status.c:1358 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)" -#: wt-status.c:1364 +#: wt-status.c:1369 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Du håller på med en \"bisect\", startad från grenen \"%s\"." -#: wt-status.c:1368 +#: wt-status.c:1373 msgid "You are currently bisecting." msgstr "Du håller på med en \"bisect\"." -#: wt-status.c:1371 +#: wt-status.c:1376 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" " (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)" -#: wt-status.c:1568 +#: wt-status.c:1573 msgid "On branch " msgstr "På grenen " -#: wt-status.c:1574 +#: wt-status.c:1579 msgid "interactive rebase in progress; onto " msgstr "interaktiv ombasering pågår; ovanpå " -#: wt-status.c:1576 +#: wt-status.c:1581 msgid "rebase in progress; onto " msgstr "ombasering pågår; ovanpå " -#: wt-status.c:1581 +#: wt-status.c:1586 msgid "HEAD detached at " msgstr "HEAD frånkopplad vid " -#: wt-status.c:1583 +#: wt-status.c:1588 msgid "HEAD detached from " msgstr "HEAD frånkopplad från " -#: wt-status.c:1586 +#: wt-status.c:1591 msgid "Not currently on any branch." msgstr "Inte på någon gren för närvarande." -#: wt-status.c:1606 +#: wt-status.c:1611 msgid "Initial commit" msgstr "Första incheckning" -#: wt-status.c:1607 +#: wt-status.c:1612 msgid "No commits yet" msgstr "Inga incheckningar ännu" -#: wt-status.c:1621 +#: wt-status.c:1626 msgid "Untracked files" msgstr "Ospårade filer" -#: wt-status.c:1623 +#: wt-status.c:1628 msgid "Ignored files" msgstr "Ignorerade filer" -#: wt-status.c:1627 +#: wt-status.c:1632 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -4646,32 +4641,32 @@ msgstr "" "lägga till nya filer själv (se \"git help status\")." # %s är nästa sträng eller tom. -#: wt-status.c:1633 +#: wt-status.c:1638 #, c-format msgid "Untracked files not listed%s" msgstr "Ospårade filer visas ej%s" -#: wt-status.c:1635 +#: wt-status.c:1640 msgid " (use -u option to show untracked files)" msgstr " (använd flaggan -u för att visa ospårade filer)" -#: wt-status.c:1641 +#: wt-status.c:1646 msgid "No changes" msgstr "Inga ändringar" -#: wt-status.c:1646 +#: wt-status.c:1651 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a" "\")\n" -#: wt-status.c:1649 +#: wt-status.c:1654 #, c-format msgid "no changes added to commit\n" msgstr "inga ändringar att checka in\n" -#: wt-status.c:1652 +#: wt-status.c:1657 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -4680,58 +4675,58 @@ msgstr "" "inget köat för incheckning, men ospårade filer finns (spåra med \"git add" "\")\n" -#: wt-status.c:1655 +#: wt-status.c:1660 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "inget köat för incheckning, men ospårade filer finns\n" -#: wt-status.c:1658 +#: wt-status.c:1663 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n" -#: wt-status.c:1661 wt-status.c:1666 +#: wt-status.c:1666 wt-status.c:1671 #, c-format msgid "nothing to commit\n" msgstr "inget att checka in\n" -#: wt-status.c:1664 +#: wt-status.c:1669 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "inget att checka in (använd -u för att visa ospårade filer)\n" -#: wt-status.c:1668 +#: wt-status.c:1673 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "inget att checka in, arbetskatalogen ren\n" -#: wt-status.c:1780 +#: wt-status.c:1785 msgid "No commits yet on " msgstr "Inga incheckningar ännu på " -#: wt-status.c:1784 +#: wt-status.c:1789 msgid "HEAD (no branch)" msgstr "HEAD (ingen gren)" -#: wt-status.c:1813 wt-status.c:1821 +#: wt-status.c:1818 wt-status.c:1826 msgid "behind " msgstr "efter " -#: wt-status.c:1816 wt-status.c:1819 +#: wt-status.c:1821 wt-status.c:1824 msgid "ahead " msgstr "före " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2311 +#: wt-status.c:2318 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "kan inte %s: Du har oköade ändringar." -#: wt-status.c:2317 +#: wt-status.c:2324 msgid "additionally, your index contains uncommitted changes." msgstr "dessutom innehåller dit index ändringar som inte har checkats in." -#: wt-status.c:2319 +#: wt-status.c:2326 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in." @@ -4745,122 +4740,126 @@ msgstr "misslyckades ta bort länken \"%s\"" msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<flaggor>] [--] <sökväg>..." -#: builtin/add.c:82 +#: builtin/add.c:83 #, c-format msgid "unexpected diff status %c" msgstr "diff-status %c förväntades inte" -#: builtin/add.c:87 builtin/commit.c:291 +#: builtin/add.c:88 builtin/commit.c:291 msgid "updating files failed" msgstr "misslyckades uppdatera filer" -#: builtin/add.c:97 +#: builtin/add.c:98 #, c-format msgid "remove '%s'\n" msgstr "ta bort \"%s\"\n" -#: builtin/add.c:153 +#: builtin/add.c:173 msgid "Unstaged changes after refreshing the index:" msgstr "Oköade ändringar efter att ha uppdaterat indexet:" -#: builtin/add.c:213 builtin/rev-parse.c:888 +#: builtin/add.c:233 builtin/rev-parse.c:888 msgid "Could not read the index" msgstr "Kunde inte läsa indexet" -#: builtin/add.c:224 +#: builtin/add.c:244 #, c-format msgid "Could not open '%s' for writing." msgstr "Kunde inte öppna \"%s\" för skrivning." -#: builtin/add.c:228 +#: builtin/add.c:248 msgid "Could not write patch" msgstr "Kunde inte skriva patch" -#: builtin/add.c:231 +#: builtin/add.c:251 msgid "editing patch failed" msgstr "redigering av patch misslyckades" -#: builtin/add.c:234 +#: builtin/add.c:254 #, c-format msgid "Could not stat '%s'" msgstr "Kunde inte ta status på \"%s\"" -#: builtin/add.c:236 +#: builtin/add.c:256 msgid "Empty patch. Aborted." msgstr "Tom patch. Avbryter." -#: builtin/add.c:241 +#: builtin/add.c:261 #, c-format msgid "Could not apply '%s'" msgstr "Kunde inte tillämpa \"%s\"" -#: builtin/add.c:251 +#: builtin/add.c:271 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n" -#: builtin/add.c:271 builtin/clean.c:910 builtin/fetch.c:132 builtin/mv.c:124 -#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529 +#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124 +#: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541 #: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164 msgid "dry run" msgstr "testkörning" -#: builtin/add.c:274 +#: builtin/add.c:294 msgid "interactive picking" msgstr "plocka interaktivt" -#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310 +#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310 msgid "select hunks interactively" msgstr "välj stycken interaktivt" -#: builtin/add.c:276 +#: builtin/add.c:296 msgid "edit current diff and apply" msgstr "redigera aktuell diff och applicera" -#: builtin/add.c:277 +#: builtin/add.c:297 msgid "allow adding otherwise ignored files" msgstr "tillåt lägga till annars ignorerade filer" -#: builtin/add.c:278 +#: builtin/add.c:298 msgid "update tracked files" msgstr "uppdatera spårade filer" -#: builtin/add.c:279 +#: builtin/add.c:299 +msgid "renormalize EOL of tracked files (implies -u)" +msgstr "åternormalisera radslut i spårade filer (implicerar -u)" + +#: builtin/add.c:300 msgid "record only the fact that the path will be added later" msgstr "registrera endast att sökvägen kommer läggas till senare" -#: builtin/add.c:280 +#: builtin/add.c:301 msgid "add changes from all tracked and untracked files" msgstr "lägg till ändringar från alla spårade och ospårade filer" -#: builtin/add.c:283 +#: builtin/add.c:304 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "ignorera sökvägar borttagna i arbetskatalogen (samma som --no-all)" -#: builtin/add.c:285 +#: builtin/add.c:306 msgid "don't add, only refresh the index" msgstr "lägg inte till, uppdatera endast indexet" -#: builtin/add.c:286 +#: builtin/add.c:307 msgid "just skip files which cannot be added because of errors" msgstr "hoppa bara över filer som inte kan läggas till på grund av fel" -#: builtin/add.c:287 +#: builtin/add.c:308 msgid "check if - even missing - files are ignored in dry run" msgstr "se om - även saknade - filer ignoreras i testkörning" -#: builtin/add.c:288 builtin/update-index.c:954 +#: builtin/add.c:309 builtin/update-index.c:964 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/add.c:288 builtin/update-index.c:955 +#: builtin/add.c:309 builtin/update-index.c:965 msgid "override the executable bit of the listed files" msgstr "överstyr exekveringsbiten för angivna filer" -#: builtin/add.c:290 +#: builtin/add.c:311 msgid "warn when adding an embedded repository" msgstr "varna när ett inbyggt arkiv läggs till" -#: builtin/add.c:305 +#: builtin/add.c:326 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -4891,47 +4890,47 @@ msgstr "" "\n" "Se ”git help submodule” för ytterligare information." -#: builtin/add.c:333 +#: builtin/add.c:354 #, c-format msgid "adding embedded git repository: %s" msgstr "lägger till inbäddat git-arkiv: %s" -#: builtin/add.c:351 +#: builtin/add.c:372 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Använd -f om du verkligen vill lägga till dem.\n" -#: builtin/add.c:359 +#: builtin/add.c:380 msgid "adding files failed" msgstr "misslyckades lägga till filer" -#: builtin/add.c:396 +#: builtin/add.c:417 msgid "-A and -u are mutually incompatible" msgstr "-A och -u är ömsesidigt inkompatibla" -#: builtin/add.c:403 +#: builtin/add.c:424 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run" -#: builtin/add.c:407 +#: builtin/add.c:428 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "--chmod-parametern \"%s\" måste antingen vara -x eller +x" -#: builtin/add.c:422 +#: builtin/add.c:443 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Inget angivet, inget tillagt.\n" -#: builtin/add.c:423 +#: builtin/add.c:444 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Kanske menade du att skriva \"git add .\"?\n" -#: builtin/add.c:428 builtin/check-ignore.c:176 builtin/checkout.c:282 -#: builtin/checkout.c:479 builtin/clean.c:957 builtin/commit.c:350 -#: builtin/mv.c:143 builtin/reset.c:249 builtin/rm.c:271 -#: builtin/submodule--helper.c:243 +#: builtin/add.c:449 builtin/check-ignore.c:176 builtin/checkout.c:281 +#: builtin/checkout.c:484 builtin/clean.c:958 builtin/commit.c:350 +#: builtin/diff-tree.c:114 builtin/mv.c:143 builtin/reset.c:249 +#: builtin/rm.c:271 builtin/submodule--helper.c:311 msgid "index file corrupt" msgstr "indexfilen trasig" @@ -4958,85 +4957,85 @@ msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\"" msgid "fseek failed" msgstr "\"fseek\" misslyckades" -#: builtin/am.c:786 +#: builtin/am.c:790 #, c-format msgid "could not parse patch '%s'" msgstr "kunde inte tolka patchen \"%s\"" -#: builtin/am.c:851 +#: builtin/am.c:855 msgid "Only one StGIT patch series can be applied at once" msgstr "Endast en StGIT-patchserie kan tillämpas åt gången" -#: builtin/am.c:899 +#: builtin/am.c:903 msgid "invalid timestamp" msgstr "ogiltig tidsstämpel" -#: builtin/am.c:904 builtin/am.c:916 +#: builtin/am.c:908 builtin/am.c:920 msgid "invalid Date line" msgstr "ogiltig \"Date\"-rad" -#: builtin/am.c:911 +#: builtin/am.c:915 msgid "invalid timezone offset" msgstr "ogiltig tidszons-offset" -#: builtin/am.c:1004 +#: builtin/am.c:1008 msgid "Patch format detection failed." msgstr "Misslyckades detektera patchformat." -#: builtin/am.c:1009 builtin/clone.c:402 +#: builtin/am.c:1013 builtin/clone.c:402 #, c-format msgid "failed to create directory '%s'" msgstr "misslyckades skapa katalogen \"%s\"" -#: builtin/am.c:1013 +#: builtin/am.c:1017 msgid "Failed to split patches." msgstr "Misslyckades dela patchar." -#: builtin/am.c:1142 builtin/commit.c:376 +#: builtin/am.c:1146 builtin/commit.c:376 msgid "unable to write index file" msgstr "kan inte skriva indexfil" -#: builtin/am.c:1193 +#: builtin/am.c:1197 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "När du har löst problemet, kör \"%s --continue\"." -#: builtin/am.c:1194 +#: builtin/am.c:1198 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Om du hellre vill hoppa över patchen, kör \"%s --skip\" i stället." -#: builtin/am.c:1195 +#: builtin/am.c:1199 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "För att återgå till ursprunglig gren och sluta patcha, kör \"%s --abort\"." -#: builtin/am.c:1302 +#: builtin/am.c:1306 msgid "Patch is empty." msgstr "Patchen är tom." -#: builtin/am.c:1368 +#: builtin/am.c:1372 #, c-format msgid "invalid ident line: %.*s" msgstr "ogiltig ident-rad: %.*s" -#: builtin/am.c:1390 +#: builtin/am.c:1394 #, c-format msgid "unable to parse commit %s" msgstr "kunde inte tolka incheckningen %s" -#: builtin/am.c:1584 +#: builtin/am.c:1587 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Arkivet saknar objekt som behövs för att falla tillbaka på 3-" "vägssammanslagning." -#: builtin/am.c:1586 +#: builtin/am.c:1589 msgid "Using index info to reconstruct a base tree..." msgstr "Använder indexinfo för att återskapa ett basträd..." -#: builtin/am.c:1605 +#: builtin/am.c:1608 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -5044,39 +5043,39 @@ msgstr "" "Har du handredigerat din patch?\n" "Den kan inte tillämpas på blobbar som antecknats i dess index." -#: builtin/am.c:1611 +#: builtin/am.c:1614 msgid "Falling back to patching base and 3-way merge..." msgstr "" "Faller tillbaka på att patcha grundversionen och trevägssammanslagning..." -#: builtin/am.c:1636 +#: builtin/am.c:1639 msgid "Failed to merge in the changes." msgstr "Misslyckades slå ihop ändringarna." -#: builtin/am.c:1660 builtin/merge.c:641 +#: builtin/am.c:1663 builtin/merge.c:642 msgid "git write-tree failed to write a tree" msgstr "git write-tree misslyckades skriva ett träd" -#: builtin/am.c:1667 +#: builtin/am.c:1670 msgid "applying to an empty history" msgstr "tillämpar på en tom historik" -#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824 -#: builtin/merge.c:849 +#: builtin/am.c:1683 builtin/commit.c:1798 builtin/merge.c:825 +#: builtin/merge.c:850 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" -#: builtin/am.c:1713 builtin/am.c:1717 +#: builtin/am.c:1716 builtin/am.c:1720 #, c-format msgid "cannot resume: %s does not exist." msgstr "kan inte återuppta: %s finns inte." -#: builtin/am.c:1733 +#: builtin/am.c:1736 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "kan inte vara interaktiv om standard in inte är ansluten till en terminal." -#: builtin/am.c:1738 +#: builtin/am.c:1741 msgid "Commit Body is:" msgstr "Incheckningskroppen är:" @@ -5084,35 +5083,35 @@ msgstr "Incheckningskroppen är:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1748 +#: builtin/am.c:1751 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla: " -#: builtin/am.c:1798 +#: builtin/am.c:1801 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)" -#: builtin/am.c:1838 builtin/am.c:1910 +#: builtin/am.c:1841 builtin/am.c:1913 #, c-format msgid "Applying: %.*s" msgstr "Tillämpar: %.*s" -#: builtin/am.c:1854 +#: builtin/am.c:1857 msgid "No changes -- Patch already applied." msgstr "Inga ändringar -- Patchen har redan tillämpats." -#: builtin/am.c:1862 +#: builtin/am.c:1865 #, c-format msgid "Patch failed at %s %.*s" msgstr "Patch misslyckades på %s %.*s" -#: builtin/am.c:1868 +#: builtin/am.c:1871 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "En kopia av patchen som misslyckades finns i: %s" -#: builtin/am.c:1913 +#: builtin/am.c:1916 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -5122,7 +5121,7 @@ msgstr "" "Om det inte är något kvar att köa kan det hända att något annat redan\n" "introducerat samma ändringar; kanske du bör hoppa över patchen." -#: builtin/am.c:1920 +#: builtin/am.c:1923 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -5134,17 +5133,17 @@ msgstr "" "lösta.\n" "Du kan köra ”git rm” för att godta ”borttagen av dem” för den." -#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332 +#: builtin/am.c:2030 builtin/am.c:2034 builtin/am.c:2046 builtin/reset.c:332 #: builtin/reset.c:340 #, c-format msgid "Could not parse object '%s'." msgstr "Kan inte tolka objektet ”%s”." -#: builtin/am.c:2081 +#: builtin/am.c:2082 msgid "failed to clean index" msgstr "misslyckades städa upp indexet" -#: builtin/am.c:2116 +#: builtin/am.c:2117 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -5152,133 +5151,133 @@ msgstr "" "Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n" "Återställer inte till ORIG_HEAD" -#: builtin/am.c:2179 +#: builtin/am.c:2180 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Felaktigt värde för --patch-format: %s" -#: builtin/am.c:2212 +#: builtin/am.c:2213 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2213 +#: builtin/am.c:2214 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<flaggor>] (--continue | --skip | --abort)" -#: builtin/am.c:2219 +#: builtin/am.c:2220 msgid "run interactively" msgstr "kör interaktivt" -#: builtin/am.c:2221 +#: builtin/am.c:2222 msgid "historical option -- no-op" msgstr "historisk flagga -- no-op" -#: builtin/am.c:2223 +#: builtin/am.c:2224 msgid "allow fall back on 3way merging if needed" msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt" -#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57 +#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57 #: builtin/repack.c:180 msgid "be quiet" msgstr "var tyst" -#: builtin/am.c:2226 +#: builtin/am.c:2227 msgid "add a Signed-off-by line to the commit message" msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet" -#: builtin/am.c:2229 +#: builtin/am.c:2230 msgid "recode into utf8 (default)" msgstr "koda om till utf8 (standard)" -#: builtin/am.c:2231 +#: builtin/am.c:2232 msgid "pass -k flag to git-mailinfo" msgstr "sänd flaggan -k till git-mailinfo" -#: builtin/am.c:2233 +#: builtin/am.c:2234 msgid "pass -b flag to git-mailinfo" msgstr "sänd flaggan -b till git-mailinfo" -#: builtin/am.c:2235 +#: builtin/am.c:2236 msgid "pass -m flag to git-mailinfo" msgstr "sänd flaggan -m till git-mailinfo" -#: builtin/am.c:2237 +#: builtin/am.c:2238 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "sänd flaggan --keep-cr till git-mailsplit för mbox-formatet" -#: builtin/am.c:2240 +#: builtin/am.c:2241 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "sänd inte flaggan --keep-cr till git-mailsplit oberoende av am.keepcr" -#: builtin/am.c:2243 +#: builtin/am.c:2244 msgid "strip everything before a scissors line" msgstr "ta bort allting före en saxlinje" -#: builtin/am.c:2245 builtin/am.c:2248 builtin/am.c:2251 builtin/am.c:2254 -#: builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263 builtin/am.c:2266 -#: builtin/am.c:2272 +#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255 +#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 +#: builtin/am.c:2273 msgid "pass it through git-apply" msgstr "sänd det genom git-apply" -#: builtin/am.c:2262 builtin/fmt-merge-msg.c:664 builtin/fmt-merge-msg.c:667 -#: builtin/grep.c:843 builtin/merge.c:205 builtin/pull.c:142 builtin/pull.c:197 +#: builtin/am.c:2263 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668 +#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203 #: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195 #: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377 #: parse-options.h:132 parse-options.h:134 parse-options.h:245 msgid "n" msgstr "n" -#: builtin/am.c:2268 builtin/branch.c:622 builtin/for-each-ref.c:38 +#: builtin/am.c:2269 builtin/branch.c:629 builtin/for-each-ref.c:38 #: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39 msgid "format" msgstr "format" -#: builtin/am.c:2269 +#: builtin/am.c:2270 msgid "format the patch(es) are in" msgstr "format för patch(ar)" -#: builtin/am.c:2275 +#: builtin/am.c:2276 msgid "override error message when patch failure occurs" msgstr "överstyr felmeddelanden när patchfel uppstår" -#: builtin/am.c:2277 +#: builtin/am.c:2278 msgid "continue applying patches after resolving a conflict" msgstr "fortsätt applicera patchar efter att ha löst en konflikt" -#: builtin/am.c:2280 +#: builtin/am.c:2281 msgid "synonyms for --continue" msgstr "synonymer till --continue" -#: builtin/am.c:2283 +#: builtin/am.c:2284 msgid "skip the current patch" msgstr "hoppa över den aktuella grenen" -#: builtin/am.c:2286 +#: builtin/am.c:2287 msgid "restore the original branch and abort the patching operation." msgstr "återställ originalgrenen och avbryt patchningen." -#: builtin/am.c:2290 +#: builtin/am.c:2291 msgid "lie about committer date" msgstr "ljug om incheckningsdatum" -#: builtin/am.c:2292 +#: builtin/am.c:2293 msgid "use current timestamp for author date" msgstr "använd nuvarande tidsstämpel för författardatum" -#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236 -#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392 +#: builtin/am.c:2295 builtin/commit.c:1636 builtin/merge.c:236 +#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392 msgid "key-id" msgstr "nyckel-id" -#: builtin/am.c:2295 +#: builtin/am.c:2296 msgid "GPG-sign commits" msgstr "GPG-signera incheckningar" -#: builtin/am.c:2298 +#: builtin/am.c:2299 msgid "(internal use for git-rebase)" msgstr "(används internt av git-rebase)" -#: builtin/am.c:2316 +#: builtin/am.c:2317 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." @@ -5286,16 +5285,16 @@ msgstr "" "Flaggan -b/--binary har varit utan funktion länge, och\n" "kommer tas bort. Vi ber dig att inte använda den längre." -#: builtin/am.c:2323 +#: builtin/am.c:2324 msgid "failed to read the index" msgstr "misslyckades läsa indexet" -#: builtin/am.c:2338 +#: builtin/am.c:2339 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "tidigare rebase-katalog %s finns fortfarande, men mbox angavs." -#: builtin/am.c:2362 +#: builtin/am.c:2363 #, c-format msgid "" "Stray %s directory found.\n" @@ -5304,7 +5303,7 @@ msgstr "" "Kvarbliven katalog %s hittades.\n" "Använd \"git am --abort\" för att ta bort den." -#: builtin/am.c:2368 +#: builtin/am.c:2369 msgid "Resolve operation not in progress, we are not resuming." msgstr "Lösningsoperation pågår inte, vi återupptar inte." @@ -5342,18 +5341,69 @@ msgstr "git archive: protokollfel" msgid "git archive: expected a flush" msgstr "git archive: förväntade en tömning (flush)" -#: builtin/bisect--helper.c:7 +#: builtin/bisect--helper.c:12 msgid "git bisect--helper --next-all [--no-checkout]" msgstr "git bisect--helper --next-all [--no-checkout]" -#: builtin/bisect--helper.c:17 +#: builtin/bisect--helper.c:13 +msgid "git bisect--helper --write-terms <bad_term> <good_term>" +msgstr "git bisect--helper --write-terms <term-för-fel> <term-för-rätt>" + +#: builtin/bisect--helper.c:14 +msgid "git bisect--helper --bisect-clean-state" +msgstr "git bisect--helper --bisect-clean-state" + +#: builtin/bisect--helper.c:46 +#, c-format +msgid "'%s' is not a valid term" +msgstr "\"%s\" är inte en giltig term" + +#: builtin/bisect--helper.c:50 +#, c-format +msgid "can't use the builtin command '%s' as a term" +msgstr "kan inte använda det inbyggda kommandot \"%s\" som term" + +#: builtin/bisect--helper.c:60 +#, c-format +msgid "can't change the meaning of the term '%s'" +msgstr "kan inte ändra betydelsen av termen \"%s\"" + +#: builtin/bisect--helper.c:71 +msgid "please use two different terms" +msgstr "termerna måste vara olika" + +#: builtin/bisect--helper.c:78 +msgid "could not open the file BISECT_TERMS" +msgstr "kunde inte öppna filen BISECT_TERMS" + +#: builtin/bisect--helper.c:120 msgid "perform 'git bisect next'" msgstr "utför 'git bisect next'" -#: builtin/bisect--helper.c:19 +#: builtin/bisect--helper.c:122 +msgid "write the terms to .git/BISECT_TERMS" +msgstr "skriv termerna i .git/BISECT_TERMS" + +#: builtin/bisect--helper.c:124 +msgid "cleanup the bisection state" +msgstr "städar upp bisect-tillstånd" + +#: builtin/bisect--helper.c:126 +msgid "check for expected revs" +msgstr "kontrollera för förväntade versioner" + +#: builtin/bisect--helper.c:128 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "uppdatera BISECT_HEAD istället för att checka ut aktuell incheckning" +#: builtin/bisect--helper.c:143 +msgid "--write-terms requires two arguments" +msgstr "--write-terms kräver två argument" + +#: builtin/bisect--helper.c:147 +msgid "--bisect-clean-state requires no arguments" +msgstr "--bisect-clean-state tar inga argument" + #: builtin/blame.c:27 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>" @@ -5610,52 +5660,52 @@ msgstr "Grenen %s ombaseras på %s" msgid "Branch %s is being bisected at %s" msgstr "Grenen %s är i en \"bisect\" på %s" -#: builtin/branch.c:470 +#: builtin/branch.c:471 msgid "cannot copy the current branch while not on any." msgstr "kunde inte kopiera aktuell gren när du inte befinner dig på någon." -#: builtin/branch.c:472 +#: builtin/branch.c:473 msgid "cannot rename the current branch while not on any." msgstr "" "kunde inte byta namn på aktuell gren när du inte befinner dig på någon." -#: builtin/branch.c:483 +#: builtin/branch.c:484 #, c-format msgid "Invalid branch name: '%s'" msgstr "Felaktigt namn på gren: \"%s\"" -#: builtin/branch.c:504 +#: builtin/branch.c:511 msgid "Branch rename failed" msgstr "Misslyckades byta namn på gren" -#: builtin/branch.c:506 +#: builtin/branch.c:513 msgid "Branch copy failed" msgstr "Misslyckades kopiera gren" -#: builtin/branch.c:510 +#: builtin/branch.c:517 #, c-format -msgid "Copied a misnamed branch '%s' away" -msgstr "Kopierade bort en felaktigt namngiven gren \"%s\"" +msgid "Created a copy of a misnamed branch '%s'" +msgstr "Skapade kopia av felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:513 +#: builtin/branch.c:520 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:519 +#: builtin/branch.c:526 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!" -#: builtin/branch.c:528 +#: builtin/branch.c:535 msgid "Branch is renamed, but update of config-file failed" msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:530 +#: builtin/branch.c:537 msgid "Branch is copied, but update of config-file failed" msgstr "Grenen kopierades, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:546 +#: builtin/branch.c:553 #, c-format msgid "" "Please edit the description for the branch\n" @@ -5666,225 +5716,221 @@ msgstr "" " %s\n" "Rader som inleds med \"%c\" ignoreras.\n" -#: builtin/branch.c:579 +#: builtin/branch.c:586 msgid "Generic options" msgstr "Allmänna flaggor" -#: builtin/branch.c:581 +#: builtin/branch.c:588 msgid "show hash and subject, give twice for upstream branch" msgstr "visa hash och ärenderad, ange två gånger för uppströmsgren" -#: builtin/branch.c:582 +#: builtin/branch.c:589 msgid "suppress informational messages" msgstr "undertryck informationsmeddelanden" -#: builtin/branch.c:583 +#: builtin/branch.c:590 msgid "set up tracking mode (see git-pull(1))" msgstr "ställ in spårningsläge (se git-pull(1))" -#: builtin/branch.c:585 +#: builtin/branch.c:592 msgid "do not use" msgstr "använd ej" -#: builtin/branch.c:587 +#: builtin/branch.c:594 msgid "upstream" msgstr "uppströms" -#: builtin/branch.c:587 +#: builtin/branch.c:594 msgid "change the upstream info" msgstr "ändra uppströmsinformationen" -#: builtin/branch.c:588 +#: builtin/branch.c:595 msgid "Unset the upstream info" msgstr "Ta bort uppströmsinformationen" -#: builtin/branch.c:589 +#: builtin/branch.c:596 msgid "use colored output" msgstr "använd färgad utdata" -#: builtin/branch.c:590 +#: builtin/branch.c:597 msgid "act on remote-tracking branches" msgstr "arbeta på fjärrspårande grenar" -#: builtin/branch.c:592 builtin/branch.c:594 +#: builtin/branch.c:599 builtin/branch.c:601 msgid "print only branches that contain the commit" msgstr "visa endast grenar som innehåller incheckningen" -#: builtin/branch.c:593 builtin/branch.c:595 +#: builtin/branch.c:600 builtin/branch.c:602 msgid "print only branches that don't contain the commit" msgstr "visa endast grenar som inte innehåller incheckningen" -#: builtin/branch.c:598 +#: builtin/branch.c:605 msgid "Specific git-branch actions:" msgstr "Specifika git-branch-åtgärder:" -#: builtin/branch.c:599 +#: builtin/branch.c:606 msgid "list both remote-tracking and local branches" msgstr "visa både fjärrspårande och lokala grenar" -#: builtin/branch.c:601 +#: builtin/branch.c:608 msgid "delete fully merged branch" msgstr "ta bort helt sammanslagen gren" -#: builtin/branch.c:602 +#: builtin/branch.c:609 msgid "delete branch (even if not merged)" msgstr "ta bort gren (även om inte helt sammanslagen)" -#: builtin/branch.c:603 +#: builtin/branch.c:610 msgid "move/rename a branch and its reflog" msgstr "flytta/ta bort en gren och dess reflogg" -#: builtin/branch.c:604 +#: builtin/branch.c:611 msgid "move/rename a branch, even if target exists" msgstr "flytta/ta bort en gren, även om målet finns" -#: builtin/branch.c:605 +#: builtin/branch.c:612 msgid "copy a branch and its reflog" msgstr "kopiera en gren och dess reflogg" -#: builtin/branch.c:606 +#: builtin/branch.c:613 msgid "copy a branch, even if target exists" msgstr "kopiera en gren, även om målet finns" -#: builtin/branch.c:607 +#: builtin/branch.c:614 msgid "list branch names" msgstr "lista namn på grenar" -#: builtin/branch.c:608 +#: builtin/branch.c:615 msgid "create the branch's reflog" msgstr "skapa grenens reflogg" -#: builtin/branch.c:610 +#: builtin/branch.c:617 msgid "edit the description for the branch" msgstr "redigera beskrivning för grenen" -#: builtin/branch.c:611 +#: builtin/branch.c:618 msgid "force creation, move/rename, deletion" msgstr "tvinga skapande, flytt/namnändring, borttagande" -#: builtin/branch.c:612 +#: builtin/branch.c:619 msgid "print only branches that are merged" msgstr "visa endast sammanslagna grenar" -#: builtin/branch.c:613 +#: builtin/branch.c:620 msgid "print only branches that are not merged" msgstr "visa endast ej sammanslagna grenar" -#: builtin/branch.c:614 +#: builtin/branch.c:621 msgid "list branches in columns" msgstr "visa grenar i spalter" -#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405 +#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405 msgid "key" msgstr "nyckel" -#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406 +#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406 msgid "field name to sort on" msgstr "fältnamn att sortera på" -#: builtin/branch.c:618 builtin/for-each-ref.c:43 builtin/notes.c:408 +#: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408 #: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574 #: builtin/tag.c:408 msgid "object" msgstr "objekt" -#: builtin/branch.c:619 +#: builtin/branch.c:626 msgid "print only branches of the object" msgstr "visa endast grenar för objektet" -#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415 +#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415 msgid "sorting and filtering are case insensitive" msgstr "sortering och filtrering skiljer gemener och VERSALER" -#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413 +#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413 #: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "format att använda för utdata" -#: builtin/branch.c:645 builtin/clone.c:729 +#: builtin/branch.c:652 builtin/clone.c:730 msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" -#: builtin/branch.c:668 +#: builtin/branch.c:675 msgid "--column and --verbose are incompatible" msgstr "--column och --verbose är inkompatibla" -#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741 +#: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751 msgid "branch name required" msgstr "grennamn krävs" -#: builtin/branch.c:708 +#: builtin/branch.c:718 msgid "Cannot give description to detached HEAD" msgstr "Kan inte beskriva frånkopplad HEAD" -#: builtin/branch.c:713 +#: builtin/branch.c:723 msgid "cannot edit description of more than one branch" msgstr "kan inte redigera beskrivning för mer än en gren" -#: builtin/branch.c:720 +#: builtin/branch.c:730 #, c-format msgid "No commit on branch '%s' yet." msgstr "Inga incheckningar på grenen \"%s\" ännu." -#: builtin/branch.c:723 +#: builtin/branch.c:733 #, c-format msgid "No branch named '%s'." msgstr "Ingen gren vid namnet \"%s\"." -#: builtin/branch.c:738 +#: builtin/branch.c:748 msgid "too many branches for a copy operation" msgstr "för många grenar för kopiering" -#: builtin/branch.c:747 +#: builtin/branch.c:757 msgid "too many arguments for a rename operation" msgstr "för många flaggor för namnbyte" -#: builtin/branch.c:752 +#: builtin/branch.c:762 msgid "too many arguments to set new upstream" msgstr "för många flaggor för att byta uppström" -#: builtin/branch.c:756 +#: builtin/branch.c:766 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" "kunde inte sätta uppström för HEAD till %s när det inte pekar mot någon gren." -#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800 +#: builtin/branch.c:769 builtin/branch.c:791 builtin/branch.c:807 #, c-format msgid "no such branch '%s'" msgstr "okänd gren \"%s\"" -#: builtin/branch.c:763 +#: builtin/branch.c:773 #, c-format msgid "branch '%s' does not exist" msgstr "grenen \"%s\" finns inte" -#: builtin/branch.c:775 +#: builtin/branch.c:785 msgid "too many arguments to unset upstream" msgstr "för många flaggor för att ta bort uppström" -#: builtin/branch.c:779 +#: builtin/branch.c:789 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "kunde inte ta bort uppström för HEAD när det inte pekar mot någon gren." -#: builtin/branch.c:785 +#: builtin/branch.c:795 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Grenen \"%s\" har ingen uppströmsinformation" -#: builtin/branch.c:797 -msgid "it does not make sense to create 'HEAD' manually" -msgstr "kan inte skapa \"HEAD\" manuellt" - -#: builtin/branch.c:803 +#: builtin/branch.c:810 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "flaggorna -a och -r på \"git branch\" kan inte anges tillsammans med ett " "grennamn" -#: builtin/branch.c:806 +#: builtin/branch.c:813 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -5949,7 +5995,7 @@ msgstr "för blob-objekt, kör filter på objektets innehåll" msgid "for blob objects, run filters on object's content" msgstr "för blob-objekt, kör filger på objektets innehåll" -#: builtin/cat-file.c:569 git-submodule.sh:943 +#: builtin/cat-file.c:569 git-submodule.sh:931 msgid "blob" msgstr "blob" @@ -6006,7 +6052,7 @@ msgstr "läs filnamn från standard in" msgid "terminate input and output records by a NUL character" msgstr "avsluta in- och utdataposter med NUL-tecken" -#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358 +#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358 msgid "suppress progress reporting" msgstr "undertryck förloppsrapportering" @@ -6063,160 +6109,160 @@ msgstr "inga kontakter angavs" msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [<flaggor>] [--] [<fil>...]" -#: builtin/checkout-index.c:145 +#: builtin/checkout-index.c:143 msgid "stage should be between 1 and 3 or all" msgstr "etapp måste vara mellan 1 och 3 eller \"all\"" -#: builtin/checkout-index.c:161 +#: builtin/checkout-index.c:159 msgid "check out all files in the index" msgstr "checka ut alla filer i indexet" -#: builtin/checkout-index.c:162 +#: builtin/checkout-index.c:160 msgid "force overwrite of existing files" msgstr "tvinga överskrivning av befintliga filer" -#: builtin/checkout-index.c:164 +#: builtin/checkout-index.c:162 msgid "no warning for existing files and files not in index" msgstr "ingen varning för existerande filer och filer ej i indexet" -#: builtin/checkout-index.c:166 +#: builtin/checkout-index.c:164 msgid "don't checkout new files" msgstr "checka inte ut nya filer" -#: builtin/checkout-index.c:168 +#: builtin/checkout-index.c:166 msgid "update stat information in the index file" msgstr "uppdatera stat-information i indexfilen" -#: builtin/checkout-index.c:172 +#: builtin/checkout-index.c:170 msgid "read list of paths from the standard input" msgstr "läs listan över sökvägar från standard in" -#: builtin/checkout-index.c:174 +#: builtin/checkout-index.c:172 msgid "write the content to temporary files" msgstr "skriv innehåll till temporära filer" -#: builtin/checkout-index.c:175 builtin/column.c:31 -#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631 -#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999 -#: builtin/worktree.c:498 +#: builtin/checkout-index.c:173 builtin/column.c:31 +#: builtin/submodule--helper.c:866 builtin/submodule--helper.c:869 +#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1237 +#: builtin/worktree.c:552 msgid "string" msgstr "sträng" -#: builtin/checkout-index.c:176 +#: builtin/checkout-index.c:174 msgid "when creating files, prepend <string>" msgstr "när filer skapas, lägg till <sträng> först" -#: builtin/checkout-index.c:178 +#: builtin/checkout-index.c:176 msgid "copy out the files from named stage" msgstr "kopiera ut filer från namngiven etapp" -#: builtin/checkout.c:26 +#: builtin/checkout.c:27 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<flaggor>] <gren>" -#: builtin/checkout.c:27 +#: builtin/checkout.c:28 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<flaggor>] [<gren>] -- <fil>..." -#: builtin/checkout.c:135 builtin/checkout.c:168 +#: builtin/checkout.c:136 builtin/checkout.c:169 #, c-format msgid "path '%s' does not have our version" msgstr "sökvägen \"%s\" har inte vår version" -#: builtin/checkout.c:137 builtin/checkout.c:170 +#: builtin/checkout.c:138 builtin/checkout.c:171 #, c-format msgid "path '%s' does not have their version" msgstr "sökvägen \"%s\" har inte deras version" -#: builtin/checkout.c:153 +#: builtin/checkout.c:154 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "sökvägen \"%s\" innehåller inte alla nödvändiga versioner" -#: builtin/checkout.c:197 +#: builtin/checkout.c:198 #, c-format msgid "path '%s' does not have necessary versions" msgstr "sökvägen \"%s\" innehåller inte nödvändiga versioner" -#: builtin/checkout.c:214 +#: builtin/checkout.c:215 #, c-format msgid "path '%s': cannot merge" msgstr "sökväg \"%s\": kan inte slå ihop" -#: builtin/checkout.c:231 +#: builtin/checkout.c:232 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\"" -#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259 -#: builtin/checkout.c:262 +#: builtin/checkout.c:254 builtin/checkout.c:257 builtin/checkout.c:260 +#: builtin/checkout.c:263 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "\"%s\" kan inte användas vid uppdatering av sökvägar" -#: builtin/checkout.c:265 builtin/checkout.c:268 +#: builtin/checkout.c:266 builtin/checkout.c:269 #, c-format msgid "'%s' cannot be used with %s" msgstr "\"%s\" kan inte användas med %s" -#: builtin/checkout.c:271 +#: builtin/checkout.c:272 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt." -#: builtin/checkout.c:342 builtin/checkout.c:349 +#: builtin/checkout.c:341 builtin/checkout.c:348 #, c-format msgid "path '%s' is unmerged" msgstr "sökvägen \"%s\" har inte slagits ihop" -#: builtin/checkout.c:501 +#: builtin/checkout.c:506 msgid "you need to resolve your current index first" msgstr "du måste lösa ditt befintliga index först" -#: builtin/checkout.c:632 +#: builtin/checkout.c:637 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Kan inte skapa referenslogg för \"%s\": %s\n" -#: builtin/checkout.c:673 +#: builtin/checkout.c:678 msgid "HEAD is now at" msgstr "HEAD är nu på" -#: builtin/checkout.c:677 builtin/clone.c:683 +#: builtin/checkout.c:682 builtin/clone.c:684 msgid "unable to update HEAD" msgstr "kan inte uppdatera HEAD" -#: builtin/checkout.c:681 +#: builtin/checkout.c:686 #, c-format msgid "Reset branch '%s'\n" msgstr "Återställ gren \"%s\"\n" -#: builtin/checkout.c:684 +#: builtin/checkout.c:689 #, c-format msgid "Already on '%s'\n" msgstr "Redan på \"%s\"\n" -#: builtin/checkout.c:688 +#: builtin/checkout.c:693 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Växlade till och nollställde grenen \"%s\"\n" -#: builtin/checkout.c:690 builtin/checkout.c:1086 +#: builtin/checkout.c:695 builtin/checkout.c:1051 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Växlade till en ny gren \"%s\"\n" -#: builtin/checkout.c:692 +#: builtin/checkout.c:697 #, c-format msgid "Switched to branch '%s'\n" msgstr "Växlade till grenen \"%s\"\n" -#: builtin/checkout.c:743 +#: builtin/checkout.c:748 #, c-format msgid " ... and %d more.\n" msgstr " ... och %d till.\n" -#: builtin/checkout.c:749 +#: builtin/checkout.c:754 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -6239,7 +6285,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:768 +#: builtin/checkout.c:773 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -6266,161 +6312,161 @@ msgstr[1] "" " git branch <nytt_grennamn> %s\n" "\n" -#: builtin/checkout.c:809 +#: builtin/checkout.c:814 msgid "internal error in revision walk" msgstr "internt fel vid genomgång av revisioner (revision walk)" -#: builtin/checkout.c:813 +#: builtin/checkout.c:818 msgid "Previous HEAD position was" msgstr "Tidigare position för HEAD var" -#: builtin/checkout.c:843 builtin/checkout.c:1081 +#: builtin/checkout.c:848 builtin/checkout.c:1046 msgid "You are on a branch yet to be born" msgstr "Du är på en gren som ännu inte är född" -#: builtin/checkout.c:987 +#: builtin/checkout.c:952 #, c-format msgid "only one reference expected, %d given." msgstr "endast en referens förväntades, %d gavs." -#: builtin/checkout.c:1027 builtin/worktree.c:233 +#: builtin/checkout.c:992 builtin/worktree.c:247 #, c-format msgid "invalid reference: %s" msgstr "felaktig referens: %s" -#: builtin/checkout.c:1056 +#: builtin/checkout.c:1021 #, c-format msgid "reference is not a tree: %s" msgstr "referensen är inte ett träd: %s" -#: builtin/checkout.c:1095 +#: builtin/checkout.c:1060 msgid "paths cannot be used with switching branches" msgstr "sökvägar kan inte användas vid byte av gren" -#: builtin/checkout.c:1098 builtin/checkout.c:1102 +#: builtin/checkout.c:1063 builtin/checkout.c:1067 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "\"%s\" kan inte användas vid byte av gren" -#: builtin/checkout.c:1106 builtin/checkout.c:1109 builtin/checkout.c:1114 -#: builtin/checkout.c:1117 +#: builtin/checkout.c:1071 builtin/checkout.c:1074 builtin/checkout.c:1079 +#: builtin/checkout.c:1082 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "\"%s\" kan inte användas med \"%s\"" -#: builtin/checkout.c:1122 +#: builtin/checkout.c:1087 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kan inte växla gren till icke-incheckningen \"%s\"" -#: builtin/checkout.c:1154 builtin/checkout.c:1156 builtin/clone.c:114 -#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:346 -#: builtin/worktree.c:348 +#: builtin/checkout.c:1119 builtin/checkout.c:1121 builtin/clone.c:114 +#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:369 +#: builtin/worktree.c:371 msgid "branch" msgstr "gren" -#: builtin/checkout.c:1155 +#: builtin/checkout.c:1120 msgid "create and checkout a new branch" msgstr "skapa och checka ut en ny gren" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1122 msgid "create/reset and checkout a branch" msgstr "skapa/nollställ och checka ut en gren" -#: builtin/checkout.c:1158 +#: builtin/checkout.c:1123 msgid "create reflog for new branch" msgstr "skapa reflogg för ny gren" -#: builtin/checkout.c:1159 builtin/worktree.c:350 +#: builtin/checkout.c:1124 builtin/worktree.c:373 msgid "detach HEAD at named commit" msgstr "koppla från HEAD vid namngiven incheckning" -#: builtin/checkout.c:1160 +#: builtin/checkout.c:1125 msgid "set upstream info for new branch" msgstr "sätt uppströmsinformation för ny gren" -#: builtin/checkout.c:1162 +#: builtin/checkout.c:1127 msgid "new-branch" msgstr "ny-gren" -#: builtin/checkout.c:1162 +#: builtin/checkout.c:1127 msgid "new unparented branch" msgstr "ny gren utan förälder" -#: builtin/checkout.c:1163 +#: builtin/checkout.c:1128 msgid "checkout our version for unmerged files" msgstr "checka ut vår version för ej sammanslagna filer" -#: builtin/checkout.c:1165 +#: builtin/checkout.c:1130 msgid "checkout their version for unmerged files" msgstr "checka ut deras version för ej sammanslagna filer" -#: builtin/checkout.c:1167 +#: builtin/checkout.c:1132 msgid "force checkout (throw away local modifications)" msgstr "tvinga utcheckning (kasta bort lokala ändringar)" -#: builtin/checkout.c:1168 +#: builtin/checkout.c:1133 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:1169 builtin/merge.c:238 +#: builtin/checkout.c:1134 builtin/merge.c:238 msgid "update ignored files (default)" msgstr "uppdatera ignorerade filer (standard)" -#: builtin/checkout.c:1170 builtin/log.c:1489 parse-options.h:251 +#: builtin/checkout.c:1135 builtin/log.c:1496 parse-options.h:251 msgid "style" msgstr "stil" -#: builtin/checkout.c:1171 +#: builtin/checkout.c:1136 msgid "conflict style (merge or diff3)" msgstr "konfliktstil (merge eller diff3)" -#: builtin/checkout.c:1174 +#: builtin/checkout.c:1139 msgid "do not limit pathspecs to sparse entries only" msgstr "begränsa inte sökvägar till endast glesa poster" -#: builtin/checkout.c:1176 +#: builtin/checkout.c:1141 msgid "second guess 'git checkout <no-such-branch>'" msgstr "förutspå \"git checkout <gren-saknas>\"" -#: builtin/checkout.c:1178 +#: builtin/checkout.c:1143 msgid "do not check if another worktree is holding the given ref" msgstr "" "kontrollera inte om en annan arbetskatalog håller den angivna referensen" -#: builtin/checkout.c:1182 builtin/clone.c:81 builtin/fetch.c:136 -#: builtin/merge.c:235 builtin/pull.c:120 builtin/push.c:544 +#: builtin/checkout.c:1147 builtin/clone.c:81 builtin/fetch.c:137 +#: builtin/merge.c:235 builtin/pull.c:123 builtin/push.c:556 #: builtin/send-pack.c:173 msgid "force progress reporting" msgstr "tvinga förloppsrapportering" -#: builtin/checkout.c:1212 +#: builtin/checkout.c:1177 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B och --orphan är ömsesidigt uteslutande" -#: builtin/checkout.c:1229 +#: builtin/checkout.c:1194 msgid "--track needs a branch name" msgstr "--track behöver ett namn på en gren" -#: builtin/checkout.c:1234 +#: builtin/checkout.c:1199 msgid "Missing branch name; try -b" msgstr "Grennamn saknas; försök med -b" -#: builtin/checkout.c:1270 +#: builtin/checkout.c:1235 msgid "invalid path specification" msgstr "felaktig sökvägsangivelse" -#: builtin/checkout.c:1277 +#: builtin/checkout.c:1242 #, 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" -#: builtin/checkout.c:1281 +#: builtin/checkout.c:1246 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach tar inte en sökväg som argument \"%s\"" -#: builtin/checkout.c:1285 +#: builtin/checkout.c:1250 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -6460,7 +6506,7 @@ msgstr "Skulle hoppa över arkivet %s\n" msgid "failed to remove %s" msgstr "misslyckades ta bort %s" -#: builtin/clean.c:301 git-add--interactive.perl:572 +#: builtin/clean.c:302 git-add--interactive.perl:572 #, c-format msgid "" "Prompt help:\n" @@ -6473,7 +6519,7 @@ msgstr "" "foo - markera post baserad på unikt prefix\n" " - (tomt) markera ingenting\n" -#: builtin/clean.c:305 git-add--interactive.perl:581 +#: builtin/clean.c:306 git-add--interactive.perl:581 #, c-format msgid "" "Prompt help:\n" @@ -6494,38 +6540,38 @@ msgstr "" "* - välj alla poster\n" " - (tomt) avsluta markering\n" -#: builtin/clean.c:521 git-add--interactive.perl:547 +#: builtin/clean.c:522 git-add--interactive.perl:547 #: git-add--interactive.perl:552 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Vadå (%s)?\n" -#: builtin/clean.c:663 +#: builtin/clean.c:664 #, c-format msgid "Input ignore patterns>> " msgstr "Ange ignoreringsmönster>>" -#: builtin/clean.c:700 +#: builtin/clean.c:701 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "VARNING: Hittar inte poster som motsvarar: %s" -#: builtin/clean.c:721 +#: builtin/clean.c:722 msgid "Select items to delete" msgstr "Välj poster att ta bort" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:762 +#: builtin/clean.c:763 #, c-format msgid "Remove %s [y/N]? " msgstr "Ta bort %s [Y=ja / N=nej]? " -#: builtin/clean.c:787 git-add--interactive.perl:1616 +#: builtin/clean.c:788 git-add--interactive.perl:1616 #, c-format msgid "Bye.\n" msgstr "Hej då.\n" -#: builtin/clean.c:795 +#: builtin/clean.c:796 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -6543,63 +6589,64 @@ msgstr "" "help - denna skärm\n" "? - hjälp för kommandoval" -#: builtin/clean.c:822 git-add--interactive.perl:1692 +#: builtin/clean.c:823 git-add--interactive.perl:1692 msgid "*** Commands ***" msgstr "*** Kommandon ***" -#: builtin/clean.c:823 git-add--interactive.perl:1689 +#: builtin/clean.c:824 git-add--interactive.perl:1689 msgid "What now" msgstr "Vad nu" -#: builtin/clean.c:831 +#: builtin/clean.c:832 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Skulle ta bort följande post:" msgstr[1] "Skulle ta bort följande poster:" -#: builtin/clean.c:847 +#: builtin/clean.c:848 msgid "No more files to clean, exiting." msgstr "Inga fler filer att städa, avslutar." -#: builtin/clean.c:909 +#: builtin/clean.c:910 msgid "do not print names of files removed" msgstr "skriv inte ut namn på borttagna filer" -#: builtin/clean.c:911 +#: builtin/clean.c:912 msgid "force" msgstr "tvinga" -#: builtin/clean.c:912 +#: builtin/clean.c:913 msgid "interactive cleaning" msgstr "städa interaktivt" -#: builtin/clean.c:914 +#: builtin/clean.c:915 msgid "remove whole directories" msgstr "ta bort hela kataloger" -#: builtin/clean.c:915 builtin/describe.c:463 builtin/describe.c:465 -#: builtin/grep.c:861 builtin/ls-files.c:544 builtin/name-rev.c:397 -#: builtin/name-rev.c:399 builtin/show-ref.c:176 +#: builtin/clean.c:916 builtin/describe.c:530 builtin/describe.c:532 +#: builtin/grep.c:863 builtin/log.c:155 builtin/log.c:157 +#: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399 +#: builtin/show-ref.c:176 msgid "pattern" msgstr "mönster" -#: builtin/clean.c:916 +#: builtin/clean.c:917 msgid "add <pattern> to ignore rules" msgstr "lägg till <mönster> till ignoreringsregler" -#: builtin/clean.c:917 +#: builtin/clean.c:918 msgid "remove ignored files, too" msgstr "ta även bort ignorerade filer" -#: builtin/clean.c:919 +#: builtin/clean.c:920 msgid "remove only ignored files" msgstr "ta endast bort ignorerade filer" -#: builtin/clean.c:937 +#: builtin/clean.c:938 msgid "-x and -X cannot be used together" msgstr "-x och -X kan inte användas samtidigt" -#: builtin/clean.c:941 +#: builtin/clean.c:942 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -6607,7 +6654,7 @@ msgstr "" "clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar " "städa" -#: builtin/clean.c:944 +#: builtin/clean.c:945 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -6663,8 +6710,8 @@ msgstr "mallkatalog" msgid "directory from which templates will be used" msgstr "katalog att använda mallar från" -#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:635 -#: builtin/submodule--helper.c:1002 +#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:873 +#: builtin/submodule--helper.c:1240 msgid "reference repository" msgstr "referensarkiv" @@ -6688,8 +6735,8 @@ msgstr "checka ut <gren> istället för fjärrens HEAD" msgid "path to git-upload-pack on the remote" msgstr "sökväg till git-upload-pack på fjärren" -#: builtin/clone.c:118 builtin/fetch.c:137 builtin/grep.c:804 -#: builtin/pull.c:205 +#: builtin/clone.c:118 builtin/fetch.c:138 builtin/grep.c:806 +#: builtin/pull.c:211 msgid "depth" msgstr "djup" @@ -6697,7 +6744,7 @@ msgstr "djup" msgid "create a shallow clone of that depth" msgstr "skapa en grund klon på detta djup" -#: builtin/clone.c:120 builtin/fetch.c:139 builtin/pack-objects.c:2938 +#: builtin/clone.c:120 builtin/fetch.c:140 builtin/pack-objects.c:2991 #: parse-options.h:142 msgid "time" msgstr "tid" @@ -6706,11 +6753,11 @@ msgstr "tid" msgid "create a shallow clone since a specific time" msgstr "skapa en grund klon från en angiven tidpunkt" -#: builtin/clone.c:122 builtin/fetch.c:141 +#: builtin/clone.c:122 builtin/fetch.c:142 msgid "revision" msgstr "revision" -#: builtin/clone.c:123 builtin/fetch.c:142 +#: builtin/clone.c:123 builtin/fetch.c:143 msgid "deepen history of shallow clone, excluding rev" msgstr "fördjupa historik för grund klon, exkludera revisionen" @@ -6742,11 +6789,13 @@ msgstr "nyckel=värde" msgid "set config inside the new repository" msgstr "ställ in konfiguration i det nya arkivet" -#: builtin/clone.c:134 builtin/fetch.c:159 builtin/push.c:555 +#: builtin/clone.c:134 builtin/fetch.c:160 builtin/pull.c:224 +#: builtin/push.c:567 msgid "use IPv4 addresses only" msgstr "använd endast IPv4-adresser" -#: builtin/clone.c:136 builtin/fetch.c:161 builtin/push.c:557 +#: builtin/clone.c:136 builtin/fetch.c:162 builtin/pull.c:227 +#: builtin/push.c:569 msgid "use IPv6 addresses only" msgstr "använd endast IPv6-adresser" @@ -6788,12 +6837,12 @@ msgstr "misslyckades skapa länken \"%s\"" msgid "failed to copy file to '%s'" msgstr "misslyckades kopiera filen till \"%s\"" -#: builtin/clone.c:471 +#: builtin/clone.c:472 #, c-format msgid "done.\n" msgstr "klart.\n" -#: builtin/clone.c:483 +#: builtin/clone.c:484 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -6803,21 +6852,21 @@ msgstr "" "Du kan inspektera det som checkades ut med \"git status\"\n" "och försöka checka ut igen med \"git checkout -f HEAD\"\n" -#: builtin/clone.c:560 +#: builtin/clone.c:561 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Kunde inte hitta fjärrgrenen %s för att klona." -#: builtin/clone.c:655 +#: builtin/clone.c:656 msgid "remote did not send all necessary objects" msgstr "fjärren sände inte alla nödvändiga objekt" -#: builtin/clone.c:671 +#: builtin/clone.c:672 #, c-format msgid "unable to update %s" msgstr "kan inte uppdatera %s" -#: builtin/clone.c:720 +#: builtin/clone.c:721 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n" @@ -6838,7 +6887,7 @@ msgstr "kan inte packa om för att städa upp" msgid "cannot unlink temporary alternates file" msgstr "kunde inte ta bort temporär \"alternates\"-fil" -#: builtin/clone.c:894 builtin/receive-pack.c:1944 +#: builtin/clone.c:894 builtin/receive-pack.c:1945 msgid "Too many arguments." msgstr "För många argument." @@ -6860,7 +6909,7 @@ msgstr "flaggorna --bare och --separate-git-dir är inkompatibla." msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:933 builtin/fetch.c:1360 +#: builtin/clone.c:933 builtin/fetch.c:1358 #, c-format msgid "depth %s is not a positive number" msgstr "djupet %s är inte ett positivt tal" @@ -6876,7 +6925,7 @@ msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." #: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270 -#: builtin/worktree.c:240 builtin/worktree.c:270 +#: builtin/worktree.c:253 builtin/worktree.c:283 #, c-format msgid "could not create leading directories of '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" @@ -6924,17 +6973,12 @@ msgstr "källarkivet är grunt, ignorerar --local" msgid "--local is ignored" msgstr "--local ignoreras" -#: builtin/clone.c:1087 -#, c-format -msgid "Don't know how to clone %s" -msgstr "Vet inte hur man klonar %s" - -#: builtin/clone.c:1142 builtin/clone.c:1150 +#: builtin/clone.c:1139 builtin/clone.c:1147 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" -#: builtin/clone.c:1153 +#: builtin/clone.c:1150 msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." @@ -7136,7 +7180,7 @@ msgstr "" "kunde inte välja ett kommentarstecken som inte använts\n" "i det befintliga incheckningsmeddelandet" -#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1100 +#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1114 #, c-format msgid "could not lookup commit %s" msgstr "kunde inte slå upp incheckningen %s" @@ -7237,127 +7281,136 @@ msgstr "%sIncheckare: %.*s <%.*s>" msgid "Cannot read index" msgstr "Kan inte läsa indexet" -#: builtin/commit.c:958 +#: builtin/commit.c:959 msgid "Error building trees" msgstr "Fel vid byggande av träd" -#: builtin/commit.c:972 builtin/tag.c:252 +#: builtin/commit.c:973 builtin/tag.c:252 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Ange meddelandet en av flaggorna -m eller -F.\n" -#: builtin/commit.c:1075 +#: builtin/commit.c:1076 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' är inte 'Namn <epost>' och matchar ingen befintlig författare" -#: builtin/commit.c:1090 builtin/commit.c:1335 +#: builtin/commit.c:1090 +#, c-format +msgid "Invalid ignored mode '%s'" +msgstr "Ogiltigt ignorerat läge \"%s\"" + +#: builtin/commit.c:1104 builtin/commit.c:1349 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ogiltigt läge för ospårade filer: \"%s\"" -#: builtin/commit.c:1128 +#: builtin/commit.c:1142 msgid "--long and -z are incompatible" msgstr "--long och -z är inkompatibla" -#: builtin/commit.c:1158 +#: builtin/commit.c:1172 msgid "Using both --reset-author and --author does not make sense" msgstr "Kan inte använda både --reset-author och --author" -#: builtin/commit.c:1167 +#: builtin/commit.c:1181 msgid "You have nothing to amend." msgstr "Du har inget att utöka." -#: builtin/commit.c:1170 +#: builtin/commit.c:1184 msgid "You are in the middle of a merge -- cannot amend." msgstr "Du är i mitten av en sammanslagning -- kan inte utöka." -#: builtin/commit.c:1172 +#: builtin/commit.c:1186 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Du är i mitten av en cherry-pick -- kan inte utöka." -#: builtin/commit.c:1175 +#: builtin/commit.c:1189 msgid "Options --squash and --fixup cannot be used together" msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt" -#: builtin/commit.c:1185 +#: builtin/commit.c:1199 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Endast en av -c/-C/-F/--fixup kan användas." -#: builtin/commit.c:1187 +#: builtin/commit.c:1201 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "Flaggan -m kan inte kombineras med -c/-C/-F/--fixup." -#: builtin/commit.c:1195 +#: builtin/commit.c:1209 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author kan endast användas med -C, -c eller --amend." -#: builtin/commit.c:1212 +#: builtin/commit.c:1226 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Endast en av --include/--only/--all/--interactive/--patch kan användas." -#: builtin/commit.c:1214 +#: builtin/commit.c:1228 msgid "No paths with --include/--only does not make sense." msgstr "Du måste ange sökvägar tillsammans med --include/--only." -#: builtin/commit.c:1226 builtin/tag.c:535 +#: builtin/commit.c:1240 builtin/tag.c:535 #, c-format msgid "Invalid cleanup mode %s" msgstr "Felaktigt städningsläge %s" -#: builtin/commit.c:1231 +#: builtin/commit.c:1245 msgid "Paths with -a does not make sense." msgstr "Kan inte ange sökvägar med -a." -#: builtin/commit.c:1349 builtin/commit.c:1626 +#: builtin/commit.c:1363 builtin/commit.c:1648 msgid "show status concisely" msgstr "visa koncis status" -#: builtin/commit.c:1351 builtin/commit.c:1628 +#: builtin/commit.c:1365 builtin/commit.c:1650 msgid "show branch information" msgstr "visa information om gren" -#: builtin/commit.c:1353 +#: builtin/commit.c:1367 msgid "show stash information" msgstr "visa information om stash" -#: builtin/commit.c:1355 +#: builtin/commit.c:1369 msgid "version" msgstr "version" -#: builtin/commit.c:1355 builtin/commit.c:1630 builtin/push.c:530 -#: builtin/worktree.c:469 +#: builtin/commit.c:1369 builtin/commit.c:1652 builtin/push.c:542 +#: builtin/worktree.c:523 msgid "machine-readable output" msgstr "maskinläsbar utdata" -#: builtin/commit.c:1358 builtin/commit.c:1632 +#: builtin/commit.c:1372 builtin/commit.c:1654 msgid "show status in long format (default)" msgstr "visa status i långt format (standard)" -#: builtin/commit.c:1361 builtin/commit.c:1635 +#: builtin/commit.c:1375 builtin/commit.c:1657 msgid "terminate entries with NUL" msgstr "terminera poster med NUL" -#: builtin/commit.c:1363 builtin/commit.c:1638 builtin/fast-export.c:999 -#: builtin/fast-export.c:1002 builtin/tag.c:390 +#: builtin/commit.c:1377 builtin/commit.c:1381 builtin/commit.c:1660 +#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:390 msgid "mode" msgstr "läge" -#: builtin/commit.c:1364 builtin/commit.c:1638 +#: builtin/commit.c:1378 builtin/commit.c:1660 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" -msgstr "visa ospårade filer, valfria lägen: alla, normal, no. (Standard: all)" +msgstr "visa ospårade filer, valfria lägen: all, normal, no. (Standard: all)" -#: builtin/commit.c:1367 -msgid "show ignored files" -msgstr "visa ignorerade filer" +#: builtin/commit.c:1382 +msgid "" +"show ignored files, optional modes: traditional, matching, no. (Default: " +"traditional)" +msgstr "" +"visa ignorerade filer, valfria lägen: traditional, matching, no (Standard: " +"traditional)" -#: builtin/commit.c:1368 parse-options.h:155 +#: builtin/commit.c:1384 parse-options.h:155 msgid "when" msgstr "när" -#: builtin/commit.c:1369 +#: builtin/commit.c:1385 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -7365,202 +7418,210 @@ msgstr "" "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. " "(Default: all)" -#: builtin/commit.c:1371 +#: builtin/commit.c:1387 msgid "list untracked files in columns" msgstr "visa ospårade filer i spalter" -#: builtin/commit.c:1449 +#: builtin/commit.c:1406 +msgid "Unsupported combination of ignored and untracked-files arguments" +msgstr "Kombinationen av argument för ignorerade och ospårade filer stöds ej" + +#: builtin/commit.c:1469 msgid "couldn't look up newly created commit" msgstr "kunde inte slå upp en precis skapad incheckning" -#: builtin/commit.c:1451 +#: builtin/commit.c:1471 msgid "could not parse newly created commit" msgstr "kunde inte tolka en precis skapad incheckning" -#: builtin/commit.c:1496 +#: builtin/commit.c:1516 +msgid "unable to resolve HEAD after creating commit" +msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning" + +#: builtin/commit.c:1518 msgid "detached HEAD" msgstr "frånkopplad HEAD" -#: builtin/commit.c:1499 +#: builtin/commit.c:1521 msgid " (root-commit)" msgstr " (rotincheckning)" -#: builtin/commit.c:1596 +#: builtin/commit.c:1618 msgid "suppress summary after successful commit" msgstr "undertryck sammanfattning efter framgångsrik incheckning" -#: builtin/commit.c:1597 +#: builtin/commit.c:1619 msgid "show diff in commit message template" msgstr "visa diff i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1599 +#: builtin/commit.c:1621 msgid "Commit message options" msgstr "Alternativ för incheckningsmeddelande" -#: builtin/commit.c:1600 builtin/tag.c:388 +#: builtin/commit.c:1622 builtin/tag.c:388 msgid "read message from file" msgstr "läs meddelande från fil" -#: builtin/commit.c:1601 +#: builtin/commit.c:1623 msgid "author" msgstr "författare" -#: builtin/commit.c:1601 +#: builtin/commit.c:1623 msgid "override author for commit" msgstr "överstyr författare för incheckningen" -#: builtin/commit.c:1602 builtin/gc.c:359 +#: builtin/commit.c:1624 builtin/gc.c:359 msgid "date" msgstr "datum" -#: builtin/commit.c:1602 +#: builtin/commit.c:1624 msgid "override date for commit" msgstr "överstyr datum för incheckningen" -#: builtin/commit.c:1603 builtin/merge.c:225 builtin/notes.c:402 +#: builtin/commit.c:1625 builtin/merge.c:225 builtin/notes.c:402 #: builtin/notes.c:565 builtin/tag.c:386 msgid "message" msgstr "meddelande" -#: builtin/commit.c:1603 +#: builtin/commit.c:1625 msgid "commit message" msgstr "incheckningsmeddelande" -#: builtin/commit.c:1604 builtin/commit.c:1605 builtin/commit.c:1606 -#: builtin/commit.c:1607 parse-options.h:257 ref-filter.h:92 +#: builtin/commit.c:1626 builtin/commit.c:1627 builtin/commit.c:1628 +#: builtin/commit.c:1629 parse-options.h:257 ref-filter.h:92 msgid "commit" msgstr "incheckning" -#: builtin/commit.c:1604 +#: builtin/commit.c:1626 msgid "reuse and edit message from specified commit" msgstr "återanvänd och redigera meddelande från angiven incheckning" -#: builtin/commit.c:1605 +#: builtin/commit.c:1627 msgid "reuse message from specified commit" msgstr "återanvänd meddelande från angiven incheckning" -#: builtin/commit.c:1606 +#: builtin/commit.c:1628 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "använd autosquash-formaterat meddelande för att fixa angiven incheckning" -#: builtin/commit.c:1607 +#: builtin/commit.c:1629 msgid "use autosquash formatted message to squash specified commit" msgstr "" "använd autosquash-formaterat meddelande för att slå ihop med angiven " "incheckning" -#: builtin/commit.c:1608 +#: builtin/commit.c:1630 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:1609 builtin/log.c:1436 builtin/merge.c:239 -#: builtin/revert.c:105 +#: builtin/commit.c:1631 builtin/log.c:1443 builtin/merge.c:239 +#: builtin/pull.c:149 builtin/revert.c:105 msgid "add Signed-off-by:" msgstr "lägg till Signed-off-by:" -#: builtin/commit.c:1610 +#: builtin/commit.c:1632 msgid "use specified template file" msgstr "använd angiven mallfil" -#: builtin/commit.c:1611 +#: builtin/commit.c:1633 msgid "force edit of commit" msgstr "tvinga redigering av incheckning" -#: builtin/commit.c:1612 +#: builtin/commit.c:1634 msgid "default" msgstr "standard" -#: builtin/commit.c:1612 builtin/tag.c:391 +#: builtin/commit.c:1634 builtin/tag.c:391 msgid "how to strip spaces and #comments from message" msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande" -#: builtin/commit.c:1613 +#: builtin/commit.c:1635 msgid "include status in commit message template" msgstr "inkludera status i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1615 builtin/merge.c:237 builtin/pull.c:173 +#: builtin/commit.c:1637 builtin/merge.c:237 builtin/pull.c:179 #: builtin/revert.c:113 msgid "GPG sign commit" msgstr "GPG-signera incheckning" -#: builtin/commit.c:1618 +#: builtin/commit.c:1640 msgid "Commit contents options" msgstr "Alternativ för incheckningens innehåll" -#: builtin/commit.c:1619 +#: builtin/commit.c:1641 msgid "commit all changed files" msgstr "checka in alla ändrade filer" -#: builtin/commit.c:1620 +#: builtin/commit.c:1642 msgid "add specified files to index for commit" msgstr "lägg till angivna filer till indexet för incheckning" -#: builtin/commit.c:1621 +#: builtin/commit.c:1643 msgid "interactively add files" msgstr "lägg till filer interaktivt" -#: builtin/commit.c:1622 +#: builtin/commit.c:1644 msgid "interactively add changes" msgstr "lägg till ändringar interaktivt" -#: builtin/commit.c:1623 +#: builtin/commit.c:1645 msgid "commit only specified files" msgstr "checka endast in angivna filer" -#: builtin/commit.c:1624 +#: builtin/commit.c:1646 msgid "bypass pre-commit and commit-msg hooks" msgstr "förbigå pre-commit- och commit-msg-krokar" -#: builtin/commit.c:1625 +#: builtin/commit.c:1647 msgid "show what would be committed" msgstr "visa vad som skulle checkas in" -#: builtin/commit.c:1636 +#: builtin/commit.c:1658 msgid "amend previous commit" msgstr "lägg till föregående incheckning" -#: builtin/commit.c:1637 +#: builtin/commit.c:1659 msgid "bypass post-rewrite hook" msgstr "förbigå post-rewrite-krok" -#: builtin/commit.c:1642 +#: builtin/commit.c:1664 msgid "ok to record an empty change" msgstr "ok att registrera en tom ändring" -#: builtin/commit.c:1644 +#: builtin/commit.c:1666 msgid "ok to record a change with an empty message" msgstr "ok att registrera en ändring med tomt meddelande" -#: builtin/commit.c:1674 +#: builtin/commit.c:1696 msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: builtin/commit.c:1719 +#: builtin/commit.c:1741 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Trasig MERGE_HEAD-fil (%s)" -#: builtin/commit.c:1726 +#: builtin/commit.c:1748 msgid "could not read MERGE_MODE" msgstr "kunde inte läsa MERGE_MODE" -#: builtin/commit.c:1745 +#: builtin/commit.c:1767 #, c-format msgid "could not read commit message: %s" msgstr "kunde inte läsa incheckningsmeddelande: %s" -#: builtin/commit.c:1756 +#: builtin/commit.c:1778 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n" -#: builtin/commit.c:1761 +#: builtin/commit.c:1783 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" -#: builtin/commit.c:1809 +#: builtin/commit.c:1831 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -7575,139 +7636,143 @@ msgstr "" msgid "git config [<options>]" msgstr "git config [<flaggor>]" -#: builtin/config.c:57 +#: builtin/config.c:58 msgid "Config file location" msgstr "Konfigurationsfilens plats" -#: builtin/config.c:58 +#: builtin/config.c:59 msgid "use global config file" msgstr "använd global konfigurationsfil" -#: builtin/config.c:59 +#: builtin/config.c:60 msgid "use system config file" msgstr "använd systemets konfigurationsfil" -#: builtin/config.c:60 +#: builtin/config.c:61 msgid "use repository config file" msgstr "använd arkivets konfigurationsfil" -#: builtin/config.c:61 +#: builtin/config.c:62 msgid "use given config file" msgstr "använd angiven konfigurationsfil" -#: builtin/config.c:62 +#: builtin/config.c:63 msgid "blob-id" msgstr "blob-id" -#: builtin/config.c:62 +#: builtin/config.c:63 msgid "read config from given blob object" msgstr "läs konfiguration från givet blob-objekt" -#: builtin/config.c:63 +#: builtin/config.c:64 msgid "Action" msgstr "Åtgärd" -#: builtin/config.c:64 +#: builtin/config.c:65 msgid "get value: name [value-regex]" msgstr "hämta värde: namn [värde-reguttr]" -#: builtin/config.c:65 +#: builtin/config.c:66 msgid "get all values: key [value-regex]" msgstr "hämta alla värden: nyckel [värde-reguttr]" -#: builtin/config.c:66 +#: builtin/config.c:67 msgid "get values for regexp: name-regex [value-regex]" msgstr "hämta värden för reguttr: namn-reguttr [värde-reguttr]" -#: builtin/config.c:67 +#: builtin/config.c:68 msgid "get value specific for the URL: section[.var] URL" msgstr "hämta värde specifikt URL:en: sektion[.var] URL" -#: builtin/config.c:68 +#: builtin/config.c:69 msgid "replace all matching variables: name value [value_regex]" msgstr "ersätt alla motsvarande variabler: namn värde [värde-reguttr]" -#: builtin/config.c:69 +#: builtin/config.c:70 msgid "add a new variable: name value" msgstr "lägg till en ny variabel: namn värde" -#: builtin/config.c:70 +#: builtin/config.c:71 msgid "remove a variable: name [value-regex]" msgstr "ta bort en variabel: namn [värde-reguttr]" -#: builtin/config.c:71 +#: builtin/config.c:72 msgid "remove all matches: name [value-regex]" msgstr "ta bort alla träffar: namn [värde-reguttr]" -#: builtin/config.c:72 +#: builtin/config.c:73 msgid "rename section: old-name new-name" msgstr "byt namn på sektion: gammalt-namn nytt-namn" -#: builtin/config.c:73 +#: builtin/config.c:74 msgid "remove a section: name" msgstr "ta bort en sektion: namn" -#: builtin/config.c:74 +#: builtin/config.c:75 msgid "list all" msgstr "visa alla" -#: builtin/config.c:75 +#: builtin/config.c:76 msgid "open an editor" msgstr "öppna textredigeringsprogram" -#: builtin/config.c:76 +#: builtin/config.c:77 msgid "find the color configured: slot [default]" msgstr "hitta den inställda färgen: slot [default]" -#: builtin/config.c:77 +#: builtin/config.c:78 msgid "find the color setting: slot [stdout-is-tty]" msgstr "hitta färginställningen: slot [stdout-is-tty]" -#: builtin/config.c:78 +#: builtin/config.c:79 msgid "Type" msgstr "Typ" -#: builtin/config.c:79 +#: builtin/config.c:80 msgid "value is \"true\" or \"false\"" msgstr "värdet är \"true\" eller \"false\"" -#: builtin/config.c:80 +#: builtin/config.c:81 msgid "value is decimal number" msgstr "värdet är ett decimalt tal" -#: builtin/config.c:81 +#: builtin/config.c:82 msgid "value is --bool or --int" msgstr "värdet är --bool eller --int" -#: builtin/config.c:82 +#: builtin/config.c:83 msgid "value is a path (file or directory name)" msgstr "värdet är en sökväg (fil- eller katalognamn)" -#: builtin/config.c:83 +#: builtin/config.c:84 +msgid "value is an expiry date" +msgstr "värdet är ett utgångsdatum" + +#: builtin/config.c:85 msgid "Other" msgstr "Andra" -#: builtin/config.c:84 +#: builtin/config.c:86 msgid "terminate values with NUL byte" msgstr "terminera värden med NUL-byte" -#: builtin/config.c:85 +#: builtin/config.c:87 msgid "show variable names only" msgstr "visa endast variabelnamn" -#: builtin/config.c:86 +#: builtin/config.c:88 msgid "respect include directives on lookup" msgstr "respektera inkluderingsdirektiv vid uppslag" -#: builtin/config.c:87 +#: builtin/config.c:89 msgid "show origin of config (file, standard input, blob, command line)" msgstr "visa konfigurationskälla (fil, standard in, blob, kommandorad)" -#: builtin/config.c:327 +#: builtin/config.c:335 msgid "unable to parse default color value" msgstr "kan inte tolka standardfärgvärde" -#: builtin/config.c:471 +#: builtin/config.c:479 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -7722,16 +7787,16 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:499 +#: builtin/config.c:507 msgid "--local can only be used inside a git repository" msgstr "--local kan bara användas inuti ett git-arkiv" -#: builtin/config.c:624 +#: builtin/config.c:632 #, c-format msgid "cannot create configuration file %s" msgstr "kan inte skapa konfigurationsfilen \"%s\"" -#: builtin/config.c:637 +#: builtin/config.c:645 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -7748,67 +7813,58 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "skriv storlekar i människoläsbart format" -#: builtin/describe.c:19 +#: builtin/describe.c:22 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<flaggor>] [<incheckning-igt>...]" -#: builtin/describe.c:20 +#: builtin/describe.c:23 msgid "git describe [<options>] --dirty" msgstr "git describe [<flaggor>] --dirty" -#: builtin/describe.c:54 +#: builtin/describe.c:57 msgid "head" msgstr "huvud" -#: builtin/describe.c:54 +#: builtin/describe.c:57 msgid "lightweight" msgstr "lättviktig" -#: builtin/describe.c:54 +#: builtin/describe.c:57 msgid "annotated" msgstr "annoterad" -#: builtin/describe.c:264 +#: builtin/describe.c:267 #, c-format msgid "annotated tag %s not available" msgstr "den annoterade taggen %s inte tillgänglig" -#: builtin/describe.c:268 +#: builtin/describe.c:271 #, c-format msgid "annotated tag %s has no embedded name" msgstr "den annoterade taggen %s har inget inbäddat namn" -#: builtin/describe.c:270 +#: builtin/describe.c:273 #, c-format msgid "tag '%s' is really '%s' here" msgstr "taggen \"%s\" är i verkligheten \"%s\" här" -#: builtin/describe.c:297 builtin/log.c:493 -#, c-format -msgid "Not a valid object name %s" -msgstr "Objektnamnet är inte giltigt: %s" - -#: builtin/describe.c:300 -#, c-format -msgid "%s is not a valid '%s' object" -msgstr "%s är inte ett giltigt \"%s\"-objekt" - -#: builtin/describe.c:317 +#: builtin/describe.c:314 #, c-format msgid "no tag exactly matches '%s'" msgstr "ingen tagg motsvarar \"%s\" exakt" -#: builtin/describe.c:319 +#: builtin/describe.c:316 #, c-format -msgid "searching to describe %s\n" -msgstr "söker för att beskriva %s\n" +msgid "No exact match on refs or tags, searching to describe\n" +msgstr "" +"Ingen exakt träff mot referenser eller taggar, söker för att beskriva\n" -#: builtin/describe.c:366 +#: builtin/describe.c:363 #, c-format msgid "finished search at %s\n" msgstr "avslutade sökning på %s\n" -#: builtin/describe.c:393 +#: builtin/describe.c:389 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -7817,7 +7873,7 @@ msgstr "" "Inga annoterade taggar kan beskriva \"%s\".\n" "Det finns dock oannoterade taggar: testa --tags." -#: builtin/describe.c:397 +#: builtin/describe.c:393 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -7826,12 +7882,12 @@ msgstr "" "Inga taggar kan beskriva \"%s\".\n" "Testa --always, eller skapa några taggar." -#: builtin/describe.c:427 +#: builtin/describe.c:423 #, c-format msgid "traversed %lu commits\n" msgstr "traverserade %lu incheckningar\n" -#: builtin/describe.c:430 +#: builtin/describe.c:426 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -7840,75 +7896,90 @@ msgstr "" "mer än %i taggar hittades; listar de %i senaste\n" "gav upp sökningen vid %s\n" -#: builtin/describe.c:452 +#: builtin/describe.c:494 +#, c-format +msgid "describe %s\n" +msgstr "beskriva %s\n" + +#: builtin/describe.c:497 builtin/log.c:500 +#, c-format +msgid "Not a valid object name %s" +msgstr "Objektnamnet är inte giltigt: %s" + +#: builtin/describe.c:505 +#, c-format +msgid "%s is neither a commit nor blob" +msgstr "%s är varken incheckning eller blob" + +#: builtin/describe.c:519 msgid "find the tag that comes after the commit" msgstr "hitta taggen som kommer efter incheckningen" -#: builtin/describe.c:453 +#: builtin/describe.c:520 msgid "debug search strategy on stderr" msgstr "felsök sökstrategin på standard fel" -#: builtin/describe.c:454 +#: builtin/describe.c:521 msgid "use any ref" msgstr "använd alla referenser" -#: builtin/describe.c:455 +#: builtin/describe.c:522 msgid "use any tag, even unannotated" msgstr "använd alla taggar, även oannoterade" -#: builtin/describe.c:456 +#: builtin/describe.c:523 msgid "always use long format" msgstr "använd alltid långt format" -#: builtin/describe.c:457 +#: builtin/describe.c:524 msgid "only follow first parent" msgstr "följ endast första föräldern" -#: builtin/describe.c:460 +#: builtin/describe.c:527 msgid "only output exact matches" msgstr "skriv endast ut exakta träffar" -#: builtin/describe.c:462 +#: builtin/describe.c:529 msgid "consider <n> most recent tags (default: 10)" msgstr "överväg de <n> nyaste taggarna (standard: 10)" -#: builtin/describe.c:464 +#: builtin/describe.c:531 msgid "only consider tags matching <pattern>" msgstr "överväg endast taggar som motsvarar <mönster>" -#: builtin/describe.c:466 +#: builtin/describe.c:533 msgid "do not consider tags matching <pattern>" msgstr "överväg inte taggar som motsvarar <mönster>" -#: builtin/describe.c:468 builtin/name-rev.c:406 +#: builtin/describe.c:535 builtin/name-rev.c:406 msgid "show abbreviated commit object as fallback" msgstr "visa förkortade incheckningsobjekt som standard" -#: builtin/describe.c:469 builtin/describe.c:472 +#: builtin/describe.c:536 builtin/describe.c:539 msgid "mark" msgstr "märke" -#: builtin/describe.c:470 +#: builtin/describe.c:537 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "lägg till <märke> på lortigt arbetsträd (standard: \"-dirty\")" -#: builtin/describe.c:473 +#: builtin/describe.c:540 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "lägg till <märke> på trasigt arbetsträd (standard: \"-broken\")" -#: builtin/describe.c:491 +#: builtin/describe.c:558 msgid "--long is incompatible with --abbrev=0" msgstr "--long är inkompatibel med --abbrev=0" -#: builtin/describe.c:520 +#: builtin/describe.c:587 msgid "No names found, cannot describe anything." msgstr "Inga namn hittades, kan inte beskriva något." -#: builtin/describe.c:563 +#: builtin/describe.c:637 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden" -#: builtin/describe.c:565 +#: builtin/describe.c:639 msgid "--broken is incompatible with commit-ishes" msgstr "--broken är inkompatibelt med \"commit-ish\"-värden" @@ -7917,26 +7988,26 @@ msgstr "--broken är inkompatibelt med \"commit-ish\"-värden" msgid "'%s': not a regular file or symlink" msgstr "\"%s\": inte en normal fil eller symbolisk länk" -#: builtin/diff.c:235 +#: builtin/diff.c:234 #, c-format msgid "invalid option: %s" msgstr "ogiltig flagga: %s" -#: builtin/diff.c:357 +#: builtin/diff.c:356 msgid "Not a git repository" msgstr "Inte ett git-arkiv" -#: builtin/diff.c:400 +#: builtin/diff.c:399 #, c-format msgid "invalid object '%s' given." msgstr "objektet \"%s\" som angavs är felaktigt." -#: builtin/diff.c:409 +#: builtin/diff.c:408 #, c-format msgid "more than two blobs given: '%s'" msgstr "mer än två blobbar angavs: \"%s\"" -#: builtin/diff.c:414 +#: builtin/diff.c:413 #, c-format msgid "unhandled object '%s' given." msgstr "ej hanterat objekt \"%s\" angavs." @@ -7974,53 +8045,53 @@ msgstr "" "kombinerade diff-format (\"-c\" och \"--cc\") stöds inte i\n" "katalogdiffläge (\"-d\" och \"--dir-diff\")." -#: builtin/difftool.c:633 +#: builtin/difftool.c:632 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "bägge filerna ändrade: \"%s\" och \"%s\"." -#: builtin/difftool.c:635 +#: builtin/difftool.c:634 msgid "working tree file has been left." msgstr "filen i arbetskatalogen lämnades kvar." -#: builtin/difftool.c:646 +#: builtin/difftool.c:645 #, c-format msgid "temporary files exist in '%s'." msgstr "temporära filer finns i \"%s\"." -#: builtin/difftool.c:647 +#: builtin/difftool.c:646 msgid "you may want to cleanup or recover these." msgstr "du kanske vill städa eller rädda dem." -#: builtin/difftool.c:696 +#: builtin/difftool.c:695 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "använd \"diff.guitool\" istället för \"diff.tool\"" -#: builtin/difftool.c:698 +#: builtin/difftool.c:697 msgid "perform a full-directory diff" msgstr "utför diff för hela katalogen" -#: builtin/difftool.c:700 +#: builtin/difftool.c:699 msgid "do not prompt before launching a diff tool" msgstr "fråga inte vid start av diff-verktyg" -#: builtin/difftool.c:706 +#: builtin/difftool.c:705 msgid "use symlinks in dir-diff mode" msgstr "använd symboliska länkar i katalogdiffläge" -#: builtin/difftool.c:707 +#: builtin/difftool.c:706 msgid "<tool>" msgstr "<verktyg>" -#: builtin/difftool.c:708 +#: builtin/difftool.c:707 msgid "use the specified diff tool" msgstr "använd angivet diff-verktyg" -#: builtin/difftool.c:710 +#: builtin/difftool.c:709 msgid "print a list of diff tools that may be used with `--tool`" msgstr "visa en lista över diff-verktyg som kan användas med ”--tool”" -#: builtin/difftool.c:713 +#: builtin/difftool.c:712 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -8028,19 +8099,19 @@ msgstr "" "låt \"git-difftool\" avbryta när ett anropat diff-verktyg ger returvärde " "skilt från noll" -#: builtin/difftool.c:715 +#: builtin/difftool.c:714 msgid "<command>" msgstr "<kommando>" -#: builtin/difftool.c:716 +#: builtin/difftool.c:715 msgid "specify a custom command for viewing diffs" msgstr "ange eget kommando för att visa diffar" -#: builtin/difftool.c:740 +#: builtin/difftool.c:739 msgid "no <tool> given for --tool=<tool>" msgstr "inget <verktyg> angavs för --tool=<verktyg>" -#: builtin/difftool.c:747 +#: builtin/difftool.c:746 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "inget <kommando> angavs för --extcmd=<kommando>" @@ -8096,95 +8167,95 @@ msgstr "Applicera referensspecifikation på exporterade referenser" msgid "anonymize output" msgstr "anonymisera utdata" -#: builtin/fetch.c:23 +#: builtin/fetch.c:24 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]" -#: builtin/fetch.c:24 +#: builtin/fetch.c:25 msgid "git fetch [<options>] <group>" msgstr "git fetch [<flaggor>] <grupp>" -#: builtin/fetch.c:25 +#: builtin/fetch.c:26 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]" -#: builtin/fetch.c:26 +#: builtin/fetch.c:27 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<flaggor>]" -#: builtin/fetch.c:112 builtin/pull.c:182 +#: builtin/fetch.c:113 builtin/pull.c:188 msgid "fetch from all remotes" msgstr "hämta från alla fjärrar" -#: builtin/fetch.c:114 builtin/pull.c:185 +#: builtin/fetch.c:115 builtin/pull.c:191 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över" -#: builtin/fetch.c:116 builtin/pull.c:188 +#: builtin/fetch.c:117 builtin/pull.c:194 msgid "path to upload pack on remote end" msgstr "sökväg till upload pack på fjärren" -#: builtin/fetch.c:117 builtin/pull.c:190 +#: builtin/fetch.c:118 builtin/pull.c:196 msgid "force overwrite of local branch" msgstr "tvinga överskrivning av lokal gren" -#: builtin/fetch.c:119 +#: builtin/fetch.c:120 msgid "fetch from multiple remotes" msgstr "hämta från flera fjärrar" -#: builtin/fetch.c:121 builtin/pull.c:192 +#: builtin/fetch.c:122 builtin/pull.c:198 msgid "fetch all tags and associated objects" msgstr "hämta alla taggar och associerade objekt" -#: builtin/fetch.c:123 +#: builtin/fetch.c:124 msgid "do not fetch all tags (--no-tags)" msgstr "hämta inte alla taggar (--no-tags)" -#: builtin/fetch.c:125 +#: builtin/fetch.c:126 msgid "number of submodules fetched in parallel" msgstr "antal undermoduler som hämtas parallellt" -#: builtin/fetch.c:127 builtin/pull.c:195 +#: builtin/fetch.c:128 builtin/pull.c:201 msgid "prune remote-tracking branches no longer on remote" msgstr "rensa fjärrspårande grenar ej längre på fjärren" -#: builtin/fetch.c:128 builtin/fetch.c:151 builtin/pull.c:123 +#: builtin/fetch.c:129 builtin/fetch.c:152 builtin/pull.c:126 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:129 +#: builtin/fetch.c:130 msgid "control recursive fetching of submodules" msgstr "styr rekursiv hämtning av undermoduler" -#: builtin/fetch.c:133 builtin/pull.c:203 +#: builtin/fetch.c:134 builtin/pull.c:209 msgid "keep downloaded pack" msgstr "behåll hämtade paket" -#: builtin/fetch.c:135 +#: builtin/fetch.c:136 msgid "allow updating of HEAD ref" msgstr "tillåt uppdatering av HEAD-referens" -#: builtin/fetch.c:138 builtin/fetch.c:144 builtin/pull.c:206 +#: builtin/fetch.c:139 builtin/fetch.c:145 builtin/pull.c:212 msgid "deepen history of shallow clone" msgstr "fördjupa historik för grund klon" -#: builtin/fetch.c:140 +#: builtin/fetch.c:141 msgid "deepen history of shallow repository based on time" msgstr "fördjupa historik för grund klon baserad på tid" -#: builtin/fetch.c:146 builtin/pull.c:209 +#: builtin/fetch.c:147 builtin/pull.c:215 msgid "convert to a complete repository" msgstr "konvertera till komplett arkiv" -#: builtin/fetch.c:148 builtin/log.c:1456 +#: builtin/fetch.c:149 builtin/log.c:1463 msgid "dir" msgstr "kat" -#: builtin/fetch.c:149 +#: builtin/fetch.c:150 msgid "prepend this to submodule path output" msgstr "lägg till i början av undermodulens sökvägsutdata" -#: builtin/fetch.c:152 +#: builtin/fetch.c:153 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -8192,89 +8263,89 @@ msgstr "" "standard för rekursiv hämtning av undermoduler (lägre prioritet än " "konfigurationsfiler)" -#: builtin/fetch.c:156 builtin/pull.c:212 +#: builtin/fetch.c:157 builtin/pull.c:218 msgid "accept refs that update .git/shallow" msgstr "tar emot referenser som uppdaterar .git/shallow" -#: builtin/fetch.c:157 builtin/pull.c:214 +#: builtin/fetch.c:158 builtin/pull.c:220 msgid "refmap" msgstr "referenskarta" -#: builtin/fetch.c:158 builtin/pull.c:215 +#: builtin/fetch.c:159 builtin/pull.c:221 msgid "specify fetch refmap" msgstr "ange referenskarta för \"fetch\"" -#: builtin/fetch.c:416 +#: builtin/fetch.c:417 msgid "Couldn't find remote ref HEAD" msgstr "Kunde inte hitta fjärr-referensen HEAD" -#: builtin/fetch.c:534 +#: builtin/fetch.c:535 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "konfigurationen för fetch.output innehåller ogiltigt värde %s" -#: builtin/fetch.c:627 +#: builtin/fetch.c:628 #, c-format msgid "object %s not found" msgstr "objektet %s hittades inte" -#: builtin/fetch.c:631 +#: builtin/fetch.c:632 msgid "[up to date]" msgstr "[àjour]" -#: builtin/fetch.c:644 builtin/fetch.c:724 +#: builtin/fetch.c:645 builtin/fetch.c:725 msgid "[rejected]" msgstr "[refuserad]" -#: builtin/fetch.c:645 +#: builtin/fetch.c:646 msgid "can't fetch in current branch" msgstr "kan inte hämta i aktuell gren" -#: builtin/fetch.c:654 +#: builtin/fetch.c:655 msgid "[tag update]" msgstr "[uppdaterad tagg]" -#: builtin/fetch.c:655 builtin/fetch.c:688 builtin/fetch.c:704 -#: builtin/fetch.c:719 +#: builtin/fetch.c:656 builtin/fetch.c:689 builtin/fetch.c:705 +#: builtin/fetch.c:720 msgid "unable to update local ref" msgstr "kunde inte uppdatera lokal ref" -#: builtin/fetch.c:674 +#: builtin/fetch.c:675 msgid "[new tag]" msgstr "[ny tagg]" -#: builtin/fetch.c:677 +#: builtin/fetch.c:678 msgid "[new branch]" msgstr "[ny gren]" -#: builtin/fetch.c:680 +#: builtin/fetch.c:681 msgid "[new ref]" msgstr "[ny ref]" -#: builtin/fetch.c:719 +#: builtin/fetch.c:720 msgid "forced update" msgstr "tvingad uppdatering" -#: builtin/fetch.c:724 +#: builtin/fetch.c:725 msgid "non-fast-forward" msgstr "ej snabbspolad" -#: builtin/fetch.c:769 +#: builtin/fetch.c:770 #, 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:789 +#: builtin/fetch.c:790 #, 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:877 builtin/fetch.c:973 +#: builtin/fetch.c:878 builtin/fetch.c:974 #, c-format msgid "From %.*s\n" msgstr "Från %.*s\n" -#: builtin/fetch.c:888 +#: builtin/fetch.c:889 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -8283,55 +8354,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:943 +#: builtin/fetch.c:944 #, c-format msgid " (%s will become dangling)" msgstr " (%s kommer bli dinglande)" -#: builtin/fetch.c:944 +#: builtin/fetch.c:945 #, c-format msgid " (%s has become dangling)" msgstr " (%s har blivit dinglande)" -#: builtin/fetch.c:976 +#: builtin/fetch.c:977 msgid "[deleted]" msgstr "[borttagen]" -#: builtin/fetch.c:977 builtin/remote.c:1024 +#: builtin/fetch.c:978 builtin/remote.c:1024 msgid "(none)" msgstr "(ingen)" -#: builtin/fetch.c:1000 +#: builtin/fetch.c:1001 #, 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:1019 +#: builtin/fetch.c:1020 #, 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:1022 +#: builtin/fetch.c:1023 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Flaggan \"%s\" ignoreras för %s\n" -#: builtin/fetch.c:1098 -#, c-format -msgid "Don't know how to fetch from %s" -msgstr "Vet inte hur man hämtar från %s" - -#: builtin/fetch.c:1258 +#: builtin/fetch.c:1256 #, c-format msgid "Fetching %s\n" msgstr "Hämtar %s\n" -#: builtin/fetch.c:1260 builtin/remote.c:97 +#: builtin/fetch.c:1258 builtin/remote.c:97 #, c-format msgid "Could not fetch %s" msgstr "Kunde inte hämta %s" -#: builtin/fetch.c:1278 +#: builtin/fetch.c:1276 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -8339,40 +8405,40 @@ 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:1301 +#: builtin/fetch.c:1299 msgid "You need to specify a tag name." msgstr "Du måste ange namnet på en tagg." -#: builtin/fetch.c:1344 +#: builtin/fetch.c:1342 msgid "Negative depth in --deepen is not supported" msgstr "Negativa djup stöds inte i --deepen" -#: builtin/fetch.c:1346 +#: builtin/fetch.c:1344 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen och --depth är ömsesidigt uteslutande" -#: builtin/fetch.c:1351 +#: builtin/fetch.c:1349 msgid "--depth and --unshallow cannot be used together" msgstr "--depth och --unshallow kan inte användas samtidigt" -#: builtin/fetch.c:1353 +#: builtin/fetch.c:1351 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow kan inte användas på ett komplett arkiv" -#: builtin/fetch.c:1366 +#: builtin/fetch.c:1364 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet på ett arkiv som argument" -#: builtin/fetch.c:1368 +#: builtin/fetch.c:1366 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kan inte anges med referensspecifikationer" -#: builtin/fetch.c:1379 +#: builtin/fetch.c:1377 #, c-format msgid "No such remote or remote group: %s" msgstr "Fjärren eller fjärrgruppen finns inte: %s" -#: builtin/fetch.c:1387 +#: builtin/fetch.c:1385 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Kan inte hämta från grupp och ange referensspecifikationer" @@ -8382,23 +8448,23 @@ msgid "" msgstr "" "git fmt-merge-msg [-m <meddelande>] [--log[=<n>] | --no-log] [--file <fil>]" -#: builtin/fmt-merge-msg.c:665 +#: builtin/fmt-merge-msg.c:666 msgid "populate log with at most <n> entries from shortlog" msgstr "fyll i loggen med som mest <n> poster från shortlog" -#: builtin/fmt-merge-msg.c:668 +#: builtin/fmt-merge-msg.c:669 msgid "alias for --log (deprecated)" msgstr "alias för --log (avråds)" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:672 msgid "text" msgstr "text" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:673 msgid "use <text> as start of message" msgstr "inled meddelande med <text>" -#: builtin/fmt-merge-msg.c:673 +#: builtin/fmt-merge-msg.c:674 msgid "file to read from" msgstr "fil att läsa från" @@ -8623,241 +8689,241 @@ msgstr "felaktigt antal trådar angivet (%d) för %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1693 +#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1688 #, c-format msgid "no threads support, ignoring %s" msgstr "trådstöd saknas, ignorerar %s" -#: builtin/grep.c:451 builtin/grep.c:571 builtin/grep.c:613 +#: builtin/grep.c:453 builtin/grep.c:573 builtin/grep.c:615 #, c-format msgid "unable to read tree (%s)" msgstr "kunde inte läsa träd (%s)" -#: builtin/grep.c:628 +#: builtin/grep.c:630 #, c-format msgid "unable to grep from object of type %s" msgstr "kunde inte \"grep\" från objekt av typen %s" -#: builtin/grep.c:694 +#: builtin/grep.c:696 #, c-format msgid "switch `%c' expects a numerical value" msgstr "flaggan \"%c\" antar ett numeriskt värde" -#: builtin/grep.c:781 +#: builtin/grep.c:783 msgid "search in index instead of in the work tree" msgstr "sök i indexet istället för i arbetskatalogen" -#: builtin/grep.c:783 +#: builtin/grep.c:785 msgid "find in contents not managed by git" msgstr "sök i innehåll som inte hanteras av git" -#: builtin/grep.c:785 +#: builtin/grep.c:787 msgid "search in both tracked and untracked files" msgstr "sök i både spårade och ospårade filer" -#: builtin/grep.c:787 +#: builtin/grep.c:789 msgid "ignore files specified via '.gitignore'" msgstr "ignorera filer angivna i \".gitignore\"" -#: builtin/grep.c:789 +#: builtin/grep.c:791 msgid "recursively search in each submodule" msgstr "sök varje undermodul rekursivt" -#: builtin/grep.c:792 +#: builtin/grep.c:794 msgid "show non-matching lines" msgstr "visa rader som inte träffas" -#: builtin/grep.c:794 +#: builtin/grep.c:796 msgid "case insensitive matching" msgstr "skiftlägesokänslig sökning" -#: builtin/grep.c:796 +#: builtin/grep.c:798 msgid "match patterns only at word boundaries" msgstr "matcha endast mönster vid ordgränser" -#: builtin/grep.c:798 +#: builtin/grep.c:800 msgid "process binary files as text" msgstr "hantera binärfiler som text" -#: builtin/grep.c:800 +#: builtin/grep.c:802 msgid "don't match patterns in binary files" msgstr "träffa inte mönster i binärfiler" -#: builtin/grep.c:803 +#: builtin/grep.c:805 msgid "process binary files with textconv filters" msgstr "hantera binärfiler med textconv-filter" -#: builtin/grep.c:805 +#: builtin/grep.c:807 msgid "descend at most <depth> levels" msgstr "gå som mest ned <djup> nivåer" -#: builtin/grep.c:809 +#: builtin/grep.c:811 msgid "use extended POSIX regular expressions" msgstr "använd utökade POSIX-reguljära uttryck" -#: builtin/grep.c:812 +#: builtin/grep.c:814 msgid "use basic POSIX regular expressions (default)" msgstr "använd grundläggande POSIX-reguljära uttryck (standard)" -#: builtin/grep.c:815 +#: builtin/grep.c:817 msgid "interpret patterns as fixed strings" msgstr "tolka mönster som fixerade strängar" -#: builtin/grep.c:818 +#: builtin/grep.c:820 msgid "use Perl-compatible regular expressions" msgstr "använd Perlkompatibla reguljära uttryck" -#: builtin/grep.c:821 +#: builtin/grep.c:823 msgid "show line numbers" msgstr "visa radnummer" -#: builtin/grep.c:822 +#: builtin/grep.c:824 msgid "don't show filenames" msgstr "visa inte filnamn" -#: builtin/grep.c:823 +#: builtin/grep.c:825 msgid "show filenames" msgstr "visa filnamn" -#: builtin/grep.c:825 +#: builtin/grep.c:827 msgid "show filenames relative to top directory" msgstr "visa filnamn relativa till toppkatalogen" -#: builtin/grep.c:827 +#: builtin/grep.c:829 msgid "show only filenames instead of matching lines" msgstr "visa endast filnamn istället för träffade rader" -#: builtin/grep.c:829 +#: builtin/grep.c:831 msgid "synonym for --files-with-matches" msgstr "synonym för --files-with-matches" -#: builtin/grep.c:832 +#: builtin/grep.c:834 msgid "show only the names of files without match" msgstr "visa endast namn på filer utan träffar" -#: builtin/grep.c:834 +#: builtin/grep.c:836 msgid "print NUL after filenames" msgstr "skriv NUL efter filnamn" -#: builtin/grep.c:836 +#: builtin/grep.c:838 msgid "show the number of matches instead of matching lines" msgstr "visa antal träffar istället för träffade rader" -#: builtin/grep.c:837 +#: builtin/grep.c:839 msgid "highlight matches" msgstr "ljusmarkera träffar" -#: builtin/grep.c:839 +#: builtin/grep.c:841 msgid "print empty line between matches from different files" msgstr "skriv tomma rader mellan träffar från olika filer" -#: builtin/grep.c:841 +#: builtin/grep.c:843 msgid "show filename only once above matches from same file" msgstr "visa filnamn endast en gång ovanför träffar från samma fil" -#: builtin/grep.c:844 +#: builtin/grep.c:846 msgid "show <n> context lines before and after matches" msgstr "visa <n> rader sammanhang före och efter träffar" -#: builtin/grep.c:847 +#: builtin/grep.c:849 msgid "show <n> context lines before matches" msgstr "visa <n> rader sammanhang före träffar" -#: builtin/grep.c:849 +#: builtin/grep.c:851 msgid "show <n> context lines after matches" msgstr "visa <n> rader sammanhang efter träffar" -#: builtin/grep.c:851 +#: builtin/grep.c:853 msgid "use <n> worker threads" msgstr "använd <n> jobbtrådar" -#: builtin/grep.c:852 +#: builtin/grep.c:854 msgid "shortcut for -C NUM" msgstr "genväg för -C NUM" -#: builtin/grep.c:855 +#: builtin/grep.c:857 msgid "show a line with the function name before matches" msgstr "visa en rad med funktionsnamnet före träffen" -#: builtin/grep.c:857 +#: builtin/grep.c:859 msgid "show the surrounding function" msgstr "visa den omkringliggande funktionen" -#: builtin/grep.c:860 +#: builtin/grep.c:862 msgid "read patterns from file" msgstr "läs mönster från fil" -#: builtin/grep.c:862 +#: builtin/grep.c:864 msgid "match <pattern>" msgstr "träffa <mönster>" -#: builtin/grep.c:864 +#: builtin/grep.c:866 msgid "combine patterns specified with -e" msgstr "kombinera mönster som anges med -e" -#: builtin/grep.c:876 +#: builtin/grep.c:878 msgid "indicate hit with exit status without output" msgstr "ange träff med slutstatuskod utan utdata" -#: builtin/grep.c:878 +#: builtin/grep.c:880 msgid "show only matches from files that match all patterns" msgstr "visa endast träffar från filer som träffar alla mönster" -#: builtin/grep.c:880 +#: builtin/grep.c:882 msgid "show parse tree for grep expression" msgstr "visa analysträd för grep-uttryck" -#: builtin/grep.c:884 +#: builtin/grep.c:886 msgid "pager" msgstr "bläddrare" -#: builtin/grep.c:884 +#: builtin/grep.c:886 msgid "show matching files in the pager" msgstr "visa träffade filer i filbläddraren" -#: builtin/grep.c:887 +#: builtin/grep.c:889 msgid "allow calling of grep(1) (ignored by this build)" msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)" -#: builtin/grep.c:950 +#: builtin/grep.c:952 msgid "no pattern given." msgstr "inget mönster angavs." -#: builtin/grep.c:982 +#: builtin/grep.c:984 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index och --untracked kan inte användas med revisioner" -#: builtin/grep.c:989 +#: builtin/grep.c:991 #, c-format msgid "unable to resolve revision: %s" msgstr "kan inte slå upp revision: %s" -#: builtin/grep.c:1023 builtin/index-pack.c:1491 +#: builtin/grep.c:1026 builtin/index-pack.c:1491 #, c-format msgid "invalid number of threads specified (%d)" msgstr "felaktigt antal trådar angivet (%d)" -#: builtin/grep.c:1028 +#: builtin/grep.c:1031 msgid "no threads support, ignoring --threads" msgstr "trådstöd saknas, ignorerar --threads" -#: builtin/grep.c:1052 +#: builtin/grep.c:1055 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager fungerar endast i arbetskatalogen" -#: builtin/grep.c:1075 +#: builtin/grep.c:1078 msgid "option not supported with --recurse-submodules." msgstr "flaggan stöds inte med --recurse-submodules." -#: builtin/grep.c:1081 +#: builtin/grep.c:1084 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached och --untracked kan inte användas med --no-index." -#: builtin/grep.c:1087 +#: builtin/grep.c:1090 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll." -#: builtin/grep.c:1095 +#: builtin/grep.c:1098 msgid "both --cached and trees are given." msgstr "både --cached och träd angavs." @@ -9141,8 +9207,8 @@ msgstr "allvarlig inflate-inkonsekvens" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !" -#: builtin/index-pack.c:752 builtin/pack-objects.c:168 -#: builtin/pack-objects.c:262 +#: builtin/index-pack.c:752 builtin/pack-objects.c:179 +#: builtin/pack-objects.c:273 #, c-format msgid "unable to read %s" msgstr "kunde inte läsa %s" @@ -9302,21 +9368,21 @@ msgstr[1] "kedjelängd = %d: %lu objekt" msgid "packfile name '%s' does not end with '.pack'" msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\"" -#: builtin/index-pack.c:1705 builtin/index-pack.c:1708 -#: builtin/index-pack.c:1724 builtin/index-pack.c:1728 +#: builtin/index-pack.c:1700 builtin/index-pack.c:1703 +#: builtin/index-pack.c:1719 builtin/index-pack.c:1723 #, c-format msgid "bad %s" msgstr "felaktig %s" -#: builtin/index-pack.c:1744 +#: builtin/index-pack.c:1739 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin kan inte användas med --stdin" -#: builtin/index-pack.c:1746 +#: builtin/index-pack.c:1741 msgid "--stdin requires a git repository" msgstr "--stdin kräver ett git-arkiv" -#: builtin/index-pack.c:1754 +#: builtin/index-pack.c:1749 msgid "--verify with no packfile name given" msgstr "--verify angavs utan paketfilnamn" @@ -9513,99 +9579,107 @@ msgstr "git show [<flaggor>] <objekt>..." msgid "invalid --decorate option: %s" msgstr "ogiltig flagga för --decorate: %s" -#: builtin/log.c:148 +#: builtin/log.c:151 msgid "suppress diff output" msgstr "undertryck diff-utdata" -#: builtin/log.c:149 +#: builtin/log.c:152 msgid "show source" msgstr "visa källkod" -#: builtin/log.c:150 +#: builtin/log.c:153 msgid "Use mail map file" msgstr "Använd e-postmappningsfil" -#: builtin/log.c:151 +#: builtin/log.c:155 +msgid "only decorate refs that match <pattern>" +msgstr "dekorera endast referenser som motsvarar <mönster>" + +#: builtin/log.c:157 +msgid "do not decorate refs that match <pattern>" +msgstr "dekorera inte referenser som motsvarar <mönster>" + +#: builtin/log.c:158 msgid "decorate options" msgstr "dekoreringsflaggor" -#: builtin/log.c:154 +#: builtin/log.c:161 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:250 +#: builtin/log.c:257 #, c-format msgid "Final output: %d %s\n" msgstr "Slututdata: %d %s\n" -#: builtin/log.c:501 +#: builtin/log.c:508 #, c-format msgid "git show %s: bad file" msgstr "git show %s: felaktig fil" -#: builtin/log.c:516 builtin/log.c:610 +#: builtin/log.c:523 builtin/log.c:617 #, c-format msgid "Could not read object %s" msgstr "Kunde inte läsa objektet %s" -#: builtin/log.c:634 +#: builtin/log.c:641 #, c-format msgid "Unknown type: %d" msgstr "Okänd typ: %d" -#: builtin/log.c:755 +#: builtin/log.c:762 msgid "format.headers without value" msgstr "format.headers utan värde" -#: builtin/log.c:856 +#: builtin/log.c:863 msgid "name of output directory is too long" msgstr "namnet på utdatakatalogen är för långt" -#: builtin/log.c:872 +#: builtin/log.c:879 #, c-format msgid "Cannot open patch file %s" msgstr "Kan inte öppna patchfilen %s" -#: builtin/log.c:889 +#: builtin/log.c:896 msgid "Need exactly one range." msgstr "Behöver precis ett intervall." -#: builtin/log.c:899 +#: builtin/log.c:906 msgid "Not a range." msgstr "Inte ett intervall." -#: builtin/log.c:1005 +#: builtin/log.c:1012 msgid "Cover letter needs email format" msgstr "Omslagsbrevet behöver e-postformat" -#: builtin/log.c:1085 +#: builtin/log.c:1092 #, c-format msgid "insane in-reply-to: %s" msgstr "tokigt in-reply-to: %s" -#: builtin/log.c:1112 +#: builtin/log.c:1119 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]" -#: builtin/log.c:1162 +#: builtin/log.c:1169 msgid "Two output directories?" msgstr "Två utdatakataloger?" -#: builtin/log.c:1269 builtin/log.c:1920 builtin/log.c:1922 builtin/log.c:1934 +#: builtin/log.c:1276 builtin/log.c:1927 builtin/log.c:1929 builtin/log.c:1941 #, c-format msgid "Unknown commit %s" msgstr "Okänd incheckning %s" -#: builtin/log.c:1279 builtin/notes.c:887 builtin/tag.c:516 +#: builtin/log.c:1286 builtin/notes.c:887 builtin/tag.c:516 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Kunde inte slå upp \"%s\" som en giltig referens." -#: builtin/log.c:1284 +#: builtin/log.c:1291 msgid "Could not find exact merge base." msgstr "Kunde inte hitta exakt sammanslagningsbas." -#: builtin/log.c:1288 +#: builtin/log.c:1295 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" @@ -9616,328 +9690,332 @@ msgstr "" "Eller så kan du ange basincheckning med --base=<bas-inchecknings-id> " "manuellt." -#: builtin/log.c:1308 +#: builtin/log.c:1315 msgid "Failed to find exact merge base" msgstr "Kunde inte hitta exakt sammanslagningsbas" -#: builtin/log.c:1319 +#: builtin/log.c:1326 msgid "base commit should be the ancestor of revision list" msgstr "basincheckningen bör vara förfader till revisionslistan" -#: builtin/log.c:1323 +#: builtin/log.c:1330 msgid "base commit shouldn't be in revision list" msgstr "basincheckningen bör inte vara i revisionslistan" -#: builtin/log.c:1372 +#: builtin/log.c:1379 msgid "cannot get patch id" msgstr "kan inte hämta patch-id" -#: builtin/log.c:1431 +#: builtin/log.c:1438 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:1434 +#: builtin/log.c:1441 msgid "use [PATCH] even with multiple patches" msgstr "använd [PATCH] även för flera patchar" -#: builtin/log.c:1438 +#: builtin/log.c:1445 msgid "print patches to standard out" msgstr "skriv patcharna på standard ut" -#: builtin/log.c:1440 +#: builtin/log.c:1447 msgid "generate a cover letter" msgstr "generera ett följebrev" -#: builtin/log.c:1442 +#: builtin/log.c:1449 msgid "use simple number sequence for output file names" msgstr "använd enkel nummersekvens för utdatafilnamn" -#: builtin/log.c:1443 +#: builtin/log.c:1450 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1444 +#: builtin/log.c:1451 msgid "use <sfx> instead of '.patch'" msgstr "använd <sfx> istället för \".patch\"" -#: builtin/log.c:1446 +#: builtin/log.c:1453 msgid "start numbering patches at <n> instead of 1" msgstr "börja numrera patchar på <n> istället för 1" -#: builtin/log.c:1448 +#: builtin/log.c:1455 msgid "mark the series as Nth re-roll" msgstr "markera serien som N:te försök" -#: builtin/log.c:1450 +#: builtin/log.c:1457 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Använd [RFC PATCH] istället för [PATCH]" -#: builtin/log.c:1453 +#: builtin/log.c:1460 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Använd [<prefix>] istället för [PATCH]" -#: builtin/log.c:1456 +#: builtin/log.c:1463 msgid "store resulting files in <dir>" msgstr "spara filerna i <katalog>" -#: builtin/log.c:1459 +#: builtin/log.c:1466 msgid "don't strip/add [PATCH]" msgstr "ta inte bort eller lägg till [PATCH]" -#: builtin/log.c:1462 +#: builtin/log.c:1469 msgid "don't output binary diffs" msgstr "skriv inte binära diffar" -#: builtin/log.c:1464 +#: builtin/log.c:1471 msgid "output all-zero hash in From header" msgstr "använd hashvärde med nollor i From-huvud" -#: builtin/log.c:1466 +#: builtin/log.c:1473 msgid "don't include a patch matching a commit upstream" msgstr "ta inte med patchar som motsvarar en uppströmsincheckning" -#: builtin/log.c:1468 +#: builtin/log.c:1475 msgid "show patch format instead of default (patch + stat)" msgstr "visa patchformat istället för standard (patch + stat)" -#: builtin/log.c:1470 +#: builtin/log.c:1477 msgid "Messaging" msgstr "E-post" -#: builtin/log.c:1471 +#: builtin/log.c:1478 msgid "header" msgstr "huvud" -#: builtin/log.c:1472 +#: builtin/log.c:1479 msgid "add email header" msgstr "lägg till e-posthuvud" -#: builtin/log.c:1473 builtin/log.c:1475 +#: builtin/log.c:1480 builtin/log.c:1482 msgid "email" msgstr "epost" -#: builtin/log.c:1473 +#: builtin/log.c:1480 msgid "add To: header" msgstr "lägg till mottagarhuvud (\"To:\")" -#: builtin/log.c:1475 +#: builtin/log.c:1482 msgid "add Cc: header" msgstr "lägg till kopiehuvud (\"Cc:\")" -#: builtin/log.c:1477 +#: builtin/log.c:1484 msgid "ident" msgstr "ident" -#: builtin/log.c:1478 +#: builtin/log.c:1485 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:1480 +#: builtin/log.c:1487 msgid "message-id" msgstr "meddelande-id" -#: builtin/log.c:1481 +#: builtin/log.c:1488 msgid "make first mail a reply to <message-id>" msgstr "gör det första brevet ett svar till <meddelande-id>" -#: builtin/log.c:1482 builtin/log.c:1485 +#: builtin/log.c:1489 builtin/log.c:1492 msgid "boundary" msgstr "gräns" -#: builtin/log.c:1483 +#: builtin/log.c:1490 msgid "attach the patch" msgstr "bifoga patchen" -#: builtin/log.c:1486 +#: builtin/log.c:1493 msgid "inline the patch" msgstr "gör patchen ett inline-objekt" -#: builtin/log.c:1490 +#: builtin/log.c:1497 msgid "enable message threading, styles: shallow, deep" msgstr "aktivera brevtrådning, typer: shallow, deep" -#: builtin/log.c:1492 +#: builtin/log.c:1499 msgid "signature" msgstr "signatur" -#: builtin/log.c:1493 +#: builtin/log.c:1500 msgid "add a signature" msgstr "lägg till signatur" -#: builtin/log.c:1494 +#: builtin/log.c:1501 msgid "base-commit" msgstr "basincheckning" -#: builtin/log.c:1495 +#: builtin/log.c:1502 msgid "add prerequisite tree info to the patch series" msgstr "lägg till förhandskrävd trädinfo i patchserien" -#: builtin/log.c:1497 +#: builtin/log.c:1504 msgid "add a signature from a file" msgstr "lägg till signatur från fil" -#: builtin/log.c:1498 +#: builtin/log.c:1505 msgid "don't print the patch filenames" msgstr "visa inte filnamn för patchar" -#: builtin/log.c:1500 +#: builtin/log.c:1507 msgid "show progress while generating patches" msgstr "visa förloppsindikator medan patchar skapas" -#: builtin/log.c:1575 +#: builtin/log.c:1582 #, c-format msgid "invalid ident line: %s" msgstr "ogiltig ident-rad: %s" -#: builtin/log.c:1590 +#: builtin/log.c:1597 msgid "-n and -k are mutually exclusive." msgstr "-n och -k kan inte användas samtidigt." -#: builtin/log.c:1592 +#: builtin/log.c:1599 msgid "--subject-prefix/--rfc and -k are mutually exclusive." msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt." -#: builtin/log.c:1600 +#: builtin/log.c:1607 msgid "--name-only does not make sense" msgstr "kan inte använda --name-only" -#: builtin/log.c:1602 +#: builtin/log.c:1609 msgid "--name-status does not make sense" msgstr "kan inte använda --name-status" -#: builtin/log.c:1604 +#: builtin/log.c:1611 msgid "--check does not make sense" msgstr "kan inte använda --check" -#: builtin/log.c:1634 +#: builtin/log.c:1641 msgid "standard output, or directory, which one?" msgstr "standard ut, eller katalog, vilken skall det vara?" -#: builtin/log.c:1636 +#: builtin/log.c:1643 #, c-format msgid "Could not create directory '%s'" msgstr "Kunde inte skapa katalogen \"%s\"" -#: builtin/log.c:1729 +#: builtin/log.c:1736 #, c-format msgid "unable to read signature file '%s'" msgstr "kunde inte läsa signaturfil \"%s\"" -#: builtin/log.c:1761 +#: builtin/log.c:1768 msgid "Generating patches" msgstr "Skapar patchar" -#: builtin/log.c:1805 +#: builtin/log.c:1812 msgid "Failed to create output files" msgstr "Misslyckades skapa utdatafiler" -#: builtin/log.c:1855 +#: builtin/log.c:1862 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]" -#: builtin/log.c:1909 +#: builtin/log.c:1916 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n" -#: builtin/ls-files.c:466 +#: builtin/ls-files.c:468 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<flaggor>] [<fil>...]" -#: builtin/ls-files.c:515 +#: builtin/ls-files.c:517 msgid "identify the file status with tags" msgstr "identifiera filstatus med taggar" -#: builtin/ls-files.c:517 +#: builtin/ls-files.c:519 msgid "use lowercase letters for 'assume unchanged' files" msgstr "använd små bokstäver för \"anta oförändrade\"-filer" -#: builtin/ls-files.c:519 +#: builtin/ls-files.c:521 +msgid "use lowercase letters for 'fsmonitor clean' files" +msgstr "använd små bokstäver för \"fsmonitor clean\"-filer" + +#: builtin/ls-files.c:523 msgid "show cached files in the output (default)" msgstr "visa cachade filer i utdata (standard)" -#: builtin/ls-files.c:521 +#: builtin/ls-files.c:525 msgid "show deleted files in the output" msgstr "visa borttagna filer i utdata" -#: builtin/ls-files.c:523 +#: builtin/ls-files.c:527 msgid "show modified files in the output" msgstr "visa modifierade filer i utdata" -#: builtin/ls-files.c:525 +#: builtin/ls-files.c:529 msgid "show other files in the output" msgstr "visa andra filer i utdata" -#: builtin/ls-files.c:527 +#: builtin/ls-files.c:531 msgid "show ignored files in the output" msgstr "visa ignorerade filer i utdata" -#: builtin/ls-files.c:530 +#: builtin/ls-files.c:534 msgid "show staged contents' object name in the output" msgstr "visa köat innehålls objektnamn i utdata" -#: builtin/ls-files.c:532 +#: builtin/ls-files.c:536 msgid "show files on the filesystem that need to be removed" msgstr "visa filer i filsystemet som behöver tas bort" -#: builtin/ls-files.c:534 +#: builtin/ls-files.c:538 msgid "show 'other' directories' names only" msgstr "visa endast namn för \"andra\" kataloger" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:540 msgid "show line endings of files" msgstr "visa radslut i filer" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:542 msgid "don't show empty directories" msgstr "visa inte tomma kataloger" -#: builtin/ls-files.c:541 +#: builtin/ls-files.c:545 msgid "show unmerged files in the output" msgstr "visa ej sammanslagna filer i utdata" -#: builtin/ls-files.c:543 +#: builtin/ls-files.c:547 msgid "show resolve-undo information" msgstr "visa \"resolve-undo\"-information" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:549 msgid "skip files matching pattern" msgstr "hoppa över filer som motsvarar mönster" -#: builtin/ls-files.c:548 +#: builtin/ls-files.c:552 msgid "exclude patterns are read from <file>" msgstr "exkludera mönster som läses från <fil>" -#: builtin/ls-files.c:551 +#: builtin/ls-files.c:555 msgid "read additional per-directory exclude patterns in <file>" msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>" -#: builtin/ls-files.c:553 +#: builtin/ls-files.c:557 msgid "add the standard git exclusions" msgstr "lägg till git:s standardexkluderingar" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:560 msgid "make the output relative to the project top directory" msgstr "gör utdata relativ till projektets toppkatalog" -#: builtin/ls-files.c:559 +#: builtin/ls-files.c:563 msgid "recurse through submodules" msgstr "rekursera ner i undermoduler" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:565 msgid "if any <file> is not in the index, treat this as an error" msgstr "om en <fil> inte är indexet, betrakta det som ett fel" -#: builtin/ls-files.c:562 +#: builtin/ls-files.c:566 msgid "tree-ish" msgstr "träd-igt" -#: builtin/ls-files.c:563 +#: builtin/ls-files.c:567 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "låtsas att sökvägar borttagna sedan <träd-igt> fortfarande finns" -#: builtin/ls-files.c:565 +#: builtin/ls-files.c:569 msgid "show debugging data" msgstr "visa felsökningsutdata" @@ -10059,32 +10137,32 @@ msgstr "Tillgängliga strategier är:" msgid "Available custom strategies are:" msgstr "Tillgängliga skräddarsydda strategier är:" -#: builtin/merge.c:200 builtin/pull.c:134 +#: builtin/merge.c:200 builtin/pull.c:137 msgid "do not show a diffstat at the end of the merge" msgstr "visa inte en diffstat när sammanslagningen är färdig" -#: builtin/merge.c:203 builtin/pull.c:137 +#: builtin/merge.c:203 builtin/pull.c:140 msgid "show a diffstat at the end of the merge" msgstr "visa en diffstat när sammanslagningen är färdig" -#: builtin/merge.c:204 builtin/pull.c:140 +#: builtin/merge.c:204 builtin/pull.c:143 msgid "(synonym to --stat)" msgstr "(synonym till --stat)" -#: builtin/merge.c:206 builtin/pull.c:143 +#: builtin/merge.c:206 builtin/pull.c:146 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "lägg till (som mest <n>) poster från shortlog till incheckningsmeddelandet" -#: builtin/merge.c:209 builtin/pull.c:146 +#: builtin/merge.c:209 builtin/pull.c:152 msgid "create a single commit instead of doing a merge" msgstr "skapa en ensam incheckning istället för en sammanslagning" -#: builtin/merge.c:211 builtin/pull.c:149 +#: builtin/merge.c:211 builtin/pull.c:155 msgid "perform a commit if the merge succeeds (default)" msgstr "utför en incheckning om sammanslagningen lyckades (standard)" -#: builtin/merge.c:213 builtin/pull.c:152 +#: builtin/merge.c:213 builtin/pull.c:158 msgid "edit message before committing" msgstr "redigera meddelande innan incheckning" @@ -10092,28 +10170,28 @@ msgstr "redigera meddelande innan incheckning" msgid "allow fast-forward (default)" msgstr "tillåt snabbspolning (standard)" -#: builtin/merge.c:216 builtin/pull.c:158 +#: builtin/merge.c:216 builtin/pull.c:164 msgid "abort if fast-forward is not possible" msgstr "avbryt om snabbspolning inte är möjlig" -#: builtin/merge.c:220 builtin/pull.c:161 +#: builtin/merge.c:220 builtin/pull.c:167 msgid "verify that the named commit has a valid GPG signature" msgstr "bekräfta att den namngivna incheckningen har en giltig GPG-signatur" -#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:165 +#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:171 #: builtin/revert.c:109 msgid "strategy" msgstr "strategi" -#: builtin/merge.c:222 builtin/pull.c:166 +#: builtin/merge.c:222 builtin/pull.c:172 msgid "merge strategy to use" msgstr "sammanslagningsstrategi att använda" -#: builtin/merge.c:223 builtin/pull.c:169 +#: builtin/merge.c:223 builtin/pull.c:175 msgid "option=value" msgstr "alternativ=värde" -#: builtin/merge.c:224 builtin/pull.c:170 +#: builtin/merge.c:224 builtin/pull.c:176 msgid "option for selected merge strategy" msgstr "alternativ för vald sammanslagningsstrategi" @@ -10129,7 +10207,7 @@ msgstr "avbryt den pågående sammanslagningen" msgid "continue the current in-progress merge" msgstr "fortsätt den pågående sammanslagningen" -#: builtin/merge.c:234 builtin/pull.c:177 +#: builtin/merge.c:234 builtin/pull.c:183 msgid "allow merging unrelated histories" msgstr "tillåt sammanslagning av orelaterade historier" @@ -10168,43 +10246,43 @@ msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n" msgid "No merge message -- not updating HEAD\n" msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n" -#: builtin/merge.c:456 +#: builtin/merge.c:455 #, c-format msgid "'%s' does not point to a commit" msgstr "\"%s\" verkar inte peka på en incheckning" -#: builtin/merge.c:546 +#: builtin/merge.c:545 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Felaktig branch.%s.mergeoptions-sträng: %s" -#: builtin/merge.c:666 +#: builtin/merge.c:667 msgid "Not handling anything other than two heads merge." msgstr "Hanterar inte något annat än en sammanslagning av två huvuden." -#: builtin/merge.c:680 +#: builtin/merge.c:681 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Felaktig flagga för merge-recursive: -X%s" -#: builtin/merge.c:695 +#: builtin/merge.c:696 #, c-format msgid "unable to write %s" msgstr "kunde inte skriva %s" -#: builtin/merge.c:747 +#: builtin/merge.c:748 #, c-format msgid "Could not read from '%s'" msgstr "Kunde inte läsa från \"%s\"" -#: builtin/merge.c:756 +#: builtin/merge.c:757 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Checkar inte in sammanslagningen; använd \"git commit\" för att slutföra " "den.\n" -#: builtin/merge.c:762 +#: builtin/merge.c:763 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -10220,69 +10298,69 @@ msgstr "" "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n" "avbryter incheckningen.\n" -#: builtin/merge.c:798 +#: builtin/merge.c:799 msgid "Empty commit message." msgstr "Tomt incheckningsmeddelande." -#: builtin/merge.c:818 +#: builtin/merge.c:819 #, c-format msgid "Wonderful.\n" msgstr "Underbart.\n" -#: builtin/merge.c:871 +#: builtin/merge.c:872 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n" -#: builtin/merge.c:910 +#: builtin/merge.c:911 msgid "No current branch." msgstr "Inte på någon gren." -#: builtin/merge.c:912 +#: builtin/merge.c:913 msgid "No remote for the current branch." msgstr "Ingen fjärr för aktuell gren." -#: builtin/merge.c:914 +#: builtin/merge.c:915 msgid "No default upstream defined for the current branch." msgstr "Ingen standarduppström angiven för aktuell gren." -#: builtin/merge.c:919 +#: builtin/merge.c:920 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Ingen fjärrspårande gren för %s från %s" -#: builtin/merge.c:972 +#: builtin/merge.c:973 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\"" -#: builtin/merge.c:1073 +#: builtin/merge.c:1075 #, c-format msgid "not something we can merge in %s: %s" msgstr "inte något vi kan slå ihop med %s: %s" -#: builtin/merge.c:1107 +#: builtin/merge.c:1109 msgid "not something we can merge" msgstr "inte något vi kan slå ihop" -#: builtin/merge.c:1172 +#: builtin/merge.c:1174 msgid "--abort expects no arguments" msgstr "--abort tar inga argument" -#: builtin/merge.c:1176 +#: builtin/merge.c:1178 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)." -#: builtin/merge.c:1188 +#: builtin/merge.c:1190 msgid "--continue expects no arguments" msgstr "--continue tar inga argument" -#: builtin/merge.c:1192 +#: builtin/merge.c:1194 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)." -#: builtin/merge.c:1208 +#: builtin/merge.c:1210 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10290,7 +10368,7 @@ msgstr "" "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" "Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1215 +#: builtin/merge.c:1217 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10298,114 +10376,114 @@ msgstr "" "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n" "Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1218 +#: builtin/merge.c:1220 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)." -#: builtin/merge.c:1227 +#: builtin/merge.c:1229 msgid "You cannot combine --squash with --no-ff." msgstr "Du kan inte kombinera --squash med --no-ff." -#: builtin/merge.c:1235 +#: builtin/merge.c:1237 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt." -#: builtin/merge.c:1252 +#: builtin/merge.c:1254 msgid "Squash commit into empty head not supported yet" msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu" -#: builtin/merge.c:1254 +#: builtin/merge.c:1256 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud" -#: builtin/merge.c:1259 +#: builtin/merge.c:1261 #, c-format msgid "%s - not something we can merge" msgstr "%s - inte något vi kan slå ihop" -#: builtin/merge.c:1261 +#: builtin/merge.c:1263 msgid "Can merge only exactly one commit into empty head" msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud" -#: builtin/merge.c:1295 +#: builtin/merge.c:1297 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "Incheckningen %s har en obetrodd GPG-signatur som påstås vara gjord av %s." -#: builtin/merge.c:1298 +#: builtin/merge.c:1300 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" "Incheckningen %s har en felaktig GPG-signatur som påstås vara gjord av %s." -#: builtin/merge.c:1301 +#: builtin/merge.c:1303 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Incheckning %s har inte någon GPG-signatur." -#: builtin/merge.c:1304 +#: builtin/merge.c:1306 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n" -#: builtin/merge.c:1366 +#: builtin/merge.c:1368 msgid "refusing to merge unrelated histories" msgstr "vägrar slå samman orelaterad historik" -#: builtin/merge.c:1375 +#: builtin/merge.c:1377 msgid "Already up to date." msgstr "Redan à jour." -#: builtin/merge.c:1385 +#: builtin/merge.c:1387 #, c-format msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" -#: builtin/merge.c:1426 +#: builtin/merge.c:1428 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" -#: builtin/merge.c:1433 +#: builtin/merge.c:1435 #, c-format msgid "Nope.\n" msgstr "Nej.\n" -#: builtin/merge.c:1458 +#: builtin/merge.c:1460 msgid "Already up to date. Yeeah!" msgstr "Redan à jour. Toppen!" -#: builtin/merge.c:1464 +#: builtin/merge.c:1466 msgid "Not possible to fast-forward, aborting." msgstr "Kan inte snabbspola, avbryter." -#: builtin/merge.c:1487 builtin/merge.c:1566 +#: builtin/merge.c:1489 builtin/merge.c:1568 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Återspolar trädet till orört...\n" -#: builtin/merge.c:1491 +#: builtin/merge.c:1493 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Försöker sammanslagningsstrategin %s...\n" -#: builtin/merge.c:1557 +#: builtin/merge.c:1559 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" -#: builtin/merge.c:1559 +#: builtin/merge.c:1561 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Sammanslagning med strategin %s misslyckades.\n" -#: builtin/merge.c:1568 +#: builtin/merge.c:1570 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Använder %s för att förbereda lösning för hand.\n" -#: builtin/merge.c:1580 +#: builtin/merge.c:1582 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -10431,23 +10509,23 @@ msgstr "git merge-base --is-ancestor <incheckning> <incheckning>" msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point <ref> [<incheckning>]" -#: builtin/merge-base.c:218 +#: builtin/merge-base.c:220 msgid "output all common ancestors" msgstr "skriv ut alla gemensamma anfäder" -#: builtin/merge-base.c:220 +#: builtin/merge-base.c:222 msgid "find ancestors for a single n-way merge" msgstr "hitta anfader för enkel n-vägssammanslagning" -#: builtin/merge-base.c:222 +#: builtin/merge-base.c:224 msgid "list revs not reachable from others" msgstr "visa revisioner som inte kan nås från andra" -#: builtin/merge-base.c:224 +#: builtin/merge-base.c:226 msgid "is the first one ancestor of the other?" msgstr "är den första anfader till den andra?" -#: builtin/merge-base.c:226 +#: builtin/merge-base.c:228 msgid "find where <commit> forked from reflog of <ref>" msgstr "se var <incheckning> grenades av från referensloggen från <ref>" @@ -10728,8 +10806,8 @@ msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "git notes [--ref <anteckningsref>] remove [<objekt>...]" #: builtin/notes.c:36 -msgid "git notes [--ref <notes-ref>] prune [-n | -v]" -msgstr "git notes [--ref <anteckningsref>] prune [-n | -v]" +msgid "git notes [--ref <notes-ref>] prune [-n] [-v]" +msgstr "git notes [--ref <anteckningsref>] prune [-n] [-v]" #: builtin/notes.c:37 msgid "git notes [--ref <notes-ref>] get-ref" @@ -11070,7 +11148,7 @@ msgstr "försök att ta bort icke-existerande anteckningar är inte ett fel" msgid "read object names from the standard input" msgstr "läs objektnamn från standard in" -#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:146 +#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:158 msgid "do not remove, show only" msgstr "ta inte bort, bara visa" @@ -11091,187 +11169,195 @@ msgstr "använd anteckningar från <anteckningsref>" msgid "unknown subcommand: %s" msgstr "okänt underkommando: %s" -#: builtin/pack-objects.c:31 +#: builtin/pack-objects.c:33 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [<flaggor>...] [< <reflista> | < <objektlista>]" -#: builtin/pack-objects.c:32 +#: builtin/pack-objects.c:34 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [<flaggor>...] <basnamn> [< <reflista> | < <objektlista>]" -#: builtin/pack-objects.c:181 builtin/pack-objects.c:184 +#: builtin/pack-objects.c:192 builtin/pack-objects.c:195 #, c-format msgid "deflate error (%d)" msgstr "fel i deflate (%d)" -#: builtin/pack-objects.c:777 +#: builtin/pack-objects.c:788 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:790 +#: builtin/pack-objects.c:801 msgid "Writing objects" msgstr "Skriver objekt" -#: builtin/pack-objects.c:1070 +#: builtin/pack-objects.c:1081 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:2440 +#: builtin/pack-objects.c:2451 msgid "Compressing objects" msgstr "Komprimerar objekt" -#: builtin/pack-objects.c:2849 +#: builtin/pack-objects.c:2599 +msgid "invalid value for --missing" +msgstr "ogiltigt värde för --missing" + +#: builtin/pack-objects.c:2902 #, c-format msgid "unsupported index version %s" msgstr "indexversionen %s stöds ej" -#: builtin/pack-objects.c:2853 +#: builtin/pack-objects.c:2906 #, c-format msgid "bad index version '%s'" msgstr "felaktig indexversion \"%s\"" -#: builtin/pack-objects.c:2883 +#: builtin/pack-objects.c:2936 msgid "do not show progress meter" msgstr "visa inte förloppsindikator" -#: builtin/pack-objects.c:2885 +#: builtin/pack-objects.c:2938 msgid "show progress meter" msgstr "visa förloppsindikator" -#: builtin/pack-objects.c:2887 +#: builtin/pack-objects.c:2940 msgid "show progress meter during object writing phase" msgstr "visa förloppsindikator under objektskrivningsfasen" -#: builtin/pack-objects.c:2890 +#: builtin/pack-objects.c:2943 msgid "similar to --all-progress when progress meter is shown" msgstr "som --all-progress när förloppsindikatorn visas" -#: builtin/pack-objects.c:2891 +#: builtin/pack-objects.c:2944 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2892 +#: builtin/pack-objects.c:2945 msgid "write the pack index file in the specified idx format version" msgstr "skriv paketindexfilen i angiven indexformatversion" -#: builtin/pack-objects.c:2895 +#: builtin/pack-objects.c:2948 msgid "maximum size of each output pack file" msgstr "maximal storlek på varje utdatapaketfil" -#: builtin/pack-objects.c:2897 +#: builtin/pack-objects.c:2950 msgid "ignore borrowed objects from alternate object store" msgstr "ignorera lånade objekt från alternativa objektlager" -#: builtin/pack-objects.c:2899 +#: builtin/pack-objects.c:2952 msgid "ignore packed objects" msgstr "ignorera packade objekt" -#: builtin/pack-objects.c:2901 +#: builtin/pack-objects.c:2954 msgid "limit pack window by objects" msgstr "begränsa paketfönster efter objekt" -#: builtin/pack-objects.c:2903 +#: builtin/pack-objects.c:2956 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:2905 +#: builtin/pack-objects.c:2958 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:2907 +#: builtin/pack-objects.c:2960 msgid "reuse existing deltas" msgstr "återanvänd befintliga delta" -#: builtin/pack-objects.c:2909 +#: builtin/pack-objects.c:2962 msgid "reuse existing objects" msgstr "återanvänd befintliga objekt" -#: builtin/pack-objects.c:2911 +#: builtin/pack-objects.c:2964 msgid "use OFS_DELTA objects" msgstr "använd OFS_DELTA-objekt" -#: builtin/pack-objects.c:2913 +#: builtin/pack-objects.c:2966 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:2915 +#: builtin/pack-objects.c:2968 msgid "do not create an empty pack output" msgstr "försök inte skapa tom paketutdata" -#: builtin/pack-objects.c:2917 +#: builtin/pack-objects.c:2970 msgid "read revision arguments from standard input" msgstr "läs revisionsargument från standard in" -#: builtin/pack-objects.c:2919 +#: builtin/pack-objects.c:2972 msgid "limit the objects to those that are not yet packed" msgstr "begränsa objekt till de som ännu inte packats" -#: builtin/pack-objects.c:2922 +#: builtin/pack-objects.c:2975 msgid "include objects reachable from any reference" msgstr "inkludera objekt som kan nås från någon referens" -#: builtin/pack-objects.c:2925 +#: builtin/pack-objects.c:2978 msgid "include objects referred by reflog entries" msgstr "inkludera objekt som refereras från referensloggposter" -#: builtin/pack-objects.c:2928 +#: builtin/pack-objects.c:2981 msgid "include objects referred to by the index" msgstr "inkludera objekt som refereras från indexet" -#: builtin/pack-objects.c:2931 +#: builtin/pack-objects.c:2984 msgid "output pack to stdout" msgstr "skriv paket på standard ut" -#: builtin/pack-objects.c:2933 +#: builtin/pack-objects.c:2986 msgid "include tag objects that refer to objects to be packed" msgstr "inkludera taggobjekt som refererar objekt som skall packas" -#: builtin/pack-objects.c:2935 +#: builtin/pack-objects.c:2988 msgid "keep unreachable objects" msgstr "behåll onåbara objekt" -#: builtin/pack-objects.c:2937 +#: builtin/pack-objects.c:2990 msgid "pack loose unreachable objects" msgstr "packa lösa onåbara objekt" -#: builtin/pack-objects.c:2939 +#: builtin/pack-objects.c:2992 msgid "unpack unreachable objects newer than <time>" msgstr "packa upp onåbara objekt nyare än <tid>" -#: builtin/pack-objects.c:2942 +#: builtin/pack-objects.c:2995 msgid "create thin packs" msgstr "skapa tunna paket" -#: builtin/pack-objects.c:2944 +#: builtin/pack-objects.c:2997 msgid "create packs suitable for shallow fetches" msgstr "skapa packfiler lämpade för grunda hämtningar" -#: builtin/pack-objects.c:2946 +#: builtin/pack-objects.c:2999 msgid "ignore packs that have companion .keep file" msgstr "ignorera paket som har tillhörande .keep-fil" -#: builtin/pack-objects.c:2948 +#: builtin/pack-objects.c:3001 msgid "pack compression level" msgstr "komprimeringsgrad för paket" -#: builtin/pack-objects.c:2950 +#: builtin/pack-objects.c:3003 msgid "do not hide commits by grafts" msgstr "göm inte incheckningar med ympningar (\"grafts\")" -#: builtin/pack-objects.c:2952 +#: builtin/pack-objects.c:3005 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:2954 +#: builtin/pack-objects.c:3007 msgid "write a bitmap index together with the pack index" msgstr "använd bitkartindex tillsammans med packindexet" -#: builtin/pack-objects.c:3081 +#: builtin/pack-objects.c:3010 +msgid "handling for missing objects" +msgstr "hantering av saknade objekt" + +#: builtin/pack-objects.c:3144 msgid "Counting objects" msgstr "Räknar objekt" @@ -11296,8 +11382,8 @@ msgid "Removing duplicate objects" msgstr "Tar bort duplicerade objekt" #: builtin/prune.c:11 -msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" -msgstr "git prune [-n] [-v] [--expire <tid>] [--] [<huvud>...]" +msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" +msgstr "git prune [-n] [-v] [--progress] [--expire <tid>] [--] [<huvud>...]" #: builtin/prune.c:106 msgid "report pruned objects" @@ -11320,40 +11406,40 @@ msgstr "Felaktigt värde för %s: %s" msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<flaggor>] [<arkiv> [<refspec>...]]" -#: builtin/pull.c:124 +#: builtin/pull.c:127 msgid "control for recursive fetching of submodules" msgstr "styrning för rekursiv hämtning av undermoduler" -#: builtin/pull.c:128 +#: builtin/pull.c:131 msgid "Options related to merging" msgstr "Alternativ gällande sammanslagning" -#: builtin/pull.c:131 +#: builtin/pull.c:134 msgid "incorporate changes by rebasing rather than merging" msgstr "inlemma ändringar genom ombasering i stället för sammanslagning" -#: builtin/pull.c:155 builtin/rebase--helper.c:21 builtin/revert.c:121 +#: builtin/pull.c:161 builtin/rebase--helper.c:23 builtin/revert.c:121 msgid "allow fast-forward" msgstr "tillåt snabbspolning" -#: builtin/pull.c:164 +#: builtin/pull.c:170 msgid "automatically stash/stash pop before and after rebase" msgstr "utför automatiskt stash/stash pop före och efter ombasering" -#: builtin/pull.c:180 +#: builtin/pull.c:186 msgid "Options related to fetching" msgstr "Alternativ gällande hämtningar" -#: builtin/pull.c:198 +#: builtin/pull.c:204 msgid "number of submodules pulled in parallel" msgstr "antal undermoduler som hämtas parallellt" -#: builtin/pull.c:287 +#: builtin/pull.c:299 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Felaktigt värde för pull.ff: %s" -#: builtin/pull.c:403 +#: builtin/pull.c:415 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -11361,14 +11447,14 @@ msgstr "" "Det finns ingen kandidat för ombasering bland referenserna du precis har " "hämtat." -#: builtin/pull.c:405 +#: builtin/pull.c:417 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "Det finns ingen kandidat för sammanslagning bland referenserna du precis har " "hämtat." -#: builtin/pull.c:406 +#: builtin/pull.c:418 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -11376,7 +11462,7 @@ msgstr "" "Det betyder vanligtvis att du använt en jokertecken-refspec som inte\n" "motsvarade något i fjärränden." -#: builtin/pull.c:409 +#: builtin/pull.c:421 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -11387,42 +11473,42 @@ msgstr "" "gren. Eftersom det inte är den fjärr som är konfigurerad som\n" "standard för aktuell gren måste du ange en gren på kommandoraden." -#: builtin/pull.c:414 git-parse-remote.sh:73 +#: builtin/pull.c:426 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Du är inte på någon gren för närvarande." -#: builtin/pull.c:416 builtin/pull.c:431 git-parse-remote.sh:79 +#: builtin/pull.c:428 builtin/pull.c:443 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Ange vilken gren du vill ombasera mot." -#: builtin/pull.c:418 builtin/pull.c:433 git-parse-remote.sh:82 +#: builtin/pull.c:430 builtin/pull.c:445 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Ange vilken gren du vill slå samman med." -#: builtin/pull.c:419 builtin/pull.c:434 +#: builtin/pull.c:431 builtin/pull.c:446 msgid "See git-pull(1) for details." msgstr "Se git-pull(1) för detaljer." -#: builtin/pull.c:421 builtin/pull.c:427 builtin/pull.c:436 +#: builtin/pull.c:433 builtin/pull.c:439 builtin/pull.c:448 #: git-parse-remote.sh:64 msgid "<remote>" msgstr "<fjärr>" -#: builtin/pull.c:421 builtin/pull.c:436 builtin/pull.c:441 git-rebase.sh:466 +#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:466 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<gren>" -#: builtin/pull.c:429 git-parse-remote.sh:75 +#: builtin/pull.c:441 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "Det finns ingen spårningsinformation för aktuell gren." -#: builtin/pull.c:438 git-parse-remote.sh:95 +#: builtin/pull.c:450 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "Om du vill ange spårningsinformation för grenen kan du göra det med:" -#: builtin/pull.c:443 +#: builtin/pull.c:455 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -11431,27 +11517,27 @@ msgstr "" "Dina inställningar anger sammanslagning med referensen \"%s\"\n" "från fjärren, men någon sådan referens togs inte emot." -#: builtin/pull.c:796 +#: builtin/pull.c:817 msgid "ignoring --verify-signatures for rebase" msgstr "ignorera --verify-signatures för ombasering" -#: builtin/pull.c:844 +#: builtin/pull.c:865 msgid "--[no-]autostash option is only valid with --rebase." msgstr "--[no-]autostash är endast giltig med --rebase." -#: builtin/pull.c:852 +#: builtin/pull.c:873 msgid "Updating an unborn branch with changes added to the index." msgstr "Uppdaterar en ofödd gren med ändringar som lagts till i indexet." -#: builtin/pull.c:855 +#: builtin/pull.c:876 msgid "pull with rebase" msgstr "pull med ombasering" -#: builtin/pull.c:856 +#: builtin/pull.c:877 msgid "please commit or stash them." msgstr "checka in eller använd \"stash\" på dem." -#: builtin/pull.c:881 +#: builtin/pull.c:902 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -11462,7 +11548,7 @@ msgstr "" "snabbspolar din arbetskatalog från\n" "incheckningen %s." -#: builtin/pull.c:886 +#: builtin/pull.c:907 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -11479,15 +11565,15 @@ msgstr "" "$ git reset --hard\n" "för att återgå." -#: builtin/pull.c:901 +#: builtin/pull.c:922 msgid "Cannot merge multiple branches into empty head." msgstr "Kan inte slå ihop flera grenar i ett tomt huvud." -#: builtin/pull.c:905 +#: builtin/pull.c:926 msgid "Cannot rebase onto multiple branches." msgstr "Kan inte ombasera ovanpå flera grenar." -#: builtin/pull.c:912 +#: builtin/pull.c:933 msgid "cannot rebase with locally recorded submodule modifications" msgstr "kan inte ombasera med lokalt lagrade ändringar i undermoful" @@ -11495,15 +11581,15 @@ msgstr "kan inte ombasera med lokalt lagrade ändringar i undermoful" msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<flaggor>] [<arkiv> [<refspec>...]]" -#: builtin/push.c:90 +#: builtin/push.c:92 msgid "tag shorthand without <tag>" msgstr "taggförkortning utan <tagg>" -#: builtin/push.c:100 +#: builtin/push.c:102 msgid "--delete only accepts plain target ref names" msgstr "--delete godtar endast enkla målreferensnamn" -#: builtin/push.c:144 +#: builtin/push.c:146 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -11512,7 +11598,7 @@ msgstr "" "För att välja ett av alternativen permanent, se push.default i \"git help " "config\"." -#: builtin/push.c:147 +#: builtin/push.c:149 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -11537,7 +11623,7 @@ msgstr "" " git push %s %s\n" "%s" -#: builtin/push.c:162 +#: builtin/push.c:164 #, c-format msgid "" "You are not currently on a branch.\n" @@ -11552,7 +11638,7 @@ msgstr "" "\n" " git push %s HEAD:<namn-på-fjärrgren>\n" -#: builtin/push.c:176 +#: builtin/push.c:178 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -11565,12 +11651,12 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:184 +#: builtin/push.c:186 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "Den aktuella grenen %s har flera uppströmsgrenar, vägrar sända." -#: builtin/push.c:187 +#: builtin/push.c:189 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -11581,14 +11667,14 @@ msgstr "" "aktuella grenen \"%s\", utan att tala om för mig vad som\n" "skall sändas för att uppdatera fjärrgrenen." -#: builtin/push.c:246 +#: builtin/push.c:248 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "Du angav inga referensspecifikationer att sända, och push.default är " "\"nothing\"." -#: builtin/push.c:253 +#: builtin/push.c:255 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -11600,7 +11686,7 @@ msgstr "" "\"git pull ....\") innan du sänder igen.\n" "Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer." -#: builtin/push.c:259 +#: builtin/push.c:261 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -11612,7 +11698,7 @@ msgstr "" "\"git pull ...\") innan du sänder igen.\n" "Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer." -#: builtin/push.c:265 +#: builtin/push.c:267 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -11626,11 +11712,11 @@ msgstr "" "(t.ex. \"git pull ...\") innan du sänder igen.\n" "Se avsnittet \"Note about fast-forwards\" i \"git push --help\" för detaljer." -#: builtin/push.c:272 +#: builtin/push.c:274 msgid "Updates were rejected because the tag already exists in the remote." msgstr "Uppdateringarna avvisades eftersom taggen redan finns på fjärren." -#: builtin/push.c:275 +#: builtin/push.c:277 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -11641,22 +11727,22 @@ msgstr "" "pekar på något som inte är en incheckning, utan att använda flaggan\n" "\"--force\".\n" -#: builtin/push.c:335 +#: builtin/push.c:337 #, c-format msgid "Pushing to %s\n" msgstr "Sänder till %s\n" -#: builtin/push.c:339 +#: builtin/push.c:341 #, c-format msgid "failed to push some refs to '%s'" msgstr "misslyckades sända vissa referenser till \"%s\"" -#: builtin/push.c:370 +#: builtin/push.c:372 #, c-format msgid "bad repository '%s'" msgstr "felaktigt arkiv \"%s\"" -#: builtin/push.c:371 +#: builtin/push.c:373 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -11677,114 +11763,114 @@ msgstr "" "\n" " git push <namn>\n" -#: builtin/push.c:389 +#: builtin/push.c:391 msgid "--all and --tags are incompatible" msgstr "--all och --tags är inkompatibla" -#: builtin/push.c:390 +#: builtin/push.c:392 msgid "--all can't be combined with refspecs" msgstr "--all kan inte kombineras med referensspecifikationer" -#: builtin/push.c:395 +#: builtin/push.c:397 msgid "--mirror and --tags are incompatible" msgstr "--mirror och --tags är inkompatibla" -#: builtin/push.c:396 +#: builtin/push.c:398 msgid "--mirror can't be combined with refspecs" msgstr "--mirror kan inte kombineras med referensspecifikationer" -#: builtin/push.c:401 +#: builtin/push.c:403 msgid "--all and --mirror are incompatible" msgstr "--all och --mirror är inkompatibla" -#: builtin/push.c:523 +#: builtin/push.c:535 msgid "repository" msgstr "arkiv" -#: builtin/push.c:524 builtin/send-pack.c:163 +#: builtin/push.c:536 builtin/send-pack.c:163 msgid "push all refs" msgstr "sänd alla referenser" -#: builtin/push.c:525 builtin/send-pack.c:165 +#: builtin/push.c:537 builtin/send-pack.c:165 msgid "mirror all refs" msgstr "spegla alla referenser" -#: builtin/push.c:527 +#: builtin/push.c:539 msgid "delete refs" msgstr "ta bort referenser" -#: builtin/push.c:528 +#: builtin/push.c:540 msgid "push tags (can't be used with --all or --mirror)" msgstr "sänd taggar (kan inte användas med --all eller --mirror)" -#: builtin/push.c:531 builtin/send-pack.c:166 +#: builtin/push.c:543 builtin/send-pack.c:166 msgid "force updates" msgstr "tvinga uppdateringar" -#: builtin/push.c:533 builtin/send-pack.c:180 +#: builtin/push.c:545 builtin/send-pack.c:180 msgid "refname>:<expect" msgstr "refnamn>:<förvänta" -#: builtin/push.c:534 builtin/send-pack.c:181 +#: builtin/push.c:546 builtin/send-pack.c:181 msgid "require old value of ref to be at this value" msgstr "kräv att ref:s tidigare värde är detta" -#: builtin/push.c:537 +#: builtin/push.c:549 msgid "control recursive pushing of submodules" msgstr "styr rekursiv insändning av undermoduler" -#: builtin/push.c:539 builtin/send-pack.c:174 +#: builtin/push.c:551 builtin/send-pack.c:174 msgid "use thin pack" msgstr "använd tunna paket" -#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160 +#: builtin/push.c:552 builtin/push.c:553 builtin/send-pack.c:160 #: builtin/send-pack.c:161 msgid "receive pack program" msgstr "program för att ta emot paket" -#: builtin/push.c:542 +#: builtin/push.c:554 msgid "set upstream for git pull/status" msgstr "ställ in uppström för git pull/status" -#: builtin/push.c:545 +#: builtin/push.c:557 msgid "prune locally removed refs" msgstr "ta bort lokalt borttagna referenser" -#: builtin/push.c:547 +#: builtin/push.c:559 msgid "bypass pre-push hook" msgstr "förbigå pre-push-krok" -#: builtin/push.c:548 +#: builtin/push.c:560 msgid "push missing but relevant tags" msgstr "sänd in saknade men relevanta taggar" -#: builtin/push.c:551 builtin/send-pack.c:168 +#: builtin/push.c:563 builtin/send-pack.c:168 msgid "GPG sign the push" msgstr "GPG-signera insändningen" -#: builtin/push.c:553 builtin/send-pack.c:175 +#: builtin/push.c:565 builtin/send-pack.c:175 msgid "request atomic transaction on remote side" msgstr "begär atomiska transaktioner på fjärrsidan" -#: builtin/push.c:554 builtin/send-pack.c:171 +#: builtin/push.c:566 builtin/send-pack.c:171 msgid "server-specific" msgstr "serverspecifik" -#: builtin/push.c:554 builtin/send-pack.c:172 +#: builtin/push.c:566 builtin/send-pack.c:172 msgid "option to transmit" msgstr "" "inget att checka in\n" "flagga att sända" -#: builtin/push.c:568 +#: builtin/push.c:583 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete är inkompatibel med --all, --mirror och --tags" -#: builtin/push.c:570 +#: builtin/push.c:585 msgid "--delete doesn't make sense without any refs" msgstr "--delete kan inte användas utan referenser" -#: builtin/push.c:589 +#: builtin/push.c:604 msgid "push options must not have new line characters" msgstr "push-flaggor kan inte innehålla radbrytning" @@ -11866,47 +11952,51 @@ msgstr "felsök unpack-trees" msgid "git rebase--helper [<options>]" msgstr "git rebase--helper [<flaggor>]" -#: builtin/rebase--helper.c:22 +#: builtin/rebase--helper.c:24 msgid "keep empty commits" msgstr "behåll tomma incheckningar" -#: builtin/rebase--helper.c:23 +#: builtin/rebase--helper.c:25 msgid "continue rebase" msgstr "fortsätt ombasering" -#: builtin/rebase--helper.c:25 +#: builtin/rebase--helper.c:27 msgid "abort rebase" msgstr "avbryt ombasering" -#: builtin/rebase--helper.c:28 +#: builtin/rebase--helper.c:30 msgid "make rebase script" msgstr "skapa ombaseringsskript" -#: builtin/rebase--helper.c:30 -msgid "shorten SHA-1s in the todo list" -msgstr "förkorta SHA-1 i todo-listan" - #: builtin/rebase--helper.c:32 -msgid "expand SHA-1s in the todo list" -msgstr "utöka SHA-1 i todo-listan" +msgid "shorten commit ids in the todo list" +msgstr "förkorta inchecknings-id i todo-listan" #: builtin/rebase--helper.c:34 +msgid "expand commit ids in the todo list" +msgstr "utöka inchecknings-id i todo-listan" + +#: builtin/rebase--helper.c:36 msgid "check the todo list" msgstr "kontrollera todo-listan" -#: builtin/rebase--helper.c:36 +#: builtin/rebase--helper.c:38 msgid "skip unnecessary picks" msgstr "hoppa över onödiga \"pick\"-kommandon" -#: builtin/rebase--helper.c:38 +#: builtin/rebase--helper.c:40 msgid "rearrange fixup/squash lines" msgstr "ordna om fixup-/squash-rader" -#: builtin/receive-pack.c:29 +#: builtin/rebase--helper.c:42 +msgid "insert exec commands in todo list" +msgstr "lägg in exec-kommandon i todo-listan" + +#: builtin/receive-pack.c:30 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-katalog>" -#: builtin/receive-pack.c:839 +#: builtin/receive-pack.c:840 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" @@ -11936,7 +12026,7 @@ msgstr "" "För att undvika detta meddelande och fortfarande behålla det\n" "normala beteendet, sätt \"receive.denyCurrentBranch\" till \"refuse\"." -#: builtin/receive-pack.c:859 +#: builtin/receive-pack.c:860 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" @@ -11957,20 +12047,15 @@ msgstr "" "\n" "För att undvika detta meddelande kan du sätta det till \"refuse\"." -#: builtin/receive-pack.c:1932 +#: builtin/receive-pack.c:1933 msgid "quiet" msgstr "tyst" -#: builtin/receive-pack.c:1946 +#: builtin/receive-pack.c:1947 msgid "You must specify a directory." msgstr "Du måste ange en katalog." -#: builtin/reflog.c:424 -#, c-format -msgid "'%s' for '%s' is not a valid timestamp" -msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel" - -#: builtin/reflog.c:541 builtin/reflog.c:546 +#: builtin/reflog.c:531 builtin/reflog.c:536 #, c-format msgid "'%s' is not a valid timestamp" msgstr "\"%s\" är inte en giltig tidsstämpel" @@ -12573,7 +12658,7 @@ msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv" msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable och -A kan inte användas samtidigt" -#: builtin/repack.c:406 builtin/worktree.c:134 +#: builtin/repack.c:406 builtin/worktree.c:146 #, c-format msgid "failed to remove '%s'" msgstr "misslyckades ta bort \"%s\"" @@ -12799,10 +12884,23 @@ msgstr "Kunde inte återställa indexfilen till versionen \"%s\"." msgid "Could not write new index file." msgstr "Kunde inte skriva ny indexfil." -#: builtin/rev-list.c:361 +#: builtin/rev-list.c:399 +msgid "object filtering requires --objects" +msgstr "objektfiltrering kräver --objects" + +#: builtin/rev-list.c:402 +#, c-format +msgid "invalid sparse value '%s'" +msgstr "ogiltigt värde för sparse: \"%s\"" + +#: builtin/rev-list.c:442 msgid "rev-list does not support display of notes" msgstr "rev-list stöder inte visning av anteckningar" +#: builtin/rev-list.c:445 +msgid "cannot combine --use-bitmap-index with object filtering" +msgstr "kan inte kombinera --use-bitmap-index med objektfiltrering" + #: builtin/rev-parse.c:402 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<options>] -- [<argument>...]" @@ -13250,35 +13348,35 @@ msgstr "hoppa över och ta bort alla rader som inleds med kommentarstecken" msgid "prepend comment character and space to each line" msgstr "lägg in kommentarstecken och blanksteg först på varje rad" -#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1094 +#: builtin/submodule--helper.c:34 builtin/submodule--helper.c:1332 #, c-format msgid "No such ref: %s" msgstr "Ingen sådan referens: %s" -#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1103 +#: builtin/submodule--helper.c:41 builtin/submodule--helper.c:1341 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Förväntade fullt referensnamn, fick %s" -#: builtin/submodule--helper.c:71 +#: builtin/submodule--helper.c:81 #, c-format msgid "cannot strip one component off url '%s'" msgstr "kan inte ta bort en komponent från url:en \"%s\"" -#: builtin/submodule--helper.c:302 builtin/submodule--helper.c:623 +#: builtin/submodule--helper.c:370 builtin/submodule--helper.c:861 msgid "alternative anchor for relative paths" msgstr "alternativa ankare för relativa sökvägar" -#: builtin/submodule--helper.c:307 +#: builtin/submodule--helper.c:375 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]" -#: builtin/submodule--helper.c:350 builtin/submodule--helper.c:374 +#: builtin/submodule--helper.c:426 builtin/submodule--helper.c:449 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "Hittade ingen url för undermodulsökvägen \"%s\" i .gitmodules" -#: builtin/submodule--helper.c:389 +#: builtin/submodule--helper.c:464 #, c-format msgid "" "could not lookup configuration '%s'. Assuming this repository is its own " @@ -13287,79 +13385,109 @@ msgstr "" "kunde inte slå upp konfigurationen \"%s\". Antar att arkivet är sn eget " "officiella uppström." -#: builtin/submodule--helper.c:400 +#: builtin/submodule--helper.c:475 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Misslyckades registrera url för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:404 +#: builtin/submodule--helper.c:479 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n" -#: builtin/submodule--helper.c:414 +#: builtin/submodule--helper.c:489 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "varning: kommandouppdateringsläge föreslogs för undermodulen \"%s\"\n" -#: builtin/submodule--helper.c:421 +#: builtin/submodule--helper.c:496 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "Misslyckades registrera uppdateringsläge för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:437 +#: builtin/submodule--helper.c:518 msgid "Suppress output for initializing a submodule" msgstr "Dölj utdata från initiering av undermodul" -#: builtin/submodule--helper.c:442 +#: builtin/submodule--helper.c:523 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper init [<sökväg>]" -#: builtin/submodule--helper.c:470 -msgid "git submodule--helper name <path>" -msgstr "git submodule--helper name <sökväg>" - -#: builtin/submodule--helper.c:475 +#: builtin/submodule--helper.c:591 builtin/submodule--helper.c:713 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "hittade ingen undermodulmappning i .gitmodules för sökvägen \"%s\"" -#: builtin/submodule--helper.c:558 builtin/submodule--helper.c:561 +#: builtin/submodule--helper.c:626 +#, c-format +msgid "could not resolve HEAD ref inside the submodule '%s'" +msgstr "kunde inte bestämma HEAD:s incheckning i undermodulen \"%s\"" + +#: builtin/submodule--helper.c:653 +#, c-format +msgid "failed to recurse into submodule '%s'" +msgstr "misslyckades rekursera in i undermodulen \"%s\"" + +#: builtin/submodule--helper.c:677 +msgid "Suppress submodule status output" +msgstr "Hindra statusutskrift för undermodul" + +#: builtin/submodule--helper.c:678 +msgid "" +"Use commit stored in the index instead of the one stored in the submodule " +"HEAD" +msgstr "" +"Visa incheckning från indexet istället för den som lagrats i undermodulens " +"HEAD" + +#: builtin/submodule--helper.c:679 +msgid "recurse into nested submodules" +msgstr "rekursera in i nästlade undermoduler" + +#: builtin/submodule--helper.c:684 +msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" +msgstr "git submodule status [--quitet] [--cached] [--recursive] [<sökväg>...]" + +#: builtin/submodule--helper.c:708 +msgid "git submodule--helper name <path>" +msgstr "git submodule--helper name <sökväg>" + +#: builtin/submodule--helper.c:796 builtin/submodule--helper.c:799 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "undermodulen \"%s\" kan inte lägga till alternativ: %s" -#: builtin/submodule--helper.c:597 +#: builtin/submodule--helper.c:835 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Värdet \"%s\" i submodule.alternateErrorStrategy förstås inte" -#: builtin/submodule--helper.c:604 +#: builtin/submodule--helper.c:842 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Värdet \"%s\" i submodule.alternateLocation förstås inte" -#: builtin/submodule--helper.c:626 +#: builtin/submodule--helper.c:864 msgid "where the new submodule will be cloned to" msgstr "var den nya undermodulen skall klonas till" -#: builtin/submodule--helper.c:629 +#: builtin/submodule--helper.c:867 msgid "name of the new submodule" msgstr "namn på den nya undermodulen" -#: builtin/submodule--helper.c:632 +#: builtin/submodule--helper.c:870 msgid "url where to clone the submodule from" msgstr "URL att klona undermodulen från" -#: builtin/submodule--helper.c:638 +#: builtin/submodule--helper.c:876 msgid "depth for shallow clones" msgstr "djup för grunda kloner" -#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:1012 +#: builtin/submodule--helper.c:879 builtin/submodule--helper.c:1250 msgid "force cloning progress" msgstr "tvinga kloningsförlopp" -#: builtin/submodule--helper.c:646 +#: builtin/submodule--helper.c:884 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -13367,82 +13495,82 @@ msgstr "" "git submodule--helper clone [--prefix=<sökväg>] [--quiet] [--reference " "<arkvi>] [--name <namn>] [--depth <djup>] --url <url> --path <sökväg>" -#: builtin/submodule--helper.c:677 +#: builtin/submodule--helper.c:915 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "misslyckades klona \"%s\" till undermodulsökvägen ”%s”" -#: builtin/submodule--helper.c:692 +#: builtin/submodule--helper.c:930 #, c-format msgid "could not get submodule directory for '%s'" msgstr "kunde inte få tag i undermodulkatalog för \"%s\"" -#: builtin/submodule--helper.c:757 +#: builtin/submodule--helper.c:995 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Undermodulsökvägen \"%s\" har inte initierats" -#: builtin/submodule--helper.c:761 +#: builtin/submodule--helper.c:999 msgid "Maybe you want to use 'update --init'?" msgstr "Kanske menade du att använda \"update --init\"?" -#: builtin/submodule--helper.c:790 +#: builtin/submodule--helper.c:1028 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Hoppar över ej sammanslagen undermodul %s" -#: builtin/submodule--helper.c:819 +#: builtin/submodule--helper.c:1057 #, c-format msgid "Skipping submodule '%s'" msgstr "Hoppar över undermodulen \"%s\"" -#: builtin/submodule--helper.c:952 +#: builtin/submodule--helper.c:1190 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Misslyckades klona \"%s\". Nytt försök planlagt" -#: builtin/submodule--helper.c:963 +#: builtin/submodule--helper.c:1201 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Misslyckades klona \"%s\" för andra gången, avbryter" -#: builtin/submodule--helper.c:993 builtin/submodule--helper.c:1213 +#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1451 msgid "path into the working tree" msgstr "sökväg inuti arbetskatalogen" -#: builtin/submodule--helper.c:996 +#: builtin/submodule--helper.c:1234 msgid "path into the working tree, across nested submodule boundaries" msgstr "sökväg inuti arbetskatalogen, genom nästlade undermodulgränser" -#: builtin/submodule--helper.c:1000 +#: builtin/submodule--helper.c:1238 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout eller none" -#: builtin/submodule--helper.c:1004 +#: builtin/submodule--helper.c:1242 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "Skapa en grund klon trunkerad till angivet antal revisioner" -#: builtin/submodule--helper.c:1007 +#: builtin/submodule--helper.c:1245 msgid "parallel jobs" msgstr "parallella jobb" -#: builtin/submodule--helper.c:1009 +#: builtin/submodule--helper.c:1247 msgid "whether the initial clone should follow the shallow recommendation" msgstr "om den första klonen skall följa rekommendation för grund kloning" -#: builtin/submodule--helper.c:1010 +#: builtin/submodule--helper.c:1248 msgid "don't print cloning progress" msgstr "skriv inte klonförlopp" -#: builtin/submodule--helper.c:1017 +#: builtin/submodule--helper.c:1255 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update_clone [--prefix=<sökväg>] [<sökväg>...]" -#: builtin/submodule--helper.c:1030 +#: builtin/submodule--helper.c:1268 msgid "bad value for update parameter" msgstr "felaktigt värde för parametern update" -#: builtin/submodule--helper.c:1098 +#: builtin/submodule--helper.c:1336 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -13451,20 +13579,20 @@ msgstr "" "Undermodulens (%s) gren inställd på att ärva gren från huvudprojektet, men " "huvudprojektet är inte på någon gren" -#: builtin/submodule--helper.c:1214 +#: builtin/submodule--helper.c:1452 msgid "recurse into submodules" msgstr "rekursera ner i undermoduler" -#: builtin/submodule--helper.c:1220 +#: builtin/submodule--helper.c:1458 msgid "git submodule--helper embed-git-dir [<path>...]" msgstr "git submodule--helper embed-git-dir [<sökväg>...]" -#: builtin/submodule--helper.c:1278 +#: builtin/submodule--helper.c:1517 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s stöder inte --super-prefix" -#: builtin/submodule--helper.c:1284 +#: builtin/submodule--helper.c:1523 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper" @@ -13706,188 +13834,204 @@ msgstr "Uppdaterad tagg \"%s\" (var %s)\n" msgid "Unpacking objects" msgstr "Packar upp objekt" -#: builtin/update-index.c:80 +#: builtin/update-index.c:82 #, c-format msgid "failed to create directory %s" msgstr "misslyckades skapa katalogen %s" -#: builtin/update-index.c:86 +#: builtin/update-index.c:88 #, c-format msgid "failed to stat %s" msgstr "misslyckades ta status på %s" -#: builtin/update-index.c:96 +#: builtin/update-index.c:98 #, c-format msgid "failed to create file %s" msgstr "misslyckades skapa filen %s" -#: builtin/update-index.c:104 +#: builtin/update-index.c:106 #, c-format msgid "failed to delete file %s" msgstr "misslyckades ta bort filen %s" -#: builtin/update-index.c:111 builtin/update-index.c:217 +#: builtin/update-index.c:113 builtin/update-index.c:219 #, c-format msgid "failed to delete directory %s" msgstr "misslyckades ta bort katalogen %s" -#: builtin/update-index.c:136 +#: builtin/update-index.c:138 #, c-format msgid "Testing mtime in '%s' " msgstr "Testar mtime i \"%s\" " -#: builtin/update-index.c:150 +#: builtin/update-index.c:152 msgid "directory stat info does not change after adding a new file" msgstr "stat-informationen för en katalog ändras inte när nya filer läggs till" -#: builtin/update-index.c:163 +#: builtin/update-index.c:165 msgid "directory stat info does not change after adding a new directory" msgstr "" "stat-informationen för en katalog ändras inte när nya kataloger läggs till" -#: builtin/update-index.c:176 +#: builtin/update-index.c:178 msgid "directory stat info changes after updating a file" msgstr "stat-informationen för en katalog ändras när filer uppdateras" -#: builtin/update-index.c:187 +#: builtin/update-index.c:189 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "" "stat-informationen för en katalog ändras när filer läggs till i en " "underkatalog" -#: builtin/update-index.c:198 +#: builtin/update-index.c:200 msgid "directory stat info does not change after deleting a file" msgstr "stat-informationen för en katalog ändras inte när en fil tas bort" -#: builtin/update-index.c:211 +#: builtin/update-index.c:213 msgid "directory stat info does not change after deleting a directory" msgstr "stat-informationen för en katalog ändras inte när en katalog tas bort" -#: builtin/update-index.c:218 +#: builtin/update-index.c:220 msgid " OK" msgstr " OK" -#: builtin/update-index.c:571 +#: builtin/update-index.c:579 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<flaggor>] [--] [<fil>...]" -#: builtin/update-index.c:926 +#: builtin/update-index.c:936 msgid "continue refresh even when index needs update" msgstr "fortsätt uppdatera även när index inte är àjour" -#: builtin/update-index.c:929 +#: builtin/update-index.c:939 msgid "refresh: ignore submodules" msgstr "refresh: ignorera undermoduler" -#: builtin/update-index.c:932 +#: builtin/update-index.c:942 msgid "do not ignore new files" msgstr "ignorera inte nya filer" -#: builtin/update-index.c:934 +#: builtin/update-index.c:944 msgid "let files replace directories and vice-versa" msgstr "låt filer ersätta kataloger och omvänt" -#: builtin/update-index.c:936 +#: builtin/update-index.c:946 msgid "notice files missing from worktree" msgstr "lägg märke till filer som saknas i arbetskatalogen" -#: builtin/update-index.c:938 +#: builtin/update-index.c:948 msgid "refresh even if index contains unmerged entries" msgstr "uppdatera även om indexet innehåller ej sammanslagna poster" -#: builtin/update-index.c:941 +#: builtin/update-index.c:951 msgid "refresh stat information" msgstr "uppdatera statusinformation" -#: builtin/update-index.c:945 +#: builtin/update-index.c:955 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "som --refresh, men ignorera assume-unchanged-inställning" -#: builtin/update-index.c:949 +#: builtin/update-index.c:959 msgid "<mode>,<object>,<path>" msgstr "<läge>,<objekt>,<sökväg>" -#: builtin/update-index.c:950 +#: builtin/update-index.c:960 msgid "add the specified entry to the index" msgstr "lägg till angiven post i indexet" -#: builtin/update-index.c:959 +#: builtin/update-index.c:969 msgid "mark files as \"not changing\"" msgstr "markera filer som \"ändras inte\"" -#: builtin/update-index.c:962 +#: builtin/update-index.c:972 msgid "clear assumed-unchanged bit" msgstr "rensa \"assume-unchanged\"-biten" -#: builtin/update-index.c:965 +#: builtin/update-index.c:975 msgid "mark files as \"index-only\"" msgstr "markera filer som \"endast index\"" -#: builtin/update-index.c:968 +#: builtin/update-index.c:978 msgid "clear skip-worktree bit" msgstr "töm \"skip-worktree\"-biten" -#: builtin/update-index.c:971 +#: builtin/update-index.c:981 msgid "add to index only; do not add content to object database" msgstr "lägg endast till indexet; lägg inte till innehållet i objektdatabasen" -#: builtin/update-index.c:973 +#: builtin/update-index.c:983 msgid "remove named paths even if present in worktree" msgstr "ta bort namngivna sökvägar även om de finns i arbetskatalogen" -#: builtin/update-index.c:975 +#: builtin/update-index.c:985 msgid "with --stdin: input lines are terminated by null bytes" msgstr "med --stdin: indatarader termineras med null-byte" -#: builtin/update-index.c:977 +#: builtin/update-index.c:987 msgid "read list of paths to be updated from standard input" msgstr "läs lista över sökvägar att uppdatera från standard in" -#: builtin/update-index.c:981 +#: builtin/update-index.c:991 msgid "add entries from standard input to the index" msgstr "lägg poster från standard in till indexet" -#: builtin/update-index.c:985 +#: builtin/update-index.c:995 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "återfyll etapp 2 och 3 från angivna sökvägar" -#: builtin/update-index.c:989 +#: builtin/update-index.c:999 msgid "only update entries that differ from HEAD" msgstr "uppdatera endast poster som skiljer sig från HEAD" -#: builtin/update-index.c:993 +#: builtin/update-index.c:1003 msgid "ignore files missing from worktree" msgstr "ignorera filer som saknas i arbetskatalogen" -#: builtin/update-index.c:996 +#: builtin/update-index.c:1006 msgid "report actions to standard output" msgstr "rapportera åtgärder på standard ut" -#: builtin/update-index.c:998 +#: builtin/update-index.c:1008 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(för porslin) glöm sparade olösta konflikter" -#: builtin/update-index.c:1002 +#: builtin/update-index.c:1012 msgid "write index in this format" msgstr "skriv index i detta format" -#: builtin/update-index.c:1004 +#: builtin/update-index.c:1014 msgid "enable or disable split index" msgstr "aktivera eller inaktivera delat index" -#: builtin/update-index.c:1006 +#: builtin/update-index.c:1016 msgid "enable/disable untracked cache" msgstr "aktivera/inaktivera ospårad cache" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1018 msgid "test if the filesystem supports untracked cache" msgstr "testa om filsystemet stöder ospårad cache" -#: builtin/update-index.c:1010 +#: builtin/update-index.c:1020 msgid "enable untracked cache without testing the filesystem" msgstr "aktivera ospårad cache utan att testa filsystemet" -#: builtin/update-index.c:1107 +#: builtin/update-index.c:1022 +msgid "write out the index even if is not flagged as changed" +msgstr "skriv ut indexet även om det inte angivits som ändrat" + +#: builtin/update-index.c:1024 +msgid "enable or disable file system monitor" +msgstr "aktivera eller inaktivera filsystemsövervakning" + +#: builtin/update-index.c:1026 +msgid "mark files as fsmonitor valid" +msgstr "markera filer som \"fsmonitor valid\"" + +#: builtin/update-index.c:1029 +msgid "clear fsmonitor valid bit" +msgstr "töm \"fsmonitor valid\"-bit" + +#: builtin/update-index.c:1127 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -13895,7 +14039,7 @@ msgstr "" "core.splitIndex är satt till false; ta bort eller ändra det om du verkligen " "vill aktivera delat index" -#: builtin/update-index.c:1116 +#: builtin/update-index.c:1136 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -13903,7 +14047,7 @@ msgstr "" "core.splitIndex är satt till true; ta bort eller ändra det om du verkligen " "vill inaktivera delat index" -#: builtin/update-index.c:1127 +#: builtin/update-index.c:1147 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -13911,11 +14055,11 @@ msgstr "" "core.untrackedCache är satt till true; ta bort eller ändra det om du " "verkligen vill inaktivera den ospårade cachen" -#: builtin/update-index.c:1131 +#: builtin/update-index.c:1151 msgid "Untracked cache disabled" msgstr "Ospårad cache är inaktiverad" -#: builtin/update-index.c:1139 +#: builtin/update-index.c:1159 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -13923,11 +14067,29 @@ msgstr "" "core.untrackedCache är satt till false; ta bort eller ändra det om du " "verkligen vill aktivera den ospårade cachen" -#: builtin/update-index.c:1143 +#: builtin/update-index.c:1163 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Ospårad cache är aktiverad för \"%s\"" +#: builtin/update-index.c:1171 +msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" +msgstr "core.fsmonitor inte satt; sätt om du verkligen vill aktivera fsmonitor" + +#: builtin/update-index.c:1175 +msgid "fsmonitor enabled" +msgstr "fsmonitor aktiverat" + +#: builtin/update-index.c:1178 +msgid "" +"core.fsmonitor is set; remove it if you really want to disable fsmonitor" +msgstr "" +"core.fsmonitor är satt; ta bort om du verkligen vill inaktivera fsmonitor" + +#: builtin/update-index.c:1182 +msgid "fsmonitor disabled" +msgstr "fsmonitor inaktiverat" + #: builtin/update-ref.c:10 msgid "git update-ref [<options>] -d <refname> [<old-val>]" msgstr "git update-ref [<flaggor>] -d <refnamn> [<gammaltvärde>]" @@ -13996,42 +14158,42 @@ msgstr "git verify-tag [-v | --verbose] [--format=<format] <tagg>..." msgid "print tag contents" msgstr "visa innehåll för tag" -#: builtin/worktree.c:16 +#: builtin/worktree.c:17 msgid "git worktree add [<options>] <path> [<branch>]" msgstr "git worktree add [<flaggor>] <sökväg> [<gren>]" -#: builtin/worktree.c:17 +#: builtin/worktree.c:18 msgid "git worktree list [<options>]" msgstr "git worktree list [<flaggor>]" -#: builtin/worktree.c:18 +#: builtin/worktree.c:19 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<flaggor>] <sökväg>" -#: builtin/worktree.c:19 +#: builtin/worktree.c:20 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<flaggor>]" -#: builtin/worktree.c:20 +#: builtin/worktree.c:21 msgid "git worktree unlock <path>" msgstr "git worktree unlock <sökväg>" -#: builtin/worktree.c:46 +#: builtin/worktree.c:58 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Tar bort worktrees/%s: inte en giltig katalog" -#: builtin/worktree.c:52 +#: builtin/worktree.c:64 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Tar bort worktrees/%s: gitdir-filen existerar inte" -#: builtin/worktree.c:57 builtin/worktree.c:66 +#: builtin/worktree.c:69 builtin/worktree.c:78 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "Tar bort worktrees/%s: kan inte läsa gitdir-filen (%s)" -#: builtin/worktree.c:76 +#: builtin/worktree.c:88 #, c-format msgid "" "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " @@ -14040,88 +14202,100 @@ msgstr "" "Tar bort worktrees/%s: kort läsning (förväntade %<PRIuMAX> byte, läste " "%<PRIuMAX>)" -#: builtin/worktree.c:84 +#: builtin/worktree.c:96 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Tar bort worktrees/%s: felaktig gitdir-fil" -#: builtin/worktree.c:100 +#: builtin/worktree.c:112 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "Tar bort worktrees/%s: gitdir-filen pekar på en ickeexisterande plats" -#: builtin/worktree.c:147 +#: builtin/worktree.c:159 msgid "report pruned working trees" msgstr "rapportera borttagna arbetskataloger" -#: builtin/worktree.c:149 +#: builtin/worktree.c:161 msgid "expire working trees older than <time>" msgstr "låt tid gå ut för arbetskataloger äldre än <tid>" -#: builtin/worktree.c:223 +#: builtin/worktree.c:236 #, c-format msgid "'%s' already exists" msgstr "\"%s\" finns redan" -#: builtin/worktree.c:254 +#: builtin/worktree.c:267 #, c-format msgid "could not create directory of '%s'" msgstr "kunde inte skapa katalogen \"%s\"" -#: builtin/worktree.c:293 +#: builtin/worktree.c:306 #, c-format msgid "Preparing %s (identifier %s)" msgstr "Förbereder %s (identifieraren %s)" -#: builtin/worktree.c:345 +#: builtin/worktree.c:368 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "checka ut <gren> även om den redan är utcheckad i en annan arbetskatalog" -#: builtin/worktree.c:347 +#: builtin/worktree.c:370 msgid "create a new branch" msgstr "skapa en ny gren" -#: builtin/worktree.c:349 +#: builtin/worktree.c:372 msgid "create or reset a branch" msgstr "skapa eller återställ en gren" -#: builtin/worktree.c:351 +#: builtin/worktree.c:374 msgid "populate the new working tree" msgstr "befolka den nya arbetskatalogen" -#: builtin/worktree.c:352 +#: builtin/worktree.c:375 msgid "keep the new working tree locked" msgstr "låt arbetskatalogen förbli låst" -#: builtin/worktree.c:360 +#: builtin/worktree.c:377 +msgid "set up tracking mode (see git-branch(1))" +msgstr "ställ in spårningsläge (se git-branch(1))" + +#: builtin/worktree.c:380 +msgid "try to match the new branch name with a remote-tracking branch" +msgstr "försök matcha namn på ny gren mot en fjärrspårande gren" + +#: builtin/worktree.c:388 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B och --detach är ömsesidigt uteslutande" -#: builtin/worktree.c:499 +#: builtin/worktree.c:453 +msgid "--[no-]track can only be used if a new branch is created" +msgstr "--[no-]track kan endast användas när ny gran skapas" + +#: builtin/worktree.c:553 msgid "reason for locking" msgstr "orsak till lås" -#: builtin/worktree.c:511 builtin/worktree.c:544 +#: builtin/worktree.c:565 builtin/worktree.c:598 #, c-format msgid "'%s' is not a working tree" msgstr "\"%s\" är inte en arbetskatalog" -#: builtin/worktree.c:513 builtin/worktree.c:546 +#: builtin/worktree.c:567 builtin/worktree.c:600 msgid "The main working tree cannot be locked or unlocked" msgstr "Huvudarbetskatalogen kan inte låsas eller låsas upp" -#: builtin/worktree.c:518 +#: builtin/worktree.c:572 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "\"%s\" är redan låst, orsak: %s" -#: builtin/worktree.c:520 +#: builtin/worktree.c:574 #, c-format msgid "'%s' is already locked" msgstr "\"%s\" är redan låst" -#: builtin/worktree.c:548 +#: builtin/worktree.c:602 #, c-format msgid "'%s' is not locked" msgstr "\"%s\" är inte låst" @@ -14142,23 +14316,23 @@ msgstr "visa trädobjekt för underkatalogen <prefix>" msgid "only useful for debugging" msgstr "endast användbart vid felsökning" -#: upload-pack.c:23 +#: upload-pack.c:24 msgid "git upload-pack [<options>] <dir>" msgstr "git upload-pack [<flaggor>] <katalog>" -#: upload-pack.c:1040 +#: upload-pack.c:1041 msgid "quit after a single request/response exchange" msgstr "avsluta omedelbart efter första anrop/svar-utväxling" -#: upload-pack.c:1042 +#: upload-pack.c:1043 msgid "exit immediately after initial ref advertisement" msgstr "avsluta omedelbart efter inledande kungörelse av referenser" -#: upload-pack.c:1044 +#: upload-pack.c:1045 msgid "do not try <directory>/.git/ if <directory> is no Git directory" msgstr "testa inte <katalog>/.git/ om <katalog> inte är en Git-katalog" -#: upload-pack.c:1046 +#: upload-pack.c:1047 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "avbryt överföringen efter <n> sekunders inaktivitet" @@ -14189,20 +14363,20 @@ msgstr "" "några konceptvägledningar. Se \"git help <kommando>\" eller \"git help\n" "<koncept>\" för att läsa mer om specifika underkommandon och koncept." -#: http.c:338 +#: http.c:339 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "http.postbuffer har negativt värde; använder förvalet %d" -#: http.c:359 +#: http.c:360 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "Delegerad styrning stöds inte av cURL < 7.22.0" -#: http.c:368 +#: http.c:369 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "Fastnålning av öppen nyckel stöds inte av cURL < 7.44.0" -#: http.c:1768 +#: http.c:1791 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -14218,6 +14392,14 @@ msgstr "" msgid "redirecting to %s" msgstr "omdirigerar till %s" +#: list-objects-filter-options.h:54 +msgid "args" +msgstr "argument" + +#: list-objects-filter-options.h:55 +msgid "object filtering" +msgstr "objektfiltrering" + #: common-cmds.h:9 msgid "start a working area (see also: git help tutorial)" msgstr "starta arbetskatalog (se också: git help tutorial)" @@ -14393,27 +14575,27 @@ msgstr "Felaktigt HEAD - konstig symbolisk referens" msgid "Bad bisect_write argument: $state" msgstr "Felaktigt argument till bisect_write: $state" -#: git-bisect.sh:262 +#: git-bisect.sh:246 #, sh-format msgid "Bad rev input: $arg" msgstr "Felaktig rev-indata: $arg" -#: git-bisect.sh:281 +#: git-bisect.sh:265 #, sh-format msgid "Bad rev input: $bisected_head" msgstr "Felaktig rev-indata: $bisected_head" -#: git-bisect.sh:290 +#: git-bisect.sh:274 #, sh-format msgid "Bad rev input: $rev" msgstr "Felaktig rev-indata: $rev" -#: git-bisect.sh:299 +#: git-bisect.sh:283 #, sh-format msgid "'git bisect $TERM_BAD' can take only one argument." msgstr "\"git bisect $TERM_BAD\" kan bara ta ett argument." -#: git-bisect.sh:322 +#: git-bisect.sh:306 #, sh-format msgid "Warning: bisecting only with a $TERM_BAD commit." msgstr "" @@ -14422,11 +14604,11 @@ msgstr "" #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. -#: git-bisect.sh:328 +#: git-bisect.sh:312 msgid "Are you sure [Y/n]? " msgstr "Är du säker [Y=ja/N=nej]? " -#: git-bisect.sh:340 +#: git-bisect.sh:324 #, sh-format msgid "" "You need to give me at least one $bad_syn and one $good_syn revision.\n" @@ -14437,7 +14619,7 @@ msgstr "" "(Du kan använda \"git bisect $bad_syn\" och \"git bisect $good_syn\" för " "detta.)" -#: git-bisect.sh:343 +#: git-bisect.sh:327 #, sh-format msgid "" "You need to start by \"git bisect start\".\n" @@ -14450,16 +14632,16 @@ msgstr "" "(Du kan använda \"git bisect $bad_syn\" och \"git bisect $good_syn\" för " "detta.)" -#: git-bisect.sh:414 git-bisect.sh:546 +#: git-bisect.sh:398 git-bisect.sh:512 msgid "We are not bisecting." msgstr "Vi utför ingen bisect för tillfället." -#: git-bisect.sh:421 +#: git-bisect.sh:405 #, sh-format msgid "'$invalid' is not a valid commit" msgstr "\"$invalid\" är inte en giltig incheckning" -#: git-bisect.sh:430 +#: git-bisect.sh:414 #, sh-format msgid "" "Could not check out original HEAD '$branch'.\n" @@ -14468,25 +14650,29 @@ msgstr "" "Kunde inte checka ut original-HEAD \"$branch\".\n" "Försök \"git bisect reset <incheckning>\"." -#: git-bisect.sh:458 +#: git-bisect.sh:422 msgid "No logfile given" msgstr "Ingen loggfil angiven" -#: git-bisect.sh:459 +#: git-bisect.sh:423 #, sh-format msgid "cannot read $file for replaying" msgstr "kan inte läsa $file för uppspelning" -#: git-bisect.sh:480 +#: git-bisect.sh:444 msgid "?? what are you talking about?" msgstr "?? vad menar du?" -#: git-bisect.sh:492 +#: git-bisect.sh:453 +msgid "bisect run failed: no command provided." +msgstr "bisect-körning misslyckades: inget kommando gavs." + +#: git-bisect.sh:458 #, sh-format msgid "running $command" msgstr "kör $command" -#: git-bisect.sh:499 +#: git-bisect.sh:465 #, sh-format msgid "" "bisect run failed:\n" @@ -14495,11 +14681,11 @@ msgstr "" "\"bisect\"-körningen misslyckades:\n" "felkod $res från \"$command\" är < 0 eller >= 128" -#: git-bisect.sh:525 +#: git-bisect.sh:491 msgid "bisect run cannot continue any more" msgstr "\"bisect\"-körningen kan inte fortsätta längre" -#: git-bisect.sh:531 +#: git-bisect.sh:497 #, sh-format msgid "" "bisect run failed:\n" @@ -14508,40 +14694,21 @@ msgstr "" "\"bisect\"-körningen misslyckades:\n" "\"bisect_state $state\" avslutades med felkoden $res" -#: git-bisect.sh:538 +#: git-bisect.sh:504 msgid "bisect run success" msgstr "\"bisect\"-körningen lyckades" -#: git-bisect.sh:565 -msgid "please use two different terms" -msgstr "termerna måste vara olika" - -#: git-bisect.sh:575 -#, sh-format -msgid "'$term' is not a valid term" -msgstr "\"$term\" är inte en giltig term" - -#: git-bisect.sh:578 -#, sh-format -msgid "can't use the builtin command '$term' as a term" -msgstr "kan inte använda det inbyggda kommandot \"$term\" som term" - -#: git-bisect.sh:587 git-bisect.sh:593 -#, sh-format -msgid "can't change the meaning of term '$term'" -msgstr "kan inte ändra betydelsen av termen \"$term\"" - -#: git-bisect.sh:606 +#: git-bisect.sh:533 #, sh-format msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect." msgstr "" "Ogiltigt kommando: du utför just nu en \"bisect\" med $TERM_BAD/$TERM_GOOD." -#: git-bisect.sh:636 +#: git-bisect.sh:567 msgid "no terms defined" msgstr "inga termer angivna" -#: git-bisect.sh:653 +#: git-bisect.sh:584 #, sh-format msgid "" "invalid argument $arg for 'git bisect terms'.\n" @@ -14623,8 +14790,8 @@ msgid "The pre-rebase hook refused to rebase." msgstr "Kroken pre-rebase vägrade ombaseringen." #: git-rebase.sh:219 -msgid "It looks like git-am is in progress. Cannot rebase." -msgstr "Det verkar som en git-am körs. Kan inte ombasera." +msgid "It looks like 'git am' is in progress. Cannot rebase." +msgstr "Det verkar som en \"git am\" körs. Kan inte ombasera." #: git-rebase.sh:363 msgid "No rebase in progress?" @@ -14669,8 +14836,8 @@ msgstr "" #: git-rebase.sh:480 #, sh-format -msgid "invalid upstream $upstream_name" -msgstr "ogiltig uppström $upstream_name" +msgid "invalid upstream '$upstream_name'" +msgstr "ogiltig uppström \"$upstream_name\"" #: git-rebase.sh:504 #, sh-format @@ -14687,45 +14854,55 @@ msgstr "$onto_name: ingen sammanslagningsbas finns" msgid "Does not point to a valid commit: $onto_name" msgstr "Peka på en giltig incheckning: $onto_name" -#: git-rebase.sh:539 +#: git-rebase.sh:542 #, sh-format -msgid "fatal: no such branch: $branch_name" -msgstr "ödesdigert: ingen sådan gren: $branch_name" +msgid "fatal: no such branch/commit '$branch_name'" +msgstr "ödesdigert: ingen sådan gren/incheckning: $branch_name" -#: git-rebase.sh:572 +#: git-rebase.sh:575 msgid "Cannot autostash" msgstr "Kan inte utföra \"autostash\"" -#: git-rebase.sh:577 +#: git-rebase.sh:580 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Skapade autostash: $stash_abbrev" -#: git-rebase.sh:581 +#: git-rebase.sh:584 msgid "Please commit or stash them." msgstr "Checka in eller använd \"stash\" på dem." -#: git-rebase.sh:601 +#: git-rebase.sh:607 +#, sh-format +msgid "HEAD is up to date." +msgstr "HEAD är à jour." + +#: git-rebase.sh:609 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "Aktuell gren $branch_name är à jour." -#: git-rebase.sh:605 +#: git-rebase.sh:617 +#, sh-format +msgid "HEAD is up to date, rebase forced." +msgstr "HEAD är à jour, ombasering framtvingad." + +#: git-rebase.sh:619 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "Aktuell gren $branch_name är à jour, ombasering framtvingad." -#: git-rebase.sh:616 +#: git-rebase.sh:631 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Ändringar från $mb till $onto:" -#: git-rebase.sh:625 +#: git-rebase.sh:640 msgid "First, rewinding head to replay your work on top of it..." msgstr "" "Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det..." -#: git-rebase.sh:635 +#: git-rebase.sh:650 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "Snabbspolade $branch_name till $onto_name." @@ -14734,159 +14911,145 @@ msgstr "Snabbspolade $branch_name till $onto_name." msgid "git stash clear with parameters is unimplemented" msgstr "\"git stash clear\" med parametrar har inte implementerats" -#: git-stash.sh:102 +#: git-stash.sh:108 msgid "You do not have the initial commit yet" msgstr "Du har inte den första incheckningen ännu" -#: git-stash.sh:117 +#: git-stash.sh:123 msgid "Cannot save the current index state" msgstr "Kan inte spara aktuellt tillstånd för indexet" -#: git-stash.sh:132 +#: git-stash.sh:138 msgid "Cannot save the untracked files" msgstr "Kan inte spara ospårade filer" -#: git-stash.sh:152 git-stash.sh:165 +#: git-stash.sh:158 git-stash.sh:171 msgid "Cannot save the current worktree state" msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen" -#: git-stash.sh:169 +#: git-stash.sh:175 msgid "No changes selected" msgstr "Inga ändringar valda" -#: git-stash.sh:172 +#: git-stash.sh:178 msgid "Cannot remove temporary index (can't happen)" msgstr "Kan inte ta bort temporärt index (kan inte inträffa)" -#: git-stash.sh:185 +#: git-stash.sh:191 msgid "Cannot record working tree state" msgstr "Kan inte registrera tillstånd för arbetskatalog" -#: git-stash.sh:217 +#: git-stash.sh:229 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "Kan inte uppdatera $ref_stash med $w_commit" -#. TRANSLATORS: $option is an invalid option, like -#. `--blah-blah'. The 7 spaces at the beginning of the -#. second line correspond to "error: ". So you should line -#. up the second line with however many characters the -#. translation of "error: " takes in your language. E.g. in -#. English this is: -#. -#. $ git stash save --blah-blah 2>&1 | head -n 2 -#. error: unknown option for 'stash save': --blah-blah -#. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:273 +#: git-stash.sh:281 #, sh-format -msgid "" -"error: unknown option for 'stash save': $option\n" -" To provide a message, use git stash save -- '$option'" -msgstr "" -"fel: felaktig flagga för \"stash save\": $option\n" -" För att ange ett meddelande, använd git stash save -- \"$option\"" +msgid "error: unknown option for 'stash push': $option" +msgstr "fel: okänd flagga för \"stash push\": $option" -#: git-stash.sh:288 +#: git-stash.sh:295 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "Kan inte använda --patch och --include-untracked eller --all samtidigt" -#: git-stash.sh:296 +#: git-stash.sh:303 msgid "No local changes to save" msgstr "Inga lokala ändringar att spara" -#: git-stash.sh:301 +#: git-stash.sh:308 msgid "Cannot initialize stash" msgstr "Kan inte initiera \"stash\"" -#: git-stash.sh:305 +#: git-stash.sh:312 msgid "Cannot save the current status" msgstr "Kan inte spara aktuell status" -#: git-stash.sh:306 +#: git-stash.sh:313 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "Sparade arbetskatalogen och indexstatus $stash_msg" -#: git-stash.sh:334 +#: git-stash.sh:341 msgid "Cannot remove worktree changes" msgstr "Kan inte ta bort ändringar i arbetskatalogen" -#: git-stash.sh:482 +#: git-stash.sh:489 #, sh-format msgid "unknown option: $opt" msgstr "okänd flagga: $opt" -#: git-stash.sh:495 +#: git-stash.sh:502 msgid "No stash entries found." msgstr "Inga \"stash”-poster hittades." -#: git-stash.sh:502 +#: git-stash.sh:509 #, sh-format msgid "Too many revisions specified: $REV" msgstr "För många revisioner angivna: $REV" -#: git-stash.sh:517 +#: git-stash.sh:524 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference är inte en giltig referens" -#: git-stash.sh:545 +#: git-stash.sh:552 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "\"$args\" är inte en \"stash\"-liknande incheckning" -#: git-stash.sh:556 +#: git-stash.sh:563 #, sh-format msgid "'$args' is not a stash reference" msgstr "\"$args\" är inte en \"stash\"-referens" -#: git-stash.sh:564 +#: git-stash.sh:571 msgid "unable to refresh index" msgstr "kan inte uppdatera indexet" -#: git-stash.sh:568 +#: git-stash.sh:575 msgid "Cannot apply a stash in the middle of a merge" msgstr "Kan inte tillämpa en \"stash\" mitt i en sammanslagning" -#: git-stash.sh:576 +#: git-stash.sh:583 msgid "Conflicts in index. Try without --index." msgstr "Konflikter i indexet. Testa utan --index." -#: git-stash.sh:578 +#: git-stash.sh:585 msgid "Could not save index tree" msgstr "Kunde inte spara indexträd" -#: git-stash.sh:587 +#: git-stash.sh:594 msgid "Could not restore untracked files from stash entry" msgstr "Kunde inte återställa ospårade filer från stash-post" -#: git-stash.sh:612 +#: git-stash.sh:619 msgid "Cannot unstage modified files" msgstr "Kan inte ta bort ändrade filer ur kön" -#: git-stash.sh:627 +#: git-stash.sh:634 msgid "Index was not unstashed." msgstr "Indexet har inte tagits ur kön." -#: git-stash.sh:641 +#: git-stash.sh:648 msgid "The stash entry is kept in case you need it again." msgstr "Stash-posten behålls ifall du behöver den igen." -#: git-stash.sh:650 +#: git-stash.sh:657 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Kastade ${REV} ($s)" -#: git-stash.sh:651 +#: git-stash.sh:658 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Kunde inte kasta \"stash\"-post" -#: git-stash.sh:659 +#: git-stash.sh:666 msgid "No branch name specified" msgstr "Inget grennamn angavs" -#: git-stash.sh:738 +#: git-stash.sh:745 msgid "(To restore them type \"git stash apply\")" msgstr "(För att återställa dem, skriv \"git stash apply\")" @@ -15112,38 +15275,33 @@ msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\"" msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:840 +#: git-submodule.sh:828 msgid "The --cached option cannot be used with the --files option" msgstr "Flaggan --cached kan inte användas med flaggan --files" -#: git-submodule.sh:892 +#: git-submodule.sh:880 #, sh-format msgid "unexpected mode $mod_dst" msgstr "oväntat läge $mod_dst" -#: git-submodule.sh:912 +#: git-submodule.sh:900 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Varning: $display_name innehåller inte incheckningen $sha1_src" -#: git-submodule.sh:915 +#: git-submodule.sh:903 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Varning: $display_name innehåller inte incheckningen $sha1_dst" -#: git-submodule.sh:918 +#: git-submodule.sh:906 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" " Varning: $display_name innehåller inte incheckningarna $sha1_src och " "$sha1_dst" -#: git-submodule.sh:1064 -#, sh-format -msgid "Failed to recurse into submodule path '$sm_path'" -msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\"" - -#: git-submodule.sh:1136 +#: git-submodule.sh:1077 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Synkroniserar undermodul-url för \"$displaypath\"" @@ -15374,15 +15532,15 @@ msgstr "Rätta det med \"git rebase --edit-todo\"." msgid "Successfully rebased and updated $head_name." msgstr "Lyckades ombasera och uppdatera $head_name." -#: git-rebase--interactive.sh:749 +#: git-rebase--interactive.sh:728 msgid "could not detach HEAD" msgstr "kunde inte koppla från HEAD" -#: git-rebase--interactive.sh:784 +#: git-rebase--interactive.sh:763 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "Kunde inte ta bort CHERRY_PICK_HEAD" -#: git-rebase--interactive.sh:789 +#: git-rebase--interactive.sh:768 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -15413,11 +15571,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--interactive.sh:806 +#: git-rebase--interactive.sh:785 msgid "Error trying to find the author identity to amend commit" msgstr "Fel vid försök att hitta författaridentitet för att utöka incheckning" -#: git-rebase--interactive.sh:811 +#: git-rebase--interactive.sh:790 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -15425,11 +15583,11 @@ msgstr "" "Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n" "först och kör sedan \"git rebase --continute\" igen." -#: git-rebase--interactive.sh:816 git-rebase--interactive.sh:820 +#: git-rebase--interactive.sh:795 git-rebase--interactive.sh:799 msgid "Could not commit staged changes." msgstr "Kunde inte checka in köade ändringar." -#: git-rebase--interactive.sh:848 +#: git-rebase--interactive.sh:827 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -15443,40 +15601,40 @@ msgstr "" " git rebase --continue\n" "\n" -#: git-rebase--interactive.sh:856 git-rebase--interactive.sh:1015 +#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:994 msgid "Could not execute editor" msgstr "Kunde inte starta textredigerare" -#: git-rebase--interactive.sh:869 +#: git-rebase--interactive.sh:848 #, sh-format msgid "Could not checkout $switch_to" msgstr "Kunde inte checka ut $switch_to" -#: git-rebase--interactive.sh:874 +#: git-rebase--interactive.sh:853 msgid "No HEAD?" msgstr "Inget HEAD?" -#: git-rebase--interactive.sh:875 +#: git-rebase--interactive.sh:854 #, sh-format msgid "Could not create temporary $state_dir" msgstr "Kunde inte skapa temporär $state_dir" -#: git-rebase--interactive.sh:877 +#: git-rebase--interactive.sh:856 msgid "Could not mark as interactive" msgstr "Kunde inte markera som interaktiv" -#: git-rebase--interactive.sh:887 git-rebase--interactive.sh:892 +#: git-rebase--interactive.sh:866 git-rebase--interactive.sh:871 msgid "Could not init rewritten commits" msgstr "Kunde inte initiera omskrivna incheckningar" -#: git-rebase--interactive.sh:993 +#: git-rebase--interactive.sh:972 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "Ombasera $shortrevisions på $shortonto ($todocount incheckning)" msgstr[1] "Ombasera $shortrevisions på $shortonto ($todocount incheckningar)" -#: git-rebase--interactive.sh:998 +#: git-rebase--interactive.sh:977 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -15486,7 +15644,7 @@ msgstr "" "Ombaseringen kommer dock att avbrytas om du tar bort allting.\n" "\n" -#: git-rebase--interactive.sh:1005 +#: git-rebase--interactive.sh:984 msgid "Note that empty commits are commented out" msgstr "Observera att tomma incheckningar är utkommenterade" @@ -16246,7 +16404,7 @@ msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "" "Message-ID att använda som In-Reply-To för det första brevet (om något)? " -#: git-send-email.perl:927 git-send-email.perl:935 +#: git-send-email.perl:929 git-send-email.perl:937 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "fel: kunde inte få fram en giltig adress från: %s\n" @@ -16254,16 +16412,16 @@ msgstr "fel: kunde inte få fram en giltig adress från: %s\n" #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:939 +#: git-send-email.perl:941 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "Vad vill du göra med adressen? (q=avsluta, d=kasta, e=redigera): " -#: git-send-email.perl:1260 +#: git-send-email.perl:1262 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "CA-sökvägen \"%s\" finns inte" -#: git-send-email.perl:1335 +#: git-send-email.perl:1337 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -16290,124 +16448,124 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1350 +#: git-send-email.perl:1352 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): " msgstr "Sända brevet? (y=ja, n=nej, q=avsluta, a=alla): " -#: git-send-email.perl:1353 +#: git-send-email.perl:1355 msgid "Send this email reply required" msgstr "Svar krävs på frågan \"Sända brevet?\"" -#: git-send-email.perl:1379 +#: git-send-email.perl:1381 msgid "The required SMTP server is not properly defined." msgstr "Nödvändig SMTP-server har inte angivits korrekt." -#: git-send-email.perl:1426 +#: git-send-email.perl:1428 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Servern stöder inte SMARTTLS! %s" -#: git-send-email.perl:1431 git-send-email.perl:1435 +#: git-send-email.perl:1433 git-send-email.perl:1437 #, perl-format msgid "STARTTLS failed! %s" msgstr "STARTTLS misslyckades! %s" -#: git-send-email.perl:1445 +#: git-send-email.perl:1447 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" "Kan inte initiera SMTP korrekt. Kontrollera inställningarna och använd --" "smtp-debug." -#: git-send-email.perl:1463 +#: git-send-email.perl:1465 #, perl-format msgid "Failed to send %s\n" msgstr "Misslyckades sända %s\n" -#: git-send-email.perl:1466 +#: git-send-email.perl:1468 #, perl-format msgid "Dry-Sent %s\n" msgstr "Test-Sände %s\n" -#: git-send-email.perl:1466 +#: git-send-email.perl:1468 #, perl-format msgid "Sent %s\n" msgstr "Sände %s\n" -#: git-send-email.perl:1468 +#: git-send-email.perl:1470 msgid "Dry-OK. Log says:\n" msgstr "Test-OK. Loggen säger:\n" -#: git-send-email.perl:1468 +#: git-send-email.perl:1470 msgid "OK. Log says:\n" msgstr "OK. Loggen säger:\n" -#: git-send-email.perl:1480 +#: git-send-email.perl:1482 msgid "Result: " msgstr "Resultat: " -#: git-send-email.perl:1483 +#: git-send-email.perl:1485 msgid "Result: OK\n" msgstr "Resultat: OK\n" -#: git-send-email.perl:1496 +#: git-send-email.perl:1498 #, perl-format msgid "can't open file %s" msgstr "kan inte öppna filen %s" -#: git-send-email.perl:1543 git-send-email.perl:1563 +#: git-send-email.perl:1545 git-send-email.perl:1565 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Lägger till cc: %s från raden \"%s\"\n" -#: git-send-email.perl:1549 +#: git-send-email.perl:1551 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) Lägger till to: %s från raden \"%s\"\n" -#: git-send-email.perl:1597 +#: git-send-email.perl:1599 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(icke-mbox) Lägger till cc: %s från raden \"%s\"\n" -#: git-send-email.perl:1622 +#: git-send-email.perl:1624 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(kropp) Lägger till cc: %s från raden \"%s\"\n" -#: git-send-email.perl:1728 +#: git-send-email.perl:1730 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Kunde inte köra \"%s\"" -#: git-send-email.perl:1735 +#: git-send-email.perl:1737 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Lägger till %s: %s från: \"%s\"\n" -#: git-send-email.perl:1739 +#: git-send-email.perl:1741 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) misslyckades stänga röret till \"%s\"" -#: git-send-email.perl:1766 +#: git-send-email.perl:1768 msgid "cannot send message as 7bit" msgstr "kan inte sända brev som sjubitars" -#: git-send-email.perl:1774 +#: git-send-email.perl:1776 msgid "invalid transfer encoding" msgstr "ogiltig överföringskondning" -#: git-send-email.perl:1812 git-send-email.perl:1863 git-send-email.perl:1873 +#: git-send-email.perl:1814 git-send-email.perl:1865 git-send-email.perl:1875 #, perl-format msgid "unable to open %s: %s\n" msgstr "kunde inte öppna %s: %s\n" -#: git-send-email.perl:1815 +#: git-send-email.perl:1817 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "%s: patchen innehåller en rad längre än 998 tecken" -#: git-send-email.perl:1831 +#: git-send-email.perl:1833 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "" @@ -16415,11 +16573,64 @@ msgstr "" "säkerhetskopior.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1835 +#: git-send-email.perl:1837 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " +#~ msgid "" +#~ "empty strings as pathspecs will be made invalid in upcoming releases. " +#~ "please use . instead if you meant to match all paths" +#~ msgstr "" +#~ "tomma strängar som sökvägsangivelser kommer bli ogiltiga i en kommande " +#~ "utgåva. använd istället . om du vill träffa alla sökvägar" + +#~ msgid "unable to open '%s' for writing" +#~ msgstr "kunde inte öppna \"%s\" för skrivning" + +#~ msgid "could not truncate '%s'" +#~ msgstr "kunde inte trunkera \"%s\"" + +#~ msgid "could not finish '%s'" +#~ msgstr "kunde inte avsluta \"%s\"" + +#~ msgid "could not write to %s" +#~ msgstr "kunde inte skriva till %s" + +#~ msgid "could not close %s" +#~ msgstr "kunde inte stänga %s" + +#~ msgid "Copied a misnamed branch '%s' away" +#~ msgstr "Kopierade bort en felaktigt namngiven gren \"%s\"" + +#~ msgid "it does not make sense to create 'HEAD' manually" +#~ msgstr "kan inte skapa \"HEAD\" manuellt" + +#~ msgid "Don't know how to clone %s" +#~ msgstr "Vet inte hur man klonar %s" + +#~ msgid "show ignored files" +#~ msgstr "visa ignorerade filer" + +#~ msgid "%s is not a valid '%s' object" +#~ msgstr "%s är inte ett giltigt \"%s\"-objekt" + +#~ msgid "Don't know how to fetch from %s" +#~ msgstr "Vet inte hur man hämtar från %s" + +#~ msgid "'$term' is not a valid term" +#~ msgstr "\"$term\" är inte en giltig term" + +#~ msgid "" +#~ "error: unknown option for 'stash save': $option\n" +#~ " To provide a message, use git stash save -- '$option'" +#~ msgstr "" +#~ "fel: felaktig flagga för \"stash save\": $option\n" +#~ " För att ange ett meddelande, använd git stash save -- \"$option\"" + +#~ msgid "Failed to recurse into submodule path '$sm_path'" +#~ msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\"" + #~ msgid "%%(trailers) does not take arguments" #~ msgstr "%%(trailers) tar inte argument" @@ -16581,9 +16792,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "git merge [<options>] <msg> HEAD <commit>" #~ msgstr "git merge [<flaggor>] <meddelande> HEAD <incheckning>" -#~ msgid "'%s' is not a commit" -#~ msgstr "\"%s\" är inte en incheckning" - #~ msgid "cannot open file '%s'" #~ msgstr "kan inte öppna filen \"%s\"" diff --git a/po/zh_CN.po b/po/zh_CN.po index d3aaf09b99..7656b3ac50 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -138,7 +138,7 @@ msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" "POT-Creation-Date: 2017-10-17 09:44+0800\n" -"PO-Revision-Date: 2017-10-24 09:43+0800\n" +"PO-Revision-Date: 2017-12-02 17:15+0800\n" "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" "Language-Team: GitHub <https://github.com/jiangxin/git/>\n" "Language: zh_CN\n" @@ -225,7 +225,7 @@ msgstr "" "如果您想要通过创建分支来保留在此状态下所做的提交，您可以通过在检出命令添加\n" "参数 -b 来实现（现在或稍后）。例如：\n" "\n" -" git checkout -b <new-branch-name>\n" +" git checkout -b <新分支名>\n" "\n" #: apply.c:58 @@ -240,7 +240,7 @@ msgstr "未能识别的空白字符忽略选项 '%s'" #: apply.c:125 msgid "--reject and --3way cannot be used together." -msgstr "--reject 和 --3say 不能同时使用。" +msgstr "--reject 和 --3way 不能同时使用。" #: apply.c:127 msgid "--cached and --3way cannot be used together." @@ -2659,7 +2659,7 @@ msgstr "领先 %d，落后 %d" #: ref-filter.c:105 #, c-format msgid "expected format: %%(color:<color>)" -msgstr "期望的格式：%%(color:<color>)" +msgstr "期望的格式：%%(color:<颜色>)" #: ref-filter.c:107 #, c-format @@ -2719,7 +2719,7 @@ msgstr "未能识别的 %%(objectname) 参数：%s" #: ref-filter.c:267 #, c-format msgid "expected format: %%(align:<width>,<position>)" -msgstr "期望的格式：%%(align:<width>,<position>)" +msgstr "期望的格式：%%(align:<宽度>,<位置>)" #: ref-filter.c:279 #, c-format @@ -3635,7 +3635,7 @@ msgid "" "Use 'git <command> -- <path>...' to specify paths that do not exist locally." msgstr "" "%s：工作区中无此路径。\n" -"使用命令 'git <command> -- <path>...' 来指定本地不存在的路径。" +"使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。" #: setup.c:184 #, c-format @@ -3646,7 +3646,7 @@ msgid "" msgstr "" "有歧义的参数 '%s'：未知的版本或路径不存在于工作区中。\n" "使用 '--' 来分隔版本和路径，例如：\n" -"'git <command> [<revision>...] -- [<file>...]'" +"'git <命令> [<版本>...] -- [<文件>...]'" #: setup.c:252 #, c-format @@ -3657,7 +3657,7 @@ msgid "" msgstr "" "有歧义的参数 '%s'：可同时是版本和文件\n" "使用 '--' 来分隔版本和路径，例如：\n" -"'git <command> [<revision>...] -- [<file>...]'" +"'git <命令> [<版本>...] -- [<文件>...]'" #: setup.c:499 #, c-format @@ -7273,7 +7273,7 @@ msgstr "请使用 -m 或 -F 选项提供提交说明。\n" #: builtin/commit.c:1075 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" -msgstr "--author '%s' 不是 'Name <email>' 格式，且未能在现有作者中找到匹配" +msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式，且未能在现有作者中找到匹配" #: builtin/commit.c:1090 builtin/commit.c:1335 #, c-format @@ -9617,7 +9617,7 @@ msgid "" msgstr "" "无法得到上游地址，如果你想自动记录基线提交，请使用命令\n" "git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n" -"参数 --base=<base-commit-id> 手动指定一个基线提交。" +"参数 --base=<基线提交> 手动指定一个基线提交。" #: builtin/log.c:1308 msgid "Failed to find exact merge base" @@ -11081,7 +11081,7 @@ msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列 #: builtin/pack-objects.c:32 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" -msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]" +msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]" #: builtin/pack-objects.c:181 builtin/pack-objects.c:184 #, c-format @@ -11862,7 +11862,7 @@ msgstr "重新排列 fixup/squash 行" #: builtin/receive-pack.c:29 msgid "git receive-pack <git-dir>" -msgstr "git receive-pack <git-dir>" +msgstr "git receive-pack <仓库目录>" #: builtin/receive-pack.c:839 msgid "" @@ -13013,7 +13013,7 @@ msgstr "" #: builtin/show-branch.c:16 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" -msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]" +msgstr "git show-branch (-g | --reflog)[=<n>[,<起始点>]] [--list] [<引用>]" #: builtin/show-branch.c:376 #, c-format @@ -13089,7 +13089,7 @@ msgstr "<n>[,<base>]" #: builtin/show-branch.c:656 msgid "show <n> most recent ref-log entries starting at base" -msgstr "显示从 base 开始的 <n> 条最近的引用日志记录" +msgstr "显示从起始点开始的 <n> 条最近的引用日志记录" #: builtin/show-branch.c:690 msgid "" @@ -13986,7 +13986,7 @@ msgstr "报告清除的工作区" #: builtin/worktree.c:149 msgid "expire working trees older than <time>" -msgstr "将早于 <time> 的工作区过期" +msgstr "将早于 <时间> 的工作区过期" #: builtin/worktree.c:223 #, c-format @@ -14005,7 +14005,7 @@ msgstr "准备 %s（标识符 %s）" #: builtin/worktree.c:345 msgid "checkout <branch> even if already checked out in other worktree" -msgstr "检出分支 <branch> 即使已经被检出到其它工作区" +msgstr "检出 <分支>，即使已经被检出到其它工作区" #: builtin/worktree.c:347 msgid "create a new branch" @@ -14085,7 +14085,7 @@ msgstr "在初始的引用广告后立即退出" #: upload-pack.c:1044 msgid "do not try <directory>/.git/ if <directory> is no Git directory" -msgstr "不要尝试 <directory>/.git/ 如果 <directory> 不是一个 Git 目录" +msgstr "如果 <目录> 不是一个 Git 目录，不要尝试 <目录>/.git/" #: upload-pack.c:1046 msgid "interrupt transfer after <n> seconds of inactivity" @@ -14518,7 +14518,7 @@ msgid "" "To abort and get back to the state before \"git rebase\", run \"git rebase --" "abort\"." msgstr "" -"手工解决所有冲突，执行 \"git add/rm <conflicted_files>\" 标记\n" +"手工解决所有冲突，执行 \"git add/rm <冲突的文件>\" 标记\n" "冲突已解决，然后执行 \"git rebase --continue\"。您也可以执行\n" "\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n" "\"git rebase\" 执行之前的状态，执行 \"git rebase --abort\"。" |