diff options
Diffstat (limited to 'po')
| -rw-r--r-- | po/bg.po | 4598 | ||||
| -rw-r--r-- | po/es.po | 4939 |
2 files changed, 5208 insertions, 4329 deletions
@@ -70,6 +70,8 @@ # linked checkout свързано изтегляне # term управляваща дума (за git-bisect) # mergetag етикет при сливане +# packfile пакет +# promisory гаратиращ, гарант promisory packfile гарантиращ пакет, promisory remote хранилище-гарант # delta - разлика, делта, обект-разлика # peeled tag - проследен етикет - когато етикет сочи към друг етикет, а не подаване и проследяваме подобно на символна връзка # strip - премахвам (за компонент при филтриране) @@ -88,6 +90,7 @@ # ignored (file) игнориран, понякога - пропуснат # manual, man page ръководство # guide въведение +# partial clone непълно хранилище # ------------------------ # „$var“ - може да не сработва за shell има gettext и eval_gettext - проверка - намират се лесно по „$ # ------------------------ @@ -100,8 +103,8 @@ msgid "" msgstr "" "Project-Id-Version: git master\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2018-01-07 07:50+0800\n" -"PO-Revision-Date: 2018-01-11 22:01+0100\n" +"POT-Creation-Date: 2018-03-16 07:29+0800\n" +"PO-Revision-Date: 2018-03-16 09:53+0100\n" "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" "Language: bg\n" @@ -152,7 +155,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "Изход от програмата заради некоригиран конфликт." -#: advice.c:121 builtin/merge.c:1213 +#: advice.c:121 builtin/merge.c:1251 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува)." @@ -573,7 +576,7 @@ msgstr "смяна на режима на достъпа на „%s“, койт msgid "sha1 information is lacking or useless (%s)." msgstr "информацията за сумата по SHA1 липсва или не е достатъчна (%s)." -#: apply.c:4095 builtin/checkout.c:236 builtin/reset.c:148 +#: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "неуспешно създаване на запис в кеша чрез „make_cache_entry“ за „%s“" @@ -651,7 +654,7 @@ msgstr[1] "Прилагане на кръпката „%%s“ с %d отхвър msgid "truncating .rej filename to %.*s.rej" msgstr "съкращаване на името на файла с отхвърлените парчета на „ %.*s.rej“" -#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011 +#: apply.c:4545 builtin/fetch.c:775 builtin/fetch.c:1025 #, c-format msgid "cannot open %s" msgstr "„%s“ не може да бъде отворен" @@ -711,11 +714,11 @@ msgstr[1] "" msgid "Unable to write new index file" msgstr "Новият индекс не може да бъде записан" -#: apply.c:4921 apply.c:4924 builtin/am.c:2220 builtin/am.c:2223 -#: 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 +#: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257 +#: builtin/clone.c:118 builtin/fetch.c:127 builtin/pull.c:193 +#: builtin/submodule--helper.c:403 builtin/submodule--helper.c:1197 +#: builtin/submodule--helper.c:1200 builtin/submodule--helper.c:1567 +#: builtin/submodule--helper.c:1570 builtin/submodule--helper.c:1787 #: git-add--interactive.perl:197 msgid "path" msgstr "път" @@ -728,7 +731,7 @@ msgstr "без прилагане на промените напасващи н msgid "apply changes matching the given path" msgstr "прилагане на промените напасващи на дадения път" -#: apply.c:4927 builtin/am.c:2229 +#: apply.c:4927 builtin/am.c:2263 msgid "num" msgstr "БРОЙ" @@ -768,79 +771,79 @@ msgstr "прилагане на кръпката без промяна на ра msgid "accept a patch that touches outside the working area" msgstr "прилагане на кръпка, която променя и файлове извън работното дърво" -#: apply.c:4949 +#: apply.c:4950 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" "кръпката да бъде приложена. Опцията се комбинира с „--check“/„--stat“/„--" "summary“" -#: apply.c:4951 +#: apply.c:4952 msgid "attempt three-way merge if a patch does not apply" msgstr "пробване с тройно сливане, ако кръпката не може да се приложи директно" -#: apply.c:4953 +#: apply.c:4954 msgid "build a temporary index based on embedded index information" msgstr "" "създаване на временен индекс на база на включената информация за индекса" -#: apply.c:4956 builtin/checkout-index.c:168 builtin/ls-files.c:515 +#: apply.c:4957 builtin/checkout-index.c:168 builtin/ls-files.c:515 msgid "paths are separated with NUL character" msgstr "разделяне на пътищата с нулевия знак „NUL“" -#: apply.c:4958 +#: apply.c:4959 msgid "ensure at least <n> lines of context match" msgstr "да се осигури контекст от поне такъв БРОЙ съвпадащи редове" -#: apply.c:4959 builtin/am.c:2208 builtin/interpret-trailers.c:95 +#: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99 -#: builtin/pack-objects.c:3009 +#: builtin/pack-objects.c:3035 msgid "action" msgstr "действие" -#: apply.c:4960 +#: apply.c:4961 msgid "detect new or modified lines that have whitespace errors" msgstr "засичане на нови или променени редове с грешки в знаците за интервали" -#: apply.c:4963 apply.c:4966 +#: apply.c:4964 apply.c:4967 msgid "ignore changes in whitespace when finding context" msgstr "" "игнориране на промените в знаците за интервали при откриване на контекста" -#: apply.c:4969 +#: apply.c:4970 msgid "apply the patch in reverse" msgstr "прилагане на кръпката в обратна посока" -#: apply.c:4971 +#: apply.c:4972 msgid "don't expect at least one line of context" msgstr "без изискване на дори и един ред контекст" -#: apply.c:4973 +#: apply.c:4974 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "оставяне на отхвърлените парчета във файлове с разширение „.rej“" -#: apply.c:4975 +#: apply.c:4976 msgid "allow overlapping hunks" msgstr "позволяване на застъпващи се парчета" -#: 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 +#: apply.c:4977 builtin/add.c:292 builtin/check-ignore.c:21 +#: builtin/commit.c:1276 builtin/count-objects.c:96 builtin/fsck.c:665 +#: builtin/log.c:1901 builtin/mv.c:123 builtin/read-tree.c:125 msgid "be verbose" msgstr "повече подробности" -#: apply.c:4978 +#: apply.c:4979 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "пренебрегване на неправилно липсващ знак за нов ред в края на файл" -#: apply.c:4981 +#: apply.c:4982 msgid "do not trust the line counts in the hunk headers" msgstr "без доверяване на номерата на редовете в заглавните части на парчетата" -#: apply.c:4983 builtin/am.c:2217 +#: apply.c:4984 builtin/am.c:2251 msgid "root" msgstr "НАЧАЛНА_ДИРЕКТОРИЯ" -#: apply.c:4984 +#: apply.c:4985 msgid "prepend <root> to all filenames" msgstr "добавяне на тази НАЧАЛНА_ДИРЕКТОРИЯ към имената на всички файлове" @@ -876,7 +879,7 @@ msgstr "ФОРМАТ" msgid "archive format" msgstr "ФОРМАТ на архива" -#: archive.c:437 builtin/log.c:1459 +#: archive.c:437 builtin/log.c:1462 msgid "prefix" msgstr "ПРЕФИКС" @@ -884,11 +887,11 @@ 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: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 +#: archive.c:439 builtin/blame.c:702 builtin/blame.c:703 builtin/config.c:62 +#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:869 +#: builtin/hash-object.c:103 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 +#: parse-options.h:165 msgid "file" msgstr "ФАЙЛ" @@ -920,8 +923,8 @@ msgstr "добро компресиране" 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:872 builtin/submodule--helper.c:1239 +#: archive.c:458 builtin/archive.c:90 builtin/clone.c:108 builtin/clone.c:111 +#: builtin/submodule--helper.c:1209 builtin/submodule--helper.c:1576 msgid "repo" msgstr "хранилище" @@ -972,22 +975,22 @@ msgstr "" "Отрицателните шаблони се игнорират в атрибутите на git.\n" "Ако ви трябва начална удивителна, ползвайте „\\!“." -#: bisect.c:458 +#: bisect.c:460 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Неправилно цитирано съдържание във файла „%s“: %s" -#: bisect.c:666 +#: bisect.c:668 #, c-format msgid "We cannot bisect more!\n" msgstr "Повече не може да се търси двоично!\n" -#: bisect.c:720 +#: bisect.c:722 #, c-format msgid "Not a valid commit name %s" msgstr "Неправилно име на подаване „%s“" -#: bisect.c:744 +#: bisect.c:746 #, c-format msgid "" "The merge base %s is bad.\n" @@ -996,7 +999,7 @@ msgstr "" "Неправилна база за сливане: %s.\n" "Следователно грешката е коригирана между „%s“ и [%s].\n" -#: bisect.c:749 +#: bisect.c:751 #, c-format msgid "" "The merge base %s is new.\n" @@ -1005,7 +1008,7 @@ msgstr "" "Нова база за сливане: %s.\n" "Свойството е променено между „%s“ и [%s].\n" -#: bisect.c:754 +#: bisect.c:756 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1014,7 +1017,7 @@ msgstr "" "Базата за сливане „%s“ е %s.\n" "Следователно първото %s подаване е между „%s“ и [%s].\n" -#: bisect.c:762 +#: bisect.c:764 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1025,7 +1028,7 @@ msgstr "" "Двоичното търсене с git bisect няма да работи правилно.\n" "Дали не сте объркали указателите „%s“ и „%s“?\n" -#: bisect.c:775 +#: bisect.c:777 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1041,31 +1044,31 @@ msgstr "" msgid "Bisecting: a merge base must be tested\n" msgstr "Двоично търсене: трябва да се провери база за сливане\n" -#: bisect.c:862 +#: bisect.c:850 #, c-format msgid "a %s revision is needed" msgstr "необходима е версия „%s“" -#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234 +#: bisect.c:869 builtin/notes.c:175 builtin/tag.c:235 #, c-format msgid "could not create file '%s'" msgstr "файлът „%s“ не може да бъде създаден" -#: bisect.c:930 +#: bisect.c:920 #, c-format msgid "could not read file '%s'" msgstr "файлът „%s“ не може да бъде прочетен" -#: bisect.c:960 +#: bisect.c:950 msgid "reading bisect refs failed" msgstr "неуспешно прочитане на указателите за двоично търсене" -#: bisect.c:979 +#: bisect.c:969 #, c-format msgid "%s was both %s and %s\n" msgstr "„%s“ e както „%s“, така и „%s“\n" -#: bisect.c:987 +#: bisect.c:977 #, c-format msgid "" "No testable commit found.\n" @@ -1074,7 +1077,7 @@ msgstr "" "Липсва подходящо за тестване подаване.\n" "Проверете параметрите за пътищата.\n" -#: bisect.c:1006 +#: bisect.c:996 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1084,47 +1087,47 @@ msgstr[1] "(приблизително %d стъпки)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1012 +#: bisect.c:1002 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "Двоично търсене: остава %d версия след тази %s\n" msgstr[1] "Двоично търсене: остават %d версии след тази %s\n" -#: blame.c:1757 +#: blame.c:1758 msgid "--contents and --reverse do not blend well." msgstr "Опциите „--contents“ и „--reverse“ са несъвместими" -#: blame.c:1768 +#: blame.c:1769 msgid "cannot use --contents with final commit object name" msgstr "Опцията „--contents“ е несъвместима с име на обект от крайно подаване" -#: blame.c:1788 +#: blame.c:1789 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "Едновременното задаване на опциите „--reverse“ и „--first-parent“ изисква " "указването на крайно подаване" -#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1177 -#: sequencer.c:2370 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 +#: blame.c:1798 bundle.c:160 ref-filter.c:1978 sequencer.c:1699 +#: sequencer.c:2901 builtin/commit.c:976 builtin/log.c:366 builtin/log.c:920 +#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:370 #: builtin/shortlog.c:191 msgid "revision walk setup failed" msgstr "неуспешно настройване на обхождането на версиите" -#: blame.c:1815 +#: blame.c:1816 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "Едновременното задаване на опциите „--reverse“ и „--first-parent“ изисква " "указването на диапазон по веригата на първите наследници" -#: blame.c:1826 +#: blame.c:1827 #, c-format msgid "no such path %s in %s" msgstr "няма път на име „%s“ в „%s“" -#: blame.c:1837 +#: blame.c:1838 #, c-format msgid "cannot read blob %s for path %s" msgstr "обектът BLOB „%s“ в пътя %s не може да бъде прочетен" @@ -1277,77 +1280,76 @@ msgstr "Файлът „%s“ не изглежда да е пратка на gi msgid "unrecognized header: %s%s (%d)" msgstr "непозната заглавна част: %s%s (%d)" -#: bundle.c:88 sequencer.c:1360 sequencer.c:1807 sequencer.c:2637 -#: sequencer.c:2663 sequencer.c:2754 sequencer.c:2856 builtin/commit.c:782 +#: bundle.c:88 sequencer.c:1879 sequencer.c:2337 builtin/commit.c:750 #, c-format msgid "could not open '%s'" msgstr "„%s“ не може да се отвори" -#: bundle.c:140 +#: bundle.c:139 msgid "Repository lacks these prerequisite commits:" msgstr "В хранилището липсват следните необходими подавания:" -#: bundle.c:193 +#: bundle.c:190 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "Пратката съдържа следния указател:" msgstr[1] "Пратката съдържа следните %d указатели:" -#: bundle.c:200 +#: bundle.c:197 msgid "The bundle records a complete history." msgstr "Пратката съдържа пълна история." -#: bundle.c:202 +#: bundle.c:199 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "Пратката изисква следния указател:" msgstr[1] "Пратката изисква следните %d указатели:" -#: bundle.c:261 +#: bundle.c:258 msgid "Could not spawn pack-objects" msgstr "Командата „git pack-objects“ не може да бъде стартирана" -#: bundle.c:272 +#: bundle.c:269 msgid "pack-objects died" msgstr "Командата „git pack-objects“ не завърши успешно" -#: bundle.c:314 +#: bundle.c:311 msgid "rev-list died" msgstr "Командата „git rev-list“ не завърши успешно" -#: bundle.c:363 +#: bundle.c:360 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "" "указателят „%s“ не е бил включен поради опциите зададени на „git rev-list“" -#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296 +#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:296 #, c-format msgid "unrecognized argument: %s" msgstr "непознат аргумент: %s" -#: bundle.c:461 +#: bundle.c:458 msgid "Refusing to create empty bundle." msgstr "Създаването на празна пратка е невъзможно." -#: bundle.c:473 +#: bundle.c:470 #, c-format msgid "cannot create '%s'" msgstr "Файлът „%s“ не може да бъде създаден" -#: bundle.c:501 +#: bundle.c:498 msgid "index-pack died" msgstr "Командата „git index-pack“ не завърши успешно" -#: color.c:301 +#: color.c:296 #, c-format msgid "invalid color value: %.*s" msgstr "неправилна стойност за цвят: %.*s" -#: commit.c:41 sequencer.c:1614 builtin/am.c:421 builtin/am.c:465 -#: builtin/am.c:1434 builtin/am.c:2069 +#: commit.c:41 sequencer.c:2141 builtin/am.c:421 builtin/am.c:465 +#: builtin/am.c:1436 builtin/am.c:2072 #, c-format msgid "could not parse %s" msgstr "„%s“ не може да се анализира" @@ -1357,7 +1359,7 @@ msgstr "„%s“ не може да се анализира" msgid "%s %s is not a commit!" msgstr "%s %s не е подаване!" -#: commit.c:1524 +#: commit.c:1506 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" @@ -1463,69 +1465,69 @@ msgstr "„%s“ не е правилна стойност за време за msgid "bad zlib compression level %d" msgstr "неправилно ниво на компресиране: %d" -#: config.c:1222 +#: config.c:1225 #, c-format msgid "invalid mode for object creation: %s" msgstr "неправилен режим за създаването на обекти: %s" -#: config.c:1378 +#: config.c:1386 #, c-format msgid "bad pack compression level %d" msgstr "неправилно ниво на компресиране при пакетиране: %d" -#: config.c:1574 +#: config.c:1582 msgid "unable to parse command-line config" msgstr "неправилни настройки от командния ред" -#: config.c:1906 +#: config.c:1914 msgid "unknown error occurred while reading the configuration files" msgstr "неочаквана грешка при изчитането на конфигурационните файлове" -#: config.c:2093 +#: config.c:2101 #, c-format msgid "Invalid %s: '%s'" msgstr "Неправилен %s: „%s“" -#: config.c:2136 +#: config.c:2144 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "" "непозната стойност „%s“ за настройката „core.untrackedCache“. Ще се ползва " "стандартната стойност „keep“ (запазване)" -#: config.c:2162 +#: config.c:2170 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" "стойността на „splitIndex.maxPercentChange“ трябва да е между 1 и 100, а не " "%d" -#: config.c:2187 +#: config.c:2195 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "неразпозната стойност „%s“ от командния ред" -#: config.c:2189 +#: config.c:2197 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "неправилна настройка „%s“ във файла „%s“ на ред №%d" -#: config.c:2248 +#: config.c:2256 #, c-format msgid "%s has multiple values" msgstr "зададени са няколко стойности за „%s“" -#: config.c:2591 config.c:2808 +#: config.c:2599 config.c:2816 #, c-format msgid "fstat on %s failed" msgstr "неуспешно изпълнение на „fstat“ върху „%s“" -#: config.c:2698 +#: config.c:2706 #, c-format msgid "could not set '%s' to '%s'" msgstr "„%s“ не може да се зададе да е „%s“" -#: config.c:2700 builtin/remote.c:776 +#: config.c:2708 builtin/remote.c:776 #, c-format msgid "could not unset '%s'" msgstr "„%s“ не може да се премахне" @@ -1546,24 +1548,29 @@ msgstr "" "Проверете дали то съществува и дали имате права\n" "за достъп." -#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141 +#: connected.c:66 builtin/fsck.c:198 builtin/prune.c:144 msgid "Checking connectivity" msgstr "Проверка на връзката" -#: connected.c:76 +#: connected.c:78 msgid "Could not run 'git rev-list'" msgstr "Командата „git rev-list“ не може да бъде изпълнена." -#: connected.c:96 +#: connected.c:98 msgid "failed write to rev-list" msgstr "неуспешен запис на списъка с версиите" -#: connected.c:103 +#: connected.c:105 msgid "failed to close rev-list's stdin" msgstr "стандартният вход на списъка с версиите не може да бъде затворен" #: convert.c:205 #, c-format +msgid "CRLF would be replaced by LF in %s." +msgstr "Всяка последователност от знаци „CRLF“ ще бъдe заменена с „LF“ в „%s“." + +#: convert.c:207 +#, c-format msgid "" "CRLF will be replaced by LF in %s.\n" "The file will have its original line endings in your working directory." @@ -1572,12 +1579,13 @@ msgstr "" "Файлът ще остане с първоначалните знаци за край на ред в работната ви " "директория." -#: convert.c:209 +#: convert.c:215 #, c-format -msgid "CRLF would be replaced by LF in %s." -msgstr "Всяка последователност от знаци „CRLF“ ще бъдe заменена с „LF“ в „%s“." +msgid "LF would be replaced by CRLF in %s" +msgstr "" +"Всеки знак „LF“ ще бъдe заменен с последователността от знаци „CRLF“ в „%s“." -#: convert.c:215 +#: convert.c:217 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" @@ -1588,12 +1596,6 @@ msgstr "" "Файлът ще остане с първоначалните знаци за край на ред в работната ви " "директория." -#: convert.c:219 -#, c-format -msgid "LF would be replaced by CRLF in %s" -msgstr "" -"Всеки знак „LF“ ще бъдe заменен с последователността от знаци „CRLF“ в „%s“." - #: date.c:116 msgid "in the future" msgstr "в бъдещето" @@ -1694,7 +1696,7 @@ msgid "" "'plain'" msgstr "" "настройката за цвят за преместване трябва да е една от: „no“ (без), " -"„default“ (стандартно), „zebra“ (райе), „dimmed_zebra“ (притъмнено райе), " +"„default“ (стандартно), „zebra“ (райе), „dimmed_zebra“ (тъмно райе), " "„plain“ (обикновено)" #: diff.c:341 @@ -1711,23 +1713,27 @@ msgstr "" "Грешки в настройката „diff.dirstat“:\n" "%s" -#: diff.c:3799 +#: diff.c:3822 #, c-format msgid "external diff died, stopping at %s" msgstr "" "външната програма за разлики завърши неуспешно. Спиране на работата при „%s“" -#: diff.c:4127 +#: diff.c:4146 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" "Опциите „--name-only“, „--name-status“, „--check“ и „-s“ са несъвместими " "една с друга" -#: diff.c:4215 +#: diff.c:4149 +msgid "-G, -S and --find-object are mutually exclusive" +msgstr "Опциите „-G“, „-S“ и „--find-object“ са несъвместими една с друга" + +#: diff.c:4237 msgid "--follow requires exactly one pathspec" msgstr "Опцията „--follow“ изисква точно един път" -#: diff.c:4381 +#: diff.c:4403 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -1736,43 +1742,48 @@ msgstr "" "Неразпознат параметър към опцията „--dirstat/-X“:\n" "%s" -#: diff.c:4395 +#: diff.c:4417 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Неразпознат параметър към опцията „--submodule“: „%s“" -#: diff.c:5446 +#: diff.c:5493 msgid "inexact rename detection was skipped due to too many files." msgstr "" "търсенето на преименувания на обекти съчетани с промени се прескача поради " "многото файлове." -#: diff.c:5449 +#: diff.c:5496 msgid "only found copies from modified paths due to too many files." msgstr "" "установени са точните копия на променените пътища поради многото файлове." -#: diff.c:5452 +#: diff.c:5499 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "задайте променливата „%s“ да е поне %d и отново изпълнете командата." -#: dir.c:2100 +#: dir.c:1866 +#, c-format +msgid "could not open directory '%s'" +msgstr "директорията „%s“ не може да бъде отворена" + +#: dir.c:2108 msgid "failed to get kernel name and information" msgstr "името и версията на ядрото не бяха получени" -#: dir.c:2219 +#: dir.c:2232 msgid "Untracked cache is disabled on this system or location." msgstr "" "Кеша за неследените файлове е изключен на тази система или местоположение." -#: dir.c:3002 dir.c:3007 +#: dir.c:3024 dir.c:3029 #, c-format msgid "could not create directories for %s" msgstr "директориите за „%s“ не може да бъдат създадени" -#: dir.c:3032 +#: dir.c:3054 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "директорията на git не може да се мигрира от „%s“ до „%s“" @@ -1791,184 +1802,193 @@ msgstr "Филтриране на съдържанието" msgid "could not stat file '%s'" msgstr "неуспешно изпълнение на „stat“ върху файла „%s“" -#: fetch-pack.c:252 +#: fetch-object.c:17 +msgid "Remote with no URL" +msgstr "Липсва адрес за отдалеченото хранилище" + +#: fetch-pack.c:253 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: очаква се плитък списък" -#: fetch-pack.c:264 -msgid "git fetch-pack: expected ACK/NAK, got EOF" -msgstr "git fetch-pack: очакваше се „ACK“/„NAK“, а бе получен „EOF“" +#: fetch-pack.c:265 +msgid "git fetch-pack: expected ACK/NAK, got a flush packet" +msgstr "" +"git fetch-pack: очакваше се „ACK“/„NAK“, а бе получен изчистващ пакет „flush“" -#: fetch-pack.c:283 builtin/archive.c:63 +#: fetch-pack.c:284 builtin/archive.c:63 #, c-format msgid "remote error: %s" msgstr "отдалечена грешка: %s" -#: fetch-pack.c:284 +#: fetch-pack.c:285 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: очакваше се „ACK“/„NAK“, а бе получен „%s“" -#: fetch-pack.c:336 +#: fetch-pack.c:337 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "опцията „--stateless-rpc“ изисква „multi_ack_detailed“" -#: fetch-pack.c:422 +#: fetch-pack.c:428 #, c-format msgid "invalid shallow line: %s" msgstr "неправилен плитък ред: „%s“" -#: fetch-pack.c:428 +#: fetch-pack.c:434 #, c-format msgid "invalid unshallow line: %s" msgstr "неправилен неплитък ред: „%s“" -#: fetch-pack.c:430 +#: fetch-pack.c:436 #, c-format msgid "object not found: %s" msgstr "обектът „%s“ липсва" -#: fetch-pack.c:433 +#: fetch-pack.c:439 #, c-format msgid "error in object: %s" msgstr "грешка в обекта: „%s“" -#: fetch-pack.c:435 +#: fetch-pack.c:441 #, c-format msgid "no shallow found: %s" msgstr "не е открит плитък обект: %s" -#: fetch-pack.c:438 +#: fetch-pack.c:444 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "очаква се плитък или не обект, а бе получено: %s" -#: fetch-pack.c:477 +#: fetch-pack.c:485 #, c-format msgid "got %s %d %s" msgstr "получено бе %s %d %s" -#: fetch-pack.c:491 +#: fetch-pack.c:499 #, c-format msgid "invalid commit %s" msgstr "неправилно подаване: „%s“" -#: fetch-pack.c:524 +#: fetch-pack.c:532 msgid "giving up" msgstr "преустановяване" -#: fetch-pack.c:534 progress.c:229 +#: fetch-pack.c:542 progress.c:229 msgid "done" msgstr "действието завърши" -#: fetch-pack.c:546 +#: fetch-pack.c:554 #, c-format msgid "got %s (%d) %s" msgstr "получено бе %s (%d) %s" -#: fetch-pack.c:592 +#: fetch-pack.c:600 #, c-format msgid "Marking %s as complete" msgstr "Отбелязване на „%s“ като пълно" -#: fetch-pack.c:777 +#: fetch-pack.c:788 #, c-format msgid "already have %s (%s)" msgstr "вече има „%s“ (%s)" -#: fetch-pack.c:815 +#: fetch-pack.c:829 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: не може да се създаде процес за демултиплексора" -#: fetch-pack.c:823 +#: fetch-pack.c:837 msgid "protocol error: bad pack header" msgstr "протоколна грешка: неправилна заглавна част на пакет" -#: fetch-pack.c:879 +#: fetch-pack.c:895 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: не може да се създаде процес за „%s“" -#: fetch-pack.c:895 +#: fetch-pack.c:911 #, c-format msgid "%s failed" msgstr "неуспешно изпълнение на „%s“" -#: fetch-pack.c:897 +#: fetch-pack.c:913 msgid "error in sideband demultiplexer" msgstr "грешка в демултиплексора" -#: fetch-pack.c:924 +#: fetch-pack.c:940 msgid "Server does not support shallow clients" msgstr "Сървърът не поддържа плитки клиенти" -#: fetch-pack.c:928 +#: fetch-pack.c:944 msgid "Server supports multi_ack_detailed" msgstr "Сървърът поддържа „multi_ack_detailed“" -#: fetch-pack.c:931 +#: fetch-pack.c:947 msgid "Server supports no-done" msgstr "Сървърът поддържа „no-done“" -#: fetch-pack.c:937 +#: fetch-pack.c:953 msgid "Server supports multi_ack" msgstr "Сървърът поддържа „multi_ack“" -#: fetch-pack.c:941 +#: fetch-pack.c:957 msgid "Server supports side-band-64k" msgstr "Сървърът поддържа „side-band-64k“" -#: fetch-pack.c:945 +#: fetch-pack.c:961 msgid "Server supports side-band" msgstr "Сървърът поддържа „side-band“" -#: fetch-pack.c:949 +#: fetch-pack.c:965 msgid "Server supports allow-tip-sha1-in-want" msgstr "Сървърът поддържа „allow-tip-sha1-in-want“" -#: fetch-pack.c:953 +#: fetch-pack.c:969 msgid "Server supports allow-reachable-sha1-in-want" msgstr "Сървърът поддържа „allow-reachable-sha1-in-want“" -#: fetch-pack.c:963 +#: fetch-pack.c:979 msgid "Server supports ofs-delta" msgstr "Сървърът поддържа „ofs-delta“" -#: fetch-pack.c:970 +#: fetch-pack.c:985 +msgid "Server supports filter" +msgstr "Сървърът поддържа филтри" + +#: fetch-pack.c:993 #, c-format msgid "Server version is %.*s" msgstr "Версията на сървъра е: %.*s" -#: fetch-pack.c:976 +#: fetch-pack.c:999 msgid "Server does not support --shallow-since" msgstr "Сървърът не поддържа опцията „--shallow-since“" -#: fetch-pack.c:980 +#: fetch-pack.c:1003 msgid "Server does not support --shallow-exclude" msgstr "Сървърът не поддържа опцията „--shallow-exclude“" -#: fetch-pack.c:982 +#: fetch-pack.c:1005 msgid "Server does not support --deepen" msgstr "Сървърът не поддържа опцията „--deepen“" -#: fetch-pack.c:993 +#: fetch-pack.c:1016 msgid "no common commits" msgstr "няма общи подавания" -#: fetch-pack.c:1005 +#: fetch-pack.c:1028 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: неуспешно доставяне." -#: fetch-pack.c:1167 +#: fetch-pack.c:1190 msgid "no matching remote head" msgstr "не може да бъде открит подходящ връх от отдалеченото хранилище" -#: fetch-pack.c:1189 +#: fetch-pack.c:1212 #, c-format msgid "no such remote ref %s" msgstr "такъв отдалечен указател няма: %s" -#: fetch-pack.c:1192 +#: fetch-pack.c:1215 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Сървърът не позволява заявка за необявен „%s“" @@ -1991,17 +2011,18 @@ msgstr "Програмата не успя да запише самостоят msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "прескачане на неправилния цвят „%.*s“ в „log.graphColors“" -#: grep.c:2017 +#: grep.c:2022 #, c-format msgid "'%s': unable to read %s" msgstr "„%s“: файлът сочен от „%s“ не може да бъде прочетен" -#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134 +#: grep.c:2039 setup.c:163 builtin/clone.c:407 builtin/diff.c:81 +#: builtin/rm.c:134 #, c-format msgid "failed to stat '%s'" msgstr "не може да бъде получена информация чрез „stat“ за „%s“" -#: grep.c:2045 +#: grep.c:2050 #, c-format msgid "'%s': short read" msgstr "„%s“: изчитането върна по-малко байтове от очакваното" @@ -2151,19 +2172,18 @@ msgstr "не може да се ползва празно име като иде msgid "name consists only of disallowed characters: %s" msgstr "името съдържа само непозволени знаци: „%s“" -#: ident.c:416 builtin/commit.c:616 +#: ident.c:416 builtin/commit.c:582 #, c-format 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:36 +msgid "multiple filter-specs 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“" +#: list-objects-filter-options.c:126 +msgid "cannot change partial clone promisor remote" +msgstr "не може да промените хранилището-гарант на непълно хранилище" #: lockfile.c:151 #, c-format @@ -2193,8 +2213,8 @@ msgstr "Файлът-ключалка „%s.lock“ не може да бъде msgid "failed to read the cache" msgstr "кешът не може да бъде прочетен" -#: merge.c:128 builtin/am.c:1943 builtin/am.c:1977 builtin/checkout.c:379 -#: builtin/checkout.c:600 builtin/clone.c:754 +#: merge.c:134 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378 +#: builtin/checkout.c:599 builtin/clone.c:759 msgid "unable to write new index file" msgstr "неуспешно записване на новия индекс" @@ -2211,62 +2231,62 @@ msgstr "неуспешно изпълнение на „addinfo_cache“ за п msgid "error building trees" msgstr "грешка при изграждане на дърветата" -#: merge-recursive.c:752 +#: merge-recursive.c:771 #, c-format msgid "failed to create path '%s'%s" msgstr "грешка при създаването на пътя „%s“%s" -#: merge-recursive.c:763 +#: merge-recursive.c:782 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Изтриване на „%s“, за да се освободи място за поддиректория\n" -#: merge-recursive.c:777 merge-recursive.c:796 +#: merge-recursive.c:796 merge-recursive.c:815 msgid ": perhaps a D/F conflict?" msgstr ": възможно е да има конфликт директория/файл." -#: merge-recursive.c:786 +#: merge-recursive.c:805 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" "преустановяване на действието, за да не се изтрие неследеният файл „%s“" -#: merge-recursive.c:828 builtin/cat-file.c:37 +#: merge-recursive.c:847 builtin/cat-file.c:37 #, c-format msgid "cannot read object %s '%s'" msgstr "обектът „%s“ (%s) не може да бъде прочетен" -#: merge-recursive.c:830 +#: merge-recursive.c:849 #, c-format msgid "blob expected for %s '%s'" msgstr "обектът „%s“ (%s) се очакваше да е BLOB, а не е" -#: merge-recursive.c:854 +#: merge-recursive.c:873 #, c-format msgid "failed to open '%s': %s" msgstr "„%s“ не може да се отвори: %s" -#: merge-recursive.c:865 +#: merge-recursive.c:884 #, c-format msgid "failed to symlink '%s': %s" msgstr "неуспешно създаване на символната връзка „%s“: %s" -#: merge-recursive.c:870 +#: merge-recursive.c:889 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" "не е ясно какво да се прави с обекта „%2$s“ (%3$s) с права за достъп „%1$06o“" -#: merge-recursive.c:1010 +#: merge-recursive.c:1029 msgid "Failed to execute internal merge" msgstr "Неуспешно вътрешно сливане" -#: merge-recursive.c:1014 +#: merge-recursive.c:1034 #, c-format msgid "Unable to add %s to database" msgstr "„%s“ не може да се добави в базата с данни" -#: merge-recursive.c:1117 +#: merge-recursive.c:1146 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2275,7 +2295,7 @@ msgstr "" "КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s. Версия %s на „%s“ " "е оставена в дървото." -#: merge-recursive.c:1122 +#: merge-recursive.c:1151 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -2284,7 +2304,7 @@ msgstr "" "КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ е преименуван на „%s“ в " "%s. Версия %s на „%s“ е оставена в дървото." -#: merge-recursive.c:1129 +#: merge-recursive.c:1158 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2293,7 +2313,7 @@ msgstr "" "КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s. Версия %s на „%s“ " "е оставена в дървото: %s." -#: merge-recursive.c:1134 +#: merge-recursive.c:1163 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -2302,20 +2322,20 @@ msgstr "" "КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ е преименуван на „%s“ в " "%s. Версия %s на „%s“ е оставена в дървото: %s." -#: merge-recursive.c:1168 +#: merge-recursive.c:1197 msgid "rename" msgstr "преименуване" -#: merge-recursive.c:1168 +#: merge-recursive.c:1197 msgid "renamed" msgstr "преименуван" -#: merge-recursive.c:1225 +#: merge-recursive.c:1254 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "„%s“ е директория в „%s“, затова се добавя като „%s“" -#: merge-recursive.c:1250 +#: merge-recursive.c:1279 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -2324,145 +2344,145 @@ msgstr "" "КОНФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон " "„%s“, а „%s“ е преименуван на „%s“ в „%s“/%s." -#: merge-recursive.c:1255 +#: merge-recursive.c:1284 msgid " (left unresolved)" msgstr " (некоригиран конфликт)" -#: merge-recursive.c:1317 +#: merge-recursive.c:1346 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "КОНФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон " "„%s“, а „%s“ е преименуван на „%s“ в „%s“" -#: merge-recursive.c:1350 +#: merge-recursive.c:1379 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "Преименуване на „%s“ на „%s“, а „%s“ на „%s“" -#: merge-recursive.c:1553 +#: merge-recursive.c:1582 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" "КОНФЛИКТ (преименуване/добавяне): „%s“ е преименуван на „%s“ в клон „%s“, а " "„%s“ е добавен в „%s“" -#: merge-recursive.c:1568 +#: merge-recursive.c:1597 #, c-format msgid "Adding merged %s" msgstr "Добавяне на слетия „%s“" -#: merge-recursive.c:1575 merge-recursive.c:1805 +#: merge-recursive.c:1604 merge-recursive.c:1834 #, c-format msgid "Adding as %s instead" msgstr "Добавяне като „%s“" -#: merge-recursive.c:1632 +#: merge-recursive.c:1661 #, c-format msgid "cannot read object %s" msgstr "обектът „%s“ не може да се прочете" -#: merge-recursive.c:1635 +#: merge-recursive.c:1664 #, c-format msgid "object %s is not a blob" msgstr "обектът „%s“ не е BLOB" -#: merge-recursive.c:1704 +#: merge-recursive.c:1733 msgid "modify" msgstr "промяна" -#: merge-recursive.c:1704 +#: merge-recursive.c:1733 msgid "modified" msgstr "променен" -#: merge-recursive.c:1714 +#: merge-recursive.c:1743 msgid "content" msgstr "съдържание" -#: merge-recursive.c:1721 +#: merge-recursive.c:1750 msgid "add/add" msgstr "добавяне/добавяне" -#: merge-recursive.c:1757 +#: merge-recursive.c:1786 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Прескачане на „%s“ (слетият резултат е идентичен със сегашния)" -#: merge-recursive.c:1771 +#: merge-recursive.c:1800 #, c-format msgid "Auto-merging %s" msgstr "Автоматично сливане на „%s“" -#: merge-recursive.c:1775 git-submodule.sh:932 +#: merge-recursive.c:1804 git-submodule.sh:879 msgid "submodule" msgstr "ПОДМОДУЛ" -#: merge-recursive.c:1776 +#: merge-recursive.c:1805 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "КОНФЛИКТ (%s): Конфликт при сливане на „%s“" -#: merge-recursive.c:1870 +#: merge-recursive.c:1899 #, c-format msgid "Removing %s" msgstr "Изтриване на „%s“" -#: merge-recursive.c:1896 +#: merge-recursive.c:1925 msgid "file/directory" msgstr "файл/директория" -#: merge-recursive.c:1902 +#: merge-recursive.c:1931 msgid "directory/file" msgstr "директория/файл" -#: merge-recursive.c:1909 +#: merge-recursive.c:1938 #, 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:1918 +#: merge-recursive.c:1947 #, c-format msgid "Adding %s" msgstr "Добавяне на „%s“" -#: merge-recursive.c:1958 +#: merge-recursive.c:1987 #, c-format msgid "Dirty index: cannot merge (dirty: %s)" msgstr "" "Индексът не е чист: кръпките не могат да бъдат приложени (замърсени са: %s)" -#: merge-recursive.c:1962 +#: merge-recursive.c:1991 msgid "Already up to date!" msgstr "Вече е обновено!" -#: merge-recursive.c:1971 +#: merge-recursive.c:2000 #, c-format msgid "merging of trees %s and %s failed" msgstr "неуспешно сливане на дърветата „%s“ и „%s“" -#: merge-recursive.c:2068 +#: merge-recursive.c:2097 msgid "Merging:" msgstr "Сливане:" -#: merge-recursive.c:2081 +#: merge-recursive.c:2110 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "открит е %u общ предшественик:" msgstr[1] "открити са %u общи предшественици:" -#: merge-recursive.c:2120 +#: merge-recursive.c:2149 msgid "merge returned no commit" msgstr "сливането не върна подаване" -#: merge-recursive.c:2183 +#: merge-recursive.c:2212 #, c-format msgid "Could not parse object '%s'" msgstr "Неуспешен анализ на обекта „%s“" -#: merge-recursive.c:2197 builtin/merge.c:656 builtin/merge.c:815 +#: merge-recursive.c:2228 builtin/merge.c:657 builtin/merge.c:816 msgid "Unable to write index." msgstr "Индексът не може да бъде прочетен" @@ -2489,17 +2509,17 @@ msgid "You have not concluded your notes merge (%s exists)." msgstr "" "Не сте завършили сливането на бележките. (Указателят „%s“ съществува)." -#: notes-utils.c:42 +#: notes-utils.c:43 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "" "Неинициализирано или нереферирано дърво за бележки не може да бъде подадено" -#: notes-utils.c:101 +#: notes-utils.c:102 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "Неправилна стойност за „notes.rewriteMode“: „%s“" -#: notes-utils.c:111 +#: notes-utils.c:112 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "" @@ -2509,7 +2529,7 @@ msgstr "" #. the environment variable, the second %s is #. its value. #. -#: notes-utils.c:141 +#: notes-utils.c:142 #, c-format msgid "Bad %s value: '%s'" msgstr "Зададена е лоша стойност на променливата „%s“: „%s“" @@ -2519,30 +2539,30 @@ msgstr "Зададена е лоша стойност на променлива msgid "unable to parse object: %s" msgstr "обектът „%s“ не може да бъде анализиран" -#: packfile.c:556 +#: packfile.c:561 msgid "offset before end of packfile (broken .idx?)" msgstr "" "отместване преди края на пакетния файл (възможно е индексът да е повреден)" -#: packfile.c:1683 +#: packfile.c:1694 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" "отместване преди началото на индекса на пакетния файл „%s“ (възможно е " "индексът да е повреден)" -#: packfile.c:1687 +#: packfile.c:1698 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" "отместване преди края на индекса на пакетния файл „%s“ (възможно е индексът " "да е отрязан)" -#: parse-options.c:573 +#: parse-options.c:619 msgid "..." msgstr "…" -#: parse-options.c:592 +#: parse-options.c:638 #, c-format msgid "usage: %s" msgstr "употреба: %s" @@ -2550,17 +2570,17 @@ msgstr "употреба: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:598 +#: parse-options.c:644 #, c-format msgid " or: %s" msgstr " или: %s" -#: parse-options.c:601 +#: parse-options.c:647 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:640 +#: parse-options.c:686 msgid "-NUM" msgstr "-ЧИСЛО" @@ -2652,7 +2672,7 @@ msgstr "пътят „%s“ е след символна връзка" msgid "unable to parse --pretty format" msgstr "аргументът към опцията „--pretty“ не може да се анализира" -#: read-cache.c:1472 +#: read-cache.c:1473 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -2661,7 +2681,7 @@ msgstr "" "Зададена е неправилна стойност на настройката „index.version“.\n" "Ще се ползва версия %i" -#: read-cache.c:1482 +#: read-cache.c:1483 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -2671,22 +2691,22 @@ msgstr "" "„GIT_INDEX_VERSION“.\n" "Ще се ползва версия %i" -#: read-cache.c:2370 sequencer.c:2731 wrapper.c:658 builtin/merge.c:1048 +#: read-cache.c:2375 sequencer.c:3248 wrapper.c:658 builtin/merge.c:1049 #, c-format msgid "could not close '%s'" msgstr "„%s“ не може да се затвори" -#: read-cache.c:2442 sequencer.c:1369 sequencer.c:2096 +#: read-cache.c:2448 sequencer.c:1900 sequencer.c:2627 #, c-format msgid "could not stat '%s'" msgstr "неуспешно изпълнение на „stat“ върху „%s“" -#: read-cache.c:2455 +#: read-cache.c:2461 #, c-format msgid "unable to open git dir: %s" msgstr "не може да се отвори директорията на git: %s" -#: read-cache.c:2467 +#: read-cache.c:2473 #, c-format msgid "unable to unlink: %s" msgstr "неуспешно изтриване на „%s“" @@ -2705,18 +2725,18 @@ msgstr "обновяванията на указатели са забранен msgid "could not remove reference %s" msgstr "Указателят „%s“ не може да бъде изтрит" -#: refs/files-backend.c:1203 refs/packed-backend.c:1524 -#: refs/packed-backend.c:1534 +#: refs/files-backend.c:1203 refs/packed-backend.c:1528 +#: refs/packed-backend.c:1538 #, c-format msgid "could not delete reference %s: %s" msgstr "Указателят „%s“ не може да бъде изтрит: %s" -#: refs/files-backend.c:1206 refs/packed-backend.c:1537 +#: refs/files-backend.c:1206 refs/packed-backend.c:1541 #, c-format msgid "could not delete references: %s" msgstr "Указателите не може да бъдат изтрити: %s" -#: ref-filter.c:35 wt-status.c:1816 +#: ref-filter.c:35 wt-status.c:1842 msgid "gone" msgstr "изтрит" @@ -2910,130 +2930,140 @@ msgstr "Указателят „HEAD“ не е свързан и е отдел msgid "(no branch)" msgstr "(извън клон)" -#: ref-filter.c:1488 ref-filter.c:1519 +#: ref-filter.c:1364 #, c-format msgid "missing object %s for %s" msgstr "обектът „%s“ липсва за „%s“" -#: ref-filter.c:1491 ref-filter.c:1522 +#: ref-filter.c:1367 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "неуспешно анализиране чрез „parse_object_buffer“ на „%s“ за „%s“" -#: ref-filter.c:1822 +#: ref-filter.c:1819 #, c-format msgid "malformed object at '%s'" msgstr "обект със сгрешен формат при „%s“" -#: ref-filter.c:1889 +#: ref-filter.c:1886 #, c-format msgid "ignoring ref with broken name %s" msgstr "игнориране на указателя с грешно име „%s“" -#: ref-filter.c:1894 +#: ref-filter.c:1891 #, c-format msgid "ignoring broken ref %s" msgstr "игнориране на повредения указател „%s“" -#: ref-filter.c:2156 +#: ref-filter.c:2152 #, c-format msgid "format: %%(end) atom missing" msgstr "грешка във форма̀та: липсва лексемата %%(end)" -#: ref-filter.c:2250 +#: ref-filter.c:2246 #, c-format msgid "malformed object name %s" msgstr "неправилно име на обект „%s“" -#: remote.c:780 +#: remote.c:795 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Невъзможно е да се доставят едновременно и „%s“, и „%s“ към „%s“" -#: remote.c:784 +#: remote.c:799 #, c-format msgid "%s usually tracks %s, not %s" msgstr "„%s“ обикновено следи „%s“, а не „%s“" -#: remote.c:788 +#: remote.c:803 #, c-format msgid "%s tracks both %s and %s" msgstr "„%s“ следи както „%s“, така и „%s“" -#: remote.c:796 +#: remote.c:811 msgid "Internal error" msgstr "Вътрешна грешка" -#: remote.c:1711 remote.c:1813 +#: remote.c:1726 remote.c:1828 msgid "HEAD does not point to a branch" msgstr "Указателят „HEAD“ не сочи към клон" -#: remote.c:1720 +#: remote.c:1735 #, c-format msgid "no such branch: '%s'" msgstr "няма клон на име „%s“" -#: remote.c:1723 +#: remote.c:1738 #, c-format msgid "no upstream configured for branch '%s'" msgstr "не е зададен клон-източник за клона „%s“" -#: remote.c:1729 +#: remote.c:1744 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "клонът-източник „%s“ не е съхранен като следящ клон" -#: remote.c:1744 +#: remote.c:1759 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "липсва локален следящ клон за местоположението за изтласкване „%s“ в " "хранилището „%s“" -#: remote.c:1756 +#: remote.c:1771 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "няма информация клонът „%s“ да следи някой друг" -#: remote.c:1767 +#: remote.c:1782 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "указателят за изтласкване на „%s“ не включва „%s“" -#: remote.c:1780 +#: remote.c:1795 msgid "push has no destination (push.default is 'nothing')" msgstr "указателят за изтласкване не включва цел („push.default“ е „nothing“)" -#: remote.c:1802 +#: remote.c:1817 msgid "cannot resolve 'simple' push to a single destination" msgstr "простото (simple) изтласкване не съответства на една цел" -#: remote.c:2106 +#: remote.c:2132 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Този клон следи „%s“, но следеният клон е изтрит.\n" -#: remote.c:2110 +#: remote.c:2136 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (за да коригирате това, използвайте „git branch --unset-upstream“)\n" -#: remote.c:2113 +#: remote.c:2139 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Клонът е актуализиран към „%s“.\n" -#: remote.c:2117 +#: remote.c:2143 +#, c-format +msgid "Your branch and '%s' refer to different commits.\n" +msgstr "Клонът ви и „%s“ сочат към различни подавания.\n" + +#: remote.c:2146 +#, c-format +msgid " (use \"%s\" for details)\n" +msgstr " (за повече информация ползвайте „%s“)\n" + +#: remote.c:2150 #, 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:2123 +#: remote.c:2156 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (публикувайте локалните си промени чрез „git push“)\n" -#: remote.c:2126 +#: remote.c:2159 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -3041,11 +3071,11 @@ msgid_plural "" msgstr[0] "Клонът ви е с %2$d подаване зад „%1$s“ и може да бъде превъртян.\n" msgstr[1] "Клонът ви е с %2$d подавания зад „%1$s“ и може да бъде превъртян.\n" -#: remote.c:2134 +#: remote.c:2167 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (обновете локалния си клон чрез „git pull“)\n" -#: remote.c:2137 +#: remote.c:2170 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -3060,28 +3090,28 @@ msgstr[1] "" "Текущият клон се е отделил от „%s“,\n" "двата имат съответно по %d и %d несъвпадащи подавания.\n" -#: remote.c:2147 +#: remote.c:2180 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (слейте отдалечения клон в локалния чрез „git pull“)\n" -#: revision.c:2268 +#: revision.c:2277 msgid "your current branch appears to be broken" msgstr "Текущият клон е повреден" -#: revision.c:2271 +#: revision.c:2280 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "Текущият клон „%s“ е без подавания " -#: revision.c:2465 +#: revision.c:2477 msgid "--first-parent is incompatible with --bisect" msgstr "опциите „--first-parent“ и „--bisect“ са несъвместими" -#: run-command.c:645 +#: run-command.c:731 msgid "open /dev/null failed" msgstr "неуспешно отваряне на „/dev/null“" -#: run-command.c:1188 +#: run-command.c:1274 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -3092,25 +3122,31 @@ msgstr "" " git config advice.ignoredHook false" #: send-pack.c:141 +msgid "unexpected flush packet while reading remote unpack status" +msgstr "" +"неочакван изчистващ пакет „flush“ при изчитане на състоянието от " +"отдалеченото разпакетиране" + +#: send-pack.c:143 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "" "състоянието от отдалеченото разпакетиране не може да бъде анализирано: %s" -#: send-pack.c:143 +#: send-pack.c:145 #, c-format msgid "remote unpack failed: %s" msgstr "неуспешно отдалечено разпакетиране: %s" -#: send-pack.c:306 +#: send-pack.c:308 msgid "failed to sign the push certificate" msgstr "сертификатът за изтласкване не може да бъде подписан" -#: send-pack.c:419 +#: send-pack.c:421 msgid "the receiving end does not support --signed push" msgstr "отсрещната страна не поддържа изтласкване с опцията „--signed“" -#: send-pack.c:421 +#: send-pack.c:423 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -3118,32 +3154,37 @@ msgstr "" "отсрещната страна не поддържа изтласкване с опцията „--signed“, затова не се " "използва сертификат" -#: send-pack.c:433 +#: send-pack.c:435 msgid "the receiving end does not support --atomic push" msgstr "получаващата страна не поддържа изтласкване с опцията „--atomic“" -#: send-pack.c:438 +#: send-pack.c:440 msgid "the receiving end does not support push options" msgstr "отсрещната страна не поддържа опции при изтласкване" -#: sequencer.c:218 +#: sequencer.c:158 +#, c-format +msgid "invalid commit message cleanup mode '%s'" +msgstr "несъществуващ режим на изчистване „%s“ на съобщение при подаване" + +#: sequencer.c:267 msgid "revert" msgstr "отмяна" -#: sequencer.c:220 +#: sequencer.c:269 msgid "cherry-pick" msgstr "отбиране" -#: sequencer.c:222 +#: sequencer.c:271 msgid "rebase -i" msgstr "rebase -i" -#: sequencer.c:224 +#: sequencer.c:273 #, c-format msgid "Unknown action: %d" msgstr "Неизвестно действие: %d" -#: sequencer.c:281 +#: sequencer.c:330 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -3151,7 +3192,7 @@ msgstr "" "след коригирането на конфликтите, отбележете съответните\n" "пътища с „git add ПЪТ…“ или „git rm ПЪТ…“." -#: sequencer.c:284 +#: sequencer.c:333 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -3161,43 +3202,43 @@ msgstr "" "пътища с „git add ПЪТ…“ или „git rm ПЪТ…“, след което\n" "подайте резултата с командата „git commit'“." -#: sequencer.c:297 sequencer.c:1718 +#: sequencer.c:346 sequencer.c:2245 #, c-format msgid "could not lock '%s'" msgstr "„%s“ не може да се заключи" -#: sequencer.c:300 sequencer.c:1595 sequencer.c:1723 sequencer.c:1737 -#: sequencer.c:2729 sequencer.c:2800 wrapper.c:656 +#: sequencer.c:349 sequencer.c:2124 sequencer.c:2250 sequencer.c:2264 +#: sequencer.c:3246 sequencer.c:3310 wrapper.c:656 #, c-format msgid "could not write to '%s'" msgstr "в „%s“ не може да се пише" -#: sequencer.c:304 +#: sequencer.c:353 #, c-format msgid "could not write eol to '%s'" msgstr "краят на ред не може да се запише в „%s“" -#: sequencer.c:308 sequencer.c:1600 sequencer.c:1725 +#: sequencer.c:356 sequencer.c:2128 sequencer.c:2252 #, c-format -msgid "failed to finalize '%s'." -msgstr "„%s“ не може да се завърши." +msgid "failed to finalize '%s'" +msgstr "„%s“ не може да се завърши" -#: sequencer.c:332 sequencer.c:829 sequencer.c:1621 builtin/am.c:259 -#: builtin/commit.c:754 builtin/merge.c:1046 +#: sequencer.c:379 sequencer.c:1340 sequencer.c:2148 builtin/am.c:259 +#: builtin/commit.c:722 builtin/merge.c:1047 #, c-format msgid "could not read '%s'" msgstr "файлът „%s“ не може да бъде прочетен" -#: sequencer.c:358 +#: sequencer.c:405 #, c-format msgid "your local changes would be overwritten by %s." msgstr "локалните ви промени ще бъдат презаписани при %s." -#: sequencer.c:362 +#: sequencer.c:409 msgid "commit your changes or stash them to proceed." msgstr "подайте или скатайте промените, за да продължите" -#: sequencer.c:391 +#: sequencer.c:438 #, c-format msgid "%s: fast-forward" msgstr "%s: превъртане" @@ -3205,20 +3246,20 @@ msgstr "%s: превъртане" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:477 +#: sequencer.c:526 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: новият индекс не може да бъде запазен" -#: sequencer.c:496 +#: sequencer.c:542 msgid "could not resolve HEAD commit" msgstr "подаването, сочено от указателя „HEAD“, не може да бъде открито" -#: sequencer.c:516 +#: sequencer.c:562 msgid "unable to update cache tree" msgstr "дървото на кеша не може да бъде обновено" -#: sequencer.c:600 +#: sequencer.c:658 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -3247,17 +3288,131 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:702 +#: sequencer.c:915 +msgid "'prepare-commit-msg' hook failed" +msgstr "" +"неуспешно изпълнение на куката при промяна на съобщението при подаване " +"(prepare-commit-msg)" + +#: sequencer.c:922 +msgid "" +"Your name and email address were configured automatically based\n" +"on your username and hostname. Please check that they are accurate.\n" +"You can suppress this message by setting them explicitly. Run the\n" +"following command and follow the instructions in your editor to edit\n" +"your configuration file:\n" +"\n" +" git config --global --edit\n" +"\n" +"After doing this, you may fix the identity used for this commit with:\n" +"\n" +" git commit --amend --reset-author\n" +msgstr "" +"Името и адресът за е-поща са настроени автоматично на базата на името на\n" +"потребителя и името на машината. Проверете дали са верни. Можете да " +"спрете\n" +"това съобщение като изрично зададете стойностите. Изпълнете следната " +"команда\n" +"и следвайте инструкциите в текстовия ви редактор, за да редактирате\n" +"конфигурационния файл:\n" +"\n" +" git config --global --edit\n" +"\n" +"След като направите това, можете да коригирате информацията за автора на\n" +"текущото подаване чрез:\n" +"\n" +" git commit --amend --reset-author\n" + +#: sequencer.c:935 +msgid "" +"Your name and email address were configured automatically based\n" +"on your username and hostname. Please check that they are accurate.\n" +"You can suppress this message by setting them explicitly:\n" +"\n" +" git config --global user.name \"Your Name\"\n" +" git config --global user.email you@example.com\n" +"\n" +"After doing this, you may fix the identity used for this commit with:\n" +"\n" +" git commit --amend --reset-author\n" +msgstr "" +"Името и адресът за е-поща са настроени автоматично на базата на името на\n" +"потребителя и името на машината. Проверете дали са верни. Можете да " +"спрете\n" +"това съобщение като изрично зададете стойностите:\n" +"\n" +" git config --global user.name \"Вашето Име\"\n" +" git config --global user.email пенчо@example.com\n" +"\n" +"След като направите това, можете да коригирате информацията за автора на\n" +"текущото подаване чрез:\n" +"\n" +" git commit --amend --reset-author\n" + +#: sequencer.c:975 +msgid "couldn't look up newly created commit" +msgstr "току що създаденото подаване не може да бъде открито" + +#: sequencer.c:977 +msgid "could not parse newly created commit" +msgstr "току що създаденото подаване не може да бъде анализирано" + +#: sequencer.c:1023 +msgid "unable to resolve HEAD after creating commit" +msgstr "" +"състоянието сочено от указателя „HEAD“ не може да бъде открито след " +"подаването" + +#: sequencer.c:1025 +msgid "detached HEAD" +msgstr "несвързан връх „HEAD“" + +#: sequencer.c:1029 +msgid " (root-commit)" +msgstr " (начално подаване)" + +#: sequencer.c:1050 +msgid "could not parse HEAD" +msgstr "указателят „HEAD“ не може да бъде анализиран" + +#: sequencer.c:1052 +#, c-format +msgid "HEAD %s is not a commit!" +msgstr "указателят „HEAD“ „%s“ сочи към нещо, което не е подаване!" + +#: sequencer.c:1056 builtin/commit.c:1491 +msgid "could not parse HEAD commit" +msgstr "върховото подаване „HEAD“ не може да бъде прочетено" + +#: sequencer.c:1107 sequencer.c:1673 +msgid "unable to parse commit author" +msgstr "авторът на подаването не може да бъде анализиран" + +#: sequencer.c:1117 builtin/am.c:1630 builtin/merge.c:643 +msgid "git write-tree failed to write a tree" +msgstr "Командата „git write-tree“ не успя да запише обект-дърво" + +#: sequencer.c:1134 sequencer.c:1186 +#, c-format +msgid "unable to read commit message from '%s'" +msgstr "съобщението за подаване не може да бъде прочетено от „%s“" + +#: sequencer.c:1154 builtin/am.c:1650 builtin/commit.c:1594 builtin/merge.c:826 +#: builtin/merge.c:851 +msgid "failed to write commit object" +msgstr "обектът за подаването не може да бъде записан" + +#: sequencer.c:1213 #, c-format msgid "could not parse commit %s" msgstr "подаването „%s“ не може да бъде анализирано" -#: sequencer.c:707 +#: sequencer.c:1218 #, c-format msgid "could not parse parent commit %s" msgstr "родителското подаване „%s“ не може да бъде анализирано" -#: sequencer.c:836 +#: sequencer.c:1347 #, c-format msgid "" "unexpected 1st line of squash message:\n" @@ -3268,7 +3423,7 @@ msgstr "" "\n" " %.*s" -#: sequencer.c:842 +#: sequencer.c:1353 #, c-format msgid "" "invalid 1st line of squash message:\n" @@ -3279,250 +3434,254 @@ msgstr "" "\n" " %.*s" -#: sequencer.c:848 sequencer.c:873 +#: sequencer.c:1359 sequencer.c:1384 #, c-format msgid "This is a combination of %d commits." msgstr "Това е обединение от %d подавания" -#: sequencer.c:857 sequencer.c:2748 +#: sequencer.c:1368 sequencer.c:3265 msgid "need a HEAD to fixup" msgstr "За смачкване ви трябва указател „HEAD“" -#: sequencer.c:859 +#: sequencer.c:1370 msgid "could not read HEAD" msgstr "указателят „HEAD“ не може да се прочете" -#: sequencer.c:861 +#: sequencer.c:1372 msgid "could not read HEAD's commit message" msgstr "" "съобщението за подаване към указателя „HEAD“ не може да бъде прочетено: %s" -#: sequencer.c:867 +#: sequencer.c:1378 #, c-format msgid "cannot write '%s'" msgstr "„%s“ не може да се запази" -#: sequencer.c:876 git-rebase--interactive.sh:446 +#: sequencer.c:1387 git-rebase--interactive.sh:452 msgid "This is the 1st commit message:" msgstr "Това е 1-то съобщение при подаване:" -#: sequencer.c:884 +#: sequencer.c:1395 #, c-format msgid "could not read commit message of %s" msgstr "съобщението за подаване към „%s“ не може да бъде прочетено" -#: sequencer.c:891 +#: sequencer.c:1402 #, c-format msgid "This is the commit message #%d:" msgstr "Това е съобщение при подаване №%d:" -#: sequencer.c:896 +#: sequencer.c:1407 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Съобщение при подаване №%d ще бъде прескочено:" -#: sequencer.c:901 +#: sequencer.c:1412 #, c-format msgid "unknown command: %d" msgstr "непозната команда: %d" -#: sequencer.c:967 +#: sequencer.c:1479 msgid "your index file is unmerged." msgstr "индексът не е слят." -#: sequencer.c:986 +#: sequencer.c:1498 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "подаването „%s“ е сливане, но не е дадена опцията „-m“" -#: sequencer.c:994 +#: sequencer.c:1506 #, c-format msgid "commit %s does not have parent %d" msgstr "подаването „%s“ няма родител %d" -#: sequencer.c:998 +#: sequencer.c:1510 #, c-format msgid "mainline was specified but commit %s is not a merge." msgstr "указано е базово подаване, но подаването „%s“ не е сливане." -#: sequencer.c:1004 +#: sequencer.c:1516 #, 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:1023 +#: sequencer.c:1535 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: неразпозната стойност за родителското подаване „%s“" -#: sequencer.c:1086 sequencer.c:1867 +#: sequencer.c:1600 sequencer.c:2397 #, c-format msgid "could not rename '%s' to '%s'" msgstr "„%s“ не може да се преименува на „%s“" -#: sequencer.c:1137 +#: sequencer.c:1654 #, c-format msgid "could not revert %s... %s" msgstr "подаването „%s“… не може да бъде отменено: „%s“" -#: sequencer.c:1138 +#: sequencer.c:1655 #, c-format msgid "could not apply %s... %s" msgstr "подаването „%s“… не може да бъде приложено: „%s“" -#: sequencer.c:1180 +#: sequencer.c:1702 msgid "empty commit set passed" msgstr "зададено е празно множество от подавания" -#: sequencer.c:1190 +#: sequencer.c:1712 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: неуспешно изчитане на индекса" -#: sequencer.c:1196 +#: sequencer.c:1718 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: неуспешно обновяване на индекса" -#: sequencer.c:1270 +#: sequencer.c:1792 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "„%s“ не приема аргументи: „%s“" -#: sequencer.c:1279 +#: sequencer.c:1801 #, c-format msgid "missing arguments for %s" msgstr "„%s“ изисква аргументи" -#: sequencer.c:1322 +#: sequencer.c:1844 #, c-format msgid "invalid line %d: %.*s" msgstr "неправилен ред %d: %.*s" -#: sequencer.c:1330 +#: sequencer.c:1852 #, c-format msgid "cannot '%s' without a previous commit" msgstr "Без предишно подаване не може да се изпълни „%s“" -#: sequencer.c:1363 sequencer.c:2525 sequencer.c:2560 sequencer.c:2642 -#: sequencer.c:2668 sequencer.c:2758 sequencer.c:2859 +#: sequencer.c:1883 sequencer.c:3056 sequencer.c:3091 #, c-format msgid "could not read '%s'." msgstr "от „%s“ не може да се чете." -#: sequencer.c:1375 +#: sequencer.c:1906 msgid "please fix this using 'git rebase --edit-todo'." msgstr "коригирайте това чрез „git rebase --edit-todo“." -#: sequencer.c:1377 +#: sequencer.c:1908 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "неизползваем файл с описание на предстоящите действия: „%s“" -#: sequencer.c:1382 +#: sequencer.c:1913 msgid "no commits parsed." msgstr "никое от подаванията не може да се разпознае." -#: sequencer.c:1393 +#: sequencer.c:1924 msgid "cannot cherry-pick during a revert." msgstr "" "по време на отмяна на подаване не може да се извърши отбиране на подаване." -#: sequencer.c:1395 +#: sequencer.c:1926 msgid "cannot revert during a cherry-pick." msgstr "по време на отбиране не може да се извърши отмяна на подаване." -#: sequencer.c:1462 +#: sequencer.c:1993 #, c-format msgid "invalid key: %s" msgstr "неправилен ключ: „%s“" -#: sequencer.c:1465 +#: sequencer.c:1996 #, c-format msgid "invalid value for %s: %s" msgstr "неправилна стойност за „%s“: „%s“" -#: sequencer.c:1531 +#: sequencer.c:2062 #, c-format msgid "malformed options sheet: '%s'" msgstr "неправилен файл с опции: „%s“" -#: sequencer.c:1569 +#: sequencer.c:2100 msgid "a cherry-pick or revert is already in progress" msgstr "" "в момента вече се извършва отбиране на подавания или пребазиране на клона" -#: sequencer.c:1570 +#: sequencer.c:2101 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "използвайте „git cherry-pick (--continue | --quit | --abort)“" -#: sequencer.c:1573 +#: sequencer.c:2104 #, c-format msgid "could not create sequencer directory '%s'" msgstr "директорията за секвенсора „%s“ не може да бъде създадена" -#: sequencer.c:1588 +#: sequencer.c:2118 msgid "could not lock HEAD" msgstr "указателят „HEAD“ не може да се заключи" -#: sequencer.c:1646 sequencer.c:2230 +#: sequencer.c:2173 sequencer.c:2761 msgid "no cherry-pick or revert in progress" msgstr "" "в момента не се извършва отбиране на подавания или пребазиране на клона" -#: sequencer.c:1648 +#: sequencer.c:2175 msgid "cannot resolve HEAD" msgstr "Подаването сочено от указателя „HEAD“ не може да бъде открито" -#: sequencer.c:1650 sequencer.c:1685 +#: sequencer.c:2177 sequencer.c:2212 msgid "cannot abort from a branch yet to be born" msgstr "" "действието не може да бъде преустановено, когато сте на клон, който тепърва " "предстои да бъде създаден" -#: sequencer.c:1671 builtin/grep.c:713 +#: sequencer.c:2198 builtin/grep.c:720 #, c-format msgid "cannot open '%s'" msgstr "„%s“ не може да бъде отворен" -#: sequencer.c:1673 +#: sequencer.c:2200 #, c-format msgid "cannot read '%s': %s" msgstr "„%s“ не може да бъде прочетен: %s" -#: sequencer.c:1674 +#: sequencer.c:2201 msgid "unexpected end of file" msgstr "неочакван край на файл" -#: sequencer.c:1680 +#: sequencer.c:2207 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" "запазеният преди започването на отбирането файл за указателя „HEAD“ — „%s“ е " "повреден" -#: sequencer.c:1691 +#: sequencer.c:2218 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" "Изглежда указателят „HEAD“ е променен. Проверете към какво сочи.\n" "Не се правят промени." -#: sequencer.c:1832 sequencer.c:2128 +#: sequencer.c:2324 sequencer.c:2679 +#, c-format +msgid "could not update %s" +msgstr "„%s“ не може да се обнови" + +#: sequencer.c:2362 sequencer.c:2659 msgid "cannot read HEAD" msgstr "указателят „HEAD“ не може да бъде прочетен" -#: sequencer.c:1872 builtin/difftool.c:639 +#: sequencer.c:2402 builtin/difftool.c:639 #, c-format msgid "could not copy '%s' to '%s'" msgstr "„%s“ не може да се копира като „%s“" -#: sequencer.c:1891 +#: sequencer.c:2421 msgid "could not read index" msgstr "индексът не може да бъде прочетен" -#: sequencer.c:1896 +#: sequencer.c:2426 #, c-format msgid "" "execution failed: %s\n" @@ -3537,11 +3696,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:1902 +#: sequencer.c:2432 msgid "and made changes to the index and/or the working tree\n" msgstr "и промени индекса и/или работното дърво\n" -#: sequencer.c:1908 +#: sequencer.c:2438 #, c-format msgid "" "execution succeeded: %s\n" @@ -3558,17 +3717,17 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:1967 +#: sequencer.c:2497 #, c-format msgid "Applied autostash.\n" msgstr "Автоматично скатаното е приложено.\n" -#: sequencer.c:1979 +#: sequencer.c:2509 #, c-format msgid "cannot store %s" msgstr "„%s“ не може да бъде запазен" -#: sequencer.c:1982 git-rebase.sh:175 +#: sequencer.c:2512 git-rebase.sh:178 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -3579,57 +3738,52 @@ msgstr "" "надеждно скатани. Можете да пробвате да ги приложите чрез „git stash pop“\n" "или да ги изхвърлите чрез „git stash drop“, когато поискате.\n" -#: sequencer.c:2064 +#: sequencer.c:2595 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Спиране при „%s“… %.*s\n" -#: sequencer.c:2106 +#: sequencer.c:2637 #, c-format msgid "unknown command %d" msgstr "непозната команда %d" -#: sequencer.c:2136 +#: sequencer.c:2667 msgid "could not read orig-head" msgstr "указателят за „orig-head“ не може да се прочете" -#: sequencer.c:2141 sequencer.c:2745 +#: sequencer.c:2672 sequencer.c:3262 msgid "could not read 'onto'" msgstr "указателят за „onto“ не може да се прочете" -#: sequencer.c:2148 -#, c-format -msgid "could not update %s" -msgstr "„%s“ не може да се обнови" - -#: sequencer.c:2155 +#: sequencer.c:2686 #, c-format msgid "could not update HEAD to %s" msgstr "„HEAD“ не може да бъде обновен до „%s“" -#: sequencer.c:2239 +#: sequencer.c:2770 msgid "cannot rebase: You have unstaged changes." msgstr "не може да пребазирате, защото има промени, които не са в индекса." -#: sequencer.c:2244 +#: sequencer.c:2775 msgid "could not remove CHERRY_PICK_HEAD" msgstr "указателят „CHERRY_PICK_HEAD“ не може да бъде изтрит" -#: sequencer.c:2253 +#: sequencer.c:2784 msgid "cannot amend non-existing commit" msgstr "несъществуващо подаване не може да се поправи" -#: sequencer.c:2255 +#: sequencer.c:2786 #, c-format msgid "invalid file: '%s'" msgstr "неправилен файл: „%s“" -#: sequencer.c:2257 +#: sequencer.c:2788 #, c-format msgid "invalid contents: '%s'" msgstr "неправилно съдържание: „%s“" -#: sequencer.c:2260 +#: sequencer.c:2791 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -3639,38 +3793,38 @@ msgstr "" "В работното дърво има неподадени промени. Първо ги подайте, а след това\n" "отново изпълнете „git rebase --continue“." -#: sequencer.c:2270 +#: sequencer.c:2801 msgid "could not commit staged changes." msgstr "промените в индекса не могат да бъдат подадени." -#: sequencer.c:2350 +#: sequencer.c:2881 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: не може да се отбере „%s“" -#: sequencer.c:2354 +#: sequencer.c:2885 #, c-format msgid "%s: bad revision" msgstr "%s: неправилна версия" -#: sequencer.c:2387 +#: sequencer.c:2918 msgid "can't revert as initial commit" msgstr "първоначалното подаване не може да бъде отменено" -#: sequencer.c:2492 +#: sequencer.c:3023 msgid "make_script: unhandled options" msgstr "make_script: неподдържани опции" -#: sequencer.c:2495 +#: sequencer.c:3026 msgid "make_script: error preparing revisions" msgstr "make_script: грешка при подготовката на версии" -#: sequencer.c:2529 sequencer.c:2564 +#: sequencer.c:3060 sequencer.c:3095 #, c-format msgid "unusable todo list: '%s'" msgstr "неуспешно изтриване на списъка за изпълнение: „%s“" -#: sequencer.c:2615 +#: sequencer.c:3146 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." @@ -3678,7 +3832,7 @@ msgstr "" "Непозната стойност „%s“ за настройката „rebase.missingCommitsCheck“. " "Настройката се прескача." -#: sequencer.c:2695 +#: sequencer.c:3212 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -3687,7 +3841,7 @@ msgstr "" "Предупреждение: някои подавания може да са пропуснати.\n" "Пропуснати подавания (новите са най-отгоре):\n" -#: sequencer.c:2702 +#: sequencer.c:3219 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -3704,7 +3858,7 @@ msgstr "" "предупреждение)\n" "или „error“ (считане за грешка).\n" -#: sequencer.c:2714 +#: sequencer.c:3231 #, c-format msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" @@ -3715,21 +3869,26 @@ msgstr "" "continue“ след това.\n" "Може и да преустановите пребазирането с командата „git rebase --abort“.\n" -#: sequencer.c:2727 sequencer.c:2794 wrapper.c:225 wrapper.c:395 +#: sequencer.c:3244 sequencer.c:3304 wrapper.c:225 wrapper.c:395 #: builtin/am.c:779 #, c-format msgid "could not open '%s' for writing" msgstr "„%s“ не може да бъде отворен за запис" -#: sequencer.c:2775 +#: sequencer.c:3285 #, c-format msgid "could not parse commit '%s'" msgstr "подаването „%s“ не може да бъде анализирано" -#: sequencer.c:2897 +#: sequencer.c:3401 msgid "the script was already rearranged." msgstr "скриптът вече е преподреден." +#: setup.c:122 +#, c-format +msgid "'%s' is outside repository" +msgstr "„%s“ е извън хранилището" + #: setup.c:171 #, c-format msgid "" @@ -3754,6 +3913,11 @@ msgstr "" "\n" " git КОМАНДА [ВЕРСИЯ…] -- [ФАЙЛ…]" +#: setup.c:233 +#, c-format +msgid "option '%s' must come before non-option arguments" +msgstr "опцията „%s“ трябва да е преди първия аргумент, който не е опция" + #: setup.c:252 #, c-format msgid "" @@ -3761,82 +3925,153 @@ msgid "" "Use '--' to separate paths from revisions, like this:\n" "'git <command> [<revision>...] -- [<file>...]'" msgstr "" -"нееднозначен аргумент „%s: както версия, така и път.\n" +"нееднозначен аргумент „%s“: както версия, така и път.\n" "Разделяйте пътищата от версиите с „--“, ето така:\n" "\n" " git КОМАНДА [ВЕРСИЯ…] -- [ФАЙЛ…]" -#: setup.c:501 +#: setup.c:388 +msgid "unable to set up work tree using invalid config" +msgstr "" +"не може да се зададе текуща работна директория при неправилни настройки" + +#: setup.c:395 +msgid "this operation must be run in a work tree" +msgstr "тази команда трябва да се изпълни в работно дърво" + +#: setup.c:506 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Очаква се версия на хранилището на git <= %d, а не %d" -#: setup.c:509 +#: setup.c:514 msgid "unknown repository extensions found:" msgstr "открити са непознати разширения в хранилището:" -#: setup.c:811 +#: setup.c:533 +#, c-format +msgid "error opening '%s'" +msgstr "„%s“ не може да се отвори" + +#: setup.c:535 +#, c-format +msgid "too large to be a .git file: '%s'" +msgstr "прекалено голям файл „.git“: „%s“" + +#: setup.c:537 +#, c-format +msgid "error reading %s" +msgstr "грешка при прочитане на „%s“" + +#: setup.c:539 +#, c-format +msgid "invalid gitfile format: %s" +msgstr "неправилен формат на gitfile: %s" + +#: setup.c:541 +#, c-format +msgid "no path in gitfile: %s" +msgstr "липсва път в gitfile: „%s“" + +#: setup.c:543 +#, c-format +msgid "not a git repository: %s" +msgstr "не е хранилище на Git: %s" + +#: setup.c:642 +#, c-format +msgid "'$%s' too big" +msgstr "„%s“ е прекалено голям" + +#: setup.c:656 +#, c-format +msgid "not a git repository: '%s'" +msgstr "не е хранилище на git: „%s“" + +#: setup.c:685 setup.c:687 setup.c:718 #, c-format -msgid "Not a git repository (or any of the parent directories): %s" +msgid "cannot chdir to '%s'" +msgstr "не може да се влезе в директорията „%s“" + +#: setup.c:690 setup.c:746 setup.c:756 setup.c:795 setup.c:803 setup.c:818 +msgid "cannot come back to cwd" +msgstr "процесът не може да се върне към предишната работна директория" + +#: setup.c:816 +#, c-format +msgid "not a git repository (or any of the parent directories): %s" msgstr "" -"Нито тази, нито която и да е от по-горните директории, не е хранилище на " +"нито тази, нито която и да е от по-горните директории, не е хранилище на " "git: %s" -#: setup.c:813 builtin/index-pack.c:1653 -msgid "Cannot come back to cwd" -msgstr "Процесът не може да се върне към предишната работна директория" +#: setup.c:827 +#, c-format +msgid "failed to stat '%*s%s%s'" +msgstr "не може да бъде получена информация чрез „stat“ за „%*s%s%s“" -#: setup.c:1052 +#: setup.c:1057 msgid "Unable to read current working directory" msgstr "Текущата работна директория не може да бъде прочетена" -#: setup.c:1064 setup.c:1070 +#: setup.c:1069 setup.c:1075 #, c-format -msgid "Cannot change to '%s'" -msgstr "Не може да се влезе в директорията „%s“" +msgid "cannot change to '%s'" +msgstr "не може да се влезе в директорията „%s“" -#: setup.c:1083 +#: setup.c:1088 #, c-format msgid "" -"Not a git repository (or any parent up to mount point %s)\n" +"not a git repository (or any parent up to mount point %s)\n" "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." msgstr "" -"Нито тази, нито която и да е от по-горните директории (до точката на " +"нито тази, нито която и да е от по-горните директории (до точката на " "монтиране „%s“), не е хранилище на git.\n" "Git работи в рамките на една файлова система, защото променливата на средата " "„GIT_DISCOVERY_ACROSS_FILESYSTEM“ не е зададена." -#: setup.c:1167 +#: setup.c:1172 #, c-format msgid "" -"Problem with core.sharedRepository filemode value (0%.3o).\n" +"problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." msgstr "" -"Зададеният в „core.sharedRepository“ режим за достъп до файлове е неправилен " +"зададеният в „core.sharedRepository“ режим за достъп до файлове е неправилен " "(0%.3o).\n" "Собственикът на файла трябва да има права за писане и четене." -#: sha1_file.c:598 +#: setup.c:1215 +msgid "open /dev/null or dup failed" +msgstr "неуспешно изпълнение на „open“ или „dup“ върху „/dev/null“" + +#: setup.c:1230 +msgid "fork failed" +msgstr "неуспешно изпълнение на „fork“" + +#: setup.c:1235 +msgid "setsid failed" +msgstr "неуспешно изпълнение на „setsid“" + +#: sha1_file.c:592 #, c-format msgid "path '%s' does not exist" msgstr "пътят „%s“ не съществува." -#: sha1_file.c:624 +#: sha1_file.c:618 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "все още не се поддържа еталонно хранилище „%s“ като свързано." -#: sha1_file.c:630 +#: sha1_file.c:624 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "еталонното хранилище „%s“ не е локално" -#: sha1_file.c:636 +#: sha1_file.c:630 #, c-format msgid "reference repository '%s' is shallow" msgstr "еталонното хранилище „%s“ е плитко" -#: sha1_file.c:644 +#: sha1_file.c:638 #, c-format msgid "reference repository '%s' is grafted" msgstr "еталонното хранилище „%s“ е с присаждане" @@ -3914,7 +4149,7 @@ msgstr "Пътят „%s“ е в подмодула „%.*s“" msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "записът за подмодула „%s“ (%s) е %s, а не подаване!" -#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387 +#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1724 msgid "Failed to resolve HEAD as a valid ref." msgstr "Не може да се открие към какво сочи указателят „HEAD“" @@ -3938,7 +4173,7 @@ msgstr "командата „git status“ не може да се изпълн msgid "submodule '%s' has dirty index" msgstr "индексът на подмодула „%s“ не е чист" -#: submodule.c:1876 +#: submodule.c:1878 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -3946,18 +4181,18 @@ msgstr "" "не се поддържа „relocate_gitdir“ за подмодула „%s“, който има повече от едно " "работно дърво" -#: submodule.c:1888 submodule.c:1944 +#: submodule.c:1890 submodule.c:1946 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "името на подмодула „%s“ не може да бъде намерено" -#: submodule.c:1892 builtin/submodule--helper.c:909 -#: builtin/submodule--helper.c:919 +#: submodule.c:1894 builtin/submodule--helper.c:1246 +#: builtin/submodule--helper.c:1256 #, c-format msgid "could not create directory '%s'" msgstr "Директорията „%s“ не може да бъде създадена" -#: submodule.c:1895 +#: submodule.c:1897 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -3968,20 +4203,20 @@ msgstr "" "„%s“ към\n" "„%s“\n" -#: submodule.c:1979 +#: submodule.c:1981 #, c-format msgid "could not recurse into submodule '%s'" msgstr "неуспешна обработка на поддиректориите в подмодула „%s“" -#: submodule.c:2023 +#: submodule.c:2025 msgid "could not start ls-files in .." msgstr "„ls-stat“ не може да се стартира в „..“" -#: submodule.c:2043 +#: submodule.c:2045 msgid "BUG: returned path string doesn't match cwd?" msgstr "ГРЕШКА: полученият низ за пътя не съвпада с върнатото от „cwd“" -#: submodule.c:2062 +#: submodule.c:2064 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "„ls-tree“ завърши с неочакван изходен код: %d" @@ -4059,7 +4294,7 @@ msgstr "Клонът „%s“ ще следи „%s“ от „%s“\n" msgid "transport: invalid depth option '%s'" msgstr "transport: неправилна опция за дълбочина: %s" -#: transport.c:904 +#: transport.c:916 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -4068,7 +4303,7 @@ msgstr "" "Следните пътища за подмодули съдържат промени,\n" "които липсват от всички отдалечени хранилища:\n" -#: transport.c:908 +#: transport.c:920 #, c-format msgid "" "\n" @@ -4093,11 +4328,11 @@ msgstr "" " git push\n" "\n" -#: transport.c:916 +#: transport.c:928 msgid "Aborting." msgstr "Преустановяване на действието." -#: transport-helper.c:1074 +#: transport-helper.c:1079 #, c-format msgid "Could not read ref %s" msgstr "Указателят „%s“ не може да се прочете." @@ -4118,7 +4353,7 @@ msgstr "празно име на файл в запис в дърво" msgid "too-short tree file" msgstr "прекалено кратък файл-дърво" -#: unpack-trees.c:107 +#: unpack-trees.c:108 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -4127,7 +4362,7 @@ msgstr "" "Изтеглянето ще презапише локалните промени на тези файлове:\n" "%%sПодайте или скатайте промените, за да преминете към нов клон." -#: unpack-trees.c:109 +#: unpack-trees.c:110 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -4136,7 +4371,7 @@ msgstr "" "Изтеглянето ще презапише локалните промени на тези файлове:\n" "%%s" -#: unpack-trees.c:112 +#: unpack-trees.c:113 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4145,7 +4380,7 @@ msgstr "" "Сливането ще презапише локалните промени на тези файлове:\n" "%%sПодайте или скатайте промените, за да слеете." -#: unpack-trees.c:114 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4154,7 +4389,7 @@ msgstr "" "Сливането ще презапише локалните промени на тези файлове:\n" "%%s" -#: unpack-trees.c:117 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -4163,7 +4398,7 @@ msgstr "" "„%s“ ще презапише локалните промени на тези файлове:\n" "%%sПодайте или скатайте промените, за да извършите „%s“." -#: unpack-trees.c:119 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -4172,7 +4407,7 @@ msgstr "" "„%s“ ще презапише локалните промени на тези файлове:\n" "%%s" -#: unpack-trees.c:124 +#: unpack-trees.c:125 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -4181,7 +4416,7 @@ msgstr "" "Обновяването на следните директории ще изтрие неследените файлове в тях:\n" "%s" -#: unpack-trees.c:128 +#: unpack-trees.c:129 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -4190,7 +4425,7 @@ msgstr "" "Изтеглянето ще изтрие тези неследени файлове в работното дърво:\n" "%%sПреместете ги или ги изтрийте, за да преминете на друг клон." -#: unpack-trees.c:130 +#: unpack-trees.c:131 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -4199,7 +4434,7 @@ msgstr "" "Изтеглянето ще изтрие тези неследени файлове в работното дърво:\n" "%%s" -#: unpack-trees.c:133 +#: unpack-trees.c:134 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -4208,7 +4443,7 @@ msgstr "" "Сливането ще изтрие тези неследени файлове в работното дърво:\n" "%%sПреместете ги или ги изтрийте, за да слеете." -#: unpack-trees.c:135 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -4217,7 +4452,7 @@ msgstr "" "Сливането ще изтрие тези неследени файлове в работното дърво:\n" "%%s" -#: unpack-trees.c:138 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -4226,7 +4461,7 @@ msgstr "" "„%s“ ще изтрие тези неследени файлове в работното дърво:\n" "%%sПреместете ги или ги изтрийте, за да извършите „%s“." -#: unpack-trees.c:140 +#: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -4235,7 +4470,7 @@ msgstr "" "„%s“ ще изтрие тези неследени файлове в работното дърво:\n" "%%s" -#: unpack-trees.c:145 +#: unpack-trees.c:146 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -4245,7 +4480,7 @@ msgstr "" "Изтеглянето ще презапише тези неследени файлове в работното дърво:\n" "%%sПреместете ги или ги изтрийте, за да смените клон." -#: unpack-trees.c:147 +#: unpack-trees.c:148 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -4255,7 +4490,7 @@ msgstr "" "Изтеглянето ще презапише тези неследени файлове в работното дърво:\n" "%%s" -#: unpack-trees.c:150 +#: unpack-trees.c:151 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -4264,7 +4499,7 @@ msgstr "" "Сливането ще презапише тези неследени файлове в работното дърво:\n" "%%sПреместете ги или ги изтрийте, за да слеете." -#: unpack-trees.c:152 +#: unpack-trees.c:153 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -4273,7 +4508,7 @@ msgstr "" "Сливането ще презапише тези неследени файлове в работното дърво:\n" "%%s" -#: unpack-trees.c:155 +#: unpack-trees.c:156 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -4282,7 +4517,7 @@ msgstr "" "„%s“ ще презапише тези неследени файлове в работното дърво:\n" "%%sПреместете ги или ги изтрийте, за да извършите „%s“." -#: unpack-trees.c:157 +#: unpack-trees.c:158 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -4291,12 +4526,12 @@ msgstr "" "„%s“ ще презапише тези неследени файлове в работното дърво:\n" "%%s" -#: unpack-trees.c:164 +#: unpack-trees.c:165 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "Записът за „%s“ съвпада с този за „%s“. Не може да се присвои." -#: unpack-trees.c:167 +#: unpack-trees.c:168 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" @@ -4306,7 +4541,7 @@ msgstr "" "актуални:\n" "%s" -#: unpack-trees.c:169 +#: unpack-trees.c:170 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -4317,7 +4552,7 @@ msgstr "" "дърво:\n" "%s" -#: unpack-trees.c:171 +#: unpack-trees.c:172 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -4328,7 +4563,7 @@ msgstr "" "дърво:\n" "%s" -#: unpack-trees.c:173 +#: unpack-trees.c:174 #, c-format msgid "" "Cannot update submodule:\n" @@ -4337,12 +4572,12 @@ msgstr "" "Подмодулът не може да бъде обновен:\n" "„%s“" -#: unpack-trees.c:250 +#: unpack-trees.c:251 #, c-format msgid "Aborting\n" msgstr "Преустановяване на действието\n" -#: unpack-trees.c:332 +#: unpack-trees.c:333 msgid "Checking out files" msgstr "Изтегляне на файлове" @@ -4375,18 +4610,44 @@ msgstr "неправилен номер на порт" msgid "invalid '..' path segment" msgstr "неправилна част от пътя „..“" -#: worktree.c:245 +#: worktree.c:245 builtin/am.c:2147 #, c-format msgid "failed to read '%s'" msgstr "„%s“ не може да бъде прочетен" +#: worktree.c:291 +#, c-format +msgid "'%s' at main working tree is not the repository directory" +msgstr "„%s“ в основното работно дърво не е директорията на хранилището" + +#: worktree.c:302 +#, c-format +msgid "'%s' file does not contain absolute path to the working tree location" +msgstr "" +"файлът „%s“ не съдържа абсолютния път към местоположението на работното дърво" + +#: worktree.c:314 +#, c-format +msgid "'%s' does not exist" +msgstr "„%s“ не съществува." + +#: worktree.c:320 +#, c-format +msgid "'%s' is not a .git file, error code %d" +msgstr "„%s“ не е файл на .git, код за грешка: %d" + +#: worktree.c:328 +#, c-format +msgid "'%s' does not point back to '%s'" +msgstr "„%s“ не сочи към обратно към „%s“" + #: wrapper.c:223 wrapper.c:393 #, c-format msgid "could not open '%s' for reading and writing" msgstr "„%s“ не може да бъде отворен и за четене, и за запис" #: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770 -#: builtin/am.c:862 builtin/merge.c:1043 +#: builtin/am.c:862 builtin/merge.c:1044 #, c-format msgid "could not open '%s' for reading" msgstr "файлът не може да бъде прочетен: „%s“" @@ -4400,161 +4661,161 @@ msgstr "няма достъп до „%s“" msgid "unable to get current working directory" msgstr "текущата работна директория е недостъпна" -#: wt-status.c:150 +#: wt-status.c:151 msgid "Unmerged paths:" msgstr "Неслети пътища:" -#: wt-status.c:177 wt-status.c:204 +#: wt-status.c:178 wt-status.c:205 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (използвайте „git reset %s ФАЙЛ…“, за да извадите ФАЙЛа от индекса)" -#: wt-status.c:179 wt-status.c:206 +#: wt-status.c:180 wt-status.c:207 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr "" " (използвайте „git rm --cached %s ФАЙЛ…“, за да извадите ФАЙЛа от индекса)" -#: wt-status.c:183 +#: wt-status.c:184 msgid " (use \"git add <file>...\" to mark resolution)" msgstr "" " (използвайте „git add ФАЙЛ…“, за да укажете разрешаването на конфликта)" -#: wt-status.c:185 wt-status.c:189 +#: wt-status.c:186 wt-status.c:190 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" " (използвайте „git add/rm ФАЙЛ…“, според решението, което избирате за " "конфликта)" -#: wt-status.c:187 +#: wt-status.c:188 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" " (използвайте „git rm ФАЙЛ…“, за да укажете разрешаването на конфликта)" -#: wt-status.c:198 wt-status.c:984 +#: wt-status.c:199 wt-status.c:1007 msgid "Changes to be committed:" msgstr "Промени, които ще бъдат подадени:" -#: wt-status.c:216 wt-status.c:993 +#: wt-status.c:217 wt-status.c:1016 msgid "Changes not staged for commit:" msgstr "Промени, които не са в индекса за подаване:" -#: wt-status.c:220 +#: wt-status.c:221 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" " (използвайте „git add ФАЙЛ…“, за да обновите съдържанието за подаване)" -#: wt-status.c:222 +#: wt-status.c:223 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" " (използвайте „git add/rm ФАЙЛ…“, за да обновите съдържанието за подаване)" -#: wt-status.c:223 +#: wt-status.c:224 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (използвайте „git checkout -- ФАЙЛ…“, за да отхвърлите промените в " "работното дърво)" -#: wt-status.c:225 +#: wt-status.c:226 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (подайте или отхвърлете неследеното или промененото съдържание в " "подмодулите)" -#: wt-status.c:237 +#: wt-status.c:238 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (използвайте „git %s ФАЙЛ…“, за да определите какво включвате в подаването)" -#: wt-status.c:252 +#: wt-status.c:253 msgid "both deleted:" msgstr "изтрити в двата случая:" -#: wt-status.c:254 +#: wt-status.c:255 msgid "added by us:" msgstr "добавени от вас:" -#: wt-status.c:256 +#: wt-status.c:257 msgid "deleted by them:" msgstr "изтрити от тях:" -#: wt-status.c:258 +#: wt-status.c:259 msgid "added by them:" msgstr "добавени от тях:" -#: wt-status.c:260 +#: wt-status.c:261 msgid "deleted by us:" msgstr "изтрити от вас:" -#: wt-status.c:262 +#: wt-status.c:263 msgid "both added:" msgstr "добавени и в двата случая:" -#: wt-status.c:264 +#: wt-status.c:265 msgid "both modified:" msgstr "променени и в двата случая:" -#: wt-status.c:274 +#: wt-status.c:275 msgid "new file:" msgstr "нов файл:" -#: wt-status.c:276 +#: wt-status.c:277 msgid "copied:" msgstr "копиран:" -#: wt-status.c:278 +#: wt-status.c:279 msgid "deleted:" msgstr "изтрит:" -#: wt-status.c:280 +#: wt-status.c:281 msgid "modified:" msgstr "променен:" -#: wt-status.c:282 +#: wt-status.c:283 msgid "renamed:" msgstr "преименуван:" -#: wt-status.c:284 +#: wt-status.c:285 msgid "typechange:" msgstr "смяна на вида:" -#: wt-status.c:286 +#: wt-status.c:287 msgid "unknown:" msgstr "непозната промяна:" -#: wt-status.c:288 +#: wt-status.c:289 msgid "unmerged:" msgstr "неслят:" -#: wt-status.c:370 +#: wt-status.c:369 msgid "new commits, " msgstr "нови подавания, " -#: wt-status.c:372 +#: wt-status.c:371 msgid "modified content, " msgstr "променено съдържание, " -#: wt-status.c:374 +#: wt-status.c:373 msgid "untracked content, " msgstr "неследено съдържание, " -#: wt-status.c:824 +#: wt-status.c:847 #, 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:856 +#: wt-status.c:879 msgid "Submodules changed but not updated:" msgstr "Подмодулите са променени, но не са обновени:" -#: wt-status.c:858 +#: wt-status.c:881 msgid "Submodule changes to be committed:" msgstr "Промени в подмодулите за подаване:" -#: wt-status.c:940 +#: wt-status.c:963 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -4562,241 +4823,241 @@ msgstr "" "Не променяйте и не изтривайте горния ред.\n" "Всичко отдолу ще бъде изтрито." -#: wt-status.c:1053 +#: wt-status.c:1076 msgid "You have unmerged paths." msgstr "Някои пътища не са слети." -#: wt-status.c:1056 +#: wt-status.c:1079 msgid " (fix conflicts and run \"git commit\")" msgstr " (коригирайте конфликтите и изпълнете „git commit“)" -#: wt-status.c:1058 +#: wt-status.c:1081 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (използвайте „git merge --abort“, за да преустановите сливането)" -#: wt-status.c:1063 +#: wt-status.c:1086 msgid "All conflicts fixed but you are still merging." msgstr "Всички конфликти са решени, но продължавате сливането." -#: wt-status.c:1066 +#: wt-status.c:1089 msgid " (use \"git commit\" to conclude merge)" msgstr " (използвайте „git commit“, за да завършите сливането)" -#: wt-status.c:1076 +#: wt-status.c:1099 msgid "You are in the middle of an am session." msgstr "В момента прилагате поредица от кръпки чрез „git am“." -#: wt-status.c:1079 +#: wt-status.c:1102 msgid "The current patch is empty." msgstr "Текущата кръпка е празна." -#: wt-status.c:1083 +#: wt-status.c:1106 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (коригирайте конфликтите и изпълнете „git am --continue“)" -#: wt-status.c:1085 +#: wt-status.c:1108 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (използвайте „git am --skip“, за да пропуснете тази кръпка)" -#: wt-status.c:1087 +#: wt-status.c:1110 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" " (използвайте „git am --abort“, за да възстановите първоначалния клон)" -#: wt-status.c:1219 +#: wt-status.c:1242 msgid "git-rebase-todo is missing." msgstr "„git-rebase-todo“ липсва." -#: wt-status.c:1221 +#: wt-status.c:1244 msgid "No commands done." msgstr "Не са изпълнени команди." -#: wt-status.c:1224 +#: wt-status.c:1247 #, 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:1235 +#: wt-status.c:1258 #, c-format msgid " (see more in file %s)" msgstr " повече информация има във файла „%s“)" -#: wt-status.c:1240 +#: wt-status.c:1263 msgid "No commands remaining." msgstr "Не остават повече команди." -#: wt-status.c:1243 +#: wt-status.c:1266 #, 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:1251 +#: wt-status.c:1274 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr "" " (използвайте „git rebase --edit-todo“, за да разгледате и редактирате)" -#: wt-status.c:1264 +#: wt-status.c:1287 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "В момента пребазирате клона „%s“ върху „%s“." -#: wt-status.c:1269 +#: wt-status.c:1292 msgid "You are currently rebasing." msgstr "В момента пребазирате." -#: wt-status.c:1283 +#: wt-status.c:1306 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (коригирайте конфликтите и използвайте „git rebase --continue“)" -#: wt-status.c:1285 +#: wt-status.c:1308 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (използвайте „git rebase --skip“, за да пропуснете тази кръпка)" -#: wt-status.c:1287 +#: wt-status.c:1310 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" " (използвайте „git rebase --abort“, за да възстановите първоначалния клон)" -#: wt-status.c:1293 +#: wt-status.c:1316 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (всички конфликти са коригирани: изпълнете „git rebase --continue“)" -#: wt-status.c:1297 +#: wt-status.c:1320 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "В момента разделяте подаване докато пребазирате клона „%s“ върху „%s“." -#: wt-status.c:1302 +#: wt-status.c:1325 msgid "You are currently splitting a commit during a rebase." msgstr "В момента разделяте подаване докато пребазирате." -#: wt-status.c:1305 +#: wt-status.c:1328 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (След като работното ви дърво стане чисто, използвайте „git rebase --" "continue“)" -#: wt-status.c:1309 +#: wt-status.c:1332 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "В момента редактирате подаване докато пребазирате клона „%s“ върху „%s“." -#: wt-status.c:1314 +#: wt-status.c:1337 msgid "You are currently editing a commit during a rebase." msgstr "В момента редактирате подаване докато пребазирате." -#: wt-status.c:1317 +#: wt-status.c:1340 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" " (използвайте „git commit --amend“, за да редактирате текущото подаване)" -#: wt-status.c:1319 +#: wt-status.c:1342 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (използвайте „git rebase --continue“, след като завършите промените си)" -#: wt-status.c:1329 +#: wt-status.c:1352 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "В момента отбирате подаването „%s“." -#: wt-status.c:1334 +#: wt-status.c:1357 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (коригирайте конфликтите и изпълнете „git cherry-pick --continue“)" -#: wt-status.c:1337 +#: wt-status.c:1360 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (всички конфликти са коригирани, изпълнете „git cherry-pick --continue“)" -#: wt-status.c:1339 +#: wt-status.c:1362 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (използвайте „git cherry-pick --abort“, за да отмените всички действия с " "отбиране)" -#: wt-status.c:1348 +#: wt-status.c:1371 #, c-format msgid "You are currently reverting commit %s." msgstr "В момента отменяте подаване „%s“." -#: wt-status.c:1353 +#: wt-status.c:1376 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (коригирайте конфликтите и изпълнете „git revert --continue“)" -#: wt-status.c:1356 +#: wt-status.c:1379 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (всички конфликти са коригирани, изпълнете „git revert --continue“)" -#: wt-status.c:1358 +#: wt-status.c:1381 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" " (използвайте „git revert --abort“, за да преустановите отмяната на " "подаване)" -#: wt-status.c:1369 +#: wt-status.c:1392 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "В момента търсите двоично, като сте стартирали от клон „%s“." -#: wt-status.c:1373 +#: wt-status.c:1396 msgid "You are currently bisecting." msgstr "В момента търсите двоично." -#: wt-status.c:1376 +#: wt-status.c:1399 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" " (използвайте „git bisect reset“, за да се върнете към първоначалното " "състояние и клон)" -#: wt-status.c:1573 +#: wt-status.c:1596 msgid "On branch " msgstr "На клон " -#: wt-status.c:1579 +#: wt-status.c:1602 msgid "interactive rebase in progress; onto " msgstr "извършвате интерактивно пребазиране върху " -#: wt-status.c:1581 +#: wt-status.c:1604 msgid "rebase in progress; onto " msgstr "извършвате пребазиране върху " -#: wt-status.c:1586 +#: wt-status.c:1609 msgid "HEAD detached at " msgstr "Указателят „HEAD“ не е свързан и е при " -#: wt-status.c:1588 +#: wt-status.c:1611 msgid "HEAD detached from " msgstr "Указателят „HEAD“ не е свързан и е отделѐн от " -#: wt-status.c:1591 +#: wt-status.c:1614 msgid "Not currently on any branch." msgstr "Извън всички клони." -#: wt-status.c:1611 +#: wt-status.c:1634 msgid "Initial commit" msgstr "Първоначално подаване" -#: wt-status.c:1612 +#: wt-status.c:1635 msgid "No commits yet" msgstr "Все още липсват подавания" -#: wt-status.c:1626 +#: wt-status.c:1649 msgid "Untracked files" msgstr "Неследени файлове" -#: wt-status.c:1628 +#: wt-status.c:1651 msgid "Ignored files" msgstr "Игнорирани файлове" -#: wt-status.c:1632 +#: wt-status.c:1655 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -4808,32 +5069,32 @@ msgstr "" "изпълнението, но не трябва да забравяте ръчно да добавяте новите файлове.\n" "За повече подробности погледнете „git status help“." -#: wt-status.c:1638 +#: wt-status.c:1661 #, c-format msgid "Untracked files not listed%s" msgstr "Неследените файлове не са изведени%s" -#: wt-status.c:1640 +#: wt-status.c:1663 msgid " (use -u option to show untracked files)" msgstr " (използвайте опцията „-u“, за да изведете неследените файлове)" -#: wt-status.c:1646 +#: wt-status.c:1669 msgid "No changes" msgstr "Няма промени" -#: wt-status.c:1651 +#: wt-status.c:1674 #, 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:1654 +#: wt-status.c:1677 #, c-format msgid "no changes added to commit\n" msgstr "към индекса за подаване не са добавени промени\n" -#: wt-status.c:1657 +#: wt-status.c:1680 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -4842,67 +5103,71 @@ msgstr "" "към индекса за подаване не са добавени промени, но има нови файлове " "(използвайте „git add“, за да започне тяхното следене)\n" -#: wt-status.c:1660 +#: wt-status.c:1683 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "към индекса за подаване не са добавени промени, но има нови файлове\n" -#: wt-status.c:1663 +#: wt-status.c:1686 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "липсват каквито и да е промени (създайте или копирайте файлове и използвайте " "„git add“, за да започне тяхното следене)\n" -#: wt-status.c:1666 wt-status.c:1671 +#: wt-status.c:1689 wt-status.c:1694 #, c-format msgid "nothing to commit\n" msgstr "липсват каквито и да е промени\n" -#: wt-status.c:1669 +#: wt-status.c:1692 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "липсват каквито и да е промени (използвайте опцията „-u“, за да се изведат и " "неследените файлове)\n" -#: wt-status.c:1673 +#: wt-status.c:1696 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "липсват каквито и да е промени, работното дърво е чисто\n" -#: wt-status.c:1785 +#: wt-status.c:1809 msgid "No commits yet on " msgstr "Все още липсват подавания в " -#: wt-status.c:1789 +#: wt-status.c:1813 msgid "HEAD (no branch)" msgstr "HEAD (извън клон)" -#: wt-status.c:1818 wt-status.c:1826 +#: wt-status.c:1844 +msgid "different" +msgstr "различен" + +#: wt-status.c:1846 wt-status.c:1854 msgid "behind " msgstr "назад с " -#: wt-status.c:1821 wt-status.c:1824 +#: wt-status.c:1849 wt-status.c:1852 msgid "ahead " msgstr "напред с " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2318 +#: wt-status.c:2358 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "не може да извършите „%s“, защото има промени, които не са в индекса." -#: wt-status.c:2324 +#: wt-status.c:2364 msgid "additionally, your index contains uncommitted changes." msgstr "освен това в индекса има неподадени промени." -#: wt-status.c:2326 +#: wt-status.c:2366 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "не може да извършите „%s“, защото в индекса има неподадени промени." -#: compat/precompose_utf8.c:58 builtin/clone.c:437 +#: compat/precompose_utf8.c:58 builtin/clone.c:440 #, c-format msgid "failed to unlink '%s'" msgstr "неуспешно изтриване на „%s“" @@ -4916,7 +5181,7 @@ msgstr "git add [ОПЦИЯ…] [--] ПЪТ…" msgid "unexpected diff status %c" msgstr "неочакван изходен код при генериране на разлика: %c" -#: builtin/add.c:88 builtin/commit.c:291 +#: builtin/add.c:88 builtin/commit.c:257 msgid "updating files failed" msgstr "неуспешно обновяване на файловете" @@ -4965,7 +5230,7 @@ msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Следните пътища ще бъдат игнорирани според някой от файловете „.gitignore“:\n" -#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124 +#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:146 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" @@ -4975,7 +5240,7 @@ msgstr "пробно изпълнение" msgid "interactive picking" msgstr "интерактивно отбиране на промени" -#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310 +#: builtin/add.c:295 builtin/checkout.c:1128 builtin/reset.c:302 msgid "select hunks interactively" msgstr "интерактивен избор на парчета код" @@ -5104,10 +5369,10 @@ msgstr "Нищо не е зададено и нищо не е добавено.\ msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Вероятно искахте да използвате „git add .“?\n" -#: 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 +#: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:280 +#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:316 +#: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241 +#: builtin/rm.c:271 builtin/submodule--helper.c:326 msgid "index file corrupt" msgstr "файлът с индекса е повреден" @@ -5160,59 +5425,59 @@ msgstr "неправилно отместване на часовия пояс" msgid "Patch format detection failed." msgstr "Форматът на кръпката не може да бъде определен." -#: builtin/am.c:1013 builtin/clone.c:402 +#: builtin/am.c:1013 builtin/clone.c:405 #, c-format msgid "failed to create directory '%s'" msgstr "директорията „%s“ не може да бъде създадена" -#: builtin/am.c:1017 +#: builtin/am.c:1018 msgid "Failed to split patches." msgstr "Кръпките не могат да бъдат разделени." -#: builtin/am.c:1146 builtin/commit.c:376 +#: builtin/am.c:1148 builtin/commit.c:342 msgid "unable to write index file" msgstr "индексът не може да бъде записан" -#: builtin/am.c:1160 +#: builtin/am.c:1162 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "След коригирането на този проблем изпълнете „%s --continue“." -#: builtin/am.c:1161 +#: builtin/am.c:1163 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Ако предпочитате да прескочите тази кръпка, изпълнете „%s --skip“." -#: builtin/am.c:1162 +#: builtin/am.c:1164 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "За да се върнете към първоначалното състояние, изпълнете „%s --abort“." -#: builtin/am.c:1269 +#: builtin/am.c:1271 msgid "Patch is empty." msgstr "Кръпката е празна." -#: builtin/am.c:1335 +#: builtin/am.c:1337 #, c-format msgid "invalid ident line: %.*s" msgstr "грешен ред с идентичност: %.*s" -#: builtin/am.c:1357 +#: builtin/am.c:1359 #, c-format msgid "unable to parse commit %s" msgstr "подаването не може да бъде анализирано: %s" -#: builtin/am.c:1550 +#: builtin/am.c:1554 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "В хранилището липсват необходимите обекти BLOB, за да се премине към тройно " "сливане." -#: builtin/am.c:1552 +#: builtin/am.c:1556 msgid "Using index info to reconstruct a base tree..." msgstr "Базовото дърво се реконструира от информацията в индекса…" -#: builtin/am.c:1571 +#: builtin/am.c:1575 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -5220,39 +5485,30 @@ msgstr "" "Кръпката не може да се приложи към обектите BLOB в индекса.\n" "Да не би да сте я редактирали на ръка?" -#: builtin/am.c:1577 +#: builtin/am.c:1581 msgid "Falling back to patching base and 3-way merge..." msgstr "Преминаване към прилагане на кръпка към базата и тройно сливане…" -#: builtin/am.c:1602 +#: builtin/am.c:1606 msgid "Failed to merge in the changes." msgstr "Неуспешно сливане на промените." -#: builtin/am.c:1626 builtin/merge.c:642 -msgid "git write-tree failed to write a tree" -msgstr "Командата „git write-tree“ не успя да запише обект-дърво" - -#: builtin/am.c:1633 +#: builtin/am.c:1637 msgid "applying to an empty history" msgstr "прилагане върху празна история" -#: builtin/am.c:1646 builtin/commit.c:1798 builtin/merge.c:825 -#: builtin/merge.c:850 -msgid "failed to write commit object" -msgstr "обектът за подаването не може да бъде записан" - -#: builtin/am.c:1679 builtin/am.c:1683 +#: builtin/am.c:1683 builtin/am.c:1687 #, c-format msgid "cannot resume: %s does not exist." msgstr "не може да се продължи — „%s“ не съществува." -#: builtin/am.c:1699 +#: builtin/am.c:1703 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "За интерактивно изпълнение е необходимо стандартният\n" "вход да е свързан с терминал, а в момента не е." -#: builtin/am.c:1704 +#: builtin/am.c:1708 msgid "Commit Body is:" msgstr "Тялото на кръпката за прилагане е:" @@ -5260,38 +5516,39 @@ msgstr "Тялото на кръпката за прилагане е:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1714 +#: builtin/am.c:1718 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" "Прилагане? „y“ — да/„n“ — не/„e“ — редактиране/„v“ — преглед/„a“ — приемане " "на всичко:" -#: builtin/am.c:1764 +#: builtin/am.c:1768 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "" "Индексът не е чист: кръпките не могат да бъдат приложени (замърсени са: %s)" -#: builtin/am.c:1804 builtin/am.c:1876 +#: builtin/am.c:1808 builtin/am.c:1879 #, c-format msgid "Applying: %.*s" msgstr "Прилагане: %.*s" -#: builtin/am.c:1820 +#: builtin/am.c:1824 msgid "No changes -- Patch already applied." msgstr "Без промени — кръпката вече е приложена." -#: builtin/am.c:1828 +#: builtin/am.c:1832 #, c-format msgid "Patch failed at %s %.*s" msgstr "Неуспешно прилагане на кръпка при %s %.*s“" -#: builtin/am.c:1834 -#, c-format -msgid "The copy of the patch that failed is found in: %s" -msgstr "Дубликат на проблемната кръпка се намира в: %s" +#: builtin/am.c:1838 +msgid "Use 'git am --show-current-patch' to see the failed patch" +msgstr "" +"За да видите неуспешно приложени кръпки, използвайте опцията „git am --show-" +"current-patch“ to see the failed patch" -#: builtin/am.c:1879 +#: builtin/am.c:1882 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -5301,7 +5558,7 @@ msgstr "" "Ако няма друга промяна за включване в индекса, най-вероятно някоя друга\n" "кръпка е довела до същите промени и в такъв случай просто пропуснете тази." -#: builtin/am.c:1886 +#: builtin/am.c:1889 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -5312,17 +5569,17 @@ msgstr "" "След корекция на конфликтите изпълнете „git add“ върху поправените файлове.\n" "За да приемете „изтрити от тях“, изпълнете „git rm“ върху изтритите файлове." -#: builtin/am.c:1993 builtin/am.c:1997 builtin/am.c:2009 builtin/reset.c:332 -#: builtin/reset.c:340 +#: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324 +#: builtin/reset.c:332 #, c-format msgid "Could not parse object '%s'." msgstr "„%s“ не е разпознат като обект." -#: builtin/am.c:2045 +#: builtin/am.c:2048 msgid "failed to clean index" msgstr "индексът не може да бъде изчистен" -#: builtin/am.c:2080 +#: builtin/am.c:2083 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -5333,138 +5590,147 @@ msgstr "" "сочи към\n" "„ORIG_HEAD“" -#: builtin/am.c:2143 +#: builtin/am.c:2174 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Неправилна стойност за „--patch-format“: „%s“" -#: builtin/am.c:2176 +#: builtin/am.c:2210 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [ОПЦИЯ…] [(ФАЙЛ_С_ПОЩА|ДИРЕКТОРИЯ_С_ПОЩА)…]" -#: builtin/am.c:2177 +#: builtin/am.c:2211 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [ОПЦИЯ…] (--continue | --quit | --abort)" -#: builtin/am.c:2183 +#: builtin/am.c:2217 msgid "run interactively" msgstr "интерактивна работа" -#: builtin/am.c:2185 +#: builtin/am.c:2219 msgid "historical option -- no-op" msgstr "изоставена опция, съществува по исторически причини, нищо не прави" -#: builtin/am.c:2187 +#: builtin/am.c:2221 msgid "allow fall back on 3way merging if needed" msgstr "да се преминава към тройно сливане при нужда." -#: builtin/am.c:2188 builtin/init-db.c:484 builtin/prune-packed.c:57 -#: builtin/repack.c:180 +#: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57 +#: builtin/repack.c:182 msgid "be quiet" msgstr "без извеждане на информация" -#: builtin/am.c:2190 +#: builtin/am.c:2224 msgid "add a Signed-off-by line to the commit message" msgstr "добавяне на ред за подпис „Signed-off-by“ в съобщението за подаване" -#: builtin/am.c:2193 +#: builtin/am.c:2227 msgid "recode into utf8 (default)" msgstr "прекодиране в UTF-8 (стандартно)" -#: builtin/am.c:2195 +#: builtin/am.c:2229 msgid "pass -k flag to git-mailinfo" msgstr "подаване на опцията „-k“ на командата „git-mailinfo“" -#: builtin/am.c:2197 +#: builtin/am.c:2231 msgid "pass -b flag to git-mailinfo" msgstr "подаване на опцията „-b“ на командата „git-mailinfo“" -#: builtin/am.c:2199 +#: builtin/am.c:2233 msgid "pass -m flag to git-mailinfo" msgstr "подаване на опцията „-m“ на командата „git-mailinfo“" -#: builtin/am.c:2201 +#: builtin/am.c:2235 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "" "подаване на опцията „--keep-cr“ на командата „git-mailsplit“ за формат „mbox“" -#: builtin/am.c:2204 +#: builtin/am.c:2238 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "без подаване на опцията „--keep-cr“ на командата „git-mailsplit“ независимо " "от „am.keepcr“" -#: builtin/am.c:2207 +#: builtin/am.c:2241 msgid "strip everything before a scissors line" msgstr "пропускане на всичко преди реда за отрязване" -#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218 -#: builtin/am.c:2221 builtin/am.c:2224 builtin/am.c:2227 builtin/am.c:2230 -#: builtin/am.c:2236 +#: builtin/am.c:2243 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:2270 msgid "pass it through git-apply" msgstr "прекарване през „git-apply“" -#: builtin/am.c:2226 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 +#: builtin/am.c:2260 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668 +#: builtin/grep.c:853 builtin/merge.c:206 builtin/pull.c:145 builtin/pull.c:203 +#: builtin/repack.c:191 builtin/repack.c:195 builtin/repack.c:197 +#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:382 +#: parse-options.h:144 parse-options.h:146 parse-options.h:257 msgid "n" msgstr "БРОЙ" -#: builtin/am.c:2232 builtin/branch.c:629 builtin/for-each-ref.c:38 -#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39 +#: builtin/am.c:2266 builtin/branch.c:629 builtin/for-each-ref.c:38 +#: builtin/replace.c:445 builtin/tag.c:418 builtin/verify-tag.c:39 msgid "format" msgstr "ФОРМАТ" -#: builtin/am.c:2233 +#: builtin/am.c:2267 msgid "format the patch(es) are in" msgstr "формат на кръпките" -#: builtin/am.c:2239 +#: builtin/am.c:2273 msgid "override error message when patch failure occurs" msgstr "избрано от вас съобщение за грешка при прилагане на кръпки" -#: builtin/am.c:2241 +#: builtin/am.c:2275 msgid "continue applying patches after resolving a conflict" msgstr "продължаване на прилагането на кръпки след коригирането на конфликт" -#: builtin/am.c:2244 +#: builtin/am.c:2278 msgid "synonyms for --continue" msgstr "синоними на „--continue“" -#: builtin/am.c:2247 +#: builtin/am.c:2281 msgid "skip the current patch" msgstr "прескачане на текущата кръпка" -#: builtin/am.c:2250 +#: builtin/am.c:2284 msgid "restore the original branch and abort the patching operation." msgstr "" "възстановяване на първоначалното състояние на клона и преустановяване на " "прилагането на кръпката." -#: builtin/am.c:2254 +#: builtin/am.c:2287 +msgid "abort the patching operation but keep HEAD where it is." +msgstr "" +"преустановяване на прилагането на кръпката без промяна към кое сочи „HEAD“." + +#: builtin/am.c:2290 +msgid "show the patch being applied." +msgstr "показване на прилаганата кръпка." + +#: builtin/am.c:2294 msgid "lie about committer date" msgstr "дата за подаване различна от първоначалната" -#: builtin/am.c:2256 +#: builtin/am.c:2296 msgid "use current timestamp for author date" msgstr "използване на текущото време като това за автор" -#: builtin/am.c:2258 builtin/commit.c:1636 builtin/merge.c:236 -#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392 +#: builtin/am.c:2298 builtin/commit.c:1431 builtin/merge.c:237 +#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:398 msgid "key-id" msgstr "ИДЕНТИФИКАТОР_НА_КЛЮЧ" -#: builtin/am.c:2259 +#: builtin/am.c:2299 msgid "GPG-sign commits" msgstr "подписване на подаванията с GPG" -#: builtin/am.c:2262 +#: builtin/am.c:2302 msgid "(internal use for git-rebase)" msgstr "(ползва се вътрешно за „git-rebase“)" -#: builtin/am.c:2280 +#: builtin/am.c:2320 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." @@ -5472,18 +5738,18 @@ msgstr "" "Опциите „-b“/„--binary“ отдавна не правят нищо и\n" "ще бъдат премахнати в бъдеще. Не ги ползвайте." -#: builtin/am.c:2287 +#: builtin/am.c:2327 msgid "failed to read the index" msgstr "неуспешно изчитане на индекса" -#: builtin/am.c:2302 +#: builtin/am.c:2342 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" "предишната директория за пребазиране „%s“ все още съществува, а е зададен " "файл „mbox“." -#: builtin/am.c:2326 +#: builtin/am.c:2366 #, c-format msgid "" "Stray %s directory found.\n" @@ -5492,7 +5758,7 @@ msgstr "" "Открита е излишна директория „%s“.\n" "Можете да я изтриете с командата „git am --abort“." -#: builtin/am.c:2332 +#: builtin/am.c:2372 msgid "Resolve operation not in progress, we are not resuming." msgstr "В момента не тече операция по коригиране и няма как да се продължи." @@ -5514,8 +5780,9 @@ msgid "git archive: Remote with no URL" msgstr "git archive: Липсва адрес за отдалеченото хранилище" #: builtin/archive.c:58 -msgid "git archive: expected ACK/NAK, got EOF" -msgstr "git archive: очакваше се „ACK“/„NAK“, а бе получен „EOF“" +msgid "git archive: expected ACK/NAK, got a flush packet" +msgstr "" +"git archive: очакваше се „ACK“/„NAK“, а бе получен изчистващ пакет „flush“" #: builtin/archive.c:61 #, c-format @@ -5602,125 +5869,125 @@ msgstr "git blame [ОПЦИЯ…] [ОПЦИЯ_ЗА_ВЕРСИЯТА…] [ВЕР msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "ОПЦИИте_ЗА_ВЕРСИЯТА са документирани в ръководството git-rev-list(1)" -#: builtin/blame.c:668 +#: builtin/blame.c:677 msgid "Show blame entries as we find them, incrementally" msgstr "Извеждане на анотациите с намирането им, последователно" -#: builtin/blame.c:669 +#: builtin/blame.c:678 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" "Извеждане на празни суми по SHA1 за граничните подавания (стандартно опцията " "е изключена)" -#: builtin/blame.c:670 +#: builtin/blame.c:679 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" "Началните подавания да не се считат за гранични (стандартно опцията е " "изключена)" -#: builtin/blame.c:671 +#: builtin/blame.c:680 msgid "Show work cost statistics" msgstr "Извеждане на статистика за извършените действия" -#: builtin/blame.c:672 +#: builtin/blame.c:681 msgid "Force progress reporting" msgstr "Принудително извеждане на напредъка" -#: builtin/blame.c:673 +#: builtin/blame.c:682 msgid "Show output score for blame entries" msgstr "Извеждане на допълнителна информация за определянето на анотациите" -#: builtin/blame.c:674 +#: builtin/blame.c:683 msgid "Show original filename (Default: auto)" msgstr "" "Извеждане на първоначалното име на файл (стандартно това е автоматично)" -#: builtin/blame.c:675 +#: builtin/blame.c:684 msgid "Show original linenumber (Default: off)" msgstr "" "Извеждане на първоначалният номер на ред (стандартно опцията е изключена)" -#: builtin/blame.c:676 +#: builtin/blame.c:685 msgid "Show in a format designed for machine consumption" msgstr "Извеждане във формат за по-нататъшна обработка" -#: builtin/blame.c:677 +#: builtin/blame.c:686 msgid "Show porcelain format with per-line commit information" msgstr "" "Извеждане във формат за команди от потребителско ниво с информация на всеки " "ред" -#: builtin/blame.c:678 +#: builtin/blame.c:687 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" "Използване на същия формат като „git-annotate“ (стандартно опцията е " "изключена)" -#: builtin/blame.c:679 +#: builtin/blame.c:688 msgid "Show raw timestamp (Default: off)" msgstr "Извеждане на неформатирани времена (стандартно опцията е изключена)" -#: builtin/blame.c:680 +#: builtin/blame.c:689 msgid "Show long commit SHA1 (Default: off)" msgstr "Извеждане на пълните суми по SHA1 (стандартно опцията е изключена)" -#: builtin/blame.c:681 +#: builtin/blame.c:690 msgid "Suppress author name and timestamp (Default: off)" msgstr "Без име на автор и време на промяна (стандартно опцията е изключена)" -#: builtin/blame.c:682 +#: builtin/blame.c:691 msgid "Show author email instead of name (Default: off)" msgstr "" "Извеждане на е-пощата на автора, а не името му (стандартно опцията е " "изключена)" -#: builtin/blame.c:683 +#: builtin/blame.c:692 msgid "Ignore whitespace differences" msgstr "Без разлики в знаците за интервали" -#: builtin/blame.c:690 +#: builtin/blame.c:699 msgid "Use an experimental heuristic to improve diffs" msgstr "Подобряване на разликите чрез експериментална евристика" -#: builtin/blame.c:692 +#: builtin/blame.c:701 msgid "Spend extra cycles to find better match" msgstr "Допълнителни изчисления за по-добри резултати" -#: builtin/blame.c:693 +#: builtin/blame.c:702 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Изчитане на версиите от ФАЙЛ, а не чрез изпълнение на „git-rev-list“" -#: builtin/blame.c:694 +#: builtin/blame.c:703 msgid "Use <file>'s contents as the final image" msgstr "Използване на съдържанието на ФАЙЛа като крайно положение" -#: builtin/blame.c:695 builtin/blame.c:696 +#: builtin/blame.c:704 builtin/blame.c:705 msgid "score" msgstr "напасване на редовете" -#: builtin/blame.c:695 +#: builtin/blame.c:704 msgid "Find line copies within and across files" msgstr "" "Търсене на копирани редове както в рамките на един файл, така и от един файл " "към друг" -#: builtin/blame.c:696 +#: builtin/blame.c:705 msgid "Find line movements within and across files" msgstr "" "Търсене на преместени редове както в рамките на един файл, така и от един " "файл към друг" -#: builtin/blame.c:697 +#: builtin/blame.c:706 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:697 +#: builtin/blame.c:706 msgid "Process only line range n,m, counting from 1" msgstr "" "Информация само за редовете в диапазона от n до m включително. Броенето " "започва от 1" -#: builtin/blame.c:744 +#: builtin/blame.c:753 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "опцията „--progress“ е несъвместима с „--incremental“ и форма̀та на командите " @@ -5734,18 +6001,18 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:795 +#: builtin/blame.c:804 msgid "4 years, 11 months ago" msgstr "преди 4 години и 11 месеца" -#: builtin/blame.c:882 +#: builtin/blame.c:890 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "има само %2$lu ред във файла „%1$s“" msgstr[1] "има само %2$lu реда във файла „%1$s“" -#: builtin/blame.c:928 +#: builtin/blame.c:936 msgid "Blaming lines" msgstr "Анотирани редове" @@ -6037,17 +6304,17 @@ msgstr "извеждане само на неслетите клони" msgid "list branches in columns" msgstr "извеждане по колони" -#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405 +#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:411 msgid "key" msgstr "КЛЮЧ" -#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406 +#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:412 msgid "field name to sort on" msgstr "име на полето, по което да е подредбата" #: 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 +#: builtin/tag.c:414 msgid "object" msgstr "ОБЕКТ" @@ -6055,16 +6322,16 @@ msgstr "ОБЕКТ" msgid "print only branches of the object" msgstr "извеждане само на клоните на ОБЕКТА" -#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415 +#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:421 msgid "sorting and filtering are case insensitive" msgstr "подредбата и филтрирането третират еднакво малките и главните букви" -#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413 +#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:419 #: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "ФОРМАТ за изхода" -#: builtin/branch.c:652 builtin/clone.c:730 +#: builtin/branch.c:652 builtin/clone.c:735 msgid "HEAD not found below refs/heads!" msgstr "В директорията „refs/heads“ липсва файл „HEAD“" @@ -6163,7 +6430,7 @@ msgstr "За създаването на пратка е необходимо х msgid "Need a repository to unbundle." msgstr "За приемането на пратка е необходимо хранилище." -#: builtin/cat-file.c:521 +#: builtin/cat-file.c:523 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -6171,7 +6438,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | ВИД | --textconv --filters) [--path=ПЪТ] ОБЕКТ" -#: builtin/cat-file.c:522 +#: builtin/cat-file.c:524 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" @@ -6179,71 +6446,71 @@ msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:559 +#: builtin/cat-file.c:561 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "" "ВИДът може да е: „blob“ (обект BLOB), „tree“ (дърво), „commit“ (подаване), " "„tag“ (етикет)" -#: builtin/cat-file.c:560 +#: builtin/cat-file.c:562 msgid "show object type" msgstr "извеждане на вида на обект" -#: builtin/cat-file.c:561 +#: builtin/cat-file.c:563 msgid "show object size" msgstr "извеждане на размера на обект" -#: builtin/cat-file.c:563 +#: builtin/cat-file.c:565 msgid "exit with zero when there's no error" msgstr "изход с 0, когато няма грешка" -#: builtin/cat-file.c:564 +#: builtin/cat-file.c:566 msgid "pretty-print object's content" msgstr "форматирано извеждане на съдържанието на обекта" -#: builtin/cat-file.c:566 +#: builtin/cat-file.c:568 msgid "for blob objects, run textconv on object's content" msgstr "" "да се стартира програмата зададена в настройката „textconv“ за преобразуване " "на съдържанието на обекта BLOB" -#: builtin/cat-file.c:568 +#: builtin/cat-file.c:570 msgid "for blob objects, run filters on object's content" msgstr "" "да се стартират програмите за преобразуване на съдържанието на обектите BLOB" -#: builtin/cat-file.c:569 git-submodule.sh:931 +#: builtin/cat-file.c:571 git-submodule.sh:878 msgid "blob" msgstr "обект BLOB" -#: builtin/cat-file.c:570 +#: builtin/cat-file.c:572 msgid "use a specific path for --textconv/--filters" msgstr "опциите „--textconv“/„--filters“ изискват път" -#: builtin/cat-file.c:572 +#: builtin/cat-file.c:574 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "позволяване на опциите „-s“ и „-t“ да работят с повредени обекти" -#: builtin/cat-file.c:573 +#: builtin/cat-file.c:575 msgid "buffer --batch output" msgstr "буфериране на изхода от „--batch“" -#: builtin/cat-file.c:575 +#: builtin/cat-file.c:577 msgid "show info and content of objects fed from the standard input" msgstr "" "извеждане на информация и съдържание на обектите подадени на стандартния вход" -#: builtin/cat-file.c:578 +#: builtin/cat-file.c:580 msgid "show info about objects fed from the standard input" msgstr "извеждане на информация за обектите подадени на стандартния вход" -#: builtin/cat-file.c:581 +#: builtin/cat-file.c:583 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "следване на символните връзки сочещи в дървото (ползва се с „--batch“ или „--" "batch-check“)" -#: builtin/cat-file.c:583 +#: builtin/cat-file.c:585 msgid "show all objects with --batch or --batch-check" msgstr "извеждане на всички обекти с „--batch“ или „--batch-check“" @@ -6263,7 +6530,7 @@ msgstr "извеждане на всички атрибути, зададени msgid "use .gitattributes only from the index" msgstr "използване на файла „.gitattributes“ само от индекса" -#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99 +#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:100 msgid "read file names from stdin" msgstr "изчитане на имената на файловете от стандартния вход" @@ -6271,7 +6538,7 @@ msgstr "изчитане на имената на файловете от ста msgid "terminate input and output records by a NUL character" msgstr "разделяне на входните и изходните записи с нулевия знак „NUL“" -#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358 +#: builtin/check-ignore.c:20 builtin/checkout.c:1106 builtin/gc.c:358 msgid "suppress progress reporting" msgstr "без показване на напредъка" @@ -6283,27 +6550,27 @@ msgstr "извеждане на несъвпадащите пътища" msgid "ignore index when checking" msgstr "прескачане на индекса при проверката" -#: builtin/check-ignore.c:158 +#: builtin/check-ignore.c:159 msgid "cannot specify pathnames with --stdin" msgstr "опцията „--stdin“ е несъвместима с имена на пътища" -#: builtin/check-ignore.c:161 +#: builtin/check-ignore.c:162 msgid "-z only makes sense with --stdin" msgstr "опцията „-z“ изисква „--stdin“" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:164 msgid "no path specified" msgstr "не е зададен път" -#: builtin/check-ignore.c:167 +#: builtin/check-ignore.c:168 msgid "--quiet is only valid with a single pathname" msgstr "опцията „--quiet“ изисква да е подаден точно един път" -#: builtin/check-ignore.c:169 +#: builtin/check-ignore.c:170 msgid "cannot have both --quiet and --verbose" msgstr "опциите „--quiet“ и „--verbose“ са несъвместими" -#: builtin/check-ignore.c:172 +#: builtin/check-ignore.c:173 msgid "--non-matching is only valid with --verbose" msgstr "опцията „--non-matching“ изисква „--verbose“" @@ -6361,9 +6628,9 @@ msgid "write the content to temporary files" msgstr "записване на съдържанието във временни файлове" #: 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 +#: builtin/submodule--helper.c:1203 builtin/submodule--helper.c:1206 +#: builtin/submodule--helper.c:1212 builtin/submodule--helper.c:1574 +#: builtin/worktree.c:570 msgid "string" msgstr "НИЗ" @@ -6408,81 +6675,81 @@ msgstr "някоя от необходимите версии липсва в п msgid "path '%s': cannot merge" msgstr "пътят „%s“ не може да бъде слян" -#: builtin/checkout.c:232 +#: builtin/checkout.c:231 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Резултатът за „%s“ не може да бъде слян" -#: builtin/checkout.c:254 builtin/checkout.c:257 builtin/checkout.c:260 -#: builtin/checkout.c:263 +#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259 +#: builtin/checkout.c:262 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "Опцията „%s“ е несъвместима с обновяването на пътища" -#: builtin/checkout.c:266 builtin/checkout.c:269 +#: builtin/checkout.c:265 builtin/checkout.c:268 #, c-format msgid "'%s' cannot be used with %s" msgstr "Опцията „%s“ е несъвместима с „%s“" -#: builtin/checkout.c:272 +#: builtin/checkout.c:271 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Невъзможно е едновременно да обновявате пътища и да преминете към клона „%s“." -#: builtin/checkout.c:341 builtin/checkout.c:348 +#: builtin/checkout.c:340 builtin/checkout.c:347 #, c-format msgid "path '%s' is unmerged" msgstr "пътят „%s“ не е слят" -#: builtin/checkout.c:506 +#: builtin/checkout.c:505 msgid "you need to resolve your current index first" msgstr "първо трябва да коригирате индекса си" -#: builtin/checkout.c:637 +#: builtin/checkout.c:636 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Журналът на указателите за „%s“ не може да се проследи: %s\n" -#: builtin/checkout.c:678 +#: builtin/checkout.c:677 msgid "HEAD is now at" msgstr "Указателят „HEAD“ в момента сочи към" -#: builtin/checkout.c:682 builtin/clone.c:684 +#: builtin/checkout.c:681 builtin/clone.c:689 msgid "unable to update HEAD" msgstr "Указателят „HEAD“ не може да бъде обновен" -#: builtin/checkout.c:686 +#: builtin/checkout.c:685 #, c-format msgid "Reset branch '%s'\n" msgstr "Зануляване на клона „%s“\n" -#: builtin/checkout.c:689 +#: builtin/checkout.c:688 #, c-format msgid "Already on '%s'\n" msgstr "Вече сте на „%s“\n" -#: builtin/checkout.c:693 +#: builtin/checkout.c:692 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Преминаване към клона „%s“ и зануляване на промените\n" -#: builtin/checkout.c:695 builtin/checkout.c:1051 +#: builtin/checkout.c:694 builtin/checkout.c:1039 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Преминахте към новия клон „%s“\n" -#: builtin/checkout.c:697 +#: builtin/checkout.c:696 #, c-format msgid "Switched to branch '%s'\n" msgstr "Преминахте към клона „%s“\n" -#: builtin/checkout.c:748 +#: builtin/checkout.c:747 #, c-format msgid " ... and %d more.\n" msgstr "… и още %d.\n" -#: builtin/checkout.c:754 +#: builtin/checkout.c:753 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -6504,7 +6771,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:773 +#: builtin/checkout.c:772 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -6531,164 +6798,164 @@ msgstr[1] "" " git branch ИМЕ_НА_НОВИЯ_КЛОН %s\n" "\n" -#: builtin/checkout.c:814 +#: builtin/checkout.c:804 msgid "internal error in revision walk" msgstr "вътрешна грешка при обхождането на версиите" -#: builtin/checkout.c:818 +#: builtin/checkout.c:808 msgid "Previous HEAD position was" msgstr "Преди това „HEAD“ сочеше към" -#: builtin/checkout.c:848 builtin/checkout.c:1046 +#: builtin/checkout.c:836 builtin/checkout.c:1034 msgid "You are on a branch yet to be born" msgstr "В момента сте на клон, който предстои да бъде създаден" -#: builtin/checkout.c:952 +#: builtin/checkout.c:940 #, c-format msgid "only one reference expected, %d given." msgstr "очакваше се един указател, а сте подали %d." -#: builtin/checkout.c:992 builtin/worktree.c:247 +#: builtin/checkout.c:980 builtin/worktree.c:249 #, c-format msgid "invalid reference: %s" msgstr "неправилен указател: %s" -#: builtin/checkout.c:1021 +#: builtin/checkout.c:1009 #, c-format msgid "reference is not a tree: %s" msgstr "указателят не сочи към обект-дърво: %s" -#: builtin/checkout.c:1060 +#: builtin/checkout.c:1048 msgid "paths cannot be used with switching branches" msgstr "задаването на път е несъвместимо с преминаването от един клон към друг" -#: builtin/checkout.c:1063 builtin/checkout.c:1067 +#: builtin/checkout.c:1051 builtin/checkout.c:1055 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "опцията „%s“ е несъвместима с преминаването от един клон към друг" -#: builtin/checkout.c:1071 builtin/checkout.c:1074 builtin/checkout.c:1079 -#: builtin/checkout.c:1082 +#: builtin/checkout.c:1059 builtin/checkout.c:1062 builtin/checkout.c:1067 +#: builtin/checkout.c:1070 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "опцията „%s“ е несъвместима с „%s“" -#: builtin/checkout.c:1087 +#: builtin/checkout.c:1075 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" "За да преминете към клон, подайте указател, който сочи към подаване. „%s“ " "не е такъв" -#: 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 +#: builtin/checkout.c:1107 builtin/checkout.c:1109 builtin/clone.c:116 +#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:387 +#: builtin/worktree.c:389 msgid "branch" msgstr "клон" -#: builtin/checkout.c:1120 +#: builtin/checkout.c:1108 msgid "create and checkout a new branch" msgstr "създаване и преминаване към нов клон" -#: builtin/checkout.c:1122 +#: builtin/checkout.c:1110 msgid "create/reset and checkout a branch" msgstr "създаване/зануляване на клон и преминаване към него" -#: builtin/checkout.c:1123 +#: builtin/checkout.c:1111 msgid "create reflog for new branch" msgstr "създаване на журнал на указателите за нов клон" -#: builtin/checkout.c:1124 builtin/worktree.c:373 +#: builtin/checkout.c:1112 builtin/worktree.c:391 msgid "detach HEAD at named commit" msgstr "отделяне на указателя „HEAD“ към указаното подаване" -#: builtin/checkout.c:1125 +#: builtin/checkout.c:1113 msgid "set upstream info for new branch" msgstr "задаване на кой клон бива следен при създаването на новия клон" -#: builtin/checkout.c:1127 +#: builtin/checkout.c:1115 msgid "new-branch" msgstr "НОВ_КЛОН" -#: builtin/checkout.c:1127 +#: builtin/checkout.c:1115 msgid "new unparented branch" msgstr "нов клон без родител" -#: builtin/checkout.c:1128 +#: builtin/checkout.c:1116 msgid "checkout our version for unmerged files" msgstr "изтегляне на вашата версия на неслетите файлове" -#: builtin/checkout.c:1130 +#: builtin/checkout.c:1118 msgid "checkout their version for unmerged files" msgstr "изтегляне на чуждата версия на неслетите файлове" -#: builtin/checkout.c:1132 +#: builtin/checkout.c:1120 msgid "force checkout (throw away local modifications)" msgstr "принудително изтегляне (вашите промени ще бъдат занулени)" -#: builtin/checkout.c:1133 +#: builtin/checkout.c:1122 msgid "perform a 3-way merge with the new branch" msgstr "извършване на тройно сливане с новия клон" -#: builtin/checkout.c:1134 builtin/merge.c:238 +#: builtin/checkout.c:1124 builtin/merge.c:239 msgid "update ignored files (default)" msgstr "обновяване на игнорираните файлове (стандартно)" -#: builtin/checkout.c:1135 builtin/log.c:1496 parse-options.h:251 +#: builtin/checkout.c:1126 builtin/log.c:1499 parse-options.h:263 msgid "style" msgstr "СТИЛ" -#: builtin/checkout.c:1136 +#: builtin/checkout.c:1127 msgid "conflict style (merge or diff3)" msgstr "действие при конфликт (сливане или тройна разлика)" -#: builtin/checkout.c:1139 +#: builtin/checkout.c:1130 msgid "do not limit pathspecs to sparse entries only" msgstr "без ограничаване на изброените пътища само до частично изтеглените" -#: builtin/checkout.c:1141 +#: builtin/checkout.c:1132 msgid "second guess 'git checkout <no-such-branch>'" msgstr "" "опит за отгатване на име на клон след неуспешен опит с „git checkout " "НЕСЪЩЕСТВУВАЩ_КЛОН“" -#: builtin/checkout.c:1143 +#: builtin/checkout.c:1134 msgid "do not check if another worktree is holding the given ref" msgstr "без проверка дали друго работно дърво държи указателя" -#: 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/checkout.c:1138 builtin/clone.c:83 builtin/fetch.c:150 +#: builtin/merge.c:236 builtin/pull.c:123 builtin/push.c:556 #: builtin/send-pack.c:173 msgid "force progress reporting" msgstr "извеждане на напредъка" -#: builtin/checkout.c:1177 +#: builtin/checkout.c:1168 msgid "-b, -B and --orphan are mutually exclusive" msgstr "Опциите „-b“, „-B“ и „--orphan“ са несъвместими една с друга" -#: builtin/checkout.c:1194 +#: builtin/checkout.c:1185 msgid "--track needs a branch name" msgstr "опцията „--track“ изисква име на клон" -#: builtin/checkout.c:1199 +#: builtin/checkout.c:1190 msgid "Missing branch name; try -b" msgstr "Липсва име на клон, използвайте опцията „-b“" -#: builtin/checkout.c:1235 +#: builtin/checkout.c:1226 msgid "invalid path specification" msgstr "указан е неправилен път" -#: builtin/checkout.c:1242 +#: builtin/checkout.c:1233 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "„%s“ не е подаване, затова от него не може да се създаде клон „%s“" -#: builtin/checkout.c:1246 +#: builtin/checkout.c:1237 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: опцията „--detach“ не приема аргумент-път „%s“" -#: builtin/checkout.c:1250 +#: builtin/checkout.c:1241 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -6787,7 +7054,7 @@ msgid "Remove %s [y/N]? " msgstr "Да се изтрие ли „%s“? „y“ — да, „N“ — НЕ" # -#: builtin/clean.c:788 git-add--interactive.perl:1616 +#: builtin/clean.c:788 git-add--interactive.perl:1710 #, c-format msgid "Bye.\n" msgstr "Изход.\n" @@ -6810,11 +7077,11 @@ msgstr "" "help — този край\n" "? — подсказка за шаблоните" -#: builtin/clean.c:823 git-add--interactive.perl:1692 +#: builtin/clean.c:823 git-add--interactive.perl:1786 msgid "*** Commands ***" msgstr "●●● Команди ●●●" -#: builtin/clean.c:824 git-add--interactive.perl:1689 +#: builtin/clean.c:824 git-add--interactive.perl:1783 msgid "What now" msgstr "Избор на следващо действие" @@ -6844,8 +7111,8 @@ msgstr "интерактивно изтриване" msgid "remove whole directories" msgstr "изтриване на цели директории" -#: 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/clean.c:916 builtin/describe.c:533 builtin/describe.c:535 +#: builtin/grep.c:871 builtin/log.c:157 builtin/log.c:159 #: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399 #: builtin/show-ref.c:176 msgid "pattern" @@ -6884,148 +7151,148 @@ msgstr "" "което изисква някоя от опциите „-i“, „-n“ или „-f“. Няма да се извърши " "изчистване" -#: builtin/clone.c:39 +#: builtin/clone.c:40 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [ОПЦИЯ…] [--] ХРАНИЛИЩЕ [ДИРЕКТОРИЯ]" -#: builtin/clone.c:83 +#: builtin/clone.c:85 msgid "don't create a checkout" msgstr "без създаване на работно дърво" -#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479 +#: builtin/clone.c:86 builtin/clone.c:88 builtin/init-db.c:479 msgid "create a bare repository" msgstr "създаване на голо хранилище" -#: builtin/clone.c:88 +#: builtin/clone.c:90 msgid "create a mirror repository (implies bare)" msgstr "" "създаване на хранилище-огледало (включва опцията „--bare“ за голо хранилище)" -#: builtin/clone.c:90 +#: builtin/clone.c:92 msgid "to clone from a local repository" msgstr "клониране от локално хранилище" -#: builtin/clone.c:92 +#: builtin/clone.c:94 msgid "don't use local hardlinks, always copy" msgstr "без твърди връзки, файловете винаги да се копират" -#: builtin/clone.c:94 +#: builtin/clone.c:96 msgid "setup as shared repository" msgstr "настройване за споделено хранилище" -#: builtin/clone.c:96 builtin/clone.c:100 +#: builtin/clone.c:98 builtin/clone.c:102 msgid "pathspec" msgstr "път" -#: builtin/clone.c:96 builtin/clone.c:100 +#: builtin/clone.c:98 builtin/clone.c:102 msgid "initialize submodules in the clone" msgstr "инициализиране на подмодулите при това клониране" -#: builtin/clone.c:103 +#: builtin/clone.c:105 msgid "number of submodules cloned in parallel" msgstr "брой подмодули, клонирани паралелно" -#: builtin/clone.c:104 builtin/init-db.c:476 +#: builtin/clone.c:106 builtin/init-db.c:476 msgid "template-directory" msgstr "директория с шаблони" -#: builtin/clone.c:105 builtin/init-db.c:477 +#: builtin/clone.c:107 builtin/init-db.c:477 msgid "directory from which templates will be used" msgstr "директория, която съдържа шаблоните, които да се ползват" -#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:873 -#: builtin/submodule--helper.c:1240 +#: builtin/clone.c:109 builtin/clone.c:111 builtin/submodule--helper.c:1210 +#: builtin/submodule--helper.c:1577 msgid "reference repository" msgstr "еталонно хранилище" -#: builtin/clone.c:111 +#: builtin/clone.c:113 msgid "use --reference only while cloning" msgstr "опцията „--reference“ може да се използва само при клониране" -#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44 +#: builtin/clone.c:114 builtin/column.c:27 builtin/merge-file.c:44 msgid "name" msgstr "ИМЕ" -#: builtin/clone.c:113 +#: builtin/clone.c:115 msgid "use <name> instead of 'origin' to track upstream" msgstr "използване на това ИМЕ вместо „origin“ при проследяване на клони" -#: builtin/clone.c:115 +#: builtin/clone.c:117 msgid "checkout <branch> instead of the remote's HEAD" msgstr "изтегляне на този КЛОН, а не соченият от отдалечения указател „HEAD“" -#: builtin/clone.c:117 +#: builtin/clone.c:119 msgid "path to git-upload-pack on the remote" msgstr "път към командата „git-upload-pack“ на отдалеченото хранилище" -#: builtin/clone.c:118 builtin/fetch.c:138 builtin/grep.c:806 +#: builtin/clone.c:120 builtin/fetch.c:151 builtin/grep.c:813 #: builtin/pull.c:211 msgid "depth" msgstr "ДЪЛБОЧИНА" -#: builtin/clone.c:119 +#: builtin/clone.c:121 msgid "create a shallow clone of that depth" msgstr "плитко клониране до тази ДЪЛБОЧИНА" -#: builtin/clone.c:120 builtin/fetch.c:140 builtin/pack-objects.c:2991 -#: parse-options.h:142 +#: builtin/clone.c:122 builtin/fetch.c:153 builtin/pack-objects.c:3017 +#: parse-options.h:154 msgid "time" msgstr "ВРЕМЕ" -#: builtin/clone.c:121 +#: builtin/clone.c:123 msgid "create a shallow clone since a specific time" msgstr "плитко клониране до момент във времето" -#: builtin/clone.c:122 builtin/fetch.c:142 +#: builtin/clone.c:124 builtin/fetch.c:155 msgid "revision" msgstr "версия" -#: builtin/clone.c:123 builtin/fetch.c:143 +#: builtin/clone.c:125 builtin/fetch.c:156 msgid "deepen history of shallow clone, excluding rev" msgstr "задълбочаване на историята на плитко хранилище до изключващ указател" -#: builtin/clone.c:125 +#: builtin/clone.c:127 msgid "clone only one branch, HEAD or --branch" msgstr "" "клониране само на един клон — или сочения от отдалечения „HEAD“, или изрично " "зададения с „--branch“" -#: builtin/clone.c:127 +#: builtin/clone.c:129 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "" "без клониране на етикети, като последващите доставяния няма да ги следят" -#: builtin/clone.c:129 +#: builtin/clone.c:131 msgid "any cloned submodules will be shallow" msgstr "всички клонирани подмодули ще са плитки" -#: builtin/clone.c:130 builtin/init-db.c:485 +#: builtin/clone.c:132 builtin/init-db.c:485 msgid "gitdir" msgstr "СЛУЖЕБНА_ДИРЕКТОРИЯ" -#: builtin/clone.c:131 builtin/init-db.c:486 +#: builtin/clone.c:133 builtin/init-db.c:486 msgid "separate git dir from working tree" msgstr "отделна СЛУЖЕБНА_ДИРЕКТОРИЯ за git извън работното дърво" -#: builtin/clone.c:132 +#: builtin/clone.c:134 msgid "key=value" msgstr "КЛЮЧ=СТОЙНОСТ" -#: builtin/clone.c:133 +#: builtin/clone.c:135 msgid "set config inside the new repository" msgstr "задаване на настройките на новото хранилище" -#: builtin/clone.c:134 builtin/fetch.c:160 builtin/pull.c:224 +#: builtin/clone.c:136 builtin/fetch.c:173 builtin/pull.c:224 #: builtin/push.c:567 msgid "use IPv4 addresses only" msgstr "само адреси IPv4" -#: builtin/clone.c:136 builtin/fetch.c:162 builtin/pull.c:227 +#: builtin/clone.c:138 builtin/fetch.c:175 builtin/pull.c:227 #: builtin/push.c:569 msgid "use IPv6 addresses only" msgstr "само адреси IPv6" -#: builtin/clone.c:273 +#: builtin/clone.c:276 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -7033,43 +7300,43 @@ msgstr "" "Името на директорията не може да бъде отгатнато.\n" "Задайте директорията изрично на командния ред" -#: builtin/clone.c:326 +#: builtin/clone.c:329 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "" "ПРЕДУПРЕЖДЕНИЕ: не може да се добави алтернативен източник на „%s“: %s\n" -#: builtin/clone.c:398 +#: builtin/clone.c:401 #, c-format msgid "failed to open '%s'" msgstr "директорията „%s“ не може да бъде отворена" -#: builtin/clone.c:406 +#: builtin/clone.c:409 #, c-format msgid "%s exists and is not a directory" msgstr "„%s“ съществува и не е директория" -#: builtin/clone.c:420 +#: builtin/clone.c:423 #, c-format msgid "failed to stat %s\n" msgstr "не може да бъде получена информация чрез „stat“ за „%s“\n" -#: builtin/clone.c:442 +#: builtin/clone.c:445 #, c-format msgid "failed to create link '%s'" msgstr "връзката „%s“ не може да бъде създадена" -#: builtin/clone.c:446 +#: builtin/clone.c:449 #, c-format msgid "failed to copy file to '%s'" msgstr "файлът не може да бъде копиран като „%s“" -#: builtin/clone.c:472 +#: builtin/clone.c:475 #, c-format msgid "done.\n" msgstr "действието завърши.\n" -#: builtin/clone.c:484 +#: builtin/clone.c:489 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -7080,103 +7347,103 @@ msgstr "" "клон в момента са изтеглени с командата „git status“. Можете да\n" "завършите изтеглянето на клона с командата „git checkout -f HEAD“.\n" -#: builtin/clone.c:561 +#: builtin/clone.c:566 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" "Клонът „%s“ от отдалеченото хранилище, което клонирате,\n" "и който следва да бъде изтеглен, не съществува." -#: builtin/clone.c:656 +#: builtin/clone.c:661 msgid "remote did not send all necessary objects" msgstr "отдалеченото хранилище не изпрати всички необходими обекти." -#: builtin/clone.c:672 +#: builtin/clone.c:677 #, c-format msgid "unable to update %s" msgstr "обектът „%s“ не може да бъде обновен" -#: builtin/clone.c:721 +#: builtin/clone.c:726 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "указателят „HEAD“ от отдалеченото хранилище сочи към нещо,\n" "което не съществува. Не може да се изтегли определен клон.\n" -#: builtin/clone.c:751 +#: builtin/clone.c:756 msgid "unable to checkout working tree" msgstr "работното дърво не може да бъде подготвено" -#: builtin/clone.c:796 +#: builtin/clone.c:801 msgid "unable to write parameters to config file" msgstr "настройките не могат да бъдат записани в конфигурационния файл" -#: builtin/clone.c:859 +#: builtin/clone.c:864 msgid "cannot repack to clean up" msgstr "не може да се извърши пакетиране за изчистване на файловете" -#: builtin/clone.c:861 +#: builtin/clone.c:866 msgid "cannot unlink temporary alternates file" msgstr "временният файл за алтернативни обекти не може да бъде изтрит" -#: builtin/clone.c:894 builtin/receive-pack.c:1945 +#: builtin/clone.c:906 builtin/receive-pack.c:1946 msgid "Too many arguments." msgstr "Прекалено много аргументи." -#: builtin/clone.c:898 +#: builtin/clone.c:910 msgid "You must specify a repository to clone." msgstr "Трябва да укажете кое хранилище искате да клонирате." -#: builtin/clone.c:911 +#: builtin/clone.c:923 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "опциите „--bare“ и „--origin %s“ са несъвместими." -#: builtin/clone.c:914 +#: builtin/clone.c:926 msgid "--bare and --separate-git-dir are incompatible." msgstr "опциите „--bare“ и „--separate-git-dir“ са несъвместими." -#: builtin/clone.c:927 +#: builtin/clone.c:939 #, c-format msgid "repository '%s' does not exist" msgstr "не съществува хранилище „%s“" -#: builtin/clone.c:933 builtin/fetch.c:1358 +#: builtin/clone.c:945 builtin/fetch.c:1455 #, c-format msgid "depth %s is not a positive number" msgstr "дълбочината трябва да е положително цяло число, а не „%s“" -#: builtin/clone.c:943 +#: builtin/clone.c:955 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "целевият път „%s“ съществува и не е празна директория." -#: builtin/clone.c:953 +#: builtin/clone.c:965 #, c-format msgid "working tree '%s' already exists." msgstr "в „%s“ вече съществува работно дърво." -#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270 -#: builtin/worktree.c:253 builtin/worktree.c:283 +#: builtin/clone.c:980 builtin/clone.c:1001 builtin/difftool.c:270 +#: builtin/worktree.c:255 builtin/worktree.c:285 #, c-format msgid "could not create leading directories of '%s'" msgstr "родителските директории на „%s“ не могат да бъдат създадени" -#: builtin/clone.c:971 +#: builtin/clone.c:985 #, c-format msgid "could not create work tree dir '%s'" msgstr "работното дърво в „%s“ не може да бъде създадено." -#: builtin/clone.c:983 +#: builtin/clone.c:1005 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Клониране и създаване на голо хранилище в „%s“…\n" -#: builtin/clone.c:985 +#: builtin/clone.c:1007 #, c-format msgid "Cloning into '%s'...\n" msgstr "Клониране и създаване на хранилище в „%s“…\n" -#: builtin/clone.c:1009 +#: builtin/clone.c:1031 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -7184,38 +7451,44 @@ msgstr "" "Опцията „--recursive“ е несъвместима с опциите „--reference“ и „--reference-" "if-able“" -#: builtin/clone.c:1071 +#: builtin/clone.c:1093 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" "При локално клониране опцията „--depth“ се прескача. Ползвайте схемата " "„file://“." -#: builtin/clone.c:1073 +#: builtin/clone.c:1095 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" "При локално клониране опцията „--shallow-since“ се прескача. Ползвайте " "схемата „file://“." -#: builtin/clone.c:1075 +#: builtin/clone.c:1097 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" "При локално клониране опцията „--shallow-exclude“ се прескача. Ползвайте " "схемата „file://“." -#: builtin/clone.c:1078 +#: builtin/clone.c:1099 +msgid "--filter is ignored in local clones; use file:// instead." +msgstr "" +"При локално клониране опцията „--filter“ се прескача. Ползвайте схемата " +"„file://“." + +#: builtin/clone.c:1102 msgid "source repository is shallow, ignoring --local" msgstr "клонираното хранилище е плитко, затова опцията „--local“ се прескача" -#: builtin/clone.c:1083 +#: builtin/clone.c:1107 msgid "--local is ignored" msgstr "опцията „--local“ се прескача" -#: builtin/clone.c:1139 builtin/clone.c:1147 +#: builtin/clone.c:1169 builtin/clone.c:1177 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Отдалеченият клон „%s“ липсва в клонираното хранилище „%s“" -#: builtin/clone.c:1150 +#: builtin/clone.c:1180 msgid "You appear to have cloned an empty repository." msgstr "Изглежда клонирахте празно хранилище." @@ -7251,70 +7524,15 @@ msgstr "Поле в знаци между колоните" msgid "--command must be the first argument" msgstr "опцията „--command“ трябва да е първият аргумент" -#: builtin/commit.c:39 +#: builtin/commit.c:37 msgid "git commit [<options>] [--] <pathspec>..." msgstr "git commit [ОПЦИЯ…] [--] ПЪТ…" -#: builtin/commit.c:44 +#: builtin/commit.c:42 msgid "git status [<options>] [--] <pathspec>..." msgstr "git status [ОПЦИЯ…] [--] ПЪТ…" -#: builtin/commit.c:49 -msgid "" -"Your name and email address were configured automatically based\n" -"on your username and hostname. Please check that they are accurate.\n" -"You can suppress this message by setting them explicitly. Run the\n" -"following command and follow the instructions in your editor to edit\n" -"your configuration file:\n" -"\n" -" git config --global --edit\n" -"\n" -"After doing this, you may fix the identity used for this commit with:\n" -"\n" -" git commit --amend --reset-author\n" -msgstr "" -"Името и адресът за е-поща са настроени автоматично на базата на името на\n" -"потребителя и името на машината. Проверете дали са верни. Можете да " -"спрете\n" -"това съобщение като изрично зададете стойностите. Изпълнете следната " -"команда\n" -"и следвайте инструкциите в текстовия ви редактор, за да редактирате\n" -"конфигурационния файл:\n" -"\n" -" git config --global --edit\n" -"\n" -"След като направите това, можете да коригирате информацията за автора на\n" -"текущото подаване чрез:\n" -"\n" -" git commit --amend --reset-author\n" - -#: builtin/commit.c:62 -msgid "" -"Your name and email address were configured automatically based\n" -"on your username and hostname. Please check that they are accurate.\n" -"You can suppress this message by setting them explicitly:\n" -"\n" -" git config --global user.name \"Your Name\"\n" -" git config --global user.email you@example.com\n" -"\n" -"After doing this, you may fix the identity used for this commit with:\n" -"\n" -" git commit --amend --reset-author\n" -msgstr "" -"Името и адресът за е-поща са настроени автоматично на базата на името на\n" -"потребителя и името на машината. Проверете дали са верни. Можете да " -"спрете\n" -"това съобщение като изрично зададете стойностите:\n" -"\n" -" git config --global user.name \"Вашето Име\"\n" -" git config --global user.email пенчо@example.com\n" -"\n" -"След като направите това, можете да коригирате информацията за автора на\n" -"текущото подаване чрез:\n" -"\n" -" git commit --amend --reset-author\n" - -#: builtin/commit.c:74 +#: builtin/commit.c:47 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" @@ -7326,7 +7544,7 @@ msgstr "" "с опцията „--allow-empty“, или да го изтриете от историята с командата:\n" "„git reset HEAD^“.\n" -#: builtin/commit.c:79 +#: builtin/commit.c:52 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -7341,11 +7559,11 @@ msgstr "" " git commit --allow-empty\n" "\n" -#: builtin/commit.c:86 +#: builtin/commit.c:59 msgid "Otherwise, please use 'git reset'\n" msgstr "В противен случай използвайте командата „git reset“\n" -#: builtin/commit.c:89 +#: builtin/commit.c:62 msgid "" "If you wish to skip this commit, use:\n" "\n" @@ -7361,61 +7579,61 @@ msgstr "" "Чрез командата „git cherry-pick --continue“ ще продължите отбирането на\n" "останалите подавания.\n" -#: builtin/commit.c:318 +#: builtin/commit.c:284 msgid "failed to unpack HEAD tree object" msgstr "върховото дърво (HEAD tree object) не може да бъде извадено от пакет" -#: builtin/commit.c:359 +#: builtin/commit.c:325 msgid "unable to create temporary index" msgstr "временният индекс не може да бъде създаден" -#: builtin/commit.c:365 +#: builtin/commit.c:331 msgid "interactive add failed" msgstr "неуспешно интерактивно добавяне" -#: builtin/commit.c:378 +#: builtin/commit.c:344 msgid "unable to update temporary index" msgstr "временният индекс не може да бъде обновен" -#: builtin/commit.c:380 +#: builtin/commit.c:346 msgid "Failed to update main cache tree" msgstr "Дървото на основния кеш не може да бъде обновено" -#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478 +#: builtin/commit.c:371 builtin/commit.c:395 builtin/commit.c:444 msgid "unable to write new_index file" msgstr "новият индекс не може да бъде записан" -#: builtin/commit.c:461 +#: builtin/commit.c:427 msgid "cannot do a partial commit during a merge." msgstr "по време на сливане не може да се извърши частично подаване." -#: builtin/commit.c:463 +#: builtin/commit.c:429 msgid "cannot do a partial commit during a cherry-pick." msgstr "по време на отбиране не може да се извърши частично подаване." -#: builtin/commit.c:471 +#: builtin/commit.c:437 msgid "cannot read the index" msgstr "индексът не може да бъде прочетен" -#: builtin/commit.c:490 +#: builtin/commit.c:456 msgid "unable to write temporary index file" msgstr "временният индекс не може да бъде записан" -#: builtin/commit.c:587 +#: builtin/commit.c:553 #, c-format msgid "commit '%s' lacks author header" msgstr "заглавната част за автор в подаването „%s“ липсва" -#: builtin/commit.c:589 +#: builtin/commit.c:555 #, c-format msgid "commit '%s' has malformed author line" msgstr "заглавната част за автор в подаването „%s“ е неправилна" -#: builtin/commit.c:608 +#: builtin/commit.c:574 msgid "malformed --author parameter" msgstr "неправилен параметър към опцията „--author“" -#: builtin/commit.c:660 +#: builtin/commit.c:626 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -7423,38 +7641,38 @@ msgstr "" "не може да се избере знак за коментар — в текущото съобщение за подаване са " "използвани всички подобни знаци" -#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1114 +#: builtin/commit.c:663 builtin/commit.c:696 builtin/commit.c:1024 #, c-format msgid "could not lookup commit %s" msgstr "следното подаване не може да бъде открито: %s" -#: builtin/commit.c:709 builtin/shortlog.c:309 +#: builtin/commit.c:675 builtin/shortlog.c:309 #, c-format msgid "(reading log message from standard input)\n" msgstr "(изчитане на съобщението за подаване от стандартния вход)\n" -#: builtin/commit.c:711 +#: builtin/commit.c:677 msgid "could not read log from standard input" msgstr "съобщението за подаване не бе прочетено стандартния вход" -#: builtin/commit.c:715 +#: builtin/commit.c:681 #, c-format msgid "could not read log file '%s'" msgstr "файлът със съобщението за подаване „%s“ не може да бъде прочетен" -#: builtin/commit.c:742 builtin/commit.c:750 +#: builtin/commit.c:710 builtin/commit.c:718 msgid "could not read SQUASH_MSG" msgstr "съобщението за смачкване SQUASH_MSG не може да бъде прочетено" -#: builtin/commit.c:747 +#: builtin/commit.c:715 msgid "could not read MERGE_MSG" msgstr "съобщението за сливане MERGE_MSG не може да бъде прочетено" -#: builtin/commit.c:801 +#: builtin/commit.c:769 msgid "could not write commit template" msgstr "шаблонът за подаване не може да бъде запазен" -#: builtin/commit.c:819 +#: builtin/commit.c:787 #, c-format msgid "" "\n" @@ -7469,7 +7687,7 @@ msgstr "" " %s\n" "и опитайте отново.\n" -#: builtin/commit.c:824 +#: builtin/commit.c:792 #, c-format msgid "" "\n" @@ -7485,7 +7703,7 @@ msgstr "" " %s\n" "и опитайте отново.\n" -#: builtin/commit.c:837 +#: builtin/commit.c:805 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -7494,7 +7712,7 @@ msgstr "" "Въведете съобщението за подаване на промените. Редовете, които започват\n" "с „%c“, ще бъдат пропуснати, а празно съобщение преустановява подаването.\n" -#: builtin/commit.c:844 +#: builtin/commit.c:813 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -7505,150 +7723,154 @@ msgstr "" "с „%c“, също ще бъдат включени — може да ги изтриете вие. Празно \n" "съобщение преустановява подаването.\n" -#: builtin/commit.c:861 +#: builtin/commit.c:830 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sАвтор: %.*s <%.*s>" -#: builtin/commit.c:869 +#: builtin/commit.c:838 #, c-format msgid "%sDate: %s" msgstr "%sДата: %s" -#: builtin/commit.c:876 +#: builtin/commit.c:845 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sПодаващ: %.*s <%.*s>" -#: builtin/commit.c:893 +#: builtin/commit.c:862 msgid "Cannot read index" msgstr "Индексът не може да бъде прочетен" -#: builtin/commit.c:959 +#: builtin/commit.c:928 msgid "Error building trees" msgstr "Грешка при изграждане на дърветата" -#: builtin/commit.c:973 builtin/tag.c:252 +#: builtin/commit.c:942 builtin/tag.c:256 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Подайте съобщението с някоя от опциите „-m“ или „-F“.\n" -#: builtin/commit.c:1076 +#: builtin/commit.c:986 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "Опцията „--author '%s'“ не отговаря на форма̀та „Име <е-поща>“ и не съвпада с " "никой автор" -#: builtin/commit.c:1090 +#: builtin/commit.c:1000 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Неправилен режим за игнорираните файлове: „%s“" -#: builtin/commit.c:1104 builtin/commit.c:1349 +#: builtin/commit.c:1014 builtin/commit.c:1264 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Неправилен режим за неследените файлове: „%s“" -#: builtin/commit.c:1142 +#: builtin/commit.c:1052 msgid "--long and -z are incompatible" msgstr "Опциите „--long“ и „-z“ са несъвместими." -#: builtin/commit.c:1172 +#: builtin/commit.c:1085 msgid "Using both --reset-author and --author does not make sense" msgstr "Опциите „--reset-author“ и „--author“ са несъвместими." -#: builtin/commit.c:1181 +#: builtin/commit.c:1094 msgid "You have nothing to amend." msgstr "Няма какво да бъде поправено." -#: builtin/commit.c:1184 +#: builtin/commit.c:1097 msgid "You are in the middle of a merge -- cannot amend." msgstr "В момента се извършва сливане, не можете да поправяте." -#: builtin/commit.c:1186 +#: builtin/commit.c:1099 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "В момента се извършва отбиране на подаване, не можете да поправяте." -#: builtin/commit.c:1189 +#: builtin/commit.c:1102 msgid "Options --squash and --fixup cannot be used together" msgstr "Опциите „--squash“ и „--fixup“ са несъвместими." -#: builtin/commit.c:1199 +#: builtin/commit.c:1112 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Опциите „-c“, „-C“, „-F“ и „--fixup““ са несъвместими." -#: builtin/commit.c:1201 -msgid "Option -m cannot be combined with -c/-C/-F/--fixup." -msgstr "Опцията „-m“ е несъвместима с „-c“, „-C“, „-F“ и „--fixup“." +#: builtin/commit.c:1114 +msgid "Option -m cannot be combined with -c/-C/-F." +msgstr "Опцията „-m“ е несъвместима с „-c“, „-C“ и „-F“." -#: builtin/commit.c:1209 +#: builtin/commit.c:1122 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" "Опцията „--reset-author“ може да се използва само заедно с „-C“, „-c“ или\n" "„--amend“." -#: builtin/commit.c:1226 +#: builtin/commit.c:1139 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Опциите „--include“, „--only“, „--all“, „--interactive“ и „--patch“ са\n" "несъвместими." -#: builtin/commit.c:1228 +#: builtin/commit.c:1141 msgid "No paths with --include/--only does not make sense." msgstr "Опциите „--include“ и „--only“ изискват аргументи." -#: builtin/commit.c:1240 builtin/tag.c:535 +#: builtin/commit.c:1155 builtin/tag.c:542 #, c-format msgid "Invalid cleanup mode %s" msgstr "Несъществуващ режим на изчистване „%s“" -#: builtin/commit.c:1245 +#: builtin/commit.c:1160 msgid "Paths with -a does not make sense." msgstr "Опцията „-a“ е несъвместима със задаването на пътища." -#: builtin/commit.c:1363 builtin/commit.c:1648 +#: builtin/commit.c:1278 builtin/commit.c:1443 msgid "show status concisely" msgstr "кратка информация за състоянието" -#: builtin/commit.c:1365 builtin/commit.c:1650 +#: builtin/commit.c:1280 builtin/commit.c:1445 msgid "show branch information" msgstr "информация за клоните" -#: builtin/commit.c:1367 +#: builtin/commit.c:1282 msgid "show stash information" msgstr "информация за скатаното" -#: builtin/commit.c:1369 +#: builtin/commit.c:1284 builtin/commit.c:1447 +msgid "compute full ahead/behind values" +msgstr "изчисляване на точните стойности напред/назад" + +#: builtin/commit.c:1286 msgid "version" msgstr "версия" -#: builtin/commit.c:1369 builtin/commit.c:1652 builtin/push.c:542 -#: builtin/worktree.c:523 +#: builtin/commit.c:1286 builtin/commit.c:1449 builtin/push.c:542 +#: builtin/worktree.c:541 msgid "machine-readable output" msgstr "формат на изхода за четене от програма" -#: builtin/commit.c:1372 builtin/commit.c:1654 +#: builtin/commit.c:1289 builtin/commit.c:1451 msgid "show status in long format (default)" msgstr "подробна информация за състоянието (стандартно)" -#: builtin/commit.c:1375 builtin/commit.c:1657 +#: builtin/commit.c:1292 builtin/commit.c:1454 msgid "terminate entries with NUL" msgstr "разделяне на елементите с нулевия знак „NUL“" -#: 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 +#: builtin/commit.c:1294 builtin/commit.c:1298 builtin/commit.c:1457 +#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:396 msgid "mode" msgstr "РЕЖИМ" -#: builtin/commit.c:1378 builtin/commit.c:1660 +#: builtin/commit.c:1295 builtin/commit.c:1457 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "извеждане на неследените файлове. Възможните РЕЖИМи са „all“ (подробна " "информация), „normal“ (кратка информация), „no“ (без неследените файлове). " "Стандартният РЕЖИМ е: „all“." -#: builtin/commit.c:1382 +#: builtin/commit.c:1299 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -7657,11 +7879,11 @@ msgstr "" "„traditional“ (традиционен), „matching“ (напасващи), „no“ (без игнорираните " "файлове). Стандартният РЕЖИМ е: „traditional“." -#: builtin/commit.c:1384 parse-options.h:155 +#: builtin/commit.c:1301 parse-options.h:167 msgid "when" msgstr "КОГА" -#: builtin/commit.c:1385 +#: builtin/commit.c:1302 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -7670,216 +7892,190 @@ msgstr "" "една от „all“ (всички), „dirty“ (тези с неподадени промени), " "„untracked“ (неследени)" -#: builtin/commit.c:1387 +#: builtin/commit.c:1304 msgid "list untracked files in columns" msgstr "извеждане на неследените файлове в колони" -#: builtin/commit.c:1406 +#: builtin/commit.c:1323 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:1471 -msgid "could not parse newly created commit" -msgstr "току що създаденото подаване не може да бъде анализирано" - -#: 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:1521 -msgid " (root-commit)" -msgstr " (начално подаване)" - -#: builtin/commit.c:1618 +#: builtin/commit.c:1413 msgid "suppress summary after successful commit" msgstr "без информация след успешно подаване" -#: builtin/commit.c:1619 +#: builtin/commit.c:1414 msgid "show diff in commit message template" msgstr "добавяне на разликата към шаблона за съобщението при подаване" -#: builtin/commit.c:1621 +#: builtin/commit.c:1416 msgid "Commit message options" msgstr "Опции за съобщението при подаване" -#: builtin/commit.c:1622 builtin/tag.c:388 +#: builtin/commit.c:1417 builtin/tag.c:393 msgid "read message from file" msgstr "взимане на съобщението от ФАЙЛ" -#: builtin/commit.c:1623 +#: builtin/commit.c:1418 msgid "author" msgstr "АВТОР" -#: builtin/commit.c:1623 +#: builtin/commit.c:1418 msgid "override author for commit" msgstr "задаване на АВТОР за подаването" -#: builtin/commit.c:1624 builtin/gc.c:359 +#: builtin/commit.c:1419 builtin/gc.c:359 msgid "date" msgstr "ДАТА" -#: builtin/commit.c:1624 +#: builtin/commit.c:1419 msgid "override date for commit" msgstr "задаване на ДАТА за подаването" -#: builtin/commit.c:1625 builtin/merge.c:225 builtin/notes.c:402 -#: builtin/notes.c:565 builtin/tag.c:386 +#: builtin/commit.c:1420 builtin/merge.c:226 builtin/notes.c:402 +#: builtin/notes.c:565 builtin/tag.c:391 msgid "message" msgstr "СЪОБЩЕНИЕ" -#: builtin/commit.c:1625 +#: builtin/commit.c:1420 msgid "commit message" msgstr "СЪОБЩЕНИЕ при подаване" -#: builtin/commit.c:1626 builtin/commit.c:1627 builtin/commit.c:1628 -#: builtin/commit.c:1629 parse-options.h:257 ref-filter.h:92 +#: builtin/commit.c:1421 builtin/commit.c:1422 builtin/commit.c:1423 +#: builtin/commit.c:1424 parse-options.h:269 ref-filter.h:92 msgid "commit" msgstr "ПОДАВАНЕ" -#: builtin/commit.c:1626 +#: builtin/commit.c:1421 msgid "reuse and edit message from specified commit" msgstr "преизползване и редактиране на съобщението от указаното ПОДАВАНЕ" -#: builtin/commit.c:1627 +#: builtin/commit.c:1422 msgid "reuse message from specified commit" msgstr "преизползване на съобщението от указаното ПОДАВАНЕ" -#: builtin/commit.c:1628 +#: builtin/commit.c:1423 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "използване на автоматичното съобщение при смачкване за вкарване на указаното " "ПОДАВАНЕ в предното без следа" -#: builtin/commit.c:1629 +#: builtin/commit.c:1424 msgid "use autosquash formatted message to squash specified commit" msgstr "" "използване на автоматичното съобщение при смачкване за смачкване на " "указаното ПОДАВАНЕ в предното" -#: builtin/commit.c:1630 +#: builtin/commit.c:1425 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" "смяна на автора да съвпада с подаващия (използва се с „-C“/„-c“/„--amend“)" -#: builtin/commit.c:1631 builtin/log.c:1443 builtin/merge.c:239 +#: builtin/commit.c:1426 builtin/log.c:1446 builtin/merge.c:240 #: builtin/pull.c:149 builtin/revert.c:105 msgid "add Signed-off-by:" msgstr "добавяне на поле за подпис — „Signed-off-by:“" -#: builtin/commit.c:1632 +#: builtin/commit.c:1427 msgid "use specified template file" msgstr "използване на указания шаблонен ФАЙЛ" -#: builtin/commit.c:1633 +#: builtin/commit.c:1428 msgid "force edit of commit" msgstr "редактиране на подаване" -#: builtin/commit.c:1634 +#: builtin/commit.c:1429 msgid "default" msgstr "стандартно" -#: builtin/commit.c:1634 builtin/tag.c:391 +#: builtin/commit.c:1429 builtin/tag.c:397 msgid "how to strip spaces and #comments from message" msgstr "кои празни знаци и #коментари да се махат от съобщенията" -#: builtin/commit.c:1635 +#: builtin/commit.c:1430 msgid "include status in commit message template" msgstr "вмъкване на състоянието в шаблона за съобщението при подаване" -#: builtin/commit.c:1637 builtin/merge.c:237 builtin/pull.c:179 +#: builtin/commit.c:1432 builtin/merge.c:238 builtin/pull.c:179 #: builtin/revert.c:113 msgid "GPG sign commit" msgstr "подписване на подаването с GPG" -#: builtin/commit.c:1640 +#: builtin/commit.c:1435 msgid "Commit contents options" msgstr "Опции за избор на файлове при подаване" -#: builtin/commit.c:1641 +#: builtin/commit.c:1436 msgid "commit all changed files" msgstr "подаване на всички променени файлове" -#: builtin/commit.c:1642 +#: builtin/commit.c:1437 msgid "add specified files to index for commit" msgstr "добавяне на указаните файлове към индекса за подаване" -#: builtin/commit.c:1643 +#: builtin/commit.c:1438 msgid "interactively add files" msgstr "интерактивно добавяне на файлове" -#: builtin/commit.c:1644 +#: builtin/commit.c:1439 msgid "interactively add changes" msgstr "интерактивно добавяне на промени" -#: builtin/commit.c:1645 +#: builtin/commit.c:1440 msgid "commit only specified files" msgstr "подаване само на указаните файлове" -#: builtin/commit.c:1646 +#: builtin/commit.c:1441 msgid "bypass pre-commit and commit-msg hooks" msgstr "" "без изпълнение на куките преди подаване и при промяна на съобщението за " "подаване (pre-commit и commit-msg)" -#: builtin/commit.c:1647 +#: builtin/commit.c:1442 msgid "show what would be committed" msgstr "отпечатване на това, което би било подадено" -#: builtin/commit.c:1658 +#: builtin/commit.c:1455 msgid "amend previous commit" msgstr "поправяне на предишното подаване" -#: builtin/commit.c:1659 +#: builtin/commit.c:1456 msgid "bypass post-rewrite hook" msgstr "без изпълнение на куката след презаписване (post-rewrite)" -#: builtin/commit.c:1664 +#: builtin/commit.c:1461 msgid "ok to record an empty change" msgstr "позволяване на празни подавания" -#: builtin/commit.c:1666 +#: builtin/commit.c:1463 msgid "ok to record a change with an empty message" msgstr "позволяване на подавания с празни съобщения" -#: builtin/commit.c:1696 -msgid "could not parse HEAD commit" -msgstr "върховото подаване „HEAD“ не може да бъде прочетено" - -#: builtin/commit.c:1741 +#: builtin/commit.c:1536 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Повреден файл за върха за сливането „MERGE_HEAD“ (%s)" -#: builtin/commit.c:1748 +#: builtin/commit.c:1543 msgid "could not read MERGE_MODE" msgstr "режимът на сливане „MERGE_MODE“ не може да бъде прочетен" -#: builtin/commit.c:1767 +#: builtin/commit.c:1562 #, c-format msgid "could not read commit message: %s" msgstr "съобщението за подаване не може да бъде прочетено: %s" -#: builtin/commit.c:1778 +#: builtin/commit.c:1573 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Неизвършване на подаване поради празно съобщение.\n" -#: builtin/commit.c:1783 +#: builtin/commit.c:1578 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Неизвършване на подаване поради нередактирано съобщение.\n" -#: builtin/commit.c:1831 +#: builtin/commit.c:1613 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -8080,7 +8276,7 @@ msgstr "извеждане на размерите на обектите във #: builtin/describe.c:22 msgid "git describe [<options>] [<commit-ish>...]" -msgstr "git describe [ОПЦИЯ…] УКАЗАТЕЛ_КЪМ_ПОДАВАНЕ…" +msgstr "git describe [ОПЦИЯ…] [УКАЗАТЕЛ_КЪМ_ПОДАВАНЕ…]" #: builtin/describe.c:23 msgid "git describe [<options>] --dirty" @@ -8113,22 +8309,22 @@ msgstr "в анотирания етикет „%s“ липсва вграде msgid "tag '%s' is really '%s' here" msgstr "етикетът „%s“ тук е всъщност „%s“" -#: builtin/describe.c:314 +#: builtin/describe.c:317 #, c-format msgid "no tag exactly matches '%s'" msgstr "никой етикет не напасва точно „%s“" -#: builtin/describe.c:316 +#: builtin/describe.c:319 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "Никоя версия и етикет не напасват точно. Търси се по описание\n" -#: builtin/describe.c:363 +#: builtin/describe.c:366 #, c-format msgid "finished search at %s\n" msgstr "търсенето приключи при „%s“\n" -#: builtin/describe.c:389 +#: builtin/describe.c:392 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -8137,7 +8333,7 @@ msgstr "" "Никой анотиран етикет не описва „%s“.\n" "Съществуват и неанотирани етикети. Пробвайте с опцията „--tags“." -#: builtin/describe.c:393 +#: builtin/describe.c:396 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -8146,12 +8342,12 @@ msgstr "" "Никой етикет не описва „%s“.\n" "Пробвайте с опцията „--always“ или създайте етикети." -#: builtin/describe.c:423 +#: builtin/describe.c:426 #, c-format msgid "traversed %lu commits\n" msgstr "претърсени са %lu подавания\n" -#: builtin/describe.c:426 +#: builtin/describe.c:429 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -8160,93 +8356,93 @@ msgstr "" "открити са над %i етикета, изведени са последните %i,\n" "търсенето бе прекратено при „%s“.\n" -#: builtin/describe.c:494 +#: builtin/describe.c:497 #, c-format msgid "describe %s\n" msgstr "описание на „%s“\n" -#: builtin/describe.c:497 builtin/log.c:500 +#: builtin/describe.c:500 builtin/log.c:502 #, c-format msgid "Not a valid object name %s" msgstr "Неправилно име на обект „%s“" -#: builtin/describe.c:505 +#: builtin/describe.c:508 #, c-format msgid "%s is neither a commit nor blob" msgstr "„%s“ не е нито подаване, нито обект BLOB" -#: builtin/describe.c:519 +#: builtin/describe.c:522 msgid "find the tag that comes after the commit" msgstr "откриване на етикета, който следва подаване" -#: builtin/describe.c:520 +#: builtin/describe.c:523 msgid "debug search strategy on stderr" msgstr "" "извеждане на информация за трасиране на стратегията за търсене на " "стандартната грешка" -#: builtin/describe.c:521 +#: builtin/describe.c:524 msgid "use any ref" msgstr "използване на произволен указател" -#: builtin/describe.c:522 +#: builtin/describe.c:525 msgid "use any tag, even unannotated" msgstr "използване на всеки етикет — включително и неанотираните" -#: builtin/describe.c:523 +#: builtin/describe.c:526 msgid "always use long format" msgstr "винаги да се ползва дългият формат" -#: builtin/describe.c:524 +#: builtin/describe.c:527 msgid "only follow first parent" msgstr "проследяване само на първия родител" -#: builtin/describe.c:527 +#: builtin/describe.c:530 msgid "only output exact matches" msgstr "извеждане само на точните съвпадения" -#: builtin/describe.c:529 +#: builtin/describe.c:532 msgid "consider <n> most recent tags (default: 10)" msgstr "да се търси само в този БРОЙ последни етикети (стандартно: 10)" -#: builtin/describe.c:531 +#: builtin/describe.c:534 msgid "only consider tags matching <pattern>" msgstr "да се търси само измежду етикетите напасващи този ШАБЛОН" -#: builtin/describe.c:533 +#: builtin/describe.c:536 msgid "do not consider tags matching <pattern>" msgstr "да не се търси измежду етикетите напасващи този ШАБЛОН" -#: builtin/describe.c:535 builtin/name-rev.c:406 +#: builtin/describe.c:538 builtin/name-rev.c:406 msgid "show abbreviated commit object as fallback" msgstr "извеждане на съкратено име на обект като резервен вариант" -#: builtin/describe.c:536 builtin/describe.c:539 +#: builtin/describe.c:539 builtin/describe.c:542 msgid "mark" msgstr "МАРКЕР" -#: builtin/describe.c:537 +#: builtin/describe.c:540 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "добавяне на такъв МАРКЕР на работното дърво (стандартно е „-dirty“)" -#: builtin/describe.c:540 +#: builtin/describe.c:543 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "" "добавяне на такъв МАРКЕР на счупеното работно дърво (стандартно е „-broken“)" -#: builtin/describe.c:558 +#: builtin/describe.c:561 msgid "--long is incompatible with --abbrev=0" msgstr "Опциите „--long“ и „--abbrev=0“ са несъвместими" -#: builtin/describe.c:587 +#: builtin/describe.c:590 msgid "No names found, cannot describe anything." msgstr "Не са открити имена — нищо не може да бъде описано." -#: builtin/describe.c:637 +#: builtin/describe.c:640 msgid "--dirty is incompatible with commit-ishes" msgstr "опцията „--dirty“ е несъвместима с указател към подаване" -#: builtin/describe.c:639 +#: builtin/describe.c:642 msgid "--broken is incompatible with commit-ishes" msgstr "опцията „--broken“ е несъвместима с указател към подаване" @@ -8435,95 +8631,101 @@ msgstr "Прилагане на УКАЗАТЕЛя_НА_ВЕРСИЯ към из msgid "anonymize output" msgstr "анонимизиране на извежданата информация" -#: builtin/fetch.c:24 +#: builtin/fetch.c:25 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [ОПЦИЯ…] [ХРАНИЛИЩЕ [УКАЗАТЕЛ…]]" -#: builtin/fetch.c:25 +#: builtin/fetch.c:26 msgid "git fetch [<options>] <group>" msgstr "git fetch [ОПЦИЯ…] ГРУПА" -#: builtin/fetch.c:26 +#: builtin/fetch.c:27 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [ОПЦИЯ…] [(ХРАНИЛИЩЕ | ГРУПА)…]" -#: builtin/fetch.c:27 +#: builtin/fetch.c:28 msgid "git fetch --all [<options>]" msgstr "git fetch --all [ОПЦИЯ…]" -#: builtin/fetch.c:113 builtin/pull.c:188 +#: builtin/fetch.c:124 builtin/pull.c:188 msgid "fetch from all remotes" msgstr "доставяне от всички отдалечени хранилища" -#: builtin/fetch.c:115 builtin/pull.c:191 +#: builtin/fetch.c:126 builtin/pull.c:191 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "добавяне към „.git/FETCH_HEAD“ вместо замяна" -#: builtin/fetch.c:117 builtin/pull.c:194 +#: builtin/fetch.c:128 builtin/pull.c:194 msgid "path to upload pack on remote end" msgstr "отдалечен път, където да се качи пакетът" -#: builtin/fetch.c:118 builtin/pull.c:196 +#: builtin/fetch.c:129 builtin/pull.c:196 msgid "force overwrite of local branch" msgstr "принудително презаписване на локалния клон" -#: builtin/fetch.c:120 +#: builtin/fetch.c:131 msgid "fetch from multiple remotes" msgstr "доставяне от множество отдалечени хранилища" -#: builtin/fetch.c:122 builtin/pull.c:198 +#: builtin/fetch.c:133 builtin/pull.c:198 msgid "fetch all tags and associated objects" msgstr "доставяне на всички етикети и принадлежащи обекти" -#: builtin/fetch.c:124 +#: builtin/fetch.c:135 msgid "do not fetch all tags (--no-tags)" msgstr "без доставянето на всички етикети „--no-tags“" -#: builtin/fetch.c:126 +#: builtin/fetch.c:137 msgid "number of submodules fetched in parallel" msgstr "брой подмодули доставени паралелно" -#: builtin/fetch.c:128 builtin/pull.c:201 +#: builtin/fetch.c:139 builtin/pull.c:201 msgid "prune remote-tracking branches no longer on remote" msgstr "окастряне на клоните следящи вече несъществуващи отдалечени клони" -#: builtin/fetch.c:129 builtin/fetch.c:152 builtin/pull.c:126 +#: builtin/fetch.c:141 +msgid "prune local tags no longer on remote and clobber changed tags" +msgstr "" +"окастряне на локалните етикети, които вече не съществуват в отдалеченото " +"хранилище и махане на променените" + +#: builtin/fetch.c:142 builtin/fetch.c:165 builtin/pull.c:126 msgid "on-demand" msgstr "ПРИ НУЖДА" -#: builtin/fetch.c:130 +#: builtin/fetch.c:143 msgid "control recursive fetching of submodules" msgstr "управление на рекурсивното доставяне на подмодулите" -#: builtin/fetch.c:134 builtin/pull.c:209 +#: builtin/fetch.c:147 builtin/pull.c:209 msgid "keep downloaded pack" msgstr "запазване на изтеглените пакети с обекти" -#: builtin/fetch.c:136 +#: builtin/fetch.c:149 msgid "allow updating of HEAD ref" msgstr "позволяване на обновяването на указателя „HEAD“" -#: builtin/fetch.c:139 builtin/fetch.c:145 builtin/pull.c:212 +#: builtin/fetch.c:152 builtin/fetch.c:158 builtin/pull.c:212 msgid "deepen history of shallow clone" msgstr "задълбочаване на историята на плитко хранилище" -#: builtin/fetch.c:141 +#: builtin/fetch.c:154 msgid "deepen history of shallow repository based on time" msgstr "задълбочаване на историята на плитко хранилище до определено време" -#: builtin/fetch.c:147 builtin/pull.c:215 +#: builtin/fetch.c:160 builtin/pull.c:215 msgid "convert to a complete repository" msgstr "превръщане в пълно хранилище" -#: builtin/fetch.c:149 builtin/log.c:1463 +#: builtin/fetch.c:162 builtin/log.c:1466 msgid "dir" msgstr "директория" -#: builtin/fetch.c:150 +#: builtin/fetch.c:163 msgid "prepend this to submodule path output" msgstr "добавяне на това пред пътя на подмодула" -#: builtin/fetch.c:153 +#: builtin/fetch.c:166 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -8531,91 +8733,91 @@ msgstr "" "стандартно рекурсивно изтегляне на подмодулите (файловете с настройки са с " "приоритет)" -#: builtin/fetch.c:157 builtin/pull.c:218 +#: builtin/fetch.c:170 builtin/pull.c:218 msgid "accept refs that update .git/shallow" msgstr "приемане на указатели, които обновяват „.git/shallow“" -#: builtin/fetch.c:158 builtin/pull.c:220 +#: builtin/fetch.c:171 builtin/pull.c:220 msgid "refmap" msgstr "КАРТА_С_УКАЗАТЕЛИ" -#: builtin/fetch.c:159 builtin/pull.c:221 +#: builtin/fetch.c:172 builtin/pull.c:221 msgid "specify fetch refmap" msgstr "указване на КАРТАта_С_УКАЗАТЕЛИ за доставяне" -#: builtin/fetch.c:417 +#: builtin/fetch.c:431 msgid "Couldn't find remote ref HEAD" msgstr "Указателят „HEAD“ в отдалеченото хранилище не може да бъде открит" -#: builtin/fetch.c:535 +#: builtin/fetch.c:549 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "настройката „fetch.output“ е с неправилна стойност „%s“" -#: builtin/fetch.c:628 +#: builtin/fetch.c:642 #, c-format msgid "object %s not found" msgstr "обектът „%s“ липсва" -#: builtin/fetch.c:632 +#: builtin/fetch.c:646 msgid "[up to date]" msgstr "[актуализиран]" -#: builtin/fetch.c:645 builtin/fetch.c:725 +#: builtin/fetch.c:659 builtin/fetch.c:739 msgid "[rejected]" msgstr "[отхвърлен]" -#: builtin/fetch.c:646 +#: builtin/fetch.c:660 msgid "can't fetch in current branch" msgstr "в текущия клон не може да се доставя" -#: builtin/fetch.c:655 +#: builtin/fetch.c:669 msgid "[tag update]" msgstr "[обновяване на етикетите]" -#: builtin/fetch.c:656 builtin/fetch.c:689 builtin/fetch.c:705 -#: builtin/fetch.c:720 +#: builtin/fetch.c:670 builtin/fetch.c:703 builtin/fetch.c:719 +#: builtin/fetch.c:734 msgid "unable to update local ref" msgstr "локален указател не може да бъде обновен" -#: builtin/fetch.c:675 +#: builtin/fetch.c:689 msgid "[new tag]" msgstr "[нов етикет]" -#: builtin/fetch.c:678 +#: builtin/fetch.c:692 msgid "[new branch]" msgstr "[нов клон]" -#: builtin/fetch.c:681 +#: builtin/fetch.c:695 msgid "[new ref]" msgstr "[нов указател]" -#: builtin/fetch.c:720 +#: builtin/fetch.c:734 msgid "forced update" msgstr "принудително обновяване" -#: builtin/fetch.c:725 +#: builtin/fetch.c:739 msgid "non-fast-forward" msgstr "същинско сливане" -#: builtin/fetch.c:770 +#: builtin/fetch.c:784 #, c-format msgid "%s did not send all necessary objects\n" msgstr "хранилището „%s“ не изпрати всички необходими обекти\n" -#: builtin/fetch.c:790 +#: builtin/fetch.c:804 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" "отхвърляне на върха „%s“, защото плитките хранилища не могат да бъдат " "обновявани" -#: builtin/fetch.c:878 builtin/fetch.c:974 +#: builtin/fetch.c:892 builtin/fetch.c:988 #, c-format msgid "From %.*s\n" msgstr "От %.*s\n" -#: builtin/fetch.c:889 +#: builtin/fetch.c:903 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -8625,50 +8827,57 @@ msgstr "" "„git remote prune %s“, за да премахнете остарелите клони, които\n" "предизвикват конфликта" -#: builtin/fetch.c:944 +#: builtin/fetch.c:958 #, c-format msgid " (%s will become dangling)" msgstr " (обектът „%s“ ще се окаже извън клон)" -#: builtin/fetch.c:945 +#: builtin/fetch.c:959 #, c-format msgid " (%s has become dangling)" msgstr " (обектът „%s“ вече е извън клон)" -#: builtin/fetch.c:977 +#: builtin/fetch.c:991 msgid "[deleted]" msgstr "[изтрит]" -#: builtin/fetch.c:978 builtin/remote.c:1024 +#: builtin/fetch.c:992 builtin/remote.c:1024 msgid "(none)" msgstr "(нищо)" -#: builtin/fetch.c:1001 +#: builtin/fetch.c:1015 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Не може да доставите в текущия клон „%s“ на хранилище, което не е голо" -#: builtin/fetch.c:1020 +#: builtin/fetch.c:1034 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Стойността „%2$s“ за опцията „%1$s“ не е съвместима с „%3$s“" -#: builtin/fetch.c:1023 +#: builtin/fetch.c:1037 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Опцията „%s“ се прескача при „%s“\n" -#: builtin/fetch.c:1256 +#: builtin/fetch.c:1277 #, c-format msgid "Fetching %s\n" msgstr "Доставяне на „%s“\n" -#: builtin/fetch.c:1258 builtin/remote.c:97 +#: builtin/fetch.c:1279 builtin/remote.c:97 #, c-format msgid "Could not fetch %s" msgstr "„%s“ не може да се достави" -#: builtin/fetch.c:1276 +#: builtin/fetch.c:1325 builtin/fetch.c:1498 +msgid "" +"--filter can only be used with the remote configured in core.partialClone" +msgstr "" +"опцията „--filter“ може да се ползва само с отдалеченото хранилище указано в " +"настройката „core.partialClone“" + +#: builtin/fetch.c:1350 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -8676,41 +8885,41 @@ msgstr "" "Не сте указали отдалечено хранилище. Задайте или адрес, или име\n" "на отдалечено хранилище, откъдето да се доставят новите версии." -#: builtin/fetch.c:1299 +#: builtin/fetch.c:1394 msgid "You need to specify a tag name." msgstr "Трябва да укажете име на етикет." -#: builtin/fetch.c:1342 +#: builtin/fetch.c:1439 msgid "Negative depth in --deepen is not supported" msgstr "Отрицателна дълбочина като аргумент на „--deepen“ не се поддържа" -#: builtin/fetch.c:1344 +#: builtin/fetch.c:1441 msgid "--deepen and --depth are mutually exclusive" msgstr "Опциите „--deepen“ и „--depth“ са несъвместими една с друга" -#: builtin/fetch.c:1349 +#: builtin/fetch.c:1446 msgid "--depth and --unshallow cannot be used together" msgstr "опциите „--depth“ и „--unshallow“ са несъвместими" -#: builtin/fetch.c:1351 +#: builtin/fetch.c:1448 msgid "--unshallow on a complete repository does not make sense" msgstr "не можете да използвате опцията „--unshallow“ върху пълно хранилище" -#: builtin/fetch.c:1364 +#: builtin/fetch.c:1464 msgid "fetch --all does not take a repository argument" msgstr "към „git fetch --all“ не можете да добавите аргумент — хранилище" -#: builtin/fetch.c:1366 +#: builtin/fetch.c:1466 msgid "fetch --all does not make sense with refspecs" msgstr "" "към „git fetch --all“ не можете да добавите аргумент — указател на версия" -#: builtin/fetch.c:1377 +#: builtin/fetch.c:1475 #, c-format msgid "No such remote or remote group: %s" msgstr "Няма нито отдалечено хранилище, нито група от хранилища на име „%s“" -#: builtin/fetch.c:1385 +#: builtin/fetch.c:1482 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Указването на група и указването на версия са несъвместими" @@ -8778,7 +8987,7 @@ msgstr "цитиране подходящо за tcl" msgid "show only <n> matched refs" msgstr "извеждане само на този БРОЙ напаснати указатели" -#: builtin/for-each-ref.c:39 builtin/tag.c:414 +#: builtin/for-each-ref.c:39 builtin/tag.c:420 msgid "respect format colors" msgstr "спазване на цветовете на форма̀та" @@ -8802,64 +9011,64 @@ msgstr "извеждане само на указателите, които съ msgid "print only refs which don't contain the commit" msgstr "извеждане само на указателите, които не съдържат това ПОДАВАНЕ" -#: builtin/fsck.c:543 +#: builtin/fsck.c:568 msgid "Checking object directories" msgstr "Проверка на директориите с обекти" -#: builtin/fsck.c:635 +#: builtin/fsck.c:660 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [ОПЦИЯ…] [ОБЕКТ…]" -#: builtin/fsck.c:641 +#: builtin/fsck.c:666 msgid "show unreachable objects" msgstr "показване на недостижимите обекти" -#: builtin/fsck.c:642 +#: builtin/fsck.c:667 msgid "show dangling objects" msgstr "показване на обектите извън клоните" -#: builtin/fsck.c:643 +#: builtin/fsck.c:668 msgid "report tags" msgstr "показване на етикетите" -#: builtin/fsck.c:644 +#: builtin/fsck.c:669 msgid "report root nodes" msgstr "показване на кореновите възли" -#: builtin/fsck.c:645 +#: builtin/fsck.c:670 msgid "make index objects head nodes" msgstr "задаване на обекти от индекса да са коренови" # FIXME bad message -#: builtin/fsck.c:646 +#: builtin/fsck.c:671 msgid "make reflogs head nodes (default)" msgstr "проследяване на указателите от журнала като глави (стандартно)" -#: builtin/fsck.c:647 +#: builtin/fsck.c:672 msgid "also consider packs and alternate objects" msgstr "допълнително да се проверяват пакетите и алтернативните обекти" -#: builtin/fsck.c:648 +#: builtin/fsck.c:673 msgid "check only connectivity" msgstr "проверка само на връзката" -#: builtin/fsck.c:649 +#: builtin/fsck.c:674 msgid "enable more strict checking" msgstr "по-строги проверки" -#: builtin/fsck.c:651 +#: builtin/fsck.c:676 msgid "write dangling objects in .git/lost-found" msgstr "запазване на обектите извън клоните в директорията „.git/lost-found“" -#: builtin/fsck.c:652 builtin/prune.c:107 +#: builtin/fsck.c:677 builtin/prune.c:108 msgid "show progress" msgstr "показване на напредъка" -#: builtin/fsck.c:653 +#: builtin/fsck.c:678 msgid "show verbose names for reachable objects" msgstr "показване на подробни имена на достижимите обекти" -#: builtin/fsck.c:714 +#: builtin/fsck.c:742 msgid "Checking objects" msgstr "Проверка на обектите" @@ -8906,37 +9115,37 @@ msgstr "изчерпателно търсене на боклука (за сме msgid "enable auto-gc mode" msgstr "включване на автоматичното събиране на боклука (auto-gc)" -#: builtin/gc.c:364 +#: builtin/gc.c:366 msgid "force running gc even if there may be another gc running" msgstr "" "изрично стартиране на събирането на боклука, дори и ако вече работи друго " "събиране" -#: builtin/gc.c:381 +#: builtin/gc.c:384 #, c-format msgid "Failed to parse gc.logexpiry value %s" msgstr "Неразпозната стойност на „gc.logexpiry“: %s" -#: builtin/gc.c:409 +#: builtin/gc.c:412 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" "Автоматично пакетиране на заден фон на хранилището за по-добра " "производителност.\n" -#: builtin/gc.c:411 +#: builtin/gc.c:414 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Автоматично пакетиране на хранилището за по-добра производителност.\n" -#: builtin/gc.c:412 +#: builtin/gc.c:415 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "" "Погледнете ръководството за повече информация как да изпълните „git help " "gc“.\n" -#: builtin/gc.c:437 +#: builtin/gc.c:440 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -8945,7 +9154,7 @@ msgstr "" "процеса: %<PRIuMAX> (ако сте сигурни, че това не е вярно, това използвайте\n" "опцията „--force“)" -#: builtin/gc.c:481 +#: builtin/gc.c:487 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -8956,12 +9165,12 @@ msgstr "" msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [ОПЦИЯ…] [-e] ШАБЛОН [ВЕРСИЯ…] [[--] ПЪТ…]" -#: builtin/grep.c:226 +#: builtin/grep.c:225 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep: неуспешно създаване на нишка: %s" -#: builtin/grep.c:284 +#: builtin/grep.c:283 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "зададен е неправилен брой нишки (%d) за %s" @@ -8970,259 +9179,259 @@ msgstr "зададен е неправилен брой нишки (%d) за %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1688 +#: builtin/grep.c:292 builtin/index-pack.c:1523 builtin/index-pack.c:1712 #, c-format msgid "no threads support, ignoring %s" msgstr "липсва поддръжка за нишки. „%s“ ще се пренебрегне" -#: builtin/grep.c:453 builtin/grep.c:573 builtin/grep.c:615 +#: builtin/grep.c:460 builtin/grep.c:580 builtin/grep.c:622 #, c-format msgid "unable to read tree (%s)" msgstr "дървото не може да бъде прочетено (%s)" -#: builtin/grep.c:630 +#: builtin/grep.c:637 #, c-format msgid "unable to grep from object of type %s" msgstr "не може да се изпълни „grep“ от обект от вида %s" -#: builtin/grep.c:696 +#: builtin/grep.c:703 #, c-format msgid "switch `%c' expects a numerical value" msgstr "опцията „%c“ очаква число за аргумент" -#: builtin/grep.c:783 +#: builtin/grep.c:790 msgid "search in index instead of in the work tree" msgstr "търсене в индекса, а не в работното дърво" -#: builtin/grep.c:785 +#: builtin/grep.c:792 msgid "find in contents not managed by git" msgstr "търсене и във файловете, които не са под управлението на git" -#: builtin/grep.c:787 +#: builtin/grep.c:794 msgid "search in both tracked and untracked files" msgstr "търсене и в следените, и в неследените файлове" -#: builtin/grep.c:789 +#: builtin/grep.c:796 msgid "ignore files specified via '.gitignore'" msgstr "игнориране на файловете указани в „.gitignore“" -#: builtin/grep.c:791 +#: builtin/grep.c:798 msgid "recursively search in each submodule" msgstr "рекурсивно търсене във всички подмодули" -#: builtin/grep.c:794 +#: builtin/grep.c:801 msgid "show non-matching lines" msgstr "извеждане на редовете, които не съвпадат" -#: builtin/grep.c:796 +#: builtin/grep.c:803 msgid "case insensitive matching" msgstr "без значение на регистъра на буквите (главни/малки)" -#: builtin/grep.c:798 +#: builtin/grep.c:805 msgid "match patterns only at word boundaries" msgstr "напасване на шаблоните само по границите на думите" -#: builtin/grep.c:800 +#: builtin/grep.c:807 msgid "process binary files as text" msgstr "обработване на двоичните файлове като текстови" -#: builtin/grep.c:802 +#: builtin/grep.c:809 msgid "don't match patterns in binary files" msgstr "прескачане на двоичните файлове" -#: builtin/grep.c:805 +#: builtin/grep.c:812 msgid "process binary files with textconv filters" msgstr "" "обработване на двоичните файлове чрез филтри за преобразуване към текст" -#: builtin/grep.c:807 +#: builtin/grep.c:814 msgid "descend at most <depth> levels" msgstr "навлизане максимално на тази ДЪЛБОЧИНА в дървото" -#: builtin/grep.c:811 +#: builtin/grep.c:818 msgid "use extended POSIX regular expressions" msgstr "разширени регулярни изрази по POSIX" -#: builtin/grep.c:814 +#: builtin/grep.c:821 msgid "use basic POSIX regular expressions (default)" msgstr "основни регулярни изрази по POSIX (стандартно)" -#: builtin/grep.c:817 +#: builtin/grep.c:824 msgid "interpret patterns as fixed strings" msgstr "шаблоните са дословни низове" -#: builtin/grep.c:820 +#: builtin/grep.c:827 msgid "use Perl-compatible regular expressions" msgstr "регулярни изрази на Perl" -#: builtin/grep.c:823 +#: builtin/grep.c:830 msgid "show line numbers" msgstr "извеждане на номерата на редовете" -#: builtin/grep.c:824 +#: builtin/grep.c:831 msgid "don't show filenames" msgstr "без извеждане на имената на файловете" -#: builtin/grep.c:825 +#: builtin/grep.c:832 msgid "show filenames" msgstr "извеждане на имената на файловете" -#: builtin/grep.c:827 +#: builtin/grep.c:834 msgid "show filenames relative to top directory" msgstr "" "извеждане на относителните имена на файловете спрямо основната директория на " "хранилището" -#: builtin/grep.c:829 +#: builtin/grep.c:836 msgid "show only filenames instead of matching lines" msgstr "извеждане само на имената на файловете без напасващите редове" -#: builtin/grep.c:831 +#: builtin/grep.c:838 msgid "synonym for --files-with-matches" msgstr "синоним на „--files-with-matches“" -#: builtin/grep.c:834 +#: builtin/grep.c:841 msgid "show only the names of files without match" msgstr "" "извеждане само на имената на файловете, които не съдържат ред, напасващ на " "шаблона" -#: builtin/grep.c:836 +#: builtin/grep.c:843 msgid "print NUL after filenames" msgstr "извеждане на нулевия знак „NUL“ след всяко име на файл" -#: builtin/grep.c:838 +#: builtin/grep.c:846 msgid "show the number of matches instead of matching lines" msgstr "извеждане на броя на съвпаденията вместо напасващите редове" -#: builtin/grep.c:839 +#: builtin/grep.c:847 msgid "highlight matches" msgstr "оцветяване на напасванията" -#: builtin/grep.c:841 +#: builtin/grep.c:849 msgid "print empty line between matches from different files" msgstr "извеждане на празен ред между напасванията от различни файлове" -#: builtin/grep.c:843 +#: builtin/grep.c:851 msgid "show filename only once above matches from same file" msgstr "" "извеждане на името на файла само веднъж за всички напасвания от този файл" -#: builtin/grep.c:846 +#: builtin/grep.c:854 msgid "show <n> context lines before and after matches" msgstr "извеждане на такъв БРОЙ редове преди и след напасванията" -#: builtin/grep.c:849 +#: builtin/grep.c:857 msgid "show <n> context lines before matches" msgstr "извеждане на такъв БРОЙ редове преди напасванията" -#: builtin/grep.c:851 +#: builtin/grep.c:859 msgid "show <n> context lines after matches" msgstr "извеждане на такъв БРОЙ редове след напасванията" -#: builtin/grep.c:853 +#: builtin/grep.c:861 msgid "use <n> worker threads" msgstr "използване на такъв БРОЙ работещи нишки" -#: builtin/grep.c:854 +#: builtin/grep.c:862 msgid "shortcut for -C NUM" msgstr "синоним на „-C БРОЙ“" -#: builtin/grep.c:857 +#: builtin/grep.c:865 msgid "show a line with the function name before matches" msgstr "извеждане на ред с името на функцията, в която е напаснат шаблона" -#: builtin/grep.c:859 +#: builtin/grep.c:867 msgid "show the surrounding function" msgstr "извеждане на обхващащата функция" -#: builtin/grep.c:862 +#: builtin/grep.c:870 msgid "read patterns from file" msgstr "изчитане на шаблоните от ФАЙЛ" -#: builtin/grep.c:864 +#: builtin/grep.c:872 msgid "match <pattern>" msgstr "напасване на ШАБЛОН" -#: builtin/grep.c:866 +#: builtin/grep.c:874 msgid "combine patterns specified with -e" msgstr "комбиниране на шаблоните указани с опцията „-e“" -#: builtin/grep.c:878 +#: builtin/grep.c:886 msgid "indicate hit with exit status without output" msgstr "" "без извеждане на стандартния изход. Изходният код указва наличието на " "напасване" -#: builtin/grep.c:880 +#: builtin/grep.c:888 msgid "show only matches from files that match all patterns" msgstr "" "извеждане на редове само от файловете, които напасват на всички шаблони" -#: builtin/grep.c:882 +#: builtin/grep.c:890 msgid "show parse tree for grep expression" msgstr "извеждане на дървото за анализ на регулярния израз" -#: builtin/grep.c:886 +#: builtin/grep.c:894 msgid "pager" msgstr "програма за преглед по страници" -#: builtin/grep.c:886 +#: builtin/grep.c:894 msgid "show matching files in the pager" msgstr "извеждане на съвпадащите файлове в програма за преглед по страници" -#: builtin/grep.c:889 +#: builtin/grep.c:898 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" "позволяване на стартирането на grep(1) (текущият компилат пренебрегва тази " "опция)" -#: builtin/grep.c:952 +#: builtin/grep.c:962 msgid "no pattern given." msgstr "липсва шаблон." -#: builtin/grep.c:984 +#: builtin/grep.c:994 msgid "--no-index or --untracked cannot be used with revs" msgstr "опциите „--cached“ и „--untracked“ са несъвместими с версии." -#: builtin/grep.c:991 +#: builtin/grep.c:1001 #, c-format msgid "unable to resolve revision: %s" msgstr "версията „%s“ не може бъде открита" -#: builtin/grep.c:1026 builtin/index-pack.c:1491 +#: builtin/grep.c:1036 builtin/index-pack.c:1519 #, c-format msgid "invalid number of threads specified (%d)" msgstr "зададен е неправилен брой нишки: %d" -#: builtin/grep.c:1031 +#: builtin/grep.c:1041 msgid "no threads support, ignoring --threads" msgstr "липсва поддръжка за нишки. „--threads“ ще се пренебрегне" -#: builtin/grep.c:1055 +#: builtin/grep.c:1065 msgid "--open-files-in-pager only works on the worktree" msgstr "" "опцията „--open-files-in-pager“ е съвместима само с търсене в работното дърво" -#: builtin/grep.c:1078 +#: builtin/grep.c:1088 msgid "option not supported with --recurse-submodules." msgstr "опцията е несъвместима с „--recurse-submodules“." -#: builtin/grep.c:1084 +#: builtin/grep.c:1094 msgid "--cached or --untracked cannot be used with --no-index." msgstr "опциите „--cached“ и „--untracked“ са несъвместими с „--no-index“." -#: builtin/grep.c:1090 +#: builtin/grep.c:1100 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" "опциите „--(no-)exclude-standard“ са несъвместими с търсене по следени " "файлове." -#: builtin/grep.c:1098 +#: builtin/grep.c:1108 msgid "both --cached and trees are given." msgstr "опцията „--cached“ е несъвместима със задаване на дърво." -#: builtin/hash-object.c:82 +#: builtin/hash-object.c:83 msgid "" "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " "[--] <file>..." @@ -9230,38 +9439,38 @@ msgstr "" "git hash-object [-t ВИД] [-w] [--path=ФАЙЛ | --no-filters] [--stdin] [--] " "ФАЙЛ…" -#: builtin/hash-object.c:83 +#: builtin/hash-object.c:84 msgid "git hash-object --stdin-paths" msgstr "git hash-object --stdin-paths" -#: builtin/hash-object.c:95 +#: builtin/hash-object.c:96 msgid "type" msgstr "ВИД" -#: builtin/hash-object.c:95 +#: builtin/hash-object.c:96 msgid "object type" msgstr "ВИД на обекта" -#: builtin/hash-object.c:96 +#: builtin/hash-object.c:97 msgid "write the object into the object database" msgstr "записване на обекта в базата от данни за обектите" -#: builtin/hash-object.c:98 +#: builtin/hash-object.c:99 msgid "read the object from stdin" msgstr "изчитане на обекта от стандартния вход" -#: builtin/hash-object.c:100 +#: builtin/hash-object.c:101 msgid "store file as is without filters" msgstr "запазване на файла както е — без филтри" -#: builtin/hash-object.c:101 +#: builtin/hash-object.c:102 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "" "създаване и хеширане на произволни данни за повредени обекти за трасиране на " "Git" -#: builtin/hash-object.c:102 +#: builtin/hash-object.c:103 msgid "process file as it were from this path" msgstr "обработване на ФАЙЛа все едно е с този път" @@ -9395,154 +9604,154 @@ msgstr "„%s“ е синоним на „%s“" msgid "usage: %s%s" msgstr "употреба: %s%s" -#: builtin/index-pack.c:156 +#: builtin/index-pack.c:157 #, c-format msgid "unable to open %s" msgstr "обектът „%s“ не може да бъде отворен" -#: builtin/index-pack.c:206 +#: builtin/index-pack.c:207 #, c-format msgid "object type mismatch at %s" msgstr "неправилен вид на обекта „%s“" -#: builtin/index-pack.c:226 +#: builtin/index-pack.c:227 #, c-format msgid "did not receive expected object %s" msgstr "очакваният обект „%s“ не бе получен" -#: builtin/index-pack.c:229 +#: builtin/index-pack.c:230 #, c-format msgid "object %s: expected type %s, found %s" msgstr "неправилен вид на обекта „%s“: очакваше се „%s“, а бе получен „%s“" -#: builtin/index-pack.c:271 +#: builtin/index-pack.c:272 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "не може да се запълни %d байт" msgstr[1] "не може да се запълнят %d байта" -#: builtin/index-pack.c:281 +#: builtin/index-pack.c:282 msgid "early EOF" msgstr "неочакван край на файл" -#: builtin/index-pack.c:282 +#: builtin/index-pack.c:283 msgid "read error on input" msgstr "грешка при четене на входните данни" -#: builtin/index-pack.c:294 +#: builtin/index-pack.c:295 msgid "used more bytes than were available" msgstr "използвани са повече от наличните байтове" -#: builtin/index-pack.c:301 +#: builtin/index-pack.c:302 msgid "pack too large for current definition of off_t" msgstr "пакетният файл е прекалено голям за текущата стойност на типа „off_t“" -#: builtin/index-pack.c:304 builtin/unpack-objects.c:93 +#: builtin/index-pack.c:305 builtin/unpack-objects.c:93 msgid "pack exceeds maximum allowed size" msgstr "пакетният файл надвишава максималния възможен размер" -#: builtin/index-pack.c:319 +#: builtin/index-pack.c:320 #, c-format msgid "unable to create '%s'" msgstr "пакетният файл „%s“ не може да бъде създаден" -#: builtin/index-pack.c:325 +#: builtin/index-pack.c:326 #, c-format msgid "cannot open packfile '%s'" msgstr "пакетният файл „%s“ не може да бъде отворен" -#: builtin/index-pack.c:339 +#: builtin/index-pack.c:340 msgid "pack signature mismatch" msgstr "несъответствие в подписа към пакетния файл" -#: builtin/index-pack.c:341 +#: builtin/index-pack.c:342 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "не се поддържа пакетиране вeрсия „%<PRIu32>“" -#: builtin/index-pack.c:359 +#: builtin/index-pack.c:360 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "повреден обект в пакетния файл при отместване %<PRIuMAX>: %s" -#: builtin/index-pack.c:480 +#: builtin/index-pack.c:481 #, c-format msgid "inflate returned %d" msgstr "декомпресирането с „inflate“ върна %d" -#: builtin/index-pack.c:529 +#: builtin/index-pack.c:530 msgid "offset value overflow for delta base object" msgstr "стойността на отместването за обекта-разлика води до препълване" -#: builtin/index-pack.c:537 +#: builtin/index-pack.c:538 msgid "delta base offset is out of bound" msgstr "стойността на отместването за обекта-разлика е извън диапазона" -#: builtin/index-pack.c:545 +#: builtin/index-pack.c:546 #, c-format msgid "unknown object type %d" msgstr "непознат вид обект %d" -#: builtin/index-pack.c:576 +#: builtin/index-pack.c:577 msgid "cannot pread pack file" msgstr "пакетният файл не може да бъде прочетен" -#: builtin/index-pack.c:578 +#: builtin/index-pack.c:579 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "неочакван край на файл, липсва %<PRIuMAX> байт" msgstr[1] "неочакван край на файл, липсват %<PRIuMAX> байта" -#: builtin/index-pack.c:604 +#: builtin/index-pack.c:605 msgid "serious inflate inconsistency" msgstr "сериозна грешка при декомпресиране с „inflate“" -#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778 -#: builtin/index-pack.c:817 builtin/index-pack.c:826 +#: builtin/index-pack.c:750 builtin/index-pack.c:756 builtin/index-pack.c:779 +#: builtin/index-pack.c:818 builtin/index-pack.c:827 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" "СЪВПАДЕНИЕ НА СТОЙНОСТИТЕ ЗА СУМИТЕ ЗА SHA1: „%s“ НА ДВА РАЗЛИЧНИ ОБЕКТА!" -#: builtin/index-pack.c:752 builtin/pack-objects.c:179 -#: builtin/pack-objects.c:273 +#: builtin/index-pack.c:753 builtin/pack-objects.c:182 +#: builtin/pack-objects.c:276 #, c-format msgid "unable to read %s" msgstr "обектът „%s“ не може да бъде прочетен" -#: builtin/index-pack.c:815 +#: builtin/index-pack.c:816 #, c-format msgid "cannot read existing object info %s" msgstr "съществуващият обект в „%s“ не може да бъде прочетен" -#: builtin/index-pack.c:823 +#: builtin/index-pack.c:824 #, c-format msgid "cannot read existing object %s" msgstr "съществуващият обект „%s“ не може да бъде прочетен" -#: builtin/index-pack.c:837 +#: builtin/index-pack.c:838 #, c-format msgid "invalid blob object %s" msgstr "неправилен обект BLOB „%s“" # FIXME perhaps invalid object -#: builtin/index-pack.c:852 +#: builtin/index-pack.c:853 #, c-format msgid "invalid %s" msgstr "неправилен обект „%s“" -#: builtin/index-pack.c:855 +#: builtin/index-pack.c:856 msgid "Error in object" msgstr "Грешка в обекта" -#: builtin/index-pack.c:857 +#: builtin/index-pack.c:858 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Някои обекти, наследници на „%s“, не могат да бъдат достигнати" -#: builtin/index-pack.c:929 builtin/index-pack.c:960 +#: builtin/index-pack.c:930 builtin/index-pack.c:961 msgid "failed to apply delta" msgstr "разликата не може да бъде приложена" @@ -9620,80 +9829,81 @@ msgstr "добавеният обект не може да се компреси msgid "local object %s is corrupt" msgstr "локалният обект „%s“ е повреден" -#: builtin/index-pack.c:1409 -msgid "error while closing pack file" -msgstr "грешка при затварянето на пакетния файл" +#: builtin/index-pack.c:1397 +#, c-format +msgid "packfile name '%s' does not end with '.pack'" +msgstr "името на пакетния файл „%s“ не завършва на „.pack“" -#: builtin/index-pack.c:1421 +#: builtin/index-pack.c:1422 #, c-format -msgid "cannot write keep file '%s'" -msgstr "" -"грешка при записването на файла „%s“, осигуряващ запазване на директория" +msgid "cannot write %s file '%s'" +msgstr "грешка при запис на файла „%s“ „%s“" -#: builtin/index-pack.c:1429 +#: builtin/index-pack.c:1430 #, c-format -msgid "cannot close written keep file '%s'" -msgstr "" -"грешка при затварянето на записания файл „%s“, осигуряващ запазване на " -"директория" +msgid "cannot close written %s file '%s'" +msgstr "грешка при затварянето на записания файл „%s“ „%s“" + +#: builtin/index-pack.c:1454 +msgid "error while closing pack file" +msgstr "грешка при затварянето на пакетния файл" -#: builtin/index-pack.c:1439 +#: builtin/index-pack.c:1468 msgid "cannot store pack file" msgstr "пакетният файл не може да бъде запазен" -#: builtin/index-pack.c:1447 +#: builtin/index-pack.c:1476 msgid "cannot store index file" msgstr "файлът за индекса не може да бъде съхранен" -#: builtin/index-pack.c:1485 +#: builtin/index-pack.c:1513 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "зададена е неправилна версия пакетиране: „pack.indexversion=%<PRIu32>“" -#: builtin/index-pack.c:1553 +#: builtin/index-pack.c:1581 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Съществуващият пакетен файл „%s“ не може да бъде отворен" -#: builtin/index-pack.c:1555 +#: builtin/index-pack.c:1583 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Съществуващият индекс за пакетния файл „%s“ не може да бъде отворен" -#: builtin/index-pack.c:1603 +#: builtin/index-pack.c:1631 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "%d обект не е разлика" msgstr[1] "%d обекта не са разлика" -#: builtin/index-pack.c:1610 +#: builtin/index-pack.c:1638 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "дължината на веригата е %d: %lu обект" msgstr[1] "дължината на веригата е %d: %lu обекта" -#: builtin/index-pack.c:1623 -#, c-format -msgid "packfile name '%s' does not end with '.pack'" -msgstr "името на пакетния файл „%s“ не завършва на „.pack“" +#: builtin/index-pack.c:1675 +msgid "Cannot come back to cwd" +msgstr "Процесът не може да се върне към предишната работна директория" -#: builtin/index-pack.c:1700 builtin/index-pack.c:1703 -#: builtin/index-pack.c:1719 builtin/index-pack.c:1723 +#: builtin/index-pack.c:1724 builtin/index-pack.c:1727 +#: builtin/index-pack.c:1743 builtin/index-pack.c:1747 #, c-format msgid "bad %s" msgstr "неправилна стойност „%s“" -#: builtin/index-pack.c:1739 +#: builtin/index-pack.c:1763 msgid "--fix-thin cannot be used without --stdin" msgstr "опцията „--fix-thin“ изисква „--stdin“" -#: builtin/index-pack.c:1741 +#: builtin/index-pack.c:1765 msgid "--stdin requires a git repository" msgstr "„--stdin“ изисква хранилище на git" -#: builtin/index-pack.c:1749 +#: builtin/index-pack.c:1771 msgid "--verify with no packfile name given" msgstr "опцията „--verify“ изисква име на пакетен файл" @@ -9880,124 +10090,124 @@ msgstr "опцията „--trailer“ е несъвместима с „--name- msgid "no input file given for in-place editing" msgstr "не е зададен входен файл за редактиране на място" -#: builtin/log.c:46 +#: builtin/log.c:48 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [ОПЦИЯ…] [ДИАПАЗОН_НА_ВЕРСИИТЕ] [[--] ПЪТ…]" -#: builtin/log.c:47 +#: builtin/log.c:49 msgid "git show [<options>] <object>..." msgstr "git show [ОПЦИЯ…] ОБЕКТ…" -#: builtin/log.c:91 +#: builtin/log.c:93 #, c-format msgid "invalid --decorate option: %s" msgstr "неправилна опция „--decorate“: %s" -#: builtin/log.c:151 +#: builtin/log.c:153 msgid "suppress diff output" msgstr "без извеждане на разликите" -#: builtin/log.c:152 +#: builtin/log.c:154 msgid "show source" msgstr "извеждане на изходния код" -#: builtin/log.c:153 +#: builtin/log.c:155 msgid "Use mail map file" msgstr "" "Използване на файл за съответствията на имената и адресите на е-поща („." "mailmap“)" -#: builtin/log.c:155 +#: builtin/log.c:157 msgid "only decorate refs that match <pattern>" msgstr "специален формат само на указателите напасващи на ШАБЛОНа" -#: builtin/log.c:157 +#: builtin/log.c:159 msgid "do not decorate refs that match <pattern>" msgstr "без специален формат на указателите напасващи на ШАБЛОНа" -#: builtin/log.c:158 +#: builtin/log.c:160 msgid "decorate options" msgstr "настройки на форма̀та на извежданата информация" -#: builtin/log.c:161 +#: builtin/log.c:163 msgid "Process line range n,m in file, counting from 1" msgstr "" "Обработване само на редовете във файла в диапазона от n до m включително. " "Броенето започва от 1" -#: builtin/log.c:257 +#: builtin/log.c:259 #, c-format msgid "Final output: %d %s\n" msgstr "Резултат: %d %s\n" -#: builtin/log.c:508 +#: builtin/log.c:510 #, c-format msgid "git show %s: bad file" msgstr "git show %s: повреден файл" -#: builtin/log.c:523 builtin/log.c:617 +#: builtin/log.c:525 builtin/log.c:619 #, c-format msgid "Could not read object %s" msgstr "Обектът не може да бъде прочетен: %s" -#: builtin/log.c:641 +#: builtin/log.c:643 #, c-format msgid "Unknown type: %d" msgstr "Неизвестен вид: %d" -#: builtin/log.c:762 +#: builtin/log.c:764 msgid "format.headers without value" msgstr "не е зададена стойност на „format.headers“" -#: builtin/log.c:863 +#: builtin/log.c:865 msgid "name of output directory is too long" msgstr "прекалено дълго име на директорията за изходната информация" -#: builtin/log.c:879 +#: builtin/log.c:881 #, c-format msgid "Cannot open patch file %s" msgstr "Файлът-кръпка „%s“ не може да бъде отворен" -#: builtin/log.c:896 +#: builtin/log.c:898 msgid "Need exactly one range." msgstr "Трябва да зададете точно един диапазон." -#: builtin/log.c:906 +#: builtin/log.c:908 msgid "Not a range." msgstr "Не е диапазон." -#: builtin/log.c:1012 +#: builtin/log.c:1014 msgid "Cover letter needs email format" msgstr "Придружаващото писмо трябва да е форматирано като е-писмо" -#: builtin/log.c:1092 +#: builtin/log.c:1095 #, c-format msgid "insane in-reply-to: %s" msgstr "неправилен формат на заглавната част за отговор „in-reply-to“: %s" -#: builtin/log.c:1119 +#: builtin/log.c:1122 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [ОПЦИЯ…] [ОТ | ДИАПАЗОН_НА_ВЕРСИИТЕ]" -#: builtin/log.c:1169 +#: builtin/log.c:1172 msgid "Two output directories?" msgstr "Можете да укажете максимум една директория за изход." -#: builtin/log.c:1276 builtin/log.c:1927 builtin/log.c:1929 builtin/log.c:1941 +#: builtin/log.c:1279 builtin/log.c:1932 builtin/log.c:1934 builtin/log.c:1946 #, c-format msgid "Unknown commit %s" msgstr "Непознато подаване „%s“" -#: builtin/log.c:1286 builtin/notes.c:887 builtin/tag.c:516 +#: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:522 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Не може да се открие към какво сочи „%s“." -#: builtin/log.c:1291 +#: builtin/log.c:1294 msgid "Could not find exact merge base." msgstr "Точната база за сливане не може да се открие." -#: builtin/log.c:1295 +#: builtin/log.c:1298 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" @@ -10007,234 +10217,234 @@ msgstr "" "зададете, използвайте „git branch --set-upstream-to“.\n" "Можете ръчно да зададете базово подаване чрез „--base=<base-commit-id>“." -#: builtin/log.c:1315 +#: builtin/log.c:1318 msgid "Failed to find exact merge base" msgstr "Точната база при сливане не може да бъде открита" -#: builtin/log.c:1326 +#: builtin/log.c:1329 msgid "base commit should be the ancestor of revision list" msgstr "базовото подаване трябва да е предшественикът на списъка с версиите" -#: builtin/log.c:1330 +#: builtin/log.c:1333 msgid "base commit shouldn't be in revision list" msgstr "базовото подаване не може да е в списъка с версиите" -#: builtin/log.c:1379 +#: builtin/log.c:1382 msgid "cannot get patch id" msgstr "идентификаторът на кръпката не може да бъде получен" -#: builtin/log.c:1438 +#: builtin/log.c:1441 msgid "use [PATCH n/m] even with a single patch" msgstr "номерация „[PATCH n/m]“ дори и при единствена кръпка" -#: builtin/log.c:1441 +#: builtin/log.c:1444 msgid "use [PATCH] even with multiple patches" msgstr "номерация „[PATCH]“ дори и при множество кръпки" -#: builtin/log.c:1445 +#: builtin/log.c:1448 msgid "print patches to standard out" msgstr "извеждане на кръпките на стандартния изход" -#: builtin/log.c:1447 +#: builtin/log.c:1450 msgid "generate a cover letter" msgstr "създаване на придружаващо писмо" -#: builtin/log.c:1449 +#: builtin/log.c:1452 msgid "use simple number sequence for output file names" msgstr "проста числова последователност за имената на файловете-кръпки" -#: builtin/log.c:1450 +#: builtin/log.c:1453 msgid "sfx" msgstr "ЗНАЦИ" -#: builtin/log.c:1451 +#: builtin/log.c:1454 msgid "use <sfx> instead of '.patch'" msgstr "използване на тези ЗНАЦИ за суфикс вместо „.patch“" -#: builtin/log.c:1453 +#: builtin/log.c:1456 msgid "start numbering patches at <n> instead of 1" msgstr "номерирането на кръпките да започва от този БРОЙ, а не с 1" -#: builtin/log.c:1455 +#: builtin/log.c:1458 msgid "mark the series as Nth re-roll" msgstr "отбелязване, че това е N-тата поредна редакция на поредицата от кръпки" -#: builtin/log.c:1457 +#: builtin/log.c:1460 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Използване на „[RFC PATCH]“ вместо „[PATCH]“" -#: builtin/log.c:1460 +#: builtin/log.c:1463 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Използване на този „[ПРЕФИКС]“ вместо „[PATCH]“" -#: builtin/log.c:1463 +#: builtin/log.c:1466 msgid "store resulting files in <dir>" msgstr "запазване на изходните файлове в тази ДИРЕКТОРИЯ" -#: builtin/log.c:1466 +#: builtin/log.c:1469 msgid "don't strip/add [PATCH]" msgstr "без добавяне/махане на префикса „[PATCH]“" -#: builtin/log.c:1469 +#: builtin/log.c:1472 msgid "don't output binary diffs" msgstr "без извеждане на разлики между двоични файлове" -#: builtin/log.c:1471 +#: builtin/log.c:1474 msgid "output all-zero hash in From header" msgstr "в заглавната част „From:“ (от) хешът да е само от нули" -#: builtin/log.c:1473 +#: builtin/log.c:1476 msgid "don't include a patch matching a commit upstream" msgstr "да не се включват кръпки, които присъстват в следения клон" -#: builtin/log.c:1475 +#: builtin/log.c:1478 msgid "show patch format instead of default (patch + stat)" msgstr "" "извеждане във формат за кръпки, а на в стандартния (кръпка и статистика)" -#: builtin/log.c:1477 +#: builtin/log.c:1480 msgid "Messaging" msgstr "Опции при изпращане" -#: builtin/log.c:1478 +#: builtin/log.c:1481 msgid "header" msgstr "ЗАГЛАВНА_ЧАСТ" -#: builtin/log.c:1479 +#: builtin/log.c:1482 msgid "add email header" msgstr "добавяне на тази ЗАГЛАВНА_ЧАСТ" -#: builtin/log.c:1480 builtin/log.c:1482 +#: builtin/log.c:1483 builtin/log.c:1485 msgid "email" msgstr "Е-ПОЩА" -#: builtin/log.c:1480 +#: builtin/log.c:1483 msgid "add To: header" msgstr "добавяне на заглавна част „To:“ (до)" -#: builtin/log.c:1482 +#: builtin/log.c:1485 msgid "add Cc: header" msgstr "добавяне на заглавна част „Cc:“ (и до)" -#: builtin/log.c:1484 +#: builtin/log.c:1487 msgid "ident" msgstr "ИДЕНТИЧНОСТ" -#: builtin/log.c:1485 +#: builtin/log.c:1488 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "задаване на адреса в заглавната част „From“ (от) да е тази ИДЕНТИЧНОСТ. Ако " "не е зададена такава, се взима адреса на подаващия" -#: builtin/log.c:1487 +#: builtin/log.c:1490 msgid "message-id" msgstr "ИДЕНТИФИКАТОР_НА_СЪОБЩЕНИЕ" -#: builtin/log.c:1488 +#: builtin/log.c:1491 msgid "make first mail a reply to <message-id>" msgstr "" "първото съобщение да е в отговор на е-писмото с този " "ИДЕНТИФИКАТОР_НА_СЪОБЩЕНИЕ" -#: builtin/log.c:1489 builtin/log.c:1492 +#: builtin/log.c:1492 builtin/log.c:1495 msgid "boundary" msgstr "граница" -#: builtin/log.c:1490 +#: builtin/log.c:1493 msgid "attach the patch" msgstr "прикрепяне на кръпката" -#: builtin/log.c:1493 +#: builtin/log.c:1496 msgid "inline the patch" msgstr "включване на кръпката в текста на писмата" -#: builtin/log.c:1497 +#: builtin/log.c:1500 msgid "enable message threading, styles: shallow, deep" msgstr "" "използване на нишки за съобщенията. СТИЛът е „shallow“ (плитък) или " "„deep“ (дълбок)" -#: builtin/log.c:1499 +#: builtin/log.c:1502 msgid "signature" msgstr "подпис" -#: builtin/log.c:1500 +#: builtin/log.c:1503 msgid "add a signature" msgstr "добавяне на поле за подпис" -#: builtin/log.c:1501 +#: builtin/log.c:1504 msgid "base-commit" msgstr "БАЗОВО_ПОДАВАНЕ" -#: builtin/log.c:1502 +#: builtin/log.c:1505 msgid "add prerequisite tree info to the patch series" msgstr "добавяне на необходимото БАЗово дърво към серията кръпки" -#: builtin/log.c:1504 +#: builtin/log.c:1507 msgid "add a signature from a file" msgstr "добавяне на подпис от файл" -#: builtin/log.c:1505 +#: builtin/log.c:1508 msgid "don't print the patch filenames" msgstr "без извеждане на имената на кръпките" -#: builtin/log.c:1507 +#: builtin/log.c:1510 msgid "show progress while generating patches" msgstr "извеждане на напредъка във фазата на създаване на кръпките" -#: builtin/log.c:1582 +#: builtin/log.c:1585 #, c-format msgid "invalid ident line: %s" msgstr "грешна идентичност: %s" -#: builtin/log.c:1597 +#: builtin/log.c:1600 msgid "-n and -k are mutually exclusive." msgstr "опциите „-n“ и „-k“ са несъвместими." -#: builtin/log.c:1599 +#: builtin/log.c:1602 msgid "--subject-prefix/--rfc and -k are mutually exclusive." msgstr "опциите „--subject-prefix“/„-rfc“ и „-k“ са несъвместими." -#: builtin/log.c:1607 +#: builtin/log.c:1610 msgid "--name-only does not make sense" msgstr "опцията „--name-only“ е несъвместима с генерирането на кръпки" -#: builtin/log.c:1609 +#: builtin/log.c:1612 msgid "--name-status does not make sense" msgstr "опцията „--name-status“ е несъвместима с генерирането на кръпки" -#: builtin/log.c:1611 +#: builtin/log.c:1614 msgid "--check does not make sense" msgstr "опцията „--check“ е несъвместима с генерирането на кръпки" -#: builtin/log.c:1641 +#: builtin/log.c:1646 msgid "standard output, or directory, which one?" msgstr "" "изходът може да или стандартният, или да е в директория, но не и двете." -#: builtin/log.c:1643 +#: builtin/log.c:1648 #, c-format msgid "Could not create directory '%s'" msgstr "Директорията „%s“ не може да бъде създадена" -#: builtin/log.c:1736 +#: builtin/log.c:1741 #, c-format msgid "unable to read signature file '%s'" msgstr "файлът „%s“ с подпис не може да бъде прочетен" -#: builtin/log.c:1768 +#: builtin/log.c:1773 msgid "Generating patches" msgstr "Създаване на кръпки" -#: builtin/log.c:1812 +#: builtin/log.c:1817 msgid "Failed to create output files" msgstr "Изходните файлове не могат да бъдат създадени" -#: builtin/log.c:1862 +#: builtin/log.c:1867 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [ОТДАЛЕЧЕН_КЛОН [ВРЪХ [ПРЕДЕЛ]]]" -#: builtin/log.c:1916 +#: builtin/log.c:1921 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -10390,7 +10600,7 @@ msgstr "взимане предвид на „url.БАЗА.insteadOf“" msgid "exit with exit code 2 if no matching refs are found" msgstr "изход с код 2, ако не се открият съвпадащи указатели" -#: builtin/ls-remote.c:66 +#: builtin/ls-remote.c:67 msgid "show underlying ref in addition to the object pointed by it" msgstr "извеждане на указателя заедно с обекта сочен от него" @@ -10437,186 +10647,186 @@ msgstr "" msgid "empty mbox: '%s'" msgstr "празна пощенска кутия mbox: „%s“" -#: builtin/merge.c:48 +#: builtin/merge.c:49 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [ОПЦИЯ…] [ПОДАВАНЕ…]" -#: builtin/merge.c:49 +#: builtin/merge.c:50 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:50 +#: builtin/merge.c:51 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:107 +#: builtin/merge.c:108 msgid "switch `m' requires a value" msgstr "опцията „-m“ изисква стойност" -#: builtin/merge.c:144 +#: builtin/merge.c:145 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Няма такава стратегия за сливане: „%s“.\n" -#: builtin/merge.c:145 +#: builtin/merge.c:146 #, c-format msgid "Available strategies are:" msgstr "Наличните стратегии са:" -#: builtin/merge.c:150 +#: builtin/merge.c:151 #, c-format msgid "Available custom strategies are:" msgstr "Допълнителните стратегии са:" -#: builtin/merge.c:200 builtin/pull.c:137 +#: builtin/merge.c:201 builtin/pull.c:137 msgid "do not show a diffstat at the end of the merge" msgstr "без извеждане на статистиката след завършване на сливане" -#: builtin/merge.c:203 builtin/pull.c:140 +#: builtin/merge.c:204 builtin/pull.c:140 msgid "show a diffstat at the end of the merge" msgstr "извеждане на статистиката след завършване на сливане" -#: builtin/merge.c:204 builtin/pull.c:143 +#: builtin/merge.c:205 builtin/pull.c:143 msgid "(synonym to --stat)" msgstr "(синоним на „--stat“)" -#: builtin/merge.c:206 builtin/pull.c:146 +#: builtin/merge.c:207 builtin/pull.c:146 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "добавяне (на максимум такъв БРОЙ) записи от съкратения журнал в съобщението " "за подаване" -#: builtin/merge.c:209 builtin/pull.c:152 +#: builtin/merge.c:210 builtin/pull.c:152 msgid "create a single commit instead of doing a merge" msgstr "създаване на едно подаване вместо извършване на сливане" -#: builtin/merge.c:211 builtin/pull.c:155 +#: builtin/merge.c:212 builtin/pull.c:155 msgid "perform a commit if the merge succeeds (default)" msgstr "извършване на подаване при успешно сливане (стандартно действие)" -#: builtin/merge.c:213 builtin/pull.c:158 +#: builtin/merge.c:214 builtin/pull.c:158 msgid "edit message before committing" msgstr "редактиране на съобщението преди подаване" -#: builtin/merge.c:214 +#: builtin/merge.c:215 msgid "allow fast-forward (default)" msgstr "позволяване на превъртане (стандартно действие)" -#: builtin/merge.c:216 builtin/pull.c:164 +#: builtin/merge.c:217 builtin/pull.c:164 msgid "abort if fast-forward is not possible" msgstr "преустановяване, ако превъртането е невъзможно" -#: builtin/merge.c:220 builtin/pull.c:167 +#: builtin/merge.c:221 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:171 +#: builtin/merge.c:222 builtin/notes.c:777 builtin/pull.c:171 #: builtin/revert.c:109 msgid "strategy" msgstr "СТРАТЕГИЯ" -#: builtin/merge.c:222 builtin/pull.c:172 +#: builtin/merge.c:223 builtin/pull.c:172 msgid "merge strategy to use" msgstr "СТРАТЕГИЯ за сливане, която да се ползва" -#: builtin/merge.c:223 builtin/pull.c:175 +#: builtin/merge.c:224 builtin/pull.c:175 msgid "option=value" msgstr "ОПЦИЯ=СТОЙНОСТ" -#: builtin/merge.c:224 builtin/pull.c:176 +#: builtin/merge.c:225 builtin/pull.c:176 msgid "option for selected merge strategy" msgstr "ОПЦИЯ за избраната стратегия за сливане" -#: builtin/merge.c:226 +#: builtin/merge.c:227 msgid "merge commit message (for a non-fast-forward merge)" msgstr "СЪОБЩЕНИЕ при подаването със сливане (при същински сливания)" -#: builtin/merge.c:230 +#: builtin/merge.c:231 msgid "abort the current in-progress merge" msgstr "преустановяване на текущото сливане" -#: builtin/merge.c:232 +#: builtin/merge.c:233 msgid "continue the current in-progress merge" msgstr "продължаване на текущото сливане" -#: builtin/merge.c:234 builtin/pull.c:183 +#: builtin/merge.c:235 builtin/pull.c:183 msgid "allow merging unrelated histories" msgstr "позволяване на сливане на независими истории" -#: builtin/merge.c:240 +#: builtin/merge.c:241 msgid "verify commit-msg hook" msgstr "" "проверка на куката при промяна на съобщението при подаване (commit-msg)" -#: builtin/merge.c:265 +#: builtin/merge.c:266 msgid "could not run stash." msgstr "не може да се извърши скатаване" -#: builtin/merge.c:270 +#: builtin/merge.c:271 msgid "stash failed" msgstr "неуспешно скатаване" -#: builtin/merge.c:275 +#: builtin/merge.c:276 #, c-format msgid "not a valid object: %s" msgstr "неправилен обект: „%s“" -#: builtin/merge.c:297 builtin/merge.c:314 +#: builtin/merge.c:298 builtin/merge.c:315 msgid "read-tree failed" msgstr "неуспешно прочитане на обект-дърво" -#: builtin/merge.c:344 +#: builtin/merge.c:345 msgid " (nothing to squash)" msgstr " (няма какво да се смачка)" -#: builtin/merge.c:355 +#: builtin/merge.c:356 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Подаване със смачкване — указателят „HEAD“ няма да бъде обновен\n" -#: builtin/merge.c:405 +#: builtin/merge.c:406 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" "Липсва съобщение при подаване — указателят „HEAD“ няма да бъде обновен\n" -#: builtin/merge.c:455 +#: builtin/merge.c:456 #, c-format msgid "'%s' does not point to a commit" msgstr "„%s“ не сочи към подаване" -#: builtin/merge.c:545 +#: builtin/merge.c:546 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Неправилен низ за настройката „branch.%s.mergeoptions“: „%s“" -#: builtin/merge.c:667 +#: builtin/merge.c:668 msgid "Not handling anything other than two heads merge." msgstr "Поддържа се само сливане на точно две истории." -#: builtin/merge.c:681 +#: builtin/merge.c:682 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Непозната опция за рекурсивното сливане „merge-recursive“: „-X%s“" -#: builtin/merge.c:696 +#: builtin/merge.c:697 #, c-format msgid "unable to write %s" msgstr "„%s“ не може да бъде записан" -#: builtin/merge.c:748 +#: builtin/merge.c:749 #, c-format msgid "Could not read from '%s'" msgstr "От „%s“ не може да се чете" -#: builtin/merge.c:757 +#: builtin/merge.c:758 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Сливането няма да бъде подадено. За завършването му и подаването му " "използвайте командата „git commit“.\n" -#: builtin/merge.c:763 +#: builtin/merge.c:764 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -10631,72 +10841,72 @@ msgstr "" "Редовете, които започват с „%c“ ще бъдат пропуснати, а празно съобщение\n" "преустановява подаването.\n" -#: builtin/merge.c:799 +#: builtin/merge.c:800 msgid "Empty commit message." msgstr "Празно съобщение при подаване." -#: builtin/merge.c:819 +#: builtin/merge.c:820 #, c-format msgid "Wonderful.\n" msgstr "Първият етап на сливането завърши.\n" -#: builtin/merge.c:872 +#: builtin/merge.c:873 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Неуспешно автоматично сливане — коригирайте конфликтите и подайте " "резултата.\n" -#: builtin/merge.c:911 +#: builtin/merge.c:912 msgid "No current branch." msgstr "Няма текущ клон." -#: builtin/merge.c:913 +#: builtin/merge.c:914 msgid "No remote for the current branch." msgstr "Текущият клон не следи никой." -#: builtin/merge.c:915 +#: builtin/merge.c:916 msgid "No default upstream defined for the current branch." msgstr "Текущият клон не следи никой клон." -#: builtin/merge.c:920 +#: builtin/merge.c:921 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Никой клон не следи клона „%s“ от хранилището „%s“" -#: builtin/merge.c:973 +#: builtin/merge.c:974 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Неправилна стойност „%s“ в средата „%s“" -#: builtin/merge.c:1075 +#: builtin/merge.c:1076 #, c-format msgid "not something we can merge in %s: %s" msgstr "не може да се слее в „%s“: %s" -#: builtin/merge.c:1109 +#: builtin/merge.c:1110 msgid "not something we can merge" msgstr "не може да се слее" -#: builtin/merge.c:1174 +#: builtin/merge.c:1212 msgid "--abort expects no arguments" msgstr "опцията „--abort“ не приема аргументи" -#: builtin/merge.c:1178 +#: builtin/merge.c:1216 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" "Не може да преустановите сливане, защото в момента не се извършва такова " "(липсва указател „MERGE_HEAD“)." -#: builtin/merge.c:1190 +#: builtin/merge.c:1228 msgid "--continue expects no arguments" msgstr "опцията „--continue“ не приема аргументи" -#: builtin/merge.c:1194 +#: builtin/merge.c:1232 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "В момента не се извършва сливане (липсва указател „MERGE_HEAD“)." -#: builtin/merge.c:1210 +#: builtin/merge.c:1248 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10704,7 +10914,7 @@ msgstr "" "Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува).\n" "Подайте промените си, преди да започнете ново сливане." -#: builtin/merge.c:1217 +#: builtin/merge.c:1255 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10712,121 +10922,121 @@ msgstr "" "Не сте завършили отбиране на подаване (указателят „CHERRY_PICK_HEAD“\n" "съществува). Подайте промените си, преди да започнете ново сливане." -#: builtin/merge.c:1220 +#: builtin/merge.c:1258 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" "Не сте завършили отбиране на подаване (указателят „CHERRY_PICK_HEAD“\n" "съществува)." -#: builtin/merge.c:1229 +#: builtin/merge.c:1267 msgid "You cannot combine --squash with --no-ff." msgstr "Опцията „--squash“ е несъвместима с „--no-ff“." -#: builtin/merge.c:1237 +#: builtin/merge.c:1275 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "Не е указано подаване и настройката „merge.defaultToUpstream“ не е зададена." -#: builtin/merge.c:1254 +#: builtin/merge.c:1292 msgid "Squash commit into empty head not supported yet" msgstr "Подаване със смачкване във връх без история все още не се поддържа" -#: builtin/merge.c:1256 +#: builtin/merge.c:1294 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" "Понеже върхът е без история, всички сливания са превъртания, не може да се " "извърши същинско сливане изисквано от опцията „--no-ff“" -#: builtin/merge.c:1261 +#: builtin/merge.c:1299 #, c-format msgid "%s - not something we can merge" msgstr "„%s“ — не е нещо, което може да се слее" -#: builtin/merge.c:1263 +#: builtin/merge.c:1301 msgid "Can merge only exactly one commit into empty head" msgstr "Можете да слеете точно едно подаване във връх без история" -#: builtin/merge.c:1297 +#: builtin/merge.c:1335 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "Подаването „%s“ е с недоверен подпис от GPG, който твърди, че е на „%s“." -#: builtin/merge.c:1300 +#: builtin/merge.c:1338 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" "Подаването „%s“ е с неправилен подпис от GPG, който твърди, че е на „%s“." -#: builtin/merge.c:1303 +#: builtin/merge.c:1341 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Подаването „%s“ е без подпис от GPG." -#: builtin/merge.c:1306 +#: builtin/merge.c:1344 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Подаването „%s“ е с коректен подпис от GPG на „%s“.\n" -#: builtin/merge.c:1368 +#: builtin/merge.c:1403 msgid "refusing to merge unrelated histories" msgstr "независими истории не може да се слеят" -#: builtin/merge.c:1377 +#: builtin/merge.c:1412 msgid "Already up to date." msgstr "Вече е обновено." -#: builtin/merge.c:1387 +#: builtin/merge.c:1422 #, c-format msgid "Updating %s..%s\n" msgstr "Обновяване „%s..%s“\n" -#: builtin/merge.c:1428 +#: builtin/merge.c:1463 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Проба със сливане в рамките на индекса…\n" -#: builtin/merge.c:1435 +#: builtin/merge.c:1470 #, c-format msgid "Nope.\n" msgstr "Неуспешно сливане.\n" -#: builtin/merge.c:1460 +#: builtin/merge.c:1495 msgid "Already up to date. Yeeah!" msgstr "Вече е обновено!" -#: builtin/merge.c:1466 +#: builtin/merge.c:1501 msgid "Not possible to fast-forward, aborting." msgstr "Не може да се извърши превъртане, преустановяване на действието." -#: builtin/merge.c:1489 builtin/merge.c:1568 +#: builtin/merge.c:1524 builtin/merge.c:1603 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Привеждане на дървото към първоначалното…\n" -#: builtin/merge.c:1493 +#: builtin/merge.c:1528 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Пробване със стратегията за сливане „%s“…\n" -#: builtin/merge.c:1559 +#: builtin/merge.c:1594 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Никоя стратегия за сливане не може да извърши сливането.\n" -#: builtin/merge.c:1561 +#: builtin/merge.c:1596 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Неуспешно сливане със стратегия „%s“.\n" -#: builtin/merge.c:1570 +#: builtin/merge.c:1605 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" "Ползва се стратегията „%s“, която ще подготви дървото за коригиране на " "ръка.\n" -#: builtin/merge.c:1582 +#: builtin/merge.c:1617 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -10985,72 +11195,72 @@ msgstr "„%.*s“ вече е в индекса" msgid "force move/rename even if target exists" msgstr "принудително преместване/преименуване дори целта да съществува" -#: builtin/mv.c:126 +#: builtin/mv.c:127 msgid "skip move/rename errors" msgstr "прескачане на грешките при преместване/преименуване" -#: builtin/mv.c:167 +#: builtin/mv.c:168 #, c-format msgid "destination '%s' is not a directory" msgstr "целта „%s“ съществува и не е директория" -#: builtin/mv.c:178 +#: builtin/mv.c:179 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Проверка на преименуването на обект от „%s“ на „%s“\n" -#: builtin/mv.c:182 +#: builtin/mv.c:183 msgid "bad source" msgstr "неправилен обект" -#: builtin/mv.c:185 +#: builtin/mv.c:186 msgid "can not move directory into itself" msgstr "директория не може да се премести в себе си" -#: builtin/mv.c:188 +#: builtin/mv.c:189 msgid "cannot move directory over file" msgstr "директория не може да се премести върху файл" -#: builtin/mv.c:197 +#: builtin/mv.c:198 msgid "source directory is empty" msgstr "първоначалната директория е празна" -#: builtin/mv.c:222 +#: builtin/mv.c:223 msgid "not under version control" msgstr "не е под контрола на Git" -#: builtin/mv.c:225 +#: builtin/mv.c:226 msgid "destination exists" msgstr "целта съществува" -#: builtin/mv.c:233 +#: builtin/mv.c:234 #, c-format msgid "overwriting '%s'" msgstr "презаписване на „%s“" -#: builtin/mv.c:236 +#: builtin/mv.c:237 msgid "Cannot overwrite" msgstr "Презаписването е невъзможно" -#: builtin/mv.c:239 +#: builtin/mv.c:240 msgid "multiple sources for the same target" msgstr "множество източници за една цел" -#: builtin/mv.c:241 +#: builtin/mv.c:242 msgid "destination directory does not exist" msgstr "целевата директория не съществува" -#: builtin/mv.c:248 +#: builtin/mv.c:249 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, обект: „%s“, цел: „%s“" -#: builtin/mv.c:269 +#: builtin/mv.c:270 #, c-format msgid "Renaming %s to %s\n" msgstr "Преименуване на „%s“ на „%s“\n" -#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390 +#: builtin/mv.c:276 builtin/remote.c:712 builtin/repack.c:394 #, c-format msgid "renaming '%s' failed" msgstr "неуспешно преименуване на „%s“" @@ -11244,12 +11454,12 @@ msgstr "обектът-бележка не може да бъде записан msgid "the note contents have been left in %s" msgstr "съдържанието на бележката е във файла „%s“" -#: builtin/notes.c:234 builtin/tag.c:500 +#: builtin/notes.c:234 builtin/tag.c:506 #, c-format msgid "cannot read '%s'" msgstr "файлът „%s“ не може да бъде прочетен" -#: builtin/notes.c:236 builtin/tag.c:503 +#: builtin/notes.c:236 builtin/tag.c:509 #, c-format msgid "could not open or read '%s'" msgstr "файлът „%s“ не може да бъде отворен или прочетен" @@ -11503,7 +11713,7 @@ msgstr "опитът за изтриването на несъществуващ msgid "read object names from the standard input" msgstr "изчитане на имената на обектите от стандартния вход" -#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:158 +#: builtin/notes.c:943 builtin/prune.c:106 builtin/worktree.c:160 msgid "do not remove, show only" msgstr "само извеждане без действително окастряне" @@ -11537,200 +11747,204 @@ msgstr "" "git pack-objects [ОПЦИЯ…] ПРЕФИКС_НА_ИМЕТО [< СПИСЪК_С_УКАЗАТЕЛИ | < " "СПИСЪК_С_ОБЕКТИ]" -#: builtin/pack-objects.c:192 builtin/pack-objects.c:195 +#: builtin/pack-objects.c:195 builtin/pack-objects.c:198 #, c-format msgid "deflate error (%d)" msgstr "грешка при декомпресиране с „deflate“ (%d)" -#: builtin/pack-objects.c:788 +#: builtin/pack-objects.c:791 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "изключване на записването на битовата маска, пакетите са разделени поради " "стойността на „pack.packSizeLimit“" -#: builtin/pack-objects.c:801 +#: builtin/pack-objects.c:804 msgid "Writing objects" msgstr "Записване на обектите" -#: builtin/pack-objects.c:1081 +#: builtin/pack-objects.c:1084 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "изключване на записването на битовата маска, защото някои обекти няма да се " "пакетират" -#: builtin/pack-objects.c:2451 +#: builtin/pack-objects.c:2454 msgid "Compressing objects" msgstr "Компресиране на обектите" -#: builtin/pack-objects.c:2599 +#: builtin/pack-objects.c:2625 msgid "invalid value for --missing" msgstr "неправилна стойност за „--missing“" -#: builtin/pack-objects.c:2902 +#: builtin/pack-objects.c:2928 #, c-format msgid "unsupported index version %s" msgstr "неподдържана версия на индекса „%s“" -#: builtin/pack-objects.c:2906 +#: builtin/pack-objects.c:2932 #, c-format msgid "bad index version '%s'" msgstr "неправилна версия на индекса „%s“" -#: builtin/pack-objects.c:2936 +#: builtin/pack-objects.c:2962 msgid "do not show progress meter" msgstr "без извеждане на напредъка" -#: builtin/pack-objects.c:2938 +#: builtin/pack-objects.c:2964 msgid "show progress meter" msgstr "извеждане на напредъка" -#: builtin/pack-objects.c:2940 +#: builtin/pack-objects.c:2966 msgid "show progress meter during object writing phase" msgstr "извеждане на напредъка във фазата на запазване на обектите" -#: builtin/pack-objects.c:2943 +#: builtin/pack-objects.c:2969 msgid "similar to --all-progress when progress meter is shown" msgstr "" "същото действие като опцията „--all-progress“ при извеждането на напредъка" -#: builtin/pack-objects.c:2944 +#: builtin/pack-objects.c:2970 msgid "version[,offset]" msgstr "ВЕРСИЯ[,ОТМЕСТВАНЕ]" -#: builtin/pack-objects.c:2945 +#: builtin/pack-objects.c:2971 msgid "write the pack index file in the specified idx format version" msgstr "" "запазване на индекса на пакетните файлове във форма̀та с указаната версия" -#: builtin/pack-objects.c:2948 +#: builtin/pack-objects.c:2974 msgid "maximum size of each output pack file" msgstr "максимален размер на всеки пакетен файл" -#: builtin/pack-objects.c:2950 +#: builtin/pack-objects.c:2976 msgid "ignore borrowed objects from alternate object store" msgstr "игнориране на обектите заети от други хранилища на обекти" -#: builtin/pack-objects.c:2952 +#: builtin/pack-objects.c:2978 msgid "ignore packed objects" msgstr "игнориране на пакетираните обекти" -#: builtin/pack-objects.c:2954 +#: builtin/pack-objects.c:2980 msgid "limit pack window by objects" msgstr "ограничаване на прозореца за пакетиране по брой обекти" -#: builtin/pack-objects.c:2956 +#: builtin/pack-objects.c:2982 msgid "limit pack window by memory in addition to object limit" msgstr "" "ограничаване на прозореца за пакетиране и по памет освен по брой обекти" -#: builtin/pack-objects.c:2958 +#: builtin/pack-objects.c:2984 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" "максимална дължина на веригата от разлики, която е позволена в пакетния файл" -#: builtin/pack-objects.c:2960 +#: builtin/pack-objects.c:2986 msgid "reuse existing deltas" msgstr "преизползване на съществуващите разлики" -#: builtin/pack-objects.c:2962 +#: builtin/pack-objects.c:2988 msgid "reuse existing objects" msgstr "преизползване на съществуващите обекти" -#: builtin/pack-objects.c:2964 +#: builtin/pack-objects.c:2990 msgid "use OFS_DELTA objects" msgstr "използване на обекти „OFS_DELTA“" -#: builtin/pack-objects.c:2966 +#: builtin/pack-objects.c:2992 msgid "use threads when searching for best delta matches" msgstr "" "стартиране на нишки за претърсване на най-добрите съвпадения на разликите" -#: builtin/pack-objects.c:2968 +#: builtin/pack-objects.c:2994 msgid "do not create an empty pack output" msgstr "без създаване на празен пакетен файл" -#: builtin/pack-objects.c:2970 +#: builtin/pack-objects.c:2996 msgid "read revision arguments from standard input" msgstr "изчитане на версиите от стандартния вход" -#: builtin/pack-objects.c:2972 +#: builtin/pack-objects.c:2998 msgid "limit the objects to those that are not yet packed" msgstr "ограничаване до все още непакетираните обекти" -#: builtin/pack-objects.c:2975 +#: builtin/pack-objects.c:3001 msgid "include objects reachable from any reference" msgstr "" "включване на всички обекти, които могат да се достигнат от произволен " "указател" -#: builtin/pack-objects.c:2978 +#: builtin/pack-objects.c:3004 msgid "include objects referred by reflog entries" msgstr "включване и на обектите сочени от записите в журнала на указателите" -#: builtin/pack-objects.c:2981 +#: builtin/pack-objects.c:3007 msgid "include objects referred to by the index" msgstr "включване и на обектите сочени от индекса" -#: builtin/pack-objects.c:2984 +#: builtin/pack-objects.c:3010 msgid "output pack to stdout" msgstr "извеждане на пакета на стандартния изход" -#: builtin/pack-objects.c:2986 +#: builtin/pack-objects.c:3012 msgid "include tag objects that refer to objects to be packed" msgstr "" "включване и на обектите-етикети, които сочат към обектите, които ще бъдат " "пакетирани" -#: builtin/pack-objects.c:2988 +#: builtin/pack-objects.c:3014 msgid "keep unreachable objects" msgstr "запазване на недостижимите обекти" -#: builtin/pack-objects.c:2990 +#: builtin/pack-objects.c:3016 msgid "pack loose unreachable objects" msgstr "пакетиране и на недостижимите обекти" -#: builtin/pack-objects.c:2992 +#: builtin/pack-objects.c:3018 msgid "unpack unreachable objects newer than <time>" msgstr "разпакетиране на недостижимите обекти, които са по-нови от това ВРЕМЕ" -#: builtin/pack-objects.c:2995 +#: builtin/pack-objects.c:3021 msgid "create thin packs" msgstr "създаване на съкратени пакети" -#: builtin/pack-objects.c:2997 +#: builtin/pack-objects.c:3023 msgid "create packs suitable for shallow fetches" msgstr "пакетиране подходящо за плитко доставяне" -#: builtin/pack-objects.c:2999 +#: builtin/pack-objects.c:3025 msgid "ignore packs that have companion .keep file" msgstr "игнориране на пакетите, които са придружени от файл „.keep“" -#: builtin/pack-objects.c:3001 +#: builtin/pack-objects.c:3027 msgid "pack compression level" msgstr "ниво на компресиране при пакетиране" -#: builtin/pack-objects.c:3003 +#: builtin/pack-objects.c:3029 msgid "do not hide commits by grafts" msgstr "" "извеждане на всички родители — дори и тези, които нормално са скрити при " "присажданията" -#: builtin/pack-objects.c:3005 +#: builtin/pack-objects.c:3031 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "използване на съществуващи индекси на база битови маски за ускоряване на " "преброяването на обектите" -#: builtin/pack-objects.c:3007 +#: builtin/pack-objects.c:3033 msgid "write a bitmap index together with the pack index" msgstr "" "запазване и на индекс на база побитова маска, заедно с индекса за пакета" -#: builtin/pack-objects.c:3010 +#: builtin/pack-objects.c:3036 msgid "handling for missing objects" msgstr "как да се обработват липсващите обекти" -#: builtin/pack-objects.c:3144 +#: builtin/pack-objects.c:3039 +msgid "do not pack objects in promisor packfiles" +msgstr "без пакетиране на обекти в гарантиращи пакети" + +#: builtin/pack-objects.c:3178 msgid "Counting objects" msgstr "Преброяване на обектите" @@ -11758,15 +11972,19 @@ msgstr "Изтриване на повтарящите се обекти" msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire ВРЕМЕ] [--] [ВРЪХ…]" -#: builtin/prune.c:106 +#: builtin/prune.c:107 msgid "report pruned objects" msgstr "информация за окастрените обекти" -#: builtin/prune.c:109 +#: builtin/prune.c:110 msgid "expire objects older than <time>" msgstr "окастряне на обектите по-стари от това ВРЕМЕ" -#: builtin/prune.c:123 +#: builtin/prune.c:112 +msgid "limit traversal to objects outside promisor packfiles" +msgstr "ограничаване на обхождането до обекти извън гарантиращи пакети" + +#: builtin/prune.c:126 msgid "cannot prune in a precious-objects repo" msgstr "хранилище с важни обекти не може да се окастря" @@ -11867,7 +12085,7 @@ msgstr "За повече информация погледнете ръково msgid "<remote>" msgstr "ОТДАЛЕЧЕНО_ХРАНИЛИЩЕ" -#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:466 +#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:477 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "КЛОН" @@ -11892,27 +12110,27 @@ msgstr "" "За сливане е указан отдалеченият указател „%s“,\n" "но такъв не е доставен." -#: builtin/pull.c:817 +#: builtin/pull.c:819 msgid "ignoring --verify-signatures for rebase" msgstr "без „--verify-signatures“ при пребазиране" -#: builtin/pull.c:865 +#: builtin/pull.c:867 msgid "--[no-]autostash option is only valid with --rebase." msgstr "опцията „--[no-]autostash“ изисква „--rebase“" -#: builtin/pull.c:873 +#: builtin/pull.c:875 msgid "Updating an unborn branch with changes added to the index." msgstr "Обновяване на все още несъздаден клон с промените от индекса" -#: builtin/pull.c:876 +#: builtin/pull.c:878 msgid "pull with rebase" msgstr "издърпване с пребазиране" -#: builtin/pull.c:877 +#: builtin/pull.c:879 msgid "please commit or stash them." msgstr "трябва да подадете или скатаете промените." -#: builtin/pull.c:902 +#: builtin/pull.c:904 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -11922,7 +12140,7 @@ msgstr "" "доставянето обнови върха на текущия клон. Работното\n" "ви копие бе превъртяно от подаване „%s“." -#: builtin/pull.c:907 +#: builtin/pull.c:909 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -11939,15 +12157,15 @@ msgstr "" " $ git reset --hard\n" "за връщане към нормално състояние." -#: builtin/pull.c:922 +#: builtin/pull.c:924 msgid "Cannot merge multiple branches into empty head." msgstr "Не може да сливате множество клони в празен върхов указател." -#: builtin/pull.c:926 +#: builtin/pull.c:928 msgid "Cannot rebase onto multiple branches." msgstr "Не може да пребазирате върху повече от един клон." -#: builtin/pull.c:933 +#: builtin/pull.c:935 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "пребазирането е невъзможно заради локално записаните промени по подмодулите" @@ -12348,41 +12566,45 @@ msgstr "git rebase--helper [ОПЦИЯ…]" msgid "keep empty commits" msgstr "запазване на празните подавания" -#: builtin/rebase--helper.c:25 +#: builtin/rebase--helper.c:26 builtin/revert.c:123 +msgid "allow commits with empty messages" +msgstr "позволяване на празни съобщения при подаване" + +#: builtin/rebase--helper.c:27 msgid "continue rebase" msgstr "продължаване на пребазирането" -#: builtin/rebase--helper.c:27 +#: builtin/rebase--helper.c:29 msgid "abort rebase" msgstr "преустановяване на пребазирането" -#: builtin/rebase--helper.c:30 +#: builtin/rebase--helper.c:32 msgid "make rebase script" msgstr "създаване на скрипт за пребазиране" -#: builtin/rebase--helper.c:32 +#: builtin/rebase--helper.c:34 msgid "shorten commit ids in the todo list" msgstr "съкратени идентификатори в списъка за изпълнение" -#: builtin/rebase--helper.c:34 +#: builtin/rebase--helper.c:36 msgid "expand commit ids in the todo list" msgstr "пълни идентификатори в списъка за изпълнение" -#: builtin/rebase--helper.c:36 +#: builtin/rebase--helper.c:38 msgid "check the todo list" msgstr "проверка на списъка за изпълнение" -#: builtin/rebase--helper.c:38 +#: builtin/rebase--helper.c:40 msgid "skip unnecessary picks" msgstr "прескачане на излишните команди за отбиране" -#: builtin/rebase--helper.c:40 +#: builtin/rebase--helper.c:42 msgid "rearrange fixup/squash lines" msgstr "" "преподреждане на редовете за сливане на подаванията със и без смени на " "съобщението" -#: builtin/rebase--helper.c:42 +#: builtin/rebase--helper.c:44 msgid "insert exec commands in todo list" msgstr "вмъкване на командите за изпълнение в списъка за изпълнение" @@ -12390,7 +12612,7 @@ msgstr "вмъкване на командите за изпълнение в с msgid "git receive-pack <git-dir>" msgstr "git receive-pack ДИРЕКТОРИЯ_НА_GIT" -#: builtin/receive-pack.c:840 +#: builtin/receive-pack.c:841 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" @@ -12423,7 +12645,7 @@ msgstr "" "За да заглушите това съобщение, като запазите стандартното поведение,\n" "задайте настройката „receive.denyCurrentBranch“ да е „refuse“ (отказ)." -#: builtin/receive-pack.c:860 +#: builtin/receive-pack.c:861 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" @@ -12444,15 +12666,15 @@ msgstr "" "За да заглушите това съобщение, задайте настройката\n" "„receive.denyDeleteCurrent“ да е „refuse“ (отказ)." -#: builtin/receive-pack.c:1933 +#: builtin/receive-pack.c:1934 msgid "quiet" msgstr "без извеждане на информация" -#: builtin/receive-pack.c:1947 +#: builtin/receive-pack.c:1948 msgid "You must specify a directory." msgstr "Трябва да укажете директория." -#: builtin/reflog.c:531 builtin/reflog.c:536 +#: builtin/reflog.c:532 builtin/reflog.c:537 #, c-format msgid "'%s' is not a valid timestamp" msgstr "„%s“ не е правилна стойност за време" @@ -12987,96 +13209,96 @@ msgstr "" "Ползвайте опцията --no-write-bitmap-index или изключете настройката\n" "„pack.writebitmaps“." -#: builtin/repack.c:168 +#: builtin/repack.c:170 msgid "pack everything in a single pack" msgstr "пакетиране на всичко в пакет" -#: builtin/repack.c:170 +#: builtin/repack.c:172 msgid "same as -a, and turn unreachable objects loose" msgstr "" "същото като опцията „-a“. Допълнително — недостижимите обекти да станат " "непакетирани" -#: builtin/repack.c:173 +#: builtin/repack.c:175 msgid "remove redundant packs, and run git-prune-packed" msgstr "" "премахване на ненужните пакетирани файлове и изпълнение на командата „git-" "prune-packed“" -#: builtin/repack.c:175 +#: builtin/repack.c:177 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "подаване на опцията „--no-reuse-delta“ на командата „git-pack-objects“" -#: builtin/repack.c:177 +#: builtin/repack.c:179 msgid "pass --no-reuse-object to git-pack-objects" msgstr "" "подаване на опцията „--no-reuse-object“ на командата „git-pack-objects“" -#: builtin/repack.c:179 +#: builtin/repack.c:181 msgid "do not run git-update-server-info" msgstr "без изпълнение на командата „git-update-server-info“" -#: builtin/repack.c:182 +#: builtin/repack.c:184 msgid "pass --local to git-pack-objects" msgstr "подаване на опцията „--local“ на командата „git-pack-objects“" -#: builtin/repack.c:184 +#: builtin/repack.c:186 msgid "write bitmap index" msgstr "създаване и записване на индекси на база битови маски" -#: builtin/repack.c:185 +#: builtin/repack.c:187 msgid "approxidate" msgstr "евристична дата" -#: builtin/repack.c:186 +#: builtin/repack.c:188 msgid "with -A, do not loosen objects older than this" msgstr "" "при комбинирането с опцията „-A“ — без разпакетиране на обектите по стари от " "това" -#: builtin/repack.c:188 +#: builtin/repack.c:190 msgid "with -a, repack unreachable objects" msgstr "с „-a“ — препакетиране на недостижимите обекти" -#: builtin/repack.c:190 +#: builtin/repack.c:192 msgid "size of the window used for delta compression" msgstr "размер на прозореца за делта компресията" -#: builtin/repack.c:191 builtin/repack.c:197 +#: builtin/repack.c:193 builtin/repack.c:199 msgid "bytes" msgstr "байтове" -#: builtin/repack.c:192 +#: builtin/repack.c:194 msgid "same as the above, but limit memory size instead of entries count" msgstr "" "същото като горната опция, но ограничението да е по размер на паметта, а не " "по броя на обектите" -#: builtin/repack.c:194 +#: builtin/repack.c:196 msgid "limits the maximum delta depth" msgstr "ограничаване на максималната дълбочина на делтата" -#: builtin/repack.c:196 +#: builtin/repack.c:198 msgid "limits the maximum number of threads" msgstr "ограничаване на максималния брой нишки" -#: builtin/repack.c:198 +#: builtin/repack.c:200 msgid "maximum size of each packfile" msgstr "максимален размер на всеки пакет" -#: builtin/repack.c:200 +#: builtin/repack.c:202 msgid "repack objects in packs marked with .keep" msgstr "препакетиране на обектите в пакети белязани с „.keep“" -#: builtin/repack.c:210 +#: builtin/repack.c:212 msgid "cannot delete packs in a precious-objects repo" msgstr "пакетите в хранилище с важни обекти не може да се трият" -#: builtin/repack.c:214 +#: builtin/repack.c:216 msgid "--keep-unreachable and -A are incompatible" msgstr "Опциите „--keep-unreachable“ и „-A“ са несъвместими" -#: builtin/repack.c:406 builtin/worktree.c:146 +#: builtin/repack.c:410 builtin/worktree.c:148 #, c-format msgid "failed to remove '%s'" msgstr "директорията „%s“ не може да бъде изтрита" @@ -13159,11 +13381,11 @@ msgstr "смяна на родителите на подаване" msgid "replace the ref if it exists" msgstr "замяна на указателя, ако съществува" -#: builtin/replace.c:443 +#: builtin/replace.c:444 msgid "do not pretty-print contents for --edit" msgstr "без форматирано извеждане на съдържанието — за опцията „--edit“" -#: builtin/replace.c:444 +#: builtin/replace.c:445 msgid "use this format" msgstr "използване на този ФОРМАТ" @@ -13222,103 +13444,107 @@ msgstr "Дървото, сочено от указателя „HEAD“, не м msgid "Failed to find tree of %s." msgstr "Дървото, сочено от „%s“, не може да бъде открито." -#: builtin/reset.c:113 +#: builtin/reset.c:111 #, c-format msgid "HEAD is now at %s" msgstr "Указателят „HEAD“ сочи към „%s“" -#: builtin/reset.c:197 +#: builtin/reset.c:189 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "Не може да се извърши %s зануляване по време на сливане." -#: builtin/reset.c:297 +#: builtin/reset.c:289 msgid "be quiet, only report errors" msgstr "по-малко подробности, да се извеждат само грешките" -#: builtin/reset.c:299 +#: builtin/reset.c:291 msgid "reset HEAD and index" msgstr "индекса и указателя „HEAD“, без работното дърво" -#: builtin/reset.c:300 +#: builtin/reset.c:292 msgid "reset only HEAD" msgstr "само указателя „HEAD“, без индекса и работното дърво" -#: builtin/reset.c:302 builtin/reset.c:304 +#: builtin/reset.c:294 builtin/reset.c:296 msgid "reset HEAD, index and working tree" msgstr "указателя „HEAD“, индекса и работното дърво" -#: builtin/reset.c:306 +#: builtin/reset.c:298 msgid "reset HEAD but keep local changes" msgstr "зануляване на указателя „HEAD“, но запазване на локалните промени" -#: builtin/reset.c:312 +#: builtin/reset.c:304 msgid "record only the fact that removed paths will be added later" msgstr "" "отбелязване само на факта, че изтритите пътища ще бъдат добавени по-късно" -#: builtin/reset.c:329 +#: builtin/reset.c:321 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Стойността „%s“ не е разпозната като съществуваща версия." -#: builtin/reset.c:337 +#: builtin/reset.c:329 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "„%s“ не е разпознат като дърво." -#: builtin/reset.c:346 +#: builtin/reset.c:338 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "" "опцията „--patch“ е несъвместима с всяка от опциите „--hard/--mixed/--soft“" -#: builtin/reset.c:355 +#: builtin/reset.c:347 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "опцията „--mixed“ не бива да се използва заедно с пътища. Вместо това " "изпълнете „git reset -- ПЪТ…“." -#: builtin/reset.c:357 +#: builtin/reset.c:349 #, c-format msgid "Cannot do %s reset with paths." msgstr "Не може да извършите %s зануляване, когато сте задали ПЪТ." -#: builtin/reset.c:367 +#: builtin/reset.c:359 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "В голо хранилище не може да извършите %s зануляване" -#: builtin/reset.c:371 +#: builtin/reset.c:363 msgid "-N can only be used with --mixed" msgstr "Опцията „-N“ е съвместима само с „--mixed“" -#: builtin/reset.c:388 +#: builtin/reset.c:380 msgid "Unstaged changes after reset:" msgstr "Промени извън индекса след зануляването:" -#: builtin/reset.c:394 +#: builtin/reset.c:386 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Индексът не може да бъде занулен към версия „%s“." -#: builtin/reset.c:398 +#: builtin/reset.c:390 msgid "Could not write new index file." msgstr "Новият индекс не може да бъде записан." -#: builtin/rev-list.c:399 +#: builtin/rev-list.c:397 +msgid "cannot combine --exclude-promisor-objects and --missing" +msgstr "опциите „--exclude-promisor-objects“ и „--missing“ и са несъвместими" + +#: builtin/rev-list.c:455 msgid "object filtering requires --objects" msgstr "филтрирането на обекти изисква опцията „--objects“" -#: builtin/rev-list.c:402 +#: builtin/rev-list.c:458 #, c-format msgid "invalid sparse value '%s'" msgstr "неправилна частична стойност: %s" -#: builtin/rev-list.c:442 +#: builtin/rev-list.c:499 msgid "rev-list does not support display of notes" msgstr "командата „rev-list“ не поддържа извеждането на бележки" -#: builtin/rev-list.c:445 +#: builtin/rev-list.c:502 msgid "cannot combine --use-bitmap-index with object filtering" msgstr "опцията „--use-bitmap-index“ е несъвместима с филтриране на обектите" @@ -13422,10 +13648,6 @@ msgstr "добавяне на името на подаването" msgid "preserve initially empty commits" msgstr "запазване на първоначално празните подавания" -#: builtin/revert.c:123 -msgid "allow commits with empty messages" -msgstr "позволяване на празни съобщения при подаване" - #: builtin/revert.c:124 msgid "keep redundant, empty commits" msgstr "запазване на излишните, празни подавания" @@ -13783,35 +14005,40 @@ msgstr "пропускане на всички редове, които запо msgid "prepend comment character and space to each line" msgstr "добавяне на „# “ в началото на всеки ред" -#: builtin/submodule--helper.c:34 builtin/submodule--helper.c:1332 +#: builtin/submodule--helper.c:35 builtin/submodule--helper.c:1669 #, c-format msgid "No such ref: %s" msgstr "Такъв указател няма: %s" -#: builtin/submodule--helper.c:41 builtin/submodule--helper.c:1341 +#: builtin/submodule--helper.c:42 builtin/submodule--helper.c:1678 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Очаква се пълно име на указател, а не „%s“" -#: builtin/submodule--helper.c:81 +#: builtin/submodule--helper.c:59 +msgid "submodule--helper print-default-remote takes no arguments" +msgstr "" +"командата „print-default-remote“ на „submodule--helper“ не приема аргументи" + +#: builtin/submodule--helper.c:96 #, c-format msgid "cannot strip one component off url '%s'" msgstr "не може да се махне компонент от адреса „%s“" -#: builtin/submodule--helper.c:370 builtin/submodule--helper.c:861 +#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1198 msgid "alternative anchor for relative paths" msgstr "директория за определянето на относителните пътища" -#: builtin/submodule--helper.c:375 +#: builtin/submodule--helper.c:409 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=ПЪТ] [ПЪТ…]" -#: builtin/submodule--helper.c:426 builtin/submodule--helper.c:449 +#: builtin/submodule--helper.c:460 builtin/submodule--helper.c:483 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "Във файла „.gitmodules“ не е открит адрес за пътя към подмодул „%s“" -#: builtin/submodule--helper.c:464 +#: builtin/submodule--helper.c:498 #, c-format msgid "" "could not lookup configuration '%s'. Assuming this repository is its own " @@ -13820,55 +14047,55 @@ msgstr "" "настройката „%s“ липсва. Приема се, че това хранилище е правилният източник " "за себе си." -#: builtin/submodule--helper.c:475 +#: builtin/submodule--helper.c:509 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Неуспешно регистриране на адрес за пътя към подмодул „%s“" -#: builtin/submodule--helper.c:479 +#: builtin/submodule--helper.c:513 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Регистриран е подмодул „%s“ (%s) за пътя към подмодул „%s“\n" -#: builtin/submodule--helper.c:489 +#: builtin/submodule--helper.c:523 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "ПРЕДУПРЕЖДЕНИЕ: препоръчва се режим на обновяване за подмодула „%s“\n" -#: builtin/submodule--helper.c:496 +#: builtin/submodule--helper.c:530 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" "Неуспешно регистриране на режима на обновяване за пътя към подмодул „%s“" -#: builtin/submodule--helper.c:518 +#: builtin/submodule--helper.c:552 msgid "Suppress output for initializing a submodule" msgstr "Без извеждане на информация при инициализирането на подмодул" -#: builtin/submodule--helper.c:523 +#: builtin/submodule--helper.c:557 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper name [ПЪТ]" -#: builtin/submodule--helper.c:591 builtin/submodule--helper.c:713 +#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:747 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "Във файла „.gitmodules“ липсва информация за пътя „%s“" -#: builtin/submodule--helper.c:626 +#: builtin/submodule--helper.c:660 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "указателят сочен от „HEAD“ в подмодула „%s“ не може да бъде открит" -#: builtin/submodule--helper.c:653 +#: builtin/submodule--helper.c:687 builtin/submodule--helper.c:856 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "неуспешно рекурсивно обхождане на подмодула „%s“" -#: builtin/submodule--helper.c:677 +#: builtin/submodule--helper.c:711 builtin/submodule--helper.c:1021 msgid "Suppress submodule status output" msgstr "Заглушаване на изхода за състоянието на подмодула" -#: builtin/submodule--helper.c:678 +#: builtin/submodule--helper.c:712 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -13876,55 +14103,145 @@ msgstr "" "Използване на подаването указано в индекса, а не това от указателя „HEAD“ на " "подмодула" -#: builtin/submodule--helper.c:679 +#: builtin/submodule--helper.c:713 msgid "recurse into nested submodules" msgstr "рекурсивно обхождане на подмодулите" -#: builtin/submodule--helper.c:684 +#: builtin/submodule--helper.c:718 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [ПЪТ…]" -#: builtin/submodule--helper.c:708 +#: builtin/submodule--helper.c:742 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name ПЪТ" -#: builtin/submodule--helper.c:796 builtin/submodule--helper.c:799 +#: builtin/submodule--helper.c:806 +#, c-format +msgid "Synchronizing submodule url for '%s'\n" +msgstr "Синхронизиране на адреса на подмодул за „%s“\n" + +#: builtin/submodule--helper.c:812 +#, c-format +msgid "failed to register url for submodule path '%s'" +msgstr "неуспешно регистриране на адрес за пътя към подмодул „%s“" + +#: builtin/submodule--helper.c:826 +#, c-format +msgid "failed to get the default remote for submodule '%s'" +msgstr "отдалеченият адрес на подмодула „%s“ не може да бъде получен" + +#: builtin/submodule--helper.c:837 +#, c-format +msgid "failed to update remote for submodule '%s'" +msgstr "отдалеченият адрес на подмодула „%s“ не може да бъде променен" + +#: builtin/submodule--helper.c:885 +msgid "Suppress output of synchronizing submodule url" +msgstr "Без извеждане на информация при синхронизирането на подмодул" + +#: builtin/submodule--helper.c:887 +msgid "Recurse into nested submodules" +msgstr "Рекурсивно обхождане на подмодулите" + +#: builtin/submodule--helper.c:892 +msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" +msgstr "git submodule--helper sync [--quiet] [--recursive] [ПЪТ]" + +#: builtin/submodule--helper.c:946 +#, c-format +msgid "" +"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " +"really want to remove it including all of its history)" +msgstr "" +"Работното дърво на подмодул „%s“ съдържа директория „.git“.\n" +"(ако искате да ги изтриете заедно с цялата им история, използвайте „rm -rf“)" + +#: builtin/submodule--helper.c:958 +#, c-format +msgid "" +"Submodule work tree '%s' contains local modifications; use '-f' to discard " +"them" +msgstr "" +"Работното дърво на подмодул „%s“ съдържа локални промени. Можете да ги " +"отхвърлите с опцията „-f“" + +#: builtin/submodule--helper.c:966 +#, c-format +msgid "Cleared directory '%s'\n" +msgstr "Директорията „%s“ е изчистена\n" + +#: builtin/submodule--helper.c:968 +#, c-format +msgid "Could not remove submodule work tree '%s'\n" +msgstr "" +"Директорията към работното дърво на подмодула „%s“ не може да бъде изтрита\n" + +#: builtin/submodule--helper.c:977 +#, c-format +msgid "could not create empty submodule directory %s" +msgstr "празната директория за подмодула „%s“ не може да бъде създадена" + +#: builtin/submodule--helper.c:993 +#, c-format +msgid "Submodule '%s' (%s) unregistered for path '%s'\n" +msgstr "Регистрацията на подмодула „%s“ (%s) за пътя „%s“ е премахната\n" + +#: builtin/submodule--helper.c:1022 +msgid "Remove submodule working trees even if they contain local changes" +msgstr "" +"Изтриване на работните дървета на подмодулите, дори когато те съдържат " +"локални промени" + +#: builtin/submodule--helper.c:1023 +msgid "Unregister all submodules" +msgstr "Премахване на регистрациите на всички подмодули" + +#: builtin/submodule--helper.c:1028 +msgid "" +"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" +msgstr "git submodule deinit [--quiet] [-f | --force] [--all | [--] [ПЪТ…]]" + +#: builtin/submodule--helper.c:1042 +msgid "Use '--all' if you really want to deinitialize all submodules" +msgstr "Използвайте „--all“, за да премахнете всички подмодули" + +#: builtin/submodule--helper.c:1133 builtin/submodule--helper.c:1136 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "към подмодула „%s“ не може да се добави алтернативен източник: %s" -#: builtin/submodule--helper.c:835 +#: builtin/submodule--helper.c:1172 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "" "Непозната стойност „%s“ за настройката „submodule.alternateErrorStrategy“" -#: builtin/submodule--helper.c:842 +#: builtin/submodule--helper.c:1179 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Непозната стойност „%s“ за настройката „submodule.alternateLocation“" -#: builtin/submodule--helper.c:864 +#: builtin/submodule--helper.c:1201 msgid "where the new submodule will be cloned to" msgstr "къде да се клонира новият подмодул" -#: builtin/submodule--helper.c:867 +#: builtin/submodule--helper.c:1204 msgid "name of the new submodule" msgstr "име на новия подмодул" -#: builtin/submodule--helper.c:870 +#: builtin/submodule--helper.c:1207 msgid "url where to clone the submodule from" msgstr "адрес, от който да се клонира новият подмодул" -#: builtin/submodule--helper.c:876 +#: builtin/submodule--helper.c:1213 msgid "depth for shallow clones" msgstr "дълбочина на плитките хранилища" -#: builtin/submodule--helper.c:879 builtin/submodule--helper.c:1250 +#: builtin/submodule--helper.c:1216 builtin/submodule--helper.c:1587 msgid "force cloning progress" msgstr "извеждане на напредъка на клонирането" -#: builtin/submodule--helper.c:884 +#: builtin/submodule--helper.c:1221 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -13932,85 +14249,85 @@ msgstr "" "git submodule--helper clone [--prefix=ПЪТ] [--quiet] [--reference ХРАНИЛИЩЕ] " "[--name ИМЕ] [--depth ДЪЛБОЧИНА] --url АДРЕС --path ПЪТ…" -#: builtin/submodule--helper.c:915 +#: builtin/submodule--helper.c:1252 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "Неуспешно клониране на адреса „%s“ в пътя „%s“ като подмодул" -#: builtin/submodule--helper.c:930 +#: builtin/submodule--helper.c:1267 #, c-format msgid "could not get submodule directory for '%s'" msgstr "директорията на подмодула „%s“ не може да бъде получена" -#: builtin/submodule--helper.c:995 +#: builtin/submodule--helper.c:1332 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Пътят на подмодула „%s“ не е инициализиран" -#: builtin/submodule--helper.c:999 +#: builtin/submodule--helper.c:1336 msgid "Maybe you want to use 'update --init'?" msgstr "Вероятно искахте да използвате „update --init“?" -#: builtin/submodule--helper.c:1028 +#: builtin/submodule--helper.c:1365 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Прескачане на неслетия подмодул „%s“" -#: builtin/submodule--helper.c:1057 +#: builtin/submodule--helper.c:1394 #, c-format msgid "Skipping submodule '%s'" msgstr "Прескачане на подмодула „%s“" -#: builtin/submodule--helper.c:1190 +#: builtin/submodule--helper.c:1527 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Неуспешен опит за клониране на „%s“. Насрочен е втори опит" -#: builtin/submodule--helper.c:1201 +#: builtin/submodule--helper.c:1538 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "" "Втори неуспешен опит за клониране на „%s“. Действието се преустановява" -#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1451 +#: builtin/submodule--helper.c:1568 builtin/submodule--helper.c:1788 msgid "path into the working tree" msgstr "път към работното дърво" -#: builtin/submodule--helper.c:1234 +#: builtin/submodule--helper.c:1571 msgid "path into the working tree, across nested submodule boundaries" msgstr "път към работното дърво, през границите на вложените подмодули" -#: builtin/submodule--helper.c:1238 +#: builtin/submodule--helper.c:1575 msgid "rebase, merge, checkout or none" msgstr "" "„rebase“ (пребазиране), „merge“ (сливане), „checkout“ (изтегляне) или " "„none“ (нищо да не се прави)" -#: builtin/submodule--helper.c:1242 +#: builtin/submodule--helper.c:1579 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "Плитко клониране, отрязано до указания брой версии" -#: builtin/submodule--helper.c:1245 +#: builtin/submodule--helper.c:1582 msgid "parallel jobs" msgstr "брой паралелни процеси" -#: builtin/submodule--helper.c:1247 +#: builtin/submodule--helper.c:1584 msgid "whether the initial clone should follow the shallow recommendation" msgstr "дали първоначалното клониране да е плитко, както се препоръчва" -#: builtin/submodule--helper.c:1248 +#: builtin/submodule--helper.c:1585 msgid "don't print cloning progress" msgstr "без извеждане на напредъка на клонирането" -#: builtin/submodule--helper.c:1255 +#: builtin/submodule--helper.c:1592 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update_clone [--prefix=ПЪТ] [ПЪТ…]" -#: builtin/submodule--helper.c:1268 +#: builtin/submodule--helper.c:1605 msgid "bad value for update parameter" msgstr "неправилен параметър към опцията „--update“" -#: builtin/submodule--helper.c:1336 +#: builtin/submodule--helper.c:1673 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -14019,20 +14336,20 @@ msgstr "" "Клонът на подмодула „%s“ е настроен да наследява клона от обхващащия проект, " "но той не е на никой клон" -#: builtin/submodule--helper.c:1452 +#: builtin/submodule--helper.c:1789 msgid "recurse into submodules" msgstr "рекурсивно обхождане подмодулите" -#: builtin/submodule--helper.c:1458 +#: builtin/submodule--helper.c:1795 msgid "git submodule--helper embed-git-dir [<path>...]" msgstr "git submodule--helper name embed-git-dir [ПЪТ…]" -#: builtin/submodule--helper.c:1517 +#: builtin/submodule--helper.c:1857 #, c-format msgid "%s doesn't support --super-prefix" msgstr "„%s“ не поддържа опцията „--super-prefix“" -#: builtin/submodule--helper.c:1523 +#: builtin/submodule--helper.c:1863 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "„%s“ не е подкоманда на „submodule--helper“" @@ -14136,139 +14453,143 @@ msgstr "етикетът не може да бъде подписан" msgid "unable to write tag file" msgstr "файлът за етикета не може да бъде запазен" -#: builtin/tag.c:215 +#: builtin/tag.c:216 msgid "bad object type." msgstr "неправилен вид обект." -#: builtin/tag.c:261 +#: builtin/tag.c:265 msgid "no tag message?" msgstr "липсва съобщение за етикета" -#: builtin/tag.c:268 +#: builtin/tag.c:272 #, c-format msgid "The tag message has been left in %s\n" msgstr "Съобщението за етикета е запазено във файла „%s“\n" -#: builtin/tag.c:376 +#: builtin/tag.c:381 msgid "list tag names" msgstr "извеждане на имената на етикетите" -#: builtin/tag.c:378 +#: builtin/tag.c:383 msgid "print <n> lines of each tag message" msgstr "извеждане на този БРОЙ редове от всяко съобщение за етикет" -#: builtin/tag.c:380 +#: builtin/tag.c:385 msgid "delete tags" msgstr "изтриване на етикети" -#: builtin/tag.c:381 +#: builtin/tag.c:386 msgid "verify tags" msgstr "проверка на етикети" -#: builtin/tag.c:383 +#: builtin/tag.c:388 msgid "Tag creation options" msgstr "Опции при създаването на етикети" -#: builtin/tag.c:385 +#: builtin/tag.c:390 msgid "annotated tag, needs a message" msgstr "анотирането на етикети изисква съобщение" -#: builtin/tag.c:387 +#: builtin/tag.c:392 msgid "tag message" msgstr "СЪОБЩЕНИЕ за етикет" -#: builtin/tag.c:389 +#: builtin/tag.c:394 +msgid "force edit of tag message" +msgstr "принудително редактиране на съобщение за етикет" + +#: builtin/tag.c:395 msgid "annotated and GPG-signed tag" msgstr "анотиран етикет с подпис по GPG" -#: builtin/tag.c:393 +#: builtin/tag.c:399 msgid "use another key to sign the tag" msgstr "използване на друг ключ за подписването на етикет" -#: builtin/tag.c:394 +#: builtin/tag.c:400 msgid "replace the tag if exists" msgstr "замяна на етикета, ако съществува" -#: builtin/tag.c:395 builtin/update-ref.c:368 +#: builtin/tag.c:401 builtin/update-ref.c:368 msgid "create a reflog" msgstr "създаване на журнал на указателите" -#: builtin/tag.c:397 +#: builtin/tag.c:403 msgid "Tag listing options" msgstr "Опции за извеждането на етикети" -#: builtin/tag.c:398 +#: builtin/tag.c:404 msgid "show tag list in columns" msgstr "извеждане на списъка на етикетите по колони" -#: builtin/tag.c:399 builtin/tag.c:401 +#: builtin/tag.c:405 builtin/tag.c:407 msgid "print only tags that contain the commit" msgstr "извеждане само на етикетите, които съдържат подаването" -#: builtin/tag.c:400 builtin/tag.c:402 +#: builtin/tag.c:406 builtin/tag.c:408 msgid "print only tags that don't contain the commit" msgstr "извеждане само на етикетите, които не съдържат подаването" -#: builtin/tag.c:403 +#: builtin/tag.c:409 msgid "print only tags that are merged" msgstr "извеждане само на слетите етикети" -#: builtin/tag.c:404 +#: builtin/tag.c:410 msgid "print only tags that are not merged" msgstr "извеждане само на неслетите етикети" -#: builtin/tag.c:409 +#: builtin/tag.c:415 msgid "print only tags of the object" msgstr "извеждане само на етикетите на ОБЕКТА" -#: builtin/tag.c:453 +#: builtin/tag.c:459 msgid "--column and -n are incompatible" msgstr "Опциите „--column“ и „-n“ са несъвместими" -#: builtin/tag.c:475 +#: builtin/tag.c:481 msgid "-n option is only allowed in list mode" msgstr "Опцията „-n“ изисква режим на списък." -#: builtin/tag.c:477 +#: builtin/tag.c:483 msgid "--contains option is only allowed in list mode" msgstr "Опцията „-contains“ изисква режим на списък." -#: builtin/tag.c:479 +#: builtin/tag.c:485 msgid "--no-contains option is only allowed in list mode" msgstr "Опцията „-contains“ изисква режим на списък." -#: builtin/tag.c:481 +#: builtin/tag.c:487 msgid "--points-at option is only allowed in list mode" msgstr "Опцията „-points-at“ изисква режим на списък." -#: builtin/tag.c:483 +#: builtin/tag.c:489 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "Опциите „--merged“ и „--no-merged“ изискват режим на списък." -#: builtin/tag.c:494 +#: builtin/tag.c:500 msgid "only one -F or -m option is allowed." msgstr "Опциите „-F“ и „-m“ са несъвместими." -#: builtin/tag.c:513 +#: builtin/tag.c:519 msgid "too many params" msgstr "Прекалено много аргументи" -#: builtin/tag.c:519 +#: builtin/tag.c:525 #, c-format msgid "'%s' is not a valid tag name." msgstr "„%s“ е неправилно име за етикет." -#: builtin/tag.c:524 +#: builtin/tag.c:530 #, c-format msgid "tag '%s' already exists" msgstr "етикетът „%s“ вече съществува" -#: builtin/tag.c:554 +#: builtin/tag.c:561 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Обновен етикет „%s“ (бе „%s“)\n" -#: builtin/unpack-objects.c:494 +#: builtin/unpack-objects.c:498 msgid "Unpacking objects" msgstr "Разпакетиране на обектите" @@ -14621,8 +14942,8 @@ msgid "print tag contents" msgstr "извеждане на съдържанието на ЕТИКЕТи" #: builtin/worktree.c:17 -msgid "git worktree add [<options>] <path> [<branch>]" -msgstr "git worktree add [ОПЦИЯ…] ПЪТ [КЛОН]" +msgid "git worktree add [<options>] <path> [<commit-ish>]" +msgstr "git worktree add [ОПЦИЯ…] ПЪТ [УКАЗАТЕЛ_КЪМ_ПОДАВАНЕ]" #: builtin/worktree.c:18 msgid "git worktree list [<options>]" @@ -14633,30 +14954,38 @@ msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [ОПЦИЯ…] [ПЪТ]" #: builtin/worktree.c:20 +msgid "git worktree move <worktree> <new-path>" +msgstr "git worktree move [ДЪРВО] [НОВ_ПЪТ]" + +#: builtin/worktree.c:21 msgid "git worktree prune [<options>]" msgstr "git worktree prune [ОПЦИЯ…]" -#: builtin/worktree.c:21 +#: builtin/worktree.c:22 +msgid "git worktree remove [<options>] <worktree>" +msgstr "git worktree remove [ОПЦИЯ…] [ДЪРВО]" + +#: builtin/worktree.c:23 msgid "git worktree unlock <path>" msgstr "git worktree unlock [ПЪТ]" -#: builtin/worktree.c:58 +#: builtin/worktree.c:60 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Изтриване на „worktrees/%s“: не е правилна поддиректория" -#: builtin/worktree.c:64 +#: builtin/worktree.c:66 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Изтриване на „worktrees/%s“: файлът „gitdir“ не съществува" -#: builtin/worktree.c:69 builtin/worktree.c:78 +#: builtin/worktree.c:71 builtin/worktree.c:80 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "" "Изтриване на „worktrees/%s“: файлът „gitdir“ (%s) не може да бъде прочетен" -#: builtin/worktree.c:88 +#: builtin/worktree.c:90 #, c-format msgid "" "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " @@ -14665,105 +14994,189 @@ msgstr "" "Изтриване на „worktrees/%s“: изчитането върна по-малко байтове от очакваното " "(очаквани: %<PRIuMAX> байта, получени: %<PRIuMAX>)" -#: builtin/worktree.c:96 +#: builtin/worktree.c:98 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Изтриване на „worktrees/%s“: неправилен файл „gitdir“" -#: builtin/worktree.c:112 +#: builtin/worktree.c:114 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "" "Изтриване на „worktrees/%s“: файлът „gitdir“ сочи несъществуващо " "местоположение" -#: builtin/worktree.c:159 +#: builtin/worktree.c:161 msgid "report pruned working trees" msgstr "докладване на окастрените работни дървета" -#: builtin/worktree.c:161 +#: builtin/worktree.c:163 msgid "expire working trees older than <time>" msgstr "обявяване на работните копия по-стари от това ВРЕМЕ за остарели" -#: builtin/worktree.c:236 +#: builtin/worktree.c:238 #, c-format msgid "'%s' already exists" msgstr "„%s“ вече съществува" -#: builtin/worktree.c:267 +#: builtin/worktree.c:269 #, c-format msgid "could not create directory of '%s'" msgstr "директорията „%s“ не може да бъде създадена" -#: builtin/worktree.c:306 +#: builtin/worktree.c:308 #, c-format msgid "Preparing %s (identifier %s)" msgstr "Подготвяне на %s (идентификатор %s)" -#: builtin/worktree.c:368 +#: builtin/worktree.c:385 msgid "checkout <branch> even if already checked out in other worktree" msgstr "Изтегляне КЛОНа, дори и да е изтеглен в друго работно дърво" -#: builtin/worktree.c:370 +#: builtin/worktree.c:388 msgid "create a new branch" msgstr "създаване на нов клон" -#: builtin/worktree.c:372 +#: builtin/worktree.c:390 msgid "create or reset a branch" msgstr "създаване или зануляване на клони" -#: builtin/worktree.c:374 +#: builtin/worktree.c:392 msgid "populate the new working tree" msgstr "подготвяне на новото работно дърво" -#: builtin/worktree.c:375 +#: builtin/worktree.c:393 msgid "keep the new working tree locked" msgstr "новото работно дърво да остане заключено" -#: builtin/worktree.c:377 +#: builtin/worktree.c:395 msgid "set up tracking mode (see git-branch(1))" msgstr "задаване на режима на следене (виж git-branch(1))" -#: builtin/worktree.c:380 +#: builtin/worktree.c:398 msgid "try to match the new branch name with a remote-tracking branch" msgstr "опит за напасване на името на новия клон с това на следящ клон" -#: builtin/worktree.c:388 +#: builtin/worktree.c:406 msgid "-b, -B, and --detach are mutually exclusive" msgstr "Опциите „-b“, „-B“ и „--detach“ са несъвместими една с друга" -#: builtin/worktree.c:453 +#: builtin/worktree.c:471 msgid "--[no-]track can only be used if a new branch is created" msgstr "„--[no-]track“ може да се използва само при създаването на нов клон" -#: builtin/worktree.c:553 +#: builtin/worktree.c:571 msgid "reason for locking" msgstr "причина за заключване" -#: builtin/worktree.c:565 builtin/worktree.c:598 +#: builtin/worktree.c:583 builtin/worktree.c:616 builtin/worktree.c:670 +#: builtin/worktree.c:809 #, c-format msgid "'%s' is not a working tree" msgstr "„%s“ не е работно дърво" -#: builtin/worktree.c:567 builtin/worktree.c:600 +#: builtin/worktree.c:585 builtin/worktree.c:618 msgid "The main working tree cannot be locked or unlocked" msgstr "Основното дърво не може да се отключи или заключи" -#: builtin/worktree.c:572 +#: builtin/worktree.c:590 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "„%s“ вече е заключено, защото „%s“" -#: builtin/worktree.c:574 +#: builtin/worktree.c:592 #, c-format msgid "'%s' is already locked" msgstr "„%s“ вече е заключено" -#: builtin/worktree.c:602 +#: builtin/worktree.c:620 #, c-format msgid "'%s' is not locked" msgstr "„%s“ не е заключено" +#: builtin/worktree.c:645 +msgid "working trees containing submodules cannot be moved or removed" +msgstr "" +"не може да местите или изтривате работни дървета, в които има подмодули" + +#: builtin/worktree.c:672 builtin/worktree.c:811 +#, c-format +msgid "'%s' is a main working tree" +msgstr "„%s“ е основно работно дърво" + +#: builtin/worktree.c:677 +#, c-format +msgid "could not figure out destination name from '%s'" +msgstr "името на целта не може да се определи от „%s“" + +#: builtin/worktree.c:683 +#, c-format +msgid "target '%s' already exists" +msgstr "целта „%s“ вече съществува" + +#: builtin/worktree.c:690 +#, c-format +msgid "cannot move a locked working tree, lock reason: %s" +msgstr "" +"не може да преместите заключено работно дърво, причина за заключването: %s" + +#: builtin/worktree.c:692 +msgid "cannot move a locked working tree" +msgstr "не може да местите заключено работно дърво" + +#: builtin/worktree.c:695 +#, c-format +msgid "validation failed, cannot move working tree: %s" +msgstr "" +"проверките са неуспешни, работното дърво не може да бъде преместено: %s" + +#: builtin/worktree.c:700 +#, c-format +msgid "failed to move '%s' to '%s'" +msgstr "„%s“ не може да се премести в „%s“" + +#: builtin/worktree.c:748 +#, c-format +msgid "failed to run 'git status' on '%s'" +msgstr "не може да изпълни „git status“ върху „%s“" + +#: builtin/worktree.c:752 +#, c-format +msgid "'%s' is dirty, use --force to delete it" +msgstr "" +"работното дърво „%s“ не е чисто, за принудително изтриване е необходима " +"опцията „--force“ " + +#: builtin/worktree.c:757 +#, c-format +msgid "failed to run 'git status' on '%s', code %d" +msgstr "" +"командата „git status“ не може да се изпълни за „%s“, код за грешка: %d" + +#: builtin/worktree.c:768 builtin/worktree.c:782 +#, c-format +msgid "failed to delete '%s'" +msgstr "неуспешно изтриване на „%s“" + +#: builtin/worktree.c:794 +msgid "force removing even if the worktree is dirty" +msgstr "принудително изтриване, дори работното дърво да не е чисто" + +#: builtin/worktree.c:815 +#, c-format +msgid "cannot remove a locked working tree, lock reason: %s" +msgstr "" +"не може да изтриете заключено работно дърво, причина за заключването: %s" + +#: builtin/worktree.c:817 +msgid "cannot remove a locked working tree" +msgstr "не може да изтриете заключено работно дърво" + +#: builtin/worktree.c:820 +#, c-format +msgid "validation failed, cannot remove working tree: %s" +msgstr "проверките са неуспешни, работното дърво не може да бъде изтрито: %s" + #: builtin/write-tree.c:14 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "git write-tree [--missing-ok] [--prefix=ПРЕФИКС/]" @@ -14780,24 +15193,24 @@ msgstr "запис на обект-дърво за поддиректорият msgid "only useful for debugging" msgstr "само за изчистване на грешки" -#: upload-pack.c:24 +#: upload-pack.c:27 msgid "git upload-pack [<options>] <dir>" msgstr "git upload-repack [ОПЦИЯ…] ДИРЕКТОРИЯ" -#: upload-pack.c:1041 +#: upload-pack.c:1070 msgid "quit after a single request/response exchange" msgstr "изход след първоначалната размяна на заявка и отговор" -#: upload-pack.c:1043 +#: upload-pack.c:1072 msgid "exit immediately after initial ref advertisement" msgstr "изход след първоначалната обява на указатели" -#: upload-pack.c:1045 +#: upload-pack.c:1074 msgid "do not try <directory>/.git/ if <directory> is no Git directory" msgstr "" "да не се търси „ДИРЕКТОРИЯ/.git/“, ако ДИРЕКТОРИЯта не е под контрола на Git" -#: upload-pack.c:1047 +#: upload-pack.c:1076 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "трансферът да се преустанови след този БРОЙ секунди" @@ -14820,6 +15233,20 @@ msgstr "" msgid "print debugging messages to stderr" msgstr "извеждане на съобщенията за трасиране на стандартната грешка" +#: git.c:8 +msgid "" +"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" +" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" +" [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n" +" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" +" <command> [<args>]" +msgstr "" +"git [--version] [--help] [-C ПЪТ] [-c ИМЕ=СТОЙНОСТ]\n" +" [--exec-path[=ПЪТ]] [--html-path] [--man-path] [--info-path]\n" +" [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n" +" [--git-dir=ПЪТ] [--work-tree=ПЪТ] [--namespace=ИМЕ]\n" +" КОМАНДА [АРГ…]" + #: git.c:15 msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" @@ -14835,21 +15262,67 @@ msgstr "" "Български превод на книгата „Pro Git“ от Чакън и Страуб:\n" "http://i-can.eu/progit2-bg/progit.html" -#: http.c:339 +#: git.c:95 +#, c-format +msgid "no directory given for --git-dir\n" +msgstr "опцията „--git-dir“ изисква директория\n" + +#: git.c:109 +#, c-format +msgid "no namespace given for --namespace\n" +msgstr "опцията „--namespace“ изисква име\n" + +#: git.c:123 +#, c-format +msgid "no directory given for --work-tree\n" +msgstr "опцията „--work-tree“ изисква директория\n" + +#: git.c:137 +#, c-format +msgid "no prefix given for --super-prefix\n" +msgstr "опцията „--super-prefix“ изисква префикс\n" + +#: git.c:159 +#, c-format +msgid "-c expects a configuration string\n" +msgstr "опцията „-c“ изисква низ за настройка\n" + +#: git.c:197 +#, c-format +msgid "no directory given for -C\n" +msgstr "опцията „-C“ изисква директория\n" + +#: git.c:212 +#, c-format +msgid "unknown option: %s\n" +msgstr "непозната опция: „%s“\n" + +#: git.c:687 +#, c-format +msgid "expansion of alias '%s' failed; '%s' is not a git command\n" +msgstr "" +"неуспешно заместване на синонима „%s“ — резултатът „%s“ не е команда на git\n" + +#: git.c:699 +#, c-format +msgid "failed to run command '%s': %s\n" +msgstr "командата „%s“ не може да се изпълни: %s\n" + +#: http.c:342 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "" "отрицателна стойност за „http.postbuffer“. Ще се ползва стандартната: %d" -#: http.c:360 +#: http.c:363 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "Управлението на делегирането не се поддържа от cURL < 7.22.0" -#: http.c:369 +#: http.c:372 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "Задаването на постоянен публичен ключ не се поддържа от cURL < 7.44.0" -#: http.c:1791 +#: http.c:1857 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -14860,16 +15333,16 @@ msgstr "" " ● заявен адрес: %s\n" " ● пренасочване: %s" -#: remote-curl.c:324 +#: remote-curl.c:345 #, c-format msgid "redirecting to %s" msgstr "пренасочване към „%s“" -#: list-objects-filter-options.h:54 +#: list-objects-filter-options.h:59 msgid "args" msgstr "АРГУМЕНТИ" -#: list-objects-filter-options.h:55 +#: list-objects-filter-options.h:60 msgid "object filtering" msgstr "филтриране по вид на обекта" @@ -14978,23 +15451,23 @@ msgstr "Извеждане на състоянието на работното msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "Извеждане, създаване, изтриване, проверка на етикети подписани с GPG" -#: parse-options.h:145 +#: parse-options.h:157 msgid "expiry-date" msgstr "период на валидност/запазване" -#: parse-options.h:160 +#: parse-options.h:172 msgid "no-op (backward compatibility)" msgstr "нулева операция (за съвместимост с предишни версии)" -#: parse-options.h:238 +#: parse-options.h:250 msgid "be more verbose" msgstr "повече подробности" -#: parse-options.h:240 +#: parse-options.h:252 msgid "be more quiet" msgstr "по-малко подробности" -#: parse-options.h:246 +#: parse-options.h:258 msgid "use <n> digits to display SHA-1s" msgstr "да се показват такъв БРОЙ цифри от сумите по SHA1" @@ -15235,7 +15708,7 @@ msgstr "Опит за просто сливане с „$pretty_name“" msgid "Simple merge did not work, trying automatic merge." msgstr "Простото сливане не сработи, пробва се автоматично сливане." -#: git-rebase.sh:58 +#: git-rebase.sh:60 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -15249,44 +15722,44 @@ msgstr "" "За да откажете пребазирането и да се върнете към първоначалното състояние,\n" "изпълнете „git rebase --abort“." -#: git-rebase.sh:160 git-rebase.sh:402 +#: git-rebase.sh:163 git-rebase.sh:409 #, sh-format msgid "Could not move back to $head_name" msgstr "Връщането към „${head_name}“ е невъзможно" -#: git-rebase.sh:171 +#: git-rebase.sh:174 msgid "Applied autostash." msgstr "Автоматично скатаното е приложено." -#: git-rebase.sh:174 +#: git-rebase.sh:177 #, sh-format msgid "Cannot store $stash_sha1" msgstr "„${stash_sha1}“ не може да бъде запазен" -#: git-rebase.sh:214 +#: git-rebase.sh:218 msgid "The pre-rebase hook refused to rebase." msgstr "Куката за изпълнение преди пребазиране отхвърли пребазирането." -#: git-rebase.sh:219 +#: git-rebase.sh:223 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "" "Изглежда, че сега се прилагат кръпки чрез командата „git-am“. Не може да " "пребазирате в момента." -#: git-rebase.sh:363 +#: git-rebase.sh:370 msgid "No rebase in progress?" msgstr "Изглежда в момента не тече пребазиране" -#: git-rebase.sh:374 +#: git-rebase.sh:381 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "Опцията „--edit-todo“ е достъпна само по време на интерактивно пребазиране." -#: git-rebase.sh:381 +#: git-rebase.sh:388 msgid "Cannot read HEAD" msgstr "Указателят „HEAD“ не може да бъде прочетен" -#: git-rebase.sh:384 +#: git-rebase.sh:391 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -15294,7 +15767,7 @@ msgstr "" "Трябва да редактирате всички конфликти при сливането. След това\n" "отбележете коригирането им чрез командата „git add“" -#: git-rebase.sh:424 +#: git-rebase.sh:435 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -15315,79 +15788,79 @@ msgstr "" "за\n" "да не загубите случайно промени." -#: git-rebase.sh:480 +#: git-rebase.sh:491 #, sh-format msgid "invalid upstream '$upstream_name'" msgstr "неправилна основа за сравнение „${upstream_name}“" -#: git-rebase.sh:504 +#: git-rebase.sh:515 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "" "указателят „${onto_name}“ може да сочи към повече от една основа за " "пребазирането" -#: git-rebase.sh:507 git-rebase.sh:511 +#: git-rebase.sh:518 git-rebase.sh:522 #, sh-format msgid "$onto_name: there is no merge base" msgstr "указателят „${onto_name}“ не сочи към никаква основа за пребазирането" -#: git-rebase.sh:516 +#: git-rebase.sh:527 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "Указателят „${onto_name}“ не сочи към подаване" -#: git-rebase.sh:542 +#: git-rebase.sh:553 #, sh-format msgid "fatal: no such branch/commit '$branch_name'" msgstr "ФАТАЛНА ГРЕШКА: не съществува клон „${branch_name}“" -#: git-rebase.sh:575 +#: git-rebase.sh:586 msgid "Cannot autostash" msgstr "Не може да се скатае автоматично" -#: git-rebase.sh:580 +#: git-rebase.sh:591 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Автоматично скатано: „${stash_abbrev}“" -#: git-rebase.sh:584 +#: git-rebase.sh:595 msgid "Please commit or stash them." msgstr "Промените трябва или да се подадат, или да се скатаят." -#: git-rebase.sh:607 +#: git-rebase.sh:618 #, sh-format msgid "HEAD is up to date." msgstr "Указателят „HEAD“ е напълно актуален" -#: git-rebase.sh:609 +#: git-rebase.sh:620 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "Текущият клон „${branch_name}“ е напълно актуален." -#: git-rebase.sh:617 +#: git-rebase.sh:628 #, sh-format msgid "HEAD is up to date, rebase forced." msgstr "Указателят „HEAD“ е напълно актуален. Пребазирането е принудително." -#: git-rebase.sh:619 +#: git-rebase.sh:630 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "" "Текущият клон „${branch_name}“ е напълно актуален. Пребазирането е " "принудително." -#: git-rebase.sh:631 +#: git-rebase.sh:642 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Промените от „${mb}“ към „${onto}“:" -#: git-rebase.sh:640 +#: git-rebase.sh:651 msgid "First, rewinding head to replay your work on top of it..." msgstr "" "Първо, указателят „HEAD“ започва да сочи към базата, върху която пребазирате…" -#: git-rebase.sh:650 +#: git-rebase.sh:661 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "Превъртане на „${branch_name}“ върху „${onto_name}“." @@ -15457,88 +15930,88 @@ msgid "Saved working directory and index state $stash_msg" msgstr "" "Състоянието на работната директория и индекса са запазени: „$stash_msg“" -#: git-stash.sh:341 +#: git-stash.sh:340 msgid "Cannot remove worktree changes" msgstr "Промените в работното дърво не могат да бъдат занулени" -#: git-stash.sh:489 +#: git-stash.sh:488 #, sh-format msgid "unknown option: $opt" msgstr "непозната опция: ${opt}" -#: git-stash.sh:502 +#: git-stash.sh:501 msgid "No stash entries found." msgstr "Не е открито нищо скатано." -#: git-stash.sh:509 +#: git-stash.sh:508 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Указани са прекалено много версии: „${REV}“" -#: git-stash.sh:524 +#: git-stash.sh:523 #, sh-format msgid "$reference is not a valid reference" msgstr "Указателят „${reference}“ е грешен" -#: git-stash.sh:552 +#: git-stash.sh:551 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "„${args}“ не е подаване, приличащо на нещо скатано" -#: git-stash.sh:563 +#: git-stash.sh:562 #, sh-format msgid "'$args' is not a stash reference" msgstr "„${args}“ не е указател към нещо скатано" -#: git-stash.sh:571 +#: git-stash.sh:570 msgid "unable to refresh index" msgstr "индексът не може да бъде обновен" -#: git-stash.sh:575 +#: git-stash.sh:574 msgid "Cannot apply a stash in the middle of a merge" msgstr "По време на сливане не може да приложите нещо скатано" -#: git-stash.sh:583 +#: git-stash.sh:582 msgid "Conflicts in index. Try without --index." msgstr "" "В индекса има конфликти. Пробвайте да изпълните командата без опцията „--" "index“." -#: git-stash.sh:585 +#: git-stash.sh:584 msgid "Could not save index tree" msgstr "Дървото сочено от индекса не може да бъде запазено" -#: git-stash.sh:594 +#: git-stash.sh:593 msgid "Could not restore untracked files from stash entry" msgstr "Неследени файлове не могат да се възстановят от скатаното" -#: git-stash.sh:619 +#: git-stash.sh:618 msgid "Cannot unstage modified files" msgstr "Променените файлове не могат да бъдат извадени от индекса" -#: git-stash.sh:634 +#: git-stash.sh:633 msgid "Index was not unstashed." msgstr "Индексът не е скатан." -#: git-stash.sh:648 +#: git-stash.sh:647 msgid "The stash entry is kept in case you need it again." msgstr "Скатаното е запазено в случай, че ви потрябва отново" -#: git-stash.sh:657 +#: git-stash.sh:656 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Изтрито е скатаното „${REV}“ ($s)" -#: git-stash.sh:658 +#: git-stash.sh:657 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "Скатаното „${REV}“ не може да бъде изтрито" -#: git-stash.sh:666 +#: git-stash.sh:665 msgid "No branch name specified" msgstr "Не е указано име на клон" -#: git-stash.sh:745 +#: git-stash.sh:744 msgid "(To restore them type \"git stash apply\")" msgstr "(За да ги възстановите, изпълнете командата „git stash apply“)" @@ -15641,70 +16114,17 @@ msgid "Stopping at '$displaypath'; script returned non-zero status." msgstr "" "Спиране при „${displaypath}“ — изходният код от скрипта бе различен от 0." -#: git-submodule.sh:433 -#, sh-format -msgid "pathspec and --all are incompatible" -msgstr "указването на път е несъвместимо с опцията „--all“" - -#: git-submodule.sh:438 -#, sh-format -msgid "Use '--all' if you really want to deinitialize all submodules" -msgstr "Използвайте „--all“, за да премахнете всички подмодули" - -#: git-submodule.sh:458 -#, sh-format -msgid "" -"Submodule work tree '$displaypath' contains a .git directory\n" -"(use 'rm -rf' if you really want to remove it including all of its history)" -msgstr "" -"Работното дърво на подмодул „${displaypath}“ съдържа директория „.git“.\n" -"(ако искате да ги изтриете заедно с цялата им история, използвайте „rm -rf“)" - -#: git-submodule.sh:466 -#, sh-format -msgid "" -"Submodule work tree '$displaypath' contains local modifications; use '-f' to " -"discard them" -msgstr "" -"Работното дърво на подмодул „${displaypath}“ съдържа локални промени. " -"Можете да го отхвърлите с опцията „-f“" - -#: git-submodule.sh:469 -#, sh-format -msgid "Cleared directory '$displaypath'" -msgstr "Директорията „${displaypath}“ е изчистена" - -#: git-submodule.sh:470 -#, sh-format -msgid "Could not remove submodule work tree '$displaypath'" -msgstr "" -"Директорията към работното дърво на подмодула „${displaypath}“ не може да " -"бъде изтрита" - -#: git-submodule.sh:473 -#, sh-format -msgid "Could not create empty submodule directory '$displaypath'" -msgstr "" -"Празната директория за подмодула „${displaypath}“ не може да бъде създадена" - -#: git-submodule.sh:482 -#, sh-format -msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" -msgstr "" -"Премахната е регистрацията на подмодул „${name}“, сочещ към адрес „${url}“, " -"за пътя „${displaypath}“" - -#: git-submodule.sh:637 +#: git-submodule.sh:584 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "Текущата версия за подмодула в „${displaypath}“ липсва" -#: git-submodule.sh:647 +#: git-submodule.sh:594 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Неуспешно доставяне в пътя към подмодул „${sm_path}“" -#: git-submodule.sh:652 +#: git-submodule.sh:599 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -15713,12 +16133,12 @@ msgstr "" "Текущата версия „${remote_name}/${branch}“ в пътя към подмодул „${sm_path}“ " "липсва" -#: git-submodule.sh:670 +#: git-submodule.sh:617 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "Неуспешно доставяне в пътя към подмодул „${displaypath}“" -#: git-submodule.sh:676 +#: git-submodule.sh:623 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -15727,91 +16147,86 @@ msgstr "" "Подмодулът в пътя „$displaypath“ е доставен, но не съдържа обекта със сума\n" "„$sha1“. Директното доставяне на това подаване е неуспешно." -#: git-submodule.sh:683 +#: git-submodule.sh:630 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" "Неуспешно изтегляне на версия „${sha1}“ в пътя към подмодул „${displaypath}“'" -#: git-submodule.sh:684 +#: git-submodule.sh:631 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Път към подмодул „${displaypath}“: изтеглена е версия „${sha1}“" -#: git-submodule.sh:688 +#: git-submodule.sh:635 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" "Неуспешно пребазиране на версия „${sha1}“ в пътя към подмодул " "„${displaypath}“" -#: git-submodule.sh:689 +#: git-submodule.sh:636 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Път към подмодул „${displaypath}“: пребазиране върху версия „${sha1}“" -#: git-submodule.sh:694 +#: git-submodule.sh:641 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" "Неуспешно сливане на версия „${sha1}“ в пътя към подмодул „${displaypath}“" -#: git-submodule.sh:695 +#: git-submodule.sh:642 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Път към подмодул „${displaypath}“: сливане с версия „${sha1}“" -#: git-submodule.sh:700 +#: git-submodule.sh:647 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "Неуспешно изпълнение на командата „${command} ${sha1}“ в пътя към подмодул " "„${displaypath}“" -#: git-submodule.sh:701 +#: git-submodule.sh:648 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Път към подмодул „${displaypath}“: „${command} ${sha1}“" -#: git-submodule.sh:732 +#: git-submodule.sh:679 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "" "Неуспешна обработка на поддиректориите в пътя към подмодул „${displaypath}“" -#: git-submodule.sh:828 +#: git-submodule.sh:775 msgid "The --cached option cannot be used with the --files option" msgstr "Опциите „--cached“ и „--files“ са несъвместими" -#: git-submodule.sh:880 +#: git-submodule.sh:827 #, sh-format msgid "unexpected mode $mod_dst" msgstr "неочакван режим „${mod_dst}“" -#: git-submodule.sh:900 +#: git-submodule.sh:847 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr "" " ПРЕДУПРЕЖДЕНИЕ: „${display_name}“ не съдържа подаването „${sha1_src}“" -#: git-submodule.sh:903 +#: git-submodule.sh:850 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr "" " ПРЕДУПРЕЖДЕНИЕ: „${display_name}“ не съдържа подаването „${sha1_dst}“" -#: git-submodule.sh:906 +#: git-submodule.sh:853 #, 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:1077 -#, sh-format -msgid "Synchronizing submodule url for '$displaypath'" -msgstr "Синхронизиране на адреса за пътя към подмодул „${displaypath}“" - #: git-parse-remote.sh:89 #, sh-format msgid "See git-${cmd}(1) for details." @@ -15867,7 +16282,7 @@ msgstr "" "\n" "Ако изтриете ред, съответстващото му подаване ще бъде ИЗТРИТО.\n" -#: git-rebase--interactive.sh:211 +#: git-rebase--interactive.sh:213 #, sh-format msgid "" "You can amend the commit now, with\n" @@ -15886,84 +16301,84 @@ msgstr "" "\n" " git rebase --continue" -#: git-rebase--interactive.sh:236 +#: git-rebase--interactive.sh:238 #, sh-format msgid "$sha1: not a commit that can be picked" msgstr "$sha1: това не е подаване, което може да бъде отбрано" -#: git-rebase--interactive.sh:275 +#: git-rebase--interactive.sh:277 #, sh-format msgid "Invalid commit name: $sha1" msgstr "Неправилно име на подаване: „$sha1“" -#: git-rebase--interactive.sh:317 +#: git-rebase--interactive.sh:319 msgid "Cannot write current commit's replacement sha1" msgstr "" "Заместващата сума по SHA1 за текущото подаване не може да бъде запазена" -#: git-rebase--interactive.sh:369 +#: git-rebase--interactive.sh:371 #, sh-format msgid "Fast-forward to $sha1" msgstr "Превъртане до „$sha1“" -#: git-rebase--interactive.sh:371 +#: git-rebase--interactive.sh:373 #, sh-format msgid "Cannot fast-forward to $sha1" msgstr "Не може да се превърти до „$sha1“" -#: git-rebase--interactive.sh:380 +#: git-rebase--interactive.sh:382 #, sh-format msgid "Cannot move HEAD to $first_parent" msgstr "Указателят „HEAD“ не може да се насочи към „$first_parent“" -#: git-rebase--interactive.sh:385 +#: git-rebase--interactive.sh:387 #, sh-format msgid "Refusing to squash a merge: $sha1" msgstr "Подаването не може да се смачка: „$sha1“" -#: git-rebase--interactive.sh:400 +#: git-rebase--interactive.sh:405 #, sh-format msgid "Error redoing merge $sha1" msgstr "Грешка при повтарянето на сливането на „$sha1“" -#: git-rebase--interactive.sh:408 +#: git-rebase--interactive.sh:414 #, sh-format msgid "Could not pick $sha1" msgstr "„$sha1“ не може да се отбере." -#: git-rebase--interactive.sh:417 +#: git-rebase--interactive.sh:423 #, sh-format msgid "This is the commit message #${n}:" msgstr "Това е съобщение при подаване №${n}:" -#: git-rebase--interactive.sh:422 +#: git-rebase--interactive.sh:428 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "Съобщение при подаване №${n} ще бъде прескочено." -#: git-rebase--interactive.sh:433 +#: git-rebase--interactive.sh:439 #, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." msgstr[0] "Това е обединение от $count подаване." msgstr[1] "Това е обединение от $count подавания." -#: git-rebase--interactive.sh:442 +#: git-rebase--interactive.sh:448 #, sh-format msgid "Cannot write $fixup_msg" msgstr "Новото съобщение при подаване „$fixup_msg“ не може да бъде запазено" -#: git-rebase--interactive.sh:445 +#: git-rebase--interactive.sh:451 msgid "This is a combination of 2 commits." msgstr "Това е обединение от 2 подавания" -#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529 -#: git-rebase--interactive.sh:532 +#: git-rebase--interactive.sh:492 git-rebase--interactive.sh:535 +#: git-rebase--interactive.sh:538 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "Не може да се подаде $sha1… $rest" -#: git-rebase--interactive.sh:560 +#: git-rebase--interactive.sh:567 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -15979,31 +16394,31 @@ msgstr "" "коригирате,\n" "преди да можете да промените подаването." -#: git-rebase--interactive.sh:575 +#: git-rebase--interactive.sh:582 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "Спиране при „$sha1_abbrev…“ $rest" -#: git-rebase--interactive.sh:590 +#: git-rebase--interactive.sh:597 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "Без предишно подаване не може да се изпълни „$squash_style“" -#: git-rebase--interactive.sh:632 +#: git-rebase--interactive.sh:639 #, sh-format msgid "Executing: $rest" msgstr "В момента се изпълнява: $rest" -#: git-rebase--interactive.sh:640 +#: git-rebase--interactive.sh:647 #, sh-format msgid "Execution failed: $rest" msgstr "Неуспешно изпълнение: $rest" -#: git-rebase--interactive.sh:642 +#: git-rebase--interactive.sh:649 msgid "and made changes to the index and/or the working tree" msgstr "и промени индекса и/или работното дърво" -#: git-rebase--interactive.sh:644 +#: git-rebase--interactive.sh:651 msgid "" "You can fix the problem, and then run\n" "\n" @@ -16014,7 +16429,7 @@ msgstr "" " git rebase --continue" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--interactive.sh:657 +#: git-rebase--interactive.sh:664 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -16029,29 +16444,29 @@ msgstr "" "\n" " git rebase --continue" -#: git-rebase--interactive.sh:668 +#: git-rebase--interactive.sh:675 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "Непозната команда: $command $sha1 $rest" -#: git-rebase--interactive.sh:669 +#: git-rebase--interactive.sh:676 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "Коригирайте това чрез „git rebase --edit-todo“." -#: git-rebase--interactive.sh:704 +#: git-rebase--interactive.sh:711 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "Успешно пребазиране и обновяване на „$head_name“." -#: git-rebase--interactive.sh:728 +#: git-rebase--interactive.sh:735 msgid "could not detach HEAD" msgstr "указателят „HEAD“ не може да се отдели" -#: git-rebase--interactive.sh:763 +#: git-rebase--interactive.sh:771 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "Указателят „CHERRY_PICK_HEAD“ не може да бъде изтрит" -#: git-rebase--interactive.sh:768 +#: git-rebase--interactive.sh:776 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -16081,11 +16496,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--interactive.sh:785 +#: git-rebase--interactive.sh:793 msgid "Error trying to find the author identity to amend commit" msgstr "Не може да бъде открит автор за поправянето на подаването" -#: git-rebase--interactive.sh:790 +#: git-rebase--interactive.sh:798 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -16093,11 +16508,11 @@ msgstr "" "В работното дърво има неподадени промени. Първо ги подайте, а след това\n" "отново изпълнете „git rebase --continue“." -#: git-rebase--interactive.sh:795 git-rebase--interactive.sh:799 +#: git-rebase--interactive.sh:803 git-rebase--interactive.sh:807 msgid "Could not commit staged changes." msgstr "Промените в индекса не могат да бъдат подадени." -#: git-rebase--interactive.sh:827 +#: git-rebase--interactive.sh:836 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -16112,37 +16527,37 @@ msgstr "" " git rebase --continue\n" "\n" -#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:995 +#: git-rebase--interactive.sh:844 git-rebase--interactive.sh:1008 msgid "Could not execute editor" msgstr "Текстовият редактор не може да бъде стартиран" -#: git-rebase--interactive.sh:848 +#: git-rebase--interactive.sh:860 #, sh-format msgid "Could not checkout $switch_to" msgstr "„$switch_to“ не може да се изтегли" -#: git-rebase--interactive.sh:853 +#: git-rebase--interactive.sh:865 msgid "No HEAD?" msgstr "Липсва указател „HEAD“" -#: git-rebase--interactive.sh:854 +#: git-rebase--interactive.sh:866 #, sh-format msgid "Could not create temporary $state_dir" msgstr "Временната директория „$state_dir“ не може да бъде създадена" -#: git-rebase--interactive.sh:856 +#: git-rebase--interactive.sh:869 msgid "Could not mark as interactive" msgstr "Пребазирането не е интерактивно" -#: git-rebase--interactive.sh:866 git-rebase--interactive.sh:871 +#: git-rebase--interactive.sh:879 git-rebase--interactive.sh:884 msgid "Could not init rewritten commits" msgstr "Списъкът с презаписаните подавания не може да бъде създаден" -#: git-rebase--interactive.sh:897 +#: git-rebase--interactive.sh:910 msgid "Could not generate todo list" msgstr "Файлът с командите не може да се генерира" -#: git-rebase--interactive.sh:973 +#: git-rebase--interactive.sh:986 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" @@ -16151,7 +16566,7 @@ msgstr[0] "" msgstr[1] "" "Пребазиране на $shortrevisions върху $shortonto ($todocount команди)" -#: git-rebase--interactive.sh:978 +#: git-rebase--interactive.sh:991 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -16161,7 +16576,7 @@ msgstr "" "Ако изтриете всичко, пребазирането ще бъде преустановено.\n" "\n" -#: git-rebase--interactive.sh:985 +#: git-rebase--interactive.sh:998 msgid "Note that empty commits are commented out" msgstr "Празните подавания са коментирани" @@ -16307,7 +16722,7 @@ msgstr "Добавяне на неследени" msgid "No untracked files.\n" msgstr "Няма неследени файлове.\n" -#: git-add--interactive.perl:985 +#: git-add--interactive.perl:1026 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." @@ -16316,7 +16731,7 @@ msgstr "" "незабавно\n" "добавено към индекса" -#: git-add--interactive.perl:988 +#: git-add--interactive.perl:1029 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." @@ -16325,7 +16740,7 @@ msgstr "" "незабавно\n" "скътано" -#: git-add--interactive.perl:991 +#: git-add--interactive.perl:1032 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." @@ -16334,7 +16749,7 @@ msgstr "" "незабавно\n" "извадено от индекса." -#: git-add--interactive.perl:994 git-add--interactive.perl:1003 +#: git-add--interactive.perl:1035 git-add--interactive.perl:1044 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." @@ -16343,7 +16758,7 @@ msgstr "" "незабавно\n" "набелязано за прилагане." -#: git-add--interactive.perl:997 git-add--interactive.perl:1000 +#: git-add--interactive.perl:1038 git-add--interactive.perl:1041 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." @@ -16352,16 +16767,16 @@ msgstr "" "незабавно\n" "набелязано за зануляване." -#: git-add--interactive.perl:1013 +#: git-add--interactive.perl:1078 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "файлът за редактиране на парчето код не може да бъде отворен: „%s“" -#: git-add--interactive.perl:1014 +#: git-add--interactive.perl:1079 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "Ръчно редактиране на парчета код — отдолу има подсказка.\n" -#: git-add--interactive.perl:1020 +#: git-add--interactive.perl:1085 #, perl-format msgid "" "---\n" @@ -16376,7 +16791,7 @@ msgstr "" "Редовете, които започват с „%s“ ще бъдат пропуснати.\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: git-add--interactive.perl:1028 +#: git-add--interactive.perl:1093 msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" @@ -16386,7 +16801,7 @@ msgstr "" "изтриете всички редове от парчето код, то ще бъде оставено непроменено, а\n" "редактирането — отказано.\n" -#: git-add--interactive.perl:1042 +#: git-add--interactive.perl:1107 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "" @@ -16398,7 +16813,7 @@ msgstr "" #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#: git-add--interactive.perl:1134 +#: git-add--interactive.perl:1206 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" @@ -16406,7 +16821,7 @@ msgstr "" "редактирането? (текущите редакции ще се отменят при отказ!): „y“ (да)/ " "„n“ (не)? " -#: git-add--interactive.perl:1143 +#: git-add--interactive.perl:1215 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -16420,7 +16835,7 @@ msgstr "" "a — добавяне на това и всички следващи парчета от файла в индекса\n" "d — без добавяне на това и всички следващи парчета от файла в индекса" -#: git-add--interactive.perl:1149 +#: git-add--interactive.perl:1221 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -16434,7 +16849,7 @@ msgstr "" "a — скатаване на това и всички следващи парчета от файла\n" "d — без скатаване на това и всички следващи парчета от файла" -#: git-add--interactive.perl:1155 +#: git-add--interactive.perl:1227 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -16448,7 +16863,7 @@ msgstr "" "a — изваждане на това и всички следващи парчета от файла от индекса\n" "d — без изваждане на това и всички следващи парчета от файла от индекса" -#: git-add--interactive.perl:1161 +#: git-add--interactive.perl:1233 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -16462,7 +16877,7 @@ msgstr "" "a — прилагане на това и всички следващи парчета от файла към индекса\n" "d — без прилагане на това и всички следващи парчета от файла към индекса" -#: git-add--interactive.perl:1167 +#: git-add--interactive.perl:1239 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -16479,7 +16894,7 @@ msgstr "" "d — без премахване на това и всички следващи парчета от файла от работното " "дърво" -#: git-add--interactive.perl:1173 +#: git-add--interactive.perl:1245 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -16496,7 +16911,7 @@ msgstr "" "d — без премахване на това и всички следващи парчета от файла от индекса и " "работното дърво" -#: git-add--interactive.perl:1179 +#: git-add--interactive.perl:1251 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -16513,7 +16928,7 @@ msgstr "" "d — без прилагане на това и всички следващи парчета от файла от индекса и " "работното дърво" -#: git-add--interactive.perl:1188 +#: git-add--interactive.perl:1266 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -16535,204 +16950,220 @@ msgstr "" "e — ръчно редактиране на текущото парче\n" "? — извеждане не помощта\n" -#: git-add--interactive.perl:1219 +#: git-add--interactive.perl:1297 msgid "The selected hunks do not apply to the index!\n" msgstr "Избраните парчета не могат да се добавят в индекса!\n" -#: git-add--interactive.perl:1220 +#: git-add--interactive.perl:1298 msgid "Apply them to the worktree anyway? " msgstr "Да се приложат ли към работното дърво? " -#: git-add--interactive.perl:1223 +#: git-add--interactive.perl:1301 msgid "Nothing was applied.\n" msgstr "Нищо не е приложено.\n" -#: git-add--interactive.perl:1234 +#: git-add--interactive.perl:1312 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "пренебрегване на неслятото: „%s“\n" -#: git-add--interactive.perl:1243 +#: git-add--interactive.perl:1321 msgid "Only binary files changed.\n" msgstr "Само двоични файлове са променени.\n" -#: git-add--interactive.perl:1245 +#: git-add--interactive.perl:1323 msgid "No changes.\n" msgstr "Няма промени.\n" -#: git-add--interactive.perl:1253 +#: git-add--interactive.perl:1331 msgid "Patch update" msgstr "Обновяване на кръпка" -#: git-add--interactive.perl:1305 +#: git-add--interactive.perl:1383 #, perl-format -msgid "Stage mode change [y,n,q,a,d,/%s,?]? " -msgstr "Добавяне на промяната на правата за достъп [y,n,q,a,d,/%s,?]? " +msgid "Stage mode change [y,n,q,a,d%s,?]? " +msgstr "Добавяне на промяната на правата за достъп [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1306 +#: git-add--interactive.perl:1384 #, perl-format -msgid "Stage deletion [y,n,q,a,d,/%s,?]? " -msgstr "Добавяне на изтриването [y,n,q,a,d,/%s,?]? " +msgid "Stage deletion [y,n,q,a,d%s,?]? " +msgstr "Добавяне на изтриването [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1307 +#: git-add--interactive.perl:1385 #, perl-format -msgid "Stage this hunk [y,n,q,a,d,/%s,?]? " -msgstr "Добавяне на това парче [y,n,q,a,d,/%s,?]? " +msgid "Stage this hunk [y,n,q,a,d%s,?]? " +msgstr "Добавяне на това парче [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1310 +#: git-add--interactive.perl:1388 #, perl-format -msgid "Stash mode change [y,n,q,a,d,/%s,?]? " -msgstr "Скатаване на промяната на правата за достъп [y,n,q,a,d,/%s,?]? " +msgid "Stash mode change [y,n,q,a,d%s,?]? " +msgstr "Скатаване на промяната на правата за достъп [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1311 +#: git-add--interactive.perl:1389 #, perl-format -msgid "Stash deletion [y,n,q,a,d,/%s,?]? " -msgstr "Скатаване на изтриването [y,n,q,a,d,/%s,?]? " +msgid "Stash deletion [y,n,q,a,d%s,?]? " +msgstr "Скатаване на изтриването [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1312 +#: git-add--interactive.perl:1390 #, perl-format -msgid "Stash this hunk [y,n,q,a,d,/%s,?]? " -msgstr "Скатаване на това парче [y,n,q,a,d,/%s,?]? " +msgid "Stash this hunk [y,n,q,a,d%s,?]? " +msgstr "Скатаване на това парче [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1315 +#: git-add--interactive.perl:1393 #, perl-format -msgid "Unstage mode change [y,n,q,a,d,/%s,?]? " -msgstr "Изваждане на промяната на правата за достъп [y,n,q,a,d,/%s,?]? " +msgid "Unstage mode change [y,n,q,a,d%s,?]? " +msgstr "Изваждане на промяната на правата за достъп [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1316 +#: git-add--interactive.perl:1394 #, perl-format -msgid "Unstage deletion [y,n,q,a,d,/%s,?]? " -msgstr "Изваждане на изтриването [y,n,q,a,d,/%s,?]? " +msgid "Unstage deletion [y,n,q,a,d%s,?]? " +msgstr "Изваждане на изтриването [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1317 +#: git-add--interactive.perl:1395 #, perl-format -msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? " -msgstr "Изваждане на това парче [y,n,q,a,d,/%s,?]? " +msgid "Unstage this hunk [y,n,q,a,d%s,?]? " +msgstr "Изваждане на това парче [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1320 +#: git-add--interactive.perl:1398 #, perl-format -msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? " +msgid "Apply mode change to index [y,n,q,a,d%s,?]? " msgstr "" -"Прилагане на промяната на правата за достъп към индекса [y,n,q,a,d,/%s,?]? " +"Прилагане на промяната на правата за достъп към индекса [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1321 +#: git-add--interactive.perl:1399 #, perl-format -msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? " -msgstr "Прилагане на изтриването към индекса [y,n,q,a,d,/%s,?]? " +msgid "Apply deletion to index [y,n,q,a,d%s,?]? " +msgstr "Прилагане на изтриването към индекса [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1322 +#: git-add--interactive.perl:1400 #, perl-format -msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? " -msgstr "Прилагане на това парче към индекса [y,n,q,a,d,/%s,?]? " +msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " +msgstr "Прилагане на това парче към индекса [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1325 +#: git-add--interactive.perl:1403 #, perl-format -msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? " +msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "" -"Премахване на промяната в правата за достъп от работното дърво [y,n,q,a,d,/" +"Премахване на промяната в правата за достъп от работното дърво [y,n,q,a,d" "%s,?]? " -#: git-add--interactive.perl:1326 +#: git-add--interactive.perl:1404 #, perl-format -msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? " -msgstr "Премахване на изтриването от работното дърво [y,n,q,a,d,/%s,?]? " +msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " +msgstr "Премахване на изтриването от работното дърво [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1327 +#: git-add--interactive.perl:1405 #, perl-format -msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? " -msgstr "Премахване на парчето от работното дърво [y,n,q,a,d,/%s,?]? " +msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " +msgstr "Премахване на парчето от работното дърво [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1330 +#: git-add--interactive.perl:1408 #, perl-format -msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? " +msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Премахване на промяната в правата за достъп от индекса и работното дърво [y," -"n,q,a,d,/%s,?]? " +"n,q,a,d%s,?]? " -#: git-add--interactive.perl:1331 +#: git-add--interactive.perl:1409 #, perl-format -msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? " +msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " msgstr "" -"Премахване на изтриването от индекса и работното дърво [y,n,q,a,d,/%s,?]? " +"Премахване на изтриването от индекса и работното дърво [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1332 +#: git-add--interactive.perl:1410 #, perl-format -msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? " -msgstr "Премахване на парчето от индекса и работното дърво [y,n,q,a,d,/%s,?]? " +msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " +msgstr "Премахване на парчето от индекса и работното дърво [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1335 +#: git-add--interactive.perl:1413 #, perl-format -msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? " +msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Прилагане на промяната в правата за достъп от индекса и работното дърво [y,n," -"q,a,d,/%s,?]? " +"q,a,d%s,?]? " -#: git-add--interactive.perl:1336 +#: git-add--interactive.perl:1414 #, perl-format -msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? " +msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " msgstr "" -"Прилагане на изтриването от индекса и работното дърво [y,n,q,a,d,/%s,?]? " +"Прилагане на изтриването от индекса и работното дърво [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1337 +#: git-add--interactive.perl:1415 #, perl-format -msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? " -msgstr "Прилагане на парчето от индекса и работното дърво [y,n,q,a,d,/%s,?]? " +msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " +msgstr "Прилагане на парчето от индекса и работното дърво [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1515 +msgid "No other hunks to goto\n" +msgstr "Няма други парчета\n" -#: git-add--interactive.perl:1440 +#: git-add--interactive.perl:1522 msgid "go to which hunk (<ret> to see more)? " msgstr "към кое парче да се придвижи (за повече варианти натиснете „enter“)? " -#: git-add--interactive.perl:1442 +#: git-add--interactive.perl:1524 msgid "go to which hunk? " msgstr "към кое парче да се придвижи? " -#: git-add--interactive.perl:1451 +#: git-add--interactive.perl:1533 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Неправилен номер: „%s“\n" -#: git-add--interactive.perl:1456 +#: git-add--interactive.perl:1538 #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" msgstr[0] "Има само %d парче.\n" msgstr[1] "Има само %d парчета.\n" -#: git-add--interactive.perl:1482 +#: git-add--interactive.perl:1564 +msgid "No other hunks to search\n" +msgstr "Няма други парчета за търсене\n" + +#: git-add--interactive.perl:1568 msgid "search for regex? " msgstr "да се търси с регулярен израз? " -#: git-add--interactive.perl:1495 +#: git-add--interactive.perl:1581 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Сгрешен регулярен израз „%s“: %s\n" -#: git-add--interactive.perl:1505 +#: git-add--interactive.perl:1591 msgid "No hunk matches the given pattern\n" msgstr "Никое парче не напасва на регулярния израз\n" -#: git-add--interactive.perl:1517 git-add--interactive.perl:1539 +#: git-add--interactive.perl:1603 git-add--interactive.perl:1625 msgid "No previous hunk\n" msgstr "Няма друго парче преди това\n" -#: git-add--interactive.perl:1526 git-add--interactive.perl:1545 +#: git-add--interactive.perl:1612 git-add--interactive.perl:1631 msgid "No next hunk\n" msgstr "Няма друго парче след това\n" -#: git-add--interactive.perl:1553 +#: git-add--interactive.perl:1637 +msgid "Sorry, cannot split this hunk\n" +msgstr "Това парче не може да бъде разделено\n" + +#: git-add--interactive.perl:1643 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "Разделяне на %d парче.\n" msgstr[1] "Разделяне на %d парчета.\n" -#: git-add--interactive.perl:1605 +#: git-add--interactive.perl:1653 +msgid "Sorry, cannot edit this hunk\n" +msgstr "Това парче не може да бъде редактирано\n" + +#: git-add--interactive.perl:1699 msgid "Review diff" msgstr "Преглед на разликата" #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1624 +#: git-add--interactive.perl:1718 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -16753,90 +17184,98 @@ msgstr "" " и индекса\n" "add untracked — добавяне на неследените файлове към промените в индекса\n" -#: git-add--interactive.perl:1641 git-add--interactive.perl:1646 -#: git-add--interactive.perl:1649 git-add--interactive.perl:1656 -#: git-add--interactive.perl:1660 git-add--interactive.perl:1666 +#: git-add--interactive.perl:1735 git-add--interactive.perl:1740 +#: git-add--interactive.perl:1743 git-add--interactive.perl:1750 +#: git-add--interactive.perl:1754 git-add--interactive.perl:1760 msgid "missing --" msgstr "„--“ липсва" -#: git-add--interactive.perl:1662 +#: git-add--interactive.perl:1756 #, perl-format msgid "unknown --patch mode: %s" msgstr "неизвестна стратегия за прилагане на кръпка: „%s“" -#: git-add--interactive.perl:1668 git-add--interactive.perl:1674 +#: git-add--interactive.perl:1762 git-add--interactive.perl:1768 #, perl-format msgid "invalid argument %s, expecting --" msgstr "указан е неправилен аргумент „%s“, а се очаква „--“." -#: git-send-email.perl:126 +#: git-send-email.perl:130 msgid "local zone differs from GMT by a non-minute interval\n" msgstr "" "разликата между местния часови пояс и GMT съдържа дробна част от минута\n" "\n" -#: git-send-email.perl:133 git-send-email.perl:139 +#: git-send-email.perl:137 git-send-email.perl:143 msgid "local time offset greater than or equal to 24 hours\n" msgstr "разликата между местния часовия пояс и GMT е 24 часа или повече\n" -#: git-send-email.perl:207 git-send-email.perl:213 +#: git-send-email.perl:211 git-send-email.perl:217 msgid "the editor exited uncleanly, aborting everything" msgstr "" "текстовият редактор приключи работата с грешка, всичко се преустановява" -#: git-send-email.perl:290 +#: git-send-email.perl:294 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "„%s“ съдържа временна версия на подготвяното е-писмо.\n" -#: git-send-email.perl:295 +#: git-send-email.perl:299 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "„%s.final“ съдържа подготвеното е-писмо.\n" -#: git-send-email.perl:313 +#: git-send-email.perl:317 msgid "--dump-aliases incompatible with other options\n" msgstr "опцията „--dump-aliases“ е несъвместима с другите опции\n" -#: git-send-email.perl:378 git-send-email.perl:629 +#: git-send-email.perl:383 git-send-email.perl:638 msgid "Cannot run git format-patch from outside a repository\n" msgstr "Командата „git format-patch“ не може да се изпълни извън хранилище\n" -#: git-send-email.perl:447 +#: git-send-email.perl:386 +msgid "" +"`batch-size` and `relogin` must be specified together (via command-line or " +"configuration option)\n" +msgstr "" +"„batch-size“ и „relogin“ трябва да се указват заедно (или чрез командния " +"ред, или чрез настройките)\n" + +#: git-send-email.perl:456 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "Непознато поле за опцията „--suppress-cc“: „%s“\n" -#: git-send-email.perl:476 +#: git-send-email.perl:485 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "Непозната стойност за „--confirm“: %s\n" -#: git-send-email.perl:504 +#: git-send-email.perl:513 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "" "ПРЕДУПРЕЖДЕНИЕ: синоними за sendmail съдържащи кавички („\"“) не се " "поддържат: %s\n" -#: git-send-email.perl:506 +#: git-send-email.perl:515 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "ПРЕДУПРЕЖДЕНИЕ: „:include:“ не се поддържа: %s\n" -#: git-send-email.perl:508 +#: git-send-email.perl:517 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "" "ПРЕДУПРЕЖДЕНИЕ: пренасочвания „/file“ или „|pipe“ не се поддържат: %s\n" -#: git-send-email.perl:513 +#: git-send-email.perl:522 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "ПРЕДУПРЕЖДЕНИЕ: редът за „sendmail“ не е разпознат: %s\n" -#: git-send-email.perl:595 +#: git-send-email.perl:604 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -16851,12 +17290,12 @@ msgstr "" " ● укажете „./%s“ за файл;\n" " ● използвате опцията „--format-patch“ за диапазон.\n" -#: git-send-email.perl:616 +#: git-send-email.perl:625 #, perl-format msgid "Failed to opendir %s: %s" msgstr "Директорията „%s“ не може да се отвори: %s" -#: git-send-email.perl:640 +#: git-send-email.perl:649 #, perl-format msgid "" "fatal: %s: %s\n" @@ -16865,7 +17304,7 @@ msgstr "" "ФАТАЛНА ГРЕШКА: %s: %s\n" "ПРЕДУПРЕЖДЕНИЕ: не са пратени никакви кръпки\n" -#: git-send-email.perl:651 +#: git-send-email.perl:660 msgid "" "\n" "No patch files specified!\n" @@ -16875,17 +17314,17 @@ msgstr "" "Не са указани кръпки!\n" "\n" -#: git-send-email.perl:664 +#: git-send-email.perl:673 #, perl-format msgid "No subject line in %s?" msgstr "В „%s“ липсва тема" -#: git-send-email.perl:674 +#: git-send-email.perl:683 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "„%s“ не може да се отвори за запис: %s" -#: git-send-email.perl:684 +#: git-send-email.perl:694 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -16900,32 +17339,27 @@ msgstr "" "\n" "Изтрийте всичко, ако не искате да изпратите обобщаващо писмо.\n" -#: git-send-email.perl:707 -#, perl-format -msgid "Failed to open %s.final: %s" -msgstr "„%s.final“ не може да се отвори: %s" - -#: git-send-email.perl:710 +#: git-send-email.perl:718 #, perl-format msgid "Failed to open %s: %s" 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" +#: git-send-email.perl:735 +#, perl-format +msgid "Failed to open %s.final: %s" +msgstr "„%s.final“ не може да се отвори: %s" -#: git-send-email.perl:754 +#: git-send-email.perl:778 msgid "Summary email is empty, skipping it\n" msgstr "Обобщаващото писмо е празно и се прескача\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:786 +#: git-send-email.perl:813 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "Сигурни ли сте, че искате да ползвате „%s“ [y/N]? " -#: git-send-email.perl:815 +#: git-send-email.perl:868 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" @@ -16933,11 +17367,11 @@ msgstr "" "Следните файлове са 8 битови, но не са с обявена заглавна част „Content-" "Transfer-Encoding“.\n" -#: git-send-email.perl:820 +#: git-send-email.perl:873 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "Кое 8 битово кодиране се ползва [стандартно: UTF-8]? " -#: git-send-email.perl:828 +#: git-send-email.perl:881 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -16950,22 +17384,22 @@ msgstr "" "все още е с шаблонното заглавие „*** SUBJECT HERE ***“. Ползвайте опцията\n" "„--force“, ако сте сигурни, че точно това искате да изпратите.\n" -#: git-send-email.perl:847 +#: git-send-email.perl:900 msgid "To whom should the emails be sent (if anyone)?" msgstr "На кой да се пратят е-писмата (незадължително поле)" -#: git-send-email.perl:865 +#: git-send-email.perl:918 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "ФАТАЛНА ГРЕШКА: „%s“ е синоним на себе си\n" -#: git-send-email.perl:877 +#: git-send-email.perl:930 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "" "Идентификатор на съобщение „Message-ID“, което да се използва за обявяването " "на отговор „In-Reply-To“ (незадължително поле)" -#: git-send-email.perl:929 git-send-email.perl:937 +#: git-send-email.perl:988 git-send-email.perl:996 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "ГРЕШКА: не може да се извлече адрес от „%s“\n" @@ -16973,18 +17407,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:941 +#: git-send-email.perl:1000 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "" "Какво да се направи с този адрес? „q“ (спиране), „d“ (изтриване), " "„e“ (редактиране): " -#: git-send-email.perl:1262 +#: git-send-email.perl:1317 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "Пътят към сертификат „%s“ не съществува." -#: git-send-email.perl:1337 +#: git-send-email.perl:1395 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -17012,131 +17446,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:1352 +#: git-send-email.perl:1410 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): " msgstr "" "Изпращане на е-писмото? „y“ (да), „n“ (не), „q“ (изход), „a“ (всичко): " -#: git-send-email.perl:1355 +#: git-send-email.perl:1413 msgid "Send this email reply required" msgstr "Изискване на отговор към това е-писмо" -#: git-send-email.perl:1381 +#: git-send-email.perl:1439 msgid "The required SMTP server is not properly defined." msgstr "Сървърът за SMTP не е настроен правилно." -#: git-send-email.perl:1428 +#: git-send-email.perl:1486 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Сървърът не поддържа „STARTTLS“! %s" -#: git-send-email.perl:1433 git-send-email.perl:1437 +#: git-send-email.perl:1491 git-send-email.perl:1495 #, perl-format msgid "STARTTLS failed! %s" msgstr "Неуспешно изпълнение на STARTTLS! %s" -#: git-send-email.perl:1447 +#: git-send-email.perl:1505 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" "Подсистемата за SMTP не може да се инициализира. Проверете настройките и " "използвайте опцията: „--smtp-debug“." -#: git-send-email.perl:1465 +#: git-send-email.perl:1523 #, perl-format msgid "Failed to send %s\n" msgstr "„%s“ не може да бъде изпратен\n" -#: git-send-email.perl:1468 +#: git-send-email.perl:1526 #, perl-format msgid "Dry-Sent %s\n" msgstr "Проба за изпращане на „%s“\n" -#: git-send-email.perl:1468 +#: git-send-email.perl:1526 #, perl-format msgid "Sent %s\n" msgstr "Изпращане на „%s“\n" -#: git-send-email.perl:1470 +#: git-send-email.perl:1528 msgid "Dry-OK. Log says:\n" msgstr "Успех при пробата. От журнала:\n" -#: git-send-email.perl:1470 +#: git-send-email.perl:1528 msgid "OK. Log says:\n" msgstr "Успех. От журнала:\n" -#: git-send-email.perl:1482 +#: git-send-email.perl:1540 msgid "Result: " msgstr "Резултат: " -#: git-send-email.perl:1485 +#: git-send-email.perl:1543 msgid "Result: OK\n" msgstr "Резултат: успех\n" -#: git-send-email.perl:1498 +#: git-send-email.perl:1556 #, perl-format msgid "can't open file %s" msgstr "файлът „%s“ не може да бъде отворен" -#: git-send-email.perl:1545 git-send-email.perl:1565 +#: git-send-email.perl:1603 git-send-email.perl:1623 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Добавяне на „як: %s“ от ред „%s“\n" -#: git-send-email.perl:1551 +#: git-send-email.perl:1609 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) Добавяне на „до: %s“ от ред „%s“\n" -#: git-send-email.perl:1599 +#: git-send-email.perl:1657 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(не-mbox) Добавяне на „як: %s“ от ред „%s“\n" -#: git-send-email.perl:1624 +#: git-send-email.perl:1682 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(тяло) Добавяне на „як: %s“ от ред „%s“\n" -#: git-send-email.perl:1730 +#: git-send-email.perl:1788 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Не може да бъде се изпълни „%s“" -#: git-send-email.perl:1737 +#: git-send-email.perl:1795 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Добавяне на „%s: %s“ от: „%s“\n" -#: git-send-email.perl:1741 +#: git-send-email.perl:1799 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) програмният канал не може да се затвори за изпълнението на „%s“" -#: git-send-email.perl:1768 +#: git-send-email.perl:1826 msgid "cannot send message as 7bit" msgstr "съобщението не може да се изпрати чрез 7 битови знаци" -#: git-send-email.perl:1776 +#: git-send-email.perl:1834 msgid "invalid transfer encoding" msgstr "неправилно кодиране за пренос" -#: git-send-email.perl:1814 git-send-email.perl:1865 git-send-email.perl:1875 +#: git-send-email.perl:1872 git-send-email.perl:1923 git-send-email.perl:1933 #, perl-format msgid "unable to open %s: %s\n" msgstr "„%s“ не може да се отвори: %s\n" -#: git-send-email.perl:1817 +#: git-send-email.perl:1875 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "„%s“: кръпката съдържа ред с над 988 знака" -#: git-send-email.perl:1833 +#: git-send-email.perl:1891 #, 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:1837 +#: git-send-email.perl:1895 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Наистина ли искате да изпратите „%s“? [y|N]: " @@ -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: 2018-01-07 07:50+0800\n" -"PO-Revision-Date: 2018-01-07 12:14-0500\n" +"POT-Creation-Date: 2018-03-16 07:29+0800\n" +"PO-Revision-Date: 2018-03-15 21:31-0500\n" "Last-Translator: christopher.diaz.riv@gmail.com\n" "Language-Team: CodeLabora <codelabora@gmail.com>\n" "Language: es\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.7\n" +"X-Generator: Poedit 2.0.6\n" #: advice.c:62 #, c-format @@ -61,7 +61,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "Saliendo porque existe un conflicto sin resolver." -#: advice.c:121 builtin/merge.c:1213 +#: advice.c:121 builtin/merge.c:1251 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "No has concluido tu fusión (MERGE_HEAD existe)." @@ -122,15 +122,15 @@ msgstr "--cached y --3way no se pueden utilizar juntas." #: apply.c:127 msgid "--3way outside a repository" -msgstr "--3way esta fuera de un repositorio" +msgstr "--3way está fuera de un repositorio" #: apply.c:138 msgid "--index outside a repository" -msgstr "--index esta fuera de un repositorio" +msgstr "--index está fuera de un repositorio" #: apply.c:141 msgid "--cached outside a repository" -msgstr "--cached esta fuera de un repositorio" +msgstr "--cached está fuera de un repositorio" #: apply.c:821 #, c-format @@ -291,7 +291,7 @@ msgid "" "while searching for:\n" "%.*s" msgstr "" -"Mientras se busca:\n" +"mientras se busca:\n" "%.*s" #: apply.c:3095 @@ -379,7 +379,7 @@ msgstr "%s: no concuerda con el índice" 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-" -"vías" +"vías." #: apply.c:3563 #, c-format @@ -475,7 +475,7 @@ msgstr "modo cambiado para %s, el cual no se encuentra en el HEAD actual" msgid "sha1 information is lacking or useless (%s)." msgstr "falta información sha1 o es inútil (%s)." -#: apply.c:4095 builtin/checkout.c:236 builtin/reset.c:148 +#: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry fallo para la ruta '%s'" @@ -534,11 +534,11 @@ msgstr "no es posible escribir el archivo '%s' modo %o" #: apply.c:4515 #, c-format msgid "Applied patch %s cleanly." -msgstr "Parche %s aplicado limpiamente" +msgstr "Parche %s aplicado limpiamente." #: apply.c:4523 msgid "internal error" -msgstr "Error interno" +msgstr "error interno" #: apply.c:4526 #, c-format @@ -550,9 +550,9 @@ msgstr[1] "Aplicando parche %%s con %d rechazos..." #: apply.c:4537 #, c-format msgid "truncating .rej filename to %.*s.rej" -msgstr "truncando el nombre de archivo .rej a %.*s.rej " +msgstr "truncando el nombre de archivo .rej a %.*s.rej" -#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011 +#: apply.c:4545 builtin/fetch.c:775 builtin/fetch.c:1025 #, c-format msgid "cannot open %s" msgstr "no se puede abrir %s" @@ -560,12 +560,12 @@ msgstr "no se puede abrir %s" #: apply.c:4559 #, c-format msgid "Hunk #%d applied cleanly." -msgstr "Hunk #%d aplicado limpiamente" +msgstr "Hunk #%d aplicado limpiamente." #: apply.c:4563 #, c-format msgid "Rejected hunk #%d." -msgstr "hunk #%d rechazado" +msgstr "Hunk #%d rechazado." #: apply.c:4673 #, c-format @@ -612,11 +612,11 @@ msgstr[1] "" msgid "Unable to write new index file" msgstr "No es posible escribir el archivo índice" -#: apply.c:4921 apply.c:4924 builtin/am.c:2220 builtin/am.c:2223 -#: 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 +#: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257 +#: builtin/clone.c:118 builtin/fetch.c:127 builtin/pull.c:193 +#: builtin/submodule--helper.c:403 builtin/submodule--helper.c:1197 +#: builtin/submodule--helper.c:1200 builtin/submodule--helper.c:1567 +#: builtin/submodule--helper.c:1570 builtin/submodule--helper.c:1787 #: git-add--interactive.perl:197 msgid "path" msgstr "ruta" @@ -629,7 +629,7 @@ msgstr "no aplicar cambios que concuerden con la ruta suministrada" msgid "apply changes matching the given path" msgstr "aplicar cambios que concuerden con la ruta suministrada" -#: apply.c:4927 builtin/am.c:2229 +#: apply.c:4927 builtin/am.c:2263 msgid "num" msgstr "num" @@ -669,81 +669,81 @@ msgstr "aplicar un parche sin tocar el árbol de trabajo" msgid "accept a patch that touches outside the working area" msgstr "aceptar un parche que toca fuera del área de trabajo" -#: apply.c:4949 +#: apply.c:4950 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "también aplicar el parche ( usar con --stat/--summary/--check" -#: apply.c:4951 +#: apply.c:4952 msgid "attempt three-way merge if a patch does not apply" msgstr "intentar merge de tres-vías si el parche no aplica" -#: apply.c:4953 +#: apply.c:4954 msgid "build a temporary index based on embedded index information" msgstr "" "construir un índice temporal basado en la información del índice incrustado" -#: apply.c:4956 builtin/checkout-index.c:168 builtin/ls-files.c:515 +#: apply.c:4957 builtin/checkout-index.c:168 builtin/ls-files.c:515 msgid "paths are separated with NUL character" -msgstr "rutas están separadas con un carácter NULL " +msgstr "rutas están separadas con un carácter NULL" -#: apply.c:4958 +#: apply.c:4959 msgid "ensure at least <n> lines of context match" msgstr "asegure que por lo menos <n> líneas del contexto concuerden" -#: apply.c:4959 builtin/am.c:2208 builtin/interpret-trailers.c:95 +#: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99 -#: builtin/pack-objects.c:3009 +#: builtin/pack-objects.c:3035 msgid "action" msgstr "acción" -#: apply.c:4960 +#: apply.c:4961 msgid "detect new or modified lines that have whitespace errors" msgstr "" "detectar líneas nuevas o modificadas que contienen errores de espacios en " "blanco" -#: apply.c:4963 apply.c:4966 +#: apply.c:4964 apply.c:4967 msgid "ignore changes in whitespace when finding context" msgstr "" "ignorar cambios en los espacios en blanco cuando se encuentra el contexto" -#: apply.c:4969 +#: apply.c:4970 msgid "apply the patch in reverse" msgstr "aplicar el parche en reversa" -#: apply.c:4971 +#: apply.c:4972 msgid "don't expect at least one line of context" msgstr "no espera al menos una línea del contexto" -#: apply.c:4973 +#: apply.c:4974 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "dejar los hunks rechazados en los archivos *.rej correspontientes" -#: apply.c:4975 +#: apply.c:4976 msgid "allow overlapping hunks" msgstr "permitir solapamiento de hunks" -#: 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 +#: apply.c:4977 builtin/add.c:292 builtin/check-ignore.c:21 +#: builtin/commit.c:1276 builtin/count-objects.c:96 builtin/fsck.c:665 +#: builtin/log.c:1901 builtin/mv.c:123 builtin/read-tree.c:125 msgid "be verbose" msgstr "ser verboso" -#: apply.c:4978 +#: apply.c:4979 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" "tolerar nuevas líneas faltantes detectadas incorrectamente al final del " "archivo" -#: apply.c:4981 +#: apply.c:4982 msgid "do not trust the line counts in the hunk headers" msgstr "no confiar en el conteo de líneas en los headers del hunk" -#: apply.c:4983 builtin/am.c:2217 +#: apply.c:4984 builtin/am.c:2251 msgid "root" msgstr "raíz" -#: apply.c:4984 +#: apply.c:4985 msgid "prepend <root> to all filenames" msgstr "anteponer <root> a todos los nombres de archivos" @@ -779,7 +779,7 @@ msgstr "fmt" msgid "archive format" msgstr "formato del archivo" -#: archive.c:437 builtin/log.c:1459 +#: archive.c:437 builtin/log.c:1462 msgid "prefix" msgstr "prefijo" @@ -787,11 +787,11 @@ 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: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 +#: archive.c:439 builtin/blame.c:702 builtin/blame.c:703 builtin/config.c:62 +#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:869 +#: builtin/hash-object.c:103 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 +#: parse-options.h:165 msgid "file" msgstr "carpeta" @@ -823,8 +823,8 @@ msgstr "comprimir mejor" 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:872 builtin/submodule--helper.c:1239 +#: archive.c:458 builtin/archive.c:90 builtin/clone.c:108 builtin/clone.c:111 +#: builtin/submodule--helper.c:1209 builtin/submodule--helper.c:1576 msgid "repo" msgstr "repo" @@ -838,11 +838,11 @@ msgstr "comando" #: archive.c:461 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" -msgstr "ruta para el comando git-upload-archivo remoto " +msgstr "ruta para el comando git-upload-archivo remoto" #: archive.c:468 msgid "Unexpected option --remote" -msgstr "opción inesperada --remote" +msgstr "Opción inesperada --remote" #: archive.c:470 msgid "Option --exec can only be used together with --remote" @@ -875,22 +875,22 @@ msgstr "" "Los patrones negativos son ignorados en los atributos de git\n" "Usa '\\!' para comenzar literalmente con exclamación." -#: bisect.c:458 +#: bisect.c:460 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Revisa las comillas en el archivo '%s': %s" -#: bisect.c:666 +#: bisect.c:668 #, c-format msgid "We cannot bisect more!\n" msgstr "No podemos bisecar mas!\n" -#: bisect.c:720 +#: bisect.c:722 #, c-format msgid "Not a valid commit name %s" msgstr "No es un nombre de commit valido %s" -#: bisect.c:744 +#: bisect.c:746 #, c-format msgid "" "The merge base %s is bad.\n" @@ -899,7 +899,7 @@ msgstr "" "La base de fisión %s esta mal.\n" "Esto quiere decir que el bug ha sido arreglado entre %s y [%s].\n" -#: bisect.c:749 +#: bisect.c:751 #, c-format msgid "" "The merge base %s is new.\n" @@ -908,7 +908,7 @@ msgstr "" "La base de fisión %s es nueva.\n" "Esta propiedad ha cambiado entre %s y [%s].\n" -#: bisect.c:754 +#: bisect.c:756 #, c-format msgid "" "The merge base %s is %s.\n" @@ -917,7 +917,7 @@ msgstr "" "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:762 +#: bisect.c:764 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -928,7 +928,7 @@ msgstr "" "git bisect no puede trabajar bien en este caso.\n" "Tal vez confundió la revisión %s y %s?\n" -#: bisect.c:775 +#: bisect.c:777 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -944,31 +944,31 @@ msgstr "" msgid "Bisecting: a merge base must be tested\n" msgstr "Bisectando: una base de fisión debe ser probada\n" -#: bisect.c:862 +#: bisect.c:850 #, c-format msgid "a %s revision is needed" msgstr "una %s revisión es necesaria" -#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234 +#: bisect.c:869 builtin/notes.c:175 builtin/tag.c:235 #, c-format msgid "could not create file '%s'" msgstr "no se pudo crear el archivo '%s'" -#: bisect.c:930 +#: bisect.c:920 #, c-format msgid "could not read file '%s'" msgstr "no se pudo leer el archivo '%s'" -#: bisect.c:960 +#: bisect.c:950 msgid "reading bisect refs failed" msgstr "fallo leer las refs de bisect" -#: bisect.c:979 +#: bisect.c:969 #, c-format msgid "%s was both %s and %s\n" msgstr "%s fue tanto %s como %s\n" -#: bisect.c:987 +#: bisect.c:977 #, c-format msgid "" "No testable commit found.\n" @@ -977,7 +977,7 @@ msgstr "" "No se encontró commit que se pueda probar.\n" "¿Quizás iniciaste con parámetros de rutas incorrectos?\n" -#: bisect.c:1006 +#: bisect.c:996 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -987,46 +987,46 @@ msgstr[1] "(aproximadamente %d pasos)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1012 +#: bisect.c:1002 #, 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 revisión por probar después de esto %s\n" msgstr[1] "Bisectando: faltan %d revisiones por probar después de esto %s\n" -#: blame.c:1757 +#: blame.c:1758 msgid "--contents and --reverse do not blend well." msgstr "--contents y --reverse no se mezclan bien." -#: blame.c:1768 +#: blame.c:1769 msgid "cannot use --contents with final commit object name" msgstr "no se puede usar --contents con el nombre de objeto commit final" -#: blame.c:1788 +#: blame.c:1789 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse y --first-parent juntos requieren especificar el último commit" -#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1177 -#: sequencer.c:2370 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 +#: blame.c:1798 bundle.c:160 ref-filter.c:1978 sequencer.c:1699 +#: sequencer.c:2901 builtin/commit.c:976 builtin/log.c:366 builtin/log.c:920 +#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:370 #: builtin/shortlog.c:191 msgid "revision walk setup failed" msgstr "fallo la configuración del camino de revisión" -#: blame.c:1815 +#: blame.c:1816 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "--reverse --first-parent juntos requieren un rango a lo largo de la cadena " "del primer padre" -#: blame.c:1826 +#: blame.c:1827 #, c-format msgid "no such path %s in %s" msgstr "no hay una ruta %s en %s" -#: blame.c:1837 +#: blame.c:1838 #, c-format msgid "cannot read blob %s for path %s" msgstr "no se puede leer el blob %s para la ruta %s" @@ -1127,7 +1127,7 @@ msgstr "No se puede forzar la actualización de la rama actual." msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "" "No se puede configurar el rastreo de información; el punto de partida '%s' " -"no es una rama" +"no es una rama." #: branch.c:235 #, c-format @@ -1178,7 +1178,7 @@ msgstr "'%s' ya ha sido marcado en '%s'" #: branch.c:382 #, c-format msgid "HEAD of working tree %s is not updated" -msgstr "la HEAD del árbol de trabajo %s no esta actualizada" +msgstr "HEAD del árbol de trabajo %s no esta actualizada" #: bundle.c:34 #, c-format @@ -1190,76 +1190,75 @@ 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:1360 sequencer.c:1807 sequencer.c:2637 -#: sequencer.c:2663 sequencer.c:2754 sequencer.c:2856 builtin/commit.c:782 +#: bundle.c:88 sequencer.c:1879 sequencer.c:2337 builtin/commit.c:750 #, c-format msgid "could not open '%s'" msgstr "no se pudo abrir '%s'" -#: bundle.c:140 +#: bundle.c:139 msgid "Repository lacks these prerequisite commits:" msgstr "Al repositorio le falta estos commits prerrequisito:" -#: bundle.c:193 +#: bundle.c:190 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "El bundle contiene esta referencia:" msgstr[1] "El bundle contiene estas %d referencias:" -#: bundle.c:200 +#: bundle.c:197 msgid "The bundle records a complete history." msgstr "El bundle registra una historia completa." -#: bundle.c:202 +#: bundle.c:199 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "El bundle requiere esta referencia:" msgstr[1] "El bundle requiere estas %d referencias:" -#: bundle.c:261 +#: bundle.c:258 msgid "Could not spawn pack-objects" -msgstr "no se pudo engendrar el pack-objetcts" +msgstr "No se pudo crear los pack-objetcts" -#: bundle.c:272 +#: bundle.c:269 msgid "pack-objects died" msgstr "pack-objects murió" -#: bundle.c:314 +#: bundle.c:311 msgid "rev-list died" msgstr "rev-list murió" -#: bundle.c:363 +#: bundle.c:360 #, c-format 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:181 builtin/log.c:1604 builtin/shortlog.c:296 +#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:296 #, c-format msgid "unrecognized argument: %s" msgstr "argumento no reconocido: %s" -#: bundle.c:461 +#: bundle.c:458 msgid "Refusing to create empty bundle." msgstr "Rechazando crear un bundle vacío." -#: bundle.c:473 +#: bundle.c:470 #, c-format msgid "cannot create '%s'" msgstr "no se puede crear '%s'" -#: bundle.c:501 +#: bundle.c:498 msgid "index-pack died" msgstr "index-pack murió" -#: color.c:301 +#: color.c:296 #, c-format msgid "invalid color value: %.*s" msgstr "color inválido: %.*s" -#: commit.c:41 sequencer.c:1614 builtin/am.c:421 builtin/am.c:465 -#: builtin/am.c:1434 builtin/am.c:2069 +#: commit.c:41 sequencer.c:2141 builtin/am.c:421 builtin/am.c:465 +#: builtin/am.c:1436 builtin/am.c:2072 #, c-format msgid "could not parse %s" msgstr "no se puede analizar %s" @@ -1269,7 +1268,7 @@ msgstr "no se puede analizar %s" msgid "%s %s is not a commit!" msgstr "%s %s no es un commit!" -#: commit.c:1524 +#: commit.c:1506 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" @@ -1379,67 +1378,68 @@ msgstr "'%s' para '%s' no es una marca de tiempo válida" msgid "bad zlib compression level %d" msgstr "mala compresión zlib en nivel %d" -#: config.c:1222 +#: config.c:1225 #, c-format msgid "invalid mode for object creation: %s" msgstr "modo invalido de creación de objetos: %s" -#: config.c:1378 +#: config.c:1386 #, c-format msgid "bad pack compression level %d" msgstr "mala compresión pack en el nivel %d" -#: config.c:1574 +#: config.c:1582 msgid "unable to parse command-line config" msgstr "no es posible analizar la configuración de la línea de comando" -#: config.c:1906 +#: config.c:1914 msgid "unknown error occurred while reading the configuration files" msgstr "" "error desconocido ocurrió mientras se leían los archivos de configuración" -#: config.c:2093 +#: config.c:2101 #, c-format msgid "Invalid %s: '%s'" msgstr "Invalido %s: '%s'" -#: config.c:2136 +#: config.c:2144 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "" -"valor core.untrackedCache '%s' desconocido; usando valor por defecto 'keep'" +"valor core.untrackedCache '%s' desconocido; usando 'keep' como valor por " +"defecto" -#: config.c:2162 +#: config.c:2170 #, 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:2187 +#: config.c:2195 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "no es posible analizar '%s' de la configuración de la línea de comando" -#: config.c:2189 +#: config.c:2197 #, 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 línea %d" -#: config.c:2248 +#: config.c:2256 #, c-format msgid "%s has multiple values" msgstr "%s tiene múltiples valores" -#: config.c:2591 config.c:2808 +#: config.c:2599 config.c:2816 #, c-format msgid "fstat on %s failed" msgstr "fstat en %s fallo" -#: config.c:2698 +#: config.c:2706 #, c-format msgid "could not set '%s' to '%s'" msgstr "no se pudo configurar '%s' a '%s'" -#: config.c:2700 builtin/remote.c:776 +#: config.c:2708 builtin/remote.c:776 #, c-format msgid "could not unset '%s'" msgstr "no se pudo desactivar '%s'" @@ -1460,24 +1460,29 @@ msgstr "" "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 +#: connected.c:66 builtin/fsck.c:198 builtin/prune.c:144 msgid "Checking connectivity" msgstr "Verificando conectividad" -#: connected.c:76 +#: connected.c:78 msgid "Could not run 'git rev-list'" msgstr "No se pudo correr 'git rev-list'" -#: connected.c:96 +#: connected.c:98 msgid "failed write to rev-list" msgstr "fallo escribir a rev-list" -#: connected.c:103 +#: connected.c:105 msgid "failed to close rev-list's stdin" msgstr "fallo al cerrar la entrada standard de rev-list" #: convert.c:205 #, c-format +msgid "CRLF would be replaced by LF in %s." +msgstr "CRLF será reemplazado por LF en %s." + +#: convert.c:207 +#, c-format msgid "" "CRLF will be replaced by LF in %s.\n" "The file will have its original line endings in your working directory." @@ -1486,12 +1491,12 @@ msgstr "" "El archivo tendrá sus finales de línea originales en tu directorio de " "trabajo." -#: convert.c:209 +#: convert.c:215 #, c-format -msgid "CRLF would be replaced by LF in %s." -msgstr "CRLF será remplazado por LF en %s." +msgid "LF would be replaced by CRLF in %s" +msgstr "LF será reemplazado por CRLF en %s" -#: convert.c:215 +#: convert.c:217 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" @@ -1501,11 +1506,6 @@ msgstr "" "El archivo tendrá sus finales de línea originales en tu directorio de " "trabajo." -#: convert.c:219 -#, c-format -msgid "LF would be replaced by CRLF in %s" -msgstr "LF será reemplazado por CRLF en %s" - #: date.c:116 msgid "in the future" msgstr "en el futuro" @@ -1609,7 +1609,8 @@ msgstr "" #: diff.c:341 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" -msgstr "valor para la variable de config 'diff.submodule' desconocido: '%s'" +msgstr "" +"Valor para la variable de configuración 'diff.submodule' desconocido: '%s'" #: diff.c:401 #, c-format @@ -1620,20 +1621,24 @@ msgstr "" "Errores en la variable de config 'diff.dirstat' encontrados:\n" "%s" -#: diff.c:3799 +#: diff.c:3822 #, c-format msgid "external diff died, stopping at %s" msgstr "diff externo murió, deteniendo en %s" -#: diff.c:4127 +#: diff.c:4146 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check y -s son mutuamente exclusivas" -#: diff.c:4215 +#: diff.c:4149 +msgid "-G, -S and --find-object are mutually exclusive" +msgstr "-G, -S y --find-object son mutuamente exclusivas" + +#: diff.c:4237 msgid "--follow requires exactly one pathspec" msgstr "--follow requiere exactamente un pathspec" -#: diff.c:4381 +#: diff.c:4403 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -1642,22 +1647,22 @@ msgstr "" "Fallo al analizar parámetro de opción --dirstat/-X:\n" "%s" -#: diff.c:4395 +#: diff.c:4417 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Fallo al analizar parámetro de opción --submodule: '%s'" -#: diff.c:5446 +#: diff.c:5493 msgid "inexact rename detection was skipped due to too many files." msgstr "" -"detección 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:5449 +#: diff.c:5496 msgid "only found copies from modified paths due to too many files." msgstr "" -"solo se encontraron copias de rutas modificadas por haber muchos archivos" +"solo se encontraron copias de rutas modificadas por haber muchos archivos." -#: diff.c:5452 +#: diff.c:5499 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -1665,20 +1670,25 @@ msgstr "" "tal vez quiera configurar la variable %s para por lo menos %d y volver a " "intentar el comando." -#: dir.c:2100 +#: dir.c:1866 +#, c-format +msgid "could not open directory '%s'" +msgstr "no se pudo abrir el directorio '%s'" + +#: dir.c:2108 msgid "failed to get kernel name and information" msgstr "fallo al conseguir la información y nombre del kernel" -#: dir.c:2219 +#: dir.c:2232 msgid "Untracked cache is disabled on this system or location." -msgstr "Untracked cache esta desactivado en este sistema o ubicación" +msgstr "Untracked cache esta desactivado en este sistema o ubicación." -#: dir.c:3002 dir.c:3007 +#: dir.c:3024 dir.c:3029 #, c-format msgid "could not create directories for %s" msgstr "no se pudo crear directorios para %s" -#: dir.c:3032 +#: dir.c:3054 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "no se pudo migrar el directorio git de '%s' a '%s'" @@ -1697,184 +1707,192 @@ msgstr "Filtrando contenido" msgid "could not stat file '%s'" msgstr "no se pudo establecer el archivo '%s'" -#: fetch-pack.c:252 +#: fetch-object.c:17 +msgid "Remote with no URL" +msgstr "Remoto sin URL" + +#: fetch-pack.c:253 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: lista poco profunda esperada" -#: fetch-pack.c:264 -msgid "git fetch-pack: expected ACK/NAK, got EOF" -msgstr "git getch-pack: se esperaba ACK/NAK, se obtuvo EOF" +#: fetch-pack.c:265 +msgid "git fetch-pack: expected ACK/NAK, got a flush packet" +msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo un flush packet" -#: fetch-pack.c:283 builtin/archive.c:63 +#: fetch-pack.c:284 builtin/archive.c:63 #, c-format msgid "remote error: %s" msgstr "error remoto: %s" -#: fetch-pack.c:284 +#: fetch-pack.c:285 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo '%s'" -#: fetch-pack.c:336 +#: fetch-pack.c:337 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc requiere multi_ack_detailed" -#: fetch-pack.c:422 +#: fetch-pack.c:428 #, c-format msgid "invalid shallow line: %s" msgstr "línea poco profunda invalida: %s" -#: fetch-pack.c:428 +#: fetch-pack.c:434 #, c-format msgid "invalid unshallow line: %s" msgstr "línea superficial inválida: %s" -#: fetch-pack.c:430 +#: fetch-pack.c:436 #, c-format msgid "object not found: %s" msgstr "objeto no encontrado: %s" -#: fetch-pack.c:433 +#: fetch-pack.c:439 #, c-format msgid "error in object: %s" msgstr "error en objeto: %s" -#: fetch-pack.c:435 +#: fetch-pack.c:441 #, c-format msgid "no shallow found: %s" msgstr "superficie no encontrada: %s" -#: fetch-pack.c:438 +#: fetch-pack.c:444 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "se esperaba shallow/unshallow, se obtuvo %s" -#: fetch-pack.c:477 +#: fetch-pack.c:485 #, c-format msgid "got %s %d %s" msgstr "se obtuvo %s %d %s" -#: fetch-pack.c:491 +#: fetch-pack.c:499 #, c-format msgid "invalid commit %s" msgstr "commit inválido %s" -#: fetch-pack.c:524 +#: fetch-pack.c:532 msgid "giving up" msgstr "rindiéndose" -#: fetch-pack.c:534 progress.c:229 +#: fetch-pack.c:542 progress.c:229 msgid "done" msgstr "listo" -#: fetch-pack.c:546 +#: fetch-pack.c:554 #, c-format msgid "got %s (%d) %s" msgstr "se obtuvo %s (%d) %s" -#: fetch-pack.c:592 +#: fetch-pack.c:600 #, c-format msgid "Marking %s as complete" msgstr "Marcando %s como completa" -#: fetch-pack.c:777 +#: fetch-pack.c:788 #, c-format msgid "already have %s (%s)" msgstr "ya se tiene %s (%s)" -#: fetch-pack.c:815 +#: fetch-pack.c:829 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: no se puede extraer un demultiplexor de banda lateral" -#: fetch-pack.c:823 +#: fetch-pack.c:837 msgid "protocol error: bad pack header" msgstr "error de protocolo: mal paquete de header" -#: fetch-pack.c:879 +#: fetch-pack.c:895 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: no se puede quitar %s" -#: fetch-pack.c:895 +#: fetch-pack.c:911 #, c-format msgid "%s failed" msgstr "%s fallo" -#: fetch-pack.c:897 +#: fetch-pack.c:913 msgid "error in sideband demultiplexer" msgstr "error en demultiplexor de banda lateral" -#: fetch-pack.c:924 +#: fetch-pack.c:940 msgid "Server does not support shallow clients" msgstr "Servidor no soporta clientes superficiales" -#: fetch-pack.c:928 +#: fetch-pack.c:944 msgid "Server supports multi_ack_detailed" msgstr "Servidor soporta ulti_ack_detailed" -#: fetch-pack.c:931 +#: fetch-pack.c:947 msgid "Server supports no-done" msgstr "Servidor soporta no-done" -#: fetch-pack.c:937 +#: fetch-pack.c:953 msgid "Server supports multi_ack" msgstr "Servidor soporta multi_ack" -#: fetch-pack.c:941 +#: fetch-pack.c:957 msgid "Server supports side-band-64k" msgstr "Servidor soporta side-band-64k" -#: fetch-pack.c:945 +#: fetch-pack.c:961 msgid "Server supports side-band" msgstr "Servidor soporta side-band" -#: fetch-pack.c:949 +#: fetch-pack.c:965 msgid "Server supports allow-tip-sha1-in-want" msgstr "Servidor soporta allow-tip-sha1-in-want" -#: fetch-pack.c:953 +#: fetch-pack.c:969 msgid "Server supports allow-reachable-sha1-in-want" msgstr "Servidor soporta allow-reachable-sha1-in-want" -#: fetch-pack.c:963 +#: fetch-pack.c:979 msgid "Server supports ofs-delta" msgstr "Servidor soporta ofs-delta" -#: fetch-pack.c:970 +#: fetch-pack.c:985 +msgid "Server supports filter" +msgstr "Servidor soporta filtro" + +#: fetch-pack.c:993 #, c-format msgid "Server version is %.*s" msgstr "Versión de servidor es %.*s" -#: fetch-pack.c:976 +#: fetch-pack.c:999 msgid "Server does not support --shallow-since" msgstr "Servidor no soporta --shalow-since" -#: fetch-pack.c:980 +#: fetch-pack.c:1003 msgid "Server does not support --shallow-exclude" msgstr "Servidor no soporta --shalow-exclude" -#: fetch-pack.c:982 +#: fetch-pack.c:1005 msgid "Server does not support --deepen" msgstr "Servidor no soporta --deepen" -#: fetch-pack.c:993 +#: fetch-pack.c:1016 msgid "no common commits" msgstr "no hay commits comunes" -#: fetch-pack.c:1005 +#: fetch-pack.c:1028 msgid "git fetch-pack: fetch failed." -msgstr "git fetch-pack: fetch fallo" +msgstr "git fetch-pack: fetch fallo." -#: fetch-pack.c:1167 +#: fetch-pack.c:1190 msgid "no matching remote head" msgstr "no concuerda el head remoto" -#: fetch-pack.c:1189 +#: fetch-pack.c:1212 #, c-format msgid "no such remote ref %s" msgstr "no existe ref remota %s" -#: fetch-pack.c:1192 +#: fetch-pack.c:1215 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Servidor no permite solicitudes de objetos inadvertidos %s" @@ -1897,17 +1915,18 @@ 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:2017 +#: grep.c:2022 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': no es posible leer %s" -#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134 +#: grep.c:2039 setup.c:163 builtin/clone.c:407 builtin/diff.c:81 +#: builtin/rm.c:134 #, c-format msgid "failed to stat '%s'" msgstr "fallo al marcar '%s'" -#: grep.c:2045 +#: grep.c:2050 #, c-format msgid "'%s': short read" msgstr "'%s': lectura corta" @@ -1936,7 +1955,7 @@ msgstr "" #: help.c:336 msgid "Uh oh. Your system reports no Git commands at all." -msgstr "Oh oh. Tu sistema no reporta ningún comando de Git" +msgstr "Oh oh. Tu sistema no reporta ningún comando de Git." #: help.c:358 #, c-format @@ -2049,19 +2068,18 @@ msgstr "no se puede tener un nombre vacío (para <%s>)" msgid "name consists only of disallowed characters: %s" msgstr "el nombre consiste solo de caracteres no permitidos: %s" -#: ident.c:416 builtin/commit.c:616 +#: ident.c:416 builtin/commit.c:582 #, c-format 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:36 +msgid "multiple filter-specs cannot be combined" +msgstr "no se pueden combinar múltiples tipos de especificaciones de 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'" +#: list-objects-filter-options.c:126 +msgid "cannot change partial clone promisor remote" +msgstr "no se puede cambiar un clon parcial remoto promisor" #: lockfile.c:151 #, c-format @@ -2092,8 +2110,8 @@ msgstr "No se pudo crear '%s.lock': %s" msgid "failed to read the cache" msgstr "fallo al leer la cache" -#: merge.c:128 builtin/am.c:1943 builtin/am.c:1977 builtin/checkout.c:379 -#: builtin/checkout.c:600 builtin/clone.c:754 +#: merge.c:134 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378 +#: builtin/checkout.c:599 builtin/clone.c:759 msgid "unable to write new index file" msgstr "no es posible escribir el archivo índice" @@ -2110,78 +2128,78 @@ msgstr "addinfo_cache fallo para la ruta '%s'" msgid "error building trees" msgstr "error construyendo árboles" -#: merge-recursive.c:752 +#: merge-recursive.c:771 #, c-format msgid "failed to create path '%s'%s" msgstr "fallo al crear la ruta '%s'%s" -#: merge-recursive.c:763 +#: merge-recursive.c:782 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Removiendo %s para hacer espacio para un subdirectorio\n" -#: merge-recursive.c:777 merge-recursive.c:796 +#: merge-recursive.c:796 merge-recursive.c:815 msgid ": perhaps a D/F conflict?" msgstr ": tal vez un conflicto D/F?" -#: merge-recursive.c:786 +#: merge-recursive.c:805 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "rehusando perder el archivo rastreado en '%s'" -#: merge-recursive.c:828 builtin/cat-file.c:37 +#: merge-recursive.c:847 builtin/cat-file.c:37 #, c-format msgid "cannot read object %s '%s'" msgstr "no se puede leer el objeto %s '%s'" -#: merge-recursive.c:830 +#: merge-recursive.c:849 #, c-format msgid "blob expected for %s '%s'" msgstr "se esperaba blob para %s '%s'" -#: merge-recursive.c:854 +#: merge-recursive.c:873 #, c-format msgid "failed to open '%s': %s" msgstr "fallo al abrir '%s': %s" -#: merge-recursive.c:865 +#: merge-recursive.c:884 #, c-format msgid "failed to symlink '%s': %s" msgstr "fallo al crear el enlace simbólico '%s': %s" -#: merge-recursive.c:870 +#: merge-recursive.c:889 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "no se que hacer con %06o %s '%s'" -#: merge-recursive.c:1010 +#: merge-recursive.c:1029 msgid "Failed to execute internal merge" msgstr "Fallo al ejecutar la fusión interna" -#: merge-recursive.c:1014 +#: merge-recursive.c:1034 #, c-format msgid "Unable to add %s to database" msgstr "No es posible agregar %s a la base de datos" -#: merge-recursive.c:1117 +#: merge-recursive.c:1146 #, c-format 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 versión %s de %s " -"en el árbol" +"en el árbol." -#: merge-recursive.c:1122 +#: merge-recursive.c:1151 #, c-format 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. Versión %s de %s " -"permanece en el árbol" +"permanece en el árbol." -#: merge-recursive.c:1129 +#: merge-recursive.c:1158 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2190,7 +2208,7 @@ msgstr "" "CONFLICTO (%s/eliminar): %s eliminado en %s y %s en %s. Versión %s de %s " "dejada en el árbol, en %s." -#: merge-recursive.c:1134 +#: merge-recursive.c:1163 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -2199,20 +2217,20 @@ msgstr "" "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 +#: merge-recursive.c:1197 msgid "rename" msgstr "renombrar" -#: merge-recursive.c:1168 +#: merge-recursive.c:1197 msgid "renamed" msgstr "renombrado" -#: merge-recursive.c:1225 +#: merge-recursive.c:1254 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s es un directorio en %s agregando como %s más bien" -#: merge-recursive.c:1250 +#: merge-recursive.c:1279 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -2221,143 +2239,143 @@ msgstr "" "CONFLICTO (renombrar/renombrar): Renombrar \"%s\"->\"%s\" en la rama \"%s\" " "renombrar \"%s\"->\"%s\" en \"%s\"%s" -#: merge-recursive.c:1255 +#: merge-recursive.c:1284 msgid " (left unresolved)" msgstr " (dejado sin resolver)" -#: merge-recursive.c:1317 +#: merge-recursive.c:1346 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "CONFLICTO (renombrar/renombrar): Renombrar %s->%s en %s. Renombrar %s->%s en " "%s" -#: merge-recursive.c:1350 +#: merge-recursive.c:1379 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "Renombrando %s a %s y %s a %s más bien" -#: merge-recursive.c:1553 +#: merge-recursive.c:1582 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" "CONFLICTO (renombrar/agregar): Renombrar %s->%s en %s. %s agregado en %s" -#: merge-recursive.c:1568 +#: merge-recursive.c:1597 #, c-format msgid "Adding merged %s" msgstr "Agregar %s fusionado" -#: merge-recursive.c:1575 merge-recursive.c:1805 +#: merge-recursive.c:1604 merge-recursive.c:1834 #, c-format msgid "Adding as %s instead" msgstr "Agregando más bien como %s" -#: merge-recursive.c:1632 +#: merge-recursive.c:1661 #, c-format msgid "cannot read object %s" msgstr "no se pudo leer el objeto %s" -#: merge-recursive.c:1635 +#: merge-recursive.c:1664 #, c-format msgid "object %s is not a blob" msgstr "objeto %s no es un blob" -#: merge-recursive.c:1704 +#: merge-recursive.c:1733 msgid "modify" msgstr "modificar" -#: merge-recursive.c:1704 +#: merge-recursive.c:1733 msgid "modified" msgstr "modificado" -#: merge-recursive.c:1714 +#: merge-recursive.c:1743 msgid "content" msgstr "contenido" -#: merge-recursive.c:1721 +#: merge-recursive.c:1750 msgid "add/add" msgstr "agregar/agregar" -#: merge-recursive.c:1757 +#: merge-recursive.c:1786 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Saltado %s (fusionado como existente)" -#: merge-recursive.c:1771 +#: merge-recursive.c:1800 #, c-format msgid "Auto-merging %s" msgstr "Auto-fusionando %s" -#: merge-recursive.c:1775 git-submodule.sh:932 +#: merge-recursive.c:1804 git-submodule.sh:879 msgid "submodule" msgstr "submódulo" -#: merge-recursive.c:1776 +#: merge-recursive.c:1805 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLICTO (%s): Conflicto de fusión en %s" -#: merge-recursive.c:1870 +#: merge-recursive.c:1899 #, c-format msgid "Removing %s" msgstr "Eliminando %s" -#: merge-recursive.c:1896 +#: merge-recursive.c:1925 msgid "file/directory" msgstr "archivo/directorio" -#: merge-recursive.c:1902 +#: merge-recursive.c:1931 msgid "directory/file" msgstr "directorio/archivo" -#: merge-recursive.c:1909 +#: merge-recursive.c:1938 #, 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:1918 +#: merge-recursive.c:1947 #, c-format msgid "Adding %s" msgstr "Agregando %s" -#: merge-recursive.c:1958 +#: merge-recursive.c:1987 #, c-format msgid "Dirty index: cannot merge (dirty: %s)" msgstr "Índice sucio: no se puede fusionar (sucio: %s)" -#: merge-recursive.c:1962 +#: merge-recursive.c:1991 msgid "Already up to date!" msgstr "¡Ya está actualizado!" -#: merge-recursive.c:1971 +#: merge-recursive.c:2000 #, c-format msgid "merging of trees %s and %s failed" msgstr "falló la fusión de los árboles %s y %s" -#: merge-recursive.c:2068 +#: merge-recursive.c:2097 msgid "Merging:" msgstr "Fusionando:" -#: merge-recursive.c:2081 +#: merge-recursive.c:2110 #, 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:2120 +#: merge-recursive.c:2149 msgid "merge returned no commit" msgstr "la fusión no devolvió ningún commit" -#: merge-recursive.c:2183 +#: merge-recursive.c:2212 #, c-format msgid "Could not parse object '%s'" msgstr "No se pudo analizar el objeto '%s'" -#: merge-recursive.c:2197 builtin/merge.c:656 builtin/merge.c:815 +#: merge-recursive.c:2228 builtin/merge.c:657 builtin/merge.c:816 msgid "Unable to write index." msgstr "Incapaz de escribir el índice." @@ -2378,18 +2396,18 @@ msgstr "" msgid "You have not concluded your notes merge (%s exists)." msgstr "No has terminado tus notas de fusión (%s existe)." -#: notes-utils.c:42 +#: notes-utils.c:43 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "" "No se puede realizar commit, notas del árbol no inicializadas o no " -"referenciadas." +"referenciadas" -#: notes-utils.c:101 +#: notes-utils.c:102 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "Mal valor para notes.rewriteMode: '%s'" -#: notes-utils.c:111 +#: notes-utils.c:112 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "Rehusando reescribir notas en %s (fuera de refs/notes/)" @@ -2398,7 +2416,7 @@ msgstr "Rehusando reescribir notas en %s (fuera de refs/notes/)" #. the environment variable, the second %s is #. its value. #. -#: notes-utils.c:141 +#: notes-utils.c:142 #, c-format msgid "Bad %s value: '%s'" msgstr "Mal valor para %s: '%s'" @@ -2408,27 +2426,27 @@ msgstr "Mal valor para %s: '%s'" msgid "unable to parse object: %s" msgstr "incapaz de analizar objeto: %s" -#: packfile.c:556 +#: packfile.c:561 msgid "offset before end of packfile (broken .idx?)" msgstr "offset antes del final del paquete (broken .idx?)" -#: packfile.c:1683 +#: packfile.c:1694 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" "offset antes del comienzo del índice del paquete para %s (índice corrupto?)" -#: packfile.c:1687 +#: packfile.c:1698 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" "offset más allá del índice de fin de paquete para %s (índice truncado?)" -#: parse-options.c:573 +#: parse-options.c:619 msgid "..." msgstr "..." -#: parse-options.c:592 +#: parse-options.c:638 #, c-format msgid "usage: %s" msgstr "uso: %s" @@ -2436,17 +2454,17 @@ msgstr "uso: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:598 +#: parse-options.c:644 #, c-format msgid " or: %s" msgstr " o: %s" -#: parse-options.c:601 +#: parse-options.c:647 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:640 +#: parse-options.c:686 msgid "-NUM" msgstr "-NUM" @@ -2481,7 +2499,7 @@ msgstr "nombre de atributo %s invalido" #: pathspec.c:258 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" -"configuraciones globales de pathspec 'glob' y 'noglob' son incompatibles " +"configuraciones globales de pathspec 'glob' y 'noglob' son incompatibles" #: pathspec.c:265 msgid "" @@ -2498,7 +2516,7 @@ msgstr "parámetro no válido para el prefijo 'magic pathspec'" #: pathspec.c:326 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" -msgstr "magic pathspec invalido '%.*s' en '%s'" +msgstr "Magic pathspec inválido '%.*s' en '%s'" #: pathspec.c:331 #, c-format @@ -2508,7 +2526,7 @@ msgstr "Falta ')' al final del magic pathspec en '%s'" #: pathspec.c:369 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" -msgstr "Magic pathspec '%c' en '%s' no implementado" +msgstr "Magic pathspec '%c' no implementado en '%s'" #: pathspec.c:428 #, c-format @@ -2539,7 +2557,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:1472 +#: read-cache.c:1473 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -2548,7 +2566,7 @@ msgstr "" "index.version configurado, pero el valor no es válido.\n" "Usando versión %i" -#: read-cache.c:1482 +#: read-cache.c:1483 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -2557,22 +2575,22 @@ msgstr "" "GIT_INDEX_VERSION configurado, pero el valor no es válido.\n" "Usando versión %i" -#: read-cache.c:2370 sequencer.c:2731 wrapper.c:658 builtin/merge.c:1048 +#: read-cache.c:2375 sequencer.c:3248 wrapper.c:658 builtin/merge.c:1049 #, c-format msgid "could not close '%s'" msgstr "no se pudo cerrar '%s'" -#: read-cache.c:2442 sequencer.c:1369 sequencer.c:2096 +#: read-cache.c:2448 sequencer.c:1900 sequencer.c:2627 #, c-format msgid "could not stat '%s'" msgstr "no se pudo definir '%s'" -#: read-cache.c:2455 +#: read-cache.c:2461 #, c-format msgid "unable to open git dir: %s" msgstr "no es posible abrir el directorio de git: %s" -#: read-cache.c:2467 +#: read-cache.c:2473 #, c-format msgid "unable to unlink: %s" msgstr "no es posible remover el vinculo: %s" @@ -2591,18 +2609,18 @@ msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena" msgid "could not remove reference %s" msgstr "no se pudo remover la referencia %s" -#: refs/files-backend.c:1203 refs/packed-backend.c:1524 -#: refs/packed-backend.c:1534 +#: refs/files-backend.c:1203 refs/packed-backend.c:1528 +#: refs/packed-backend.c:1538 #, c-format msgid "could not delete reference %s: %s" msgstr "no se pudo eliminar la referencia %s: %s" -#: refs/files-backend.c:1206 refs/packed-backend.c:1537 +#: refs/files-backend.c:1206 refs/packed-backend.c:1541 #, c-format msgid "could not delete references: %s" msgstr "no se pudo eliminar la referencia: %s" -#: ref-filter.c:35 wt-status.c:1816 +#: ref-filter.c:35 wt-status.c:1842 msgid "gone" msgstr "desaparecido" @@ -2634,12 +2652,12 @@ msgstr "color no reconocido: %%(color:%s)" #: ref-filter.c:129 #, c-format msgid "Integer value expected refname:lstrip=%s" -msgstr "valor entero esperado refname:lstrip=%s" +msgstr "Valor entero esperado refname:lstrip=%s" #: ref-filter.c:133 #, c-format msgid "Integer value expected refname:rstrip=%s" -msgstr "valor entero esperado refname:rstrip=%s" +msgstr "Valor entero esperado refname:rstrip=%s" #: ref-filter.c:135 #, c-format @@ -2749,7 +2767,7 @@ msgstr "formato: átomo %%(else) usado sin un átomo %%(if)" #: ref-filter.c:639 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" -msgstr "formato: átomo %%(else) usado sin un átomo %%(then) " +msgstr "formato: átomo %%(else) usado sin un átomo %%(then)" #: ref-filter.c:641 #, c-format @@ -2796,129 +2814,139 @@ msgstr "(HEAD desacoplado de %s)" msgid "(no branch)" msgstr "(sin rama)" -#: ref-filter.c:1488 ref-filter.c:1519 +#: ref-filter.c:1364 #, c-format msgid "missing object %s for %s" msgstr "falta objeto %s para %s" -#: ref-filter.c:1491 ref-filter.c:1522 +#: ref-filter.c:1367 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer falló en %s para %s" -#: ref-filter.c:1822 +#: ref-filter.c:1819 #, c-format msgid "malformed object at '%s'" msgstr "objeto mal formado en '%s'" -#: ref-filter.c:1889 +#: ref-filter.c:1886 #, c-format msgid "ignoring ref with broken name %s" msgstr "ignorando referencia con nombre roto %s" -#: ref-filter.c:1894 +#: ref-filter.c:1891 #, c-format msgid "ignoring broken ref %s" msgstr "ignorando referencia rota %s" -#: ref-filter.c:2156 +#: ref-filter.c:2152 #, c-format msgid "format: %%(end) atom missing" msgstr "formato: falta átomo %%(end)" -#: ref-filter.c:2250 +#: ref-filter.c:2246 #, c-format msgid "malformed object name %s" msgstr "nombre de objeto mal formado %s" -#: remote.c:780 +#: remote.c:795 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "No se pueden traer ambos %s y %s a %s" -#: remote.c:784 +#: remote.c:799 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s por lo general hace seguimiento a %s, no a %s" -#: remote.c:788 +#: remote.c:803 #, c-format msgid "%s tracks both %s and %s" msgstr "%s hace seguimiento tanto a %s como a %s" -#: remote.c:796 +#: remote.c:811 msgid "Internal error" msgstr "Error interno" -#: remote.c:1711 remote.c:1813 +#: remote.c:1726 remote.c:1828 msgid "HEAD does not point to a branch" msgstr "HEAD no apunta a ninguna rama" -#: remote.c:1720 +#: remote.c:1735 #, c-format msgid "no such branch: '%s'" msgstr "no existe tal rama: '%s'" -#: remote.c:1723 +#: remote.c:1738 #, c-format msgid "no upstream configured for branch '%s'" msgstr "no se ha configurado upstream para la rama '%s'" -#: remote.c:1729 +#: remote.c:1744 #, 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:1744 +#: remote.c:1759 #, 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:1756 +#: remote.c:1771 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "la rama '%s' no tiene remoto para enviar" -#: remote.c:1767 +#: remote.c:1782 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "refspecs del push para '%s' no incluyen '%s'" -#: remote.c:1780 +#: remote.c:1795 msgid "push has no destination (push.default is 'nothing')" msgstr "push no tiene destino (push.default es 'nada')" -#: remote.c:1802 +#: remote.c:1817 msgid "cannot resolve 'simple' push to a single destination" msgstr "no se puede resolver push 'simple' para un destino único" -#: remote.c:2106 +#: remote.c:2132 #, 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" +msgstr "Tu rama esta basada en '%s', pero upstream ha desaparecido.\n" -#: remote.c:2110 +#: remote.c:2136 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (usa \"git branch --unset-upstream\" para arreglar)\n" -#: remote.c:2113 +#: remote.c:2139 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Tu rama está actualizada con '%s'.\n" -#: remote.c:2117 +#: remote.c:2143 +#, c-format +msgid "Your branch and '%s' refer to different commits.\n" +msgstr "Tu rama y '%s' refieren a commits diferentes.\n" + +#: remote.c:2146 +#, c-format +msgid " (use \"%s\" for details)\n" +msgstr " (usa \"%s\" para detalles)\n" + +#: remote.c:2150 #, 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 commit.\n" msgstr[1] "Tu rama está adelantada a '%s' por %d commits.\n" -#: remote.c:2123 +#: remote.c:2156 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (usa \"git push\" para publicar tus commits locales)\n" -#: remote.c:2126 +#: remote.c:2159 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -2928,11 +2956,11 @@ msgstr[0] "" msgstr[1] "" "Tu rama está detrás de '%s' por %d commits, y puede ser avanzada rápido.\n" -#: remote.c:2134 +#: remote.c:2167 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (usa \"git pull\" para actualizar tu rama local)\n" -#: remote.c:2137 +#: remote.c:2170 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -2947,28 +2975,28 @@ msgstr[1] "" "Tu rama y '%s' han divergido,\n" "y tienen %d y %d commits diferentes cada una respectivamente.\n" -#: remote.c:2147 +#: remote.c:2180 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:2268 +#: revision.c:2277 msgid "your current branch appears to be broken" msgstr "tu rama actual parece estar rota" -#: revision.c:2271 +#: revision.c:2280 #, 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:2465 +#: revision.c:2477 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent es incompatible con --bisect" -#: run-command.c:645 +#: run-command.c:731 msgid "open /dev/null failed" msgstr "falló al abrir /dev/null" -#: run-command.c:1188 +#: run-command.c:1274 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -2979,24 +3007,29 @@ msgstr "" "false`." #: send-pack.c:141 +msgid "unexpected flush packet while reading remote unpack status" +msgstr "" +"flush packet inesperado mientras se leía estatus de desempaquetado remoto" + +#: send-pack.c:143 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "no es posible analizar el estado de desempaquetado remoto: %s" -#: send-pack.c:143 +#: send-pack.c:145 #, c-format msgid "remote unpack failed: %s" msgstr "desempaquetado remoto falló: %s" -#: send-pack.c:306 +#: send-pack.c:308 msgid "failed to sign the push certificate" msgstr "falló al firmar el certificado de push" -#: send-pack.c:419 +#: send-pack.c:421 msgid "the receiving end does not support --signed push" msgstr "el final receptor no soporta --signed push" -#: send-pack.c:421 +#: send-pack.c:423 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -3004,32 +3037,37 @@ msgstr "" "no se manda un certificado de push ya que el destino no soporta push firmado " "(--signed )" -#: send-pack.c:433 +#: send-pack.c:435 msgid "the receiving end does not support --atomic push" msgstr "el destino no soporta push atómicos (--atomic)" -#: send-pack.c:438 +#: send-pack.c:440 msgid "the receiving end does not support push options" msgstr "el destino no soporta opciones de push" -#: sequencer.c:218 +#: sequencer.c:158 +#, c-format +msgid "invalid commit message cleanup mode '%s'" +msgstr "mensaje de commit inválido, modo cleanup '%s'" + +#: sequencer.c:267 msgid "revert" msgstr "revertir" -#: sequencer.c:220 +#: sequencer.c:269 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:222 +#: sequencer.c:271 msgid "rebase -i" msgstr "rebase -i" -#: sequencer.c:224 +#: sequencer.c:273 #, c-format msgid "Unknown action: %d" msgstr "Acción desconocida: %d" -#: sequencer.c:281 +#: sequencer.c:330 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -3037,7 +3075,7 @@ msgstr "" "después de resolver los conflictos, marca las rutas corregidas\n" "con 'git add <rutas>' o 'git rm <rutas>'" -#: sequencer.c:284 +#: sequencer.c:333 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -3047,43 +3085,43 @@ msgstr "" "con 'git add <rutas>' o 'git rm <rutas>'\n" "y haz un commit del resultado con 'git commit'" -#: sequencer.c:297 sequencer.c:1718 +#: sequencer.c:346 sequencer.c:2245 #, c-format msgid "could not lock '%s'" -msgstr "No se pudo bloquear '%s'" +msgstr "no se pudo bloquear '%s'" -#: sequencer.c:300 sequencer.c:1595 sequencer.c:1723 sequencer.c:1737 -#: sequencer.c:2729 sequencer.c:2800 wrapper.c:656 +#: sequencer.c:349 sequencer.c:2124 sequencer.c:2250 sequencer.c:2264 +#: sequencer.c:3246 sequencer.c:3310 wrapper.c:656 #, c-format msgid "could not write to '%s'" -msgstr "No se pudo escribir en '%s'" +msgstr "no se pudo escribir en '%s'" -#: sequencer.c:304 +#: sequencer.c:353 #, c-format msgid "could not write eol to '%s'" -msgstr "No se pudo escribir EOL en '%s'" +msgstr "no se pudo escribir EOL en '%s'" -#: sequencer.c:308 sequencer.c:1600 sequencer.c:1725 +#: sequencer.c:356 sequencer.c:2128 sequencer.c:2252 #, c-format -msgid "failed to finalize '%s'." -msgstr "Fallo al finalizar '%s'." +msgid "failed to finalize '%s'" +msgstr "falló al finalizar '%s'" -#: sequencer.c:332 sequencer.c:829 sequencer.c:1621 builtin/am.c:259 -#: builtin/commit.c:754 builtin/merge.c:1046 +#: sequencer.c:379 sequencer.c:1340 sequencer.c:2148 builtin/am.c:259 +#: builtin/commit.c:722 builtin/merge.c:1047 #, c-format msgid "could not read '%s'" -msgstr "No se pudo leer '%s'" +msgstr "no se pudo leer '%s'" -#: sequencer.c:358 +#: sequencer.c:405 #, c-format msgid "your local changes would be overwritten by %s." -msgstr "Tus cambios locales serán sobreescritos por %s." +msgstr "tus cambios locales serán sobreescritos por %s." -#: sequencer.c:362 +#: sequencer.c:409 msgid "commit your changes or stash them to proceed." -msgstr "Realiza un commit con tus cambios o aplica un stash para proceder." +msgstr "realiza un commit con tus cambios o aplica un stash para proceder." -#: sequencer.c:391 +#: sequencer.c:438 #, c-format msgid "%s: fast-forward" msgstr "%s: avance rápido" @@ -3091,20 +3129,20 @@ msgstr "%s: avance rápido" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:477 +#: sequencer.c:526 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Incapaz de escribir el nuevo archivo índice" -#: sequencer.c:496 +#: sequencer.c:542 msgid "could not resolve HEAD commit" -msgstr "No se pudo resolver el commit de HEAD" +msgstr "no se pudo resolver el commit de HEAD" -#: sequencer.c:516 +#: sequencer.c:562 msgid "unable to update cache tree" msgstr "no es posible actualizar el árbol de la caché" -#: sequencer.c:600 +#: sequencer.c:658 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -3134,17 +3172,123 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:702 +#: sequencer.c:915 +msgid "'prepare-commit-msg' hook failed" +msgstr "hook 'prepare-commit-msg' falló" + +#: sequencer.c:922 +msgid "" +"Your name and email address were configured automatically based\n" +"on your username and hostname. Please check that they are accurate.\n" +"You can suppress this message by setting them explicitly. Run the\n" +"following command and follow the instructions in your editor to edit\n" +"your configuration file:\n" +"\n" +" git config --global --edit\n" +"\n" +"After doing this, you may fix the identity used for this commit with:\n" +"\n" +" git commit --amend --reset-author\n" +msgstr "" +"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 configurándolos de forma explicita. Ejecuta " +"el \n" +"siguiente comando y sigue las instrucciones de tu editor\n" +" para modificar tu archivo de configuración:\n" +"\n" +" git config --global --edit\n" +"\n" +"Tras hacer esto, puedes arreglar la identidad usada para este commit con:\n" +"\n" +" git commit --amend --reset-author\n" + +#: sequencer.c:935 +msgid "" +"Your name and email address were configured automatically based\n" +"on your username and hostname. Please check that they are accurate.\n" +"You can suppress this message by setting them explicitly:\n" +"\n" +" git config --global user.name \"Your Name\"\n" +" git config --global user.email you@example.com\n" +"\n" +"After doing this, you may fix the identity used for this commit with:\n" +"\n" +" git commit --amend --reset-author\n" +msgstr "" +"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 configurándolos de forma explicita: \n" +"\n" +" git config --global user.name \"Tu nombre\"\n" +" git config --global user.email you@example.com\n" +"\n" +"Tras hacer esto, puedes arreglar tu identidad para este commit con:\n" +"\n" +" git commit --amend --reset-author\n" + +#: sequencer.c:975 +msgid "couldn't look up newly created commit" +msgstr "no se pudo revisar el commit recién creado" + +#: sequencer.c:977 +msgid "could not parse newly created commit" +msgstr "no se pudo analizar el commit recién creado" + +#: sequencer.c:1023 +msgid "unable to resolve HEAD after creating commit" +msgstr "no se pudo resolver HEAD tras crear el commit" + +#: sequencer.c:1025 +msgid "detached HEAD" +msgstr "HEAD desacoplado" + +#: sequencer.c:1029 +msgid " (root-commit)" +msgstr " (commit-raíz)" + +#: sequencer.c:1050 +msgid "could not parse HEAD" +msgstr "no se pudo analizar HEAD" + +#: sequencer.c:1052 +#, c-format +msgid "HEAD %s is not a commit!" +msgstr "HEAD %s no es un commit!" + +#: sequencer.c:1056 builtin/commit.c:1491 +msgid "could not parse HEAD commit" +msgstr "no se pudo analizar el commit de HEAD" + +#: sequencer.c:1107 sequencer.c:1673 +msgid "unable to parse commit author" +msgstr "no es posible analizar el autor del commit" + +#: sequencer.c:1117 builtin/am.c:1630 builtin/merge.c:643 +msgid "git write-tree failed to write a tree" +msgstr "git write-tree falló al escribir el árbol" + +#: sequencer.c:1134 sequencer.c:1186 +#, c-format +msgid "unable to read commit message from '%s'" +msgstr "no se puede leer el mensaje del commit de '%s'" + +#: sequencer.c:1154 builtin/am.c:1650 builtin/commit.c:1594 builtin/merge.c:826 +#: builtin/merge.c:851 +msgid "failed to write commit object" +msgstr "fallo al escribir el objeto commit" + +#: sequencer.c:1213 #, c-format msgid "could not parse commit %s" -msgstr "No se pudo analizar commit %s" +msgstr "no se pudo analizar commit %s" -#: sequencer.c:707 +#: sequencer.c:1218 #, c-format msgid "could not parse parent commit %s" -msgstr "No se pudo analizar el commit padre %s" +msgstr "no se pudo analizar el commit padre %s" -#: sequencer.c:836 +#: sequencer.c:1347 #, c-format msgid "" "unexpected 1st line of squash message:\n" @@ -3155,7 +3299,7 @@ msgstr "" "\n" "\t%.*s" -#: sequencer.c:842 +#: sequencer.c:1353 #, c-format msgid "" "invalid 1st line of squash message:\n" @@ -3166,240 +3310,244 @@ msgstr "" "\n" "\t%.*s" -#: sequencer.c:848 sequencer.c:873 +#: sequencer.c:1359 sequencer.c:1384 #, c-format msgid "This is a combination of %d commits." msgstr "Esta es una combinación de %d commits." -#: sequencer.c:857 sequencer.c:2748 +#: sequencer.c:1368 sequencer.c:3265 msgid "need a HEAD to fixup" msgstr "se necesita un HEAD para arreglar" -#: sequencer.c:859 +#: sequencer.c:1370 msgid "could not read HEAD" msgstr "no se pudo leer HEAD" -#: sequencer.c:861 +#: sequencer.c:1372 msgid "could not read HEAD's commit message" msgstr "no se pudo leer el mensaje de commit de HEAD" -#: sequencer.c:867 +#: sequencer.c:1378 #, c-format msgid "cannot write '%s'" msgstr "no se puede escribir '%s'" -#: sequencer.c:876 git-rebase--interactive.sh:446 +#: sequencer.c:1387 git-rebase--interactive.sh:452 msgid "This is the 1st commit message:" msgstr "Este es el mensaje del 1er commit:" -#: sequencer.c:884 +#: sequencer.c:1395 #, c-format msgid "could not read commit message of %s" msgstr "no se puede leer el mensaje del commit de %s" -#: sequencer.c:891 +#: sequencer.c:1402 #, c-format msgid "This is the commit message #%d:" -msgstr "este es el mensaje del commit #%d:" +msgstr "Este es el mensaje del commit #%d:" -#: sequencer.c:896 +#: sequencer.c:1407 #, c-format msgid "The commit message #%d will be skipped:" -msgstr "El mensaje del commit #%d será saltado: " +msgstr "El mensaje del commit #%d será saltado:" -#: sequencer.c:901 +#: sequencer.c:1412 #, c-format msgid "unknown command: %d" msgstr "comando desconocido: %d" -#: sequencer.c:967 +#: sequencer.c:1479 msgid "your index file is unmerged." msgstr "tu archivo índice no esta fusionado." -#: sequencer.c:986 +#: sequencer.c:1498 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "el commit %s es una fusión pero no se entrego la opción -m." -#: sequencer.c:994 +#: sequencer.c:1506 #, c-format msgid "commit %s does not have parent %d" msgstr "el commit %s no tiene un padre %d" -#: sequencer.c:998 +#: sequencer.c:1510 #, c-format msgid "mainline was specified but commit %s is not a merge." msgstr "línea principal especificada pero el commit %s no es una fusión." -#: sequencer.c:1004 +#: sequencer.c:1516 #, 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:1023 +#: sequencer.c:1535 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: no se puede analizar el commit padre %s" -#: sequencer.c:1086 sequencer.c:1867 +#: sequencer.c:1600 sequencer.c:2397 #, c-format msgid "could not rename '%s' to '%s'" -msgstr "No se puede renombrar '%s' a '%s'" +msgstr "no se puede renombrar '%s' a '%s'" -#: sequencer.c:1137 +#: sequencer.c:1654 #, c-format msgid "could not revert %s... %s" msgstr "no se pudo revertir %s... %s" -#: sequencer.c:1138 +#: sequencer.c:1655 #, c-format msgid "could not apply %s... %s" msgstr "no se pudo aplicar %s... %s" -#: sequencer.c:1180 +#: sequencer.c:1702 msgid "empty commit set passed" msgstr "conjunto de commits vacío entregado" -#: sequencer.c:1190 +#: sequencer.c:1712 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: fallo al leer el índice" -#: sequencer.c:1196 +#: sequencer.c:1718 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: fallo al refrescar el índice" -#: sequencer.c:1270 +#: sequencer.c:1792 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s no acepta los argumentos: '%s'" -#: sequencer.c:1279 +#: sequencer.c:1801 #, c-format msgid "missing arguments for %s" msgstr "faltan argumentos para para %s" -#: sequencer.c:1322 +#: sequencer.c:1844 #, c-format msgid "invalid line %d: %.*s" msgstr "línea inválida %d: %.*s" -#: sequencer.c:1330 +#: sequencer.c:1852 #, c-format msgid "cannot '%s' without a previous commit" msgstr "no se puede '%s' sin un commit previo" -#: sequencer.c:1363 sequencer.c:2525 sequencer.c:2560 sequencer.c:2642 -#: sequencer.c:2668 sequencer.c:2758 sequencer.c:2859 +#: sequencer.c:1883 sequencer.c:3056 sequencer.c:3091 #, c-format msgid "could not read '%s'." msgstr "no se puede leer '%s'." -#: sequencer.c:1375 +#: sequencer.c:1906 msgid "please fix this using 'git rebase --edit-todo'." msgstr "por favor arregle esto usando 'git rebase --edit-todo'." -#: sequencer.c:1377 +#: sequencer.c:1908 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "hoja de instrucciones inutilizable: '%s'" -#: sequencer.c:1382 +#: sequencer.c:1913 msgid "no commits parsed." msgstr "ningún commit analizado." -#: sequencer.c:1393 +#: sequencer.c:1924 msgid "cannot cherry-pick during a revert." msgstr "no se puede realizar cherry-pick durante un revert." -#: sequencer.c:1395 +#: sequencer.c:1926 msgid "cannot revert during a cherry-pick." -msgstr "no se puede realizar un revert durante un cherry-pick" +msgstr "no se puede realizar un revert durante un cherry-pick." -#: sequencer.c:1462 +#: sequencer.c:1993 #, c-format msgid "invalid key: %s" msgstr "llave invalida: %s" -#: sequencer.c:1465 +#: sequencer.c:1996 #, c-format msgid "invalid value for %s: %s" msgstr "valor invalido para %s: %s" -#: sequencer.c:1531 +#: sequencer.c:2062 #, c-format msgid "malformed options sheet: '%s'" msgstr "hoja de opciones mal formada: '%s'" -#: sequencer.c:1569 +#: sequencer.c:2100 msgid "a cherry-pick or revert is already in progress" msgstr "un cherry-pick o revert ya esta en progreso" -#: sequencer.c:1570 +#: sequencer.c:2101 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "intenta \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:1573 +#: sequencer.c:2104 #, c-format msgid "could not create sequencer directory '%s'" -msgstr "no se pudo crear un directorio secuenciador '%s' " +msgstr "no se pudo crear un directorio secuenciador '%s'" -#: sequencer.c:1588 +#: sequencer.c:2118 msgid "could not lock HEAD" msgstr "no se pudo bloquear HEAD" -#: sequencer.c:1646 sequencer.c:2230 +#: sequencer.c:2173 sequencer.c:2761 msgid "no cherry-pick or revert in progress" msgstr "ningún cherry-pick o revert en progreso" -#: sequencer.c:1648 +#: sequencer.c:2175 msgid "cannot resolve HEAD" msgstr "no se puede resolver HEAD" -#: sequencer.c:1650 sequencer.c:1685 +#: sequencer.c:2177 sequencer.c:2212 msgid "cannot abort from a branch yet to be born" msgstr "no se puede abortar de una rama por nacer" -#: sequencer.c:1671 builtin/grep.c:713 +#: sequencer.c:2198 builtin/grep.c:720 #, c-format msgid "cannot open '%s'" msgstr "no se puede abrir '%s'" -#: sequencer.c:1673 +#: sequencer.c:2200 #, c-format msgid "cannot read '%s': %s" msgstr "no se puede leer '%s': %s" -#: sequencer.c:1674 +#: sequencer.c:2201 msgid "unexpected end of file" msgstr "final de archivo inesperado" -#: sequencer.c:1680 +#: sequencer.c:2207 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "archivo HEAD de pre-cherry-pick guardado '%s' esta corrupto" -#: sequencer.c:1691 +#: sequencer.c:2218 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:1832 sequencer.c:2128 +#: sequencer.c:2324 sequencer.c:2679 +#, c-format +msgid "could not update %s" +msgstr "no se puede actualizar %s" + +#: sequencer.c:2362 sequencer.c:2659 msgid "cannot read HEAD" msgstr "no se puede leer HEAD" -#: sequencer.c:1872 builtin/difftool.c:639 +#: sequencer.c:2402 builtin/difftool.c:639 #, c-format msgid "could not copy '%s' to '%s'" msgstr "no se pudo copiar '%s' a '%s'" -#: sequencer.c:1891 +#: sequencer.c:2421 msgid "could not read index" msgstr "no se pudo leer índice" -#: sequencer.c:1896 +#: sequencer.c:2426 #, c-format msgid "" "execution failed: %s\n" @@ -3414,11 +3562,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:1902 +#: sequencer.c:2432 msgid "and made changes to the index and/or the working tree\n" msgstr "y se hicieron cambios al índice y/o árbol de trabajo\n" -#: sequencer.c:1908 +#: sequencer.c:2438 #, c-format msgid "" "execution succeeded: %s\n" @@ -3435,17 +3583,17 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:1967 +#: sequencer.c:2497 #, c-format msgid "Applied autostash.\n" msgstr "Autostash aplicado.\n" -#: sequencer.c:1979 +#: sequencer.c:2509 #, c-format msgid "cannot store %s" msgstr "no se puede guardar %s" -#: sequencer.c:1982 git-rebase.sh:175 +#: sequencer.c:2512 git-rebase.sh:178 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -3457,57 +3605,52 @@ msgstr "" "Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier " "momento.\n" -#: sequencer.c:2064 +#: sequencer.c:2595 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Detenido en %s... %.*s\n" -#: sequencer.c:2106 +#: sequencer.c:2637 #, c-format msgid "unknown command %d" msgstr "comando desconocido %d" -#: sequencer.c:2136 +#: sequencer.c:2667 msgid "could not read orig-head" msgstr "no se puede leer orig-head" -#: sequencer.c:2141 sequencer.c:2745 +#: sequencer.c:2672 sequencer.c:3262 msgid "could not read 'onto'" msgstr "no se puede leer 'onto'" -#: sequencer.c:2148 -#, c-format -msgid "could not update %s" -msgstr "no se puede actualizar %s" - -#: sequencer.c:2155 +#: sequencer.c:2686 #, c-format msgid "could not update HEAD to %s" msgstr "no se puede actualizar HEAD a %s" -#: sequencer.c:2239 +#: sequencer.c:2770 msgid "cannot rebase: You have unstaged changes." msgstr "no se puede realizar rebase: Tienes cambios fuera del área de stage." -#: sequencer.c:2244 +#: sequencer.c:2775 msgid "could not remove CHERRY_PICK_HEAD" msgstr "no se puede remover CHERRY_PICK_HEAD" -#: sequencer.c:2253 +#: sequencer.c:2784 msgid "cannot amend non-existing commit" msgstr "no se puede arreglar un commit no existente" -#: sequencer.c:2255 +#: sequencer.c:2786 #, c-format msgid "invalid file: '%s'" msgstr "archivo invalido: '%s'" -#: sequencer.c:2257 +#: sequencer.c:2788 #, c-format msgid "invalid contents: '%s'" msgstr "contenido inválido: '%s'" -#: sequencer.c:2260 +#: sequencer.c:2791 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -3518,45 +3661,45 @@ msgstr "" "un commit con estos\n" "primero y luego ejecuta 'git rebase --continue' de nuevo." -#: sequencer.c:2270 +#: sequencer.c:2801 msgid "could not commit staged changes." msgstr "no se pudo realizar el commit con los cambios en el área de stage." -#: sequencer.c:2350 +#: sequencer.c:2881 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: no se puede aplicar cherry-pick a un %s" -#: sequencer.c:2354 +#: sequencer.c:2885 #, c-format msgid "%s: bad revision" msgstr "%s: mala revision" -#: sequencer.c:2387 +#: sequencer.c:2918 msgid "can't revert as initial commit" msgstr "no se puede revertir como commit inicial" -#: sequencer.c:2492 +#: sequencer.c:3023 msgid "make_script: unhandled options" msgstr "make_script: opciones desconocidas" -#: sequencer.c:2495 +#: sequencer.c:3026 msgid "make_script: error preparing revisions" msgstr "make_script: error preparando revisiones" -#: sequencer.c:2529 sequencer.c:2564 +#: sequencer.c:3060 sequencer.c:3095 #, c-format msgid "unusable todo list: '%s'" msgstr "lista de pendientes inutilizable: '%s'" -#: sequencer.c:2615 +#: sequencer.c:3146 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." msgstr "" -"Opción %s no reconocida para la opción rebase.missingCommitsCheck. Ignorando." +"opción %s no reconocida para la opción rebase.missingCommitsCheck. Ignorando." -#: sequencer.c:2695 +#: sequencer.c:3212 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -3565,7 +3708,7 @@ msgstr "" "Peligro: algunos commits pueden haber sido botados de forma accidental.\n" "Commits botados (empezando con el mas nuevo):\n" -#: sequencer.c:2702 +#: sequencer.c:3219 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -3583,7 +3726,7 @@ msgstr "" "Los posibles comportamientos son: ignore,warn,error.\n" "\n" -#: sequencer.c:2714 +#: sequencer.c:3231 #, c-format msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" @@ -3594,21 +3737,26 @@ msgstr "" "rebase --continue'.\n" "O se puede abortar el rebase con 'git rebase --abort'.\n" -#: sequencer.c:2727 sequencer.c:2794 wrapper.c:225 wrapper.c:395 +#: sequencer.c:3244 sequencer.c:3304 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:2775 +#: sequencer.c:3285 #, c-format msgid "could not parse commit '%s'" -msgstr "No se pudo analizar commit '%s'" +msgstr "no se pudo analizar commit '%s'" -#: sequencer.c:2897 +#: sequencer.c:3401 msgid "the script was already rearranged." msgstr "este script ya fue reorganizado." +#: setup.c:122 +#, c-format +msgid "'%s' is outside repository" +msgstr "'%s' está fuera del repositorio" + #: setup.c:171 #, c-format msgid "" @@ -3631,6 +3779,11 @@ msgstr "" "Use '--' para separar las rutas de las revisiones, de esta manera:\n" "'git <comando> [<revisión>...] -- [<archivo>...]'" +#: setup.c:233 +#, c-format +msgid "option '%s' must come before non-option arguments" +msgstr "opción '%s' debe venir antes de argumentos no opcionales" + #: setup.c:252 #, c-format msgid "" @@ -3642,76 +3795,148 @@ msgstr "" "Use '--' para separar rutas de revisiones, de esta manera:\n" "'git <comando> [<revisión>...] -- [<archivo>...]'" -#: setup.c:501 +#: setup.c:388 +msgid "unable to set up work tree using invalid config" +msgstr "" +"no es posible configurar el directorio de trabajo usando una configuración " +"inválida" + +#: setup.c:395 +msgid "this operation must be run in a work tree" +msgstr "esta operación debe ser realizada en un árbol de trabajo" + +#: setup.c:506 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Se esperaba versión de git repo <= %d, encontrada %d" -#: setup.c:509 +#: setup.c:514 msgid "unknown repository extensions found:" msgstr "se encontró extensión de repositorio desconocida:" -#: setup.c:811 +#: setup.c:533 +#, c-format +msgid "error opening '%s'" +msgstr "error abriendo '%s'" + +#: setup.c:535 #, c-format -msgid "Not a git repository (or any of the parent directories): %s" +msgid "too large to be a .git file: '%s'" +msgstr "muy grande para ser un archivo .git: '%s'" + +#: setup.c:537 +#, c-format +msgid "error reading %s" +msgstr "error leyendo %s" + +#: setup.c:539 +#, c-format +msgid "invalid gitfile format: %s" +msgstr "formato gitfile inválido: %s" + +#: setup.c:541 +#, c-format +msgid "no path in gitfile: %s" +msgstr "no hay ruta en gitfile: %s" + +#: setup.c:543 +#, c-format +msgid "not a git repository: %s" +msgstr "no es un repositorio git: %s" + +#: setup.c:642 +#, c-format +msgid "'$%s' too big" +msgstr "'$%s' muy grande" + +#: setup.c:656 +#, c-format +msgid "not a git repository: '%s'" +msgstr "no es un repositorio git: '%s'" + +#: setup.c:685 setup.c:687 setup.c:718 +#, c-format +msgid "cannot chdir to '%s'" +msgstr "no se puede aplicar chdir a '%s'" + +#: setup.c:690 setup.c:746 setup.c:756 setup.c:795 setup.c:803 setup.c:818 +msgid "cannot come back to cwd" +msgstr "no se puede volver a cwd" + +#: setup.c:816 +#, 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" +"no es un repositorio git (ni ninguno de los directorios superiores): %s" -#: setup.c:813 builtin/index-pack.c:1653 -msgid "Cannot come back to cwd" -msgstr "No se puede regresar a cwd" +#: setup.c:827 +#, c-format +msgid "failed to stat '%*s%s%s'" +msgstr "fallo al determinar '%*s%s%s'" -#: setup.c:1052 +#: setup.c:1057 msgid "Unable to read current working directory" msgstr "Incapaz de leer el directorio de trabajo actual" -#: setup.c:1064 setup.c:1070 +#: setup.c:1069 setup.c:1075 #, c-format -msgid "Cannot change to '%s'" -msgstr "No se puede cambiar a '%s'" +msgid "cannot change to '%s'" +msgstr "no se puede cambiar a '%s'" -#: setup.c:1083 +#: setup.c:1088 #, c-format msgid "" -"Not a git repository (or any parent up to mount point %s)\n" +"not a git repository (or any parent up to mount point %s)\n" "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." msgstr "" -"No es un repositorio git ( o ningún padre en el punto de montado %s)\n" +"no es un repositorio git ( o ningún padre en el punto de montado %s)\n" "Parando en el límite del sistema de archivos " "(GIT_DISCOVERY_ACROSS_FILESYSTEM no establecido)." -#: setup.c:1167 +#: setup.c:1172 #, c-format msgid "" -"Problem with core.sharedRepository filemode value (0%.3o).\n" +"problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." msgstr "" -"Problema con el valor del modo de archivo core.sharedRepository (0%.3o).\n" +"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:598 +#: setup.c:1215 +msgid "open /dev/null or dup failed" +msgstr "falló al abrir /dev/null o dup" + +#: setup.c:1230 +msgid "fork failed" +msgstr "falló fork" + +#: setup.c:1235 +msgid "setsid failed" +msgstr "falló setsid" + +#: sha1_file.c:592 #, c-format msgid "path '%s' does not exist" msgstr "ruta '%s' no existe" -#: sha1_file.c:624 +#: sha1_file.c:618 #, 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:630 +#: sha1_file.c:624 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "repositorio de referencia '%s' no es un repositorio local." -#: sha1_file.c:636 +#: sha1_file.c:630 #, c-format msgid "reference repository '%s' is shallow" msgstr "repositorio de referencia '%s' es superficial (shallow)" -#: sha1_file.c:644 +#: sha1_file.c:638 #, c-format msgid "reference repository '%s' is grafted" msgstr "repositorio de referencia '% s' está injertado" @@ -3719,7 +3944,7 @@ msgstr "repositorio de referencia '% s' está injertado" #: sha1_name.c:422 #, c-format msgid "short SHA1 %s is ambiguous" -msgstr "SHA1 %s corta es ambigua" +msgstr "SHA1 %s corto es ambiguao" #: sha1_name.c:433 msgid "The candidates are:" @@ -3787,7 +4012,7 @@ msgstr "El patrón de ruta '%s' está en el submódulo '%.*s'" 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:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387 +#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1724 msgid "Failed to resolve HEAD as a valid ref." msgstr "Fallo al resolver HEAD como un ref valido." @@ -3811,7 +4036,7 @@ msgstr "no se pudo ejecutar 'git status' en el submódulo '%s'" msgid "submodule '%s' has dirty index" msgstr "submódulo '%s' tiene un índice corrupto" -#: submodule.c:1876 +#: submodule.c:1878 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -3819,18 +4044,18 @@ msgstr "" "relocate_gitdir para el submódulo '%s' con más de un árbol de trabajo no " "soportado" -#: submodule.c:1888 submodule.c:1944 +#: submodule.c:1890 submodule.c:1946 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "no se pudo resolver el nombre para el submódulo '%s'" -#: submodule.c:1892 builtin/submodule--helper.c:909 -#: builtin/submodule--helper.c:919 +#: submodule.c:1894 builtin/submodule--helper.c:1246 +#: builtin/submodule--helper.c:1256 #, c-format msgid "could not create directory '%s'" msgstr "no se pudo crear el directorio '%s'" -#: submodule.c:1895 +#: submodule.c:1897 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -3841,20 +4066,20 @@ msgstr "" "'%s' hacia\n" "'%s'\n" -#: submodule.c:1979 +#: submodule.c:1981 #, c-format msgid "could not recurse into submodule '%s'" -msgstr "No pudo recursar en el submódulo '%s'" +msgstr "no pudo recursar en el submódulo '%s'" -#: submodule.c:2023 +#: submodule.c:2025 msgid "could not start ls-files in .." msgstr "no se pudo comenzar ls-files en .." -#: submodule.c:2043 +#: submodule.c:2045 msgid "BUG: returned path string doesn't match cwd?" msgstr "BUG: string de ruta recibido no concuerda con cwd?" -#: submodule.c:2062 +#: submodule.c:2064 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree retornó un código %d inesperado" @@ -3871,7 +4096,7 @@ msgstr "valor inválido para %s" #: trailer.c:238 #, c-format msgid "running trailer command '%s' failed" -msgstr "no se pudo ejecutar el comando de remolque '%s'" +msgstr "ejecución del comando de remolque '%s' falló" #: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 #: trailer.c:557 @@ -3911,7 +4136,7 @@ msgstr "el archivo %s no es un archivo regular" #: trailer.c:1012 #, c-format msgid "file %s is not writable by user" -msgstr "el archivo %s no puede ser escrito por el usuario " +msgstr "el archivo %s no puede ser escrito por el usuario" #: trailer.c:1024 msgid "could not open temporary file" @@ -3932,7 +4157,7 @@ msgstr "Configurará upstream de '%s' a '%s' de '%s'\n" msgid "transport: invalid depth option '%s'" msgstr "transport: opción inválida '%s'" -#: transport.c:904 +#: transport.c:916 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -3941,7 +4166,7 @@ msgstr "" "La siguiente ruta de submódulo contiene cambios que no\n" "pueden ser encontrados en ningún remoto:\n" -#: transport.c:908 +#: transport.c:920 #, c-format msgid "" "\n" @@ -3968,11 +4193,11 @@ msgstr "" "para hacer un push al remoto.\n" "\n" -#: transport.c:916 +#: transport.c:928 msgid "Aborting." msgstr "Abortando." -#: transport-helper.c:1074 +#: transport-helper.c:1079 #, c-format msgid "Could not read ref %s" msgstr "No se pudo leer la referencia %s" @@ -3993,18 +4218,18 @@ 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:107 +#: unpack-trees.c:108 #, 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 "" -"Los cambios locales de los siguientes archivos serán sobrescritos al " -"actualizar el árbol de trabajo:\n" -"%%sPor favor, confirma tus cambios o guárdalos antes de intercambiar " +"Los cambios locales de los siguientes archivos serán sobrescritos por " +"checkuot:\n" +"%%sPor favor realiza un commit con los cambios o un stash antes de cambiar " "ramas." -#: unpack-trees.c:109 +#: unpack-trees.c:110 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -4014,7 +4239,7 @@ msgstr "" "checkout:\n" "%%s" -#: unpack-trees.c:112 +#: unpack-trees.c:113 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4024,7 +4249,7 @@ msgstr "" "fusionar:\n" "%%sPor favor, confirma tus cambios o aguárdalos antes de fusionar." -#: unpack-trees.c:114 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4034,7 +4259,7 @@ msgstr "" "merge:\n" "%%s" -#: unpack-trees.c:117 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -4043,7 +4268,7 @@ msgstr "" "Los cambios locales de los siguientes archivos serán sobrescritos al %s:\n" "%%sPor favor, confirma tus cambios o guárdalos antes de %s." -#: unpack-trees.c:119 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -4052,7 +4277,7 @@ msgstr "" "Los cambios locales de los siguientes archivos serán sobreescritos por %s:\n" "%%s" -#: unpack-trees.c:124 +#: unpack-trees.c:125 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -4062,7 +4287,7 @@ msgstr "" "seguimiento en ellos:\n" "%s" -#: unpack-trees.c:128 +#: unpack-trees.c:129 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -4072,7 +4297,7 @@ msgstr "" "removidos al actualizar el árbol de trabajo:\n" "%%sPor favor, muévelos o elimínalos antes de intercambiar ramas." -#: unpack-trees.c:130 +#: unpack-trees.c:131 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -4082,7 +4307,7 @@ msgstr "" "al actualizar el árbol de trabajo:\n" "%%s" -#: unpack-trees.c:133 +#: unpack-trees.c:134 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -4092,7 +4317,7 @@ msgstr "" "removidos al fusionar:\n" "%%sPor favor, muévelos o elimínalos antes de fusionar." -#: unpack-trees.c:135 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -4102,7 +4327,7 @@ msgstr "" "al fusionar:\n" "%%s" -#: unpack-trees.c:138 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -4112,7 +4337,7 @@ msgstr "" "removidos al %s:\n" "%%sPor favor, muévelos o elimínalos antes de %s." -#: unpack-trees.c:140 +#: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -4122,7 +4347,7 @@ msgstr "" "removidos al ejecutar %s:\n" "%%s" -#: unpack-trees.c:145 +#: unpack-trees.c:146 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -4133,7 +4358,7 @@ msgstr "" "sobrescritos al actualizar el árbol de trabajo:\n" "%%sPor favor, muévelos o elimínalos antes de intercambiar ramas." -#: unpack-trees.c:147 +#: unpack-trees.c:148 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -4144,7 +4369,7 @@ msgstr "" "sobrescritos al actualizar el árbol de trabajo:\n" "%%s" -#: unpack-trees.c:150 +#: unpack-trees.c:151 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -4154,7 +4379,7 @@ msgstr "" "sobrescritos al fusionar:\n" "%%sPor favor, muévelos o elimínalos antes de fusionar." -#: unpack-trees.c:152 +#: unpack-trees.c:153 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -4164,7 +4389,7 @@ msgstr "" "sobrescritos al fusionar:\n" "%%s" -#: unpack-trees.c:155 +#: unpack-trees.c:156 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -4174,7 +4399,7 @@ msgstr "" "sobrescritos al %s:\n" "%%sPor favor, muévelos o elimínalos antes de %s." -#: unpack-trees.c:157 +#: unpack-trees.c:158 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -4184,12 +4409,12 @@ msgstr "" "por %s:\n" "%%s" -#: unpack-trees.c:164 +#: unpack-trees.c:165 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." -msgstr "Entrada '%s' se superpone con '%s'. No se pueden unir" +msgstr "Entrada '%s' se superpone con '%s'. No se pueden unir." -#: unpack-trees.c:167 +#: unpack-trees.c:168 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" @@ -4199,7 +4424,7 @@ msgstr "" "actualizadas:\n" "%s" -#: unpack-trees.c:169 +#: unpack-trees.c:170 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -4210,7 +4435,7 @@ msgstr "" "actualización sparse checkout:\n" "%s" -#: unpack-trees.c:171 +#: unpack-trees.c:172 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -4221,7 +4446,7 @@ msgstr "" "actualización sparse checkout:\n" "%s" -#: unpack-trees.c:173 +#: unpack-trees.c:174 #, c-format msgid "" "Cannot update submodule:\n" @@ -4230,27 +4455,27 @@ msgstr "" "No se puede actualizar le submódulo:\n" "%s" -#: unpack-trees.c:250 +#: unpack-trees.c:251 #, c-format msgid "Aborting\n" msgstr "Abortando\n" -#: unpack-trees.c:332 +#: unpack-trees.c:333 msgid "Checking out files" msgstr "Revisando archivos" #: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" -msgstr "nombre de URL invalido o falta sufijo '://'" +msgstr "nombre de URL invalido o sufijo '://' faltante" #: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405 #, c-format msgid "invalid %XX escape sequence" -msgstr "secuencia de escape %XX invalida " +msgstr "secuencia de escape %XX invalida" #: urlmatch.c:215 msgid "missing host and scheme is not 'file:'" -msgstr "falta host y el esquema no es 'archivo':" +msgstr "falta host y el esquema no es 'file:'" #: urlmatch.c:232 msgid "a 'file:' URL may not have a port number" @@ -4268,18 +4493,46 @@ msgstr "numero de puerto invalido" msgid "invalid '..' path segment" msgstr "segmento de ruta '..' invalido" -#: worktree.c:245 +#: worktree.c:245 builtin/am.c:2147 #, c-format msgid "failed to read '%s'" msgstr "fallo al leer '%s'" +#: worktree.c:291 +#, c-format +msgid "'%s' at main working tree is not the repository directory" +msgstr "" +"'%s' en el árbol de trabajo principal no es el directorio del repositorio" + +#: worktree.c:302 +#, c-format +msgid "'%s' file does not contain absolute path to the working tree location" +msgstr "" +"archivo '%s' no contiene una ruta absoluta a la ubicación del árbol de " +"trabajo" + +#: worktree.c:314 +#, c-format +msgid "'%s' does not exist" +msgstr "'%s' no existe" + +#: worktree.c:320 +#, c-format +msgid "'%s' is not a .git file, error code %d" +msgstr "'%s' no es un archivo .git, código de error %d" + +#: worktree.c:328 +#, c-format +msgid "'%s' does not point back to '%s'" +msgstr "'%s' no apunta de vuelta a '%s'" + #: wrapper.c:223 wrapper.c:393 #, c-format 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:770 -#: builtin/am.c:862 builtin/merge.c:1043 +#: builtin/am.c:862 builtin/merge.c:1044 #, c-format msgid "could not open '%s' for reading" msgstr "no se pudo abrir '%s' para lectura" @@ -4293,159 +4546,159 @@ msgstr "no es posible acceder '%s'" msgid "unable to get current working directory" msgstr "no es posible obtener el directorio de trabajo actual" -#: wt-status.c:150 +#: wt-status.c:151 msgid "Unmerged paths:" -msgstr "rutas no fusionadas:" +msgstr "Rutas no fusionadas:" -#: wt-status.c:177 wt-status.c:204 +#: wt-status.c:178 wt-status.c:205 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (usa \"git reset %s <archivo>...\" para sacar del área de stage)" -#: wt-status.c:179 wt-status.c:206 +#: wt-status.c:180 wt-status.c:207 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (usa \"git rm --cached <archivo>...\" para sacar del área de stage)" -#: wt-status.c:183 +#: wt-status.c:184 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (usa \"git add <archivo>...\" para marcar una resolución)" -#: wt-status.c:185 wt-status.c:189 +#: wt-status.c:186 wt-status.c:190 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" " (usa \"git add/rm <archivo>...\" como una forma apropiada de marcar la " "resolución)" -#: wt-status.c:187 +#: wt-status.c:188 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (usa \"git rm <file>...\" para marcar la resolución)" -#: wt-status.c:198 wt-status.c:984 +#: wt-status.c:199 wt-status.c:1007 msgid "Changes to be committed:" msgstr "Cambios a ser confirmados:" -#: wt-status.c:216 wt-status.c:993 +#: wt-status.c:217 wt-status.c:1016 msgid "Changes not staged for commit:" msgstr "Cambios no rastreados para el commit:" -#: wt-status.c:220 +#: wt-status.c:221 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" " (usa \"git add <archivo>...\" para actualizar lo que será confirmado)" -#: wt-status.c:222 +#: wt-status.c:223 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" " (usa \"git add/rm <archivo>...\" para actualizar a lo que se le va a hacer " "commit)" -#: wt-status.c:223 +#: wt-status.c:224 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (usa \"git checkout -- <archivo>...\" para descartar los cambios en el " "directorio de trabajo)" -#: wt-status.c:225 +#: wt-status.c:226 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (confirmar o descartar el contenido sin seguimiento o modificado en los " "sub-módulos)" -#: wt-status.c:237 +#: wt-status.c:238 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (usa \"git %s <archivo>...\" para incluirlo a lo que se será confirmado)" -#: wt-status.c:252 +#: wt-status.c:253 msgid "both deleted:" msgstr "ambos borrados:" -#: wt-status.c:254 +#: wt-status.c:255 msgid "added by us:" msgstr "agregado por nosotros:" -#: wt-status.c:256 +#: wt-status.c:257 msgid "deleted by them:" msgstr "borrados por ellos:" -#: wt-status.c:258 +#: wt-status.c:259 msgid "added by them:" msgstr "agregado por ellos:" -#: wt-status.c:260 +#: wt-status.c:261 msgid "deleted by us:" msgstr "borrado por nosotros:" -#: wt-status.c:262 +#: wt-status.c:263 msgid "both added:" msgstr "ambos agregados:" -#: wt-status.c:264 +#: wt-status.c:265 msgid "both modified:" msgstr "ambos modificados:" -#: wt-status.c:274 +#: wt-status.c:275 msgid "new file:" msgstr "nuevo archivo:" -#: wt-status.c:276 +#: wt-status.c:277 msgid "copied:" msgstr "copiado:" -#: wt-status.c:278 +#: wt-status.c:279 msgid "deleted:" msgstr "borrado:" -#: wt-status.c:280 +#: wt-status.c:281 msgid "modified:" msgstr "modificado:" -#: wt-status.c:282 +#: wt-status.c:283 msgid "renamed:" msgstr "renombrado:" -#: wt-status.c:284 +#: wt-status.c:285 msgid "typechange:" msgstr "cambio de tipo:" -#: wt-status.c:286 +#: wt-status.c:287 msgid "unknown:" msgstr "desconocido:" -#: wt-status.c:288 +#: wt-status.c:289 msgid "unmerged:" msgstr "des-fusionado:" -#: wt-status.c:370 +#: wt-status.c:369 msgid "new commits, " msgstr "nuevos commits, " -#: wt-status.c:372 +#: wt-status.c:371 msgid "modified content, " msgstr "contenido modificado, " -#: wt-status.c:374 +#: wt-status.c:373 msgid "untracked content, " msgstr "contenido no rastreado, " -#: wt-status.c:824 +#: wt-status.c:847 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "Tu stash actualmente tiene %d entrada" msgstr[1] "Tu stash actualmente tiene %d entradas" -#: wt-status.c:856 +#: wt-status.c:879 msgid "Submodules changed but not updated:" msgstr "Submodulos cambiados pero no actualizados:" -#: wt-status.c:858 +#: wt-status.c:881 msgid "Submodule changes to be committed:" msgstr "Submodulos cambiados listos para realizar commit:" -#: wt-status.c:940 +#: wt-status.c:963 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -4453,107 +4706,107 @@ msgstr "" "No modifique o borre la línea de encima.\n" "Todo lo que este por abajo será removido." -#: wt-status.c:1053 +#: wt-status.c:1076 msgid "You have unmerged paths." -msgstr "tienes rutas no fusionadas" +msgstr "Tienes rutas no fusionadas." -#: wt-status.c:1056 +#: wt-status.c:1079 msgid " (fix conflicts and run \"git commit\")" msgstr " (arregla los conflictos y corre \"git commit\"" -#: wt-status.c:1058 +#: wt-status.c:1081 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (usa \"git merge --abort\" para abortar la fusion)" -#: wt-status.c:1063 +#: wt-status.c:1086 msgid "All conflicts fixed but you are still merging." msgstr "Todos los conflictos resueltos pero sigues fusionando." -#: wt-status.c:1066 +#: wt-status.c:1089 msgid " (use \"git commit\" to conclude merge)" msgstr " (usa \"git commit\" para concluir la fusión)" -#: wt-status.c:1076 +#: wt-status.c:1099 msgid "You are in the middle of an am session." msgstr "Estás en medio de una sesión am." -#: wt-status.c:1079 +#: wt-status.c:1102 msgid "The current patch is empty." msgstr "El parche actual esta vacío." -#: wt-status.c:1083 +#: wt-status.c:1106 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (arregla los conflictos y luego corre \"git am --continue\"" -#: wt-status.c:1085 +#: wt-status.c:1108 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (usa \"git am --skip\" para saltar este parche)" -#: wt-status.c:1087 +#: wt-status.c:1110 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (usa \"git am --abort\" para restaurar la rama original)" -#: wt-status.c:1219 +#: wt-status.c:1242 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo no esta presente." -#: wt-status.c:1221 +#: wt-status.c:1244 msgid "No commands done." msgstr "No se realizaron los comandos." -#: wt-status.c:1224 +#: wt-status.c:1247 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "El último comando realizado (%d comando realizado):" msgstr[1] "Los últimos comandos realizados (%d comandos realizados):" -#: wt-status.c:1235 +#: wt-status.c:1258 #, c-format msgid " (see more in file %s)" msgstr " (ver mas en el archivo %s)" -#: wt-status.c:1240 +#: wt-status.c:1263 msgid "No commands remaining." msgstr "No quedan mas comandos." -#: wt-status.c:1243 +#: wt-status.c:1266 #, 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=" +msgstr[0] "Siguiente comando a realizar (%d comando restante):" +msgstr[1] "Siguiente comandos a realizar (%d comandos faltantes):" -#: wt-status.c:1251 +#: wt-status.c:1274 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (usa \"git rebase --edit-todo\" para ver y editar)" -#: wt-status.c:1264 +#: wt-status.c:1287 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Estás aplicando un rebase de la rama '%s' en '%s." -#: wt-status.c:1269 +#: wt-status.c:1292 msgid "You are currently rebasing." msgstr "Estás aplicando un rebase." -#: wt-status.c:1283 +#: wt-status.c:1306 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (corrige los conflictos y ejecuta \"git rebase --continue\")" -#: wt-status.c:1285 +#: wt-status.c:1308 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (usa \"git rebase --skip\" para omitir este parche)" -#: wt-status.c:1287 +#: wt-status.c:1310 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:1293 +#: wt-status.c:1316 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (todos los conflictos corregidos: ejecuta \"git rebase --continue\")" -#: wt-status.c:1297 +#: wt-status.c:1320 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -4561,128 +4814,128 @@ msgstr "" "Estás dividiendo un commit mientras aplicas un rebase de la rama '%s' en " "'%s'." -#: wt-status.c:1302 +#: wt-status.c:1325 msgid "You are currently splitting a commit during a rebase." msgstr "Estás dividiendo un commit durante un rebase." -#: wt-status.c:1305 +#: wt-status.c:1328 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:1309 +#: wt-status.c:1332 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Estás editando un commit mientras se aplica un rebase de la rama '%s' en " "'%s'." -#: wt-status.c:1314 +#: wt-status.c:1337 msgid "You are currently editing a commit during a rebase." msgstr "Estás editando un commit durante un rebase." -#: wt-status.c:1317 +#: wt-status.c:1340 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (usa \"git commit --amend\" para enmendar el commit actual)" -#: wt-status.c:1319 +#: wt-status.c:1342 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:1329 +#: wt-status.c:1352 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Estás realizando un cherry-picking en el commit %s." -#: wt-status.c:1334 +#: wt-status.c:1357 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (corrige los conflictos y ejecuta \"git cherry-pick --continue\")" -#: wt-status.c:1337 +#: wt-status.c:1360 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (todos los conflictos corregidos: ejecuta \"git cherry-pick --continue\")" -#: wt-status.c:1339 +#: wt-status.c:1362 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (use \"git cherry-pick --abort\" para cancelar la operación cherry-pick)" -#: wt-status.c:1348 +#: wt-status.c:1371 #, c-format msgid "You are currently reverting commit %s." msgstr "Estás revirtiendo el commit %s." -#: wt-status.c:1353 +#: wt-status.c:1376 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (corrige los conflictos y ejecuta \"git revert --continue\")" -#: wt-status.c:1356 +#: wt-status.c:1379 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (todos los conflictos corregidos: ejecuta \"git revert --continue\")" -#: wt-status.c:1358 +#: wt-status.c:1381 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:1369 +#: wt-status.c:1392 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Estás aplicando un bisect, comenzando en la rama '%s'." -#: wt-status.c:1373 +#: wt-status.c:1396 msgid "You are currently bisecting." msgstr "Estás aplicando un bisect." -#: wt-status.c:1376 +#: wt-status.c:1399 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:1573 +#: wt-status.c:1596 msgid "On branch " msgstr "En la rama " -#: wt-status.c:1579 +#: wt-status.c:1602 msgid "interactive rebase in progress; onto " -msgstr "rebase interactivo en progreso; en" +msgstr "rebase interactivo en progreso; en " -#: wt-status.c:1581 +#: wt-status.c:1604 msgid "rebase in progress; onto " -msgstr "rebase en progreso; en" +msgstr "rebase en progreso; en " -#: wt-status.c:1586 +#: wt-status.c:1609 msgid "HEAD detached at " -msgstr "HEAD desacoplada en" +msgstr "HEAD desacoplada en " -#: wt-status.c:1588 +#: wt-status.c:1611 msgid "HEAD detached from " -msgstr "HEAD desacoplada de" +msgstr "HEAD desacoplada de " -#: wt-status.c:1591 +#: wt-status.c:1614 msgid "Not currently on any branch." msgstr "Actualmente no estás en ninguna rama." -#: wt-status.c:1611 +#: wt-status.c:1634 msgid "Initial commit" msgstr "Confirmación inicial" -#: wt-status.c:1612 +#: wt-status.c:1635 msgid "No commits yet" msgstr "No hay commits todavía" -#: wt-status.c:1626 +#: wt-status.c:1649 msgid "Untracked files" msgstr "Archivos sin seguimiento" -#: wt-status.c:1628 +#: wt-status.c:1651 msgid "Ignored files" msgstr "Archivos ignorados" -#: wt-status.c:1632 +#: wt-status.c:1655 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -4693,31 +4946,31 @@ msgstr "" "puede acelerarlo, pero tiene que ser cuidadoso de no olvidar agregar\n" "nuevos archivos usted mismo (vea 'git help status')." -#: wt-status.c:1638 +#: wt-status.c:1661 #, c-format msgid "Untracked files not listed%s" msgstr "Archivos no rastreados no son mostrados %s" -#: wt-status.c:1640 +#: wt-status.c:1663 msgid " (use -u option to show untracked files)" msgstr " (usa la opción -u para mostrar los archivos sin seguimiento)" -#: wt-status.c:1646 +#: wt-status.c:1669 msgid "No changes" msgstr "Sin cambios" -#: wt-status.c:1651 +#: wt-status.c:1674 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "sin cambios agregados al commit (usa \"git add\" y/o \"git commit -a\")\n" -#: wt-status.c:1654 +#: wt-status.c:1677 #, c-format msgid "no changes added to commit\n" msgstr "no se agregaron cambios al commit\n" -#: wt-status.c:1657 +#: wt-status.c:1680 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -4726,68 +4979,72 @@ msgstr "" "no hay nada agregado al commit pero hay archivos sin seguimiento presentes " "(usa \"git add\" para hacerles seguimiento)\n" -#: wt-status.c:1660 +#: wt-status.c:1683 #, 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:1663 +#: wt-status.c:1686 #, 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:1666 wt-status.c:1671 +#: wt-status.c:1689 wt-status.c:1694 #, c-format msgid "nothing to commit\n" msgstr "nada para hacer commit\n" -#: wt-status.c:1669 +#: wt-status.c:1692 #, 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:1673 +#: wt-status.c:1696 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "nada para hacer commit, el árbol de trabajo esta limpio\n" -#: wt-status.c:1785 +#: wt-status.c:1809 msgid "No commits yet on " msgstr "No hay commits todavía en " -#: wt-status.c:1789 +#: wt-status.c:1813 msgid "HEAD (no branch)" msgstr "HEAD (sin rama)" -#: wt-status.c:1818 wt-status.c:1826 +#: wt-status.c:1844 +msgid "different" +msgstr "diferente" + +#: wt-status.c:1846 wt-status.c:1854 msgid "behind " -msgstr "detrás" +msgstr "detrás " -#: wt-status.c:1821 wt-status.c:1824 +#: wt-status.c:1849 wt-status.c:1852 msgid "ahead " -msgstr "adelante" +msgstr "adelante " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2318 +#: wt-status.c:2358 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "no se puede %s: Tienes cambios sin marcar." -#: wt-status.c:2324 +#: wt-status.c:2364 msgid "additionally, your index contains uncommitted changes." msgstr "adicionalmente, tu índice contiene cambios que no están en un commit." -#: wt-status.c:2326 +#: wt-status.c:2366 #, c-format msgid "cannot %s: Your index contains uncommitted changes." 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 +#: compat/precompose_utf8.c:58 builtin/clone.c:440 #, c-format msgid "failed to unlink '%s'" msgstr "fallo al desvincular '%s'" @@ -4801,7 +5058,7 @@ msgstr "git add [<opción>] [--] <especificación-de-ruta>..." msgid "unexpected diff status %c" msgstr "diff status inesperado %c" -#: builtin/add.c:88 builtin/commit.c:291 +#: builtin/add.c:88 builtin/commit.c:257 msgid "updating files failed" msgstr "fallo la actualización de carpetas" @@ -4850,7 +5107,7 @@ 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:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124 +#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:146 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" @@ -4860,7 +5117,7 @@ msgstr "dry run ( ejecución en seco)" msgid "interactive picking" msgstr "selección interactiva" -#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310 +#: builtin/add.c:295 builtin/checkout.c:1128 builtin/reset.c:302 msgid "select hunks interactively" msgstr "elegir hunks de forma interactiva" @@ -4984,10 +5241,10 @@ msgstr "Nada especificado, nada agregado.\n" msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Tal vez quiso decir 'git add .'?\n" -#: 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 +#: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:280 +#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:316 +#: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241 +#: builtin/rm.c:271 builtin/submodule--helper.c:326 msgid "index file corrupt" msgstr "archivo índice corrompido" @@ -5003,7 +5260,7 @@ msgstr "'%s' fue borrado por el hook de applypatch-msg" #: builtin/am.c:539 #, c-format msgid "Malformed input line: '%s'." -msgstr "línea mal formada: '%s'." +msgstr "Línea mal formada: '%s'." #: builtin/am.c:576 #, c-format @@ -5021,7 +5278,7 @@ msgstr "no se pudo analizar el parche '%s'" #: 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 " +msgstr "Solo un parche StGIT puede ser aplicado de una vez" #: builtin/am.c:903 msgid "invalid timestamp" @@ -5039,61 +5296,61 @@ msgstr "offset de zona horaria inválido" msgid "Patch format detection failed." msgstr "Falló al detectar el formato del parche." -#: builtin/am.c:1013 builtin/clone.c:402 +#: builtin/am.c:1013 builtin/clone.c:405 #, c-format msgid "failed to create directory '%s'" msgstr "fallo al crear el directorio '%s'" -#: builtin/am.c:1017 +#: builtin/am.c:1018 msgid "Failed to split patches." -msgstr "Fallo al dividir parches" +msgstr "Fallo al dividir parches." -#: builtin/am.c:1146 builtin/commit.c:376 +#: builtin/am.c:1148 builtin/commit.c:342 msgid "unable to write index file" msgstr "no es posible escribir en el archivo índice" -#: builtin/am.c:1160 +#: builtin/am.c:1162 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Cuando haya resuelto este problema, ejecute \"%s --continue\"." -#: builtin/am.c:1161 +#: builtin/am.c:1163 #, 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:1162 +#: builtin/am.c:1164 #, 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:1269 +#: builtin/am.c:1271 msgid "Patch is empty." msgstr "El parche esta vacío." -#: builtin/am.c:1335 +#: builtin/am.c:1337 #, c-format msgid "invalid ident line: %.*s" msgstr "sangría no válida: %.*s" -#: builtin/am.c:1357 +#: builtin/am.c:1359 #, c-format msgid "unable to parse commit %s" msgstr "no es posible analizar el commit %s" -#: builtin/am.c:1550 +#: builtin/am.c:1554 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" +"3-vías." -#: builtin/am.c:1552 +#: builtin/am.c:1556 msgid "Using index info to reconstruct a base tree..." msgstr "Usando la información del índice para reconstruir un árbol base..." -#: builtin/am.c:1571 +#: builtin/am.c:1575 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -5101,37 +5358,28 @@ msgstr "" "Editaste el parche a mano?\n" "No aplica a blobs guardados en su índice." -#: builtin/am.c:1577 +#: builtin/am.c:1581 msgid "Falling back to patching base and 3-way merge..." msgstr "Retrocediendo para parchar base y fusión de 3-vías..." -#: builtin/am.c:1602 +#: builtin/am.c:1606 msgid "Failed to merge in the changes." msgstr "Falló al fusionar en los cambios." -#: builtin/am.c:1626 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:1633 +#: builtin/am.c:1637 msgid "applying to an empty history" msgstr "aplicando a un historial vacío" -#: builtin/am.c:1646 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:1679 builtin/am.c:1683 +#: builtin/am.c:1683 builtin/am.c:1687 #, c-format msgid "cannot resume: %s does not exist." -msgstr "no se puede continuar: %s no existe" +msgstr "no se puede continuar: %s no existe." -#: builtin/am.c:1699 +#: builtin/am.c:1703 msgid "cannot be interactive without stdin connected to a terminal." -msgstr "no se puede ser interactivo sin stdin conectado a un terminal" +msgstr "no se puede ser interactivo sin stdin conectado a un terminal." -#: builtin/am.c:1704 +#: builtin/am.c:1708 msgid "Commit Body is:" msgstr "Cuerpo de commit es:" @@ -5139,35 +5387,34 @@ msgstr "Cuerpo de commit es:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1714 +#: builtin/am.c:1718 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:1764 +#: builtin/am.c:1768 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Índice sucio: no se puede aplicar parches (sucio: %s)" -#: builtin/am.c:1804 builtin/am.c:1876 +#: builtin/am.c:1808 builtin/am.c:1879 #, c-format msgid "Applying: %.*s" msgstr "Aplicando: %.*s" -#: builtin/am.c:1820 +#: builtin/am.c:1824 msgid "No changes -- Patch already applied." msgstr "Sin cambios -- parche ya aplicado." -#: builtin/am.c:1828 +#: builtin/am.c:1832 #, c-format msgid "Patch failed at %s %.*s" msgstr "El parche fallo en %s %.*s" -#: builtin/am.c:1834 -#, 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:1838 +msgid "Use 'git am --show-current-patch' to see the failed patch" +msgstr "Use 'git am --show-current-patch' para ver el parche fallido" -#: builtin/am.c:1879 +#: builtin/am.c:1882 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -5177,7 +5424,7 @@ msgstr "" "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:1886 +#: builtin/am.c:1889 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -5190,152 +5437,160 @@ msgstr "" "Tal vez ejecute `git rm` en el archivo para aceptar \"borrado por ellos\" en " "él." -#: builtin/am.c:1993 builtin/am.c:1997 builtin/am.c:2009 builtin/reset.c:332 -#: builtin/reset.c:340 +#: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324 +#: builtin/reset.c:332 #, c-format msgid "Could not parse object '%s'." msgstr "No se pudo analizar el objeto '%s'." -#: builtin/am.c:2045 +#: builtin/am.c:2048 msgid "failed to clean index" msgstr "fallo al limpiar el índice" -#: builtin/am.c:2080 +#: builtin/am.c:2083 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "" "Parece haber movido HEAD desde el último fallo 'am'.\n" -"No rebobinando a ORIG_HEAD " +"No rebobinando a ORIG_HEAD" -#: builtin/am.c:2143 +#: builtin/am.c:2174 #, c-format msgid "Invalid value for --patch-format: %s" -msgstr "valor invalido para --patch-format: %s" +msgstr "Valor invalido para --patch-format: %s" -#: builtin/am.c:2176 +#: builtin/am.c:2210 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<opciones>] [(<mbox> | <Directorio-de-correo>)...]" -#: builtin/am.c:2177 +#: builtin/am.c:2211 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<opciones>] (--continue | --skip | --abort)" -#: builtin/am.c:2183 +#: builtin/am.c:2217 msgid "run interactively" msgstr "ejecutar de manera interactiva" -#: builtin/am.c:2185 +#: builtin/am.c:2219 msgid "historical option -- no-op" msgstr "opción histórica -- no-op" -#: builtin/am.c:2187 +#: builtin/am.c:2221 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:2188 builtin/init-db.c:484 builtin/prune-packed.c:57 -#: builtin/repack.c:180 +#: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57 +#: builtin/repack.c:182 msgid "be quiet" msgstr "ser silencioso" -#: builtin/am.c:2190 +#: builtin/am.c:2224 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:2193 +#: builtin/am.c:2227 msgid "recode into utf8 (default)" msgstr "recodificar en utf8 (default)" -#: builtin/am.c:2195 +#: builtin/am.c:2229 msgid "pass -k flag to git-mailinfo" msgstr "pasar flag -k a git-mailinfo" -#: builtin/am.c:2197 +#: builtin/am.c:2231 msgid "pass -b flag to git-mailinfo" msgstr "pasar flag -b a git-mailinfo" -#: builtin/am.c:2199 +#: builtin/am.c:2233 msgid "pass -m flag to git-mailinfo" msgstr "pasar flag -m a git-mailinfo" -#: builtin/am.c:2201 +#: builtin/am.c:2235 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:2204 +#: builtin/am.c:2238 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:2207 +#: builtin/am.c:2241 msgid "strip everything before a scissors line" msgstr "descubrir todo antes de una línea de tijeras" -#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218 -#: builtin/am.c:2221 builtin/am.c:2224 builtin/am.c:2227 builtin/am.c:2230 -#: builtin/am.c:2236 +#: builtin/am.c:2243 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:2270 msgid "pass it through git-apply" msgstr "pasarlo a través de git-apply" -#: builtin/am.c:2226 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 +#: builtin/am.c:2260 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668 +#: builtin/grep.c:853 builtin/merge.c:206 builtin/pull.c:145 builtin/pull.c:203 +#: builtin/repack.c:191 builtin/repack.c:195 builtin/repack.c:197 +#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:382 +#: parse-options.h:144 parse-options.h:146 parse-options.h:257 msgid "n" msgstr "n" -#: builtin/am.c:2232 builtin/branch.c:629 builtin/for-each-ref.c:38 -#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39 +#: builtin/am.c:2266 builtin/branch.c:629 builtin/for-each-ref.c:38 +#: builtin/replace.c:445 builtin/tag.c:418 builtin/verify-tag.c:39 msgid "format" msgstr "formato" -#: builtin/am.c:2233 +#: builtin/am.c:2267 msgid "format the patch(es) are in" msgstr "formatear el parche(s)" -#: builtin/am.c:2239 +#: builtin/am.c:2273 msgid "override error message when patch failure occurs" msgstr "sobrescribir mensajes de error cuando fallos de parchado ocurran" -#: builtin/am.c:2241 +#: builtin/am.c:2275 msgid "continue applying patches after resolving a conflict" msgstr "continuar aplicando los parches tras resolver conflictos" -#: builtin/am.c:2244 +#: builtin/am.c:2278 msgid "synonyms for --continue" msgstr "sinónimos para --continue" -#: builtin/am.c:2247 +#: builtin/am.c:2281 msgid "skip the current patch" msgstr "saltar el parche actual" -#: builtin/am.c:2250 +#: builtin/am.c:2284 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:2254 +#: builtin/am.c:2287 +msgid "abort the patching operation but keep HEAD where it is." +msgstr "abortar la operación de parchado pero mantener HEAD donde está." + +#: builtin/am.c:2290 +msgid "show the patch being applied." +msgstr "muestra el parche siendo aplicado." + +#: builtin/am.c:2294 msgid "lie about committer date" msgstr "mentir sobre la fecha del committer" -#: builtin/am.c:2256 +#: builtin/am.c:2296 msgid "use current timestamp for author date" msgstr "usar el timestamp actual para la fecha del autor" -#: builtin/am.c:2258 builtin/commit.c:1636 builtin/merge.c:236 -#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392 +#: builtin/am.c:2298 builtin/commit.c:1431 builtin/merge.c:237 +#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:398 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2259 +#: builtin/am.c:2299 msgid "GPG-sign commits" -msgstr "commits con firma GPG" +msgstr "Commits con firma GPG" -#: builtin/am.c:2262 +#: builtin/am.c:2302 msgid "(internal use for git-rebase)" msgstr "(uso interno para git-rebase)" -#: builtin/am.c:2280 +#: builtin/am.c:2320 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." @@ -5343,16 +5598,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:2287 +#: builtin/am.c:2327 msgid "failed to read the index" msgstr "fallo al leer el índice" -#: builtin/am.c:2302 +#: builtin/am.c:2342 #, 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:2326 +#: builtin/am.c:2366 #, c-format msgid "" "Stray %s directory found.\n" @@ -5361,7 +5616,7 @@ msgstr "" "Directorio extraviado %s encontrado.\n" "Use \"git am --abort\" para borrarlo." -#: builtin/am.c:2332 +#: builtin/am.c:2372 msgid "Resolve operation not in progress, we are not resuming." msgstr "Operación de resolución no está en progreso, no vamos a continuar." @@ -5383,8 +5638,8 @@ msgid "git archive: Remote with no URL" msgstr "git archive: Remote sin URL" #: builtin/archive.c:58 -msgid "git archive: expected ACK/NAK, got EOF" -msgstr "git archive: se esperaba ACK/NAK, se obtuvo EOF" +msgid "git archive: expected ACK/NAK, got a flush packet" +msgstr "git archive: se esperaba ACK/NAK, se obtuvo flush packet" #: builtin/archive.c:61 #, c-format @@ -5414,7 +5669,7 @@ 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." +msgstr "'%s' no es un término válido" #: builtin/bisect--helper.c:50 #, c-format @@ -5470,107 +5725,107 @@ msgstr "git blame [<opciones>] [<opciones-rev>] [<revision>] [--] <archivo>" msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<rev-opts> están documentadas en git-rev-list(1)" -#: builtin/blame.c:668 +#: builtin/blame.c:677 msgid "Show blame entries as we find them, incrementally" msgstr "Mostrar las entradas blame como las encontramos, incrementalmente" -#: builtin/blame.c:669 +#: builtin/blame.c:678 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Mostrar SHA-1 en blanco para commits extremos (Default: off)" -#: builtin/blame.c:670 +#: builtin/blame.c:679 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "No tratar commits raíces como extremos (Default: off)" -#: builtin/blame.c:671 +#: builtin/blame.c:680 msgid "Show work cost statistics" msgstr "Mostrar estadísticas de costo de trabajo" -#: builtin/blame.c:672 +#: builtin/blame.c:681 msgid "Force progress reporting" msgstr "Forzar el reporte de progreso" -#: builtin/blame.c:673 +#: builtin/blame.c:682 msgid "Show output score for blame entries" msgstr "Mostrar la puntuación de salida de las entradas de blame" -#: builtin/blame.c:674 +#: builtin/blame.c:683 msgid "Show original filename (Default: auto)" msgstr "Mostrar nombre original del archivo (Default: auto)" -#: builtin/blame.c:675 +#: builtin/blame.c:684 msgid "Show original linenumber (Default: off)" msgstr "Mostrar número de línea original (Default: off)" -#: builtin/blame.c:676 +#: builtin/blame.c:685 msgid "Show in a format designed for machine consumption" msgstr "Mostrar en un formato diseñado para consumo de máquina" -#: builtin/blame.c:677 +#: builtin/blame.c:686 msgid "Show porcelain format with per-line commit information" msgstr "Mostrar en formato porcelana con información de commit por línea" -#: builtin/blame.c:678 +#: builtin/blame.c:687 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "Usar el mismo modo salida como git-annotate (Default: off)" -#: builtin/blame.c:679 +#: builtin/blame.c:688 msgid "Show raw timestamp (Default: off)" msgstr "Mostrar timestamp en formato raw (Default: off)" -#: builtin/blame.c:680 +#: builtin/blame.c:689 msgid "Show long commit SHA1 (Default: off)" msgstr "Mostrar SHA1 del commit en formato largo (Default: off)" -#: builtin/blame.c:681 +#: builtin/blame.c:690 msgid "Suppress author name and timestamp (Default: off)" msgstr "Suprimir nombre del autor y timestamp (Default: off)" -#: builtin/blame.c:682 +#: builtin/blame.c:691 msgid "Show author email instead of name (Default: off)" msgstr "Mostrar en cambio el email del autor (Default: off)" -#: builtin/blame.c:683 +#: builtin/blame.c:692 msgid "Ignore whitespace differences" msgstr "Ignorar diferencias de espacios en blanco" -#: builtin/blame.c:690 +#: builtin/blame.c:699 msgid "Use an experimental heuristic to improve diffs" msgstr "Usar un heurístico experimental para mejorar los diffs" -#: builtin/blame.c:692 +#: builtin/blame.c:701 msgid "Spend extra cycles to find better match" msgstr "Ocupo más ciclos para encontrar mejoras resultados" -#: builtin/blame.c:693 +#: builtin/blame.c:702 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Use revisiones desde <archivo> en lugar de llamar git-rev-list" -#: builtin/blame.c:694 +#: builtin/blame.c:703 msgid "Use <file>'s contents as the final image" msgstr "Usar contenido de <archivo> como imagen final" -#: builtin/blame.c:695 builtin/blame.c:696 +#: builtin/blame.c:704 builtin/blame.c:705 msgid "score" msgstr "puntaje" -#: builtin/blame.c:695 +#: builtin/blame.c:704 msgid "Find line copies within and across files" msgstr "Encontrar copias de líneas entre y a través de archivos" -#: builtin/blame.c:696 +#: builtin/blame.c:705 msgid "Find line movements within and across files" msgstr "Encontrar movimientos de líneas entre y a través de archivos" -#: builtin/blame.c:697 +#: builtin/blame.c:706 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:697 +#: builtin/blame.c:706 msgid "Process only line range n,m, counting from 1" msgstr "Procesar solo el rango de líneas n,m, contando desde 1" -#: builtin/blame.c:744 +#: builtin/blame.c:753 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "--progress no puede ser usado con --incremental o formatos porcelana" @@ -5582,18 +5837,18 @@ msgstr "--progress no puede ser usado con --incremental o formatos porcelana" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:795 +#: builtin/blame.c:804 msgid "4 years, 11 months ago" msgstr "hace 4 años, 11 meses" -#: builtin/blame.c:882 +#: builtin/blame.c:890 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "archivo %s tiene solo %lu línea" msgstr[1] "archivo %s tiene solo %lu líneas" -#: builtin/blame.c:928 +#: builtin/blame.c:936 msgid "Blaming lines" msgstr "Blaming a líneas" @@ -5742,7 +5997,7 @@ msgstr "Copiado de rama fallido" #: builtin/branch.c:517 #, c-format msgid "Created a copy of a misnamed branch '%s'" -msgstr "Copia creada de la rama malnombrada '%s' " +msgstr "Copia creada de la rama malnombrada '%s'" #: builtin/branch.c:520 #, c-format @@ -5787,7 +6042,7 @@ msgstr "mostrar hash y tema, dar dos veces para rama upstream" #: builtin/branch.c:589 msgid "suppress informational messages" -msgstr "Suprimir mensajes informativos" +msgstr "suprimir mensajes informativos" #: builtin/branch.c:590 msgid "set up tracking mode (see git-pull(1))" @@ -5885,17 +6140,17 @@ msgstr "muestra solo ramas que no han sido fusionadas" msgid "list branches in columns" msgstr "muestra las ramas en columnas" -#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405 +#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:411 msgid "key" msgstr "clave" -#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406 +#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:412 msgid "field name to sort on" msgstr "nombre del campo por el cuál ordenar" #: 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 +#: builtin/tag.c:414 msgid "object" msgstr "objeto" @@ -5903,16 +6158,16 @@ msgstr "objeto" msgid "print only branches of the object" msgstr "imprimir sólo las ramas del objeto" -#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415 +#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:421 msgid "sorting and filtering are case insensitive" msgstr "ordenamiento y filtrado son case-insensitive" -#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413 +#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:419 #: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "formato para usar para el output" -#: builtin/branch.c:652 builtin/clone.c:730 +#: builtin/branch.c:652 builtin/clone.c:735 msgid "HEAD not found below refs/heads!" msgstr "HEAD no encontrado abajo de refs/heads!" @@ -5997,7 +6252,7 @@ msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." msgstr "" -"La opción --set-upstream ya no es soportada. Considere usar '--track' o '--" +"la opción '--set-upstream' ya no es soportada. Considere usar '--track' o '--" "set-upstream-to' en cambio." #: builtin/bundle.c:45 @@ -6013,7 +6268,7 @@ msgstr "Se necesita un repositorio para agrupar." msgid "Need a repository to unbundle." msgstr "Se necesita un repositorio para desagrupar." -#: builtin/cat-file.c:521 +#: builtin/cat-file.c:523 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -6021,7 +6276,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <tipo> | --textconv | --filters) [--path=<ruta>] <objeto>" -#: builtin/cat-file.c:522 +#: builtin/cat-file.c:524 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" @@ -6029,64 +6284,64 @@ msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:559 +#: builtin/cat-file.c:561 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<tipo> puede ser: blob, tree, commit, tag" -#: builtin/cat-file.c:560 +#: builtin/cat-file.c:562 msgid "show object type" msgstr "mostrar el tipo del objeto" -#: builtin/cat-file.c:561 +#: builtin/cat-file.c:563 msgid "show object size" msgstr "mostrar el tamaño del objeto" -#: builtin/cat-file.c:563 +#: builtin/cat-file.c:565 msgid "exit with zero when there's no error" msgstr "salir con cero cuando no haya error" -#: builtin/cat-file.c:564 +#: builtin/cat-file.c:566 msgid "pretty-print object's content" msgstr "realizar pretty-print del contenido del objeto" -#: builtin/cat-file.c:566 +#: builtin/cat-file.c:568 msgid "for blob objects, run textconv on object's content" msgstr "para objetos blob, ejecuta textconv en el contenido del objeto" -#: builtin/cat-file.c:568 +#: builtin/cat-file.c:570 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:931 +#: builtin/cat-file.c:571 git-submodule.sh:878 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:570 +#: builtin/cat-file.c:572 msgid "use a specific path for --textconv/--filters" msgstr "use una ruta específica para --textconv/--filters" -#: builtin/cat-file.c:572 +#: builtin/cat-file.c:574 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "permita -s y -t para trabajar con objetos rotos o corruptos" -#: builtin/cat-file.c:573 +#: builtin/cat-file.c:575 msgid "buffer --batch output" -msgstr "salida buffer --batch " +msgstr "salida buffer --batch" -#: builtin/cat-file.c:575 +#: builtin/cat-file.c:577 msgid "show info and content of objects fed from the standard input" msgstr "mostrar info y content de los objetos alimentados por standard input" -#: builtin/cat-file.c:578 +#: builtin/cat-file.c:580 msgid "show info about objects fed from the standard input" msgstr "mostrar info de los objetos alimentados por standard input" -#: builtin/cat-file.c:581 +#: builtin/cat-file.c:583 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "seguir los enlaces simbólicos en el árbol (usado con --batch o --batch-check)" -#: builtin/cat-file.c:583 +#: builtin/cat-file.c:585 msgid "show all objects with --batch or --batch-check" msgstr "mostrar todos los objetos con --batch o --batch-check" @@ -6106,7 +6361,7 @@ msgstr "reportar todos los atributos configurados en el archivo" msgid "use .gitattributes only from the index" msgstr "use .gitattributes solo desde el índice" -#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99 +#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:100 msgid "read file names from stdin" msgstr "leer nombres de archivos de stdin" @@ -6114,7 +6369,7 @@ msgstr "leer nombres de archivos de stdin" msgid "terminate input and output records by a NUL character" msgstr "terminar registros de entrada y salida con un carácter NUL" -#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358 +#: builtin/check-ignore.c:20 builtin/checkout.c:1106 builtin/gc.c:358 msgid "suppress progress reporting" msgstr "suprimir el reporte de progreso" @@ -6126,27 +6381,27 @@ msgstr "mostrar rutas de entrada que no concuerdan" msgid "ignore index when checking" msgstr "ignorar el índice cuando se revise" -#: builtin/check-ignore.c:158 +#: builtin/check-ignore.c:159 msgid "cannot specify pathnames with --stdin" msgstr "no se puede especificar los nombres de rutas con --stdin" -#: builtin/check-ignore.c:161 +#: builtin/check-ignore.c:162 msgid "-z only makes sense with --stdin" msgstr "-z sólo tiene sentido con --stdin" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:164 msgid "no path specified" msgstr "ruta no especificada" -#: builtin/check-ignore.c:167 +#: builtin/check-ignore.c:168 msgid "--quiet is only valid with a single pathname" msgstr "--quiet solo es válido con un nombre de ruta único" -#: builtin/check-ignore.c:169 +#: builtin/check-ignore.c:170 msgid "cannot have both --quiet and --verbose" msgstr "no se puede tener ambos --quiet y --verbose" -#: builtin/check-ignore.c:172 +#: builtin/check-ignore.c:173 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching sólo es válida con --verbose" @@ -6206,9 +6461,9 @@ msgid "write the content to temporary files" msgstr "escribir el contenido en un archivo temporal" #: 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 +#: builtin/submodule--helper.c:1203 builtin/submodule--helper.c:1206 +#: builtin/submodule--helper.c:1212 builtin/submodule--helper.c:1574 +#: builtin/worktree.c:570 msgid "string" msgstr "string" @@ -6253,80 +6508,80 @@ msgstr "ruta '%s' no tiene versiones necesarias" msgid "path '%s': cannot merge" msgstr "ruta '%s': no se puede fusionar" -#: builtin/checkout.c:232 +#: builtin/checkout.c:231 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Incapaz de agregar resultados de fusión a '%s'" -#: builtin/checkout.c:254 builtin/checkout.c:257 builtin/checkout.c:260 -#: builtin/checkout.c:263 +#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259 +#: builtin/checkout.c:262 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' no puede ser usada con rutas actualizadas" -#: builtin/checkout.c:266 builtin/checkout.c:269 +#: builtin/checkout.c:265 builtin/checkout.c:268 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' no puede ser usado con %s" -#: builtin/checkout.c:272 +#: builtin/checkout.c:271 #, 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." +msgstr "No se puede actualizar rutas y cambiar a la rama '%s' al mismo tiempo." -#: builtin/checkout.c:341 builtin/checkout.c:348 +#: builtin/checkout.c:340 builtin/checkout.c:347 #, c-format msgid "path '%s' is unmerged" msgstr "ruta '%s' no esta fusionada" -#: builtin/checkout.c:506 +#: builtin/checkout.c:505 msgid "you need to resolve your current index first" msgstr "necesita resolver su índice actual primero" -#: builtin/checkout.c:637 +#: builtin/checkout.c:636 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "No se puede hacer reflog para '%s': %s\n" -#: builtin/checkout.c:678 +#: builtin/checkout.c:677 msgid "HEAD is now at" msgstr "HEAD está ahora en" -#: builtin/checkout.c:682 builtin/clone.c:684 +#: builtin/checkout.c:681 builtin/clone.c:689 msgid "unable to update HEAD" msgstr "no es posible actualizar HEAD" -#: builtin/checkout.c:686 +#: builtin/checkout.c:685 #, c-format msgid "Reset branch '%s'\n" msgstr "Reiniciar rama '%s'\n" -#: builtin/checkout.c:689 +#: builtin/checkout.c:688 #, c-format msgid "Already on '%s'\n" msgstr "Ya en '%s'\n" -#: builtin/checkout.c:693 +#: builtin/checkout.c:692 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Rama reiniciada y cambiada a '%s'\n" -#: builtin/checkout.c:695 builtin/checkout.c:1051 +#: builtin/checkout.c:694 builtin/checkout.c:1039 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Cambiado a nueva rama '%s'\n" -#: builtin/checkout.c:697 +#: builtin/checkout.c:696 #, c-format msgid "Switched to branch '%s'\n" msgstr "Cambiado a rama '%s'\n" -#: builtin/checkout.c:748 +#: builtin/checkout.c:747 #, c-format msgid " ... and %d more.\n" msgstr " ... y %d más.\n" -#: builtin/checkout.c:754 +#: builtin/checkout.c:753 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -6349,7 +6604,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:773 +#: builtin/checkout.c:772 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -6376,160 +6631,160 @@ msgstr[1] "" " git branch <nombre-de-rama> %s\n" "\n" -#: builtin/checkout.c:814 +#: builtin/checkout.c:804 msgid "internal error in revision walk" msgstr "error interno en camino de revisión" -#: builtin/checkout.c:818 +#: builtin/checkout.c:808 msgid "Previous HEAD position was" msgstr "La posición previa de HEAD era" -#: builtin/checkout.c:848 builtin/checkout.c:1046 +#: builtin/checkout.c:836 builtin/checkout.c:1034 msgid "You are on a branch yet to be born" msgstr "Estás en una rama por nacer" -#: builtin/checkout.c:952 +#: builtin/checkout.c:940 #, c-format msgid "only one reference expected, %d given." msgstr "solo una referencia esperada, %d entregadas." -#: builtin/checkout.c:992 builtin/worktree.c:247 +#: builtin/checkout.c:980 builtin/worktree.c:249 #, c-format msgid "invalid reference: %s" msgstr "referencia invalida: %s" -#: builtin/checkout.c:1021 +#: builtin/checkout.c:1009 #, c-format msgid "reference is not a tree: %s" msgstr "la referencia no es n árbol: %s" -#: builtin/checkout.c:1060 +#: builtin/checkout.c:1048 msgid "paths cannot be used with switching branches" msgstr "rutas no pueden ser usadas con cambios de rama" -#: builtin/checkout.c:1063 builtin/checkout.c:1067 +#: builtin/checkout.c:1051 builtin/checkout.c:1055 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' no puede ser usado con cambios de ramas" -#: builtin/checkout.c:1071 builtin/checkout.c:1074 builtin/checkout.c:1079 -#: builtin/checkout.c:1082 +#: builtin/checkout.c:1059 builtin/checkout.c:1062 builtin/checkout.c:1067 +#: builtin/checkout.c:1070 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' no puede ser usado con '%s'" -#: builtin/checkout.c:1087 +#: builtin/checkout.c:1075 #, 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: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 +#: builtin/checkout.c:1107 builtin/checkout.c:1109 builtin/clone.c:116 +#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:387 +#: builtin/worktree.c:389 msgid "branch" msgstr "rama" -#: builtin/checkout.c:1120 +#: builtin/checkout.c:1108 msgid "create and checkout a new branch" msgstr "crear y hacer checkout a una nueva rama" -#: builtin/checkout.c:1122 +#: builtin/checkout.c:1110 msgid "create/reset and checkout a branch" msgstr "crear/reiniciar y hacer checkout a una rama" -#: builtin/checkout.c:1123 +#: builtin/checkout.c:1111 msgid "create reflog for new branch" msgstr "crear un reflog para una nueva rama" -#: builtin/checkout.c:1124 builtin/worktree.c:373 +#: builtin/checkout.c:1112 builtin/worktree.c:391 msgid "detach HEAD at named commit" msgstr "desacoplar HEAD en el commit nombrado" -#: builtin/checkout.c:1125 +#: builtin/checkout.c:1113 msgid "set upstream info for new branch" msgstr "configurar info de upstream para una rama nueva" -#: builtin/checkout.c:1127 +#: builtin/checkout.c:1115 msgid "new-branch" msgstr "nueva-rama" -#: builtin/checkout.c:1127 +#: builtin/checkout.c:1115 msgid "new unparented branch" msgstr "nueva rama no emparentada" -#: builtin/checkout.c:1128 +#: builtin/checkout.c:1116 msgid "checkout our version for unmerged files" msgstr "hacer checkout a nuestra versión para archivos sin fusionar" -#: builtin/checkout.c:1130 +#: builtin/checkout.c:1118 msgid "checkout their version for unmerged files" msgstr "hacer checkout a su versión para los archivos sin fusionar" -#: builtin/checkout.c:1132 +#: builtin/checkout.c:1120 msgid "force checkout (throw away local modifications)" msgstr "forzar el checkout (descartar modificaciones locales)" -#: builtin/checkout.c:1133 +#: builtin/checkout.c:1122 msgid "perform a 3-way merge with the new branch" msgstr "realizar una fusión de tres vías con la rama nueva" -#: builtin/checkout.c:1134 builtin/merge.c:238 +#: builtin/checkout.c:1124 builtin/merge.c:239 msgid "update ignored files (default)" msgstr "actualizar archivos ignorados (default)" -#: builtin/checkout.c:1135 builtin/log.c:1496 parse-options.h:251 +#: builtin/checkout.c:1126 builtin/log.c:1499 parse-options.h:263 msgid "style" msgstr "estilo" -#: builtin/checkout.c:1136 +#: builtin/checkout.c:1127 msgid "conflict style (merge or diff3)" msgstr "conflicto de estilos (merge o diff3)" -#: builtin/checkout.c:1139 +#: builtin/checkout.c:1130 msgid "do not limit pathspecs to sparse entries only" msgstr "no limitar pathspecs a dispersar entradas solamente" -#: builtin/checkout.c:1141 +#: builtin/checkout.c:1132 msgid "second guess 'git checkout <no-such-branch>'" msgstr "segunda opción 'git checkout <no-hay-tal-rama>'" -#: builtin/checkout.c:1143 +#: builtin/checkout.c:1134 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:1147 builtin/clone.c:81 builtin/fetch.c:137 -#: builtin/merge.c:235 builtin/pull.c:123 builtin/push.c:556 +#: builtin/checkout.c:1138 builtin/clone.c:83 builtin/fetch.c:150 +#: builtin/merge.c:236 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:1177 +#: builtin/checkout.c:1168 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B y --orphan son mutuamente exclusivas" -#: builtin/checkout.c:1194 +#: builtin/checkout.c:1185 msgid "--track needs a branch name" msgstr "--track necesita el nombre de una rama" -#: builtin/checkout.c:1199 +#: builtin/checkout.c:1190 msgid "Missing branch name; try -b" msgstr "Falta nombre de rama; prueba -b" -#: builtin/checkout.c:1235 +#: builtin/checkout.c:1226 msgid "invalid path specification" -msgstr "Especificación de ruta invalida" +msgstr "especificación de ruta invalida" -#: builtin/checkout.c:1242 +#: builtin/checkout.c:1233 #, 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:1246 +#: builtin/checkout.c:1237 #, 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:1250 +#: builtin/checkout.c:1241 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -6628,7 +6883,7 @@ msgstr "Seleccionar objetos para borrar" msgid "Remove %s [y/N]? " msgstr "Borrar %s [y/N]? " -#: builtin/clean.c:788 git-add--interactive.perl:1616 +#: builtin/clean.c:788 git-add--interactive.perl:1710 #, c-format msgid "Bye.\n" msgstr "Adiós.\n" @@ -6651,18 +6906,18 @@ msgstr "" "help - esta ventana\n" "? - ayuda para selección de opciones" -#: builtin/clean.c:823 git-add--interactive.perl:1692 +#: builtin/clean.c:823 git-add--interactive.perl:1786 msgid "*** Commands ***" msgstr "*** Comandos ***" -#: builtin/clean.c:824 git-add--interactive.perl:1689 +#: builtin/clean.c:824 git-add--interactive.perl:1783 msgid "What now" msgstr "Ahora que" #: builtin/clean.c:832 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" -msgstr[0] "Se removerá el siguiente objeto" +msgstr[0] "Se removerá el siguiente objeto:" msgstr[1] "Se removerán los siguientes objetos:" #: builtin/clean.c:848 @@ -6685,8 +6940,8 @@ msgstr "limpieza interactiva" msgid "remove whole directories" msgstr "borrar directorios completos" -#: 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/clean.c:916 builtin/describe.c:533 builtin/describe.c:535 +#: builtin/grep.c:871 builtin/log.c:157 builtin/log.c:159 #: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399 #: builtin/show-ref.c:176 msgid "pattern" @@ -6724,144 +6979,144 @@ msgstr "" "clean.requireForce default en true y ninguno -i, -n, ni -f entregados; " "rehusando el clean" -#: builtin/clone.c:39 +#: builtin/clone.c:40 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<opciones>] [--] <repo> [<directorio>]" -#: builtin/clone.c:83 +#: builtin/clone.c:85 msgid "don't create a checkout" msgstr "no crear checkout" -#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479 +#: builtin/clone.c:86 builtin/clone.c:88 builtin/init-db.c:479 msgid "create a bare repository" msgstr "crear un repositorio vacío" -#: builtin/clone.c:88 +#: builtin/clone.c:90 msgid "create a mirror repository (implies bare)" msgstr "crear un repositorio espejo (implica vacío)" -#: builtin/clone.c:90 +#: builtin/clone.c:92 msgid "to clone from a local repository" msgstr "clonar de un repositorio local" -#: builtin/clone.c:92 +#: builtin/clone.c:94 msgid "don't use local hardlinks, always copy" msgstr "no usar hardlinks, siempre copiar" -#: builtin/clone.c:94 +#: builtin/clone.c:96 msgid "setup as shared repository" msgstr "configurar como repositorio compartido" -#: builtin/clone.c:96 builtin/clone.c:100 +#: builtin/clone.c:98 builtin/clone.c:102 msgid "pathspec" msgstr "pathspec" -#: builtin/clone.c:96 builtin/clone.c:100 +#: builtin/clone.c:98 builtin/clone.c:102 msgid "initialize submodules in the clone" msgstr "inicializar submódulos en el clonado" -#: builtin/clone.c:103 +#: builtin/clone.c:105 msgid "number of submodules cloned in parallel" msgstr "numero de submódulos clonados en paralelo" -#: builtin/clone.c:104 builtin/init-db.c:476 +#: builtin/clone.c:106 builtin/init-db.c:476 msgid "template-directory" msgstr "directorio-template" -#: builtin/clone.c:105 builtin/init-db.c:477 +#: builtin/clone.c:107 builtin/init-db.c:477 msgid "directory from which templates will be used" msgstr "directorio del cual los templates serán usados" -#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:873 -#: builtin/submodule--helper.c:1240 +#: builtin/clone.c:109 builtin/clone.c:111 builtin/submodule--helper.c:1210 +#: builtin/submodule--helper.c:1577 msgid "reference repository" msgstr "repositorio de referencia" -#: builtin/clone.c:111 +#: builtin/clone.c:113 msgid "use --reference only while cloning" msgstr "usa--reference solamente si estas clonado" -#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44 +#: builtin/clone.c:114 builtin/column.c:27 builtin/merge-file.c:44 msgid "name" msgstr "nombre" -#: builtin/clone.c:113 +#: builtin/clone.c:115 msgid "use <name> instead of 'origin' to track upstream" msgstr "use <nombre> en lugar de 'origin' para rastrear upstream" -#: builtin/clone.c:115 +#: builtin/clone.c:117 msgid "checkout <branch> instead of the remote's HEAD" msgstr "checkout <rama> en lugar de HEAD remota" -#: builtin/clone.c:117 +#: builtin/clone.c:119 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:138 builtin/grep.c:806 +#: builtin/clone.c:120 builtin/fetch.c:151 builtin/grep.c:813 #: builtin/pull.c:211 msgid "depth" msgstr "profundidad" -#: builtin/clone.c:119 +#: builtin/clone.c:121 msgid "create a shallow clone of that depth" msgstr "crear un clon superficial para esa profundidad" -#: builtin/clone.c:120 builtin/fetch.c:140 builtin/pack-objects.c:2991 -#: parse-options.h:142 +#: builtin/clone.c:122 builtin/fetch.c:153 builtin/pack-objects.c:3017 +#: parse-options.h:154 msgid "time" msgstr "tiempo" -#: builtin/clone.c:121 +#: builtin/clone.c:123 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:142 +#: builtin/clone.c:124 builtin/fetch.c:155 msgid "revision" msgstr "revision" -#: builtin/clone.c:123 builtin/fetch.c:143 +#: builtin/clone.c:125 builtin/fetch.c:156 msgid "deepen history of shallow clone, excluding rev" msgstr "ahondando historia de clon superficial, excluyendo rev" -#: builtin/clone.c:125 +#: builtin/clone.c:127 msgid "clone only one branch, HEAD or --branch" msgstr "clonar solo una rama,HEAD o --branch" -#: builtin/clone.c:127 +#: builtin/clone.c:129 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "no clonar ningún tag, y hacer que los subsiguientes fetch no los sigan" -#: builtin/clone.c:129 +#: builtin/clone.c:131 msgid "any cloned submodules will be shallow" msgstr "cualquier submódulo clonado será superficial" -#: builtin/clone.c:130 builtin/init-db.c:485 +#: builtin/clone.c:132 builtin/init-db.c:485 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:131 builtin/init-db.c:486 +#: builtin/clone.c:133 builtin/init-db.c:486 msgid "separate git dir from working tree" msgstr "separa git dir del árbol de trabajo" -#: builtin/clone.c:132 +#: builtin/clone.c:134 msgid "key=value" msgstr "llave=valor" -#: builtin/clone.c:133 +#: builtin/clone.c:135 msgid "set config inside the new repository" msgstr "configurar config dentro del nuevo repositorio" -#: builtin/clone.c:134 builtin/fetch.c:160 builtin/pull.c:224 +#: builtin/clone.c:136 builtin/fetch.c:173 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:162 builtin/pull.c:227 +#: builtin/clone.c:138 builtin/fetch.c:175 builtin/pull.c:227 #: builtin/push.c:569 msgid "use IPv6 addresses only" msgstr "solo usar direcciones IPv6" -#: builtin/clone.c:273 +#: builtin/clone.c:276 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -6869,42 +7124,42 @@ msgstr "" "No se pudo adivinar ningún nombre de directorio.\n" "Por favor especifique un directorio en la línea de comando" -#: builtin/clone.c:326 +#: builtin/clone.c:329 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: No se pudo agregar un alterno para '%s': %s\n" -#: builtin/clone.c:398 +#: builtin/clone.c:401 #, c-format msgid "failed to open '%s'" msgstr "fallo al abrir '%s'" -#: builtin/clone.c:406 +#: builtin/clone.c:409 #, c-format msgid "%s exists and is not a directory" msgstr "%s existe pero no es un directorio" -#: builtin/clone.c:420 +#: builtin/clone.c:423 #, c-format msgid "failed to stat %s\n" msgstr "falló al analizar %s\n" -#: builtin/clone.c:442 +#: builtin/clone.c:445 #, c-format msgid "failed to create link '%s'" msgstr "fallo al crear link '%s'" -#: builtin/clone.c:446 +#: builtin/clone.c:449 #, c-format msgid "failed to copy file to '%s'" msgstr "fallo al copiar archivo a '%s'" -#: builtin/clone.c:472 +#: builtin/clone.c:475 #, c-format msgid "done.\n" msgstr "hecho.\n" -#: builtin/clone.c:484 +#: builtin/clone.c:489 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -6914,100 +7169,100 @@ 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:561 +#: builtin/clone.c:566 #, c-format msgid "Could not find remote branch %s to clone." -msgstr "No se pudo encontrar la rama remota %s para clonar" +msgstr "No se pudo encontrar la rama remota %s para clonar." -#: builtin/clone.c:656 +#: builtin/clone.c:661 msgid "remote did not send all necessary objects" msgstr "remoto no mando todos los objetos necesarios" -#: builtin/clone.c:672 +#: builtin/clone.c:677 #, c-format msgid "unable to update %s" msgstr "incapaz de actualizar %s" -#: builtin/clone.c:721 +#: builtin/clone.c:726 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" +"remoto HEAD refiere a un ref inexistente, no se puede hacer checkout.\n" -#: builtin/clone.c:751 +#: builtin/clone.c:756 msgid "unable to checkout working tree" msgstr "no es posible realizar checkout en el árbol de trabajo" -#: builtin/clone.c:796 +#: builtin/clone.c:801 msgid "unable to write parameters to config file" msgstr "no es posible escribir parámetros al archivo config" -#: builtin/clone.c:859 +#: builtin/clone.c:864 msgid "cannot repack to clean up" msgstr "no se puede reempaquetar para limpiar" -#: builtin/clone.c:861 +#: builtin/clone.c:866 msgid "cannot unlink temporary alternates file" msgstr "no se puede desvincular archivos alternos temporales" -#: builtin/clone.c:894 builtin/receive-pack.c:1945 +#: builtin/clone.c:906 builtin/receive-pack.c:1946 msgid "Too many arguments." msgstr "Muchos argumentos." -#: builtin/clone.c:898 +#: builtin/clone.c:910 msgid "You must specify a repository to clone." -msgstr "Tienes que especificar un repositorio para clonar" +msgstr "Tienes que especificar un repositorio para clonar." -#: builtin/clone.c:911 +#: builtin/clone.c:923 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "Las opciones --bare y --origin %s son incompatibles." -#: builtin/clone.c:914 +#: builtin/clone.c:926 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare y --separate-git-dir son incompatibles." -#: builtin/clone.c:927 +#: builtin/clone.c:939 #, c-format msgid "repository '%s' does not exist" msgstr "repositorio '%s' no existe" -#: builtin/clone.c:933 builtin/fetch.c:1358 +#: builtin/clone.c:945 builtin/fetch.c:1455 #, c-format msgid "depth %s is not a positive number" msgstr "profundidad %s no es un numero positivo" -#: builtin/clone.c:943 +#: builtin/clone.c:955 #, c-format msgid "destination path '%s' already exists and is not an empty directory." -msgstr "la ruta de destino '%s' ya existe y no es un directorio vacío" +msgstr "la ruta de destino '%s' ya existe y no es un directorio vacío." -#: builtin/clone.c:953 +#: builtin/clone.c:965 #, c-format 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:253 builtin/worktree.c:283 +#: builtin/clone.c:980 builtin/clone.c:1001 builtin/difftool.c:270 +#: builtin/worktree.c:255 builtin/worktree.c:285 #, c-format msgid "could not create leading directories of '%s'" msgstr "no se pudo crear directorios principales de '%s'" -#: builtin/clone.c:971 +#: builtin/clone.c:985 #, c-format msgid "could not create work tree dir '%s'" msgstr "no se pudo crear un árbol de trabajo '%s'" -#: builtin/clone.c:983 +#: builtin/clone.c:1005 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clonando en un repositorio vacío '%s'...\n" -#: builtin/clone.c:985 +#: builtin/clone.c:1007 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clonando en '%s'...\n" -#: builtin/clone.c:1009 +#: builtin/clone.c:1031 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -7015,32 +7270,36 @@ msgstr "" "clone --recursive no es compatible con --reference y --reference-if-able al " "mismo tiempo" -#: builtin/clone.c:1071 +#: builtin/clone.c:1093 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth es ignorada en clonaciones locales; usa file:// más bien." -#: builtin/clone.c:1073 +#: builtin/clone.c:1095 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "--shallow-since es ignorado en el clon local; use file:// ." -#: builtin/clone.c:1075 +#: builtin/clone.c:1097 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "--shallow-exclude es ignorado en clones locales; use file://." -#: builtin/clone.c:1078 +#: builtin/clone.c:1099 +msgid "--filter is ignored in local clones; use file:// instead." +msgstr "--filter es ignorado en clones locales; usa file:// en su lugar." + +#: builtin/clone.c:1102 msgid "source repository is shallow, ignoring --local" msgstr "repositorio fuente es superficial, ignorando --local" -#: builtin/clone.c:1083 +#: builtin/clone.c:1107 msgid "--local is ignored" msgstr "--local es ignorado" -#: builtin/clone.c:1139 builtin/clone.c:1147 +#: builtin/clone.c:1169 builtin/clone.c:1177 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Rama remota %s no encontrada en upstream %s" -#: builtin/clone.c:1150 +#: builtin/clone.c:1180 msgid "You appear to have cloned an empty repository." msgstr "Pareces haber clonado un repositorio sin contenido." @@ -7050,7 +7309,7 @@ msgstr "git column [<opciones>]" #: builtin/column.c:27 msgid "lookup config vars" -msgstr "revisa las variables de configuraciones " +msgstr "revisa las variables de configuraciones" #: builtin/column.c:28 builtin/column.c:29 msgid "layout to use" @@ -7076,66 +7335,15 @@ msgstr "Realizando padding entre columnas" msgid "--command must be the first argument" msgstr "--command debe ser el primer argumento" -#: builtin/commit.c:39 +#: builtin/commit.c:37 msgid "git commit [<options>] [--] <pathspec>..." msgstr "git commit [<opciones>] [--] <especificación-de-ruta>..." -#: builtin/commit.c:44 +#: builtin/commit.c:42 msgid "git status [<options>] [--] <pathspec>..." msgstr "git status [<opciones>] [--] <especificación-de-ruta>..." -#: builtin/commit.c:49 -msgid "" -"Your name and email address were configured automatically based\n" -"on your username and hostname. Please check that they are accurate.\n" -"You can suppress this message by setting them explicitly. Run the\n" -"following command and follow the instructions in your editor to edit\n" -"your configuration file:\n" -"\n" -" git config --global --edit\n" -"\n" -"After doing this, you may fix the identity used for this commit with:\n" -"\n" -" git commit --amend --reset-author\n" -msgstr "" -"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 configurándolos de forma explicita. Ejecuta " -"el \n" -"siguiente comando y sigue las instrucciones de tu editor\n" -" para modificar tu archivo de configuración:\n" -"\n" -" git config --global --edit\n" -"\n" -"Tras hacer esto, puedes arreglar la identidad usada para este commit con:\n" -"\n" -" git commit --amend --reset-author\n" - -#: builtin/commit.c:62 -msgid "" -"Your name and email address were configured automatically based\n" -"on your username and hostname. Please check that they are accurate.\n" -"You can suppress this message by setting them explicitly:\n" -"\n" -" git config --global user.name \"Your Name\"\n" -" git config --global user.email you@example.com\n" -"\n" -"After doing this, you may fix the identity used for this commit with:\n" -"\n" -" git commit --amend --reset-author\n" -msgstr "" -"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 configurándolos de forma explicita: \n" -"\n" -" git config --global user.name \"Tu nombre\"\n" -" git config --global user.email you@example.com\n" -"\n" -"Tras hacer esto, puedes arreglar tu identidad para este commit con:\n" -"\n" -" git commit --amend --reset-author\n" - -#: builtin/commit.c:74 +#: builtin/commit.c:47 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" @@ -7145,7 +7353,7 @@ msgstr "" "vaciaría. Puedes repetir el comando con --alow-empty, o puedes remover \n" "el commit completamente con \"git reset HEAD^\".\n" -#: builtin/commit.c:79 +#: builtin/commit.c:52 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -7160,11 +7368,11 @@ msgstr "" " git commit --allow-empty\n" "\n" -#: builtin/commit.c:86 +#: builtin/commit.c:59 msgid "Otherwise, please use 'git reset'\n" msgstr "Caso contrario, por favor usa 'git reset'\n" -#: builtin/commit.c:89 +#: builtin/commit.c:62 msgid "" "If you wish to skip this commit, use:\n" "\n" @@ -7180,61 +7388,61 @@ msgstr "" "Luego \"git cherry-pick --continue\" continuara el cherry-picking\n" "para los commits restantes.\n" -#: builtin/commit.c:318 +#: builtin/commit.c:284 msgid "failed to unpack HEAD tree object" msgstr "fallo al desempaquetar objeto del árbol HEAD" -#: builtin/commit.c:359 +#: builtin/commit.c:325 msgid "unable to create temporary index" msgstr "no es posible crear un índice temporal" -#: builtin/commit.c:365 +#: builtin/commit.c:331 msgid "interactive add failed" msgstr "adición interactiva fallida" -#: builtin/commit.c:378 +#: builtin/commit.c:344 msgid "unable to update temporary index" msgstr "no es posible actualizar el índice temporal" -#: builtin/commit.c:380 +#: builtin/commit.c:346 msgid "Failed to update main cache tree" msgstr "Fallo al actualizar el cache principal del árbol" -#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478 +#: builtin/commit.c:371 builtin/commit.c:395 builtin/commit.c:444 msgid "unable to write new_index file" msgstr "no es posible escribir archivo new_index" -#: builtin/commit.c:461 +#: builtin/commit.c:427 msgid "cannot do a partial commit during a merge." msgstr "no se puede realizar un commit parcial durante una fusión." -#: builtin/commit.c:463 +#: builtin/commit.c:429 msgid "cannot do a partial commit during a cherry-pick." msgstr "no se puede realizar un commit parcial durante un cherry-pick." -#: builtin/commit.c:471 +#: builtin/commit.c:437 msgid "cannot read the index" -msgstr "no se puede leer el índice." +msgstr "no se puede leer el índice" -#: builtin/commit.c:490 +#: builtin/commit.c:456 msgid "unable to write temporary index file" -msgstr "no es posible escribir el índice temporal " +msgstr "no es posible escribir el índice temporal" -#: builtin/commit.c:587 +#: builtin/commit.c:553 #, c-format msgid "commit '%s' lacks author header" -msgstr "falta header de autor al commit '%s'" +msgstr "commit '%s' requiere cabecera de autor" -#: builtin/commit.c:589 +#: builtin/commit.c:555 #, c-format msgid "commit '%s' has malformed author line" msgstr "el commit '%s' tiene una línea de autor mal formada" -#: builtin/commit.c:608 +#: builtin/commit.c:574 msgid "malformed --author parameter" msgstr "parámetro --author mal formado" -#: builtin/commit.c:660 +#: builtin/commit.c:626 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -7242,38 +7450,38 @@ msgstr "" "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:1114 +#: builtin/commit.c:663 builtin/commit.c:696 builtin/commit.c:1024 #, c-format msgid "could not lookup commit %s" msgstr "no se pudo revisar el commit %s" -#: builtin/commit.c:709 builtin/shortlog.c:309 +#: builtin/commit.c:675 builtin/shortlog.c:309 #, c-format msgid "(reading log message from standard input)\n" msgstr "(leyendo mensajes de logs desde standard input)\n" -#: builtin/commit.c:711 +#: builtin/commit.c:677 msgid "could not read log from standard input" msgstr "no se pudo leer log desde standard input" -#: builtin/commit.c:715 +#: builtin/commit.c:681 #, c-format msgid "could not read log file '%s'" msgstr "no se pudo leer el log '%s'" -#: builtin/commit.c:742 builtin/commit.c:750 +#: builtin/commit.c:710 builtin/commit.c:718 msgid "could not read SQUASH_MSG" msgstr "no se pudo leer SQUASH_MSG" -#: builtin/commit.c:747 +#: builtin/commit.c:715 msgid "could not read MERGE_MSG" msgstr "no se pudo leer MERGE_MSG" -#: builtin/commit.c:801 +#: builtin/commit.c:769 msgid "could not write commit template" msgstr "no se pudo escribir el template del commit" -#: builtin/commit.c:819 +#: builtin/commit.c:787 #, c-format msgid "" "\n" @@ -7288,7 +7496,7 @@ msgstr "" "\t%s\n" "y vuelve a intentar.\n" -#: builtin/commit.c:824 +#: builtin/commit.c:792 #, c-format msgid "" "\n" @@ -7303,7 +7511,7 @@ msgstr "" "\t%s\n" "y vuelva a intentar.\n" -#: builtin/commit.c:837 +#: builtin/commit.c:805 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -7313,7 +7521,7 @@ msgstr "" "comiencen\n" "con '%c' serán ignoradas, y un mensaje vacío aborta el commit.\n" -#: builtin/commit.c:844 +#: builtin/commit.c:813 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -7325,146 +7533,150 @@ msgstr "" "con '%c' serán guardadas; puede removerlas usted mismo si desea.\n" "Un mensaje vacío aborta el commit.\n" -#: builtin/commit.c:861 +#: builtin/commit.c:830 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutor: %.*s <%.*s>" -#: builtin/commit.c:869 +#: builtin/commit.c:838 #, c-format msgid "%sDate: %s" msgstr "%sFecha: %s" -#: builtin/commit.c:876 +#: builtin/commit.c:845 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sCommitter: %.*s <%.*s>" -#: builtin/commit.c:893 +#: builtin/commit.c:862 msgid "Cannot read index" msgstr "No se puede leer el índice" -#: builtin/commit.c:959 +#: builtin/commit.c:928 msgid "Error building trees" msgstr "Error al construir los árboles" -#: builtin/commit.c:973 builtin/tag.c:252 +#: builtin/commit.c:942 builtin/tag.c:256 #, 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:1076 +#: builtin/commit.c:986 #, 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:1000 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Modo ignorado inválido '%s'" -#: builtin/commit.c:1104 builtin/commit.c:1349 +#: builtin/commit.c:1014 builtin/commit.c:1264 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Modo inválido de los archivos no rastreados '%s'" -#: builtin/commit.c:1142 +#: builtin/commit.c:1052 msgid "--long and -z are incompatible" msgstr "--long y -z son incompatibles" -#: builtin/commit.c:1172 +#: builtin/commit.c:1085 msgid "Using both --reset-author and --author does not make sense" msgstr "Usar ambos --reset-author y --author no tiene sentido" -#: builtin/commit.c:1181 +#: builtin/commit.c:1094 msgid "You have nothing to amend." msgstr "No tienes nada que enmendar." -#: builtin/commit.c:1184 +#: builtin/commit.c:1097 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:1186 +#: builtin/commit.c:1099 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:1189 +#: builtin/commit.c:1102 msgid "Options --squash and --fixup cannot be used together" msgstr "Opciones --squash y --fixup no pueden ser usadas juntas" -#: builtin/commit.c:1199 +#: builtin/commit.c:1112 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Solo uno de -c/-C/-F/--fixup puede ser usado." -#: 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:1114 +msgid "Option -m cannot be combined with -c/-C/-F." +msgstr "La opción -m no puede ser combinada con -c/-C/-F." -#: builtin/commit.c:1209 +#: builtin/commit.c:1122 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:1226 +#: builtin/commit.c:1139 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:1228 +#: builtin/commit.c:1141 msgid "No paths with --include/--only does not make sense." msgstr "No hay rutas con --include/--only no tiene sentido." -#: builtin/commit.c:1240 builtin/tag.c:535 +#: builtin/commit.c:1155 builtin/tag.c:542 #, c-format msgid "Invalid cleanup mode %s" msgstr "Modo cleanup invalido %s" -#: builtin/commit.c:1245 +#: builtin/commit.c:1160 msgid "Paths with -a does not make sense." msgstr "Rutas con -a no tiene sentido." -#: builtin/commit.c:1363 builtin/commit.c:1648 +#: builtin/commit.c:1278 builtin/commit.c:1443 msgid "show status concisely" msgstr "mostrar status de manera concisa" -#: builtin/commit.c:1365 builtin/commit.c:1650 +#: builtin/commit.c:1280 builtin/commit.c:1445 msgid "show branch information" msgstr "mostrar información de la rama" -#: builtin/commit.c:1367 +#: builtin/commit.c:1282 msgid "show stash information" msgstr "mostrar información del stash" -#: builtin/commit.c:1369 +#: builtin/commit.c:1284 builtin/commit.c:1447 +msgid "compute full ahead/behind values" +msgstr "calcular todos los valores delante/atrás" + +#: builtin/commit.c:1286 msgid "version" msgstr "version" -#: builtin/commit.c:1369 builtin/commit.c:1652 builtin/push.c:542 -#: builtin/worktree.c:523 +#: builtin/commit.c:1286 builtin/commit.c:1449 builtin/push.c:542 +#: builtin/worktree.c:541 msgid "machine-readable output" msgstr "output formato-maquina" -#: builtin/commit.c:1372 builtin/commit.c:1654 +#: builtin/commit.c:1289 builtin/commit.c:1451 msgid "show status in long format (default)" msgstr "mostrar status en formato largo (default)" -#: builtin/commit.c:1375 builtin/commit.c:1657 +#: builtin/commit.c:1292 builtin/commit.c:1454 msgid "terminate entries with NUL" msgstr "terminar entradas con NUL" -#: 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 +#: builtin/commit.c:1294 builtin/commit.c:1298 builtin/commit.c:1457 +#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:396 msgid "mode" msgstr "modo" -#: builtin/commit.c:1378 builtin/commit.c:1660 +#: builtin/commit.c:1295 builtin/commit.c:1457 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:1382 +#: builtin/commit.c:1299 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -7472,11 +7684,11 @@ msgstr "" "mostrar archivos ignorados, modos opcionales: traditional, matching, no. " "(Predeterminado: traditional)" -#: builtin/commit.c:1384 parse-options.h:155 +#: builtin/commit.c:1301 parse-options.h:167 msgid "when" msgstr "cuando" -#: builtin/commit.c:1385 +#: builtin/commit.c:1302 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -7484,211 +7696,187 @@ msgstr "" "ignorar cambios en submódulos, opcional cuando: all,dirty,untracked. " "(Default: all)" -#: builtin/commit.c:1387 +#: builtin/commit.c:1304 msgid "list untracked files in columns" msgstr "listar en columnas los archivos sin seguimiento" -#: builtin/commit.c:1406 +#: builtin/commit.c:1323 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:1471 -msgid "could not parse newly created commit" -msgstr "no se pudo analizar el commit recién creado" - -#: 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:1521 -msgid " (root-commit)" -msgstr "(commit-raíz)" - -#: builtin/commit.c:1618 +#: builtin/commit.c:1413 msgid "suppress summary after successful commit" msgstr "suprime summary tras un commit exitoso" -#: builtin/commit.c:1619 +#: builtin/commit.c:1414 msgid "show diff in commit message template" msgstr "mostrar diff en el template del mensaje de commit" -#: builtin/commit.c:1621 +#: builtin/commit.c:1416 msgid "Commit message options" msgstr "Opciones para el mensaje del commit" -#: builtin/commit.c:1622 builtin/tag.c:388 +#: builtin/commit.c:1417 builtin/tag.c:393 msgid "read message from file" msgstr "leer mensaje desde un archivo" -#: builtin/commit.c:1623 +#: builtin/commit.c:1418 msgid "author" msgstr "autor" -#: builtin/commit.c:1623 +#: builtin/commit.c:1418 msgid "override author for commit" msgstr "sobrescribe el autor del commit" -#: builtin/commit.c:1624 builtin/gc.c:359 +#: builtin/commit.c:1419 builtin/gc.c:359 msgid "date" msgstr "fecha" -#: builtin/commit.c:1624 +#: builtin/commit.c:1419 msgid "override date for commit" msgstr "sobrescribe la fecha del commit" -#: builtin/commit.c:1625 builtin/merge.c:225 builtin/notes.c:402 -#: builtin/notes.c:565 builtin/tag.c:386 +#: builtin/commit.c:1420 builtin/merge.c:226 builtin/notes.c:402 +#: builtin/notes.c:565 builtin/tag.c:391 msgid "message" msgstr "mensaje" -#: builtin/commit.c:1625 +#: builtin/commit.c:1420 msgid "commit message" msgstr "mensaje del commit" -#: builtin/commit.c:1626 builtin/commit.c:1627 builtin/commit.c:1628 -#: builtin/commit.c:1629 parse-options.h:257 ref-filter.h:92 +#: builtin/commit.c:1421 builtin/commit.c:1422 builtin/commit.c:1423 +#: builtin/commit.c:1424 parse-options.h:269 ref-filter.h:92 msgid "commit" msgstr "confirmar" -#: builtin/commit.c:1626 +#: builtin/commit.c:1421 msgid "reuse and edit message from specified commit" msgstr "reusar y editar el mensaje de un commit especifico" -#: builtin/commit.c:1627 +#: builtin/commit.c:1422 msgid "reuse message from specified commit" msgstr "reusar el mensaje de un commit especifico" -#: builtin/commit.c:1628 +#: builtin/commit.c:1423 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "usar mensaje de formato autosquash para arreglar el commit especificado" -#: builtin/commit.c:1629 +#: builtin/commit.c:1424 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:1630 +#: builtin/commit.c:1425 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:1631 builtin/log.c:1443 builtin/merge.c:239 +#: builtin/commit.c:1426 builtin/log.c:1446 builtin/merge.c:240 #: builtin/pull.c:149 builtin/revert.c:105 msgid "add Signed-off-by:" msgstr "agregar Signed-off-by: (firmado por)" -#: builtin/commit.c:1632 +#: builtin/commit.c:1427 msgid "use specified template file" msgstr "usar archivo de template especificado" -#: builtin/commit.c:1633 +#: builtin/commit.c:1428 msgid "force edit of commit" msgstr "forzar la edición del commit" -#: builtin/commit.c:1634 +#: builtin/commit.c:1429 msgid "default" msgstr "default" -#: builtin/commit.c:1634 builtin/tag.c:391 +#: builtin/commit.c:1429 builtin/tag.c:397 msgid "how to strip spaces and #comments from message" msgstr "cómo quitar espacios y #comentarios de mensajes" -#: builtin/commit.c:1635 +#: builtin/commit.c:1430 msgid "include status in commit message template" msgstr "incluir status en el template del mensaje de commit" -#: builtin/commit.c:1637 builtin/merge.c:237 builtin/pull.c:179 +#: builtin/commit.c:1432 builtin/merge.c:238 builtin/pull.c:179 #: builtin/revert.c:113 msgid "GPG sign commit" -msgstr "firmar commit con GPG" +msgstr "Firmar commit con GPG" -#: builtin/commit.c:1640 +#: builtin/commit.c:1435 msgid "Commit contents options" msgstr "Opciones para el contenido del commit" -#: builtin/commit.c:1641 +#: builtin/commit.c:1436 msgid "commit all changed files" msgstr "confirmar todos los archivos cambiados" -#: builtin/commit.c:1642 +#: builtin/commit.c:1437 msgid "add specified files to index for commit" msgstr "agregar archivos específicos al índice para confirmar" -#: builtin/commit.c:1643 +#: builtin/commit.c:1438 msgid "interactively add files" msgstr "agregar archivos interactivamente" -#: builtin/commit.c:1644 +#: builtin/commit.c:1439 msgid "interactively add changes" msgstr "agregar cambios interactivamente" -#: builtin/commit.c:1645 +#: builtin/commit.c:1440 msgid "commit only specified files" msgstr "sólo confirmar archivos específicos" -#: builtin/commit.c:1646 +#: builtin/commit.c:1441 msgid "bypass pre-commit and commit-msg hooks" msgstr "evitar los capturadores (hooks) de pre-commit y commit-msg" -#: builtin/commit.c:1647 +#: builtin/commit.c:1442 msgid "show what would be committed" msgstr "mostrar lo que sería incluido en el commit" -#: builtin/commit.c:1658 +#: builtin/commit.c:1455 msgid "amend previous commit" msgstr "enmendar commit previo" -#: builtin/commit.c:1659 +#: builtin/commit.c:1456 msgid "bypass post-rewrite hook" msgstr "gancho bypass post reescritura" -#: builtin/commit.c:1664 +#: builtin/commit.c:1461 msgid "ok to record an empty change" msgstr "ok al grabar un cambio vacío" -#: builtin/commit.c:1666 +#: builtin/commit.c:1463 msgid "ok to record a change with an empty message" msgstr "ok al grabar un cambio con un mensaje vacío" -#: builtin/commit.c:1696 -msgid "could not parse HEAD commit" -msgstr "no se pudo analizar el commit de HEAD" - -#: builtin/commit.c:1741 +#: builtin/commit.c:1536 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Archivo MERGE_HEAD (%s) corrupto" -#: builtin/commit.c:1748 +#: builtin/commit.c:1543 msgid "could not read MERGE_MODE" msgstr "no se pudo leer MERGE_MODE" -#: builtin/commit.c:1767 +#: builtin/commit.c:1562 #, c-format msgid "could not read commit message: %s" msgstr "no se pudo leer el mensaje de commit: %s" -#: builtin/commit.c:1778 +#: builtin/commit.c:1573 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Abortando commit debido que el mensaje está en blanco.\n" -#: builtin/commit.c:1783 +#: builtin/commit.c:1578 #, 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:1831 +#: builtin/commit.c:1613 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -7704,7 +7892,7 @@ msgstr "git config [<opciones>]" #: builtin/config.c:58 msgid "Config file location" -msgstr "ubicación del archivo config" +msgstr "Ubicación del archivo configuración" #: builtin/config.c:59 msgid "use global config file" @@ -7757,7 +7945,7 @@ msgstr "" #: builtin/config.c:70 msgid "add a new variable: name value" -msgstr "agregar nueva variable: nombre valor " +msgstr "agregar nueva variable: nombre valor" #: builtin/config.c:71 msgid "remove a variable: name [value-regex]" @@ -7821,7 +8009,7 @@ msgstr "Otro" #: builtin/config.c:86 msgid "terminate values with NUL byte" -msgstr "Terminar valores con un byte NUL" +msgstr "terminar valores con un byte NULL" #: builtin/config.c:87 msgid "show variable names only" @@ -7837,7 +8025,7 @@ msgstr "mostrar el origen de configuración (archivo, stdin, blob, comando)" #: builtin/config.c:335 msgid "unable to parse default color value" -msgstr "no es posible analizar el valor default de color " +msgstr "no es posible analizar el valor por defecto de color" #: builtin/config.c:479 #, c-format @@ -7908,29 +8096,29 @@ msgstr "tag anotado %s no disponible" #: builtin/describe.c:271 #, c-format msgid "annotated tag %s has no embedded name" -msgstr "tag anotado %s no tiene nombre embebido " +msgstr "tag anotado %s no tiene nombre embebido" #: builtin/describe.c:273 #, c-format msgid "tag '%s' is really '%s' here" msgstr "tag '%s' es realmente '%s' aquí" -#: builtin/describe.c:314 +#: builtin/describe.c:317 #, c-format msgid "no tag exactly matches '%s'" msgstr "no hay tag que concuerde exactamente con '%s'" -#: builtin/describe.c:316 +#: builtin/describe.c:319 #, c-format 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:363 +#: builtin/describe.c:366 #, c-format msgid "finished search at %s\n" msgstr "búsqueda finalizada a las %s\n" -#: builtin/describe.c:389 +#: builtin/describe.c:392 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -7939,7 +8127,7 @@ msgstr "" "No hay tags anotados que puedan describir '%s'.\n" "Sin embargo, hubieron tags no anotados: intente --tags." -#: builtin/describe.c:393 +#: builtin/describe.c:396 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -7948,12 +8136,12 @@ msgstr "" "Ningún tag puede describit '%s'.\n" "Intente --always, o cree algunos tags." -#: builtin/describe.c:423 +#: builtin/describe.c:426 #, c-format msgid "traversed %lu commits\n" msgstr "%lu commits cruzados\n" -#: builtin/describe.c:426 +#: builtin/describe.c:429 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -7962,90 +8150,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:494 +#: builtin/describe.c:497 #, c-format msgid "describe %s\n" msgstr "describe %s\n" -#: builtin/describe.c:497 builtin/log.c:500 +#: builtin/describe.c:500 builtin/log.c:502 #, c-format msgid "Not a valid object name %s" msgstr "Nombre de objeto %s no válido" -#: builtin/describe.c:505 +#: builtin/describe.c:508 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s no es un commit ni un blob" -#: builtin/describe.c:519 +#: builtin/describe.c:522 msgid "find the tag that comes after the commit" msgstr "encontrar el tag que viene después del commit" -#: builtin/describe.c:520 +#: builtin/describe.c:523 msgid "debug search strategy on stderr" msgstr "hacer debug a la estrategia de búsqueda en stderr" -#: builtin/describe.c:521 +#: builtin/describe.c:524 msgid "use any ref" msgstr "use cualquier ref" -#: builtin/describe.c:522 +#: builtin/describe.c:525 msgid "use any tag, even unannotated" msgstr "use cualquier tag, incluso los no anotados" -#: builtin/describe.c:523 +#: builtin/describe.c:526 msgid "always use long format" msgstr "siempre usar formato largo" -#: builtin/describe.c:524 +#: builtin/describe.c:527 msgid "only follow first parent" msgstr "solo seguir el primer patrón" -#: builtin/describe.c:527 +#: builtin/describe.c:530 msgid "only output exact matches" msgstr "solo mostrar concordancias exactas" -#: builtin/describe.c:529 +#: builtin/describe.c:532 msgid "consider <n> most recent tags (default: 10)" msgstr "considerar <n> tags más recientes (default:10)" -#: builtin/describe.c:531 +#: builtin/describe.c:534 msgid "only consider tags matching <pattern>" msgstr "solo considerar tags que concuerden con <patrón>" -#: builtin/describe.c:533 +#: builtin/describe.c:536 msgid "do not consider tags matching <pattern>" msgstr "no considerar tags que concuerden con <patrón>" -#: builtin/describe.c:535 builtin/name-rev.c:406 +#: builtin/describe.c:538 builtin/name-rev.c:406 msgid "show abbreviated commit object as fallback" msgstr "mostrar el objeto commit abreviado como fallback" -#: builtin/describe.c:536 builtin/describe.c:539 +#: builtin/describe.c:539 builtin/describe.c:542 msgid "mark" msgstr "marca" -#: builtin/describe.c:537 +#: builtin/describe.c:540 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "adjuntar <marca> en el árbol de trabajo sucio (default: \"-dirty\")" -#: builtin/describe.c:540 +#: builtin/describe.c:543 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "adjuntar <marca> en un árbol de trabajo roto (default: \"-broken\")" -#: builtin/describe.c:558 +#: builtin/describe.c:561 msgid "--long is incompatible with --abbrev=0" msgstr "--long es incompatible con --abbrev=0" -#: builtin/describe.c:587 +#: builtin/describe.c:590 msgid "No names found, cannot describe anything." msgstr "No se encontraron nombres, no se puede describir nada." -#: builtin/describe.c:637 +#: builtin/describe.c:640 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty es incompatible con commit-ismos" -#: builtin/describe.c:639 +#: builtin/describe.c:642 msgid "--broken is incompatible with commit-ishes" msgstr "--broken es incompatible con commit-ismos" @@ -8066,7 +8254,7 @@ msgstr "No es un repositorio git" #: builtin/diff.c:399 #, c-format msgid "invalid object '%s' given." -msgstr "objeto '%s' entregado no es válido" +msgstr "objeto '%s' entregado no es válido." #: builtin/diff.c:408 #, c-format @@ -8233,95 +8421,101 @@ msgstr "Aplicar refspec para los refs exportados" msgid "anonymize output" msgstr "anonimizar la salida" -#: builtin/fetch.c:24 +#: builtin/fetch.c:25 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<opciones>] [<repositorio> [<refspec>...]]" -#: builtin/fetch.c:25 +#: builtin/fetch.c:26 msgid "git fetch [<options>] <group>" msgstr "git fetch [<opciones>] <grupo>" -#: builtin/fetch.c:26 +#: builtin/fetch.c:27 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<opciones>] [(<repositorio> | <grupo>)...]" -#: builtin/fetch.c:27 +#: builtin/fetch.c:28 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<opciones>]" -#: builtin/fetch.c:113 builtin/pull.c:188 +#: builtin/fetch.c:124 builtin/pull.c:188 msgid "fetch from all remotes" msgstr "extraer de todos los remotos" -#: builtin/fetch.c:115 builtin/pull.c:191 +#: builtin/fetch.c:126 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:117 builtin/pull.c:194 +#: builtin/fetch.c:128 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:118 builtin/pull.c:196 +#: builtin/fetch.c:129 builtin/pull.c:196 msgid "force overwrite of local branch" msgstr "forzar sobrescritura de la rama local" -#: builtin/fetch.c:120 +#: builtin/fetch.c:131 msgid "fetch from multiple remotes" msgstr "extraer de múltiples remotos" -#: builtin/fetch.c:122 builtin/pull.c:198 +#: builtin/fetch.c:133 builtin/pull.c:198 msgid "fetch all tags and associated objects" msgstr "extraer todos los tags y objetos asociados" -#: builtin/fetch.c:124 +#: builtin/fetch.c:135 msgid "do not fetch all tags (--no-tags)" msgstr "no extraer todos los tags (--no-tags)" -#: builtin/fetch.c:126 +#: builtin/fetch.c:137 msgid "number of submodules fetched in parallel" msgstr "número de submódulos extraídos en paralelo" -#: builtin/fetch.c:128 builtin/pull.c:201 +#: builtin/fetch.c:139 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" +msgstr "limpiar ramas remotas rastreadas que ya no están en el remoto" + +#: builtin/fetch.c:141 +msgid "prune local tags no longer on remote and clobber changed tags" +msgstr "" +"limpiar tags locales que no se encuentran en el remoto y eliminar tags " +"cambiados" -#: builtin/fetch.c:129 builtin/fetch.c:152 builtin/pull.c:126 +#: builtin/fetch.c:142 builtin/fetch.c:165 builtin/pull.c:126 msgid "on-demand" msgstr "en demanda" -#: builtin/fetch.c:130 +#: builtin/fetch.c:143 msgid "control recursive fetching of submodules" msgstr "controlar extracción recursiva de submódulos" -#: builtin/fetch.c:134 builtin/pull.c:209 +#: builtin/fetch.c:147 builtin/pull.c:209 msgid "keep downloaded pack" msgstr "mantener el paquete descargado" -#: builtin/fetch.c:136 +#: builtin/fetch.c:149 msgid "allow updating of HEAD ref" msgstr "permitir actualizar la ref HEAD" -#: builtin/fetch.c:139 builtin/fetch.c:145 builtin/pull.c:212 +#: builtin/fetch.c:152 builtin/fetch.c:158 builtin/pull.c:212 msgid "deepen history of shallow clone" msgstr "historia profunda de un clon superficial" -#: builtin/fetch.c:141 +#: builtin/fetch.c:154 msgid "deepen history of shallow repository based on time" msgstr "historia profunda de un repositorio superficial basado en tiempo" -#: builtin/fetch.c:147 builtin/pull.c:215 +#: builtin/fetch.c:160 builtin/pull.c:215 msgid "convert to a complete repository" msgstr "convertir a un repositorio completo" -#: builtin/fetch.c:149 builtin/log.c:1463 +#: builtin/fetch.c:162 builtin/log.c:1466 msgid "dir" msgstr "dir" -#: builtin/fetch.c:150 +#: builtin/fetch.c:163 msgid "prepend this to submodule path output" -msgstr "anteponer esto a salida de la ruta del submódulo " +msgstr "anteponer esto a salida de la ruta del submódulo" -#: builtin/fetch.c:153 +#: builtin/fetch.c:166 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -8329,89 +8523,89 @@ msgstr "" "default para extracción recursiva de submódulos (menor prioridad que " "archivos de configuración)" -#: builtin/fetch.c:157 builtin/pull.c:218 +#: builtin/fetch.c:170 builtin/pull.c:218 msgid "accept refs that update .git/shallow" msgstr "aceptar refs que actualicen .git/shallow" -#: builtin/fetch.c:158 builtin/pull.c:220 +#: builtin/fetch.c:171 builtin/pull.c:220 msgid "refmap" msgstr "refmap" -#: builtin/fetch.c:159 builtin/pull.c:221 +#: builtin/fetch.c:172 builtin/pull.c:221 msgid "specify fetch refmap" msgstr "especificar extracción de refmap" -#: builtin/fetch.c:417 +#: builtin/fetch.c:431 msgid "Couldn't find remote ref HEAD" msgstr "No se puedo encontrar ref remota HEAD" -#: builtin/fetch.c:535 +#: builtin/fetch.c:549 #, 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:628 +#: builtin/fetch.c:642 #, c-format msgid "object %s not found" msgstr "objeto %s no encontrado" -#: builtin/fetch.c:632 +#: builtin/fetch.c:646 msgid "[up to date]" msgstr "[actualizado]" -#: builtin/fetch.c:645 builtin/fetch.c:725 +#: builtin/fetch.c:659 builtin/fetch.c:739 msgid "[rejected]" msgstr "[rechazado]" -#: builtin/fetch.c:646 +#: builtin/fetch.c:660 msgid "can't fetch in current branch" msgstr "no se puede traer en la rama actual" -#: builtin/fetch.c:655 +#: builtin/fetch.c:669 msgid "[tag update]" msgstr "[actualización de tag]" -#: builtin/fetch.c:656 builtin/fetch.c:689 builtin/fetch.c:705 -#: builtin/fetch.c:720 +#: builtin/fetch.c:670 builtin/fetch.c:703 builtin/fetch.c:719 +#: builtin/fetch.c:734 msgid "unable to update local ref" msgstr "no se posible actualizar el ref local" -#: builtin/fetch.c:675 +#: builtin/fetch.c:689 msgid "[new tag]" msgstr "[nuevo tag]" -#: builtin/fetch.c:678 +#: builtin/fetch.c:692 msgid "[new branch]" msgstr "[nueva rama]" -#: builtin/fetch.c:681 +#: builtin/fetch.c:695 msgid "[new ref]" msgstr "[nueva referencia]" -#: builtin/fetch.c:720 +#: builtin/fetch.c:734 msgid "forced update" msgstr "actualización forzada" -#: builtin/fetch.c:725 +#: builtin/fetch.c:739 msgid "non-fast-forward" msgstr "avance lento" -#: builtin/fetch.c:770 +#: builtin/fetch.c:784 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s no envió todos los objetos necesarios\n" -#: builtin/fetch.c:790 +#: builtin/fetch.c:804 #, 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:878 builtin/fetch.c:974 +#: builtin/fetch.c:892 builtin/fetch.c:988 #, c-format msgid "From %.*s\n" msgstr "Desde %.*s\n" -#: builtin/fetch.c:889 +#: builtin/fetch.c:903 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -8420,50 +8614,56 @@ 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:944 +#: builtin/fetch.c:958 #, c-format msgid " (%s will become dangling)" msgstr " (%s se pondrá colgado)" -#: builtin/fetch.c:945 +#: builtin/fetch.c:959 #, c-format msgid " (%s has become dangling)" msgstr " (%s se ha colgado)" -#: builtin/fetch.c:977 +#: builtin/fetch.c:991 msgid "[deleted]" msgstr "[eliminado]" -#: builtin/fetch.c:978 builtin/remote.c:1024 +#: builtin/fetch.c:992 builtin/remote.c:1024 msgid "(none)" msgstr "(nada)" -#: builtin/fetch.c:1001 +#: builtin/fetch.c:1015 #, 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:1020 +#: builtin/fetch.c:1034 #, 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:1023 +#: builtin/fetch.c:1037 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Opción \"%s\" es ignorada por %s\n" -#: builtin/fetch.c:1256 +#: builtin/fetch.c:1277 #, c-format msgid "Fetching %s\n" msgstr "Extrayendo %s\n" -#: builtin/fetch.c:1258 builtin/remote.c:97 +#: builtin/fetch.c:1279 builtin/remote.c:97 #, c-format msgid "Could not fetch %s" msgstr "No se pudo extraer %s" -#: builtin/fetch.c:1276 +#: builtin/fetch.c:1325 builtin/fetch.c:1498 +msgid "" +"--filter can only be used with the remote configured in core.partialClone" +msgstr "" +"--filter solo puede ser usado con el remoto configurado en core.partialClone" + +#: builtin/fetch.c:1350 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -8471,40 +8671,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:1299 +#: builtin/fetch.c:1394 msgid "You need to specify a tag name." msgstr "Tiene que especificar un nombre de tag." -#: builtin/fetch.c:1342 +#: builtin/fetch.c:1439 msgid "Negative depth in --deepen is not supported" msgstr "Profundidad negativa en --deepen no soportada" -#: builtin/fetch.c:1344 +#: builtin/fetch.c:1441 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen y --depth son mutuamente exclusivas" -#: builtin/fetch.c:1349 +#: builtin/fetch.c:1446 msgid "--depth and --unshallow cannot be used together" msgstr "--depth y --unshallow no pueden ser usadas juntas" -#: builtin/fetch.c:1351 +#: builtin/fetch.c:1448 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow no tiene sentido en un repositorio completo" -#: builtin/fetch.c:1364 +#: builtin/fetch.c:1464 msgid "fetch --all does not take a repository argument" msgstr "fetch --all no toma un argumento de repositorio" -#: builtin/fetch.c:1366 +#: builtin/fetch.c:1466 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all no tiene sentido con refspecs" -#: builtin/fetch.c:1377 +#: builtin/fetch.c:1475 #, c-format msgid "No such remote or remote group: %s" msgstr "No existe el remoto o grupo remoto: %s" -#: builtin/fetch.c:1385 +#: builtin/fetch.c:1482 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Extraer un grupo y especificar un refspecs no tiene sentido" @@ -8552,25 +8752,25 @@ msgstr "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" #: builtin/for-each-ref.c:28 msgid "quote placeholders suitably for shells" -msgstr "Cite los marcadores de posición adecuadamente para los shells" +msgstr "cite los marcadores de posición adecuadamente para los shells" #: builtin/for-each-ref.c:30 msgid "quote placeholders suitably for perl" -msgstr "Cite los marcadores de posición adecuadamente para perl" +msgstr "cite los marcadores de posición adecuadamente para perl" #: builtin/for-each-ref.c:32 msgid "quote placeholders suitably for python" -msgstr "Cite los marcadores de posición adecuadamente para python" +msgstr "cite los marcadores de posición adecuadamente para python" #: builtin/for-each-ref.c:34 msgid "quote placeholders suitably for Tcl" -msgstr "Cite los marcadores de posición adecuadamente para Tcl" +msgstr "cite los marcadores de posición adecuadamente para Tcl" #: builtin/for-each-ref.c:37 msgid "show only <n> matched refs" msgstr "mostrar solo <n> refs encontradas" -#: builtin/for-each-ref.c:39 builtin/tag.c:414 +#: builtin/for-each-ref.c:39 builtin/tag.c:420 msgid "respect format colors" msgstr "respetar el formato de colores" @@ -8594,63 +8794,63 @@ msgstr "mostrar solo refs que contienen el commit" msgid "print only refs which don't contain the commit" msgstr "mostrar solo refs que no contienen el commit" -#: builtin/fsck.c:543 +#: builtin/fsck.c:568 msgid "Checking object directories" msgstr "Revisando objetos directorios" -#: builtin/fsck.c:635 +#: builtin/fsck.c:660 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<opciones>] [<objeto>...]" -#: builtin/fsck.c:641 +#: builtin/fsck.c:666 msgid "show unreachable objects" msgstr "mostrar objetos ilegibles" -#: builtin/fsck.c:642 +#: builtin/fsck.c:667 msgid "show dangling objects" msgstr "mostrar objetos colgados" -#: builtin/fsck.c:643 +#: builtin/fsck.c:668 msgid "report tags" msgstr "reportar tags" -#: builtin/fsck.c:644 +#: builtin/fsck.c:669 msgid "report root nodes" msgstr "reportar nodos raíz" -#: builtin/fsck.c:645 +#: builtin/fsck.c:670 msgid "make index objects head nodes" msgstr "hacer objetos índices cabezas de nodos" -#: builtin/fsck.c:646 +#: builtin/fsck.c:671 msgid "make reflogs head nodes (default)" msgstr "hacer reflogs cabeza de nodos (default)" -#: builtin/fsck.c:647 +#: builtin/fsck.c:672 msgid "also consider packs and alternate objects" msgstr "también considerar paquetes y objetos alternos" -#: builtin/fsck.c:648 +#: builtin/fsck.c:673 msgid "check only connectivity" msgstr "revisar solo conectividad" -#: builtin/fsck.c:649 +#: builtin/fsck.c:674 msgid "enable more strict checking" msgstr "habilitar revisión más estricta" -#: builtin/fsck.c:651 +#: builtin/fsck.c:676 msgid "write dangling objects in .git/lost-found" msgstr "escribir objetos colgados en .git/lost-found" -#: builtin/fsck.c:652 builtin/prune.c:107 +#: builtin/fsck.c:677 builtin/prune.c:108 msgid "show progress" msgstr "mostrar progreso" -#: builtin/fsck.c:653 +#: builtin/fsck.c:678 msgid "show verbose names for reachable objects" msgstr "mostrar nombres verboso para objetos alcanzables" -#: builtin/fsck.c:714 +#: builtin/fsck.c:742 msgid "Checking objects" msgstr "Revisando objetos" @@ -8695,33 +8895,33 @@ msgstr "ser más exhaustivo (aumentar runtime)" msgid "enable auto-gc mode" msgstr "habilitar modo auto-gc" -#: builtin/gc.c:364 +#: builtin/gc.c:366 msgid "force running gc even if there may be another gc running" msgstr "forzar la ejecución de gc incluso si puede haber otro gc ejecutándose" -#: builtin/gc.c:381 +#: builtin/gc.c:384 #, c-format msgid "Failed to parse gc.logexpiry value %s" msgstr "Falló al analizar valor %s de gc.logexpirity" -#: builtin/gc.c:409 +#: builtin/gc.c:412 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" "Auto empaquetado del repositorio en segundo plano para un performance " "óptimo.\n" -#: builtin/gc.c:411 +#: builtin/gc.c:414 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Auto empaquetado del repositorio para performance óptimo.\n" -#: builtin/gc.c:412 +#: builtin/gc.c:415 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Vea \"git help gc\" para limpieza manual.\n" -#: builtin/gc.c:437 +#: builtin/gc.c:440 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -8729,7 +8929,7 @@ msgstr "" "gc ya está ejecutándose en la máquina '%s' pid %<PRIuMAX> (use --force so no " "es así)" -#: builtin/gc.c:481 +#: builtin/gc.c:487 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -8740,12 +8940,12 @@ msgstr "" msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<opciones>] [-e] <patrón> [<rev>...] [[--] <ruta>...]" -#: builtin/grep.c:226 +#: builtin/grep.c:225 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep: falló al crear el hilo: %s" -#: builtin/grep.c:284 +#: builtin/grep.c:283 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "número inválido de hilos especificado (%d) para %s" @@ -8754,249 +8954,249 @@ 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:1688 +#: builtin/grep.c:292 builtin/index-pack.c:1523 builtin/index-pack.c:1712 #, c-format msgid "no threads support, ignoring %s" msgstr "no hay soporte para hilos, ignorando %s" -#: builtin/grep.c:453 builtin/grep.c:573 builtin/grep.c:615 +#: builtin/grep.c:460 builtin/grep.c:580 builtin/grep.c:622 #, c-format msgid "unable to read tree (%s)" msgstr "no es posible leer el árbol (%s)" -#: builtin/grep.c:630 +#: builtin/grep.c:637 #, 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:696 +#: builtin/grep.c:703 #, c-format msgid "switch `%c' expects a numerical value" msgstr "switch `%c' espera un valor numérico" -#: builtin/grep.c:783 +#: builtin/grep.c:790 msgid "search in index instead of in the work tree" msgstr "buscar en el índice en lugar del árbol de trabajo" -#: builtin/grep.c:785 +#: builtin/grep.c:792 msgid "find in contents not managed by git" msgstr "encontrar en contenidos no manejados por git" -#: builtin/grep.c:787 +#: builtin/grep.c:794 msgid "search in both tracked and untracked files" msgstr "buscar en archivos rastreados y no rastreados" -#: builtin/grep.c:789 +#: builtin/grep.c:796 msgid "ignore files specified via '.gitignore'" msgstr "ignorar archivos especificados via '.gitignore'" -#: builtin/grep.c:791 +#: builtin/grep.c:798 msgid "recursively search in each submodule" msgstr "búsqueda recursiva en cada submódulo" -#: builtin/grep.c:794 +#: builtin/grep.c:801 msgid "show non-matching lines" msgstr "mostrar líneas que no concuerdan" -#: builtin/grep.c:796 +#: builtin/grep.c:803 msgid "case insensitive matching" msgstr "búsqueda insensible a mayúsculas" -#: builtin/grep.c:798 +#: builtin/grep.c:805 msgid "match patterns only at word boundaries" msgstr "concordar patrón solo a los límites de las palabras" -#: builtin/grep.c:800 +#: builtin/grep.c:807 msgid "process binary files as text" msgstr "procesar archivos binarios como texto" -#: builtin/grep.c:802 +#: builtin/grep.c:809 msgid "don't match patterns in binary files" msgstr "no concordar patrones en archivos binarios" -#: builtin/grep.c:805 +#: builtin/grep.c:812 msgid "process binary files with textconv filters" -msgstr "procesar archivos binarios con filtros textconv " +msgstr "procesar archivos binarios con filtros textconv" -#: builtin/grep.c:807 +#: builtin/grep.c:814 msgid "descend at most <depth> levels" msgstr "descender como máximo <valor-de-profundiad> niveles" -#: builtin/grep.c:811 +#: builtin/grep.c:818 msgid "use extended POSIX regular expressions" msgstr "usar expresiones regulares POSIX extendidas" -#: builtin/grep.c:814 +#: builtin/grep.c:821 msgid "use basic POSIX regular expressions (default)" msgstr "usar expresiones regulares POSIX (default)" -#: builtin/grep.c:817 +#: builtin/grep.c:824 msgid "interpret patterns as fixed strings" msgstr "interpretar patrones como strings arreglados" -#: builtin/grep.c:820 +#: builtin/grep.c:827 msgid "use Perl-compatible regular expressions" msgstr "usar expresiones regulares compatibles con Perl" -#: builtin/grep.c:823 +#: builtin/grep.c:830 msgid "show line numbers" msgstr "mostrar números de línea" -#: builtin/grep.c:824 +#: builtin/grep.c:831 msgid "don't show filenames" msgstr "no mostrar nombres de archivo" -#: builtin/grep.c:825 +#: builtin/grep.c:832 msgid "show filenames" msgstr "mostrar nombres de archivo" -#: builtin/grep.c:827 +#: builtin/grep.c:834 msgid "show filenames relative to top directory" msgstr "mostrar nombres de archivo relativos al directorio superior" -#: builtin/grep.c:829 +#: builtin/grep.c:836 msgid "show only filenames instead of matching lines" msgstr "mostrar solo nombres de archivos en lugar de líneas encontradas" -#: builtin/grep.c:831 +#: builtin/grep.c:838 msgid "synonym for --files-with-matches" msgstr "sinónimo para --files-with-matches" -#: builtin/grep.c:834 +#: builtin/grep.c:841 msgid "show only the names of files without match" msgstr "mostrar solo los nombres de archivos sin coincidencias" -#: builtin/grep.c:836 +#: builtin/grep.c:843 msgid "print NUL after filenames" msgstr "imprimir NUL después del nombre de archivo" -#: builtin/grep.c:838 +#: builtin/grep.c:846 msgid "show the number of matches instead of matching lines" -msgstr "Mostrar el número de concordancias en lugar de las líneas concordantes" +msgstr "mostrar el número de concordancias en lugar de las líneas concordantes" -#: builtin/grep.c:839 +#: builtin/grep.c:847 msgid "highlight matches" msgstr "resaltar concordancias" -#: builtin/grep.c:841 +#: builtin/grep.c:849 msgid "print empty line between matches from different files" msgstr "imprimir una línea vacía entre coincidencias de diferentes archivos" -#: builtin/grep.c:843 +#: builtin/grep.c:851 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:846 +#: builtin/grep.c:854 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:849 +#: builtin/grep.c:857 msgid "show <n> context lines before matches" msgstr "mostrar <n> líneas de contexto antes de las concordancias" -#: builtin/grep.c:851 +#: builtin/grep.c:859 msgid "show <n> context lines after matches" msgstr "mostrar <n> líneas de context después de las concordancias" -#: builtin/grep.c:853 +#: builtin/grep.c:861 msgid "use <n> worker threads" msgstr "usar <n> hilos de trabajo" -#: builtin/grep.c:854 +#: builtin/grep.c:862 msgid "shortcut for -C NUM" msgstr "atajo para -C NUM" -#: builtin/grep.c:857 +#: builtin/grep.c:865 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:859 +#: builtin/grep.c:867 msgid "show the surrounding function" msgstr "mostrar la función circundante" -#: builtin/grep.c:862 +#: builtin/grep.c:870 msgid "read patterns from file" msgstr "leer patrones del archivo" -#: builtin/grep.c:864 +#: builtin/grep.c:872 msgid "match <pattern>" msgstr "concordar <patrón>" -#: builtin/grep.c:866 +#: builtin/grep.c:874 msgid "combine patterns specified with -e" msgstr "combinar patrones especificados con -e" -#: builtin/grep.c:878 +#: builtin/grep.c:886 msgid "indicate hit with exit status without output" msgstr "indicar concordancia con exit status sin output" -#: builtin/grep.c:880 +#: builtin/grep.c:888 msgid "show only matches from files that match all patterns" msgstr "" "mostrar solo concordancias con archivos que concuerdan todos los patrones" -#: builtin/grep.c:882 +#: builtin/grep.c:890 msgid "show parse tree for grep expression" msgstr "mostrar árbol analizado para la expresión grep" -#: builtin/grep.c:886 +#: builtin/grep.c:894 msgid "pager" msgstr "paginador" -#: builtin/grep.c:886 +#: builtin/grep.c:894 msgid "show matching files in the pager" msgstr "mostrar archivos concordantes en el paginador" -#: builtin/grep.c:889 +#: builtin/grep.c:898 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permitir el llamado de grep(1) (ignorado por esta build)" -#: builtin/grep.c:952 +#: builtin/grep.c:962 msgid "no pattern given." -msgstr "no se ha entregado patrón" +msgstr "no se ha entregado patrón." -#: builtin/grep.c:984 +#: builtin/grep.c:994 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index o --untracked no se puede usar con revs" -#: builtin/grep.c:991 +#: builtin/grep.c:1001 #, c-format msgid "unable to resolve revision: %s" msgstr "no se posible resolver revisión: %s" -#: builtin/grep.c:1026 builtin/index-pack.c:1491 +#: builtin/grep.c:1036 builtin/index-pack.c:1519 #, c-format msgid "invalid number of threads specified (%d)" msgstr "número inválido de hilos especificado (%d)" -#: builtin/grep.c:1031 +#: builtin/grep.c:1041 msgid "no threads support, ignoring --threads" msgstr "no se soportan hilos, ignorando --threads" -#: builtin/grep.c:1055 +#: builtin/grep.c:1065 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:1078 +#: builtin/grep.c:1088 msgid "option not supported with --recurse-submodules." msgstr "opción no soportada con --recurse-submodules." -#: builtin/grep.c:1084 +#: builtin/grep.c:1094 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached o --untracked no pueden ser usadas con --no-index." -#: builtin/grep.c:1090 +#: builtin/grep.c:1100 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard no puede ser usada para contenido rastreado." -#: builtin/grep.c:1098 +#: builtin/grep.c:1108 msgid "both --cached and trees are given." msgstr "--cached y árboles han sido entregados." -#: builtin/hash-object.c:82 +#: builtin/hash-object.c:83 msgid "" "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " "[--] <file>..." @@ -9004,38 +9204,38 @@ msgstr "" "git hash-object [-t <tipo>] [-w] [--path=<archivo> | --no-filters] [--stdin] " "[--] <archivo>..." -#: builtin/hash-object.c:83 +#: builtin/hash-object.c:84 msgid "git hash-object --stdin-paths" msgstr "git hash-object --stdin-paths" -#: builtin/hash-object.c:95 +#: builtin/hash-object.c:96 msgid "type" msgstr "tipo" -#: builtin/hash-object.c:95 +#: builtin/hash-object.c:96 msgid "object type" msgstr "tipo de objeto" -#: builtin/hash-object.c:96 +#: builtin/hash-object.c:97 msgid "write the object into the object database" msgstr "escribir el objeto en la base de datos de objetos" -#: builtin/hash-object.c:98 +#: builtin/hash-object.c:99 msgid "read the object from stdin" msgstr "leer el objeto de stdin" -#: builtin/hash-object.c:100 +#: builtin/hash-object.c:101 msgid "store file as is without filters" msgstr "guardar el archivo como es sin filtros" -#: builtin/hash-object.c:101 +#: builtin/hash-object.c:102 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "" "solo realizar un hash a cualquier basura random para crear un objeto " "corrupto para hacer debugging de Gti" -#: builtin/hash-object.c:102 +#: builtin/hash-object.c:103 msgid "process file as it were from this path" msgstr "procesar el archivo como si fuera de esta ruta" @@ -9111,7 +9311,7 @@ msgstr "" #: builtin/help.c:340 #, c-format msgid "'%s': unknown man viewer." -msgstr "'%s': visualizador de man desconocido" +msgstr "'%s': visualizador de man desconocido." #: builtin/help.c:357 msgid "no man viewer handled the request" @@ -9167,152 +9367,152 @@ msgstr "'%s' tiene el alias '%s'" msgid "usage: %s%s" msgstr "uso: %s%s" -#: builtin/index-pack.c:156 +#: builtin/index-pack.c:157 #, c-format msgid "unable to open %s" msgstr "no es posible abrir %s" -#: builtin/index-pack.c:206 +#: builtin/index-pack.c:207 #, c-format msgid "object type mismatch at %s" msgstr "el tipo del objeto no concuerda en %s" -#: builtin/index-pack.c:226 +#: builtin/index-pack.c:227 #, c-format msgid "did not receive expected object %s" msgstr "no se recibió el objeto esperado %s" -#: builtin/index-pack.c:229 +#: builtin/index-pack.c:230 #, c-format msgid "object %s: expected type %s, found %s" msgstr "objeto %s: tipo esperado %s, encontrado %s" -#: builtin/index-pack.c:271 +#: builtin/index-pack.c:272 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "no se puede llenar %d byte" msgstr[1] "no se pueden llenar %d bytes" -#: builtin/index-pack.c:281 +#: builtin/index-pack.c:282 msgid "early EOF" msgstr "EOF temprano" -#: builtin/index-pack.c:282 +#: builtin/index-pack.c:283 msgid "read error on input" msgstr "leer error en input" -#: builtin/index-pack.c:294 +#: builtin/index-pack.c:295 msgid "used more bytes than were available" msgstr "se usaron más bytes de los disponibles" -#: builtin/index-pack.c:301 +#: builtin/index-pack.c:302 msgid "pack too large for current definition of off_t" msgstr "paquete muy grande para la definición actual de off_t" -#: builtin/index-pack.c:304 builtin/unpack-objects.c:93 +#: builtin/index-pack.c:305 builtin/unpack-objects.c:93 msgid "pack exceeds maximum allowed size" msgstr "paquete excede el máximo tamaño permitido" -#: builtin/index-pack.c:319 +#: builtin/index-pack.c:320 #, c-format msgid "unable to create '%s'" msgstr "no se puede crear '%s'" -#: builtin/index-pack.c:325 +#: builtin/index-pack.c:326 #, c-format msgid "cannot open packfile '%s'" msgstr "no se puede abrir el archivo de paquete '%s'" -#: builtin/index-pack.c:339 +#: builtin/index-pack.c:340 msgid "pack signature mismatch" msgstr "firma del paquete no concuerda" -#: builtin/index-pack.c:341 +#: builtin/index-pack.c:342 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "versión de paquete %<PRIu32> no soportada" -#: builtin/index-pack.c:359 +#: builtin/index-pack.c:360 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "paquete tiene un mal objeto en el offset %<PRIuMAX>: %s" -#: builtin/index-pack.c:480 +#: builtin/index-pack.c:481 #, c-format msgid "inflate returned %d" msgstr "inflate retornó %d" -#: builtin/index-pack.c:529 +#: builtin/index-pack.c:530 msgid "offset value overflow for delta base object" msgstr "valor de offset desbordado para el objeto base delta" -#: builtin/index-pack.c:537 +#: builtin/index-pack.c:538 msgid "delta base offset is out of bound" msgstr "offset de base delta está fuera de límites" -#: builtin/index-pack.c:545 +#: builtin/index-pack.c:546 #, c-format msgid "unknown object type %d" msgstr "tipo de objeto %d desconocido" -#: builtin/index-pack.c:576 +#: builtin/index-pack.c:577 msgid "cannot pread pack file" msgstr "no se puede propagar el paquete" -#: builtin/index-pack.c:578 +#: builtin/index-pack.c:579 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "final prematuro de archivo de paquete, %<PRIuMAX> byte faltante" msgstr[1] "final prematuro de archivo de paquete, %<PRIuMAX> bytes faltantes" -#: builtin/index-pack.c:604 +#: builtin/index-pack.c:605 msgid "serious inflate inconsistency" msgstr "inconsistencia seria en inflate" -#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778 -#: builtin/index-pack.c:817 builtin/index-pack.c:826 +#: builtin/index-pack.c:750 builtin/index-pack.c:756 builtin/index-pack.c:779 +#: builtin/index-pack.c:818 builtin/index-pack.c:827 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "COLISIÓN DE TIPO SHA1 ENCONTRADA CON %s !" -#: builtin/index-pack.c:752 builtin/pack-objects.c:179 -#: builtin/pack-objects.c:273 +#: builtin/index-pack.c:753 builtin/pack-objects.c:182 +#: builtin/pack-objects.c:276 #, c-format msgid "unable to read %s" msgstr "no se posible leer %s" -#: builtin/index-pack.c:815 +#: builtin/index-pack.c:816 #, c-format msgid "cannot read existing object info %s" msgstr "no se puede leer la información existente del objeto %s" -#: builtin/index-pack.c:823 +#: builtin/index-pack.c:824 #, c-format msgid "cannot read existing object %s" msgstr "no se puede leer el objeto existente %s" -#: builtin/index-pack.c:837 +#: builtin/index-pack.c:838 #, c-format msgid "invalid blob object %s" msgstr "objeto blob %s inválido" -#: builtin/index-pack.c:852 +#: builtin/index-pack.c:853 #, c-format msgid "invalid %s" msgstr "%s inválido" -#: builtin/index-pack.c:855 +#: builtin/index-pack.c:856 msgid "Error in object" msgstr "Error en el objeto" -#: builtin/index-pack.c:857 +#: builtin/index-pack.c:858 #, c-format msgid "Not all child objects of %s are reachable" msgstr "No todos los objetos hijos de %s son alcanzables" -#: builtin/index-pack.c:929 builtin/index-pack.c:960 +#: builtin/index-pack.c:930 builtin/index-pack.c:961 msgid "failed to apply delta" msgstr "falló al aplicar delta" @@ -9363,7 +9563,7 @@ msgstr[1] "completado con %d objetos locales" #: builtin/index-pack.c:1279 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" -msgstr "tail checksum para %s inesperada (corrupción de disco?)" +msgstr "Tail checksum para %s inesperada (corrupción de disco?)" #: builtin/index-pack.c:1283 #, c-format @@ -9382,77 +9582,81 @@ msgstr "no es posible desinflar el objeto adjunto (%d)" msgid "local object %s is corrupt" msgstr "objeto local %s está corrompido" -#: builtin/index-pack.c:1409 -msgid "error while closing pack file" -msgstr "error mientras se cierra el archivo paquete" +#: builtin/index-pack.c:1397 +#, c-format +msgid "packfile name '%s' does not end with '.pack'" +msgstr "nombre '%s' de archivo de paquete no termina con '.pack'" -#: builtin/index-pack.c:1421 +#: builtin/index-pack.c:1422 #, c-format -msgid "cannot write keep file '%s'" -msgstr "no se puede escribir el archivo guardado '%s'" +msgid "cannot write %s file '%s'" +msgstr "no se puede escribir %s en el archivo '%s'" -#: builtin/index-pack.c:1429 +#: builtin/index-pack.c:1430 #, c-format -msgid "cannot close written keep file '%s'" -msgstr "no se puede cerrar el archivo guardado escrito '%s'" +msgid "cannot close written %s file '%s'" +msgstr "no se puede cerrar escrito %s en archivo '%s'" -#: builtin/index-pack.c:1439 +#: builtin/index-pack.c:1454 +msgid "error while closing pack file" +msgstr "error mientras se cierra el archivo paquete" + +#: builtin/index-pack.c:1468 msgid "cannot store pack file" msgstr "no se puede guardar el archivo paquete" -#: builtin/index-pack.c:1447 +#: builtin/index-pack.c:1476 msgid "cannot store index file" msgstr "no se puede guardar el archivo índice" -#: builtin/index-pack.c:1485 +#: builtin/index-pack.c:1513 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "mal pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1553 +#: builtin/index-pack.c:1581 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "No se puede abrir el archivo paquete existente '%s'" -#: builtin/index-pack.c:1555 +#: builtin/index-pack.c:1583 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "No se puede abrir el índice del archivo paquete para '%s'" -#: builtin/index-pack.c:1603 +#: builtin/index-pack.c:1631 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "no delta: %d objeto" msgstr[1] "no delta: %d objetos" -#: builtin/index-pack.c:1610 +#: builtin/index-pack.c:1638 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "largo de cadena = %d: %lu objeto" msgstr[1] "largo de cadena = %d: %lu objetos" -#: builtin/index-pack.c:1623 -#, c-format -msgid "packfile name '%s' does not end with '.pack'" -msgstr "nombre '%s' de archivo de paquete no termina con '.pack'" +#: builtin/index-pack.c:1675 +msgid "Cannot come back to cwd" +msgstr "No se puede regresar a cwd" -#: builtin/index-pack.c:1700 builtin/index-pack.c:1703 -#: builtin/index-pack.c:1719 builtin/index-pack.c:1723 +#: builtin/index-pack.c:1724 builtin/index-pack.c:1727 +#: builtin/index-pack.c:1743 builtin/index-pack.c:1747 #, c-format msgid "bad %s" msgstr "mal %s" -#: builtin/index-pack.c:1739 +#: builtin/index-pack.c:1763 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin no puede ser usada sin --stdin" -#: builtin/index-pack.c:1741 +#: builtin/index-pack.c:1765 msgid "--stdin requires a git repository" msgstr "--stdin requiere un repositorio git" -#: builtin/index-pack.c:1749 +#: builtin/index-pack.c:1771 msgid "--verify with no packfile name given" msgstr "--verify no recibió ningún nombre de archivo de paquete" @@ -9637,120 +9841,120 @@ msgstr "--trailer con --only-input no tiene sentido" msgid "no input file given for in-place editing" msgstr "no se entregó archivo de entrada para edición en lugar" -#: builtin/log.c:46 +#: builtin/log.c:48 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<opciones>] [<rango-de-revisión>] [[--] <ruta>...]" -#: builtin/log.c:47 +#: builtin/log.c:49 msgid "git show [<options>] <object>..." msgstr "git show [<opciones>] <objeto>..." -#: builtin/log.c:91 +#: builtin/log.c:93 #, c-format msgid "invalid --decorate option: %s" msgstr "opción --decorate inválida: %s" -#: builtin/log.c:151 +#: builtin/log.c:153 msgid "suppress diff output" msgstr "suprimir salida de diff" -#: builtin/log.c:152 +#: builtin/log.c:154 msgid "show source" msgstr "mostrar fuente" -#: builtin/log.c:153 +#: builtin/log.c:155 msgid "Use mail map file" -msgstr "usar archivo de mapa de mail" +msgstr "Usar archivo de mapa de mail" -#: builtin/log.c:155 +#: builtin/log.c:157 msgid "only decorate refs that match <pattern>" msgstr "solo decorar refs que concuerden con <patrón>" -#: builtin/log.c:157 +#: builtin/log.c:159 msgid "do not decorate refs that match <pattern>" msgstr "no decorar refs que concuerden con <patrón>" -#: builtin/log.c:158 +#: builtin/log.c:160 msgid "decorate options" msgstr "opciones de decorado" -#: builtin/log.c:161 +#: builtin/log.c:163 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:257 +#: builtin/log.c:259 #, c-format msgid "Final output: %d %s\n" msgstr "Salida final: %d %s\n" -#: builtin/log.c:508 +#: builtin/log.c:510 #, c-format msgid "git show %s: bad file" msgstr "git show %s: mal archivo" -#: builtin/log.c:523 builtin/log.c:617 +#: builtin/log.c:525 builtin/log.c:619 #, c-format msgid "Could not read object %s" msgstr "No se pudo leer objeto %s" -#: builtin/log.c:641 +#: builtin/log.c:643 #, c-format msgid "Unknown type: %d" msgstr "Tipo desconocido: %d" -#: builtin/log.c:762 +#: builtin/log.c:764 msgid "format.headers without value" msgstr "formate.headers. sin valor" -#: builtin/log.c:863 +#: builtin/log.c:865 msgid "name of output directory is too long" msgstr "nombre del directorio de salida es muy largo" -#: builtin/log.c:879 +#: builtin/log.c:881 #, c-format msgid "Cannot open patch file %s" msgstr "No se puede abrir archivo patch %s" -#: builtin/log.c:896 +#: builtin/log.c:898 msgid "Need exactly one range." msgstr "Exactamente un rango necesario." -#: builtin/log.c:906 +#: builtin/log.c:908 msgid "Not a range." msgstr "No es un rango." -#: builtin/log.c:1012 +#: builtin/log.c:1014 msgid "Cover letter needs email format" msgstr "Letras de portada necesita formato email" -#: builtin/log.c:1092 +#: builtin/log.c:1095 #, c-format msgid "insane in-reply-to: %s" msgstr "insano in-reply-to: %s" -#: builtin/log.c:1119 +#: builtin/log.c:1122 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<opciones>] [<desde> | <rango-de-revisiones>]" -#: builtin/log.c:1169 +#: builtin/log.c:1172 msgid "Two output directories?" -msgstr "dos directorios de salida?" +msgstr "Dos directorios de salida?" -#: builtin/log.c:1276 builtin/log.c:1927 builtin/log.c:1929 builtin/log.c:1941 +#: builtin/log.c:1279 builtin/log.c:1932 builtin/log.c:1934 builtin/log.c:1946 #, c-format msgid "Unknown commit %s" msgstr "Commit desconocido %s" -#: builtin/log.c:1286 builtin/notes.c:887 builtin/tag.c:516 +#: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:522 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Falló al resolver '%s' como una ref válida." -#: builtin/log.c:1291 +#: builtin/log.c:1294 msgid "Could not find exact merge base." msgstr "No se pudo encontrar una base de fusión." -#: builtin/log.c:1295 +#: builtin/log.c:1298 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" @@ -9762,230 +9966,230 @@ msgstr "" "O puede especificar un commit base mediante --base=<id-commit-base> " "manualmente." -#: builtin/log.c:1315 +#: builtin/log.c:1318 msgid "Failed to find exact merge base" msgstr "Fallo al encontrar una base de fusión exacta" -#: builtin/log.c:1326 +#: builtin/log.c:1329 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:1330 +#: builtin/log.c:1333 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:1379 +#: builtin/log.c:1382 msgid "cannot get patch id" msgstr "no se puede obtener id de patch" -#: builtin/log.c:1438 +#: builtin/log.c:1441 msgid "use [PATCH n/m] even with a single patch" msgstr "use [PATCH n/m] incluso con un único parche" -#: builtin/log.c:1441 +#: builtin/log.c:1444 msgid "use [PATCH] even with multiple patches" msgstr "use [PATCH] incluso con múltiples parches" -#: builtin/log.c:1445 +#: builtin/log.c:1448 msgid "print patches to standard out" msgstr "mostrar parches en standard out" -#: builtin/log.c:1447 +#: builtin/log.c:1450 msgid "generate a cover letter" msgstr "generar letra de cover" -#: builtin/log.c:1449 +#: builtin/log.c:1452 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:1450 +#: builtin/log.c:1453 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1451 +#: builtin/log.c:1454 msgid "use <sfx> instead of '.patch'" msgstr "use <sfx> en lugar de '.patch'" -#: builtin/log.c:1453 +#: builtin/log.c:1456 msgid "start numbering patches at <n> instead of 1" msgstr "comenzar a numerar los parches desde <n> en lugar de 1" -#: builtin/log.c:1455 +#: builtin/log.c:1458 msgid "mark the series as Nth re-roll" msgstr "marcar las series como Nth re-roll" -#: builtin/log.c:1457 +#: builtin/log.c:1460 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Use [RFC PATCH] en lugar de [PATCH]" -#: builtin/log.c:1460 +#: builtin/log.c:1463 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Use [<prefijo>] en lugar de [PATCH]" -#: builtin/log.c:1463 +#: builtin/log.c:1466 msgid "store resulting files in <dir>" msgstr "guardar archivos resultantes en <dir>" -#: builtin/log.c:1466 +#: builtin/log.c:1469 msgid "don't strip/add [PATCH]" msgstr "no cortar/agregar [PATCH]" -#: builtin/log.c:1469 +#: builtin/log.c:1472 msgid "don't output binary diffs" msgstr "no mostrar diffs binarios" -#: builtin/log.c:1471 +#: builtin/log.c:1474 msgid "output all-zero hash in From header" -msgstr "salida como hash de todos-ceros en la cabecera From " +msgstr "salida como hash de todos-ceros en la cabecera From" -#: builtin/log.c:1473 +#: builtin/log.c:1476 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:1475 +#: builtin/log.c:1478 msgid "show patch format instead of default (patch + stat)" msgstr "mostrar formato de parche en lugar del default (parche + stat)" -#: builtin/log.c:1477 +#: builtin/log.c:1480 msgid "Messaging" msgstr "Mensajeando" -#: builtin/log.c:1478 +#: builtin/log.c:1481 msgid "header" msgstr "cabezal" -#: builtin/log.c:1479 +#: builtin/log.c:1482 msgid "add email header" msgstr "agregar cabecera email" -#: builtin/log.c:1480 builtin/log.c:1482 +#: builtin/log.c:1483 builtin/log.c:1485 msgid "email" msgstr "email" -#: builtin/log.c:1480 +#: builtin/log.c:1483 msgid "add To: header" msgstr "agregar cabecera To:" -#: builtin/log.c:1482 +#: builtin/log.c:1485 msgid "add Cc: header" msgstr "agregar cabecera Cc:" -#: builtin/log.c:1484 +#: builtin/log.c:1487 msgid "ident" msgstr "ident" -#: builtin/log.c:1485 +#: builtin/log.c:1488 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:1487 +#: builtin/log.c:1490 msgid "message-id" msgstr "id de mensaje" -#: builtin/log.c:1488 +#: builtin/log.c:1491 msgid "make first mail a reply to <message-id>" msgstr "hacer primer mail una respuesta a <id de mensaje>" -#: builtin/log.c:1489 builtin/log.c:1492 +#: builtin/log.c:1492 builtin/log.c:1495 msgid "boundary" msgstr "límite" -#: builtin/log.c:1490 +#: builtin/log.c:1493 msgid "attach the patch" msgstr "adjuntar el parche" -#: builtin/log.c:1493 +#: builtin/log.c:1496 msgid "inline the patch" msgstr "poner el parche en línea" -#: builtin/log.c:1497 +#: builtin/log.c:1500 msgid "enable message threading, styles: shallow, deep" msgstr "habilitar hilos de mensajes, estilos: superficial, profundo" -#: builtin/log.c:1499 +#: builtin/log.c:1502 msgid "signature" msgstr "firma" -#: builtin/log.c:1500 +#: builtin/log.c:1503 msgid "add a signature" msgstr "agregar una firma" -#: builtin/log.c:1501 +#: builtin/log.c:1504 msgid "base-commit" msgstr "commit-base" -#: builtin/log.c:1502 +#: builtin/log.c:1505 msgid "add prerequisite tree info to the patch series" msgstr "" "agregar información de árbol de requisitos previos a la serie de parches" -#: builtin/log.c:1504 +#: builtin/log.c:1507 msgid "add a signature from a file" msgstr "agregar una firma de un archivo" -#: builtin/log.c:1505 +#: builtin/log.c:1508 msgid "don't print the patch filenames" msgstr "no mostrar los nombres de archivos de los parches" -#: builtin/log.c:1507 +#: builtin/log.c:1510 msgid "show progress while generating patches" msgstr "mostrar medidor de progreso mientras se generan los parches" -#: builtin/log.c:1582 +#: builtin/log.c:1585 #, c-format msgid "invalid ident line: %s" msgstr "línea de identificación inválida: %s" -#: builtin/log.c:1597 +#: builtin/log.c:1600 msgid "-n and -k are mutually exclusive." msgstr "-n y -k son mutuamente exclusivas." -#: builtin/log.c:1599 +#: builtin/log.c:1602 msgid "--subject-prefix/--rfc and -k are mutually exclusive." msgstr "--subject-prefix/--rfc y -k son mutuamente exclusivos." -#: builtin/log.c:1607 +#: builtin/log.c:1610 msgid "--name-only does not make sense" msgstr "--name-only no tiene sentido" -#: builtin/log.c:1609 +#: builtin/log.c:1612 msgid "--name-status does not make sense" msgstr "--name-status no tiene sentido" -#: builtin/log.c:1611 +#: builtin/log.c:1614 msgid "--check does not make sense" msgstr "--check no tiene sentido" -#: builtin/log.c:1641 +#: builtin/log.c:1646 msgid "standard output, or directory, which one?" -msgstr "salida standard, o directorio, cual? " +msgstr "salida standard, o directorio, cual?" -#: builtin/log.c:1643 +#: builtin/log.c:1648 #, c-format msgid "Could not create directory '%s'" msgstr "No se pudo crear el directorio '%s'" -#: builtin/log.c:1736 +#: builtin/log.c:1741 #, c-format msgid "unable to read signature file '%s'" msgstr "no se puede leer la firma del archivo '%s'" -#: builtin/log.c:1768 +#: builtin/log.c:1773 msgid "Generating patches" msgstr "Generando parches" -#: builtin/log.c:1812 +#: builtin/log.c:1817 msgid "Failed to create output files" msgstr "Falló al crear los archivos de salida" -#: builtin/log.c:1862 +#: builtin/log.c:1867 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<upstream> [<head> [<límite>]]]" -#: builtin/log.c:1916 +#: builtin/log.c:1921 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -10143,7 +10347,7 @@ msgstr "tomar url.<base>.insteadOf en cuenta" msgid "exit with exit code 2 if no matching refs are found" msgstr "salir con código de salida 2 si no se encuentran refs que concuerden" -#: builtin/ls-remote.c:66 +#: builtin/ls-remote.c:67 msgid "show underlying ref in addition to the object pointed by it" msgstr "mostrar ref subyacente en adición al objeto apuntado por él" @@ -10189,184 +10393,184 @@ msgstr "" msgid "empty mbox: '%s'" msgstr "mbox vacío: '%s'" -#: builtin/merge.c:48 +#: builtin/merge.c:49 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<opciones>] [<commit>...]" -#: builtin/merge.c:49 +#: builtin/merge.c:50 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:50 +#: builtin/merge.c:51 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:107 +#: builtin/merge.c:108 msgid "switch `m' requires a value" msgstr "cambiar `m' requiere un valor" -#: builtin/merge.c:144 +#: builtin/merge.c:145 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "No se pudo encontrar estrategia de fusión '%s'.\n" -#: builtin/merge.c:145 +#: builtin/merge.c:146 #, c-format msgid "Available strategies are:" msgstr "Estrategias disponibles son:" -#: builtin/merge.c:150 +#: builtin/merge.c:151 #, c-format msgid "Available custom strategies are:" msgstr "Estrategias personalizadas disponibles son:" -#: builtin/merge.c:200 builtin/pull.c:137 +#: builtin/merge.c:201 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:140 +#: builtin/merge.c:204 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:143 +#: builtin/merge.c:205 builtin/pull.c:143 msgid "(synonym to --stat)" msgstr "(sinónimo para --stat)" -#: builtin/merge.c:206 builtin/pull.c:146 +#: builtin/merge.c:207 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:152 +#: builtin/merge.c:210 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:155 +#: builtin/merge.c:212 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:158 +#: builtin/merge.c:214 builtin/pull.c:158 msgid "edit message before committing" msgstr "editar mensaje antes de realizar commit" -#: builtin/merge.c:214 +#: builtin/merge.c:215 msgid "allow fast-forward (default)" msgstr "permitir fast-forwars (default)" -#: builtin/merge.c:216 builtin/pull.c:164 +#: builtin/merge.c:217 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:167 +#: builtin/merge.c:221 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:171 +#: builtin/merge.c:222 builtin/notes.c:777 builtin/pull.c:171 #: builtin/revert.c:109 msgid "strategy" msgstr "estrategia" -#: builtin/merge.c:222 builtin/pull.c:172 +#: builtin/merge.c:223 builtin/pull.c:172 msgid "merge strategy to use" msgstr "estrategia de fusión para usar" -#: builtin/merge.c:223 builtin/pull.c:175 +#: builtin/merge.c:224 builtin/pull.c:175 msgid "option=value" msgstr "opción=valor" -#: builtin/merge.c:224 builtin/pull.c:176 +#: builtin/merge.c:225 builtin/pull.c:176 msgid "option for selected merge strategy" msgstr "opción para la estrategia de fusión seleccionada" -#: builtin/merge.c:226 +#: builtin/merge.c:227 msgid "merge commit message (for a non-fast-forward merge)" msgstr "fusionar mensaje de commit (para una fusión no fast-forward)" -#: builtin/merge.c:230 +#: builtin/merge.c:231 msgid "abort the current in-progress merge" msgstr "abortar la fusión en progreso actual" -#: builtin/merge.c:232 +#: builtin/merge.c:233 msgid "continue the current in-progress merge" msgstr "continuar la fusión en progreso actual" -#: builtin/merge.c:234 builtin/pull.c:183 +#: builtin/merge.c:235 builtin/pull.c:183 msgid "allow merging unrelated histories" msgstr "permitir fusionar historias no relacionadas" -#: builtin/merge.c:240 +#: builtin/merge.c:241 msgid "verify commit-msg hook" msgstr "verificar el hook commit-msg" -#: builtin/merge.c:265 +#: builtin/merge.c:266 msgid "could not run stash." msgstr "no se pudo ejecutar stash." -#: builtin/merge.c:270 +#: builtin/merge.c:271 msgid "stash failed" msgstr "stash falló" -#: builtin/merge.c:275 +#: builtin/merge.c:276 #, c-format msgid "not a valid object: %s" msgstr "no es un objeto válido: %s" -#: builtin/merge.c:297 builtin/merge.c:314 +#: builtin/merge.c:298 builtin/merge.c:315 msgid "read-tree failed" msgstr "lectura de árbol falló" -#: builtin/merge.c:344 +#: builtin/merge.c:345 msgid " (nothing to squash)" msgstr " (nada para hacer squash)" -#: builtin/merge.c:355 +#: builtin/merge.c:356 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Commit de squash -- no actualizando HEAD\n" -#: builtin/merge.c:405 +#: builtin/merge.c:406 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "No hay mensaje de fusión -- no actualizando HEAD\n" -#: builtin/merge.c:455 +#: builtin/merge.c:456 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' no apunta a ningún commit" -#: builtin/merge.c:545 +#: builtin/merge.c:546 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Mal string branch.%s.mergeoptions: %s" -#: builtin/merge.c:667 +#: builtin/merge.c:668 msgid "Not handling anything other than two heads merge." msgstr "No manejando nada más que fusión de dos heads." -#: builtin/merge.c:681 +#: builtin/merge.c:682 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Opción desconocida para merge-recursive: -X%s" -#: builtin/merge.c:696 +#: builtin/merge.c:697 #, c-format msgid "unable to write %s" msgstr "no es posible escribir %s" -#: builtin/merge.c:748 +#: builtin/merge.c:749 #, c-format msgid "Could not read from '%s'" msgstr "No se puedo leer de '%s'" -#: builtin/merge.c:757 +#: builtin/merge.c:758 #, 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:763 +#: builtin/merge.c:764 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -10383,70 +10587,70 @@ msgstr "" "Líneas comenzando con '%c' serán ignoradas, y un mensaje vacío aborta\n" "el commit.\n" -#: builtin/merge.c:799 +#: builtin/merge.c:800 msgid "Empty commit message." msgstr "Mensaje de commit vacío." -#: builtin/merge.c:819 +#: builtin/merge.c:820 #, c-format msgid "Wonderful.\n" msgstr "Maravilloso.\n" -#: builtin/merge.c:872 +#: builtin/merge.c:873 #, 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:911 +#: builtin/merge.c:912 msgid "No current branch." msgstr "No rama actual." -#: builtin/merge.c:913 +#: builtin/merge.c:914 msgid "No remote for the current branch." msgstr "No hay remoto para la rama actual." -#: builtin/merge.c:915 +#: builtin/merge.c:916 msgid "No default upstream defined for the current branch." msgstr "Por defecto, no hay un upstream definido para la rama actual." -#: builtin/merge.c:920 +#: builtin/merge.c:921 #, 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:973 +#: builtin/merge.c:974 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Mal valor '%s' en el entorno '%s'" -#: builtin/merge.c:1075 +#: builtin/merge.c:1076 #, c-format msgid "not something we can merge in %s: %s" msgstr "nada que podamos fusionar en %s: %s" -#: builtin/merge.c:1109 +#: builtin/merge.c:1110 msgid "not something we can merge" msgstr "nada que podamos fusionar" -#: builtin/merge.c:1174 +#: builtin/merge.c:1212 msgid "--abort expects no arguments" msgstr "--abort no espera argumentos" -#: builtin/merge.c:1178 +#: builtin/merge.c:1216 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "No hay una fusión para abortar (falta MERGE_HEAD)" -#: builtin/merge.c:1190 +#: builtin/merge.c:1228 msgid "--continue expects no arguments" msgstr "--continue no espera argumentos" -#: builtin/merge.c:1194 +#: builtin/merge.c:1232 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "No hay fusión en progreso (falta MERGE_HEAD)." -#: builtin/merge.c:1210 +#: builtin/merge.c:1248 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10454,7 +10658,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:1217 +#: builtin/merge.c:1255 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10462,113 +10666,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:1220 +#: builtin/merge.c:1258 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:1229 +#: builtin/merge.c:1267 msgid "You cannot combine --squash with --no-ff." msgstr "No se puede combinar --squash con --no-ff." -#: builtin/merge.c:1237 +#: builtin/merge.c:1275 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "No hay commit especificado y merge.defaultToUpstream no está configurado." -#: builtin/merge.c:1254 +#: builtin/merge.c:1292 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:1256 +#: builtin/merge.c:1294 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:1261 +#: builtin/merge.c:1299 #, c-format msgid "%s - not something we can merge" msgstr "%s - nada que podamos fusionar" -#: builtin/merge.c:1263 +#: builtin/merge.c:1301 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:1297 +#: builtin/merge.c:1335 #, 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:1300 +#: builtin/merge.c:1338 #, 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:1303 +#: builtin/merge.c:1341 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Commit %s no tiene una firma GPG." -#: builtin/merge.c:1306 +#: builtin/merge.c:1344 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "El Commit %s tiene una buena firma GPG por %s\n" -#: builtin/merge.c:1368 +#: builtin/merge.c:1403 msgid "refusing to merge unrelated histories" msgstr "rehusando fusionar historias no relacionadas" -#: builtin/merge.c:1377 +#: builtin/merge.c:1412 msgid "Already up to date." msgstr "Ya está actualizado." -#: builtin/merge.c:1387 +#: builtin/merge.c:1422 #, c-format msgid "Updating %s..%s\n" msgstr "Actualizando %s..%s\n" -#: builtin/merge.c:1428 +#: builtin/merge.c:1463 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Intentando fusión en índice realmente trivial...\n" -#: builtin/merge.c:1435 +#: builtin/merge.c:1470 #, c-format msgid "Nope.\n" msgstr "Nop.\n" -#: builtin/merge.c:1460 +#: builtin/merge.c:1495 msgid "Already up to date. Yeeah!" msgstr "Ya está actualizado. ¡Oh, yeaahh!" -#: builtin/merge.c:1466 +#: builtin/merge.c:1501 msgid "Not possible to fast-forward, aborting." msgstr "No es posible hacer fast-forward, abortando." -#: builtin/merge.c:1489 builtin/merge.c:1568 +#: builtin/merge.c:1524 builtin/merge.c:1603 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Rebobinando el árbol a original...\n" -#: builtin/merge.c:1493 +#: builtin/merge.c:1528 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Intentando estrategia de fusión %s...\n" -#: builtin/merge.c:1559 +#: builtin/merge.c:1594 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ninguna estrategia de fusión manejó la fusión.\n" -#: builtin/merge.c:1561 +#: builtin/merge.c:1596 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Fusionar con estrategia %s falló.\n" -#: builtin/merge.c:1570 +#: builtin/merge.c:1605 #, 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:1582 +#: builtin/merge.c:1617 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -10600,7 +10804,7 @@ msgstr "mostrar todos los ancestros comunes" #: 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 " +msgstr "encontrar ancestros para una única fusión de n-vías" #: builtin/merge-base.c:224 msgid "list revs not reachable from others" @@ -10628,7 +10832,7 @@ msgstr "mandar resultados a standard output" #: builtin/merge-file.c:34 msgid "use a diff3 based merge" -msgstr "usar un fusión basada en diff3 " +msgstr "usar un fusión basada en diff3" #: builtin/merge-file.c:35 msgid "for conflicts, use our version" @@ -10725,75 +10929,75 @@ msgstr "%.*s está en el índice" msgid "force move/rename even if target exists" msgstr "forzar mover/renombrar incluso si el objetivo existe" -#: builtin/mv.c:126 +#: builtin/mv.c:127 msgid "skip move/rename errors" msgstr "saltar errores de mover/renombrar" -#: builtin/mv.c:167 +#: builtin/mv.c:168 #, c-format msgid "destination '%s' is not a directory" msgstr "destino '%s' no es un directorio" -#: builtin/mv.c:178 +#: builtin/mv.c:179 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Revisando cambio de nombre de '%s' a '%s'\n" -#: builtin/mv.c:182 +#: builtin/mv.c:183 msgid "bad source" msgstr "mala fuente" -#: builtin/mv.c:185 +#: builtin/mv.c:186 msgid "can not move directory into itself" msgstr "no se pude mover un directorio en sí mismo" -#: builtin/mv.c:188 +#: builtin/mv.c:189 msgid "cannot move directory over file" msgstr "no se puede mover un directorio dentro de un archivo" -#: builtin/mv.c:197 +#: builtin/mv.c:198 msgid "source directory is empty" msgstr "directorio de fuente está vacío" -#: builtin/mv.c:222 +#: builtin/mv.c:223 msgid "not under version control" -msgstr "no se encuentra bajo control de versión " +msgstr "no se encuentra bajo control de versión" -#: builtin/mv.c:225 +#: builtin/mv.c:226 msgid "destination exists" msgstr "destino existe" -#: builtin/mv.c:233 +#: builtin/mv.c:234 #, c-format msgid "overwriting '%s'" msgstr "sobrescribiendo '%s'" -#: builtin/mv.c:236 +#: builtin/mv.c:237 msgid "Cannot overwrite" msgstr "No se puede sobrescribir" -#: builtin/mv.c:239 +#: builtin/mv.c:240 msgid "multiple sources for the same target" msgstr "múltiples fuentes para el mismo objetivo" -#: builtin/mv.c:241 +#: builtin/mv.c:242 msgid "destination directory does not exist" msgstr "el directorio de destino no existe" -#: builtin/mv.c:248 +#: builtin/mv.c:249 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, fuente=%s, destino=%s" -#: builtin/mv.c:269 +#: builtin/mv.c:270 #, c-format msgid "Renaming %s to %s\n" msgstr "Renombrando %s a %s\n" -#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390 +#: builtin/mv.c:276 builtin/remote.c:712 builtin/repack.c:394 #, c-format msgid "renaming '%s' failed" -msgstr "fallo al renombrar '%s'" +msgstr "renombrando '%s' falló" #: builtin/name-rev.c:338 msgid "git name-rev [<options>] <commit>..." @@ -10984,12 +11188,12 @@ msgstr "incapaz de escribir el objeto de nota" msgid "the note contents have been left in %s" msgstr "los contenidos de nota han sido dejados en %s" -#: builtin/notes.c:234 builtin/tag.c:500 +#: builtin/notes.c:234 builtin/tag.c:506 #, c-format msgid "cannot read '%s'" msgstr "no se puede leer '%s'" -#: builtin/notes.c:236 builtin/tag.c:503 +#: builtin/notes.c:236 builtin/tag.c:509 #, c-format msgid "could not open or read '%s'" msgstr "no se pudo abrir o leer '%s'" @@ -11235,7 +11439,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:158 +#: builtin/notes.c:943 builtin/prune.c:106 builtin/worktree.c:160 msgid "do not remove, show only" msgstr "no remover, solo mostrar" @@ -11270,188 +11474,192 @@ msgstr "" "git pack-objects [<opciones>...] <nombre-base> [< <lista-de-refs> | < <lista-" "de-objetos>]" -#: builtin/pack-objects.c:192 builtin/pack-objects.c:195 +#: builtin/pack-objects.c:195 builtin/pack-objects.c:198 #, c-format msgid "deflate error (%d)" msgstr "error al desinflar (%d)" -#: builtin/pack-objects.c:788 +#: builtin/pack-objects.c:791 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:801 +#: builtin/pack-objects.c:804 msgid "Writing objects" msgstr "Escribiendo objetos" -#: builtin/pack-objects.c:1081 +#: builtin/pack-objects.c:1084 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:2451 +#: builtin/pack-objects.c:2454 msgid "Compressing objects" msgstr "Comprimiendo objetos" -#: builtin/pack-objects.c:2599 +#: builtin/pack-objects.c:2625 msgid "invalid value for --missing" msgstr "valor inválido para --missing" -#: builtin/pack-objects.c:2902 +#: builtin/pack-objects.c:2928 #, c-format msgid "unsupported index version %s" msgstr "versión de índice no soportada %s" -#: builtin/pack-objects.c:2906 +#: builtin/pack-objects.c:2932 #, c-format msgid "bad index version '%s'" msgstr "mala versión del índice '%s'" -#: builtin/pack-objects.c:2936 +#: builtin/pack-objects.c:2962 msgid "do not show progress meter" msgstr "no mostrar medidor de progreso" -#: builtin/pack-objects.c:2938 +#: builtin/pack-objects.c:2964 msgid "show progress meter" msgstr "mostrar medidor de progreso" -#: builtin/pack-objects.c:2940 +#: builtin/pack-objects.c:2966 msgid "show progress meter during object writing phase" msgstr "mostrar medidor de progreso durante la fase de escritura de objeto" -#: builtin/pack-objects.c:2943 +#: builtin/pack-objects.c:2969 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:2944 +#: builtin/pack-objects.c:2970 msgid "version[,offset]" msgstr "versión[,offset]" -#: builtin/pack-objects.c:2945 +#: builtin/pack-objects.c:2971 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:2948 +#: builtin/pack-objects.c:2974 msgid "maximum size of each output pack file" msgstr "tamaño máximo de cada paquete resultante" -#: builtin/pack-objects.c:2950 +#: builtin/pack-objects.c:2976 msgid "ignore borrowed objects from alternate object store" msgstr "ignorar objetos prestados de otros almacenes de objetos" -#: builtin/pack-objects.c:2952 +#: builtin/pack-objects.c:2978 msgid "ignore packed objects" msgstr "ignorar objetos paquete" -#: builtin/pack-objects.c:2954 +#: builtin/pack-objects.c:2980 msgid "limit pack window by objects" msgstr "limitar ventana de paquete por objetos" -#: builtin/pack-objects.c:2956 +#: builtin/pack-objects.c:2982 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:2958 +#: builtin/pack-objects.c:2984 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:2960 +#: builtin/pack-objects.c:2986 msgid "reuse existing deltas" msgstr "reusar deltas existentes" -#: builtin/pack-objects.c:2962 +#: builtin/pack-objects.c:2988 msgid "reuse existing objects" msgstr "reutilizar objetos existentes" -#: builtin/pack-objects.c:2964 +#: builtin/pack-objects.c:2990 msgid "use OFS_DELTA objects" msgstr "usar objetos OFS_DELTA" -#: builtin/pack-objects.c:2966 +#: builtin/pack-objects.c:2992 msgid "use threads when searching for best delta matches" msgstr "usar hilos cuando se busque para mejores concordancias de delta" -#: builtin/pack-objects.c:2968 +#: builtin/pack-objects.c:2994 msgid "do not create an empty pack output" msgstr "no crear un paquete resultante vacío" -#: builtin/pack-objects.c:2970 +#: builtin/pack-objects.c:2996 msgid "read revision arguments from standard input" msgstr "leer argumentos de revisión de standard input" -#: builtin/pack-objects.c:2972 +#: builtin/pack-objects.c:2998 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:2975 +#: builtin/pack-objects.c:3001 msgid "include objects reachable from any reference" msgstr "incluir objetos alcanzables por cualquier referencia" -#: builtin/pack-objects.c:2978 +#: builtin/pack-objects.c:3004 msgid "include objects referred by reflog entries" msgstr "incluir objetos referidos por entradas de reflog" -#: builtin/pack-objects.c:2981 +#: builtin/pack-objects.c:3007 msgid "include objects referred to by the index" msgstr "incluir objetos referidos por el índice" -#: builtin/pack-objects.c:2984 +#: builtin/pack-objects.c:3010 msgid "output pack to stdout" msgstr "mostrar paquete en stdout" -#: builtin/pack-objects.c:2986 +#: builtin/pack-objects.c:3012 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:2988 +#: builtin/pack-objects.c:3014 msgid "keep unreachable objects" msgstr "mantener objetos inalcanzables" -#: builtin/pack-objects.c:2990 +#: builtin/pack-objects.c:3016 msgid "pack loose unreachable objects" msgstr "empaquetar objetos sueltos inalcanzables" -#: builtin/pack-objects.c:2992 +#: builtin/pack-objects.c:3018 msgid "unpack unreachable objects newer than <time>" msgstr "desempaquetar objetos inalcanzables más nuevos que <tiempo>" -#: builtin/pack-objects.c:2995 +#: builtin/pack-objects.c:3021 msgid "create thin packs" msgstr "crear paquetes delgados" -#: builtin/pack-objects.c:2997 +#: builtin/pack-objects.c:3023 msgid "create packs suitable for shallow fetches" msgstr "crear paquetes adecuados para fetches superficiales" -#: builtin/pack-objects.c:2999 +#: builtin/pack-objects.c:3025 msgid "ignore packs that have companion .keep file" msgstr "ignorar paquetes que tienen un archivo .keep acompañante" -#: builtin/pack-objects.c:3001 +#: builtin/pack-objects.c:3027 msgid "pack compression level" msgstr "nivel de compresión del paquete" -#: builtin/pack-objects.c:3003 +#: builtin/pack-objects.c:3029 msgid "do not hide commits by grafts" msgstr "no ocultar commits por injertos" -#: builtin/pack-objects.c:3005 +#: builtin/pack-objects.c:3031 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:3007 +#: builtin/pack-objects.c:3033 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:3010 +#: builtin/pack-objects.c:3036 msgid "handling for missing objects" msgstr "manejo de objetos perdidos" -#: builtin/pack-objects.c:3144 +#: builtin/pack-objects.c:3039 +msgid "do not pack objects in promisor packfiles" +msgstr "no se puede empaquetar objetos en packfiles promisores" + +#: builtin/pack-objects.c:3178 msgid "Counting objects" msgstr "Contando objetos" @@ -11479,15 +11687,19 @@ msgstr "Removiendo objetos duplicados" msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire <tiempo>] [--] [<head>...]" -#: builtin/prune.c:106 +#: builtin/prune.c:107 msgid "report pruned objects" msgstr "reportar objetos recortados" -#: builtin/prune.c:109 +#: builtin/prune.c:110 msgid "expire objects older than <time>" msgstr "expirar objetos más viejos a <tiempo>" -#: builtin/prune.c:123 +#: builtin/prune.c:112 +msgid "limit traversal to objects outside promisor packfiles" +msgstr "limitar el recorrido a objetos fuera de los paquetes del promisor" + +#: builtin/prune.c:126 msgid "cannot prune in a precious-objects repo" msgstr "no se puede recortar en un repositorio de objetos-preciosos" @@ -11532,7 +11744,7 @@ msgstr "número de submódulos que realizan pull en paralelo" #: builtin/pull.c:299 #, c-format msgid "Invalid value for pull.ff: %s" -msgstr "valor inválido para pull.ff: %s" +msgstr "Valor inválido para pull.ff: %s" #: builtin/pull.c:415 msgid "" @@ -11587,7 +11799,7 @@ msgstr "Ver git-pull(1) para detalles." msgid "<remote>" msgstr "<remoto>" -#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:466 +#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:477 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<rama>" @@ -11612,27 +11824,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:817 +#: builtin/pull.c:819 msgid "ignoring --verify-signatures for rebase" msgstr "ignorando --verify-signatures para rebase" -#: builtin/pull.c:865 +#: builtin/pull.c:867 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:873 +#: builtin/pull.c:875 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:876 +#: builtin/pull.c:878 msgid "pull with rebase" msgstr "pull con rebase" -#: builtin/pull.c:877 +#: builtin/pull.c:879 msgid "please commit or stash them." msgstr "por favor realiza un commit o un stash con ellos." -#: builtin/pull.c:902 +#: builtin/pull.c:904 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -11643,7 +11855,7 @@ msgstr "" "realizando fast-forward al árbol de trabajo\n" "desde commit %s." -#: builtin/pull.c:907 +#: builtin/pull.c:909 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -11660,15 +11872,15 @@ msgstr "" "$ git reset --hard\n" "para recuperar." -#: builtin/pull.c:922 +#: builtin/pull.c:924 msgid "Cannot merge multiple branches into empty head." msgstr "No se puede fusionar múltiples ramas en un head vacío." -#: builtin/pull.c:926 +#: builtin/pull.c:928 msgid "Cannot rebase onto multiple branches." msgstr "No se puede rebasar en múltiples ramas." -#: builtin/pull.c:933 +#: builtin/pull.c:935 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "no se puede rebasar con modificaciones de submódulos grabadas localmente" @@ -11945,7 +12157,7 @@ msgstr "realizar push de tags faltantes pero relevantes" #: builtin/push.c:563 builtin/send-pack.c:168 msgid "GPG sign the push" -msgstr "firmar con GPG el push" +msgstr "Firmar con GPG el push" #: builtin/push.c:565 builtin/send-pack.c:175 msgid "request atomic transaction on remote side" @@ -12054,39 +12266,43 @@ msgstr "git rebase--helper [<opciones>]" msgid "keep empty commits" msgstr "mantener commits vacíos" -#: builtin/rebase--helper.c:25 +#: builtin/rebase--helper.c:26 builtin/revert.c:123 +msgid "allow commits with empty messages" +msgstr "permitir commits con mensajes vacíos" + +#: builtin/rebase--helper.c:27 msgid "continue rebase" msgstr "continuar rebase" -#: builtin/rebase--helper.c:27 +#: builtin/rebase--helper.c:29 msgid "abort rebase" msgstr "abortar rebase" -#: builtin/rebase--helper.c:30 +#: builtin/rebase--helper.c:32 msgid "make rebase script" msgstr "generar script de rebase" -#: builtin/rebase--helper.c:32 +#: builtin/rebase--helper.c:34 msgid "shorten commit ids in the todo list" msgstr "ids de commits cortos en la lista de pendientes" -#: builtin/rebase--helper.c:34 +#: builtin/rebase--helper.c:36 msgid "expand commit ids in the todo list" msgstr "expandir ids de commits en la lista de pendientes" -#: builtin/rebase--helper.c:36 +#: builtin/rebase--helper.c:38 msgid "check the todo list" msgstr "revisar la lista de pendientes" -#: builtin/rebase--helper.c:38 +#: builtin/rebase--helper.c:40 msgid "skip unnecessary picks" msgstr "saltar los picks innecesarios" -#: builtin/rebase--helper.c:40 +#: builtin/rebase--helper.c:42 msgid "rearrange fixup/squash lines" msgstr "reorganizar líneas fixup/squash" -#: builtin/rebase--helper.c:42 +#: builtin/rebase--helper.c:44 msgid "insert exec commands in todo list" msgstr "insertar comando exec en la lista de pendientes" @@ -12094,7 +12310,7 @@ msgstr "insertar comando exec en la lista de pendientes" msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-dir>" -#: builtin/receive-pack.c:840 +#: builtin/receive-pack.c:841 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" @@ -12127,7 +12343,7 @@ msgstr "" "Para suprimir este mensaje y mantener el comportamiento predeterminado,\n" "configure 'receive.denyCurrentBranch' a 'refuse'." -#: builtin/receive-pack.c:860 +#: builtin/receive-pack.c:861 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" @@ -12148,15 +12364,15 @@ msgstr "" "\n" "Para suprimir este mensaje, puede configurarlo en 'refuse'." -#: builtin/receive-pack.c:1933 +#: builtin/receive-pack.c:1934 msgid "quiet" msgstr "tranquilo" -#: builtin/receive-pack.c:1947 +#: builtin/receive-pack.c:1948 msgid "You must specify a directory." msgstr "Se tiene que especificar un directorio." -#: builtin/reflog.c:531 builtin/reflog.c:536 +#: builtin/reflog.c:532 builtin/reflog.c:537 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' no es una marca de tiempo válida" @@ -12682,89 +12898,89 @@ msgstr "" "Re empaquetados incrementales son incompatibles con índices bitmap. Use \n" "--no-write-bitmap-index o deshabilite la configuración pack.writebitmaps." -#: builtin/repack.c:168 +#: builtin/repack.c:170 msgid "pack everything in a single pack" msgstr "empaquetar todo en un único paquete" -#: builtin/repack.c:170 +#: builtin/repack.c:172 msgid "same as -a, and turn unreachable objects loose" msgstr "lo mismo que -a, y pierde objetos inaccesibles" -#: builtin/repack.c:173 +#: builtin/repack.c:175 msgid "remove redundant packs, and run git-prune-packed" msgstr "remover paquetes redundantes, y ejecutar git-prune-packed" -#: builtin/repack.c:175 +#: builtin/repack.c:177 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "pasar --no-reuse-delta a git-pack-objects" -#: builtin/repack.c:177 +#: builtin/repack.c:179 msgid "pass --no-reuse-object to git-pack-objects" msgstr "pasar --no-reuse-object a git-pack-objects" -#: builtin/repack.c:179 +#: builtin/repack.c:181 msgid "do not run git-update-server-info" msgstr "no ejecutar git-update-server-info" -#: builtin/repack.c:182 +#: builtin/repack.c:184 msgid "pass --local to git-pack-objects" msgstr "pasar --local a git-pack-objects" -#: builtin/repack.c:184 +#: builtin/repack.c:186 msgid "write bitmap index" msgstr "escribir un índice de bitmap" -#: builtin/repack.c:185 +#: builtin/repack.c:187 msgid "approxidate" msgstr "aproxime" -#: builtin/repack.c:186 +#: builtin/repack.c:188 msgid "with -A, do not loosen objects older than this" msgstr "con -A, no perder objetos más antiguos que este" -#: builtin/repack.c:188 +#: builtin/repack.c:190 msgid "with -a, repack unreachable objects" -msgstr "con -a, re empaquetar objetos inalcanzables " +msgstr "con -a, re empaquetar objetos inalcanzables" -#: builtin/repack.c:190 +#: builtin/repack.c:192 msgid "size of the window used for delta compression" msgstr "tamaño de la ventana usado para la compresión delta" -#: builtin/repack.c:191 builtin/repack.c:197 +#: builtin/repack.c:193 builtin/repack.c:199 msgid "bytes" msgstr "bytes" -#: builtin/repack.c:192 +#: builtin/repack.c:194 msgid "same as the above, but limit memory size instead of entries count" msgstr "" "lo mismo que arriba, pero limita el tamaño de memoria en lugar de contar " "entradas" -#: builtin/repack.c:194 +#: builtin/repack.c:196 msgid "limits the maximum delta depth" msgstr "limita la profundidad máxima del delta" -#: builtin/repack.c:196 +#: builtin/repack.c:198 msgid "limits the maximum number of threads" msgstr "limita el número máximo de hilos" -#: builtin/repack.c:198 +#: builtin/repack.c:200 msgid "maximum size of each packfile" msgstr "tamaño máximo de cada paquete" -#: builtin/repack.c:200 +#: builtin/repack.c:202 msgid "repack objects in packs marked with .keep" msgstr "re-empaquetar objetos en paquetes marcados con .keep" -#: builtin/repack.c:210 +#: builtin/repack.c:212 msgid "cannot delete packs in a precious-objects repo" msgstr "no se pueden borrar paquetes en un repositorio de objetos-preciosos" -#: builtin/repack.c:214 +#: builtin/repack.c:216 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable y -A son incompatibles" -#: builtin/repack.c:406 builtin/worktree.c:146 +#: builtin/repack.c:410 builtin/worktree.c:148 #, c-format msgid "failed to remove '%s'" msgstr "falló al remover '%s'" @@ -12829,7 +13045,7 @@ msgstr "no se pudo escribir el commit de reemplazo: '%s'" #: builtin/replace.c:438 msgid "list replace refs" -msgstr "listar replace refs " +msgstr "listar replace refs" #: builtin/replace.c:439 msgid "delete replace refs" @@ -12847,11 +13063,11 @@ msgstr "cambiar un padre de commit" msgid "replace the ref if it exists" msgstr "reemplazar el ref si este existe" -#: builtin/replace.c:443 +#: builtin/replace.c:444 msgid "do not pretty-print contents for --edit" msgstr "no se puede imprimir contenidos para --edit" -#: builtin/replace.c:444 +#: builtin/replace.c:445 msgid "use this format" msgstr "usar este formato" @@ -12899,112 +13115,116 @@ msgstr "mantener" #: builtin/reset.c:78 msgid "You do not have a valid HEAD." -msgstr "No hay un HEAD válido" +msgstr "No hay un HEAD válido." #: builtin/reset.c:80 msgid "Failed to find tree of HEAD." -msgstr "Falló al encontrar el HEAD del árbol" +msgstr "Falló al encontrar el HEAD del árbol." #: builtin/reset.c:86 #, c-format msgid "Failed to find tree of %s." msgstr "Falló al encontrar árbol de %s." -#: builtin/reset.c:113 +#: builtin/reset.c:111 #, c-format msgid "HEAD is now at %s" msgstr "HEAD está ahora en %s" -#: builtin/reset.c:197 +#: builtin/reset.c:189 #, c-format msgid "Cannot do a %s reset in the middle of a merge." -msgstr "no se puede realziar un reset %s en medio de una fusión." +msgstr "No se puede realziar un reset %s en medio de una fusión." -#: builtin/reset.c:297 +#: builtin/reset.c:289 msgid "be quiet, only report errors" msgstr "ser silencioso, solo reportar errores" -#: builtin/reset.c:299 +#: builtin/reset.c:291 msgid "reset HEAD and index" msgstr "reiniciar HEAD e index" -#: builtin/reset.c:300 +#: builtin/reset.c:292 msgid "reset only HEAD" msgstr "reiniciar solo HEAD" -#: builtin/reset.c:302 builtin/reset.c:304 +#: builtin/reset.c:294 builtin/reset.c:296 msgid "reset HEAD, index and working tree" msgstr "reiniciar HEAD, índice y árbol de trabajo" -#: builtin/reset.c:306 +#: builtin/reset.c:298 msgid "reset HEAD but keep local changes" msgstr "reiniciar HEAD pero mantener cambios locales" -#: builtin/reset.c:312 +#: builtin/reset.c:304 msgid "record only the fact that removed paths will be added later" msgstr "" "grabar solo el hecho de que las rutas removidas serán agregadas después" -#: builtin/reset.c:329 +#: builtin/reset.c:321 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Falló al resolver '%s' como una revisión válida." -#: builtin/reset.c:337 +#: builtin/reset.c:329 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "Falló al resolver '%s' como un árbol válido." -#: builtin/reset.c:346 +#: builtin/reset.c:338 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch es incompatible con --{hard,mixed,soft}" -#: builtin/reset.c:355 +#: builtin/reset.c:347 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "--mixed con rutas ha sido deprecado; use 'git reset -- <rutas>' en cambio." -#: builtin/reset.c:357 +#: builtin/reset.c:349 #, c-format msgid "Cannot do %s reset with paths." msgstr "No se puede hacer un reset %s con rutas." -#: builtin/reset.c:367 +#: builtin/reset.c:359 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "%s reset no está permitido en un repositorio vacío" -#: builtin/reset.c:371 +#: builtin/reset.c:363 msgid "-N can only be used with --mixed" msgstr "-N sólo puede ser usada con --mixed" -#: builtin/reset.c:388 +#: builtin/reset.c:380 msgid "Unstaged changes after reset:" msgstr "Cambios fuera del área de stage tras el reset:" -#: builtin/reset.c:394 +#: builtin/reset.c:386 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "No se puede reiniciar el índice a la revisión '%s'." -#: builtin/reset.c:398 +#: builtin/reset.c:390 msgid "Could not write new index file." msgstr "No se puede escribir un nuevo archivo índice." -#: builtin/rev-list.c:399 +#: builtin/rev-list.c:397 +msgid "cannot combine --exclude-promisor-objects and --missing" +msgstr "no se puede combinar --exclude-promisor-objects y --missing" + +#: builtin/rev-list.c:455 msgid "object filtering requires --objects" msgstr "filtrado de objetos requiere --objects" -#: builtin/rev-list.c:402 +#: builtin/rev-list.c:458 #, c-format msgid "invalid sparse value '%s'" msgstr "valor disperso inválido: '%s'" -#: builtin/rev-list.c:442 +#: builtin/rev-list.c:499 msgid "rev-list does not support display of notes" msgstr "rev-list no soporta mostrar notas" -#: builtin/rev-list.c:445 +#: builtin/rev-list.c:502 msgid "cannot combine --use-bitmap-index with object filtering" msgstr "no se puede combinar --use-bitmap-index con objetos de filtrado" @@ -13108,10 +13328,6 @@ msgstr "adjuntar el nombre del commit" msgid "preserve initially empty commits" msgstr "preservar commits iniciales vacíos" -#: builtin/revert.c:123 -msgid "allow commits with empty messages" -msgstr "permitir commits con mensajes vacíos" - #: builtin/revert.c:124 msgid "keep redundant, empty commits" msgstr "mantener commits redundantes, vacíos" @@ -13136,7 +13352,7 @@ msgid_plural "" "the following files have staged content different from both the\n" "file and the HEAD:" msgstr[0] "" -"El siguiente archivo tiene contenido en stage diferente al archivo\n" +"el siguiente archivo tiene contenido en stage diferente al archivo\n" "y a HEAD:" msgstr[1] "" "los siguientes archivos tienen contenido diferente a los mismos\n" @@ -13457,35 +13673,39 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "anteponer carácter de comentario y espacio a cada línea" -#: builtin/submodule--helper.c:34 builtin/submodule--helper.c:1332 +#: builtin/submodule--helper.c:35 builtin/submodule--helper.c:1669 #, c-format msgid "No such ref: %s" msgstr "No existe ref: %s" -#: builtin/submodule--helper.c:41 builtin/submodule--helper.c:1341 +#: builtin/submodule--helper.c:42 builtin/submodule--helper.c:1678 #, 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:81 +#: builtin/submodule--helper.c:59 +msgid "submodule--helper print-default-remote takes no arguments" +msgstr "subomdule--helper print-default-remote no toma argumentos" + +#: builtin/submodule--helper.c:96 #, c-format msgid "cannot strip one component off url '%s'" msgstr "no se puede quitar un componente del url '%s'" -#: builtin/submodule--helper.c:370 builtin/submodule--helper.c:861 +#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1198 msgid "alternative anchor for relative paths" msgstr "ancho alternativo para rutas relativas" -#: builtin/submodule--helper.c:375 +#: builtin/submodule--helper.c:409 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<ruta>] [<ruta>...]" -#: builtin/submodule--helper.c:426 builtin/submodule--helper.c:449 +#: builtin/submodule--helper.c:460 builtin/submodule--helper.c:483 #, 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:464 +#: builtin/submodule--helper.c:498 #, c-format msgid "" "could not lookup configuration '%s'. Assuming this repository is its own " @@ -13494,57 +13714,57 @@ msgstr "" "no se pudo encontrar configuración '%s'. Asumiendo que este repositorio es " "su propio upstream autoritativo." -#: builtin/submodule--helper.c:475 +#: builtin/submodule--helper.c:509 #, 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:479 +#: builtin/submodule--helper.c:513 #, 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:489 +#: builtin/submodule--helper.c:523 #, 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:496 +#: builtin/submodule--helper.c:530 #, 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:518 +#: builtin/submodule--helper.c:552 msgid "Suppress output for initializing a submodule" -msgstr "suprime la salida para inicializar un submódulo" +msgstr "Suprime la salida para inicializar un submódulo" -#: builtin/submodule--helper.c:523 +#: builtin/submodule--helper.c:557 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper init [<ruta>]" -#: builtin/submodule--helper.c:591 builtin/submodule--helper.c:713 +#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:747 #, 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'" +"no se ha encontrado mapeo de submódulos en .gitmodules para la ruta '%s'" -#: builtin/submodule--helper.c:626 +#: builtin/submodule--helper.c:660 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" -msgstr "No pudo resolver ref de HEAD dentro del submódulo '%s'" +msgstr "no pudo resolver ref de HEAD dentro del submódulo '%s'" -#: builtin/submodule--helper.c:653 +#: builtin/submodule--helper.c:687 builtin/submodule--helper.c:856 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "falló al recursar en el submódulo '%s'" -#: builtin/submodule--helper.c:677 +#: builtin/submodule--helper.c:711 builtin/submodule--helper.c:1021 msgid "Suppress submodule status output" -msgstr "Suprimir output del estado del submódulo " +msgstr "Suprimir output del estado del submódulo" -#: builtin/submodule--helper.c:678 +#: builtin/submodule--helper.c:712 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -13552,54 +13772,143 @@ msgstr "" "Usar el commit guardado en el índice en lugar del guardado en el submódulo " "HEAD" -#: builtin/submodule--helper.c:679 +#: builtin/submodule--helper.c:713 msgid "recurse into nested submodules" msgstr "recursar en submódulos anidados" -#: builtin/submodule--helper.c:684 +#: builtin/submodule--helper.c:718 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<ruta>...]" -#: builtin/submodule--helper.c:708 +#: builtin/submodule--helper.c:742 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <ruta>" -#: builtin/submodule--helper.c:796 builtin/submodule--helper.c:799 +#: builtin/submodule--helper.c:806 +#, c-format +msgid "Synchronizing submodule url for '%s'\n" +msgstr "Sincronizando url del submódulo para '%s'\n" + +#: builtin/submodule--helper.c:812 +#, 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:826 +#, c-format +msgid "failed to get the default remote for submodule '%s'" +msgstr "error al conseguir el remoto por defecto para el submódulo '%s'" + +#: builtin/submodule--helper.c:837 +#, c-format +msgid "failed to update remote for submodule '%s'" +msgstr "error al actualizar el remoto para el submódulo '%s'" + +#: builtin/submodule--helper.c:885 +msgid "Suppress output of synchronizing submodule url" +msgstr "Suprime la salida del url del submódulo que se sincroniza" + +#: builtin/submodule--helper.c:887 +msgid "Recurse into nested submodules" +msgstr "Recursar en submódulos anidados" + +#: builtin/submodule--helper.c:892 +msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" +msgstr "git submodule--helper sync [--quiet] [--recursive] [<ruta>]" + +#: builtin/submodule--helper.c:946 +#, c-format +msgid "" +"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " +"really want to remove it including all of its history)" +msgstr "" +"El árbol de trabajo del submódulo '%s' contiene un directorio .git (use 'rm -" +"rf' si realmente quiere removerlo incluyendo todo en su historia)" + +#: builtin/submodule--helper.c:958 +#, c-format +msgid "" +"Submodule work tree '%s' contains local modifications; use '-f' to discard " +"them" +msgstr "" +"El árbol de trabajo del submódulo '%s' contiene modificaciones locales; usa " +"'-f' para descartarlas" + +#: builtin/submodule--helper.c:966 +#, c-format +msgid "Cleared directory '%s'\n" +msgstr "Directorio '%s' limpiado\n" + +#: builtin/submodule--helper.c:968 +#, c-format +msgid "Could not remove submodule work tree '%s'\n" +msgstr "No se pudo eliminar el árbol de trabajo del submódulo '%s'\n" + +#: builtin/submodule--helper.c:977 +#, c-format +msgid "could not create empty submodule directory %s" +msgstr "no se pudo crear directorio vacío de submódulo %s" + +#: builtin/submodule--helper.c:993 +#, c-format +msgid "Submodule '%s' (%s) unregistered for path '%s'\n" +msgstr "Submódulo '%s' (%s) no registrado para ruta '%s'\n" + +#: builtin/submodule--helper.c:1022 +msgid "Remove submodule working trees even if they contain local changes" +msgstr "" +"Remover arboles de trabajo de submódulos incluso si contienen cambios locales" + +#: builtin/submodule--helper.c:1023 +msgid "Unregister all submodules" +msgstr "Quitar todos los submódulos" + +#: builtin/submodule--helper.c:1028 +msgid "" +"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" +msgstr "" +"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<ruta>...]]" + +#: builtin/submodule--helper.c:1042 +msgid "Use '--all' if you really want to deinitialize all submodules" +msgstr "Usa '--all' si realmente quieres des-inicializar todos los submódulos" + +#: builtin/submodule--helper.c:1133 builtin/submodule--helper.c:1136 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "submódulo '%s' no puede agregar alterno: %s" -#: builtin/submodule--helper.c:835 +#: builtin/submodule--helper.c:1172 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Valor '%s' para submodule.alternateErrorStrategy no es reconocido" -#: builtin/submodule--helper.c:842 +#: builtin/submodule--helper.c:1179 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Valor '%s' para submodule.alternateLocation no es reconocido" -#: builtin/submodule--helper.c:864 +#: builtin/submodule--helper.c:1201 msgid "where the new submodule will be cloned to" msgstr "a donde el nuevo submódulo será clonado" -#: builtin/submodule--helper.c:867 +#: builtin/submodule--helper.c:1204 msgid "name of the new submodule" msgstr "nombre del nuevo submódulo" -#: builtin/submodule--helper.c:870 +#: builtin/submodule--helper.c:1207 msgid "url where to clone the submodule from" msgstr "url de dónde clonar el submódulo" -#: builtin/submodule--helper.c:876 +#: builtin/submodule--helper.c:1213 msgid "depth for shallow clones" msgstr "profundidad para clones superficiales" -#: builtin/submodule--helper.c:879 builtin/submodule--helper.c:1250 +#: builtin/submodule--helper.c:1216 builtin/submodule--helper.c:1587 msgid "force cloning progress" msgstr "forzar el proceso de clonado" -#: builtin/submodule--helper.c:884 +#: builtin/submodule--helper.c:1221 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -13608,83 +13917,83 @@ msgstr "" "<repositorio>] [--name <nombre>] [--depth <profundidad>] --url <url> --path " "<ruta>" -#: builtin/submodule--helper.c:915 +#: builtin/submodule--helper.c:1252 #, 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:930 +#: builtin/submodule--helper.c:1267 #, 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:995 +#: builtin/submodule--helper.c:1332 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Ruta de submódulo '%s' no inicializada" -#: builtin/submodule--helper.c:999 +#: builtin/submodule--helper.c:1336 msgid "Maybe you want to use 'update --init'?" msgstr "Tal vez quiere usar 'update --init'?" -#: builtin/submodule--helper.c:1028 +#: builtin/submodule--helper.c:1365 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Saltando submódulo %s no fusionado" -#: builtin/submodule--helper.c:1057 +#: builtin/submodule--helper.c:1394 #, c-format msgid "Skipping submodule '%s'" msgstr "Saltando submódulo '%s'" -#: builtin/submodule--helper.c:1190 +#: builtin/submodule--helper.c:1527 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Falló al clonar '%s'. Reintento programado" -#: builtin/submodule--helper.c:1201 +#: builtin/submodule--helper.c:1538 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Falló al clonar '%s' una segunda vez, abortando" -#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1451 +#: builtin/submodule--helper.c:1568 builtin/submodule--helper.c:1788 msgid "path into the working tree" msgstr "ruta hacia el árbol de trabajo" -#: builtin/submodule--helper.c:1234 +#: builtin/submodule--helper.c:1571 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:1238 +#: builtin/submodule--helper.c:1575 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout o none" -#: builtin/submodule--helper.c:1242 +#: builtin/submodule--helper.c:1579 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:1245 +#: builtin/submodule--helper.c:1582 msgid "parallel jobs" msgstr "trabajos paralelos" -#: builtin/submodule--helper.c:1247 +#: builtin/submodule--helper.c:1584 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:1248 +#: builtin/submodule--helper.c:1585 msgid "don't print cloning progress" msgstr "no mostrar el progreso de clonado" -#: builtin/submodule--helper.c:1255 +#: builtin/submodule--helper.c:1592 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update_clone [--prefix=<ruta>] [<ruta>...]" -#: builtin/submodule--helper.c:1268 +#: builtin/submodule--helper.c:1605 msgid "bad value for update parameter" msgstr "mal valor para parámetro update" -#: builtin/submodule--helper.c:1336 +#: builtin/submodule--helper.c:1673 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -13693,20 +14002,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:1452 +#: builtin/submodule--helper.c:1789 msgid "recurse into submodules" msgstr "recurrir a submódulos" -#: builtin/submodule--helper.c:1458 +#: builtin/submodule--helper.c:1795 msgid "git submodule--helper embed-git-dir [<path>...]" msgstr "git submodule--helper embed-git-dir [<ruta>...]" -#: builtin/submodule--helper.c:1517 +#: builtin/submodule--helper.c:1857 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s no soporta --super-prefix" -#: builtin/submodule--helper.c:1523 +#: builtin/submodule--helper.c:1863 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' no es un comando submodule--helper valido" @@ -13811,139 +14120,143 @@ msgstr "incapaz de firmar tag" msgid "unable to write tag file" msgstr "incapaz de escribir el archivo de tag" -#: builtin/tag.c:215 +#: builtin/tag.c:216 msgid "bad object type." msgstr "tipo de objeto erróneo." -#: builtin/tag.c:261 +#: builtin/tag.c:265 msgid "no tag message?" msgstr "¿Sin mensaje de tag?" -#: builtin/tag.c:268 +#: builtin/tag.c:272 #, c-format msgid "The tag message has been left in %s\n" msgstr "El mensaje del tag ha sido dejado en %s\n" -#: builtin/tag.c:376 +#: builtin/tag.c:381 msgid "list tag names" msgstr "listar nombres de tags" -#: builtin/tag.c:378 +#: builtin/tag.c:383 msgid "print <n> lines of each tag message" msgstr "imprimir <n> líneas de cada mensaje de tag" -#: builtin/tag.c:380 +#: builtin/tag.c:385 msgid "delete tags" msgstr "eliminar tags" -#: builtin/tag.c:381 +#: builtin/tag.c:386 msgid "verify tags" msgstr "verificar tags" -#: builtin/tag.c:383 +#: builtin/tag.c:388 msgid "Tag creation options" msgstr "Opciones de creación de tags" -#: builtin/tag.c:385 +#: builtin/tag.c:390 msgid "annotated tag, needs a message" msgstr "tags anotadas necesitan un mensaje" -#: builtin/tag.c:387 +#: builtin/tag.c:392 msgid "tag message" msgstr "mensaje de tag" -#: builtin/tag.c:389 +#: builtin/tag.c:394 +msgid "force edit of tag message" +msgstr "forzar la edición del mensaje de tag" + +#: builtin/tag.c:395 msgid "annotated and GPG-signed tag" msgstr "tag anotado y firmado con GPG" -#: builtin/tag.c:393 +#: builtin/tag.c:399 msgid "use another key to sign the tag" msgstr "usar otra clave para firmar el tag" -#: builtin/tag.c:394 +#: builtin/tag.c:400 msgid "replace the tag if exists" msgstr "remplazar tag si existe" -#: builtin/tag.c:395 builtin/update-ref.c:368 +#: builtin/tag.c:401 builtin/update-ref.c:368 msgid "create a reflog" msgstr "crear un reflog" -#: builtin/tag.c:397 +#: builtin/tag.c:403 msgid "Tag listing options" msgstr "Opciones de listado de tag" -#: builtin/tag.c:398 +#: builtin/tag.c:404 msgid "show tag list in columns" msgstr "mostrar lista de tags en columnas" -#: builtin/tag.c:399 builtin/tag.c:401 +#: builtin/tag.c:405 builtin/tag.c:407 msgid "print only tags that contain the commit" msgstr "mostrar solo tags que contienen el commit" -#: builtin/tag.c:400 builtin/tag.c:402 +#: builtin/tag.c:406 builtin/tag.c:408 msgid "print only tags that don't contain the commit" msgstr "mostrar solo tags que no contienen el commit" -#: builtin/tag.c:403 +#: builtin/tag.c:409 msgid "print only tags that are merged" msgstr "sólo imprimir las tags que están fusionadas" -#: builtin/tag.c:404 +#: builtin/tag.c:410 msgid "print only tags that are not merged" msgstr "sólo imprimir las tags que no están fusionadas" -#: builtin/tag.c:409 +#: builtin/tag.c:415 msgid "print only tags of the object" msgstr "sólo imprimir tags de el objeto" -#: builtin/tag.c:453 +#: builtin/tag.c:459 msgid "--column and -n are incompatible" msgstr "--column y -n son incompatibles" -#: builtin/tag.c:475 +#: builtin/tag.c:481 msgid "-n option is only allowed in list mode" msgstr "opción -n solo es permitida en modo lista" -#: builtin/tag.c:477 +#: builtin/tag.c:483 msgid "--contains option is only allowed in list mode" msgstr "opción --contains solo es permitido en modo lista" -#: builtin/tag.c:479 +#: builtin/tag.c:485 msgid "--no-contains option is only allowed in list mode" msgstr "opción --no-contains solo es permitida en modo lista" -#: builtin/tag.c:481 +#: builtin/tag.c:487 msgid "--points-at option is only allowed in list mode" msgstr "opción --points-at solo es permitida en modo lista" -#: builtin/tag.c:483 +#: builtin/tag.c:489 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "opciones --merged y --no-merged solo están permitidas en modo lista" -#: builtin/tag.c:494 +#: builtin/tag.c:500 msgid "only one -F or -m option is allowed." msgstr "sólo se permite una de las opciones, -m ó -F." -#: builtin/tag.c:513 +#: builtin/tag.c:519 msgid "too many params" msgstr "demasiados parámetros" -#: builtin/tag.c:519 +#: builtin/tag.c:525 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' no es un nombre de tag válido." -#: builtin/tag.c:524 +#: builtin/tag.c:530 #, c-format msgid "tag '%s' already exists" msgstr "el tag '%s' ya existe" -#: builtin/tag.c:554 +#: builtin/tag.c:561 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Etiqueta '%s' actualizada (era %s)\n" -#: builtin/unpack-objects.c:494 +#: builtin/unpack-objects.c:498 msgid "Unpacking objects" msgstr "Desempaquetando objetos" @@ -14281,8 +14594,8 @@ msgid "print tag contents" msgstr "imprimir contenido del tag" #: builtin/worktree.c:17 -msgid "git worktree add [<options>] <path> [<branch>]" -msgstr "git worktree add [<opciones>] <ruta> [<rama>]" +msgid "git worktree add [<options>] <path> [<commit-ish>]" +msgstr "git worktree add [<opciones>] <ruta> [<commit-ish>]" #: builtin/worktree.c:18 msgid "git worktree list [<options>]" @@ -14293,29 +14606,37 @@ msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<opciones>] <ruta>" #: builtin/worktree.c:20 +msgid "git worktree move <worktree> <new-path>" +msgstr "git worktree move <worktree> <nueva-ruta>" + +#: builtin/worktree.c:21 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<opciones>]" -#: builtin/worktree.c:21 +#: builtin/worktree.c:22 +msgid "git worktree remove [<options>] <worktree>" +msgstr "git worktree remove [<opciones>] <worktree>" + +#: builtin/worktree.c:23 msgid "git worktree unlock <path>" msgstr "git worktree unlock <ruta>" -#: builtin/worktree.c:58 +#: builtin/worktree.c:60 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Removiendo el worktrees/%s: no es un directorio válido" -#: builtin/worktree.c:64 +#: builtin/worktree.c:66 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Removiendo worktrees/%s: archivo gitdir no existe" -#: builtin/worktree.c:69 builtin/worktree.c:78 +#: builtin/worktree.c:71 builtin/worktree.c:80 #, 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:88 +#: builtin/worktree.c:90 #, c-format msgid "" "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " @@ -14324,107 +14645,187 @@ msgstr "" "Removiendo árboles de trabajo/%s: lectura corta (se esperan %<PRIuMAX> " "bytes, %<PRIuMAX> leídos)" -#: builtin/worktree.c:96 +#: builtin/worktree.c:98 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Removiendo worktrees/%s: archivo gitdir inválido" -#: builtin/worktree.c:112 +#: builtin/worktree.c:114 #, 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:159 +#: builtin/worktree.c:161 msgid "report pruned working trees" msgstr "reporta árboles de trabajo recortados" -#: builtin/worktree.c:161 +#: builtin/worktree.c:163 msgid "expire working trees older than <time>" msgstr "expirar árboles de trabajo más viejos a <tiempo>" -#: builtin/worktree.c:236 +#: builtin/worktree.c:238 #, c-format msgid "'%s' already exists" msgstr "'%s' ya existe" -#: builtin/worktree.c:267 +#: builtin/worktree.c:269 #, c-format msgid "could not create directory of '%s'" msgstr "no se pudo crear directorio de '%s'" -#: builtin/worktree.c:306 +#: builtin/worktree.c:308 #, c-format msgid "Preparing %s (identifier %s)" msgstr "Preparando %s (identificador %s)" -#: builtin/worktree.c:368 +#: builtin/worktree.c:385 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:370 +#: builtin/worktree.c:388 msgid "create a new branch" msgstr "crear una nueva rama" -#: builtin/worktree.c:372 +#: builtin/worktree.c:390 msgid "create or reset a branch" msgstr "crear o restablecer una rama" -#: builtin/worktree.c:374 +#: builtin/worktree.c:392 msgid "populate the new working tree" msgstr "popular el nuevo árbol de trabajo" -#: builtin/worktree.c:375 +#: builtin/worktree.c:393 msgid "keep the new working tree locked" msgstr "mantener el nuevo árbol de trabajo bloqueado" -#: builtin/worktree.c:377 +#: builtin/worktree.c:395 msgid "set up tracking mode (see git-branch(1))" msgstr "configurando modo tracking (mirar git-branch(1))" -#: builtin/worktree.c:380 +#: builtin/worktree.c:398 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 +#: builtin/worktree.c:406 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B, y --detach son mutuamente exclusivas" -#: builtin/worktree.c:453 +#: builtin/worktree.c:471 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 +#: builtin/worktree.c:571 msgid "reason for locking" msgstr "razón para bloquear" -#: builtin/worktree.c:565 builtin/worktree.c:598 +#: builtin/worktree.c:583 builtin/worktree.c:616 builtin/worktree.c:670 +#: builtin/worktree.c:809 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' no es un árbol de trabajo" -#: builtin/worktree.c:567 builtin/worktree.c:600 +#: builtin/worktree.c:585 builtin/worktree.c:618 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:572 +#: builtin/worktree.c:590 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' ya está bloqueado; razón: %s" -#: builtin/worktree.c:574 +#: builtin/worktree.c:592 #, c-format msgid "'%s' is already locked" msgstr "'%s' ya está bloqueado" -#: builtin/worktree.c:602 +#: builtin/worktree.c:620 #, c-format msgid "'%s' is not locked" msgstr "'%s' no está bloqueado" +#: builtin/worktree.c:645 +msgid "working trees containing submodules cannot be moved or removed" +msgstr "" +"árboles de trabajo conteniendo submódulos no puede ser movidos o removidos" + +#: builtin/worktree.c:672 builtin/worktree.c:811 +#, c-format +msgid "'%s' is a main working tree" +msgstr "'%s' es un árbol de trabajo principal" + +#: builtin/worktree.c:677 +#, c-format +msgid "could not figure out destination name from '%s'" +msgstr "no se pudo descubrir el nombre de destino de '%s'" + +#: builtin/worktree.c:683 +#, c-format +msgid "target '%s' already exists" +msgstr "el objetivo '%s' ya existe" + +#: builtin/worktree.c:690 +#, c-format +msgid "cannot move a locked working tree, lock reason: %s" +msgstr "" +"no se puede mover un árbol de trabajo encerrado, motivo del encierro: %s" + +#: builtin/worktree.c:692 +msgid "cannot move a locked working tree" +msgstr "no se puede mover un árbol de trabajo encerrado" + +#: builtin/worktree.c:695 +#, c-format +msgid "validation failed, cannot move working tree: %s" +msgstr "falló validación, no se puede mover el árbol de trabajo: %s" + +#: builtin/worktree.c:700 +#, c-format +msgid "failed to move '%s' to '%s'" +msgstr "fallo al mover '%s' a '%s'" + +#: builtin/worktree.c:748 +#, c-format +msgid "failed to run 'git status' on '%s'" +msgstr "falló al ejecutar 'git status' en '%s'" + +#: builtin/worktree.c:752 +#, c-format +msgid "'%s' is dirty, use --force to delete it" +msgstr "'%s' está sucio, use --force para borrarlo" + +#: builtin/worktree.c:757 +#, c-format +msgid "failed to run 'git status' on '%s', code %d" +msgstr "no se pudo ejecutar 'git status' en '%s', código %d" + +#: builtin/worktree.c:768 builtin/worktree.c:782 +#, c-format +msgid "failed to delete '%s'" +msgstr "fallo al borrar '%s'" + +#: builtin/worktree.c:794 +msgid "force removing even if the worktree is dirty" +msgstr "forzar remoción incluso si el árbol de trabajo está sucio" + +#: builtin/worktree.c:815 +#, c-format +msgid "cannot remove a locked working tree, lock reason: %s" +msgstr "" +"no se pueden remover árbol de trabajo encerrado, razón del encierro: %s" + +#: builtin/worktree.c:817 +msgid "cannot remove a locked working tree" +msgstr "no se puede remover árbol de trabajo encerrado" + +#: builtin/worktree.c:820 +#, c-format +msgid "validation failed, cannot remove working tree: %s" +msgstr "falló validación, no se puede remover árbol de trabajo: %s" + #: builtin/write-tree.c:14 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "git write-tree [--missing-ok] [--prefix=<prefijo>/]" @@ -14441,23 +14842,23 @@ msgstr "escribir objeto de árbol para un subdirectorio <prefijo>" msgid "only useful for debugging" msgstr "sólo útil para depurar" -#: upload-pack.c:24 +#: upload-pack.c:27 msgid "git upload-pack [<options>] <dir>" msgstr "git upload-pack [<opciones>] <directorio>" -#: upload-pack.c:1041 +#: upload-pack.c:1070 msgid "quit after a single request/response exchange" msgstr "sale después de un intercambio petición/respuesta único" -#: upload-pack.c:1043 +#: upload-pack.c:1072 msgid "exit immediately after initial ref advertisement" msgstr "salir inmediatamente tras el anuncio inicial de ref" -#: upload-pack.c:1045 +#: upload-pack.c:1074 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:1047 +#: upload-pack.c:1076 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "interrumpir transferencia tras <n> segundos de inactividad" @@ -14479,6 +14880,20 @@ msgstr "" msgid "print debugging messages to stderr" msgstr "mostrar mensajes de debug en stderr" +#: git.c:8 +msgid "" +"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" +" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" +" [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n" +" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" +" <command> [<args>]" +msgstr "" +"git [--version] [--help] [-C <ruta>] [-c <nombre>=<valor>]\n" +" [--exec-path[=<ruta>]] [--html-path] [--man-path] [--info-path]\n" +" [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n" +" [--git-dir=<ruta>] [--work-tree=<ruta>] [--namespace=<nombre>]\n" +" <comando> [<args>]" + #: git.c:15 msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" @@ -14489,20 +14904,65 @@ 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:339 +#: git.c:95 +#, c-format +msgid "no directory given for --git-dir\n" +msgstr "no se entregó directorio para --git-dir\n" + +#: git.c:109 +#, c-format +msgid "no namespace given for --namespace\n" +msgstr "no se entregó namespace para --namespace\n" + +#: git.c:123 +#, c-format +msgid "no directory given for --work-tree\n" +msgstr "no se entregó directorio para --work-tree\n" + +#: git.c:137 +#, c-format +msgid "no prefix given for --super-prefix\n" +msgstr "no se entregó prefijo para --super-prefix\n" + +#: git.c:159 +#, c-format +msgid "-c expects a configuration string\n" +msgstr "-c espera un string de configuración\n" + +#: git.c:197 +#, c-format +msgid "no directory given for -C\n" +msgstr "no se entregó directorio para -C\n" + +#: git.c:212 +#, c-format +msgid "unknown option: %s\n" +msgstr "opción %s desconocida\n" + +#: git.c:687 +#, c-format +msgid "expansion of alias '%s' failed; '%s' is not a git command\n" +msgstr "expansión del alias '%s' falló; '%s' no es un comando de git\n" + +#: git.c:699 +#, c-format +msgid "failed to run command '%s': %s\n" +msgstr "fallo al ejecutar comando '%s': %s\n" + +#: http.c:342 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "valor negativo para http.postbuffer; poniendo el default a %d" -#: http.c:360 +#: http.c:363 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:369 +#: http.c:372 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:1791 +#: http.c:1857 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -14513,16 +14973,16 @@ msgstr "" " preguntaba por: %s\n" " redireccionamiento: %s" -#: remote-curl.c:324 +#: remote-curl.c:345 #, c-format msgid "redirecting to %s" msgstr "redirigiendo a %s" -#: list-objects-filter-options.h:54 +#: list-objects-filter-options.h:59 msgid "args" msgstr "args" -#: list-objects-filter-options.h:55 +#: list-objects-filter-options.h:60 msgid "object filtering" msgstr "filtrado de objeto" @@ -14552,7 +15012,7 @@ msgstr "Agrega contenido de carpetas al índice" #: common-cmds.h:18 msgid "Use binary search to find the commit that introduced a bug" -msgstr "use la búsqueda 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" @@ -14630,23 +15090,23 @@ msgstr "Muestra el estado del árbol de trabajo" msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "Crea, lista, borra o verifica un tag de objeto firmado con GPG" -#: parse-options.h:145 +#: parse-options.h:157 msgid "expiry-date" msgstr "fecha de expiración" -#: parse-options.h:160 +#: parse-options.h:172 msgid "no-op (backward compatibility)" msgstr "no-op (compatibilidad con versiones anteriores)" -#: parse-options.h:238 +#: parse-options.h:250 msgid "be more verbose" msgstr "ser mas verboso" -#: parse-options.h:240 +#: parse-options.h:252 msgid "be more quiet" msgstr "ser mas discreto" -#: parse-options.h:246 +#: parse-options.h:258 msgid "use <n> digits to display SHA-1s" msgstr "usa <n> dígitos para mostrar SHA-1s" @@ -14665,7 +15125,7 @@ msgstr "Debes iniciar con \"git bisect start\"" #. at this point. #: git-bisect.sh:60 msgid "Do you want me to do it for you [Y/n]? " -msgstr "¿Quieres que lo haga por ti [Y/n]?" +msgstr "¿Quieres que lo haga por ti [Y/n]? " #: git-bisect.sh:121 #, sh-format @@ -14731,7 +15191,7 @@ msgstr "Peligro: bisecando solo con un $TERM_BAD commit." #. at this point. #: git-bisect.sh:312 msgid "Are you sure [Y/n]? " -msgstr "¿Estás seguro [Y/n]?" +msgstr "¿Estás seguro [Y/n]? " #: git-bisect.sh:324 #, sh-format @@ -14786,7 +15246,7 @@ msgstr "?? ¿De qué estás hablando?" #: git-bisect.sh:453 msgid "bisect run failed: no command provided." -msgstr "bisect falló: no se proveyó comando" +msgstr "bisect falló: no se proveyó comando." #: git-bisect.sh:458 #, sh-format @@ -14823,7 +15283,7 @@ msgstr "bisect exitoso" #, 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" +"Comando inválido: actualmente se encuentra en un bisect $TERM_BAD/$TERM_GOOD." #: git-bisect.sh:567 msgid "no terms defined" @@ -14853,7 +15313,7 @@ msgstr "Fusión automatizada no funcionó." #: git-merge-octopus.sh:62 msgid "Should not be doing an octopus." -msgstr "No debería hacer un pulpo" +msgstr "No debería hacer un pulpo." #: git-merge-octopus.sh:73 #, sh-format @@ -14879,7 +15339,7 @@ msgstr "Intentando fusión simple con $pretty_name" msgid "Simple merge did not work, trying automatic merge." msgstr "Fusión simple no funcionó, intentando fusión automática." -#: git-rebase.sh:58 +#: git-rebase.sh:60 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -14894,42 +15354,42 @@ msgstr "" "Para abortar y regresar al estado previo al \"git rebase\", ejecute \"git " "rebase --abort\"." -#: git-rebase.sh:160 git-rebase.sh:402 +#: git-rebase.sh:163 git-rebase.sh:409 #, sh-format msgid "Could not move back to $head_name" msgstr "No se puede regresar a $head_name" -#: git-rebase.sh:171 +#: git-rebase.sh:174 msgid "Applied autostash." msgstr "Autostash aplicado." -#: git-rebase.sh:174 +#: git-rebase.sh:177 #, sh-format msgid "Cannot store $stash_sha1" msgstr "No se puede almacenar $stash_sha1" -#: git-rebase.sh:214 +#: git-rebase.sh:218 msgid "The pre-rebase hook refused to rebase." msgstr "El hook pre-rebase rechazó el rebase." -#: git-rebase.sh:219 +#: git-rebase.sh:223 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 +#: git-rebase.sh:370 msgid "No rebase in progress?" msgstr "No hay rebase en progreso?" -#: git-rebase.sh:374 +#: git-rebase.sh:381 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "La acción --edit-todo sólo puede ser usada al rebasar interactivamente." -#: git-rebase.sh:381 +#: git-rebase.sh:388 msgid "Cannot read HEAD" msgstr "No se puede leer el HEAD" -#: git-rebase.sh:384 +#: git-rebase.sh:391 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -14937,7 +15397,7 @@ msgstr "" "Tienes que editar todos los conflictos de fusión y luego\n" "marcarlos como resueltos usando git add" -#: git-rebase.sh:424 +#: git-rebase.sh:435 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -14958,75 +15418,76 @@ msgstr "" "y ejecúteme nuevamente. Me estoy deteniendo en caso de que tenga\n" "algo de valor ahí." -#: git-rebase.sh:480 +#: git-rebase.sh:491 #, sh-format msgid "invalid upstream '$upstream_name'" msgstr "upstream inválido '$upstream_name'" -#: git-rebase.sh:504 +#: git-rebase.sh:515 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: hay más de una base de fusión" -#: git-rebase.sh:507 git-rebase.sh:511 +#: git-rebase.sh:518 git-rebase.sh:522 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: no hay base de fusión" -#: git-rebase.sh:516 +#: git-rebase.sh:527 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "No apunta a un commit válido: $onto_name" -#: git-rebase.sh:542 +#: git-rebase.sh:553 #, sh-format msgid "fatal: no such branch/commit '$branch_name'" msgstr "fatal: no existe la rama/commit: '$branch_name'" -#: git-rebase.sh:575 +#: git-rebase.sh:586 msgid "Cannot autostash" msgstr "No se puede ejecutar autostash" -#: git-rebase.sh:580 +#: git-rebase.sh:591 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Autostash creado: $stash_abbrev" -#: git-rebase.sh:584 +#: git-rebase.sh:595 msgid "Please commit or stash them." msgstr "Por favor, confírmalos o guárdalos." -#: git-rebase.sh:607 +#: git-rebase.sh:618 #, sh-format msgid "HEAD is up to date." -msgstr "HEAD está actualizado" +msgstr "HEAD está actualizado." -#: git-rebase.sh:609 +#: git-rebase.sh:620 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "La rama actual $branch_name está actualizada." -#: git-rebase.sh:617 +#: git-rebase.sh:628 #, sh-format msgid "HEAD is up to date, rebase forced." msgstr "HEAD está actualizado, rebase forzado." -#: git-rebase.sh:619 +#: git-rebase.sh:630 #, 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:631 +#: git-rebase.sh:642 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Cambios desde $mb a $onto:" -#: git-rebase.sh:640 +#: git-rebase.sh:651 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..." +"En primer lugar, rebobinando HEAD para después reproducir tus cambios encima " +"de ésta..." -#: git-rebase.sh:650 +#: git-rebase.sh:661 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "Avance rápido de $branch_name a $onto_name." @@ -15037,7 +15498,7 @@ msgstr "git stash clear con parámetros no está implementado" #: git-stash.sh:108 msgid "You do not have the initial commit yet" -msgstr "Aún no tienes un commit inicial." +msgstr "Aún no tienes un commit inicial" #: git-stash.sh:123 msgid "Cannot save the current index state" @@ -15094,86 +15555,86 @@ msgstr "No se puede guardar el estado actual" msgid "Saved working directory and index state $stash_msg" msgstr "Directorio de trabajo guardado y estado de índice $stash_msg" -#: git-stash.sh:341 +#: git-stash.sh:340 msgid "Cannot remove worktree changes" msgstr "No se pueden remover cambios del árbol de trabajo" -#: git-stash.sh:489 +#: git-stash.sh:488 #, sh-format msgid "unknown option: $opt" msgstr "opción desconocida: $opt" -#: git-stash.sh:502 +#: git-stash.sh:501 msgid "No stash entries found." msgstr "No se encontraron entradas de stash." -#: git-stash.sh:509 +#: git-stash.sh:508 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Se especificaron demasiadas revisiones: $REV" -#: git-stash.sh:524 +#: git-stash.sh:523 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference no es una referencia válida" -#: git-stash.sh:552 +#: git-stash.sh:551 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args' no es un commit estilo stash" -#: git-stash.sh:563 +#: git-stash.sh:562 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args' no es una referencia stash" -#: git-stash.sh:571 +#: git-stash.sh:570 msgid "unable to refresh index" msgstr "incapaz de refrescar el índice" -#: git-stash.sh:575 +#: git-stash.sh:574 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:583 +#: git-stash.sh:582 msgid "Conflicts in index. Try without --index." msgstr "Conflictos en índice. Intente sin --index." -#: git-stash.sh:585 +#: git-stash.sh:584 msgid "Could not save index tree" msgstr "No se puede guardar el índice del árbol" -#: git-stash.sh:594 +#: git-stash.sh:593 msgid "Could not restore untracked files from stash entry" msgstr "No se pueden restaurar archivos no rastreados de la entrada stash" -#: git-stash.sh:619 +#: git-stash.sh:618 msgid "Cannot unstage modified files" msgstr "No se puede sacar de stage archivos modificados" -#: git-stash.sh:634 +#: git-stash.sh:633 msgid "Index was not unstashed." msgstr "El índice no fue sacado de stash." -#: git-stash.sh:648 +#: git-stash.sh:647 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:657 +#: git-stash.sh:656 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Botado ${REV} ($s)" -#: git-stash.sh:658 +#: git-stash.sh:657 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: No se pudo borrar entrada stash" -#: git-stash.sh:666 +#: git-stash.sh:665 msgid "No branch name specified" -msgstr "No se especificó el nombre de la rama." +msgstr "No se especificó el nombre de la rama" -#: git-stash.sh:745 +#: git-stash.sh:744 msgid "(To restore them type \"git stash apply\")" msgstr "(Para restaurarlos, escribe \"git stash apply\")" @@ -15186,7 +15647,7 @@ msgstr "" #: git-submodule.sh:191 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" -msgstr "URL del repositorio: '$repo' debe ser absoluta o iniciar con ./|../" +msgstr "repo URL: '$repo' debe ser absoluta o iniciar con ./|../" #: git-submodule.sh:210 #, sh-format @@ -15212,7 +15673,7 @@ msgstr "" #: git-submodule.sh:237 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" -msgstr "Agregar al índice el repositorio existente en '$sm_path'" +msgstr "Agregando el repositorio existente en '$sm_path' al índice" #: git-submodule.sh:239 #, sh-format @@ -15274,69 +15735,19 @@ msgid "Stopping at '$displaypath'; script returned non-zero status." msgstr "" "Deteniendo en '$displaypath'; script retornó un status distinto de cero." -#: git-submodule.sh:433 -#, sh-format -msgid "pathspec and --all are incompatible" -msgstr "pathspec y --all son incompatibles" - -#: git-submodule.sh:438 -#, sh-format -msgid "Use '--all' if you really want to deinitialize all submodules" -msgstr "Usa '--all' si realmente quieres des-inicializar todos los submódulos" - -#: git-submodule.sh:458 -#, sh-format -msgid "" -"Submodule work tree '$displaypath' contains a .git directory\n" -"(use 'rm -rf' if you really want to remove it including all of its history)" -msgstr "" -"El árbol de trabajo del submódulo '$displaypath' contiene un directorio ." -"git \n" -"(use 'rm -rf' si realmente quiere removerlo incluyendo todo en su historia)" - -#: git-submodule.sh:466 -#, sh-format -msgid "" -"Submodule work tree '$displaypath' contains local modifications; use '-f' to " -"discard them" -msgstr "" -"El árbol de trabajo '$displaypath' contiene modificaciones locales; usa '-f' " -"para descartarlos" - -#: git-submodule.sh:469 -#, sh-format -msgid "Cleared directory '$displaypath'" -msgstr "Directorio '$displaypath' limpiado" - -#: git-submodule.sh:470 -#, sh-format -msgid "Could not remove submodule work tree '$displaypath'" -msgstr "No se pudo eliminar el árbol de trabajo del submódulo '$displaypath'" - -#: git-submodule.sh:473 -#, sh-format -msgid "Could not create empty submodule directory '$displaypath'" -msgstr "No se pudo crear el directorio vacío '$displaypath' para el submódulo" - -#: git-submodule.sh:482 -#, sh-format -msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" -msgstr "" -"Anulado el registro del submódulo '$name' ($url) para la ruta '$displaypath'" - -#: git-submodule.sh:637 +#: git-submodule.sh:584 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" "No se pudo encontrar la revisión actual en la ruta de submódulo " "'$displaypath'" -#: git-submodule.sh:647 +#: git-submodule.sh:594 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "No es posible realizar fetch en la ruta de submódulo '$sm_path'" -#: git-submodule.sh:652 +#: git-submodule.sh:599 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -15345,12 +15756,12 @@ msgstr "" "No es posible encontrar revisión actual ${remote_name}/${branch} en la ruta " "de submódulo '$sm_path'" -#: git-submodule.sh:670 +#: git-submodule.sh:617 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "No es posible realizar fetch en la ruta de submódulo '$displaypath'" -#: git-submodule.sh:676 +#: git-submodule.sh:623 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -15359,84 +15770,79 @@ msgstr "" "Fetch realizado en ruta de submódulo '$displaypath', pero no contenía $sha1. " "Fetch directo del commit falló." -#: git-submodule.sh:683 +#: git-submodule.sh:630 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "No es posible revisar '$sha1' en la ruta de submódulo '$displaypath'" -#: git-submodule.sh:684 +#: git-submodule.sh:631 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Ruta de submódulo '$displaypath': check out realizado a '$sha1'" -#: git-submodule.sh:688 +#: git-submodule.sh:635 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" "No se posible ejecutar rebase a '$sha1' en la ruta de submódulo " "'$displaypath'" -#: git-submodule.sh:689 +#: git-submodule.sh:636 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Ruta de submódulo '$displaypath': rebasada en '$sha1'" -#: git-submodule.sh:694 +#: git-submodule.sh:641 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" -msgstr "Incapaz de fusionar '$sha1' en la ruta '$displaypath' del submódulo" +msgstr "Incapaz de fusionar '$sha1' en la ruta del submódulo '$displaypath'" -#: git-submodule.sh:695 +#: git-submodule.sh:642 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Ruta de submódulo '$displaypath': fusionada en '$sha1'" -#: git-submodule.sh:700 +#: git-submodule.sh:647 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "Falló la ejecución de '$command $sha1' en la ruta de submódulo " "'$displaypath'" -#: git-submodule.sh:701 +#: git-submodule.sh:648 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Ruta de submódulo '$displaypath': '$command $sha1'" -#: git-submodule.sh:732 +#: git-submodule.sh:679 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Falló al recurrir en la ruta de submódulo '$displaypath'" -#: git-submodule.sh:828 +#: git-submodule.sh:775 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:880 +#: git-submodule.sh:827 #, sh-format msgid "unexpected mode $mod_dst" msgstr "modo $mod_dst inesperado" -#: git-submodule.sh:900 +#: git-submodule.sh:847 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Advertencia: $display_name no contiene el commit $sha1_src" -#: git-submodule.sh:903 +#: git-submodule.sh:850 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Advertencia: $display_name no contiene el commit $sha1_dst" -#: git-submodule.sh:906 +#: git-submodule.sh:853 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" -"Advertencia: $display_name no contiene los commits $sha1_src y $sha1_dst" - -#: git-submodule.sh:1077 -#, sh-format -msgid "Synchronizing submodule url for '$displaypath'" -msgstr "Sincronizando url de submódulo para '$displaypath'" +" Advertencia: $display_name no contiene los commits $sha1_src y $sha1_dst" #: git-parse-remote.sh:89 #, sh-format @@ -15491,7 +15897,7 @@ msgstr "" "\n" "Si remueves una línea aquí EL COMMIT SE PERDERÁ.\n" -#: git-rebase--interactive.sh:211 +#: git-rebase--interactive.sh:213 #, sh-format msgid "" "You can amend the commit now, with\n" @@ -15510,83 +15916,83 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--interactive.sh:236 +#: git-rebase--interactive.sh:238 #, sh-format msgid "$sha1: not a commit that can be picked" msgstr "$sha1: no es un commit que pueda ser cogido" -#: git-rebase--interactive.sh:275 +#: git-rebase--interactive.sh:277 #, sh-format msgid "Invalid commit name: $sha1" msgstr "Nombre de commit inválido: $sha1" -#: git-rebase--interactive.sh:317 +#: git-rebase--interactive.sh:319 msgid "Cannot write current commit's replacement sha1" msgstr "No se puede escribir el remplazo sha1 del commit actual" -#: git-rebase--interactive.sh:369 +#: git-rebase--interactive.sh:371 #, sh-format msgid "Fast-forward to $sha1" msgstr "Avance rápido a $sha1" -#: git-rebase--interactive.sh:371 +#: git-rebase--interactive.sh:373 #, sh-format msgid "Cannot fast-forward to $sha1" msgstr "No se puede realizar avance rápido a $sha1" -#: git-rebase--interactive.sh:380 +#: git-rebase--interactive.sh:382 #, sh-format msgid "Cannot move HEAD to $first_parent" msgstr "No se puede mover HEAD a $first_parent" -#: git-rebase--interactive.sh:385 +#: git-rebase--interactive.sh:387 #, sh-format msgid "Refusing to squash a merge: $sha1" msgstr "Rehusando a ejecutar squash en fusión: $sha1" -#: git-rebase--interactive.sh:400 +#: git-rebase--interactive.sh:405 #, sh-format msgid "Error redoing merge $sha1" msgstr "Error rehaciendo fusión $sha1" -#: git-rebase--interactive.sh:408 +#: git-rebase--interactive.sh:414 #, sh-format msgid "Could not pick $sha1" msgstr "No se pudo coger $sha1" -#: git-rebase--interactive.sh:417 +#: git-rebase--interactive.sh:423 #, sh-format msgid "This is the commit message #${n}:" msgstr "Este es el mensaje del commit #${n}:" -#: git-rebase--interactive.sh:422 +#: git-rebase--interactive.sh:428 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "El mensaje del commit #${n} será ignorado:" -#: git-rebase--interactive.sh:433 +#: git-rebase--interactive.sh:439 #, 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 commit." msgstr[1] "Esta es la combinación de $count commits." -#: git-rebase--interactive.sh:442 +#: git-rebase--interactive.sh:448 #, sh-format msgid "Cannot write $fixup_msg" msgstr "No se puede escribir $fixup_msg" -#: git-rebase--interactive.sh:445 +#: git-rebase--interactive.sh:451 msgid "This is a combination of 2 commits." msgstr "Esto es una combinación de 2 commits." -#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529 -#: git-rebase--interactive.sh:532 +#: git-rebase--interactive.sh:492 git-rebase--interactive.sh:535 +#: git-rebase--interactive.sh:538 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "No se puede aplicar $sha1... $rest" -#: git-rebase--interactive.sh:560 +#: git-rebase--interactive.sh:567 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -15603,31 +16009,31 @@ msgstr "" "problema antes\n" "de que sea capaz de reformular el commit." -#: git-rebase--interactive.sh:575 +#: git-rebase--interactive.sh:582 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "Detenido en $sha1_abbrev... $rest" -#: git-rebase--interactive.sh:590 +#: git-rebase--interactive.sh:597 #, sh-format msgid "Cannot '$squash_style' without a previous commit" -msgstr "no se puede '$squash_style' sin un commit previo" +msgstr "No se puede '$squash_style' sin un commit previo" -#: git-rebase--interactive.sh:632 +#: git-rebase--interactive.sh:639 #, sh-format msgid "Executing: $rest" msgstr "Ejecutando: $rest" -#: git-rebase--interactive.sh:640 +#: git-rebase--interactive.sh:647 #, sh-format msgid "Execution failed: $rest" msgstr "Ejecución fallida: $rest" -#: git-rebase--interactive.sh:642 +#: git-rebase--interactive.sh:649 msgid "and made changes to the index and/or the working tree" msgstr "y hizo cambios al índice y/o al árbol de trabajo" -#: git-rebase--interactive.sh:644 +#: git-rebase--interactive.sh:651 msgid "" "You can fix the problem, and then run\n" "\n" @@ -15638,7 +16044,7 @@ msgstr "" "\tgit rebase --continue" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--interactive.sh:657 +#: git-rebase--interactive.sh:664 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -15653,29 +16059,29 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--interactive.sh:668 +#: git-rebase--interactive.sh:675 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "Comando desconocido: $command $sha1 $rest" -#: git-rebase--interactive.sh:669 +#: git-rebase--interactive.sh:676 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "Por favor, corrige esto usando 'git rebase --edit-todo'." -#: git-rebase--interactive.sh:704 +#: git-rebase--interactive.sh:711 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "$head_name rebasado y actualizado satisfactoriamente." -#: git-rebase--interactive.sh:728 +#: git-rebase--interactive.sh:735 msgid "could not detach HEAD" -msgstr "No se puede desacoplar HEAD" +msgstr "no se puede desacoplar HEAD" -#: git-rebase--interactive.sh:763 +#: git-rebase--interactive.sh:771 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "No se pudo remover CHERRY_PICK_HEAD" -#: git-rebase--interactive.sh:768 +#: git-rebase--interactive.sh:776 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -15706,12 +16112,12 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--interactive.sh:785 +#: git-rebase--interactive.sh:793 msgid "Error trying to find the author identity to amend commit" msgstr "" -"Error tratando de encontrar la identidad del autor para remediar el commit " +"Error tratando de encontrar la identidad del autor para remediar el commit" -#: git-rebase--interactive.sh:790 +#: git-rebase--interactive.sh:798 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -15719,11 +16125,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:795 git-rebase--interactive.sh:799 +#: git-rebase--interactive.sh:803 git-rebase--interactive.sh:807 msgid "Could not commit staged changes." -msgstr "No se pudo realizar el commit con los cambios en el área de stage" +msgstr "No se pudo realizar el commit con los cambios en el área de stage." -#: git-rebase--interactive.sh:827 +#: git-rebase--interactive.sh:836 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -15737,44 +16143,44 @@ msgstr "" " git rebase --continue\n" "\n" -#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:995 +#: git-rebase--interactive.sh:844 git-rebase--interactive.sh:1008 msgid "Could not execute editor" msgstr "No se pudo ejecutar el editor" -#: git-rebase--interactive.sh:848 +#: git-rebase--interactive.sh:860 #, sh-format msgid "Could not checkout $switch_to" msgstr "No se pudo actualizar el árbol de trabajo a $switch_to" -#: git-rebase--interactive.sh:853 +#: git-rebase--interactive.sh:865 msgid "No HEAD?" msgstr "¿Sin HEAD?" -#: git-rebase--interactive.sh:854 +#: git-rebase--interactive.sh:866 #, sh-format msgid "Could not create temporary $state_dir" msgstr "No se pudo crear $state_dir temporalmente" -#: git-rebase--interactive.sh:856 +#: git-rebase--interactive.sh:869 msgid "Could not mark as interactive" msgstr "No se pudo marcar como interactivo" -#: git-rebase--interactive.sh:866 git-rebase--interactive.sh:871 +#: git-rebase--interactive.sh:879 git-rebase--interactive.sh:884 msgid "Could not init rewritten commits" msgstr "No se puede inicializar los commits reescritos" -#: git-rebase--interactive.sh:897 +#: git-rebase--interactive.sh:910 msgid "Could not generate todo list" msgstr "No se pudo generar lista de pendientes" -#: git-rebase--interactive.sh:973 +#: git-rebase--interactive.sh:986 #, 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:978 +#: git-rebase--interactive.sh:991 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -15784,7 +16190,7 @@ msgstr "" "Como sea, si se remueve todo, el rebase sera abortado.\n" "\n" -#: git-rebase--interactive.sh:985 +#: git-rebase--interactive.sh:998 msgid "Note that empty commits are commented out" msgstr "Tenga en cuenta que los commits vacíos están comentados" @@ -15813,7 +16219,7 @@ msgstr "" msgid "Cannot rewrite branches: You have unstaged changes." msgstr "" "No se puede reescribir las ramas: Tienes cambios que no están en el área de " -"stage" +"stage." #: git-sh-setup.sh:226 msgid "Cannot pull with rebase: You have unstaged changes." @@ -15824,7 +16230,7 @@ msgstr "" #: git-sh-setup.sh:229 #, sh-format msgid "Cannot $action: You have unstaged changes." -msgstr "No se puede $action: Tienes cambios que no están en el área 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." @@ -15932,7 +16338,7 @@ msgstr "Agregar no rastreados" msgid "No untracked files.\n" msgstr "No hay archivos sin rastrear.\n" -#: git-add--interactive.perl:985 +#: git-add--interactive.perl:1026 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." @@ -15940,7 +16346,7 @@ msgstr "" "Si el parche aplica limpiamente, el hunk editado sera marcado\n" "inmediatamente para el área de stage." -#: git-add--interactive.perl:988 +#: git-add--interactive.perl:1029 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." @@ -15948,7 +16354,7 @@ msgstr "" "Si el parche aplica limpiamente, el hunk editado sera marcado\n" "inmediatamente para aplicar stash." -#: git-add--interactive.perl:991 +#: git-add--interactive.perl:1032 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." @@ -15956,7 +16362,7 @@ msgstr "" "Si el parche aplica limpiamente, el hunk editado sera marcado\n" "inmediatamente para sacar del área de stage." -#: git-add--interactive.perl:994 git-add--interactive.perl:1003 +#: git-add--interactive.perl:1035 git-add--interactive.perl:1044 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." @@ -15964,7 +16370,7 @@ msgstr "" "Si el parche aplica de forma limpia, el hunk editado sera marcado \n" "inmediatamente para aplicar." -#: git-add--interactive.perl:997 git-add--interactive.perl:1000 +#: git-add--interactive.perl:1038 git-add--interactive.perl:1041 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." @@ -15972,16 +16378,16 @@ msgstr "" "Si el parche aplica de forma limpia, el hunk editado sera marcado\n" "inmediatamente para descarte." -#: git-add--interactive.perl:1013 +#: git-add--interactive.perl:1078 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "fallo al abrir el archivo de adición del hunk para escritura: %s" -#: git-add--interactive.perl:1014 +#: git-add--interactive.perl:1079 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "Modo de edición manual de hunk -- vea abajo para una guía rápida.\n" -#: git-add--interactive.perl:1020 +#: git-add--interactive.perl:1085 #, perl-format msgid "" "---\n" @@ -15995,7 +16401,7 @@ msgstr "" "Lineas comenzando con %s serán removidas.\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: git-add--interactive.perl:1028 +#: git-add--interactive.perl:1093 msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" @@ -16005,7 +16411,7 @@ msgstr "" "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 +#: git-add--interactive.perl:1107 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "fallo al abrir el archivo de edición del hunk para lectura: %s" @@ -16016,13 +16422,13 @@ msgstr "fallo al abrir el archivo de edición del hunk para lectura: %s" #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#: git-add--interactive.perl:1134 +#: git-add--interactive.perl:1206 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" "Tu hunk editado no aplica. Editar nuevamente (decir \"no\" descarta!) [y/n]? " -#: git-add--interactive.perl:1143 +#: git-add--interactive.perl:1215 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -16037,7 +16443,7 @@ msgstr "" "d - no aplicar stage a este hunk o a ninguno de los posteriores en este " "archivo" -#: git-add--interactive.perl:1149 +#: git-add--interactive.perl:1221 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -16051,7 +16457,7 @@ msgstr "" "a - aplicar stash a este hunk y a todos los posteriores en el archivo\n" "d - no aplicar stash a este hunk o ninguno de los posteriores en el archivo" -#: git-add--interactive.perl:1155 +#: git-add--interactive.perl:1227 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -16066,7 +16472,7 @@ msgstr "" "d - no sacar del area de stage este hunk o ninguno de los posteriores en el " "archivo" -#: git-add--interactive.perl:1161 +#: git-add--interactive.perl:1233 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -16080,7 +16486,7 @@ msgstr "" "a - aplicar este hunk y todos los posteriores en el archivo\n" "d - no aplicar este hunko ninguno de los posteriores en el archivo" -#: git-add--interactive.perl:1167 +#: git-add--interactive.perl:1239 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -16094,7 +16500,7 @@ msgstr "" "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" -#: git-add--interactive.perl:1173 +#: git-add--interactive.perl:1245 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -16108,7 +16514,7 @@ msgstr "" "a - descartar este hunk y todos los posteriores en este archivo\n" "d - no descartar este hunk o ninguno posterior en el archivo" -#: git-add--interactive.perl:1179 +#: git-add--interactive.perl:1251 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -16122,7 +16528,7 @@ msgstr "" "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" -#: git-add--interactive.perl:1188 +#: git-add--interactive.perl:1266 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -16144,199 +16550,213 @@ msgstr "" "e - editar manualmente el hunk actual\n" "? - imprimir ayuda\n" -#: git-add--interactive.perl:1219 +#: git-add--interactive.perl:1297 msgid "The selected hunks do not apply to the index!\n" msgstr "Los hunks seleccionados no aplican al índice!\n" -#: git-add--interactive.perl:1220 +#: git-add--interactive.perl:1298 msgid "Apply them to the worktree anyway? " -msgstr "Aplicarlos al árbol de trabajo de todas maneras?" +msgstr "Aplicarlos al árbol de trabajo de todas maneras? " -#: git-add--interactive.perl:1223 +#: git-add--interactive.perl:1301 msgid "Nothing was applied.\n" msgstr "Nada fue aplicado.\n" -#: git-add--interactive.perl:1234 +#: git-add--interactive.perl:1312 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "ignorando lo no fusionado: %s\n" -#: git-add--interactive.perl:1243 +#: git-add--interactive.perl:1321 msgid "Only binary files changed.\n" msgstr "Solo cambiaron archivos binarios.\n" -#: git-add--interactive.perl:1245 +#: git-add--interactive.perl:1323 msgid "No changes.\n" msgstr "Sin cambios.\n" -#: git-add--interactive.perl:1253 +#: git-add--interactive.perl:1331 msgid "Patch update" msgstr "Actualización del parche" -#: git-add--interactive.perl:1305 +#: git-add--interactive.perl:1383 #, perl-format -msgid "Stage mode change [y,n,q,a,d,/%s,?]? " -msgstr "Aplicar stage al cambio de modo [y,n,q,a,d,/%s,?]? " +msgid "Stage mode change [y,n,q,a,d%s,?]? " +msgstr "Cambio de modo de stage [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1306 +#: git-add--interactive.perl:1384 #, perl-format -msgid "Stage deletion [y,n,q,a,d,/%s,?]? " -msgstr "Aplicar stage al borrado [y,n,q,a,d,/%s,?]? " +msgid "Stage deletion [y,n,q,a,d%s,?]? " +msgstr "Aplicar stage al borrado [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1307 +#: git-add--interactive.perl:1385 #, perl-format -msgid "Stage this hunk [y,n,q,a,d,/%s,?]? " -msgstr "Aplicar stage a este hunk [y,n,q,a,d,/%s,?]? " +msgid "Stage this hunk [y,n,q,a,d%s,?]? " +msgstr "Aplicar stage a este hunk [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1310 +#: git-add--interactive.perl:1388 #, perl-format -msgid "Stash mode change [y,n,q,a,d,/%s,?]? " -msgstr "Aplicar stash al cambio de modo [y,n,q,a,d,/%s,?]? " +msgid "Stash mode change [y,n,q,a,d%s,?]? " +msgstr "Aplicar stash al cambio de modo [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1311 +#: git-add--interactive.perl:1389 #, perl-format -msgid "Stash deletion [y,n,q,a,d,/%s,?]? " -msgstr "Aplicar stash al borrado [y,n,q,a,d,/%s,?]? " +msgid "Stash deletion [y,n,q,a,d%s,?]? " +msgstr "Aplicar stash al borrado [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1312 +#: git-add--interactive.perl:1390 #, perl-format -msgid "Stash this hunk [y,n,q,a,d,/%s,?]? " -msgstr "Aplicar stash a este hunk [y,n,q,a,d,/%s,?]? " +msgid "Stash this hunk [y,n,q,a,d%s,?]? " +msgstr "Aplicar stash a este hunk [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1315 +#: git-add--interactive.perl:1393 #, perl-format -msgid "Unstage mode change [y,n,q,a,d,/%s,?]? " -msgstr "Sacar cambio de modo del stage [y,n,q,a,d,/%s,?]? " +msgid "Unstage mode change [y,n,q,a,d%s,?]? " +msgstr "Sacar cambio de modo del stage [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1316 +#: git-add--interactive.perl:1394 #, perl-format -msgid "Unstage deletion [y,n,q,a,d,/%s,?]? " -msgstr "Sacar borrado del stage [y,n,q,a,d,/%s,?]? " +msgid "Unstage deletion [y,n,q,a,d%s,?]? " +msgstr "Sacar borrado del stage [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1317 +#: git-add--interactive.perl:1395 #, perl-format -msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? " -msgstr "Sacar este hunk del stage [y,n,q,a,d,/%s,?]? " +msgid "Unstage this hunk [y,n,q,a,d%s,?]? " +msgstr "Sacar este hunk del stage [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1320 +#: git-add--interactive.perl:1398 #, perl-format -msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? " -msgstr "Aplicar cambio de modo al índice [y,n,q,a,d,/%s,?]? " +msgid "Apply mode change to index [y,n,q,a,d%s,?]? " +msgstr "Aplicar cambio de modo al índice [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1321 +#: git-add--interactive.perl:1399 #, perl-format -msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? " -msgstr "Aplicar borrado al índice [y,n,q,a,d,/%s,?]? " +msgid "Apply deletion to index [y,n,q,a,d%s,?]? " +msgstr "Aplicar borrado al índice [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1322 +#: git-add--interactive.perl:1400 #, perl-format -msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? " -msgstr "Aplicar este hunk al índice [y,n,q,a,d,/%s,?]? " +msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " +msgstr "Aplicar este hunk al índice [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1325 +#: git-add--interactive.perl:1403 #, perl-format -msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? " -msgstr "Descartar cambio de modo del árbol de trabajo [y,n,q,a,d,/%s,?]? " +msgid "Discard mode change from worktree [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 +#: git-add--interactive.perl:1404 #, perl-format -msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? " -msgstr "Descartar borrado del árbol de trabajo [y,n,q,a,d,/%s,?]? " +msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " +msgstr "Descartar borrado del árbol de trabajo [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1327 +#: git-add--interactive.perl:1405 #, perl-format -msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? " -msgstr "Descartar este hunk del árbol de trabajo [y,n,q,a,d,/%s,?]? " +msgid "Discard this hunk from worktree [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 +#: git-add--interactive.perl:1408 #, perl-format -msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? " +msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " msgstr "" -"Descartar cambio de modo del índice y el árbol 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 +#: git-add--interactive.perl:1409 #, perl-format -msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? " -msgstr "Descartar borrado del índice y el árbol de trabajo [y,n,q,a,d,/%s,?]? " +msgid "Discard deletion from index and worktree [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 +#: git-add--interactive.perl:1410 #, perl-format -msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? " -msgstr "" -"Descartar este hunk del índice y el árbol de trabajo [y,n,q,a,d,/%s,?]? " +msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " +msgstr "Descartar este hunk del índice y el árbol de trabajo [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1335 +#: git-add--interactive.perl:1413 #, perl-format -msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? " +msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " msgstr "" -"Aplicar cambio de modo para el índice y el árbol de trabajo [y,n,q,a,d,/" -"%s,?]? " +"Aplicar cambio de modo para el índice y el árbol de trabajo [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1336 +#: git-add--interactive.perl:1414 #, perl-format -msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? " -msgstr "Aplicar borrado al índice y al árbol de trabajo [y,n,q,a,d,/%s,?]? " +msgid "Apply deletion to index and worktree [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 +#: git-add--interactive.perl:1415 #, perl-format -msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? " +msgid "Apply this hunk to index and worktree [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 +#: git-add--interactive.perl:1515 +msgid "No other hunks to goto\n" +msgstr "No hay más pedazos para el ir\n" + +#: git-add--interactive.perl:1522 msgid "go to which hunk (<ret> to see more)? " -msgstr "A que hunk ir (<enter> para ver mas)?" +msgstr "a que hunk ir (<enter> para ver mas)? " -#: git-add--interactive.perl:1442 +#: git-add--interactive.perl:1524 msgid "go to which hunk? " -msgstr "A que hunk ir?" +msgstr "a que hunk ir? " -#: git-add--interactive.perl:1451 +#: git-add--interactive.perl:1533 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Numero invalido: '%s'\n" -#: git-add--interactive.perl:1456 +#: git-add--interactive.perl:1538 #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" msgstr[0] "Lo siento, solo %d hunk disponible.\n" msgstr[1] "Lo siento, solo %d hunks disponibles.\n" -#: git-add--interactive.perl:1482 +#: git-add--interactive.perl:1564 +msgid "No other hunks to search\n" +msgstr "No hay más pedazos para buscar\n" + +#: git-add--interactive.perl:1568 msgid "search for regex? " -msgstr "buscar para regexp?" +msgstr "buscar para regexp? " -#: git-add--interactive.perl:1495 +#: git-add--interactive.perl:1581 #, perl-format msgid "Malformed search regexp %s: %s\n" -msgstr "regexp para la búsqueda mal formado %s: %s\n" +msgstr "Regexp para la búsqueda mal formado %s: %s\n" -#: git-add--interactive.perl:1505 +#: git-add--interactive.perl:1591 msgid "No hunk matches the given pattern\n" msgstr "No hay hunks que concuerden con el patrón entregado.\n" -#: git-add--interactive.perl:1517 git-add--interactive.perl:1539 +#: git-add--interactive.perl:1603 git-add--interactive.perl:1625 msgid "No previous hunk\n" msgstr "No el anterior hunk\n" -#: git-add--interactive.perl:1526 git-add--interactive.perl:1545 +#: git-add--interactive.perl:1612 git-add--interactive.perl:1631 msgid "No next hunk\n" msgstr "No el siguiente hunk\n" -#: git-add--interactive.perl:1553 +#: git-add--interactive.perl:1637 +msgid "Sorry, cannot split this hunk\n" +msgstr "Perdón, no se puede dividir este pedazo\n" + +#: git-add--interactive.perl:1643 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "Cortar en %d hunk.\n" msgstr[1] "Cortar en %d hunks.\n" -#: git-add--interactive.perl:1605 +#: git-add--interactive.perl:1653 +msgid "Sorry, cannot edit this hunk\n" +msgstr "Perdón, no se puede editar este pedazo\n" + +#: git-add--interactive.perl:1699 msgid "Review diff" msgstr "Revisión de diff" #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1624 +#: git-add--interactive.perl:1718 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -16356,85 +16776,93 @@ msgstr "" "add untracked - agrega contenidos de archivos no rastreados al grupo de " "cambios del area de stage\n" -#: git-add--interactive.perl:1641 git-add--interactive.perl:1646 -#: git-add--interactive.perl:1649 git-add--interactive.perl:1656 -#: git-add--interactive.perl:1660 git-add--interactive.perl:1666 +#: git-add--interactive.perl:1735 git-add--interactive.perl:1740 +#: git-add--interactive.perl:1743 git-add--interactive.perl:1750 +#: git-add--interactive.perl:1754 git-add--interactive.perl:1760 msgid "missing --" msgstr "falta --" -#: git-add--interactive.perl:1662 +#: git-add--interactive.perl:1756 #, perl-format msgid "unknown --patch mode: %s" msgstr "modo --patch desconocido: %s" -#: git-add--interactive.perl:1668 git-add--interactive.perl:1674 +#: git-add--interactive.perl:1762 git-add--interactive.perl:1768 #, perl-format msgid "invalid argument %s, expecting --" msgstr "argumento invalido %s, se esperaba --" -#: git-send-email.perl:126 +#: git-send-email.perl:130 msgid "local zone differs from GMT by a non-minute interval\n" msgstr "la zona local difiere de GMT por un intervalo de cero minutos\n" -#: git-send-email.perl:133 git-send-email.perl:139 +#: git-send-email.perl:137 git-send-email.perl:143 msgid "local time offset greater than or equal to 24 hours\n" msgstr "el offset del tiempo local es mayor o igual a 24 horas\n" -#: git-send-email.perl:207 git-send-email.perl:213 +#: git-send-email.perl:211 git-send-email.perl:217 msgid "the editor exited uncleanly, aborting everything" msgstr "el editor se cerro inapropiadamente, abortando todo" -#: git-send-email.perl:290 +#: git-send-email.perl:294 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "" "'%s' contiene una versión intermedia del correo que se estaba generando.\n" -#: git-send-email.perl:295 +#: git-send-email.perl:299 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "'%s.final' contiene el email generado.\n" -#: git-send-email.perl:313 +#: git-send-email.perl:317 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases no es compatible con otras opciones.\n" -#: git-send-email.perl:378 git-send-email.perl:629 +#: git-send-email.perl:383 git-send-email.perl:638 msgid "Cannot run git format-patch from outside a repository\n" msgstr "No se puede ejecutar git format-patch desde fuera del repositorio.\n" -#: git-send-email.perl:447 +#: git-send-email.perl:386 +msgid "" +"`batch-size` and `relogin` must be specified together (via command-line or " +"configuration option)\n" +msgstr "" +"`batch-size` y `relogin` deben ser especificados juntos (via la línea de " +"comando o por opción de configuración)\n" + +#: git-send-email.perl:456 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" -msgstr "campo --suppress-cc desconocido: '%s'\n" +msgstr "Campo --suppress-cc desconocido: '%s'\n" -#: git-send-email.perl:476 +#: git-send-email.perl:485 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "Configuración --confirm desconocida: '%s'\n" -#: git-send-email.perl:504 +#: git-send-email.perl:513 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "peligro: alias de sendmail con comillas no es soportado: %s\n" -#: git-send-email.perl:506 +#: git-send-email.perl:515 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "peligro: `:include:` no soportado: %s\n" -#: git-send-email.perl:508 +#: git-send-email.perl:517 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" -msgstr "Advertencia: redirección `/file` o `|pipe` no soportada : %s\n" +msgstr "advertencia: redirección `/file` o `|pipe` no soportada : %s\n" -#: git-send-email.perl:513 +#: git-send-email.perl:522 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" -msgstr "Advertencia: línea sendmail no reconocida: %s\n" +msgstr "advertencia: línea sendmail no reconocida: %s\n" -#: git-send-email.perl:595 +#: git-send-email.perl:604 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -16449,12 +16877,12 @@ msgstr "" " * Diciendo \"./%s\" si se quiere decir un archivo; o\n" " * Agregando la opción --format-patch si se quiere decir un rango.\n" -#: git-send-email.perl:616 +#: git-send-email.perl:625 #, perl-format msgid "Failed to opendir %s: %s" msgstr "Fallo al abrir directorio %s: %s" -#: git-send-email.perl:640 +#: git-send-email.perl:649 #, perl-format msgid "" "fatal: %s: %s\n" @@ -16463,7 +16891,7 @@ msgstr "" "fatal: %s: %s\n" "peligro: no se mandaron parches\n" -#: git-send-email.perl:651 +#: git-send-email.perl:660 msgid "" "\n" "No patch files specified!\n" @@ -16473,17 +16901,17 @@ msgstr "" "No se especificaron parches!\n" "\n" -#: git-send-email.perl:664 +#: git-send-email.perl:673 #, perl-format msgid "No subject line in %s?" msgstr "No hay línea de subject en %s?" -#: git-send-email.perl:674 +#: git-send-email.perl:683 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "Fallo al abrir para escritura %s: %s" -#: git-send-email.perl:684 +#: git-send-email.perl:694 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -16497,32 +16925,27 @@ msgstr "" "\n" "Limpiar el contenido de body si usted no desea mandar un resumen.\n" -#: git-send-email.perl:707 -#, perl-format -msgid "Failed to open %s.final: %s" -msgstr "Fallo al abrir %s.final: %s" - -#: git-send-email.perl:710 +#: git-send-email.perl:718 #, perl-format msgid "Failed to open %s: %s" 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 todavía, han sido ignorados\n" +#: git-send-email.perl:735 +#, perl-format +msgid "Failed to open %s.final: %s" +msgstr "Fallo al abrir %s.final: %s" -#: git-send-email.perl:754 +#: git-send-email.perl:778 msgid "Summary email is empty, skipping it\n" msgstr "Archivo de resumen esta vacío, saltando al siguiente\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:786 +#: git-send-email.perl:813 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " -msgstr "Esta seguro de que desea usar <%s> [y/N]?" +msgstr "Esta seguro de que desea usar <%s> [y/N]? " -#: git-send-email.perl:815 +#: git-send-email.perl:868 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" @@ -16530,11 +16953,11 @@ msgstr "" "Los siguientes archivos son 8bit, pero no declaran un Content-Transfer-" "Encoding.\n" -#: git-send-email.perl:820 +#: git-send-email.perl:873 msgid "Which 8bit encoding should I declare [UTF-8]? " -msgstr "Que codificación de 8bit debería declarar [UTF-8]?" +msgstr "Que codificación de 8bit debería declarar [UTF-8]? " -#: git-send-email.perl:828 +#: git-send-email.perl:881 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -16547,22 +16970,22 @@ msgstr "" "tiene el template '*** SUBJECT HERE ***'. Agrega --force si realmente lo " "deseas mandar.\n" -#: git-send-email.perl:847 +#: git-send-email.perl:900 msgid "To whom should the emails be sent (if anyone)?" msgstr "A quien se deben mandar los correos (si existe)?" -#: git-send-email.perl:865 +#: git-send-email.perl:918 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "fatal: alias '%s' se expande a si mismo\n" -#: git-send-email.perl:877 +#: git-send-email.perl:930 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "" -"que id de mensaje sera usado como En-Respuesta-Para en el primer email (si " -"existe alguno)?" +"Qué id de mensaje será usado como En-Respuesta-Para en el primer email (si " +"existe alguno)? " -#: git-send-email.perl:929 git-send-email.perl:937 +#: git-send-email.perl:988 git-send-email.perl:996 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "error: no es posible extraer una dirección valida de %s\n" @@ -16570,16 +16993,16 @@ 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:941 +#: git-send-email.perl:1000 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " -msgstr "Que hacer con esta dirección? ([q]salir|[d]botar|[e]ditar):" +msgstr "Que hacer con esta dirección? ([q]salir|[d]botar|[e]ditar): " -#: git-send-email.perl:1262 +#: git-send-email.perl:1317 #, perl-format msgid "CA path \"%s\" does not exist" -msgstr "ruta CA \"%s\" no existe" +msgstr "Ruta CA \"%s\" no existe" -#: git-send-email.perl:1337 +#: git-send-email.perl:1395 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -16592,147 +17015,169 @@ msgid "" " run 'git config --global sendemail.confirm auto'.\n" "\n" 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 configuración sendemail." -"confirm.\n" +" 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 configuración " +"sendemail.confirm.\n" "\n" -"Para mas información, ejecuta 'git send-email --help'.\n" -"Para mantener el comportamiento actual, pero evitar este mensaje,\n" -"ejecuta 'git config --global sendemail.confirm auto'.\n" +" Para mas información, ejecuta 'git send-email --help'.\n" +" Para mantener el comportamiento actual, pero evitar este mensaje,\n" +" ejecuta 'git config --global sendemail.confirm auto'.\n" "\n" #. 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:1352 +#: git-send-email.perl:1410 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): " -msgstr "Mandar este email? ([y]si||[n]o|[q]salir|[a]todo):" +msgstr "Mandar este email? ([y]si||[n]o|[q]salir|[a]todo): " -#: git-send-email.perl:1355 +#: git-send-email.perl:1413 msgid "Send this email reply required" msgstr "Necesitas mandar esta respuesta de email" -#: git-send-email.perl:1381 +#: git-send-email.perl:1439 msgid "The required SMTP server is not properly defined." msgstr "El servidor SMTP no esta definido adecuadamente." -#: git-send-email.perl:1428 +#: git-send-email.perl:1486 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Servidor no soporta STARTTLS! %s" -#: git-send-email.perl:1433 git-send-email.perl:1437 +#: git-send-email.perl:1491 git-send-email.perl:1495 #, perl-format msgid "STARTTLS failed! %s" -msgstr "fallo de STARTTLS! %s" +msgstr "Falló STARTTLS! %s" -#: git-send-email.perl:1447 +#: git-send-email.perl:1505 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:1465 +#: git-send-email.perl:1523 #, perl-format msgid "Failed to send %s\n" msgstr "Fallo al enviar %s\n" -#: git-send-email.perl:1468 +#: git-send-email.perl:1526 #, perl-format msgid "Dry-Sent %s\n" msgstr "Dry-Sent %s\n" -#: git-send-email.perl:1468 +#: git-send-email.perl:1526 #, perl-format msgid "Sent %s\n" msgstr "Enviado %s\n" -#: git-send-email.perl:1470 +#: git-send-email.perl:1528 msgid "Dry-OK. Log says:\n" msgstr "Dry-OK. Log dice:\n" -#: git-send-email.perl:1470 +#: git-send-email.perl:1528 msgid "OK. Log says:\n" msgstr "OK. Log dice:\n" -#: git-send-email.perl:1482 +#: git-send-email.perl:1540 msgid "Result: " -msgstr "Resultado:" +msgstr "Resultado: " -#: git-send-email.perl:1485 +#: git-send-email.perl:1543 msgid "Result: OK\n" msgstr "Resultado: OK\n" -#: git-send-email.perl:1498 +#: git-send-email.perl:1556 #, perl-format msgid "can't open file %s" msgstr "no se puede abrir el archivo %s" -#: git-send-email.perl:1545 git-send-email.perl:1565 +#: git-send-email.perl:1603 git-send-email.perl:1623 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Agregando cc: %s de línea '%s'\n" -#: git-send-email.perl:1551 +#: git-send-email.perl:1609 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) Agregando para: %s de la línea '%s'\n" -#: git-send-email.perl:1599 +#: git-send-email.perl:1657 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) Agregando cc: %s de la línea '%s'\n" -#: git-send-email.perl:1624 +#: git-send-email.perl:1682 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(body) Agregando cc: %s de la línea '%s'\n" -#: git-send-email.perl:1730 +#: git-send-email.perl:1788 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) no se pudo ejecutar '%s'" -#: git-send-email.perl:1737 +#: git-send-email.perl:1795 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Agregando %s: %s de: '%s'\n" -#: git-send-email.perl:1741 +#: git-send-email.perl:1799 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) fallo al cerrar el pipe para '%s'" -#: git-send-email.perl:1768 +#: git-send-email.perl:1826 msgid "cannot send message as 7bit" msgstr "no se puede mandar mensaje como 7bit" -#: git-send-email.perl:1776 +#: git-send-email.perl:1834 msgid "invalid transfer encoding" msgstr "codificación de transferencia invalida" -#: git-send-email.perl:1814 git-send-email.perl:1865 git-send-email.perl:1875 +#: git-send-email.perl:1872 git-send-email.perl:1923 git-send-email.perl:1933 #, perl-format msgid "unable to open %s: %s\n" msgstr "no es posible abrir %s: %s\n" -#: git-send-email.perl:1817 +#: git-send-email.perl:1875 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "%s: el parche contiene una línea con mas de 998 caracteres" -#: git-send-email.perl:1833 +#: git-send-email.perl:1891 #, 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:1837 +#: git-send-email.perl:1895 #, perl-format msgid "Do you really want to send %s? [y|N]: " -msgstr "Realmente deseas mandar %s?[y|N]" +msgstr "Realmente deseas mandar %s?[y|N]: " + +#~ msgid "git fetch-pack: expected ACK/NAK, got EOF" +#~ msgstr "git getch-pack: se esperaba ACK/NAK, se obtuvo EOF" + +#~ msgid "invalid filter-spec expression '%s'" +#~ msgstr "expresión filter-spec inválida '%s'" + +#~ msgid "The copy of the patch that failed is found in: %s" +#~ msgstr "La copia del parche que fallido se encuentra en: %s" + +#~ msgid "pathspec and --all are incompatible" +#~ msgstr "pathspec y --all son incompatibles" + +#~ msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" +#~ msgstr "" +#~ "Anulado el registro del submódulo '$name' ($url) para la ruta " +#~ "'$displaypath'" + +#~ msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n" +#~ msgstr "" +#~ "Campos Para/Cc/Bcc no han sido interpretados todavía, han sido ignorados\n" #~ msgid "" #~ "empty strings as pathspecs will be made invalid in upcoming releases. " |