diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2017-10-17 09:44:24 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2017-10-17 09:44:24 +0800 |
| commit | a3c34cb6ff979b3ed6fe137e9a827a1aec1609e5 (patch) | |
| tree | da561192b0630aff60b67a0b5e530b9634a4628e | |
| parent | 111ef79afe185f8731920569450f6a65320f5d5f (diff) | |
| parent | 38cc0b77830438a5e72483206920dc1b7ea34efa (diff) | |
| download | git-a3c34cb6ff979b3ed6fe137e9a827a1aec1609e5.tar.gz | |
Merge branch 'master' of git://github.com/git-l10n/git-po
* 'master' of git://github.com/git-l10n/git-po:
l10n: ru.po: update Russian translation
l10n: bg.po: Updated Bulgarian translation (3245t)
l10n: sv.po: Update Swedish translation (3245t0f0u)
l10n: vi.po(3245t): Updated Vietnamese translation for v2.15.0
l10n: es.po: Update translation v2.15.0 round 1
l10n: git.pot: v2.15.0 round 1 (68 new, 36 removed)
l10n: es.po: spanish added to TEAMS
l10n: es.po: initial Spanish version git 2.14.0
| -rw-r--r-- | po/TEAMS | 4 | ||||
| -rw-r--r-- | po/bg.po | 4973 | ||||
| -rw-r--r-- | po/es.po | 16595 | ||||
| -rw-r--r-- | po/git.pot | 4859 | ||||
| -rw-r--r-- | po/ru.po | 4902 | ||||
| -rw-r--r-- | po/sv.po | 5149 | ||||
| -rw-r--r-- | po/vi.po | 5023 |
7 files changed, 29445 insertions, 12060 deletions
@@ -20,6 +20,10 @@ Members: Thomas Rast <tr@thomasrast.ch> Matthias Rüster <matthias.ruester@gmail.com> Magnus Görlitz <magnus.goerlitz@googlemail.com> +Language: es (Spanish) +Repository: https://github.com/ChrisADR/git-po +Leader: Christopher Díaz <christopher.diaz.riv@gmail.com> + Language: fr (French) Repository: https://github.com/jnavila/git Leader: Jean-Noël Avila <jn.avila@free.fr> @@ -82,6 +82,8 @@ # alternate алтернативен източник # superproject обхващащ проект # split index разделяне на индекса +# truncate отрязвам +# format string форматиращ низ # ------------------------ # „$var“ - може да не сработва за shell има gettext и eval_gettext - проверка - намират се лесно по „$ # ------------------------ @@ -94,8 +96,8 @@ msgid "" msgstr "" "Project-Id-Version: git master\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2017-07-24 21:54+0800\n" -"PO-Revision-Date: 2017-07-24 17:26+0200\n" +"POT-Creation-Date: 2017-10-08 09:48+0800\n" +"PO-Revision-Date: 2017-10-14 11:52+0200\n" "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" "Language: bg\n" @@ -139,14 +141,14 @@ msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." msgstr "" -"Редактирайте ги в работното дърво, и тогава ползвайте „git add/rm ФАЙЛ“\n" +"Редактирайте ги в работното дърво, и тогава ползвайте „git add/rm ФАЙЛ“,\n" "за да отбележите коригирането им. След това извършете подаването." #: advice.c:112 msgid "Exiting because of an unresolved conflict." msgstr "Изход от програмата заради некоригиран конфликт." -#: advice.c:117 builtin/merge.c:1184 +#: advice.c:117 builtin/merge.c:1211 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува)." @@ -197,90 +199,90 @@ msgstr "непозната опция за знаците за интервал msgid "unrecognized whitespace ignore option '%s'" msgstr "непозната опция за игнориране на знаците за интервали „%s“" -#: apply.c:126 +#: apply.c:125 msgid "--reject and --3way cannot be used together." msgstr "опциите „--reject“ и „--3way“ са несъвместими" -#: apply.c:128 +#: apply.c:127 msgid "--cached and --3way cannot be used together." msgstr "опциите „--cached“ и „--3way“ са несъвместими" -#: apply.c:131 +#: apply.c:130 msgid "--3way outside a repository" msgstr "като „--3way“, но извън хранилище" -#: apply.c:142 +#: apply.c:141 msgid "--index outside a repository" msgstr "като „--index“, но извън хранилище" -#: apply.c:145 +#: apply.c:144 msgid "--cached outside a repository" msgstr "като „--cached“, но извън хранилище" -#: apply.c:836 +#: apply.c:845 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Регулярният израз за времето „%s“ не може за бъде компилиран" -#: apply.c:845 +#: apply.c:854 #, c-format msgid "regexec returned %d for input: %s" msgstr "Регулярният израз върна %d при подадена последователност „%s“ на входа" -#: apply.c:929 +#: apply.c:928 #, c-format msgid "unable to find filename in patch at line %d" msgstr "Липсва име на файл на ред %d от кръпката" -#: apply.c:967 +#: apply.c:966 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" "git apply: лош изход от командата „git-diff“ — на ред %2$d се очакваше „/dev/" "null“, а бе получен „%1$s“" -#: apply.c:973 +#: apply.c:972 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" "git apply: лош изход от командата „git-diff“ — на ред %d бе получено " "неправилно име на нов файл" -#: apply.c:974 +#: apply.c:973 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" "git apply: лош изход от командата „git-diff“ — на ред %d бе получено " "неправилно име на стар файл" -#: apply.c:979 +#: apply.c:978 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" "git apply: лош изход от командата „git-diff“ — на ред %d се очакваше „/dev/" "null“" -#: apply.c:1008 +#: apply.c:1007 #, c-format msgid "invalid mode on line %d: %s" msgstr "грешен режим на ред №%d: %s" -#: apply.c:1326 +#: apply.c:1325 #, c-format msgid "inconsistent header lines %d and %d" msgstr "несъвместими заглавни части на редове №%d и №%d" -#: apply.c:1498 +#: apply.c:1497 #, c-format msgid "recount: unexpected line: %.*s" msgstr "при повторното преброяване бе получен неочакван ред: „%.*s“" -#: apply.c:1567 +#: apply.c:1566 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "част от кръпка без заглавна част на ред %d: %.*s" -#: apply.c:1587 +#: apply.c:1586 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -295,71 +297,71 @@ msgstr[1] "" "След съкращаването на първите %d части от компонентите на пътя, в заглавната " "част на „git diff“ липсва информация за име на файл (ред: %d)" -#: apply.c:1600 +#: apply.c:1599 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" "в заглавната част на „git diff“ липсва информация за име на файл (ред: %d)" -#: apply.c:1770 +#: apply.c:1787 msgid "new file depends on old contents" msgstr "новият файл зависи от старото съдържание на файла" -#: apply.c:1772 +#: apply.c:1789 msgid "deleted file still has contents" msgstr "изтритият файл не е празен" -#: apply.c:1806 +#: apply.c:1823 #, c-format msgid "corrupt patch at line %d" msgstr "грешка в кръпката на ред %d" -#: apply.c:1843 +#: apply.c:1860 #, c-format msgid "new file %s depends on old contents" msgstr "новият файл „%s“ зависи от старото съдържание на файла" -#: apply.c:1845 +#: apply.c:1862 #, c-format msgid "deleted file %s still has contents" msgstr "изтритият файл „%s“ не е празен" -#: apply.c:1848 +#: apply.c:1865 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "● предупреждение: файлът „%s“ вече е празен, но не е изтрит" -#: apply.c:1995 +#: apply.c:2012 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "грешка в двоичната кръпка на ред %d: %.*s" -#: apply.c:2032 +#: apply.c:2049 #, c-format msgid "unrecognized binary patch at line %d" msgstr "неразпозната двоичната кръпка на ред %d" -#: apply.c:2193 +#: apply.c:2209 #, c-format msgid "patch with only garbage at line %d" msgstr "кръпката е с изцяло повредени данни на ред %d" -#: apply.c:2276 +#: apply.c:2295 #, c-format msgid "unable to read symlink %s" msgstr "символната връзка „%s“ не може да бъде прочетена" -#: apply.c:2280 +#: apply.c:2299 #, c-format msgid "unable to open or read %s" msgstr "файлът „%s“ не може да бъде отворен или прочетен" -#: apply.c:2933 +#: apply.c:2958 #, c-format msgid "invalid start of line: '%c'" msgstr "неправилно начало на ред: „%c“" -#: apply.c:3052 +#: apply.c:3077 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." @@ -368,13 +370,13 @@ msgstr[0] "" msgstr[1] "" "%d-то парче код бе успешно приложено на ред %d (отместване от %d реда)." -#: apply.c:3064 +#: apply.c:3089 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" "Контекстът е намален на (%ld/%ld) за прилагането на парчето код на ред %d" -#: apply.c:3070 +#: apply.c:3095 #, c-format msgid "" "while searching for:\n" @@ -383,316 +385,316 @@ msgstr "" "при търсене за:\n" "%.*s" -#: apply.c:3092 +#: apply.c:3117 #, c-format msgid "missing binary patch data for '%s'" msgstr "липсват данните за двоичната кръпка за „%s“" -#: apply.c:3100 +#: apply.c:3125 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "двоичната кръпка не може да се приложи в обратна посока, когато обратното " "парче за „%s“ липсва" -#: apply.c:3146 +#: apply.c:3171 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "към „%s“ не може да се приложи двоична кръпка без пълен индекс" -#: apply.c:3156 +#: apply.c:3181 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "кръпката съответства на „%s“ (%s), който не съвпада по съдържание." -#: apply.c:3164 +#: apply.c:3189 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "кръпката съответства на „%s“, който трябва да е празен, но не е" -#: apply.c:3182 +#: apply.c:3207 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "" "необходимият резултат след операцията — „%s“ за „%s“ не може да бъде " "прочетен" -#: apply.c:3195 +#: apply.c:3220 #, c-format msgid "binary patch does not apply to '%s'" msgstr "двоичната кръпка не може да бъде приложена върху „%s“" -#: apply.c:3201 +#: apply.c:3226 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "двоичната кръпка за „%s“ води до неправилни резултати (очакваше се: „%s“, а " "бе получено: „%s“)" -#: apply.c:3222 +#: apply.c:3247 #, c-format msgid "patch failed: %s:%ld" msgstr "неуспешно прилагане на кръпка: „%s:%ld“" -#: apply.c:3344 +#: apply.c:3369 #, c-format msgid "cannot checkout %s" msgstr "„%s“ не може да се изтегли" -#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277 +#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277 #, c-format msgid "failed to read %s" msgstr "файлът „%s“ не може да бъде прочетен" -#: apply.c:3400 +#: apply.c:3426 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "изчитане на „%s“ след проследяване на символна връзка" -#: apply.c:3429 apply.c:3669 +#: apply.c:3455 apply.c:3695 #, c-format msgid "path %s has been renamed/deleted" msgstr "обектът с път „%s“ е преименуван или изтрит" -#: apply.c:3512 apply.c:3683 +#: apply.c:3538 apply.c:3709 #, c-format msgid "%s: does not exist in index" msgstr "„%s“ не съществува в индекса" -#: apply.c:3521 apply.c:3691 +#: apply.c:3547 apply.c:3717 #, c-format msgid "%s: does not match index" msgstr "„%s“ не съответства на индекса" -#: apply.c:3556 +#: apply.c:3582 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" "в хранилището липсват необходимите обекти BLOB, за да се премине към тройно " "сливане." -#: apply.c:3559 +#: apply.c:3585 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Преминаване към тройно сливане…\n" -#: apply.c:3575 apply.c:3579 +#: apply.c:3601 apply.c:3605 #, c-format msgid "cannot read the current contents of '%s'" msgstr "текущото съдържание на „%s“ не може да бъде прочетено" -#: apply.c:3591 +#: apply.c:3617 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Неуспешно преминаване към тройно сливане…\n" -#: apply.c:3605 +#: apply.c:3631 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Конфликти при прилагането на кръпката към „%s“.\n" -#: apply.c:3610 +#: apply.c:3636 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Кръпката бе приложена чисто към „%s“.\n" -#: apply.c:3636 +#: apply.c:3662 msgid "removal patch leaves file contents" msgstr "изтриващата кръпка оставя файла непразен" -#: apply.c:3708 +#: apply.c:3734 #, c-format msgid "%s: wrong type" msgstr "„%s“: неправилен вид" -#: apply.c:3710 +#: apply.c:3736 #, c-format msgid "%s has type %o, expected %o" msgstr "„%s“ е от вид „%o“, а се очакваше „%o“" -#: apply.c:3860 apply.c:3862 +#: apply.c:3886 apply.c:3888 #, c-format msgid "invalid path '%s'" msgstr "неправилен път: „%s“" -#: apply.c:3918 +#: apply.c:3944 #, c-format msgid "%s: already exists in index" msgstr "„%s“: вече съществува в индекса" -#: apply.c:3921 +#: apply.c:3947 #, c-format msgid "%s: already exists in working directory" msgstr "„%s“: вече съществува в работното дърво" -#: apply.c:3941 +#: apply.c:3967 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "новите права за достъп (%o) на „%s“ не съвпадат със старите (%o)" -#: apply.c:3946 +#: apply.c:3972 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" "новите права за достъп (%o) на „%s“ не съвпадат със старите (%o) на „%s“" -#: apply.c:3966 +#: apply.c:3992 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "засегнатият файл „%s“ е след символна връзка" -#: apply.c:3970 +#: apply.c:3996 #, c-format msgid "%s: patch does not apply" msgstr "Кръпката „%s“ не може да бъде приложена" -#: apply.c:3985 +#: apply.c:4011 #, c-format msgid "Checking patch %s..." msgstr "Проверяване на кръпката „%s“…" -#: apply.c:4076 +#: apply.c:4102 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "" "информацията за сумата по SHA1 за подмодула липсва или не е достатъчна (%s)." -#: apply.c:4083 +#: apply.c:4109 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "смяна на режима на достъпа на „%s“, който не е в текущия връх „HEAD“" -#: apply.c:4086 +#: apply.c:4112 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "информацията за сумата по SHA1 липсва или не е достатъчна (%s)." -#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138 +#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "неуспешно създаване на запис в кеша чрез „make_cache_entry“ за „%s“" -#: apply.c:4095 +#: apply.c:4121 #, c-format msgid "could not add %s to temporary index" msgstr "„%s“ не може да се добави към временния индекс" -#: apply.c:4105 +#: apply.c:4131 #, c-format msgid "could not write temporary index to %s" msgstr "временният индекс не може да се запази в „%s“" -#: apply.c:4243 +#: apply.c:4269 #, c-format msgid "unable to remove %s from index" msgstr "„%s“ не може да се извади от индекса" -#: apply.c:4278 +#: apply.c:4304 #, c-format msgid "corrupt patch for submodule %s" msgstr "повредена кръпка за модула „%s“" -#: apply.c:4284 +#: apply.c:4310 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" "не може да се получи информация чрез „stat“ за новосъздадения файл „%s“" -#: apply.c:4292 +#: apply.c:4318 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" "не може да се за създаде мястото за съхранение на новосъздадения файл „%s“" -#: apply.c:4298 apply.c:4442 +#: apply.c:4324 apply.c:4468 #, c-format msgid "unable to add cache entry for %s" msgstr "не може да се добави запис в кеша за „%s“" -#: apply.c:4339 +#: apply.c:4365 #, c-format msgid "failed to write to '%s'" msgstr "в „%s“ не може да се пише" -#: apply.c:4343 +#: apply.c:4369 #, c-format msgid "closing file '%s'" msgstr "затваряне на файла „%s“" -#: apply.c:4413 +#: apply.c:4439 #, c-format msgid "unable to write file '%s' mode %o" msgstr "файлът „%s“ не може да се запише с режим на достъп „%o“" -#: apply.c:4511 +#: apply.c:4537 #, c-format msgid "Applied patch %s cleanly." msgstr "Кръпката „%s“ бе приложена чисто." -#: apply.c:4519 +#: apply.c:4545 msgid "internal error" msgstr "вътрешна грешка" -#: apply.c:4522 +#: apply.c:4548 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Прилагане на кръпката „%%s“ с %d отхвърлено парче…" msgstr[1] "Прилагане на кръпката „%%s“ с %d отхвърлени парчета…" -#: apply.c:4533 +#: apply.c:4559 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "съкращаване на името на файла с отхвърлените парчета на „ %.*s.rej“" -#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988 +#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010 #, c-format msgid "cannot open %s" msgstr "„%s“ не може да бъде отворен" -#: apply.c:4555 +#: apply.c:4581 #, c-format msgid "Hunk #%d applied cleanly." msgstr "%d-то парче бе успешно приложено." -#: apply.c:4559 +#: apply.c:4585 #, c-format msgid "Rejected hunk #%d." msgstr "%d-то парче бе отхвърлено." -#: apply.c:4669 +#: apply.c:4695 #, c-format msgid "Skipped patch '%s'." msgstr "Пропусната кръпка: „%s“" -#: apply.c:4677 +#: apply.c:4703 msgid "unrecognized input" msgstr "непознат вход" -#: apply.c:4696 +#: apply.c:4722 msgid "unable to read index file" msgstr "индексът не може да бъде записан" -#: apply.c:4833 +#: apply.c:4859 #, c-format msgid "can't open patch '%s': %s" msgstr "кръпката „%s“ не може да бъде отворена: %s" -#: apply.c:4860 +#: apply.c:4886 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "пренебрегната е %d грешка в знаците за интервали" msgstr[1] "пренебрегнати са %d грешки в знаците за интервали" -#: apply.c:4866 apply.c:4881 +#: apply.c:4892 apply.c:4907 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d ред добавя грешки в знаците за интервали." msgstr[1] "%d реда добавят грешки в знаците за интервали." -#: apply.c:4874 +#: apply.c:4900 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." @@ -701,138 +703,139 @@ msgstr[0] "" msgstr[1] "" "Добавени са %d реда след корекцията на грешките в знаците за интервали." -#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391 +#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "Новият индекс не може да бъде записан" -#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260 -#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187 -#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629 -#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973 -#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161 +#: apply.c:4947 apply.c:4950 builtin/am.c:2256 builtin/am.c:2259 +#: builtin/clone.c:116 builtin/fetch.c:115 builtin/pull.c:187 +#: builtin/submodule--helper.c:301 builtin/submodule--helper.c:622 +#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:992 +#: builtin/submodule--helper.c:995 builtin/submodule--helper.c:1212 #: git-add--interactive.perl:197 msgid "path" msgstr "път" -#: apply.c:4922 +#: apply.c:4948 msgid "don't apply changes matching the given path" msgstr "без прилагане на промените напасващи на дадения път" -#: apply.c:4925 +#: apply.c:4951 msgid "apply changes matching the given path" msgstr "прилагане на промените напасващи на дадения път" -#: apply.c:4927 builtin/am.c:2266 +#: apply.c:4953 builtin/am.c:2265 msgid "num" msgstr "БРОЙ" -#: apply.c:4928 +#: apply.c:4954 msgid "remove <num> leading slashes from traditional diff paths" msgstr "премахване на този БРОЙ водещи елементи от пътищата в разликата" -#: apply.c:4931 +#: apply.c:4957 msgid "ignore additions made by the patch" msgstr "игнориране на редовете добавени от тази кръпка" -#: apply.c:4933 +#: apply.c:4959 msgid "instead of applying the patch, output diffstat for the input" msgstr "извеждане на статистика на промените без прилагане на кръпката" -#: apply.c:4937 +#: apply.c:4963 msgid "show number of added and deleted lines in decimal notation" msgstr "извеждане на броя на добавените и изтритите редове" -#: apply.c:4939 +#: apply.c:4965 msgid "instead of applying the patch, output a summary for the input" msgstr "извеждане на статистика на входните данни без прилагане на кръпката" -#: apply.c:4941 +#: apply.c:4967 msgid "instead of applying the patch, see if the patch is applicable" msgstr "проверка дали кръпката може да се приложи, без действително прилагане" -#: apply.c:4943 +#: apply.c:4969 msgid "make sure the patch is applicable to the current index" msgstr "проверка дали кръпката може да бъде приложена към текущия индекс" -#: apply.c:4945 +#: apply.c:4971 msgid "apply a patch without touching the working tree" msgstr "прилагане на кръпката без промяна на работното дърво" -#: apply.c:4947 +#: apply.c:4973 msgid "accept a patch that touches outside the working area" msgstr "прилагане на кръпка, която променя и файлове извън работното дърво" -#: apply.c:4949 +#: apply.c:4975 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" "кръпката да бъде приложена. Опцията се комбинира с „--check“/„--stat“/„--" "summary“" -#: apply.c:4951 +#: apply.c:4977 msgid "attempt three-way merge if a patch does not apply" msgstr "пробване с тройно сливане, ако кръпката не може да се приложи директно" -#: apply.c:4953 +#: apply.c:4979 msgid "build a temporary index based on embedded index information" msgstr "" "създаване на временен индекс на база на включената информация за индекса" -#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515 +#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513 msgid "paths are separated with NUL character" msgstr "разделяне на пътищата с нулевия знак „NUL“" -#: apply.c:4958 +#: apply.c:4984 msgid "ensure at least <n> lines of context match" msgstr "да се осигури контекст от поне такъв БРОЙ съвпадащи редове" -#: apply.c:4959 builtin/am.c:2245 +#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95 +#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99 msgid "action" msgstr "действие" -#: apply.c:4960 +#: apply.c:4986 msgid "detect new or modified lines that have whitespace errors" msgstr "засичане на нови или променени редове с грешки в знаците за интервали" -#: apply.c:4963 apply.c:4966 +#: apply.c:4989 apply.c:4992 msgid "ignore changes in whitespace when finding context" msgstr "" "игнориране на промените в знаците за интервали при откриване на контекста" -#: apply.c:4969 +#: apply.c:4995 msgid "apply the patch in reverse" msgstr "прилагане на кръпката в обратна посока" -#: apply.c:4971 +#: apply.c:4997 msgid "don't expect at least one line of context" msgstr "без изискване на дори и един ред контекст" -#: apply.c:4973 +#: apply.c:4999 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "оставяне на отхвърлените парчета във файлове с разширение „.rej“" -#: apply.c:4975 +#: apply.c:5001 msgid "allow overlapping hunks" msgstr "позволяване на застъпващи се парчета" -#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21 -#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651 -#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125 +#: apply.c:5002 builtin/add.c:272 builtin/check-ignore.c:21 +#: builtin/commit.c:1347 builtin/count-objects.c:96 builtin/fsck.c:640 +#: builtin/log.c:1889 builtin/mv.c:123 builtin/read-tree.c:125 msgid "be verbose" msgstr "повече подробности" -#: apply.c:4978 +#: apply.c:5004 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "пренебрегване на неправилно липсващ знак за нов ред в края на файл" -#: apply.c:4981 +#: apply.c:5007 msgid "do not trust the line counts in the hunk headers" msgstr "без доверяване на номерата на редовете в заглавните части на парчетата" -#: apply.c:4983 builtin/am.c:2254 +#: apply.c:5009 builtin/am.c:2253 msgid "root" msgstr "НАЧАЛНА_ДИРЕКТОРИЯ" -#: apply.c:4984 +#: apply.c:5010 msgid "prepend <root> to all filenames" msgstr "добавяне на тази НАЧАЛНА_ДИРЕКТОРИЯ към имената на всички файлове" @@ -855,108 +858,108 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote ХРАНИЛИЩЕ [--exec КОМАНДА] --list" -#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300 +#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "пътят „%s“ не съвпада с никой файл" -#: archive.c:418 +#: archive.c:436 msgid "fmt" msgstr "ФОРМАТ" -#: archive.c:418 +#: archive.c:436 msgid "archive format" msgstr "ФОРМАТ на архива" -#: archive.c:419 builtin/log.c:1446 +#: archive.c:437 builtin/log.c:1452 msgid "prefix" msgstr "ПРЕФИКС" -#: archive.c:420 +#: archive.c:438 msgid "prepend prefix to each pathname in the archive" msgstr "добавяне на този ПРЕФИКС към всеки път в архива" -#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61 -#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080 -#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552 -#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120 +#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61 +#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:859 +#: builtin/hash-object.c:102 builtin/ls-files.c:547 builtin/ls-files.c:550 +#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120 #: parse-options.h:153 msgid "file" msgstr "ФАЙЛ" -#: archive.c:422 builtin/archive.c:89 +#: archive.c:440 builtin/archive.c:89 msgid "write the archive to this file" msgstr "запазване на архива в този ФАЙЛ" -#: archive.c:424 +#: archive.c:442 msgid "read .gitattributes in working directory" msgstr "изчитане на „.gitattributes“ в работната директория" -#: archive.c:425 +#: archive.c:443 msgid "report archived files on stderr" msgstr "извеждане на архивираните файлове на стандартната грешка" -#: archive.c:426 +#: archive.c:444 msgid "store only" msgstr "само съхранение без компресиране" -#: archive.c:427 +#: archive.c:445 msgid "compress faster" msgstr "бързо компресиране" -#: archive.c:435 +#: archive.c:453 msgid "compress better" msgstr "добро компресиране" -#: archive.c:438 +#: archive.c:456 msgid "list supported archive formats" msgstr "извеждане на списъка с поддържаните формати" -#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108 -#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982 +#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109 +#: builtin/submodule--helper.c:634 builtin/submodule--helper.c:1001 msgid "repo" msgstr "хранилище" -#: archive.c:441 builtin/archive.c:91 +#: archive.c:459 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "изтегляне на архива от отдалеченото ХРАНИЛИЩЕ" -#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488 +#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489 msgid "command" msgstr "команда" -#: archive.c:443 builtin/archive.c:93 +#: archive.c:461 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "път към отдалечената команда „git-upload-archive“" -#: archive.c:450 +#: archive.c:468 msgid "Unexpected option --remote" msgstr "Неочаквана опция „--remote“" -#: archive.c:452 +#: archive.c:470 msgid "Option --exec can only be used together with --remote" msgstr "Опцията „--exec“ изисква „--remote“" -#: archive.c:454 +#: archive.c:472 msgid "Unexpected option --output" msgstr "Неочаквана опция „--output“" -#: archive.c:476 +#: archive.c:494 #, c-format msgid "Unknown archive format '%s'" msgstr "Непознат формат на архив: „%s“" -#: archive.c:483 +#: archive.c:501 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Аргументът не се поддържа за форма̀та „%s“: -%d" -#: attr.c:214 +#: attr.c:218 #, c-format msgid "%.*s is not a valid attribute name" msgstr "„%.*s“ е неправилно име за атрибут" -#: attr.c:410 +#: attr.c:415 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1033,31 +1036,31 @@ msgstr "" msgid "Bisecting: a merge base must be tested\n" msgstr "Двоично търсене: трябва да се провери база за сливане\n" -#: bisect.c:849 +#: bisect.c:850 #, c-format msgid "a %s revision is needed" msgstr "необходима е версия „%s“" -#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256 +#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234 #, c-format msgid "could not create file '%s'" msgstr "файлът „%s“ не може да бъде създаден" -#: bisect.c:917 +#: bisect.c:918 #, c-format msgid "could not read file '%s'" msgstr "файлът „%s“ не може да бъде прочетен" -#: bisect.c:947 +#: bisect.c:948 msgid "reading bisect refs failed" msgstr "неуспешно прочитане на указателите за двоично търсене" -#: bisect.c:967 +#: bisect.c:968 #, c-format msgid "%s was both %s and %s\n" msgstr "„%s“ e както „%s“, така и „%s“\n" -#: bisect.c:975 +#: bisect.c:976 #, c-format msgid "" "No testable commit found.\n" @@ -1066,7 +1069,7 @@ msgstr "" "Липсва подходящо за тестване подаване.\n" "Проверете параметрите за пътищата.\n" -#: bisect.c:994 +#: bisect.c:995 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1076,7 +1079,7 @@ msgstr[1] "(приблизително %d стъпки)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1000 +#: bisect.c:1001 #, 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" @@ -1097,10 +1100,10 @@ msgstr "" "Едновременното задаване на опциите „--reverse“ и „--first-parent“ изисква " "указването на крайно подаване" -#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166 -#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907 -#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360 -#: builtin/shortlog.c:177 +#: blame.c:1797 bundle.c:169 ref-filter.c:1932 sequencer.c:1168 +#: sequencer.c:2351 builtin/commit.c:1065 builtin/log.c:357 builtin/log.c:911 +#: builtin/log.c:1361 builtin/log.c:1690 builtin/log.c:1938 builtin/merge.c:369 +#: builtin/shortlog.c:191 msgid "revision walk setup failed" msgstr "неуспешно настройване на обхождането на версиите" @@ -1142,45 +1145,44 @@ msgstr "" #: branch.c:93 #, c-format -msgid "Branch %s set up to track remote branch %s from %s by rebasing." +msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." msgstr "" -"Клонът „%s“ ще следи клона „%s“ от отдалеченото хранилище „%s“ чрез " +"Клонът „%s“ ще следи отдалечения клон „%s“ от хранилището „%s“ чрез " "пребазиране." #: branch.c:94 #, c-format -msgid "Branch %s set up to track remote branch %s from %s." -msgstr "Клонът „%s“ ще следи клона „%s“ от отдалеченото хранилище „%s“." +msgid "Branch '%s' set up to track remote branch '%s' from '%s'." +msgstr "Клонът „%s“ ще следи отдалечения клон „%s“ от хранилището „%s“." #: branch.c:98 #, c-format -msgid "Branch %s set up to track local branch %s by rebasing." -msgstr "" -"Клонът „%s“ ще следи клона „%s“ от локалното хранилище чрез пребазиране." +msgid "Branch '%s' set up to track local branch '%s' by rebasing." +msgstr "Клонът „%s“ ще следи локалния клон „%s“ чрез пребазиране." #: branch.c:99 #, c-format -msgid "Branch %s set up to track local branch %s." -msgstr "Клонът „%s“ ще следи клона „%s“ от локалното хранилище." +msgid "Branch '%s' set up to track local branch '%s'." +msgstr "Клонът „%s“ ще следи локалния клон „%s“." #: branch.c:104 #, c-format -msgid "Branch %s set up to track remote ref %s by rebasing." +msgid "Branch '%s' set up to track remote ref '%s' by rebasing." msgstr "Клонът „%s“ ще следи отдалечения указател „%s“ чрез пребазиране." #: branch.c:105 #, c-format -msgid "Branch %s set up to track remote ref %s." +msgid "Branch '%s' set up to track remote ref '%s'." msgstr "Клонът „%s“ ще следи отдалечения указател „%s“." #: branch.c:109 #, c-format -msgid "Branch %s set up to track local ref %s by rebasing." +msgid "Branch '%s' set up to track local ref '%s' by rebasing." msgstr "Клонът „%s“ ще следи локалния указател „%s“ чрез пребазиране." #: branch.c:110 #, c-format -msgid "Branch %s set up to track local ref %s." +msgid "Branch '%s' set up to track local ref '%s'." msgstr "Клонът „%s“ ще следи локалния указател „%s“." #: branch.c:119 @@ -1202,21 +1204,21 @@ msgstr "„%s“ не е позволено име за клон." msgid "A branch named '%s' already exists." msgstr "Вече съществува клон с име „%s“." -#: branch.c:198 +#: branch.c:197 msgid "Cannot force update the current branch." msgstr "Текущият клон не може да бъде принудително обновен." -#: branch.c:218 +#: branch.c:217 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "Зададените настройки за следенето са грешни — началото „%s“ не е клон." -#: branch.c:220 +#: branch.c:219 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "заявеният отдалечен клон „%s“ не съществува" -#: branch.c:222 +#: branch.c:221 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -1235,22 +1237,22 @@ msgstr "" "може да използвате „git push -u“, за да настроите към кой клон да се " "изтласква." -#: branch.c:265 +#: branch.c:264 #, c-format msgid "Not a valid object name: '%s'." msgstr "Неправилно име на обект: „%s“" -#: branch.c:285 +#: branch.c:284 #, c-format msgid "Ambiguous object name: '%s'." msgstr "Името на обект не е еднозначно: „%s“" -#: branch.c:290 +#: branch.c:289 #, c-format msgid "Not a valid branch point: '%s'." msgstr "Неправилно място за начало на клон: „%s“" -#: branch.c:344 +#: branch.c:343 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "„%s“ вече е изтеглен в „%s“" @@ -1270,7 +1272,9 @@ msgstr "Файлът „%s“ не изглежда да е пратка на gi msgid "unrecognized header: %s%s (%d)" msgstr "непозната заглавна част: %s%s (%d)" -#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778 +#: bundle.c:88 sequencer.c:1346 sequencer.c:1793 sequencer.c:2500 +#: sequencer.c:2583 sequencer.c:2609 sequencer.c:2687 sequencer.c:2807 +#: sequencer.c:2949 builtin/commit.c:782 #, c-format msgid "could not open '%s'" msgstr "„%s“ не може да се отвори" @@ -1279,57 +1283,57 @@ msgstr "„%s“ не може да се отвори" msgid "Repository lacks these prerequisite commits:" msgstr "В хранилището липсват следните необходими подавания:" -#: bundle.c:186 +#: bundle.c:193 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "Пратката съдържа следния указател:" msgstr[1] "Пратката съдържа следните %d указатели:" -#: bundle.c:193 +#: bundle.c:200 msgid "The bundle records a complete history." msgstr "Пратката съдържа пълна история." -#: bundle.c:195 +#: bundle.c:202 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "Пратката изисква следния указател:" msgstr[1] "Пратката изисква следните %d указатели:" -#: bundle.c:254 +#: bundle.c:261 msgid "Could not spawn pack-objects" msgstr "Командата „git pack-objects“ не може да бъде стартирана" -#: bundle.c:265 +#: bundle.c:272 msgid "pack-objects died" msgstr "Командата „git pack-objects“ не завърши успешно" -#: bundle.c:307 +#: bundle.c:314 msgid "rev-list died" msgstr "Командата „git rev-list“ не завърши успешно" -#: bundle.c:356 +#: bundle.c:363 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "" "указателят „%s“ не е бил включен поради опциите зададени на „git rev-list“" -#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282 +#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296 #, c-format msgid "unrecognized argument: %s" msgstr "непознат аргумент: %s" -#: bundle.c:454 +#: bundle.c:461 msgid "Refusing to create empty bundle." msgstr "Създаването на празна пратка е невъзможно." -#: bundle.c:466 +#: bundle.c:473 #, c-format msgid "cannot create '%s'" msgstr "Файлът „%s“ не може да бъде създаден" -#: bundle.c:494 +#: bundle.c:501 msgid "index-pack died" msgstr "Командата „git index-pack“ не завърши успешно" @@ -1338,8 +1342,8 @@ msgstr "Командата „git index-pack“ не завърши успешн msgid "invalid color value: %.*s" msgstr "неправилна стойност за цвят: %.*s" -#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456 -#: builtin/am.c:1469 builtin/am.c:2107 +#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465 +#: builtin/am.c:1467 builtin/am.c:2105 #, c-format msgid "could not parse %s" msgstr "„%s“ не може да се анализира" @@ -1349,7 +1353,7 @@ msgstr "„%s“ не може да се анализира" msgid "%s %s is not a commit!" msgstr "%s %s не е подаване!" -#: commit.c:1511 +#: commit.c:1517 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -1363,156 +1367,156 @@ msgstr "" msgid "memory exhausted" msgstr "паметта свърши" -#: config.c:186 +#: config.c:187 msgid "relative config include conditionals must come from files" msgstr "относителните условни изрази за вмъкване трябва да идват от файлове" -#: config.c:720 +#: config.c:721 #, c-format msgid "bad config line %d in blob %s" msgstr "неправилен ред за настройки %d в BLOB „%s“" -#: config.c:724 +#: config.c:725 #, c-format msgid "bad config line %d in file %s" msgstr "неправилен ред за настройки %d във файла „%s“" -#: config.c:728 +#: config.c:729 #, c-format msgid "bad config line %d in standard input" msgstr "неправилен ред за настройки %d на стандартния вход" -#: config.c:732 +#: config.c:733 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "неправилен ред за настройки %d в BLOB за подмодул „%s“" -#: config.c:736 +#: config.c:737 #, c-format msgid "bad config line %d in command line %s" msgstr "неправилен ред за настройки %d на командния ред „%s“" -#: config.c:740 +#: config.c:741 #, c-format msgid "bad config line %d in %s" msgstr "неправилен ред за настройки %d в „%s“" -#: config.c:868 +#: config.c:869 msgid "out of range" msgstr "извън диапазона" -#: config.c:868 +#: config.c:869 msgid "invalid unit" msgstr "неправилна мерна единица" -#: config.c:874 +#: config.c:875 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "неправилна числова стойност „%s“ за „%s“: %s" -#: config.c:879 +#: config.c:880 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "неправилна числова стойност „%s“ за „%s“ в BLOB „%s“: %s" -#: config.c:882 +#: config.c:883 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "неправилна числова стойност „%s“ за „%s“ във файла „%s“: %s" -#: config.c:885 +#: config.c:886 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "неправилна числова стойност „%s“ за „%s“ на стандартния вход: %s" -#: config.c:888 +#: config.c:889 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "неправилна числова стойност „%s“ за „%s“ в BLOB от подмодул „%s“: %s" -#: config.c:891 +#: config.c:892 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "неправилна числова стойност „%s“ за „%s“ на командния ред „%s“: %s" -#: config.c:894 +#: config.c:895 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "неправилна числова стойност „%s“ за „%s“ в %s: %s" -#: config.c:989 +#: config.c:990 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "домашната папка на потребителя не може да бъде открита: „%s“" -#: config.c:1084 config.c:1095 +#: config.c:1085 config.c:1096 #, c-format msgid "bad zlib compression level %d" msgstr "неправилно ниво на компресиране: %d" -#: config.c:1212 +#: config.c:1213 #, c-format msgid "invalid mode for object creation: %s" msgstr "неправилен режим за създаването на обекти: %s" -#: config.c:1368 +#: config.c:1372 #, c-format msgid "bad pack compression level %d" msgstr "неправилно ниво на компресиране при пакетиране: %d" -#: config.c:1564 +#: config.c:1568 msgid "unable to parse command-line config" msgstr "неправилни настройки от командния ред" -#: config.c:1894 +#: config.c:1900 msgid "unknown error occurred while reading the configuration files" msgstr "неочаквана грешка при изчитането на конфигурационните файлове" -#: config.c:2064 +#: config.c:2087 #, c-format msgid "Invalid %s: '%s'" msgstr "Неправилен %s: „%s“" -#: config.c:2085 +#: config.c:2130 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "" "непозната стойност „%s“ за настройката „core.untrackedCache“. Ще се ползва " "стандартната стойност „keep“ (запазване)" -#: config.c:2111 +#: config.c:2156 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" "стойността на „splitIndex.maxPercentChange“ трябва да е между 1 и 100, а не " "%d" -#: config.c:2122 +#: config.c:2167 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "неразпозната стойност „%s“ от командния ред" -#: config.c:2124 +#: config.c:2169 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "неправилна настройка „%s“ във файла „%s“ на ред №%d" -#: config.c:2183 +#: config.c:2228 #, c-format msgid "%s has multiple values" msgstr "зададени са няколко стойности за „%s“" -#: config.c:2517 config.c:2745 +#: config.c:2571 config.c:2789 #, c-format msgid "fstat on %s failed" msgstr "неуспешно изпълнение на „fstat“ върху „%s“" -#: config.c:2635 +#: config.c:2678 #, c-format msgid "could not set '%s' to '%s'" msgstr "„%s“ не може да се зададе да е „%s“" -#: config.c:2637 builtin/remote.c:775 +#: config.c:2680 builtin/remote.c:776 #, c-format msgid "could not unset '%s'" msgstr "„%s“ не може да се премахне" @@ -1533,19 +1537,19 @@ msgstr "" "Проверете дали то съществува и дали имате права\n" "за достъп." -#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141 +#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141 msgid "Checking connectivity" msgstr "Проверка на връзката" -#: connected.c:75 +#: connected.c:76 msgid "Could not run 'git rev-list'" msgstr "Командата „git rev-list“ не може да бъде изпълнена." -#: connected.c:95 +#: connected.c:96 msgid "failed write to rev-list" msgstr "неуспешен запис на списъка с версиите" -#: connected.c:102 +#: connected.c:103 msgid "failed to close rev-list's stdin" msgstr "стандартният вход на списъка с версиите не може да бъде затворен" @@ -1658,29 +1662,38 @@ msgstr "файлът с подредбата на съответствията msgid "Performing inexact rename detection" msgstr "Търсене на преименувания на обекти съчетани с промени" -#: diff.c:63 +#: diff.c:74 #, c-format msgid "option '%s' requires a value" msgstr "опцията „%s“ изисква стойност" -#: diff.c:125 +#: diff.c:152 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" " Неуспешно разпознаване на „%s“ като процент-праг за статистиката по " "директории\n" -#: diff.c:130 +#: diff.c:157 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Непознат параметър „%s“ за статистиката по директории'\n" -#: diff.c:282 +#: diff.c:281 +msgid "" +"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', " +"'plain'" +msgstr "" +"настройката за цвят за преместване трябва да е една от: „no“ (без), " +"„default“ (стандартно), „zebra“ (райе), „dimmed_zebra“ (притъмнено райе), " +"„plain“ (обикновено)" + +#: diff.c:341 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Непозната стойност „%s“ за настройката „diff.submodule“" -#: diff.c:342 +#: diff.c:398 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -1689,23 +1702,23 @@ msgstr "" "Грешки в настройката „diff.dirstat“:\n" "%s" -#: diff.c:3101 +#: diff.c:3861 #, c-format msgid "external diff died, stopping at %s" msgstr "" "външната програма за разлики завърши неуспешно. Спиране на работата при „%s“" -#: diff.c:3427 +#: diff.c:4189 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" "Опциите „--name-only“, „--name-status“, „--check“ и „-s“ са несъвместими " "една с друга" -#: diff.c:3517 +#: diff.c:4279 msgid "--follow requires exactly one pathspec" msgstr "Опцията „--follow“ изисква точно един път" -#: diff.c:3680 +#: diff.c:4445 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -1714,230 +1727,234 @@ msgstr "" "Неразпознат параметър към опцията „--dirstat/-X“:\n" "%s" -#: diff.c:3694 +#: diff.c:4459 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Неразпознат параметър към опцията „--submodule“: „%s“" -#: diff.c:4716 +#: diff.c:5505 msgid "inexact rename detection was skipped due to too many files." msgstr "" "търсенето на преименувания на обекти съчетани с промени се прескача поради " "многото файлове." -#: diff.c:4719 +#: diff.c:5508 msgid "only found copies from modified paths due to too many files." msgstr "" "установени са точните копия на променените пътища поради многото файлове." -#: diff.c:4722 +#: diff.c:5511 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "задайте променливата „%s“ да е поне %d и отново изпълнете командата." -#: dir.c:1948 +#: dir.c:1983 msgid "failed to get kernel name and information" msgstr "името и версията на ядрото не бяха получени" -#: dir.c:2067 +#: dir.c:2102 msgid "Untracked cache is disabled on this system or location." msgstr "" "Кеша за неследените файлове е изключен на тази система или местоположение." -#: dir.c:2846 dir.c:2851 +#: dir.c:2885 dir.c:2890 #, c-format msgid "could not create directories for %s" msgstr "директориите за „%s“ не може да бъдат създадени" -#: dir.c:2876 +#: dir.c:2915 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "директорията на git не може да се мигрира от „%s“ до „%s“" -#: entry.c:281 +#: entry.c:176 +msgid "Filtering content" +msgstr "Филтриране на съдържанието" + +#: entry.c:417 #, c-format msgid "could not stat file '%s'" msgstr "неуспешно изпълнение на „stat“ върху файла „%s“" -#: fetch-pack.c:251 +#: fetch-pack.c:252 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: очаква се плитък списък" -#: fetch-pack.c:263 +#: fetch-pack.c:264 msgid "git fetch-pack: expected ACK/NAK, got EOF" msgstr "git fetch-pack: очакваше се „ACK“/„NAK“, а бе получен „EOF“" -#: fetch-pack.c:282 builtin/archive.c:63 +#: fetch-pack.c:283 builtin/archive.c:63 #, c-format msgid "remote error: %s" msgstr "отдалечена грешка: %s" -#: fetch-pack.c:283 +#: fetch-pack.c:284 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: очакваше се „ACK“/„NAK“, а бе получен „%s“" -#: fetch-pack.c:335 +#: fetch-pack.c:336 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "опцията „--stateless-rpc“ изисква „multi_ack_detailed“" -#: fetch-pack.c:421 +#: fetch-pack.c:422 #, c-format msgid "invalid shallow line: %s" msgstr "неправилен плитък ред: „%s“" -#: fetch-pack.c:427 +#: fetch-pack.c:428 #, c-format msgid "invalid unshallow line: %s" msgstr "неправилен неплитък ред: „%s“" -#: fetch-pack.c:429 +#: fetch-pack.c:430 #, c-format msgid "object not found: %s" msgstr "обектът „%s“ липсва" -#: fetch-pack.c:432 +#: fetch-pack.c:433 #, c-format msgid "error in object: %s" msgstr "грешка в обекта: „%s“" -#: fetch-pack.c:434 +#: fetch-pack.c:435 #, c-format msgid "no shallow found: %s" msgstr "не е открит плитък обект: %s" -#: fetch-pack.c:437 +#: fetch-pack.c:438 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "очаква се плитък или не обект, а бе получено: %s" -#: fetch-pack.c:476 +#: fetch-pack.c:477 #, c-format msgid "got %s %d %s" msgstr "получено бе %s %d %s" -#: fetch-pack.c:490 +#: fetch-pack.c:491 #, c-format msgid "invalid commit %s" msgstr "неправилно подаване: „%s“" -#: fetch-pack.c:523 +#: fetch-pack.c:524 msgid "giving up" msgstr "преустановяване" -#: fetch-pack.c:533 progress.c:237 +#: fetch-pack.c:534 progress.c:242 msgid "done" msgstr "действието завърши" -#: fetch-pack.c:545 +#: fetch-pack.c:546 #, c-format msgid "got %s (%d) %s" msgstr "получено бе %s (%d) %s" -#: fetch-pack.c:591 +#: fetch-pack.c:592 #, c-format msgid "Marking %s as complete" msgstr "Отбелязване на „%s“ като пълно" -#: fetch-pack.c:775 +#: fetch-pack.c:776 #, c-format msgid "already have %s (%s)" msgstr "вече има „%s“ (%s)" -#: fetch-pack.c:813 +#: fetch-pack.c:814 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: не може да се създаде процес за демултиплексора" -#: fetch-pack.c:821 +#: fetch-pack.c:822 msgid "protocol error: bad pack header" msgstr "протоколна грешка: неправилна заглавна част на пакет" -#: fetch-pack.c:877 +#: fetch-pack.c:878 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: не може да се създаде процес за „%s“" -#: fetch-pack.c:893 +#: fetch-pack.c:894 #, c-format msgid "%s failed" msgstr "неуспешно изпълнение на „%s“" -#: fetch-pack.c:895 +#: fetch-pack.c:896 msgid "error in sideband demultiplexer" msgstr "грешка в демултиплексора" -#: fetch-pack.c:922 +#: fetch-pack.c:923 msgid "Server does not support shallow clients" msgstr "Сървърът не поддържа плитки клиенти" -#: fetch-pack.c:926 +#: fetch-pack.c:927 msgid "Server supports multi_ack_detailed" msgstr "Сървърът поддържа „multi_ack_detailed“" -#: fetch-pack.c:929 +#: fetch-pack.c:930 msgid "Server supports no-done" msgstr "Сървърът поддържа „no-done“" -#: fetch-pack.c:935 +#: fetch-pack.c:936 msgid "Server supports multi_ack" msgstr "Сървърът поддържа „multi_ack“" -#: fetch-pack.c:939 +#: fetch-pack.c:940 msgid "Server supports side-band-64k" msgstr "Сървърът поддържа „side-band-64k“" -#: fetch-pack.c:943 +#: fetch-pack.c:944 msgid "Server supports side-band" msgstr "Сървърът поддържа „side-band“" -#: fetch-pack.c:947 +#: fetch-pack.c:948 msgid "Server supports allow-tip-sha1-in-want" msgstr "Сървърът поддържа „allow-tip-sha1-in-want“" -#: fetch-pack.c:951 +#: fetch-pack.c:952 msgid "Server supports allow-reachable-sha1-in-want" msgstr "Сървърът поддържа „allow-reachable-sha1-in-want“" -#: fetch-pack.c:961 +#: fetch-pack.c:962 msgid "Server supports ofs-delta" msgstr "Сървърът поддържа „ofs-delta“" -#: fetch-pack.c:968 +#: fetch-pack.c:969 #, c-format msgid "Server version is %.*s" msgstr "Версията на сървъра е: %.*s" -#: fetch-pack.c:974 +#: fetch-pack.c:975 msgid "Server does not support --shallow-since" msgstr "Сървърът не поддържа опцията „--shallow-since“" -#: fetch-pack.c:978 +#: fetch-pack.c:979 msgid "Server does not support --shallow-exclude" msgstr "Сървърът не поддържа опцията „--shallow-exclude“" -#: fetch-pack.c:980 +#: fetch-pack.c:981 msgid "Server does not support --deepen" msgstr "Сървърът не поддържа опцията „--deepen“" -#: fetch-pack.c:991 +#: fetch-pack.c:992 msgid "no common commits" msgstr "няма общи подавания" -#: fetch-pack.c:1003 +#: fetch-pack.c:1004 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: неуспешно доставяне." -#: fetch-pack.c:1165 +#: fetch-pack.c:1166 msgid "no matching remote head" msgstr "не може да бъде открит подходящ връх от отдалеченото хранилище" -#: fetch-pack.c:1187 +#: fetch-pack.c:1188 #, c-format msgid "no such remote ref %s" msgstr "такъв отдалечен указател няма: %s" -#: fetch-pack.c:1190 +#: fetch-pack.c:1191 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Сървърът не позволява заявка за необявен „%s“" @@ -1950,7 +1967,7 @@ msgstr "Програмата „gpg“ не подписа данните." msgid "could not create temporary file" msgstr "не може да се създаде временен файл" -#: gpg-interface.c:213 +#: gpg-interface.c:214 #, c-format msgid "failed writing detached signature to '%s'" msgstr "Програмата не успя да запише самостоятелния подпис в „%s“" @@ -1960,20 +1977,20 @@ msgstr "Програмата не успя да запише самостоят msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "прескачане на неправилния цвят „%.*s“ в „log.graphColors“" -#: grep.c:1981 +#: grep.c:1970 #, c-format msgid "'%s': unable to read %s" msgstr "„%s“: файлът сочен от „%s“ не може да бъде прочетен" -#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134 +#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134 #, c-format msgid "failed to stat '%s'" msgstr "не може да бъде получена информация чрез „stat“ за „%s“" -#: grep.c:2009 +#: grep.c:1998 #, c-format msgid "'%s': short read" -msgstr "„%s“: изчитането върна по-малко байтове от заявените" +msgstr "„%s“: изчитането върна по-малко байтове от очакваното" #: help.c:179 #, c-format @@ -2120,12 +2137,12 @@ msgstr "не може да се ползва празно име като иде msgid "name consists only of disallowed characters: %s" msgstr "името съдържа само непозволени знаци: „%s“" -#: ident.c:416 builtin/commit.c:612 +#: ident.c:416 builtin/commit.c:616 #, c-format msgid "invalid date format: %s" msgstr "неправилен формат на дата: %s" -#: lockfile.c:152 +#: lockfile.c:151 #, c-format msgid "" "Unable to create '%s.lock': %s.\n" @@ -2144,7 +2161,7 @@ msgstr "" "причина е, че някой процес на git в това хранилище е забил. За да\n" "продължите работа, ще трябва ръчно да изтриете файла:" -#: lockfile.c:160 +#: lockfile.c:159 #, c-format msgid "Unable to create '%s.lock': %s" msgstr "Файлът-ключалка „%s.lock“ не може да бъде създаден: %s" @@ -2153,80 +2170,80 @@ msgstr "Файлът-ключалка „%s.lock“ не може да бъде msgid "failed to read the cache" msgstr "кешът не може да бъде прочетен" -#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377 -#: builtin/checkout.c:591 builtin/clone.c:753 +#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380 +#: builtin/checkout.c:595 builtin/clone.c:754 msgid "unable to write new index file" msgstr "неуспешно записване на новия индекс" -#: merge-recursive.c:210 +#: merge-recursive.c:235 msgid "(bad commit)\n" msgstr "(лошо подаване)\n" -#: merge-recursive.c:232 merge-recursive.c:240 +#: merge-recursive.c:257 merge-recursive.c:265 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "неуспешно изпълнение на „addinfo_cache“ за пътя „%s“" -#: merge-recursive.c:304 +#: merge-recursive.c:329 msgid "error building trees" msgstr "грешка при изграждане на дърветата" -#: merge-recursive.c:728 +#: merge-recursive.c:752 #, c-format msgid "failed to create path '%s'%s" msgstr "грешка при създаването на пътя „%s“%s" -#: merge-recursive.c:739 +#: merge-recursive.c:763 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Изтриване на „%s“, за да се освободи място за поддиректория\n" -#: merge-recursive.c:753 merge-recursive.c:772 +#: merge-recursive.c:777 merge-recursive.c:796 msgid ": perhaps a D/F conflict?" msgstr ": възможно е да има конфликт директория/файл." -#: merge-recursive.c:762 +#: merge-recursive.c:786 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" "преустановяване на действието, за да не се изтрие неследеният файл „%s“" -#: merge-recursive.c:804 builtin/cat-file.c:36 +#: merge-recursive.c:828 builtin/cat-file.c:37 #, c-format msgid "cannot read object %s '%s'" msgstr "обектът „%s“ (%s) не може да бъде прочетен" -#: merge-recursive.c:806 +#: merge-recursive.c:830 #, c-format msgid "blob expected for %s '%s'" msgstr "обектът „%s“ (%s) се очакваше да е BLOB, а не е" -#: merge-recursive.c:830 +#: merge-recursive.c:854 #, c-format msgid "failed to open '%s': %s" msgstr "„%s“ не може да се отвори: %s" -#: merge-recursive.c:841 +#: merge-recursive.c:865 #, c-format msgid "failed to symlink '%s': %s" msgstr "неуспешно създаване на символната връзка „%s“: %s" -#: merge-recursive.c:846 +#: merge-recursive.c:870 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" "не е ясно какво да се прави с обекта „%2$s“ (%3$s) с права за достъп „%1$06o“" -#: merge-recursive.c:986 +#: merge-recursive.c:1010 msgid "Failed to execute internal merge" msgstr "Неуспешно вътрешно сливане" -#: merge-recursive.c:990 +#: merge-recursive.c:1014 #, c-format msgid "Unable to add %s to database" msgstr "„%s“ не може да се добави в базата с данни" -#: merge-recursive.c:1093 +#: merge-recursive.c:1117 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2235,7 +2252,7 @@ msgstr "" "КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s. Версия %s на „%s“ " "е оставена в дървото." -#: merge-recursive.c:1098 +#: merge-recursive.c:1122 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -2244,7 +2261,7 @@ msgstr "" "КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ е преименуван на „%s“ в " "%s. Версия %s на „%s“ е оставена в дървото." -#: merge-recursive.c:1105 +#: merge-recursive.c:1129 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2253,7 +2270,7 @@ msgstr "" "КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s. Версия %s на „%s“ " "е оставена в дървото: %s." -#: merge-recursive.c:1110 +#: merge-recursive.c:1134 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -2262,20 +2279,20 @@ msgstr "" "КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ е преименуван на „%s“ в " "%s. Версия %s на „%s“ е оставена в дървото: %s." -#: merge-recursive.c:1144 +#: merge-recursive.c:1168 msgid "rename" msgstr "преименуване" -#: merge-recursive.c:1144 +#: merge-recursive.c:1168 msgid "renamed" msgstr "преименуван" -#: merge-recursive.c:1201 +#: merge-recursive.c:1225 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "„%s“ е директория в „%s“, затова се добавя като „%s“" -#: merge-recursive.c:1226 +#: merge-recursive.c:1250 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -2284,143 +2301,143 @@ msgstr "" "КОНФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон " "„%s“, а „%s“ е преименуван на „%s“ в „%s“/%s." -#: merge-recursive.c:1231 +#: merge-recursive.c:1255 msgid " (left unresolved)" msgstr " (некоригиран конфликт)" -#: merge-recursive.c:1293 +#: merge-recursive.c:1317 #, 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:1326 +#: merge-recursive.c:1350 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "Преименуване на „%s“ на „%s“, а „%s“ на „%s“" -#: merge-recursive.c:1529 +#: merge-recursive.c:1553 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" "КОНФЛИКТ (преименуване/добавяне): „%s“ е преименуван на „%s“ в клон „%s“, а " "„%s“ е добавен в „%s“" -#: merge-recursive.c:1544 +#: merge-recursive.c:1568 #, c-format msgid "Adding merged %s" msgstr "Добавяне на слетия „%s“" -#: merge-recursive.c:1551 merge-recursive.c:1781 +#: merge-recursive.c:1575 merge-recursive.c:1805 #, c-format msgid "Adding as %s instead" msgstr "Добавяне като „%s“" -#: merge-recursive.c:1608 +#: merge-recursive.c:1632 #, c-format msgid "cannot read object %s" msgstr "обектът „%s“ не може да се прочете" -#: merge-recursive.c:1611 +#: merge-recursive.c:1635 #, c-format msgid "object %s is not a blob" msgstr "обектът „%s“ не е BLOB" -#: merge-recursive.c:1680 +#: merge-recursive.c:1704 msgid "modify" msgstr "промяна" -#: merge-recursive.c:1680 +#: merge-recursive.c:1704 msgid "modified" msgstr "променен" -#: merge-recursive.c:1690 +#: merge-recursive.c:1714 msgid "content" msgstr "съдържание" -#: merge-recursive.c:1697 +#: merge-recursive.c:1721 msgid "add/add" msgstr "добавяне/добавяне" -#: merge-recursive.c:1733 +#: merge-recursive.c:1757 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Прескачане на „%s“ (слетият резултат е идентичен със сегашния)" -#: merge-recursive.c:1747 +#: merge-recursive.c:1771 #, c-format msgid "Auto-merging %s" msgstr "Автоматично сливане на „%s“" -#: merge-recursive.c:1751 git-submodule.sh:945 +#: merge-recursive.c:1775 git-submodule.sh:944 msgid "submodule" msgstr "ПОДМОДУЛ" -#: merge-recursive.c:1752 +#: merge-recursive.c:1776 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "КОНФЛИКТ (%s): Конфликт при сливане на „%s“" -#: merge-recursive.c:1846 +#: merge-recursive.c:1870 #, c-format msgid "Removing %s" msgstr "Изтриване на „%s“" -#: merge-recursive.c:1872 +#: merge-recursive.c:1896 msgid "file/directory" msgstr "файл/директория" -#: merge-recursive.c:1878 +#: merge-recursive.c:1902 msgid "directory/file" msgstr "директория/файл" -#: merge-recursive.c:1884 +#: merge-recursive.c:1908 #, 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:1893 +#: merge-recursive.c:1917 #, c-format msgid "Adding %s" msgstr "Добавяне на „%s“" -#: merge-recursive.c:1930 -msgid "Already up-to-date!" +#: merge-recursive.c:1954 +msgid "Already up to date!" msgstr "Вече е обновено!" -#: merge-recursive.c:1939 +#: merge-recursive.c:1963 #, c-format msgid "merging of trees %s and %s failed" msgstr "неуспешно сливане на дърветата „%s“ и „%s“" -#: merge-recursive.c:2022 +#: merge-recursive.c:2060 msgid "Merging:" msgstr "Сливане:" -#: merge-recursive.c:2035 +#: merge-recursive.c:2073 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "открит е %u общ предшественик:" msgstr[1] "открити са %u общи предшественици:" -#: merge-recursive.c:2074 +#: merge-recursive.c:2112 msgid "merge returned no commit" msgstr "сливането не върна подаване" -#: merge-recursive.c:2137 +#: merge-recursive.c:2175 #, c-format msgid "Could not parse object '%s'" msgstr "Неуспешен анализ на обекта „%s“" -#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793 +#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814 msgid "Unable to write index." msgstr "Индексът не може да бъде прочетен" -#: notes-merge.c:273 +#: notes-merge.c:272 #, c-format msgid "" "You have not concluded your previous notes merge (%s exists).\n" @@ -2437,7 +2454,7 @@ msgstr "" "\n" " git notes merge --abort" -#: notes-merge.c:280 +#: notes-merge.c:279 #, c-format msgid "You have not concluded your notes merge (%s exists)." msgstr "" @@ -2468,16 +2485,35 @@ msgstr "" msgid "Bad %s value: '%s'" msgstr "Зададена е лоша стойност на променливата „%s“: „%s“" -#: object.c:240 +#: object.c:239 #, c-format msgid "unable to parse object: %s" msgstr "обектът „%s“ не може да бъде анализиран" +#: packfile.c:556 +msgid "offset before end of packfile (broken .idx?)" +msgstr "" +"отместване преди края на пакетния файл (възможно е индексът да е повреден)" + +#: packfile.c:1683 +#, c-format +msgid "offset before start of pack index for %s (corrupt index?)" +msgstr "" +"отместване преди началото на индекса на пакетния файл „%s“ (възможно е " +"индексът да е повреден)" + +#: packfile.c:1687 +#, c-format +msgid "offset beyond end of pack index for %s (truncated index?)" +msgstr "" +"отместване преди края на индекса на пакетния файл „%s“ (възможно е индексът " +"да е отрязан)" + #: parse-options.c:573 msgid "..." msgstr "…" -#: parse-options.c:591 +#: parse-options.c:592 #, c-format msgid "usage: %s" msgstr "употреба: %s" @@ -2485,17 +2521,17 @@ msgstr "употреба: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:597 +#: parse-options.c:598 #, c-format msgid " or: %s" msgstr " или: %s" -#: parse-options.c:600 +#: parse-options.c:601 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:634 +#: parse-options.c:640 msgid "-NUM" msgstr "-ЧИСЛО" @@ -2504,7 +2540,7 @@ msgstr "-ЧИСЛО" msgid "malformed object name '%s'" msgstr "неправилно име на обект „%s“" -#: path.c:890 +#: path.c:891 #, c-format msgid "Could not make %s writable by group" msgstr "Не могат да се дадат права за запис в директорията „%s“ на групата" @@ -2578,7 +2614,7 @@ msgstr "„%s“ (клавиш: „%c“)" msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: магическите пътища не се поддържат от командата „%s“" -#: pathspec.c:575 +#: pathspec.c:571 msgid "" "empty strings as pathspecs will be made invalid in upcoming releases. please " "use . instead if you meant to match all paths" @@ -2587,12 +2623,12 @@ msgstr "" "следващи версии на Git. Ако искате съвпадение с всички пътища, използвайте: " "„.“" -#: pathspec.c:599 +#: pathspec.c:595 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "пътят „%s“ е след символна връзка" -#: pretty.c:963 +#: pretty.c:962 msgid "unable to parse --pretty format" msgstr "аргументът към опцията „--pretty“ не може да се анализира" @@ -2615,50 +2651,51 @@ msgstr "" "„GIT_INDEX_VERSION“.\n" "Ще се ползва версия %i" -#: read-cache.c:2308 builtin/merge.c:1019 +#: read-cache.c:2316 builtin/merge.c:1046 #, c-format msgid "could not close '%s'" msgstr "„%s“ не може да се затвори" -#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054 +#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077 #, c-format msgid "could not stat '%s'" msgstr "неуспешно изпълнение на „stat“ върху „%s“" -#: read-cache.c:2396 +#: read-cache.c:2407 #, c-format msgid "unable to open git dir: %s" msgstr "не може да се отвори директорията на git: %s" -#: read-cache.c:2408 +#: read-cache.c:2419 #, c-format msgid "unable to unlink: %s" msgstr "неуспешно изтриване на „%s“" -#: refs.c:622 +#: refs.c:638 #, c-format msgid "Could not open '%s' for writing" msgstr "„%s“ не може да бъде отворен за запис" -#: refs.c:1769 +#: refs.c:1779 msgid "ref updates forbidden inside quarantine environment" msgstr "обновяванията на указатели са забранени в среди под карантина" -#: refs/files-backend.c:1664 +#: refs/files-backend.c:1136 +#, c-format +msgid "could not remove reference %s" +msgstr "Указателят „%s“ не може да бъде изтрит" + +#: refs/files-backend.c:1150 refs/packed-backend.c:1430 +#: refs/packed-backend.c:1440 #, c-format msgid "could not delete reference %s: %s" msgstr "Указателят „%s“ не може да бъде изтрит: %s" -#: refs/files-backend.c:1667 +#: refs/files-backend.c:1153 refs/packed-backend.c:1443 #, c-format msgid "could not delete references: %s" msgstr "Указателите не може да бъдат изтрити: %s" -#: refs/files-backend.c:1676 -#, c-format -msgid "could not remove reference %s" -msgstr "Указателят „%s“ не може да бъде изтрит" - #: ref-filter.c:35 wt-status.c:1811 msgid "gone" msgstr "изтрит" @@ -2678,157 +2715,157 @@ msgstr "назад с %d" msgid "ahead %d, behind %d" msgstr "напред с %d, назад с %d" -#: ref-filter.c:105 +#: ref-filter.c:104 #, c-format msgid "expected format: %%(color:<color>)" msgstr "очакван формат: %%(color:ЦВЯТ)" -#: ref-filter.c:107 +#: ref-filter.c:106 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "непознат цвят: %%(color:%s)" -#: ref-filter.c:121 +#: ref-filter.c:126 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "очаква се цяло число за „refname:lstrip=%s“" -#: ref-filter.c:125 +#: ref-filter.c:130 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "очаква се цяло число за „refname:rstrip=%s“" -#: ref-filter.c:127 +#: ref-filter.c:132 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "непознат аргумент за „%%(%s)“: %s" -#: ref-filter.c:167 +#: ref-filter.c:172 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) не приема аргументи" -#: ref-filter.c:174 +#: ref-filter.c:179 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) не приема аргументи" -#: ref-filter.c:181 +#: ref-filter.c:186 #, c-format msgid "%%(trailers) does not take arguments" msgstr "%%(trailers) не приема аргументи" -#: ref-filter.c:200 +#: ref-filter.c:205 #, c-format msgid "positive value expected contents:lines=%s" msgstr "очаква се положителна стойност за „contents:lines=%s“" -#: ref-filter.c:202 +#: ref-filter.c:207 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "непознат аргумент за %%(contents): %s" -#: ref-filter.c:215 +#: ref-filter.c:220 #, c-format msgid "positive value expected objectname:short=%s" msgstr "очаква се положителна стойност за „objectname:short=%s“" -#: ref-filter.c:219 +#: ref-filter.c:224 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "непознат аргумент за %%(objectname): %s" -#: ref-filter.c:246 +#: ref-filter.c:251 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "очакван формат: %%(align:ШИРОЧИНА,ПОЗИЦИЯ)" -#: ref-filter.c:258 +#: ref-filter.c:263 #, c-format msgid "unrecognized position:%s" msgstr "непозната позиция: %s" -#: ref-filter.c:262 +#: ref-filter.c:267 #, c-format msgid "unrecognized width:%s" msgstr "непозната широчина: %s" -#: ref-filter.c:268 +#: ref-filter.c:273 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "непознат аргумент за %%(align): %s" -#: ref-filter.c:272 +#: ref-filter.c:277 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "очаква се положителна широчина с лексемата „%%(align)“" -#: ref-filter.c:287 +#: ref-filter.c:292 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "непознат аргумент за „%%(if)“: %s" -#: ref-filter.c:378 +#: ref-filter.c:382 #, c-format msgid "malformed field name: %.*s" msgstr "неправилно име на обект: „%.*s“" -#: ref-filter.c:404 +#: ref-filter.c:408 #, c-format msgid "unknown field name: %.*s" msgstr "непознато име на обект: „%.*s“" -#: ref-filter.c:508 +#: ref-filter.c:520 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "формат: лексемата %%(if) е използвана без съответната ѝ %%(then)" -#: ref-filter.c:568 +#: ref-filter.c:580 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "формат: лексемата %%(then) е използвана без съответната ѝ %%(if)" -#: ref-filter.c:570 +#: ref-filter.c:582 #, c-format msgid "format: %%(then) atom used more than once" msgstr "формат: лексемата %%(then) е използвана повече от един път" -#: ref-filter.c:572 +#: ref-filter.c:584 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "формат: лексемата %%(then) е използвана след %%(else)" -#: ref-filter.c:598 +#: ref-filter.c:610 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "формат: лексемата %%(else) е използвана без съответната ѝ %%(if)" -#: ref-filter.c:600 +#: ref-filter.c:612 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "формат: лексемата %%(else) е използвана без съответната ѝ %%(then)" -#: ref-filter.c:602 +#: ref-filter.c:614 #, c-format msgid "format: %%(else) atom used more than once" msgstr "формат: лексемата %%(else) е използвана повече от един път" -#: ref-filter.c:615 +#: ref-filter.c:627 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "формат: лексемата %%(end) е използвана без съответната ѝ" -#: ref-filter.c:670 +#: ref-filter.c:682 #, c-format msgid "malformed format string %s" -msgstr "неправилен низ за форматиране „%s“" +msgstr "неправилен форматиращ низ „%s“" -#: ref-filter.c:1254 +#: ref-filter.c:1268 #, c-format msgid "(no branch, rebasing %s)" msgstr "(извън клон, пребазиране на „%s“)" -#: ref-filter.c:1257 +#: ref-filter.c:1271 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(извън клон, двоично търсене от „%s“)" @@ -2836,7 +2873,7 @@ msgstr "(извън клон, двоично търсене от „%s“)" #. TRANSLATORS: make sure this matches "HEAD #. detached at " in wt-status.c #. -#: ref-filter.c:1265 +#: ref-filter.c:1279 #, c-format msgid "(HEAD detached at %s)" msgstr "(Указателят „HEAD“ не е свързан и е при „%s“)" @@ -2844,110 +2881,110 @@ msgstr "(Указателят „HEAD“ не е свързан и е при „ #. TRANSLATORS: make sure this matches "HEAD #. detached from " in wt-status.c #. -#: ref-filter.c:1272 +#: ref-filter.c:1286 #, c-format msgid "(HEAD detached from %s)" msgstr "Указателят „HEAD“ не е свързан и е отделѐн от „%s“" -#: ref-filter.c:1276 +#: ref-filter.c:1290 msgid "(no branch)" msgstr "(извън клон)" -#: ref-filter.c:1426 ref-filter.c:1457 +#: ref-filter.c:1439 ref-filter.c:1470 #, c-format msgid "missing object %s for %s" msgstr "обектът „%s“ липсва за „%s“" -#: ref-filter.c:1429 ref-filter.c:1460 +#: ref-filter.c:1442 ref-filter.c:1473 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "неуспешно анализиране чрез „parse_object_buffer“ на „%s“ за „%s“" -#: ref-filter.c:1760 +#: ref-filter.c:1773 #, c-format msgid "malformed object at '%s'" msgstr "обект със сгрешен формат при „%s“" -#: ref-filter.c:1827 +#: ref-filter.c:1840 #, c-format msgid "ignoring ref with broken name %s" msgstr "игнориране на указателя с грешно име „%s“" -#: ref-filter.c:1832 +#: ref-filter.c:1845 #, c-format msgid "ignoring broken ref %s" msgstr "игнориране на повредения указател „%s“" -#: ref-filter.c:2095 +#: ref-filter.c:2107 #, c-format msgid "format: %%(end) atom missing" msgstr "грешка във форма̀та: липсва лексемата %%(end)" -#: ref-filter.c:2176 +#: ref-filter.c:2201 #, c-format msgid "malformed object name %s" msgstr "неправилно име на обект „%s“" -#: remote.c:747 +#: remote.c:750 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Невъзможно е да се доставят едновременно и „%s“, и „%s“ към „%s“" -#: remote.c:751 +#: remote.c:754 #, c-format msgid "%s usually tracks %s, not %s" msgstr "„%s“ обикновено следи „%s“, а не „%s“" -#: remote.c:755 +#: remote.c:758 #, c-format msgid "%s tracks both %s and %s" msgstr "„%s“ следи както „%s“, така и „%s“" -#: remote.c:763 +#: remote.c:766 msgid "Internal error" msgstr "Вътрешна грешка" -#: remote.c:1680 remote.c:1782 +#: remote.c:1681 remote.c:1783 msgid "HEAD does not point to a branch" msgstr "Указателят „HEAD“ не сочи към клон" -#: remote.c:1689 +#: remote.c:1690 #, c-format msgid "no such branch: '%s'" msgstr "няма клон на име „%s“" -#: remote.c:1692 +#: remote.c:1693 #, c-format msgid "no upstream configured for branch '%s'" msgstr "не е зададен клон-източник за клона „%s“" -#: remote.c:1698 +#: remote.c:1699 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "клонът-източник „%s“ не е съхранен като следящ клон" -#: remote.c:1713 +#: remote.c:1714 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "липсва локален следящ клон за местоположението за изтласкване „%s“ в " "хранилището „%s“" -#: remote.c:1725 +#: remote.c:1726 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "няма информация клонът „%s“ да следи някой друг" -#: remote.c:1736 +#: remote.c:1737 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "указателят за изтласкване на „%s“ не включва „%s“" -#: remote.c:1749 +#: remote.c:1750 msgid "push has no destination (push.default is 'nothing')" msgstr "указателят за изтласкване не включва цел („push.default“ е „nothing“)" -#: remote.c:1771 +#: remote.c:1772 msgid "cannot resolve 'simple' push to a single destination" msgstr "простото (simple) изтласкване не съответства на една цел" @@ -2962,7 +2999,7 @@ msgstr " (за да коригирате това, използвайте „gi #: remote.c:2083 #, c-format -msgid "Your branch is up-to-date with '%s'.\n" +msgid "Your branch is up to date with '%s'.\n" msgstr "Клонът е актуализиран към „%s“.\n" #: remote.c:2087 @@ -3007,16 +3044,16 @@ msgstr[1] "" msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (слейте отдалечения клон в локалния чрез „git pull“)\n" -#: revision.c:2187 +#: revision.c:2256 msgid "your current branch appears to be broken" msgstr "Текущият клон е повреден" -#: revision.c:2190 +#: revision.c:2259 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "Текущият клон „%s“ е без подавания " -#: revision.c:2384 +#: revision.c:2453 msgid "--first-parent is incompatible with --bisect" msgstr "опциите „--first-parent“ и „--bisect“ са несъвместими" @@ -3059,24 +3096,24 @@ msgstr "получаващата страна не поддържа изтлас msgid "the receiving end does not support push options" msgstr "отсрещната страна не поддържа опции при изтласкване" -#: sequencer.c:216 +#: sequencer.c:218 msgid "revert" msgstr "отмяна" -#: sequencer.c:218 +#: sequencer.c:220 msgid "cherry-pick" msgstr "отбиране" -#: sequencer.c:220 +#: sequencer.c:222 msgid "rebase -i" msgstr "rebase -i" -#: sequencer.c:222 +#: sequencer.c:224 #, c-format msgid "Unknown action: %d" msgstr "Неизвестно действие: %d" -#: sequencer.c:279 +#: sequencer.c:281 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -3084,7 +3121,7 @@ msgstr "" "след коригирането на конфликтите, отбележете съответните\n" "пътища с „git add ПЪТ…“ или „git rm ПЪТ…“." -#: sequencer.c:282 +#: sequencer.c:284 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -3094,42 +3131,43 @@ msgstr "" "пътища с „git add ПЪТ…“ или „git rm ПЪТ…“, след което\n" "подайте резултата с командата „git commit'“." -#: sequencer.c:295 sequencer.c:1685 +#: sequencer.c:297 sequencer.c:1704 #, c-format msgid "could not lock '%s'" msgstr "„%s“ не може да се заключи" -#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704 +#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723 +#: sequencer.c:2733 sequencer.c:2749 #, c-format msgid "could not write to '%s'" msgstr "в „%s“ не може да се пише" -#: sequencer.c:302 +#: sequencer.c:304 #, c-format msgid "could not write eol to '%s'" msgstr "краят на ред не може да се запише в „%s“" -#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692 +#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711 #, c-format msgid "failed to finalize '%s'." msgstr "„%s“ не може да се завърши." -#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258 -#: builtin/commit.c:750 builtin/merge.c:1017 +#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259 +#: builtin/commit.c:754 builtin/merge.c:1044 #, c-format msgid "could not read '%s'" msgstr "файлът „%s“ не може да бъде прочетен" -#: sequencer.c:356 +#: sequencer.c:358 #, c-format msgid "your local changes would be overwritten by %s." msgstr "локалните ви промени ще бъдат презаписани при %s." -#: sequencer.c:360 +#: sequencer.c:362 msgid "commit your changes or stash them to proceed." msgstr "подайте или скатайте промените, за да продължите" -#: sequencer.c:389 +#: sequencer.c:391 #, c-format msgid "%s: fast-forward" msgstr "%s: превъртане" @@ -3137,20 +3175,20 @@ msgstr "%s: превъртане" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:472 +#: sequencer.c:474 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: новият индекс не може да бъде запазен" -#: sequencer.c:491 +#: sequencer.c:493 msgid "could not resolve HEAD commit\n" msgstr "подаването сочено от указателя „HEAD“ не може да бъде открито\n" -#: sequencer.c:511 +#: sequencer.c:513 msgid "unable to update cache tree\n" msgstr "дървото на кеша не може да бъде обновено\n" -#: sequencer.c:595 +#: sequencer.c:597 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -3179,17 +3217,17 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:697 +#: sequencer.c:699 #, c-format msgid "could not parse commit %s\n" msgstr "подаването „%s“ не може да бъде анализирано\n" -#: sequencer.c:702 +#: sequencer.c:704 #, c-format msgid "could not parse parent commit %s\n" msgstr "родителското подаване „%s“ не може да бъде анализирано\n" -#: sequencer.c:824 +#: sequencer.c:826 #, c-format msgid "" "unexpected 1st line of squash message:\n" @@ -3200,7 +3238,7 @@ msgstr "" "\n" " %.*s" -#: sequencer.c:830 +#: sequencer.c:832 #, c-format msgid "" "invalid 1st line of squash message:\n" @@ -3211,239 +3249,240 @@ msgstr "" "\n" " %.*s" -#: sequencer.c:836 sequencer.c:861 +#: sequencer.c:838 sequencer.c:863 #, c-format msgid "This is a combination of %d commits." msgstr "Това е обединение от %d подавания" -#: sequencer.c:845 +#: sequencer.c:847 sequencer.c:2681 msgid "need a HEAD to fixup" msgstr "За смачкване ви трябва указател „HEAD“" -#: sequencer.c:847 +#: sequencer.c:849 msgid "could not read HEAD" msgstr "указателят „HEAD“ не може да се прочете" -#: sequencer.c:849 +#: sequencer.c:851 msgid "could not read HEAD's commit message" msgstr "" "съобщението за подаване към указателя „HEAD“ не може да бъде прочетено: %s" -#: sequencer.c:855 +#: sequencer.c:857 #, c-format msgid "cannot write '%s'" msgstr "„%s“ не може да се запази" -#: sequencer.c:864 git-rebase--interactive.sh:445 +#: sequencer.c:866 git-rebase--interactive.sh:446 msgid "This is the 1st commit message:" msgstr "Това е 1-то съобщение при подаване:" -#: sequencer.c:872 +#: sequencer.c:874 #, c-format msgid "could not read commit message of %s" msgstr "съобщението за подаване към „%s“ не може да бъде прочетено" -#: sequencer.c:879 +#: sequencer.c:881 #, c-format msgid "This is the commit message #%d:" msgstr "Това е съобщение при подаване №%d:" -#: sequencer.c:884 +#: sequencer.c:886 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Съобщение при подаване №%d ще бъде прескочено:" -#: sequencer.c:889 +#: sequencer.c:891 #, c-format msgid "unknown command: %d" msgstr "непозната команда: %d" -#: sequencer.c:955 +#: sequencer.c:957 msgid "your index file is unmerged." msgstr "индексът не е слят." -#: sequencer.c:973 +#: sequencer.c:975 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "подаването „%s“ е сливане, но не е дадена опцията „-m“" -#: sequencer.c:981 +#: sequencer.c:983 #, c-format msgid "commit %s does not have parent %d" msgstr "подаването „%s“ няма родител %d" -#: sequencer.c:985 +#: sequencer.c:987 #, c-format msgid "mainline was specified but commit %s is not a merge." msgstr "указано е базово подаване, но подаването „%s“ не е сливане." -#: sequencer.c:991 +#: sequencer.c:993 #, 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:1012 +#: sequencer.c:1014 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: неразпозната стойност за родителското подаване „%s“" -#: sequencer.c:1075 sequencer.c:1830 +#: sequencer.c:1077 sequencer.c:1853 #, c-format msgid "could not rename '%s' to '%s'" msgstr "„%s“ не може да се преименува на „%s“" -#: sequencer.c:1126 +#: sequencer.c:1128 #, c-format msgid "could not revert %s... %s" msgstr "подаването „%s“… не може да бъде отменено: „%s“" -#: sequencer.c:1127 +#: sequencer.c:1129 #, c-format msgid "could not apply %s... %s" msgstr "подаването „%s“… не може да бъде приложено: „%s“" -#: sequencer.c:1169 +#: sequencer.c:1171 msgid "empty commit set passed" msgstr "зададено е празно множество от подавания" -#: sequencer.c:1179 +#: sequencer.c:1181 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: неуспешно изчитане на индекса" -#: sequencer.c:1186 +#: sequencer.c:1188 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: неуспешно обновяване на индекса" -#: sequencer.c:1306 +#: sequencer.c:1308 #, c-format msgid "invalid line %d: %.*s" msgstr "неправилен ред %d: %.*s" -#: sequencer.c:1314 +#: sequencer.c:1316 #, c-format msgid "cannot '%s' without a previous commit" msgstr "Без предишно подаване не може да се изпълни „%s“" -#: sequencer.c:1347 +#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614 +#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951 #, c-format msgid "could not read '%s'." msgstr "от „%s“ не може да се чете." -#: sequencer.c:1359 +#: sequencer.c:1361 msgid "please fix this using 'git rebase --edit-todo'." msgstr "коригирайте това чрез „git rebase --edit-todo“." -#: sequencer.c:1361 +#: sequencer.c:1363 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "неизползваем файл с описание на предстоящите действия: „%s“" -#: sequencer.c:1366 +#: sequencer.c:1368 msgid "no commits parsed." msgstr "никое от подаванията не може да се разпознае." -#: sequencer.c:1377 +#: sequencer.c:1379 msgid "cannot cherry-pick during a revert." msgstr "" "по време на отмяна на подаване не може да се извърши отбиране на подаване." -#: sequencer.c:1379 +#: sequencer.c:1381 msgid "cannot revert during a cherry-pick." msgstr "по време на отбиране не може да се извърши отмяна на подаване." -#: sequencer.c:1442 +#: sequencer.c:1448 #, c-format msgid "invalid key: %s" msgstr "неправилен ключ: „%s“" -#: sequencer.c:1445 +#: sequencer.c:1451 #, c-format msgid "invalid value for %s: %s" msgstr "неправилна стойност за „%s“: „%s“" -#: sequencer.c:1502 +#: sequencer.c:1517 #, c-format msgid "malformed options sheet: '%s'" msgstr "неправилен файл с опции: „%s“" -#: sequencer.c:1540 +#: sequencer.c:1555 msgid "a cherry-pick or revert is already in progress" msgstr "" "в момента вече се извършва отбиране на подавания или пребазиране на клона" -#: sequencer.c:1541 +#: sequencer.c:1556 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "използвайте „git cherry-pick (--continue | --quit | --abort)“" -#: sequencer.c:1544 +#: sequencer.c:1559 #, c-format msgid "could not create sequencer directory '%s'" msgstr "директорията за секвенсора „%s“ не може да бъде създадена" -#: sequencer.c:1558 +#: sequencer.c:1574 msgid "could not lock HEAD" msgstr "указателят „HEAD“ не може да се заключи" -#: sequencer.c:1614 sequencer.c:2188 +#: sequencer.c:1632 sequencer.c:2211 msgid "no cherry-pick or revert in progress" msgstr "" "в момента не се извършва отбиране на подавания или пребазиране на клона" -#: sequencer.c:1616 +#: sequencer.c:1634 msgid "cannot resolve HEAD" msgstr "Подаването сочено от указателя „HEAD“ не може да бъде открито" -#: sequencer.c:1618 sequencer.c:1652 +#: sequencer.c:1636 sequencer.c:1671 msgid "cannot abort from a branch yet to be born" msgstr "" "действието не може да бъде преустановено, когато сте на клон, който тепърва " "предстои да бъде създаден" -#: sequencer.c:1638 builtin/grep.c:929 +#: sequencer.c:1657 builtin/grep.c:711 #, c-format msgid "cannot open '%s'" msgstr "„%s“ не може да бъде отворен" -#: sequencer.c:1640 +#: sequencer.c:1659 #, c-format msgid "cannot read '%s': %s" msgstr "„%s“ не може да бъде прочетен: %s" -#: sequencer.c:1641 +#: sequencer.c:1660 msgid "unexpected end of file" msgstr "неочакван край на файл" -#: sequencer.c:1647 +#: sequencer.c:1666 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" "запазеният преди започването на отбирането файл за указателя „HEAD“ — „%s“ е " "повреден" -#: sequencer.c:1658 +#: sequencer.c:1677 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" "Изглежда указателят „HEAD“ е променен. Проверете към какво сочи.\n" "Не се правят промени." -#: sequencer.c:1795 sequencer.c:2086 +#: sequencer.c:1818 sequencer.c:2109 msgid "cannot read HEAD" msgstr "указателят „HEAD“ не може да бъде прочетен" -#: sequencer.c:1835 builtin/difftool.c:633 +#: sequencer.c:1858 builtin/difftool.c:640 #, c-format msgid "could not copy '%s' to '%s'" msgstr "„%s“ не може да се копира като „%s“" -#: sequencer.c:1851 +#: sequencer.c:1874 msgid "could not read index" msgstr "индексът не може да бъде прочетен" -#: sequencer.c:1856 +#: sequencer.c:1879 #, c-format msgid "" "execution failed: %s\n" @@ -3458,11 +3497,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:1862 +#: sequencer.c:1885 msgid "and made changes to the index and/or the working tree\n" msgstr "и промени индекса и/или работното дърво\n" -#: sequencer.c:1868 +#: sequencer.c:1891 #, c-format msgid "" "execution succeeded: %s\n" @@ -3479,17 +3518,17 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:1925 +#: sequencer.c:1948 #, c-format msgid "Applied autostash.\n" msgstr "Автоматично скатаното е приложено.\n" -#: sequencer.c:1937 +#: sequencer.c:1960 #, c-format msgid "cannot store %s" msgstr "„%s“ не може да бъде запазен" -#: sequencer.c:1940 git-rebase.sh:173 +#: sequencer.c:1963 git-rebase.sh:175 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -3500,57 +3539,57 @@ msgstr "" "надеждно скатани. Можете да пробвате да ги приложите чрез „git stash pop“\n" "или да ги изхвърлите чрез „git stash drop“, когато поискате.\n" -#: sequencer.c:2022 +#: sequencer.c:2045 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Спиране при „%s“… %.*s\n" -#: sequencer.c:2064 +#: sequencer.c:2087 #, c-format msgid "unknown command %d" msgstr "непозната команда %d" -#: sequencer.c:2094 +#: sequencer.c:2117 msgid "could not read orig-head" msgstr "указателят за „orig-head“ не може да се прочете" -#: sequencer.c:2099 +#: sequencer.c:2122 sequencer.c:2678 msgid "could not read 'onto'" msgstr "указателят за „onto“ не може да се прочете" -#: sequencer.c:2106 +#: sequencer.c:2129 #, c-format msgid "could not update %s" msgstr "„%s“ не може да се обнови" -#: sequencer.c:2113 +#: sequencer.c:2136 #, c-format msgid "could not update HEAD to %s" msgstr "„HEAD“ не може да бъде обновен до „%s“" -#: sequencer.c:2197 +#: sequencer.c:2220 msgid "cannot rebase: You have unstaged changes." msgstr "не може да пребазирате, защото има промени, които не са в индекса." -#: sequencer.c:2202 +#: sequencer.c:2225 msgid "could not remove CHERRY_PICK_HEAD" msgstr "указателят „CHERRY_PICK_HEAD“ не може да бъде изтрит" -#: sequencer.c:2211 +#: sequencer.c:2234 msgid "cannot amend non-existing commit" msgstr "несъществуващо подаване не може да се поправи" -#: sequencer.c:2213 +#: sequencer.c:2236 #, c-format msgid "invalid file: '%s'" msgstr "неправилен файл: „%s“" -#: sequencer.c:2215 +#: sequencer.c:2238 #, c-format msgid "invalid contents: '%s'" msgstr "неправилно съдържание: „%s“" -#: sequencer.c:2218 +#: sequencer.c:2241 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -3560,24 +3599,111 @@ msgstr "" "В работното дърво има неподадени промени. Първо ги подайте, а след това\n" "отново изпълнете „git rebase --continue“." -#: sequencer.c:2228 +#: sequencer.c:2251 msgid "could not commit staged changes." msgstr "промените в индекса не могат да бъдат подадени." -#: sequencer.c:2308 +#: sequencer.c:2331 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: не може да се отбере „%s“" -#: sequencer.c:2312 +#: sequencer.c:2335 #, c-format msgid "%s: bad revision" msgstr "%s: неправилна версия" -#: sequencer.c:2345 +#: sequencer.c:2368 msgid "can't revert as initial commit" msgstr "първоначалното подаване не може да бъде отменено" +#: sequencer.c:2471 +msgid "make_script: unhandled options" +msgstr "make_script: неподдържани опции" + +#: sequencer.c:2474 +msgid "make_script: error preparing revisions" +msgstr "make_script: грешка при подготовката на версии" + +#: sequencer.c:2510 +#, c-format +msgid "unusable todo list: '%s'" +msgstr "неуспешно изтриване на списъка за изпълнение: „%s“" + +#: sequencer.c:2516 +#, c-format +msgid "unable to open '%s' for writing" +msgstr "„%s“ не може да бъде отворен за запис" + +#: sequencer.c:2561 +#, c-format +msgid "unrecognized setting %s for optionrebase.missingCommitsCheck. Ignoring." +msgstr "" +"Непозната стойност „%s“ за настройката „optionrebase.missingCommitsCheck“. " +"Настройката се прескача." + +#: sequencer.c:2641 +#, c-format +msgid "" +"Warning: some commits may have been dropped accidentally.\n" +"Dropped commits (newer to older):\n" +msgstr "" +"Предупреждение: някои подавания може да са пропуснати.\n" +"Пропуснати подавания (новите са най-отгоре):\n" + +#: sequencer.c:2648 +#, c-format +msgid "" +"To avoid this message, use \"drop\" to explicitly remove a commit.\n" +"\n" +"Use 'git config rebase.missingCommitsCheck' to change the level of " +"warnings.\n" +"The possible behaviours are: ignore, warn, error.\n" +"\n" +msgstr "" +"За да не получавате това съобщение, изрично ползвайте командата „drop“.\n" +"\n" +"Настройката „rebase.missingCommitsCheck“ управлява нивото на предупреждение\n" +"Възможните стойности са „ignore“ (пренебрегване), „warn“ (само " +"предупреждение)\n" +"или „error“ (считане за грешка).\n" + +#: sequencer.c:2660 +#, c-format +msgid "" +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" +"continue'.\n" +"Or you can abort the rebase with 'git rebase --abort'.\n" +msgstr "" +"Може да промените това с командите „git rebase --edit-todo“ и „git rebase --" +"continue“ след това.\n" +"Може и да преустановите пребазирането с командата „git rebase --abort“.\n" + +#: sequencer.c:2708 +#, c-format +msgid "could not parse commit '%s'" +msgstr "подаването „%s“ не може да бъде анализирано" + +#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395 +#: builtin/am.c:775 +#, c-format +msgid "could not open '%s' for writing" +msgstr "„%s“ не може да бъде отворен за запис" + +#: sequencer.c:2756 +#, c-format +msgid "could not truncate '%s'" +msgstr "неуспешно отрязване чрез „truncate“ върху „%s“" + +#: sequencer.c:2848 +msgid "the script was already rearranged." +msgstr "скриптът вече е преподреден." + +#: sequencer.c:2953 +#, c-format +msgid "could not finish '%s'" +msgstr "„%s“ не може да се завърши" + #: setup.c:171 #, c-format msgid "" @@ -3614,36 +3740,36 @@ msgstr "" "\n" " git КОМАНДА [ВЕРСИЯ…] -- [ФАЙЛ…]" -#: setup.c:504 +#: setup.c:499 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Очаква се версия на хранилището на git <= %d, а не %d" -#: setup.c:512 +#: setup.c:507 msgid "unknown repository extensions found:" msgstr "открити са непознати разширения в хранилището:" -#: setup.c:810 +#: setup.c:806 #, c-format msgid "Not a git repository (or any of the parent directories): %s" msgstr "" "Нито тази, нито която и да е от по-горните директории, не е хранилище на " "git: %s" -#: setup.c:812 builtin/index-pack.c:1652 +#: setup.c:808 builtin/index-pack.c:1653 msgid "Cannot come back to cwd" msgstr "Процесът не може да се върне към предишната работна директория" -#: setup.c:1050 +#: setup.c:1046 msgid "Unable to read current working directory" msgstr "Текущата работна директория не може да бъде прочетена" -#: setup.c:1062 setup.c:1068 +#: setup.c:1058 setup.c:1064 #, c-format msgid "Cannot change to '%s'" msgstr "Не може да се влезе в директорията „%s“" -#: setup.c:1081 +#: setup.c:1077 #, c-format msgid "" "Not a git repository (or any parent up to mount point %s)\n" @@ -3654,7 +3780,7 @@ msgstr "" "Git работи в рамките на една файлова система, защото променливата на средата " "„GIT_DISCOVERY_ACROSS_FILESYSTEM“ не е зададена." -#: setup.c:1173 +#: setup.c:1159 #, c-format msgid "" "Problem with core.sharedRepository filemode value (0%.3o).\n" @@ -3664,60 +3790,41 @@ msgstr "" "(0%.3o).\n" "Собственикът на файла трябва да има права за писане и четене." -#: sha1_file.c:560 +#: sha1_file.c:528 #, c-format msgid "path '%s' does not exist" msgstr "пътят „%s“ не съществува." -#: sha1_file.c:586 +#: sha1_file.c:554 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "все още не се поддържа еталонно хранилище „%s“ като свързано." -#: sha1_file.c:592 +#: sha1_file.c:560 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "еталонното хранилище „%s“ не е локално" -#: sha1_file.c:598 +#: sha1_file.c:566 #, c-format msgid "reference repository '%s' is shallow" msgstr "еталонното хранилище „%s“ е плитко" -#: sha1_file.c:606 +#: sha1_file.c:574 #, c-format msgid "reference repository '%s' is grafted" msgstr "еталонното хранилище „%s“ е с присаждане" -#: sha1_file.c:1245 -msgid "offset before end of packfile (broken .idx?)" -msgstr "" -"отместване преди края на пакетния файл (възможно е индексът да е повреден)" - -#: sha1_file.c:2729 -#, c-format -msgid "offset before start of pack index for %s (corrupt index?)" -msgstr "" -"отместване преди началото на индекса на пакетния файл „%s“ (възможно е " -"индексът да е повреден)" - -#: sha1_file.c:2733 -#, c-format -msgid "offset beyond end of pack index for %s (truncated index?)" -msgstr "" -"отместване преди края на индекса на пакетния файл „%s“ (възможно е индексът " -"да е отрязан)" - -#: sha1_name.c:419 +#: sha1_name.c:420 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "късият SHA1 „%s“ не е еднозначен" -#: sha1_name.c:430 +#: sha1_name.c:431 msgid "The candidates are:" msgstr "Възможностите са:" -#: sha1_name.c:589 +#: sha1_name.c:590 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -3741,66 +3848,71 @@ msgstr "" "спрете това съобщение като изпълните командата:\n" "„git config advice.objectNameWarning false“" -#: submodule.c:70 submodule.c:104 +#: submodule.c:93 submodule.c:127 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" "Неслетите файлове „.gitmodules“ не могат да бъдат променяни. Първо " "коригирайте конфликтите" -#: submodule.c:74 submodule.c:108 +#: submodule.c:97 submodule.c:131 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "Във файла „.gitmodules“ липсва раздел за директория „path=%s“" -#: submodule.c:82 +#: submodule.c:105 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Записът „%s“ във файла „.gitmodules“ не може да бъде променен" -#: submodule.c:115 +#: submodule.c:138 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "Записът „%s“ във файла „.gitmodules“ не може да бъде изтрит" -#: submodule.c:126 +#: submodule.c:149 msgid "staging updated .gitmodules failed" msgstr "неуспешно добавяне на променения файл „.gitmodules“ в индекса" -#: submodule.c:165 -msgid "negative values not allowed for submodule.fetchJobs" -msgstr "Настройката „submodule.fetchJobs“ не приема отрицателни стойности" - -#: submodule.c:376 +#: submodule.c:309 #, c-format msgid "in unpopulated submodule '%s'" msgstr "в неподготвения подмодул „%s“" -#: submodule.c:407 +#: submodule.c:340 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Пътят „%s“ е в подмодула „%.*s“" -#: submodule.c:1337 +#: submodule.c:799 +#, c-format +msgid "submodule entry '%s' (%s) is a %s, not a commit" +msgstr "записът за подмодула „%s“ (%s) е %s, а не подаване!" + +#: submodule.c:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149 +msgid "Failed to resolve HEAD as a valid ref." +msgstr "Не може да се открие към какво сочи указателят „HEAD“" + +#: submodule.c:1304 #, c-format msgid "'%s' not recognized as a git repository" msgstr "„%s“ не е хранилище на git" -#: submodule.c:1475 +#: submodule.c:1442 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "командата „git status“ не може да се изпълни в подмодула „%s“" -#: submodule.c:1488 +#: submodule.c:1455 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "командата „git status“ не може да се изпълни в подмодула „%s“" -#: submodule.c:1581 +#: submodule.c:1548 #, c-format msgid "submodule '%s' has dirty index" msgstr "индексът на подмодула „%s“ не е чист" -#: submodule.c:1845 +#: submodule.c:1809 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -3808,18 +3920,18 @@ msgstr "" "не се поддържа „relocate_gitdir“ за подмодула „%s“, който има повече от едно " "работно дърво" -#: submodule.c:1857 submodule.c:1913 +#: submodule.c:1821 submodule.c:1877 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "името на подмодула „%s“ не може да бъде намерено" -#: submodule.c:1861 builtin/submodule--helper.c:678 -#: builtin/submodule--helper.c:688 +#: submodule.c:1825 builtin/submodule--helper.c:671 +#: builtin/submodule--helper.c:681 #, c-format msgid "could not create directory '%s'" msgstr "Директорията „%s“ не може да бъде създадена" -#: submodule.c:1864 +#: submodule.c:1828 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -3830,94 +3942,98 @@ msgstr "" "„%s“ към\n" "„%s“\n" -#: submodule.c:1948 +#: submodule.c:1912 #, c-format msgid "could not recurse into submodule '%s'" msgstr "неуспешна обработка на поддиректориите в подмодула „%s“" -#: submodule.c:1992 +#: submodule.c:1956 msgid "could not start ls-files in .." msgstr "„ls-stat“ не може да се стартира в „..“" -#: submodule.c:2012 +#: submodule.c:1976 msgid "BUG: returned path string doesn't match cwd?" msgstr "ГРЕШКА: полученият низ за пътя не съвпада с върнатото от „cwd“" -#: submodule.c:2031 +#: submodule.c:1995 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "„ls-tree“ завърши с неочакван изходен код: %d" -#: submodule-config.c:420 +#: submodule-config.c:263 +msgid "negative values not allowed for submodule.fetchjobs" +msgstr "настройката „submodule.fetchjobs“ не приема отрицателни стойности" + +#: submodule-config.c:436 #, c-format msgid "invalid value for %s" msgstr "Неправилна стойност за „%s“" -#: trailer.c:241 +#: trailer.c:238 #, c-format msgid "running trailer command '%s' failed" msgstr "неуспешно изпълнение на завършващата команда „%s“" -#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540 -#: trailer.c:544 +#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 +#: trailer.c:557 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "непозната стойност „%s“ за настройката „%s“" -#: trailer.c:526 trailer.c:531 builtin/remote.c:290 +#: trailer.c:539 trailer.c:544 builtin/remote.c:290 #, c-format msgid "more than one %s" msgstr "стойността „%s“ се повтаря в настройките" -#: trailer.c:703 +#: trailer.c:730 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "празна завършваща лексема в епилога „%.*s“" -#: trailer.c:723 +#: trailer.c:750 #, c-format msgid "could not read input file '%s'" msgstr "входният файл „%s“ не може да бъде прочетен" -#: trailer.c:726 +#: trailer.c:753 msgid "could not read from stdin" msgstr "от стандартния вход не може да се чете" -#: trailer.c:950 builtin/am.c:45 +#: trailer.c:1008 builtin/am.c:46 #, c-format msgid "could not stat %s" msgstr "Не може да се получи информация чрез „stat“ за „%s“" -#: trailer.c:952 +#: trailer.c:1010 #, c-format msgid "file %s is not a regular file" msgstr "„%s“ не е обикновен файл" -#: trailer.c:954 +#: trailer.c:1012 #, c-format msgid "file %s is not writable by user" msgstr "„%s“: няма права за записване на файла" -#: trailer.c:966 +#: trailer.c:1024 msgid "could not open temporary file" msgstr "временният файл не може да се отвори" -#: trailer.c:1002 +#: trailer.c:1064 #, c-format msgid "could not rename temporary file to %s" msgstr "временният файл не може да се преименува на „%s“" -#: transport.c:63 +#: transport.c:62 #, c-format msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "Клонът „%s“ ще следи „%s“ от „%s“\n" -#: transport.c:152 +#: transport.c:151 #, c-format msgid "transport: invalid depth option '%s'" msgstr "transport: неправилна опция за дълбочина: %s" -#: transport.c:890 +#: transport.c:888 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -3926,7 +4042,7 @@ msgstr "" "Следните пътища за подмодули съдържат промени,\n" "които липсват от всички отдалечени хранилища:\n" -#: transport.c:894 +#: transport.c:892 #, c-format msgid "" "\n" @@ -3951,7 +4067,7 @@ msgstr "" " git push\n" "\n" -#: transport.c:902 +#: transport.c:900 msgid "Aborting." msgstr "Преустановяване на действието." @@ -3972,11 +4088,11 @@ msgstr "неправилни права за достъп в запис в дъ msgid "empty filename in tree entry" msgstr "празно име на файл в запис в дърво" -#: tree-walk.c:113 +#: tree-walk.c:114 msgid "too-short tree file" msgstr "прекалено кратък файл-дърво" -#: unpack-trees.c:105 +#: unpack-trees.c:106 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3985,7 +4101,7 @@ msgstr "" "Изтеглянето ще презапише локалните промени на тези файлове:\n" "%%sПодайте или скатайте промените, за да преминете към нов клон." -#: unpack-trees.c:107 +#: unpack-trees.c:108 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3994,7 +4110,7 @@ msgstr "" "Изтеглянето ще презапише локалните промени на тези файлове:\n" "%%s" -#: unpack-trees.c:110 +#: unpack-trees.c:111 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4003,7 +4119,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" @@ -4012,7 +4128,7 @@ msgstr "" "Сливането ще презапише локалните промени на тези файлове:\n" "%%s" -#: unpack-trees.c:115 +#: unpack-trees.c:116 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -4021,7 +4137,7 @@ msgstr "" "„%s“ ще презапише локалните промени на тези файлове:\n" "%%sПодайте или скатайте промените, за да извършите „%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" @@ -4030,7 +4146,7 @@ msgstr "" "„%s“ ще презапише локалните промени на тези файлове:\n" "%%s" -#: unpack-trees.c:122 +#: unpack-trees.c:123 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -4039,7 +4155,7 @@ msgstr "" "Обновяването на следните директории ще изтрие неследените файлове в тях:\n" "%s" -#: unpack-trees.c:126 +#: unpack-trees.c:127 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -4048,7 +4164,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" @@ -4057,7 +4173,7 @@ msgstr "" "Изтеглянето ще изтрие тези неследени файлове в работното дърво:\n" "%%s" -#: unpack-trees.c:131 +#: unpack-trees.c:132 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -4066,7 +4182,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" @@ -4075,7 +4191,7 @@ msgstr "" "Сливането ще изтрие тези неследени файлове в работното дърво:\n" "%%s" -#: unpack-trees.c:136 +#: unpack-trees.c:137 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -4084,7 +4200,7 @@ msgstr "" "„%s“ ще изтрие тези неследени файлове в работното дърво:\n" "%%sПреместете ги или ги изтрийте, за да извършите „%s“." -#: unpack-trees.c:138 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -4093,7 +4209,7 @@ msgstr "" "„%s“ ще изтрие тези неследени файлове в работното дърво:\n" "%%s" -#: unpack-trees.c:143 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -4103,7 +4219,7 @@ msgstr "" "Изтеглянето ще презапише тези неследени файлове в работното дърво:\n" "%%sПреместете ги или ги изтрийте, за да смените клон." -#: unpack-trees.c:145 +#: unpack-trees.c:146 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -4113,7 +4229,7 @@ msgstr "" "Изтеглянето ще презапише тези неследени файлове в работното дърво:\n" "%%s" -#: unpack-trees.c:148 +#: unpack-trees.c:149 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -4122,7 +4238,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" @@ -4131,7 +4247,7 @@ msgstr "" "Сливането ще презапише тези неследени файлове в работното дърво:\n" "%%s" -#: unpack-trees.c:153 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -4140,7 +4256,7 @@ msgstr "" "„%s“ ще презапише тези неследени файлове в работното дърво:\n" "%%sПреместете ги или ги изтрийте, за да извършите „%s“." -#: unpack-trees.c:155 +#: unpack-trees.c:156 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -4149,22 +4265,22 @@ msgstr "" "„%s“ ще презапише тези неследени файлове в работното дърво:\n" "%%s" -#: unpack-trees.c:162 +#: unpack-trees.c:163 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "Записът за „%s“ съвпада с този за „%s“. Не може да се присвои." -#: unpack-trees.c:165 +#: unpack-trees.c:166 #, c-format msgid "" -"Cannot update sparse checkout: the following entries are not up-to-date:\n" +"Cannot update sparse checkout: the following entries are not up to date:\n" "%s" msgstr "" "Частичното изтегляне не може да бъде обновено: следните записи не са " "актуални:\n" "%s" -#: unpack-trees.c:167 +#: unpack-trees.c:168 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -4175,7 +4291,7 @@ msgstr "" "дърво:\n" "%s" -#: unpack-trees.c:169 +#: unpack-trees.c:170 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -4186,7 +4302,7 @@ msgstr "" "дърво:\n" "%s" -#: unpack-trees.c:171 +#: unpack-trees.c:172 #, c-format msgid "" "Cannot update submodule:\n" @@ -4195,17 +4311,12 @@ msgstr "" "Подмодулът не може да бъде обновен:\n" "„%s“" -#: unpack-trees.c:248 +#: unpack-trees.c:249 #, c-format msgid "Aborting\n" msgstr "Преустановяване на действието\n" -#: unpack-trees.c:277 -#, c-format -msgid "submodule update strategy not supported for submodule '%s'" -msgstr "подмодулът „%s“ не поддържа стратегията за обновяване като подмодул" - -#: unpack-trees.c:346 +#: unpack-trees.c:331 msgid "Checking out files" msgstr "Изтегляне на файлове" @@ -4248,13 +4359,8 @@ msgstr "„%s“ не може да бъде прочетен" msgid "could not open '%s' for reading and writing" msgstr "„%s“ не може да бъде отворен и за четене, и за запис" -#: wrapper.c:225 wrapper.c:395 builtin/am.c:766 -#, c-format -msgid "could not open '%s' for writing" -msgstr "„%s“ не може да бъде отворен за запис" - -#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757 -#: builtin/am.c:849 builtin/merge.c:1014 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766 +#: builtin/am.c:858 builtin/merge.c:1041 #, c-format msgid "could not open '%s' for reading" msgstr "файлът не може да бъде прочетен: „%s“" @@ -4278,205 +4384,205 @@ msgstr "„%s“ не може да бъде записан" msgid "could not close %s" msgstr "„%s“ не може да се затвори" -#: wt-status.c:152 +#: wt-status.c:150 msgid "Unmerged paths:" msgstr "Неслети пътища:" -#: wt-status.c:179 wt-status.c:206 +#: wt-status.c:177 wt-status.c:204 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (използвайте „git reset %s ФАЙЛ…“, за да извадите ФАЙЛа от индекса)" -#: wt-status.c:181 wt-status.c:208 +#: wt-status.c:179 wt-status.c:206 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr "" " (използвайте „git rm --cached %s ФАЙЛ…“, за да извадите ФАЙЛа от индекса)" -#: wt-status.c:185 +#: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" msgstr "" " (използвайте „git add ФАЙЛ…“, за да укажете разрешаването на конфликта)" -#: wt-status.c:187 wt-status.c:191 +#: wt-status.c:185 wt-status.c:189 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" " (използвайте „git add/rm ФАЙЛ…“, според решението, което избирате за " "конфликта)" -#: wt-status.c:189 +#: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" " (използвайте „git rm ФАЙЛ…“, за да укажете разрешаването на конфликта)" -#: wt-status.c:200 wt-status.c:981 +#: wt-status.c:198 wt-status.c:979 msgid "Changes to be committed:" msgstr "Промени, които ще бъдат подадени:" -#: wt-status.c:218 wt-status.c:990 +#: wt-status.c:216 wt-status.c:988 msgid "Changes not staged for commit:" msgstr "Промени, които не са в индекса за подаване:" -#: wt-status.c:222 +#: wt-status.c:220 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" " (използвайте „git add ФАЙЛ…“, за да обновите съдържанието за подаване)" -#: wt-status.c:224 +#: wt-status.c:222 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" " (използвайте „git add/rm ФАЙЛ…“, за да обновите съдържанието за подаване)" -#: wt-status.c:225 +#: wt-status.c:223 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (използвайте „git checkout -- ФАЙЛ…“, за да отхвърлите промените в " "работното дърво)" -#: wt-status.c:227 +#: wt-status.c:225 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (подайте или отхвърлете неследеното или промененото съдържание в " "подмодулите)" -#: wt-status.c:239 +#: wt-status.c:237 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (използвайте „git %s ФАЙЛ…“, за да определите какво включвате в подаването)" -#: wt-status.c:254 +#: wt-status.c:252 msgid "both deleted:" msgstr "изтрити в двата случая:" -#: wt-status.c:256 +#: wt-status.c:254 msgid "added by us:" msgstr "добавени от вас:" -#: wt-status.c:258 +#: wt-status.c:256 msgid "deleted by them:" msgstr "изтрити от тях:" -#: wt-status.c:260 +#: wt-status.c:258 msgid "added by them:" msgstr "добавени от тях:" -#: wt-status.c:262 +#: wt-status.c:260 msgid "deleted by us:" msgstr "изтрити от вас:" -#: wt-status.c:264 +#: wt-status.c:262 msgid "both added:" msgstr "добавени и в двата случая:" -#: wt-status.c:266 +#: wt-status.c:264 msgid "both modified:" msgstr "променени и в двата случая:" -#: wt-status.c:276 +#: wt-status.c:274 msgid "new file:" msgstr "нов файл:" -#: wt-status.c:278 +#: wt-status.c:276 msgid "copied:" msgstr "копиран:" -#: wt-status.c:280 +#: wt-status.c:278 msgid "deleted:" msgstr "изтрит:" -#: wt-status.c:282 +#: wt-status.c:280 msgid "modified:" msgstr "променен:" -#: wt-status.c:284 +#: wt-status.c:282 msgid "renamed:" msgstr "преименуван:" -#: wt-status.c:286 +#: wt-status.c:284 msgid "typechange:" msgstr "смяна на вида:" -#: wt-status.c:288 +#: wt-status.c:286 msgid "unknown:" msgstr "непозната промяна:" -#: wt-status.c:290 +#: wt-status.c:288 msgid "unmerged:" msgstr "неслят:" -#: wt-status.c:372 +#: wt-status.c:370 msgid "new commits, " msgstr "нови подавания, " -#: wt-status.c:374 +#: wt-status.c:372 msgid "modified content, " msgstr "променено съдържание, " -#: wt-status.c:376 +#: wt-status.c:374 msgid "untracked content, " msgstr "неследено съдържание, " -#: wt-status.c:821 +#: wt-status.c:819 #, 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:853 +#: wt-status.c:851 msgid "Submodules changed but not updated:" msgstr "Подмодулите са променени, но не са обновени:" -#: wt-status.c:855 +#: wt-status.c:853 msgid "Submodule changes to be committed:" msgstr "Промени в подмодулите за подаване:" -#: wt-status.c:937 +#: wt-status.c:935 msgid "" -"Do not touch the line above.\n" -"Everything below will be removed." +"Do not modify or remove the line above.\n" +"Everything below it will be ignored." msgstr "" -"Не променяйте горния ред.\n" +"Не променяйте и не изтривайте горния ред.\n" "Всичко отдолу ще бъде изтрито." -#: wt-status.c:1049 +#: wt-status.c:1048 msgid "You have unmerged paths." msgstr "Някои пътища не са слети." -#: wt-status.c:1052 +#: wt-status.c:1051 msgid " (fix conflicts and run \"git commit\")" msgstr " (коригирайте конфликтите и изпълнете „git commit“)" -#: wt-status.c:1054 +#: wt-status.c:1053 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (използвайте „git merge --abort“, за да преустановите сливането)" -#: wt-status.c:1059 +#: wt-status.c:1058 msgid "All conflicts fixed but you are still merging." msgstr "Всички конфликти са решени, но продължавате сливането." -#: wt-status.c:1062 +#: wt-status.c:1061 msgid " (use \"git commit\" to conclude merge)" msgstr " (използвайте „git commit“, за да завършите сливането)" -#: wt-status.c:1072 +#: wt-status.c:1071 msgid "You are in the middle of an am session." msgstr "В момента прилагате поредица от кръпки чрез „git am“." -#: wt-status.c:1075 +#: wt-status.c:1074 msgid "The current patch is empty." msgstr "Текущата кръпка е празна." -#: wt-status.c:1079 +#: wt-status.c:1078 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (коригирайте конфликтите и изпълнете „git am --continue“)" -#: wt-status.c:1081 +#: wt-status.c:1080 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (използвайте „git am --skip“, за да пропуснете тази кръпка)" -#: wt-status.c:1083 +#: wt-status.c:1082 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" " (използвайте „git am --abort“, за да възстановите първоначалния клон)" @@ -4780,7 +4886,7 @@ msgstr "освен това в индекса има неподадени про msgid "cannot %s: Your index contains uncommitted changes." msgstr "не може да извършите „%s“, защото в индекса има неподадени промени." -#: compat/precompose_utf8.c:58 builtin/clone.c:436 +#: compat/precompose_utf8.c:58 builtin/clone.c:437 #, c-format msgid "failed to unlink '%s'" msgstr "неуспешно изтриване на „%s“" @@ -4794,7 +4900,7 @@ msgstr "git add [ОПЦИЯ…] [--] ПЪТ…" msgid "unexpected diff status %c" msgstr "неочакван изходен код при генериране на разлика: %c" -#: builtin/add.c:87 builtin/commit.c:292 +#: builtin/add.c:87 builtin/commit.c:291 msgid "updating files failed" msgstr "неуспешно обновяване на файловете" @@ -4803,114 +4909,114 @@ msgstr "неуспешно обновяване на файловете" msgid "remove '%s'\n" msgstr "изтриване на „%s“\n" -#: builtin/add.c:151 +#: builtin/add.c:153 msgid "Unstaged changes after refreshing the index:" msgstr "Промени, които и след обновяването на индекса не са добавени към него:" -#: builtin/add.c:211 builtin/rev-parse.c:873 +#: builtin/add.c:213 builtin/rev-parse.c:888 msgid "Could not read the index" msgstr "Индексът не може да бъде прочетен" -#: builtin/add.c:222 +#: builtin/add.c:224 #, c-format msgid "Could not open '%s' for writing." msgstr "Файлът „%s“ не може да бъде отворен за запис." -#: builtin/add.c:226 +#: builtin/add.c:228 msgid "Could not write patch" msgstr "Кръпката не може да бъде записана" -#: builtin/add.c:229 +#: builtin/add.c:231 msgid "editing patch failed" msgstr "неуспешно редактиране на кръпка" -#: builtin/add.c:232 +#: builtin/add.c:234 #, c-format msgid "Could not stat '%s'" msgstr "Не може да се получи информация чрез „stat“ за файла „%s“" -#: builtin/add.c:234 +#: builtin/add.c:236 msgid "Empty patch. Aborted." msgstr "Празна кръпка, преустановяване на действието." -#: builtin/add.c:239 +#: builtin/add.c:241 #, c-format msgid "Could not apply '%s'" msgstr "Кръпката „%s“ не може да бъде приложена" -#: builtin/add.c:249 +#: builtin/add.c:251 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Следните пътища ще бъдат игнорирани според някой от файловете „.gitignore“:\n" -#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124 +#: builtin/add.c:271 builtin/clean.c:910 builtin/fetch.c:132 builtin/mv.c:124 #: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529 -#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164 +#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164 msgid "dry run" msgstr "пробно изпълнение" -#: builtin/add.c:272 +#: builtin/add.c:274 msgid "interactive picking" msgstr "интерактивно отбиране на промени" -#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299 +#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310 msgid "select hunks interactively" msgstr "интерактивен избор на парчета код" -#: builtin/add.c:274 +#: builtin/add.c:276 msgid "edit current diff and apply" msgstr "редактиране на текущата разлика и прилагане" -#: builtin/add.c:275 +#: builtin/add.c:277 msgid "allow adding otherwise ignored files" msgstr "добавяне и на иначе игнорираните файлове" -#: builtin/add.c:276 +#: builtin/add.c:278 msgid "update tracked files" msgstr "обновяване на следените файлове" -#: builtin/add.c:277 +#: builtin/add.c:279 msgid "record only the fact that the path will be added later" msgstr "отбелязване само на факта, че пътят ще бъде добавен по-късно" -#: builtin/add.c:278 +#: builtin/add.c:280 msgid "add changes from all tracked and untracked files" msgstr "добавяне на всички промени в следените и неследените файлове" -#: builtin/add.c:281 +#: builtin/add.c:283 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" "игнориране на пътищата, които са изтрити от работното дърво (същото като „--" "no-all“)" -#: builtin/add.c:283 +#: builtin/add.c:285 msgid "don't add, only refresh the index" msgstr "без добавяне на нови файлове, само обновяване на индекса" -#: builtin/add.c:284 +#: builtin/add.c:286 msgid "just skip files which cannot be added because of errors" msgstr "" "прескачане на файловете, които не могат да бъдат добавени поради грешки" -#: builtin/add.c:285 +#: builtin/add.c:287 msgid "check if - even missing - files are ignored in dry run" msgstr "" "проверка, че при пробно изпълнение всички файлове, дори и изтритите, се " "игнорират" -#: builtin/add.c:286 builtin/update-index.c:952 +#: builtin/add.c:288 builtin/update-index.c:954 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/add.c:286 builtin/update-index.c:953 +#: builtin/add.c:288 builtin/update-index.c:955 msgid "override the executable bit of the listed files" msgstr "изрично задаване на стойността на флага дали файлът е изпълним" -#: builtin/add.c:288 +#: builtin/add.c:290 msgid "warn when adding an embedded repository" msgstr "предупреждаване при добавяне на вградено хранилище" -#: builtin/add.c:303 +#: builtin/add.c:305 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -4927,10 +5033,8 @@ msgid "" "\n" "See \"git help submodule\" for more information." msgstr "" -"Изтеглили сте допълнително хранилище в текущото. Когато клонирате " -"обхващащото\n" -"хранилище няма да получити вграденото, защото външното хранилище няма " -"представа\n" +"Изтеглили сте допълнително хранилище в текущото. Когато клонирате обхващащото\n" +"хранилище няма да получите вграденото, защото външното хранилище няма представа\n" "за вътрешното. За да добавите подмодул, изпълнете:\n" "\n" " git submodule add АДРЕС %s\n" @@ -4941,152 +5045,152 @@ msgstr "" "\n" "За повече информация погледнете „git help submodule“." -#: builtin/add.c:331 +#: builtin/add.c:333 #, c-format msgid "adding embedded git repository: %s" msgstr "добавяне на вградено хранилище: %s" -#: builtin/add.c:349 +#: builtin/add.c:351 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Използвайте опцията „-f“, за да ги добавите наистина.\n" -#: builtin/add.c:357 +#: builtin/add.c:359 msgid "adding files failed" msgstr "неуспешно добавяне на файлове" -#: builtin/add.c:394 +#: builtin/add.c:396 msgid "-A and -u are mutually incompatible" msgstr "опциите „-A“ и „-u“ са несъвместими" -#: builtin/add.c:401 +#: builtin/add.c:403 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "Опцията „--ignore-missing“ е съвместима само с „--dry-run“" -#: builtin/add.c:405 +#: builtin/add.c:407 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "параметърът към „--chmod“ — „%s“ може да е или „-x“, или „+x“" -#: builtin/add.c:420 +#: builtin/add.c:422 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Нищо не е зададено и нищо не е добавено.\n" -#: builtin/add.c:421 +#: builtin/add.c:423 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Вероятно искахте да използвате „git add .“?\n" -#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282 -#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351 -#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272 -#: builtin/submodule--helper.c:244 +#: builtin/add.c:428 builtin/check-ignore.c:176 builtin/checkout.c:282 +#: builtin/checkout.c:479 builtin/clean.c:957 builtin/commit.c:350 +#: builtin/mv.c:143 builtin/reset.c:249 builtin/rm.c:271 +#: builtin/submodule--helper.c:243 msgid "index file corrupt" msgstr "файлът с индекса е повреден" -#: builtin/am.c:413 +#: builtin/am.c:414 msgid "could not parse author script" msgstr "скриптът за автор не може да се анализира" -#: builtin/am.c:489 +#: builtin/am.c:498 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "„%s“ бе изтрит от куката „applypatch-msg“" -#: builtin/am.c:530 +#: builtin/am.c:539 #, c-format msgid "Malformed input line: '%s'." msgstr "Даденият входен ред е с неправилен формат: „%s“." -#: builtin/am.c:567 +#: builtin/am.c:576 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Бележката не може да се копира от „%s“ към „%s“" -#: builtin/am.c:593 +#: builtin/am.c:602 msgid "fseek failed" msgstr "неуспешно изпълнение на „fseek“" -#: builtin/am.c:777 +#: builtin/am.c:786 #, c-format msgid "could not parse patch '%s'" msgstr "кръпката „%s“ не може да се анализира" -#: builtin/am.c:842 +#: builtin/am.c:851 msgid "Only one StGIT patch series can be applied at once" msgstr "" "Само една серия кръпки от „StGIT“ може да бъде прилагана в даден момент" -#: builtin/am.c:889 +#: builtin/am.c:899 msgid "invalid timestamp" msgstr "неправилна стойност за време" -#: builtin/am.c:892 builtin/am.c:900 +#: builtin/am.c:904 builtin/am.c:916 msgid "invalid Date line" msgstr "неправилен ред за дата „Date“" -#: builtin/am.c:897 +#: builtin/am.c:911 msgid "invalid timezone offset" msgstr "неправилно отместване на часовия пояс" -#: builtin/am.c:986 +#: builtin/am.c:1004 msgid "Patch format detection failed." msgstr "Форматът на кръпката не може да бъде определен." -#: builtin/am.c:991 builtin/clone.c:401 +#: builtin/am.c:1009 builtin/clone.c:402 #, c-format msgid "failed to create directory '%s'" msgstr "директорията „%s“ не може да бъде създадена" -#: builtin/am.c:995 +#: builtin/am.c:1013 msgid "Failed to split patches." msgstr "Кръпките не могат да бъдат разделени." -#: builtin/am.c:1120 builtin/commit.c:377 +#: builtin/am.c:1142 builtin/commit.c:376 msgid "unable to write index file" msgstr "индексът не може да бъде записан" -#: builtin/am.c:1171 +#: builtin/am.c:1193 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "След коригирането на този проблем изпълнете „%s --continue“." -#: builtin/am.c:1172 +#: builtin/am.c:1194 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Ако предпочитате да прескочите тази кръпка, изпълнете „%s --skip“." -#: builtin/am.c:1173 +#: builtin/am.c:1195 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "За да се върнете към първоначалното състояние, изпълнете „%s --abort“." -#: builtin/am.c:1304 +#: builtin/am.c:1302 msgid "Patch is empty." msgstr "Кръпката е празна." -#: builtin/am.c:1370 +#: builtin/am.c:1368 #, c-format msgid "invalid ident line: %.*s" msgstr "грешен ред с идентичност: %.*s" -#: builtin/am.c:1392 +#: builtin/am.c:1390 #, c-format msgid "unable to parse commit %s" msgstr "подаването не може да бъде анализирано: %s" -#: builtin/am.c:1586 +#: builtin/am.c:1584 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "В хранилището липсват необходимите обекти BLOB, за да се премине към тройно " "сливане." -#: builtin/am.c:1588 +#: builtin/am.c:1586 msgid "Using index info to reconstruct a base tree..." msgstr "Базовото дърво се реконструира от информацията в индекса…" -#: builtin/am.c:1607 +#: builtin/am.c:1605 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -5094,39 +5198,39 @@ msgstr "" "Кръпката не може да се приложи към обектите BLOB в индекса.\n" "Да не би да сте я редактирали на ръка?" -#: builtin/am.c:1613 +#: builtin/am.c:1611 msgid "Falling back to patching base and 3-way merge..." msgstr "Преминаване към прилагане на кръпка към базата и тройно сливане…" -#: builtin/am.c:1638 +#: builtin/am.c:1636 msgid "Failed to merge in the changes." msgstr "Неуспешно сливане на промените." -#: builtin/am.c:1662 builtin/merge.c:632 +#: builtin/am.c:1660 builtin/merge.c:641 msgid "git write-tree failed to write a tree" msgstr "Командата „git write-tree“ не успя да запише обект-дърво" -#: builtin/am.c:1669 +#: builtin/am.c:1667 msgid "applying to an empty history" msgstr "прилагане върху празна история" -#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803 -#: builtin/merge.c:828 +#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824 +#: builtin/merge.c:849 msgid "failed to write commit object" msgstr "обектът за подаването не може да бъде записан" -#: builtin/am.c:1715 builtin/am.c:1719 +#: builtin/am.c:1713 builtin/am.c:1717 #, c-format msgid "cannot resume: %s does not exist." msgstr "не може да се продължи — „%s“ не съществува." -#: builtin/am.c:1735 +#: builtin/am.c:1733 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "За интерактивно изпълнение е необходимо стандартният\n" "вход да е свързан с терминал, а в момента не е." -#: builtin/am.c:1740 +#: builtin/am.c:1738 msgid "Commit Body is:" msgstr "Тялото на кръпката за прилагане е:" @@ -5134,38 +5238,38 @@ msgstr "Тялото на кръпката за прилагане е:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1750 +#: builtin/am.c:1748 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" "Прилагане? „y“ — да/„n“ — не/„e“ — редактиране/„v“ — преглед/„a“ — приемане " "на всичко:" -#: builtin/am.c:1800 +#: builtin/am.c:1798 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "" "Индексът не е чист: кръпките не могат да бъдат приложени (замърсени са: %s)" -#: builtin/am.c:1840 builtin/am.c:1912 +#: builtin/am.c:1838 builtin/am.c:1910 #, c-format msgid "Applying: %.*s" msgstr "Прилагане: %.*s" -#: builtin/am.c:1856 +#: builtin/am.c:1854 msgid "No changes -- Patch already applied." msgstr "Без промени — кръпката вече е приложена." -#: builtin/am.c:1864 +#: builtin/am.c:1862 #, c-format msgid "Patch failed at %s %.*s" msgstr "Неуспешно прилагане на кръпка при %s %.*s“" -#: builtin/am.c:1870 +#: builtin/am.c:1868 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "Дубликат на проблемната кръпка се намира в: %s" -#: builtin/am.c:1915 +#: builtin/am.c:1913 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -5175,7 +5279,7 @@ msgstr "" "Ако няма друга промяна за включване в индекса, най-вероятно някоя друга\n" "кръпка е довела до същите промени и в такъв случай просто пропуснете тази." -#: builtin/am.c:1922 +#: builtin/am.c:1920 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -5186,17 +5290,17 @@ msgstr "" "След корекция на конфликтите изпълнете „git add“ върху поправените файлове.\n" "За да приемете „изтрити от тях“, изпълнете „git rm“ върху изтритите файлове." -#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323 -#: builtin/reset.c:331 +#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332 +#: builtin/reset.c:340 #, c-format msgid "Could not parse object '%s'." msgstr "„%s“ не е разпознат като обект." -#: builtin/am.c:2083 +#: builtin/am.c:2081 msgid "failed to clean index" msgstr "индексът не може да бъде изчистен" -#: builtin/am.c:2117 +#: builtin/am.c:2116 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -5207,139 +5311,138 @@ msgstr "" "сочи към\n" "„ORIG_HEAD“" -#: builtin/am.c:2180 +#: builtin/am.c:2179 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Неправилна стойност за „--patch-format“: „%s“" -#: builtin/am.c:2213 +#: builtin/am.c:2212 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [ОПЦИЯ…] [(ФАЙЛ_С_ПОЩА|ДИРЕКТОРИЯ_С_ПОЩА)…]" -#: builtin/am.c:2214 +#: builtin/am.c:2213 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [ОПЦИЯ…] (--continue | --quit | --abort)" -#: builtin/am.c:2220 +#: builtin/am.c:2219 msgid "run interactively" msgstr "интерактивна работа" -#: builtin/am.c:2222 +#: builtin/am.c:2221 msgid "historical option -- no-op" msgstr "изоставена опция, съществува по исторически причини, нищо не прави" -#: builtin/am.c:2224 +#: builtin/am.c:2223 msgid "allow fall back on 3way merging if needed" msgstr "да се преминава към тройно сливане при нужда." -#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57 +#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57 #: builtin/repack.c:180 msgid "be quiet" msgstr "без извеждане на информация" -#: builtin/am.c:2227 +#: builtin/am.c:2226 msgid "add a Signed-off-by line to the commit message" msgstr "добавяне на ред за подпис „Signed-off-by“ в съобщението за подаване" -#: builtin/am.c:2230 +#: builtin/am.c:2229 msgid "recode into utf8 (default)" msgstr "прекодиране в UTF-8 (стандартно)" -#: builtin/am.c:2232 +#: builtin/am.c:2231 msgid "pass -k flag to git-mailinfo" msgstr "подаване на опцията „-k“ на командата „git-mailinfo“" -#: builtin/am.c:2234 +#: builtin/am.c:2233 msgid "pass -b flag to git-mailinfo" msgstr "подаване на опцията „-b“ на командата „git-mailinfo“" -#: builtin/am.c:2236 +#: builtin/am.c:2235 msgid "pass -m flag to git-mailinfo" msgstr "подаване на опцията „-m“ на командата „git-mailinfo“" -#: builtin/am.c:2238 +#: builtin/am.c:2237 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "" "подаване на опцията „--keep-cr“ на командата „git-mailsplit“ за формат „mbox“" -#: builtin/am.c:2241 +#: builtin/am.c:2240 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "без подаване на опцията „--keep-cr“ на командата „git-mailsplit“ независимо " "от „am.keepcr“" -#: builtin/am.c:2244 +#: builtin/am.c:2243 msgid "strip everything before a scissors line" msgstr "пропускане на всичко преди реда за отрязване" -#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255 -#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 -#: builtin/am.c:2273 +#: builtin/am.c:2245 builtin/am.c:2248 builtin/am.c:2251 builtin/am.c:2254 +#: builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263 builtin/am.c:2266 +#: builtin/am.c:2272 msgid "pass it through git-apply" msgstr "прекарване през „git-apply“" -#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 -#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142 -#: builtin/pull.c:197 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:399 parse-options.h:132 parse-options.h:134 -#: parse-options.h:245 +#: builtin/am.c:2262 builtin/fmt-merge-msg.c:664 builtin/fmt-merge-msg.c:667 +#: builtin/grep.c:843 builtin/merge.c:205 builtin/pull.c:142 builtin/pull.c:197 +#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195 +#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377 +#: parse-options.h:132 parse-options.h:134 parse-options.h:245 msgid "n" msgstr "БРОЙ" -#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38 -#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39 +#: builtin/am.c:2268 builtin/branch.c:622 builtin/for-each-ref.c:38 +#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39 msgid "format" msgstr "ФОРМАТ" -#: builtin/am.c:2270 +#: builtin/am.c:2269 msgid "format the patch(es) are in" msgstr "формат на кръпките" -#: builtin/am.c:2276 +#: builtin/am.c:2275 msgid "override error message when patch failure occurs" msgstr "избрано от вас съобщение за грешка при прилагане на кръпки" -#: builtin/am.c:2278 +#: builtin/am.c:2277 msgid "continue applying patches after resolving a conflict" msgstr "продължаване на прилагането на кръпки след коригирането на конфликт" -#: builtin/am.c:2281 +#: builtin/am.c:2280 msgid "synonyms for --continue" msgstr "синоними на „--continue“" -#: builtin/am.c:2284 +#: builtin/am.c:2283 msgid "skip the current patch" msgstr "прескачане на текущата кръпка" -#: builtin/am.c:2287 +#: builtin/am.c:2286 msgid "restore the original branch and abort the patching operation." msgstr "" "възстановяване на първоначалното състояние на клона и преустановяване на " "прилагането на кръпката." -#: builtin/am.c:2291 +#: builtin/am.c:2290 msgid "lie about committer date" msgstr "дата за подаване различна от първоначалната" -#: builtin/am.c:2293 +#: builtin/am.c:2292 msgid "use current timestamp for author date" msgstr "използване на текущото време като това за автор" -#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233 -#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414 +#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236 +#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392 msgid "key-id" msgstr "ИДЕНТИФИКАТОР_НА_КЛЮЧ" -#: builtin/am.c:2296 +#: builtin/am.c:2295 msgid "GPG-sign commits" msgstr "подписване на подаванията с GPG" -#: builtin/am.c:2299 +#: builtin/am.c:2298 msgid "(internal use for git-rebase)" msgstr "(ползва се вътрешно за „git-rebase“)" -#: builtin/am.c:2317 +#: builtin/am.c:2316 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." @@ -5347,18 +5450,18 @@ msgstr "" "Опциите „-b“/„--binary“ отдавна не правят нищо и\n" "ще бъдат премахнати в бъдеще. Не ги ползвайте." -#: builtin/am.c:2324 +#: builtin/am.c:2323 msgid "failed to read the index" msgstr "неуспешно изчитане на индекса" -#: builtin/am.c:2339 +#: builtin/am.c:2338 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" "предишната директория за пребазиране „%s“ все още съществува, а е зададен " "файл „mbox“." -#: builtin/am.c:2363 +#: builtin/am.c:2362 #, c-format msgid "" "Stray %s directory found.\n" @@ -5367,7 +5470,7 @@ msgstr "" "Открита е излишна директория „%s“.\n" "Можете да я изтриете с командата „git am --abort“." -#: builtin/am.c:2369 +#: builtin/am.c:2368 msgid "Resolve operation not in progress, we are not resuming." msgstr "В момента не тече операция по коригиране и няма как да се продължи." @@ -5590,14 +5693,18 @@ msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [ОПЦИЯ…] (-m | -M) [СТАР_КЛОН] НОВ_КЛОН" #: builtin/branch.c:31 +msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>" +msgstr "git branch [ОПЦИЯ…] (-c | -C) [СТАР_КЛОН] НОВ_КЛОН" + +#: builtin/branch.c:32 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [ОПЦИЯ…] [-r | -a] [--points-at]" -#: builtin/branch.c:32 +#: builtin/branch.c:33 msgid "git branch [<options>] [-r | -a] [--format]" msgstr "git branch [ОПЦИЯ…] [-r | -a] [--format]" -#: builtin/branch.c:145 +#: builtin/branch.c:146 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -5606,7 +5713,7 @@ msgstr "" "изтриване на клона „%s“, който е слят към „%s“,\n" " но още не е слят към върха „HEAD“." -#: builtin/branch.c:149 +#: builtin/branch.c:150 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -5615,12 +5722,12 @@ msgstr "" "отказване на изтриване на клона „%s“, който не е слят към\n" " „%s“, но е слят към върха „HEAD“." -#: builtin/branch.c:163 +#: builtin/branch.c:164 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Обектът-подаване за „%s“ не може да бъде открит" -#: builtin/branch.c:167 +#: builtin/branch.c:168 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -5629,92 +5736,113 @@ msgstr "" "Клонът „%s“ не е слят напълно. Ако сте сигурни, че искате\n" "да го изтриете, изпълнете „git branch -D %s“." -#: builtin/branch.c:180 +#: builtin/branch.c:181 msgid "Update of config-file failed" msgstr "Неуспешно обновяване на конфигурационния файл" -#: builtin/branch.c:211 +#: builtin/branch.c:212 msgid "cannot use -a with -d" msgstr "Опцията „-a“ е несъвместима с опцията „-d“" -#: builtin/branch.c:217 +#: builtin/branch.c:218 msgid "Couldn't look up commit object for HEAD" msgstr "Обектът-подаване, сочен от указателя „HEAD“, не може да бъде открит" -#: builtin/branch.c:231 +#: builtin/branch.c:232 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "Не можете да изтриете клона „%s“, който е изтеглен в пътя „%s“" -#: builtin/branch.c:246 +#: builtin/branch.c:247 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "следящият клон „%s“ не може да бъде открит." -#: builtin/branch.c:247 +#: builtin/branch.c:248 #, c-format msgid "branch '%s' not found." msgstr "клонът „%s“ не може да бъде открит." -#: builtin/branch.c:262 +#: builtin/branch.c:263 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "Грешка при изтриването на следящия клон „%s“" -#: builtin/branch.c:263 +#: builtin/branch.c:264 #, c-format msgid "Error deleting branch '%s'" msgstr "Грешка при изтриването на клона „%s“" -#: builtin/branch.c:270 +#: builtin/branch.c:271 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Изтрит следящ клон „%s“ (той сочеше към „%s“).\n" -#: builtin/branch.c:271 +#: builtin/branch.c:272 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Изтрит клон „%s“ (той сочеше към „%s“).\n" -#: builtin/branch.c:445 +#: builtin/branch.c:417 builtin/tag.c:58 +msgid "unable to parse format string" +msgstr "форматиращият низ не може да бъде анализиран: %s" + +#: builtin/branch.c:450 #, c-format msgid "Branch %s is being rebased at %s" msgstr "Клонът „%s“ се пребазира върху „%s“" -#: builtin/branch.c:449 +#: builtin/branch.c:454 #, c-format msgid "Branch %s is being bisected at %s" msgstr "Търси се двоично в клона „%s“ при „%s“" -#: builtin/branch.c:464 +#: builtin/branch.c:470 +msgid "cannot copy the current branch while not on any." +msgstr "не можете да копирате текущия клон, защото сте извън който и да е клон" + +#: builtin/branch.c:472 msgid "cannot rename the current branch while not on any." msgstr "" "не можете да преименувате текущия клон, защото сте извън който и да е клон" -#: builtin/branch.c:474 +#: builtin/branch.c:483 #, c-format msgid "Invalid branch name: '%s'" msgstr "Неправилно име на клон: „%s“" -#: builtin/branch.c:491 +#: builtin/branch.c:504 msgid "Branch rename failed" msgstr "Неуспешно преименуване на клон" -#: builtin/branch.c:494 +#: builtin/branch.c:506 +msgid "Branch copy failed" +msgstr "Неуспешно копиране на клон" + +#: builtin/branch.c:510 +#, c-format +msgid "Copied a misnamed branch '%s' away" +msgstr "Клонът с неправилно име „%s“ е копиран" + +#: builtin/branch.c:513 #, c-format msgid "Renamed a misnamed branch '%s' away" -msgstr "На клона с неправилно име „%s“ е дадено служебно име" +msgstr "Клонът с неправилно име „%s“ е преименуван" -#: builtin/branch.c:497 +#: builtin/branch.c:519 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Клонът е преименуван на „%s“, но указателят „HEAD“ не е обновен" -#: builtin/branch.c:506 +#: builtin/branch.c:528 msgid "Branch is renamed, but update of config-file failed" msgstr "Клонът е преименуван, но конфигурационният файл не е обновен" -#: builtin/branch.c:522 +#: builtin/branch.c:530 +msgid "Branch is copied, but update of config-file failed" +msgstr "Клонът е копиран, но конфигурационният файл не е обновен" + +#: builtin/branch.c:546 #, c-format msgid "" "Please edit the description for the branch\n" @@ -5725,179 +5853,187 @@ msgstr "" " %s\n" "Редовете, които започват с „%c“, ще бъдат пропуснати.\n" -#: builtin/branch.c:555 +#: builtin/branch.c:579 msgid "Generic options" msgstr "Общи настройки" -#: builtin/branch.c:557 +#: builtin/branch.c:581 msgid "show hash and subject, give twice for upstream branch" msgstr "" "извеждане на хеша и темата. Повтарянето на опцията прибавя отдалечените " "клони" -#: builtin/branch.c:558 +#: builtin/branch.c:582 msgid "suppress informational messages" msgstr "без информационни съобщения" -#: builtin/branch.c:559 +#: builtin/branch.c:583 msgid "set up tracking mode (see git-pull(1))" msgstr "задаване на режима на следене (виж git-pull(1))" -#: builtin/branch.c:561 -msgid "change upstream info" -msgstr "смяна на следения клон" +#: builtin/branch.c:585 +msgid "do not use" +msgstr "да не се ползва" -#: builtin/branch.c:563 +#: builtin/branch.c:587 msgid "upstream" msgstr "клон-източник" -#: builtin/branch.c:563 +#: builtin/branch.c:587 msgid "change the upstream info" msgstr "смяна на клона-източник" -#: builtin/branch.c:564 +#: builtin/branch.c:588 msgid "Unset the upstream info" msgstr "без клон-източник" -#: builtin/branch.c:565 +#: builtin/branch.c:589 msgid "use colored output" msgstr "цветен изход" -#: builtin/branch.c:566 +#: builtin/branch.c:590 msgid "act on remote-tracking branches" msgstr "действие върху следящите клони" -#: builtin/branch.c:568 builtin/branch.c:570 +#: builtin/branch.c:592 builtin/branch.c:594 msgid "print only branches that contain the commit" msgstr "извеждане само на клоните, които съдържат това ПОДАВАНЕ" -#: builtin/branch.c:569 builtin/branch.c:571 +#: builtin/branch.c:593 builtin/branch.c:595 msgid "print only branches that don't contain the commit" msgstr "извеждане само на клоните, които не съдържат това ПОДАВАНЕ" -#: builtin/branch.c:574 +#: builtin/branch.c:598 msgid "Specific git-branch actions:" msgstr "Специални действия на „git-branch“:" -#: builtin/branch.c:575 +#: builtin/branch.c:599 msgid "list both remote-tracking and local branches" msgstr "извеждане както на следящите, така и на локалните клони" -#: builtin/branch.c:577 +#: builtin/branch.c:601 msgid "delete fully merged branch" msgstr "изтриване на клони, които са напълно слети" -#: builtin/branch.c:578 +#: builtin/branch.c:602 msgid "delete branch (even if not merged)" msgstr "изтриване и на клони, които не са напълно слети" -#: builtin/branch.c:579 +#: builtin/branch.c:603 msgid "move/rename a branch and its reflog" msgstr "" "преместване/преименуване на клон и принадлежащият му журнал на указателите" -#: builtin/branch.c:580 +#: builtin/branch.c:604 msgid "move/rename a branch, even if target exists" msgstr "преместване/преименуване на клон, дори ако има вече клон с такова име" -#: builtin/branch.c:581 +#: builtin/branch.c:605 +msgid "copy a branch and its reflog" +msgstr "копиране на клон и принадлежащия му журнал на указателите" + +#: builtin/branch.c:606 +msgid "copy a branch, even if target exists" +msgstr "копиране на клон, дори ако има вече клон с такова име" + +#: builtin/branch.c:607 msgid "list branch names" msgstr "извеждане на имената на клоните" -#: builtin/branch.c:582 +#: builtin/branch.c:608 msgid "create the branch's reflog" msgstr "създаване на журнала на указателите на клона" -#: builtin/branch.c:584 +#: builtin/branch.c:610 msgid "edit the description for the branch" msgstr "редактиране на описанието на клона" -#: builtin/branch.c:585 +#: builtin/branch.c:611 msgid "force creation, move/rename, deletion" msgstr "принудително създаване, преместване, преименуване, изтриване" -#: builtin/branch.c:586 +#: builtin/branch.c:612 msgid "print only branches that are merged" msgstr "извеждане само на слетите клони" -#: builtin/branch.c:587 +#: builtin/branch.c:613 msgid "print only branches that are not merged" msgstr "извеждане само на неслетите клони" -#: builtin/branch.c:588 +#: builtin/branch.c:614 msgid "list branches in columns" msgstr "извеждане по колони" -#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427 +#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405 msgid "key" msgstr "КЛЮЧ" -#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428 +#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406 msgid "field name to sort on" msgstr "име на полето, по което да е подредбата" -#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407 -#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573 -#: builtin/tag.c:430 +#: builtin/branch.c:618 builtin/for-each-ref.c:43 builtin/notes.c:408 +#: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574 +#: builtin/tag.c:408 msgid "object" msgstr "ОБЕКТ" -#: builtin/branch.c:593 +#: builtin/branch.c:619 msgid "print only branches of the object" msgstr "извеждане само на клоните на ОБЕКТА" -#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435 +#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415 msgid "sorting and filtering are case insensitive" msgstr "подредбата и филтрирането третират еднакво малките и главните букви" -#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434 +#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413 #: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "ФОРМАТ за изхода" -#: builtin/branch.c:615 -msgid "Failed to resolve HEAD as a valid ref." -msgstr "Не може да се открие към какво сочи указателят „HEAD“" - -#: builtin/branch.c:619 builtin/clone.c:728 +#: builtin/branch.c:645 builtin/clone.c:729 msgid "HEAD not found below refs/heads!" msgstr "В директорията „refs/heads“ липсва файл „HEAD“" -#: builtin/branch.c:642 +#: builtin/branch.c:668 msgid "--column and --verbose are incompatible" msgstr "Опциите „--column“ и „--verbose“ са несъвместими" -#: builtin/branch.c:653 builtin/branch.c:705 +#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741 msgid "branch name required" msgstr "Необходимо е име на клон" -#: builtin/branch.c:681 +#: builtin/branch.c:708 msgid "Cannot give description to detached HEAD" msgstr "Не може да зададете описание на несвързан „HEAD“" -#: builtin/branch.c:686 +#: builtin/branch.c:713 msgid "cannot edit description of more than one branch" msgstr "Не може да редактирате описанието на повече от един клон едновременно" -#: builtin/branch.c:693 +#: builtin/branch.c:720 #, c-format msgid "No commit on branch '%s' yet." msgstr "В клона „%s“ все още няма подавания." -#: builtin/branch.c:696 +#: builtin/branch.c:723 #, c-format msgid "No branch named '%s'." msgstr "Липсва клон на име „%s“." -#: builtin/branch.c:711 -msgid "too many branches for a rename operation" -msgstr "Прекалено много клони за преименуване" +#: builtin/branch.c:738 +msgid "too many branches for a copy operation" +msgstr "прекалено много клони за копиране" -#: builtin/branch.c:716 -msgid "too many branches to set new upstream" -msgstr "Зададени са прекалено много клони за следене" +#: builtin/branch.c:747 +msgid "too many arguments for a rename operation" +msgstr "прекалено много аргументи към командата за преименуване" -#: builtin/branch.c:720 +#: builtin/branch.c:752 +msgid "too many arguments to set new upstream" +msgstr "прекалено много аргументи към командата за следене" + +#: builtin/branch.c:756 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -5905,57 +6041,45 @@ msgstr "" "Следеното от „HEAD“ не може да се зададе да е „%s“, защото то не сочи към " "никой клон." -#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766 +#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800 #, c-format msgid "no such branch '%s'" msgstr "Няма клон на име „%s“." -#: builtin/branch.c:727 +#: builtin/branch.c:763 #, c-format msgid "branch '%s' does not exist" msgstr "Не съществува клон на име „%s“." -#: builtin/branch.c:739 -msgid "too many branches to unset upstream" -msgstr "Прекалено много клони за махане на следене" +#: builtin/branch.c:775 +msgid "too many arguments to unset upstream" +msgstr "прекалено много аргументи към командата за спиране на следене" -#: builtin/branch.c:743 +#: builtin/branch.c:779 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "Следеното от „HEAD“ не може да махне, защото то не сочи към никой клон." -#: builtin/branch.c:749 +#: builtin/branch.c:785 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Няма информация клонът „%s“ да следи някой друг" -#: builtin/branch.c:763 +#: builtin/branch.c:797 msgid "it does not make sense to create 'HEAD' manually" msgstr "Няма никакъв смисъл ръчно да създавате „HEAD“." -#: builtin/branch.c:769 +#: builtin/branch.c:803 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "Опциите „-a“ и „-r“ на „git branch“ са несъвместими с име на клон" -#: builtin/branch.c:772 -#, c-format +#: builtin/branch.c:806 msgid "" -"The --set-upstream flag is deprecated and will be removed. Consider using --" -"track or --set-upstream-to\n" +"the '--set-upstream' option is no longer supported. Please use '--track' or " +"'--set-upstream-to' instead." msgstr "" -"Опцията „--set-upstream“ вече е остаряла и предстои да бъде махната. " -"Използвайте „--track“ или „--set-upstream-to“\n" - -#: builtin/branch.c:789 -#, c-format -msgid "" -"\n" -"If you wanted to make '%s' track '%s', do this:\n" -"\n" -msgstr "" -"\n" -"За да накарате „%s“ да следи „%s“, изпълнете следната команда:\n" -"\n" +"Опцията „--set-upstream“ вече не се поддържа. Използвайте „--track“ или „--" +"set-upstream-to“" #: builtin/bundle.c:45 #, c-format @@ -5970,7 +6094,7 @@ msgstr "За създаването на пратка е необходимо х msgid "Need a repository to unbundle." msgstr "За приемането на пратка е необходимо хранилище." -#: builtin/cat-file.c:519 +#: builtin/cat-file.c:521 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -5978,7 +6102,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | ВИД | --textconv --filters) [--path=ПЪТ] ОБЕКТ" -#: builtin/cat-file.c:520 +#: builtin/cat-file.c:522 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" @@ -5986,71 +6110,71 @@ msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:557 +#: builtin/cat-file.c:559 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "" "ВИДът може да е: „blob“ (обект BLOB), „tree“ (дърво), „commit“ (подаване), " "„tag“ (етикет)" -#: builtin/cat-file.c:558 +#: builtin/cat-file.c:560 msgid "show object type" msgstr "извеждане на вида на обект" -#: builtin/cat-file.c:559 +#: builtin/cat-file.c:561 msgid "show object size" msgstr "извеждане на размера на обект" -#: builtin/cat-file.c:561 +#: builtin/cat-file.c:563 msgid "exit with zero when there's no error" msgstr "изход с 0, когато няма грешка" -#: builtin/cat-file.c:562 +#: builtin/cat-file.c:564 msgid "pretty-print object's content" msgstr "форматирано извеждане на съдържанието на обекта" -#: builtin/cat-file.c:564 +#: builtin/cat-file.c:566 msgid "for blob objects, run textconv on object's content" msgstr "" "да се стартира програмата зададена в настройката „textconv“ за преобразуване " "на съдържанието на обекта BLOB" -#: builtin/cat-file.c:566 +#: builtin/cat-file.c:568 msgid "for blob objects, run filters on object's content" msgstr "" "да се стартират програмите за преобразуване на съдържанието на обектите BLOB" -#: builtin/cat-file.c:567 git-submodule.sh:944 +#: builtin/cat-file.c:569 git-submodule.sh:943 msgid "blob" msgstr "обект BLOB" -#: builtin/cat-file.c:568 +#: builtin/cat-file.c:570 msgid "use a specific path for --textconv/--filters" msgstr "опциите „--textconv“/„--filters“ изискват път" -#: builtin/cat-file.c:570 +#: builtin/cat-file.c:572 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "позволяване на опциите „-s“ и „-t“ да работят с повредени обекти" -#: builtin/cat-file.c:571 +#: builtin/cat-file.c:573 msgid "buffer --batch output" msgstr "буфериране на изхода от „--batch“" -#: builtin/cat-file.c:573 +#: builtin/cat-file.c:575 msgid "show info and content of objects fed from the standard input" msgstr "" "извеждане на информация и съдържание на обектите подадени на стандартния вход" -#: builtin/cat-file.c:576 +#: builtin/cat-file.c:578 msgid "show info about objects fed from the standard input" msgstr "извеждане на информация за обектите подадени на стандартния вход" -#: builtin/cat-file.c:579 +#: builtin/cat-file.c:581 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "следване на символните връзки сочещи в дървото (ползва се с „--batch“ или „--" "batch-check“)" -#: builtin/cat-file.c:581 +#: builtin/cat-file.c:583 msgid "show all objects with --batch or --batch-check" msgstr "извеждане на всички обекти с „--batch“ или „--batch-check“" @@ -6078,7 +6202,7 @@ msgstr "изчитане на имената на файловете от ста msgid "terminate input and output records by a NUL character" msgstr "разделяне на входните и изходните записи с нулевия знак „NUL“" -#: builtin/check-ignore.c:20 builtin/checkout.c:1143 builtin/gc.c:357 +#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358 msgid "suppress progress reporting" msgstr "без показване на напредъка" @@ -6168,9 +6292,9 @@ msgid "write the content to temporary files" msgstr "записване на съдържанието във временни файлове" #: builtin/checkout-index.c:175 builtin/column.c:31 -#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638 -#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980 -#: builtin/worktree.c:478 +#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631 +#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999 +#: builtin/worktree.c:498 msgid "string" msgstr "НИЗ" @@ -6242,54 +6366,54 @@ msgstr "" msgid "path '%s' is unmerged" msgstr "пътят „%s“ не е слят" -#: builtin/checkout.c:497 +#: builtin/checkout.c:501 msgid "you need to resolve your current index first" msgstr "първо трябва да коригирате индекса си" -#: builtin/checkout.c:628 +#: builtin/checkout.c:632 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Журналът на указателите за „%s“ не може да се проследи: %s\n" -#: builtin/checkout.c:669 +#: builtin/checkout.c:673 msgid "HEAD is now at" msgstr "Указателят „HEAD“ в момента сочи към" -#: builtin/checkout.c:673 builtin/clone.c:682 +#: builtin/checkout.c:677 builtin/clone.c:683 msgid "unable to update HEAD" msgstr "Указателят „HEAD“ не може да бъде обновен" -#: builtin/checkout.c:677 +#: builtin/checkout.c:681 #, c-format msgid "Reset branch '%s'\n" msgstr "Зануляване на клона „%s“\n" -#: builtin/checkout.c:680 +#: builtin/checkout.c:684 #, c-format msgid "Already on '%s'\n" msgstr "Вече сте на „%s“\n" -#: builtin/checkout.c:684 +#: builtin/checkout.c:688 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Преминаване към клона „%s“ и зануляване на промените\n" -#: builtin/checkout.c:686 builtin/checkout.c:1075 +#: builtin/checkout.c:690 builtin/checkout.c:1086 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Преминахте към новия клон „%s“\n" -#: builtin/checkout.c:688 +#: builtin/checkout.c:692 #, c-format msgid "Switched to branch '%s'\n" msgstr "Преминахте към клона „%s“\n" -#: builtin/checkout.c:739 +#: builtin/checkout.c:743 #, c-format msgid " ... and %d more.\n" msgstr "… и още %d.\n" -#: builtin/checkout.c:745 +#: builtin/checkout.c:749 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -6311,7 +6435,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:764 +#: builtin/checkout.c:768 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -6338,164 +6462,164 @@ msgstr[1] "" " git branch ИМЕ_НА_НОВИЯ_КЛОН %s\n" "\n" -#: builtin/checkout.c:800 +#: builtin/checkout.c:809 msgid "internal error in revision walk" msgstr "вътрешна грешка при обхождането на версиите" -#: builtin/checkout.c:804 +#: builtin/checkout.c:813 msgid "Previous HEAD position was" msgstr "Преди това „HEAD“ сочеше към" -#: builtin/checkout.c:832 builtin/checkout.c:1070 +#: builtin/checkout.c:843 builtin/checkout.c:1081 msgid "You are on a branch yet to be born" msgstr "В момента сте на клон, който предстои да бъде създаден" -#: builtin/checkout.c:976 +#: builtin/checkout.c:987 #, c-format msgid "only one reference expected, %d given." msgstr "очакваше се един указател, а сте подали %d." -#: builtin/checkout.c:1016 builtin/worktree.c:215 +#: builtin/checkout.c:1027 builtin/worktree.c:233 #, c-format msgid "invalid reference: %s" msgstr "неправилен указател: %s" -#: builtin/checkout.c:1045 +#: builtin/checkout.c:1056 #, c-format msgid "reference is not a tree: %s" msgstr "указателят не сочи към обект-дърво: %s" -#: builtin/checkout.c:1084 +#: builtin/checkout.c:1095 msgid "paths cannot be used with switching branches" msgstr "задаването на път е несъвместимо с преминаването от един клон към друг" -#: builtin/checkout.c:1087 builtin/checkout.c:1091 +#: builtin/checkout.c:1098 builtin/checkout.c:1102 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "опцията „%s“ е несъвместима с преминаването от един клон към друг" -#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103 -#: builtin/checkout.c:1106 +#: builtin/checkout.c:1106 builtin/checkout.c:1109 builtin/checkout.c:1114 +#: builtin/checkout.c:1117 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "опцията „%s“ е несъвместима с „%s“" -#: builtin/checkout.c:1111 +#: builtin/checkout.c:1122 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" "За да преминете към клон, подайте указател, който сочи към подаване. „%s“ " "не е такъв" -#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113 -#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328 -#: builtin/worktree.c:330 +#: builtin/checkout.c:1154 builtin/checkout.c:1156 builtin/clone.c:114 +#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:346 +#: builtin/worktree.c:348 msgid "branch" msgstr "клон" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1155 msgid "create and checkout a new branch" msgstr "създаване и преминаване към нов клон" -#: builtin/checkout.c:1147 +#: builtin/checkout.c:1157 msgid "create/reset and checkout a branch" msgstr "създаване/зануляване на клон и преминаване към него" -#: builtin/checkout.c:1148 +#: builtin/checkout.c:1158 msgid "create reflog for new branch" msgstr "създаване на журнал на указателите за нов клон" -#: builtin/checkout.c:1149 builtin/worktree.c:332 +#: builtin/checkout.c:1159 builtin/worktree.c:350 msgid "detach HEAD at named commit" msgstr "отделяне на указателя „HEAD“ към указаното подаване" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1160 msgid "set upstream info for new branch" msgstr "задаване на кой клон бива следен при създаването на новия клон" -#: builtin/checkout.c:1152 +#: builtin/checkout.c:1162 msgid "new-branch" msgstr "НОВ_КЛОН" -#: builtin/checkout.c:1152 +#: builtin/checkout.c:1162 msgid "new unparented branch" msgstr "нов клон без родител" -#: builtin/checkout.c:1153 +#: builtin/checkout.c:1163 msgid "checkout our version for unmerged files" msgstr "изтегляне на вашата версия на неслетите файлове" -#: builtin/checkout.c:1155 +#: builtin/checkout.c:1165 msgid "checkout their version for unmerged files" msgstr "изтегляне на чуждата версия на неслетите файлове" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1167 msgid "force checkout (throw away local modifications)" msgstr "принудително изтегляне (вашите промени ще бъдат занулени)" -#: builtin/checkout.c:1158 +#: builtin/checkout.c:1168 msgid "perform a 3-way merge with the new branch" msgstr "извършване на тройно сливане с новия клон" -#: builtin/checkout.c:1159 builtin/merge.c:235 +#: builtin/checkout.c:1169 builtin/merge.c:238 msgid "update ignored files (default)" msgstr "обновяване на игнорираните файлове (стандартно)" -#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251 +#: builtin/checkout.c:1170 builtin/log.c:1489 parse-options.h:251 msgid "style" msgstr "СТИЛ" -#: builtin/checkout.c:1161 +#: builtin/checkout.c:1171 msgid "conflict style (merge or diff3)" msgstr "действие при конфликт (сливане или тройна разлика)" -#: builtin/checkout.c:1164 +#: builtin/checkout.c:1174 msgid "do not limit pathspecs to sparse entries only" msgstr "без ограничаване на изброените пътища само до частично изтеглените" -#: builtin/checkout.c:1166 +#: builtin/checkout.c:1176 msgid "second guess 'git checkout <no-such-branch>'" msgstr "" "опит за отгатване на име на клон след неуспешен опит с „git checkout " "НЕСЪЩЕСТВУВАЩ_КЛОН“" -#: builtin/checkout.c:1168 +#: builtin/checkout.c:1178 msgid "do not check if another worktree is holding the given ref" msgstr "без проверка дали друго работно дърво държи указателя" -#: builtin/checkout.c:1172 builtin/clone.c:80 builtin/fetch.c:114 -#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544 +#: builtin/checkout.c:1182 builtin/clone.c:81 builtin/fetch.c:136 +#: builtin/merge.c:235 builtin/pull.c:120 builtin/push.c:544 #: builtin/send-pack.c:173 msgid "force progress reporting" msgstr "извеждане на напредъка" -#: builtin/checkout.c:1203 +#: builtin/checkout.c:1212 msgid "-b, -B and --orphan are mutually exclusive" msgstr "Опциите „-b“, „-B“ и „--orphan“ са несъвместими една с друга" -#: builtin/checkout.c:1220 +#: builtin/checkout.c:1229 msgid "--track needs a branch name" msgstr "опцията „--track“ изисква име на клон" -#: builtin/checkout.c:1225 +#: builtin/checkout.c:1234 msgid "Missing branch name; try -b" msgstr "Липсва име на клон, използвайте опцията „-b“" -#: builtin/checkout.c:1261 +#: builtin/checkout.c:1270 msgid "invalid path specification" msgstr "указан е неправилен път" -#: builtin/checkout.c:1268 +#: builtin/checkout.c:1277 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "„%s“ не е подаване, затова от него не може да се създаде клон „%s“" -#: builtin/checkout.c:1272 +#: builtin/checkout.c:1281 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: опцията „--detach“ не приема аргумент-път „%s“" -#: builtin/checkout.c:1276 +#: builtin/checkout.c:1285 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -6533,7 +6657,7 @@ msgstr "Хранилището „%s“ ще бъде прескочено\n" msgid "failed to remove %s" msgstr "файлът „%s“ не може да бъде изтрит" -#: builtin/clean.c:298 git-add--interactive.perl:572 +#: builtin/clean.c:301 git-add--interactive.perl:572 #, c-format msgid "" "Prompt help:\n" @@ -6546,7 +6670,7 @@ msgstr "" "ПРЕФИКС — избор на единствен обект по този уникален префикс\n" " — (празно) нищо да не се избира\n" -#: builtin/clean.c:302 git-add--interactive.perl:581 +#: builtin/clean.c:305 git-add--interactive.perl:581 #, c-format msgid "" "Prompt help:\n" @@ -6567,39 +6691,39 @@ msgstr "" "* — избиране на всички обекти\n" " — (празно) завършване на избирането\n" -#: builtin/clean.c:518 git-add--interactive.perl:547 +#: builtin/clean.c:521 git-add--interactive.perl:547 #: git-add--interactive.perl:552 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Неправилен избор (%s).\n" -#: builtin/clean.c:660 +#: builtin/clean.c:663 #, c-format msgid "Input ignore patterns>> " msgstr "Шаблони за игнорирани елементи≫ " -#: builtin/clean.c:697 +#: builtin/clean.c:700 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "ПРЕДУПРЕЖДЕНИЕ: Никой обект не напасва на „%s“" -#: builtin/clean.c:718 +#: builtin/clean.c:721 msgid "Select items to delete" msgstr "Избиране на обекти за изтриване" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:759 +#: builtin/clean.c:762 #, c-format msgid "Remove %s [y/N]? " msgstr "Да се изтрие ли „%s“? „y“ — да, „N“ — НЕ" # -#: builtin/clean.c:784 git-add--interactive.perl:1616 +#: builtin/clean.c:787 git-add--interactive.perl:1616 #, c-format msgid "Bye.\n" msgstr "Изход.\n" -#: builtin/clean.c:792 +#: builtin/clean.c:795 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -6617,63 +6741,63 @@ msgstr "" "help — този край\n" "? — подсказка за шаблоните" -#: builtin/clean.c:819 git-add--interactive.perl:1692 +#: builtin/clean.c:822 git-add--interactive.perl:1692 msgid "*** Commands ***" msgstr "●●● Команди ●●●" -#: builtin/clean.c:820 git-add--interactive.perl:1689 +#: builtin/clean.c:823 git-add--interactive.perl:1689 msgid "What now" msgstr "Избор на следващо действие" -#: builtin/clean.c:828 +#: builtin/clean.c:831 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Следният обект ще бъде изтрит:" msgstr[1] "Следните обекти ще бъдат изтрити:" -#: builtin/clean.c:844 +#: builtin/clean.c:847 msgid "No more files to clean, exiting." msgstr "Файловете за изчистване свършиха. Изход от програмата." -#: builtin/clean.c:906 +#: builtin/clean.c:909 msgid "do not print names of files removed" msgstr "без извеждане на имената на файловете, които ще бъдат изтрити" -#: builtin/clean.c:908 +#: builtin/clean.c:911 msgid "force" msgstr "принудително изтриване" -#: builtin/clean.c:909 +#: builtin/clean.c:912 msgid "interactive cleaning" msgstr "интерактивно изтриване" -#: builtin/clean.c:911 +#: builtin/clean.c:914 msgid "remove whole directories" msgstr "изтриване на цели директории" -#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454 -#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397 +#: builtin/clean.c:915 builtin/describe.c:463 builtin/describe.c:465 +#: builtin/grep.c:861 builtin/ls-files.c:544 builtin/name-rev.c:397 #: builtin/name-rev.c:399 builtin/show-ref.c:176 msgid "pattern" msgstr "ШАБЛОН" -#: builtin/clean.c:913 +#: builtin/clean.c:916 msgid "add <pattern> to ignore rules" msgstr "добавяне на ШАБЛОН от файлове, които да не се трият" -#: builtin/clean.c:914 +#: builtin/clean.c:917 msgid "remove ignored files, too" msgstr "изтриване и на игнорираните файлове" -#: builtin/clean.c:916 +#: builtin/clean.c:919 msgid "remove only ignored files" msgstr "изтриване само на игнорирани файлове" -#: builtin/clean.c:934 +#: builtin/clean.c:937 msgid "-x and -X cannot be used together" msgstr "опциите „-x“ и „-X“ са несъвместими" -#: builtin/clean.c:938 +#: builtin/clean.c:941 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -6681,7 +6805,7 @@ msgstr "" "Настройката „clean.requireForce“ е зададена като истина, което изисква някоя " "от опциите „-i“, „-n“ или „-f“. Няма да се извърши изчистване" -#: builtin/clean.c:941 +#: builtin/clean.c:944 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -6690,146 +6814,146 @@ msgstr "" "което изисква някоя от опциите „-i“, „-n“ или „-f“. Няма да се извърши " "изчистване" -#: builtin/clone.c:38 +#: builtin/clone.c:39 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [ОПЦИЯ…] [--] ХРАНИЛИЩЕ [ДИРЕКТОРИЯ]" -#: builtin/clone.c:82 +#: builtin/clone.c:83 msgid "don't create a checkout" msgstr "без създаване на работно дърво" -#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479 +#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479 msgid "create a bare repository" msgstr "създаване на голо хранилище" -#: builtin/clone.c:87 +#: builtin/clone.c:88 msgid "create a mirror repository (implies bare)" msgstr "" "създаване на хранилище-огледало (включва опцията „--bare“ за голо хранилище)" -#: builtin/clone.c:89 +#: builtin/clone.c:90 msgid "to clone from a local repository" msgstr "клониране от локално хранилище" -#: builtin/clone.c:91 +#: builtin/clone.c:92 msgid "don't use local hardlinks, always copy" msgstr "без твърди връзки, файловете винаги да се копират" -#: builtin/clone.c:93 +#: builtin/clone.c:94 msgid "setup as shared repository" msgstr "настройване за споделено хранилище" -#: builtin/clone.c:95 builtin/clone.c:99 +#: builtin/clone.c:96 builtin/clone.c:100 msgid "pathspec" msgstr "път" -#: builtin/clone.c:95 builtin/clone.c:99 +#: builtin/clone.c:96 builtin/clone.c:100 msgid "initialize submodules in the clone" msgstr "инициализиране на подмодулите при това клониране" -#: builtin/clone.c:102 +#: builtin/clone.c:103 msgid "number of submodules cloned in parallel" msgstr "брой подмодули, клонирани паралелно" -#: builtin/clone.c:103 builtin/init-db.c:476 +#: builtin/clone.c:104 builtin/init-db.c:476 msgid "template-directory" msgstr "директория с шаблони" -#: builtin/clone.c:104 builtin/init-db.c:477 +#: builtin/clone.c:105 builtin/init-db.c:477 msgid "directory from which templates will be used" msgstr "директория, която съдържа шаблоните, които да се ползват" -#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642 -#: builtin/submodule--helper.c:983 +#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:635 +#: builtin/submodule--helper.c:1002 msgid "reference repository" msgstr "еталонно хранилище" -#: builtin/clone.c:110 +#: builtin/clone.c:111 msgid "use --reference only while cloning" msgstr "опцията „--reference“ може да се използва само при клониране" -#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44 +#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44 msgid "name" msgstr "ИМЕ" -#: builtin/clone.c:112 +#: builtin/clone.c:113 msgid "use <name> instead of 'origin' to track upstream" msgstr "използване на това ИМЕ вместо „origin“ при проследяване на клони" -#: builtin/clone.c:114 +#: builtin/clone.c:115 msgid "checkout <branch> instead of the remote's HEAD" msgstr "изтегляне на този КЛОН, а не соченият от отдалечения указател „HEAD“" -#: builtin/clone.c:116 +#: builtin/clone.c:117 msgid "path to git-upload-pack on the remote" msgstr "път към командата „git-upload-pack“ на отдалеченото хранилище" -#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025 +#: builtin/clone.c:118 builtin/fetch.c:137 builtin/grep.c:804 #: builtin/pull.c:205 msgid "depth" msgstr "ДЪЛБОЧИНА" -#: builtin/clone.c:118 +#: builtin/clone.c:119 msgid "create a shallow clone of that depth" msgstr "плитко клониране до тази ДЪЛБОЧИНА" -#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932 +#: builtin/clone.c:120 builtin/fetch.c:139 builtin/pack-objects.c:2938 #: parse-options.h:142 msgid "time" msgstr "ВРЕМЕ" -#: builtin/clone.c:120 +#: builtin/clone.c:121 msgid "create a shallow clone since a specific time" msgstr "плитко клониране до момент във времето" -#: builtin/clone.c:121 builtin/fetch.c:119 +#: builtin/clone.c:122 builtin/fetch.c:141 msgid "revision" msgstr "версия" -#: builtin/clone.c:122 builtin/fetch.c:120 +#: builtin/clone.c:123 builtin/fetch.c:142 msgid "deepen history of shallow clone, excluding rev" msgstr "задълбочаване на историята на плитко хранилище до изключващ указател" -#: builtin/clone.c:124 +#: builtin/clone.c:125 msgid "clone only one branch, HEAD or --branch" msgstr "" "клониране само на един клон — или сочения от отдалечения „HEAD“, или изрично " "зададения с „--branch“" -#: builtin/clone.c:126 +#: builtin/clone.c:127 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "" "без клониране на етикети, като последващите доставяния няма да ги следят" -#: builtin/clone.c:128 +#: builtin/clone.c:129 msgid "any cloned submodules will be shallow" msgstr "всички клонирани подмодули ще са плитки" -#: builtin/clone.c:129 builtin/init-db.c:485 +#: builtin/clone.c:130 builtin/init-db.c:485 msgid "gitdir" msgstr "СЛУЖЕБНА_ДИРЕКТОРИЯ" -#: builtin/clone.c:130 builtin/init-db.c:486 +#: builtin/clone.c:131 builtin/init-db.c:486 msgid "separate git dir from working tree" msgstr "отделна СЛУЖЕБНА_ДИРЕКТОРИЯ за git извън работното дърво" -#: builtin/clone.c:131 +#: builtin/clone.c:132 msgid "key=value" msgstr "КЛЮЧ=СТОЙНОСТ" -#: builtin/clone.c:132 +#: builtin/clone.c:133 msgid "set config inside the new repository" msgstr "задаване на настройките на новото хранилище" -#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555 +#: builtin/clone.c:134 builtin/fetch.c:159 builtin/push.c:555 msgid "use IPv4 addresses only" msgstr "само адреси IPv4" -#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557 +#: builtin/clone.c:136 builtin/fetch.c:161 builtin/push.c:557 msgid "use IPv6 addresses only" msgstr "само адреси IPv6" -#: builtin/clone.c:272 +#: builtin/clone.c:273 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -6837,43 +6961,43 @@ msgstr "" "Името на директорията не може да бъде отгатнато.\n" "Задайте директорията изрично на командния ред" -#: builtin/clone.c:325 +#: builtin/clone.c:326 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "" "ПРЕДУПРЕЖДЕНИЕ: не може да се добави алтернативен източник на „%s“: %s\n" -#: builtin/clone.c:397 +#: builtin/clone.c:398 #, c-format msgid "failed to open '%s'" msgstr "директорията „%s“ не може да бъде отворена" -#: builtin/clone.c:405 +#: builtin/clone.c:406 #, c-format msgid "%s exists and is not a directory" msgstr "„%s“ съществува и не е директория" -#: builtin/clone.c:419 +#: builtin/clone.c:420 #, c-format msgid "failed to stat %s\n" msgstr "не може да бъде получена информация чрез „stat“ за „%s“\n" -#: builtin/clone.c:441 +#: builtin/clone.c:442 #, c-format msgid "failed to create link '%s'" msgstr "връзката „%s“ не може да бъде създадена" -#: builtin/clone.c:445 +#: builtin/clone.c:446 #, c-format msgid "failed to copy file to '%s'" msgstr "файлът не може да бъде копиран като „%s“" -#: builtin/clone.c:470 +#: builtin/clone.c:471 #, c-format msgid "done.\n" msgstr "действието завърши.\n" -#: builtin/clone.c:482 +#: builtin/clone.c:483 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -6884,103 +7008,103 @@ msgstr "" "клон в момента са изтеглени с командата „git status“. Можете да\n" "завършите изтеглянето на клона с командата „git checkout -f HEAD“.\n" -#: builtin/clone.c:559 +#: builtin/clone.c:560 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" "Клонът „%s“ от отдалеченото хранилище, което клонирате,\n" "и който следва да бъде изтеглен, не съществува." -#: builtin/clone.c:654 +#: builtin/clone.c:655 msgid "remote did not send all necessary objects" msgstr "отдалеченото хранилище не изпрати всички необходими обекти." -#: builtin/clone.c:670 +#: builtin/clone.c:671 #, c-format msgid "unable to update %s" msgstr "обектът „%s“ не може да бъде обновен" -#: builtin/clone.c:719 +#: builtin/clone.c:720 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "указателят „HEAD“ от отдалеченото хранилище сочи към нещо,\n" "което не съществува. Не може да се изтегли определен клон.\n" -#: builtin/clone.c:750 +#: builtin/clone.c:751 msgid "unable to checkout working tree" msgstr "работното дърво не може да бъде подготвено" -#: builtin/clone.c:792 +#: builtin/clone.c:796 msgid "unable to write parameters to config file" msgstr "настройките не могат да бъдат записани в конфигурационния файл" -#: builtin/clone.c:855 +#: builtin/clone.c:859 msgid "cannot repack to clean up" msgstr "не може да се извърши пакетиране за изчистване на файловете" -#: builtin/clone.c:857 +#: builtin/clone.c:861 msgid "cannot unlink temporary alternates file" msgstr "временният файл за алтернативни обекти не може да бъде изтрит" -#: builtin/clone.c:890 builtin/receive-pack.c:1945 +#: builtin/clone.c:894 builtin/receive-pack.c:1944 msgid "Too many arguments." msgstr "Прекалено много аргументи." -#: builtin/clone.c:894 +#: builtin/clone.c:898 msgid "You must specify a repository to clone." msgstr "Трябва да укажете кое хранилище искате да клонирате." -#: builtin/clone.c:907 +#: builtin/clone.c:911 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "опциите „--bare“ и „--origin %s“ са несъвместими." -#: builtin/clone.c:910 +#: builtin/clone.c:914 msgid "--bare and --separate-git-dir are incompatible." msgstr "опциите „--bare“ и „--separate-git-dir“ са несъвместими." -#: builtin/clone.c:923 +#: builtin/clone.c:927 #, c-format msgid "repository '%s' does not exist" msgstr "не съществува хранилище „%s“" -#: builtin/clone.c:929 builtin/fetch.c:1337 +#: builtin/clone.c:933 builtin/fetch.c:1360 #, c-format msgid "depth %s is not a positive number" msgstr "дълбочината трябва да е положително цяло число, а не „%s“" -#: builtin/clone.c:939 +#: builtin/clone.c:943 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "целевият път „%s“ съществува и не е празна директория." -#: builtin/clone.c:949 +#: builtin/clone.c:953 #, c-format msgid "working tree '%s' already exists." msgstr "в „%s“ вече съществува работно дърво." -#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260 -#: builtin/worktree.c:222 builtin/worktree.c:252 +#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270 +#: builtin/worktree.c:240 builtin/worktree.c:270 #, c-format msgid "could not create leading directories of '%s'" msgstr "родителските директории на „%s“ не могат да бъдат създадени" -#: builtin/clone.c:967 +#: builtin/clone.c:971 #, c-format msgid "could not create work tree dir '%s'" msgstr "работното дърво в „%s“ не може да бъде създадено." -#: builtin/clone.c:979 +#: builtin/clone.c:983 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Клониране и създаване на голо хранилище в „%s“…\n" -#: builtin/clone.c:981 +#: builtin/clone.c:985 #, c-format msgid "Cloning into '%s'...\n" msgstr "Клониране и създаване на хранилище в „%s“…\n" -#: builtin/clone.c:1005 +#: builtin/clone.c:1009 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -6988,43 +7112,43 @@ msgstr "" "Опцията „--recursive“ е несъвместима с опциите „--reference“ и „--reference-" "if-able“" -#: builtin/clone.c:1067 +#: builtin/clone.c:1071 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" "При локално клониране опцията „--depth“ се прескача. Ползвайте схемата " "„file://“." -#: builtin/clone.c:1069 +#: builtin/clone.c:1073 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" "При локално клониране опцията „--shallow-since“ се прескача. Ползвайте " "схемата „file://“." -#: builtin/clone.c:1071 +#: builtin/clone.c:1075 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" "При локално клониране опцията „--shallow-exclude“ се прескача. Ползвайте " "схемата „file://“." -#: builtin/clone.c:1074 +#: builtin/clone.c:1078 msgid "source repository is shallow, ignoring --local" msgstr "клонираното хранилище е плитко, затова опцията „--local“ се прескача" -#: builtin/clone.c:1079 +#: builtin/clone.c:1083 msgid "--local is ignored" msgstr "опцията „--local“ се прескача" -#: builtin/clone.c:1083 +#: builtin/clone.c:1087 #, c-format msgid "Don't know how to clone %s" msgstr "Не се поддържа клониране на връзки от вида „%s“ " -#: builtin/clone.c:1138 builtin/clone.c:1146 +#: builtin/clone.c:1142 builtin/clone.c:1150 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Отдалеченият клон „%s“ липсва в клонираното хранилище „%s“" -#: builtin/clone.c:1149 +#: builtin/clone.c:1153 msgid "You appear to have cloned an empty repository." msgstr "Изглежда клонирахте празно хранилище." @@ -7168,61 +7292,61 @@ msgstr "" "Чрез командата „git cherry-pick --continue“ ще продължите отбирането на\n" "останалите подавания.\n" -#: builtin/commit.c:319 +#: builtin/commit.c:318 msgid "failed to unpack HEAD tree object" msgstr "върховото дърво (HEAD tree object) не може да бъде извадено от пакет" -#: builtin/commit.c:360 +#: builtin/commit.c:359 msgid "unable to create temporary index" msgstr "временният индекс не може да бъде създаден" -#: builtin/commit.c:366 +#: builtin/commit.c:365 msgid "interactive add failed" msgstr "неуспешно интерактивно добавяне" -#: builtin/commit.c:379 +#: builtin/commit.c:378 msgid "unable to update temporary index" msgstr "временният индекс не може да бъде обновен" -#: builtin/commit.c:381 +#: builtin/commit.c:380 msgid "Failed to update main cache tree" msgstr "Дървото на основния кеш не може да бъде обновено" -#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477 +#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478 msgid "unable to write new_index file" msgstr "новият индекс не може да бъде записан" -#: builtin/commit.c:459 +#: builtin/commit.c:461 msgid "cannot do a partial commit during a merge." msgstr "по време на сливане не може да се извърши частично подаване." -#: builtin/commit.c:461 +#: builtin/commit.c:463 msgid "cannot do a partial commit during a cherry-pick." msgstr "по време на отбиране не може да се извърши частично подаване." -#: builtin/commit.c:470 +#: builtin/commit.c:471 msgid "cannot read the index" msgstr "индексът не може да бъде прочетен" -#: builtin/commit.c:489 +#: builtin/commit.c:490 msgid "unable to write temporary index file" msgstr "временният индекс не може да бъде записан" -#: builtin/commit.c:583 +#: builtin/commit.c:587 #, c-format msgid "commit '%s' lacks author header" msgstr "заглавната част за автор в подаването „%s“ липсва" -#: builtin/commit.c:585 +#: builtin/commit.c:589 #, c-format msgid "commit '%s' has malformed author line" msgstr "заглавната част за автор в подаването „%s“ е неправилна" -#: builtin/commit.c:604 +#: builtin/commit.c:608 msgid "malformed --author parameter" msgstr "неправилен параметър към опцията „--author“" -#: builtin/commit.c:656 +#: builtin/commit.c:660 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -7230,38 +7354,38 @@ msgstr "" "не може да се избере знак за коментар — в текущото съобщение за подаване са " "използвани всички подобни знаци" -#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093 +#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1100 #, c-format msgid "could not lookup commit %s" msgstr "следното подаване не може да бъде открито: %s" -#: builtin/commit.c:705 builtin/shortlog.c:295 +#: builtin/commit.c:709 builtin/shortlog.c:309 #, c-format msgid "(reading log message from standard input)\n" msgstr "(изчитане на съобщението за подаване от стандартния вход)\n" -#: builtin/commit.c:707 +#: builtin/commit.c:711 msgid "could not read log from standard input" msgstr "съобщението за подаване не бе прочетено стандартния вход" -#: builtin/commit.c:711 +#: builtin/commit.c:715 #, c-format msgid "could not read log file '%s'" msgstr "файлът със съобщението за подаване „%s“ не може да бъде прочетен" -#: builtin/commit.c:738 builtin/commit.c:746 +#: builtin/commit.c:742 builtin/commit.c:750 msgid "could not read SQUASH_MSG" msgstr "съобщението за смачкване SQUASH_MSG не може да бъде прочетено" -#: builtin/commit.c:743 +#: builtin/commit.c:747 msgid "could not read MERGE_MSG" msgstr "съобщението за сливане MERGE_MSG не може да бъде прочетено" -#: builtin/commit.c:797 +#: builtin/commit.c:801 msgid "could not write commit template" msgstr "шаблонът за подаване не може да бъде запазен" -#: builtin/commit.c:815 +#: builtin/commit.c:819 #, c-format msgid "" "\n" @@ -7276,7 +7400,7 @@ msgstr "" " %s\n" "и опитайте отново.\n" -#: builtin/commit.c:820 +#: builtin/commit.c:824 #, c-format msgid "" "\n" @@ -7292,7 +7416,7 @@ msgstr "" " %s\n" "и опитайте отново.\n" -#: builtin/commit.c:833 +#: builtin/commit.c:837 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -7301,7 +7425,7 @@ msgstr "" "Въведете съобщението за подаване на промените. Редовете, които започват\n" "с „%c“, ще бъдат пропуснати, а празно съобщение преустановява подаването.\n" -#: builtin/commit.c:840 +#: builtin/commit.c:844 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -7312,153 +7436,153 @@ msgstr "" "с „%c“, също ще бъдат включени — може да ги изтриете вие. Празно \n" "съобщение преустановява подаването.\n" -#: builtin/commit.c:857 +#: builtin/commit.c:861 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sАвтор: %.*s <%.*s>" -#: builtin/commit.c:865 +#: builtin/commit.c:869 #, c-format msgid "%sDate: %s" msgstr "%sДата: %s" -#: builtin/commit.c:872 +#: builtin/commit.c:876 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sПодаващ: %.*s <%.*s>" -#: builtin/commit.c:889 +#: builtin/commit.c:893 msgid "Cannot read index" msgstr "Индексът не може да бъде прочетен" -#: builtin/commit.c:951 +#: builtin/commit.c:958 msgid "Error building trees" msgstr "Грешка при изграждане на дърветата" -#: builtin/commit.c:965 builtin/tag.c:274 +#: builtin/commit.c:972 builtin/tag.c:252 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Подайте съобщението с някоя от опциите „-m“ или „-F“.\n" -#: builtin/commit.c:1068 +#: builtin/commit.c:1075 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "Опцията „--author '%s'“ не отговаря на форма̀та „Име <е-поща>“ и не съвпада с " "никой автор" -#: builtin/commit.c:1083 builtin/commit.c:1328 +#: builtin/commit.c:1090 builtin/commit.c:1335 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Неправилна стойност за неследените файлове: „%s“" -#: builtin/commit.c:1121 +#: builtin/commit.c:1128 msgid "--long and -z are incompatible" msgstr "Опциите „--long“ и „-z“ са несъвместими." -#: builtin/commit.c:1151 +#: builtin/commit.c:1158 msgid "Using both --reset-author and --author does not make sense" msgstr "Опциите „--reset-author“ и „--author“ са несъвместими." -#: builtin/commit.c:1160 +#: builtin/commit.c:1167 msgid "You have nothing to amend." msgstr "Няма какво да бъде поправено." -#: builtin/commit.c:1163 +#: builtin/commit.c:1170 msgid "You are in the middle of a merge -- cannot amend." msgstr "В момента се извършва сливане, не можете да поправяте." -#: builtin/commit.c:1165 +#: builtin/commit.c:1172 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "В момента се извършва отбиране на подаване, не можете да поправяте." -#: builtin/commit.c:1168 +#: builtin/commit.c:1175 msgid "Options --squash and --fixup cannot be used together" msgstr "Опциите „--squash“ и „--fixup“ са несъвместими." -#: builtin/commit.c:1178 +#: builtin/commit.c:1185 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Опциите „-c“, „-C“, „-F“ и „--fixup““ са несъвместими." -#: builtin/commit.c:1180 +#: builtin/commit.c:1187 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "Опцията „-m“ е несъвместима с „-c“, „-C“, „-F“ и „--fixup“." -#: builtin/commit.c:1188 +#: builtin/commit.c:1195 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" "Опцията „--reset-author“ може да се използва само заедно с „-C“, „-c“ или\n" "„--amend“." -#: builtin/commit.c:1205 +#: builtin/commit.c:1212 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Опциите „--include“, „--only“, „--all“, „--interactive“ и „--patch“ са\n" "несъвместими." -#: builtin/commit.c:1207 +#: builtin/commit.c:1214 msgid "No paths with --include/--only does not make sense." msgstr "Опциите „--include“ и „--only“ изискват аргументи." -#: builtin/commit.c:1219 builtin/tag.c:552 +#: builtin/commit.c:1226 builtin/tag.c:535 #, c-format msgid "Invalid cleanup mode %s" msgstr "Несъществуващ режим на изчистване „%s“" -#: builtin/commit.c:1224 +#: builtin/commit.c:1231 msgid "Paths with -a does not make sense." msgstr "Опцията „-a“ е несъвместима със задаването на пътища." -#: builtin/commit.c:1342 builtin/commit.c:1617 +#: builtin/commit.c:1349 builtin/commit.c:1626 msgid "show status concisely" msgstr "кратка информация за състоянието" -#: builtin/commit.c:1344 builtin/commit.c:1619 +#: builtin/commit.c:1351 builtin/commit.c:1628 msgid "show branch information" msgstr "информация за клоните" -#: builtin/commit.c:1346 +#: builtin/commit.c:1353 msgid "show stash information" msgstr "информация за скатаното" -#: builtin/commit.c:1348 +#: builtin/commit.c:1355 msgid "version" msgstr "версия" -#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530 -#: builtin/worktree.c:449 +#: builtin/commit.c:1355 builtin/commit.c:1630 builtin/push.c:530 +#: builtin/worktree.c:469 msgid "machine-readable output" msgstr "формат на изхода за четене от програма" -#: builtin/commit.c:1351 builtin/commit.c:1623 +#: builtin/commit.c:1358 builtin/commit.c:1632 msgid "show status in long format (default)" msgstr "подробна информация за състоянието (стандартно)" -#: builtin/commit.c:1354 builtin/commit.c:1626 +#: builtin/commit.c:1361 builtin/commit.c:1635 msgid "terminate entries with NUL" msgstr "разделяне на елементите с нулевия знак „NUL“" -#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983 -#: builtin/fast-export.c:986 builtin/tag.c:412 +#: builtin/commit.c:1363 builtin/commit.c:1638 builtin/fast-export.c:999 +#: builtin/fast-export.c:1002 builtin/tag.c:390 msgid "mode" msgstr "РЕЖИМ" -#: builtin/commit.c:1357 builtin/commit.c:1629 +#: builtin/commit.c:1364 builtin/commit.c:1638 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "извеждане на неследените файлове. Възможните РЕЖИМи са „all“ (подробна " "информация), „normal“ (кратка информация), „no“ (без неследените файлове). " "Стандартният РЕЖИМ е: „all“." -#: builtin/commit.c:1360 +#: builtin/commit.c:1367 msgid "show ignored files" msgstr "извеждане на игнорираните файлове" -#: builtin/commit.c:1361 parse-options.h:155 +#: builtin/commit.c:1368 parse-options.h:155 msgid "when" msgstr "КОГА" -#: builtin/commit.c:1362 +#: builtin/commit.c:1369 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -7467,205 +7591,206 @@ msgstr "" "една от „all“ (всички), „dirty“ (тези с неподадени промени), " "„untracked“ (неследени)" -#: builtin/commit.c:1364 +#: builtin/commit.c:1371 msgid "list untracked files in columns" msgstr "извеждане на неследените файлове в колони" -#: builtin/commit.c:1440 +#: builtin/commit.c:1449 msgid "couldn't look up newly created commit" msgstr "току що създаденото подаване не може да бъде открито" -#: builtin/commit.c:1442 +#: builtin/commit.c:1451 msgid "could not parse newly created commit" msgstr "току що създаденото подаване не може да бъде анализирано" -#: builtin/commit.c:1487 +#: builtin/commit.c:1496 msgid "detached HEAD" msgstr "несвързан връх „HEAD“" -#: builtin/commit.c:1490 +#: builtin/commit.c:1499 msgid " (root-commit)" msgstr " (начално подаване)" -#: builtin/commit.c:1587 +#: builtin/commit.c:1596 msgid "suppress summary after successful commit" msgstr "без информация след успешно подаване" -#: builtin/commit.c:1588 +#: builtin/commit.c:1597 msgid "show diff in commit message template" msgstr "добавяне на разликата към шаблона за съобщението при подаване" -#: builtin/commit.c:1590 +#: builtin/commit.c:1599 msgid "Commit message options" msgstr "Опции за съобщението при подаване" -#: builtin/commit.c:1591 builtin/tag.c:410 +#: builtin/commit.c:1600 builtin/tag.c:388 msgid "read message from file" msgstr "взимане на съобщението от ФАЙЛ" -#: builtin/commit.c:1592 +#: builtin/commit.c:1601 msgid "author" msgstr "АВТОР" -#: builtin/commit.c:1592 +#: builtin/commit.c:1601 msgid "override author for commit" msgstr "задаване на АВТОР за подаването" -#: builtin/commit.c:1593 builtin/gc.c:358 +#: builtin/commit.c:1602 builtin/gc.c:359 msgid "date" msgstr "ДАТА" -#: builtin/commit.c:1593 +#: builtin/commit.c:1602 msgid "override date for commit" msgstr "задаване на ДАТА за подаването" -#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401 -#: builtin/notes.c:564 builtin/tag.c:408 +#: builtin/commit.c:1603 builtin/merge.c:225 builtin/notes.c:402 +#: builtin/notes.c:565 builtin/tag.c:386 msgid "message" msgstr "СЪОБЩЕНИЕ" -#: builtin/commit.c:1594 +#: builtin/commit.c:1603 msgid "commit message" msgstr "СЪОБЩЕНИЕ при подаване" -#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597 -#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77 +#: builtin/commit.c:1604 builtin/commit.c:1605 builtin/commit.c:1606 +#: builtin/commit.c:1607 parse-options.h:257 ref-filter.h:92 msgid "commit" msgstr "ПОДАВАНЕ" -#: builtin/commit.c:1595 +#: builtin/commit.c:1604 msgid "reuse and edit message from specified commit" msgstr "преизползване и редактиране на съобщението от указаното ПОДАВАНЕ" -#: builtin/commit.c:1596 +#: builtin/commit.c:1605 msgid "reuse message from specified commit" msgstr "преизползване на съобщението от указаното ПОДАВАНЕ" -#: builtin/commit.c:1597 +#: builtin/commit.c:1606 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "използване на автоматичното съобщение при смачкване за вкарване на указаното " "ПОДАВАНЕ в предното без следа" -#: builtin/commit.c:1598 +#: builtin/commit.c:1607 msgid "use autosquash formatted message to squash specified commit" msgstr "" "използване на автоматичното съобщение при смачкване за смачкване на " "указаното ПОДАВАНЕ в предното" -#: builtin/commit.c:1599 +#: builtin/commit.c:1608 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" "смяна на автора да съвпада с подаващия (използва се с „-C“/„-c“/„--amend“)" -#: builtin/commit.c:1600 builtin/log.c:1430 builtin/revert.c:105 +#: builtin/commit.c:1609 builtin/log.c:1436 builtin/merge.c:239 +#: builtin/revert.c:105 msgid "add Signed-off-by:" msgstr "добавяне на поле за подпис — „Signed-off-by:“" -#: builtin/commit.c:1601 +#: builtin/commit.c:1610 msgid "use specified template file" msgstr "използване на указания шаблонен ФАЙЛ" -#: builtin/commit.c:1602 +#: builtin/commit.c:1611 msgid "force edit of commit" msgstr "редактиране на подаване" -#: builtin/commit.c:1603 +#: builtin/commit.c:1612 msgid "default" msgstr "стандартно" -#: builtin/commit.c:1603 builtin/tag.c:413 +#: builtin/commit.c:1612 builtin/tag.c:391 msgid "how to strip spaces and #comments from message" msgstr "кои празни знаци и #коментари да се махат от съобщенията" -#: builtin/commit.c:1604 +#: builtin/commit.c:1613 msgid "include status in commit message template" msgstr "вмъкване на състоянието в шаблона за съобщението при подаване" -#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173 +#: builtin/commit.c:1615 builtin/merge.c:237 builtin/pull.c:173 #: builtin/revert.c:113 msgid "GPG sign commit" msgstr "подписване на подаването с GPG" -#: builtin/commit.c:1609 +#: builtin/commit.c:1618 msgid "Commit contents options" msgstr "Опции за избор на файлове при подаване" -#: builtin/commit.c:1610 +#: builtin/commit.c:1619 msgid "commit all changed files" msgstr "подаване на всички променени файлове" -#: builtin/commit.c:1611 +#: builtin/commit.c:1620 msgid "add specified files to index for commit" msgstr "добавяне на указаните файлове към индекса за подаване" -#: builtin/commit.c:1612 +#: builtin/commit.c:1621 msgid "interactively add files" msgstr "интерактивно добавяне на файлове" -#: builtin/commit.c:1613 +#: builtin/commit.c:1622 msgid "interactively add changes" msgstr "интерактивно добавяне на промени" -#: builtin/commit.c:1614 +#: builtin/commit.c:1623 msgid "commit only specified files" msgstr "подаване само на указаните файлове" -#: builtin/commit.c:1615 +#: builtin/commit.c:1624 msgid "bypass pre-commit and commit-msg hooks" msgstr "" "без изпълнение на куките преди подаване и при промяна на съобщението за " "подаване (pre-commit и commit-msg)" -#: builtin/commit.c:1616 +#: builtin/commit.c:1625 msgid "show what would be committed" msgstr "отпечатване на това, което би било подадено" -#: builtin/commit.c:1627 +#: builtin/commit.c:1636 msgid "amend previous commit" msgstr "поправяне на предишното подаване" -#: builtin/commit.c:1628 +#: builtin/commit.c:1637 msgid "bypass post-rewrite hook" msgstr "без изпълнение на куката след презаписване (post-rewrite)" -#: builtin/commit.c:1633 +#: builtin/commit.c:1642 msgid "ok to record an empty change" msgstr "позволяване на празни подавания" -#: builtin/commit.c:1635 +#: builtin/commit.c:1644 msgid "ok to record a change with an empty message" msgstr "позволяване на подавания с празни съобщения" -#: builtin/commit.c:1665 +#: builtin/commit.c:1674 msgid "could not parse HEAD commit" msgstr "върховото подаване „HEAD“ не може да бъде прочетено" -#: builtin/commit.c:1710 +#: builtin/commit.c:1719 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Повреден файл за върха за сливането „MERGE_HEAD“ (%s)" -#: builtin/commit.c:1717 +#: builtin/commit.c:1726 msgid "could not read MERGE_MODE" msgstr "режимът на сливане „MERGE_MODE“ не може да бъде прочетен" -#: builtin/commit.c:1736 +#: builtin/commit.c:1745 #, c-format msgid "could not read commit message: %s" msgstr "съобщението за подаване не може да бъде прочетено: %s" -#: builtin/commit.c:1747 -#, c-format -msgid "Aborting commit; you did not edit the message.\n" -msgstr "Неизвършване на подаване поради нередактирано съобщение.\n" - -#: builtin/commit.c:1752 +#: builtin/commit.c:1756 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Неизвършване на подаване поради празно съобщение.\n" -#: builtin/commit.c:1800 +#: builtin/commit.c:1761 +#, c-format +msgid "Aborting commit; you did not edit the message.\n" +msgstr "Неизвършване на подаване поради нередактирано съобщение.\n" + +#: builtin/commit.c:1809 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -7837,12 +7962,12 @@ msgstr "" msgid "--local can only be used inside a git repository" msgstr "„--local“ може да се използва само в хранилище" -#: builtin/config.c:621 +#: builtin/config.c:624 #, c-format msgid "cannot create configuration file %s" msgstr "конфигурационният файл „%s“ не може да бъде създаден" -#: builtin/config.c:633 +#: builtin/config.c:637 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -7852,11 +7977,11 @@ msgstr "" "За да промените „%s“, ползвайте регулярен израз или опциите „--add“ и „--" "replace-all“." -#: builtin/count-objects.c:87 +#: builtin/count-objects.c:88 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "git count-objects [-v] [-H | --human-readable]" -#: builtin/count-objects.c:97 +#: builtin/count-objects.c:98 msgid "print sizes in human readable format" msgstr "извеждане на размерите на обектите във формат лесно четим от хора" @@ -7880,47 +8005,47 @@ msgstr "кратко" msgid "annotated" msgstr "анотирано" -#: builtin/describe.c:253 +#: builtin/describe.c:264 #, c-format msgid "annotated tag %s not available" msgstr "не съществува анотиран етикет „%s“" -#: builtin/describe.c:257 +#: builtin/describe.c:268 #, c-format msgid "annotated tag %s has no embedded name" msgstr "в анотирания етикет „%s“ липсва вградено име" -#: builtin/describe.c:259 +#: builtin/describe.c:270 #, c-format msgid "tag '%s' is really '%s' here" msgstr "етикетът „%s“ тук е всъщност „%s“" -#: builtin/describe.c:286 builtin/log.c:489 +#: builtin/describe.c:297 builtin/log.c:493 #, c-format msgid "Not a valid object name %s" msgstr "Неправилно име на обект „%s“" -#: builtin/describe.c:289 +#: builtin/describe.c:300 #, c-format msgid "%s is not a valid '%s' object" msgstr "„%s“ е неправилен обект „%s“" -#: builtin/describe.c:306 +#: builtin/describe.c:317 #, c-format msgid "no tag exactly matches '%s'" msgstr "никой етикет не напасва точно „%s“" -#: builtin/describe.c:308 +#: builtin/describe.c:319 #, c-format msgid "searching to describe %s\n" msgstr "търсене за описание на „%s“\n" -#: builtin/describe.c:355 +#: builtin/describe.c:366 #, c-format msgid "finished search at %s\n" msgstr "търсенето приключи при „%s“\n" -#: builtin/describe.c:382 +#: builtin/describe.c:393 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -7929,7 +8054,7 @@ msgstr "" "Никой анотиран етикет не описва „%s“.\n" "Съществуват и неанотирани етикети. Пробвайте с опцията „--tags“." -#: builtin/describe.c:386 +#: builtin/describe.c:397 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -7938,12 +8063,12 @@ msgstr "" "Никой етикет не описва „%s“.\n" "Пробвайте с опцията „--always“ или създайте етикети." -#: builtin/describe.c:416 +#: builtin/describe.c:427 #, c-format msgid "traversed %lu commits\n" msgstr "претърсени са %lu подавания\n" -#: builtin/describe.c:419 +#: builtin/describe.c:430 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -7952,78 +8077,78 @@ msgstr "" "открити са над %i етикета, изведени са последните %i,\n" "търсенето бе прекратено при „%s“.\n" -#: builtin/describe.c:441 +#: builtin/describe.c:452 msgid "find the tag that comes after the commit" msgstr "откриване на етикета, който следва подаване" -#: builtin/describe.c:442 +#: builtin/describe.c:453 msgid "debug search strategy on stderr" msgstr "" "извеждане на информация за трасиране на стратегията за търсене на " "стандартната грешка" -#: builtin/describe.c:443 +#: builtin/describe.c:454 msgid "use any ref" msgstr "използване на произволен указател" -#: builtin/describe.c:444 +#: builtin/describe.c:455 msgid "use any tag, even unannotated" msgstr "използване на всеки етикет — включително и неанотираните" -#: builtin/describe.c:445 +#: builtin/describe.c:456 msgid "always use long format" msgstr "винаги да се ползва дългият формат" -#: builtin/describe.c:446 +#: builtin/describe.c:457 msgid "only follow first parent" msgstr "проследяване само на първия родител" -#: builtin/describe.c:449 +#: builtin/describe.c:460 msgid "only output exact matches" msgstr "извеждане само на точните съвпадения" -#: builtin/describe.c:451 +#: builtin/describe.c:462 msgid "consider <n> most recent tags (default: 10)" msgstr "да се търси само в този БРОЙ последни етикети (стандартно: 10)" -#: builtin/describe.c:453 +#: builtin/describe.c:464 msgid "only consider tags matching <pattern>" msgstr "да се търси само измежду етикетите напасващи този ШАБЛОН" -#: builtin/describe.c:455 +#: builtin/describe.c:466 msgid "do not consider tags matching <pattern>" msgstr "да не се търси измежду етикетите напасващи този ШАБЛОН" -#: builtin/describe.c:457 builtin/name-rev.c:406 +#: builtin/describe.c:468 builtin/name-rev.c:406 msgid "show abbreviated commit object as fallback" msgstr "извеждане на съкратено име на обект като резервен вариант" -#: builtin/describe.c:458 builtin/describe.c:461 +#: builtin/describe.c:469 builtin/describe.c:472 msgid "mark" msgstr "МАРКЕР" -#: builtin/describe.c:459 +#: builtin/describe.c:470 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "добавяне на такъв МАРКЕР на работното дърво (стандартно е „-dirty“)" -#: builtin/describe.c:462 +#: builtin/describe.c:473 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "" "добавяне на такъв МАРКЕР на счупеното работно дърво (стандартно е „-broken“)" -#: builtin/describe.c:480 +#: builtin/describe.c:491 msgid "--long is incompatible with --abbrev=0" msgstr "Опциите „--long“ и „--abbrev=0“ са несъвместими" -#: builtin/describe.c:509 +#: builtin/describe.c:520 msgid "No names found, cannot describe anything." msgstr "Не са открити имена — нищо не може да бъде описано." -#: builtin/describe.c:552 +#: builtin/describe.c:563 msgid "--dirty is incompatible with commit-ishes" msgstr "опцията „--dirty“ е несъвместима с указател към подаване" -#: builtin/describe.c:554 +#: builtin/describe.c:565 msgid "--broken is incompatible with commit-ishes" msgstr "опцията „--broken“ е несъвместима с указател към подаване" @@ -8037,21 +8162,21 @@ msgstr "„%s“: не е нито обикновен файл, нито сим msgid "invalid option: %s" msgstr "неправилна опция: %s" -#: builtin/diff.c:359 +#: builtin/diff.c:357 msgid "Not a git repository" msgstr "Не е хранилище на Git" -#: builtin/diff.c:402 +#: builtin/diff.c:400 #, c-format msgid "invalid object '%s' given." msgstr "зададен е неправилен обект „%s“." -#: builtin/diff.c:411 +#: builtin/diff.c:409 #, c-format msgid "more than two blobs given: '%s'" msgstr "зададени са повече от 2 обекта BLOB: „%s“" -#: builtin/diff.c:416 +#: builtin/diff.c:414 #, c-format msgid "unhandled object '%s' given." msgstr "зададен е неподдържан обект „%s“." @@ -8060,27 +8185,27 @@ msgstr "зададен е неподдържан обект „%s“." msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [ОПЦИЯ…] [ПОДАВАНЕ [ПОДАВАНЕ]] [[--] ПЪТ…]" -#: builtin/difftool.c:249 +#: builtin/difftool.c:259 #, c-format msgid "failed: %d" msgstr "неуспешно действие с изходен код: %d" -#: builtin/difftool.c:291 +#: builtin/difftool.c:301 #, c-format msgid "could not read symlink %s" msgstr "символната връзка „%s“ не може да бъде прочетена" -#: builtin/difftool.c:293 +#: builtin/difftool.c:303 #, c-format msgid "could not read symlink file %s" msgstr "файлът, сочен от символната връзка „%s“, не може да бъде прочетен" -#: builtin/difftool.c:301 +#: builtin/difftool.c:311 #, c-format msgid "could not read object %s for symlink %s" msgstr "обектът „%s“ за символната връзка „%s“ не може да бъде прочетен" -#: builtin/difftool.c:403 +#: builtin/difftool.c:412 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -8088,55 +8213,55 @@ msgstr "" "комбинираните формати на разликите („-c“ и „--cc“) не се поддържат\n" "в режима за разлики върху директории („-d“ и „--dir-diff“)." -#: builtin/difftool.c:626 +#: builtin/difftool.c:633 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "и двата файла са променени: „%s“ и „%s“." -#: builtin/difftool.c:628 +#: builtin/difftool.c:635 msgid "working tree file has been left." msgstr "работното дърво е изоставено." -#: builtin/difftool.c:639 +#: builtin/difftool.c:646 #, c-format msgid "temporary files exist in '%s'." msgstr "в „%s“ има временни файлове." -#: builtin/difftool.c:640 +#: builtin/difftool.c:647 msgid "you may want to cleanup or recover these." msgstr "възможно е да ги изчистите или възстановите" -#: builtin/difftool.c:689 +#: builtin/difftool.c:696 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "използвайте „diff.guitool“ вместо „diff.tool“" -#: builtin/difftool.c:691 +#: builtin/difftool.c:698 msgid "perform a full-directory diff" msgstr "разлика по директории" -#: builtin/difftool.c:693 +#: builtin/difftool.c:700 msgid "do not prompt before launching a diff tool" msgstr "стартиране на ПРОГРАМАта за разлики без предупреждение" -#: builtin/difftool.c:699 +#: builtin/difftool.c:706 msgid "use symlinks in dir-diff mode" msgstr "следване на символните връзки при разлика по директории" -#: builtin/difftool.c:700 +#: builtin/difftool.c:707 msgid "<tool>" msgstr "ПРОГРАМА" -#: builtin/difftool.c:701 +#: builtin/difftool.c:708 msgid "use the specified diff tool" msgstr "използване на указаната ПРОГРАМА" -#: builtin/difftool.c:703 +#: builtin/difftool.c:710 msgid "print a list of diff tools that may be used with `--tool`" msgstr "" "извеждане на списък с всички ПРОГРАМи, които може да се ползват с опцията „--" "tool“" -#: builtin/difftool.c:706 +#: builtin/difftool.c:713 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -8144,19 +8269,19 @@ msgstr "" "„git-difftool“ да спре работа, когато стартираната ПРОГРАМА завърши с " "ненулев код" -#: builtin/difftool.c:708 +#: builtin/difftool.c:715 msgid "<command>" msgstr "КОМАНДА" -#: builtin/difftool.c:709 +#: builtin/difftool.c:716 msgid "specify a custom command for viewing diffs" msgstr "команда за разглеждане на разлики" -#: builtin/difftool.c:733 +#: builtin/difftool.c:740 msgid "no <tool> given for --tool=<tool>" msgstr "не е зададена програма за „--tool=ПРОГРАМА“" -#: builtin/difftool.c:740 +#: builtin/difftool.c:747 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "не е зададена команда за „--extcmd=КОМАНДА“" @@ -8164,143 +8289,143 @@ msgstr "не е зададена команда за „--extcmd=КОМАНДА msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [ОПЦИИ_ЗА_СПИСЪКА_С_ВЕРСИИ]" -#: builtin/fast-export.c:982 +#: builtin/fast-export.c:998 msgid "show progress after <n> objects" msgstr "Съобщение за напредъка на всеки такъв БРОЙ обекта" -#: builtin/fast-export.c:984 +#: builtin/fast-export.c:1000 msgid "select handling of signed tags" msgstr "Как да се обработват подписаните етикети" -#: builtin/fast-export.c:987 +#: builtin/fast-export.c:1003 msgid "select handling of tags that tag filtered objects" msgstr "Как да се обработват етикетите на филтрираните обекти" -#: builtin/fast-export.c:990 +#: builtin/fast-export.c:1006 msgid "Dump marks to this file" msgstr "Запазване на маркерите в този ФАЙЛ" -#: builtin/fast-export.c:992 +#: builtin/fast-export.c:1008 msgid "Import marks from this file" msgstr "Внасяне на маркерите от този ФАЙЛ" -#: builtin/fast-export.c:994 +#: builtin/fast-export.c:1010 msgid "Fake a tagger when tags lack one" msgstr "Да се използва изкуствено име на човек при липса на задаващ етикета" -#: builtin/fast-export.c:996 +#: builtin/fast-export.c:1012 msgid "Output full tree for each commit" msgstr "Извеждане на цялото дърво за всяко подаване" -#: builtin/fast-export.c:998 +#: builtin/fast-export.c:1014 msgid "Use the done feature to terminate the stream" msgstr "Използване на маркер за завършване на потока" -#: builtin/fast-export.c:999 +#: builtin/fast-export.c:1015 msgid "Skip output of blob data" msgstr "Без извеждане на съдържанието на обектите BLOB" -#: builtin/fast-export.c:1000 +#: builtin/fast-export.c:1016 msgid "refspec" msgstr "УКАЗАТЕЛ_НА_ВЕРСИЯ" -#: builtin/fast-export.c:1001 +#: builtin/fast-export.c:1017 msgid "Apply refspec to exported refs" msgstr "Прилагане на УКАЗАТЕЛя_НА_ВЕРСИЯ към изнесените указатели" -#: builtin/fast-export.c:1002 +#: builtin/fast-export.c:1018 msgid "anonymize output" msgstr "анонимизиране на извежданата информация" -#: builtin/fetch.c:22 +#: builtin/fetch.c:23 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [ОПЦИЯ…] [ХРАНИЛИЩЕ [УКАЗАТЕЛ…]]" -#: builtin/fetch.c:23 +#: builtin/fetch.c:24 msgid "git fetch [<options>] <group>" msgstr "git fetch [ОПЦИЯ…] ГРУПА" -#: builtin/fetch.c:24 +#: builtin/fetch.c:25 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [ОПЦИЯ…] [(ХРАНИЛИЩЕ | ГРУПА)…]" -#: builtin/fetch.c:25 +#: builtin/fetch.c:26 msgid "git fetch --all [<options>]" msgstr "git fetch --all [ОПЦИЯ…]" -#: builtin/fetch.c:90 builtin/pull.c:182 +#: builtin/fetch.c:112 builtin/pull.c:182 msgid "fetch from all remotes" msgstr "доставяне от всички отдалечени хранилища" -#: builtin/fetch.c:92 builtin/pull.c:185 +#: builtin/fetch.c:114 builtin/pull.c:185 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "добавяне към „.git/FETCH_HEAD“ вместо замяна" -#: builtin/fetch.c:94 builtin/pull.c:188 +#: builtin/fetch.c:116 builtin/pull.c:188 msgid "path to upload pack on remote end" msgstr "отдалечен път, където да се качи пакетът" -#: builtin/fetch.c:95 builtin/pull.c:190 +#: builtin/fetch.c:117 builtin/pull.c:190 msgid "force overwrite of local branch" msgstr "принудително презаписване на локалния клон" -#: builtin/fetch.c:97 +#: builtin/fetch.c:119 msgid "fetch from multiple remotes" msgstr "доставяне от множество отдалечени хранилища" -#: builtin/fetch.c:99 builtin/pull.c:192 +#: builtin/fetch.c:121 builtin/pull.c:192 msgid "fetch all tags and associated objects" msgstr "доставяне на всички етикети и принадлежащи обекти" -#: builtin/fetch.c:101 +#: builtin/fetch.c:123 msgid "do not fetch all tags (--no-tags)" msgstr "без доставянето на всички етикети „--no-tags“" -#: builtin/fetch.c:103 +#: builtin/fetch.c:125 msgid "number of submodules fetched in parallel" msgstr "брой подмодули доставени паралелно" -#: builtin/fetch.c:105 builtin/pull.c:195 +#: builtin/fetch.c:127 builtin/pull.c:195 msgid "prune remote-tracking branches no longer on remote" msgstr "окастряне на клоните следящи вече несъществуващи отдалечени клони" -#: builtin/fetch.c:106 builtin/fetch.c:129 builtin/pull.c:123 +#: builtin/fetch.c:128 builtin/fetch.c:151 builtin/pull.c:123 msgid "on-demand" msgstr "ПРИ НУЖДА" -#: builtin/fetch.c:107 +#: builtin/fetch.c:129 msgid "control recursive fetching of submodules" msgstr "управление на рекурсивното доставяне на подмодулите" -#: builtin/fetch.c:111 builtin/pull.c:203 +#: builtin/fetch.c:133 builtin/pull.c:203 msgid "keep downloaded pack" msgstr "запазване на изтеглените пакети с обекти" -#: builtin/fetch.c:113 +#: builtin/fetch.c:135 msgid "allow updating of HEAD ref" msgstr "позволяване на обновяването на указателя „HEAD“" -#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206 +#: builtin/fetch.c:138 builtin/fetch.c:144 builtin/pull.c:206 msgid "deepen history of shallow clone" msgstr "задълбочаване на историята на плитко хранилище" -#: builtin/fetch.c:118 +#: builtin/fetch.c:140 msgid "deepen history of shallow repository based on time" msgstr "задълбочаване на историята на плитко хранилище до определено време" -#: builtin/fetch.c:124 builtin/pull.c:209 +#: builtin/fetch.c:146 builtin/pull.c:209 msgid "convert to a complete repository" msgstr "превръщане в пълно хранилище" -#: builtin/fetch.c:126 builtin/log.c:1450 +#: builtin/fetch.c:148 builtin/log.c:1456 msgid "dir" msgstr "директория" -#: builtin/fetch.c:127 +#: builtin/fetch.c:149 msgid "prepend this to submodule path output" msgstr "добавяне на това пред пътя на подмодула" -#: builtin/fetch.c:130 +#: builtin/fetch.c:152 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -8308,91 +8433,91 @@ msgstr "" "стандартно рекурсивно изтегляне на подмодулите (файловете с настройки са с " "приоритет)" -#: builtin/fetch.c:134 builtin/pull.c:212 +#: builtin/fetch.c:156 builtin/pull.c:212 msgid "accept refs that update .git/shallow" msgstr "приемане на указатели, които обновяват „.git/shallow“" -#: builtin/fetch.c:135 builtin/pull.c:214 +#: builtin/fetch.c:157 builtin/pull.c:214 msgid "refmap" msgstr "КАРТА_С_УКАЗАТЕЛИ" -#: builtin/fetch.c:136 builtin/pull.c:215 +#: builtin/fetch.c:158 builtin/pull.c:215 msgid "specify fetch refmap" msgstr "указване на КАРТАта_С_УКАЗАТЕЛИ за доставяне" -#: builtin/fetch.c:394 +#: builtin/fetch.c:416 msgid "Couldn't find remote ref HEAD" msgstr "Указателят „HEAD“ в отдалеченото хранилище не може да бъде открит" -#: builtin/fetch.c:512 +#: builtin/fetch.c:534 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "настройката „fetch.output“ е с неправилна стойност „%s“" -#: builtin/fetch.c:605 +#: builtin/fetch.c:627 #, c-format msgid "object %s not found" msgstr "обектът „%s“ липсва" -#: builtin/fetch.c:609 +#: builtin/fetch.c:631 msgid "[up to date]" msgstr "[актуализиран]" -#: builtin/fetch.c:622 builtin/fetch.c:702 +#: builtin/fetch.c:644 builtin/fetch.c:724 msgid "[rejected]" msgstr "[отхвърлен]" -#: builtin/fetch.c:623 +#: builtin/fetch.c:645 msgid "can't fetch in current branch" msgstr "в текущия клон не може да се доставя" -#: builtin/fetch.c:632 +#: builtin/fetch.c:654 msgid "[tag update]" msgstr "[обновяване на етикетите]" -#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682 -#: builtin/fetch.c:697 +#: builtin/fetch.c:655 builtin/fetch.c:688 builtin/fetch.c:704 +#: builtin/fetch.c:719 msgid "unable to update local ref" msgstr "локален указател не може да бъде обновен" -#: builtin/fetch.c:652 +#: builtin/fetch.c:674 msgid "[new tag]" msgstr "[нов етикет]" -#: builtin/fetch.c:655 +#: builtin/fetch.c:677 msgid "[new branch]" msgstr "[нов клон]" -#: builtin/fetch.c:658 +#: builtin/fetch.c:680 msgid "[new ref]" msgstr "[нов указател]" -#: builtin/fetch.c:697 +#: builtin/fetch.c:719 msgid "forced update" msgstr "принудително обновяване" -#: builtin/fetch.c:702 +#: builtin/fetch.c:724 msgid "non-fast-forward" msgstr "същинско сливане" -#: builtin/fetch.c:747 +#: builtin/fetch.c:769 #, c-format msgid "%s did not send all necessary objects\n" msgstr "хранилището „%s“ не изпрати всички необходими обекти\n" -#: builtin/fetch.c:767 +#: builtin/fetch.c:789 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" "отхвърляне на върха „%s“, защото плитките хранилища не могат да бъдат " "обновявани" -#: builtin/fetch.c:855 builtin/fetch.c:951 +#: builtin/fetch.c:877 builtin/fetch.c:973 #, c-format msgid "From %.*s\n" msgstr "От %.*s\n" -#: builtin/fetch.c:866 +#: builtin/fetch.c:888 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -8402,55 +8527,55 @@ msgstr "" "„git remote prune %s“, за да премахнете остарелите клони, които\n" "предизвикват конфликта" -#: builtin/fetch.c:921 +#: builtin/fetch.c:943 #, c-format msgid " (%s will become dangling)" msgstr " (обектът „%s“ ще се окаже извън клон)" -#: builtin/fetch.c:922 +#: builtin/fetch.c:944 #, c-format msgid " (%s has become dangling)" msgstr " (обектът „%s“ вече е извън клон)" -#: builtin/fetch.c:954 +#: builtin/fetch.c:976 msgid "[deleted]" msgstr "[изтрит]" -#: builtin/fetch.c:955 builtin/remote.c:1023 +#: builtin/fetch.c:977 builtin/remote.c:1024 msgid "(none)" msgstr "(нищо)" -#: builtin/fetch.c:978 +#: builtin/fetch.c:1000 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Не може да доставите в текущия клон „%s“ на хранилище, което не е голо" -#: builtin/fetch.c:997 +#: builtin/fetch.c:1019 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Стойността „%2$s“ за опцията „%1$s“ не е съвместима с „%3$s“" -#: builtin/fetch.c:1000 +#: builtin/fetch.c:1022 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Опцията „%s“ се прескача при „%s“\n" -#: builtin/fetch.c:1076 +#: builtin/fetch.c:1098 #, c-format msgid "Don't know how to fetch from %s" msgstr "Не се поддържа доставяне от „%s“" -#: builtin/fetch.c:1236 +#: builtin/fetch.c:1258 #, c-format msgid "Fetching %s\n" msgstr "Доставяне на „%s“\n" -#: builtin/fetch.c:1238 builtin/remote.c:97 +#: builtin/fetch.c:1260 builtin/remote.c:97 #, c-format msgid "Could not fetch %s" msgstr "„%s“ не може да се достави" -#: builtin/fetch.c:1256 +#: builtin/fetch.c:1278 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -8458,41 +8583,41 @@ msgstr "" "Не сте указали отдалечено хранилище. Задайте или адрес, или име\n" "на отдалечено хранилище, откъдето да се доставят новите версии." -#: builtin/fetch.c:1279 +#: builtin/fetch.c:1301 msgid "You need to specify a tag name." msgstr "Трябва да укажете име на етикет." -#: builtin/fetch.c:1321 +#: builtin/fetch.c:1344 msgid "Negative depth in --deepen is not supported" msgstr "Отрицателна дълбочина като аргумент на „--deepen“ не се поддържа" -#: builtin/fetch.c:1323 +#: builtin/fetch.c:1346 msgid "--deepen and --depth are mutually exclusive" msgstr "Опциите „--deepen“ и „--depth“ са несъвместими една с друга" -#: builtin/fetch.c:1328 +#: builtin/fetch.c:1351 msgid "--depth and --unshallow cannot be used together" msgstr "опциите „--depth“ и „--unshallow“ са несъвместими" -#: builtin/fetch.c:1330 +#: builtin/fetch.c:1353 msgid "--unshallow on a complete repository does not make sense" msgstr "не можете да използвате опцията „--unshallow“ върху пълно хранилище" -#: builtin/fetch.c:1349 +#: builtin/fetch.c:1366 msgid "fetch --all does not take a repository argument" msgstr "към „git fetch --all“ не можете да добавите аргумент — хранилище" -#: builtin/fetch.c:1351 +#: builtin/fetch.c:1368 msgid "fetch --all does not make sense with refspecs" msgstr "" "към „git fetch --all“ не можете да добавите аргумент — указател на версия" -#: builtin/fetch.c:1362 +#: builtin/fetch.c:1379 #, c-format msgid "No such remote or remote group: %s" msgstr "Няма нито отдалечено хранилище, нито група от хранилища на име „%s“" -#: builtin/fetch.c:1370 +#: builtin/fetch.c:1387 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Указването на група и указването на версия са несъвместими" @@ -8502,25 +8627,25 @@ msgid "" msgstr "" "git fmt-merge-msg [-m СЪОБЩЕНИЕ] [--log[=БРОЙ] | --no-log] [--file ФАЙЛ]" -#: builtin/fmt-merge-msg.c:664 +#: builtin/fmt-merge-msg.c:665 msgid "populate log with at most <n> entries from shortlog" msgstr "" "вмъкване на журнал състоящ се от не повече от БРОЙ записа от съкратения " "журнал" -#: builtin/fmt-merge-msg.c:667 +#: builtin/fmt-merge-msg.c:668 msgid "alias for --log (deprecated)" msgstr "синоним на „--log“ (остаряло)" -#: builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:671 msgid "text" msgstr "ТЕКСТ" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:672 msgid "use <text> as start of message" msgstr "за начало на съобщението да се ползва ТЕКСТ" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:673 msgid "file to read from" msgstr "файл, от който да се чете" @@ -8560,102 +8685,106 @@ msgstr "цитиране подходящо за tcl" msgid "show only <n> matched refs" msgstr "извеждане само на този БРОЙ напаснати указатели" -#: builtin/for-each-ref.c:42 +#: builtin/for-each-ref.c:39 builtin/tag.c:414 +msgid "respect format colors" +msgstr "спазване на цветовете на форма̀та" + +#: builtin/for-each-ref.c:43 msgid "print only refs which points at the given object" msgstr "извеждане само на указателите, сочещи към ОБЕКТА" -#: builtin/for-each-ref.c:44 +#: builtin/for-each-ref.c:45 msgid "print only refs that are merged" msgstr "извеждане само на слетите указатели" -#: builtin/for-each-ref.c:45 +#: builtin/for-each-ref.c:46 msgid "print only refs that are not merged" msgstr "извеждане само на неслетите указатели" -#: builtin/for-each-ref.c:46 +#: builtin/for-each-ref.c:47 msgid "print only refs which contain the commit" msgstr "извеждане само на указателите, които съдържат това ПОДАВАНЕ" -#: builtin/for-each-ref.c:47 +#: builtin/for-each-ref.c:48 msgid "print only refs which don't contain the commit" msgstr "извеждане само на указателите, които не съдържат това ПОДАВАНЕ" -#: builtin/fsck.c:554 +#: builtin/fsck.c:543 msgid "Checking object directories" msgstr "Проверка на директориите с обекти" -#: builtin/fsck.c:646 +#: builtin/fsck.c:635 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [ОПЦИЯ…] [ОБЕКТ…]" -#: builtin/fsck.c:652 +#: builtin/fsck.c:641 msgid "show unreachable objects" msgstr "показване на недостижимите обекти" -#: builtin/fsck.c:653 +#: builtin/fsck.c:642 msgid "show dangling objects" msgstr "показване на обектите извън клоните" -#: builtin/fsck.c:654 +#: builtin/fsck.c:643 msgid "report tags" msgstr "показване на етикетите" -#: builtin/fsck.c:655 +#: builtin/fsck.c:644 msgid "report root nodes" msgstr "показване на кореновите възли" -#: builtin/fsck.c:656 +#: builtin/fsck.c:645 msgid "make index objects head nodes" msgstr "задаване на обекти от индекса да са коренови" # FIXME bad message -#: builtin/fsck.c:657 +#: builtin/fsck.c:646 msgid "make reflogs head nodes (default)" msgstr "проследяване на указателите от журнала като глави (стандартно)" -#: builtin/fsck.c:658 +#: builtin/fsck.c:647 msgid "also consider packs and alternate objects" msgstr "допълнително да се проверяват пакетите и алтернативните обекти" -#: builtin/fsck.c:659 +#: builtin/fsck.c:648 msgid "check only connectivity" msgstr "проверка само на връзката" -#: builtin/fsck.c:660 +#: builtin/fsck.c:649 msgid "enable more strict checking" msgstr "по-строги проверки" -#: builtin/fsck.c:662 +#: builtin/fsck.c:651 msgid "write dangling objects in .git/lost-found" msgstr "запазване на обектите извън клоните в директорията „.git/lost-found“" -#: builtin/fsck.c:663 builtin/prune.c:107 +#: builtin/fsck.c:652 builtin/prune.c:107 msgid "show progress" msgstr "показване на напредъка" -#: builtin/fsck.c:664 +#: builtin/fsck.c:653 msgid "show verbose names for reachable objects" msgstr "показване на подробни имена на достижимите обекти" -#: builtin/fsck.c:725 +#: builtin/fsck.c:714 msgid "Checking objects" msgstr "Проверка на обектите" -#: builtin/gc.c:26 +#: builtin/gc.c:27 msgid "git gc [<options>]" msgstr "git gc [ОПЦИЯ…]" -#: builtin/gc.c:79 +#: builtin/gc.c:80 #, c-format msgid "Failed to fstat %s: %s" msgstr "Неуспешно изпълнение на „fstat“ върху „%s“: %s" -#: builtin/gc.c:311 +#: builtin/gc.c:312 #, c-format msgid "Can't stat %s" msgstr "Неуспешно изпълнение на „stat“ върху „%s“" -#: builtin/gc.c:320 +#: builtin/gc.c:321 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -8672,49 +8801,49 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:359 +#: builtin/gc.c:360 msgid "prune unreferenced objects" msgstr "окастряне на обектите, към които нищо не сочи" -#: builtin/gc.c:361 +#: builtin/gc.c:362 msgid "be more thorough (increased runtime)" msgstr "изчерпателно търсене на боклука (за сметка на повече време работа)" -#: builtin/gc.c:362 +#: builtin/gc.c:363 msgid "enable auto-gc mode" msgstr "включване на автоматичното събиране на боклука (auto-gc)" -#: builtin/gc.c:363 +#: builtin/gc.c:364 msgid "force running gc even if there may be another gc running" msgstr "" "изрично стартиране на събирането на боклука, дори и ако вече работи друго " "събиране" -#: builtin/gc.c:380 +#: builtin/gc.c:381 #, c-format msgid "Failed to parse gc.logexpiry value %s" msgstr "Неразпозната стойност на „gc.logexpiry“: %s" -#: builtin/gc.c:408 +#: builtin/gc.c:409 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" "Автоматично пакетиране на заден фон на хранилището за по-добра " "производителност.\n" -#: builtin/gc.c:410 +#: builtin/gc.c:411 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Автоматично пакетиране на хранилището за по-добра производителност.\n" -#: builtin/gc.c:411 +#: builtin/gc.c:412 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "" "Погледнете ръководството за повече информация как да изпълните „git help " "gc“.\n" -#: builtin/gc.c:436 +#: builtin/gc.c:437 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -8723,7 +8852,7 @@ msgstr "" "процеса: %<PRIuMAX> (ако сте сигурни, че това не е вярно, това използвайте\n" "опцията „--force“)" -#: builtin/gc.c:480 +#: builtin/gc.c:481 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -8734,12 +8863,12 @@ msgstr "" msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [ОПЦИЯ…] [-e] ШАБЛОН [ВЕРСИЯ…] [[--] ПЪТ…]" -#: builtin/grep.c:235 +#: builtin/grep.c:226 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep: неуспешно създаване на нишка: %s" -#: builtin/grep.c:293 +#: builtin/grep.c:284 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "зададен е неправилен брой нишки (%d) за %s" @@ -8748,263 +8877,255 @@ msgstr "зададен е неправилен брой нишки (%d) за %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692 +#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1693 #, c-format msgid "no threads support, ignoring %s" msgstr "липсва поддръжка за нишки. „%s“ ще се пренебрегне" -#: builtin/grep.c:788 builtin/grep.c:829 +#: builtin/grep.c:451 builtin/grep.c:571 builtin/grep.c:613 #, c-format msgid "unable to read tree (%s)" msgstr "дървото не може да бъде прочетено (%s)" -#: builtin/grep.c:848 +#: builtin/grep.c:628 #, c-format msgid "unable to grep from object of type %s" msgstr "не може да се изпълни „grep“ от обект от вида %s" -#: builtin/grep.c:912 +#: builtin/grep.c:694 #, c-format msgid "switch `%c' expects a numerical value" msgstr "опцията „%c“ очаква число за аргумент" -#: builtin/grep.c:999 +#: builtin/grep.c:781 msgid "search in index instead of in the work tree" msgstr "търсене в индекса, а не в работното дърво" -#: builtin/grep.c:1001 +#: builtin/grep.c:783 msgid "find in contents not managed by git" msgstr "търсене и във файловете, които не са под управлението на git" -#: builtin/grep.c:1003 +#: builtin/grep.c:785 msgid "search in both tracked and untracked files" msgstr "търсене и в следените, и в неследените файлове" -#: builtin/grep.c:1005 +#: builtin/grep.c:787 msgid "ignore files specified via '.gitignore'" msgstr "игнориране на файловете указани в „.gitignore“" -#: builtin/grep.c:1007 +#: builtin/grep.c:789 msgid "recursively search in each submodule" msgstr "рекурсивно търсене във всички подмодули" -#: builtin/grep.c:1009 -msgid "basename" -msgstr "ОСНОВНО ИМЕ" - -#: builtin/grep.c:1010 -msgid "prepend parent project's basename to output" -msgstr "добавяне на ОСНОВНОто ИМЕ на проекта към изхода" - -#: builtin/grep.c:1013 +#: builtin/grep.c:792 msgid "show non-matching lines" msgstr "извеждане на редовете, които не съвпадат" -#: builtin/grep.c:1015 +#: builtin/grep.c:794 msgid "case insensitive matching" msgstr "без значение на регистъра на буквите (главни/малки)" -#: builtin/grep.c:1017 +#: builtin/grep.c:796 msgid "match patterns only at word boundaries" msgstr "напасване на шаблоните само по границите на думите" -#: builtin/grep.c:1019 +#: builtin/grep.c:798 msgid "process binary files as text" msgstr "обработване на двоичните файлове като текстови" -#: builtin/grep.c:1021 +#: builtin/grep.c:800 msgid "don't match patterns in binary files" msgstr "прескачане на двоичните файлове" -#: builtin/grep.c:1024 +#: builtin/grep.c:803 msgid "process binary files with textconv filters" msgstr "" "обработване на двоичните файлове чрез филтри за преобразуване към текст" -#: builtin/grep.c:1026 +#: builtin/grep.c:805 msgid "descend at most <depth> levels" msgstr "навлизане максимално на тази ДЪЛБОЧИНА в дървото" -#: builtin/grep.c:1030 +#: builtin/grep.c:809 msgid "use extended POSIX regular expressions" msgstr "разширени регулярни изрази по POSIX" -#: builtin/grep.c:1033 +#: builtin/grep.c:812 msgid "use basic POSIX regular expressions (default)" msgstr "основни регулярни изрази по POSIX (стандартно)" -#: builtin/grep.c:1036 +#: builtin/grep.c:815 msgid "interpret patterns as fixed strings" msgstr "шаблоните са дословни низове" -#: builtin/grep.c:1039 +#: builtin/grep.c:818 msgid "use Perl-compatible regular expressions" msgstr "регулярни изрази на Perl" -#: builtin/grep.c:1042 +#: builtin/grep.c:821 msgid "show line numbers" msgstr "извеждане на номерата на редовете" -#: builtin/grep.c:1043 +#: builtin/grep.c:822 msgid "don't show filenames" msgstr "без извеждане на имената на файловете" -#: builtin/grep.c:1044 +#: builtin/grep.c:823 msgid "show filenames" msgstr "извеждане на имената на файловете" -#: builtin/grep.c:1046 +#: builtin/grep.c:825 msgid "show filenames relative to top directory" msgstr "" "извеждане на относителните имена на файловете спрямо основната директория на " "хранилището" -#: builtin/grep.c:1048 +#: builtin/grep.c:827 msgid "show only filenames instead of matching lines" msgstr "извеждане само на имената на файловете без напасващите редове" -#: builtin/grep.c:1050 +#: builtin/grep.c:829 msgid "synonym for --files-with-matches" msgstr "синоним на „--files-with-matches“" -#: builtin/grep.c:1053 +#: builtin/grep.c:832 msgid "show only the names of files without match" msgstr "" "извеждане само на имената на файловете, които не съдържат ред, напасващ на " "шаблона" -#: builtin/grep.c:1055 +#: builtin/grep.c:834 msgid "print NUL after filenames" msgstr "извеждане на нулевия знак „NUL“ след всяко име на файл" -#: builtin/grep.c:1057 +#: builtin/grep.c:836 msgid "show the number of matches instead of matching lines" msgstr "извеждане на броя на съвпаденията вместо напасващите редове" -#: builtin/grep.c:1058 +#: builtin/grep.c:837 msgid "highlight matches" msgstr "оцветяване на напасванията" -#: builtin/grep.c:1060 +#: builtin/grep.c:839 msgid "print empty line between matches from different files" msgstr "извеждане на празен ред между напасванията от различни файлове" -#: builtin/grep.c:1062 +#: builtin/grep.c:841 msgid "show filename only once above matches from same file" msgstr "" "извеждане на името на файла само веднъж за всички напасвания от този файл" -#: builtin/grep.c:1065 +#: builtin/grep.c:844 msgid "show <n> context lines before and after matches" msgstr "извеждане на такъв БРОЙ редове преди и след напасванията" -#: builtin/grep.c:1068 +#: builtin/grep.c:847 msgid "show <n> context lines before matches" msgstr "извеждане на такъв БРОЙ редове преди напасванията" -#: builtin/grep.c:1070 +#: builtin/grep.c:849 msgid "show <n> context lines after matches" msgstr "извеждане на такъв БРОЙ редове след напасванията" -#: builtin/grep.c:1072 +#: builtin/grep.c:851 msgid "use <n> worker threads" msgstr "използване на такъв БРОЙ работещи нишки" -#: builtin/grep.c:1073 +#: builtin/grep.c:852 msgid "shortcut for -C NUM" msgstr "синоним на „-C БРОЙ“" -#: builtin/grep.c:1076 +#: builtin/grep.c:855 msgid "show a line with the function name before matches" msgstr "извеждане на ред с името на функцията, в която е напаснат шаблона" -#: builtin/grep.c:1078 +#: builtin/grep.c:857 msgid "show the surrounding function" msgstr "извеждане на обхващащата функция" -#: builtin/grep.c:1081 +#: builtin/grep.c:860 msgid "read patterns from file" msgstr "изчитане на шаблоните от ФАЙЛ" -#: builtin/grep.c:1083 +#: builtin/grep.c:862 msgid "match <pattern>" msgstr "напасване на ШАБЛОН" -#: builtin/grep.c:1085 +#: builtin/grep.c:864 msgid "combine patterns specified with -e" msgstr "комбиниране на шаблоните указани с опцията „-e“" -#: builtin/grep.c:1097 +#: builtin/grep.c:876 msgid "indicate hit with exit status without output" msgstr "" "без извеждане на стандартния изход. Изходният код указва наличието на " "напасване" -#: builtin/grep.c:1099 +#: builtin/grep.c:878 msgid "show only matches from files that match all patterns" msgstr "" "извеждане на редове само от файловете, които напасват на всички шаблони" -#: builtin/grep.c:1101 +#: builtin/grep.c:880 msgid "show parse tree for grep expression" msgstr "извеждане на дървото за анализ на регулярния израз" -#: builtin/grep.c:1105 +#: builtin/grep.c:884 msgid "pager" msgstr "програма за преглед по страници" -#: builtin/grep.c:1105 +#: builtin/grep.c:884 msgid "show matching files in the pager" msgstr "извеждане на съвпадащите файлове в програма за преглед по страници" -#: builtin/grep.c:1108 +#: builtin/grep.c:887 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" "позволяване на стартирането на grep(1) (текущият компилат пренебрегва тази " "опция)" -#: builtin/grep.c:1172 +#: builtin/grep.c:950 msgid "no pattern given." msgstr "липсва шаблон." -#: builtin/grep.c:1204 +#: builtin/grep.c:982 msgid "--no-index or --untracked cannot be used with revs" msgstr "опциите „--cached“ и „--untracked“ са несъвместими с версии." -#: builtin/grep.c:1211 +#: builtin/grep.c:989 #, c-format msgid "unable to resolve revision: %s" msgstr "версията „%s“ не може бъде открита" -#: builtin/grep.c:1245 builtin/index-pack.c:1490 +#: builtin/grep.c:1023 builtin/index-pack.c:1491 #, c-format msgid "invalid number of threads specified (%d)" msgstr "зададен е неправилен брой нишки: %d" -#: builtin/grep.c:1250 +#: builtin/grep.c:1028 msgid "no threads support, ignoring --threads" msgstr "липсва поддръжка за нишки. „--threads“ ще се пренебрегне" -#: builtin/grep.c:1281 +#: builtin/grep.c:1052 msgid "--open-files-in-pager only works on the worktree" msgstr "" "опцията „--open-files-in-pager“ е съвместима само с търсене в работното дърво" -#: builtin/grep.c:1304 +#: builtin/grep.c:1075 msgid "option not supported with --recurse-submodules." msgstr "опцията е несъвместима с „--recurse-submodules“." -#: builtin/grep.c:1310 +#: builtin/grep.c:1081 msgid "--cached or --untracked cannot be used with --no-index." msgstr "опциите „--cached“ и „--untracked“ са несъвместими с „--no-index“." -#: builtin/grep.c:1316 +#: builtin/grep.c:1087 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" "опциите „--(no-)exclude-standard“ са несъвместими с търсене по следени " "файлове." -#: builtin/grep.c:1324 +#: builtin/grep.c:1095 msgid "both --cached and trees are given." msgstr "опцията „--cached“ е несъвместима със задаване на дърво." @@ -9097,12 +9218,12 @@ msgstr "Версията на „emacsclient“ не може да се анал msgid "emacsclient version '%d' too old (< 22)." msgstr "Прекалено стара версия на „emacsclient“ — %d (< 22)." -#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171 +#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173 #, c-format msgid "failed to exec '%s'" msgstr "неуспешно изпълнение на „%s“" -#: builtin/help.c:208 +#: builtin/help.c:211 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -9111,7 +9232,7 @@ msgstr "" "„%s“: път към неподдържана програма за преглед на\n" " ръководството. Вместо нея пробвайте „man.<tool>.cmd“." -#: builtin/help.c:220 +#: builtin/help.c:223 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -9120,366 +9241,366 @@ msgstr "" "„%s“: команда за поддържана програма за преглед на\n" " ръководството. Вместо нея пробвайте „man.<tool>.path“." -#: builtin/help.c:337 +#: builtin/help.c:340 #, c-format msgid "'%s': unknown man viewer." msgstr "„%s“: непозната програма за преглед на ръководството." -#: builtin/help.c:354 +#: builtin/help.c:357 msgid "no man viewer handled the request" msgstr "никоя програма за преглед на ръководство не успя да обработи заявката" -#: builtin/help.c:362 +#: builtin/help.c:365 msgid "no info viewer handled the request" msgstr "" "никоя програма за преглед на информационните страници не успя да обработи " "заявката" -#: builtin/help.c:404 +#: builtin/help.c:407 msgid "Defining attributes per path" msgstr "Указване на атрибути към път" -#: builtin/help.c:405 +#: builtin/help.c:408 msgid "Everyday Git With 20 Commands Or So" msgstr "Ежедневието в Git в рамките на 20-ина команди" -#: builtin/help.c:406 +#: builtin/help.c:409 msgid "A Git glossary" msgstr "Речник с термините на Git" -#: builtin/help.c:407 +#: builtin/help.c:410 msgid "Specifies intentionally untracked files to ignore" msgstr "Указване на неследени файлове, които да бъдат нарочно пренебрегвани" -#: builtin/help.c:408 +#: builtin/help.c:411 msgid "Defining submodule properties" msgstr "Дефиниране на свойствата на подмодулите" -#: builtin/help.c:409 +#: builtin/help.c:412 msgid "Specifying revisions and ranges for Git" msgstr "Указване на версии и диапазони в Git" -#: builtin/help.c:410 +#: builtin/help.c:413 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "Въвеждащ урок за Git (версии поне 1.5.1)" -#: builtin/help.c:411 +#: builtin/help.c:414 msgid "An overview of recommended workflows with Git" msgstr "Общ преглед на препоръчваните начини за работа с Git" -#: builtin/help.c:423 +#: builtin/help.c:426 msgid "The common Git guides are:\n" msgstr "Популярните пътеводители в Git са:\n" -#: builtin/help.c:441 +#: builtin/help.c:444 #, c-format -msgid "`git %s' is aliased to `%s'" -msgstr "„git %s“ е синоним на „%s“" +msgid "'%s' is aliased to '%s'" +msgstr "„%s“ е синоним на „%s“" -#: builtin/help.c:463 builtin/help.c:480 +#: builtin/help.c:466 builtin/help.c:483 #, c-format msgid "usage: %s%s" msgstr "употреба: %s%s" -#: builtin/index-pack.c:155 +#: builtin/index-pack.c:156 #, c-format msgid "unable to open %s" msgstr "обектът „%s“ не може да бъде отворен" -#: builtin/index-pack.c:205 +#: builtin/index-pack.c:206 #, c-format msgid "object type mismatch at %s" msgstr "неправилен вид на обекта „%s“" -#: builtin/index-pack.c:225 +#: builtin/index-pack.c:226 #, c-format msgid "did not receive expected object %s" msgstr "очакваният обект „%s“ не бе получен" -#: builtin/index-pack.c:228 +#: builtin/index-pack.c:229 #, c-format msgid "object %s: expected type %s, found %s" msgstr "неправилен вид на обекта „%s“: очакваше се „%s“, а бе получен „%s“" -#: builtin/index-pack.c:270 +#: builtin/index-pack.c:271 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "не може да се запълни %d байт" msgstr[1] "не може да се запълнят %d байта" -#: builtin/index-pack.c:280 +#: builtin/index-pack.c:281 msgid "early EOF" msgstr "неочакван край на файл" -#: builtin/index-pack.c:281 +#: builtin/index-pack.c:282 msgid "read error on input" msgstr "грешка при четене на входните данни" -#: builtin/index-pack.c:293 +#: builtin/index-pack.c:294 msgid "used more bytes than were available" msgstr "използвани са повече от наличните байтове" -#: builtin/index-pack.c:300 +#: builtin/index-pack.c:301 msgid "pack too large for current definition of off_t" msgstr "пакетният файл е прекалено голям за текущата стойност на типа „off_t“" -#: builtin/index-pack.c:303 builtin/unpack-objects.c:93 +#: builtin/index-pack.c:304 builtin/unpack-objects.c:93 msgid "pack exceeds maximum allowed size" msgstr "пакетният файл надвишава максималния възможен размер" -#: builtin/index-pack.c:318 +#: builtin/index-pack.c:319 #, c-format msgid "unable to create '%s'" msgstr "пакетният файл „%s“ не може да бъде създаден" -#: builtin/index-pack.c:324 +#: builtin/index-pack.c:325 #, c-format msgid "cannot open packfile '%s'" msgstr "пакетният файл „%s“ не може да бъде отворен" -#: builtin/index-pack.c:338 +#: builtin/index-pack.c:339 msgid "pack signature mismatch" msgstr "несъответствие в подписа към пакетния файл" -#: builtin/index-pack.c:340 +#: builtin/index-pack.c:341 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "не се поддържа пакетиране вeрсия „%<PRIu32>“" -#: builtin/index-pack.c:358 +#: builtin/index-pack.c:359 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "повреден обект в пакетния файл при отместване %<PRIuMAX>: %s" -#: builtin/index-pack.c:479 +#: builtin/index-pack.c:480 #, c-format msgid "inflate returned %d" msgstr "декомпресирането с „inflate“ върна %d" -#: builtin/index-pack.c:528 +#: builtin/index-pack.c:529 msgid "offset value overflow for delta base object" msgstr "стойността на отместването за обекта-разлика води до препълване" -#: builtin/index-pack.c:536 +#: builtin/index-pack.c:537 msgid "delta base offset is out of bound" msgstr "стойността на отместването за обекта-разлика е извън диапазона" -#: builtin/index-pack.c:544 +#: builtin/index-pack.c:545 #, c-format msgid "unknown object type %d" msgstr "непознат вид обект %d" -#: builtin/index-pack.c:575 +#: builtin/index-pack.c:576 msgid "cannot pread pack file" msgstr "пакетният файл не може да бъде прочетен" -#: builtin/index-pack.c:577 +#: builtin/index-pack.c:578 #, 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:603 +#: builtin/index-pack.c:604 msgid "serious inflate inconsistency" msgstr "сериозна грешка при декомпресиране с „inflate“" -#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777 -#: builtin/index-pack.c:816 builtin/index-pack.c:825 +#: 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 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" "СЪВПАДЕНИЕ НА СТОЙНОСТИТЕ ЗА СУМИТЕ ЗА SHA1: „%s“ НА ДВА РАЗЛИЧНИ ОБЕКТА!" -#: builtin/index-pack.c:751 builtin/pack-objects.c:167 -#: builtin/pack-objects.c:261 +#: builtin/index-pack.c:752 builtin/pack-objects.c:168 +#: builtin/pack-objects.c:262 #, c-format msgid "unable to read %s" msgstr "обектът „%s“ не може да бъде прочетен" -#: builtin/index-pack.c:814 +#: builtin/index-pack.c:815 #, c-format msgid "cannot read existing object info %s" msgstr "съществуващият обект в „%s“ не може да бъде прочетен" -#: builtin/index-pack.c:822 +#: builtin/index-pack.c:823 #, c-format msgid "cannot read existing object %s" msgstr "съществуващият обект „%s“ не може да бъде прочетен" -#: builtin/index-pack.c:836 +#: builtin/index-pack.c:837 #, c-format msgid "invalid blob object %s" msgstr "неправилен обект BLOB „%s“" # FIXME perhaps invalid object -#: builtin/index-pack.c:851 +#: builtin/index-pack.c:852 #, c-format msgid "invalid %s" msgstr "неправилен обект „%s“" -#: builtin/index-pack.c:854 +#: builtin/index-pack.c:855 msgid "Error in object" msgstr "Грешка в обекта" -#: builtin/index-pack.c:856 +#: builtin/index-pack.c:857 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Някои обекти, наследници на „%s“, не могат да бъдат достигнати" -#: builtin/index-pack.c:928 builtin/index-pack.c:959 +#: builtin/index-pack.c:929 builtin/index-pack.c:960 msgid "failed to apply delta" msgstr "разликата не може да бъде приложена" -#: builtin/index-pack.c:1130 +#: builtin/index-pack.c:1131 msgid "Receiving objects" msgstr "Получаване на обекти" -#: builtin/index-pack.c:1130 +#: builtin/index-pack.c:1131 msgid "Indexing objects" msgstr "Индексиране на обекти" -#: builtin/index-pack.c:1164 +#: builtin/index-pack.c:1165 msgid "pack is corrupted (SHA1 mismatch)" msgstr "пакетният файл е повреден (нееднакви суми по SHA1)" -#: builtin/index-pack.c:1169 +#: builtin/index-pack.c:1170 msgid "cannot fstat packfile" msgstr "не може да се получи информация за пакетния файл с „fstat“" -#: builtin/index-pack.c:1172 +#: builtin/index-pack.c:1173 msgid "pack has junk at the end" msgstr "в края на пакетния файл има повредени данни" -#: builtin/index-pack.c:1184 +#: builtin/index-pack.c:1185 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "" "фатална грешка във функцията „parse_pack_objects“. Това е грешка в Git, " "докладвайте я на разработчиците, като пратите е-писмо на адрес: „git@vger." "kernel.org“." -#: builtin/index-pack.c:1207 +#: builtin/index-pack.c:1208 msgid "Resolving deltas" msgstr "Откриване на съответните разлики" -#: builtin/index-pack.c:1218 +#: builtin/index-pack.c:1219 #, c-format msgid "unable to create thread: %s" msgstr "не може да се създаде нишка: %s" -#: builtin/index-pack.c:1260 +#: builtin/index-pack.c:1261 msgid "confusion beyond insanity" msgstr "" "фатална грешка във функцията „conclude_pack“. Това е грешка в Git, " "докладвайте я на разработчиците, като пратите е-писмо на адрес: „git@vger." "kernel.org“." -#: builtin/index-pack.c:1266 +#: builtin/index-pack.c:1267 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "действието завърши с %d локален обект" msgstr[1] "действието завърши с %d локални обекта" -#: builtin/index-pack.c:1278 +#: builtin/index-pack.c:1279 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" "Неочаквана последваща сума за грешки за „%s“ (причината може да е грешка в " "диска)" -#: builtin/index-pack.c:1282 +#: builtin/index-pack.c:1283 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "в пакета има %d ненапасваща разлика" msgstr[1] "в пакета има %d ненапасващи разлики" -#: builtin/index-pack.c:1306 +#: builtin/index-pack.c:1307 #, c-format msgid "unable to deflate appended object (%d)" msgstr "добавеният обект не може да се компресира с „deflate“: %d" -#: builtin/index-pack.c:1382 +#: builtin/index-pack.c:1383 #, c-format msgid "local object %s is corrupt" msgstr "локалният обект „%s“ е повреден" -#: builtin/index-pack.c:1408 +#: builtin/index-pack.c:1409 msgid "error while closing pack file" msgstr "грешка при затварянето на пакетния файл" -#: builtin/index-pack.c:1420 +#: builtin/index-pack.c:1421 #, c-format msgid "cannot write keep file '%s'" msgstr "" "грешка при записването на файла „%s“, осигуряващ запазване на директория" -#: builtin/index-pack.c:1428 +#: builtin/index-pack.c:1429 #, c-format msgid "cannot close written keep file '%s'" msgstr "" "грешка при затварянето на записания файл „%s“, осигуряващ запазване на " "директория" -#: builtin/index-pack.c:1438 +#: builtin/index-pack.c:1439 msgid "cannot store pack file" msgstr "пакетният файл не може да бъде запазен" -#: builtin/index-pack.c:1446 +#: builtin/index-pack.c:1447 msgid "cannot store index file" msgstr "файлът за индекса не може да бъде съхранен" -#: builtin/index-pack.c:1484 +#: builtin/index-pack.c:1485 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "зададена е неправилна версия пакетиране: „pack.indexversion=%<PRIu32>“" -#: builtin/index-pack.c:1552 +#: builtin/index-pack.c:1553 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Съществуващият пакетен файл „%s“ не може да бъде отворен" -#: builtin/index-pack.c:1554 +#: builtin/index-pack.c:1555 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Съществуващият индекс за пакетния файл „%s“ не може да бъде отворен" -#: builtin/index-pack.c:1602 +#: builtin/index-pack.c:1603 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "%d обект не е разлика" msgstr[1] "%d обекта не са разлика" -#: builtin/index-pack.c:1609 +#: builtin/index-pack.c:1610 #, 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:1622 +#: builtin/index-pack.c:1623 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "името на пакетния файл „%s“ не завършва на „.pack“" -#: builtin/index-pack.c:1704 builtin/index-pack.c:1707 -#: builtin/index-pack.c:1723 builtin/index-pack.c:1727 +#: builtin/index-pack.c:1705 builtin/index-pack.c:1708 +#: builtin/index-pack.c:1724 builtin/index-pack.c:1728 #, c-format msgid "bad %s" msgstr "неправилна стойност „%s“" -#: builtin/index-pack.c:1743 +#: builtin/index-pack.c:1744 msgid "--fix-thin cannot be used without --stdin" msgstr "опцията „--fix-thin“ изисква „--stdin“" -#: builtin/index-pack.c:1745 +#: builtin/index-pack.c:1746 msgid "--stdin requires a git repository" msgstr "„--stdin“ изисква хранилище на git" -#: builtin/index-pack.c:1753 +#: builtin/index-pack.c:1754 msgid "--verify with no packfile name given" msgstr "опцията „--verify“ изисква име на пакетен файл" @@ -9614,136 +9735,168 @@ msgstr "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " "ЛЕКСЕМА[(=|:)СТОЙНОСТ])…] [ФАЙЛ…]" -#: builtin/interpret-trailers.c:26 +#: builtin/interpret-trailers.c:92 msgid "edit files in place" msgstr "директно редактиране на файловете" -#: builtin/interpret-trailers.c:27 +#: builtin/interpret-trailers.c:93 msgid "trim empty trailers" msgstr "изчистване на празните епилози" -#: builtin/interpret-trailers.c:28 +#: builtin/interpret-trailers.c:96 +msgid "where to place the new trailer" +msgstr "къде да се постави новият епилог" + +#: builtin/interpret-trailers.c:98 +msgid "action if trailer already exists" +msgstr "действие, ако епилог вече съществува" + +#: builtin/interpret-trailers.c:100 +msgid "action if trailer is missing" +msgstr "действи при липсващ епилог" + +#: builtin/interpret-trailers.c:102 +msgid "output only the trailers" +msgstr "извеждане само на епилозите" + +#: builtin/interpret-trailers.c:103 +msgid "do not apply config rules" +msgstr "без прилагане на правилата за настройките" + +#: builtin/interpret-trailers.c:104 +msgid "join whitespace-continued values" +msgstr "сливане на стойностите последване от знаци за интервали" + +#: builtin/interpret-trailers.c:105 +msgid "set parsing options" +msgstr "опции при анализ" + +#: builtin/interpret-trailers.c:107 msgid "trailer" msgstr "епилог" -#: builtin/interpret-trailers.c:29 +#: builtin/interpret-trailers.c:108 msgid "trailer(s) to add" msgstr "епилог(зи) за добавяне" -#: builtin/interpret-trailers.c:42 +#: builtin/interpret-trailers.c:117 +msgid "--trailer with --only-input does not make sense" +msgstr "опцията „--trailer“ е несъвместима с „--name-only“" + +#: builtin/interpret-trailers.c:127 msgid "no input file given for in-place editing" msgstr "не е зададен входен файл за редактиране на място" -#: builtin/log.c:45 +#: builtin/log.c:46 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [ОПЦИЯ…] [ДИАПАЗОН_НА_ВЕРСИИТЕ] [[--] ПЪТ…]" -#: builtin/log.c:46 +#: builtin/log.c:47 msgid "git show [<options>] <object>..." msgstr "git show [ОПЦИЯ…] ОБЕКТ…" -#: builtin/log.c:90 +#: builtin/log.c:91 #, c-format msgid "invalid --decorate option: %s" msgstr "неправилна опция „--decorate“: %s" -#: builtin/log.c:147 +#: builtin/log.c:148 msgid "suppress diff output" msgstr "без извеждане на разликите" -#: builtin/log.c:148 +#: builtin/log.c:149 msgid "show source" msgstr "извеждане на изходния код" -#: builtin/log.c:149 +#: builtin/log.c:150 msgid "Use mail map file" msgstr "" "Използване на файл за съответствията на имената и адресите на е-поща („." "mailmap“)" -#: builtin/log.c:150 +#: builtin/log.c:151 msgid "decorate options" msgstr "настройки на форма̀та на извежданата информация" -#: builtin/log.c:153 +#: builtin/log.c:154 msgid "Process line range n,m in file, counting from 1" msgstr "" "Обработване само на редовете във файла в диапазона от n до m включително. " "Броенето започва от 1" -#: builtin/log.c:249 +#: builtin/log.c:250 #, c-format msgid "Final output: %d %s\n" msgstr "Резултат: %d %s\n" -#: builtin/log.c:497 +#: builtin/log.c:501 #, c-format msgid "git show %s: bad file" msgstr "git show %s: повреден файл" -#: builtin/log.c:512 builtin/log.c:606 +#: builtin/log.c:516 builtin/log.c:610 #, c-format msgid "Could not read object %s" msgstr "Обектът не може да бъде прочетен: %s" -#: builtin/log.c:630 +#: builtin/log.c:634 #, c-format msgid "Unknown type: %d" msgstr "Неизвестен вид: %d" -#: builtin/log.c:751 +#: builtin/log.c:755 msgid "format.headers without value" msgstr "не е зададена стойност на „format.headers“" -#: builtin/log.c:852 +#: builtin/log.c:856 msgid "name of output directory is too long" msgstr "прекалено дълго име на директорията за изходната информация" -#: builtin/log.c:868 +#: builtin/log.c:872 #, c-format msgid "Cannot open patch file %s" msgstr "Файлът-кръпка „%s“ не може да бъде отворен" -#: builtin/log.c:885 +#: builtin/log.c:889 msgid "Need exactly one range." msgstr "Трябва да зададете точно един диапазон." -#: builtin/log.c:895 +#: builtin/log.c:899 msgid "Not a range." msgstr "Не е диапазон." -#: builtin/log.c:1001 +#: builtin/log.c:1005 msgid "Cover letter needs email format" msgstr "Придружаващото писмо трябва да е форматирано като е-писмо" -#: builtin/log.c:1081 +#: builtin/log.c:1085 #, c-format msgid "insane in-reply-to: %s" msgstr "неправилен формат на заглавната част за отговор „in-reply-to“: %s" -#: builtin/log.c:1108 +#: builtin/log.c:1112 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [ОПЦИЯ…] [ОТ | ДИАПАЗОН_НА_ВЕРСИИТЕ]" -#: builtin/log.c:1158 +#: builtin/log.c:1162 msgid "Two output directories?" msgstr "Можете да укажете максимум една директория за изход." -#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922 +#: builtin/log.c:1269 builtin/log.c:1920 builtin/log.c:1922 builtin/log.c:1934 #, c-format msgid "Unknown commit %s" msgstr "Непознато подаване „%s“" -#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533 +#: builtin/log.c:1279 builtin/notes.c:887 builtin/tag.c:516 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Не може да се открие към какво сочи „%s“." -#: builtin/log.c:1280 +#: builtin/log.c:1284 msgid "Could not find exact merge base." msgstr "Точната база за сливане не може да се открие." -#: builtin/log.c:1284 +#: builtin/log.c:1288 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" @@ -9753,226 +9906,234 @@ msgstr "" "зададете, използвайте „git branch --set-upstream-to“.\n" "Можете ръчно да зададете базово подаване чрез „--base=<base-commit-id>“." -#: builtin/log.c:1304 +#: builtin/log.c:1308 msgid "Failed to find exact merge base" msgstr "Точната база при сливане не може да бъде открита" -#: builtin/log.c:1315 +#: builtin/log.c:1319 msgid "base commit should be the ancestor of revision list" msgstr "базовото подаване трябва да е предшественикът на списъка с версиите" -#: builtin/log.c:1319 +#: builtin/log.c:1323 msgid "base commit shouldn't be in revision list" msgstr "базовото подаване не може да е в списъка с версиите" -#: builtin/log.c:1368 +#: builtin/log.c:1372 msgid "cannot get patch id" msgstr "идентификаторът на кръпката не може да бъде получен" -#: builtin/log.c:1425 +#: builtin/log.c:1431 msgid "use [PATCH n/m] even with a single patch" msgstr "номерация „[PATCH n/m]“ дори и при единствена кръпка" -#: builtin/log.c:1428 +#: builtin/log.c:1434 msgid "use [PATCH] even with multiple patches" msgstr "номерация „[PATCH]“ дори и при множество кръпки" -#: builtin/log.c:1432 +#: builtin/log.c:1438 msgid "print patches to standard out" msgstr "извеждане на кръпките на стандартния изход" -#: builtin/log.c:1434 +#: builtin/log.c:1440 msgid "generate a cover letter" msgstr "създаване на придружаващо писмо" -#: builtin/log.c:1436 +#: builtin/log.c:1442 msgid "use simple number sequence for output file names" msgstr "проста числова последователност за имената на файловете-кръпки" -#: builtin/log.c:1437 +#: builtin/log.c:1443 msgid "sfx" msgstr "ЗНАЦИ" -#: builtin/log.c:1438 +#: builtin/log.c:1444 msgid "use <sfx> instead of '.patch'" msgstr "използване на тези ЗНАЦИ за суфикс вместо „.patch“" -#: builtin/log.c:1440 +#: builtin/log.c:1446 msgid "start numbering patches at <n> instead of 1" msgstr "номерирането на кръпките да започва от този БРОЙ, а не с 1" -#: builtin/log.c:1442 +#: builtin/log.c:1448 msgid "mark the series as Nth re-roll" msgstr "отбелязване, че това е N-тата поредна редакция на поредицата от кръпки" -#: builtin/log.c:1444 +#: builtin/log.c:1450 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Използване на „[RFC PATCH]“ вместо „[PATCH]“" -#: builtin/log.c:1447 +#: builtin/log.c:1453 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Използване на този „[ПРЕФИКС]“ вместо „[PATCH]“" -#: builtin/log.c:1450 +#: builtin/log.c:1456 msgid "store resulting files in <dir>" msgstr "запазване на изходните файлове в тази ДИРЕКТОРИЯ" -#: builtin/log.c:1453 +#: builtin/log.c:1459 msgid "don't strip/add [PATCH]" msgstr "без добавяне/махане на префикса „[PATCH]“" -#: builtin/log.c:1456 +#: builtin/log.c:1462 msgid "don't output binary diffs" msgstr "без извеждане на разлики между двоични файлове" -#: builtin/log.c:1458 +#: builtin/log.c:1464 msgid "output all-zero hash in From header" msgstr "в заглавната част „From:“ (от) хешът да е само от нули" -#: builtin/log.c:1460 +#: builtin/log.c:1466 msgid "don't include a patch matching a commit upstream" msgstr "да не се включват кръпки, които присъстват в следения клон" -#: builtin/log.c:1462 +#: builtin/log.c:1468 msgid "show patch format instead of default (patch + stat)" msgstr "" "извеждане във формат за кръпки, а на в стандартния (кръпка и статистика)" -#: builtin/log.c:1464 +#: builtin/log.c:1470 msgid "Messaging" msgstr "Опции при изпращане" -#: builtin/log.c:1465 +#: builtin/log.c:1471 msgid "header" msgstr "ЗАГЛАВНА_ЧАСТ" -#: builtin/log.c:1466 +#: builtin/log.c:1472 msgid "add email header" msgstr "добавяне на тази ЗАГЛАВНА_ЧАСТ" -#: builtin/log.c:1467 builtin/log.c:1469 +#: builtin/log.c:1473 builtin/log.c:1475 msgid "email" msgstr "Е-ПОЩА" -#: builtin/log.c:1467 +#: builtin/log.c:1473 msgid "add To: header" msgstr "добавяне на заглавна част „To:“ (до)" -#: builtin/log.c:1469 +#: builtin/log.c:1475 msgid "add Cc: header" msgstr "добавяне на заглавна част „Cc:“ (и до)" -#: builtin/log.c:1471 +#: builtin/log.c:1477 msgid "ident" msgstr "ИДЕНТИЧНОСТ" -#: builtin/log.c:1472 +#: builtin/log.c:1478 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "задаване на адреса в заглавната част „From“ (от) да е тази ИДЕНТИЧНОСТ. Ако " "не е зададена такава, се взима адреса на подаващия" -#: builtin/log.c:1474 +#: builtin/log.c:1480 msgid "message-id" msgstr "ИДЕНТИФИКАТОР_НА_СЪОБЩЕНИЕ" -#: builtin/log.c:1475 +#: builtin/log.c:1481 msgid "make first mail a reply to <message-id>" msgstr "" "първото съобщение да е в отговор на е-писмото с този " "ИДЕНТИФИКАТОР_НА_СЪОБЩЕНИЕ" -#: builtin/log.c:1476 builtin/log.c:1479 +#: builtin/log.c:1482 builtin/log.c:1485 msgid "boundary" msgstr "граница" -#: builtin/log.c:1477 +#: builtin/log.c:1483 msgid "attach the patch" msgstr "прикрепяне на кръпката" -#: builtin/log.c:1480 +#: builtin/log.c:1486 msgid "inline the patch" msgstr "включване на кръпката в текста на писмата" -#: builtin/log.c:1484 +#: builtin/log.c:1490 msgid "enable message threading, styles: shallow, deep" msgstr "" "използване на нишки за съобщенията. СТИЛът е „shallow“ (плитък) или " "„deep“ (дълбок)" -#: builtin/log.c:1486 +#: builtin/log.c:1492 msgid "signature" msgstr "подпис" -#: builtin/log.c:1487 +#: builtin/log.c:1493 msgid "add a signature" msgstr "добавяне на поле за подпис" -#: builtin/log.c:1488 +#: builtin/log.c:1494 msgid "base-commit" msgstr "БАЗОВО_ПОДАВАНЕ" -#: builtin/log.c:1489 +#: builtin/log.c:1495 msgid "add prerequisite tree info to the patch series" msgstr "добавяне на необходимото БАЗово дърво към серията кръпки" -#: builtin/log.c:1491 +#: builtin/log.c:1497 msgid "add a signature from a file" msgstr "добавяне на подпис от файл" -#: builtin/log.c:1492 +#: builtin/log.c:1498 msgid "don't print the patch filenames" msgstr "без извеждане на имената на кръпките" -#: builtin/log.c:1567 +#: builtin/log.c:1500 +msgid "show progress while generating patches" +msgstr "извеждане на напредъка във фазата на създаване на кръпките" + +#: builtin/log.c:1575 #, c-format msgid "invalid ident line: %s" msgstr "грешна идентичност: %s" -#: builtin/log.c:1582 +#: builtin/log.c:1590 msgid "-n and -k are mutually exclusive." msgstr "опциите „-n“ и „-k“ са несъвместими." -#: builtin/log.c:1584 +#: builtin/log.c:1592 msgid "--subject-prefix/--rfc and -k are mutually exclusive." msgstr "опциите „--subject-prefix“/„-rfc“ и „-k“ са несъвместими." -#: builtin/log.c:1592 +#: builtin/log.c:1600 msgid "--name-only does not make sense" msgstr "опцията „--name-only“ е несъвместима с генерирането на кръпки" -#: builtin/log.c:1594 +#: builtin/log.c:1602 msgid "--name-status does not make sense" msgstr "опцията „--name-status“ е несъвместима с генерирането на кръпки" -#: builtin/log.c:1596 +#: builtin/log.c:1604 msgid "--check does not make sense" msgstr "опцията „--check“ е несъвместима с генерирането на кръпки" -#: builtin/log.c:1626 +#: builtin/log.c:1634 msgid "standard output, or directory, which one?" msgstr "" "изходът може да или стандартният, или да е в директория, но не и двете." -#: builtin/log.c:1628 +#: builtin/log.c:1636 #, c-format msgid "Could not create directory '%s'" msgstr "Директорията „%s“ не може да бъде създадена" -#: builtin/log.c:1722 +#: builtin/log.c:1729 #, c-format msgid "unable to read signature file '%s'" msgstr "файлът „%s“ с подпис не може да бъде прочетен" -#: builtin/log.c:1794 +#: builtin/log.c:1761 +msgid "Generating patches" +msgstr "Създаване на кръпки" + +#: builtin/log.c:1805 msgid "Failed to create output files" msgstr "Изходните файлове не могат да бъдат създадени" -#: builtin/log.c:1843 +#: builtin/log.c:1855 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [ОТДАЛЕЧЕН_КЛОН [ВРЪХ [ПРЕДЕЛ]]]" -#: builtin/log.c:1897 +#: builtin/log.c:1909 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -9980,105 +10141,105 @@ msgstr "" "Следеният отдалечен клон не бе открит, затова изрично задайте " "ОТДАЛЕЧЕН_КЛОН.\n" -#: builtin/ls-files.c:468 +#: builtin/ls-files.c:466 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [ОПЦИЯ…] [ФАЙЛ…]" -#: builtin/ls-files.c:517 +#: builtin/ls-files.c:515 msgid "identify the file status with tags" msgstr "извеждане на състоянието на файловете с еднобуквени флагове" -#: builtin/ls-files.c:519 +#: builtin/ls-files.c:517 msgid "use lowercase letters for 'assume unchanged' files" msgstr "малки букви за файловете, които да се счетат за непроменени" -#: builtin/ls-files.c:521 +#: builtin/ls-files.c:519 msgid "show cached files in the output (default)" msgstr "извеждане на кешираните файлове (стандартно)" -#: builtin/ls-files.c:523 +#: builtin/ls-files.c:521 msgid "show deleted files in the output" msgstr "извеждане на изтритите файлове" -#: builtin/ls-files.c:525 +#: builtin/ls-files.c:523 msgid "show modified files in the output" msgstr "извеждане на променените файлове" -#: builtin/ls-files.c:527 +#: builtin/ls-files.c:525 msgid "show other files in the output" msgstr "извеждане на другите файлове" -#: builtin/ls-files.c:529 +#: builtin/ls-files.c:527 msgid "show ignored files in the output" msgstr "извеждане на игнорираните файлове" -#: builtin/ls-files.c:532 +#: builtin/ls-files.c:530 msgid "show staged contents' object name in the output" msgstr "извеждане на името на обекта за съдържанието на индекса" -#: builtin/ls-files.c:534 +#: builtin/ls-files.c:532 msgid "show files on the filesystem that need to be removed" msgstr "извеждане на файловете, които трябва да бъдат изтрити" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:534 msgid "show 'other' directories' names only" msgstr "извеждане само на името на другите (неследените) директории" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:536 msgid "show line endings of files" msgstr "извеждане на знаците за край на ред във файловете" -#: builtin/ls-files.c:540 +#: builtin/ls-files.c:538 msgid "don't show empty directories" msgstr "без извеждане на празните директории" -#: builtin/ls-files.c:543 +#: builtin/ls-files.c:541 msgid "show unmerged files in the output" msgstr "извеждане на неслетите файлове" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:543 msgid "show resolve-undo information" msgstr "извеждане на информацията за отмяна на разрешените подавания" -#: builtin/ls-files.c:547 +#: builtin/ls-files.c:545 msgid "skip files matching pattern" msgstr "прескачане на файловете напасващи ШАБЛОНа" -#: builtin/ls-files.c:550 +#: builtin/ls-files.c:548 msgid "exclude patterns are read from <file>" msgstr "шаблоните за игнориране да се прочетат от този ФАЙЛ" -#: builtin/ls-files.c:553 +#: builtin/ls-files.c:551 msgid "read additional per-directory exclude patterns in <file>" msgstr "" "изчитане на допълнителните шаблони за игнориране по директория от този ФАЙЛ" -#: builtin/ls-files.c:555 +#: builtin/ls-files.c:553 msgid "add the standard git exclusions" msgstr "добавяне на стандартно игнорираните от Git файлове" -#: builtin/ls-files.c:558 +#: builtin/ls-files.c:556 msgid "make the output relative to the project top directory" msgstr "пътищата да са относителни спрямо основната директория на проекта" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:559 msgid "recurse through submodules" msgstr "рекурсивно обхождане подмодулите" -#: builtin/ls-files.c:563 +#: builtin/ls-files.c:561 msgid "if any <file> is not in the index, treat this as an error" msgstr "грешка, ако някой от тези ФАЙЛове не е в индекса" -#: builtin/ls-files.c:564 +#: builtin/ls-files.c:562 msgid "tree-ish" msgstr "УКАЗАТЕЛ_КЪМ_ДЪРВО" -#: builtin/ls-files.c:565 +#: builtin/ls-files.c:563 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "считане, че пътищата изтрити след УКАЗАТЕЛя_КЪМ_ДЪРВО все още съществуват" -#: builtin/ls-files.c:567 +#: builtin/ls-files.c:565 msgid "show debugging data" msgstr "извеждане на информацията за изчистване на грешки" @@ -10171,181 +10332,186 @@ msgstr "" msgid "empty mbox: '%s'" msgstr "празна пощенска кутия mbox: „%s“" -#: builtin/merge.c:47 +#: builtin/merge.c:48 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [ОПЦИЯ…] [ПОДАВАНЕ…]" -#: builtin/merge.c:48 +#: builtin/merge.c:49 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:49 +#: builtin/merge.c:50 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:104 +#: builtin/merge.c:107 msgid "switch `m' requires a value" msgstr "опцията „-m“ изисква стойност" -#: builtin/merge.c:141 +#: builtin/merge.c:144 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Няма такава стратегия за сливане: „%s“.\n" -#: builtin/merge.c:142 +#: builtin/merge.c:145 #, c-format msgid "Available strategies are:" msgstr "Наличните стратегии са:" -#: builtin/merge.c:147 +#: builtin/merge.c:150 #, c-format msgid "Available custom strategies are:" msgstr "Допълнителните стратегии са:" -#: builtin/merge.c:197 builtin/pull.c:134 +#: builtin/merge.c:200 builtin/pull.c:134 msgid "do not show a diffstat at the end of the merge" msgstr "без извеждане на статистиката след завършване на сливане" -#: builtin/merge.c:200 builtin/pull.c:137 +#: builtin/merge.c:203 builtin/pull.c:137 msgid "show a diffstat at the end of the merge" msgstr "извеждане на статистиката след завършване на сливане" -#: builtin/merge.c:201 builtin/pull.c:140 +#: builtin/merge.c:204 builtin/pull.c:140 msgid "(synonym to --stat)" msgstr "(синоним на „--stat“)" -#: builtin/merge.c:203 builtin/pull.c:143 +#: builtin/merge.c:206 builtin/pull.c:143 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "добавяне (на максимум такъв БРОЙ) записи от съкратения журнал в съобщението " "за подаване" -#: builtin/merge.c:206 builtin/pull.c:146 +#: builtin/merge.c:209 builtin/pull.c:146 msgid "create a single commit instead of doing a merge" msgstr "създаване на едно подаване вместо извършване на сливане" -#: builtin/merge.c:208 builtin/pull.c:149 +#: builtin/merge.c:211 builtin/pull.c:149 msgid "perform a commit if the merge succeeds (default)" msgstr "извършване на подаване при успешно сливане (стандартно действие)" -#: builtin/merge.c:210 builtin/pull.c:152 +#: builtin/merge.c:213 builtin/pull.c:152 msgid "edit message before committing" msgstr "редактиране на съобщението преди подаване" -#: builtin/merge.c:211 +#: builtin/merge.c:214 msgid "allow fast-forward (default)" msgstr "позволяване на превъртане (стандартно действие)" -#: builtin/merge.c:213 builtin/pull.c:158 +#: builtin/merge.c:216 builtin/pull.c:158 msgid "abort if fast-forward is not possible" msgstr "преустановяване, ако превъртането е невъзможно" -#: builtin/merge.c:217 builtin/pull.c:161 +#: builtin/merge.c:220 builtin/pull.c:161 msgid "verify that the named commit has a valid GPG signature" msgstr "проверка, че указаното подаване е с правилен подпис на GPG" -#: builtin/merge.c:218 builtin/notes.c:776 builtin/pull.c:165 +#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:165 #: builtin/revert.c:109 msgid "strategy" msgstr "СТРАТЕГИЯ" -#: builtin/merge.c:219 builtin/pull.c:166 +#: builtin/merge.c:222 builtin/pull.c:166 msgid "merge strategy to use" msgstr "СТРАТЕГИЯ за сливане, която да се ползва" -#: builtin/merge.c:220 builtin/pull.c:169 +#: builtin/merge.c:223 builtin/pull.c:169 msgid "option=value" msgstr "ОПЦИЯ=СТОЙНОСТ" -#: builtin/merge.c:221 builtin/pull.c:170 +#: builtin/merge.c:224 builtin/pull.c:170 msgid "option for selected merge strategy" msgstr "ОПЦИЯ за избраната стратегия за сливане" -#: builtin/merge.c:223 +#: builtin/merge.c:226 msgid "merge commit message (for a non-fast-forward merge)" msgstr "СЪОБЩЕНИЕ при подаването със сливане (при същински сливания)" -#: builtin/merge.c:227 +#: builtin/merge.c:230 msgid "abort the current in-progress merge" msgstr "преустановяване на текущото сливане" -#: builtin/merge.c:229 +#: builtin/merge.c:232 msgid "continue the current in-progress merge" msgstr "продължаване на текущото сливане" -#: builtin/merge.c:231 builtin/pull.c:177 +#: builtin/merge.c:234 builtin/pull.c:177 msgid "allow merging unrelated histories" msgstr "позволяване на сливане на независими истории" -#: builtin/merge.c:259 +#: builtin/merge.c:240 +msgid "verify commit-msg hook" +msgstr "" +"проверка на куката при промяна на съобщението при подаване (commit-msg)" + +#: builtin/merge.c:265 msgid "could not run stash." msgstr "не може да се извърши скатаване" -#: builtin/merge.c:264 +#: builtin/merge.c:270 msgid "stash failed" msgstr "неуспешно скатаване" -#: builtin/merge.c:269 +#: builtin/merge.c:275 #, c-format msgid "not a valid object: %s" msgstr "неправилен обект: „%s“" -#: builtin/merge.c:288 builtin/merge.c:305 +#: builtin/merge.c:297 builtin/merge.c:314 msgid "read-tree failed" msgstr "неуспешно прочитане на обект-дърво" -#: builtin/merge.c:335 +#: builtin/merge.c:344 msgid " (nothing to squash)" msgstr " (няма какво да се смачка)" -#: builtin/merge.c:346 +#: builtin/merge.c:355 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Подаване със смачкване — указателят „HEAD“ няма да бъде обновен\n" -#: builtin/merge.c:396 +#: builtin/merge.c:405 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" "Липсва съобщение при подаване — указателят „HEAD“ няма да бъде обновен\n" -#: builtin/merge.c:447 +#: builtin/merge.c:456 #, c-format msgid "'%s' does not point to a commit" msgstr "„%s“ не сочи към подаване" -#: builtin/merge.c:537 +#: builtin/merge.c:546 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Неправилен низ за настройката „branch.%s.mergeoptions“: „%s“" -#: builtin/merge.c:657 +#: builtin/merge.c:666 msgid "Not handling anything other than two heads merge." msgstr "Поддържа се само сливане на точно две истории." -#: builtin/merge.c:671 +#: builtin/merge.c:680 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Непозната опция за рекурсивното сливане „merge-recursive“: „-X%s“" -#: builtin/merge.c:686 +#: builtin/merge.c:695 #, c-format msgid "unable to write %s" msgstr "„%s“ не може да бъде записан" -#: builtin/merge.c:738 +#: builtin/merge.c:747 #, c-format msgid "Could not read from '%s'" msgstr "От „%s“ не може да се чете" -#: builtin/merge.c:747 +#: builtin/merge.c:756 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Сливането няма да бъде подадено. За завършването му и подаването му " "използвайте командата „git commit“.\n" -#: builtin/merge.c:753 +#: builtin/merge.c:762 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -10360,72 +10526,72 @@ msgstr "" "Редовете, които започват с „%c“ ще бъдат пропуснати, а празно съобщение\n" "преустановява подаването.\n" -#: builtin/merge.c:777 +#: builtin/merge.c:798 msgid "Empty commit message." msgstr "Празно съобщение при подаване." -#: builtin/merge.c:797 +#: builtin/merge.c:818 #, c-format msgid "Wonderful.\n" msgstr "Първият етап на сливането завърши.\n" -#: builtin/merge.c:850 +#: builtin/merge.c:871 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Неуспешно автоматично сливане — коригирайте конфликтите и подайте " "резултата.\n" -#: builtin/merge.c:889 +#: builtin/merge.c:910 msgid "No current branch." msgstr "Няма текущ клон." -#: builtin/merge.c:891 +#: builtin/merge.c:912 msgid "No remote for the current branch." msgstr "Текущият клон не следи никой." -#: builtin/merge.c:893 +#: builtin/merge.c:914 msgid "No default upstream defined for the current branch." msgstr "Текущият клон не следи никой клон." -#: builtin/merge.c:898 +#: builtin/merge.c:919 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Никой клон не следи клона „%s“ от хранилището „%s“" -#: builtin/merge.c:945 +#: builtin/merge.c:972 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Неправилна стойност „%s“ в средата „%s“" -#: builtin/merge.c:1046 +#: builtin/merge.c:1073 #, c-format msgid "not something we can merge in %s: %s" msgstr "не може да се слее в „%s“: %s" -#: builtin/merge.c:1080 +#: builtin/merge.c:1107 msgid "not something we can merge" msgstr "не може да се слее" -#: builtin/merge.c:1145 +#: builtin/merge.c:1172 msgid "--abort expects no arguments" msgstr "опцията „--abort“ не приема аргументи" -#: builtin/merge.c:1149 +#: builtin/merge.c:1176 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" "Не може да преустановите сливане, защото в момента не се извършва такова " "(липсва указател „MERGE_HEAD“)." -#: builtin/merge.c:1161 +#: builtin/merge.c:1188 msgid "--continue expects no arguments" msgstr "опцията „--continue“ не приема аргументи" -#: builtin/merge.c:1165 +#: builtin/merge.c:1192 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "В момента не се извършва сливане (липсва указател „MERGE_HEAD“)." -#: builtin/merge.c:1181 +#: builtin/merge.c:1208 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10433,7 +10599,7 @@ msgstr "" "Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува).\n" "Подайте промените си, преди да започнете ново сливане." -#: builtin/merge.c:1188 +#: builtin/merge.c:1215 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10441,121 +10607,121 @@ msgstr "" "Не сте завършили отбиране на подаване (указателят „CHERRY_PICK_HEAD“\n" "съществува). Подайте промените си, преди да започнете ново сливане." -#: builtin/merge.c:1191 +#: builtin/merge.c:1218 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" "Не сте завършили отбиране на подаване (указателят „CHERRY_PICK_HEAD“\n" "съществува)." -#: builtin/merge.c:1200 +#: builtin/merge.c:1227 msgid "You cannot combine --squash with --no-ff." msgstr "Опцията „--squash“ е несъвместима с „--no-ff“." -#: builtin/merge.c:1208 +#: builtin/merge.c:1235 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "Не е указано подаване и настройката „merge.defaultToUpstream“ не е зададена." -#: builtin/merge.c:1225 +#: builtin/merge.c:1252 msgid "Squash commit into empty head not supported yet" msgstr "Подаване със смачкване във връх без история все още не се поддържа" -#: builtin/merge.c:1227 +#: builtin/merge.c:1254 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" "Понеже върхът е без история, всички сливания са превъртания, не може да се " "извърши същинско сливане изисквано от опцията „--no-ff“" -#: builtin/merge.c:1232 +#: builtin/merge.c:1259 #, c-format msgid "%s - not something we can merge" msgstr "„%s“ — не е нещо, което може да се слее" -#: builtin/merge.c:1234 +#: builtin/merge.c:1261 msgid "Can merge only exactly one commit into empty head" msgstr "Можете да слеете точно едно подаване във връх без история" -#: builtin/merge.c:1268 +#: builtin/merge.c:1295 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "Подаването „%s“ е с недоверен подпис от GPG, който твърди, че е на „%s“." -#: builtin/merge.c:1271 +#: builtin/merge.c:1298 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" "Подаването „%s“ е с неправилен подпис от GPG, който твърди, че е на „%s“." -#: builtin/merge.c:1274 +#: builtin/merge.c:1301 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Подаването „%s“ е без подпис от GPG." -#: builtin/merge.c:1277 +#: builtin/merge.c:1304 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Подаването „%s“ е с коректен подпис от GPG на „%s“.\n" -#: builtin/merge.c:1339 +#: builtin/merge.c:1366 msgid "refusing to merge unrelated histories" msgstr "независими истории не може да се слеят" -#: builtin/merge.c:1348 -msgid "Already up-to-date." +#: builtin/merge.c:1375 +msgid "Already up to date." msgstr "Вече е обновено." -#: builtin/merge.c:1358 +#: builtin/merge.c:1385 #, c-format msgid "Updating %s..%s\n" msgstr "Обновяване „%s..%s“\n" -#: builtin/merge.c:1399 +#: builtin/merge.c:1426 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Проба със сливане в рамките на индекса…\n" -#: builtin/merge.c:1406 +#: builtin/merge.c:1433 #, c-format msgid "Nope.\n" msgstr "Неуспешно сливане.\n" -#: builtin/merge.c:1431 -msgid "Already up-to-date. Yeeah!" +#: builtin/merge.c:1458 +msgid "Already up to date. Yeeah!" msgstr "Вече е обновено!" -#: builtin/merge.c:1437 +#: builtin/merge.c:1464 msgid "Not possible to fast-forward, aborting." msgstr "Не може да се извърши превъртане, преустановяване на действието." -#: builtin/merge.c:1460 builtin/merge.c:1539 +#: builtin/merge.c:1487 builtin/merge.c:1566 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Привеждане на дървото към първоначалното…\n" -#: builtin/merge.c:1464 +#: builtin/merge.c:1491 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Пробване със стратегията за сливане „%s“…\n" -#: builtin/merge.c:1530 +#: builtin/merge.c:1557 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Никоя стратегия за сливане не може да извърши сливането.\n" -#: builtin/merge.c:1532 +#: builtin/merge.c:1559 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Неуспешно сливане със стратегия „%s“.\n" -#: builtin/merge.c:1541 +#: builtin/merge.c:1568 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" "Ползва се стратегията „%s“, която ще подготви дървото за коригиране на " "ръка.\n" -#: builtin/merge.c:1553 +#: builtin/merge.c:1580 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -10699,7 +10865,7 @@ msgstr "git mv [ОПЦИЯ…] ОБЕКТ… ЦЕЛ" msgid "Directory %s is in index and no submodule?" msgstr "Директорията „%s“ е в индекса, но не е подмодул" -#: builtin/mv.c:85 builtin/rm.c:290 +#: builtin/mv.c:85 builtin/rm.c:289 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" "За да продължите, или вкарайте промените по файла „.gitmodules“ в индекса,\n" @@ -10718,68 +10884,68 @@ msgstr "принудително преместване/преименуване msgid "skip move/rename errors" msgstr "прескачане на грешките при преместване/преименуване" -#: builtin/mv.c:168 +#: builtin/mv.c:167 #, c-format msgid "destination '%s' is not a directory" msgstr "целта „%s“ съществува и не е директория" -#: builtin/mv.c:179 +#: builtin/mv.c:178 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Проверка на преименуването на обект от „%s“ на „%s“\n" -#: builtin/mv.c:183 +#: builtin/mv.c:182 msgid "bad source" msgstr "неправилен обект" -#: builtin/mv.c:186 +#: builtin/mv.c:185 msgid "can not move directory into itself" msgstr "директория не може да се премести в себе си" -#: builtin/mv.c:189 +#: builtin/mv.c:188 msgid "cannot move directory over file" msgstr "директория не може да се премести върху файл" -#: builtin/mv.c:198 +#: builtin/mv.c:197 msgid "source directory is empty" msgstr "първоначалната директория е празна" -#: builtin/mv.c:223 +#: builtin/mv.c:222 msgid "not under version control" msgstr "не е под контрола на Git" -#: builtin/mv.c:226 +#: builtin/mv.c:225 msgid "destination exists" msgstr "целта съществува" -#: builtin/mv.c:234 +#: builtin/mv.c:233 #, c-format msgid "overwriting '%s'" msgstr "презаписване на „%s“" -#: builtin/mv.c:237 +#: builtin/mv.c:236 msgid "Cannot overwrite" msgstr "Презаписването е невъзможно" -#: builtin/mv.c:240 +#: builtin/mv.c:239 msgid "multiple sources for the same target" msgstr "множество източници за една цел" -#: builtin/mv.c:242 +#: builtin/mv.c:241 msgid "destination directory does not exist" msgstr "целевата директория не съществува" -#: builtin/mv.c:249 +#: builtin/mv.c:248 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, обект: „%s“, цел: „%s“" -#: builtin/mv.c:270 +#: builtin/mv.c:269 #, c-format msgid "Renaming %s to %s\n" msgstr "Преименуване на „%s“ на „%s“\n" -#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390 +#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390 #, c-format msgid "renaming '%s' failed" msgstr "неуспешно преименуване на „%s“" @@ -10973,19 +11139,19 @@ msgstr "обектът-бележка не може да бъде записан msgid "the note contents have been left in %s" msgstr "съдържанието на бележката е във файла „%s“" -#: builtin/notes.c:234 builtin/tag.c:517 +#: builtin/notes.c:234 builtin/tag.c:500 #, c-format msgid "cannot read '%s'" msgstr "файлът „%s“ не може да бъде прочетен" -#: builtin/notes.c:236 builtin/tag.c:520 +#: builtin/notes.c:236 builtin/tag.c:503 #, c-format msgid "could not open or read '%s'" msgstr "файлът „%s“ не може да бъде отворен или прочетен" #: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308 -#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516 -#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661 +#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517 +#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662 #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "не може да се открие към какво сочи „%s“." @@ -11014,49 +11180,49 @@ msgstr "бележката не може да се копира от „%s“ к #. TRANSLATORS: the first %s will be replaced by a git #. notes command: 'add', 'merge', 'remove', etc. #. -#: builtin/notes.c:348 +#: builtin/notes.c:349 #, c-format msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "" "няма да се извърши „%s“ върху бележките в „%s“, защото са извън „refs/" "notes/“." -#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499 -#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654 -#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972 +#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500 +#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655 +#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973 msgid "too many parameters" msgstr "прекалено много параметри" -#: builtin/notes.c:381 builtin/notes.c:667 +#: builtin/notes.c:382 builtin/notes.c:668 #, c-format msgid "no note found for object %s." msgstr "няма бележки за обекта „%s“." -#: builtin/notes.c:402 builtin/notes.c:565 +#: builtin/notes.c:403 builtin/notes.c:566 msgid "note contents as a string" msgstr "низ, който е съдържанието на бележката" -#: builtin/notes.c:405 builtin/notes.c:568 +#: builtin/notes.c:406 builtin/notes.c:569 msgid "note contents in a file" msgstr "ФАЙЛ със съдържанието на бележката" -#: builtin/notes.c:408 builtin/notes.c:571 +#: builtin/notes.c:409 builtin/notes.c:572 msgid "reuse and edit specified note object" msgstr "преизползване и редактиране на указания ОБЕКТ-бележка" -#: builtin/notes.c:411 builtin/notes.c:574 +#: builtin/notes.c:412 builtin/notes.c:575 msgid "reuse specified note object" msgstr "преизползване на указания ОБЕКТ-бележка" -#: builtin/notes.c:414 builtin/notes.c:577 +#: builtin/notes.c:415 builtin/notes.c:578 msgid "allow storing empty note" msgstr "приемане и на празни бележки" -#: builtin/notes.c:415 builtin/notes.c:486 +#: builtin/notes.c:416 builtin/notes.c:487 msgid "replace existing notes" msgstr "замяна на съществуващите бележки" -#: builtin/notes.c:440 +#: builtin/notes.c:441 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -11065,31 +11231,31 @@ msgstr "" "Не може да се добави бележка, защото такава вече съществува за обекта „%s“. " "Използвайте опцията „-f“, за да презапишете съществуващи бележки." -#: builtin/notes.c:455 builtin/notes.c:534 +#: builtin/notes.c:456 builtin/notes.c:535 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Презаписване на съществуващите бележки за обекта „%s“\n" -#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891 +#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892 #, c-format msgid "Removing note for object %s\n" msgstr "Изтриване на бележката за обекта „%s“\n" -#: builtin/notes.c:487 +#: builtin/notes.c:488 msgid "read objects from stdin" msgstr "изчитане на обектите от стандартния вход" -#: builtin/notes.c:489 +#: builtin/notes.c:490 msgid "load rewriting config for <command> (implies --stdin)" msgstr "" "зареждане на настройките за КОМАНДАта, която презаписва подавания (включва " "опцията „--stdin“)" -#: builtin/notes.c:507 +#: builtin/notes.c:508 msgid "too few parameters" msgstr "прекалено малко параметри" -#: builtin/notes.c:528 +#: builtin/notes.c:529 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -11098,12 +11264,12 @@ msgstr "" "Не може да се копира бележка, защото такава вече съществува за обекта „%s“. " "Използвайте опцията „-f“, за да презапишете съществуващи бележки." -#: builtin/notes.c:540 +#: builtin/notes.c:541 #, c-format msgid "missing notes on source object %s. Cannot copy." msgstr "няма бележки за обекта-източник „%s“. Не може да се копира." -#: builtin/notes.c:592 +#: builtin/notes.c:593 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -11114,52 +11280,52 @@ msgstr "" "Вместо това ги използвайте с подкомандата „add“: „git notes add -f -m/-F/-c/-" "C“.\n" -#: builtin/notes.c:687 +#: builtin/notes.c:688 msgid "failed to delete ref NOTES_MERGE_PARTIAL" msgstr "указателят „NOTES_MERGE_PARTIAL“ не може да бъде изтрит" -#: builtin/notes.c:689 +#: builtin/notes.c:690 msgid "failed to delete ref NOTES_MERGE_REF" msgstr "указателят „NOTES_MERGE_REF“ не може да бъде изтрит" -#: builtin/notes.c:691 +#: builtin/notes.c:692 msgid "failed to remove 'git notes merge' worktree" msgstr "работната директория на „git notes merge“ не може да бъде изтрита" -#: builtin/notes.c:711 +#: builtin/notes.c:712 msgid "failed to read ref NOTES_MERGE_PARTIAL" msgstr "указателят „NOTES_MERGE_PARTIAL“ не може да бъде прочетен" -#: builtin/notes.c:713 +#: builtin/notes.c:714 msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "подаването от „NOTES_MERGE_PARTIAL“ не може да се открие." -#: builtin/notes.c:715 +#: builtin/notes.c:716 msgid "could not parse commit from NOTES_MERGE_PARTIAL." msgstr "подаването от „NOTES_MERGE_PARTIAL“ не може да се анализира." -#: builtin/notes.c:728 +#: builtin/notes.c:729 msgid "failed to resolve NOTES_MERGE_REF" msgstr "не може да се открие към какво сочи „NOTES_MERGE_REF“" -#: builtin/notes.c:731 +#: builtin/notes.c:732 msgid "failed to finalize notes merge" msgstr "неуспешно сливане на бележките" -#: builtin/notes.c:757 +#: builtin/notes.c:758 #, c-format msgid "unknown notes merge strategy %s" msgstr "непозната стратегия за сливане на бележки „%s“" -#: builtin/notes.c:773 +#: builtin/notes.c:774 msgid "General options" msgstr "Общи опции" -#: builtin/notes.c:775 +#: builtin/notes.c:776 msgid "Merge options" msgstr "Опции при сливане" -#: builtin/notes.c:777 +#: builtin/notes.c:778 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -11169,46 +11335,46 @@ msgstr "" "„union“ (обединяване), „cat_sort_uniq“ (обединяване, подреждане, уникални " "резултати)" -#: builtin/notes.c:779 +#: builtin/notes.c:780 msgid "Committing unmerged notes" msgstr "Подаване на неслети бележки" -#: builtin/notes.c:781 +#: builtin/notes.c:782 msgid "finalize notes merge by committing unmerged notes" msgstr "завършване на сливането чрез подаване на неслети бележки" -#: builtin/notes.c:783 +#: builtin/notes.c:784 msgid "Aborting notes merge resolution" msgstr "Преустановяване на корекцията при сливането на бележки" -#: builtin/notes.c:785 +#: builtin/notes.c:786 msgid "abort notes merge" msgstr "преустановяване на сливането на бележки" -#: builtin/notes.c:796 +#: builtin/notes.c:797 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "опциите „--commit“, „--abort“ и „-s“/„--strategy“ са несъвместими" -#: builtin/notes.c:801 +#: builtin/notes.c:802 msgid "must specify a notes ref to merge" msgstr "трябва да укажете указател към бележка за сливане." -#: builtin/notes.c:825 +#: builtin/notes.c:826 #, c-format msgid "unknown -s/--strategy: %s" msgstr "неизвестна стратегия към опцията „-s“/„--strategy“: „%s“" -#: builtin/notes.c:862 +#: builtin/notes.c:863 #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "в момента се извършва сливане на бележките в „%s“ при „%s“" -#: builtin/notes.c:865 +#: builtin/notes.c:866 #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "не може да се запази връзка към указателя на текущата бележка („%s“)." -#: builtin/notes.c:867 +#: builtin/notes.c:868 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " @@ -11219,239 +11385,239 @@ msgstr "" "резултата с „git notes merge --commit“ или преустановете сливането с " "командата „git notes merge --abort“.\n" -#: builtin/notes.c:889 +#: builtin/notes.c:890 #, c-format msgid "Object %s has no note\n" msgstr "Няма бележки за обекта „%s“\n" -#: builtin/notes.c:901 +#: builtin/notes.c:902 msgid "attempt to remove non-existent note is not an error" msgstr "опитът за изтриването на несъществуваща бележка не се счита за грешка" -#: builtin/notes.c:904 +#: builtin/notes.c:905 msgid "read object names from the standard input" msgstr "изчитане на имената на обектите от стандартния вход" -#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128 +#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:146 msgid "do not remove, show only" msgstr "само извеждане без действително окастряне" -#: builtin/notes.c:943 +#: builtin/notes.c:944 msgid "report pruned notes" msgstr "докладване на окастрените обекти" -#: builtin/notes.c:985 +#: builtin/notes.c:986 msgid "notes-ref" msgstr "УКАЗАТЕЛ_ЗА_БЕЛЕЖКА" -#: builtin/notes.c:986 +#: builtin/notes.c:987 msgid "use notes from <notes-ref>" msgstr "да се използва бележката сочена от този УКАЗАТЕЛ_ЗА_БЕЛЕЖКА" -#: builtin/notes.c:1021 +#: builtin/notes.c:1022 #, c-format msgid "unknown subcommand: %s" msgstr "непозната подкоманда: %s" -#: builtin/pack-objects.c:30 +#: builtin/pack-objects.c:31 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [ОПЦИЯ…] [< СПИСЪК_С_УКАЗАТЕЛИ | < СПИСЪК_С_ОБЕКТИ]" -#: builtin/pack-objects.c:31 +#: builtin/pack-objects.c:32 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [ОПЦИЯ…] ПРЕФИКС_НА_ИМЕТО [< СПИСЪК_С_УКАЗАТЕЛИ | < " "СПИСЪК_С_ОБЕКТИ]" -#: builtin/pack-objects.c:180 builtin/pack-objects.c:183 +#: builtin/pack-objects.c:181 builtin/pack-objects.c:184 #, c-format msgid "deflate error (%d)" msgstr "грешка при декомпресиране с „deflate“ (%d)" -#: builtin/pack-objects.c:776 +#: builtin/pack-objects.c:777 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "изключване на записването на битовата маска, пакетите са разделени поради " "стойността на „pack.packSizeLimit“" -#: builtin/pack-objects.c:789 +#: builtin/pack-objects.c:790 msgid "Writing objects" msgstr "Записване на обектите" -#: builtin/pack-objects.c:1069 +#: builtin/pack-objects.c:1070 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "изключване на записването на битовата маска, защото някои обекти няма да се " "пакетират" -#: builtin/pack-objects.c:2434 +#: builtin/pack-objects.c:2440 msgid "Compressing objects" msgstr "Компресиране на обектите" -#: builtin/pack-objects.c:2843 +#: builtin/pack-objects.c:2849 #, c-format msgid "unsupported index version %s" msgstr "неподдържана версия на индекса „%s“" -#: builtin/pack-objects.c:2847 +#: builtin/pack-objects.c:2853 #, c-format msgid "bad index version '%s'" msgstr "неправилна версия на индекса „%s“" -#: builtin/pack-objects.c:2877 +#: builtin/pack-objects.c:2883 msgid "do not show progress meter" msgstr "без извеждане на напредъка" -#: builtin/pack-objects.c:2879 +#: builtin/pack-objects.c:2885 msgid "show progress meter" msgstr "извеждане на напредъка" -#: builtin/pack-objects.c:2881 +#: builtin/pack-objects.c:2887 msgid "show progress meter during object writing phase" msgstr "извеждане на напредъка във фазата на запазване на обектите" -#: builtin/pack-objects.c:2884 +#: builtin/pack-objects.c:2890 msgid "similar to --all-progress when progress meter is shown" msgstr "" "същото действие като опцията „--all-progress“ при извеждането на напредъка" -#: builtin/pack-objects.c:2885 +#: builtin/pack-objects.c:2891 msgid "version[,offset]" msgstr "ВЕРСИЯ[,ОТМЕСТВАНЕ]" -#: builtin/pack-objects.c:2886 +#: builtin/pack-objects.c:2892 msgid "write the pack index file in the specified idx format version" msgstr "" "запазване на индекса на пакетните файлове във форма̀та с указаната версия" -#: builtin/pack-objects.c:2889 +#: builtin/pack-objects.c:2895 msgid "maximum size of each output pack file" msgstr "максимален размер на всеки пакетен файл" -#: builtin/pack-objects.c:2891 +#: builtin/pack-objects.c:2897 msgid "ignore borrowed objects from alternate object store" msgstr "игнориране на обектите заети от други хранилища на обекти" -#: builtin/pack-objects.c:2893 +#: builtin/pack-objects.c:2899 msgid "ignore packed objects" msgstr "игнориране на пакетираните обекти" -#: builtin/pack-objects.c:2895 +#: builtin/pack-objects.c:2901 msgid "limit pack window by objects" msgstr "ограничаване на прозореца за пакетиране по брой обекти" -#: builtin/pack-objects.c:2897 +#: builtin/pack-objects.c:2903 msgid "limit pack window by memory in addition to object limit" msgstr "" "ограничаване на прозореца за пакетиране и по памет освен по брой обекти" -#: builtin/pack-objects.c:2899 +#: builtin/pack-objects.c:2905 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" "максимална дължина на веригата от разлики, която е позволена в пакетния файл" -#: builtin/pack-objects.c:2901 +#: builtin/pack-objects.c:2907 msgid "reuse existing deltas" msgstr "преизползване на съществуващите разлики" -#: builtin/pack-objects.c:2903 +#: builtin/pack-objects.c:2909 msgid "reuse existing objects" msgstr "преизползване на съществуващите обекти" -#: builtin/pack-objects.c:2905 +#: builtin/pack-objects.c:2911 msgid "use OFS_DELTA objects" msgstr "използване на обекти „OFS_DELTA“" -#: builtin/pack-objects.c:2907 +#: builtin/pack-objects.c:2913 msgid "use threads when searching for best delta matches" msgstr "" "стартиране на нишки за претърсване на най-добрите съвпадения на разликите" -#: builtin/pack-objects.c:2909 +#: builtin/pack-objects.c:2915 msgid "do not create an empty pack output" msgstr "без създаване на празен пакетен файл" -#: builtin/pack-objects.c:2911 +#: builtin/pack-objects.c:2917 msgid "read revision arguments from standard input" msgstr "изчитане на версиите от стандартния вход" -#: builtin/pack-objects.c:2913 +#: builtin/pack-objects.c:2919 msgid "limit the objects to those that are not yet packed" msgstr "ограничаване до все още непакетираните обекти" -#: builtin/pack-objects.c:2916 +#: builtin/pack-objects.c:2922 msgid "include objects reachable from any reference" msgstr "" "включване на всички обекти, които могат да се достигнат от произволен " "указател" -#: builtin/pack-objects.c:2919 +#: builtin/pack-objects.c:2925 msgid "include objects referred by reflog entries" msgstr "включване и на обектите сочени от записите в журнала на указателите" -#: builtin/pack-objects.c:2922 +#: builtin/pack-objects.c:2928 msgid "include objects referred to by the index" msgstr "включване и на обектите сочени от индекса" -#: builtin/pack-objects.c:2925 +#: builtin/pack-objects.c:2931 msgid "output pack to stdout" msgstr "извеждане на пакета на стандартния изход" -#: builtin/pack-objects.c:2927 +#: builtin/pack-objects.c:2933 msgid "include tag objects that refer to objects to be packed" msgstr "" "включване и на обектите-етикети, които сочат към обектите, които ще бъдат " "пакетирани" -#: builtin/pack-objects.c:2929 +#: builtin/pack-objects.c:2935 msgid "keep unreachable objects" msgstr "запазване на недостижимите обекти" -#: builtin/pack-objects.c:2931 +#: builtin/pack-objects.c:2937 msgid "pack loose unreachable objects" msgstr "пакетиране и на недостижимите обекти" -#: builtin/pack-objects.c:2933 +#: builtin/pack-objects.c:2939 msgid "unpack unreachable objects newer than <time>" msgstr "разпакетиране на недостижимите обекти, които са по-нови от това ВРЕМЕ" -#: builtin/pack-objects.c:2936 +#: builtin/pack-objects.c:2942 msgid "create thin packs" msgstr "създаване на съкратени пакети" -#: builtin/pack-objects.c:2938 +#: builtin/pack-objects.c:2944 msgid "create packs suitable for shallow fetches" msgstr "пакетиране подходящо за плитко доставяне" -#: builtin/pack-objects.c:2940 +#: builtin/pack-objects.c:2946 msgid "ignore packs that have companion .keep file" msgstr "игнориране на пакетите, които са придружени от файл „.keep“" -#: builtin/pack-objects.c:2942 +#: builtin/pack-objects.c:2948 msgid "pack compression level" msgstr "ниво на компресиране при пакетиране" -#: builtin/pack-objects.c:2944 +#: builtin/pack-objects.c:2950 msgid "do not hide commits by grafts" msgstr "" "извеждане на всички родители — дори и тези, които нормално са скрити при " "присажданията" -#: builtin/pack-objects.c:2946 +#: builtin/pack-objects.c:2952 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "използване на съществуващи индекси на база битови маски за ускоряване на " "преброяването на обектите" -#: builtin/pack-objects.c:2948 +#: builtin/pack-objects.c:2954 msgid "write a bitmap index together with the pack index" msgstr "" "запазване и на индекс на база побитова маска, заедно с индекса за пакета" -#: builtin/pack-objects.c:3075 +#: builtin/pack-objects.c:3081 msgid "Counting objects" msgstr "Преброяване на обектите" @@ -11467,11 +11633,11 @@ msgstr "пакетиране на всичко" msgid "prune loose refs (default)" msgstr "окастряне на недостижимите указатели (стандартно)" -#: builtin/prune-packed.c:7 +#: builtin/prune-packed.c:8 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" -#: builtin/prune-packed.c:40 +#: builtin/prune-packed.c:41 msgid "Removing duplicate objects" msgstr "Изтриване на повтарящите се обекти" @@ -11512,7 +11678,7 @@ msgstr "Опции при сливане" msgid "incorporate changes by rebasing rather than merging" msgstr "внасяне на промените чрез пребазиране, а не чрез сливане" -#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121 +#: builtin/pull.c:155 builtin/rebase--helper.c:21 builtin/revert.c:121 msgid "allow fast-forward" msgstr "позволяване на превъртания" @@ -11533,7 +11699,7 @@ msgstr "брой подмодули издърпани паралелно" msgid "Invalid value for pull.ff: %s" msgstr "Неправилна стойност за „pull.ff“: „%s“" -#: builtin/pull.c:399 +#: builtin/pull.c:403 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -11541,14 +11707,14 @@ msgstr "" "Между указателите, които току що доставихте, няма подходящ кандидат, върху " "който да пребазирате." -#: builtin/pull.c:401 +#: builtin/pull.c:405 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "Между указателите, които току що доставихте, няма подходящ кандидат, който " "да слеете." -#: builtin/pull.c:402 +#: builtin/pull.c:406 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -11556,7 +11722,7 @@ msgstr "" "Най вероятно сте подали шаблон за указатели, който не е напаснал с нищо в " "отдалеченото хранилище." -#: builtin/pull.c:405 +#: builtin/pull.c:409 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -11567,44 +11733,44 @@ msgstr "" "Понеже това не е хранилището по подразбиране на текущия клон, трябва\n" "да укажете отдалечения клон на командния ред." -#: builtin/pull.c:410 git-parse-remote.sh:73 +#: builtin/pull.c:414 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Извън всички клони." -#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79 +#: builtin/pull.c:416 builtin/pull.c:431 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Укажете върху кой клон искате да пребазирате." -#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82 +#: builtin/pull.c:418 builtin/pull.c:433 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Укажете кой клон искате да слеете." -#: builtin/pull.c:415 builtin/pull.c:430 +#: builtin/pull.c:419 builtin/pull.c:434 msgid "See git-pull(1) for details." msgstr "За повече информация погледнете ръководството „git-pull(1)“" -#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432 +#: builtin/pull.c:421 builtin/pull.c:427 builtin/pull.c:436 #: git-parse-remote.sh:64 msgid "<remote>" msgstr "ОТДАЛЕЧЕНО_ХРАНИЛИЩЕ" -#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456 +#: builtin/pull.c:421 builtin/pull.c:436 builtin/pull.c:441 git-rebase.sh:466 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "КЛОН" -#: builtin/pull.c:425 git-parse-remote.sh:75 +#: builtin/pull.c:429 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "Текущият клон не следи никой." -#: builtin/pull.c:434 git-parse-remote.sh:95 +#: builtin/pull.c:438 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" "Ако искате да зададете информация за следен клон, можете да направите това с " "командата:" -#: builtin/pull.c:439 +#: builtin/pull.c:443 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -11613,27 +11779,27 @@ msgstr "" "За сливане е указан отдалеченият указател „%s“,\n" "но такъв не е доставен." -#: builtin/pull.c:792 +#: builtin/pull.c:796 msgid "ignoring --verify-signatures for rebase" msgstr "без „--verify-signatures“ при пребазиране" -#: builtin/pull.c:840 +#: builtin/pull.c:844 msgid "--[no-]autostash option is only valid with --rebase." msgstr "опцията „--[no-]autostash“ изисква „--rebase“" -#: builtin/pull.c:848 +#: builtin/pull.c:852 msgid "Updating an unborn branch with changes added to the index." msgstr "Обновяване на все още несъздаден клон с промените от индекса" -#: builtin/pull.c:851 +#: builtin/pull.c:855 msgid "pull with rebase" msgstr "издърпване с пребазиране" -#: builtin/pull.c:852 +#: builtin/pull.c:856 msgid "please commit or stash them." msgstr "трябва да подадете или скатаете промените." -#: builtin/pull.c:877 +#: builtin/pull.c:881 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -11643,7 +11809,7 @@ msgstr "" "доставянето обнови върха на текущия клон. Работното\n" "ви копие бе превъртяно от подаване „%s“." -#: builtin/pull.c:882 +#: builtin/pull.c:886 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -11660,15 +11826,15 @@ msgstr "" " $ git reset --hard\n" "за връщане към нормално състояние." -#: builtin/pull.c:897 +#: builtin/pull.c:901 msgid "Cannot merge multiple branches into empty head." msgstr "Не може да сливате множество клони в празен върхов указател." -#: builtin/pull.c:901 +#: builtin/pull.c:905 msgid "Cannot rebase onto multiple branches." msgstr "Не може да пребазирате върху повече от един клон." -#: builtin/pull.c:908 +#: builtin/pull.c:912 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "пребазирането е невъзможно заради локално записаните промени по подмодулите" @@ -12064,19 +12230,49 @@ msgstr "изчистване на грешки в командата „unpack-t msgid "git rebase--helper [<options>]" msgstr "git rebase--helper [ОПЦИЯ…]" -#: builtin/rebase--helper.c:20 +#: builtin/rebase--helper.c:22 +msgid "keep empty commits" +msgstr "запазване на празните подавания" + +#: builtin/rebase--helper.c:23 msgid "continue rebase" msgstr "продължаване на пребазирането" -#: builtin/rebase--helper.c:22 +#: builtin/rebase--helper.c:25 msgid "abort rebase" msgstr "преустановяване на пребазирането" -#: builtin/receive-pack.c:28 +#: builtin/rebase--helper.c:28 +msgid "make rebase script" +msgstr "създаване на скрипт за пребазиране" + +#: builtin/rebase--helper.c:30 +msgid "shorten SHA-1s in the todo list" +msgstr "съкратени суми по SHA1 в списъка за изпълнение" + +#: builtin/rebase--helper.c:32 +msgid "expand SHA-1s in the todo list" +msgstr "пълни суми по SHA1 в списъка за изпълнение" + +#: builtin/rebase--helper.c:34 +msgid "check the todo list" +msgstr "проверка на списъка за изпълнение" + +#: builtin/rebase--helper.c:36 +msgid "skip unnecessary picks" +msgstr "прескачане на излишните команди за отбиране" + +#: builtin/rebase--helper.c:38 +msgid "rearrange fixup/squash lines" +msgstr "" +"преподреждане на редовете за сливане на подаванията със и без смени на " +"съобщението" + +#: builtin/receive-pack.c:29 msgid "git receive-pack <git-dir>" msgstr "git receive-pack ДИРЕКТОРИЯ_НА_GIT" -#: builtin/receive-pack.c:838 +#: builtin/receive-pack.c:839 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" @@ -12109,7 +12305,7 @@ msgstr "" "За да заглушите това съобщение, като запазите стандартното поведение,\n" "задайте настройката „receive.denyCurrentBranch“ да е „refuse“ (отказ)." -#: builtin/receive-pack.c:858 +#: builtin/receive-pack.c:859 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" @@ -12130,11 +12326,11 @@ msgstr "" "За да заглушите това съобщение, задайте настройката\n" "„receive.denyDeleteCurrent“ да е „refuse“ (отказ)." -#: builtin/receive-pack.c:1933 +#: builtin/receive-pack.c:1932 msgid "quiet" msgstr "без извеждане на информация" -#: builtin/receive-pack.c:1947 +#: builtin/receive-pack.c:1946 msgid "You must specify a directory." msgstr "Трябва да укажете директория." @@ -12289,12 +12485,12 @@ msgstr "" "указването на следени клони е смислено само за отдалечени хранилища, от " "които се доставя" -#: builtin/remote.c:191 builtin/remote.c:630 +#: builtin/remote.c:191 builtin/remote.c:631 #, c-format msgid "remote %s already exists." msgstr "вече съществува отдалечено хранилище с име „%s“." -#: builtin/remote.c:195 builtin/remote.c:634 +#: builtin/remote.c:195 builtin/remote.c:635 #, c-format msgid "'%s' is not a valid remote name" msgstr "„%s“ е неправилно име за отдалечено хранилище" @@ -12317,17 +12513,17 @@ msgstr "(съвпадащи)" msgid "(delete)" msgstr "(за изтриване)" -#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857 +#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858 #, c-format msgid "No such remote: %s" msgstr "Такова отдалечено хранилище няма: %s" -#: builtin/remote.c:640 +#: builtin/remote.c:641 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Разделът „%s“ в настройките не може да бъде преименуван на „%s“" -#: builtin/remote.c:660 +#: builtin/remote.c:661 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -12338,17 +12534,17 @@ msgstr "" " %s\n" " Променете настройките ръчно, ако е необходимо." -#: builtin/remote.c:696 +#: builtin/remote.c:697 #, c-format msgid "deleting '%s' failed" msgstr "неуспешно изтриване на „%s“" -#: builtin/remote.c:730 +#: builtin/remote.c:731 #, c-format msgid "creating '%s' failed" msgstr "неуспешно създаване на „%s“" -#: builtin/remote.c:795 +#: builtin/remote.c:796 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -12362,116 +12558,116 @@ msgstr[1] "" "Бележка: Няколко клона извън йерархията „refs/remotes/“ не бяха изтрити.\n" "Изтрийте ги чрез командата:" -#: builtin/remote.c:809 +#: builtin/remote.c:810 #, c-format msgid "Could not remove config section '%s'" msgstr "Разделът „%s“ в настройките не може да бъде изтрит" -#: builtin/remote.c:910 +#: builtin/remote.c:911 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " нов (следващото доставяне ще го разположи в „remotes/%s“)" -#: builtin/remote.c:913 +#: builtin/remote.c:914 msgid " tracked" msgstr " следен" -#: builtin/remote.c:915 +#: builtin/remote.c:916 msgid " stale (use 'git remote prune' to remove)" msgstr " стар (изтрийте чрез „git remote prune“)" -#: builtin/remote.c:917 +#: builtin/remote.c:918 msgid " ???" msgstr " неясно състояние" # CHECK -#: builtin/remote.c:958 +#: builtin/remote.c:959 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "" "неправилен клон за сливане „%s“. Невъзможно е да пребазирате върху повече " "от 1 клон" -#: builtin/remote.c:966 +#: builtin/remote.c:967 #, c-format msgid "rebases interactively onto remote %s" msgstr "интерактивно пребазиране върху отдалечения клон „%s“" -#: builtin/remote.c:967 +#: builtin/remote.c:968 #, c-format msgid "rebases onto remote %s" msgstr "пребазиране върху отдалечения клон „%s“" -#: builtin/remote.c:970 +#: builtin/remote.c:971 #, c-format msgid " merges with remote %s" msgstr " сливане с отдалечения клон „%s“" -#: builtin/remote.c:973 +#: builtin/remote.c:974 #, c-format msgid "merges with remote %s" msgstr "сливане с отдалечения клон „%s“" -#: builtin/remote.c:976 +#: builtin/remote.c:977 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s и с отдалечения клон „%s“\n" -#: builtin/remote.c:1019 +#: builtin/remote.c:1020 msgid "create" msgstr "създаден" -#: builtin/remote.c:1022 +#: builtin/remote.c:1023 msgid "delete" msgstr "изтрит" -#: builtin/remote.c:1026 +#: builtin/remote.c:1027 msgid "up to date" msgstr "актуален" -#: builtin/remote.c:1029 +#: builtin/remote.c:1030 msgid "fast-forwardable" msgstr "може да се превърти" -#: builtin/remote.c:1032 +#: builtin/remote.c:1033 msgid "local out of date" msgstr "локалният е изостанал" -#: builtin/remote.c:1039 +#: builtin/remote.c:1040 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s принудително изтласква към %-*s (%s)" -#: builtin/remote.c:1042 +#: builtin/remote.c:1043 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s изтласква към %-*s (%s)" -#: builtin/remote.c:1046 +#: builtin/remote.c:1047 #, c-format msgid " %-*s forces to %s" msgstr " %-*s принудително изтласква към %s" -#: builtin/remote.c:1049 +#: builtin/remote.c:1050 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s изтласква към %s" -#: builtin/remote.c:1117 +#: builtin/remote.c:1118 msgid "do not query remotes" msgstr "без заявки към отдалечените хранилища" -#: builtin/remote.c:1144 +#: builtin/remote.c:1145 #, c-format msgid "* remote %s" msgstr "● отдалечено хранилище „%s“" -#: builtin/remote.c:1145 +#: builtin/remote.c:1146 #, c-format msgid " Fetch URL: %s" msgstr " Адрес за доставяне: %s" -#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301 +#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302 msgid "(no URL)" msgstr "(без адрес)" @@ -12479,25 +12675,25 @@ msgstr "(без адрес)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1160 builtin/remote.c:1162 +#: builtin/remote.c:1161 builtin/remote.c:1163 #, c-format msgid " Push URL: %s" msgstr " Адрес за изтласкване: %s" -#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168 +#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169 #, c-format msgid " HEAD branch: %s" msgstr " клон сочен от HEAD: %s" -#: builtin/remote.c:1164 +#: builtin/remote.c:1165 msgid "(not queried)" msgstr "(без проверка)" -#: builtin/remote.c:1166 +#: builtin/remote.c:1167 msgid "(unknown)" msgstr "(непознат)" -#: builtin/remote.c:1170 +#: builtin/remote.c:1171 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" @@ -12506,161 +12702,161 @@ msgstr "" "хранилище\n" " не е еднозначен и е някой от следните):\n" -#: builtin/remote.c:1182 +#: builtin/remote.c:1183 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Отдалечен клон:%s" msgstr[1] " Отдалечени клони:%s" -#: builtin/remote.c:1185 builtin/remote.c:1211 +#: builtin/remote.c:1186 builtin/remote.c:1212 msgid " (status not queried)" msgstr " (състоянието не бе проверено)" -#: builtin/remote.c:1194 +#: builtin/remote.c:1195 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Локален клон настроен за издърпване чрез „git pull“:" msgstr[1] " Локални клони настроени за издърпване чрез „git pull“:" -#: builtin/remote.c:1202 +#: builtin/remote.c:1203 msgid " Local refs will be mirrored by 'git push'" msgstr " Локалните указатели ще бъдат пренесени чрез „ push“" -#: builtin/remote.c:1208 +#: builtin/remote.c:1209 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Локалният указател, настроен за „git push“%s:" msgstr[1] " Локалните указатели, настроени за „git push“%s:" -#: builtin/remote.c:1229 +#: builtin/remote.c:1230 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "задаване на refs/remotes/ИМЕ/HEAD според отдалеченото хранилище" -#: builtin/remote.c:1231 +#: builtin/remote.c:1232 msgid "delete refs/remotes/<name>/HEAD" msgstr "изтриване на refs/remotes/ИМЕ/HEAD" -#: builtin/remote.c:1246 +#: builtin/remote.c:1247 msgid "Cannot determine remote HEAD" msgstr "Не може да се установи отдалеченият връх" -#: builtin/remote.c:1248 +#: builtin/remote.c:1249 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" "Множество клони с върхове. Изберете изрично някой от тях чрез командата:" -#: builtin/remote.c:1258 +#: builtin/remote.c:1259 #, c-format msgid "Could not delete %s" msgstr "„%s“ не може да бъде изтрит" -#: builtin/remote.c:1266 +#: builtin/remote.c:1267 #, c-format msgid "Not a valid ref: %s" msgstr "Неправилен указател: %s" -#: builtin/remote.c:1268 +#: builtin/remote.c:1269 #, c-format msgid "Could not setup %s" msgstr "„%s“ не може да се настрои" -#: builtin/remote.c:1286 +#: builtin/remote.c:1287 #, c-format msgid " %s will become dangling!" msgstr "„%s“ ще се превърне в обект извън клоните!" -#: builtin/remote.c:1287 +#: builtin/remote.c:1288 #, c-format msgid " %s has become dangling!" msgstr "„%s“ се превърна в обект извън клоните!" -#: builtin/remote.c:1297 +#: builtin/remote.c:1298 #, c-format msgid "Pruning %s" msgstr "Окастряне на „%s“" -#: builtin/remote.c:1298 +#: builtin/remote.c:1299 #, c-format msgid "URL: %s" msgstr "адрес: %s" -#: builtin/remote.c:1314 +#: builtin/remote.c:1315 #, c-format msgid " * [would prune] %s" msgstr " ● [ще бъде окастрено] %s" -#: builtin/remote.c:1317 +#: builtin/remote.c:1318 #, c-format msgid " * [pruned] %s" msgstr " ● [окастрено] %s" -#: builtin/remote.c:1362 +#: builtin/remote.c:1363 msgid "prune remotes after fetching" msgstr "окастряне на огледалата на отдалечените хранилища след доставяне" -#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547 +#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548 #, c-format msgid "No such remote '%s'" msgstr "Няма отдалечено хранилище на име „%s“" -#: builtin/remote.c:1441 +#: builtin/remote.c:1442 msgid "add branch" msgstr "добавяне на клон" -#: builtin/remote.c:1448 +#: builtin/remote.c:1449 msgid "no remote specified" msgstr "не е указано отдалечено хранилище" -#: builtin/remote.c:1465 +#: builtin/remote.c:1466 msgid "query push URLs rather than fetch URLs" msgstr "запитване към адресите за изтласкване, а не за доставяне" -#: builtin/remote.c:1467 +#: builtin/remote.c:1468 msgid "return all URLs" msgstr "извеждане на всички адреси" -#: builtin/remote.c:1495 +#: builtin/remote.c:1496 #, c-format msgid "no URLs configured for remote '%s'" msgstr "не е зададен адрес за отдалеченото хранилище „%s“" -#: builtin/remote.c:1521 +#: builtin/remote.c:1522 msgid "manipulate push URLs" msgstr "промяна на адресите за изтласкване" -#: builtin/remote.c:1523 +#: builtin/remote.c:1524 msgid "add URL" msgstr "добавяне на адреси" -#: builtin/remote.c:1525 +#: builtin/remote.c:1526 msgid "delete URLs" msgstr "изтриване на адреси" -#: builtin/remote.c:1532 +#: builtin/remote.c:1533 msgid "--add --delete doesn't make sense" msgstr "опциите „--add“ и „--delete“ са несъвместими" -#: builtin/remote.c:1573 +#: builtin/remote.c:1572 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Неправилен (стар) формат за адрес: %s" -#: builtin/remote.c:1581 +#: builtin/remote.c:1580 #, c-format msgid "No such URL found: %s" msgstr "Такъв адрес не е открит: %s" -#: builtin/remote.c:1583 +#: builtin/remote.c:1582 msgid "Will not delete all non-push URLs" msgstr "Никой от адресите, които не са за изтласкване, няма да се изтрие" -#: builtin/remote.c:1597 +#: builtin/remote.c:1598 msgid "be verbose; must be placed before a subcommand" msgstr "повече подробности. Поставя се пред подкоманда" -#: builtin/remote.c:1628 +#: builtin/remote.c:1629 #, c-format msgid "Unknown subcommand: %s" msgstr "Непозната подкоманда: %s" @@ -12767,7 +12963,7 @@ msgstr "пакетите в хранилище с важни обекти не msgid "--keep-unreachable and -A are incompatible" msgstr "Опциите „--keep-unreachable“ и „-A“ са несъвместими" -#: builtin/repack.c:406 builtin/worktree.c:116 +#: builtin/repack.c:406 builtin/worktree.c:134 #, c-format msgid "failed to remove '%s'" msgstr "директорията „%s“ не може да бъде изтрита" @@ -12900,123 +13096,123 @@ msgstr "слято (merge)" msgid "keep" msgstr "запазващо (keep)" -#: builtin/reset.c:77 +#: builtin/reset.c:78 msgid "You do not have a valid HEAD." msgstr "Указателят „HEAD“ е повреден." -#: builtin/reset.c:79 +#: builtin/reset.c:80 msgid "Failed to find tree of HEAD." msgstr "Дървото, сочено от указателя „HEAD“, не може да бъде открито." -#: builtin/reset.c:85 +#: builtin/reset.c:86 #, c-format msgid "Failed to find tree of %s." msgstr "Дървото, сочено от „%s“, не може да бъде открито." -#: builtin/reset.c:103 +#: builtin/reset.c:113 #, c-format msgid "HEAD is now at %s" msgstr "Указателят „HEAD“ сочи към „%s“" -#: builtin/reset.c:186 +#: builtin/reset.c:197 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "Не може да се извърши %s зануляване по време на сливане." -#: builtin/reset.c:286 +#: builtin/reset.c:297 msgid "be quiet, only report errors" msgstr "по-малко подробности, да се извеждат само грешките" -#: builtin/reset.c:288 +#: builtin/reset.c:299 msgid "reset HEAD and index" msgstr "индекса и указателя „HEAD“, без работното дърво" -#: builtin/reset.c:289 +#: builtin/reset.c:300 msgid "reset only HEAD" msgstr "само указателя „HEAD“, без индекса и работното дърво" -#: builtin/reset.c:291 builtin/reset.c:293 +#: builtin/reset.c:302 builtin/reset.c:304 msgid "reset HEAD, index and working tree" msgstr "указателя „HEAD“, индекса и работното дърво" -#: builtin/reset.c:295 +#: builtin/reset.c:306 msgid "reset HEAD but keep local changes" msgstr "зануляване на указателя „HEAD“, но запазване на локалните промени" -#: builtin/reset.c:301 +#: builtin/reset.c:312 msgid "record only the fact that removed paths will be added later" msgstr "" "отбелязване само на факта, че изтритите пътища ще бъдат добавени по-късно" -#: builtin/reset.c:320 +#: builtin/reset.c:329 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Стойността „%s“ не е разпозната като съществуваща версия." -#: builtin/reset.c:328 +#: builtin/reset.c:337 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "„%s“ не е разпознат като дърво." -#: builtin/reset.c:337 +#: builtin/reset.c:346 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "" "опцията „--patch“ е несъвместима с всяка от опциите „--hard/--mixed/--soft“" -#: builtin/reset.c:346 +#: builtin/reset.c:355 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "опцията „--mixed“ не бива да се използва заедно с пътища. Вместо това " "изпълнете „git reset -- ПЪТ…“." -#: builtin/reset.c:348 +#: builtin/reset.c:357 #, c-format msgid "Cannot do %s reset with paths." msgstr "Не може да извършите %s зануляване, когато сте задали ПЪТ." -#: builtin/reset.c:358 +#: builtin/reset.c:367 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "В голо хранилище не може да извършите %s зануляване" -#: builtin/reset.c:362 +#: builtin/reset.c:371 msgid "-N can only be used with --mixed" msgstr "Опцията „-N“ е съвместима само с „--mixed“" -#: builtin/reset.c:379 +#: builtin/reset.c:388 msgid "Unstaged changes after reset:" msgstr "Промени извън индекса след зануляването:" -#: builtin/reset.c:385 +#: builtin/reset.c:394 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Индексът не може да бъде занулен към версия „%s“." -#: builtin/reset.c:389 +#: builtin/reset.c:398 msgid "Could not write new index file." msgstr "Новият индекс не може да бъде записан." -#: builtin/rev-list.c:358 +#: builtin/rev-list.c:361 msgid "rev-list does not support display of notes" msgstr "командата „rev-list“ не поддържа извеждането на бележки" -#: builtin/rev-parse.c:394 +#: builtin/rev-parse.c:402 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [ОПЦИЯ…] -- [АРГУМЕНТ…]" -#: builtin/rev-parse.c:399 +#: builtin/rev-parse.c:407 msgid "keep the `--` passed as an arg" msgstr "зададеният низ „--“ да се тълкува като аргумент" -#: builtin/rev-parse.c:401 +#: builtin/rev-parse.c:409 msgid "stop parsing after the first non-option argument" msgstr "спиране на анализа след първия аргумент, който не е опция" -#: builtin/rev-parse.c:404 +#: builtin/rev-parse.c:412 msgid "output in stuck long form" msgstr "изход в дългия формат" -#: builtin/rev-parse.c:535 +#: builtin/rev-parse.c:545 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -13108,11 +13304,11 @@ msgstr "позволяване на празни съобщения при по msgid "keep redundant, empty commits" msgstr "запазване на излишните, празни подавания" -#: builtin/revert.c:212 +#: builtin/revert.c:214 msgid "revert failed" msgstr "неуспешна отмяна" -#: builtin/revert.c:225 +#: builtin/revert.c:227 msgid "cherry-pick failed" msgstr "неуспешно отбиране" @@ -13187,17 +13383,17 @@ msgstr "" "изходният код да е 0, дори ако никой файл нe e напаснал с шаблона за " "изтриване" -#: builtin/rm.c:308 +#: builtin/rm.c:307 #, c-format msgid "not removing '%s' recursively without -r" msgstr "без използването на опцията „-r“ „%s“ няма да се изтрие рекурсивно" -#: builtin/rm.c:347 +#: builtin/rm.c:346 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: „%s“ не може да се изтрие" -#: builtin/rm.c:370 +#: builtin/rm.c:369 #, c-format msgid "could not remove '%s'" msgstr "„%s“ не може да бъде изтрит" @@ -13233,27 +13429,27 @@ msgstr "извеждане на състоянието от отдалечена msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" msgstr "git shortlog [ОПЦИЯ…] [ДИАПАЗОН_НА_ВЕРСИИТЕ] [[--] [ПЪТ…]]" -#: builtin/shortlog.c:249 +#: builtin/shortlog.c:263 msgid "Group by committer rather than author" msgstr "Групиране по подаващ, а не по автор" -#: builtin/shortlog.c:251 +#: builtin/shortlog.c:265 msgid "sort output according to the number of commits per author" msgstr "подредба на подаванията по броя подавания от автор" -#: builtin/shortlog.c:253 +#: builtin/shortlog.c:267 msgid "Suppress commit descriptions, only provides commit count" msgstr "Без описания на подаванията — да се показва само броя подавания" -#: builtin/shortlog.c:255 +#: builtin/shortlog.c:269 msgid "Show the email address of each author" msgstr "Извеждане на адреса на е-поща за всеки автор" -#: builtin/shortlog.c:256 +#: builtin/shortlog.c:270 msgid "w[,i1[,i2]]" msgstr "ШИРОЧИНА[,ОТСТЪП_1[,ОТСТЪП_2]]" -#: builtin/shortlog.c:257 +#: builtin/shortlog.c:271 msgid "Linewrap output" msgstr "" "Пренасяне на редовете до тази обща ШИРОЧИНА (76), с ОТСТЪП_1 (6) за първия " @@ -13461,35 +13657,35 @@ msgstr "пропускане на всички редове, които запо msgid "prepend comment character and space to each line" msgstr "добавяне на „# “ в началото на всеки ред" -#: builtin/submodule--helper.c:25 builtin/submodule--helper.c:1075 +#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1094 #, c-format msgid "No such ref: %s" msgstr "Такъв указател няма: %s" -#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084 +#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1103 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Очаква се пълно име на указател, а не „%s“" -#: builtin/submodule--helper.c:72 +#: builtin/submodule--helper.c:71 #, c-format msgid "cannot strip one component off url '%s'" msgstr "не може да се махне компонент от адреса „%s“" -#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630 +#: builtin/submodule--helper.c:302 builtin/submodule--helper.c:623 msgid "alternative anchor for relative paths" msgstr "директория за определянето на относителните пътища" -#: builtin/submodule--helper.c:310 +#: builtin/submodule--helper.c:307 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=ПЪТ] [ПЪТ…]" -#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380 +#: builtin/submodule--helper.c:350 builtin/submodule--helper.c:374 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "Във файла „.gitmodules“ не е открит адрес за пътя към подмодул „%s“" -#: builtin/submodule--helper.c:395 +#: builtin/submodule--helper.c:389 #, c-format msgid "" "could not lookup configuration '%s'. Assuming this repository is its own " @@ -13498,81 +13694,81 @@ msgstr "" "настройката „%s“ липсва. Приема се, че това хранилище е правилният източник " "за себе си." -#: builtin/submodule--helper.c:406 +#: builtin/submodule--helper.c:400 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Неуспешно регистриране на адрес за пътя към подмодул „%s“" -#: builtin/submodule--helper.c:410 +#: builtin/submodule--helper.c:404 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Регистриран е подмодул „%s“ (%s) за пътя към подмодул „%s“\n" -#: builtin/submodule--helper.c:420 +#: builtin/submodule--helper.c:414 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "ПРЕДУПРЕЖДЕНИЕ: препоръчва се режим на обновяване за подмодула „%s“\n" -#: builtin/submodule--helper.c:427 +#: builtin/submodule--helper.c:421 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" "Неуспешно регистриране на режима на обновяване за пътя към подмодул „%s“" -#: builtin/submodule--helper.c:443 +#: builtin/submodule--helper.c:437 msgid "Suppress output for initializing a submodule" msgstr "Без извеждане на информация при инициализирането на подмодул" -#: builtin/submodule--helper.c:448 +#: builtin/submodule--helper.c:442 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper name [ПЪТ]" -#: builtin/submodule--helper.c:476 +#: builtin/submodule--helper.c:470 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name ПЪТ" -#: builtin/submodule--helper.c:482 +#: builtin/submodule--helper.c:475 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "Във файла „.gitmodules“ липсва информация за пътя „%s“" -#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568 +#: builtin/submodule--helper.c:558 builtin/submodule--helper.c:561 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "към подмодула „%s“ не може да се добави алтернативен източник: %s" -#: builtin/submodule--helper.c:604 +#: builtin/submodule--helper.c:597 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "" "Непозната стойност „%s“ за настройката „submodule.alternateErrorStrategy“" -#: builtin/submodule--helper.c:611 +#: builtin/submodule--helper.c:604 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Непозната стойност „%s“ за настройката „submodule.alternateLocation“" -#: builtin/submodule--helper.c:633 +#: builtin/submodule--helper.c:626 msgid "where the new submodule will be cloned to" msgstr "къде да се клонира новият подмодул" -#: builtin/submodule--helper.c:636 +#: builtin/submodule--helper.c:629 msgid "name of the new submodule" msgstr "име на новия подмодул" -#: builtin/submodule--helper.c:639 +#: builtin/submodule--helper.c:632 msgid "url where to clone the submodule from" msgstr "адрес, от който да се клонира новият подмодул" -#: builtin/submodule--helper.c:645 +#: builtin/submodule--helper.c:638 msgid "depth for shallow clones" msgstr "дълбочина на плитките хранилища" -#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993 +#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:1012 msgid "force cloning progress" msgstr "извеждане на напредъка на клонирането" -#: builtin/submodule--helper.c:653 +#: builtin/submodule--helper.c:646 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -13580,85 +13776,85 @@ msgstr "" "git submodule--helper clone [--prefix=ПЪТ] [--quiet] [--reference ХРАНИЛИЩЕ] " "[--name ИМЕ] [--depth ДЪЛБОЧИНА] --url АДРЕС --path ПЪТ…" -#: builtin/submodule--helper.c:684 +#: builtin/submodule--helper.c:677 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "Неуспешно клониране на адреса „%s“ в пътя „%s“ като подмодул" -#: builtin/submodule--helper.c:699 +#: builtin/submodule--helper.c:692 #, c-format msgid "could not get submodule directory for '%s'" msgstr "директорията на подмодула „%s“ не може да бъде получена" -#: builtin/submodule--helper.c:764 +#: builtin/submodule--helper.c:757 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Пътят на подмодула „%s“ не е инициализиран" -#: builtin/submodule--helper.c:768 +#: builtin/submodule--helper.c:761 msgid "Maybe you want to use 'update --init'?" msgstr "Вероятно искахте да използвате „update --init“?" -#: builtin/submodule--helper.c:793 +#: builtin/submodule--helper.c:790 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Прескачане на неслетия подмодул „%s“" -#: builtin/submodule--helper.c:814 +#: builtin/submodule--helper.c:819 #, c-format msgid "Skipping submodule '%s'" msgstr "Прескачане на подмодула „%s“" -#: builtin/submodule--helper.c:942 +#: builtin/submodule--helper.c:952 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Неуспешен опит за клониране на „%s“. Насрочен е втори опит" -#: builtin/submodule--helper.c:953 +#: builtin/submodule--helper.c:963 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "" "Втори неуспешен опит за клониране на „%s“. Действието се преустановява" -#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162 +#: builtin/submodule--helper.c:993 builtin/submodule--helper.c:1213 msgid "path into the working tree" msgstr "път към работното дърво" -#: builtin/submodule--helper.c:977 +#: builtin/submodule--helper.c:996 msgid "path into the working tree, across nested submodule boundaries" msgstr "път към работното дърво, през границите на вложените подмодули" -#: builtin/submodule--helper.c:981 +#: builtin/submodule--helper.c:1000 msgid "rebase, merge, checkout or none" msgstr "" "„rebase“ (пребазиране), „merge“ (сливане), „checkout“ (изтегляне) или " "„none“ (нищо да не се прави)" -#: builtin/submodule--helper.c:985 +#: builtin/submodule--helper.c:1004 msgid "Create a shallow clone truncated to the specified number of revisions" -msgstr "Плитко клониране, ограничено до указания брой версии" +msgstr "Плитко клониране, отрязано до указания брой версии" -#: builtin/submodule--helper.c:988 +#: builtin/submodule--helper.c:1007 msgid "parallel jobs" msgstr "брой паралелни процеси" -#: builtin/submodule--helper.c:990 +#: builtin/submodule--helper.c:1009 msgid "whether the initial clone should follow the shallow recommendation" msgstr "дали първоначалното клониране да е плитко, както се препоръчва" -#: builtin/submodule--helper.c:991 +#: builtin/submodule--helper.c:1010 msgid "don't print cloning progress" msgstr "без извеждане на напредъка на клонирането" -#: builtin/submodule--helper.c:998 +#: builtin/submodule--helper.c:1017 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update_clone [--prefix=ПЪТ] [ПЪТ…]" -#: builtin/submodule--helper.c:1008 +#: builtin/submodule--helper.c:1030 msgid "bad value for update parameter" msgstr "неправилен параметър към опцията „--update“" -#: builtin/submodule--helper.c:1079 +#: builtin/submodule--helper.c:1098 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -13667,20 +13863,20 @@ msgstr "" "Клонът на подмодула „%s“ е настроен да наследява клона от обхващащия проект, " "но той не е на никой клон" -#: builtin/submodule--helper.c:1163 +#: builtin/submodule--helper.c:1214 msgid "recurse into submodules" msgstr "рекурсивно обхождане подмодулите" -#: builtin/submodule--helper.c:1169 +#: builtin/submodule--helper.c:1220 msgid "git submodule--helper embed-git-dir [<path>...]" msgstr "git submodule--helper name embed-git-dir [ПЪТ…]" -#: builtin/submodule--helper.c:1232 +#: builtin/submodule--helper.c:1278 #, c-format msgid "%s doesn't support --super-prefix" msgstr "„%s“ не поддържа опцията „--super-prefix“" -#: builtin/submodule--helper.c:1238 +#: builtin/submodule--helper.c:1284 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "„%s“ не е подкоманда на „submodule--helper“" @@ -13693,23 +13889,23 @@ msgstr "git symbolic-ref [ОПЦИЯ…] ИМЕ [УКАЗАТЕЛ]" msgid "git symbolic-ref -d [-q] <name>" msgstr "git symbolic-ref -d [-q] ИМЕ" -#: builtin/symbolic-ref.c:41 +#: builtin/symbolic-ref.c:40 msgid "suppress error message for non-symbolic (detached) refs" msgstr "без извеждане на грешка за несвързани (несимволни) указатели" -#: builtin/symbolic-ref.c:42 +#: builtin/symbolic-ref.c:41 msgid "delete symbolic ref" msgstr "изтриване на символен указател" -#: builtin/symbolic-ref.c:43 +#: builtin/symbolic-ref.c:42 msgid "shorten ref output" msgstr "кратка информация за указателя" -#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason" msgstr "причина" -#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason of the update" msgstr "причина за обновяването" @@ -13738,17 +13934,17 @@ msgstr "" msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=ФОРМАТ] ЕТИКЕТ…" -#: builtin/tag.c:84 +#: builtin/tag.c:86 #, c-format msgid "tag '%s' not found." msgstr "етикетът „%s“ не е открит." -#: builtin/tag.c:100 +#: builtin/tag.c:102 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Изтрит е етикетът „%s“ (бе „%s“)\n" -#: builtin/tag.c:129 +#: builtin/tag.c:131 #, c-format msgid "" "\n" @@ -13761,7 +13957,7 @@ msgstr "" " %s\n" "Редовете, които започват с „%c“, ще бъдат пропуснати.\n" -#: builtin/tag.c:133 +#: builtin/tag.c:135 #, c-format msgid "" "\n" @@ -13776,142 +13972,142 @@ msgstr "" "Редовете, които започват с „%c“, също ще бъдат включени — може да ги " "изтриете вие.\n" -#: builtin/tag.c:211 +#: builtin/tag.c:189 msgid "unable to sign the tag" msgstr "етикетът не може да бъде подписан" -#: builtin/tag.c:213 +#: builtin/tag.c:191 msgid "unable to write tag file" msgstr "файлът за етикета не може да бъде запазен" -#: builtin/tag.c:237 +#: builtin/tag.c:215 msgid "bad object type." msgstr "неправилен вид обект." -#: builtin/tag.c:283 +#: builtin/tag.c:261 msgid "no tag message?" msgstr "липсва съобщение за етикета" -#: builtin/tag.c:290 +#: builtin/tag.c:268 #, c-format msgid "The tag message has been left in %s\n" msgstr "Съобщението за етикета е запазено във файла „%s“\n" -#: builtin/tag.c:398 +#: builtin/tag.c:376 msgid "list tag names" msgstr "извеждане на имената на етикетите" -#: builtin/tag.c:400 +#: builtin/tag.c:378 msgid "print <n> lines of each tag message" msgstr "извеждане на този БРОЙ редове от всяко съобщение за етикет" -#: builtin/tag.c:402 +#: builtin/tag.c:380 msgid "delete tags" msgstr "изтриване на етикети" -#: builtin/tag.c:403 +#: builtin/tag.c:381 msgid "verify tags" msgstr "проверка на етикети" -#: builtin/tag.c:405 +#: builtin/tag.c:383 msgid "Tag creation options" msgstr "Опции при създаването на етикети" -#: builtin/tag.c:407 +#: builtin/tag.c:385 msgid "annotated tag, needs a message" msgstr "анотирането на етикети изисква съобщение" -#: builtin/tag.c:409 +#: builtin/tag.c:387 msgid "tag message" msgstr "СЪОБЩЕНИЕ за етикет" -#: builtin/tag.c:411 +#: builtin/tag.c:389 msgid "annotated and GPG-signed tag" msgstr "анотиран етикет с подпис по GPG" -#: builtin/tag.c:415 +#: builtin/tag.c:393 msgid "use another key to sign the tag" msgstr "използване на друг ключ за подписването на етикет" -#: builtin/tag.c:416 +#: builtin/tag.c:394 msgid "replace the tag if exists" msgstr "замяна на етикета, ако съществува" -#: builtin/tag.c:417 builtin/update-ref.c:369 +#: builtin/tag.c:395 builtin/update-ref.c:368 msgid "create a reflog" msgstr "създаване на журнал на указателите" -#: builtin/tag.c:419 +#: builtin/tag.c:397 msgid "Tag listing options" msgstr "Опции за извеждането на етикети" -#: builtin/tag.c:420 +#: builtin/tag.c:398 msgid "show tag list in columns" msgstr "извеждане на списъка на етикетите по колони" -#: builtin/tag.c:421 builtin/tag.c:423 +#: builtin/tag.c:399 builtin/tag.c:401 msgid "print only tags that contain the commit" msgstr "извеждане само на етикетите, които съдържат подаването" -#: builtin/tag.c:422 builtin/tag.c:424 +#: builtin/tag.c:400 builtin/tag.c:402 msgid "print only tags that don't contain the commit" msgstr "извеждане само на етикетите, които не съдържат подаването" -#: builtin/tag.c:425 +#: builtin/tag.c:403 msgid "print only tags that are merged" msgstr "извеждане само на слетите етикети" -#: builtin/tag.c:426 +#: builtin/tag.c:404 msgid "print only tags that are not merged" msgstr "извеждане само на неслетите етикети" -#: builtin/tag.c:431 +#: builtin/tag.c:409 msgid "print only tags of the object" msgstr "извеждане само на етикетите на ОБЕКТА" -#: builtin/tag.c:470 +#: builtin/tag.c:453 msgid "--column and -n are incompatible" msgstr "Опциите „--column“ и „-n“ са несъвместими" -#: builtin/tag.c:492 +#: builtin/tag.c:475 msgid "-n option is only allowed in list mode" msgstr "Опцията „-n“ изисква режим на списък." -#: builtin/tag.c:494 +#: builtin/tag.c:477 msgid "--contains option is only allowed in list mode" msgstr "Опцията „-contains“ изисква режим на списък." -#: builtin/tag.c:496 +#: builtin/tag.c:479 msgid "--no-contains option is only allowed in list mode" msgstr "Опцията „-contains“ изисква режим на списък." -#: builtin/tag.c:498 +#: builtin/tag.c:481 msgid "--points-at option is only allowed in list mode" msgstr "Опцията „-points-at“ изисква режим на списък." -#: builtin/tag.c:500 +#: builtin/tag.c:483 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "Опциите „--merged“ и „--no-merged“ изискват режим на списък." -#: builtin/tag.c:511 +#: builtin/tag.c:494 msgid "only one -F or -m option is allowed." msgstr "Опциите „-F“ и „-m“ са несъвместими." -#: builtin/tag.c:530 +#: builtin/tag.c:513 msgid "too many params" msgstr "Прекалено много аргументи" -#: builtin/tag.c:536 +#: builtin/tag.c:519 #, c-format msgid "'%s' is not a valid tag name." msgstr "„%s“ е неправилно име за етикет." -#: builtin/tag.c:541 +#: builtin/tag.c:524 #, c-format msgid "tag '%s' already exists" msgstr "етикетът „%s“ вече съществува" -#: builtin/tag.c:571 +#: builtin/tag.c:554 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Обновен етикет „%s“ (бе „%s“)\n" @@ -13990,137 +14186,137 @@ msgstr "" msgid " OK" msgstr " Добре" -#: builtin/update-index.c:569 +#: builtin/update-index.c:571 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [ОПЦИЯ…] [--] [ФАЙЛ…]" -#: builtin/update-index.c:924 +#: builtin/update-index.c:926 msgid "continue refresh even when index needs update" msgstr "" "продължаване с обновяването, дори когато индексът трябва да бъде обновен" -#: builtin/update-index.c:927 +#: builtin/update-index.c:929 msgid "refresh: ignore submodules" msgstr "подмодулите да се игнорират при обновяването" -#: builtin/update-index.c:930 +#: builtin/update-index.c:932 msgid "do not ignore new files" msgstr "новите файлове да не се игнорират" -#: builtin/update-index.c:932 +#: builtin/update-index.c:934 msgid "let files replace directories and vice-versa" msgstr "файлове да могат да заменят директории и обратно" -#: builtin/update-index.c:934 +#: builtin/update-index.c:936 msgid "notice files missing from worktree" msgstr "предупреждаване при липсващи в работното дърво файлове" -#: builtin/update-index.c:936 +#: builtin/update-index.c:938 msgid "refresh even if index contains unmerged entries" msgstr "обновяване дори и индексът да съдържа неслети обекти" -#: builtin/update-index.c:939 +#: builtin/update-index.c:941 msgid "refresh stat information" msgstr "обновяване на информацията от функцията „stat“" -#: builtin/update-index.c:943 +#: builtin/update-index.c:945 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "" "като опцията „--refresh“, но да се проверят и обектите, които са били приети " "за непроменени" -#: builtin/update-index.c:947 +#: builtin/update-index.c:949 msgid "<mode>,<object>,<path>" msgstr "РЕЖИМ,ОБЕКТ,ПЪТ" -#: builtin/update-index.c:948 +#: builtin/update-index.c:950 msgid "add the specified entry to the index" msgstr "добавяне на изброените обекти към индекса" -#: builtin/update-index.c:957 +#: builtin/update-index.c:959 msgid "mark files as \"not changing\"" msgstr "задаване на флаг, че файлът не се променя" -#: builtin/update-index.c:960 +#: builtin/update-index.c:962 msgid "clear assumed-unchanged bit" msgstr "изчистване на флага, че файлът не се променя" -#: builtin/update-index.c:963 +#: builtin/update-index.c:965 msgid "mark files as \"index-only\"" msgstr "задаване на флаг, че файловете са само за индекса" -#: builtin/update-index.c:966 +#: builtin/update-index.c:968 msgid "clear skip-worktree bit" msgstr "изчистване на флага, че файловете са само за индекса" -#: builtin/update-index.c:969 +#: builtin/update-index.c:971 msgid "add to index only; do not add content to object database" msgstr "добавяне само към индекса без добавяне към базата от данни за обектите" -#: builtin/update-index.c:971 +#: builtin/update-index.c:973 msgid "remove named paths even if present in worktree" msgstr "изтриване на указаните пътища, дори и да съществуват в работното дърво" -#: builtin/update-index.c:973 +#: builtin/update-index.c:975 msgid "with --stdin: input lines are terminated by null bytes" msgstr "" "при комбиниране с опцията „--stdin“ — входните редове са разделени с нулевия " "байт" -#: builtin/update-index.c:975 +#: builtin/update-index.c:977 msgid "read list of paths to be updated from standard input" msgstr "изчитане на списъка с пътища за обновяване от стандартния вход" -#: builtin/update-index.c:979 +#: builtin/update-index.c:981 msgid "add entries from standard input to the index" msgstr "добавяне на елементите от стандартния вход към индекса" -#: builtin/update-index.c:983 +#: builtin/update-index.c:985 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" "възстановяване на състоянието преди сливане или нужда от обновяване за " "изброените пътища" -#: builtin/update-index.c:987 +#: builtin/update-index.c:989 msgid "only update entries that differ from HEAD" msgstr "добавяне само на съдържанието, което се различава от това в „HEAD“" -#: builtin/update-index.c:991 +#: builtin/update-index.c:993 msgid "ignore files missing from worktree" msgstr "игнориране на файловете, които липсват в работното дърво" -#: builtin/update-index.c:994 +#: builtin/update-index.c:996 msgid "report actions to standard output" msgstr "извеждане на действията на стандартния изход" -#: builtin/update-index.c:996 +#: builtin/update-index.c:998 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" "забравяне на записаната информация за неразрешени конфликти — за командите " "от потребителско ниво" -#: builtin/update-index.c:1000 +#: builtin/update-index.c:1002 msgid "write index in this format" msgstr "записване на индекса в този формат" -#: builtin/update-index.c:1002 +#: builtin/update-index.c:1004 msgid "enable or disable split index" msgstr "включване или изключване на разделянето на индекса" -#: builtin/update-index.c:1004 +#: builtin/update-index.c:1006 msgid "enable/disable untracked cache" msgstr "включване/изключване на кеша за неследените файлове" -#: builtin/update-index.c:1006 +#: builtin/update-index.c:1008 msgid "test if the filesystem supports untracked cache" msgstr "проверка дали файловата система поддържа кеш за неследени файлове" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1010 msgid "enable untracked cache without testing the filesystem" msgstr "" "включване на кеша за неследените файлове без проверка на файловата система" -#: builtin/update-index.c:1108 +#: builtin/update-index.c:1107 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -14128,7 +14324,7 @@ msgstr "" "Настройката „core.splitIndex“ е зададена на „false“ (лъжа). Сменете я или я " "изтрийте, за да включите разделянето на индекса" -#: builtin/update-index.c:1117 +#: builtin/update-index.c:1116 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -14136,7 +14332,7 @@ msgstr "" "Настройката „core.splitIndex“ е зададена на „true“ (истина). Сменете я или " "я изтрийте, за да изключите разделянето на индекса." -#: builtin/update-index.c:1128 +#: builtin/update-index.c:1127 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -14144,11 +14340,11 @@ msgstr "" "Настройката „core.untrackedCache“ е зададена на „true“ (истина). Сменете я " "или я изтрийте, за да изключите кеша за неследените файлове" -#: builtin/update-index.c:1132 +#: builtin/update-index.c:1131 msgid "Untracked cache disabled" msgstr "Кешът за неследените файлове е изключен" -#: builtin/update-index.c:1140 +#: builtin/update-index.c:1139 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -14156,7 +14352,7 @@ msgstr "" "Настройката „core.untrackedCache“ е зададена на „false“ (лъжа). Сменете я " "или я изтрийте, за да включите кеша за неследените файлове" -#: builtin/update-index.c:1144 +#: builtin/update-index.c:1143 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Кешът за неследените файлове е включен за „%s“" @@ -14173,21 +14369,21 @@ msgstr "git update-ref [ОПЦИЯ…] ИМЕ_НА_УКАЗАТЕЛ НОВА_С msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [ОПЦИЯ…] --stdin [-z]" -#: builtin/update-ref.c:364 +#: builtin/update-ref.c:363 msgid "delete the reference" msgstr "изтриване на указателя" -#: builtin/update-ref.c:366 +#: builtin/update-ref.c:365 msgid "update <refname> not the one it points to" msgstr "обновяване на ИМЕто_НА_УКАЗАТЕЛя, а не това, към което сочи" -#: builtin/update-ref.c:367 +#: builtin/update-ref.c:366 msgid "stdin has NUL-terminated arguments" msgstr "" "някои от елементите подадени на стандартния вход завършват с нулевия знак " "„NUL“" -#: builtin/update-ref.c:368 +#: builtin/update-ref.c:367 msgid "read updates from stdin" msgstr "изчитане на указателите от стандартния вход" @@ -14251,105 +14447,114 @@ msgstr "git worktree prune [ОПЦИЯ…]" msgid "git worktree unlock <path>" msgstr "git worktree unlock [ПЪТ]" -#: builtin/worktree.c:44 +#: builtin/worktree.c:46 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Изтриване на „worktrees/%s“: не е правилна поддиректория" -#: builtin/worktree.c:50 +#: builtin/worktree.c:52 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Изтриване на „worktrees/%s“: файлът „gitdir“ не съществува" -#: builtin/worktree.c:55 +#: builtin/worktree.c:57 builtin/worktree.c:66 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "" "Изтриване на „worktrees/%s“: файлът „gitdir“ (%s) не може да бъде прочетен" -#: builtin/worktree.c:66 +#: builtin/worktree.c:76 +#, c-format +msgid "" +"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " +"%<PRIuMAX>)" +msgstr "" +"Изтриване на „worktrees/%s“: изчитането върна по-малко байтове от очакваното " +"(очаквани: %<PRIuMAX> байта, получени: %<PRIuMAX>)" + +#: builtin/worktree.c:84 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Изтриване на „worktrees/%s“: неправилен файл „gitdir“" -#: builtin/worktree.c:82 +#: builtin/worktree.c:100 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "" "Изтриване на „worktrees/%s“: файлът „gitdir“ сочи несъществуващо " "местоположение" -#: builtin/worktree.c:129 +#: builtin/worktree.c:147 msgid "report pruned working trees" msgstr "докладване на окастрените работни дървета" -#: builtin/worktree.c:131 +#: builtin/worktree.c:149 msgid "expire working trees older than <time>" msgstr "обявяване на работните копия по-стари от това ВРЕМЕ за остарели" -#: builtin/worktree.c:205 +#: builtin/worktree.c:223 #, c-format msgid "'%s' already exists" msgstr "„%s“ вече съществува" -#: builtin/worktree.c:236 +#: builtin/worktree.c:254 #, c-format msgid "could not create directory of '%s'" msgstr "директорията „%s“ не може да бъде създадена" -#: builtin/worktree.c:275 +#: builtin/worktree.c:293 #, c-format msgid "Preparing %s (identifier %s)" msgstr "Подготвяне на %s (идентификатор %s)" -#: builtin/worktree.c:327 +#: builtin/worktree.c:345 msgid "checkout <branch> even if already checked out in other worktree" msgstr "Изтегляне КЛОНа, дори и да е изтеглен в друго работно дърво" -#: builtin/worktree.c:329 +#: builtin/worktree.c:347 msgid "create a new branch" msgstr "създаване на нов клон" -#: builtin/worktree.c:331 +#: builtin/worktree.c:349 msgid "create or reset a branch" msgstr "създаване или зануляване на клони" -#: builtin/worktree.c:333 +#: builtin/worktree.c:351 msgid "populate the new working tree" msgstr "подготвяне на новото работно дърво" -#: builtin/worktree.c:334 +#: builtin/worktree.c:352 msgid "keep the new working tree locked" msgstr "новото работно дърво да остане заключено" -#: builtin/worktree.c:342 +#: builtin/worktree.c:360 msgid "-b, -B, and --detach are mutually exclusive" msgstr "Опциите „-b“, „-B“ и „--detach“ са несъвместими една с друга" -#: builtin/worktree.c:479 +#: builtin/worktree.c:499 msgid "reason for locking" msgstr "причина за заключване" -#: builtin/worktree.c:491 builtin/worktree.c:524 +#: builtin/worktree.c:511 builtin/worktree.c:544 #, c-format msgid "'%s' is not a working tree" msgstr "„%s“ не е работно дърво" -#: builtin/worktree.c:493 builtin/worktree.c:526 +#: builtin/worktree.c:513 builtin/worktree.c:546 msgid "The main working tree cannot be locked or unlocked" msgstr "Основното дърво не може да се отключи или заключи" -#: builtin/worktree.c:498 +#: builtin/worktree.c:518 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "„%s“ вече е заключено, защото „%s“" -#: builtin/worktree.c:500 +#: builtin/worktree.c:520 #, c-format msgid "'%s' is already locked" msgstr "„%s“ вече е заключено" -#: builtin/worktree.c:528 +#: builtin/worktree.c:548 #, c-format msgid "'%s' is not locked" msgstr "„%s“ не е заключено" @@ -14374,24 +14579,24 @@ msgstr "само за изчистване на грешки" msgid "git upload-pack [<options>] <dir>" msgstr "git upload-repack [ОПЦИЯ…] ДИРЕКТОРИЯ" -#: upload-pack.c:1041 +#: upload-pack.c:1040 msgid "quit after a single request/response exchange" msgstr "изход след първоначалната размяна на заявка и отговор" -#: upload-pack.c:1043 +#: upload-pack.c:1042 msgid "exit immediately after initial ref advertisement" msgstr "изход след първоначалната обява на указатели" -#: upload-pack.c:1045 +#: upload-pack.c:1044 msgid "do not try <directory>/.git/ if <directory> is no Git directory" msgstr "" "да не се търси „ДИРЕКТОРИЯ/.git/“, ако ДИРЕКТОРИЯта не е под контрола на Git" -#: upload-pack.c:1047 +#: upload-pack.c:1046 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "трансферът да се преустанови след този БРОЙ секунди" -#: credential-cache--daemon.c:224 +#: credential-cache--daemon.c:222 #, c-format msgid "" "The permissions on your socket directory are too loose; other\n" @@ -14406,7 +14611,7 @@ msgstr "" "\n" " chmod 0700 %s" -#: credential-cache--daemon.c:272 +#: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "извеждане на съобщенията за трасиране на стандартната грешка" @@ -14416,30 +14621,28 @@ msgid "" "concept guides. See 'git help <command>' or 'git help <concept>'\n" "to read about a specific subcommand or concept." msgstr "" -"„git help -a“ извежда наличните подкоманди, а „git help -g“ извежда " -"наличните\n" -"ръководства. За помощ за специфична КОМАНДА ползвайте „git help КОМАНДА“, а " -"за\n" +"„git help -a“ извежда наличните подкоманди, а „git help -g“ извежда наличните\n" +"ръководства. За помощ за специфична КОМАНДА ползвайте „git help КОМАНДА“, а за\n" "някое определено ПОНЯТИЕ използвайте „git help ПОНЯТИЕ“.\n" "\n" "Български превод на книгата „Pro Git“ от Чакън и Страуб:\n" "http://i-can.eu/progit2-bg/progit.html" -#: http.c:337 +#: http.c:338 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "" "отрицателна стойност за „http.postbuffer“. Ще се ползва стандартната: %d" -#: http.c:358 +#: http.c:359 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "Управлението на делегирането не се поддържа от cURL < 7.22.0" -#: http.c:367 +#: http.c:368 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "Задаването на постоянен публичен ключ не се поддържа от cURL < 7.44.0" -#: http.c:1764 +#: http.c:1768 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -14816,7 +15019,7 @@ msgstr "Не може да се открие общо подаване с „$pr #: git-merge-octopus.sh:77 #, sh-format -msgid "Already up-to-date with $pretty_name" +msgid "Already up to date with $pretty_name" msgstr "Вече е обновено до „$pretty_name“" #: git-merge-octopus.sh:89 @@ -14835,54 +15038,56 @@ msgstr "Простото сливане не сработи, пробва се #: git-rebase.sh:58 msgid "" -"When you have resolved this problem, run \"git rebase --continue\".\n" -"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" -"To check out the original branch and stop rebasing, run \"git rebase --abort" -"\"." +"Resolve all conflicts manually, mark them as resolved with\n" +"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" +"You can instead skip this commit: run \"git rebase --skip\".\n" +"To abort and get back to the state before \"git rebase\", run \"git rebase --" +"abort\"." msgstr "" -"След коригирането на този проблем изпълнете „git rebase --continue“.\n" +"След коригирането на конфликтите, отбележете решаването им чрез:\n" +"„git add/rm ФАЙЛ_С_КОНФЛИКТ…“ и изпълнете „git rebase --continue“.\n" "Ако предпочитате да прескочите тази кръпка, изпълнете „git rebase --skip“.\n" "За да откажете пребазирането и да се върнете към първоначалното състояние,\n" "изпълнете „git rebase --abort“." -#: git-rebase.sh:158 git-rebase.sh:397 +#: git-rebase.sh:160 git-rebase.sh:402 #, sh-format msgid "Could not move back to $head_name" msgstr "Връщането към „${head_name}“ е невъзможно" -#: git-rebase.sh:169 +#: git-rebase.sh:171 msgid "Applied autostash." msgstr "Автоматично скатаното е приложено." -#: git-rebase.sh:172 +#: git-rebase.sh:174 #, sh-format msgid "Cannot store $stash_sha1" msgstr "„${stash_sha1}“ не може да бъде запазен" -#: git-rebase.sh:212 +#: git-rebase.sh:214 msgid "The pre-rebase hook refused to rebase." msgstr "Куката за изпълнение преди пребазиране отхвърли пребазирането." -#: git-rebase.sh:217 +#: git-rebase.sh:219 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "" "Изглежда, че сега се прилагат кръпки чрез командата „git-am“. Не може да " "пребазирате в момента." -#: git-rebase.sh:358 +#: git-rebase.sh:363 msgid "No rebase in progress?" msgstr "Изглежда в момента не тече пребазиране" -#: git-rebase.sh:369 +#: git-rebase.sh:374 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "Опцията „--edit-todo“ е достъпна само по време на интерактивно пребазиране." -#: git-rebase.sh:376 +#: git-rebase.sh:381 msgid "Cannot read HEAD" msgstr "Указателят „HEAD“ не може да бъде прочетен" -#: git-rebase.sh:379 +#: git-rebase.sh:384 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -14890,7 +15095,7 @@ msgstr "" "Трябва да редактирате всички конфликти при сливането. След това\n" "отбележете коригирането им чрез командата „git add“" -#: git-rebase.sh:419 +#: git-rebase.sh:424 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -14911,106 +15116,106 @@ msgstr "" "за\n" "да не загубите случайно промени." -#: git-rebase.sh:470 +#: git-rebase.sh:480 #, sh-format msgid "invalid upstream $upstream_name" msgstr "неправилна основа за сравнение „${upstream_name}“" -#: git-rebase.sh:494 +#: git-rebase.sh:504 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "" "указателят „${onto_name}“ може да сочи към повече от една основа за " "пребазирането" -#: git-rebase.sh:497 git-rebase.sh:501 +#: git-rebase.sh:507 git-rebase.sh:511 #, sh-format msgid "$onto_name: there is no merge base" msgstr "указателят „${onto_name}“ не сочи към никаква основа за пребазирането" -#: git-rebase.sh:506 +#: git-rebase.sh:516 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "Указателят „${onto_name}“ не сочи към подаване" -#: git-rebase.sh:529 +#: git-rebase.sh:539 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "ФАТАЛНА ГРЕШКА: не съществува клон „${branch_name}“" -#: git-rebase.sh:562 +#: git-rebase.sh:572 msgid "Cannot autostash" msgstr "Не може да се скатае автоматично" -#: git-rebase.sh:567 +#: git-rebase.sh:577 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Автоматично скатано: „${stash_abbrev}“" -#: git-rebase.sh:571 +#: git-rebase.sh:581 msgid "Please commit or stash them." msgstr "Промените трябва или да се подадат, или да се скатаят." -#: git-rebase.sh:591 +#: git-rebase.sh:601 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "Текущият клон „${branch_name}“ е напълно актуален." -#: git-rebase.sh:595 +#: git-rebase.sh:605 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "" "Текущият клон „${branch_name}“ е напълно актуален. Пребазирането е " "принудително." -#: git-rebase.sh:606 +#: git-rebase.sh:616 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Промените от „${mb}“ към „${onto}“:" -#: git-rebase.sh:615 +#: git-rebase.sh:625 msgid "First, rewinding head to replay your work on top of it..." msgstr "" "Първо, указателят „HEAD“ започва да сочи към базата, върху която пребазирате…" -#: git-rebase.sh:625 +#: git-rebase.sh:635 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "Превъртане на „${branch_name}“ върху „${onto_name}“." -#: git-stash.sh:54 +#: git-stash.sh:61 msgid "git stash clear with parameters is unimplemented" msgstr "Командата „git stash clear“ не поддържа аргументи" -#: git-stash.sh:95 +#: git-stash.sh:102 msgid "You do not have the initial commit yet" msgstr "Все още липсва първоначално подаване" -#: git-stash.sh:110 +#: git-stash.sh:117 msgid "Cannot save the current index state" msgstr "Състоянието на текущия индекс не може да бъде запазено" -#: git-stash.sh:125 +#: git-stash.sh:132 msgid "Cannot save the untracked files" msgstr "Неследените файлове не могат да се запазят" -#: git-stash.sh:145 git-stash.sh:158 +#: git-stash.sh:152 git-stash.sh:165 msgid "Cannot save the current worktree state" msgstr "Състоянието на работното дърво не може да бъде запазено" -#: git-stash.sh:162 +#: git-stash.sh:169 msgid "No changes selected" msgstr "Не са избрани никакви промени" -#: git-stash.sh:165 +#: git-stash.sh:172 msgid "Cannot remove temporary index (can't happen)" msgstr "Временният индекс не може да бъде изтрит" -#: git-stash.sh:178 +#: git-stash.sh:185 msgid "Cannot record working tree state" msgstr "Състоянието на работното дърво не може да бъде запазено" -#: git-stash.sh:210 +#: git-stash.sh:217 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "" @@ -15026,7 +15231,7 @@ msgstr "" #. $ git stash save --blah-blah 2>&1 | head -n 2 #. error: unknown option for 'stash save': --blah-blah #. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:266 +#: git-stash.sh:273 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" @@ -15035,110 +15240,110 @@ msgstr "" "грешка: командата „git stash save“ не поддържа опция „${option}“\n" " За да зададете съобщение, изпълнете „git stash save -- '${option}'“" -#: git-stash.sh:281 +#: git-stash.sh:288 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "Опцията „--patch“ е несъвместима с „--include-untracked“ и „--all“" -#: git-stash.sh:289 +#: git-stash.sh:296 msgid "No local changes to save" msgstr "Няма никакви локални промени за скатаване" -#: git-stash.sh:294 +#: git-stash.sh:301 msgid "Cannot initialize stash" msgstr "Скатаването не може да стартира" -#: git-stash.sh:298 +#: git-stash.sh:305 msgid "Cannot save the current status" msgstr "Текущото състояние не може да бъде запазено" -#: git-stash.sh:299 +#: git-stash.sh:306 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "" "Състоянието на работната директория и индекса са запазени: „$stash_msg“" -#: git-stash.sh:326 +#: git-stash.sh:334 msgid "Cannot remove worktree changes" msgstr "Промените в работното дърво не могат да бъдат занулени" -#: git-stash.sh:474 +#: git-stash.sh:482 #, sh-format msgid "unknown option: $opt" msgstr "непозната опция: ${opt}" -#: git-stash.sh:487 +#: git-stash.sh:495 msgid "No stash entries found." msgstr "Не е открито нищо скатано." -#: git-stash.sh:494 +#: git-stash.sh:502 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Указани са прекалено много версии: „${REV}“" -#: git-stash.sh:509 +#: git-stash.sh:517 #, sh-format msgid "$reference is not a valid reference" msgstr "Указателят „${reference}“ е грешен" -#: git-stash.sh:537 +#: git-stash.sh:545 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "„${args}“ не е подаване, приличащо на нещо скатано" -#: git-stash.sh:548 +#: git-stash.sh:556 #, sh-format msgid "'$args' is not a stash reference" msgstr "„${args}“ не е указател към нещо скатано" -#: git-stash.sh:556 +#: git-stash.sh:564 msgid "unable to refresh index" msgstr "индексът не може да бъде обновен" -#: git-stash.sh:560 +#: git-stash.sh:568 msgid "Cannot apply a stash in the middle of a merge" msgstr "По време на сливане не може да приложите нещо скатано" -#: git-stash.sh:568 +#: git-stash.sh:576 msgid "Conflicts in index. Try without --index." msgstr "" "В индекса има конфликти. Пробвайте да изпълните командата без опцията „--" "index“." -#: git-stash.sh:570 +#: git-stash.sh:578 msgid "Could not save index tree" msgstr "Дървото сочено от индекса не може да бъде запазено" -#: git-stash.sh:579 +#: git-stash.sh:587 msgid "Could not restore untracked files from stash entry" msgstr "Неследени файлове не могат да се възстановят от скатаното" -#: git-stash.sh:604 +#: git-stash.sh:612 msgid "Cannot unstage modified files" msgstr "Променените файлове не могат да бъдат извадени от индекса" -#: git-stash.sh:619 +#: git-stash.sh:627 msgid "Index was not unstashed." msgstr "Индексът не е скатан." -#: git-stash.sh:633 +#: git-stash.sh:641 msgid "The stash entry is kept in case you need it again." msgstr "Скатаното е запазено в случай, че ви потрябва отново" -#: git-stash.sh:642 +#: git-stash.sh:650 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Изтрито е скатаното „${REV}“ ($s)" -#: git-stash.sh:643 +#: git-stash.sh:651 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "Скатаното „${REV}“ не може да бъде изтрито" -#: git-stash.sh:651 +#: git-stash.sh:659 msgid "No branch name specified" msgstr "Не е указано име на клон" -#: git-stash.sh:730 +#: git-stash.sh:738 msgid "(To restore them type \"git stash apply\")" msgstr "(За да ги възстановите, изпълнете командата „git stash apply“)" @@ -15294,17 +15499,17 @@ msgstr "" "Премахната е регистрацията на подмодул „${name}“, сочещ към адрес „${url}“, " "за пътя „${displaypath}“" -#: git-submodule.sh:638 +#: git-submodule.sh:637 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "Текущата версия за подмодула в „${displaypath}“ липсва" -#: git-submodule.sh:648 +#: git-submodule.sh:647 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Неуспешно доставяне в пътя към подмодул „${sm_path}“" -#: git-submodule.sh:653 +#: git-submodule.sh:652 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -15313,12 +15518,12 @@ msgstr "" "Текущата версия „${remote_name}/${branch}“ в пътя към подмодул „${sm_path}“ " "липсва" -#: git-submodule.sh:671 +#: git-submodule.sh:670 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "Неуспешно доставяне в пътя към подмодул „${displaypath}“" -#: git-submodule.sh:677 +#: git-submodule.sh:676 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -15327,93 +15532,93 @@ msgstr "" "Подмодулът в пътя „$displaypath“ е доставен, но не съдържа обекта със сума\n" "„$sha1“. Директното доставяне на това подаване е неуспешно." -#: git-submodule.sh:684 +#: git-submodule.sh:683 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" "Неуспешно изтегляне на версия „${sha1}“ в пътя към подмодул „${displaypath}“'" -#: git-submodule.sh:685 +#: git-submodule.sh:684 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Път към подмодул „${displaypath}“: изтеглена е версия „${sha1}“" -#: git-submodule.sh:689 +#: git-submodule.sh:688 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" "Неуспешно пребазиране на версия „${sha1}“ в пътя към подмодул " "„${displaypath}“" -#: git-submodule.sh:690 +#: git-submodule.sh:689 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Път към подмодул „${displaypath}“: пребазиране върху версия „${sha1}“" -#: git-submodule.sh:695 +#: git-submodule.sh:694 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" "Неуспешно сливане на версия „${sha1}“ в пътя към подмодул „${displaypath}“" -#: git-submodule.sh:696 +#: git-submodule.sh:695 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Път към подмодул „${displaypath}“: сливане с версия „${sha1}“" -#: git-submodule.sh:701 +#: git-submodule.sh:700 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "Неуспешно изпълнение на командата „${command} ${sha1}“ в пътя към подмодул " "„${displaypath}“" -#: git-submodule.sh:702 +#: git-submodule.sh:701 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Път към подмодул „${displaypath}“: „${command} ${sha1}“" -#: git-submodule.sh:733 +#: git-submodule.sh:732 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "" "Неуспешна обработка на поддиректориите в пътя към подмодул „${displaypath}“" -#: git-submodule.sh:841 +#: git-submodule.sh:840 msgid "The --cached option cannot be used with the --files option" msgstr "Опциите „--cached“ и „--files“ са несъвместими" -#: git-submodule.sh:893 +#: git-submodule.sh:892 #, sh-format msgid "unexpected mode $mod_dst" msgstr "неочакван режим „${mod_dst}“" -#: git-submodule.sh:913 +#: git-submodule.sh:912 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr "" " ПРЕДУПРЕЖДЕНИЕ: „${display_name}“ не съдържа подаването „${sha1_src}“" -#: git-submodule.sh:916 +#: git-submodule.sh:915 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr "" " ПРЕДУПРЕЖДЕНИЕ: „${display_name}“ не съдържа подаването „${sha1_dst}“" -#: git-submodule.sh:919 +#: git-submodule.sh:918 #, 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:1065 +#: git-submodule.sh:1064 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "" "Неуспешна обработка на поддиректориите в пътя към подмодул „${sm_path}“" -#: git-submodule.sh:1137 +#: git-submodule.sh:1136 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Синхронизиране на адреса за пътя към подмодул „${displaypath}“" @@ -15432,13 +15637,13 @@ msgstr "Пребазиране ($new_count/$total)" msgid "" "\n" "Commands:\n" -" p, pick = use commit\n" -" r, reword = use commit, but edit the commit message\n" -" e, edit = use commit, but stop for amending\n" -" s, squash = use commit, but meld into previous commit\n" -" f, fixup = like \"squash\", but discard this commit's log message\n" -" x, exec = run command (the rest of the line) using shell\n" -" d, drop = remove commit\n" +"p, pick = use commit\n" +"r, reword = use commit, but edit the commit message\n" +"e, edit = use commit, but stop for amending\n" +"s, squash = use commit, but meld into previous commit\n" +"f, fixup = like \"squash\", but discard this commit's log message\n" +"x, exec = run command (the rest of the line) using shell\n" +"d, drop = remove commit\n" "\n" "These lines can be re-ordered; they are executed from top to bottom.\n" msgstr "" @@ -15527,49 +15732,49 @@ msgstr "Указателят „HEAD“ не може да се насочи к msgid "Refusing to squash a merge: $sha1" msgstr "Подаването не може да се смачка: „$sha1“" -#: git-rebase--interactive.sh:399 +#: git-rebase--interactive.sh:400 #, sh-format msgid "Error redoing merge $sha1" msgstr "Грешка при повтарянето на сливането на „$sha1“" -#: git-rebase--interactive.sh:407 +#: git-rebase--interactive.sh:408 #, sh-format msgid "Could not pick $sha1" msgstr "„$sha1“ не може да се отбере." -#: git-rebase--interactive.sh:416 +#: git-rebase--interactive.sh:417 #, sh-format msgid "This is the commit message #${n}:" msgstr "Това е съобщение при подаване №${n}:" -#: git-rebase--interactive.sh:421 +#: git-rebase--interactive.sh:422 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "Съобщение при подаване №${n} ще бъде прескочено." -#: git-rebase--interactive.sh:432 +#: git-rebase--interactive.sh:433 #, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." msgstr[0] "Това е обединение от $count подаване." msgstr[1] "Това е обединение от $count подавания." -#: git-rebase--interactive.sh:441 +#: git-rebase--interactive.sh:442 #, sh-format msgid "Cannot write $fixup_msg" msgstr "Новото съобщение при подаване „$fixup_msg“ не може да бъде запазено" -#: git-rebase--interactive.sh:444 +#: git-rebase--interactive.sh:445 msgid "This is a combination of 2 commits." msgstr "Това е обединение от 2 подавания" -#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528 -#: git-rebase--interactive.sh:531 +#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529 +#: git-rebase--interactive.sh:532 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "Не може да се подаде $sha1… $rest" -#: git-rebase--interactive.sh:559 +#: git-rebase--interactive.sh:560 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -15585,31 +15790,31 @@ msgstr "" "коригирате,\n" "преди да можете да промените подаването." -#: git-rebase--interactive.sh:574 +#: git-rebase--interactive.sh:575 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "Спиране при „$sha1_abbrev…“ $rest" -#: git-rebase--interactive.sh:589 +#: git-rebase--interactive.sh:590 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "Без предишно подаване не може да се изпълни „$squash_style“" -#: git-rebase--interactive.sh:631 +#: git-rebase--interactive.sh:632 #, sh-format msgid "Executing: $rest" msgstr "В момента се изпълнява: $rest" -#: git-rebase--interactive.sh:639 +#: git-rebase--interactive.sh:640 #, sh-format msgid "Execution failed: $rest" msgstr "Неуспешно изпълнение: $rest" -#: git-rebase--interactive.sh:641 +#: git-rebase--interactive.sh:642 msgid "and made changes to the index and/or the working tree" msgstr "и промени индекса и/или работното дърво" -#: git-rebase--interactive.sh:643 +#: git-rebase--interactive.sh:644 msgid "" "You can fix the problem, and then run\n" "\n" @@ -15620,7 +15825,7 @@ msgstr "" " git rebase --continue" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--interactive.sh:656 +#: git-rebase--interactive.sh:657 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -15635,99 +15840,29 @@ msgstr "" "\n" " git rebase --continue" -#: git-rebase--interactive.sh:667 +#: git-rebase--interactive.sh:668 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "Непозната команда: $command $sha1 $rest" -#: git-rebase--interactive.sh:668 +#: git-rebase--interactive.sh:669 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "Коригирайте това чрез „git rebase --edit-todo“." -#: git-rebase--interactive.sh:703 +#: git-rebase--interactive.sh:704 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "Успешно пребазиране и обновяване на „$head_name“." -#: git-rebase--interactive.sh:750 -msgid "Could not skip unnecessary pick commands" -msgstr "Излишните команди да отбиране не могат да бъдат прескочени" - -#: git-rebase--interactive.sh:908 -#, sh-format -msgid "" -"Warning: the SHA-1 is missing or isn't a commit in the following line:\n" -" - $line" -msgstr "" -"Предупреждение: сумата по SHA1, указана към командата на реда:\n" -" - $line\n" -" липсва или не е представлява подаване" - -#: git-rebase--interactive.sh:941 -#, sh-format -msgid "" -"Warning: the command isn't recognized in the following line:\n" -" - $line" -msgstr "" -"Предупреждение: непозната команда на ред:\n" -" - $line" - -#: git-rebase--interactive.sh:980 +#: git-rebase--interactive.sh:749 msgid "could not detach HEAD" msgstr "указателят „HEAD“ не може да се отдели" -#: git-rebase--interactive.sh:1018 -msgid "" -"Warning: some commits may have been dropped accidentally.\n" -"Dropped commits (newer to older):" -msgstr "" -"Предупреждение: някои подавания може да са пропуснати.\n" -"\n" -"Пропуснати подавания (новите са най-отгоре):" - -#: git-rebase--interactive.sh:1026 -msgid "" -"To avoid this message, use \"drop\" to explicitly remove a commit.\n" -"\n" -"Use 'git config rebase.missingCommitsCheck' to change the level of " -"warnings.\n" -"The possible behaviours are: ignore, warn, error." -msgstr "" -"За да не получавате това съобщение, изрично ползвайте командата „drop“.\n" -"\n" -"Настройката „rebase.missingCommitsCheck“ управлява нивото на предупреждение\n" -"Възможните стойности са „ignore“ (пренебрегване), „warn“ (само " -"предупреждение)\n" -"или „error“ (считане за грешка)." - -#: git-rebase--interactive.sh:1037 -#, sh-format -msgid "" -"Unrecognized setting $check_level for option rebase.missingCommitsCheck. " -"Ignoring." -msgstr "" -"Непозната стойност „$check_level“ за настройката „rebase." -"missingCommitsCheck“.\n" -"Настройката се прескача." - -#: git-rebase--interactive.sh:1054 -msgid "" -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" -"continue'." -msgstr "" -"Можете да промените това с командите „git rebase --edit-todo“ и „git rebase " -"--continue“ след това." - -#: git-rebase--interactive.sh:1055 -msgid "Or you can abort the rebase with 'git rebase --abort'." -msgstr "" -"Може и да преустановите пребазирането с командата „git rebase --abort“." - -#: git-rebase--interactive.sh:1083 +#: git-rebase--interactive.sh:784 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "Указателят „CHERRY_PICK_HEAD“ не може да бъде изтрит" -#: git-rebase--interactive.sh:1088 +#: git-rebase--interactive.sh:789 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -15757,11 +15892,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--interactive.sh:1105 +#: git-rebase--interactive.sh:806 msgid "Error trying to find the author identity to amend commit" msgstr "Не може да бъде открит автор за поправянето на подаването" -#: git-rebase--interactive.sh:1110 +#: git-rebase--interactive.sh:811 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -15769,11 +15904,11 @@ msgstr "" "В работното дърво има неподадени промени. Първо ги подайте, а след това\n" "отново изпълнете „git rebase --continue“." -#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119 +#: git-rebase--interactive.sh:816 git-rebase--interactive.sh:820 msgid "Could not commit staged changes." msgstr "Промените в индекса не могат да бъдат подадени." -#: git-rebase--interactive.sh:1147 +#: git-rebase--interactive.sh:848 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -15787,33 +15922,33 @@ msgstr "" " git rebase --continue\n" "\n" -#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313 +#: git-rebase--interactive.sh:856 git-rebase--interactive.sh:1015 msgid "Could not execute editor" msgstr "Текстовият редактор не може да бъде стартиран" -#: git-rebase--interactive.sh:1168 +#: git-rebase--interactive.sh:869 #, sh-format msgid "Could not checkout $switch_to" msgstr "„$switch_to“ не може да се изтегли" -#: git-rebase--interactive.sh:1173 +#: git-rebase--interactive.sh:874 msgid "No HEAD?" msgstr "Липсва указател „HEAD“" -#: git-rebase--interactive.sh:1174 +#: git-rebase--interactive.sh:875 #, sh-format msgid "Could not create temporary $state_dir" msgstr "Временната директория „$state_dir“ не може да бъде създадена" -#: git-rebase--interactive.sh:1176 +#: git-rebase--interactive.sh:877 msgid "Could not mark as interactive" msgstr "Пребазирането не е интерактивно" -#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191 +#: git-rebase--interactive.sh:887 git-rebase--interactive.sh:892 msgid "Could not init rewritten commits" msgstr "Списъкът с презаписаните подавания не може да бъде създаден" -#: git-rebase--interactive.sh:1291 +#: git-rebase--interactive.sh:993 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" @@ -15822,7 +15957,7 @@ msgstr[0] "" msgstr[1] "" "Пребазиране на $shortrevisions върху $shortonto ($todocount команди)" -#: git-rebase--interactive.sh:1296 +#: git-rebase--interactive.sh:998 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -15832,7 +15967,7 @@ msgstr "" "Ако изтриете всичко, пребазирането ще бъде преустановено.\n" "\n" -#: git-rebase--interactive.sh:1303 +#: git-rebase--interactive.sh:1005 msgid "Note that empty commits are commented out" msgstr "Празните подавания са коментирани" @@ -16450,64 +16585,64 @@ msgstr "" msgid "local time offset greater than or equal to 24 hours\n" msgstr "разликата между местния часовия пояс и GMT е 24 часа или повече\n" -#: git-send-email.perl:208 git-send-email.perl:214 +#: git-send-email.perl:207 git-send-email.perl:213 msgid "the editor exited uncleanly, aborting everything" msgstr "" "текстовият редактор приключи работата с грешка, всичко се преустановява" -#: git-send-email.perl:291 +#: git-send-email.perl:290 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "„%s“ съдържа временна версия на подготвяното е-писмо.\n" -#: git-send-email.perl:296 +#: git-send-email.perl:295 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "„%s.final“ съдържа подготвеното е-писмо.\n" -#: git-send-email.perl:314 +#: git-send-email.perl:313 msgid "--dump-aliases incompatible with other options\n" msgstr "опцията „--dump-aliases“ е несъвместима с другите опции\n" -#: git-send-email.perl:379 git-send-email.perl:634 +#: git-send-email.perl:378 git-send-email.perl:629 msgid "Cannot run git format-patch from outside a repository\n" msgstr "Командата „git format-patch“ не може да се изпълни извън хранилище\n" -#: git-send-email.perl:448 +#: git-send-email.perl:447 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "Непознато поле за опцията „--suppress-cc“: „%s“\n" -#: git-send-email.perl:477 +#: git-send-email.perl:476 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "Непозната стойност за „--confirm“: %s\n" -#: git-send-email.perl:509 +#: git-send-email.perl:504 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "" "ПРЕДУПРЕЖДЕНИЕ: синоними за sendmail съдържащи кавички („\"“) не се " "поддържат: %s\n" -#: git-send-email.perl:511 +#: git-send-email.perl:506 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "ПРЕДУПРЕЖДЕНИЕ: „:include:“ не се поддържа: %s\n" -#: git-send-email.perl:513 +#: git-send-email.perl:508 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "" "ПРЕДУПРЕЖДЕНИЕ: пренасочвания „/file“ или „|pipe“ не се поддържат: %s\n" -#: git-send-email.perl:518 +#: git-send-email.perl:513 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "ПРЕДУПРЕЖДЕНИЕ: редът за „sendmail“ не е разпознат: %s\n" -#: git-send-email.perl:600 +#: git-send-email.perl:595 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -16522,12 +16657,12 @@ msgstr "" " ● укажете „./%s“ за файл;\n" " ● използвате опцията „--format-patch“ за диапазон.\n" -#: git-send-email.perl:621 +#: git-send-email.perl:616 #, perl-format msgid "Failed to opendir %s: %s" msgstr "Директорията „%s“ не може да се отвори: %s" -#: git-send-email.perl:645 +#: git-send-email.perl:640 #, perl-format msgid "" "fatal: %s: %s\n" @@ -16536,7 +16671,7 @@ msgstr "" "ФАТАЛНА ГРЕШКА: %s: %s\n" "ПРЕДУПРЕЖДЕНИЕ: не са пратени никакви кръпки\n" -#: git-send-email.perl:656 +#: git-send-email.perl:651 msgid "" "\n" "No patch files specified!\n" @@ -16546,17 +16681,17 @@ msgstr "" "Не са указани кръпки!\n" "\n" -#: git-send-email.perl:669 +#: git-send-email.perl:664 #, perl-format msgid "No subject line in %s?" msgstr "В „%s“ липсва тема" -#: git-send-email.perl:679 +#: git-send-email.perl:674 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "„%s“ не може да се отвори за запис: %s" -#: git-send-email.perl:689 +#: git-send-email.perl:684 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -16571,32 +16706,32 @@ msgstr "" "\n" "Изтрийте всичко, ако не искате да изпратите обобщаващо писмо.\n" -#: git-send-email.perl:712 +#: git-send-email.perl:707 #, perl-format msgid "Failed to open %s.final: %s" msgstr "„%s.final“ не може да се отвори: %s" -#: git-send-email.perl:715 +#: git-send-email.perl:710 #, perl-format msgid "Failed to open %s: %s" msgstr "„%s“ не може да се отвори: %s" -#: git-send-email.perl:750 +#: 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:759 +#: git-send-email.perl:754 msgid "Summary email is empty, skipping it\n" msgstr "Обобщаващото писмо е празно и се прескача\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:791 +#: git-send-email.perl:786 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "Сигурни ли сте, че искате да ползвате „%s“ [y/N]? " -#: git-send-email.perl:820 +#: git-send-email.perl:815 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" @@ -16604,11 +16739,11 @@ msgstr "" "Следните файлове са 8 битови, но не са с обявена заглавна част „Content-" "Transfer-Encoding“.\n" -#: git-send-email.perl:825 +#: git-send-email.perl:820 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "Кое 8 битово кодиране се ползва [стандартно: UTF-8]? " -#: git-send-email.perl:833 +#: git-send-email.perl:828 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -16621,22 +16756,22 @@ msgstr "" "все още е с шаблонното заглавие „*** SUBJECT HERE ***“. Ползвайте опцията\n" "„--force“, ако сте сигурни, че точно това искате да изпратите.\n" -#: git-send-email.perl:852 +#: git-send-email.perl:847 msgid "To whom should the emails be sent (if anyone)?" msgstr "На кой да се пратят е-писмата (незадължително поле)" -#: git-send-email.perl:870 +#: git-send-email.perl:865 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "ФАТАЛНА ГРЕШКА: „%s“ е синоним на себе си\n" -#: git-send-email.perl:882 +#: git-send-email.perl:877 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:932 git-send-email.perl:940 +#: git-send-email.perl:927 git-send-email.perl:935 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "ГРЕШКА: не може да се извлече адрес от „%s“\n" @@ -16644,18 +16779,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:944 +#: git-send-email.perl:939 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "" "Какво да се направи с този адрес? „q“ (спиране), „d“ (изтриване), " "„e“ (редактиране): " -#: git-send-email.perl:1245 +#: git-send-email.perl:1260 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "Пътят към сертификат „%s“ не съществува." -#: git-send-email.perl:1320 +#: git-send-email.perl:1335 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -16683,131 +16818,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:1335 +#: git-send-email.perl:1350 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): " msgstr "" "Изпращане на е-писмото? „y“ (да), „n“ (не), „q“ (изход), „a“ (всичко): " -#: git-send-email.perl:1338 +#: git-send-email.perl:1353 msgid "Send this email reply required" msgstr "Изискване на отговор към това е-писмо" -#: git-send-email.perl:1364 +#: git-send-email.perl:1379 msgid "The required SMTP server is not properly defined." msgstr "Сървърът за SMTP не е настроен правилно." -#: git-send-email.perl:1411 +#: git-send-email.perl:1426 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Сървърът не поддържа „STARTTLS“! %s" -#: git-send-email.perl:1416 git-send-email.perl:1420 +#: git-send-email.perl:1431 git-send-email.perl:1435 #, perl-format msgid "STARTTLS failed! %s" msgstr "Неуспешно изпълнение на STARTTLS! %s" -#: git-send-email.perl:1430 +#: git-send-email.perl:1445 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" "Подсистемата за SMTP не може да се инициализира. Проверете настройките и " "използвайте опцията: „--smtp-debug“." -#: git-send-email.perl:1448 +#: git-send-email.perl:1463 #, perl-format msgid "Failed to send %s\n" msgstr "„%s“ не може да бъде изпратен\n" -#: git-send-email.perl:1451 +#: git-send-email.perl:1466 #, perl-format msgid "Dry-Sent %s\n" msgstr "Проба за изпращане на „%s“\n" -#: git-send-email.perl:1451 +#: git-send-email.perl:1466 #, perl-format msgid "Sent %s\n" msgstr "Изпращане на „%s“\n" -#: git-send-email.perl:1453 +#: git-send-email.perl:1468 msgid "Dry-OK. Log says:\n" msgstr "Успех при пробата. От журнала:\n" -#: git-send-email.perl:1453 +#: git-send-email.perl:1468 msgid "OK. Log says:\n" msgstr "Успех. От журнала:\n" -#: git-send-email.perl:1465 +#: git-send-email.perl:1480 msgid "Result: " msgstr "Резултат: " -#: git-send-email.perl:1468 +#: git-send-email.perl:1483 msgid "Result: OK\n" msgstr "Резултат: успех\n" -#: git-send-email.perl:1481 +#: git-send-email.perl:1496 #, perl-format msgid "can't open file %s" msgstr "файлът „%s“ не може да бъде отворен" -#: git-send-email.perl:1528 git-send-email.perl:1548 +#: git-send-email.perl:1543 git-send-email.perl:1563 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Добавяне на „як: %s“ от ред „%s“\n" -#: git-send-email.perl:1534 +#: git-send-email.perl:1549 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) Добавяне на „до: %s“ от ред „%s“\n" -#: git-send-email.perl:1582 +#: git-send-email.perl:1597 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(не-mbox) Добавяне на „як: %s“ от ред „%s“\n" -#: git-send-email.perl:1605 +#: git-send-email.perl:1622 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(тяло) Добавяне на „як: %s“ от ред „%s“\n" -#: git-send-email.perl:1711 +#: git-send-email.perl:1728 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Не може да бъде се изпълни „%s“" -#: git-send-email.perl:1718 +#: git-send-email.perl:1735 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Добавяне на „%s: %s“ от: „%s“\n" -#: git-send-email.perl:1722 +#: git-send-email.perl:1739 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) програмният канал не може да се затвори за изпълнението на „%s“" -#: git-send-email.perl:1749 +#: git-send-email.perl:1766 msgid "cannot send message as 7bit" msgstr "съобщението не може да се изпрати чрез 7 битови знаци" -#: git-send-email.perl:1757 +#: git-send-email.perl:1774 msgid "invalid transfer encoding" msgstr "неправилно кодиране за пренос" -#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856 +#: git-send-email.perl:1812 git-send-email.perl:1863 git-send-email.perl:1873 #, perl-format msgid "unable to open %s: %s\n" msgstr "„%s“ не може да се отвори: %s\n" -#: git-send-email.perl:1798 +#: git-send-email.perl:1815 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "„%s“: кръпката съдържа ред с над 988 знака" -#: git-send-email.perl:1814 +#: git-send-email.perl:1831 #, 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:1818 +#: git-send-email.perl:1835 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Наистина ли искате да изпратите „%s“? [y|N]: " diff --git a/po/es.po b/po/es.po new file mode 100644 index 0000000000..62ded060d4 --- /dev/null +++ b/po/es.po @@ -0,0 +1,16595 @@ +# Spanish translations for Git. +# Copyright (C) 2017 Christopher Diaz Riveros <christopher.diaz.riv@gmail.com> +# This file is distributed under the same license as the Git package. +# Christopher Diaz Riveros <christopher.diaz.riv@gmail.com>, 2017. +# +msgid "" +msgstr "" +"Project-Id-Version: Git\n" +"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" +"POT-Creation-Date: 2017-10-08 09:48+0800\n" +"PO-Revision-Date: 2017-10-08 11:17-0500\n" +"Last-Translator: christopher.diaz.riv@gmail.com\n" +"Language-Team: CodeLabora <codelabora@gmail.com>\n" +"Language: es\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 1.8.5\n" + +#: advice.c:58 +#, c-format +msgid "hint: %.*s\n" +msgstr "ayuda: %.*s\n" + +#: advice.c:86 +msgid "Cherry-picking is not possible because you have unmerged files." +msgstr "" +"No es posible ejecutar cherry-picking porque tienes archivos sin fusionar." + +#: advice.c:88 +msgid "Committing is not possible because you have unmerged files." +msgstr "No es posible realizar un commit porque tienes archivos sin fusionar." + +#: advice.c:90 +msgid "Merging is not possible because you have unmerged files." +msgstr "No es posible hacer merge porque tienes archivos sin fusionar." + +#: advice.c:92 +msgid "Pulling is not possible because you have unmerged files." +msgstr "No es posible hacer pull porque tienes archivos sin fusionar." + +#: advice.c:94 +msgid "Reverting is not possible because you have unmerged files." +msgstr "No es posible revertir porque tienes archivos sin fusionar." + +#: advice.c:96 +#, c-format +msgid "It is not possible to %s because you have unmerged files." +msgstr "No es posible %s porque tienes archivos sin fusionar." + +#: advice.c:104 +msgid "" +"Fix them up in the work tree, and then use 'git add/rm <file>'\n" +"as appropriate to mark resolution and make a commit." +msgstr "" +"Corrígelos en el árbol de trabajo y entonces usa 'git add/rm <archivo>',\n" +"como sea apropiado, para marcar la resolución y realizar un commit." + +#: advice.c:112 +msgid "Exiting because of an unresolved conflict." +msgstr "Saliendo porque existe un conflicto sin resolver." + +#: advice.c:117 builtin/merge.c:1211 +msgid "You have not concluded your merge (MERGE_HEAD exists)." +msgstr "No has concluido tu fusión (MERGE_HEAD existe)." + +#: advice.c:119 +msgid "Please, commit your changes before merging." +msgstr "Por favor, realiza un commit antes de fusionar." + +#: advice.c:120 +msgid "Exiting because of unfinished merge." +msgstr "Saliendo por una fusion inconclusa." + +#: advice.c:126 +#, c-format +msgid "" +"Note: checking out '%s'.\n" +"\n" +"You are in 'detached HEAD' state. You can look around, make experimental\n" +"changes and commit them, and you can discard any commits you make in this\n" +"state without impacting any branches by performing another checkout.\n" +"\n" +"If you want to create a new branch to retain commits you create, you may\n" +"do so (now or later) by using -b with the checkout command again. Example:\n" +"\n" +" git checkout -b <new-branch-name>\n" +"\n" +msgstr "" +"Nota: actualizando el árbol de trabajo '%s'.\n" +"\n" +"Te encuentras en estado 'detached HEAD'. Puedes revisar por aquí, hacer\n" +"cambios experimentales y confirmarlos, y puedes descartar cualquier\n" +"commit que hayas hecho en este estado sin impactar a tu rama realizando\n" +"otro checkout.\n" +"\n" +"Si quieres crear una nueva rama para mantener los commits que has creado,\n" +"puedes hacerlo (ahora o después) usando -b con el comando checkout. " +"Ejemplo:\n" +"\n" +" git checkout -b <nombre-de-nueva-rama>\n" +"\n" + +#: apply.c:58 +#, c-format +msgid "unrecognized whitespace option '%s'" +msgstr "opcion de espacios en blanco no reconocida '%s'" + +#: apply.c:74 +#, c-format +msgid "unrecognized whitespace ignore option '%s'" +msgstr "opcion de ignorar espacios en blanco no reconocida '%s'" + +#: apply.c:125 +msgid "--reject and --3way cannot be used together." +msgstr "--reject y --3way no se pueden utilizar juntas." + +#: apply.c:127 +msgid "--cached and --3way cannot be used together." +msgstr "--cached y --3way no se pueden utilizar juntas." + +#: apply.c:130 +msgid "--3way outside a repository" +msgstr "--3way esta fuera de un repositorio" + +#: apply.c:141 +msgid "--index outside a repository" +msgstr "--index esta fuera de un repositorio" + +#: apply.c:144 +msgid "--cached outside a repository" +msgstr "--cached esta fuera de un repositorio" + +#: apply.c:845 +#, c-format +msgid "Cannot prepare timestamp regexp %s" +msgstr "No se puede preparar una marca de tiempo para la expresion regular %s" + +#: apply.c:854 +#, c-format +msgid "regexec returned %d for input: %s" +msgstr "regexec retorno %d para la entrada: %s" + +#: apply.c:928 +#, c-format +msgid "unable to find filename in patch at line %d" +msgstr "" +"no se puede encontrar el nombre del archivo en el parche en la linea %d" + +#: apply.c:966 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" +msgstr "" +"git apply: mal git-diff - se esperaba /dev/null, se encontro %s en la linea " +"%d" + +#: apply.c:972 +#, c-format +msgid "git apply: bad git-diff - inconsistent new filename on line %d" +msgstr "" +"git apply: mal git-diff - nuevo nombre de archivo inconsistente en la linea " +"%d" + +#: apply.c:973 +#, c-format +msgid "git apply: bad git-diff - inconsistent old filename on line %d" +msgstr "" +"git apply: mal git-diff - viejo nombre de archivo inconsistente en la linea " +"%d" + +#: apply.c:978 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null on line %d" +msgstr "git apply: mal git-diff - se esperaba /dev/null en la linea %d" + +#: apply.c:1007 +#, c-format +msgid "invalid mode on line %d: %s" +msgstr "modo invalido en la linea %d: %s" + +#: apply.c:1325 +#, c-format +msgid "inconsistent header lines %d and %d" +msgstr "header inconsistente en las lineas %d y %d" + +#: apply.c:1497 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "recount: linea inesperada: %.*s" + +#: apply.c:1566 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "fragmento de parche sin header en la linea %d: %.*s" + +#: apply.c:1586 +#, c-format +msgid "" +"git diff header lacks filename information when removing %d leading pathname " +"component (line %d)" +msgid_plural "" +"git diff header lacks filename information when removing %d leading pathname " +"components (line %d)" +msgstr[0] "" +"al header de git diff carece de informacion del nombre del archivo %d cuando " +"lo remueve de la ruta principalcomponente (linea %d)" +msgstr[1] "" +"los headers de git diff carecen de informacion de los nombres de los " +"archivos %d cuando los remueven de la ruta principalcomponentes (linea %d)" + +#: apply.c:1599 +#, c-format +msgid "git diff header lacks filename information (line %d)" +msgstr "" +"el header de git diff carece de informacion del nombre del archivo (linea %d)" + +#: apply.c:1787 +msgid "new file depends on old contents" +msgstr "el nuevo archivo depende de contenidos viejos" + +#: apply.c:1789 +msgid "deleted file still has contents" +msgstr "el archivo eliminado todavia tiene contenido" + +#: apply.c:1823 +#, c-format +msgid "corrupt patch at line %d" +msgstr "parche corrupto en la linea %d" + +#: apply.c:1860 +#, c-format +msgid "new file %s depends on old contents" +msgstr "nuevo archivo %s depende en contenidos viejos" + +#: apply.c:1862 +#, c-format +msgid "deleted file %s still has contents" +msgstr "el archivo borrado %s todavia tiene contenido" + +#: apply.c:1865 +#, c-format +msgid "** warning: file %s becomes empty but is not deleted" +msgstr "** peligro: el archivo %s esta vacio pero no es borrado" + +#: apply.c:2012 +#, c-format +msgid "corrupt binary patch at line %d: %.*s" +msgstr "parche binario corrupto en la linea %d: %.*s" + +#: apply.c:2049 +#, c-format +msgid "unrecognized binary patch at line %d" +msgstr "parche binario no reconocido en la linea %d" + +#: apply.c:2209 +#, c-format +msgid "patch with only garbage at line %d" +msgstr "parche que solo contiene basura en la linea %d" + +#: apply.c:2295 +#, c-format +msgid "unable to read symlink %s" +msgstr "no es posible leer el symlink %s" + +#: apply.c:2299 +#, c-format +msgid "unable to open or read %s" +msgstr "no es posible abrir o leer %s" + +#: apply.c:2958 +#, c-format +msgid "invalid start of line: '%c'" +msgstr "comienzo invalido de linea: '%c'" + +#: apply.c:3077 +#, c-format +msgid "Hunk #%d succeeded at %d (offset %d line)." +msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." +msgstr[0] "Hunk #%d tuvo exito en %d (%d linea compensada)." +msgstr[1] "Hunk #%d tuvo exito en %d (%d lineas compensadas)." + +#: apply.c:3089 +#, c-format +msgid "Context reduced to (%ld/%ld) to apply fragment at %d" +msgstr "Contexto reducido a (%ld/%ld) para aplicar el fragmento en %d" + +#: apply.c:3095 +#, c-format +msgid "" +"while searching for:\n" +"%.*s" +msgstr "" +"Mientras se busca:\n" +"%.*s" + +#: apply.c:3117 +#, c-format +msgid "missing binary patch data for '%s'" +msgstr "data perdida en parche binario para '%s'" + +#: apply.c:3125 +#, c-format +msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" +msgstr "" +"no se puede revertir-aplicar un parche binario sin el hunk revertido a '%s'" + +#: apply.c:3171 +#, c-format +msgid "cannot apply binary patch to '%s' without full index line" +msgstr "no se puede aplcar el parche binario a '%s' sin un indice completo" + +#: apply.c:3181 +#, c-format +msgid "" +"the patch applies to '%s' (%s), which does not match the current contents." +msgstr "" +"el parche aplica a '%s' (%s), lo cual no concuerda con los contenidos " +"actuales." + +#: apply.c:3189 +#, c-format +msgid "the patch applies to an empty '%s' but it is not empty" +msgstr "el parche aplica a un '%s' vacio, pero este no lo esta" + +#: apply.c:3207 +#, c-format +msgid "the necessary postimage %s for '%s' cannot be read" +msgstr "la postimagen necesaria %s para '%s' no se puede leer" + +#: apply.c:3220 +#, c-format +msgid "binary patch does not apply to '%s'" +msgstr "el parche binario no aplica para '%s'" + +#: apply.c:3226 +#, c-format +msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" +msgstr "" +"el parche binario para '%s' crea un resultado incorrecto (saliendo %s, se " +"obtuvo %s)" + +#: apply.c:3247 +#, c-format +msgid "patch failed: %s:%ld" +msgstr "el parche fallo: %s:%ld" + +#: apply.c:3369 +#, c-format +msgid "cannot checkout %s" +msgstr "no se puede hacer checkout a %s" + +#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277 +#, c-format +msgid "failed to read %s" +msgstr "no se pudo leer %s" + +#: apply.c:3426 +#, c-format +msgid "reading from '%s' beyond a symbolic link" +msgstr "leyendo de '%s' tras un symbolic link" + +#: apply.c:3455 apply.c:3695 +#, c-format +msgid "path %s has been renamed/deleted" +msgstr "la ruta %s ha sido renombrada/suprimida" + +#: apply.c:3538 apply.c:3709 +#, c-format +msgid "%s: does not exist in index" +msgstr "%s: no existe en el indice" + +#: apply.c:3547 apply.c:3717 +#, c-format +msgid "%s: does not match index" +msgstr "%s: no concuerda con el indice" + +#: apply.c:3582 +msgid "repository lacks the necessary blob to fall back on 3-way merge." +msgstr "" +"el repositorio carece del blob necesario para regresar en un merge de tres-" +"vias" + +#: apply.c:3585 +#, c-format +msgid "Falling back to three-way merge...\n" +msgstr "Retrocediendo en un merge de tres-vias...\n" + +#: apply.c:3601 apply.c:3605 +#, c-format +msgid "cannot read the current contents of '%s'" +msgstr "no se pueden leer los contenidos actuales de '%s'" + +#: apply.c:3617 +#, c-format +msgid "Failed to fall back on three-way merge...\n" +msgstr "Fallo el merge en retroceso de tres-vias...\n" + +#: apply.c:3631 +#, c-format +msgid "Applied patch to '%s' with conflicts.\n" +msgstr "Parche aplicado a '%s' con conflictos.\n" + +#: apply.c:3636 +#, c-format +msgid "Applied patch to '%s' cleanly.\n" +msgstr "Parche aplicado a '%s' limpiamente\n" + +#: apply.c:3662 +msgid "removal patch leaves file contents" +msgstr "parche de remocion deja contenidos en el archivo" + +#: apply.c:3734 +#, c-format +msgid "%s: wrong type" +msgstr "%s: tipo incorrecto" + +#: apply.c:3736 +#, c-format +msgid "%s has type %o, expected %o" +msgstr "%s tiene tipo %o, se esperaba %o" + +#: apply.c:3886 apply.c:3888 +#, c-format +msgid "invalid path '%s'" +msgstr "ruta invalida '%s'" + +#: apply.c:3944 +#, c-format +msgid "%s: already exists in index" +msgstr "%s: ya existe en el indice" + +#: apply.c:3947 +#, c-format +msgid "%s: already exists in working directory" +msgstr "%s: ya existe en el directorio de trabajo" + +#: apply.c:3967 +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o)" +msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o)" + +#: apply.c:3972 +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o) of %s" +msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o) de %s" + +#: apply.c:3992 +#, c-format +msgid "affected file '%s' is beyond a symbolic link" +msgstr "archivo afectado '%s' esta tras un symbolic link" + +#: apply.c:3996 +#, c-format +msgid "%s: patch does not apply" +msgstr "%s: el parche no aplica" + +#: apply.c:4011 +#, c-format +msgid "Checking patch %s..." +msgstr "Revisando el parche %s..." + +#: apply.c:4102 +#, c-format +msgid "sha1 information is lacking or useless for submodule %s" +msgstr "falta informacion del sha1 o es inutil para el submodulo %s" + +#: apply.c:4109 +#, c-format +msgid "mode change for %s, which is not in current HEAD" +msgstr "modo cambiado para %s, el cual no se encuentra en el HEAD actual" + +#: apply.c:4112 +#, c-format +msgid "sha1 information is lacking or useless (%s)." +msgstr "falta informacion sha1 o es inutil (%s)." + +#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "make_cache_entry fallo para la ruta '%s'" + +#: apply.c:4121 +#, c-format +msgid "could not add %s to temporary index" +msgstr "no se pudo anadir %s al indice temporal" + +#: apply.c:4131 +#, c-format +msgid "could not write temporary index to %s" +msgstr "no se pudo escribir un indice temporal para %s" + +#: apply.c:4269 +#, c-format +msgid "unable to remove %s from index" +msgstr "no se puede remover %s del indice" + +#: apply.c:4304 +#, c-format +msgid "corrupt patch for submodule %s" +msgstr "parche corrupto para el submodulo %s" + +#: apply.c:4310 +#, c-format +msgid "unable to stat newly created file '%s'" +msgstr "no es posible establecer el archivo recien creado '%s'" + +#: apply.c:4318 +#, c-format +msgid "unable to create backing store for newly created file %s" +msgstr "" +"no es posible crear una copia de seguridad para el archivo recien creado %s" + +#: apply.c:4324 apply.c:4468 +#, c-format +msgid "unable to add cache entry for %s" +msgstr "no es posible agregar una entrada en el cache para %s" + +#: apply.c:4365 +#, c-format +msgid "failed to write to '%s'" +msgstr "fallo escribir para '%s'" + +#: apply.c:4369 +#, c-format +msgid "closing file '%s'" +msgstr "cerrando archivo '%s'" + +#: apply.c:4439 +#, c-format +msgid "unable to write file '%s' mode %o" +msgstr "no es posible escribir el archivo '%s' modo %o" + +#: apply.c:4537 +#, c-format +msgid "Applied patch %s cleanly." +msgstr "Parche %s aplicado limpiamente" + +#: apply.c:4545 +msgid "internal error" +msgstr "Error interno" + +#: apply.c:4548 +#, c-format +msgid "Applying patch %%s with %d reject..." +msgid_plural "Applying patch %%s with %d rejects..." +msgstr[0] "Aplicando parche %%s con %d rechazo..." +msgstr[1] "Aplicando parche %%s con %d rechazos..." + +#: apply.c:4559 +#, c-format +msgid "truncating .rej filename to %.*s.rej" +msgstr "truncando el nombre de archivo .rej a %.*s.rej " + +#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010 +#, c-format +msgid "cannot open %s" +msgstr "no se puede abrir %s" + +#: apply.c:4581 +#, c-format +msgid "Hunk #%d applied cleanly." +msgstr "Hunk #%d aplicado limpiamente" + +#: apply.c:4585 +#, c-format +msgid "Rejected hunk #%d." +msgstr "hunk #%d rechazado" + +#: apply.c:4695 +#, c-format +msgid "Skipped patch '%s'." +msgstr "Parche '%s' saltado." + +#: apply.c:4703 +msgid "unrecognized input" +msgstr "input no reconocido" + +#: apply.c:4722 +msgid "unable to read index file" +msgstr "no es posible leer el archivo indice" + +#: apply.c:4859 +#, c-format +msgid "can't open patch '%s': %s" +msgstr "no se puede abrir el parche '%s': %s" + +#: apply.c:4886 +#, c-format +msgid "squelched %d whitespace error" +msgid_plural "squelched %d whitespace errors" +msgstr[0] "%d error de espacios en blanco aplastado" +msgstr[1] "%d errores de espacios en blanco aplastados" + +#: apply.c:4892 apply.c:4907 +#, c-format +msgid "%d line adds whitespace errors." +msgid_plural "%d lines add whitespace errors." +msgstr[0] "%d linea agrega errores de espacios en blanco." +msgstr[1] "%d lineas agregan erroes de espacios en blanco." + +#: apply.c:4900 +#, c-format +msgid "%d line applied after fixing whitespace errors." +msgid_plural "%d lines applied after fixing whitespace errors." +msgstr[0] "" +"%d linea aplicada despues de arreglar los errores de espacios en blanco." +msgstr[1] "" +"%d lineas aplicadas despues de arreglar los errores de espacios en blanco." + +#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390 +msgid "Unable to write new index file" +msgstr "No es posible escribir el archivo indice" + +#: apply.c:4947 apply.c:4950 builtin/am.c:2256 builtin/am.c:2259 +#: builtin/clone.c:116 builtin/fetch.c:115 builtin/pull.c:187 +#: builtin/submodule--helper.c:301 builtin/submodule--helper.c:622 +#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:992 +#: builtin/submodule--helper.c:995 builtin/submodule--helper.c:1212 +#: git-add--interactive.perl:197 +msgid "path" +msgstr "ruta" + +#: apply.c:4948 +msgid "don't apply changes matching the given path" +msgstr "no aplicar cambios que concuerden con la ruta suministrada" + +#: apply.c:4951 +msgid "apply changes matching the given path" +msgstr "aplicar cambios que concuerden con la ruta suministrada" + +#: apply.c:4953 builtin/am.c:2265 +msgid "num" +msgstr "num" + +#: apply.c:4954 +msgid "remove <num> leading slashes from traditional diff paths" +msgstr "remover <num> slashes iniciales de las rutas diff tradicionales" + +#: apply.c:4957 +msgid "ignore additions made by the patch" +msgstr "ignorar adiciones hechas por el parche" + +#: apply.c:4959 +msgid "instead of applying the patch, output diffstat for the input" +msgstr "en lugar de aplicar elparche, mostrar diffstat para la entrada" + +#: apply.c:4963 +msgid "show number of added and deleted lines in decimal notation" +msgstr "mostrar el numero de lineas agregadas y elminadas en notacion decimal" + +#: apply.c:4965 +msgid "instead of applying the patch, output a summary for the input" +msgstr "en lugar de aplicar el parche, mostrar un resumen para la entrada" + +#: apply.c:4967 +msgid "instead of applying the patch, see if the patch is applicable" +msgstr "en lugar de aplicar el parche, ver si el parche es aplicable" + +#: apply.c:4969 +msgid "make sure the patch is applicable to the current index" +msgstr "asegurar que el parche es aplicable al indice actual" + +#: apply.c:4971 +msgid "apply a patch without touching the working tree" +msgstr "aplicar un parche sin tocar el arbol de trabajo" + +#: apply.c:4973 +msgid "accept a patch that touches outside the working area" +msgstr "aceptar un parche que toca fuera del area de trabajo" + +#: apply.c:4975 +msgid "also apply the patch (use with --stat/--summary/--check)" +msgstr "tambien aplicar el parche ( usar con --stat/--summary/--check" + +#: apply.c:4977 +msgid "attempt three-way merge if a patch does not apply" +msgstr "intentar merge de tres-vias si el parche no aplica" + +#: apply.c:4979 +msgid "build a temporary index based on embedded index information" +msgstr "" +"construir un indice temporal basado en la informacion del indice incrustado" + +#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513 +msgid "paths are separated with NUL character" +msgstr "rutas estan separadas con un caracter NULL " + +#: apply.c:4984 +msgid "ensure at least <n> lines of context match" +msgstr "asegure que por lo menos <n> lineas del contexto concuerden" + +#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95 +#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99 +msgid "action" +msgstr "accion" + +#: apply.c:4986 +msgid "detect new or modified lines that have whitespace errors" +msgstr "" +"detectar lineas nuevas o modificadas que contienen errores de espacios en " +"blanco" + +#: apply.c:4989 apply.c:4992 +msgid "ignore changes in whitespace when finding context" +msgstr "" +"ignorar cambios en los espacios en blanco cuando se encuentra el contexto" + +#: apply.c:4995 +msgid "apply the patch in reverse" +msgstr "aplicar el parche en reversa" + +#: apply.c:4997 +msgid "don't expect at least one line of context" +msgstr "no espera al menos una linea del contexto" + +#: apply.c:4999 +msgid "leave the rejected hunks in corresponding *.rej files" +msgstr "dejar los hunks rechazados en los archivos *.rej correspontientes" + +#: apply.c:5001 +msgid "allow overlapping hunks" +msgstr "permitir solapamiento de hunks" + +#: apply.c:5002 builtin/add.c:272 builtin/check-ignore.c:21 +#: builtin/commit.c:1347 builtin/count-objects.c:96 builtin/fsck.c:640 +#: builtin/log.c:1889 builtin/mv.c:123 builtin/read-tree.c:125 +msgid "be verbose" +msgstr "ser verboso" + +#: apply.c:5004 +msgid "tolerate incorrectly detected missing new-line at the end of file" +msgstr "" +"tolerar nuevas lineas faltantes detectadas incorrectamente al final del " +"archivo" + +#: apply.c:5007 +msgid "do not trust the line counts in the hunk headers" +msgstr "no confiar en el conteo de lineas en los headers del hunk" + +#: apply.c:5009 builtin/am.c:2253 +msgid "root" +msgstr "raiz" + +#: apply.c:5010 +msgid "prepend <root> to all filenames" +msgstr "anteponer <root> a todos los nombres de archivos" + +#: archive.c:13 +msgid "git archive [<options>] <tree-ish> [<path>...]" +msgstr "git archive [<opciones>] <parte-del-arbol> [<ruta>...]" + +#: archive.c:14 +msgid "git archive --list" +msgstr "git archive --list" + +#: archive.c:15 +msgid "" +"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" +msgstr "" +"git archive --remote <repo> [--exec <comando> ] [<opciones>] <parte-del-" +"arbol> [<ruta>...]" + +#: archive.c:16 +msgid "git archive --remote <repo> [--exec <cmd>] --list" +msgstr "git archive --remote <repo> [--exec <comando>] --list" + +#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299 +#, c-format +msgid "pathspec '%s' did not match any files" +msgstr "ruta especificada '%s' no concordo con ninguna carpeta" + +#: archive.c:436 +msgid "fmt" +msgstr "fmt" + +#: archive.c:436 +msgid "archive format" +msgstr "formato del archivo" + +#: archive.c:437 builtin/log.c:1452 +msgid "prefix" +msgstr "prefijo" + +#: archive.c:438 +msgid "prepend prefix to each pathname in the archive" +msgstr "anteponer prefijo a cada ruta en el archivo" + +#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61 +#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:859 +#: builtin/hash-object.c:102 builtin/ls-files.c:547 builtin/ls-files.c:550 +#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120 +#: parse-options.h:153 +msgid "file" +msgstr "carpeta" + +#: archive.c:440 builtin/archive.c:89 +msgid "write the archive to this file" +msgstr "escribe el archivo en esta carpeta" + +#: archive.c:442 +msgid "read .gitattributes in working directory" +msgstr "leer .gitatributes en el directorio de trabajo" + +#: archive.c:443 +msgid "report archived files on stderr" +msgstr "reportar archivos archivados por stderr" + +#: archive.c:444 +msgid "store only" +msgstr "solo guardar" + +#: archive.c:445 +msgid "compress faster" +msgstr "comprimir mas rapido" + +#: archive.c:453 +msgid "compress better" +msgstr "comprimir mejor" + +#: archive.c:456 +msgid "list supported archive formats" +msgstr "listar los formatos de carpeta soportados" + +#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109 +#: builtin/submodule--helper.c:634 builtin/submodule--helper.c:1001 +msgid "repo" +msgstr "repo" + +#: archive.c:459 builtin/archive.c:91 +msgid "retrieve the archive from remote repository <repo>" +msgstr "obtener la carpeta del repositorio remoto <repo>" + +#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489 +msgid "command" +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 " + +#: archive.c:468 +msgid "Unexpected option --remote" +msgstr "opcion inesperada --remote" + +#: archive.c:470 +msgid "Option --exec can only be used together with --remote" +msgstr "Opcion --exec solo puede ser utilizada con --remote" + +#: archive.c:472 +msgid "Unexpected option --output" +msgstr "Opcion inesperada --output" + +#: archive.c:494 +#, c-format +msgid "Unknown archive format '%s'" +msgstr "Formato de carpeta desconocido '%s'" + +#: archive.c:501 +#, c-format +msgid "Argument not supported for format '%s': -%d" +msgstr "Argumento no soprtado para formato '%s': -%d" + +#: attr.c:218 +#, c-format +msgid "%.*s is not a valid attribute name" +msgstr "%.*s no es un nombre de atributo valido" + +#: attr.c:415 +msgid "" +"Negative patterns are ignored in git attributes\n" +"Use '\\!' for literal leading exclamation." +msgstr "" +"Los patrones negativos son ignorados en los atributos de git\n" +"Usa '\\!' para comenzar literalmente con exclamacion." + +#: bisect.c:447 +#, c-format +msgid "Badly quoted content in file '%s': %s" +msgstr "Revisa las comillas en el archivo '%s': %s" + +#: bisect.c:655 +#, c-format +msgid "We cannot bisect more!\n" +msgstr "No podemos bisecar mas!\n" + +#: bisect.c:708 +#, c-format +msgid "Not a valid commit name %s" +msgstr "No es un nombre de commit valido %s" + +#: bisect.c:732 +#, c-format +msgid "" +"The merge base %s is bad.\n" +"This means the bug has been fixed between %s and [%s].\n" +msgstr "" +"La base de fusion %s esta mal.\n" +"Esto quiere decir que el bug ha sido arreglado enter %s y [%s].\n" + +#: bisect.c:737 +#, c-format +msgid "" +"The merge base %s is new.\n" +"The property has changed between %s and [%s].\n" +msgstr "" +"La base de fusion %s es nueva.\n" +"Esta propiedad ha cambiado entre %s y [%s].\n" + +#: bisect.c:742 +#, c-format +msgid "" +"The merge base %s is %s.\n" +"This means the first '%s' commit is between %s and [%s].\n" +msgstr "" +"La base de fusion %s es %s.\n" +"Esto quiere decir que el primer '%s' commit esta entre %s y [%s].\n" + +#: bisect.c:750 +#, c-format +msgid "" +"Some %s revs are not ancestors of the %s rev.\n" +"git bisect cannot work properly in this case.\n" +"Maybe you mistook %s and %s revs?\n" +msgstr "" +"Algunas %s revisiones no son ancestros de la revision %s.\n" +"git bisect no puede trabajar bien en este caso.\n" +"Tal vez confundio la revision %s y %s?\n" + +#: bisect.c:763 +#, c-format +msgid "" +"the merge base between %s and [%s] must be skipped.\n" +"So we cannot be sure the first %s commit is between %s and %s.\n" +"We continue anyway." +msgstr "" +"la base de fusion entre %s y [%s] tiene que ser saltada.\n" +"Asi que no podemos estar seguros que el primer %s commit esta entre%s y %s.\n" +"Vamos a continuar de todas maneras." + +#: bisect.c:798 +#, c-format +msgid "Bisecting: a merge base must be tested\n" +msgstr "Bisectando: una base de fusion debe ser probada\n" + +#: bisect.c:850 +#, c-format +msgid "a %s revision is needed" +msgstr "una %s revision es necesaria" + +#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234 +#, c-format +msgid "could not create file '%s'" +msgstr "no se pudo crear el archivo '%s'" + +#: bisect.c:918 +#, c-format +msgid "could not read file '%s'" +msgstr "no se pudo leer el archivo '%s'" + +#: bisect.c:948 +msgid "reading bisect refs failed" +msgstr "fallo leer las refs de bisect" + +#: bisect.c:968 +#, c-format +msgid "%s was both %s and %s\n" +msgstr "%s fue tanto %s como %s\n" + +#: bisect.c:976 +#, c-format +msgid "" +"No testable commit found.\n" +"Maybe you started with bad path parameters?\n" +msgstr "" +"No se encontró confirmación que se pueda probar.\n" +"¿Quizás iniciaste con parámetros de rutas incorrectos?\n" + +#: bisect.c:995 +#, c-format +msgid "(roughly %d step)" +msgid_plural "(roughly %d steps)" +msgstr[0] "(aproximadamente %d paso)" +msgstr[1] "(aproximadamente %d pasos)" + +#. TRANSLATORS: the last %s will be replaced with "(roughly %d +#. steps)" translation. +#. +#: bisect.c:1001 +#, c-format +msgid "Bisecting: %d revision left to test after this %s\n" +msgid_plural "Bisecting: %d revisions left to test after this %s\n" +msgstr[0] "Bisectando: falta %d revision por probar despues de esto %s\n" +msgstr[1] "Bisectando: faltan %d revisiones por probar despues de esto %s\n" + +#: blame.c:1757 +msgid "--contents and --reverse do not blend well." +msgstr "--contents y --reverse no se mezclan bien." + +#: blame.c:1768 +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 +msgid "--reverse and --first-parent together require specified latest commit" +msgstr "" +"--reverse y --first-parent juntos requieren especificar el ultimo commit" + +#: blame.c:1797 bundle.c:169 ref-filter.c:1932 sequencer.c:1168 +#: sequencer.c:2351 builtin/commit.c:1065 builtin/log.c:357 builtin/log.c:911 +#: builtin/log.c:1361 builtin/log.c:1690 builtin/log.c:1938 builtin/merge.c:369 +#: builtin/shortlog.c:191 +msgid "revision walk setup failed" +msgstr "fallo la configuracion del camino de revision" + +#: blame.c:1815 +msgid "" +"--reverse --first-parent together require range along first-parent chain" +msgstr "" +"--reverse --first-parent jutnos requieren un rango a lo largo de la cadena " +"del primer padre" + +#: blame.c:1826 +#, c-format +msgid "no such path %s in %s" +msgstr "no hay una ruta %s en %s" + +#: blame.c:1837 +#, c-format +msgid "cannot read blob %s for path %s" +msgstr "no se puede leer el blob %s para la ruta %s" + +#: branch.c:53 +#, c-format +msgid "" +"\n" +"After fixing the error cause you may try to fix up\n" +"the remote tracking information by invoking\n" +"\"git branch --set-upstream-to=%s%s%s\"." +msgstr "" +"\n" +"Tras arreglar la causa del error puedes intentar arreglar\n" +"la infomacion del rastreo remoto invocando\n" +"\"git branch --set-upstream-to=%s%s%s\"." + +#: branch.c:67 +#, c-format +msgid "Not setting branch %s as its own upstream." +msgstr "La rama %s no se configura como su propio upstream." + +#: branch.c:93 +#, c-format +msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." +msgstr "" +"Rama '%s' configurada para hacer seguimiento a la rama remota '%s' de '%s' " +"por rebase." + +#: branch.c:94 +#, c-format +msgid "Branch '%s' set up to track remote branch '%s' from '%s'." +msgstr "" +"Rama '%s' configurada para hacer seguimiento a la rama remota '%s' de '%s'." + +#: branch.c:98 +#, c-format +msgid "Branch '%s' set up to track local branch '%s' by rebasing." +msgstr "" +"Rama '%s' configurada para hacer seguimiento a la rama local '%s' por rebase." + +#: branch.c:99 +#, c-format +msgid "Branch '%s' set up to track local branch '%s'." +msgstr "Rama '%s' configurada para hacer seguimiento a la rama local '%s'." + +#: branch.c:104 +#, c-format +msgid "Branch '%s' set up to track remote ref '%s' by rebasing." +msgstr "" +"Rama '%s' configurada para hacer seguimiento a la referencia remota '%s' por " +"rebase." + +#: branch.c:105 +#, c-format +msgid "Branch '%s' set up to track remote ref '%s'." +msgstr "" +"Rama '%s' configurada para hacer seguimiento a la referencia remota '%s'." + +#: branch.c:109 +#, c-format +msgid "Branch '%s' set up to track local ref '%s' by rebasing." +msgstr "" +"Rama '%s' configurada para hacer seguimiento a la referencia local '%s' por " +"rebase." + +#: branch.c:110 +#, c-format +msgid "Branch '%s' set up to track local ref '%s'." +msgstr "" +"Rama '%s' configurada para hacer seguimiento a la referencia local '%s'." + +#: branch.c:119 +msgid "Unable to write upstream branch configuration" +msgstr "No es posible escribir la configuracion de la rama upstream" + +#: branch.c:156 +#, c-format +msgid "Not tracking: ambiguous information for ref %s" +msgstr "No rastreando: informacion ambigua para la referencia %s" + +#: branch.c:185 +#, c-format +msgid "'%s' is not a valid branch name." +msgstr "'%s' no es un nombre valido de rama." + +#: branch.c:190 +#, c-format +msgid "A branch named '%s' already exists." +msgstr "Una rama llamada '%s' ya existe." + +#: branch.c:197 +msgid "Cannot force update the current branch." +msgstr "No se puede forzar la actualizacion de la rama actual." + +#: branch.c:217 +#, c-format +msgid "Cannot setup tracking information; starting point '%s' is not a branch." +msgstr "" +"No se puede configurar el rastreo de informacion; el punto de partida '%s' " +"no es una rama" + +#: branch.c:219 +#, c-format +msgid "the requested upstream branch '%s' does not exist" +msgstr "la rama de upstream solicitada '%s' no existe" + +#: branch.c:221 +msgid "" +"\n" +"If you are planning on basing your work on an upstream\n" +"branch that already exists at the remote, you may need to\n" +"run \"git fetch\" to retrieve it.\n" +"\n" +"If you are planning to push out a new local branch that\n" +"will track its remote counterpart, you may want to use\n" +"\"git push -u\" to set the upstream config as you push." +msgstr "" +"\n" +"Si estas planeando basar tu trabajo en una rama upstream\n" +"que ya existe en el remoto, tal vez necesites ejecutar\n" +"\"git fetch\" para recibirla.\n" +"\n" +"Si estás planeando hacer push a una nueva rama local que\n" +"va a rastrear a su contraparte remota, tal vez quieras usar\n" +"\"git push -u\" para configurar tu upstream predeterminado cuando realizas " +"el push." + +#: branch.c:264 +#, c-format +msgid "Not a valid object name: '%s'." +msgstr "Nombre de objeto no valido: '%s'." + +#: branch.c:284 +#, c-format +msgid "Ambiguous object name: '%s'." +msgstr "Nombre de objeto ambiguo: '%s'." + +#: branch.c:289 +#, c-format +msgid "Not a valid branch point: '%s'." +msgstr "Punto de rama no valido: '%s'." + +#: branch.c:343 +#, c-format +msgid "'%s' is already checked out at '%s'" +msgstr "'%s' ya ha sido marcado en '%s'" + +#: branch.c:366 +#, c-format +msgid "HEAD of working tree %s is not updated" +msgstr "la HEAD del arbol de trabajo %s no esta actualizada" + +#: bundle.c:34 +#, c-format +msgid "'%s' does not look like a v2 bundle file" +msgstr "'%s' no se ve como un archivo bundle v2" + +#: bundle.c:62 +#, c-format +msgid "unrecognized header: %s%s (%d)" +msgstr "header no reconocido %s%s (%d)" + +#: bundle.c:88 sequencer.c:1346 sequencer.c:1793 sequencer.c:2500 +#: sequencer.c:2583 sequencer.c:2609 sequencer.c:2687 sequencer.c:2807 +#: sequencer.c:2949 builtin/commit.c:782 +#, c-format +msgid "could not open '%s'" +msgstr "no se pudo abrir '%s'" + +#: bundle.c:140 +msgid "Repository lacks these prerequisite commits:" +msgstr "Al repositorio le falta estos commits prerequisito:" + +#: bundle.c:193 +#, 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 +msgid "The bundle records a complete history." +msgstr "El bundle registra una historia completa." + +#: bundle.c:202 +#, 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 +msgid "Could not spawn pack-objects" +msgstr "no se pudo engendrar el pack-objetcts" + +#: bundle.c:272 +msgid "pack-objects died" +msgstr "pack-objects muerio" + +#: bundle.c:314 +msgid "rev-list died" +msgstr "rev-list muerio" + +#: bundle.c:363 +#, 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:174 builtin/log.c:1597 builtin/shortlog.c:296 +#, c-format +msgid "unrecognized argument: %s" +msgstr "argumento no reconocido: %s" + +#: bundle.c:461 +msgid "Refusing to create empty bundle." +msgstr "Rechazando crear un bundle vacio." + +#: bundle.c:473 +#, c-format +msgid "cannot create '%s'" +msgstr "no se puede crear '%s'" + +#: bundle.c:501 +msgid "index-pack died" +msgstr "index-pack murio" + +#: color.c:301 +#, c-format +msgid "invalid color value: %.*s" +msgstr "color inválido: %.*s" + +#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465 +#: builtin/am.c:1467 builtin/am.c:2105 +#, c-format +msgid "could not parse %s" +msgstr "no se puede anazliar %s" + +#: commit.c:43 +#, c-format +msgid "%s %s is not a commit!" +msgstr "%s %s no es un commit!" + +#: commit.c:1517 +msgid "" +"Warning: commit message did not conform to UTF-8.\n" +"You may want to amend it after fixing the message, or set the config\n" +"variable i18n.commitencoding to the encoding your project uses.\n" +msgstr "" +"Peligro: el mensaje del commit no se ajusta a UTF-8.\n" +"Tal vez quiera enmendarlo despues de arreglar el mensaje, o arreglar la\n" +"variable de configuracion i18n.commitencoding para el codificacion que usa " +"su proyecto.\n" + +#: compat/obstack.c:406 compat/obstack.c:408 +msgid "memory exhausted" +msgstr "memoria agotada" + +#: config.c:187 +msgid "relative config include conditionals must come from files" +msgstr "" +"la configuracion relativa incluye condicionales que deben venir de archivos" + +#: config.c:721 +#, c-format +msgid "bad config line %d in blob %s" +msgstr "mala linea de config %d en el blob %s" + +#: config.c:725 +#, c-format +msgid "bad config line %d in file %s" +msgstr "mala linea de config %d en el archivo %s" + +#: config.c:729 +#, c-format +msgid "bad config line %d in standard input" +msgstr "mala linea de config %d en la entrada standard" + +#: config.c:733 +#, c-format +msgid "bad config line %d in submodule-blob %s" +msgstr "mala linea de config %d en el submodulo-blob %s" + +#: config.c:737 +#, c-format +msgid "bad config line %d in command line %s" +msgstr "mala linea de config %d en la linea de comando %s" + +#: config.c:741 +#, c-format +msgid "bad config line %d in %s" +msgstr "mala linea de config %d en %s" + +#: config.c:869 +msgid "out of range" +msgstr "fuera de rango" + +#: config.c:869 +msgid "invalid unit" +msgstr "unidad invalida" + +#: config.c:875 +#, c-format +msgid "bad numeric config value '%s' for '%s': %s" +msgstr "mal valor de config numerica '%s' para '%s': %s" + +#: config.c:880 +#, c-format +msgid "bad numeric config value '%s' for '%s' in blob %s: %s" +msgstr "mal valor de config numerica '%s' para '%s' en el blob %s: %s" + +#: config.c:883 +#, c-format +msgid "bad numeric config value '%s' for '%s' in file %s: %s" +msgstr "mal valor de config numerica '%s' para '%s' en el archivo %s: %s" + +#: config.c:886 +#, c-format +msgid "bad numeric config value '%s' for '%s' in standard input: %s" +msgstr "mal valor de config numerica '%s' para '%s' en la entrada standard: %s" + +#: config.c:889 +#, c-format +msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" +msgstr "" +"mal valor de config numerica '%s' para '%s' en el submodulo-blob %s: %s" + +#: config.c:892 +#, c-format +msgid "bad numeric config value '%s' for '%s' in command line %s: %s" +msgstr "" +"mal valor de config numerica '%s' para '%s' en la linea de comando %s: %s" + +#: config.c:895 +#, c-format +msgid "bad numeric config value '%s' for '%s' in %s: %s" +msgstr "mal valor de config numerica '%s' para '%s' en %s: %s" + +#: config.c:990 +#, c-format +msgid "failed to expand user dir in: '%s'" +msgstr "fallo al expandir el directorio de usuario en: '%s'" + +#: config.c:1085 config.c:1096 +#, c-format +msgid "bad zlib compression level %d" +msgstr "mala compresion zlib en nivel %d" + +#: config.c:1213 +#, c-format +msgid "invalid mode for object creation: %s" +msgstr "modo invalido de creacion de objetos: %s" + +#: config.c:1372 +#, c-format +msgid "bad pack compression level %d" +msgstr "mala compresion pack en el nivel %d" + +#: config.c:1568 +msgid "unable to parse command-line config" +msgstr "no es posible analizar la configuracion de la linea de comando" + +#: config.c:1900 +msgid "unknown error occurred while reading the configuration files" +msgstr "" +"error desconocido ocurrio mientras se leian los archivos de configuracion" + +#: config.c:2087 +#, c-format +msgid "Invalid %s: '%s'" +msgstr "Invalido %s: '%s'" + +#: config.c:2130 +#, c-format +msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" +msgstr "" +"valor core.untrackedCache '%s' desconocido; usando valor por defecto 'keep'" + +#: config.c:2156 +#, c-format +msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" +msgstr "valor splitIndex.maxPercentChange '%d' debe estar entre 0 y 100" + +#: config.c:2167 +#, c-format +msgid "unable to parse '%s' from command-line config" +msgstr "no es posible analizar '%s' de la configuracion de la linea de comando" + +#: config.c:2169 +#, c-format +msgid "bad config variable '%s' in file '%s' at line %d" +msgstr "mala variable de config '%s' en el archivo '%s' en la linea %d" + +#: config.c:2228 +#, c-format +msgid "%s has multiple values" +msgstr "%s tiene multiples valores" + +#: config.c:2571 config.c:2789 +#, c-format +msgid "fstat on %s failed" +msgstr "fstat en %s fallo" + +#: config.c:2678 +#, c-format +msgid "could not set '%s' to '%s'" +msgstr "no se pudo configurar '%s' a '%s'" + +#: config.c:2680 builtin/remote.c:776 +#, c-format +msgid "could not unset '%s'" +msgstr "no se pudo desactivar '%s'" + +#: connect.c:50 +msgid "The remote end hung up upon initial contact" +msgstr "El remoto se colgo en el contacto inicial" + +#: connect.c:52 +msgid "" +"Could not read from remote repository.\n" +"\n" +"Please make sure you have the correct access rights\n" +"and the repository exists." +msgstr "" +"No se pudo leer del repositorio remoto.\n" +"\n" +"Por favor asegurese que tiene los permisos de acceso correctos\n" +"y que el repositorio existe." + +#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141 +msgid "Checking connectivity" +msgstr "Verificando conectividad" + +#: connected.c:76 +msgid "Could not run 'git rev-list'" +msgstr "No se pudo correr 'git rev-list'" + +#: connected.c:96 +msgid "failed write to rev-list" +msgstr "fallo escribir a rev-list" + +#: connected.c:103 +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 will be replaced by LF in %s.\n" +"The file will have its original line endings in your working directory." +msgstr "" +"CRLF sera remplazado por LF en %s.\n" +"El archivo tendra sus finals de linea originales en tu directorio de trabajo." + +#: convert.c:209 +#, c-format +msgid "CRLF would be replaced by LF in %s." +msgstr "CRLF sera remplazado por LF en %s." + +#: convert.c:215 +#, c-format +msgid "" +"LF will be replaced by CRLF in %s.\n" +"The file will have its original line endings in your working directory." +msgstr "" +"LF sera reemplazado por CRLF en %s.\n" +"El archivo tendra sus finales de linea originales en tu directorio de " +"trabajo." + +#: convert.c:219 +#, c-format +msgid "LF would be replaced by CRLF in %s" +msgstr "LF sera reemplazado por CRLF en %s" + +#: date.c:116 +msgid "in the future" +msgstr "en el futuro" + +#: date.c:122 +#, c-format +msgid "%<PRIuMAX> second ago" +msgid_plural "%<PRIuMAX> seconds ago" +msgstr[0] "hace %<PRIuMAX> segundo" +msgstr[1] "hace %<PRIuMAX> segundos" + +#: date.c:129 +#, c-format +msgid "%<PRIuMAX> minute ago" +msgid_plural "%<PRIuMAX> minutes ago" +msgstr[0] "hace %<PRIuMAX> minuto" +msgstr[1] "hace %<PRIuMAX> minutos" + +#: date.c:136 +#, c-format +msgid "%<PRIuMAX> hour ago" +msgid_plural "%<PRIuMAX> hours ago" +msgstr[0] "hace %<PRIuMAX> hora" +msgstr[1] "hace %<PRIuMAX> horas" + +#: date.c:143 +#, c-format +msgid "%<PRIuMAX> day ago" +msgid_plural "%<PRIuMAX> days ago" +msgstr[0] "hace %<PRIuMAX> día" +msgstr[1] "hace %<PRIuMAX> días" + +#: date.c:149 +#, c-format +msgid "%<PRIuMAX> week ago" +msgid_plural "%<PRIuMAX> weeks ago" +msgstr[0] "hace %<PRIuMAX> semana" +msgstr[1] "hace %<PRIuMAX> semanas" + +#: date.c:156 +#, c-format +msgid "%<PRIuMAX> month ago" +msgid_plural "%<PRIuMAX> months ago" +msgstr[0] "hace %<PRIuMAX> mes" +msgstr[1] "hace %<PRIuMAX> meses" + +#: date.c:167 +#, c-format +msgid "%<PRIuMAX> year" +msgid_plural "%<PRIuMAX> years" +msgstr[0] "%<PRIuMAX> año" +msgstr[1] "%<PRIuMAX> años" + +#. TRANSLATORS: "%s" is "<n> years" +#: date.c:170 +#, c-format +msgid "%s, %<PRIuMAX> month ago" +msgid_plural "%s, %<PRIuMAX> months ago" +msgstr[0] "%s, y %<PRIuMAX> mes atrás" +msgstr[1] "%s, y %<PRIuMAX> meses atrás" + +#: date.c:175 date.c:180 +#, c-format +msgid "%<PRIuMAX> year ago" +msgid_plural "%<PRIuMAX> years ago" +msgstr[0] "hace %<PRIuMAX> año" +msgstr[1] "hace %<PRIuMAX> años" + +#: diffcore-order.c:24 +#, c-format +msgid "failed to read orderfile '%s'" +msgstr "fallo al leer orden de archivos '%s'" + +#: diffcore-rename.c:536 +msgid "Performing inexact rename detection" +msgstr "Realizando una deteccion de cambios de nombre inexacta" + +#: diff.c:74 +#, c-format +msgid "option '%s' requires a value" +msgstr "opcion '%s' requiere un valor" + +#: diff.c:152 +#, c-format +msgid " Failed to parse dirstat cut-off percentage '%s'\n" +msgstr " Fallo al analizar dirstat porcentaje de corte '%s'\n" + +#: diff.c:157 +#, c-format +msgid " Unknown dirstat parameter '%s'\n" +msgstr " parametro '%s' de dirstat desconocido\n" + +#: diff.c:281 +msgid "" +"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', " +"'plain'" +msgstr "" +"opción de color debe ser una entre 'no', 'default', 'zebra', 'dimmed_zebra, " +"'plain'" + +#: 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'" + +#: diff.c:398 +#, c-format +msgid "" +"Found errors in 'diff.dirstat' config variable:\n" +"%s" +msgstr "" +"Errores en la variable de config 'diff.dirstat' encontrados:\n" +"%s" + +#: diff.c:3861 +#, c-format +msgid "external diff died, stopping at %s" +msgstr "digg externo murio, deteniendo en %s" + +#: diff.c:4189 +msgid "--name-only, --name-status, --check and -s are mutually exclusive" +msgstr "--name-only, --name-status, --check y -s son mutuamente exclusivas" + +#: diff.c:4279 +msgid "--follow requires exactly one pathspec" +msgstr "--follow requiere exactamente un pathspec" + +#: diff.c:4445 +#, c-format +msgid "" +"Failed to parse --dirstat/-X option parameter:\n" +"%s" +msgstr "" +"Fallo al analizar parametro de opcion --dirstat/-X:\n" +"%s" + +#: diff.c:4459 +#, c-format +msgid "Failed to parse --submodule option parameter: '%s'" +msgstr "Fallo al analizar parametro de opcion --submodule: '%s'" + +#: diff.c:5505 +msgid "inexact rename detection was skipped due to too many files." +msgstr "" +"deteccion de cambio de nombre inexacta fue saltada por haber muchos archivos" + +#: diff.c:5508 +msgid "only found copies from modified paths due to too many files." +msgstr "" +"solo se encontraron copias de rutas modificadas por haber muchos archivos" + +#: diff.c:5511 +#, c-format +msgid "" +"you may want to set your %s variable to at least %d and retry the command." +msgstr "" +"tal vez quiera configurar la variable %s para por lo menos %d y volver a " +"intentar el comando." + +#: dir.c:1983 +msgid "failed to get kernel name and information" +msgstr "fallo al conseguir la informacion y nombre del kernel" + +#: dir.c:2102 +msgid "Untracked cache is disabled on this system or location." +msgstr "Untracked cache esta desactivado en este sistema o ubicacion" + +#: dir.c:2885 dir.c:2890 +#, c-format +msgid "could not create directories for %s" +msgstr "no se pudo crear directorios para %s" + +#: dir.c:2915 +#, c-format +msgid "could not migrate git directory from '%s' to '%s'" +msgstr "no se pudo migrar el directorio git de '%s' a '%s'" + +#: entry.c:176 +msgid "Filtering content" +msgstr "Filtrando contenido" + +#: entry.c:417 +#, c-format +msgid "could not stat file '%s'" +msgstr "no se pudo establecer el archivo '%s'" + +#: fetch-pack.c:252 +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:283 builtin/archive.c:63 +#, c-format +msgid "remote error: %s" +msgstr "error remoto: %s" + +#: fetch-pack.c:284 +#, 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 +msgid "--stateless-rpc requires multi_ack_detailed" +msgstr "--stateless-rpc requiere multi_ack_detailed" + +#: fetch-pack.c:422 +#, c-format +msgid "invalid shallow line: %s" +msgstr "linea poco profunda invalida: %s" + +#: fetch-pack.c:428 +#, c-format +msgid "invalid unshallow line: %s" +msgstr "línea superficial inválida: %s" + +#: fetch-pack.c:430 +#, c-format +msgid "object not found: %s" +msgstr "objeto no encontrado: %s" + +#: fetch-pack.c:433 +#, c-format +msgid "error in object: %s" +msgstr "error en objeto: %s" + +#: fetch-pack.c:435 +#, c-format +msgid "no shallow found: %s" +msgstr "superficie no encontrada: %s" + +#: fetch-pack.c:438 +#, c-format +msgid "expected shallow/unshallow, got %s" +msgstr "se esperaba shallow/unshallow, se obtuvo %s" + +#: fetch-pack.c:477 +#, c-format +msgid "got %s %d %s" +msgstr "se obtuvo %s %d %s" + +#: fetch-pack.c:491 +#, c-format +msgid "invalid commit %s" +msgstr "commit inválido %s" + +#: fetch-pack.c:524 +msgid "giving up" +msgstr "rindiendose" + +#: fetch-pack.c:534 progress.c:242 +msgid "done" +msgstr "listo" + +#: fetch-pack.c:546 +#, c-format +msgid "got %s (%d) %s" +msgstr "se obtuvo %s (%d) %s" + +#: fetch-pack.c:592 +#, c-format +msgid "Marking %s as complete" +msgstr "Marcando %s como completa" + +#: fetch-pack.c:776 +#, c-format +msgid "already have %s (%s)" +msgstr "ya se tiene %s (%s)" + +#: fetch-pack.c:814 +msgid "fetch-pack: unable to fork off sideband demultiplexer" +msgstr "fetch-pack: no se puede extraer un demultiplexor de banda lateral" + +#: fetch-pack.c:822 +msgid "protocol error: bad pack header" +msgstr "error de protocolo: mal paquete de header" + +#: fetch-pack.c:878 +#, c-format +msgid "fetch-pack: unable to fork off %s" +msgstr "fetch-pack: no se puede quitar %s" + +#: fetch-pack.c:894 +#, c-format +msgid "%s failed" +msgstr "%s fallo" + +#: fetch-pack.c:896 +msgid "error in sideband demultiplexer" +msgstr "error en demultiplexor de banda lateral" + +#: fetch-pack.c:923 +msgid "Server does not support shallow clients" +msgstr "Servidor no soporta clientes superficiales" + +#: fetch-pack.c:927 +msgid "Server supports multi_ack_detailed" +msgstr "Servidor soporta ulti_ack_detailed" + +#: fetch-pack.c:930 +msgid "Server supports no-done" +msgstr "Servidor soporta no-done" + +#: fetch-pack.c:936 +msgid "Server supports multi_ack" +msgstr "Servidor soporta multi_ack" + +#: fetch-pack.c:940 +msgid "Server supports side-band-64k" +msgstr "Servidor soporta side-band-64k" + +#: fetch-pack.c:944 +msgid "Server supports side-band" +msgstr "Servidor soporta side-band" + +#: fetch-pack.c:948 +msgid "Server supports allow-tip-sha1-in-want" +msgstr "Servidor soporta allow-tip-sha1-in-want" + +#: fetch-pack.c:952 +msgid "Server supports allow-reachable-sha1-in-want" +msgstr "Servidor soporta allow-reachable-sha1-in-want" + +#: fetch-pack.c:962 +msgid "Server supports ofs-delta" +msgstr "Servidor soporta ofs-delta" + +#: fetch-pack.c:969 +#, c-format +msgid "Server version is %.*s" +msgstr "Version de servidor es %.*s" + +#: fetch-pack.c:975 +msgid "Server does not support --shallow-since" +msgstr "Servidor no soporta --shalow-since" + +#: fetch-pack.c:979 +msgid "Server does not support --shallow-exclude" +msgstr "Servidor no soporta --shalow-exclude" + +#: fetch-pack.c:981 +msgid "Server does not support --deepen" +msgstr "Servidor no soporta --deepen" + +#: fetch-pack.c:992 +msgid "no common commits" +msgstr "no hay commits comunes" + +#: fetch-pack.c:1004 +msgid "git fetch-pack: fetch failed." +msgstr "git fetch-pack: fetch fallo" + +#: fetch-pack.c:1166 +msgid "no matching remote head" +msgstr "no concuerda el head remoto" + +#: fetch-pack.c:1188 +#, c-format +msgid "no such remote ref %s" +msgstr "no existe ref remota %s" + +#: fetch-pack.c:1191 +#, c-format +msgid "Server does not allow request for unadvertised object %s" +msgstr "Servidor no permite solicitudes de objetos inadvertidos %s" + +#: gpg-interface.c:181 +msgid "gpg failed to sign the data" +msgstr "gpg fallo al firmar la data" + +#: gpg-interface.c:211 +msgid "could not create temporary file" +msgstr "no se pudo crear archivo temporal" + +#: gpg-interface.c:214 +#, c-format +msgid "failed writing detached signature to '%s'" +msgstr "fallo al escribir la firma separada para '%s'" + +#: graph.c:97 +#, c-format +msgid "ignore invalid color '%.*s' in log.graphColors" +msgstr "ignora color invalido '%.*s' en log.graphColors" + +#: grep.c:1970 +#, c-format +msgid "'%s': unable to read %s" +msgstr "'%s': no es posible leer %s" + +#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134 +#, c-format +msgid "failed to stat '%s'" +msgstr "fallo al marcar '%s'" + +#: grep.c:1998 +#, c-format +msgid "'%s': short read" +msgstr "'%s': lectura corta" + +#: help.c:179 +#, c-format +msgid "available git commands in '%s'" +msgstr "comandos disponibles de git en '%s'" + +#: help.c:186 +msgid "git commands available from elsewhere on your $PATH" +msgstr "comandos disponibles de git desde otro lugar en tu $PATH" + +#: help.c:217 +msgid "These are common Git commands used in various situations:" +msgstr "Estos son comandos comunes de Git usados en varias situaciones:" + +#: help.c:281 +#, c-format +msgid "" +"'%s' appears to be a git command, but we were not\n" +"able to execute it. Maybe git-%s is broken?" +msgstr "" +"'%s' parece ser un commando de git, pero no hemos\n" +"podido ejecutarlo. Tal vez git-%s se ha roto?" + +#: help.c:336 +msgid "Uh oh. Your system reports no Git commands at all." +msgstr "Oh oh. Tu sistema no reporta ningun comando de Git" + +#: help.c:358 +#, c-format +msgid "WARNING: You called a Git command named '%s', which does not exist." +msgstr "PELIGRO: Has llamado a un comando de Git '%s', el cual no existe." + +#: help.c:363 +#, c-format +msgid "Continuing under the assumption that you meant '%s'." +msgstr "Continuando asumiendo que quisiste decir '%s'." + +#: help.c:368 +#, c-format +msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." +msgstr "Continuando en %0.1f segundos, asumiendo que tu dijiste '%s'." + +#: help.c:376 +#, c-format +msgid "git: '%s' is not a git command. See 'git --help'." +msgstr "git: '%s'no es un commando de git. Mira 'git --help'." + +#: help.c:380 +msgid "" +"\n" +"The most similar command is" +msgid_plural "" +"\n" +"The most similar commands are" +msgstr[0] "" +"\n" +"El comando mas similar es" +msgstr[1] "" +"\n" +"Los comandos mas similares son" + +#: help.c:395 +msgid "git version [<options>]" +msgstr "git version [<opciones>]" + +#: help.c:456 +#, c-format +msgid "%s: %s - %s" +msgstr "%s: %s - %s" + +#: help.c:460 +msgid "" +"\n" +"Did you mean this?" +msgid_plural "" +"\n" +"Did you mean one of these?" +msgstr[0] "" +"\n" +"Quisiste decir esto?" +msgstr[1] "" +"\n" +"Quisiste decir alguno de estos?" + +#: ident.c:342 +msgid "" +"\n" +"*** Please tell me who you are.\n" +"\n" +"Run\n" +"\n" +" git config --global user.email \"you@example.com\"\n" +" git config --global user.name \"Your Name\"\n" +"\n" +"to set your account's default identity.\n" +"Omit --global to set the identity only in this repository.\n" +"\n" +msgstr "" +"\n" +"*** Por favor cuentame quien eres.\n" +"\n" +"Corre\n" +"\n" +" git config --global user.email \"you@example.com\"\n" +" git config --global user.name \"Tu Nombre\"\n" +"\n" +"para configurar la identidad por defecto de tu cuenta.\n" +"Omite --global para configurar tu identidad solo en este repositorio.\n" +"\n" + +#: ident.c:366 +msgid "no email was given and auto-detection is disabled" +msgstr "no se entrego ningun email y la deteccion automatica esta desactivada" + +#: ident.c:371 +#, c-format +msgid "unable to auto-detect email address (got '%s')" +msgstr "no es posible auto-detectar la direccion de correo (se obtuvo '%s')" + +#: ident.c:381 +msgid "no name was given and auto-detection is disabled" +msgstr "" +"no se entreogo ningun nombre y la deteccion automatica esta desactivada" + +#: ident.c:387 +#, c-format +msgid "unable to auto-detect name (got '%s')" +msgstr "no es posible auto-detectar el nombre (se obtuvo '%s')" + +#: ident.c:395 +#, c-format +msgid "empty ident name (for <%s>) not allowed" +msgstr "no se puede tener un nombre vacio (para <%s>)" + +#: ident.c:401 +#, c-format +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 +#, c-format +msgid "invalid date format: %s" +msgstr "formato de fecha invalido: %s" + +#: lockfile.c:151 +#, c-format +msgid "" +"Unable to create '%s.lock': %s.\n" +"\n" +"Another git process seems to be running in this repository, e.g.\n" +"an editor opened by 'git commit'. Please make sure all processes\n" +"are terminated then try again. If it still fails, a git process\n" +"may have crashed in this repository earlier:\n" +"remove the file manually to continue." +msgstr "" +"No se puede crear '%s.lock': %s.\n" +"\n" +"Otro proceso git parece estar corriendo en el repositorio, es decir\n" +"un editor abierto con 'git commit'. Por favor asegurese de que todos los " +"procesos\n" +"estan terminados y vuelve a intentar. Si el fallo permanece, un proceso git\n" +"puede haber roto el repositorio antes:\n" +"borra el archivo manualmente para continuar." + +#: lockfile.c:159 +#, c-format +msgid "Unable to create '%s.lock': %s" +msgstr "No se pudo crear '%s.lock': %s" + +#: merge.c:41 +msgid "failed to read the cache" +msgstr "fallo al leer la cache" + +#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380 +#: builtin/checkout.c:595 builtin/clone.c:754 +msgid "unable to write new index file" +msgstr "no es posible escribir el archivo indice" + +#: merge-recursive.c:235 +msgid "(bad commit)\n" +msgstr "(mal commit)\n" + +#: merge-recursive.c:257 merge-recursive.c:265 +#, c-format +msgid "addinfo_cache failed for path '%s'" +msgstr "addinfo_cache fallo para la ruta '%s'" + +#: merge-recursive.c:329 +msgid "error building trees" +msgstr "error construyendo arboles" + +#: merge-recursive.c:752 +#, c-format +msgid "failed to create path '%s'%s" +msgstr "fallo al crear la ruta '%s'%s" + +#: merge-recursive.c:763 +#, 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 +msgid ": perhaps a D/F conflict?" +msgstr ": tal vez un conflicto D/F?" + +#: merge-recursive.c:786 +#, 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 +#, c-format +msgid "cannot read object %s '%s'" +msgstr "no se puede leer el objeto %s '%s'" + +#: merge-recursive.c:830 +#, c-format +msgid "blob expected for %s '%s'" +msgstr "se esperaba blob para %s '%s'" + +#: merge-recursive.c:854 +#, c-format +msgid "failed to open '%s': %s" +msgstr "fallo al abrir '%s': %s" + +#: merge-recursive.c:865 +#, c-format +msgid "failed to symlink '%s': %s" +msgstr "fallo al crear symlink '%s': %s" + +#: merge-recursive.c:870 +#, 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 +msgid "Failed to execute internal merge" +msgstr "Fallo al ejectura fusion interna" + +#: merge-recursive.c:1014 +#, c-format +msgid "Unable to add %s to database" +msgstr "No es posible agregar %s a la base de datos" + +#: merge-recursive.c:1117 +#, 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 version %s de %s " +"en el arbol" + +#: merge-recursive.c:1122 +#, 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. Version %s de %s " +"permanece en el arbol" + +#: merge-recursive.c:1129 +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " +"in tree at %s." +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 +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " +"left in tree at %s." +msgstr "" +"CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Version %s de %s " +"permanece en el arbol en %s." + +#: merge-recursive.c:1168 +msgid "rename" +msgstr "renombrar" + +#: merge-recursive.c:1168 +msgid "renamed" +msgstr "renombrado" + +#: merge-recursive.c:1225 +#, 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 +#, c-format +msgid "" +"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" +"\"->\"%s\" in \"%s\"%s" +msgstr "" +"CONFLICTO (renombrar/renombrar): Renombrar \"%s\"->\"%s\" en la rama \"%s\" " +"renombrar \"%s\"->\"%s\" en \"%s\"%s" + +#: merge-recursive.c:1255 +msgid " (left unresolved)" +msgstr " (dejado sin resolver)" + +#: merge-recursive.c:1317 +#, 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 +#, 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 +#, 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 +#, c-format +msgid "Adding merged %s" +msgstr "Agregar %s fusionado" + +#: merge-recursive.c:1575 merge-recursive.c:1805 +#, c-format +msgid "Adding as %s instead" +msgstr "Agregando más bien como %s" + +#: merge-recursive.c:1632 +#, c-format +msgid "cannot read object %s" +msgstr "no se pudo leer el objeto %s" + +#: merge-recursive.c:1635 +#, c-format +msgid "object %s is not a blob" +msgstr "objeto %s no es un blob" + +#: merge-recursive.c:1704 +msgid "modify" +msgstr "modificar" + +#: merge-recursive.c:1704 +msgid "modified" +msgstr "modificado" + +#: merge-recursive.c:1714 +msgid "content" +msgstr "contenido" + +#: merge-recursive.c:1721 +msgid "add/add" +msgstr "agregar/agregar" + +#: merge-recursive.c:1757 +#, c-format +msgid "Skipped %s (merged same as existing)" +msgstr "Saltado %s (fusionado como existente)" + +#: merge-recursive.c:1771 +#, c-format +msgid "Auto-merging %s" +msgstr "Auto-fusionando %s" + +#: merge-recursive.c:1775 git-submodule.sh:944 +msgid "submodule" +msgstr "submódulo" + +#: merge-recursive.c:1776 +#, c-format +msgid "CONFLICT (%s): Merge conflict in %s" +msgstr "CONFLICTO (%s): Conflicto de fusión en %s" + +#: merge-recursive.c:1870 +#, c-format +msgid "Removing %s" +msgstr "Eliminando %s" + +#: merge-recursive.c:1896 +msgid "file/directory" +msgstr "archivo/directorio" + +#: merge-recursive.c:1902 +msgid "directory/file" +msgstr "directorio/archivo" + +#: merge-recursive.c:1908 +#, c-format +msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" +msgstr "" +"CONFLICTO (%s): Hay un directorio con el nombre %s en %s. Agregando %s como " +"%s" + +#: merge-recursive.c:1917 +#, c-format +msgid "Adding %s" +msgstr "Agregando %s" + +#: merge-recursive.c:1954 +msgid "Already up to date!" +msgstr "¡Ya está actualizado!" + +#: merge-recursive.c:1963 +#, c-format +msgid "merging of trees %s and %s failed" +msgstr "falló la fusión de los árboles %s y %s" + +#: merge-recursive.c:2060 +msgid "Merging:" +msgstr "Fusionando:" + +#: merge-recursive.c:2073 +#, c-format +msgid "found %u common ancestor:" +msgid_plural "found %u common ancestors:" +msgstr[0] "se encontró %u ancestro común:" +msgstr[1] "se encontraron %u ancestros comunes:" + +#: merge-recursive.c:2112 +msgid "merge returned no commit" +msgstr "la fusión no devolvió ninguna confirmación" + +#: merge-recursive.c:2175 +#, c-format +msgid "Could not parse object '%s'" +msgstr "No se pudo analizar el objeto '%s'" + +#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814 +msgid "Unable to write index." +msgstr "Incapaz de escribir el índice." + +#: notes-merge.c:272 +#, c-format +msgid "" +"You have not concluded your previous notes merge (%s exists).\n" +"Please, use 'git notes merge --commit' or 'git notes merge --abort' to " +"commit/abort the previous merge before you start a new notes merge." +msgstr "" +"No has concluido tus notas previas de fusion (%s existe).\n" +"Por favor, usa 'git notes merge --commit' o 'git notes merge --abort' para " +"confirmar/abortar la fusion previa antes de que puedas comenzar una nueva " +"nota de fusion." + +#: notes-merge.c:279 +#, c-format +msgid "You have not concluded your notes merge (%s exists)." +msgstr "No has terminado tus notas de fusion (%s existe)." + +#: notes-utils.c:42 +msgid "Cannot commit uninitialized/unreferenced notes tree" +msgstr "" +"No se puede realizar commit, notas del arbol no inicializadas o no " +"referenciadas." + +#: notes-utils.c:101 +#, c-format +msgid "Bad notes.rewriteMode value: '%s'" +msgstr "Mal valor para notes.rewriteMode: '%s'" + +#: notes-utils.c:111 +#, c-format +msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" +msgstr "Rehusando reescribir notas en %s (fuera de refs/notes/)" + +#. TRANSLATORS: The first %s is the name of +#. the environment variable, the second %s is +#. its value. +#. +#: notes-utils.c:141 +#, c-format +msgid "Bad %s value: '%s'" +msgstr "Mal valor para %s: '%s'" + +#: object.c:239 +#, c-format +msgid "unable to parse object: %s" +msgstr "incapaz de analizar objeto: %s" + +#: packfile.c:556 +msgid "offset before end of packfile (broken .idx?)" +msgstr "offset antes del final del paquete (broken .idx?)" + +#: packfile.c:1683 +#, 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 +#, 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 +msgid "..." +msgstr "..." + +#: parse-options.c:592 +#, c-format +msgid "usage: %s" +msgstr "uso: %s" + +#. TRANSLATORS: the colon here should align with the +#. one in "usage: %s" translation. +#. +#: parse-options.c:598 +#, c-format +msgid " or: %s" +msgstr " o: %s" + +#: parse-options.c:601 +#, c-format +msgid " %s" +msgstr " %s" + +#: parse-options.c:640 +msgid "-NUM" +msgstr "-NUM" + +#: parse-options-cb.c:108 +#, c-format +msgid "malformed object name '%s'" +msgstr "nombre de objeto malformado '%s'" + +#: path.c:891 +#, c-format +msgid "Could not make %s writable by group" +msgstr "No se pudo hacer que %s fuera escribible por el grupo" + +#: pathspec.c:129 +msgid "Escape character '\\' not allowed as last character in attr value" +msgstr "" +"Caracter de escape '\\' no permitido como ultimo caracter en el valor attr" + +#: pathspec.c:147 +msgid "Only one 'attr:' specification is allowed." +msgstr "Solo una especificacion 'attr' es permitida." + +#: pathspec.c:150 +msgid "attr spec must not be empty" +msgstr "especificacion attr no puede estar vacia" + +#: pathspec.c:193 +#, c-format +msgid "invalid attribute name %s" +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 " + +#: pathspec.c:265 +msgid "" +"global 'literal' pathspec setting is incompatible with all other global " +"pathspec settings" +msgstr "" +"la configuración global de 'literal' para patrones de ruta es incompatible " +"con las demás configuraciones globales de patrones de ruta" + +#: pathspec.c:305 +msgid "invalid parameter for pathspec magic 'prefix'" +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'" + +#: pathspec.c:331 +#, c-format +msgid "Missing ')' at the end of pathspec magic in '%s'" +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" + +#: pathspec.c:428 +#, c-format +msgid "%s: 'literal' and 'glob' are incompatible" +msgstr "%s: 'literal' y 'glob' son incompatibles" + +#: pathspec.c:441 +#, c-format +msgid "%s: '%s' is outside repository" +msgstr "%s: '%s' está fuera del repositorio" + +#: pathspec.c:515 +#, c-format +msgid "'%s' (mnemonic: '%c')" +msgstr "'%s' (nemotecnico: '%c')" + +#: pathspec.c:525 +#, c-format +msgid "%s: pathspec magic not supported by this command: %s" +msgstr "%s: magic pathspec no soportado por este comando: %s" + +#: pathspec.c:571 +msgid "" +"empty strings as pathspecs will be made invalid in upcoming releases. please " +"use . instead if you meant to match all paths" +msgstr "" +"los strings vacíos como pathspecs serán inválidas en las próximas versiones. " +"por favor use . si quería hacer coincidir todas las rutas" + +#: pathspec.c:595 +#, c-format +msgid "pathspec '%s' is beyond a symbolic link" +msgstr "el patrón de ruta '%s' está detrás de un enlace simbólico" + +#: pretty.c:962 +msgid "unable to parse --pretty format" +msgstr "incapaz de analizar el formato --pretty" + +#: read-cache.c:1443 +#, c-format +msgid "" +"index.version set, but the value is invalid.\n" +"Using version %i" +msgstr "" +"index.version configurado, pero el valor no es válido.\n" +"Usando versión %i" + +#: read-cache.c:1453 +#, c-format +msgid "" +"GIT_INDEX_VERSION set, but the value is invalid.\n" +"Using version %i" +msgstr "" +"GIT_INDEX_VERSION configurado, pero el valor no es válido.\n" +"Usando versión %i" + +#: read-cache.c:2316 builtin/merge.c:1046 +#, c-format +msgid "could not close '%s'" +msgstr "no se pudo cerrar '%s'" + +#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077 +#, c-format +msgid "could not stat '%s'" +msgstr "no se pudo definir '%s'" + +#: read-cache.c:2407 +#, c-format +msgid "unable to open git dir: %s" +msgstr "no es posible abrir el directorio de git: %s" + +#: read-cache.c:2419 +#, c-format +msgid "unable to unlink: %s" +msgstr "no es posible remover el vinculo: %s" + +#: refs.c:638 +#, c-format +msgid "Could not open '%s' for writing" +msgstr "No sepudo abrir '%s' para escritura" + +#: refs.c:1779 +msgid "ref updates forbidden inside quarantine environment" +msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena" + +#: refs/files-backend.c:1136 +#, c-format +msgid "could not remove reference %s" +msgstr "no se pudo remover la referencia %s" + +#: refs/files-backend.c:1150 refs/packed-backend.c:1430 +#: refs/packed-backend.c:1440 +#, c-format +msgid "could not delete reference %s: %s" +msgstr "no se pudo eliminar la referencia %s: %s" + +#: refs/files-backend.c:1153 refs/packed-backend.c:1443 +#, c-format +msgid "could not delete references: %s" +msgstr "no se pudo eliminar la referencia: %s" + +#: ref-filter.c:35 wt-status.c:1811 +msgid "gone" +msgstr "desaparecido" + +#: ref-filter.c:36 +#, c-format +msgid "ahead %d" +msgstr "adelante %d" + +#: ref-filter.c:37 +#, c-format +msgid "behind %d" +msgstr "detras %d" + +#: ref-filter.c:38 +#, c-format +msgid "ahead %d, behind %d" +msgstr "delante %d, detras %d" + +#: ref-filter.c:104 +#, c-format +msgid "expected format: %%(color:<color>)" +msgstr "formato esperado: %%(color:<color>)" + +#: ref-filter.c:106 +#, c-format +msgid "unrecognized color: %%(color:%s)" +msgstr "color no reconocido: %%(color:%s)" + +#: ref-filter.c:126 +#, c-format +msgid "Integer value expected refname:lstrip=%s" +msgstr "valor entero esperado refname:lstrip=%s" + +#: ref-filter.c:130 +#, c-format +msgid "Integer value expected refname:rstrip=%s" +msgstr "valor entero esperado refname:rstrip=%s" + +#: ref-filter.c:132 +#, c-format +msgid "unrecognized %%(%s) argument: %s" +msgstr "argumento: %s no reconocido %%(%s)" + +#: ref-filter.c:172 +#, c-format +msgid "%%(body) does not take arguments" +msgstr "%%(body) no toma ningún argumento" + +#: ref-filter.c:179 +#, c-format +msgid "%%(subject) does not take arguments" +msgstr "%%(subject) no toma ningún argumento" + +#: ref-filter.c:186 +#, c-format +msgid "%%(trailers) does not take arguments" +msgstr "%%(trailers) no toma argumentos" + +#: ref-filter.c:205 +#, c-format +msgid "positive value expected contents:lines=%s" +msgstr "valor positivo esperado contents:lines=%s" + +#: ref-filter.c:207 +#, c-format +msgid "unrecognized %%(contents) argument: %s" +msgstr "argumento %s no reconocido %%(contents)" + +#: ref-filter.c:220 +#, c-format +msgid "positive value expected objectname:short=%s" +msgstr "valor positivo esperado objectname:short=%s" + +#: ref-filter.c:224 +#, c-format +msgid "unrecognized %%(objectname) argument: %s" +msgstr "argumento: %s no reconocido %%(objectname)" + +#: ref-filter.c:251 +#, c-format +msgid "expected format: %%(align:<width>,<position>)" +msgstr "formato esperado: %%(align:<ancho>,<posición>)" + +#: ref-filter.c:263 +#, c-format +msgid "unrecognized position:%s" +msgstr "posición desconocida: %s" + +#: ref-filter.c:267 +#, c-format +msgid "unrecognized width:%s" +msgstr "ancho desconocido: %s" + +#: ref-filter.c:273 +#, c-format +msgid "unrecognized %%(align) argument: %s" +msgstr "argumento no reconocido para %%(align): %s" + +#: ref-filter.c:277 +#, c-format +msgid "positive width expected with the %%(align) atom" +msgstr "se esperaba un ancho positivo con el átomo %%(align)" + +#: ref-filter.c:292 +#, c-format +msgid "unrecognized %%(if) argument: %s" +msgstr "argumento: %s no reconocido %%(if)" + +#: ref-filter.c:382 +#, c-format +msgid "malformed field name: %.*s" +msgstr "nombre malformado de campo: %.*s" + +#: ref-filter.c:408 +#, c-format +msgid "unknown field name: %.*s" +msgstr "nombre de campo desconocido: %.*s" + +#: ref-filter.c:520 +#, c-format +msgid "format: %%(if) atom used without a %%(then) atom" +msgstr "formato: atomo %%(if) usado sin un atomo %%(then)" + +#: ref-filter.c:580 +#, c-format +msgid "format: %%(then) atom used without an %%(if) atom" +msgstr "formato: atomo %%(then) usado sin atomo %%(if)" + +#: ref-filter.c:582 +#, c-format +msgid "format: %%(then) atom used more than once" +msgstr "formato: atomo %%(then) usado mas de una vez" + +#: ref-filter.c:584 +#, c-format +msgid "format: %%(then) atom used after %%(else)" +msgstr "formato: atomo %%(then) usado despues de %%(else)" + +#: ref-filter.c:610 +#, c-format +msgid "format: %%(else) atom used without an %%(if) atom" +msgstr "formato: atomo %%(else) usado sin un atomo %%(if)" + +#: ref-filter.c:612 +#, c-format +msgid "format: %%(else) atom used without a %%(then) atom" +msgstr "formato: atomo %%(else) usado sin un atomo %%(then) " + +#: ref-filter.c:614 +#, c-format +msgid "format: %%(else) atom used more than once" +msgstr "formato: atomo %%(else) usado mas de una vez" + +#: ref-filter.c:627 +#, c-format +msgid "format: %%(end) atom used without corresponding atom" +msgstr "formato: atomo %%(end) usado sin atomo correspondiente" + +#: ref-filter.c:682 +#, c-format +msgid "malformed format string %s" +msgstr "formato de cadena malformado %s" + +#: ref-filter.c:1268 +#, c-format +msgid "(no branch, rebasing %s)" +msgstr "(no hay rama, rebasando %s)" + +#: ref-filter.c:1271 +#, c-format +msgid "(no branch, bisect started on %s)" +msgstr "(no hay rama, comenzando bisectado en %s)" + +#. TRANSLATORS: make sure this matches "HEAD +#. detached at " in wt-status.c +#. +#: ref-filter.c:1279 +#, c-format +msgid "(HEAD detached at %s)" +msgstr "(HEAD desascoplado en %s)" + +#. TRANSLATORS: make sure this matches "HEAD +#. detached from " in wt-status.c +#. +#: ref-filter.c:1286 +#, c-format +msgid "(HEAD detached from %s)" +msgstr "(HEAD desacoplado de %s)" + +#: ref-filter.c:1290 +msgid "(no branch)" +msgstr "(sin rama)" + +#: ref-filter.c:1439 ref-filter.c:1470 +#, c-format +msgid "missing object %s for %s" +msgstr "objeto %s faltante para %s" + +#: ref-filter.c:1442 ref-filter.c:1473 +#, c-format +msgid "parse_object_buffer failed on %s for %s" +msgstr "parse_object_buffer falló en %s para %s" + +#: ref-filter.c:1773 +#, c-format +msgid "malformed object at '%s'" +msgstr "objeto malformado en '%s'" + +#: ref-filter.c:1840 +#, c-format +msgid "ignoring ref with broken name %s" +msgstr "ignorando referencia con nombre roto %s" + +#: ref-filter.c:1845 +#, c-format +msgid "ignoring broken ref %s" +msgstr "ignorando referencia rota %s" + +#: ref-filter.c:2107 +#, c-format +msgid "format: %%(end) atom missing" +msgstr "formato: falta atomo %%(end)" + +#: ref-filter.c:2201 +#, c-format +msgid "malformed object name %s" +msgstr "nombre de objeto malformado %s" + +#: remote.c:750 +#, c-format +msgid "Cannot fetch both %s and %s to %s" +msgstr "No se pueden traer ambos %s y %s a %s" + +#: remote.c:754 +#, c-format +msgid "%s usually tracks %s, not %s" +msgstr "%s por lo general hace seguimiento a %s, no a %s" + +#: remote.c:758 +#, c-format +msgid "%s tracks both %s and %s" +msgstr "%s hace seguimiento tanto a %s como a %s" + +#: remote.c:766 +msgid "Internal error" +msgstr "Error interno" + +#: remote.c:1681 remote.c:1783 +msgid "HEAD does not point to a branch" +msgstr "HEAD no apunta a ninguna rama" + +#: remote.c:1690 +#, c-format +msgid "no such branch: '%s'" +msgstr "no existe tal rama: '%s'" + +#: remote.c:1693 +#, c-format +msgid "no upstream configured for branch '%s'" +msgstr "no se ha configurado upstream para la rama '%s'" + +#: remote.c:1699 +#, c-format +msgid "upstream branch '%s' not stored as a remote-tracking branch" +msgstr "la rama '%s' de upstream no es guardad como rama de rastreo remoto" + +#: remote.c:1714 +#, c-format +msgid "push destination '%s' on remote '%s' has no local tracking branch" +msgstr "" +"destino de push '%s' en el remoto '%s' no tiene una rama de rastreo local" + +#: remote.c:1726 +#, c-format +msgid "branch '%s' has no remote for pushing" +msgstr "la rama '%s' no tiene remoto para enviar" + +#: remote.c:1737 +#, c-format +msgid "push refspecs for '%s' do not include '%s'" +msgstr "refspecs del push para '%s' no incluyen '%s'" + +#: remote.c:1750 +msgid "push has no destination (push.default is 'nothing')" +msgstr "push no tiene destino (push.default es 'nada')" + +#: remote.c:1772 +msgid "cannot resolve 'simple' push to a single destination" +msgstr "no se puede resolver push 'simple' para un destino unico" + +#: remote.c:2076 +#, c-format +msgid "Your branch is based on '%s', but the upstream is gone.\n" +msgstr "tu rama esta basada en '%s', pero upstream ha desaparecido.\n" + +#: remote.c:2080 +msgid " (use \"git branch --unset-upstream\" to fixup)\n" +msgstr " (usa \"git branch --unset-upstream\" para arreglar)\n" + +#: remote.c:2083 +#, c-format +msgid "Your branch is up to date with '%s'.\n" +msgstr "Tu rama está actualizada con '%s'.\n" + +#: remote.c:2087 +#, c-format +msgid "Your branch is ahead of '%s' by %d commit.\n" +msgid_plural "Your branch is ahead of '%s' by %d commits.\n" +msgstr[0] "Tu rama está adelantada a '%s' por %d confirmación.\n" +msgstr[1] "Tu rama está adelantada a '%s' por %d confirmaciones.\n" + +#: remote.c:2093 +msgid " (use \"git push\" to publish your local commits)\n" +msgstr " (usa \"git push\" para publicar tus confirmaciones locales)\n" + +#: remote.c:2096 +#, c-format +msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" +msgid_plural "" +"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" +msgstr[0] "" +"Tu rama está detrás de '%s' por %d confirmación, y puede ser avanzada " +"rápido.\n" +msgstr[1] "" +"Tu rama está detrás de '%s' por %d confirmaciones, y puede ser avanzada " +"rápido.\n" + +#: remote.c:2104 +msgid " (use \"git pull\" to update your local branch)\n" +msgstr " (usa \"git pull\" para actualizar tu rama local)\n" + +#: remote.c:2107 +#, c-format +msgid "" +"Your branch and '%s' have diverged,\n" +"and have %d and %d different commit each, respectively.\n" +msgid_plural "" +"Your branch and '%s' have diverged,\n" +"and have %d and %d different commits each, respectively.\n" +msgstr[0] "" +"Tu rama y '%s' han divergido,\n" +"y se tiene %d y %d commit diferentes en cada una respectivamente.\n" +msgstr[1] "" +"Tu rama y '%s' han divergido,\n" +"y tienen %d y %d commits diferentes cada una respectivamente.\n" + +#: remote.c:2117 +msgid " (use \"git pull\" to merge the remote branch into yours)\n" +msgstr " (usa \"git pull\" para fusionar la rama remota en la tuya)\n" + +#: revision.c:2256 +msgid "your current branch appears to be broken" +msgstr "tu rama actual parece estar rota" + +#: revision.c:2259 +#, c-format +msgid "your current branch '%s' does not have any commits yet" +msgstr "tu rama actual '%s' no tiene ningún commit todavía" + +#: revision.c:2453 +msgid "--first-parent is incompatible with --bisect" +msgstr "--first-parent es incompatible con --bisect" + +#: run-command.c:644 +msgid "open /dev/null failed" +msgstr "falló al abrir /dev/null" + +#: send-pack.c:151 +#, c-format +msgid "unable to parse remote unpack status: %s" +msgstr "no es posible analizar el estado de desempaquetado remoto: %s" + +#: send-pack.c:153 +#, c-format +msgid "remote unpack failed: %s" +msgstr "desempaquetado remoto falló: %s" + +#: send-pack.c:316 +msgid "failed to sign the push certificate" +msgstr "falló al firmar el certificado de push" + +#: send-pack.c:429 +msgid "the receiving end does not support --signed push" +msgstr "el final receptor no soporta --signed push" + +#: send-pack.c:431 +msgid "" +"not sending a push certificate since the receiving end does not support --" +"signed push" +msgstr "" +"no se manda un certificado de push ya que el destino no soporta push firmado " +"(--signed )" + +#: send-pack.c:443 +msgid "the receiving end does not support --atomic push" +msgstr "el destino no soporta push atómicos (--atomic)" + +#: send-pack.c:448 +msgid "the receiving end does not support push options" +msgstr "el destino no soporta opciones de push" + +#: sequencer.c:218 +msgid "revert" +msgstr "revertir" + +#: sequencer.c:220 +msgid "cherry-pick" +msgstr "cherry-pick" + +#: sequencer.c:222 +msgid "rebase -i" +msgstr "rebase -i" + +#: sequencer.c:224 +#, c-format +msgid "Unknown action: %d" +msgstr "Accion desconocida: %d" + +#: sequencer.c:281 +msgid "" +"after resolving the conflicts, mark the corrected paths\n" +"with 'git add <paths>' or 'git rm <paths>'" +msgstr "" +"despues de resolver los conflictos, marca las rutas corregidas\n" +"con 'git add <rutas>' o 'git rm <rutas>'" + +#: sequencer.c:284 +msgid "" +"after resolving the conflicts, mark the corrected paths\n" +"with 'git add <paths>' or 'git rm <paths>'\n" +"and commit the result with 'git commit'" +msgstr "" +"tras resolver los conflictos, marca las rutas corregidas\n" +"con 'git add <rutas>' o 'git rm <rutas>'\n" +"y haz un commit del resultado con 'git commit'" + +#: sequencer.c:297 sequencer.c:1704 +#, c-format +msgid "could not lock '%s'" +msgstr "No se pudo bloquear '%s'" + +#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723 +#: sequencer.c:2733 sequencer.c:2749 +#, c-format +msgid "could not write to '%s'" +msgstr "No se pudo escribir en '%s'" + +#: sequencer.c:304 +#, c-format +msgid "could not write eol to '%s'" +msgstr "No se pudo escribir EOL en '%s'" + +#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711 +#, c-format +msgid "failed to finalize '%s'." +msgstr "Fallo al finalizar '%s'." + +#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259 +#: builtin/commit.c:754 builtin/merge.c:1044 +#, c-format +msgid "could not read '%s'" +msgstr "No se pudo leer '%s'" + +#: sequencer.c:358 +#, c-format +msgid "your local changes would be overwritten by %s." +msgstr "Tus cambios locales seran sobreescritos por %s." + +#: sequencer.c:362 +msgid "commit your changes or stash them to proceed." +msgstr "Realiza un commit con tus cambios o aplica un stash para proceder." + +#: sequencer.c:391 +#, c-format +msgid "%s: fast-forward" +msgstr "%s: avance rápido" + +#. TRANSLATORS: %s will be "revert", "cherry-pick" or +#. "rebase -i". +#. +#: sequencer.c:474 +#, c-format +msgid "%s: Unable to write new index file" +msgstr "%s: Incapaz de escribir el nuevo archivo índice" + +#: sequencer.c:493 +msgid "could not resolve HEAD commit\n" +msgstr "No se pudo resolver el commit de HEAD\n" + +#: sequencer.c:513 +msgid "unable to update cache tree\n" +msgstr "no es posible actualizar el árbol de la caché\n" + +#: sequencer.c:597 +#, c-format +msgid "" +"you have staged changes in your working tree\n" +"If these changes are meant to be squashed into the previous commit, run:\n" +"\n" +" git commit --amend %s\n" +"\n" +"If they are meant to go into a new commit, run:\n" +"\n" +" git commit %s\n" +"\n" +"In both cases, once you're done, continue with:\n" +"\n" +" git rebase --continue\n" +msgstr "" +"se ha aplicado un stage a los cambios en el arbol de trabajo\n" +"si estos cambios estan destinados a ser aplastados en el commit previo, " +"ejecuta:\n" +"\n" +" git commit --amend %s\n" +"\n" +"Si estos cambios estan destinados a un nuevo commit, ejecuta:\n" +"\n" +" git commit %s\n" +"\n" +"en cambos casos, cuando acabes, continua con:\n" +"\n" +" git rebase --continue\n" + +#: sequencer.c:699 +#, c-format +msgid "could not parse commit %s\n" +msgstr "No se pudo analizar commit %s.\n" + +#: sequencer.c:704 +#, c-format +msgid "could not parse parent commit %s\n" +msgstr "No se pudo analizar el commit padre %s\n" + +#: sequencer.c:826 +#, c-format +msgid "" +"unexpected 1st line of squash message:\n" +"\n" +"\t%.*s" +msgstr "" +"1ra línea del mensaje squash no esperada:\n" +"\n" +"\t%.*s" + +#: sequencer.c:832 +#, c-format +msgid "" +"invalid 1st line of squash message:\n" +"\n" +"\t%.*s" +msgstr "" +"1ra línea del mensaje squash inválida:\n" +"\n" +"\t%.*s" + +#: sequencer.c:838 sequencer.c:863 +#, c-format +msgid "This is a combination of %d commits." +msgstr "Esta es una combinacion de %d commits." + +#: sequencer.c:847 sequencer.c:2681 +msgid "need a HEAD to fixup" +msgstr "se necesita un HEAD para arreglar" + +#: sequencer.c:849 +msgid "could not read HEAD" +msgstr "no se pudo leer HEAD" + +#: sequencer.c:851 +msgid "could not read HEAD's commit message" +msgstr "no se pudo leer el mensaje de commit de HEAD" + +#: sequencer.c:857 +#, c-format +msgid "cannot write '%s'" +msgstr "no se puede escribir '%s'" + +#: sequencer.c:866 git-rebase--interactive.sh:446 +msgid "This is the 1st commit message:" +msgstr "Este es el mensaje de la 1ra confirmación:" + +#: sequencer.c:874 +#, c-format +msgid "could not read commit message of %s" +msgstr "no se puede leer el mensaje del commit de %s" + +#: sequencer.c:881 +#, c-format +msgid "This is the commit message #%d:" +msgstr "este es el mensaje del commit #%d:" + +#: sequencer.c:886 +#, c-format +msgid "The commit message #%d will be skipped:" +msgstr "El mensaje del commit #%d sera saltado: " + +#: sequencer.c:891 +#, c-format +msgid "unknown command: %d" +msgstr "comando desconocido: %d" + +#: sequencer.c:957 +msgid "your index file is unmerged." +msgstr "tu archivo indice no esta fusionado." + +#: sequencer.c:975 +#, c-format +msgid "commit %s is a merge but no -m option was given." +msgstr "el commit %s es una fusion pero no se entrego la opcion -m." + +#: sequencer.c:983 +#, c-format +msgid "commit %s does not have parent %d" +msgstr "el commit %s no tiene un padre %d" + +#: sequencer.c:987 +#, c-format +msgid "mainline was specified but commit %s is not a merge." +msgstr "linea principal especificada pero el commit %s no es una fusion." + +#: sequencer.c:993 +#, c-format +msgid "cannot get commit message for %s" +msgstr "no se puede obtener el mensaje de commit para %s" + +#. TRANSLATORS: The first %s will be a "todo" command like +#. "revert" or "pick", the second %s a SHA1. +#: sequencer.c:1014 +#, c-format +msgid "%s: cannot parse parent commit %s" +msgstr "%s: no se puede analizar la confirmación padre %s" + +#: sequencer.c:1077 sequencer.c:1853 +#, c-format +msgid "could not rename '%s' to '%s'" +msgstr "No se puede renombrar '%s' a '%s'" + +#: sequencer.c:1128 +#, c-format +msgid "could not revert %s... %s" +msgstr "no se pudo revertir %s... %s" + +#: sequencer.c:1129 +#, c-format +msgid "could not apply %s... %s" +msgstr "no se pudo aplicar %s... %s" + +#: sequencer.c:1171 +msgid "empty commit set passed" +msgstr "conjunto de confirmación vacío aprobado" + +#: sequencer.c:1181 +#, c-format +msgid "git %s: failed to read the index" +msgstr "git %s: fallo al leer el índice" + +#: sequencer.c:1188 +#, c-format +msgid "git %s: failed to refresh the index" +msgstr "git %s: fallo al refrescar el índice" + +#: sequencer.c:1308 +#, c-format +msgid "invalid line %d: %.*s" +msgstr "línea inválida %d: %.*s" + +#: sequencer.c:1316 +#, c-format +msgid "cannot '%s' without a previous commit" +msgstr "no se puede '%s' sin un commit previo" + +#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614 +#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951 +#, c-format +msgid "could not read '%s'." +msgstr "no se puede leer '%s'." + +#: sequencer.c:1361 +msgid "please fix this using 'git rebase --edit-todo'." +msgstr "por favor arregle esto usando 'git rebase --edit-todo'." + +#: sequencer.c:1363 +#, c-format +msgid "unusable instruction sheet: '%s'" +msgstr "hoja de instrucciones inutilizable: '%s'" + +#: sequencer.c:1368 +msgid "no commits parsed." +msgstr "ningun commit analizado." + +#: sequencer.c:1379 +msgid "cannot cherry-pick during a revert." +msgstr "no se puede realizar cherry-pick durante un revert." + +#: sequencer.c:1381 +msgid "cannot revert during a cherry-pick." +msgstr "no se puede realizar un revert durante un cherry-pick" + +#: sequencer.c:1448 +#, c-format +msgid "invalid key: %s" +msgstr "llave invalida: %s" + +#: sequencer.c:1451 +#, c-format +msgid "invalid value for %s: %s" +msgstr "valor invalido para %s: %s" + +#: sequencer.c:1517 +#, c-format +msgid "malformed options sheet: '%s'" +msgstr "hoja de opciones mal formada: '%s'" + +#: sequencer.c:1555 +msgid "a cherry-pick or revert is already in progress" +msgstr "un cherry-pick o rever ya esta en progreso" + +#: sequencer.c:1556 +msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" +msgstr "intenta \"git cherry-pick (--continue | --quit | --abort)\"" + +#: sequencer.c:1559 +#, c-format +msgid "could not create sequencer directory '%s'" +msgstr "no se pudo crear un directorio secuenciador '%s' " + +#: sequencer.c:1574 +msgid "could not lock HEAD" +msgstr "no se pudo bloquear HEAD" + +#: sequencer.c:1632 sequencer.c:2211 +msgid "no cherry-pick or revert in progress" +msgstr "ningun cherry-pick o revert en progreso" + +#: sequencer.c:1634 +msgid "cannot resolve HEAD" +msgstr "no se puede resolver HEAD" + +#: sequencer.c:1636 sequencer.c:1671 +msgid "cannot abort from a branch yet to be born" +msgstr "no se puede abortar de una rama por nacer" + +#: sequencer.c:1657 builtin/grep.c:711 +#, c-format +msgid "cannot open '%s'" +msgstr "no se puede abrir '%s'" + +#: sequencer.c:1659 +#, c-format +msgid "cannot read '%s': %s" +msgstr "no se puede leer '%s': %s" + +#: sequencer.c:1660 +msgid "unexpected end of file" +msgstr "final de archivo inesperado" + +#: sequencer.c:1666 +#, c-format +msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" +msgstr "archiv HEAD de pre-cherry-pick guardado '%s' esta corrompido" + +#: sequencer.c:1677 +msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" +msgstr "Parece que se ha movido HEAD. No se hace rebobinado, revise su HEAD!" + +#: sequencer.c:1818 sequencer.c:2109 +msgid "cannot read HEAD" +msgstr "no se puede leer HEAD" + +#: sequencer.c:1858 builtin/difftool.c:640 +#, c-format +msgid "could not copy '%s' to '%s'" +msgstr "no se pudo copiar '%s' a '%s'" + +#: sequencer.c:1874 +msgid "could not read index" +msgstr "no se pudo leer indice" + +#: sequencer.c:1879 +#, c-format +msgid "" +"execution failed: %s\n" +"%sYou can fix the problem, and then run\n" +"\n" +" git rebase --continue\n" +"\n" +msgstr "" +"ejecucion fallida: %s\n" +"%sse puede arreglar el problema , y luego ejecutar\n" +"\n" +" git rebase --continue\n" +"\n" + +#: sequencer.c:1885 +msgid "and made changes to the index and/or the working tree\n" +msgstr "y se hicieron cambios al indice y/o arbol de trabajo\n" + +#: sequencer.c:1891 +#, c-format +msgid "" +"execution succeeded: %s\n" +"but left changes to the index and/or the working tree\n" +"Commit or stash your changes, and then run\n" +"\n" +" git rebase --continue\n" +"\n" +msgstr "" +"ejecucion exitosa: %s\n" +"pero todavia quedan cambios para el indice o arbol de trabajo.\n" +"Realiza un commit o stash con tus cambios, y luego ejecuta\n" +"\n" +" git rebase --continue\n" +"\n" + +#: sequencer.c:1948 +#, c-format +msgid "Applied autostash.\n" +msgstr "Autostash aplicado.\n" + +#: sequencer.c:1960 +#, c-format +msgid "cannot store %s" +msgstr "no se puede guardar %s" + +#: sequencer.c:1963 git-rebase.sh:175 +#, c-format +msgid "" +"Applying autostash resulted in conflicts.\n" +"Your changes are safe in the stash.\n" +"You can run \"git stash pop\" or \"git stash drop\" at any time.\n" +msgstr "" +"Aplicando autostash resultó en conflictos.\n" +"Tus cambios estan seguros en el stash.\n" +"Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier " +"momento.\n" + +#: sequencer.c:2045 +#, c-format +msgid "Stopped at %s... %.*s\n" +msgstr "Detenido en %s... %.*s\n" + +#: sequencer.c:2087 +#, c-format +msgid "unknown command %d" +msgstr "comando desconocido %d" + +#: sequencer.c:2117 +msgid "could not read orig-head" +msgstr "no se puede leer orig-head" + +#: sequencer.c:2122 sequencer.c:2678 +msgid "could not read 'onto'" +msgstr "no se puede leer 'onto'" + +#: sequencer.c:2129 +#, c-format +msgid "could not update %s" +msgstr "no se puede actualizar %s" + +#: sequencer.c:2136 +#, c-format +msgid "could not update HEAD to %s" +msgstr "no se puede actualizar HEAD a %s" + +#: sequencer.c:2220 +msgid "cannot rebase: You have unstaged changes." +msgstr "no se puede realziar rebase: Tienes cambios fuera del area de stage." + +#: sequencer.c:2225 +msgid "could not remove CHERRY_PICK_HEAD" +msgstr "no se puede remover CHERRY_PICK_HEAD" + +#: sequencer.c:2234 +msgid "cannot amend non-existing commit" +msgstr "no se puede arreglar un commit no existente" + +#: sequencer.c:2236 +#, c-format +msgid "invalid file: '%s'" +msgstr "archivo invalido: '%s'" + +#: sequencer.c:2238 +#, c-format +msgid "invalid contents: '%s'" +msgstr "contenido inválido: '%s'" + +#: sequencer.c:2241 +msgid "" +"\n" +"You have uncommitted changes in your working tree. Please, commit them\n" +"first and then run 'git rebase --continue' again." +msgstr "" +"\n" +"Tienes cambios fuera de un commit en tu arbol de trabajo. Por favor, realiza " +"un commit con estos\n" +"primero y luego ejecuta 'git rebase --continue' de nuevo." + +#: sequencer.c:2251 +msgid "could not commit staged changes." +msgstr "no se pudo realiar commit con los cambios en el area de stage." + +#: sequencer.c:2331 +#, c-format +msgid "%s: can't cherry-pick a %s" +msgstr "%s: no se puede aplicar cherry-pick a un %s" + +#: sequencer.c:2335 +#, c-format +msgid "%s: bad revision" +msgstr "%s: mala revision" + +#: sequencer.c:2368 +msgid "can't revert as initial commit" +msgstr "no se puede revertir como commit inicial" + +#: sequencer.c:2471 +msgid "make_script: unhandled options" +msgstr "make_script: opciones desconocidas" + +#: sequencer.c:2474 +msgid "make_script: error preparing revisions" +msgstr "make_script: error preparando revisiones" + +#: sequencer.c:2510 +#, c-format +msgid "unusable todo list: '%s'" +msgstr "lista de pendientes inutilizable: '%s'" + +#: sequencer.c:2516 +#, c-format +msgid "unable to open '%s' for writing" +msgstr "No se pudo abrir '%s' para escritura" + +#: sequencer.c:2561 +#, c-format +msgid "unrecognized setting %s for optionrebase.missingCommitsCheck. Ignoring." +msgstr "" +"Opcion %s no reconocida para optionrebase.missingCommitsCheck. Ingorando." + +#: sequencer.c:2641 +#, c-format +msgid "" +"Warning: some commits may have been dropped accidentally.\n" +"Dropped commits (newer to older):\n" +msgstr "" +"Peligro: algunos commits pueden haber sido botados de forma accidental.\n" +"Commits botados (empezando con el mas nuevo):\n" + +#: sequencer.c:2648 +#, c-format +msgid "" +"To avoid this message, use \"drop\" to explicitly remove a commit.\n" +"\n" +"Use 'git config rebase.missingCommitsCheck' to change the level of " +"warnings.\n" +"The possible behaviours are: ignore, warn, error.\n" +"\n" +msgstr "" +"Para evitar este mensaje, use \"drop\" para remover de forma explícita un " +"commit.\n" +"\n" +"Use 'git config rebase.missingCommitsCheck' para cambiar el nivel de " +"advertencias.\n" +"Los posibles comportamientos son: ignore,warn,error.\n" +"\n" + +#: sequencer.c:2660 +#, c-format +msgid "" +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" +"continue'.\n" +"Or you can abort the rebase with 'git rebase --abort'.\n" +msgstr "" +"Se puede arreglar esto con 'git rebase --edit-todo' y después ejecutar 'git " +"rebase --continue'.\n" +"O se puede abortar el rebase con 'git rebase --abort'.\n" + +#: sequencer.c:2708 +#, c-format +msgid "could not parse commit '%s'" +msgstr "No se pudo analizar commit '%s'" + +#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395 +#: builtin/am.c:775 +#, c-format +msgid "could not open '%s' for writing" +msgstr "no se pudo abrir '%s' para escritura" + +#: sequencer.c:2756 +#, c-format +msgid "could not truncate '%s'" +msgstr "no se pudo truncar '%s'" + +#: sequencer.c:2848 +msgid "the script was already rearranged." +msgstr "este script ya fue reorganizado." + +#: sequencer.c:2953 +#, c-format +msgid "could not finish '%s'" +msgstr "no se pudo finalizar '%s'" + +#: setup.c:171 +#, c-format +msgid "" +"%s: no such path in the working tree.\n" +"Use 'git <command> -- <path>...' to specify paths that do not exist locally." +msgstr "" +"%s: no existe la ruta en el arbol de trabajo.\n" +"Use 'git <comando> -- <ruta>...' para especificar rutas que no existen " +"localmente." + +#: setup.c:184 +#, c-format +msgid "" +"ambiguous argument '%s': unknown revision or path not in the working tree.\n" +"Use '--' to separate paths from revisions, like this:\n" +"'git <command> [<revision>...] -- [<file>...]'" +msgstr "" +"argumento ambiguo '%s': revisión desconocida o ruta fuera del árbol de " +"trabajo.\n" +"Use '--' para separar las rutas de las revisiones, de esta manera:\n" +"'git <comando> [<revisión>...] -- [<archivo>...]'" + +#: setup.c:252 +#, c-format +msgid "" +"ambiguous argument '%s': both revision and filename\n" +"Use '--' to separate paths from revisions, like this:\n" +"'git <command> [<revision>...] -- [<file>...]'" +msgstr "" +"argumento ambiguo '%s': ambos revisión y nombre de archivo\n" +"Use '--' para separar rutas de revisiones, de esta manera:\n" +"'git <comando> [<revisión>...] -- [<archivo>...]'" + +#: setup.c:499 +#, c-format +msgid "Expected git repo version <= %d, found %d" +msgstr "Se esperaba version de git repo <= %d, encontrada %d" + +#: setup.c:507 +msgid "unknown repository extensions found:" +msgstr "se encontro extension de repositorio desconocida:" + +#: setup.c:806 +#, c-format +msgid "Not a git repository (or any of the parent directories): %s" +msgstr "" +"No es un repositorio git (ni ninguno de los directorios superiores): %s" + +#: setup.c:808 builtin/index-pack.c:1653 +msgid "Cannot come back to cwd" +msgstr "No se puede regresar a cwd" + +#: setup.c:1046 +msgid "Unable to read current working directory" +msgstr "Incapaz de leer el directorio de trabajo actual" + +#: setup.c:1058 setup.c:1064 +#, c-format +msgid "Cannot change to '%s'" +msgstr "No se puede cambiar a '%s'" + +#: setup.c:1077 +#, c-format +msgid "" +"Not a git repository (or any parent up to mount point %s)\n" +"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." +msgstr "" +"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:1159 +#, c-format +msgid "" +"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" +"El dueño de los archivos tiene que tener permisos de lectura y escritura." + +#: sha1_file.c:528 +#, c-format +msgid "path '%s' does not exist" +msgstr "ruta '%s' no existe" + +#: sha1_file.c:554 +#, c-format +msgid "reference repository '%s' as a linked checkout is not supported yet." +msgstr "" +"repositorio de referencia '%s' como un checkout vinculado no es soportado " +"todavía." + +#: sha1_file.c:560 +#, c-format +msgid "reference repository '%s' is not a local repository." +msgstr "repositorio de referencia '%s' no es un repositorio local." + +#: sha1_file.c:566 +#, c-format +msgid "reference repository '%s' is shallow" +msgstr "repositorio de referencia '%s' es superficial (shallow)" + +#: sha1_file.c:574 +#, c-format +msgid "reference repository '%s' is grafted" +msgstr "repositorio de referencia '% s' está injertado" + +#: sha1_name.c:420 +#, c-format +msgid "short SHA1 %s is ambiguous" +msgstr "SHA1 %s corta es ambigua" + +#: sha1_name.c:431 +msgid "The candidates are:" +msgstr "Los candidatos son:" + +#: sha1_name.c:590 +msgid "" +"Git normally never creates a ref that ends with 40 hex characters\n" +"because it will be ignored when you just specify 40-hex. These refs\n" +"may be created by mistake. For example,\n" +"\n" +" git checkout -b $br $(git rev-parse ...)\n" +"\n" +"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" +"examine these refs and maybe delete them. Turn this message off by\n" +"running \"git config advice.objectNameWarning false\"" +msgstr "" +"Git normalmente nunca crea una ref que termine con 40 caracteres hex\n" +"porque esto sería ignorado cuando solo se especifiquen 40-hex. Estas refs\n" +"tal vez sean creadas por error. Por ejemplo,\n" +"\n" +" git checkout -b $br $(git rev-parse ...)\n" +"\n" +"donde \"$br\" est'a de alguna manera vacía y una ref de 40-hex es creada. " +"Por favor\n" +"examine estas refs y tal vez bórrelas. Silencie este mensaje \n" +"ejecutando \"git config advice.objectNameWarning false\"" + +#: submodule.c:93 submodule.c:127 +msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" +msgstr "" +"No se puede cambiar .gitmodules no fusionados, resuelva este problema primero" + +#: submodule.c:97 submodule.c:131 +#, c-format +msgid "Could not find section in .gitmodules where path=%s" +msgstr "No se pudo encontrar la sección en .gitmodules donde path=%s" + +#: submodule.c:105 +#, c-format +msgid "Could not update .gitmodules entry %s" +msgstr "No se pudo actualizar la entrada %s de .gitmodules" + +#: submodule.c:138 +#, c-format +msgid "Could not remove .gitmodules entry for %s" +msgstr "No se pudo remover la entrada %s de .gitmodules" + +#: submodule.c:149 +msgid "staging updated .gitmodules failed" +msgstr "falló realizar stage a los .gitmodules actualizados" + +#: submodule.c:309 +#, c-format +msgid "in unpopulated submodule '%s'" +msgstr "en el submódulo no poblado '%s'" + +#: submodule.c:340 +#, c-format +msgid "Pathspec '%s' is in submodule '%.*s'" +msgstr "El patrón de ruta '%s' está en el submódulo '%.*s'" + +#: submodule.c:799 +#, c-format +msgid "submodule entry '%s' (%s) is a %s, not a commit" +msgstr "entrada de submódulo '%s' (%s) es un %s, no un commit" + +#: submodule.c:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149 +msgid "Failed to resolve HEAD as a valid ref." +msgstr "Fallo al resolver HEAD como un ref valido." + +#: submodule.c:1304 +#, c-format +msgid "'%s' not recognized as a git repository" +msgstr "'%s' no reconocido como un repositorio git" + +#: submodule.c:1442 +#, c-format +msgid "could not start 'git status' in submodule '%s'" +msgstr "no se pudo comenzar 'git status' en el submódulo '%s'" + +#: submodule.c:1455 +#, c-format +msgid "could not run 'git status' in submodule '%s'" +msgstr "no se pudo ejecutar 'git status' en el submódulo '%s'" + +#: submodule.c:1548 +#, c-format +msgid "submodule '%s' has dirty index" +msgstr "submódulo '%s' tiene un índice corrupto" + +#: submodule.c:1809 +#, c-format +msgid "" +"relocate_gitdir for submodule '%s' with more than one worktree not supported" +msgstr "" +"relocate_gitdir para el submódulo '%s' con más de un árbol de trabajo no " +"soportado" + +#: submodule.c:1821 submodule.c:1877 +#, c-format +msgid "could not lookup name for submodule '%s'" +msgstr "no se pudo resolver el nombre para el submódulo '%s'" + +#: submodule.c:1825 builtin/submodule--helper.c:671 +#: builtin/submodule--helper.c:681 +#, c-format +msgid "could not create directory '%s'" +msgstr "no se pudo crear el directorio '%s'" + +#: submodule.c:1828 +#, c-format +msgid "" +"Migrating git directory of '%s%s' from\n" +"'%s' to\n" +"'%s'\n" +msgstr "" +"Migrando directorio git de '%s%s' desde\n" +"'%s' hacia\n" +"'%s'\n" + +#: submodule.c:1912 +#, c-format +msgid "could not recurse into submodule '%s'" +msgstr "No pudo recursar en el submódulo '%s'" + +#: submodule.c:1956 +msgid "could not start ls-files in .." +msgstr "no se pudo comenzar ls-files en .." + +#: submodule.c:1976 +msgid "BUG: returned path string doesn't match cwd?" +msgstr "BUG: string de ruta recibido no concuerda con cwd?" + +#: submodule.c:1995 +#, c-format +msgid "ls-tree returned unexpected return code %d" +msgstr "ls-tree retornó un código %d inesperado" + +#: submodule-config.c:263 +msgid "negative values not allowed for submodule.fetchjobs" +msgstr "no se permiten valores negativos para submodule.fetchjobs" + +#: submodule-config.c:436 +#, c-format +msgid "invalid value for %s" +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'" + +#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 +#: trailer.c:557 +#, c-format +msgid "unknown value '%s' for key '%s'" +msgstr "valor '%s' desconocido para la clave '%s'" + +#: trailer.c:539 trailer.c:544 builtin/remote.c:290 +#, c-format +msgid "more than one %s" +msgstr "más de un %s" + +#: trailer.c:730 +#, c-format +msgid "empty trailer token in trailer '%.*s'" +msgstr "token de remolque vacío en el trailer '%.*s'" + +#: trailer.c:750 +#, c-format +msgid "could not read input file '%s'" +msgstr "no se pudo leer el archivo de entrada '%s'" + +#: trailer.c:753 +msgid "could not read from stdin" +msgstr "no se pudo leer desde stdin" + +#: trailer.c:1008 builtin/am.c:46 +#, c-format +msgid "could not stat %s" +msgstr "no se pudo definir %s" + +#: trailer.c:1010 +#, c-format +msgid "file %s is not a regular file" +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 " + +#: trailer.c:1024 +msgid "could not open temporary file" +msgstr "no se pudo abrir el archivo temporal" + +#: trailer.c:1064 +#, c-format +msgid "could not rename temporary file to %s" +msgstr "no se pudo renombrar el archivo temporal a %s" + +#: transport.c:62 +#, c-format +msgid "Would set upstream of '%s' to '%s' of '%s'\n" +msgstr "Configurará upstream de '%s' a '%s' de '%s'\n" + +#: transport.c:151 +#, c-format +msgid "transport: invalid depth option '%s'" +msgstr "transport: opción inválida '%s'" + +#: transport.c:888 +#, c-format +msgid "" +"The following submodule paths contain changes that can\n" +"not be found on any remote:\n" +msgstr "" +"La siguiente ruta de submódulo contiene cambios que no\n" +"pueden ser encontrados en ningún remoto:\n" + +#: transport.c:892 +#, c-format +msgid "" +"\n" +"Please try\n" +"\n" +"\tgit push --recurse-submodules=on-demand\n" +"\n" +"or cd to the path and use\n" +"\n" +"\tgit push\n" +"\n" +"to push them to a remote.\n" +"\n" +msgstr "" +"\n" +"Por favor intenta\n" +"\n" +"\tgit push --recurse-submodules=on-demand\n" +"\n" +"o cd a la ruta y usa\n" +"\n" +"\tgit push\n" +"\n" +"para hacer un push al remoto.\n" +"\n" + +#: transport.c:900 +msgid "Aborting." +msgstr "Abortando." + +#: transport-helper.c:1071 +#, c-format +msgid "Could not read ref %s" +msgstr "No se pudo leer la referencia %s" + +#: tree-walk.c:31 +msgid "too-short tree object" +msgstr "objeto de arbol muy corto" + +#: tree-walk.c:37 +msgid "malformed mode in tree entry" +msgstr "modo mal formado en la entrada de árbol" + +#: tree-walk.c:41 +msgid "empty filename in tree entry" +msgstr "nombre de archivo vacío en la entrada de árbol" + +#: tree-walk.c:114 +msgid "too-short tree file" +msgstr "archivo de árbol muy corto" + +#: unpack-trees.c:106 +#, 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 salvaguárdalos antes de intercambiar " +"ramas." + +#: unpack-trees.c:108 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%s" +msgstr "" +"Los cambios locales de los siguientes archivos seran sobreescritos por " +"checkout:\n" +"%%s" + +#: unpack-trees.c:111 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%sPlease commit your changes or stash them before you merge." +msgstr "" +"Los cambios locales de los siguientes archivos serán sobrescritos al " +"fusionar:\n" +"%%sPor favor, confirma tus cambios o salvaguárdalos antes de fusionar." + +#: unpack-trees.c:113 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%s" +msgstr "" +"Los cambios locales de los siguientes archivos seran sobreescritos por " +"merge:\n" +"%%s" + +#: unpack-trees.c:116 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%sPlease commit your changes or stash them before you %s." +msgstr "" +"Los cambios locales de los siguientes archivos serán sobrescritos al %s:\n" +"%%sPor favor, confirma tus cambios o salvaguárdalos antes de %s." + +#: unpack-trees.c:118 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%s" +msgstr "" +"Los cambios locales de los siguientes archivos seran sobreescritos por %s:\n" +"%%s" + +#: unpack-trees.c:123 +#, c-format +msgid "" +"Updating the following directories would lose untracked files in them:\n" +"%s" +msgstr "" +"Al actualizar los siguientes directorios se perderán los archivos sin " +"seguimiento en ellos:\n" +"%s" + +#: unpack-trees.c:127 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%sPlease move or remove them before you switch branches." +msgstr "" +"Los siguientes archivos sin seguimiento en el árbol de trabajo serán " +"removidos al actualizar el árbol de trabajo:\n" +"%%sPor favor, muévelos o elimínalos antes de intercambiar ramas." + +#: unpack-trees.c:129 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%s" +msgstr "" +"Los siguientes archivos sin seguimiento del árbol de trabajo serán removidos " +"al actualizar el árbol de trabajo:\n" +"%%s" + +#: unpack-trees.c:132 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%sPlease move or remove them before you merge." +msgstr "" +"Los siguientes archivos sin seguimiento en el árbol de trabajo serán " +"removidos al fusionar:\n" +"%%sPor favor, muévelos o elimínalos antes de fusionar." + +#: unpack-trees.c:134 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%s" +msgstr "" +"Los siguientes archivos sin seguimiento de árbol de trabajo serán removidos " +"al fusionar:\n" +"%%s" + +#: unpack-trees.c:137 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%sPlease move or remove them before you %s." +msgstr "" +"Los siguientes archivos sin seguimiento en el árbol de trabajo serán " +"removidos al %s:\n" +"%%sPor favor, muévelos o elimínalos antes de %s." + +#: unpack-trees.c:139 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%s" +msgstr "" +"Los siguientes archivos sin seguimiento en el árbol de trabajo serán " +"removidos al ejecutar %s:\n" +"%%s" + +#: unpack-trees.c:144 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%sPlease move or remove them before you switch branches." +msgstr "" +"Los siguientes archivos sin seguimiento en el árbol de trabajo serán " +"sobrescritos al actualizar el árbol de trabajo:\n" +"%%sPor favor, muévelos o elimínalos antes de intercambiar ramas." + +#: unpack-trees.c:146 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%s" +msgstr "" +"Los siguientes archivos sin seguimiento de árbol de trabajo serán " +"sobrescritos al actualizar el árbol de trabajo:\n" +"%%s" + +#: unpack-trees.c:149 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%sPlease move or remove them before you merge." +msgstr "" +"Los siguientes archivos sin seguimiento en el árbol de trabajo serán " +"sobrescritos al fusionar:\n" +"%%sPor favor, muévelos o elimínalos antes de fusionar." + +#: unpack-trees.c:151 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%s" +msgstr "" +"Los siguientes archivos sin seguimiento de árbol de trabajo serán " +"sobrescritos al fusionar:\n" +"%%s" + +#: unpack-trees.c:154 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%sPlease move or remove them before you %s." +msgstr "" +"Los siguientes archivos sin seguimiento en el árbol de trabajo serán " +"sobrescritos al %s:\n" +"%%sPor favor, muévelos o elimínalos antes de %s." + +#: unpack-trees.c:156 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%s" +msgstr "" +"Los siguientes archivos no rastreados en el arbol de trabajo seran removidos " +"por %s:\n" +"%%s" + +#: unpack-trees.c:163 +#, c-format +msgid "Entry '%s' overlaps with '%s'. Cannot bind." +msgstr "Entrda '%s' se superpone con '%s'. No se pueden unir" + +#: unpack-trees.c:166 +#, c-format +msgid "" +"Cannot update sparse checkout: the following entries are not up to date:\n" +"%s" +msgstr "" +"No se puede actualizar el sparse checkout: las siguientes entradas no están " +"actualizadas:\n" +"%s" + +#: unpack-trees.c:168 +#, c-format +msgid "" +"The following working tree files would be overwritten by sparse checkout " +"update:\n" +"%s" +msgstr "" +"Los siguientes archivos del árbol de trabajo serán sobrescritos por la " +"actualización sparse checkout:\n" +"%s" + +#: unpack-trees.c:170 +#, c-format +msgid "" +"The following working tree files would be removed by sparse checkout " +"update:\n" +"%s" +msgstr "" +"Los siguientes archivos del árbol de trabajo serán removidos por la " +"actualización sparse checkout:\n" +"%s" + +#: unpack-trees.c:172 +#, c-format +msgid "" +"Cannot update submodule:\n" +"%s" +msgstr "" +"No se puede actualizar le submodulo:\n" +"%s" + +#: unpack-trees.c:249 +#, c-format +msgid "Aborting\n" +msgstr "Abortando\n" + +#: unpack-trees.c:331 +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 '://'" + +#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405 +#, c-format +msgid "invalid %XX escape sequence" +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':" + +#: urlmatch.c:232 +msgid "a 'file:' URL may not have a port number" +msgstr "un 'archivo:' URL puede no tener un número de puerto" + +#: urlmatch.c:247 +msgid "invalid characters in host name" +msgstr "carácter inválido en el nombre del host" + +#: urlmatch.c:292 urlmatch.c:303 +msgid "invalid port number" +msgstr "numero de puerto invalido" + +#: urlmatch.c:371 +msgid "invalid '..' path segment" +msgstr "segmento de ruta '..' invalido" + +#: worktree.c:245 +#, c-format +msgid "failed to read '%s'" +msgstr "fallo al leer '%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:766 +#: builtin/am.c:858 builtin/merge.c:1041 +#, c-format +msgid "could not open '%s' for reading" +msgstr "no se pudo abrir '%s' para lectura" + +#: wrapper.c:424 wrapper.c:624 +#, c-format +msgid "unable to access '%s'" +msgstr "no es posible acceder '%s'" + +#: wrapper.c:632 +msgid "unable to get current working directory" +msgstr "no es posible obtener el directorio de trabajo actual" + +#: wrapper.c:656 +#, c-format +msgid "could not write to %s" +msgstr "no se pudo escribir en %s" + +#: wrapper.c:658 +#, c-format +msgid "could not close %s" +msgstr "no se pudo cerrar %s" + +#: wt-status.c:150 +msgid "Unmerged paths:" +msgstr "rutas no fusionadas:" + +#: wt-status.c:177 wt-status.c:204 +#, c-format +msgid " (use \"git reset %s <file>...\" to unstage)" +msgstr " (usa \"git reset %s <archivo>...\" para sacar del area de stage)" + +#: wt-status.c:179 wt-status.c:206 +msgid " (use \"git rm --cached <file>...\" to unstage)" +msgstr " (usa \"git rm --cached <archivo>...\" para sacar del area de stage)" + +#: wt-status.c:183 +msgid " (use \"git add <file>...\" to mark resolution)" +msgstr " (usa \"git add <archivo>...\" para marcar una resolucion)" + +#: wt-status.c:185 wt-status.c:189 +msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" +msgstr "" +" (usa \"git add/rm <archivo>...\" como una forma apropiada de marcar la " +"resolucion)" + +#: wt-status.c:187 +msgid " (use \"git rm <file>...\" to mark resolution)" +msgstr " (usa \"git rm <file>...\" para marcar la resolucion)" + +#: wt-status.c:198 wt-status.c:979 +msgid "Changes to be committed:" +msgstr "Cambios a ser confirmados:" + +#: wt-status.c:216 wt-status.c:988 +msgid "Changes not staged for commit:" +msgstr "Cambios no rastreados para el commit:" + +#: wt-status.c:220 +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 +msgid " (use \"git add/rm <file>...\" to update what will be committed)" +msgstr "" +" (usa \"git add/rm <archivo>...\" para actuailzar a lo que se le va a hacer " +"commit)" + +#: wt-status.c:223 +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 +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 +#, 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 +msgid "both deleted:" +msgstr "ambos borrados:" + +#: wt-status.c:254 +msgid "added by us:" +msgstr "agregado por nosotros:" + +#: wt-status.c:256 +msgid "deleted by them:" +msgstr "borrados por ellso:" + +#: wt-status.c:258 +msgid "added by them:" +msgstr "agregado por ellos:" + +#: wt-status.c:260 +msgid "deleted by us:" +msgstr "borrado por nosotros:" + +#: wt-status.c:262 +msgid "both added:" +msgstr "ambos agregados:" + +#: wt-status.c:264 +msgid "both modified:" +msgstr "ambos modificados:" + +#: wt-status.c:274 +msgid "new file:" +msgstr "nuevo archivo:" + +#: wt-status.c:276 +msgid "copied:" +msgstr "copiado:" + +#: wt-status.c:278 +msgid "deleted:" +msgstr "borrado:" + +#: wt-status.c:280 +msgid "modified:" +msgstr "modificado:" + +#: wt-status.c:282 +msgid "renamed:" +msgstr "renombrado:" + +#: wt-status.c:284 +msgid "typechange:" +msgstr "cambio de tipo:" + +#: wt-status.c:286 +msgid "unknown:" +msgstr "desconocido:" + +#: wt-status.c:288 +msgid "unmerged:" +msgstr "desfusionado:" + +#: wt-status.c:370 +msgid "new commits, " +msgstr "nuevos commits, " + +#: wt-status.c:372 +msgid "modified content, " +msgstr "contenido modificado, " + +#: wt-status.c:374 +msgid "untracked content, " +msgstr "contenido no rastreado, " + +#: wt-status.c:819 +#, c-format +msgid "Your stash currently has %d entry" +msgid_plural "Your stash currently has %d entries" +msgstr[0] "Tu stash actualmente tine %d entrada" +msgstr[1] "Tu stash actualmente tiene %d entradas" + +#: wt-status.c:851 +msgid "Submodules changed but not updated:" +msgstr "Submodulos cambiados pero no actualizados:" + +#: wt-status.c:853 +msgid "Submodule changes to be committed:" +msgstr "Submodulos cambiados listos para realizar commit:" + +#: wt-status.c:935 +msgid "" +"Do not modify or remove the line above.\n" +"Everything below it will be ignored." +msgstr "" +"No modifique o borre la linea de encima.\n" +"Todo lo que este por abajo será removido." + +#: wt-status.c:1048 +msgid "You have unmerged paths." +msgstr "tienes rutas no fusionadas" + +#: wt-status.c:1051 +msgid " (fix conflicts and run \"git commit\")" +msgstr " (arregla los conflictos y corre \"git commit\"" + +#: wt-status.c:1053 +msgid " (use \"git merge --abort\" to abort the merge)" +msgstr " (usa \"git merge --abort\" para abortar la fusion)" + +#: wt-status.c:1058 +msgid "All conflicts fixed but you are still merging." +msgstr "Todos los conflictos resueltos pero sigues fusionando." + +#: wt-status.c:1061 +msgid " (use \"git commit\" to conclude merge)" +msgstr " (usa \"git commit\" para concluir la fusion)" + +#: wt-status.c:1071 +msgid "You are in the middle of an am session." +msgstr "Estas en medio de una sesion am." + +#: wt-status.c:1074 +msgid "The current patch is empty." +msgstr "El parche actual esta vacio." + +#: wt-status.c:1078 +msgid " (fix conflicts and then run \"git am --continue\")" +msgstr " (arregla los conflictos y luego corre \"git am --continue\"" + +#: wt-status.c:1080 +msgid " (use \"git am --skip\" to skip this patch)" +msgstr " (usa \"git am --skip\" para saltar este parche)" + +#: wt-status.c:1082 +msgid " (use \"git am --abort\" to restore the original branch)" +msgstr " (usa \"git am --abort\" para restaurar la rama original)" + +#: wt-status.c:1214 +msgid "git-rebase-todo is missing." +msgstr "git-rebase-todo no esta presente." + +#: wt-status.c:1216 +msgid "No commands done." +msgstr "No se realizaron los comandos." + +#: wt-status.c:1219 +#, c-format +msgid "Last command done (%d command done):" +msgid_plural "Last commands done (%d commands done):" +msgstr[0] "El ultimo comando realizado (%d comando realizado):" +msgstr[1] "Los ultimos comandos realizados (%d comandos realizados):" + +#: wt-status.c:1230 +#, c-format +msgid " (see more in file %s)" +msgstr " (ver mas en el archivo %s)" + +#: wt-status.c:1235 +msgid "No commands remaining." +msgstr "No quedan mas comandos." + +#: wt-status.c:1238 +#, c-format +msgid "Next command to do (%d remaining command):" +msgid_plural "Next commands to do (%d remaining commands):" +msgstr[0] "Siguiente comando a realizar (%d comando restante)" +msgstr[1] "Siguiente comandos a realizar (%d comandos faltantes=" + +#: wt-status.c:1246 +msgid " (use \"git rebase --edit-todo\" to view and edit)" +msgstr " (usa \"git rebase --edit-todo\" para ver y editar)" + +#: wt-status.c:1259 +#, c-format +msgid "You are currently rebasing branch '%s' on '%s'." +msgstr "Estas aplicando un rebase de la rama '%s' en '%s." + +#: wt-status.c:1264 +msgid "You are currently rebasing." +msgstr "Estas aplicando un rebase." + +#: wt-status.c:1278 +msgid " (fix conflicts and then run \"git rebase --continue\")" +msgstr " (corrige los conflictos y ejecuta \"git rebase --continue\")" + +#: wt-status.c:1280 +msgid " (use \"git rebase --skip\" to skip this patch)" +msgstr " (usa \"git rebase --skip\" para omitir este parche)" + +#: wt-status.c:1282 +msgid " (use \"git rebase --abort\" to check out the original branch)" +msgstr " (usa \"git rebase --abort\" para volver a tu rama original)" + +#: wt-status.c:1288 +msgid " (all conflicts fixed: run \"git rebase --continue\")" +msgstr " (todos los conflictos corregidos: ejecuta \"git rebase --continue\")" + +#: wt-status.c:1292 +#, c-format +msgid "" +"You are currently splitting a commit while rebasing branch '%s' on '%s'." +msgstr "" +"Estas dividiendo un commit mientras aplicas un rebase de la rama '%s' en " +"'%s'." + +#: wt-status.c:1297 +msgid "You are currently splitting a commit during a rebase." +msgstr "Estas dividiendo un commit durante un rebase." + +#: wt-status.c:1300 +msgid " (Once your working directory is clean, run \"git rebase --continue\")" +msgstr "" +" (Una vez que tu directorio de trabajo esté limpio, ejecuta \"git rebase --" +"continue\")" + +#: wt-status.c:1304 +#, c-format +msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." +msgstr "" +"Estas editando un commit mientras se aplica un rebase de la rama '%s' en " +"'%s'." + +#: wt-status.c:1309 +msgid "You are currently editing a commit during a rebase." +msgstr "Estas editando un commit durante un rebase." + +#: wt-status.c:1312 +msgid " (use \"git commit --amend\" to amend the current commit)" +msgstr " (usa \"git commit --amend\" para enmendar la confirmación actual)" + +#: wt-status.c:1314 +msgid "" +" (use \"git rebase --continue\" once you are satisfied with your changes)" +msgstr "" +" (usa \"git rebase --continue\" una vez que estés satisfecho con tus " +"cambios)" + +#: wt-status.c:1324 +#, c-format +msgid "You are currently cherry-picking commit %s." +msgstr "Estas realizando un cherry-picking en el commit %s." + +#: wt-status.c:1329 +msgid " (fix conflicts and run \"git cherry-pick --continue\")" +msgstr " (corrige los conflictos y ejecuta \"git cherry-pick --continue\")" + +#: wt-status.c:1332 +msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" +msgstr "" +" (todos los conflictos corregidos: ejecuta \"git cherry-pick --continue\")" + +#: wt-status.c:1334 +msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" +msgstr "" +" (use \"git cherry-pick --abort\" para cancelar la operacion cherry-pick)" + +#: wt-status.c:1343 +#, c-format +msgid "You are currently reverting commit %s." +msgstr "Estas revirtiendo el commit %s." + +#: wt-status.c:1348 +msgid " (fix conflicts and run \"git revert --continue\")" +msgstr " (corrige los conflictos y ejecuta \"git revert --continue\")" + +#: wt-status.c:1351 +msgid " (all conflicts fixed: run \"git revert --continue\")" +msgstr " (todos los conflictos corregidos: ejecuta \"git revert --continue\")" + +#: wt-status.c:1353 +msgid " (use \"git revert --abort\" to cancel the revert operation)" +msgstr " (usa \"git revert --abort\" para cancelar la operación de revertir)" + +#: wt-status.c:1364 +#, c-format +msgid "You are currently bisecting, started from branch '%s'." +msgstr "Estas aplicando un bisect, comenzando en la rama '%s'." + +#: wt-status.c:1368 +msgid "You are currently bisecting." +msgstr "Estas aplicando un bisect." + +#: wt-status.c:1371 +msgid " (use \"git bisect reset\" to get back to the original branch)" +msgstr " (usa \"git bisect reset\" para volver a la rama original)" + +#: wt-status.c:1568 +msgid "On branch " +msgstr "En la rama " + +#: wt-status.c:1574 +msgid "interactive rebase in progress; onto " +msgstr "rebase interactivo en progreso; en" + +#: wt-status.c:1576 +msgid "rebase in progress; onto " +msgstr "rebase en progreso; en" + +#: wt-status.c:1581 +msgid "HEAD detached at " +msgstr "HEAD desacoplada en" + +#: wt-status.c:1583 +msgid "HEAD detached from " +msgstr "HEAD desacoplada de" + +#: wt-status.c:1586 +msgid "Not currently on any branch." +msgstr "Actualmente no estás en ninguna rama." + +#: wt-status.c:1606 +msgid "Initial commit" +msgstr "Confirmación inicial" + +#: wt-status.c:1607 +msgid "No commits yet" +msgstr "No hay commits todavia" + +#: wt-status.c:1621 +msgid "Untracked files" +msgstr "Archivos sin seguimiento" + +#: wt-status.c:1623 +msgid "Ignored files" +msgstr "Archivos ignorados" + +#: wt-status.c:1627 +#, c-format +msgid "" +"It took %.2f seconds to enumerate untracked files. 'status -uno'\n" +"may speed it up, but you have to be careful not to forget to add\n" +"new files yourself (see 'git help status')." +msgstr "" +"Tomó %.2f segundos enumerar los archivos no rastreados. 'status -uno'\n" +"puede acelerarlo, pero tiene que ser cuidadoso de no olvidar agregar\n" +"nuevos archivos usted mismo (vea 'git help status')." + +#: wt-status.c:1633 +#, c-format +msgid "Untracked files not listed%s" +msgstr "Archivos no rastreados no son mostrados %s" + +#: wt-status.c:1635 +msgid " (use -u option to show untracked files)" +msgstr " (usa la opción -u para mostrar los archivos sin seguimiento)" + +#: wt-status.c:1641 +msgid "No changes" +msgstr "Sin cambios" + +#: wt-status.c:1646 +#, c-format +msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" +msgstr "" +"sin cambios agregados a la confirmación (usa \"git add\" y/o \"git commit -a" +"\")\n" + +#: wt-status.c:1649 +#, c-format +msgid "no changes added to commit\n" +msgstr "no se agregaron cambios al commit\n" + +#: wt-status.c:1652 +#, c-format +msgid "" +"nothing added to commit but untracked files present (use \"git add\" to " +"track)\n" +msgstr "" +"no hay nada agregado a la confirmación pero hay archivos sin seguimiento " +"presentes (usa \"git add\" para hacerles seguimiento)\n" + +#: wt-status.c:1655 +#, c-format +msgid "nothing added to commit but untracked files present\n" +msgstr "" +"no hay nada agregado para confirmar, pero hay archivos sin seguimiento " +"presentes\n" + +#: wt-status.c:1658 +#, c-format +msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" +msgstr "" +"no hay nada para confirmar (crea/copia archivos y usa \"git add\" para " +"hacerles seguimiento)\n" + +#: wt-status.c:1661 wt-status.c:1666 +#, c-format +msgid "nothing to commit\n" +msgstr "nada para hacer commit\n" + +#: wt-status.c:1664 +#, c-format +msgid "nothing to commit (use -u to show untracked files)\n" +msgstr "" +"nada para hacer commit (usa -u para mostrar los archivos no rastreados)\n" + +#: wt-status.c:1668 +#, c-format +msgid "nothing to commit, working tree clean\n" +msgstr "nada para hacer comit, el arbol de trabajo esta limpio\n" + +#: wt-status.c:1780 +msgid "No commits yet on " +msgstr "No hay commits todavia en " + +#: wt-status.c:1784 +msgid "HEAD (no branch)" +msgstr "HEAD (sin rama)" + +#: wt-status.c:1813 wt-status.c:1821 +msgid "behind " +msgstr "detras" + +#: wt-status.c:1816 wt-status.c:1819 +msgid "ahead " +msgstr "adelante" + +#. TRANSLATORS: the action is e.g. "pull with rebase" +#: wt-status.c:2311 +#, c-format +msgid "cannot %s: You have unstaged changes." +msgstr "no se puede %s: Tienes cambios sin marcar." + +#: wt-status.c:2317 +msgid "additionally, your index contains uncommitted changes." +msgstr "adicionalmente, tu indice contiene cambios que no estan en un commit." + +#: wt-status.c:2319 +#, c-format +msgid "cannot %s: Your index contains uncommitted changes." +msgstr "no se puede %s: Tu indice contiene cambios que no estan en un commit." + +#: compat/precompose_utf8.c:58 builtin/clone.c:437 +#, c-format +msgid "failed to unlink '%s'" +msgstr "fallo al desvincular '%s'" + +#: builtin/add.c:24 +msgid "git add [<options>] [--] <pathspec>..." +msgstr "git add [<opcion>] [--] <especificacion-de-ruta>..." + +#: builtin/add.c:82 +#, c-format +msgid "unexpected diff status %c" +msgstr "diff status inesperado %c" + +#: builtin/add.c:87 builtin/commit.c:291 +msgid "updating files failed" +msgstr "fallo la actualizacion de carpetas" + +#: builtin/add.c:97 +#, c-format +msgid "remove '%s'\n" +msgstr "remover '%s'\n" + +#: builtin/add.c:153 +msgid "Unstaged changes after refreshing the index:" +msgstr "Cambios fuera del área de stage tras refrescar el índice:" + +#: builtin/add.c:213 builtin/rev-parse.c:888 +msgid "Could not read the index" +msgstr "No se pudo leer el indice" + +#: builtin/add.c:224 +#, c-format +msgid "Could not open '%s' for writing." +msgstr "No se pudo abrir '%s' para escritura." + +#: builtin/add.c:228 +msgid "Could not write patch" +msgstr "No se puede escribir el parche" + +#: builtin/add.c:231 +msgid "editing patch failed" +msgstr "fallo la edicion del parche" + +#: builtin/add.c:234 +#, c-format +msgid "Could not stat '%s'" +msgstr "No se pudo definir '%s'" + +#: builtin/add.c:236 +msgid "Empty patch. Aborted." +msgstr "Parche vacio. Abortado." + +#: builtin/add.c:241 +#, c-format +msgid "Could not apply '%s'" +msgstr "No se pudo aplicar '%s'" + +#: builtin/add.c:251 +msgid "The following paths are ignored by one of your .gitignore files:\n" +msgstr "" +"Las siguientes rutas son ignoradas por uno de tus archivos .gitignore:\n" + +#: builtin/add.c:271 builtin/clean.c:910 builtin/fetch.c:132 builtin/mv.c:124 +#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529 +#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164 +msgid "dry run" +msgstr "dry run ( ejecucion en seco)" + +#: builtin/add.c:274 +msgid "interactive picking" +msgstr "seleccion interactiva" + +#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310 +msgid "select hunks interactively" +msgstr "elegir hunks de forma interactiva" + +#: builtin/add.c:276 +msgid "edit current diff and apply" +msgstr "editar diff actual y aplicar" + +#: builtin/add.c:277 +msgid "allow adding otherwise ignored files" +msgstr "permitir agregar caso contrario ignorar archivos" + +#: builtin/add.c:278 +msgid "update tracked files" +msgstr "actualizado las carpetas rastreadas" + +#: builtin/add.c:279 +msgid "record only the fact that the path will be added later" +msgstr "grabar solo el hecho de que la ruta será agregada después" + +#: builtin/add.c:280 +msgid "add changes from all tracked and untracked files" +msgstr "agregar los cambios de todas las carpetas con y sin seguimiento" + +#: builtin/add.c:283 +msgid "ignore paths removed in the working tree (same as --no-all)" +msgstr "ignorar rutas removidas en el arbol de trabajo (lo mismo que --no-all)" + +#: builtin/add.c:285 +msgid "don't add, only refresh the index" +msgstr "no agregar, solo actualizar el indice" + +#: builtin/add.c:286 +msgid "just skip files which cannot be added because of errors" +msgstr "saltar las carpetas que no pueden ser agregadas a causa de errores" + +#: builtin/add.c:287 +msgid "check if - even missing - files are ignored in dry run" +msgstr "comprobar si - incluso los archivos que faltan - se ignoran en dry run" + +#: builtin/add.c:288 builtin/update-index.c:954 +msgid "(+/-)x" +msgstr "(+/-)x" + +#: builtin/add.c:288 builtin/update-index.c:955 +msgid "override the executable bit of the listed files" +msgstr "sobrescribir el bit ejecutable de los archivos listados" + +#: builtin/add.c:290 +msgid "warn when adding an embedded repository" +msgstr "avisar cuando se agrega un repositorio incrustado" + +#: builtin/add.c:305 +#, c-format +msgid "" +"You've added another git repository inside your current repository.\n" +"Clones of the outer repository will not contain the contents of\n" +"the embedded repository and will not know how to obtain it.\n" +"If you meant to add a submodule, use:\n" +"\n" +"\tgit submodule add <url> %s\n" +"\n" +"If you added this path by mistake, you can remove it from the\n" +"index with:\n" +"\n" +"\tgit rm --cached %s\n" +"\n" +"See \"git help submodule\" for more information." +msgstr "" +"Se ha agregado otro repositorio de git dentro del repositorio actual.\n" +"Clones del repositorio exterior no tendran el contenido del \n" +"repositorio embebido y no sabran como obtenerla.\n" +"Si queria agregar un submodulo, use:\n" +"\n" +"\tgit submodule add <url> %s\n" +"\n" +"Si se agrego esta ruta por error, puede removerla desde el indice \n" +"usando:\n" +"\n" +"\tgit rm --cached %s\n" +"\n" +"Vea \"git help submodule\" para mas informacion." + +#: builtin/add.c:333 +#, c-format +msgid "adding embedded git repository: %s" +msgstr "agregando repositorio embebido: %s" + +#: builtin/add.c:351 +#, c-format +msgid "Use -f if you really want to add them.\n" +msgstr "Use -f si realmente quiere agregarlos.\n" + +#: builtin/add.c:359 +msgid "adding files failed" +msgstr "fallo al agregar archivos" + +#: builtin/add.c:396 +msgid "-A and -u are mutually incompatible" +msgstr "-A y -u son mutuamente incompatibles" + +#: builtin/add.c:403 +msgid "Option --ignore-missing can only be used together with --dry-run" +msgstr "Opción --ignore-missing solo puede ser usada junto a --dry-run" + +#: builtin/add.c:407 +#, c-format +msgid "--chmod param '%s' must be either -x or +x" +msgstr "El parámetro '%s' para --chmod debe ser -x ó +x" + +#: builtin/add.c:422 +#, c-format +msgid "Nothing specified, nothing added.\n" +msgstr "Nada especificado, nada agregado.\n" + +#: builtin/add.c:423 +#, c-format +msgid "Maybe you wanted to say 'git add .'?\n" +msgstr "Tal vez quiso decir 'git add .'?\n" + +#: builtin/add.c:428 builtin/check-ignore.c:176 builtin/checkout.c:282 +#: builtin/checkout.c:479 builtin/clean.c:957 builtin/commit.c:350 +#: builtin/mv.c:143 builtin/reset.c:249 builtin/rm.c:271 +#: builtin/submodule--helper.c:243 +msgid "index file corrupt" +msgstr "archivo indice corrompido" + +#: builtin/am.c:414 +msgid "could not parse author script" +msgstr "no se pudo analizar el script del autor" + +#: builtin/am.c:498 +#, c-format +msgid "'%s' was deleted by the applypatch-msg hook" +msgstr "'%s' fue borrado por el hook de applypatch-msg" + +#: builtin/am.c:539 +#, c-format +msgid "Malformed input line: '%s'." +msgstr "linea mal formada: '%s'." + +#: builtin/am.c:576 +#, c-format +msgid "Failed to copy notes from '%s' to '%s'" +msgstr "Fallo al copiar notas de '%s' a '%s'" + +#: builtin/am.c:602 +msgid "fseek failed" +msgstr "fall de fseek" + +#: builtin/am.c:786 +#, c-format +msgid "could not parse patch '%s'" +msgstr "no se pudo analizar el parche '%s'" + +#: builtin/am.c:851 +msgid "Only one StGIT patch series can be applied at once" +msgstr "Solo un parche StGIT puede ser aplicado de una vez " + +#: builtin/am.c:899 +msgid "invalid timestamp" +msgstr "timestamp invalido" + +#: builtin/am.c:904 builtin/am.c:916 +msgid "invalid Date line" +msgstr "linea Date invalida" + +#: builtin/am.c:911 +msgid "invalid timezone offset" +msgstr "offset de zona horaria inválido" + +#: builtin/am.c:1004 +msgid "Patch format detection failed." +msgstr "Falló al detectar el formato del parche." + +#: builtin/am.c:1009 builtin/clone.c:402 +#, c-format +msgid "failed to create directory '%s'" +msgstr "fallo al crear el directorio '%s'" + +#: builtin/am.c:1013 +msgid "Failed to split patches." +msgstr "Fallo al dividir parches" + +#: builtin/am.c:1142 builtin/commit.c:376 +msgid "unable to write index file" +msgstr "no es posible escribir en el archivo indice" + +#: builtin/am.c:1193 +#, c-format +msgid "When you have resolved this problem, run \"%s --continue\"." +msgstr "Cuando haya resuelto este problema, ejecute \"%s --continue\"." + +#: builtin/am.c:1194 +#, c-format +msgid "If you prefer to skip this patch, run \"%s --skip\" instead." +msgstr "Si prefieres saltar este parche, ejecuta \"%s --skip\"." + +#: builtin/am.c:1195 +#, c-format +msgid "To restore the original branch and stop patching, run \"%s --abort\"." +msgstr "" +"Para restaurar la rama original y detener el parchado, ejecutar \"%s --abort" +"\"." + +#: builtin/am.c:1302 +msgid "Patch is empty." +msgstr "El parche esta vacio." + +#: builtin/am.c:1368 +#, c-format +msgid "invalid ident line: %.*s" +msgstr "sangría no válida: %.*s" + +#: builtin/am.c:1390 +#, c-format +msgid "unable to parse commit %s" +msgstr "no es posible analizar el commit %s" + +#: builtin/am.c:1584 +msgid "Repository lacks necessary blobs to fall back on 3-way merge." +msgstr "" +"Repositorio carece de los blobs necesarios para retroceder en una fusión de " +"3-vías" + +#: builtin/am.c:1586 +msgid "Using index info to reconstruct a base tree..." +msgstr "Usando la información del índice para reconstruir un árbol base..." + +#: builtin/am.c:1605 +msgid "" +"Did you hand edit your patch?\n" +"It does not apply to blobs recorded in its index." +msgstr "" +"Editaste el parche a mano?\n" +"No aplica a blobs guardados en su índice." + +#: builtin/am.c:1611 +msgid "Falling back to patching base and 3-way merge..." +msgstr "Retrocediento para parchar base y fusión de 3-vías..." + +#: builtin/am.c:1636 +msgid "Failed to merge in the changes." +msgstr "Falló al fusionar en los cambios." + +#: builtin/am.c:1660 builtin/merge.c:641 +msgid "git write-tree failed to write a tree" +msgstr "git write-tree falló al escribir el árbol" + +#: builtin/am.c:1667 +msgid "applying to an empty history" +msgstr "aplicando a un historial vacio" + +#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824 +#: builtin/merge.c:849 +msgid "failed to write commit object" +msgstr "fallo al escribir el objeto commit" + +#: builtin/am.c:1713 builtin/am.c:1717 +#, c-format +msgid "cannot resume: %s does not exist." +msgstr "no se puede continuar: %s no existe" + +#: builtin/am.c:1733 +msgid "cannot be interactive without stdin connected to a terminal." +msgstr "no se puede ser interactivo sin stdin conectado a un terminal" + +#: builtin/am.c:1738 +msgid "Commit Body is:" +msgstr "Cuerpo de commit es:" + +#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] +#. in your translation. The program will only accept English +#. input at this point. +#. +#: builtin/am.c:1748 +msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " +msgstr "Aplicar? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " + +#: builtin/am.c:1798 +#, c-format +msgid "Dirty index: cannot apply patches (dirty: %s)" +msgstr "Índice sucio: no se puede aplicar parches (sucio: %s)" + +#: builtin/am.c:1838 builtin/am.c:1910 +#, c-format +msgid "Applying: %.*s" +msgstr "Aplicando: %.*s" + +#: builtin/am.c:1854 +msgid "No changes -- Patch already applied." +msgstr "Sin cambios -- parche ya aplicado." + +#: builtin/am.c:1862 +#, c-format +msgid "Patch failed at %s %.*s" +msgstr "El parche fallo en %s %.*s" + +#: builtin/am.c:1868 +#, c-format +msgid "The copy of the patch that failed is found in: %s" +msgstr "La copia del parche que fallido se encuentra en: %s" + +#: builtin/am.c:1913 +msgid "" +"No changes - did you forget to use 'git add'?\n" +"If there is nothing left to stage, chances are that something else\n" +"already introduced the same changes; you might want to skip this patch." +msgstr "" +"Sin cambios - olvidaste usar 'git add'?\n" +"Si no hay nada en el area de stage, las posibilidad es que algo mas\n" +"ya haya introducido el mismo cambio; tal vez quieras omitir este parche." + +#: builtin/am.c:1920 +msgid "" +"You still have unmerged paths in your index.\n" +"You should 'git add' each file with resolved conflicts to mark them as " +"such.\n" +"You might run `git rm` on a file to accept \"deleted by them\" for it." +msgstr "" +"Todavía tiene rutas sin fusionar en su índice.\n" +"Debe realizar 'git add' cada archivo con conflictos resueltos y marcarlos " +"como tal.\n" +"Tal vez ejecute `git rm` en el archivo para aceptar \"borrado por ellos\" en " +"él." + +#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332 +#: builtin/reset.c:340 +#, c-format +msgid "Could not parse object '%s'." +msgstr "No se pudo analizar el objeto '%s'." + +#: builtin/am.c:2081 +msgid "failed to clean index" +msgstr "fallo al limpiar el indice" + +#: builtin/am.c:2116 +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 " + +#: builtin/am.c:2179 +#, c-format +msgid "Invalid value for --patch-format: %s" +msgstr "valor invalido para --patch-format: %s" + +#: builtin/am.c:2212 +msgid "git am [<options>] [(<mbox> | <Maildir>)...]" +msgstr "git am [<opciones>] [(<mbox> | <Directorio-de-correo>)...]" + +#: builtin/am.c:2213 +msgid "git am [<options>] (--continue | --skip | --abort)" +msgstr "git am [<opciones>] (--continue | --skip | --abort)" + +#: builtin/am.c:2219 +msgid "run interactively" +msgstr "ejecutar de manera interactiva" + +#: builtin/am.c:2221 +msgid "historical option -- no-op" +msgstr "opcion historica -- no-op" + +#: builtin/am.c:2223 +msgid "allow fall back on 3way merging if needed" +msgstr "permitir retroceso en fusión de 3-vías si es necesario" + +#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57 +#: builtin/repack.c:180 +msgid "be quiet" +msgstr "ser silencioso" + +#: builtin/am.c:2226 +msgid "add a Signed-off-by line to the commit message" +msgstr "agregar una línea \"Firmado-por\" al mensaje del commit" + +#: builtin/am.c:2229 +msgid "recode into utf8 (default)" +msgstr "recodificar en utf8 (default)" + +#: builtin/am.c:2231 +msgid "pass -k flag to git-mailinfo" +msgstr "pasar flag -k a git-mailinfo" + +#: builtin/am.c:2233 +msgid "pass -b flag to git-mailinfo" +msgstr "pasar flag -b a git-mailinfo" + +#: builtin/am.c:2235 +msgid "pass -m flag to git-mailinfo" +msgstr "pasar flag -m a git-mailinfo" + +#: builtin/am.c:2237 +msgid "pass --keep-cr flag to git-mailsplit for mbox format" +msgstr "pasar flag --keep-cr a git-mailsplit para formato mbox" + +#: builtin/am.c:2240 +msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" +msgstr "" +"no pasar flag --keep-cr a git-mailsplit independientemente de am.keepcr" + +#: builtin/am.c:2243 +msgid "strip everything before a scissors line" +msgstr "descubrir todo antes de una línea de tijeras" + +#: builtin/am.c:2245 builtin/am.c:2248 builtin/am.c:2251 builtin/am.c:2254 +#: builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263 builtin/am.c:2266 +#: builtin/am.c:2272 +msgid "pass it through git-apply" +msgstr "pasarlo a través de git-apply" + +#: builtin/am.c:2262 builtin/fmt-merge-msg.c:664 builtin/fmt-merge-msg.c:667 +#: builtin/grep.c:843 builtin/merge.c:205 builtin/pull.c:142 builtin/pull.c:197 +#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195 +#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377 +#: parse-options.h:132 parse-options.h:134 parse-options.h:245 +msgid "n" +msgstr "n" + +#: builtin/am.c:2268 builtin/branch.c:622 builtin/for-each-ref.c:38 +#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39 +msgid "format" +msgstr "formato" + +#: builtin/am.c:2269 +msgid "format the patch(es) are in" +msgstr "formatear el parche(s)" + +#: builtin/am.c:2275 +msgid "override error message when patch failure occurs" +msgstr "sobrescribir mensajes de error cuando fallos de parchado ocurran" + +#: builtin/am.c:2277 +msgid "continue applying patches after resolving a conflict" +msgstr "continuar aplicando los parches tras resolver conflictos" + +#: builtin/am.c:2280 +msgid "synonyms for --continue" +msgstr "sinonimos para --continue" + +#: builtin/am.c:2283 +msgid "skip the current patch" +msgstr "saltar el parche actual" + +#: builtin/am.c:2286 +msgid "restore the original branch and abort the patching operation." +msgstr "restaurar la rama original y abortar la operación de parchado." + +#: builtin/am.c:2290 +msgid "lie about committer date" +msgstr "mentir sobre la fecha del committer" + +#: builtin/am.c:2292 +msgid "use current timestamp for author date" +msgstr "usar el timestamp actual para la fecha del autor" + +#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236 +#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392 +msgid "key-id" +msgstr "key-id" + +#: builtin/am.c:2295 +msgid "GPG-sign commits" +msgstr "commits con firma GPG" + +#: builtin/am.c:2298 +msgid "(internal use for git-rebase)" +msgstr "(uso interno para git-rebase)" + +#: builtin/am.c:2316 +msgid "" +"The -b/--binary option has been a no-op for long time, and\n" +"it will be removed. Please do not use it anymore." +msgstr "" +"La opción -b/--binary ha estado deshabilitada por mucho tiempo, y\n" +"será removida. Por favor no la use más." + +#: builtin/am.c:2323 +msgid "failed to read the index" +msgstr "fallo al leer el indice" + +#: builtin/am.c:2338 +#, c-format +msgid "previous rebase directory %s still exists but mbox given." +msgstr "directorio de rebase previo %s todavía existe en el mbox dado." + +#: builtin/am.c:2362 +#, c-format +msgid "" +"Stray %s directory found.\n" +"Use \"git am --abort\" to remove it." +msgstr "" +"Directorio extraviado %s encontrado.\n" +"Use \"git am --abort\" para borrarlo." + +#: builtin/am.c:2368 +msgid "Resolve operation not in progress, we are not resuming." +msgstr "Operación de resolución no está en progreso, no vamos a continuar." + +#: builtin/apply.c:8 +msgid "git apply [<options>] [<patch>...]" +msgstr "git apply [<opciones>] [<parch>...]" + +#: builtin/archive.c:17 +#, c-format +msgid "could not create archive file '%s'" +msgstr "no se pudo crear el archivo comprimido '%s'" + +#: builtin/archive.c:20 +msgid "could not redirect output" +msgstr "no se pudo redireccionar la salida" + +#: builtin/archive.c:37 +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" + +#: builtin/archive.c:61 +#, c-format +msgid "git archive: NACK %s" +msgstr "git archive: NACK %s" + +#: builtin/archive.c:64 +msgid "git archive: protocol error" +msgstr "git archive: error de protocolo" + +#: builtin/archive.c:68 +msgid "git archive: expected a flush" +msgstr "git archive: se esperaba un flush" + +#: builtin/bisect--helper.c:7 +msgid "git bisect--helper --next-all [--no-checkout]" +msgstr "git bisect--helper --next-all [--no-checkout]" + +#: builtin/bisect--helper.c:17 +msgid "perform 'git bisect next'" +msgstr "realiza 'git bisect next'" + +#: builtin/bisect--helper.c:19 +msgid "update BISECT_HEAD instead of checking out the current commit" +msgstr "actualiza BISECT_HEAD en lugar de revisar el commit actual" + +#: builtin/blame.c:27 +msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" +msgstr "git blame [<opciones>] [<opciones-rev>] [<revision>] [--] <archivo>" + +#: builtin/blame.c:32 +msgid "<rev-opts> are documented in git-rev-list(1)" +msgstr "<rev-opts> estan documentadas en git-rev-list(1)" + +#: builtin/blame.c:668 +msgid "Show blame entries as we find them, incrementally" +msgstr "Mostrar las entradas blame como las encontramos, incrementalmente" + +#: builtin/blame.c:669 +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 +msgid "Do not treat root commits as boundaries (Default: off)" +msgstr "No tratar commits raíces como extremos (Default: off)" + +#: builtin/blame.c:671 +msgid "Show work cost statistics" +msgstr "Mostrar estadisticas de costo de trabajo" + +#: builtin/blame.c:672 +msgid "Force progress reporting" +msgstr "Forzar el reporte de progreso" + +#: builtin/blame.c:673 +msgid "Show output score for blame entries" +msgstr "Mostrar la puntuación de salida de las entradas de blame" + +#: builtin/blame.c:674 +msgid "Show original filename (Default: auto)" +msgstr "Mostrar nombre original del archivo (Default: auto)" + +#: builtin/blame.c:675 +msgid "Show original linenumber (Default: off)" +msgstr "Mostrar número de línea original (Default: off)" + +#: builtin/blame.c:676 +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 +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 +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 +msgid "Show raw timestamp (Default: off)" +msgstr "Mostrar timestamp en formato raw (Default: off)" + +#: builtin/blame.c:680 +msgid "Show long commit SHA1 (Default: off)" +msgstr "Mostrar SHA1 del commit en formato largo (Default: off)" + +#: builtin/blame.c:681 +msgid "Suppress author name and timestamp (Default: off)" +msgstr "Suprimir nombre del autor y timestamp (Default: off)" + +#: builtin/blame.c:682 +msgid "Show author email instead of name (Default: off)" +msgstr "Mostrar en cambio el email del autor (Default: off)" + +#: builtin/blame.c:683 +msgid "Ignore whitespace differences" +msgstr "Ignorar diferencias de espacios en blanco" + +#: builtin/blame.c:690 +msgid "Use an experimental heuristic to improve diffs" +msgstr "Usar un heurístico experimental para mejorar los diffs" + +#: builtin/blame.c:692 +msgid "Spend extra cycles to find better match" +msgstr "Ocupo más ciclos para encontrar mejoras resultados" + +#: builtin/blame.c:693 +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 +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 +msgid "score" +msgstr "puntaje" + +#: builtin/blame.c:695 +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 +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 +msgid "n,m" +msgstr "n,m" + +#: builtin/blame.c:697 +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 +msgid "--progress can't be used with --incremental or porcelain formats" +msgstr "--progress no puede ser usado con --incremental o formatos porcelana" + +#. TRANSLATORS: This string is used to tell us the +#. maximum display width for a relative timestamp in +#. "git blame" output. For C locale, "4 years, 11 +#. months ago", which takes 22 places, is the longest +#. among various forms of relative timestamps, but +#. your language may need more or fewer display +#. columns. +#. +#: builtin/blame.c:795 +msgid "4 years, 11 months ago" +msgstr "hace 4 años, 11 meses" + +#: builtin/blame.c:882 +#, 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 +msgid "Blaming lines" +msgstr "Blaming a líneas" + +#: builtin/branch.c:27 +msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" +msgstr "git branch [<opciones>] [-r | -a] [--merged | --no-merged]" + +#: builtin/branch.c:28 +msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" +msgstr "git branch [<opciones>] [-l] [-f] <nombre-de-rama> [<punto-inicial>]" + +#: builtin/branch.c:29 +msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." +msgstr "git branch [<opciones>] [-r] (-d | -D) <nombre-de-rama>..." + +#: builtin/branch.c:30 +msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" +msgstr "git branch [<opciones>] (-m | -M) [<rama-vieja>] <rama-nueva>" + +#: builtin/branch.c:31 +msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>" +msgstr "git branch [<opciones>] (-c | -C) [<rama-vieja>] <rama-nueva>" + +#: builtin/branch.c:32 +msgid "git branch [<options>] [-r | -a] [--points-at]" +msgstr "git branch [<opciones>] [-r | -a] [--points-at]" + +#: builtin/branch.c:33 +msgid "git branch [<options>] [-r | -a] [--format]" +msgstr "git branch [<opciones>] [-r | -a] [--formato]" + +#: builtin/branch.c:146 +#, c-format +msgid "" +"deleting branch '%s' that has been merged to\n" +" '%s', but not yet merged to HEAD." +msgstr "" +"borrando la rama '%s' que ha sido fusionada en\n" +" '%s', pero aún no ha sido fusionada a HEAD." + +#: builtin/branch.c:150 +#, c-format +msgid "" +"not deleting branch '%s' that is not yet merged to\n" +" '%s', even though it is merged to HEAD." +msgstr "" +"no borrando rama '%s' que todavía no ha sido fusionada \n" +"\ta '%s', aunque se fusione con HEAD." + +#: builtin/branch.c:164 +#, c-format +msgid "Couldn't look up commit object for '%s'" +msgstr "No se pudo encontrar el objeto commit para '%s'" + +#: builtin/branch.c:168 +#, c-format +msgid "" +"The branch '%s' is not fully merged.\n" +"If you are sure you want to delete it, run 'git branch -D %s'." +msgstr "" +"La rama '%s' no ha sido fusionada completamente.\n" +"Si está seguro de querer borrarla, ejecute 'git branch -D %s'." + +#: builtin/branch.c:181 +msgid "Update of config-file failed" +msgstr "Fallo de actualizacion de config-file" + +#: builtin/branch.c:212 +msgid "cannot use -a with -d" +msgstr "no se puede usar-a con -d" + +#: builtin/branch.c:218 +msgid "Couldn't look up commit object for HEAD" +msgstr "No se pudo revisar el objeto commit para HEAD" + +#: builtin/branch.c:232 +#, c-format +msgid "Cannot delete branch '%s' checked out at '%s'" +msgstr "No se puede borrar rama '%s' que cuenta con checkout en '%s'" + +#: builtin/branch.c:247 +#, c-format +msgid "remote-tracking branch '%s' not found." +msgstr "rama de rastreo remoto '%s' no encontrada." + +#: builtin/branch.c:248 +#, c-format +msgid "branch '%s' not found." +msgstr "rama '%s' no encontrada." + +#: builtin/branch.c:263 +#, c-format +msgid "Error deleting remote-tracking branch '%s'" +msgstr "Error al eliminar la rama de rastreo remota '%s'" + +#: builtin/branch.c:264 +#, c-format +msgid "Error deleting branch '%s'" +msgstr "Error al eliminar la rama '%s'" + +#: builtin/branch.c:271 +#, c-format +msgid "Deleted remote-tracking branch %s (was %s).\n" +msgstr "Eliminada la rama de rastreo remota %s (era %s).\n" + +#: builtin/branch.c:272 +#, c-format +msgid "Deleted branch %s (was %s).\n" +msgstr "Eliminada la rama %s (era %s)..\n" + +#: builtin/branch.c:417 builtin/tag.c:58 +msgid "unable to parse format string" +msgstr "no es posible analizar el string de formato" + +#: builtin/branch.c:450 +#, c-format +msgid "Branch %s is being rebased at %s" +msgstr "Rama %s está siendo rebasada en %s" + +#: builtin/branch.c:454 +#, c-format +msgid "Branch %s is being bisected at %s" +msgstr "Rama %s está siendo bisecada en %s" + +#: builtin/branch.c:470 +msgid "cannot copy the current branch while not on any." +msgstr "no se puede copiar la rama actual mientras no se está en ninguna." + +#: builtin/branch.c:472 +msgid "cannot rename the current branch while not on any." +msgstr "no se puede renombrar la rama actual mientras no se está en ninguna." + +#: builtin/branch.c:483 +#, c-format +msgid "Invalid branch name: '%s'" +msgstr "Nombre de rama invalido: '%s'" + +#: builtin/branch.c:504 +msgid "Branch rename failed" +msgstr "Cambio de nombre de rama fallido" + +#: builtin/branch.c:506 +msgid "Branch copy failed" +msgstr "Copiado de rama fallido" + +#: builtin/branch.c:510 +#, c-format +msgid "Copied a misnamed branch '%s' away" +msgstr "Copiada una rama mal llamada '%s' afuera" + +#: builtin/branch.c:513 +#, c-format +msgid "Renamed a misnamed branch '%s' away" +msgstr "Rama mal llamada '%s' renombrada" + +#: builtin/branch.c:519 +#, c-format +msgid "Branch renamed to %s, but HEAD is not updated!" +msgstr "¡Rama renombrada a %s, pero HEAD no está actualizado!" + +#: builtin/branch.c:528 +msgid "Branch is renamed, but update of config-file failed" +msgstr "" +"La rama está renombrada, pero falló la actualización del archivo de " +"configuración" + +#: builtin/branch.c:530 +msgid "Branch is copied, but update of config-file failed" +msgstr "" +"La rama está copiada, pero falló la actualización del archivo de " +"configuración" + +#: builtin/branch.c:546 +#, c-format +msgid "" +"Please edit the description for the branch\n" +" %s\n" +"Lines starting with '%c' will be stripped.\n" +msgstr "" +"Por favor, edita la descripción para la rama\n" +"%s\n" +"Las líneas que comiencen con '%c' serán removidas.\n" + +#: builtin/branch.c:579 +msgid "Generic options" +msgstr "Opciones genericas" + +#: builtin/branch.c:581 +msgid "show hash and subject, give twice for upstream branch" +msgstr "mostrar hash y tema, dar dos veces para rama upstream" + +#: builtin/branch.c:582 +msgid "suppress informational messages" +msgstr "Suprimir mensajes informativos" + +#: builtin/branch.c:583 +msgid "set up tracking mode (see git-pull(1))" +msgstr "configurando modo tracking (mirar git-pull(1))" + +#: builtin/branch.c:585 +msgid "do not use" +msgstr "no usar" + +#: builtin/branch.c:587 +msgid "upstream" +msgstr "upstream" + +#: builtin/branch.c:587 +msgid "change the upstream info" +msgstr "cambiar info de upstream" + +#: builtin/branch.c:588 +msgid "Unset the upstream info" +msgstr "Desconfigurando la info de upstream" + +#: builtin/branch.c:589 +msgid "use colored output" +msgstr "usar salida con colores" + +#: builtin/branch.c:590 +msgid "act on remote-tracking branches" +msgstr "actuar en ramas de traqueo remoto" + +#: builtin/branch.c:592 builtin/branch.c:594 +msgid "print only branches that contain the commit" +msgstr "mostrar solo ramas que contienen el commit" + +#: builtin/branch.c:593 builtin/branch.c:595 +msgid "print only branches that don't contain the commit" +msgstr "mostrar solo ramas que no contienen el commit" + +#: builtin/branch.c:598 +msgid "Specific git-branch actions:" +msgstr "Acciones específicas de git-branch:" + +#: builtin/branch.c:599 +msgid "list both remote-tracking and local branches" +msgstr "listar ramas de remote-tracking y locales" + +#: builtin/branch.c:601 +msgid "delete fully merged branch" +msgstr "borrar ramas totalmente fusionadas" + +#: builtin/branch.c:602 +msgid "delete branch (even if not merged)" +msgstr "borar rama (incluso si no esta fusionada)" + +#: builtin/branch.c:603 +msgid "move/rename a branch and its reflog" +msgstr "mover/renombrar una rama y su reflog" + +#: builtin/branch.c:604 +msgid "move/rename a branch, even if target exists" +msgstr "mover/renombrar una rama, incluso si el destino existe" + +#: builtin/branch.c:605 +msgid "copy a branch and its reflog" +msgstr "copiar una rama y su reflog" + +#: builtin/branch.c:606 +msgid "copy a branch, even if target exists" +msgstr "copiar una rama, incluso si el objetivo existe" + +#: builtin/branch.c:607 +msgid "list branch names" +msgstr "listar nombres de ramas" + +#: builtin/branch.c:608 +msgid "create the branch's reflog" +msgstr "crea el reflog de la rama" + +#: builtin/branch.c:610 +msgid "edit the description for the branch" +msgstr "edita la descripcion de la rama" + +#: builtin/branch.c:611 +msgid "force creation, move/rename, deletion" +msgstr "fuerza la creacion,movimiento/renombrado,borrado" + +#: builtin/branch.c:612 +msgid "print only branches that are merged" +msgstr "muestra solo ramas que han sido fusionadas" + +#: builtin/branch.c:613 +msgid "print only branches that are not merged" +msgstr "muestra solo ramas que no han sido fusionadas" + +#: builtin/branch.c:614 +msgid "list branches in columns" +msgstr "muestra las ramas en columnas" + +#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405 +msgid "key" +msgstr "clave" + +#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406 +msgid "field name to sort on" +msgstr "nombre del campo por el cuál ordenar" + +#: builtin/branch.c:618 builtin/for-each-ref.c:43 builtin/notes.c:408 +#: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574 +#: builtin/tag.c:408 +msgid "object" +msgstr "objeto" + +#: builtin/branch.c:619 +msgid "print only branches of the object" +msgstr "imprimir sólo las ramas del objeto" + +#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415 +msgid "sorting and filtering are case insensitive" +msgstr "ordenamiento y filstrado son case-insensitive" + +#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413 +#: builtin/verify-tag.c:39 +msgid "format to use for the output" +msgstr "formato para usar para el output" + +#: builtin/branch.c:645 builtin/clone.c:729 +msgid "HEAD not found below refs/heads!" +msgstr "HEAD no encontrado abajo de refs/heads!" + +#: builtin/branch.c:668 +msgid "--column and --verbose are incompatible" +msgstr "--column y --verbose son incompatibles" + +#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741 +msgid "branch name required" +msgstr "se necesita el nombre de la rama" + +#: builtin/branch.c:708 +msgid "Cannot give description to detached HEAD" +msgstr "No se puede dar descripción al HEAD desacoplado" + +#: builtin/branch.c:713 +msgid "cannot edit description of more than one branch" +msgstr "no se puede editar la descripción de más de una rama" + +#: builtin/branch.c:720 +#, c-format +msgid "No commit on branch '%s' yet." +msgstr "Aún no hay confirmaciones en la rama '%s'." + +#: builtin/branch.c:723 +#, c-format +msgid "No branch named '%s'." +msgstr "No hay ninguna rama llamada '%s'." + +#: builtin/branch.c:738 +msgid "too many branches for a copy operation" +msgstr "demasiadas ramas para una operación de copiado" + +#: builtin/branch.c:747 +msgid "too many arguments for a rename operation" +msgstr "demasiados argumentos para una operación de renombrado" + +#: builtin/branch.c:752 +msgid "too many arguments to set new upstream" +msgstr "demasiados argumentos para configurar un nuevo upstream" + +#: builtin/branch.c:756 +#, c-format +msgid "" +"could not set upstream of HEAD to %s when it does not point to any branch." +msgstr "" +"no se pudo configurar upstream de HEAD a %s cuando este no apunta a ninguna " +"rama." + +#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800 +#, c-format +msgid "no such branch '%s'" +msgstr "no hay tal rama '%s'" + +#: builtin/branch.c:763 +#, c-format +msgid "branch '%s' does not exist" +msgstr "la rama '%s' no existe" + +#: builtin/branch.c:775 +msgid "too many arguments to unset upstream" +msgstr "demasiados argumentos para desconfigurar upstream" + +#: builtin/branch.c:779 +msgid "could not unset upstream of HEAD when it does not point to any branch." +msgstr "" +"no se puede desconfigurar upstream de HEAD cuando este no apunta a ninguna " +"rama." + +#: builtin/branch.c:785 +#, c-format +msgid "Branch '%s' has no upstream information" +msgstr "Rama '%s' no tiene informacion de upstream" + +#: builtin/branch.c:797 +msgid "it does not make sense to create 'HEAD' manually" +msgstr "No tiene sentido crear 'HEAD' manualmente" + +#: builtin/branch.c:803 +msgid "-a and -r options to 'git branch' do not make sense with a branch name" +msgstr "" +"opciones -a y -r para 'git branch' no tienen sentido con un nombre de rama" + +#: builtin/branch.c:806 +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 '--" +"set-upstream-to' en cambio." + +#: builtin/bundle.c:45 +#, c-format +msgid "%s is okay\n" +msgstr "%s está bien\n" + +#: builtin/bundle.c:58 +msgid "Need a repository to create a bundle." +msgstr "Se necesita un repositorio para agrupar." + +#: builtin/bundle.c:62 +msgid "Need a repository to unbundle." +msgstr "Se necesita un repositorio para desagrupar." + +#: builtin/cat-file.c:521 +msgid "" +"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" +"p | <type> | --textconv | --filters) [--path=<path>] <object>" +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 +msgid "" +"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" +"filters]" +msgstr "" +"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" +"filters]" + +#: builtin/cat-file.c:559 +msgid "<type> can be one of: blob, tree, commit, tag" +msgstr "<tipo> puede ser: blob, tree, commit, tag" + +#: builtin/cat-file.c:560 +msgid "show object type" +msgstr "mostrar el tipo del objeto" + +#: builtin/cat-file.c:561 +msgid "show object size" +msgstr "mostrar el tamanio del objeto" + +#: builtin/cat-file.c:563 +msgid "exit with zero when there's no error" +msgstr "salir con cero cuando no haya error" + +#: builtin/cat-file.c:564 +msgid "pretty-print object's content" +msgstr "realizar pretty-print del contenido del objeto" + +#: builtin/cat-file.c:566 +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 +msgid "for blob objects, run filters on object's content" +msgstr "para objetos blob, ejecuta filters en el contenido del objeto" + +#: builtin/cat-file.c:569 git-submodule.sh:943 +msgid "blob" +msgstr "blob" + +#: builtin/cat-file.c:570 +msgid "use a specific path for --textconv/--filters" +msgstr "use una ruta específica para --textconv/--filters" + +#: builtin/cat-file.c:572 +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 +msgid "buffer --batch output" +msgstr "salida buffer --batch " + +#: builtin/cat-file.c:575 +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 +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 +msgid "follow in-tree symlinks (used with --batch or --batch-check)" +msgstr "seguir symlinks en el árbol (usado con --batch o --batch-check)" + +#: builtin/cat-file.c:583 +msgid "show all objects with --batch or --batch-check" +msgstr "mostrar todos los objetos con --batch o --batch-check" + +#: builtin/check-attr.c:12 +msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." +msgstr "git check-attr [-a | --all | <attr>...] [--] <nombre-de-ruta>..." + +#: builtin/check-attr.c:13 +msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" +msgstr "git check-attr --stdin [-z] [-a | --all | <attr>...]" + +#: builtin/check-attr.c:20 +msgid "report all attributes set on file" +msgstr "reportar todos los atributos configurados en el archivo" + +#: builtin/check-attr.c:21 +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 +msgid "read file names from stdin" +msgstr "leer nombres de archivos de stdin" + +#: builtin/check-attr.c:24 builtin/check-ignore.c:26 +msgid "terminate input and output records by a NUL character" +msgstr "terminar registros de entrada y salida con un caracter NUL" + +#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358 +msgid "suppress progress reporting" +msgstr "suprimir el reporte de progreso" + +#: builtin/check-ignore.c:28 +msgid "show non-matching input paths" +msgstr "mostrar rutas de entrada que no concuerdan" + +#: builtin/check-ignore.c:30 +msgid "ignore index when checking" +msgstr "ignorar el índice cuando se revise" + +#: builtin/check-ignore.c:158 +msgid "cannot specify pathnames with --stdin" +msgstr "no se puede especificar los nombres de rutas con --stdin" + +#: builtin/check-ignore.c:161 +msgid "-z only makes sense with --stdin" +msgstr "-z sólo tiene sentido con --stdin" + +#: builtin/check-ignore.c:163 +msgid "no path specified" +msgstr "ruta no especificada" + +#: builtin/check-ignore.c:167 +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 +msgid "cannot have both --quiet and --verbose" +msgstr "no se puede tener ambos --quiet y --verbose" + +#: builtin/check-ignore.c:172 +msgid "--non-matching is only valid with --verbose" +msgstr "--non-matching sólo es válida con --verbose" + +#: builtin/check-mailmap.c:9 +msgid "git check-mailmap [<options>] <contact>..." +msgstr "git check-mailmap [<opciones>] <contacto>..." + +#: builtin/check-mailmap.c:14 +msgid "also read contacts from stdin" +msgstr "también leer contactos desde stdin" + +#: builtin/check-mailmap.c:25 +#, c-format +msgid "unable to parse contact: %s" +msgstr "no es posible analizar el contacto: %s" + +#: builtin/check-mailmap.c:48 +msgid "no contacts specified" +msgstr "contactos no especificados" + +#: builtin/checkout-index.c:128 +msgid "git checkout-index [<options>] [--] [<file>...]" +msgstr "git checkout-index [<opciones>] [--] [<archivo>...]" + +#: builtin/checkout-index.c:145 +msgid "stage should be between 1 and 3 or all" +msgstr "stage tiene que estar entre 1 y 3 o all" + +#: builtin/checkout-index.c:161 +msgid "check out all files in the index" +msgstr "revisar todos los archivos en el indice" + +#: builtin/checkout-index.c:162 +msgid "force overwrite of existing files" +msgstr "forzar sobreescritura de los archivos existentes" + +#: builtin/checkout-index.c:164 +msgid "no warning for existing files and files not in index" +msgstr "" +"no hay advertencias para los archivos existentes y los archivos no están en " +"el índice" + +#: builtin/checkout-index.c:166 +msgid "don't checkout new files" +msgstr "no revisar archivos nuevos" + +#: builtin/checkout-index.c:168 +msgid "update stat information in the index file" +msgstr "actualizar información de estado en el archivo índice" + +#: builtin/checkout-index.c:172 +msgid "read list of paths from the standard input" +msgstr "leer lista de rutas desde standard input" + +#: builtin/checkout-index.c:174 +msgid "write the content to temporary files" +msgstr "escribir el contenido en un archivo temporal" + +#: builtin/checkout-index.c:175 builtin/column.c:31 +#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631 +#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999 +#: builtin/worktree.c:498 +msgid "string" +msgstr "string" + +#: builtin/checkout-index.c:176 +msgid "when creating files, prepend <string>" +msgstr "cuando cree archivos, anteponer <string>" + +#: builtin/checkout-index.c:178 +msgid "copy out the files from named stage" +msgstr "copiar los archivos del stage nombrado" + +#: builtin/checkout.c:26 +msgid "git checkout [<options>] <branch>" +msgstr "git checkout [<opciones>] <rama>" + +#: builtin/checkout.c:27 +msgid "git checkout [<options>] [<branch>] -- <file>..." +msgstr "git checkout [<opciones>] [<rama>] -- <archivo>..." + +#: builtin/checkout.c:135 builtin/checkout.c:168 +#, c-format +msgid "path '%s' does not have our version" +msgstr "ruta '%s' no tiene nuestra versión" + +#: builtin/checkout.c:137 builtin/checkout.c:170 +#, c-format +msgid "path '%s' does not have their version" +msgstr "ruta '%s' no tiene su versión" + +#: builtin/checkout.c:153 +#, c-format +msgid "path '%s' does not have all necessary versions" +msgstr "ruta '%s' no tiene todas las versiones necesarias" + +#: builtin/checkout.c:197 +#, c-format +msgid "path '%s' does not have necessary versions" +msgstr "ruta '%s' no tiene versiones necesarias" + +#: builtin/checkout.c:214 +#, c-format +msgid "path '%s': cannot merge" +msgstr "ruta '%s': no se puede fusionar" + +#: 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: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: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: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." + +#: builtin/checkout.c:342 builtin/checkout.c:349 +#, c-format +msgid "path '%s' is unmerged" +msgstr "ruta '%s' no esta fusionada" + +#: builtin/checkout.c:501 +msgid "you need to resolve your current index first" +msgstr "necesita resolver su índice actual primero" + +#: builtin/checkout.c:632 +#, c-format +msgid "Can not do reflog for '%s': %s\n" +msgstr "No se puede hacer reflog para '%s': %s\n" + +#: builtin/checkout.c:673 +msgid "HEAD is now at" +msgstr "HEAD está ahora en" + +#: builtin/checkout.c:677 builtin/clone.c:683 +msgid "unable to update HEAD" +msgstr "no es posible actualizar HEAD" + +#: builtin/checkout.c:681 +#, c-format +msgid "Reset branch '%s'\n" +msgstr "Reiniciar rama '%s'\n" + +#: builtin/checkout.c:684 +#, c-format +msgid "Already on '%s'\n" +msgstr "Ya en '%s'\n" + +#: builtin/checkout.c:688 +#, c-format +msgid "Switched to and reset branch '%s'\n" +msgstr "Rama reiniciada y cambiada a '%s'\n" + +#: builtin/checkout.c:690 builtin/checkout.c:1086 +#, c-format +msgid "Switched to a new branch '%s'\n" +msgstr "Cambiado a nueva rama '%s'\n" + +#: builtin/checkout.c:692 +#, c-format +msgid "Switched to branch '%s'\n" +msgstr "Cambiado a rama '%s'\n" + +#: builtin/checkout.c:743 +#, c-format +msgid " ... and %d more.\n" +msgstr " ... y %d más.\n" + +#: builtin/checkout.c:749 +#, c-format +msgid "" +"Warning: you are leaving %d commit behind, not connected to\n" +"any of your branches:\n" +"\n" +"%s\n" +msgid_plural "" +"Warning: you are leaving %d commits behind, not connected to\n" +"any of your branches:\n" +"\n" +"%s\n" +msgstr[0] "" +"Peligro: está saliendo %d commit atrás, no está conectado\n" +"a ninguna rama:\n" +"\n" +"%s\n" +msgstr[1] "" +"Peligro: está saliendo %d commits antrás, no está conectado\n" +"a ninguna rama:\n" +"\n" +"%s\n" + +#: builtin/checkout.c:768 +#, c-format +msgid "" +"If you want to keep it by creating a new branch, this may be a good time\n" +"to do so with:\n" +"\n" +" git branch <new-branch-name> %s\n" +"\n" +msgid_plural "" +"If you want to keep them by creating a new branch, this may be a good time\n" +"to do so with:\n" +"\n" +" git branch <new-branch-name> %s\n" +"\n" +msgstr[0] "" +"Si quiere conservarlo creando una nueva rama, este es un buen momento\n" +"para hacerlo:\n" +"\n" +" git branch <nuevo-nombre-de-rama> %s\n" +"\n" +msgstr[1] "" +"Si quiere conservarlos creando una nueva rama, este es un buen momento\n" +"para hacerlo:\n" +"\n" +" git branch <nombre-de-rama> %s\n" +"\n" + +#: builtin/checkout.c:809 +msgid "internal error in revision walk" +msgstr "error interno en camino de reivison" + +#: builtin/checkout.c:813 +msgid "Previous HEAD position was" +msgstr "La posicion previa de HEAD era" + +#: builtin/checkout.c:843 builtin/checkout.c:1081 +msgid "You are on a branch yet to be born" +msgstr "Estas en una rama por nacer" + +#: builtin/checkout.c:987 +#, c-format +msgid "only one reference expected, %d given." +msgstr "solo una referencia esperada, %d entregadas." + +#: builtin/checkout.c:1027 builtin/worktree.c:233 +#, c-format +msgid "invalid reference: %s" +msgstr "referencia invalida: %s" + +#: builtin/checkout.c:1056 +#, c-format +msgid "reference is not a tree: %s" +msgstr "la referencia no es n arbol: %s" + +#: builtin/checkout.c:1095 +msgid "paths cannot be used with switching branches" +msgstr "rutas no pueden ser usadas con cambios de rama" + +#: builtin/checkout.c:1098 builtin/checkout.c:1102 +#, c-format +msgid "'%s' cannot be used with switching branches" +msgstr "'%s' no puede ser usado con cambios de ramas" + +#: builtin/checkout.c:1106 builtin/checkout.c:1109 builtin/checkout.c:1114 +#: builtin/checkout.c:1117 +#, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "'%s' no puede ser usado con '%s'" + +#: builtin/checkout.c:1122 +#, c-format +msgid "Cannot switch branch to a non-commit '%s'" +msgstr "No se puede cambiar rama a un '%s' sin commits" + +#: builtin/checkout.c:1154 builtin/checkout.c:1156 builtin/clone.c:114 +#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:346 +#: builtin/worktree.c:348 +msgid "branch" +msgstr "rama" + +#: builtin/checkout.c:1155 +msgid "create and checkout a new branch" +msgstr "crear y hacer checkout a una nueva rama" + +#: builtin/checkout.c:1157 +msgid "create/reset and checkout a branch" +msgstr "crear/reiniciar y hacer checkout a una rama" + +#: builtin/checkout.c:1158 +msgid "create reflog for new branch" +msgstr "crear un reflog para una nueva rama" + +#: builtin/checkout.c:1159 builtin/worktree.c:350 +msgid "detach HEAD at named commit" +msgstr "desacoplar HEAD en el commit nombrado" + +#: builtin/checkout.c:1160 +msgid "set upstream info for new branch" +msgstr "configurar info de upstream para una rama nueva" + +#: builtin/checkout.c:1162 +msgid "new-branch" +msgstr "nueva-rama" + +#: builtin/checkout.c:1162 +msgid "new unparented branch" +msgstr "nueva rama no emparentada" + +#: builtin/checkout.c:1163 +msgid "checkout our version for unmerged files" +msgstr "hacer checkout a nuestra version para archivos sin fusionar" + +#: builtin/checkout.c:1165 +msgid "checkout their version for unmerged files" +msgstr "hacer checkout a su version para los archivos sin fusionar" + +#: builtin/checkout.c:1167 +msgid "force checkout (throw away local modifications)" +msgstr "forzar el checkout (descartar modificaciones locales)" + +#: builtin/checkout.c:1168 +msgid "perform a 3-way merge with the new branch" +msgstr "realizar una fusion de tres vias con la rama nueva" + +#: builtin/checkout.c:1169 builtin/merge.c:238 +msgid "update ignored files (default)" +msgstr "actualizar archivos ignorados (default)" + +#: builtin/checkout.c:1170 builtin/log.c:1489 parse-options.h:251 +msgid "style" +msgstr "estilo" + +#: builtin/checkout.c:1171 +msgid "conflict style (merge or diff3)" +msgstr "conflicto de estilos (merge o diff3)" + +#: builtin/checkout.c:1174 +msgid "do not limit pathspecs to sparse entries only" +msgstr "no limitar pathspecs a dispersar entradas solamente" + +#: builtin/checkout.c:1176 +msgid "second guess 'git checkout <no-such-branch>'" +msgstr "segunda opción 'git checkout <no-hay-tal-rama>'" + +#: builtin/checkout.c:1178 +msgid "do not check if another worktree is holding the given ref" +msgstr "no revise si otro árbol de trabajo contiene la ref entregada" + +#: builtin/checkout.c:1182 builtin/clone.c:81 builtin/fetch.c:136 +#: builtin/merge.c:235 builtin/pull.c:120 builtin/push.c:544 +#: builtin/send-pack.c:173 +msgid "force progress reporting" +msgstr "forzar el reporte de progreso" + +#: builtin/checkout.c:1212 +msgid "-b, -B and --orphan are mutually exclusive" +msgstr "-b, -B y --orphan son mutuamente exclusivas" + +#: builtin/checkout.c:1229 +msgid "--track needs a branch name" +msgstr "--track necesita el nombre de una rama" + +#: builtin/checkout.c:1234 +msgid "Missing branch name; try -b" +msgstr "Falta nombre de rama; prueba -b" + +#: builtin/checkout.c:1270 +msgid "invalid path specification" +msgstr "Especificacion de ruta invalida" + +#: builtin/checkout.c:1277 +#, c-format +msgid "'%s' is not a commit and a branch '%s' cannot be created from it" +msgstr "'%s' no es un commit y una rama '%s' no puede ser creada desde este" + +#: builtin/checkout.c:1281 +#, c-format +msgid "git checkout: --detach does not take a path argument '%s'" +msgstr "git checkout: --detach no toma un argumento de ruta '%s'" + +#: builtin/checkout.c:1285 +msgid "" +"git checkout: --ours/--theirs, --force and --merge are incompatible when\n" +"checking out of the index." +msgstr "" +"git checkout: --ours/--theirs, --force y --merge son incompatibles cuando\n" +"se revisa fuera del índice." + +#: builtin/clean.c:26 +msgid "" +"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." +msgstr "" +"git clean [-d] [-f] [-i] [-n] [-q] [-e <patrón>] [-x | -X] [--] <rutas>..." + +#: builtin/clean.c:30 +#, c-format +msgid "Removing %s\n" +msgstr "Borrando %s\n" + +#: builtin/clean.c:31 +#, c-format +msgid "Would remove %s\n" +msgstr "Sera borrado %s\n" + +#: builtin/clean.c:32 +#, c-format +msgid "Skipping repository %s\n" +msgstr "Saltando repositorio %s\n" + +#: builtin/clean.c:33 +#, c-format +msgid "Would skip repository %s\n" +msgstr "Se saltara repositorio %s\n" + +#: builtin/clean.c:34 +#, c-format +msgid "failed to remove %s" +msgstr "fallo al borrar %s" + +#: builtin/clean.c:301 git-add--interactive.perl:572 +#, c-format +msgid "" +"Prompt help:\n" +"1 - select a numbered item\n" +"foo - select item based on unique prefix\n" +" - (empty) select nothing\n" +msgstr "" +"Ayuda rapida:\n" +"1 - selecciona un objeto por numero\n" +"foo - selecciona un objeto basado en un prefijo unico\n" +" - (vacio) no elegir nada\n" + +#: builtin/clean.c:305 git-add--interactive.perl:581 +#, c-format +msgid "" +"Prompt help:\n" +"1 - select a single item\n" +"3-5 - select a range of items\n" +"2-3,6-9 - select multiple ranges\n" +"foo - select item based on unique prefix\n" +"-... - unselect specified items\n" +"* - choose all items\n" +" - (empty) finish selecting\n" +msgstr "" +"Ayuda rapida:\n" +"1 - selecciona un objeto unico\n" +"3-5 - selecciona un rango de objtos\n" +"2-3,6-9 - selecciona multiples rangos\n" +"foo - selecciona un objeto basado en un prefijo unico\n" +"-... - deseleccionar objetos especificados\n" +"* - escoger todos los objetos\n" +" - (vacio) terminar seleccion\n" + +#: builtin/clean.c:521 git-add--interactive.perl:547 +#: git-add--interactive.perl:552 +#, c-format, perl-format +msgid "Huh (%s)?\n" +msgstr "Ahh (%s)?\n" + +#: builtin/clean.c:663 +#, c-format +msgid "Input ignore patterns>> " +msgstr "Input ignora los patrones >> " + +#: builtin/clean.c:700 +#, c-format +msgid "WARNING: Cannot find items matched by: %s" +msgstr "PELIGRO: No se puede encontrar objetos que concuerden con: %s" + +#: builtin/clean.c:721 +msgid "Select items to delete" +msgstr "Seleccionar objetos para borrar" + +#. TRANSLATORS: Make sure to keep [y/N] as is +#: builtin/clean.c:762 +#, c-format +msgid "Remove %s [y/N]? " +msgstr "Borrar %s [y/N]? " + +#: builtin/clean.c:787 git-add--interactive.perl:1616 +#, c-format +msgid "Bye.\n" +msgstr "Bye.\n" + +#: builtin/clean.c:795 +msgid "" +"clean - start cleaning\n" +"filter by pattern - exclude items from deletion\n" +"select by numbers - select items to be deleted by numbers\n" +"ask each - confirm each deletion (like \"rm -i\")\n" +"quit - stop cleaning\n" +"help - this screen\n" +"? - help for prompt selection" +msgstr "" +"clean - comenzar la limpieza\n" +"filtrar por patron - excluye objetos del borrado \n" +"elegir por numeros - selecciona objetos a ser borrados por numero\n" +"preguntar cada uno - confirmar cada borrado (como \"rm -i\")\n" +"quit - parar limpieza\n" +"help - esta ventana\n" +"? - ayuda para seleccion de opciones" + +#: builtin/clean.c:822 git-add--interactive.perl:1692 +msgid "*** Commands ***" +msgstr "*** Comandos ***" + +#: builtin/clean.c:823 git-add--interactive.perl:1689 +msgid "What now" +msgstr "Ahora que" + +#: builtin/clean.c:831 +msgid "Would remove the following item:" +msgid_plural "Would remove the following items:" +msgstr[0] "Se removera el siguiente objeto" +msgstr[1] "Se removeran los siguientes objetos:" + +#: builtin/clean.c:847 +msgid "No more files to clean, exiting." +msgstr "No hay mas archivos para limpiar, saliendo." + +#: builtin/clean.c:909 +msgid "do not print names of files removed" +msgstr "no imprimir nombres de archivos borrados" + +#: builtin/clean.c:911 +msgid "force" +msgstr "forzar" + +#: builtin/clean.c:912 +msgid "interactive cleaning" +msgstr "limpieza interactiva" + +#: builtin/clean.c:914 +msgid "remove whole directories" +msgstr "borrar directorios completos" + +#: builtin/clean.c:915 builtin/describe.c:463 builtin/describe.c:465 +#: builtin/grep.c:861 builtin/ls-files.c:544 builtin/name-rev.c:397 +#: builtin/name-rev.c:399 builtin/show-ref.c:176 +msgid "pattern" +msgstr "patron" + +#: builtin/clean.c:916 +msgid "add <pattern> to ignore rules" +msgstr "agregar <patron> para ignorar reglas" + +#: builtin/clean.c:917 +msgid "remove ignored files, too" +msgstr "borrar archivos ignorados, tambien" + +#: builtin/clean.c:919 +msgid "remove only ignored files" +msgstr "borrar solo archivos ignorados" + +#: builtin/clean.c:937 +msgid "-x and -X cannot be used together" +msgstr "-x y -X no pueden ser usadas juntas" + +#: builtin/clean.c:941 +msgid "" +"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " +"clean" +msgstr "" +"clean.requireForce configurado como true y ninguno -i, -n, ni -f entregados; " +"rehusando el clean" + +#: builtin/clean.c:944 +msgid "" +"clean.requireForce defaults to true and neither -i, -n, nor -f given; " +"refusing to clean" +msgstr "" +"clean.requireForce default en true y ninguno -i, -n, ni -f entregados; " +"rehusando el clean" + +#: builtin/clone.c:39 +msgid "git clone [<options>] [--] <repo> [<dir>]" +msgstr "git clone [<opciones>] [--] <repo> [<directorio>]" + +#: builtin/clone.c:83 +msgid "don't create a checkout" +msgstr "no crear checkout" + +#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479 +msgid "create a bare repository" +msgstr "crear un repositorio vacio" + +#: builtin/clone.c:88 +msgid "create a mirror repository (implies bare)" +msgstr "crear un repositorio espejo (implica vacio)" + +#: builtin/clone.c:90 +msgid "to clone from a local repository" +msgstr "clonar de un repositorio local" + +#: builtin/clone.c:92 +msgid "don't use local hardlinks, always copy" +msgstr "no usar hardlinks, siempre copiar" + +#: builtin/clone.c:94 +msgid "setup as shared repository" +msgstr "configurar como repositorio compartido" + +#: builtin/clone.c:96 builtin/clone.c:100 +msgid "pathspec" +msgstr "pathspec" + +#: builtin/clone.c:96 builtin/clone.c:100 +msgid "initialize submodules in the clone" +msgstr "inicializar submodulos en el clonado" + +#: builtin/clone.c:103 +msgid "number of submodules cloned in parallel" +msgstr "numero de submodulos clonados en paralelo" + +#: builtin/clone.c:104 builtin/init-db.c:476 +msgid "template-directory" +msgstr "directorio-template" + +#: builtin/clone.c:105 builtin/init-db.c:477 +msgid "directory from which templates will be used" +msgstr "directorio del cual los templates seran usados" + +#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:635 +#: builtin/submodule--helper.c:1002 +msgid "reference repository" +msgstr "repositorio de referencia" + +#: builtin/clone.c:111 +msgid "use --reference only while cloning" +msgstr "usa--reference sólo al clonar" + +#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44 +msgid "name" +msgstr "nombre" + +#: builtin/clone.c:113 +msgid "use <name> instead of 'origin' to track upstream" +msgstr "use <nombre> en lugar de 'origin' para rastrear upstream" + +#: builtin/clone.c:115 +msgid "checkout <branch> instead of the remote's HEAD" +msgstr "checkout <rama> en lugar de HEAD remota" + +#: builtin/clone.c:117 +msgid "path to git-upload-pack on the remote" +msgstr "ruta para git-upload-pack en el remoto" + +#: builtin/clone.c:118 builtin/fetch.c:137 builtin/grep.c:804 +#: builtin/pull.c:205 +msgid "depth" +msgstr "profundidad" + +#: builtin/clone.c:119 +msgid "create a shallow clone of that depth" +msgstr "crear un clon superficial para esa profundidad" + +#: builtin/clone.c:120 builtin/fetch.c:139 builtin/pack-objects.c:2938 +#: parse-options.h:142 +msgid "time" +msgstr "tiempo" + +#: builtin/clone.c:121 +msgid "create a shallow clone since a specific time" +msgstr "crear un clon superficial desde el tiempo específico" + +#: builtin/clone.c:122 builtin/fetch.c:141 +msgid "revision" +msgstr "revision" + +#: builtin/clone.c:123 builtin/fetch.c:142 +msgid "deepen history of shallow clone, excluding rev" +msgstr "ahondando historia de clon superficial, excluyendo rev" + +#: builtin/clone.c:125 +msgid "clone only one branch, HEAD or --branch" +msgstr "clonar solo una rama,HEAD o --branch" + +#: builtin/clone.c:127 +msgid "don't clone any tags, and make later fetches not to follow them" +msgstr "no clonar niun tag, y hacer que los subsiguientes fetch no los sigan" + +#: builtin/clone.c:129 +msgid "any cloned submodules will be shallow" +msgstr "cualquier submódulo clonado será superficial" + +#: builtin/clone.c:130 builtin/init-db.c:485 +msgid "gitdir" +msgstr "gitdir" + +#: builtin/clone.c:131 builtin/init-db.c:486 +msgid "separate git dir from working tree" +msgstr "separa git dir del árbol de trabajo" + +#: builtin/clone.c:132 +msgid "key=value" +msgstr "llave=valor" + +#: builtin/clone.c:133 +msgid "set config inside the new repository" +msgstr "configurar config dentro del nuevo repositorio" + +#: builtin/clone.c:134 builtin/fetch.c:159 builtin/push.c:555 +msgid "use IPv4 addresses only" +msgstr "solo usar direcciones IPv4" + +#: builtin/clone.c:136 builtin/fetch.c:161 builtin/push.c:557 +msgid "use IPv6 addresses only" +msgstr "solo usar direcciones IPv6" + +#: builtin/clone.c:273 +msgid "" +"No directory name could be guessed.\n" +"Please specify a directory on the command line" +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 +#, 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 +#, c-format +msgid "failed to open '%s'" +msgstr "fallo al abrir '%s'" + +#: builtin/clone.c:406 +#, c-format +msgid "%s exists and is not a directory" +msgstr "%s existe pero no es un directorio" + +#: builtin/clone.c:420 +#, c-format +msgid "failed to stat %s\n" +msgstr "falló al analizar %s\n" + +#: builtin/clone.c:442 +#, c-format +msgid "failed to create link '%s'" +msgstr "fallo al crear link '%s'" + +#: builtin/clone.c:446 +#, c-format +msgid "failed to copy file to '%s'" +msgstr "fallo al copiar archivo a '%s'" + +#: builtin/clone.c:471 +#, c-format +msgid "done.\n" +msgstr "hecho.\n" + +#: builtin/clone.c:483 +msgid "" +"Clone succeeded, but checkout failed.\n" +"You can inspect what was checked out with 'git status'\n" +"and retry the checkout with 'git checkout -f HEAD'\n" +msgstr "" +"Clonado exitoso, pero falló el checkout.\n" +"Puede inspeccionar a qué se hizo checkout con 'git status'\n" +"y volver a intentarlo con 'git checkout -f HEAD'\n" + +#: builtin/clone.c:560 +#, c-format +msgid "Could not find remote branch %s to clone." +msgstr "No se pudo encontrar la rama remota %s para clonar" + +#: builtin/clone.c:655 +msgid "remote did not send all necessary objects" +msgstr "remoto no mando todos los objetos necsarios" + +#: builtin/clone.c:671 +#, c-format +msgid "unable to update %s" +msgstr "incapaz de actualizar %s" + +#: builtin/clone.c:720 +msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" +msgstr "" +"HEAD remoto refiere a un ref inexistente, no se puede hacer checkout.\n" + +#: builtin/clone.c:751 +msgid "unable to checkout working tree" +msgstr "no es posible realizar checkout en el arbol de trabajo" + +#: builtin/clone.c:796 +msgid "unable to write parameters to config file" +msgstr "no es posible escribir parametors al arhivo config" + +#: builtin/clone.c:859 +msgid "cannot repack to clean up" +msgstr "no se puede reempaquetar para limpiar" + +#: builtin/clone.c:861 +msgid "cannot unlink temporary alternates file" +msgstr "no se puede desvincular archivos alternos temporales" + +#: builtin/clone.c:894 builtin/receive-pack.c:1944 +msgid "Too many arguments." +msgstr "Muchos argumentos." + +#: builtin/clone.c:898 +msgid "You must specify a repository to clone." +msgstr "Tienes que especificar un repositorio para clonar" + +#: builtin/clone.c:911 +#, c-format +msgid "--bare and --origin %s options are incompatible." +msgstr "Las opciones --bare y --origin %s son incompatibles." + +#: builtin/clone.c:914 +msgid "--bare and --separate-git-dir are incompatible." +msgstr "--bare y --separate-git-dir son incompatibles." + +#: builtin/clone.c:927 +#, c-format +msgid "repository '%s' does not exist" +msgstr "repositorio '%s' no existe" + +#: builtin/clone.c:933 builtin/fetch.c:1360 +#, c-format +msgid "depth %s is not a positive number" +msgstr "profundidad %s no es un numero positivo" + +#: builtin/clone.c:943 +#, 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 vacio" + +#: builtin/clone.c:953 +#, 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:240 builtin/worktree.c:270 +#, c-format +msgid "could not create leading directories of '%s'" +msgstr "no se pudo crear directorios principales de '%s'" + +#: builtin/clone.c:971 +#, c-format +msgid "could not create work tree dir '%s'" +msgstr "no se pudo crear un arbol de trabajo '%s'" + +#: builtin/clone.c:983 +#, c-format +msgid "Cloning into bare repository '%s'...\n" +msgstr "Clonando en un repositorio vacio '%s'...\n" + +#: builtin/clone.c:985 +#, c-format +msgid "Cloning into '%s'...\n" +msgstr "Clonando en '%s'...\n" + +#: builtin/clone.c:1009 +msgid "" +"clone --recursive is not compatible with both --reference and --reference-if-" +"able" +msgstr "" +"clone --recursive no es compatible con --reference y --reference-if-able al " +"mismo tiempo" + +#: builtin/clone.c:1071 +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 +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 +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 +msgid "source repository is shallow, ignoring --local" +msgstr "repositorio fuente es superficial, ignorando --local" + +#: builtin/clone.c:1083 +msgid "--local is ignored" +msgstr "--local es ignorado" + +#: builtin/clone.c:1087 +#, c-format +msgid "Don't know how to clone %s" +msgstr "No se sabe como clonar %s" + +#: builtin/clone.c:1142 builtin/clone.c:1150 +#, c-format +msgid "Remote branch %s not found in upstream %s" +msgstr "Rama remota %s no encontrada en upstream %s" + +#: builtin/clone.c:1153 +msgid "You appear to have cloned an empty repository." +msgstr "Pareces haber clonado un repositorio sin contenido." + +#: builtin/column.c:10 +msgid "git column [<options>]" +msgstr "git column [<opciones>]" + +#: builtin/column.c:27 +msgid "lookup config vars" +msgstr "revisa las variables de configuraciones " + +#: builtin/column.c:28 builtin/column.c:29 +msgid "layout to use" +msgstr "capa a usar" + +#: builtin/column.c:30 +msgid "Maximum width" +msgstr "Ancho maximo" + +#: builtin/column.c:31 +msgid "Padding space on left border" +msgstr "Realizando padding en el borde izquierdo" + +#: builtin/column.c:32 +msgid "Padding space on right border" +msgstr "Realizando padding en el borde derecho" + +#: builtin/column.c:33 +msgid "Padding space between columns" +msgstr "Realizando padding entre columnas" + +#: builtin/column.c:52 +msgid "--command must be the first argument" +msgstr "--command debe ser el primer argumento" + +#: builtin/commit.c:39 +msgid "git commit [<options>] [--] <pathspec>..." +msgstr "git commit [<opciones>] [--] <especificacion-de-ruta>..." + +#: builtin/commit.c:44 +msgid "git status [<options>] [--] <pathspec>..." +msgstr "git status [<opciones>] [--] <especificacion-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 automaticamente basados\n" +"en tu usuario y nombre de host. Por favor verifica que son correctos.\n" +"Tu puedes suprimir este mensaje configurandolos de forma explicita. Ejecuta " +"el \n" +"siguiente comando y sigue las instrucciones de tu editor\n" +" para modificar tu archivo de configuracion:\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 automaticamente basados\n" +"en tu usuario y nombre de host. Por favor verifica que son correctos.\n" +"Tu puedes suprimir este mensaje configurandolos de forma explicita: \n" +"\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 +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" +"remove the commit entirely with \"git reset HEAD^\".\n" +msgstr "" +"Has solicitado un amend en tu commit mas reciente, pero hacerlo lo \n" +"vaciaria. Puedes repetir el commando con --alow-empty, o puedes remover \n" +"el commit completamente con \"git reset HEAD^\".\n" + +#: builtin/commit.c:79 +msgid "" +"The previous cherry-pick is now empty, possibly due to conflict resolution.\n" +"If you wish to commit it anyway, use:\n" +"\n" +" git commit --allow-empty\n" +"\n" +msgstr "" +"El cherry-pick anterior ahora esta vacio, posiblemente por un conflicto de " +"resolucion.\n" +"Si desea realizar un commit de todas maneras, use:\n" +"\n" +" git commit --allow-empty\n" +"\n" + +#: builtin/commit.c:86 +msgid "Otherwise, please use 'git reset'\n" +msgstr "Caso contrario, por favor usa 'git reset'\n" + +#: builtin/commit.c:89 +msgid "" +"If you wish to skip this commit, use:\n" +"\n" +" git reset\n" +"\n" +"Then \"git cherry-pick --continue\" will resume cherry-picking\n" +"the remaining commits.\n" +msgstr "" +"Si quiere saltar este commit, use:\n" +"\n" +" git reset\n" +"\n" +"Luego \"git cherry-pick --continue\" continuara el cherry-picking\n" +"para los commits restantes.\n" + +#: builtin/commit.c:318 +msgid "failed to unpack HEAD tree object" +msgstr "fallo al desempaquetar objeto del árbol HEAD" + +#: builtin/commit.c:359 +msgid "unable to create temporary index" +msgstr "no es posible crear un indice temporal" + +#: builtin/commit.c:365 +msgid "interactive add failed" +msgstr "adicion interactiva fallida" + +#: builtin/commit.c:378 +msgid "unable to update temporary index" +msgstr "no es posible actualizar el indice temporal" + +#: builtin/commit.c:380 +msgid "Failed to update main cache tree" +msgstr "Fallo al actualizar el cache principal del arbol" + +#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478 +msgid "unable to write new_index file" +msgstr "no es posible escribir archiv new_index" + +#: builtin/commit.c:461 +msgid "cannot do a partial commit during a merge." +msgstr "no se puede realizar un commit parcial durante una fusion." + +#: builtin/commit.c:463 +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 +msgid "cannot read the index" +msgstr "no se puede leer el indice." + +#: builtin/commit.c:490 +msgid "unable to write temporary index file" +msgstr "no es posible escribir el indice temporal " + +#: builtin/commit.c:587 +#, c-format +msgid "commit '%s' lacks author header" +msgstr "falta header de autor al commit '%s'" + +#: builtin/commit.c:589 +#, c-format +msgid "commit '%s' has malformed author line" +msgstr "el commit '%s' tiene una linea de autor mal formada" + +#: builtin/commit.c:608 +msgid "malformed --author parameter" +msgstr "parametro --author mal formado" + +#: builtin/commit.c:660 +msgid "" +"unable to select a comment character that is not used\n" +"in the current commit message" +msgstr "" +"no es posible seleccionar un caracter de comentario que no es usado\n" +"en el mensaje de commit actual" + +#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1100 +#, c-format +msgid "could not lookup commit %s" +msgstr "no se pudo revisar el commit %s" + +#: builtin/commit.c:709 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 +msgid "could not read log from standard input" +msgstr "no se pudo leer log desde standard input" + +#: builtin/commit.c:715 +#, 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 +msgid "could not read SQUASH_MSG" +msgstr "no se pudo leer SQUASH_MSG" + +#: builtin/commit.c:747 +msgid "could not read MERGE_MSG" +msgstr "no se pudo leer MERGE_MSG" + +#: builtin/commit.c:801 +msgid "could not write commit template" +msgstr "no se pudo escribit el template del commit" + +#: builtin/commit.c:819 +#, c-format +msgid "" +"\n" +"It looks like you may be committing a merge.\n" +"If this is not correct, please remove the file\n" +"\t%s\n" +"and try again.\n" +msgstr "" +"\n" +"Parece que estas haciendo un commit con una fusion dentro.\n" +"Si esto no es correcto, por favor remueve el archivo\n" +"\t%s\n" +"y vuelve a intentar.\n" + +#: builtin/commit.c:824 +#, c-format +msgid "" +"\n" +"It looks like you may be committing a cherry-pick.\n" +"If this is not correct, please remove the file\n" +"\t%s\n" +"and try again.\n" +msgstr "" +"\n" +"Parece que puede estar haciendo un commit a un cherry-pick.\n" +"Si esto no es correcto, por favor elimine el archivo\n" +"\t%s\n" +"y vuelva a intentar.\n" + +#: builtin/commit.c:837 +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be ignored, and an empty message aborts the commit.\n" +msgstr "" +"Por favor ingrese el mensaje del commit para sus cambios. Las líneas que " +"comiencen\n" +"con '%c' serán ignoradas, y un mensaje vacío aborta el commit.\n" + +#: builtin/commit.c:844 +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be kept; you may remove them yourself if you want to.\n" +"An empty message aborts the commit.\n" +msgstr "" +"Por favor ingrese el mensaje del commit para sus cambios. Las líneas que " +"comiencen\n" +"con '%c' serán guardadas; puede removerlas usted mismo si desea.\n" +"Un mensaje vacío aborta el commit.\n" + +#: builtin/commit.c:861 +#, c-format +msgid "%sAuthor: %.*s <%.*s>" +msgstr "%sAutor: %.*s <%.*s>" + +#: builtin/commit.c:869 +#, c-format +msgid "%sDate: %s" +msgstr "%sFecha: %s" + +#: builtin/commit.c:876 +#, c-format +msgid "%sCommitter: %.*s <%.*s>" +msgstr "%sCommitter: %.*s <%.*s>" + +#: builtin/commit.c:893 +msgid "Cannot read index" +msgstr "No se puede leer el índice" + +#: builtin/commit.c:958 +msgid "Error building trees" +msgstr "Error al construir los árboles" + +#: builtin/commit.c:972 builtin/tag.c:252 +#, c-format +msgid "Please supply the message using either -m or -F option.\n" +msgstr "Por favor suministra el mensaje usando las opciones -m o -F.\n" + +#: builtin/commit.c:1075 +#, c-format +msgid "--author '%s' is not 'Name <email>' and matches no existing author" +msgstr "" +"--author '%s' no está en el formato 'Name <email>' y no concuerda con ningún " +"autor existente" + +#: builtin/commit.c:1090 builtin/commit.c:1335 +#, c-format +msgid "Invalid untracked files mode '%s'" +msgstr "Modo inválido de los archivos no rastreados '%s'" + +#: builtin/commit.c:1128 +msgid "--long and -z are incompatible" +msgstr "--long y -z son incompatibles" + +#: builtin/commit.c:1158 +msgid "Using both --reset-author and --author does not make sense" +msgstr "Usar ambos --reset-author y --author no tiene sentido" + +#: builtin/commit.c:1167 +msgid "You have nothing to amend." +msgstr "No tienes nada que enmendar." + +#: builtin/commit.c:1170 +msgid "You are in the middle of a merge -- cannot amend." +msgstr "Estás en medio de una fusión -- no puedes enmendar." + +#: builtin/commit.c:1172 +msgid "You are in the middle of a cherry-pick -- cannot amend." +msgstr "Está en medio de un cherry-pick -- no se puede enmendar." + +#: builtin/commit.c:1175 +msgid "Options --squash and --fixup cannot be used together" +msgstr "Opciones --squash y --fixup no pueden ser usadas juntas" + +#: builtin/commit.c:1185 +msgid "Only one of -c/-C/-F/--fixup can be used." +msgstr "Solo uno de -c/-C/-F/--fixup puede ser usardo." + +#: builtin/commit.c:1187 +msgid "Option -m cannot be combined with -c/-C/-F/--fixup." +msgstr "La opción -m no puede ser combinada con -c/-C/-F/--fixup." + +#: builtin/commit.c:1195 +msgid "--reset-author can be used only with -C, -c or --amend." +msgstr "--reset-author sólo puede ser usada con -C, -c o --amend." + +#: builtin/commit.c:1212 +msgid "Only one of --include/--only/--all/--interactive/--patch can be used." +msgstr "" +"Solo uno de --include/--only/--all/--interactive/--patch puede ser usado." + +#: builtin/commit.c:1214 +msgid "No paths with --include/--only does not make sense." +msgstr "No hay rutas con --include/--only no tiene sentido." + +#: builtin/commit.c:1226 builtin/tag.c:535 +#, c-format +msgid "Invalid cleanup mode %s" +msgstr "Modo cleanup invalido %s" + +#: builtin/commit.c:1231 +msgid "Paths with -a does not make sense." +msgstr "Rutas con -a no tiene sentido." + +#: builtin/commit.c:1349 builtin/commit.c:1626 +msgid "show status concisely" +msgstr "mostrar status de manera concisa" + +#: builtin/commit.c:1351 builtin/commit.c:1628 +msgid "show branch information" +msgstr "mostrar informacion de la rama" + +#: builtin/commit.c:1353 +msgid "show stash information" +msgstr "mostrar informacion del stash" + +#: builtin/commit.c:1355 +msgid "version" +msgstr "version" + +#: builtin/commit.c:1355 builtin/commit.c:1630 builtin/push.c:530 +#: builtin/worktree.c:469 +msgid "machine-readable output" +msgstr "output formato-maquina" + +#: builtin/commit.c:1358 builtin/commit.c:1632 +msgid "show status in long format (default)" +msgstr "mostrar status en formato largo (default)" + +#: builtin/commit.c:1361 builtin/commit.c:1635 +msgid "terminate entries with NUL" +msgstr "terminar entradas con NUL" + +#: builtin/commit.c:1363 builtin/commit.c:1638 builtin/fast-export.c:999 +#: builtin/fast-export.c:1002 builtin/tag.c:390 +msgid "mode" +msgstr "modo" + +#: builtin/commit.c:1364 builtin/commit.c:1638 +msgid "show untracked files, optional modes: all, normal, no. (Default: all)" +msgstr "" +"mostrar archivos sin seguimiento, modos opcionales: all, normal, no. " +"(Predeterminado: all)" + +#: builtin/commit.c:1367 +msgid "show ignored files" +msgstr "mostrar archivos ignorados" + +#: builtin/commit.c:1368 parse-options.h:155 +msgid "when" +msgstr "cuando" + +#: builtin/commit.c:1369 +msgid "" +"ignore changes to submodules, optional when: all, dirty, untracked. " +"(Default: all)" +msgstr "" +"ignorar cambios en submodulos, opcional cuando: all,dirty,untracked. " +"(Default: all)" + +#: builtin/commit.c:1371 +msgid "list untracked files in columns" +msgstr "listar en columnas los archivos sin seguimiento" + +#: builtin/commit.c:1449 +msgid "couldn't look up newly created commit" +msgstr "no se pudo revisar el commit recién creado" + +#: builtin/commit.c:1451 +msgid "could not parse newly created commit" +msgstr "no se pudo analizar el commit recién creado" + +#: builtin/commit.c:1496 +msgid "detached HEAD" +msgstr "HEAD desacoplado" + +#: builtin/commit.c:1499 +msgid " (root-commit)" +msgstr "(commit-raiz)" + +#: builtin/commit.c:1596 +msgid "suppress summary after successful commit" +msgstr "suprime summary tras un commit exitoso" + +#: builtin/commit.c:1597 +msgid "show diff in commit message template" +msgstr "mostrar diff en el template del mensaje de commit" + +#: builtin/commit.c:1599 +msgid "Commit message options" +msgstr "Opciones para el mensaje de la confirmación" + +#: builtin/commit.c:1600 builtin/tag.c:388 +msgid "read message from file" +msgstr "leer mensaje desde un archivo" + +#: builtin/commit.c:1601 +msgid "author" +msgstr "autor" + +#: builtin/commit.c:1601 +msgid "override author for commit" +msgstr "sobrescribe el autor de la confirmación" + +#: builtin/commit.c:1602 builtin/gc.c:359 +msgid "date" +msgstr "fecha" + +#: builtin/commit.c:1602 +msgid "override date for commit" +msgstr "sobrescribe la fecha de la confirmación" + +#: builtin/commit.c:1603 builtin/merge.c:225 builtin/notes.c:402 +#: builtin/notes.c:565 builtin/tag.c:386 +msgid "message" +msgstr "mensaje" + +#: builtin/commit.c:1603 +msgid "commit message" +msgstr "mensaje de la confirmación" + +#: builtin/commit.c:1604 builtin/commit.c:1605 builtin/commit.c:1606 +#: builtin/commit.c:1607 parse-options.h:257 ref-filter.h:92 +msgid "commit" +msgstr "confirmar" + +#: builtin/commit.c:1604 +msgid "reuse and edit message from specified commit" +msgstr "reusar y editar el mensaje de un commit especifico" + +#: builtin/commit.c:1605 +msgid "reuse message from specified commit" +msgstr "reusar el mensaje de un commit especifico" + +#: builtin/commit.c:1606 +msgid "use autosquash formatted message to fixup specified commit" +msgstr "" +"usar mensaje de formato autosquash para arreglar el commit especificado" + +#: builtin/commit.c:1607 +msgid "use autosquash formatted message to squash specified commit" +msgstr "" +"usar el mensaje de formato autosquash para realizar squash al commit " +"especificado" + +#: builtin/commit.c:1608 +msgid "the commit is authored by me now (used with -C/-c/--amend)" +msgstr "el autor del commit soy yo ahora (usado con -C/-c/--amend)" + +#: builtin/commit.c:1609 builtin/log.c:1436 builtin/merge.c:239 +#: builtin/revert.c:105 +msgid "add Signed-off-by:" +msgstr "agregar Signed-off-by: (firmado por)" + +#: builtin/commit.c:1610 +msgid "use specified template file" +msgstr "usar archivo template especificado" + +#: builtin/commit.c:1611 +msgid "force edit of commit" +msgstr "forzar la edición de la confirmación" + +#: builtin/commit.c:1612 +msgid "default" +msgstr "default" + +#: builtin/commit.c:1612 builtin/tag.c:391 +msgid "how to strip spaces and #comments from message" +msgstr "cómo quitar espacios y #comentarios de mensajes" + +#: builtin/commit.c:1613 +msgid "include status in commit message template" +msgstr "incluir status en el template del mensaje de commit" + +#: builtin/commit.c:1615 builtin/merge.c:237 builtin/pull.c:173 +#: builtin/revert.c:113 +msgid "GPG sign commit" +msgstr "firmar confirmación con GPG" + +#: builtin/commit.c:1618 +msgid "Commit contents options" +msgstr "Opciones para el contenido de la confirmación" + +#: builtin/commit.c:1619 +msgid "commit all changed files" +msgstr "confirmar todos los archivos cambiados" + +#: builtin/commit.c:1620 +msgid "add specified files to index for commit" +msgstr "agregar archivos específicos al índice para confirmar" + +#: builtin/commit.c:1621 +msgid "interactively add files" +msgstr "agregar archivos interactivamente" + +#: builtin/commit.c:1622 +msgid "interactively add changes" +msgstr "agregar cambios interactivamente" + +#: builtin/commit.c:1623 +msgid "commit only specified files" +msgstr "sólo confirmar archivos específicos" + +#: builtin/commit.c:1624 +msgid "bypass pre-commit and commit-msg hooks" +msgstr "" +"evitar los capturadores (hooks) de pre-confirmación (pre-commit) y mensaje " +"de confirmación (commit-msg)" + +#: builtin/commit.c:1625 +msgid "show what would be committed" +msgstr "mostrar lo que sería confirmado" + +#: builtin/commit.c:1636 +msgid "amend previous commit" +msgstr "enmendar confirmación previa" + +#: builtin/commit.c:1637 +msgid "bypass post-rewrite hook" +msgstr "gancho bypass post reescritura" + +#: builtin/commit.c:1642 +msgid "ok to record an empty change" +msgstr "ok al grabar un cambio vacio" + +#: builtin/commit.c:1644 +msgid "ok to record a change with an empty message" +msgstr "ok al grabar un cambio con un mensaje vacio" + +#: builtin/commit.c:1674 +msgid "could not parse HEAD commit" +msgstr "no se pudo analizar el commit de HEAD" + +#: builtin/commit.c:1719 +#, c-format +msgid "Corrupt MERGE_HEAD file (%s)" +msgstr "Archivo MERGE_HEAD (%s) corrupto" + +#: builtin/commit.c:1726 +msgid "could not read MERGE_MODE" +msgstr "no se pudo leer MERGE_MODE" + +#: builtin/commit.c:1745 +#, c-format +msgid "could not read commit message: %s" +msgstr "no se pudo leer el mensaje de commit: %s" + +#: builtin/commit.c:1756 +#, c-format +msgid "Aborting commit due to empty commit message.\n" +msgstr "Abortando confirmación debido que el mensaje está en blanco.\n" + +#: builtin/commit.c:1761 +#, c-format +msgid "Aborting commit; you did not edit the message.\n" +msgstr "Abortando commit; no se ha editado el mensaje\n" + +#: builtin/commit.c:1809 +msgid "" +"Repository has been updated, but unable to write\n" +"new_index file. Check that disk is not full and quota is\n" +"not exceeded, and then \"git reset HEAD\" to recover." +msgstr "" +"El repositorio ha sido actualizado, pero no se pudo escribir el archivo\n" +"new_index. Verifique que el disco no este lleno y la quota no ha\n" +"sido superada, y luego \"git reset HEAD\" para recuperar." + +#: builtin/config.c:10 +msgid "git config [<options>]" +msgstr "git config [<opciones>]" + +#: builtin/config.c:57 +msgid "Config file location" +msgstr "ubicacion del archivo config" + +#: builtin/config.c:58 +msgid "use global config file" +msgstr "usar archivo de config global" + +#: builtin/config.c:59 +msgid "use system config file" +msgstr "usar archivo de config del sistema" + +#: builtin/config.c:60 +msgid "use repository config file" +msgstr "usar archivo de config del repositorio" + +#: builtin/config.c:61 +msgid "use given config file" +msgstr "usar archivo config especificado" + +#: builtin/config.c:62 +msgid "blob-id" +msgstr "blob-id" + +#: builtin/config.c:62 +msgid "read config from given blob object" +msgstr "leer config del objeto blob suministrado" + +#: builtin/config.c:63 +msgid "Action" +msgstr "Accion" + +#: builtin/config.c:64 +msgid "get value: name [value-regex]" +msgstr "obtener valor: nombre [valor-regex]" + +#: builtin/config.c:65 +msgid "get all values: key [value-regex]" +msgstr "obtener todos los valores: llave [valores-regex]" + +#: builtin/config.c:66 +msgid "get values for regexp: name-regex [value-regex]" +msgstr "obtener valores para una regexp: nombre-regex [valor-regex]" + +#: builtin/config.c:67 +msgid "get value specific for the URL: section[.var] URL" +msgstr "obtener valor especifico para el URL: seccion[.var] URL" + +#: builtin/config.c:68 +msgid "replace all matching variables: name value [value_regex]" +msgstr "" +"remplazar todas las variables que concuerden: nombre valor [valor_regex]" + +#: builtin/config.c:69 +msgid "add a new variable: name value" +msgstr "agregar nueva variable: nombre valor " + +#: builtin/config.c:70 +msgid "remove a variable: name [value-regex]" +msgstr "borrar una variable. nombre [valor-regex]" + +#: builtin/config.c:71 +msgid "remove all matches: name [value-regex]" +msgstr "borrar todas las concurrencias: nombre [valor-regex]" + +#: builtin/config.c:72 +msgid "rename section: old-name new-name" +msgstr "renombrar seccion: nombre-viejo nombre-nuevo" + +#: builtin/config.c:73 +msgid "remove a section: name" +msgstr "borrar una seccion: nombre" + +#: builtin/config.c:74 +msgid "list all" +msgstr "listar todo" + +#: builtin/config.c:75 +msgid "open an editor" +msgstr "abrir el editor" + +#: builtin/config.c:76 +msgid "find the color configured: slot [default]" +msgstr "encontrar el color configurado: slot [default]" + +#: builtin/config.c:77 +msgid "find the color setting: slot [stdout-is-tty]" +msgstr "encontrar las opciones del color: slot [stdout-es-tty]" + +#: builtin/config.c:78 +msgid "Type" +msgstr "Tipo" + +#: builtin/config.c:79 +msgid "value is \"true\" or \"false\"" +msgstr "valor es \"true\" o \"false\"" + +#: builtin/config.c:80 +msgid "value is decimal number" +msgstr "valor es un numero decimal" + +#: builtin/config.c:81 +msgid "value is --bool or --int" +msgstr "valor es --bool o --int" + +#: builtin/config.c:82 +msgid "value is a path (file or directory name)" +msgstr "valor es una ruta (archivo o nombre de directorio)" + +#: builtin/config.c:83 +msgid "Other" +msgstr "Otro" + +#: builtin/config.c:84 +msgid "terminate values with NUL byte" +msgstr "Terminar valores con un byte NUL" + +#: builtin/config.c:85 +msgid "show variable names only" +msgstr "mostrar solo nombres de variables" + +#: builtin/config.c:86 +msgid "respect include directives on lookup" +msgstr "respetar directivas include en la busqueda" + +#: builtin/config.c:87 +msgid "show origin of config (file, standard input, blob, command line)" +msgstr "mostrar el origen de configuracion (archivo, stdin, blob, comando)" + +#: builtin/config.c:327 +msgid "unable to parse default color value" +msgstr "no es posible analizar el valor default de color " + +#: builtin/config.c:471 +#, c-format +msgid "" +"# This is Git's per-user configuration file.\n" +"[user]\n" +"# Please adapt and uncomment the following lines:\n" +"#\tname = %s\n" +"#\temail = %s\n" +msgstr "" +"# Este es el archivo de configuración de Git por usuario.\n" +"[user]\n" +"# Por favor, adapta y descomenta las siguientes líneas:\n" +"#\tname = %s\n" +"#\temail = %s\n" + +#: builtin/config.c:499 +msgid "--local can only be used inside a git repository" +msgstr "--local solo puedo ser usado dentro de un repositorio" + +#: builtin/config.c:624 +#, c-format +msgid "cannot create configuration file %s" +msgstr "no se puede crear el archivo de configuración %s" + +#: builtin/config.c:637 +#, c-format +msgid "" +"cannot overwrite multiple values with a single value\n" +" Use a regexp, --add or --replace-all to change %s." +msgstr "" +"no se puede sobrescribir múltiples valores con un único valor\n" +"\tUse una regexp, --add o --replace-all para cambiar %s." + +#: builtin/count-objects.c:88 +msgid "git count-objects [-v] [-H | --human-readable]" +msgstr "git count-objects [-v] [-H | --human-readable]" + +#: builtin/count-objects.c:98 +msgid "print sizes in human readable format" +msgstr "mostrar tamaños en formato legible para humano" + +#: builtin/describe.c:19 +msgid "git describe [<options>] [<commit-ish>...]" +msgstr "git describe [<opciones>] [<commit-ish>...]" + +#: builtin/describe.c:20 +msgid "git describe [<options>] --dirty" +msgstr "git describe [<opciones>] --dirty" + +#: builtin/describe.c:54 +msgid "head" +msgstr "head" + +#: builtin/describe.c:54 +msgid "lightweight" +msgstr "ligero" + +#: builtin/describe.c:54 +msgid "annotated" +msgstr "anotado" + +#: builtin/describe.c:264 +#, c-format +msgid "annotated tag %s not available" +msgstr "tag anotado %s no disponible" + +#: builtin/describe.c:268 +#, c-format +msgid "annotated tag %s has no embedded name" +msgstr "tag anotado %s no tiene nombre embebido " + +#: builtin/describe.c:270 +#, c-format +msgid "tag '%s' is really '%s' here" +msgstr "tag '%s' es realmente '%s' aquí" + +#: builtin/describe.c:297 builtin/log.c:493 +#, c-format +msgid "Not a valid object name %s" +msgstr "Nombre de objeto %s no válido" + +#: builtin/describe.c:300 +#, c-format +msgid "%s is not a valid '%s' object" +msgstr "%s no es un objeto '%s' válido" + +#: builtin/describe.c:317 +#, c-format +msgid "no tag exactly matches '%s'" +msgstr "no hay tag que concuerde exactamente con '%s'" + +#: builtin/describe.c:319 +#, c-format +msgid "searching to describe %s\n" +msgstr "buscanado para describir %s\n" + +#: builtin/describe.c:366 +#, c-format +msgid "finished search at %s\n" +msgstr "busqueda finalizada a las %s\n" + +#: builtin/describe.c:393 +#, c-format +msgid "" +"No annotated tags can describe '%s'.\n" +"However, there were unannotated tags: try --tags." +msgstr "" +"No hay tags anotados que puedan describir '%s'.\n" +"Sin embargo, hubieron tags no anotados: intente --tags." + +#: builtin/describe.c:397 +#, c-format +msgid "" +"No tags can describe '%s'.\n" +"Try --always, or create some tags." +msgstr "" +"Ningún tag puede describit '%s'.\n" +"Intente --always, o cree algunos tags." + +#: builtin/describe.c:427 +#, c-format +msgid "traversed %lu commits\n" +msgstr "%lu commits cruzados\n" + +#: builtin/describe.c:430 +#, c-format +msgid "" +"more than %i tags found; listed %i most recent\n" +"gave up search at %s\n" +msgstr "" +"se encontró más de %i tags; se mostró %i más reciente\n" +"fin de la búsqueda en %s\n" + +#: builtin/describe.c:452 +msgid "find the tag that comes after the commit" +msgstr "encontrar el tag que viene después del commit" + +#: builtin/describe.c:453 +msgid "debug search strategy on stderr" +msgstr "hacer debug a la estrategia de búsqueda en stderr" + +#: builtin/describe.c:454 +msgid "use any ref" +msgstr "use cualquier ref" + +#: builtin/describe.c:455 +msgid "use any tag, even unannotated" +msgstr "use cualquier tag, incluso los no anotados" + +#: builtin/describe.c:456 +msgid "always use long format" +msgstr "siempre usar formato largo" + +#: builtin/describe.c:457 +msgid "only follow first parent" +msgstr "solo seguir el primer patrón" + +#: builtin/describe.c:460 +msgid "only output exact matches" +msgstr "solo mostrar concordancias exactas" + +#: builtin/describe.c:462 +msgid "consider <n> most recent tags (default: 10)" +msgstr "considerar <n> tags más recientes (default:10)" + +#: builtin/describe.c:464 +msgid "only consider tags matching <pattern>" +msgstr "solo considerar tags que concuerden con <patrón>" + +#: builtin/describe.c:466 +msgid "do not consider tags matching <pattern>" +msgstr "no considerar tags que concuerden con <patrón>" + +#: builtin/describe.c:468 builtin/name-rev.c:406 +msgid "show abbreviated commit object as fallback" +msgstr "mostrar el objeto commit abreviado como fallback" + +#: builtin/describe.c:469 builtin/describe.c:472 +msgid "mark" +msgstr "marca" + +#: builtin/describe.c:470 +msgid "append <mark> on dirty working tree (default: \"-dirty\")" +msgstr "adjuntar <marca> en el árbol de trabajo sucio (default: \"-dirty\")" + +#: builtin/describe.c:473 +msgid "append <mark> on broken working tree (default: \"-broken\")" +msgstr "adjuntar <marca> en un árbol de trbajo roto (default: \"-broken\")" + +#: builtin/describe.c:491 +msgid "--long is incompatible with --abbrev=0" +msgstr "--long es incompatible con --abbrev=0" + +#: builtin/describe.c:520 +msgid "No names found, cannot describe anything." +msgstr "No se encontraron nombres, no se puede describir nada." + +#: builtin/describe.c:563 +msgid "--dirty is incompatible with commit-ishes" +msgstr "--dirty es imcompatible con commit-ismos" + +#: builtin/describe.c:565 +msgid "--broken is incompatible with commit-ishes" +msgstr "--broken es incompatible con commit-ismos" + +#: builtin/diff.c:83 +#, c-format +msgid "'%s': not a regular file or symlink" +msgstr "'%s': no es un archivo regular o un enlace simbólico" + +#: builtin/diff.c:235 +#, c-format +msgid "invalid option: %s" +msgstr "opción inválida: %s" + +#: builtin/diff.c:357 +msgid "Not a git repository" +msgstr "No es un repositorio git" + +#: builtin/diff.c:400 +#, c-format +msgid "invalid object '%s' given." +msgstr "objeto '%s' entregado no es válido" + +#: builtin/diff.c:409 +#, c-format +msgid "more than two blobs given: '%s'" +msgstr "más de dos blobs entregados: '%s'" + +#: builtin/diff.c:414 +#, c-format +msgid "unhandled object '%s' given." +msgstr "objeto no manejado '%s' entregado." + +#: builtin/difftool.c:29 +msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" +msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]" + +#: builtin/difftool.c:259 +#, c-format +msgid "failed: %d" +msgstr "falló: %d" + +#: builtin/difftool.c:301 +#, c-format +msgid "could not read symlink %s" +msgstr "no se pudo leer el symlink %s" + +#: builtin/difftool.c:303 +#, c-format +msgid "could not read symlink file %s" +msgstr "no se pudo leer el archivo symlink %s" + +#: builtin/difftool.c:311 +#, c-format +msgid "could not read object %s for symlink %s" +msgstr "no se pudo leer el objeto %s para el symlink %s" + +#: builtin/difftool.c:412 +msgid "" +"combined diff formats('-c' and '--cc') are not supported in\n" +"directory diff mode('-d' and '--dir-diff')." +msgstr "" +"formatos combinados de diff ('-c' y '--cc') no soportados en\n" +"modo diff para directorio('-d' y '--dir-diff')." + +#: builtin/difftool.c:633 +#, c-format +msgid "both files modified: '%s' and '%s'." +msgstr "ambos archivos modificados: '%s' y '%s'." + +#: builtin/difftool.c:635 +msgid "working tree file has been left." +msgstr "archivo del árbol de trabajo ha sido dejado." + +#: builtin/difftool.c:646 +#, c-format +msgid "temporary files exist in '%s'." +msgstr "archivo temporal existe en '%s'." + +#: builtin/difftool.c:647 +msgid "you may want to cleanup or recover these." +msgstr "tal vez desee limpiar o recuperar estos." + +#: builtin/difftool.c:696 +msgid "use `diff.guitool` instead of `diff.tool`" +msgstr "use `diff.guitool` en lugar de `diff.tool`" + +#: builtin/difftool.c:698 +msgid "perform a full-directory diff" +msgstr "realizar un diff de todo el directorio" + +#: builtin/difftool.c:700 +msgid "do not prompt before launching a diff tool" +msgstr "no mostrar antes de lanzar una herramienta de diff" + +#: builtin/difftool.c:706 +msgid "use symlinks in dir-diff mode" +msgstr "usar symlinks en modo dir-diff" + +#: builtin/difftool.c:707 +msgid "<tool>" +msgstr "<herramienta>" + +#: builtin/difftool.c:708 +msgid "use the specified diff tool" +msgstr "usar la herramienta de diff especificada" + +#: builtin/difftool.c:710 +msgid "print a list of diff tools that may be used with `--tool`" +msgstr "" +"mostrar una lista de herramientas de diff que pueden ser usadas con `--tool`" + +#: builtin/difftool.c:713 +msgid "" +"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " +"code" +msgstr "" +"hacer que 'git-difftool' salga cuando una herramienta de diff retorne un " +"código de salida distinto de cero" + +#: builtin/difftool.c:715 +msgid "<command>" +msgstr "<comando>" + +#: builtin/difftool.c:716 +msgid "specify a custom command for viewing diffs" +msgstr "especificar un comando personalizado para ver diffs" + +#: builtin/difftool.c:740 +msgid "no <tool> given for --tool=<tool>" +msgstr "no se ha entragado <herramienta> para --tool=<herramienta>" + +#: builtin/difftool.c:747 +msgid "no <cmd> given for --extcmd=<cmd>" +msgstr "no se ha entregado <comando> para --extcmd=<comando>" + +#: builtin/fast-export.c:26 +msgid "git fast-export [rev-list-opts]" +msgstr "git fast-export [rev-list-opts]" + +#: builtin/fast-export.c:998 +msgid "show progress after <n> objects" +msgstr "mostrar progreso después de <n> objetos" + +#: builtin/fast-export.c:1000 +msgid "select handling of signed tags" +msgstr "seleccionar el manejo de tags firmados" + +#: builtin/fast-export.c:1003 +msgid "select handling of tags that tag filtered objects" +msgstr "seleccionar el manejo de tags que son tags de objetos filtrados" + +#: builtin/fast-export.c:1006 +msgid "Dump marks to this file" +msgstr "Volcar marcas a este archivo" + +#: builtin/fast-export.c:1008 +msgid "Import marks from this file" +msgstr "Importar marcas de este archivo" + +#: builtin/fast-export.c:1010 +msgid "Fake a tagger when tags lack one" +msgstr "Falsificar un tagger cuando les falta uno" + +#: builtin/fast-export.c:1012 +msgid "Output full tree for each commit" +msgstr "Mostrar todo el árbol para cada commit" + +#: builtin/fast-export.c:1014 +msgid "Use the done feature to terminate the stream" +msgstr "Use el feature done para terminar el stream" + +#: builtin/fast-export.c:1015 +msgid "Skip output of blob data" +msgstr "Saltar el output de data blob" + +#: builtin/fast-export.c:1016 +msgid "refspec" +msgstr "refspec" + +#: builtin/fast-export.c:1017 +msgid "Apply refspec to exported refs" +msgstr "Aplicar refspec para los refs exportados" + +#: builtin/fast-export.c:1018 +msgid "anonymize output" +msgstr "anonimizar la salida" + +#: builtin/fetch.c:23 +msgid "git fetch [<options>] [<repository> [<refspec>...]]" +msgstr "git fetch [<opciones>] [<repositorio> [<refspec>...]]" + +#: builtin/fetch.c:24 +msgid "git fetch [<options>] <group>" +msgstr "git fetch [<opciones>] <grupo>" + +#: builtin/fetch.c:25 +msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" +msgstr "git fetch --multiple [<opciones>] [(<repositorio> | <grupo>)...]" + +#: builtin/fetch.c:26 +msgid "git fetch --all [<options>]" +msgstr "git fetch --all [<opciones>]" + +#: builtin/fetch.c:112 builtin/pull.c:182 +msgid "fetch from all remotes" +msgstr "extraer de todos los remotos" + +#: builtin/fetch.c:114 builtin/pull.c:185 +msgid "append to .git/FETCH_HEAD instead of overwriting" +msgstr "adjuntar a .git/FETCH_HEAD en lugar de sobrescribir" + +#: builtin/fetch.c:116 builtin/pull.c:188 +msgid "path to upload pack on remote end" +msgstr "ruta para cargar el paquete al final del remoto" + +#: builtin/fetch.c:117 builtin/pull.c:190 +msgid "force overwrite of local branch" +msgstr "forzar sobrescritura de la rama local" + +#: builtin/fetch.c:119 +msgid "fetch from multiple remotes" +msgstr "extraer de múltiples remotos" + +#: builtin/fetch.c:121 builtin/pull.c:192 +msgid "fetch all tags and associated objects" +msgstr "extraer todos los tags y objetos asociados" + +#: builtin/fetch.c:123 +msgid "do not fetch all tags (--no-tags)" +msgstr "no extraer todos los tags (--no-tags)" + +#: builtin/fetch.c:125 +msgid "number of submodules fetched in parallel" +msgstr "número de submódulos extraídos en paralelo" + +#: builtin/fetch.c:127 builtin/pull.c:195 +msgid "prune remote-tracking branches no longer on remote" +msgstr "Limpiar ramas remotas rastreadas que ya no están en el remoto" + +#: builtin/fetch.c:128 builtin/fetch.c:151 builtin/pull.c:123 +msgid "on-demand" +msgstr "en demanda" + +#: builtin/fetch.c:129 +msgid "control recursive fetching of submodules" +msgstr "controlar extracción recursiva de submódulos" + +#: builtin/fetch.c:133 builtin/pull.c:203 +msgid "keep downloaded pack" +msgstr "mantener el paquete descargado" + +#: builtin/fetch.c:135 +msgid "allow updating of HEAD ref" +msgstr "permitir actualizar la ref HEAD" + +#: builtin/fetch.c:138 builtin/fetch.c:144 builtin/pull.c:206 +msgid "deepen history of shallow clone" +msgstr "historia profunda de un clon superficial" + +#: builtin/fetch.c:140 +msgid "deepen history of shallow repository based on time" +msgstr "historia profunda de un repositorio superficial basado en tiempo" + +#: builtin/fetch.c:146 builtin/pull.c:209 +msgid "convert to a complete repository" +msgstr "convertir a un repositorio completo" + +#: builtin/fetch.c:148 builtin/log.c:1456 +msgid "dir" +msgstr "dir" + +#: builtin/fetch.c:149 +msgid "prepend this to submodule path output" +msgstr "anteponer esto a salida de la ruta del submódulo " + +#: builtin/fetch.c:152 +msgid "" +"default for recursive fetching of submodules (lower priority than config " +"files)" +msgstr "" +"default para extracción recursiva de submódulos (menor prioridad que " +"archivos de configuración)" + +#: builtin/fetch.c:156 builtin/pull.c:212 +msgid "accept refs that update .git/shallow" +msgstr "aceptar refs que actualicen .git/shallow" + +#: builtin/fetch.c:157 builtin/pull.c:214 +msgid "refmap" +msgstr "refmap" + +#: builtin/fetch.c:158 builtin/pull.c:215 +msgid "specify fetch refmap" +msgstr "especificar extracción de refmap" + +#: builtin/fetch.c:416 +msgid "Couldn't find remote ref HEAD" +msgstr "No se puedo encontrar ref remota HEAD" + +#: builtin/fetch.c:534 +#, c-format +msgid "configuration fetch.output contains invalid value %s" +msgstr "la configuración fetch.output contiene el valor inválido %s" + +#: builtin/fetch.c:627 +#, c-format +msgid "object %s not found" +msgstr "objeto %s no encontrado" + +#: builtin/fetch.c:631 +msgid "[up to date]" +msgstr "[actualizado]" + +#: builtin/fetch.c:644 builtin/fetch.c:724 +msgid "[rejected]" +msgstr "[rechazado]" + +#: builtin/fetch.c:645 +msgid "can't fetch in current branch" +msgstr "no se puede traer en la rama actual" + +#: builtin/fetch.c:654 +msgid "[tag update]" +msgstr "[actualización de etiqueta]" + +#: builtin/fetch.c:655 builtin/fetch.c:688 builtin/fetch.c:704 +#: builtin/fetch.c:719 +msgid "unable to update local ref" +msgstr "no se posible actualizar el ref local" + +#: builtin/fetch.c:674 +msgid "[new tag]" +msgstr "[nueva etiqueta]" + +#: builtin/fetch.c:677 +msgid "[new branch]" +msgstr "[nueva rama]" + +#: builtin/fetch.c:680 +msgid "[new ref]" +msgstr "[nueva referencia]" + +#: builtin/fetch.c:719 +msgid "forced update" +msgstr "actualización forzada" + +#: builtin/fetch.c:724 +msgid "non-fast-forward" +msgstr "avance lento" + +#: builtin/fetch.c:769 +#, c-format +msgid "%s did not send all necessary objects\n" +msgstr "%s no envió todos los objetos necesarios\n" + +#: builtin/fetch.c:789 +#, c-format +msgid "reject %s because shallow roots are not allowed to be updated" +msgstr "rechazado %s porque raíces superficiales no pueden ser actualizadas" + +#: builtin/fetch.c:877 builtin/fetch.c:973 +#, c-format +msgid "From %.*s\n" +msgstr "Desde %.*s\n" + +#: builtin/fetch.c:888 +#, c-format +msgid "" +"some local refs could not be updated; try running\n" +" 'git remote prune %s' to remove any old, conflicting branches" +msgstr "" +"algunos refs locales no pudieron ser actualizados; intente ejecutar\n" +" 'git remote prune %s' para remover cualquier rama vieja o conflictiva" + +#: builtin/fetch.c:943 +#, c-format +msgid " (%s will become dangling)" +msgstr " (%s se pondrá colgado)" + +#: builtin/fetch.c:944 +#, c-format +msgid " (%s has become dangling)" +msgstr " (%s se ha colgado)" + +#: builtin/fetch.c:976 +msgid "[deleted]" +msgstr "[eliminado]" + +#: builtin/fetch.c:977 builtin/remote.c:1024 +msgid "(none)" +msgstr "(nada)" + +#: builtin/fetch.c:1000 +#, c-format +msgid "Refusing to fetch into current branch %s of non-bare repository" +msgstr "Rehusando extraer en la rama actual %s de un repositorio no vacío" + +#: builtin/fetch.c:1019 +#, c-format +msgid "Option \"%s\" value \"%s\" is not valid for %s" +msgstr "Opción \"%s\" valor \"%s\" no es válido para %s" + +#: builtin/fetch.c:1022 +#, c-format +msgid "Option \"%s\" is ignored for %s\n" +msgstr "Opción \"%s\" es ignorada por %s\n" + +#: builtin/fetch.c:1098 +#, c-format +msgid "Don't know how to fetch from %s" +msgstr "No se sabe como extraer de %s" + +#: builtin/fetch.c:1258 +#, c-format +msgid "Fetching %s\n" +msgstr "Extrayendo %s\n" + +#: builtin/fetch.c:1260 builtin/remote.c:97 +#, c-format +msgid "Could not fetch %s" +msgstr "No se pudo extraer %s" + +#: builtin/fetch.c:1278 +msgid "" +"No remote repository specified. Please, specify either a URL or a\n" +"remote name from which new revisions should be fetched." +msgstr "" +"No hay repositorio remoto especificado. Por favor, especifique un URL o un\n" +"nombre remoto del cual las nuevas revisiones deben ser extraídas." + +#: builtin/fetch.c:1301 +msgid "You need to specify a tag name." +msgstr "Tiene que especificar un nombre de tag." + +#: builtin/fetch.c:1344 +msgid "Negative depth in --deepen is not supported" +msgstr "Profundidad negativa en --deepen no es soportada" + +#: builtin/fetch.c:1346 +msgid "--deepen and --depth are mutually exclusive" +msgstr "--depen y --depth son mutuamente exclusivas" + +#: builtin/fetch.c:1351 +msgid "--depth and --unshallow cannot be used together" +msgstr "--depth y --unshallow no pueden ser usadas juntas" + +#: builtin/fetch.c:1353 +msgid "--unshallow on a complete repository does not make sense" +msgstr "--unshallow no tiene sentido en un repositorio completo" + +#: builtin/fetch.c:1366 +msgid "fetch --all does not take a repository argument" +msgstr "fetch --all no toma un argumento de repositorio" + +#: builtin/fetch.c:1368 +msgid "fetch --all does not make sense with refspecs" +msgstr "fetch --all no tiene sentido con refspecs" + +#: builtin/fetch.c:1379 +#, c-format +msgid "No such remote or remote group: %s" +msgstr "No existe el remoto o grupo remoto: %s" + +#: builtin/fetch.c:1387 +msgid "Fetching a group and specifying refspecs does not make sense" +msgstr "Extraer un grupo y especificar un refspecs no tiene sentido" + +#: builtin/fmt-merge-msg.c:15 +msgid "" +"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" +msgstr "" +"git fmt-merge-msg [-m <mensaje>] [--log[=<n>] | --no-log] [--file <archivo>]" + +#: builtin/fmt-merge-msg.c:665 +msgid "populate log with at most <n> entries from shortlog" +msgstr "poblar el log con máximo <n> entradas del shorlog" + +#: builtin/fmt-merge-msg.c:668 +msgid "alias for --log (deprecated)" +msgstr "alias para --log (deprecado)" + +#: builtin/fmt-merge-msg.c:671 +msgid "text" +msgstr "texto" + +#: builtin/fmt-merge-msg.c:672 +msgid "use <text> as start of message" +msgstr "use <text> como comienzo de mensaje" + +#: builtin/fmt-merge-msg.c:673 +msgid "file to read from" +msgstr "archivo del cual leer" + +#: builtin/for-each-ref.c:10 +msgid "git for-each-ref [<options>] [<pattern>]" +msgstr "git for-each-ref [<opciones>] [<patrón>]" + +#: builtin/for-each-ref.c:11 +msgid "git for-each-ref [--points-at <object>]" +msgstr "git for-each-ref [--points-at <objeto>]" + +#: builtin/for-each-ref.c:12 +msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" +msgstr "git for-each-ref [(--merged | --no-merged) [<commit>]]" + +#: builtin/for-each-ref.c:13 +msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" +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" + +#: builtin/for-each-ref.c:30 +msgid "quote placeholders suitably for 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" + +#: builtin/for-each-ref.c:34 +msgid "quote placeholders suitably for 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 +msgid "respect format colors" +msgstr "respetar el formato de colores" + +#: builtin/for-each-ref.c:43 +msgid "print only refs which points at the given object" +msgstr "mostrar solo refs que apunten al objeto dado" + +#: builtin/for-each-ref.c:45 +msgid "print only refs that are merged" +msgstr "mostrar solo refs que son fusionadas" + +#: builtin/for-each-ref.c:46 +msgid "print only refs that are not merged" +msgstr "mostrar solo refs que no son fusionadas" + +#: builtin/for-each-ref.c:47 +msgid "print only refs which contain the commit" +msgstr "mostrar solo refs que contienen el commit" + +#: builtin/for-each-ref.c:48 +msgid "print only refs which don't contain the commit" +msgstr "mostrar solo refs que no contienen el commit" + +#: builtin/fsck.c:543 +msgid "Checking object directories" +msgstr "Revisando objetos directorios" + +#: builtin/fsck.c:635 +msgid "git fsck [<options>] [<object>...]" +msgstr "git fsck [<opciones>] [<objeto>...]" + +#: builtin/fsck.c:641 +msgid "show unreachable objects" +msgstr "mostrar objetos ilegibles" + +#: builtin/fsck.c:642 +msgid "show dangling objects" +msgstr "mostrar objetos colgados" + +#: builtin/fsck.c:643 +msgid "report tags" +msgstr "reportar tags" + +#: builtin/fsck.c:644 +msgid "report root nodes" +msgstr "reportar nodos raíz" + +#: builtin/fsck.c:645 +msgid "make index objects head nodes" +msgstr "hacer objetos índices cabezas de nodos" + +#: builtin/fsck.c:646 +msgid "make reflogs head nodes (default)" +msgstr "hacer reflogs cabeza de nodos (default)" + +#: builtin/fsck.c:647 +msgid "also consider packs and alternate objects" +msgstr "también considerar paquetes y objetos alternos" + +#: builtin/fsck.c:648 +msgid "check only connectivity" +msgstr "revisar solo connectividad" + +#: builtin/fsck.c:649 +msgid "enable more strict checking" +msgstr "habilitar revisión más estricta" + +#: builtin/fsck.c:651 +msgid "write dangling objects in .git/lost-found" +msgstr "escribir objetos colgados en .git/lost-found" + +#: builtin/fsck.c:652 builtin/prune.c:107 +msgid "show progress" +msgstr "mostrar prograso" + +#: builtin/fsck.c:653 +msgid "show verbose names for reachable objects" +msgstr "mostrar nombres verboso para objetos alcanzables" + +#: builtin/fsck.c:714 +msgid "Checking objects" +msgstr "Revisando objetos" + +#: builtin/gc.c:27 +msgid "git gc [<options>]" +msgstr "git gc [<opciones>]" + +#: builtin/gc.c:80 +#, c-format +msgid "Failed to fstat %s: %s" +msgstr "Falló el fstat %s: %s" + +#: builtin/gc.c:312 +#, c-format +msgid "Can't stat %s" +msgstr "No se puede definir %s" + +#: builtin/gc.c:321 +#, c-format +msgid "" +"The last gc run reported the following. Please correct the root cause\n" +"and remove %s.\n" +"Automatic cleanup will not be performed until the file is removed.\n" +"\n" +"%s" +msgstr "" +"El último gc reportó lo siguiente. Por favor corriga la causa\n" +"y remueva %s.\n" +"Limpieza automática no se realizará hasta que el archivo sea removido.\n" +"\n" +"%s" + +#: builtin/gc.c:360 +msgid "prune unreferenced objects" +msgstr "limpiar objetos no referenciados" + +#: builtin/gc.c:362 +msgid "be more thorough (increased runtime)" +msgstr "ser más exhaustivo (aumentar runtime)" + +#: builtin/gc.c:363 +msgid "enable auto-gc mode" +msgstr "habilitar modo auto-gc" + +#: builtin/gc.c:364 +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 +#, c-format +msgid "Failed to parse gc.logexpiry value %s" +msgstr "Falló al analizar valor %s de gc.logexpirity" + +#: builtin/gc.c:409 +#, 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 +#, c-format +msgid "Auto packing the repository for optimum performance.\n" +msgstr "Auto empaquetado del repositorio para performance óptimo.\n" + +#: builtin/gc.c:412 +#, c-format +msgid "See \"git help gc\" for manual housekeeping.\n" +msgstr "Vea \"git help gc\" para limpieza manual.\n" + +#: builtin/gc.c:437 +#, c-format +msgid "" +"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" +msgstr "" +"gc ya está ejecutándose en la máquina '%s' pid %<PRIuMAX> (use --force so no " +"es así)" + +#: builtin/gc.c:481 +msgid "" +"There are too many unreachable loose objects; run 'git prune' to remove them." +msgstr "" +"Hay muchos objetos sueltos inalcanzables; ejecute 'git prune' para " +"removerlos." + +#: builtin/grep.c:27 +msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" +msgstr "git grep [<opciones>] [-e] <patrón> [<rev>...] [[--] <ruta>...]" + +#: builtin/grep.c:226 +#, c-format +msgid "grep: failed to create thread: %s" +msgstr "grep: falló al crear el hilo: %s" + +#: builtin/grep.c:284 +#, c-format +msgid "invalid number of threads specified (%d) for %s" +msgstr "número inválido de hilos especificado (%d) para %s" + +#. TRANSLATORS: %s is the configuration +#. variable for tweaking threads, currently +#. grep.threads +#. +#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1693 +#, c-format +msgid "no threads support, ignoring %s" +msgstr "no hay soporte para hilos, ignorando %s" + +#: builtin/grep.c:451 builtin/grep.c:571 builtin/grep.c:613 +#, c-format +msgid "unable to read tree (%s)" +msgstr "no es posible leer el árbol (%s)" + +#: builtin/grep.c:628 +#, c-format +msgid "unable to grep from object of type %s" +msgstr "no es posible realizar grep del objeto de tipo %s" + +#: builtin/grep.c:694 +#, c-format +msgid "switch `%c' expects a numerical value" +msgstr "switch `%c' espera un valor numérico" + +#: builtin/grep.c:781 +msgid "search in index instead of in the work tree" +msgstr "buscar en el índice en lugar del árbol de trabajo" + +#: builtin/grep.c:783 +msgid "find in contents not managed by git" +msgstr "encontrar en contenidos no manejados por git" + +#: builtin/grep.c:785 +msgid "search in both tracked and untracked files" +msgstr "buscar en archivos rastreados y no rastreados" + +#: builtin/grep.c:787 +msgid "ignore files specified via '.gitignore'" +msgstr "ingnorar archivos especificados via '.gitignore'" + +#: builtin/grep.c:789 +msgid "recursively search in each submodule" +msgstr "búsqueda recursiva en cada submódulo" + +#: builtin/grep.c:792 +msgid "show non-matching lines" +msgstr "mostrar líneas que no concuerdan" + +#: builtin/grep.c:794 +msgid "case insensitive matching" +msgstr "búsqueda insensible a mayúsculas" + +#: builtin/grep.c:796 +msgid "match patterns only at word boundaries" +msgstr "concordar patrón solo a los límites de las palabras" + +#: builtin/grep.c:798 +msgid "process binary files as text" +msgstr "procesar archivos binarios como texto" + +#: builtin/grep.c:800 +msgid "don't match patterns in binary files" +msgstr "no concordar patrones en archivos binarios" + +#: builtin/grep.c:803 +msgid "process binary files with textconv filters" +msgstr "procesar archivos binarios con filtros textconv " + +#: builtin/grep.c:805 +msgid "descend at most <depth> levels" +msgstr "descender como máximo <valor-de-profundiad> niveles" + +#: builtin/grep.c:809 +msgid "use extended POSIX regular expressions" +msgstr "usar expresiones regulares POSIX extendidas" + +#: builtin/grep.c:812 +msgid "use basic POSIX regular expressions (default)" +msgstr "usar expresiones regulares POSIX (default)" + +#: builtin/grep.c:815 +msgid "interpret patterns as fixed strings" +msgstr "interpretar patrones como strings arreglados" + +#: builtin/grep.c:818 +msgid "use Perl-compatible regular expressions" +msgstr "usar expresiones regulares compatibles con Perl" + +#: builtin/grep.c:821 +msgid "show line numbers" +msgstr "mostrar números de línea" + +#: builtin/grep.c:822 +msgid "don't show filenames" +msgstr "no mostrar nombres de archivo" + +#: builtin/grep.c:823 +msgid "show filenames" +msgstr "mostrar nombres de archivo" + +#: builtin/grep.c:825 +msgid "show filenames relative to top directory" +msgstr "mostrar nombres de archivo relativos al directorio superior" + +#: builtin/grep.c:827 +msgid "show only filenames instead of matching lines" +msgstr "mostrar solo nombres de archivos en lugar de líneas encontradas" + +#: builtin/grep.c:829 +msgid "synonym for --files-with-matches" +msgstr "sinónimo para --files-with-matches" + +#: builtin/grep.c:832 +msgid "show only the names of files without match" +msgstr "mostrar solo los nombres de archivos sin coincidencias" + +#: builtin/grep.c:834 +msgid "print NUL after filenames" +msgstr "imprimir NUL después del nombre de archivo" + +#: builtin/grep.c:836 +msgid "show the number of matches instead of matching lines" +msgstr "Mostrar el número de concordancias en lugar de las líneas concordantes" + +#: builtin/grep.c:837 +msgid "highlight matches" +msgstr "resaltar concordancias" + +#: builtin/grep.c:839 +msgid "print empty line between matches from different files" +msgstr "emprimir una línea vacía entre concordancias de diferentes archivos" + +#: builtin/grep.c:841 +msgid "show filename only once above matches from same file" +msgstr "" +"mostrar el nombre de archivo solo una vez para concordancias en el mismo " +"archivo" + +#: builtin/grep.c:844 +msgid "show <n> context lines before and after matches" +msgstr "mostrar <n> líneas de contexto antes y después de la concordancia" + +#: builtin/grep.c:847 +msgid "show <n> context lines before matches" +msgstr "mostrar <n> líneas de contexto antes de las concordancias" + +#: builtin/grep.c:849 +msgid "show <n> context lines after matches" +msgstr "mostrar <n> líneas de context después de las concordancias" + +#: builtin/grep.c:851 +msgid "use <n> worker threads" +msgstr "usar <n> hilos de trabajo" + +#: builtin/grep.c:852 +msgid "shortcut for -C NUM" +msgstr "atajo para -C NUM" + +#: builtin/grep.c:855 +msgid "show a line with the function name before matches" +msgstr "" +"mostrar una línea con el nombre de la función antes de las concordancias" + +#: builtin/grep.c:857 +msgid "show the surrounding function" +msgstr "mostrar la función circundante" + +#: builtin/grep.c:860 +msgid "read patterns from file" +msgstr "leer patrones del archivo" + +#: builtin/grep.c:862 +msgid "match <pattern>" +msgstr "concordar <patrón>" + +#: builtin/grep.c:864 +msgid "combine patterns specified with -e" +msgstr "combinar patrones especificados con -e" + +#: builtin/grep.c:876 +msgid "indicate hit with exit status without output" +msgstr "indicar concordancia con exit status sin output" + +#: builtin/grep.c:878 +msgid "show only matches from files that match all patterns" +msgstr "" +"mostrar solo concordancias con archivos que concuerdan todos los patrones" + +#: builtin/grep.c:880 +msgid "show parse tree for grep expression" +msgstr "mostrar árbol analizado para la expresión grep" + +#: builtin/grep.c:884 +msgid "pager" +msgstr "paginador" + +#: builtin/grep.c:884 +msgid "show matching files in the pager" +msgstr "mostrar archivos concordantes en el paginador" + +#: builtin/grep.c:887 +msgid "allow calling of grep(1) (ignored by this build)" +msgstr "permitir el llamado de grep(1) (ignorado por esta build)" + +#: builtin/grep.c:950 +msgid "no pattern given." +msgstr "no se ha entregado patrón" + +#: builtin/grep.c:982 +msgid "--no-index or --untracked cannot be used with revs" +msgstr "--no-index o --untracked no se puede usar con revs" + +#: builtin/grep.c:989 +#, c-format +msgid "unable to resolve revision: %s" +msgstr "no se posible resolver revisión: %s" + +#: builtin/grep.c:1023 builtin/index-pack.c:1491 +#, c-format +msgid "invalid number of threads specified (%d)" +msgstr "número inválido de hilos especificado (%d)" + +#: builtin/grep.c:1028 +msgid "no threads support, ignoring --threads" +msgstr "no se soportan hilos, ignorando --threads" + +#: builtin/grep.c:1052 +msgid "--open-files-in-pager only works on the worktree" +msgstr "--open-files-in-pager solo funciona en el árbol de trabajo" + +#: builtin/grep.c:1075 +msgid "option not supported with --recurse-submodules." +msgstr "opción no soportada con --recurse-submodules." + +#: builtin/grep.c:1081 +msgid "--cached or --untracked cannot be used with --no-index." +msgstr "--cached o --untracked no pueden ser usadas con --no-index." + +#: builtin/grep.c:1087 +msgid "--[no-]exclude-standard cannot be used for tracked contents." +msgstr "--[no-]exclude-standard no puede ser usada para contenido rastreado." + +#: builtin/grep.c:1095 +msgid "both --cached and trees are given." +msgstr "--cached y árboles han sido entregados." + +#: builtin/hash-object.c:82 +msgid "" +"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " +"[--] <file>..." +msgstr "" +"git hash-object [-t <tipo>] [-w] [--path=<archivo> | --no-filters] [--stdin] " +"[--] <archivo>..." + +#: builtin/hash-object.c:83 +msgid "git hash-object --stdin-paths" +msgstr "git hash-object --stdin-paths" + +#: builtin/hash-object.c:95 +msgid "type" +msgstr "tipo" + +#: builtin/hash-object.c:95 +msgid "object type" +msgstr "tipo de objeto" + +#: builtin/hash-object.c:96 +msgid "write the object into the object database" +msgstr "escribir el objeto en la base de datos de objetos" + +#: builtin/hash-object.c:98 +msgid "read the object from stdin" +msgstr "leer el objeto de stdin" + +#: builtin/hash-object.c:100 +msgid "store file as is without filters" +msgstr "guardar el archivo como es sin filtros" + +#: builtin/hash-object.c:101 +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 +msgid "process file as it were from this path" +msgstr "procesar el archivo como si fuera de esta ruta" + +#: builtin/help.c:43 +msgid "print all available commands" +msgstr "mostrar todos los comandos disponibles" + +#: builtin/help.c:44 +msgid "exclude guides" +msgstr "excluir las guias" + +#: builtin/help.c:45 +msgid "print list of useful guides" +msgstr "mostrar una lista de nociones utiles" + +#: builtin/help.c:46 +msgid "show man page" +msgstr "mostrar la pagina del manual" + +#: builtin/help.c:47 +msgid "show manual in web browser" +msgstr "mostrar la pagina del manual en un navegador web" + +#: builtin/help.c:49 +msgid "show info page" +msgstr "mostrar la pagina de info" + +#: builtin/help.c:55 +msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" +msgstr "git help [--all] [--guides] [--man | --web | --info] [<comando>]" + +#: builtin/help.c:67 +#, c-format +msgid "unrecognized help format '%s'" +msgstr "formato help no reconocido '%s'" + +#: builtin/help.c:94 +msgid "Failed to start emacsclient." +msgstr "Fallo al iniciar emacsclient." + +#: builtin/help.c:107 +msgid "Failed to parse emacsclient version." +msgstr "Fallo al analizar la version de emacsclient." + +#: builtin/help.c:115 +#, c-format +msgid "emacsclient version '%d' too old (< 22)." +msgstr "la version '%d' de emacsclient es muy antigua (<22)." + +#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173 +#, c-format +msgid "failed to exec '%s'" +msgstr "fallo al ejecutar '%s'" + +#: builtin/help.c:211 +#, c-format +msgid "" +"'%s': path for unsupported man viewer.\n" +"Please consider using 'man.<tool>.cmd' instead." +msgstr "" +"'%s': ruta para el visualizador del manual no soportada.\n" +"Por favor considere usar 'man.<herramienta.cmd'." + +#: builtin/help.c:223 +#, c-format +msgid "" +"'%s': cmd for supported man viewer.\n" +"Please consider using 'man.<tool>.path' instead." +msgstr "" +"'%s': comando no soportado para man viewer.\n" +"Por favor considere usar 'man.<herramienta>.path." + +#: builtin/help.c:340 +#, c-format +msgid "'%s': unknown man viewer." +msgstr "'%s': visualizador de man desconocido" + +#: builtin/help.c:357 +msgid "no man viewer handled the request" +msgstr "ningun visualizador de manual proceso la peticion" + +#: builtin/help.c:365 +msgid "no info viewer handled the request" +msgstr "ningun visualizador de info manejo la peticion" + +#: builtin/help.c:407 +msgid "Defining attributes per path" +msgstr "Defininiendo atributos por ruta" + +#: builtin/help.c:408 +msgid "Everyday Git With 20 Commands Or So" +msgstr "Git diario con 20 comandos o algo asi" + +#: builtin/help.c:409 +msgid "A Git glossary" +msgstr "Un glosario de Git" + +#: builtin/help.c:410 +msgid "Specifies intentionally untracked files to ignore" +msgstr "Especifica de forma intencional archivos sin seguimiento a ignorar" + +#: builtin/help.c:411 +msgid "Defining submodule properties" +msgstr "Definiendo las propiedades del submodulo" + +#: builtin/help.c:412 +msgid "Specifying revisions and ranges for Git" +msgstr "Especificando revisiones y rangos para Git" + +#: builtin/help.c:413 +msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" +msgstr "Un tutorial de introduccion para Git ( para versiones 1.5.1 o mayores)" + +#: builtin/help.c:414 +msgid "An overview of recommended workflows with Git" +msgstr "Un repaso de flujos de trabajo recomendadoes con Git" + +#: builtin/help.c:426 +msgid "The common Git guides are:\n" +msgstr "Las guias communes de Git son:\n" + +#: builtin/help.c:444 +#, c-format +msgid "'%s' is aliased to '%s'" +msgstr "'%s' tiene el alias '%s'" + +#: builtin/help.c:466 builtin/help.c:483 +#, c-format +msgid "usage: %s%s" +msgstr "uso: %s%s" + +#: builtin/index-pack.c:156 +#, c-format +msgid "unable to open %s" +msgstr "no es posible abrir %s" + +#: builtin/index-pack.c:206 +#, c-format +msgid "object type mismatch at %s" +msgstr "el tipo del objeto no concuerda en %s" + +#: builtin/index-pack.c:226 +#, c-format +msgid "did not receive expected object %s" +msgstr "no se recibió el objeto esperado %s" + +#: builtin/index-pack.c:229 +#, c-format +msgid "object %s: expected type %s, found %s" +msgstr "objeto %s: tipo esperado %s, encontrado %s" + +#: builtin/index-pack.c:271 +#, 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 +msgid "early EOF" +msgstr "EOF temprano" + +#: builtin/index-pack.c:282 +msgid "read error on input" +msgstr "leer error en input" + +#: builtin/index-pack.c:294 +msgid "used more bytes than were available" +msgstr "se usaron más bytes de los disponibles" + +#: builtin/index-pack.c:301 +msgid "pack too large for current definition of off_t" +msgstr "paquete muy grande para la difinición actual de off_t" + +#: builtin/index-pack.c:304 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 +#, c-format +msgid "unable to create '%s'" +msgstr "no se puede crear '%s'" + +#: builtin/index-pack.c:325 +#, c-format +msgid "cannot open packfile '%s'" +msgstr "no se puede abrir el archivo de paquete '%s'" + +#: builtin/index-pack.c:339 +msgid "pack signature mismatch" +msgstr "firma del paquete no concuerda" + +#: builtin/index-pack.c:341 +#, c-format +msgid "pack version %<PRIu32> unsupported" +msgstr "versión de paquete %<PRIu32> no soportada" + +#: builtin/index-pack.c:359 +#, 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 +#, c-format +msgid "inflate returned %d" +msgstr "inflate retornó %d" + +#: builtin/index-pack.c:529 +msgid "offset value overflow for delta base object" +msgstr "valor de offset desbordado para el objeto base delta" + +#: builtin/index-pack.c:537 +msgid "delta base offset is out of bound" +msgstr "offset de base delta está fuera de límites" + +#: builtin/index-pack.c:545 +#, c-format +msgid "unknown object type %d" +msgstr "tipo de objeto %d desconocido" + +#: builtin/index-pack.c:576 +msgid "cannot pread pack file" +msgstr "no se puede propagar el paquete" + +#: builtin/index-pack.c:578 +#, 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 +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 +#, c-format +msgid "SHA1 COLLISION FOUND WITH %s !" +msgstr "COLLISIÓN SHA1 ENCONTRADA CON %s !" + +#: builtin/index-pack.c:752 builtin/pack-objects.c:168 +#: builtin/pack-objects.c:262 +#, c-format +msgid "unable to read %s" +msgstr "no se posible leer %s" + +#: builtin/index-pack.c:815 +#, 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 +#, c-format +msgid "cannot read existing object %s" +msgstr "no se puede leer el objeto existente %s" + +#: builtin/index-pack.c:837 +#, c-format +msgid "invalid blob object %s" +msgstr "objeto blob %s inválido" + +#: builtin/index-pack.c:852 +#, c-format +msgid "invalid %s" +msgstr "%s inválido" + +#: builtin/index-pack.c:855 +msgid "Error in object" +msgstr "Error en el objeto" + +#: builtin/index-pack.c:857 +#, 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 +msgid "failed to apply delta" +msgstr "falló al aplicar delta" + +#: builtin/index-pack.c:1131 +msgid "Receiving objects" +msgstr "Recibiendo objetos" + +#: builtin/index-pack.c:1131 +msgid "Indexing objects" +msgstr "Indexando objetos" + +#: builtin/index-pack.c:1165 +msgid "pack is corrupted (SHA1 mismatch)" +msgstr "paquete está corrompido (SHA1 no concuerda)" + +#: builtin/index-pack.c:1170 +msgid "cannot fstat packfile" +msgstr "no se puede fstat al archivo de paquete" + +#: builtin/index-pack.c:1173 +msgid "pack has junk at the end" +msgstr "el paquete tiene basura al final" + +#: builtin/index-pack.c:1185 +msgid "confusion beyond insanity in parse_pack_objects()" +msgstr "confusión más allá de la locura en parse_pack_objects()" + +#: builtin/index-pack.c:1208 +msgid "Resolving deltas" +msgstr "Resolviendo deltas" + +#: builtin/index-pack.c:1219 +#, c-format +msgid "unable to create thread: %s" +msgstr "no es posible crear hilo: %s" + +#: builtin/index-pack.c:1261 +msgid "confusion beyond insanity" +msgstr "confusión más allá de la locura" + +#: builtin/index-pack.c:1267 +#, c-format +msgid "completed with %d local object" +msgid_plural "completed with %d local objects" +msgstr[0] "completado con %d objeto local" +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?)" + +#: builtin/index-pack.c:1283 +#, c-format +msgid "pack has %d unresolved delta" +msgid_plural "pack has %d unresolved deltas" +msgstr[0] "paquete tiene %d delta sin resolver" +msgstr[1] "paquete tiene %d deltas sin resolver" + +#: builtin/index-pack.c:1307 +#, c-format +msgid "unable to deflate appended object (%d)" +msgstr "no es posible desinflar el objeto adjunto (%d)" + +#: builtin/index-pack.c:1383 +#, c-format +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:1421 +#, c-format +msgid "cannot write keep file '%s'" +msgstr "no se puede escribir el archivo guardado '%s'" + +#: builtin/index-pack.c:1429 +#, c-format +msgid "cannot close written keep file '%s'" +msgstr "no se puede cerrar el archivo guardado escrito '%s'" + +#: builtin/index-pack.c:1439 +msgid "cannot store pack file" +msgstr "no se puede guardar el archivo paquete" + +#: builtin/index-pack.c:1447 +msgid "cannot store index file" +msgstr "no se puede guardar el archivo índice" + +#: builtin/index-pack.c:1485 +#, c-format +msgid "bad pack.indexversion=%<PRIu32>" +msgstr "mal pack.indexversion=%<PRIu32>" + +#: builtin/index-pack.c:1553 +#, c-format +msgid "Cannot open existing pack file '%s'" +msgstr "No se puede abrir el archivo paquete existente '%s'" + +#: builtin/index-pack.c:1555 +#, 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 +#, 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 +#, 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:1705 builtin/index-pack.c:1708 +#: builtin/index-pack.c:1724 builtin/index-pack.c:1728 +#, c-format +msgid "bad %s" +msgstr "mal %s" + +#: builtin/index-pack.c:1744 +msgid "--fix-thin cannot be used without --stdin" +msgstr "--fix-thin no puede ser usada sin --stdin" + +#: builtin/index-pack.c:1746 +msgid "--stdin requires a git repository" +msgstr "--stdin requiere un repositorio git" + +#: builtin/index-pack.c:1754 +msgid "--verify with no packfile name given" +msgstr "--verify no recibió ningún nombre de archivo de paquete" + +#: builtin/init-db.c:55 +#, c-format +msgid "cannot stat '%s'" +msgstr "no se pudo definir '%s'" + +#: builtin/init-db.c:61 +#, c-format +msgid "cannot stat template '%s'" +msgstr "no se pudo definir template '%s'" + +#: builtin/init-db.c:66 +#, c-format +msgid "cannot opendir '%s'" +msgstr "no se puede abrir directorio '%s'" + +#: builtin/init-db.c:77 +#, c-format +msgid "cannot readlink '%s'" +msgstr "no se puede leer link '%s'" + +#: builtin/init-db.c:79 +#, c-format +msgid "cannot symlink '%s' '%s'" +msgstr "no se puede crear symlink '%s' '%s'" + +#: builtin/init-db.c:85 +#, c-format +msgid "cannot copy '%s' to '%s'" +msgstr "no se puede copiar '%s' a '%s'" + +#: builtin/init-db.c:89 +#, c-format +msgid "ignoring template %s" +msgstr "ignorando template %s" + +#: builtin/init-db.c:120 +#, c-format +msgid "templates not found %s" +msgstr "no se encontraron templates %s" + +#: builtin/init-db.c:135 +#, c-format +msgid "not copying templates from '%s': %s" +msgstr "no se copian templates de '%s': %s" + +#: builtin/init-db.c:328 +#, c-format +msgid "unable to handle file type %d" +msgstr "no es posible manejar el tipo de archivo %d" + +#: builtin/init-db.c:331 +#, c-format +msgid "unable to move %s to %s" +msgstr "no se puede mover %s a %s" + +#: builtin/init-db.c:348 builtin/init-db.c:351 +#, c-format +msgid "%s already exists" +msgstr "%s ya existe" + +#: builtin/init-db.c:404 +#, c-format +msgid "Reinitialized existing shared Git repository in %s%s\n" +msgstr "Reinicializado el repositorio Git compartido existente en %s%s\n" + +#: builtin/init-db.c:405 +#, c-format +msgid "Reinitialized existing Git repository in %s%s\n" +msgstr "Reinicializado el repositorio Git existente en %s%s\n" + +#: builtin/init-db.c:409 +#, c-format +msgid "Initialized empty shared Git repository in %s%s\n" +msgstr "Inicializado repositorio Git compartido vacío en %s%s\n" + +#: builtin/init-db.c:410 +#, c-format +msgid "Initialized empty Git repository in %s%s\n" +msgstr "Inicializado repositorio Git vacío en %s%s\n" + +#: builtin/init-db.c:458 +msgid "" +"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" +"shared[=<permissions>]] [<directory>]" +msgstr "" +"git init [-q | --quiet] [--bare] [--template=<directorio-template>] [--" +"shared[=<permisos>]] [<directorio>]" + +#: builtin/init-db.c:481 +msgid "permissions" +msgstr "permisos" + +#: builtin/init-db.c:482 +msgid "specify that the git repository is to be shared amongst several users" +msgstr "" +"especifica que el repositorio de git será compartido entre varios usuarios" + +#: builtin/init-db.c:516 builtin/init-db.c:521 +#, c-format +msgid "cannot mkdir %s" +msgstr "no se pude crear directorio %s" + +#: builtin/init-db.c:525 +#, c-format +msgid "cannot chdir to %s" +msgstr "no se puede aplicar chdir a %s" + +#: builtin/init-db.c:546 +#, c-format +msgid "" +"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" +"dir=<directory>)" +msgstr "" +"%s (o --work-tree=<directorio>) no se permite sin especificar %s (o --git-" +"dir=<directorio>)" + +#: builtin/init-db.c:574 +#, c-format +msgid "Cannot access work tree '%s'" +msgstr "No se puede acceder al árbol de trabajo '%s'" + +#: builtin/interpret-trailers.c:15 +msgid "" +"git interpret-trailers [--in-place] [--trim-empty] [(--trailer " +"<token>[(=|:)<value>])...] [<file>...]" +msgstr "" +"git interpret-trailers [--in-place] [--trim-empty] [(--trailer " +"<token>[(=|:)<valor>])...] [<archivo>...]" + +#: builtin/interpret-trailers.c:92 +msgid "edit files in place" +msgstr "editar archivos en el lugar" + +#: builtin/interpret-trailers.c:93 +msgid "trim empty trailers" +msgstr "cortar trailers vacíos" + +#: builtin/interpret-trailers.c:96 +msgid "where to place the new trailer" +msgstr "donde colocar el nuevo trailer" + +#: builtin/interpret-trailers.c:98 +msgid "action if trailer already exists" +msgstr "acción if trailer ya existe" + +#: builtin/interpret-trailers.c:100 +msgid "action if trailer is missing" +msgstr "acción si falta el trailer" + +#: builtin/interpret-trailers.c:102 +msgid "output only the trailers" +msgstr "mostrar solo los trailers" + +#: builtin/interpret-trailers.c:103 +msgid "do not apply config rules" +msgstr "no aplicar reglas de configuración" + +#: builtin/interpret-trailers.c:104 +msgid "join whitespace-continued values" +msgstr "juntar valores con espacios en blanco contiguos" + +#: builtin/interpret-trailers.c:105 +msgid "set parsing options" +msgstr "configurar opciones de análisis" + +#: builtin/interpret-trailers.c:107 +msgid "trailer" +msgstr "trailer" + +#: builtin/interpret-trailers.c:108 +msgid "trailer(s) to add" +msgstr "trailer(s) para agregar" + +#: builtin/interpret-trailers.c:117 +msgid "--trailer with --only-input does not make sense" +msgstr "--trailer con --only-input no tiene sentido" + +#: builtin/interpret-trailers.c:127 +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 +msgid "git log [<options>] [<revision-range>] [[--] <path>...]" +msgstr "git log [<opciones>] [<rango-de-revisión>] [[--] <ruta>...]" + +#: builtin/log.c:47 +msgid "git show [<options>] <object>..." +msgstr "git show [<opciones>] <objeto>..." + +#: builtin/log.c:91 +#, c-format +msgid "invalid --decorate option: %s" +msgstr "opción --decorate inválida: %s" + +#: builtin/log.c:148 +msgid "suppress diff output" +msgstr "suprimir salida de diff" + +#: builtin/log.c:149 +msgid "show source" +msgstr "mostrar fuente" + +#: builtin/log.c:150 +msgid "Use mail map file" +msgstr "usar archivo de mapa de mail" + +#: builtin/log.c:151 +msgid "decorate options" +msgstr "opciones de decorado" + +#: builtin/log.c:154 +msgid "Process line range n,m in file, counting from 1" +msgstr "Procesar rango de líneas n,m en archivo, contando desde 1" + +#: builtin/log.c:250 +#, c-format +msgid "Final output: %d %s\n" +msgstr "Salida final: %d %s\n" + +#: builtin/log.c:501 +#, c-format +msgid "git show %s: bad file" +msgstr "git show %s: mal archivo" + +#: builtin/log.c:516 builtin/log.c:610 +#, c-format +msgid "Could not read object %s" +msgstr "No se pudo leer objeto %s" + +#: builtin/log.c:634 +#, c-format +msgid "Unknown type: %d" +msgstr "Tipo desconocido: %d" + +#: builtin/log.c:755 +msgid "format.headers without value" +msgstr "formate.headers. sin valor" + +#: builtin/log.c:856 +msgid "name of output directory is too long" +msgstr "nombre del directorio de salida es muy largo" + +#: builtin/log.c:872 +#, c-format +msgid "Cannot open patch file %s" +msgstr "No se puede abrir archivo patch %s" + +#: builtin/log.c:889 +msgid "Need exactly one range." +msgstr "Exactamente un rango necesario." + +#: builtin/log.c:899 +msgid "Not a range." +msgstr "No es un rango." + +#: builtin/log.c:1005 +msgid "Cover letter needs email format" +msgstr "Letras de portada necesita formato email" + +#: builtin/log.c:1085 +#, c-format +msgid "insane in-reply-to: %s" +msgstr "insano in-reply-to: %s" + +#: builtin/log.c:1112 +msgid "git format-patch [<options>] [<since> | <revision-range>]" +msgstr "git format-patch [<opciones>] [<desde> | <rango-de-revisiones>]" + +#: builtin/log.c:1162 +msgid "Two output directories?" +msgstr "dos directorios de salida?" + +#: builtin/log.c:1269 builtin/log.c:1920 builtin/log.c:1922 builtin/log.c:1934 +#, c-format +msgid "Unknown commit %s" +msgstr "Commit desconocido %s" + +#: builtin/log.c:1279 builtin/notes.c:887 builtin/tag.c:516 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "Falló al resolver '%s' como una ref válida." + +#: builtin/log.c:1284 +msgid "Could not find exact merge base." +msgstr "No se pudo encontrar una base de fusión." + +#: builtin/log.c:1288 +msgid "" +"Failed to get upstream, if you want to record base commit automatically,\n" +"please use git branch --set-upstream-to to track a remote branch.\n" +"Or you could specify base commit by --base=<base-commit-id> manually." +msgstr "" +"Falló al conseguir upstream, si quiere grabar un commit base de manera " +"automática,\n" +"por favor use git branch --set-upstream-to para rastrear una rama remota.\n" +"O puede especificar un commit base mediante --base=<id-commit-base> " +"manualmente." + +#: builtin/log.c:1308 +msgid "Failed to find exact merge base" +msgstr "Fallo al encontrar una base de fusión exacta" + +#: builtin/log.c:1319 +msgid "base commit should be the ancestor of revision list" +msgstr "el commit base debe ser el ancestro de la lista de revisión" + +#: builtin/log.c:1323 +msgid "base commit shouldn't be in revision list" +msgstr "el commit base no debe estar en la lista de revisión" + +#: builtin/log.c:1372 +msgid "cannot get patch id" +msgstr "no se puede obtener id de patch" + +#: builtin/log.c:1431 +msgid "use [PATCH n/m] even with a single patch" +msgstr "use [PATCH n/m] incluso con un único parche" + +#: builtin/log.c:1434 +msgid "use [PATCH] even with multiple patches" +msgstr "use [PATCH] incluso con múltiples parches" + +#: builtin/log.c:1438 +msgid "print patches to standard out" +msgstr "mostrar parches en standard out" + +#: builtin/log.c:1440 +msgid "generate a cover letter" +msgstr "generar letra de cover" + +#: builtin/log.c:1442 +msgid "use simple number sequence for output file names" +msgstr "" +"usar una secuencia simple de números para salida de nombres de archivos" + +#: builtin/log.c:1443 +msgid "sfx" +msgstr "sfx" + +#: builtin/log.c:1444 +msgid "use <sfx> instead of '.patch'" +msgstr "use <sfx> en lugar de '.patch'" + +#: builtin/log.c:1446 +msgid "start numbering patches at <n> instead of 1" +msgstr "comenzar a numerar los parches desde <n> en lugar de 1" + +#: builtin/log.c:1448 +msgid "mark the series as Nth re-roll" +msgstr "marcar las series como Nth re-roll" + +#: builtin/log.c:1450 +msgid "Use [RFC PATCH] instead of [PATCH]" +msgstr "Use [RFC PATCH] en lugar de [PATCH]" + +#: builtin/log.c:1453 +msgid "Use [<prefix>] instead of [PATCH]" +msgstr "Use [<prefijo>] en lugar de [PATCH]" + +#: builtin/log.c:1456 +msgid "store resulting files in <dir>" +msgstr "guardar archivos resultantes en <dir>" + +#: builtin/log.c:1459 +msgid "don't strip/add [PATCH]" +msgstr "no cortar/agregar [PATCH]" + +#: builtin/log.c:1462 +msgid "don't output binary diffs" +msgstr "no mostrar diffs binarios" + +#: builtin/log.c:1464 +msgid "output all-zero hash in From header" +msgstr "salida como hash de todos-ceros en la cabecera From " + +#: builtin/log.c:1466 +msgid "don't include a patch matching a commit upstream" +msgstr "no incluya un parche que coincida con un commit en upstream" + +#: builtin/log.c:1468 +msgid "show patch format instead of default (patch + stat)" +msgstr "mostrar formato de parche en lugar del default (parche + stat)" + +#: builtin/log.c:1470 +msgid "Messaging" +msgstr "Mensajeando" + +#: builtin/log.c:1471 +msgid "header" +msgstr "cabezal" + +#: builtin/log.c:1472 +msgid "add email header" +msgstr "agregar cabecera email" + +#: builtin/log.c:1473 builtin/log.c:1475 +msgid "email" +msgstr "email" + +#: builtin/log.c:1473 +msgid "add To: header" +msgstr "agregar cabecera To:" + +#: builtin/log.c:1475 +msgid "add Cc: header" +msgstr "agregar cabecera Cc:" + +#: builtin/log.c:1477 +msgid "ident" +msgstr "ident" + +#: builtin/log.c:1478 +msgid "set From address to <ident> (or committer ident if absent)" +msgstr "" +"configurar dirección From a <ident> ( o identidad de committer si está " +"ausente)" + +#: builtin/log.c:1480 +msgid "message-id" +msgstr "id de mensaje" + +#: builtin/log.c:1481 +msgid "make first mail a reply to <message-id>" +msgstr "hacer primer mail una respuesta a <id de mensaje>" + +#: builtin/log.c:1482 builtin/log.c:1485 +msgid "boundary" +msgstr "límite" + +#: builtin/log.c:1483 +msgid "attach the patch" +msgstr "adjuntar el parche" + +#: builtin/log.c:1486 +msgid "inline the patch" +msgstr "poner el parche en línea" + +#: builtin/log.c:1490 +msgid "enable message threading, styles: shallow, deep" +msgstr "habilitar hilos de mensajes, estilos: superficial, profundo" + +#: builtin/log.c:1492 +msgid "signature" +msgstr "firma" + +#: builtin/log.c:1493 +msgid "add a signature" +msgstr "agregar una firma" + +#: builtin/log.c:1494 +msgid "base-commit" +msgstr "commit-base" + +#: builtin/log.c:1495 +msgid "add prerequisite tree info to the patch series" +msgstr "agregar pre requisito información de árbol a la serie de parches" + +#: builtin/log.c:1497 +msgid "add a signature from a file" +msgstr "agregar una firma de un archivo" + +#: builtin/log.c:1498 +msgid "don't print the patch filenames" +msgstr "no mostrar los nombres de archivos de los parches" + +#: builtin/log.c:1500 +msgid "show progress while generating patches" +msgstr "mostrar medidor de progreso mientras se generan los parches" + +#: builtin/log.c:1575 +#, c-format +msgid "invalid ident line: %s" +msgstr "línea de ident inválida: %s" + +#: builtin/log.c:1590 +msgid "-n and -k are mutually exclusive." +msgstr "-n y -k son mutuamente exclusivas." + +#: builtin/log.c:1592 +msgid "--subject-prefix/--rfc and -k are mutually exclusive." +msgstr "--subject-prefix/--rfc y -k son mutuamente exclusivos." + +#: builtin/log.c:1600 +msgid "--name-only does not make sense" +msgstr "--name-only no tiene sentido" + +#: builtin/log.c:1602 +msgid "--name-status does not make sense" +msgstr "--name-status no tiene sentido" + +#: builtin/log.c:1604 +msgid "--check does not make sense" +msgstr "--check no tiene sentido" + +#: builtin/log.c:1634 +msgid "standard output, or directory, which one?" +msgstr "salida standard, o directorio, cual? " + +#: builtin/log.c:1636 +#, c-format +msgid "Could not create directory '%s'" +msgstr "No se pudo crear el directorio '%s'" + +#: builtin/log.c:1729 +#, c-format +msgid "unable to read signature file '%s'" +msgstr "no se puede leer la firma del archivo '%s'" + +#: builtin/log.c:1761 +msgid "Generating patches" +msgstr "Generando parches" + +#: builtin/log.c:1805 +msgid "Failed to create output files" +msgstr "Falló al crear los archivos de salida" + +#: builtin/log.c:1855 +msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" +msgstr "git cherry [-v] [<upstream> [<head> [<límite>]]]" + +#: builtin/log.c:1909 +#, c-format +msgid "" +"Could not find a tracked remote branch, please specify <upstream> manually.\n" +msgstr "" +"No se pudo encontrar una rama remota rastreada, por favor especifique " +"<upstream> manualmente.\n" + +#: builtin/ls-files.c:466 +msgid "git ls-files [<options>] [<file>...]" +msgstr "git ls-files [<opciones>] [<archivo>...]" + +#: builtin/ls-files.c:515 +msgid "identify the file status with tags" +msgstr "identifique el estado del archivo con tags" + +#: builtin/ls-files.c:517 +msgid "use lowercase letters for 'assume unchanged' files" +msgstr "usar letras minúsculas para archivos 'asumidos sin cambios'" + +#: builtin/ls-files.c:519 +msgid "show cached files in the output (default)" +msgstr "mostrar archivos en caché en la salida (default)" + +#: builtin/ls-files.c:521 +msgid "show deleted files in the output" +msgstr "mostrar archivos borrados en la salida" + +#: builtin/ls-files.c:523 +msgid "show modified files in the output" +msgstr "mostrar archivos modificados en la salida" + +#: builtin/ls-files.c:525 +msgid "show other files in the output" +msgstr "mostrar otros archivos en la salida" + +#: builtin/ls-files.c:527 +msgid "show ignored files in the output" +msgstr "mostrar archivos ignorados en la salida" + +#: builtin/ls-files.c:530 +msgid "show staged contents' object name in the output" +msgstr "" +"mostrar contenido de nombres de objetos en el área de stage en la salida" + +#: builtin/ls-files.c:532 +msgid "show files on the filesystem that need to be removed" +msgstr "mostrar archivos en el filesystem que necesitan ser borrados" + +#: builtin/ls-files.c:534 +msgid "show 'other' directories' names only" +msgstr "mostrar solo nombres de 'directorios otros'" + +#: builtin/ls-files.c:536 +msgid "show line endings of files" +msgstr "mostrar finales de línea de archivos" + +#: builtin/ls-files.c:538 +msgid "don't show empty directories" +msgstr "no mostrar directorios vacíos" + +#: builtin/ls-files.c:541 +msgid "show unmerged files in the output" +msgstr "mostrar archivos no fusionados en la salida" + +#: builtin/ls-files.c:543 +msgid "show resolve-undo information" +msgstr "mostrar información resolver-deshacer" + +#: builtin/ls-files.c:545 +msgid "skip files matching pattern" +msgstr "saltar archivos que concuerden con el patrón" + +#: builtin/ls-files.c:548 +msgid "exclude patterns are read from <file>" +msgstr "excluir patrones leídos de <archivo>" + +#: builtin/ls-files.c:551 +msgid "read additional per-directory exclude patterns in <file>" +msgstr "" +"leer patrones de exclusión de manera adicional por directorio en <archivo>" + +#: builtin/ls-files.c:553 +msgid "add the standard git exclusions" +msgstr "agregar las exclusiones standard de git" + +#: builtin/ls-files.c:556 +msgid "make the output relative to the project top directory" +msgstr "hacer la salidad relativa al directorio principal del proyecto" + +#: builtin/ls-files.c:559 +msgid "recurse through submodules" +msgstr "recurrir a través de submódulos" + +#: builtin/ls-files.c:561 +msgid "if any <file> is not in the index, treat this as an error" +msgstr "si cualquier <archivo> no está en el índice, tratarlo como un error" + +#: builtin/ls-files.c:562 +msgid "tree-ish" +msgstr "arbol-ismo" + +#: builtin/ls-files.c:563 +msgid "pretend that paths removed since <tree-ish> are still present" +msgstr "" +"fingir que las rutas han sido borradas ya que todavía hay <arbol-ismos> " +"presentes" + +#: builtin/ls-files.c:565 +msgid "show debugging data" +msgstr "mostrar data de debug" + +#: builtin/ls-remote.c:7 +msgid "" +"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" +" [-q | --quiet] [--exit-code] [--get-url]\n" +" [--symref] [<repository> [<refs>...]]" +msgstr "" +"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" +" [-q | --quiet] [--exit-code] [--get-url]\n" +" [--symref] [<repositorio> [<refs>...]]" + +#: builtin/ls-remote.c:52 +msgid "do not print remote URL" +msgstr "no mostrar el URL remoto" + +#: builtin/ls-remote.c:53 builtin/ls-remote.c:55 +msgid "exec" +msgstr "ejecutar" + +#: builtin/ls-remote.c:54 builtin/ls-remote.c:56 +msgid "path of git-upload-pack on the remote host" +msgstr "ruta de git-upload-pack en el host remoto" + +#: builtin/ls-remote.c:58 +msgid "limit to tags" +msgstr "limitar a tags" + +#: builtin/ls-remote.c:59 +msgid "limit to heads" +msgstr "limitar a heads" + +#: builtin/ls-remote.c:60 +msgid "do not show peeled tags" +msgstr "no mostrar tags pelados" + +#: builtin/ls-remote.c:62 +msgid "take url.<base>.insteadOf into account" +msgstr "tomar url.<base>.insteadOf en cuenta" + +#: builtin/ls-remote.c:64 +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 +msgid "show underlying ref in addition to the object pointed by it" +msgstr "mostrar ref subyacente en adición al objeto apuntado por él" + +#: builtin/ls-tree.c:29 +msgid "git ls-tree [<options>] <tree-ish> [<path>...]" +msgstr "git ls-tree [<opciones>] <arbol-ismo> [<ruta>...]" + +#: builtin/ls-tree.c:127 +msgid "only show trees" +msgstr "solo mostrar árboles" + +#: builtin/ls-tree.c:129 +msgid "recurse into subtrees" +msgstr "recurrir en subárboles" + +#: builtin/ls-tree.c:131 +msgid "show trees when recursing" +msgstr "mostrar árboles cuando se recurre" + +#: builtin/ls-tree.c:134 +msgid "terminate entries with NUL byte" +msgstr "terminar entradas con byte NUL" + +#: builtin/ls-tree.c:135 +msgid "include object size" +msgstr "incluir tamaño de objeto" + +#: builtin/ls-tree.c:137 builtin/ls-tree.c:139 +msgid "list only filenames" +msgstr "listar solo nombres de archivos" + +#: builtin/ls-tree.c:142 +msgid "use full path names" +msgstr "usar rutas completas" + +#: builtin/ls-tree.c:144 +msgid "list entire tree; not just current directory (implies --full-name)" +msgstr "" +"mostrar todo el árbol; no solo el directorio actual (implica --full-name)" + +#: builtin/mailsplit.c:241 +#, c-format +msgid "empty mbox: '%s'" +msgstr "mbox vacío: '%s'" + +#: builtin/merge.c:48 +msgid "git merge [<options>] [<commit>...]" +msgstr "git merge [<opciones>] [<commit>...]" + +#: builtin/merge.c:49 +msgid "git merge --abort" +msgstr "git merge --abort" + +#: builtin/merge.c:50 +msgid "git merge --continue" +msgstr "git merge --continue" + +#: builtin/merge.c:107 +msgid "switch `m' requires a value" +msgstr "cambiar `m' requiere un valor" + +#: builtin/merge.c:144 +#, 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 +#, c-format +msgid "Available strategies are:" +msgstr "Estrategias disponibles son:" + +#: builtin/merge.c:150 +#, c-format +msgid "Available custom strategies are:" +msgstr "Estrategias personalizadas disponibles son:" + +#: builtin/merge.c:200 builtin/pull.c:134 +msgid "do not show a diffstat at the end of the merge" +msgstr "no mostrar un diffstat al final de la fusión" + +#: builtin/merge.c:203 builtin/pull.c:137 +msgid "show a diffstat at the end of the merge" +msgstr "mostrar un diffstat al final de la fusión" + +#: builtin/merge.c:204 builtin/pull.c:140 +msgid "(synonym to --stat)" +msgstr "(sinónimo para --stat)" + +#: builtin/merge.c:206 builtin/pull.c:143 +msgid "add (at most <n>) entries from shortlog to merge commit message" +msgstr "" +"agregar (como máximo <n>) entradas del shortlog al mensaje del commit de " +"fusión" + +#: builtin/merge.c:209 builtin/pull.c:146 +msgid "create a single commit instead of doing a merge" +msgstr "crear un commit único en lugar de hacer una fusión" + +#: builtin/merge.c:211 builtin/pull.c:149 +msgid "perform a commit if the merge succeeds (default)" +msgstr "realizar un commit si la fusión es exitosa (default)" + +#: builtin/merge.c:213 builtin/pull.c:152 +msgid "edit message before committing" +msgstr "editar mensaje antes de realizar commit" + +#: builtin/merge.c:214 +msgid "allow fast-forward (default)" +msgstr "permitir fast-forwars (default)" + +#: builtin/merge.c:216 builtin/pull.c:158 +msgid "abort if fast-forward is not possible" +msgstr "abortar si fast-forward no es posible" + +#: builtin/merge.c:220 builtin/pull.c:161 +msgid "verify that the named commit has a valid GPG signature" +msgstr "verificar que el commit nombrado tiene una firma GPG válida" + +#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:165 +#: builtin/revert.c:109 +msgid "strategy" +msgstr "estrategia" + +#: builtin/merge.c:222 builtin/pull.c:166 +msgid "merge strategy to use" +msgstr "estrategia de fusión para usar" + +#: builtin/merge.c:223 builtin/pull.c:169 +msgid "option=value" +msgstr "opción=valor" + +#: builtin/merge.c:224 builtin/pull.c:170 +msgid "option for selected merge strategy" +msgstr "opción para la estrategia de fusión seleccionada" + +#: builtin/merge.c:226 +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 +msgid "abort the current in-progress merge" +msgstr "abortar la fusión en progreso actual" + +#: builtin/merge.c:232 +msgid "continue the current in-progress merge" +msgstr "continuar la fusión en progreso actual" + +#: builtin/merge.c:234 builtin/pull.c:177 +msgid "allow merging unrelated histories" +msgstr "permitir fusionar historias no relacionadas" + +#: builtin/merge.c:240 +msgid "verify commit-msg hook" +msgstr "verificar el hook commit-msg" + +#: builtin/merge.c:265 +msgid "could not run stash." +msgstr "no se pudo ejecutar stash." + +#: builtin/merge.c:270 +msgid "stash failed" +msgstr "stash falló" + +#: builtin/merge.c:275 +#, c-format +msgid "not a valid object: %s" +msgstr "no es un objeto válido: %s" + +#: builtin/merge.c:297 builtin/merge.c:314 +msgid "read-tree failed" +msgstr "lectura de árbol falló" + +#: builtin/merge.c:344 +msgid " (nothing to squash)" +msgstr " (nada para hacer squash)" + +#: builtin/merge.c:355 +#, c-format +msgid "Squash commit -- not updating HEAD\n" +msgstr "Commit de squash -- no actualizando HEAD\n" + +#: builtin/merge.c:405 +#, c-format +msgid "No merge message -- not updating HEAD\n" +msgstr "No hay mensaje de fusión -- no actualizando HEAD\n" + +#: builtin/merge.c:456 +#, c-format +msgid "'%s' does not point to a commit" +msgstr "'%s' no apunta a ninguna confirmación" + +#: builtin/merge.c:546 +#, c-format +msgid "Bad branch.%s.mergeoptions string: %s" +msgstr "Mal string branch.%s.mergeoptions: %s" + +#: builtin/merge.c:666 +msgid "Not handling anything other than two heads merge." +msgstr "No manejando nada más que fusión de dos heads." + +#: builtin/merge.c:680 +#, c-format +msgid "Unknown option for merge-recursive: -X%s" +msgstr "Opción desconocida para merge-recursive: -X%s" + +#: builtin/merge.c:695 +#, c-format +msgid "unable to write %s" +msgstr "no es posible escribit %s" + +#: builtin/merge.c:747 +#, c-format +msgid "Could not read from '%s'" +msgstr "No se puedo leer de '%s'" + +#: builtin/merge.c:756 +#, c-format +msgid "Not committing merge; use 'git commit' to complete the merge.\n" +msgstr "" +"No se realiza commit de la fusión; use 'git commit' para completar la " +"fusión.\n" + +#: builtin/merge.c:762 +#, c-format +msgid "" +"Please enter a commit message to explain why this merge is necessary,\n" +"especially if it merges an updated upstream into a topic branch.\n" +"\n" +"Lines starting with '%c' will be ignored, and an empty message aborts\n" +"the commit.\n" +msgstr "" +"Por favor ingrese un mensaje de commit que explique por qué es necesaria " +"esta fusión,\n" +"especialmente si esto fusiona un upstream actualizado en una rama de " +"tópico.\n" +"\n" +"Líneas comenzando con '%c' serán ignoradas, y un mensaje vacío aborta\n" +"el commit.\n" + +#: builtin/merge.c:798 +msgid "Empty commit message." +msgstr "Mensaje de commit vacío." + +#: builtin/merge.c:818 +#, c-format +msgid "Wonderful.\n" +msgstr "Maravilloso.\n" + +#: builtin/merge.c:871 +#, c-format +msgid "Automatic merge failed; fix conflicts and then commit the result.\n" +msgstr "" +"Fusión automática falló; arregle los conflictos y luego realice un commit " +"con el resultado.\n" + +#: builtin/merge.c:910 +msgid "No current branch." +msgstr "No rama actual." + +#: builtin/merge.c:912 +msgid "No remote for the current branch." +msgstr "No hay remoto para la rama actual." + +#: builtin/merge.c:914 +msgid "No default upstream defined for the current branch." +msgstr "No hay upstream default definido para la rama actual." + +#: builtin/merge.c:919 +#, c-format +msgid "No remote-tracking branch for %s from %s" +msgstr "No hay rama de rastreo remoto para %s de %s" + +#: builtin/merge.c:972 +#, c-format +msgid "Bad value '%s' in environment '%s'" +msgstr "Mal valor '%s' en el entorno '%s'" + +#: builtin/merge.c:1073 +#, c-format +msgid "not something we can merge in %s: %s" +msgstr "nada que podamos fusionar en %s: %s" + +#: builtin/merge.c:1107 +msgid "not something we can merge" +msgstr "nada que podamos fusionar" + +#: builtin/merge.c:1172 +msgid "--abort expects no arguments" +msgstr "--abort no espera argumentos" + +#: builtin/merge.c:1176 +msgid "There is no merge to abort (MERGE_HEAD missing)." +msgstr "No hay una fusión para abortar (falta MERGE_HEAD)" + +#: builtin/merge.c:1188 +msgid "--continue expects no arguments" +msgstr "--continue no espera argumentos" + +#: builtin/merge.c:1192 +msgid "There is no merge in progress (MERGE_HEAD missing)." +msgstr "No hay fusión en progreso (falta MERGE_HEAD)." + +#: builtin/merge.c:1208 +msgid "" +"You have not concluded your merge (MERGE_HEAD exists).\n" +"Please, commit your changes before you merge." +msgstr "" +"No ha concluido la fusión (existe MERGE_HEAD).\n" +"Por favor, realice un commit con los cambios antes de fusionar." + +#: builtin/merge.c:1215 +msgid "" +"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" +"Please, commit your changes before you merge." +msgstr "" +"No ha concluido el cherry-pick (existe CHERRY_PICK_HEAD).\n" +"Por favor, realice un commit con los cambios antes de fusionar." + +#: builtin/merge.c:1218 +msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." +msgstr "No ha concluido el cherry-pick (existe CHERRY_PICK_HEAD)." + +#: builtin/merge.c:1227 +msgid "You cannot combine --squash with --no-ff." +msgstr "No se puede combinar --squash con --no-ff." + +#: builtin/merge.c:1235 +msgid "No commit specified and merge.defaultToUpstream not set." +msgstr "" +"No hay commit especificado y merge.defaultToUpstream no está configurado." + +#: builtin/merge.c:1252 +msgid "Squash commit into empty head not supported yet" +msgstr "Commit aplastado dentro de un head vacío no es soportado todavía" + +#: builtin/merge.c:1254 +msgid "Non-fast-forward commit does not make sense into an empty head" +msgstr "Commit no fast-forward no tiene sentido dentro de un head vacío" + +#: builtin/merge.c:1259 +#, c-format +msgid "%s - not something we can merge" +msgstr "%s - nada que podamos fusionar" + +#: builtin/merge.c:1261 +msgid "Can merge only exactly one commit into empty head" +msgstr "Solo se puede fusionar exactamente un commit en un head vacío" + +#: builtin/merge.c:1295 +#, c-format +msgid "Commit %s has an untrusted GPG signature, allegedly by %s." +msgstr "Commit %s tiene una firma GPG no confiable, pretendidamente por %s." + +#: builtin/merge.c:1298 +#, c-format +msgid "Commit %s has a bad GPG signature allegedly by %s." +msgstr "Commit %s tiene una mala firma GPG pretendidamente por %s." + +#: builtin/merge.c:1301 +#, c-format +msgid "Commit %s does not have a GPG signature." +msgstr "Commit %s no tiene una firma GPG." + +#: builtin/merge.c:1304 +#, c-format +msgid "Commit %s has a good GPG signature by %s\n" +msgstr "Commit %s titene una buena firma GPG por %s\n" + +#: builtin/merge.c:1366 +msgid "refusing to merge unrelated histories" +msgstr "rehusando fusionar historias no relacionadas" + +#: builtin/merge.c:1375 +msgid "Already up to date." +msgstr "Ya está actualizado." + +#: builtin/merge.c:1385 +#, c-format +msgid "Updating %s..%s\n" +msgstr "Actualizando %s..%s\n" + +#: builtin/merge.c:1426 +#, c-format +msgid "Trying really trivial in-index merge...\n" +msgstr "Intentando fusión en índice realmente trivial...\n" + +#: builtin/merge.c:1433 +#, c-format +msgid "Nope.\n" +msgstr "Nop.\n" + +#: builtin/merge.c:1458 +msgid "Already up to date. Yeeah!" +msgstr "Ya está actualizado. ¡Oh, yeaahh!" + +#: builtin/merge.c:1464 +msgid "Not possible to fast-forward, aborting." +msgstr "No es posible hacer fast-forward, abortando." + +#: builtin/merge.c:1487 builtin/merge.c:1566 +#, c-format +msgid "Rewinding the tree to pristine...\n" +msgstr "Rebobinando el árbol a original...\n" + +#: builtin/merge.c:1491 +#, c-format +msgid "Trying merge strategy %s...\n" +msgstr "Intentando estrategia de fusión %s...\n" + +#: builtin/merge.c:1557 +#, c-format +msgid "No merge strategy handled the merge.\n" +msgstr "Ninguna estrategia de fusión manejó la fusión.\n" + +#: builtin/merge.c:1559 +#, c-format +msgid "Merge with strategy %s failed.\n" +msgstr "Fusionar con estrategia %s falló.\n" + +#: builtin/merge.c:1568 +#, c-format +msgid "Using the %s to prepare resolving by hand.\n" +msgstr "Usando el %s para preparar resolución a mano.\n" + +#: builtin/merge.c:1580 +#, c-format +msgid "Automatic merge went well; stopped before committing as requested\n" +msgstr "" +"Fusión automática fue bien; detenida antes del commit como se solicitó\n" + +#: builtin/merge-base.c:30 +msgid "git merge-base [-a | --all] <commit> <commit>..." +msgstr "git merge-base [-a | --all] <commit> <commit>..." + +#: builtin/merge-base.c:31 +msgid "git merge-base [-a | --all] --octopus <commit>..." +msgstr "git merge-base [-a | --all] --octopus <commit>..." + +#: builtin/merge-base.c:32 +msgid "git merge-base --independent <commit>..." +msgstr "git merge-base --independent <commit>..." + +#: builtin/merge-base.c:33 +msgid "git merge-base --is-ancestor <commit> <commit>" +msgstr "git merge-base --is-ancestor <commit> <commit>" + +#: builtin/merge-base.c:34 +msgid "git merge-base --fork-point <ref> [<commit>]" +msgstr "git merge-base --fork-point <ref> [<commit>]" + +#: builtin/merge-base.c:218 +msgid "output all common ancestors" +msgstr "mostrar todos los ancestros comunes" + +#: builtin/merge-base.c:220 +msgid "find ancestors for a single n-way merge" +msgstr "encontrar ancestros para una única fusión de n-vías " + +#: builtin/merge-base.c:222 +msgid "list revs not reachable from others" +msgstr "listar revs no alcanzables desde otros" + +#: builtin/merge-base.c:224 +msgid "is the first one ancestor of the other?" +msgstr "es el primer ancestro del otro?" + +#: builtin/merge-base.c:226 +msgid "find where <commit> forked from reflog of <ref>" +msgstr "encontrar donde <commit> forjó del reflog de <ref>" + +#: builtin/merge-file.c:9 +msgid "" +"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " +"<orig-file> <file2>" +msgstr "" +"git merge-file [<opciones>] [-L <nombre1> [-L <origen> [-L <nombre2>]]] " +"<archivo1> <archivo-origen> <archivo2>" + +#: builtin/merge-file.c:33 +msgid "send results to standard output" +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 " + +#: builtin/merge-file.c:35 +msgid "for conflicts, use our version" +msgstr "por conflictos, usar nuestra versión" + +#: builtin/merge-file.c:37 +msgid "for conflicts, use their version" +msgstr "por conflictos, usar la versión de ellos" + +#: builtin/merge-file.c:39 +msgid "for conflicts, use a union version" +msgstr "por conflictos, usar una versión de unión" + +#: builtin/merge-file.c:42 +msgid "for conflicts, use this marker size" +msgstr "por conflictos, usar el tamaño de este marcador" + +#: builtin/merge-file.c:43 +msgid "do not warn about conflicts" +msgstr "no advertir sobre conflictos" + +#: builtin/merge-file.c:45 +msgid "set labels for file1/orig-file/file2" +msgstr "configurar labels para archivo1/orig-archivo/archivo2" + +#: builtin/merge-recursive.c:45 +#, c-format +msgid "unknown option %s" +msgstr "opción %s desconocida" + +#: builtin/merge-recursive.c:51 +#, c-format +msgid "could not parse object '%s'" +msgstr "no se pudo analizar el objeto '%s'" + +#: builtin/merge-recursive.c:55 +#, c-format +msgid "cannot handle more than %d base. Ignoring %s." +msgid_plural "cannot handle more than %d bases. Ignoring %s." +msgstr[0] "no se puede manejar más de %d base. Ignorando %s." +msgstr[1] "no se puede manejar más de %d bases. Ignorando %s." + +#: builtin/merge-recursive.c:63 +msgid "not handling anything other than two heads merge." +msgstr "no manejando nada distinto a fusiones de dos heads." + +#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71 +#, c-format +msgid "could not resolve ref '%s'" +msgstr "no se pudo resolver ref '%s'" + +#: builtin/merge-recursive.c:77 +#, c-format +msgid "Merging %s with %s\n" +msgstr "Fusionando %s con %s\n" + +#: builtin/mktree.c:65 +msgid "git mktree [-z] [--missing] [--batch]" +msgstr "git mktree [-z] [--missing] [--batch]" + +#: builtin/mktree.c:153 +msgid "input is NUL terminated" +msgstr "input es terminada con NUL" + +#: builtin/mktree.c:154 builtin/write-tree.c:25 +msgid "allow missing objects" +msgstr "permitir objetos faltantes" + +#: builtin/mktree.c:155 +msgid "allow creation of more than one tree" +msgstr "permitir la creación de más de un árbol" + +#: builtin/mv.c:17 +msgid "git mv [<options>] <source>... <destination>" +msgstr "git mv [<opciones>] <fuente>... <destino>" + +#: builtin/mv.c:83 +#, c-format +msgid "Directory %s is in index and no submodule?" +msgstr "Directorio %s está en el índice y no hay submódulo?" + +#: builtin/mv.c:85 builtin/rm.c:289 +msgid "Please stage your changes to .gitmodules or stash them to proceed" +msgstr "" +"Por favor agrega el stage de tus cambios a .gitmodules o realiza un stash " +"para proceder" + +#: builtin/mv.c:103 +#, c-format +msgid "%.*s is in index" +msgstr "%.*s está en el índice" + +#: builtin/mv.c:125 +msgid "force move/rename even if target exists" +msgstr "forzar mover/renombrar incluso si el objetivo existe" + +#: builtin/mv.c:126 +msgid "skip move/rename errors" +msgstr "saltar errores de mover/renombrar" + +#: builtin/mv.c:167 +#, c-format +msgid "destination '%s' is not a directory" +msgstr "destino '%s' no es un directorio" + +#: builtin/mv.c:178 +#, c-format +msgid "Checking rename of '%s' to '%s'\n" +msgstr "Revisando cambio de nombre de '%s' a '%s'\n" + +#: builtin/mv.c:182 +msgid "bad source" +msgstr "mala fuente" + +#: builtin/mv.c:185 +msgid "can not move directory into itself" +msgstr "no se pude mover un directorio en sí mismo" + +#: builtin/mv.c:188 +msgid "cannot move directory over file" +msgstr "no se puede mover un directorio dentro de un archivo" + +#: builtin/mv.c:197 +msgid "source directory is empty" +msgstr "directorio de fuente está vacío" + +#: builtin/mv.c:222 +msgid "not under version control" +msgstr "no se encuentra bajo control de versión " + +#: builtin/mv.c:225 +msgid "destination exists" +msgstr "destino existe" + +#: builtin/mv.c:233 +#, c-format +msgid "overwriting '%s'" +msgstr "sobrescribiendo '%s'" + +#: builtin/mv.c:236 +msgid "Cannot overwrite" +msgstr "No se puede sobrescribir" + +#: builtin/mv.c:239 +msgid "multiple sources for the same target" +msgstr "múltiples fuentes para el mismo objetivo" + +#: builtin/mv.c:241 +msgid "destination directory does not exist" +msgstr "el directorio de destino no existe" + +#: builtin/mv.c:248 +#, c-format +msgid "%s, source=%s, destination=%s" +msgstr "%s, fuente=%s, destino=%s" + +#: builtin/mv.c:269 +#, 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 +#, c-format +msgid "renaming '%s' failed" +msgstr "fallo al renombrar '%s'" + +#: builtin/name-rev.c:338 +msgid "git name-rev [<options>] <commit>..." +msgstr "git name-rev [<opciones>] <confirmación>..." + +#: builtin/name-rev.c:339 +msgid "git name-rev [<options>] --all" +msgstr "git name-rev [<opciones>] --all" + +#: builtin/name-rev.c:340 +msgid "git name-rev [<options>] --stdin" +msgstr "git name-rev [<opciones>] --stdin" + +#: builtin/name-rev.c:395 +msgid "print only names (no SHA-1)" +msgstr "imprimir sólo nombres (sin SHA-1)" + +#: builtin/name-rev.c:396 +msgid "only use tags to name the commits" +msgstr "sólo usar etiquetas para nombrar confirmaciones" + +#: builtin/name-rev.c:398 +msgid "only use refs matching <pattern>" +msgstr "solo usar refs que concuerden con <patrón>" + +#: builtin/name-rev.c:400 +msgid "ignore refs matching <pattern>" +msgstr "ignorar refs que concuerden con <patrón>" + +#: builtin/name-rev.c:402 +msgid "list all commits reachable from all refs" +msgstr "" +"listar todas las confirmaciones alcanzables desde todas las referencias" + +#: builtin/name-rev.c:403 +msgid "read from stdin" +msgstr "leer desde stdin" + +#: builtin/name-rev.c:404 +msgid "allow to print `undefined` names (default)" +msgstr "permitir imprimir nombres `undefined` (predeterminado)" + +#: builtin/name-rev.c:410 +msgid "dereference tags in the input (internal use)" +msgstr "desreferenciar etiquetas en la entrada (uso interno)" + +#: builtin/notes.c:26 +msgid "git notes [--ref <notes-ref>] [list [<object>]]" +msgstr "git notes [--ref <referencia-de-notas>] [list [<objeto>]]" + +#: builtin/notes.c:27 +msgid "" +"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " +"| (-c | -C) <object>] [<object>]" +msgstr "" +"git notes [--ref <referencia-de-notas>] add [-f] [--allow-empty] [-m " +"<mensaje> | -F <archivo> | (-c | -C) <objeto>] [<objeto>]" + +#: builtin/notes.c:28 +msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" +msgstr "" +"git notes [--ref <referencia-de-notas>] copy [-f] <objeto-origen> <objeto-" +"destino>" + +#: builtin/notes.c:29 +msgid "" +"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " +"(-c | -C) <object>] [<object>]" +msgstr "" +"git notes [--ref <referencia-de-notas>] append [--allow-empty] [-m <mensaje> " +"| -F <archivo> | (-c | -C) <objeto>] [<objeto>]" + +#: builtin/notes.c:30 +msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" +msgstr "" +"git notes [--ref <referencia-de-notas>] edit [--allow-empty] [<objeto>]" + +#: builtin/notes.c:31 +msgid "git notes [--ref <notes-ref>] show [<object>]" +msgstr "git notes [--ref <referencia-de-notas>] show [<objeto>]" + +#: builtin/notes.c:32 +msgid "" +"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" +msgstr "" +"git notes [--ref <referencia-de notas>] merge [-v | -q] [-s <estrategia>] " +"<referencia-de-notas>" + +#: builtin/notes.c:33 +msgid "git notes merge --commit [-v | -q]" +msgstr "git notes merge --commit [-v | -q]" + +#: builtin/notes.c:34 +msgid "git notes merge --abort [-v | -q]" +msgstr "git notes merge --abort [-v | -q]" + +#: builtin/notes.c:35 +msgid "git notes [--ref <notes-ref>] remove [<object>...]" +msgstr "git notes [--ref <referencia-de-notas>] remove [<objeto>...]" + +#: builtin/notes.c:36 +msgid "git notes [--ref <notes-ref>] prune [-n | -v]" +msgstr "git notes [--ref <referencia-de-notas>] prune [-n | -v]" + +#: builtin/notes.c:37 +msgid "git notes [--ref <notes-ref>] get-ref" +msgstr "git notes [--ref <referencia-de-notas>] get-ref" + +#: builtin/notes.c:42 +msgid "git notes [list [<object>]]" +msgstr "git notes [list [<objeto>]]" + +#: builtin/notes.c:47 +msgid "git notes add [<options>] [<object>]" +msgstr "git notes add [<opciones>] [<objeto>]" + +#: builtin/notes.c:52 +msgid "git notes copy [<options>] <from-object> <to-object>" +msgstr "git notes copy [<opciones>] <objeto-origen> <objeto-destino>" + +#: builtin/notes.c:53 +msgid "git notes copy --stdin [<from-object> <to-object>]..." +msgstr "git notes copy --stdin [<objeto-origen> <objeto-destino>]..." + +#: builtin/notes.c:58 +msgid "git notes append [<options>] [<object>]" +msgstr "git notes append [<opciones>] [<objeto>]" + +#: builtin/notes.c:63 +msgid "git notes edit [<object>]" +msgstr "git notes edit [<objeto>]" + +#: builtin/notes.c:68 +msgid "git notes show [<object>]" +msgstr "git notes show [<objeto>]" + +#: builtin/notes.c:73 +msgid "git notes merge [<options>] <notes-ref>" +msgstr "git notes merge [<opciones>] <referencia-de-notas>" + +#: builtin/notes.c:74 +msgid "git notes merge --commit [<options>]" +msgstr "git notes merge --commit [<opciones>]" + +#: builtin/notes.c:75 +msgid "git notes merge --abort [<options>]" +msgstr "git notes merge --abort [<opciones>]" + +#: builtin/notes.c:80 +msgid "git notes remove [<object>]" +msgstr "git notes remove [<objeto>]" + +#: builtin/notes.c:85 +msgid "git notes prune [<options>]" +msgstr "git notes prune [<opciones>]" + +#: builtin/notes.c:90 +msgid "git notes get-ref" +msgstr "git notes get-ref" + +#: builtin/notes.c:95 +msgid "Write/edit the notes for the following object:" +msgstr "Escribe/edita las notas para los siguientes objetos:" + +#: builtin/notes.c:148 +#, c-format +msgid "unable to start 'show' for object '%s'" +msgstr "incapaz de iniciar 'show' para el objeto '%s'" + +#: builtin/notes.c:152 +msgid "could not read 'show' output" +msgstr "no se pudo leer salida de 'show'" + +#: builtin/notes.c:160 +#, c-format +msgid "failed to finish 'show' for object '%s'" +msgstr "falló la finalización de 'show' para el objeto '%s'" + +#: builtin/notes.c:195 +msgid "please supply the note contents using either -m or -F option" +msgstr "por favor suministrar los contenidos de nota usando la opción -m o -F" + +#: builtin/notes.c:204 +msgid "unable to write note object" +msgstr "incapaz de escribir el objeto de nota" + +#: builtin/notes.c:206 +#, c-format +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 +#, c-format +msgid "cannot read '%s'" +msgstr "no se puede leer '%s'" + +#: builtin/notes.c:236 builtin/tag.c:503 +#, c-format +msgid "could not open or read '%s'" +msgstr "no se pudo abrir o leer '%s'" + +#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308 +#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517 +#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662 +#, c-format +msgid "failed to resolve '%s' as a valid ref." +msgstr "falló al resolver '%s' como ref válida." + +#: builtin/notes.c:258 +#, c-format +msgid "failed to read object '%s'." +msgstr "falló al leer objeto '%s'." + +#: builtin/notes.c:262 +#, c-format +msgid "cannot read note data from non-blob object '%s'." +msgstr "no se puede leer la data de la nota de un objeto no-blob '%s'." + +#: builtin/notes.c:302 +#, c-format +msgid "malformed input line: '%s'." +msgstr "línea de entrada mal formada: '%s'." + +#: builtin/notes.c:317 +#, c-format +msgid "failed to copy notes from '%s' to '%s'" +msgstr "falló al copiar notas de '%s' a '%s'" + +#. TRANSLATORS: the first %s will be replaced by a git +#. notes command: 'add', 'merge', 'remove', etc. +#. +#: builtin/notes.c:349 +#, c-format +msgid "refusing to %s notes in %s (outside of refs/notes/)" +msgstr "rechazando %s notas en %s (fuera de refs/notes/)" + +#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500 +#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655 +#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973 +msgid "too many parameters" +msgstr "demasiados parámetros" + +#: builtin/notes.c:382 builtin/notes.c:668 +#, c-format +msgid "no note found for object %s." +msgstr "no se encontraron notas para objeto %s." + +#: builtin/notes.c:403 builtin/notes.c:566 +msgid "note contents as a string" +msgstr "contenidos de la nota como cadena" + +#: builtin/notes.c:406 builtin/notes.c:569 +msgid "note contents in a file" +msgstr "contenidos de la nota en un archivo" + +#: builtin/notes.c:409 builtin/notes.c:572 +msgid "reuse and edit specified note object" +msgstr "reutilizar y editar el objeto de nota especificada" + +#: builtin/notes.c:412 builtin/notes.c:575 +msgid "reuse specified note object" +msgstr "reutilizar el objeto de nota especificado" + +#: builtin/notes.c:415 builtin/notes.c:578 +msgid "allow storing empty note" +msgstr "permitir almacenar nota vacía" + +#: builtin/notes.c:416 builtin/notes.c:487 +msgid "replace existing notes" +msgstr "reemplazar notas existentes" + +#: builtin/notes.c:441 +#, c-format +msgid "" +"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "" +"No se puede agregar notas. Se encontró notas existentes para objeto %s. Use " +"'-f' para sobrescribir las notas existentes" + +#: builtin/notes.c:456 builtin/notes.c:535 +#, c-format +msgid "Overwriting existing notes for object %s\n" +msgstr "Sobrescribiendo notas existentes para objeto %s\n" + +#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892 +#, c-format +msgid "Removing note for object %s\n" +msgstr "Removiendo nota para objeto %s\n" + +#: builtin/notes.c:488 +msgid "read objects from stdin" +msgstr "leer objetos desde stdin" + +#: builtin/notes.c:490 +msgid "load rewriting config for <command> (implies --stdin)" +msgstr "cargar configuración de reescritura para <comando> (implica --stdin)" + +#: builtin/notes.c:508 +msgid "too few parameters" +msgstr "muy pocos parámetros" + +#: builtin/notes.c:529 +#, c-format +msgid "" +"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "" +"No se puede copiar notas. Se encontró notas existentes para el objeto %s. " +"Use '-f' para sobrescribir las notes existentes" + +#: builtin/notes.c:541 +#, c-format +msgid "missing notes on source object %s. Cannot copy." +msgstr "faltan notas en la fuente del objeto %s. No se puede copiar." + +#: builtin/notes.c:593 +#, c-format +msgid "" +"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" +"Please use 'git notes add -f -m/-F/-c/-C' instead.\n" +msgstr "" +"Las opciones -m/-F/-c/-C han sido deprecadas por el subcomando 'edit'.\n" +"Por favor use 'git notes add -f -m/-F/-c/-C' en cambio.\n" + +#: builtin/notes.c:688 +msgid "failed to delete ref NOTES_MERGE_PARTIAL" +msgstr "falló al borrar ref NOTES_MERGE_PARTIAL" + +#: builtin/notes.c:690 +msgid "failed to delete ref NOTES_MERGE_REF" +msgstr "falló al borrar ref NOTES_MERGE_REF" + +#: builtin/notes.c:692 +msgid "failed to remove 'git notes merge' worktree" +msgstr "no se pudo eliminar el árbol de trabajo 'git notes merge'" + +#: builtin/notes.c:712 +msgid "failed to read ref NOTES_MERGE_PARTIAL" +msgstr "falló al leer ref NOTES_MERGE_PARTIAL" + +#: builtin/notes.c:714 +msgid "could not find commit from NOTES_MERGE_PARTIAL." +msgstr "no se pudo encontrar commit de NOTES_MERGE_PARTIAL." + +#: builtin/notes.c:716 +msgid "could not parse commit from NOTES_MERGE_PARTIAL." +msgstr "no se pudo analizar commit de NOTES_MERGE_PARTIAL." + +#: builtin/notes.c:729 +msgid "failed to resolve NOTES_MERGE_REF" +msgstr "falló al resolver NOTES_MERGE_REF" + +#: builtin/notes.c:732 +msgid "failed to finalize notes merge" +msgstr "falló al finalizar las notas de fusión" + +#: builtin/notes.c:758 +#, c-format +msgid "unknown notes merge strategy %s" +msgstr "estrategia de fusión de notas %s desconocida" + +#: builtin/notes.c:774 +msgid "General options" +msgstr "Opciones generales" + +#: builtin/notes.c:776 +msgid "Merge options" +msgstr "Opciones de fusión" + +#: builtin/notes.c:778 +msgid "" +"resolve notes conflicts using the given strategy (manual/ours/theirs/union/" +"cat_sort_uniq)" +msgstr "" +"resolver conflictos de notas usando la estrategia entregadas (manual/ours/" +"theirs/union/cat_sort_uniq)" + +#: builtin/notes.c:780 +msgid "Committing unmerged notes" +msgstr "Realizando commit a las notas no fusionadas" + +#: builtin/notes.c:782 +msgid "finalize notes merge by committing unmerged notes" +msgstr "" +"finalizar fusión de notas realizando un commit de las notas no fusionadas" + +#: builtin/notes.c:784 +msgid "Aborting notes merge resolution" +msgstr "Abortando notas de resolución de fusión" + +#: builtin/notes.c:786 +msgid "abort notes merge" +msgstr "abortar notas de fusión" + +#: builtin/notes.c:797 +msgid "cannot mix --commit, --abort or -s/--strategy" +msgstr "no se pueden mezclar --commit, --abort ó -s/--strategy" + +#: builtin/notes.c:802 +msgid "must specify a notes ref to merge" +msgstr "debe espeficiar una ref de notas a fusionar" + +#: builtin/notes.c:826 +#, c-format +msgid "unknown -s/--strategy: %s" +msgstr "--strategy/-s desconocida: %s" + +#: builtin/notes.c:863 +#, c-format +msgid "a notes merge into %s is already in-progress at %s" +msgstr "una fusión de notas en %s ya está en progreso en %s" + +#: builtin/notes.c:866 +#, c-format +msgid "failed to store link to current notes ref (%s)" +msgstr "falló al guardar un link para el ref de notas actual (%s)" + +#: builtin/notes.c:868 +#, c-format +msgid "" +"Automatic notes merge failed. Fix conflicts in %s and commit the result with " +"'git notes merge --commit', or abort the merge with 'git notes merge --" +"abort'.\n" +msgstr "" +"Fusión automática de notas falló. Arregle conflictos en %s y realice un " +"commit con el resultado 'git notes merge --commit', o aborte la fusión con " +"'git notes merge --abort'.\n" + +#: builtin/notes.c:890 +#, c-format +msgid "Object %s has no note\n" +msgstr "El objeto %s no tiene notas\n" + +#: builtin/notes.c:902 +msgid "attempt to remove non-existent note is not an error" +msgstr "intentar remover una nota no existente no es un error" + +#: builtin/notes.c:905 +msgid "read object names from the standard input" +msgstr "leer nombres de objetos de standard input" + +#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:146 +msgid "do not remove, show only" +msgstr "no remover, solo mostrar" + +#: builtin/notes.c:944 +msgid "report pruned notes" +msgstr "reportar notas recortadas" + +#: builtin/notes.c:986 +msgid "notes-ref" +msgstr "referencia-de-notas" + +#: builtin/notes.c:987 +msgid "use notes from <notes-ref>" +msgstr "usar notas desde <referencia-de-notas>" + +#: builtin/notes.c:1022 +#, c-format +msgid "unknown subcommand: %s" +msgstr "subcomando desconocido: %s" + +#: builtin/pack-objects.c:31 +msgid "" +"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" +msgstr "" +"git pack-objects --stdout [<opciones>...] [< <lista-de-ref> | < <lista-de-" +"objetos>]" + +#: builtin/pack-objects.c:32 +msgid "" +"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" +msgstr "" +"git pack-objects [<opciones>...] <nombre-base> [< <lista-de-refs> | < <lista-" +"de-objetos>]" + +#: builtin/pack-objects.c:181 builtin/pack-objects.c:184 +#, c-format +msgid "deflate error (%d)" +msgstr "error al desinflar (%d)" + +#: builtin/pack-objects.c:777 +msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" +msgstr "" +"deshabilitando escritura bitmap, paquetes son divididos debido a pack." +"packSizeLimit" + +#: builtin/pack-objects.c:790 +msgid "Writing objects" +msgstr "Escribiendo objetos" + +#: builtin/pack-objects.c:1070 +msgid "disabling bitmap writing, as some objects are not being packed" +msgstr "" +"deshabilitando escritura bitmap, ya que algunos objetos no están siendo " +"empaquetados" + +#: builtin/pack-objects.c:2440 +msgid "Compressing objects" +msgstr "Comprimiendo objetos" + +#: builtin/pack-objects.c:2849 +#, c-format +msgid "unsupported index version %s" +msgstr "versión de índice no soportada %s" + +#: builtin/pack-objects.c:2853 +#, c-format +msgid "bad index version '%s'" +msgstr "mala versión del índice '%s'" + +#: builtin/pack-objects.c:2883 +msgid "do not show progress meter" +msgstr "no mostrar medidor de progreso" + +#: builtin/pack-objects.c:2885 +msgid "show progress meter" +msgstr "mostrar medidor de progreso" + +#: builtin/pack-objects.c:2887 +msgid "show progress meter during object writing phase" +msgstr "mostrar medidor de progreso durante la fase de escritura de objeto" + +#: builtin/pack-objects.c:2890 +msgid "similar to --all-progress when progress meter is shown" +msgstr "similar a --all-progress cuando medidor de progreso es mostrado" + +#: builtin/pack-objects.c:2891 +msgid "version[,offset]" +msgstr "versión[,offset]" + +#: builtin/pack-objects.c:2892 +msgid "write the pack index file in the specified idx format version" +msgstr "" +"escribir el índice de paquete en la versión de formato idx especificado" + +#: builtin/pack-objects.c:2895 +msgid "maximum size of each output pack file" +msgstr "tamaño máximo de cada paquete resultante" + +#: builtin/pack-objects.c:2897 +msgid "ignore borrowed objects from alternate object store" +msgstr "ignorar objetos prestados de otros almacenes de objetos" + +#: builtin/pack-objects.c:2899 +msgid "ignore packed objects" +msgstr "ignorar objetos paquete" + +#: builtin/pack-objects.c:2901 +msgid "limit pack window by objects" +msgstr "limitar ventana de paquete por objetos" + +#: builtin/pack-objects.c:2903 +msgid "limit pack window by memory in addition to object limit" +msgstr "limitar ventana de paquete por memoria en adición a límite de objetos" + +#: builtin/pack-objects.c:2905 +msgid "maximum length of delta chain allowed in the resulting pack" +msgstr "longitud máxima de cadena delta permitida en el paquete resultante" + +#: builtin/pack-objects.c:2907 +msgid "reuse existing deltas" +msgstr "reusar deltas existentes" + +#: builtin/pack-objects.c:2909 +msgid "reuse existing objects" +msgstr "reutilizar objetos existentes" + +#: builtin/pack-objects.c:2911 +msgid "use OFS_DELTA objects" +msgstr "usar objetos OFS_DELTA" + +#: builtin/pack-objects.c:2913 +msgid "use threads when searching for best delta matches" +msgstr "usar hilos cuando se busque para mejores concordancias de delta" + +#: builtin/pack-objects.c:2915 +msgid "do not create an empty pack output" +msgstr "no crear un paquete resultante vacío" + +#: builtin/pack-objects.c:2917 +msgid "read revision arguments from standard input" +msgstr "leer argumentos de revisión de standard input" + +#: builtin/pack-objects.c:2919 +msgid "limit the objects to those that are not yet packed" +msgstr "limitar los objetos a aquellos que no han sido empaquetados todavía" + +#: builtin/pack-objects.c:2922 +msgid "include objects reachable from any reference" +msgstr "incluir objetos alcanzables por cualquier referencia" + +#: builtin/pack-objects.c:2925 +msgid "include objects referred by reflog entries" +msgstr "incluir objetos referidos por entradas de reflog" + +#: builtin/pack-objects.c:2928 +msgid "include objects referred to by the index" +msgstr "incluir objetos referidos por el índice" + +#: builtin/pack-objects.c:2931 +msgid "output pack to stdout" +msgstr "mostrar paquete en stdout" + +#: builtin/pack-objects.c:2933 +msgid "include tag objects that refer to objects to be packed" +msgstr "incluir objetos tag que refieren a objetos a ser empaquetados" + +#: builtin/pack-objects.c:2935 +msgid "keep unreachable objects" +msgstr "mantener objetos inalcanzables" + +#: builtin/pack-objects.c:2937 +msgid "pack loose unreachable objects" +msgstr "empaquetar objetos sueltos inalcanzables" + +#: builtin/pack-objects.c:2939 +msgid "unpack unreachable objects newer than <time>" +msgstr "desempaquetar objetos inalcanzables más nuevos que <tiempo>" + +#: builtin/pack-objects.c:2942 +msgid "create thin packs" +msgstr "crear paquetes delgados" + +#: builtin/pack-objects.c:2944 +msgid "create packs suitable for shallow fetches" +msgstr "crear paquetes adecuados para fetches superficiales" + +#: builtin/pack-objects.c:2946 +msgid "ignore packs that have companion .keep file" +msgstr "ignorar paquetes que tienen un archivo .keep acompañante" + +#: builtin/pack-objects.c:2948 +msgid "pack compression level" +msgstr "nivel de compresión del paquete" + +#: builtin/pack-objects.c:2950 +msgid "do not hide commits by grafts" +msgstr "no ocultar commits por injertos" + +#: builtin/pack-objects.c:2952 +msgid "use a bitmap index if available to speed up counting objects" +msgstr "" +"usar un índice bitmap si está disponible para acelerar la cuenta de objetos" + +#: builtin/pack-objects.c:2954 +msgid "write a bitmap index together with the pack index" +msgstr "escribir un índice de bitmap junto al índice de paquete" + +#: builtin/pack-objects.c:3081 +msgid "Counting objects" +msgstr "Contando objetos" + +#: builtin/pack-refs.c:6 +msgid "git pack-refs [<options>]" +msgstr "git pack-refs [<opciones>]" + +#: builtin/pack-refs.c:14 +msgid "pack everything" +msgstr "empaquetar todo" + +#: builtin/pack-refs.c:15 +msgid "prune loose refs (default)" +msgstr "recortar refs perdidos (default)" + +#: builtin/prune-packed.c:8 +msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" +msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" + +#: builtin/prune-packed.c:41 +msgid "Removing duplicate objects" +msgstr "Removiendo objetos duplicados" + +#: builtin/prune.c:11 +msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" +msgstr "git prune [-n] [-v] [--expire <tiempo>] [--] [<head>...]" + +#: builtin/prune.c:106 +msgid "report pruned objects" +msgstr "reportar objetos recortados" + +#: builtin/prune.c:109 +msgid "expire objects older than <time>" +msgstr "expirar objetos más viejos a <tiempo>" + +#: builtin/prune.c:123 +msgid "cannot prune in a precious-objects repo" +msgstr "no se puede recortar en un repositorio de objetos-preciosos" + +#: builtin/pull.c:54 builtin/pull.c:56 +#, c-format +msgid "Invalid value for %s: %s" +msgstr "Valor inválido para %s: %s" + +#: builtin/pull.c:76 +msgid "git pull [<options>] [<repository> [<refspec>...]]" +msgstr "" +"git pull [<opciones>] [<repositorio> [<especificacion-de-referencia>...]]" + +#: builtin/pull.c:124 +msgid "control for recursive fetching of submodules" +msgstr "control de fetch recursivo en submódulos" + +#: builtin/pull.c:128 +msgid "Options related to merging" +msgstr "Opciones relacionadas a fusión" + +#: builtin/pull.c:131 +msgid "incorporate changes by rebasing rather than merging" +msgstr "incorporar cambios por rebase en lugar de fusión" + +#: builtin/pull.c:155 builtin/rebase--helper.c:21 builtin/revert.c:121 +msgid "allow fast-forward" +msgstr "permitir fast-forward" + +#: builtin/pull.c:164 +msgid "automatically stash/stash pop before and after rebase" +msgstr "ejecutar automáticamente stash/stash pop antes y después de rebase" + +#: builtin/pull.c:180 +msgid "Options related to fetching" +msgstr "Opciones relacionadas a fetch" + +#: builtin/pull.c:198 +msgid "number of submodules pulled in parallel" +msgstr "número de submódules que realizan pull en paralelo" + +#: builtin/pull.c:287 +#, c-format +msgid "Invalid value for pull.ff: %s" +msgstr "valor inválido para pull.ff: %s" + +#: builtin/pull.c:403 +msgid "" +"There is no candidate for rebasing against among the refs that you just " +"fetched." +msgstr "No hay candidato para rebasar entre las refs que has bajado con fetch." + +#: builtin/pull.c:405 +msgid "" +"There are no candidates for merging among the refs that you just fetched." +msgstr "" +"No hay candidatos para fusionar entre las refs que has bajado con fetch." + +#: builtin/pull.c:406 +msgid "" +"Generally this means that you provided a wildcard refspec which had no\n" +"matches on the remote end." +msgstr "" +"Generalmente esto significa que has proveído un wildcard de refspec que no " +"tiene\n" +"concordancia en el final remoto." + +#: builtin/pull.c:409 +#, c-format +msgid "" +"You asked to pull from the remote '%s', but did not specify\n" +"a branch. Because this is not the default configured remote\n" +"for your current branch, you must specify a branch on the command line." +msgstr "" +"Se ha solicitado un pull del remoto '%s', pero no se ha especificado\n" +"una rama. Porque este no es el remoto configurado por default\n" +"para tu rama actual, tienes que especificar una rama en la línea de comando." + +#: builtin/pull.c:414 git-parse-remote.sh:73 +msgid "You are not currently on a branch." +msgstr "No te encuentras actualmente en la rama." + +#: builtin/pull.c:416 builtin/pull.c:431 git-parse-remote.sh:79 +msgid "Please specify which branch you want to rebase against." +msgstr "Por favor especifica a qué rama quieres rebasar." + +#: builtin/pull.c:418 builtin/pull.c:433 git-parse-remote.sh:82 +msgid "Please specify which branch you want to merge with." +msgstr "Por favor especifica a qué rama quieres fusionar." + +#: builtin/pull.c:419 builtin/pull.c:434 +msgid "See git-pull(1) for details." +msgstr "Ver git-pull(1) para detalles." + +#: builtin/pull.c:421 builtin/pull.c:427 builtin/pull.c:436 +#: git-parse-remote.sh:64 +msgid "<remote>" +msgstr "<remoto>" + +#: builtin/pull.c:421 builtin/pull.c:436 builtin/pull.c:441 git-rebase.sh:466 +#: git-parse-remote.sh:65 +msgid "<branch>" +msgstr "<rama>" + +#: builtin/pull.c:429 git-parse-remote.sh:75 +msgid "There is no tracking information for the current branch." +msgstr "No hay información de rastreo para la rama actual." + +#: builtin/pull.c:438 git-parse-remote.sh:95 +msgid "" +"If you wish to set tracking information for this branch you can do so with:" +msgstr "" +"Si deseas configurar el rastreo de información para esta rama, puedes " +"hacerlo con:" + +#: builtin/pull.c:443 +#, c-format +msgid "" +"Your configuration specifies to merge with the ref '%s'\n" +"from the remote, but no such ref was fetched." +msgstr "" +"Tu configuración especifica fusionar con la ref '%s'\n" +"de tu remoto, pero no se pudo hacer fetch a esa ref." + +#: builtin/pull.c:796 +msgid "ignoring --verify-signatures for rebase" +msgstr "ignorando --verify-signatures para rebase" + +#: builtin/pull.c:844 +msgid "--[no-]autostash option is only valid with --rebase." +msgstr "La opción --[no-]autostash sólo es válida con --rebase." + +#: builtin/pull.c:852 +msgid "Updating an unborn branch with changes added to the index." +msgstr "Actualizando una rama no nata con cambios agregados al índice." + +#: builtin/pull.c:855 +msgid "pull with rebase" +msgstr "pull con rebase" + +#: builtin/pull.c:856 +msgid "please commit or stash them." +msgstr "por favor realiza un commit o un stash con ellos." + +#: builtin/pull.c:881 +#, c-format +msgid "" +"fetch updated the current branch head.\n" +"fast-forwarding your working tree from\n" +"commit %s." +msgstr "" +"fetch actualizó el head de la rama actual.\n" +"realizando fast-forward al árbol de trabajo\n" +"desde commit %s." + +#: builtin/pull.c:886 +#, c-format +msgid "" +"Cannot fast-forward your working tree.\n" +"After making sure that you saved anything precious from\n" +"$ git diff %s\n" +"output, run\n" +"$ git reset --hard\n" +"to recover." +msgstr "" +"No se puede realizar fast-forward en tu árbol de trabajo.\n" +"Tras asegurarse que ha guardado todo lo preciado de la salida de\n" +"$ git diff %s\n" +",ejecute\n" +"$ git reset --hard\n" +"para recuperar." + +#: builtin/pull.c:901 +msgid "Cannot merge multiple branches into empty head." +msgstr "No se puede fusionar múltiples ramas en un head vacío." + +#: builtin/pull.c:905 +msgid "Cannot rebase onto multiple branches." +msgstr "No se puede rebasar en multiples ramas." + +#: builtin/pull.c:912 +msgid "cannot rebase with locally recorded submodule modifications" +msgstr "" +"no se puede rebasar con modificaciones de submódulos grabadas localmente" + +#: builtin/push.c:17 +msgid "git push [<options>] [<repository> [<refspec>...]]" +msgstr "" +"git push [<opciones>] [<repositorio> [<especificaciones-de-refrencia>...]]" + +#: builtin/push.c:90 +msgid "tag shorthand without <tag>" +msgstr "taquigrafía de tag sin <tag>" + +#: builtin/push.c:100 +msgid "--delete only accepts plain target ref names" +msgstr "--delete solo acepta como objetivos nombres de ref planos" + +#: builtin/push.c:144 +msgid "" +"\n" +"To choose either option permanently, see push.default in 'git help config'." +msgstr "" +"\n" +"Para elegir si la opcion es permanente, mira push.default en 'git help " +"config'." + +#: builtin/push.c:147 +#, c-format +msgid "" +"The upstream branch of your current branch does not match\n" +"the name of your current branch. To push to the upstream branch\n" +"on the remote, use\n" +"\n" +" git push %s HEAD:%s\n" +"\n" +"To push to the branch of the same name on the remote, use\n" +"\n" +" git push %s %s\n" +"%s" +msgstr "" +"La rama upstream de tu rama actual no concuerda\n" +"con el nombre de tu rama actual. Para hacer un push a la rama upstream\n" +"en el remoto, ejecuta\n" +"\n" +"\tgit push %s HEAD:%s\n" +"\n" +"Para hacer un push a la rama del mismo nombre en el remoto, ejecuta\n" +"\n" +"\tgit push %s %s\n" +"%s" + +#: builtin/push.c:162 +#, c-format +msgid "" +"You are not currently on a branch.\n" +"To push the history leading to the current (detached HEAD)\n" +"state now, use\n" +"\n" +" git push %s HEAD:<name-of-remote-branch>\n" +msgstr "" +"Actualmente no estás en una rama.\n" +"Para hacer un push a la historia que lleva al estado actual\n" +"(HEAD desacoplado), use\n" +"\n" +"\tgit push %s HEAD:<nombre-de-rama-remota>\n" + +#: builtin/push.c:176 +#, c-format +msgid "" +"The current branch %s has no upstream branch.\n" +"To push the current branch and set the remote as upstream, use\n" +"\n" +" git push --set-upstream %s %s\n" +msgstr "" +"La rama actual %s no tiene una rama upstream.\n" +"Para realizar un push de la rama actual y configurar el remoto como " +"upstream, use\n" +"\n" +"\tgit push --set-upstream %s %s\n" + +#: builtin/push.c:184 +#, c-format +msgid "The current branch %s has multiple upstream branches, refusing to push." +msgstr "La rama actual %s tiene múltiples ramas upstream, rechazando el push." + +#: builtin/push.c:187 +#, c-format +msgid "" +"You are pushing to remote '%s', which is not the upstream of\n" +"your current branch '%s', without telling me what to push\n" +"to update which remote branch." +msgstr "" +"Está haciendo un push al remoto '%s', el cual no es el upstream de\n" +"su rama actual '%s', sin decirme qué poner en el push\n" +"para actualizar en qué rama de remoto." + +#: builtin/push.c:246 +msgid "" +"You didn't specify any refspecs to push, and push.default is \"nothing\"." +msgstr "" +"No se especificó ningún refspecs para hacer push, y push.default es \"nada\"." + +#: builtin/push.c:253 +msgid "" +"Updates were rejected because the tip of your current branch is behind\n" +"its remote counterpart. Integrate the remote changes (e.g.\n" +"'git pull ...') before pushing again.\n" +"See the 'Note about fast-forwards' in 'git push --help' for details." +msgstr "" +"Actualizaciones fueron rechazadas porque la punta de tu rama actual esta\n" +"detras de su contraparte remota. Integra los cambios remotos (es decir\n" +"'git pull ...') antes de hacer push de nuevo.\n" +"Mira 'Note about fast-forwards' en 'git push --help' para mas detalles." + +#: builtin/push.c:259 +msgid "" +"Updates were rejected because a pushed branch tip is behind its remote\n" +"counterpart. Check out this branch and integrate the remote changes\n" +"(e.g. 'git pull ...') before pushing again.\n" +"See the 'Note about fast-forwards' in 'git push --help' for details." +msgstr "" +"Actualizaciones fueron rechazadas porque una punta de rama en el push está \n" +"detrás de su contraparte remota. Verifique esta rama e integre los cambios " +"remotos\n" +"(ejem. 'git pull ...') antes de volver a hacer push.\n" +"Vea las 'Notes about fast-forwards' en 'git push --help' para más detalles." + +#: builtin/push.c:265 +msgid "" +"Updates were rejected because the remote contains work that you do\n" +"not have locally. This is usually caused by another repository pushing\n" +"to the same ref. You may want to first integrate the remote changes\n" +"(e.g., 'git pull ...') before pushing again.\n" +"See the 'Note about fast-forwards' in 'git push --help' for details." +msgstr "" +"Actualizaciones fueron rechazadas porque el remoto contiene trabajo que\n" +"no existe localmente. Esto es causado usuallmente por otro repositorio \n" +"realizando push a la misma ref. Quizás quiera integrar primero los cambios\n" +"remotos (ejem. 'git pull ...') antes de volver a hacer push.\n" +"Vea 'Notes about fast-forwards0 en 'git push --help' para detalles." + +#: builtin/push.c:272 +msgid "Updates were rejected because the tag already exists in the remote." +msgstr "" +"Actualizaciones fueron rechazadas porque el tag ya existe en el remoto." + +#: builtin/push.c:275 +msgid "" +"You cannot update a remote ref that points at a non-commit object,\n" +"or update a remote ref to make it point at a non-commit object,\n" +"without using the '--force' option.\n" +msgstr "" +"No puede actualizar un ref remoto que apunta a un objeto no-commit,\n" +"o actualizar un ref remoto para hacer que apunte a un objeto no-commit,\n" +"sin usar la opción '--force'.\n" + +#: builtin/push.c:335 +#, c-format +msgid "Pushing to %s\n" +msgstr "Hacienod push a %s\n" + +#: builtin/push.c:339 +#, c-format +msgid "failed to push some refs to '%s'" +msgstr "fallo el push de algunas referencias a '%s'" + +#: builtin/push.c:370 +#, c-format +msgid "bad repository '%s'" +msgstr "mal repositorio '%s'" + +#: builtin/push.c:371 +msgid "" +"No configured push destination.\n" +"Either specify the URL from the command-line or configure a remote " +"repository using\n" +"\n" +" git remote add <name> <url>\n" +"\n" +"and then push using the remote name\n" +"\n" +" git push <name>\n" +msgstr "" +"No se ha configurado un destino para el push.\n" +"Puedes o especificar una URL desde la linea de comandos o configurar " +"unrepositorio remoto usando\n" +"\n" +" git remote add <nombre> <url>\n" +"\n" +"y luego haciendo push al nombre del remoto\n" +"\n" +" git push <nombre>\n" + +#: builtin/push.c:389 +msgid "--all and --tags are incompatible" +msgstr "--all y --tags son incompatibles" + +#: builtin/push.c:390 +msgid "--all can't be combined with refspecs" +msgstr "--all no puede ser combinada con refspecs" + +#: builtin/push.c:395 +msgid "--mirror and --tags are incompatible" +msgstr "--mirror y --tags son incompatibles" + +#: builtin/push.c:396 +msgid "--mirror can't be combined with refspecs" +msgstr "--mirror no puede ser combinado con refspecs" + +#: builtin/push.c:401 +msgid "--all and --mirror are incompatible" +msgstr "--all y --mirror son incompatibles" + +#: builtin/push.c:523 +msgid "repository" +msgstr "repositorio" + +#: builtin/push.c:524 builtin/send-pack.c:163 +msgid "push all refs" +msgstr "realizar push a todas las refs" + +#: builtin/push.c:525 builtin/send-pack.c:165 +msgid "mirror all refs" +msgstr "realizar mirror a todas las refs" + +#: builtin/push.c:527 +msgid "delete refs" +msgstr "borrar refs" + +#: builtin/push.c:528 +msgid "push tags (can't be used with --all or --mirror)" +msgstr "realizar push a tags (no puede ser usado con --all o --mirror)" + +#: builtin/push.c:531 builtin/send-pack.c:166 +msgid "force updates" +msgstr "forzar actualizaciones" + +#: builtin/push.c:533 builtin/send-pack.c:180 +msgid "refname>:<expect" +msgstr "refname>:<expect" + +#: builtin/push.c:534 builtin/send-pack.c:181 +msgid "require old value of ref to be at this value" +msgstr "requiere haber valor viejo de ref en este valor" + +#: builtin/push.c:537 +msgid "control recursive pushing of submodules" +msgstr "controlar push recursivo de submódulos" + +#: builtin/push.c:539 builtin/send-pack.c:174 +msgid "use thin pack" +msgstr "usar empaquetado delgado" + +#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160 +#: builtin/send-pack.c:161 +msgid "receive pack program" +msgstr "recibir programa de paquete" + +#: builtin/push.c:542 +msgid "set upstream for git pull/status" +msgstr "configurar upstream para git pulll/status" + +#: builtin/push.c:545 +msgid "prune locally removed refs" +msgstr "recortando refs removidas localmente" + +#: builtin/push.c:547 +msgid "bypass pre-push hook" +msgstr "hacer un bypass al hook pre-push" + +#: builtin/push.c:548 +msgid "push missing but relevant tags" +msgstr "realizar push de tags faltantes pero relevantes" + +#: builtin/push.c:551 builtin/send-pack.c:168 +msgid "GPG sign the push" +msgstr "firmar con GPG el push" + +#: builtin/push.c:553 builtin/send-pack.c:175 +msgid "request atomic transaction on remote side" +msgstr "solicitar transacción atómica en el lado remoto" + +#: builtin/push.c:554 builtin/send-pack.c:171 +msgid "server-specific" +msgstr "especifico-de-servidor" + +#: builtin/push.c:554 builtin/send-pack.c:172 +msgid "option to transmit" +msgstr "opción para trasmitir" + +#: builtin/push.c:568 +msgid "--delete is incompatible with --all, --mirror and --tags" +msgstr "--delete es incompatible con --all, --mirror y --tags" + +#: builtin/push.c:570 +msgid "--delete doesn't make sense without any refs" +msgstr "--delete no tiene sentido sin ninguna referencia" + +#: builtin/push.c:589 +msgid "push options must not have new line characters" +msgstr "opciones de push no pueden tener caracteres de línea nueva" + +#: builtin/read-tree.c:40 +msgid "" +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " +"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" +"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" +msgstr "" +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --" +"prefix=<prefijo>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-" +"sparse-checkout] [--index-output=<archivo>] (--empty | <arbol-ismo1> [<arbol-" +"ismo2> [<arbol-ismo3>]])" + +#: builtin/read-tree.c:121 +msgid "write resulting index to <file>" +msgstr "escribir índice resultante en <archivo>" + +#: builtin/read-tree.c:124 +msgid "only empty the index" +msgstr "solo vaciar el índice" + +#: builtin/read-tree.c:126 +msgid "Merging" +msgstr "Fusionando" + +#: builtin/read-tree.c:128 +msgid "perform a merge in addition to a read" +msgstr "realizar un merge en adición a una lectura" + +#: builtin/read-tree.c:130 +msgid "3-way merge if no file level merging required" +msgstr "fusión de 3-vías si no se requiere ninguna fusión a nivel de archivo" + +#: builtin/read-tree.c:132 +msgid "3-way merge in presence of adds and removes" +msgstr "fusión en 3-vías en presencia de adiciones y remociones" + +#: builtin/read-tree.c:134 +msgid "same as -m, but discard unmerged entries" +msgstr "igual que -m, pero descarta entradas sin fusionar" + +#: builtin/read-tree.c:135 +msgid "<subdirectory>/" +msgstr "<subdirectorio>/" + +#: builtin/read-tree.c:136 +msgid "read the tree into the index under <subdirectory>/" +msgstr "lea el árbol en el índice bajo <subdirectorio>/" + +#: builtin/read-tree.c:139 +msgid "update working tree with merge result" +msgstr "actualiza el árbol de trabajo con el resultado de la fusión" + +#: builtin/read-tree.c:141 +msgid "gitignore" +msgstr "gitignore" + +#: builtin/read-tree.c:142 +msgid "allow explicitly ignored files to be overwritten" +msgstr "permitir sobrescritura de archivos explícitamente ignorados" + +#: builtin/read-tree.c:145 +msgid "don't check the working tree after merging" +msgstr "no revisar el árbol de trabajo tras fusionar" + +#: builtin/read-tree.c:146 +msgid "don't update the index or the work tree" +msgstr "no actualizar el índice o el árbol de trabajo" + +#: builtin/read-tree.c:148 +msgid "skip applying sparse checkout filter" +msgstr "saltar aplicado de filtro de sparse checkout" + +#: builtin/read-tree.c:150 +msgid "debug unpack-trees" +msgstr "debug de árboles-desempacados" + +#: builtin/rebase--helper.c:8 +msgid "git rebase--helper [<options>]" +msgstr "git rebase--helper [<opciones>]" + +#: builtin/rebase--helper.c:22 +msgid "keep empty commits" +msgstr "mantener commits vacíos" + +#: builtin/rebase--helper.c:23 +msgid "continue rebase" +msgstr "continuar rebase" + +#: builtin/rebase--helper.c:25 +msgid "abort rebase" +msgstr "abortar rebase" + +#: builtin/rebase--helper.c:28 +msgid "make rebase script" +msgstr "generar script de rebase" + +#: builtin/rebase--helper.c:30 +msgid "shorten SHA-1s in the todo list" +msgstr "SHA-1s cortos en la lista de pendientes" + +#: builtin/rebase--helper.c:32 +msgid "expand SHA-1s in the todo list" +msgstr "SHA-1s expandidos en la lista de pendientes" + +#: builtin/rebase--helper.c:34 +msgid "check the todo list" +msgstr "revisar la lista de pendientes" + +#: builtin/rebase--helper.c:36 +msgid "skip unnecessary picks" +msgstr "saltar los picks innecesarios" + +#: builtin/rebase--helper.c:38 +msgid "rearrange fixup/squash lines" +msgstr "reorganizar líneas fixup/squash" + +#: builtin/receive-pack.c:29 +msgid "git receive-pack <git-dir>" +msgstr "git receive-pack <git-dir>" + +#: builtin/receive-pack.c:839 +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" +"with what you pushed, and will require 'git reset --hard' to match\n" +"the work tree to HEAD.\n" +"\n" +"You can set the 'receive.denyCurrentBranch' configuration variable\n" +"to 'ignore' or 'warn' in the remote repository to allow pushing into\n" +"its current branch; however, this is not recommended unless you\n" +"arranged to update its work tree to match what you pushed in some\n" +"other way.\n" +"\n" +"To squelch this message and still keep the default behaviour, set\n" +"'receive.denyCurrentBranch' configuration variable to 'refuse'." +msgstr "" +"Por default, actualizar la rama actual en un repositorio no vacío\n" +"está denegado, porque eso haría el índice y el árbol de trabajo " +"inconsistentes\n" +"con lo que ya se ha hecho push, y requeriría 'git reset --hard' para " +"arreglar\n" +"el árbol de trabajo con HEAD.\n" +"\n" +"Puede configurar la variable de configuración 'receive.denyCurrentBranch'\n" +"\"ignore\" o \"warn\" en el repositorio remoto para permitir\n" +"su rama actual; Sin embargo, esto no se recomienda a menos que usted\n" +"se haya organizado para actualizar su árbol de trabajo para que coincida con " +"lo que\n" +"enviará con el push de otra manera.\n" +"\n" +"Para suprimir este mensaje y mantener el comportamiento predeterminado,\n" +"configure 'receive.denyCurrentBranch' a 'refuse'." + +#: builtin/receive-pack.c:859 +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" +"\n" +"You can set 'receive.denyDeleteCurrent' configuration variable to\n" +"'warn' or 'ignore' in the remote repository to allow deleting the\n" +"current branch, with or without a warning message.\n" +"\n" +"To squelch this message, you can set it to 'refuse'." +msgstr "" +"Por default, borrar la rama actual está denegado, porque el siguiente\n" +"'git clone' no serultará en ningún archivo revisado, causando confusión.\n" +"\n" +"Se puede configurar la variable 'receive.denyDeleteCurrent' a 'warn' o " +"'ignore'\n" +"en el repositorio remoto para permitir borrar la rama actual.\n" +"con o sin mensaje de advertencia.\n" +"\n" +"Para suprimir este mensaje, puede configurarlo en 'refuse'." + +#: builtin/receive-pack.c:1932 +msgid "quiet" +msgstr "tranquilo" + +#: builtin/receive-pack.c:1946 +msgid "You must specify a directory." +msgstr "Se tiene que especificar un directorio." + +#: builtin/reflog.c:424 +#, c-format +msgid "'%s' for '%s' is not a valid timestamp" +msgstr "'%s' para '%s' no es una marca de tiempo válida" + +#: builtin/reflog.c:541 builtin/reflog.c:546 +#, c-format +msgid "'%s' is not a valid timestamp" +msgstr "'%s' no es una marca de tiempo válida" + +#: builtin/remote.c:13 +msgid "git remote [-v | --verbose]" +msgstr "git remote [-v | --verbose]" + +#: builtin/remote.c:14 +msgid "" +"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" +"mirror=<fetch|push>] <name> <url>" +msgstr "" +"git remote add [-t <rama>] [-m <master>] [-f] [--tags | --no-tags] [--" +"mirror=<fetch|push>] <nombre> <url>" + +#: builtin/remote.c:15 builtin/remote.c:35 +msgid "git remote rename <old> <new>" +msgstr "git remote rename <viejo> <nuevo>" + +#: builtin/remote.c:16 builtin/remote.c:40 +msgid "git remote remove <name>" +msgstr "git remote remove <nombre>" + +#: builtin/remote.c:17 builtin/remote.c:45 +msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" +msgstr "git remote set-head <nombre> (-a | --auto | -d | --delete | <rama>)" + +#: builtin/remote.c:18 +msgid "git remote [-v | --verbose] show [-n] <name>" +msgstr "git remote [-v | --verbose] show [-n] <nombre>" + +#: builtin/remote.c:19 +msgid "git remote prune [-n | --dry-run] <name>" +msgstr "git remote prune [-n | --dry-run] <nombre>" + +#: builtin/remote.c:20 +msgid "" +"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" +msgstr "" +"git remote [-v | --verbose] update [-p | --prune] [(<grupo> | <remoto>)...]" + +#: builtin/remote.c:21 +msgid "git remote set-branches [--add] <name> <branch>..." +msgstr "git remote set-branches [--add] <nombre> <rama>..." + +#: builtin/remote.c:22 builtin/remote.c:71 +msgid "git remote get-url [--push] [--all] <name>" +msgstr "git remote get-url [--push] [--all] <nombre>" + +#: builtin/remote.c:23 builtin/remote.c:76 +msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" +msgstr "git remote set-url [--push] <nombre> <nuevo-url> [<viejo-url>]" + +#: builtin/remote.c:24 builtin/remote.c:77 +msgid "git remote set-url --add <name> <newurl>" +msgstr "git remote set-url --add <nombre> <nuevo-url>" + +#: builtin/remote.c:25 builtin/remote.c:78 +msgid "git remote set-url --delete <name> <url>" +msgstr "git remote set-url --delete <nombre> <url>" + +#: builtin/remote.c:30 +msgid "git remote add [<options>] <name> <url>" +msgstr "git remote add [<opciones>] <nombre> <url>" + +#: builtin/remote.c:50 +msgid "git remote set-branches <name> <branch>..." +msgstr "git remote set-branches <nombre> <rama>..." + +#: builtin/remote.c:51 +msgid "git remote set-branches --add <name> <branch>..." +msgstr "git remote set-branches --add <nombre> <rama>..." + +#: builtin/remote.c:56 +msgid "git remote show [<options>] <name>" +msgstr "git remote show [<opciones>] <nombre>" + +#: builtin/remote.c:61 +msgid "git remote prune [<options>] <name>" +msgstr "git remote prune [<opciones>] <nombre>" + +#: builtin/remote.c:66 +msgid "git remote update [<options>] [<group> | <remote>]..." +msgstr "git remote update [<opciones>] [<grupo> | <remoto>]..." + +#: builtin/remote.c:95 +#, c-format +msgid "Updating %s" +msgstr "Actualizando %s" + +#: builtin/remote.c:127 +msgid "" +"--mirror is dangerous and deprecated; please\n" +"\t use --mirror=fetch or --mirror=push instead" +msgstr "" +"Usar --mirror es peligroso y está desaprobado;\n" +"\t usa más bien --mirror=fetch o --mirror=push" + +#: builtin/remote.c:144 +#, c-format +msgid "unknown mirror argument: %s" +msgstr "argumento mirror desconocido: %s" + +#: builtin/remote.c:160 +msgid "fetch the remote branches" +msgstr "realizar fetch a las ramas remotas" + +#: builtin/remote.c:162 +msgid "import all tags and associated objects when fetching" +msgstr "importar todos los tags y objetos asociados cuando realiza el fetch" + +#: builtin/remote.c:165 +msgid "or do not fetch any tag at all (--no-tags)" +msgstr "o no realziar fetch a ningún tag (--no-tags)" + +#: builtin/remote.c:167 +msgid "branch(es) to track" +msgstr "rama(s) para rastrear" + +#: builtin/remote.c:168 +msgid "master branch" +msgstr "rama master" + +#: builtin/remote.c:169 +msgid "push|fetch" +msgstr "push|fetch" + +#: builtin/remote.c:170 +msgid "set up remote as a mirror to push to or fetch from" +msgstr "" +"configurar remote como mirror para realizar push o desde el cual realizar " +"fetch" + +#: builtin/remote.c:182 +msgid "specifying a master branch makes no sense with --mirror" +msgstr "especificar una rama master no tiene sentido con --mirror" + +#: builtin/remote.c:184 +msgid "specifying branches to track makes sense only with fetch mirrors" +msgstr "especificar ramas para rastrear solo tiene sentido con fetch mirrors" + +#: builtin/remote.c:191 builtin/remote.c:631 +#, c-format +msgid "remote %s already exists." +msgstr "remoto %s ya existe." + +#: builtin/remote.c:195 builtin/remote.c:635 +#, c-format +msgid "'%s' is not a valid remote name" +msgstr "'%s' no es un nombre remoto válido" + +#: builtin/remote.c:235 +#, c-format +msgid "Could not setup master '%s'" +msgstr "No se pudo configurar master '%s'" + +#: builtin/remote.c:337 +#, c-format +msgid "Could not get fetch map for refspec %s" +msgstr "No se pudo realizar el fetch al mapa para refspec %s" + +#: builtin/remote.c:438 builtin/remote.c:446 +msgid "(matching)" +msgstr "(concordando)" + +#: builtin/remote.c:450 +msgid "(delete)" +msgstr "(eliminar)" + +#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858 +#, c-format +msgid "No such remote: %s" +msgstr "No existe el remoto: %s" + +#: builtin/remote.c:641 +#, c-format +msgid "Could not rename config section '%s' to '%s'" +msgstr "No se pudo renombrar la sección de configuración '%s' a '%s'" + +#: builtin/remote.c:661 +#, c-format +msgid "" +"Not updating non-default fetch refspec\n" +"\t%s\n" +"\tPlease update the configuration manually if necessary." +msgstr "" +"No se actualizan refspec de fetch no predeterminada\n" +"\t%s\n" +"\tPor favor actualice la configuración manualmente si es necesario." + +#: builtin/remote.c:697 +#, c-format +msgid "deleting '%s' failed" +msgstr "borrando '%s' falló" + +#: builtin/remote.c:731 +#, c-format +msgid "creating '%s' failed" +msgstr "creando '%s' falló" + +#: builtin/remote.c:796 +msgid "" +"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" +"to delete it, use:" +msgid_plural "" +"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" +"to delete them, use:" +msgstr[0] "" +"Nota: Una rama fuera de la jerarquía refs/remotes/ no fue removida;\n" +"para borrarla, use:" +msgstr[1] "" +"Nota: Algunas ramas fuera de la jerarquía refs/remotes/ no fueron " +"removidas;\n" +"para borrarlas, use:" + +#: builtin/remote.c:810 +#, c-format +msgid "Could not remove config section '%s'" +msgstr "No se pudo borrar la sección de configuración '%s'" + +#: builtin/remote.c:911 +#, c-format +msgid " new (next fetch will store in remotes/%s)" +msgstr " nuevo (siguiente fetch se guardará en remotes/%s)" + +#: builtin/remote.c:914 +msgid " tracked" +msgstr " rastreada" + +#: builtin/remote.c:916 +msgid " stale (use 'git remote prune' to remove)" +msgstr " viejo ( use 'git remote prune' para remover)" + +#: builtin/remote.c:918 +msgid " ???" +msgstr " ???" + +#: builtin/remote.c:959 +#, c-format +msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" +msgstr "invalido branch.%s.merge; no se puede rebasar en > 1 rama" + +#: builtin/remote.c:967 +#, c-format +msgid "rebases interactively onto remote %s" +msgstr "rebasa interactivamente en remoto %s" + +#: builtin/remote.c:968 +#, c-format +msgid "rebases onto remote %s" +msgstr "rebasa sobre el remoto %s" + +#: builtin/remote.c:971 +#, c-format +msgid " merges with remote %s" +msgstr " se fusiona con remoto %s" + +#: builtin/remote.c:974 +#, c-format +msgid "merges with remote %s" +msgstr "fusiona con remoto %s" + +#: builtin/remote.c:977 +#, c-format +msgid "%-*s and with remote %s\n" +msgstr "%-*s y con el remoto %s\n" + +#: builtin/remote.c:1020 +msgid "create" +msgstr "crear" + +#: builtin/remote.c:1023 +msgid "delete" +msgstr "borrar" + +#: builtin/remote.c:1027 +msgid "up to date" +msgstr "actualizado" + +#: builtin/remote.c:1030 +msgid "fast-forwardable" +msgstr "puede realizar fast-forward" + +#: builtin/remote.c:1033 +msgid "local out of date" +msgstr "desactualizado local" + +#: builtin/remote.c:1040 +#, c-format +msgid " %-*s forces to %-*s (%s)" +msgstr " %-*s fuerza a %-*s (%s)" + +#: builtin/remote.c:1043 +#, c-format +msgid " %-*s pushes to %-*s (%s)" +msgstr " %-*s publica a %-*s (%s)" + +#: builtin/remote.c:1047 +#, c-format +msgid " %-*s forces to %s" +msgstr " %-*s fuerza a %s" + +#: builtin/remote.c:1050 +#, c-format +msgid " %-*s pushes to %s" +msgstr " %-*s publica a %s" + +#: builtin/remote.c:1118 +msgid "do not query remotes" +msgstr "no consultar remotos" + +#: builtin/remote.c:1145 +#, c-format +msgid "* remote %s" +msgstr "* remoto %s" + +#: builtin/remote.c:1146 +#, c-format +msgid " Fetch URL: %s" +msgstr " URL para obtener: %s" + +#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302 +msgid "(no URL)" +msgstr "(sin URL)" + +#. TRANSLATORS: the colon ':' should align +#. with the one in " Fetch URL: %s" +#. translation. +#. +#: builtin/remote.c:1161 builtin/remote.c:1163 +#, c-format +msgid " Push URL: %s" +msgstr " URL para publicar: %s" + +#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169 +#, c-format +msgid " HEAD branch: %s" +msgstr " Rama HEAD: %s" + +#: builtin/remote.c:1165 +msgid "(not queried)" +msgstr "(no consultado)" + +#: builtin/remote.c:1167 +msgid "(unknown)" +msgstr "(desconocido)" + +#: builtin/remote.c:1171 +#, c-format +msgid "" +" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" +msgstr "" +" HEAD en rama ( HEAD remoto es ambiguo, puede ser uno de los siguientes):\n" + +#: builtin/remote.c:1183 +#, c-format +msgid " Remote branch:%s" +msgid_plural " Remote branches:%s" +msgstr[0] " Rama remota:%s" +msgstr[1] " Ramas remotas:%s" + +#: builtin/remote.c:1186 builtin/remote.c:1212 +msgid " (status not queried)" +msgstr " (estado no consultado)" + +#: builtin/remote.c:1195 +msgid " Local branch configured for 'git pull':" +msgid_plural " Local branches configured for 'git pull':" +msgstr[0] " Rama local configurada para 'git pull':" +msgstr[1] " Ramas locales configuradas para 'git pull':" + +#: builtin/remote.c:1203 +msgid " Local refs will be mirrored by 'git push'" +msgstr " Las referencias locales serán reflejadas por 'git push'" + +#: builtin/remote.c:1209 +#, c-format +msgid " Local ref configured for 'git push'%s:" +msgid_plural " Local refs configured for 'git push'%s:" +msgstr[0] " Referencia local configurada para 'git push'%s:" +msgstr[1] " Referencias locales configuradas para 'git push'%s:" + +#: builtin/remote.c:1230 +msgid "set refs/remotes/<name>/HEAD according to remote" +msgstr "configurar refs/remotes/<nombre>/HEAD de acuerdo al remoto" + +#: builtin/remote.c:1232 +msgid "delete refs/remotes/<name>/HEAD" +msgstr "borrar refs/remotos/<nombre>/HEAD" + +#: builtin/remote.c:1247 +msgid "Cannot determine remote HEAD" +msgstr "No se puede determinar el HEAD remoto" + +#: builtin/remote.c:1249 +msgid "Multiple remote HEAD branches. Please choose one explicitly with:" +msgstr "Múltiples ramas HEAD remotas. Por favor escoja una explícitamente con:" + +#: builtin/remote.c:1259 +#, c-format +msgid "Could not delete %s" +msgstr "No se pudo borrar %s" + +#: builtin/remote.c:1267 +#, c-format +msgid "Not a valid ref: %s" +msgstr "No es un ref válido: %s" + +#: builtin/remote.c:1269 +#, c-format +msgid "Could not setup %s" +msgstr "No se pudo configurar %s" + +#: builtin/remote.c:1287 +#, c-format +msgid " %s will become dangling!" +msgstr " %s será colgado!" + +#: builtin/remote.c:1288 +#, c-format +msgid " %s has become dangling!" +msgstr " %s ha sido colgado!" + +#: builtin/remote.c:1298 +#, c-format +msgid "Pruning %s" +msgstr "Recortando %s" + +#: builtin/remote.c:1299 +#, c-format +msgid "URL: %s" +msgstr "URL: %s" + +#: builtin/remote.c:1315 +#, c-format +msgid " * [would prune] %s" +msgstr " * [ejecutará prune] %s" + +#: builtin/remote.c:1318 +#, c-format +msgid " * [pruned] %s" +msgstr " * [prune realizado] %s" + +#: builtin/remote.c:1363 +msgid "prune remotes after fetching" +msgstr "recortar remotos tras realizar fetch" + +#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548 +#, c-format +msgid "No such remote '%s'" +msgstr "No existe el remoto '%s'" + +#: builtin/remote.c:1442 +msgid "add branch" +msgstr "agregar rama" + +#: builtin/remote.c:1449 +msgid "no remote specified" +msgstr "no hay remotos especificados" + +#: builtin/remote.c:1466 +msgid "query push URLs rather than fetch URLs" +msgstr "consultar URLs de push en lugar de URLs de fetch" + +#: builtin/remote.c:1468 +msgid "return all URLs" +msgstr "retornar todos los URLs" + +#: builtin/remote.c:1496 +#, c-format +msgid "no URLs configured for remote '%s'" +msgstr "no hay URLs configurados para remoto '%s'" + +#: builtin/remote.c:1522 +msgid "manipulate push URLs" +msgstr "manipular URLs de push" + +#: builtin/remote.c:1524 +msgid "add URL" +msgstr "agregar URL" + +#: builtin/remote.c:1526 +msgid "delete URLs" +msgstr "borrar URLs" + +#: builtin/remote.c:1533 +msgid "--add --delete doesn't make sense" +msgstr "--add --delete no tiene sentido" + +#: builtin/remote.c:1572 +#, c-format +msgid "Invalid old URL pattern: %s" +msgstr "Patrón de URL viejo inválido: %s" + +#: builtin/remote.c:1580 +#, c-format +msgid "No such URL found: %s" +msgstr "No se encontró URL: %s" + +#: builtin/remote.c:1582 +msgid "Will not delete all non-push URLs" +msgstr "No borrará todos los URLs de no-push" + +#: builtin/remote.c:1598 +msgid "be verbose; must be placed before a subcommand" +msgstr "ser verboso; tiene que ser agregado antes de un subcomando" + +#: builtin/remote.c:1629 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "Sub-comando desconocido: %s" + +#: builtin/repack.c:18 +msgid "git repack [<options>]" +msgstr "git repack [<opciones>]" + +#: builtin/repack.c:23 +msgid "" +"Incremental repacks are incompatible with bitmap indexes. Use\n" +"--no-write-bitmap-index or disable the pack.writebitmaps configuration." +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 +msgid "pack everything in a single pack" +msgstr "empaquetar todo en un único paquete" + +#: builtin/repack.c:170 +msgid "same as -a, and turn unreachable objects loose" +msgstr "lo mismo que -a, y pierde objetos inaccesibles" + +#: builtin/repack.c:173 +msgid "remove redundant packs, and run git-prune-packed" +msgstr "remover paquetes redundantes, y ejecutar git-prune-packed" + +#: builtin/repack.c:175 +msgid "pass --no-reuse-delta to git-pack-objects" +msgstr "pasar --no-reuse-delta a git-pack-objects" + +#: builtin/repack.c:177 +msgid "pass --no-reuse-object to git-pack-objects" +msgstr "pasar --no-reuse-object a git-pack-objects" + +#: builtin/repack.c:179 +msgid "do not run git-update-server-info" +msgstr "no ejecutar git-update-server-info" + +#: builtin/repack.c:182 +msgid "pass --local to git-pack-objects" +msgstr "pasar --local a git-pack-objects" + +#: builtin/repack.c:184 +msgid "write bitmap index" +msgstr "escribir un índice de bitmap" + +#: builtin/repack.c:185 +msgid "approxidate" +msgstr "aproxime" + +#: builtin/repack.c:186 +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 +msgid "with -a, repack unreachable objects" +msgstr "con -a, re empaquetar objetos inalcanzables " + +#: builtin/repack.c:190 +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 +msgid "bytes" +msgstr "bytes" + +#: builtin/repack.c:192 +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 +msgid "limits the maximum delta depth" +msgstr "limita la profundidad máxima del delta" + +#: builtin/repack.c:196 +msgid "limits the maximum number of threads" +msgstr "limita el número máximo de hilos" + +#: builtin/repack.c:198 +msgid "maximum size of each packfile" +msgstr "tamaño máximo de cada paquete" + +#: builtin/repack.c:200 +msgid "repack objects in packs marked with .keep" +msgstr "re-empaquetar objetos en paquetes marcados con .keep" + +#: builtin/repack.c:210 +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 +msgid "--keep-unreachable and -A are incompatible" +msgstr "--keep-unreachable y -A son incompatibles" + +#: builtin/repack.c:406 builtin/worktree.c:134 +#, c-format +msgid "failed to remove '%s'" +msgstr "falló al remover '%s'" + +#: builtin/replace.c:20 +msgid "git replace [-f] <object> <replacement>" +msgstr "git replace [-f] <objeto> <remplazo>" + +#: builtin/replace.c:21 +msgid "git replace [-f] --edit <object>" +msgstr "git replace [-f] --edit <objeto>" + +#: builtin/replace.c:22 +msgid "git replace [-f] --graft <commit> [<parent>...]" +msgstr "git replace [-f] --graft <commit> [<padre>...]" + +#: builtin/replace.c:23 +msgid "git replace -d <object>..." +msgstr "git replace -d <objeto>..." + +#: builtin/replace.c:24 +msgid "git replace [--format=<format>] [-l [<pattern>]]" +msgstr "git replace [--format=<formato>] [-l [<patrón>]]" + +#: builtin/replace.c:331 builtin/replace.c:369 builtin/replace.c:397 +#, c-format +msgid "Not a valid object name: '%s'" +msgstr "Nombre de objeto no válido: '%s'" + +#: builtin/replace.c:361 +#, c-format +msgid "bad mergetag in commit '%s'" +msgstr "mal mergetag en commit '%s'" + +#: builtin/replace.c:363 +#, c-format +msgid "malformed mergetag in commit '%s'" +msgstr "mergetag mal formado en commit '%s'" + +#: builtin/replace.c:374 +#, c-format +msgid "" +"original commit '%s' contains mergetag '%s' that is discarded; use --edit " +"instead of --graft" +msgstr "" +"commit original '%s' contiene un mergetag '%s' que es descartado; use --edit " +"en lugar de --graft" + +#: builtin/replace.c:407 +#, c-format +msgid "the original commit '%s' has a gpg signature." +msgstr "el commit original '%s' tiene una firma gpg." + +#: builtin/replace.c:408 +msgid "the signature will be removed in the replacement commit!" +msgstr "la firma será removida en el commit de reemplazo!" + +#: builtin/replace.c:414 +#, c-format +msgid "could not write replacement commit for: '%s'" +msgstr "no se pudo escribir el commit de reemplazo: '%s'" + +#: builtin/replace.c:438 +msgid "list replace refs" +msgstr "listar replace refs " + +#: builtin/replace.c:439 +msgid "delete replace refs" +msgstr "borrar replace refs" + +#: builtin/replace.c:440 +msgid "edit existing object" +msgstr "editar objeto existente" + +#: builtin/replace.c:441 +msgid "change a commit's parents" +msgstr "cambiar un padre de commit" + +#: builtin/replace.c:442 +msgid "replace the ref if it exists" +msgstr "reemplazar el ref si este existe" + +#: builtin/replace.c:443 +msgid "do not pretty-print contents for --edit" +msgstr "no se puede imprimir contenidos para --edit" + +#: builtin/replace.c:444 +msgid "use this format" +msgstr "usar este formato" + +#: builtin/rerere.c:13 +msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" +msgstr "git rerere [clear | forget <ruta>... | status | remaining | diff | gc]" + +#: builtin/rerere.c:59 +msgid "register clean resolutions in index" +msgstr "registrar resoluciones limpias en el índice" + +#: builtin/reset.c:29 +msgid "" +"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" +msgstr "" +"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" + +#: builtin/reset.c:30 +msgid "git reset [-q] [<tree-ish>] [--] <paths>..." +msgstr "git reset [-q] [<arbol-ismo>] [--] <rutas>..." + +#: builtin/reset.c:31 +msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" +msgstr "git reset --patch [<arbol-ismo>] [--] [<rutas>...]" + +#: builtin/reset.c:37 +msgid "mixed" +msgstr "mezclado" + +#: builtin/reset.c:37 +msgid "soft" +msgstr "suave" + +#: builtin/reset.c:37 +msgid "hard" +msgstr "duro" + +#: builtin/reset.c:37 +msgid "merge" +msgstr "fusionar" + +#: builtin/reset.c:37 +msgid "keep" +msgstr "mantener" + +#: builtin/reset.c:78 +msgid "You do not have a valid HEAD." +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" + +#: builtin/reset.c:86 +#, c-format +msgid "Failed to find tree of %s." +msgstr "Falló al encontrar árbol de %s." + +#: builtin/reset.c:113 +#, c-format +msgid "HEAD is now at %s" +msgstr "HEAD está ahora en %s" + +#: builtin/reset.c:197 +#, 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." + +#: builtin/reset.c:297 +msgid "be quiet, only report errors" +msgstr "ser silencioso, solo reportar errores" + +#: builtin/reset.c:299 +msgid "reset HEAD and index" +msgstr "reiniciar HEAD e index" + +#: builtin/reset.c:300 +msgid "reset only HEAD" +msgstr "reiniciar solo HEAD" + +#: builtin/reset.c:302 builtin/reset.c:304 +msgid "reset HEAD, index and working tree" +msgstr "reiniciar HEAD, índice y árbol de trabajo" + +#: builtin/reset.c:306 +msgid "reset HEAD but keep local changes" +msgstr "reiniciar HEAD pero mantener cambios locales" + +#: builtin/reset.c:312 +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 +#, 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 +#, 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 +msgid "--patch is incompatible with --{hard,mixed,soft}" +msgstr "--patch es incompatible con --{hard,mixed,soft}" + +#: builtin/reset.c:355 +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 +#, c-format +msgid "Cannot do %s reset with paths." +msgstr "No se puede hacer un reset %s con rutas." + +#: builtin/reset.c:367 +#, 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 +msgid "-N can only be used with --mixed" +msgstr "-N sólo puede ser usada con --mixed" + +#: builtin/reset.c:388 +msgid "Unstaged changes after reset:" +msgstr "Cambios fuera del área de stage tras el reset:" + +#: builtin/reset.c:394 +#, 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 +msgid "Could not write new index file." +msgstr "No se puede escribir un nuevo archivo índice." + +#: builtin/rev-list.c:361 +msgid "rev-list does not support display of notes" +msgstr "rev-list no soporta mostrar notas" + +#: builtin/rev-parse.c:402 +msgid "git rev-parse --parseopt [<options>] -- [<args>...]" +msgstr "git rev-parse --parseopt [<opciones>] -- [<args>...]" + +#: builtin/rev-parse.c:407 +msgid "keep the `--` passed as an arg" +msgstr "mantener el `--` pasado como un arg" + +#: builtin/rev-parse.c:409 +msgid "stop parsing after the first non-option argument" +msgstr "detener análisis tras el primer argumento que no es opción" + +#: builtin/rev-parse.c:412 +msgid "output in stuck long form" +msgstr "salida en formulario largo de atasco" + +#: builtin/rev-parse.c:545 +msgid "" +"git rev-parse --parseopt [<options>] -- [<args>...]\n" +" or: git rev-parse --sq-quote [<arg>...]\n" +" or: git rev-parse [<options>] [<arg>...]\n" +"\n" +"Run \"git rev-parse --parseopt -h\" for more information on the first usage." +msgstr "" +"git rev-parse --parseopt [<opciones>] -- [<args>...]\n" +" or: git rev-parse --sq-quote [<arg>...]\n" +" or: git rev-parse [<opciones>] [<arg>...]\n" +"\n" +"Ejecute \"git rev-parse --parseopt -h\" para más información sobre el primer " +"uso." + +#: builtin/revert.c:23 +msgid "git revert [<options>] <commit-ish>..." +msgstr "git revert [<opciones>] <commit-ish>..." + +#: builtin/revert.c:24 +msgid "git revert <subcommand>" +msgstr "git revert <subcomando>" + +#: builtin/revert.c:29 +msgid "git cherry-pick [<options>] <commit-ish>..." +msgstr "git cherry-pick [<opciones>] <commit-ish>..." + +#: builtin/revert.c:30 +msgid "git cherry-pick <subcommand>" +msgstr "git cherry-pick <subcomando>" + +#: builtin/revert.c:90 +#, c-format +msgid "%s: %s cannot be used with %s" +msgstr "%s: %s no puede ser usado con %s" + +#: builtin/revert.c:99 +msgid "end revert or cherry-pick sequence" +msgstr "finalizar secuencia revert o cherry-pick" + +#: builtin/revert.c:100 +msgid "resume revert or cherry-pick sequence" +msgstr "resumir secuencia revert o cherry-pick" + +#: builtin/revert.c:101 +msgid "cancel revert or cherry-pick sequence" +msgstr "cancelar secuencia revert o cherry-pick" + +#: builtin/revert.c:102 +msgid "don't automatically commit" +msgstr "no realizar commit de forma automática" + +#: builtin/revert.c:103 +msgid "edit the commit message" +msgstr "editar el mensaje de commit" + +#: builtin/revert.c:106 +msgid "parent-number" +msgstr "número-de-padre" + +#: builtin/revert.c:107 +msgid "select mainline parent" +msgstr "seleccionar el padre principal" + +#: builtin/revert.c:109 +msgid "merge strategy" +msgstr "estrategia de fusión" + +#: builtin/revert.c:110 +msgid "option" +msgstr "opción" + +#: builtin/revert.c:111 +msgid "option for merge strategy" +msgstr "opción para estrategia de fusión" + +#: builtin/revert.c:120 +msgid "append commit name" +msgstr "adjuntar el nombre del commit" + +#: builtin/revert.c:122 +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" + +#: builtin/revert.c:214 +msgid "revert failed" +msgstr "falló al revertir" + +#: builtin/revert.c:227 +msgid "cherry-pick failed" +msgstr "cherry-pick falló" + +#: builtin/rm.c:18 +msgid "git rm [<options>] [--] <file>..." +msgstr "git rm [<opciones>] [--] <archivo>..." + +#: builtin/rm.c:206 +msgid "" +"the following file has staged content different from both the\n" +"file and the HEAD:" +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" +"y a HEAD:" +msgstr[1] "" +"los siguientes archivos tienen contenido diferente a los mismos\n" +"y a HEAD:" + +#: builtin/rm.c:211 +msgid "" +"\n" +"(use -f to force removal)" +msgstr "" +"\n" +"(usa -f para forzar su eliminación)" + +#: builtin/rm.c:215 +msgid "the following file has changes staged in the index:" +msgid_plural "the following files have changes staged in the index:" +msgstr[0] "el siguiente archivo tiene cambios en stage en el índice:" +msgstr[1] "los siguientes archivos tienen cambios en stage en el índice:" + +#: builtin/rm.c:219 builtin/rm.c:228 +msgid "" +"\n" +"(use --cached to keep the file, or -f to force removal)" +msgstr "" +"\n" +"(usa --cached para conservar el archivo, o -f para forzar su eliminación)" + +#: builtin/rm.c:225 +msgid "the following file has local modifications:" +msgid_plural "the following files have local modifications:" +msgstr[0] "el siguiente archivo tiene modificaciones locales:" +msgstr[1] "los siguientes archivos tienen modificaciones locales:" + +#: builtin/rm.c:243 +msgid "do not list removed files" +msgstr "no listar archivos removidos" + +#: builtin/rm.c:244 +msgid "only remove from the index" +msgstr "solo remover del índice" + +#: builtin/rm.c:245 +msgid "override the up-to-date check" +msgstr "sobrescribir el check de actualizado" + +#: builtin/rm.c:246 +msgid "allow recursive removal" +msgstr "permitir remover de forma recursiva" + +#: builtin/rm.c:248 +msgid "exit with a zero status even if nothing matched" +msgstr "salir con stado cero incluso si nada concuerda" + +#: builtin/rm.c:307 +#, c-format +msgid "not removing '%s' recursively without -r" +msgstr "no removiendo '%s' de manera recursiva sin -r" + +#: builtin/rm.c:346 +#, c-format +msgid "git rm: unable to remove %s" +msgstr "git rm: no es posible remover %s" + +#: builtin/rm.c:369 +#, c-format +msgid "could not remove '%s'" +msgstr "no se pudo remover '%s'" + +#: builtin/send-pack.c:19 +msgid "" +"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" +"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " +"[<ref>...]\n" +" --all and explicit <ref> specification are mutually exclusive." +msgstr "" +"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" +"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " +"[<ref>...]\n" +" --all y especificaciones <ref> explícitas son mutuamente exclusivas." + +#: builtin/send-pack.c:162 +msgid "remote name" +msgstr "nombre remoto" + +#: builtin/send-pack.c:176 +msgid "use stateless RPC protocol" +msgstr "usar protocolo RPC sin estado" + +#: builtin/send-pack.c:177 +msgid "read refs from stdin" +msgstr "leer refs de stdin" + +#: builtin/send-pack.c:178 +msgid "print status from remote helper" +msgstr "mostrar status del remote helper" + +#: builtin/shortlog.c:14 +msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" +msgstr "git shortlog [<opciones>] [<rango-de-revisión>] [[--] [<ruta>...]]" + +#: builtin/shortlog.c:263 +msgid "Group by committer rather than author" +msgstr "Agrupar por committer en lugar de autor" + +#: builtin/shortlog.c:265 +msgid "sort output according to the number of commits per author" +msgstr "ordenar salida de acuerdo al número de commits por autor" + +#: builtin/shortlog.c:267 +msgid "Suppress commit descriptions, only provides commit count" +msgstr "Suprimir descripción de commits, solo proveer cuenta de commits" + +#: builtin/shortlog.c:269 +msgid "Show the email address of each author" +msgstr "Mostrar la dirección de correo de cada autor" + +#: builtin/shortlog.c:270 +msgid "w[,i1[,i2]]" +msgstr "w[,i1[,i2]]" + +#: builtin/shortlog.c:271 +msgid "Linewrap output" +msgstr "Salida de línea" + +#: builtin/show-branch.c:12 +msgid "" +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" +"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" +"\t\t[--more=<n> | --list | --independent | --merge-base]\n" +"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" +msgstr "" +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" +"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" +"\t\t[--more=<n> | --list | --independent | --merge-base]\n" +"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" + +#: builtin/show-branch.c:16 +msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" +msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" + +#: builtin/show-branch.c:376 +#, c-format +msgid "ignoring %s; cannot handle more than %d ref" +msgid_plural "ignoring %s; cannot handle more than %d refs" +msgstr[0] "ignorando %s; no se puede manejar más de %d ref" +msgstr[1] "ignorando %s; no se puede manejar más de %d refs" + +#: builtin/show-branch.c:530 +#, c-format +msgid "no matching refs with %s" +msgstr "no hay refs que concuerden con %s" + +#: builtin/show-branch.c:626 +msgid "show remote-tracking and local branches" +msgstr "mostrar ramas locales y de rastreo remoto" + +#: builtin/show-branch.c:628 +msgid "show remote-tracking branches" +msgstr "mostrar ramas de rastreo remoto" + +#: builtin/show-branch.c:630 +msgid "color '*!+-' corresponding to the branch" +msgstr "color '*!+-' correspondiendo a la rama" + +#: builtin/show-branch.c:632 +msgid "show <n> more commits after the common ancestor" +msgstr "mostrar <n> commits más tras encontrar el ancestro común" + +#: builtin/show-branch.c:634 +msgid "synonym to more=-1" +msgstr "sinonimo de más=-1" + +#: builtin/show-branch.c:635 +msgid "suppress naming strings" +msgstr "suprimir strings de nombre" + +#: builtin/show-branch.c:637 +msgid "include the current branch" +msgstr "incluir la rama actual" + +#: builtin/show-branch.c:639 +msgid "name commits with their object names" +msgstr "nombrar commits con sus nombres de objeto" + +#: builtin/show-branch.c:641 +msgid "show possible merge bases" +msgstr "mostrar bases de fusión posibles" + +#: builtin/show-branch.c:643 +msgid "show refs unreachable from any other ref" +msgstr "mostrar refs inalcanzables por ningún otro ref" + +#: builtin/show-branch.c:645 +msgid "show commits in topological order" +msgstr "mostrar commits en orden topológico" + +#: builtin/show-branch.c:648 +msgid "show only commits not on the first branch" +msgstr "mostrar solo commits que no están en la primera rama" + +#: builtin/show-branch.c:650 +msgid "show merges reachable from only one tip" +msgstr "mostrar fusiones alcanzables solo por una punta" + +#: builtin/show-branch.c:652 +msgid "topologically sort, maintaining date order where possible" +msgstr "orden topológico, manteniendo el orden de fechas donde sea posible" + +#: builtin/show-branch.c:655 +msgid "<n>[,<base>]" +msgstr "<n>[,<base>]" + +#: builtin/show-branch.c:656 +msgid "show <n> most recent ref-log entries starting at base" +msgstr "mostrar <n> entradas más recientes de ref-log comenzando desde la base" + +#: builtin/show-branch.c:690 +msgid "" +"--reflog is incompatible with --all, --remotes, --independent or --merge-base" +msgstr "" +"--reflog no es compatible con --all, --remotes, --independent o --merge-base" + +#: builtin/show-branch.c:714 +msgid "no branches given, and HEAD is not valid" +msgstr "no se dieron ramas, y el HEAD no es válido" + +#: builtin/show-branch.c:717 +msgid "--reflog option needs one branch name" +msgstr "opción --reflog necesita un nombre de rama" + +#: builtin/show-branch.c:720 +#, c-format +msgid "only %d entry can be shown at one time." +msgid_plural "only %d entries can be shown at one time." +msgstr[0] "solo %d entrada puede ser mostrada a la vez." +msgstr[1] "solo %d entradas pueden ser mostradas a la vez." + +#: builtin/show-branch.c:724 +#, c-format +msgid "no such ref %s" +msgstr "no existe el ref %s" + +#: builtin/show-branch.c:808 +#, c-format +msgid "cannot handle more than %d rev." +msgid_plural "cannot handle more than %d revs." +msgstr[0] "no se puede manejar más de %d rev." +msgstr[1] "no se puede manejar más de %d revs." + +#: builtin/show-branch.c:812 +#, c-format +msgid "'%s' is not a valid ref." +msgstr "'%s' no es una ref válida." + +#: builtin/show-branch.c:815 +#, c-format +msgid "cannot find commit %s (%s)" +msgstr "no se puede encontrar el commit %s (%s)" + +#: builtin/show-ref.c:10 +msgid "" +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" +msgstr "" +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<patrón>...]" + +#: builtin/show-ref.c:11 +msgid "git show-ref --exclude-existing[=<pattern>]" +msgstr "git show-ref --exclude-existing[=<patrón>]" + +#: builtin/show-ref.c:159 +msgid "only show tags (can be combined with heads)" +msgstr "solo mostrar tags (puede ser combinado con heads)" + +#: builtin/show-ref.c:160 +msgid "only show heads (can be combined with tags)" +msgstr "solo mostrar heads (puede ser combinado con tags)" + +#: builtin/show-ref.c:161 +msgid "stricter reference checking, requires exact ref path" +msgstr "revisar referencias más estrictamente, requiere ruta de ref exacta" + +#: builtin/show-ref.c:164 builtin/show-ref.c:166 +msgid "show the HEAD reference, even if it would be filtered out" +msgstr "mostrar la referencia de HEAD, incluso si se filtrara" + +#: builtin/show-ref.c:168 +msgid "dereference tags into object IDs" +msgstr "tags de deferencia en IDs de objeto" + +#: builtin/show-ref.c:170 +msgid "only show SHA1 hash using <n> digits" +msgstr "solo mostrar hash SHA1 usando <n> dígitos" + +#: builtin/show-ref.c:174 +msgid "do not print results to stdout (useful with --verify)" +msgstr "no mostrar resultados en stdout (útil con --verify)" + +#: builtin/show-ref.c:176 +msgid "show refs from stdin that aren't in local repository" +msgstr "mostrar refs de stdin que no están en el repositorio local" + +#: builtin/stripspace.c:18 +msgid "git stripspace [-s | --strip-comments]" +msgstr "git stripspace [-s | --strip-comments]" + +#: builtin/stripspace.c:19 +msgid "git stripspace [-c | --comment-lines]" +msgstr "git stripspace [-c | --comment-lines]" + +#: builtin/stripspace.c:36 +msgid "skip and remove all lines starting with comment character" +msgstr "" +"saltar y borrar todas las líneas que comienzan con un caracter de comentario" + +#: builtin/stripspace.c:39 +msgid "prepend comment character and space to each line" +msgstr "anteponer caracter de comentario y espacio a cada línea" + +#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1094 +#, c-format +msgid "No such ref: %s" +msgstr "No existe ref: %s" + +#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1103 +#, c-format +msgid "Expecting a full ref name, got %s" +msgstr "Se esperaba un nombre de ref completo, se obtuvo %s" + +#: builtin/submodule--helper.c:71 +#, c-format +msgid "cannot strip one component off url '%s'" +msgstr "no se puede quitar un componente del url '%s'" + +#: builtin/submodule--helper.c:302 builtin/submodule--helper.c:623 +msgid "alternative anchor for relative paths" +msgstr "ancho alternativo para rutas relativas" + +#: builtin/submodule--helper.c:307 +msgid "git submodule--helper list [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper list [--prefix=<ruta>] [<ruta>...]" + +#: builtin/submodule--helper.c:350 builtin/submodule--helper.c:374 +#, c-format +msgid "No url found for submodule path '%s' in .gitmodules" +msgstr "No se encontró url para la ruta del submódulo '%s' en .gitmodules" + +#: builtin/submodule--helper.c:389 +#, c-format +msgid "" +"could not lookup configuration '%s'. Assuming this repository is its own " +"authoritative upstream." +msgstr "" +"no se pudo encontrar configuración '%s'. Asumiendo que este repositorio es " +"su propio upstream autoritativo." + +#: builtin/submodule--helper.c:400 +#, c-format +msgid "Failed to register url for submodule path '%s'" +msgstr "Falló al registrar el url para la ruta del submódulo '%s'" + +#: builtin/submodule--helper.c:404 +#, c-format +msgid "Submodule '%s' (%s) registered for path '%s'\n" +msgstr "Submódulo '%s' (%s) registrado para ruta '%s'\n" + +#: builtin/submodule--helper.c:414 +#, c-format +msgid "warning: command update mode suggested for submodule '%s'\n" +msgstr "" +"peligro: modo de actualización de comandos sugerido para el submódulo '%s'\n" + +#: builtin/submodule--helper.c:421 +#, c-format +msgid "Failed to register update mode for submodule path '%s'" +msgstr "" +"Error al registrar el modo de actualización para la ruta del submódulo '%s'" + +#: builtin/submodule--helper.c:437 +msgid "Suppress output for initializing a submodule" +msgstr "suprime la salida para inicializar un submódulo" + +#: builtin/submodule--helper.c:442 +msgid "git submodule--helper init [<path>]" +msgstr "git submodule--helper init [<ruta>]" + +#: builtin/submodule--helper.c:470 +msgid "git submodule--helper name <path>" +msgstr "git submodule--helper name <ruta>" + +#: builtin/submodule--helper.c:475 +#, c-format +msgid "no submodule mapping found in .gitmodules for path '%s'" +msgstr "" +"No se ha encontrado mapeo de submódulos en .gitmodules para la ruta '%s'" + +#: builtin/submodule--helper.c:558 builtin/submodule--helper.c:561 +#, c-format +msgid "submodule '%s' cannot add alternate: %s" +msgstr "submódulo '%s' no puede agregar alterno: %s" + +#: builtin/submodule--helper.c:597 +#, c-format +msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" +msgstr "Valor '%s' para submodule.alternateErrorStrategy no es reconocido" + +#: builtin/submodule--helper.c:604 +#, c-format +msgid "Value '%s' for submodule.alternateLocation is not recognized" +msgstr "Valor '%s' para submodule.alternateLocation no es reconocido" + +#: builtin/submodule--helper.c:626 +msgid "where the new submodule will be cloned to" +msgstr "a donde el nuevo submódulo será clonado" + +#: builtin/submodule--helper.c:629 +msgid "name of the new submodule" +msgstr "nombre del nuevo submódulo" + +#: builtin/submodule--helper.c:632 +msgid "url where to clone the submodule from" +msgstr "url de dónde clonar el submódulo" + +#: builtin/submodule--helper.c:638 +msgid "depth for shallow clones" +msgstr "profundidad para clones superficiales" + +#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:1012 +msgid "force cloning progress" +msgstr "forzar el proceso de clonado" + +#: builtin/submodule--helper.c:646 +msgid "" +"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " +"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" +msgstr "" +"git submodule--helper clone [--prefix=<ruta>] [--quiet] [--reference " +"<repositorio>] [--name <nombre>] [--depth <profundidad>] --url <url> --path " +"<ruta>" + +#: builtin/submodule--helper.c:677 +#, c-format +msgid "clone of '%s' into submodule path '%s' failed" +msgstr "clon de '%s' en la ruta de submódulo '%s' falló" + +#: builtin/submodule--helper.c:692 +#, c-format +msgid "could not get submodule directory for '%s'" +msgstr "no se pudo obtener el directorio de submódulo para '%s'" + +#: builtin/submodule--helper.c:757 +#, c-format +msgid "Submodule path '%s' not initialized" +msgstr "Ruta de submódulo '%s' no inicializada" + +#: builtin/submodule--helper.c:761 +msgid "Maybe you want to use 'update --init'?" +msgstr "Tal vez quiere usar 'update --init'?" + +#: builtin/submodule--helper.c:790 +#, c-format +msgid "Skipping unmerged submodule %s" +msgstr "Saltando submódulo %s no fusionado" + +#: builtin/submodule--helper.c:819 +#, c-format +msgid "Skipping submodule '%s'" +msgstr "Saltando submódulo '%s'" + +#: builtin/submodule--helper.c:952 +#, c-format +msgid "Failed to clone '%s'. Retry scheduled" +msgstr "Falló al clonar '%s'. Reintento programado" + +#: builtin/submodule--helper.c:963 +#, c-format +msgid "Failed to clone '%s' a second time, aborting" +msgstr "Falló al clonar '%s' una segunda vez, abortando" + +#: builtin/submodule--helper.c:993 builtin/submodule--helper.c:1213 +msgid "path into the working tree" +msgstr "ruta hacia el árbol de trabajo" + +#: builtin/submodule--helper.c:996 +msgid "path into the working tree, across nested submodule boundaries" +msgstr "" +"ruta hacia el árbol de trabajo, a través de extremos de submódulos anidados" + +#: builtin/submodule--helper.c:1000 +msgid "rebase, merge, checkout or none" +msgstr "rebase, merge, checkout o none" + +#: builtin/submodule--helper.c:1004 +msgid "Create a shallow clone truncated to the specified number of revisions" +msgstr "Crea un clon superficial truncado al número especificado de revisión" + +#: builtin/submodule--helper.c:1007 +msgid "parallel jobs" +msgstr "trabajos paralelos" + +#: builtin/submodule--helper.c:1009 +msgid "whether the initial clone should follow the shallow recommendation" +msgstr "si el clon inicial debe seguir la recomendación superficial" + +#: builtin/submodule--helper.c:1010 +msgid "don't print cloning progress" +msgstr "no mostrar el progreso de clonado" + +#: builtin/submodule--helper.c:1017 +msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper update_clone [--prefix=<ruta>] [<ruta>...]" + +#: builtin/submodule--helper.c:1030 +msgid "bad value for update parameter" +msgstr "mal valor para parámetro update" + +#: builtin/submodule--helper.c:1098 +#, c-format +msgid "" +"Submodule (%s) branch configured to inherit branch from superproject, but " +"the superproject is not on any branch" +msgstr "" +"Rama de submódulo (%s) configurada para heredar rama del superproyecto, " +"pero el superproyecto no está en ninguna rama" + +#: builtin/submodule--helper.c:1214 +msgid "recurse into submodules" +msgstr "recurrir a submódulos" + +#: builtin/submodule--helper.c:1220 +msgid "git submodule--helper embed-git-dir [<path>...]" +msgstr "git submodule--helper embed-git-dir [<ruta>...]" + +#: builtin/submodule--helper.c:1278 +#, c-format +msgid "%s doesn't support --super-prefix" +msgstr "%s no soporta --super-prefix" + +#: builtin/submodule--helper.c:1284 +#, c-format +msgid "'%s' is not a valid submodule--helper subcommand" +msgstr "'%s' no es un comando submodule--helper valido" + +#: builtin/symbolic-ref.c:8 +msgid "git symbolic-ref [<options>] <name> [<ref>]" +msgstr "git symbolic-ref [<opciones>] <nombre> [<referencia>]" + +#: builtin/symbolic-ref.c:9 +msgid "git symbolic-ref -d [-q] <name>" +msgstr "git symbolic-ref -d [-q] <nombre>" + +#: builtin/symbolic-ref.c:40 +msgid "suppress error message for non-symbolic (detached) refs" +msgstr "suprimir mensajes de error para refs no simbólicos (desacoplados)" + +#: builtin/symbolic-ref.c:41 +msgid "delete symbolic ref" +msgstr "eliminar referencia simbólica" + +#: builtin/symbolic-ref.c:42 +msgid "shorten ref output" +msgstr "salida de referencia más corta" + +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 +msgid "reason" +msgstr "razón" + +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 +msgid "reason of the update" +msgstr "razón de la actualización" + +#: builtin/tag.c:24 +msgid "" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " +"[<head>]" +msgstr "" +"git tag [-a | -s | -u <id-de-clave>] [-f] [-m <mensaje> | -F <archivo>] " +"<nombre-de-etiqueta> [<head>]" + +#: builtin/tag.c:25 +msgid "git tag -d <tagname>..." +msgstr "git tag -d <nombre-de-etiqueta>..." + +#: builtin/tag.c:26 +msgid "" +"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" +"points-at <object>]\n" +"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" +msgstr "" +"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" +"points-at <objeto>]\n" +"\t\t[--format=<formato>] [--[no-]merged [<commit>]] [<patrón>...]" + +#: builtin/tag.c:28 +msgid "git tag -v [--format=<format>] <tagname>..." +msgstr "git tag -v [--format=<formato>] <nombre-de-tag>..." + +#: builtin/tag.c:86 +#, c-format +msgid "tag '%s' not found." +msgstr "etiqueta '%s' no encontrada." + +#: builtin/tag.c:102 +#, c-format +msgid "Deleted tag '%s' (was %s)\n" +msgstr "Etiqueta '%s' eliminada (era %s)\n" + +#: builtin/tag.c:131 +#, c-format +msgid "" +"\n" +"Write a message for tag:\n" +" %s\n" +"Lines starting with '%c' will be ignored.\n" +msgstr "" +"\n" +"Escribe un mensaje para la etiqueta:\n" +" %s\n" +"Las líneas que comienzan con '%c' serán ignoradas.\n" + +#: builtin/tag.c:135 +#, c-format +msgid "" +"\n" +"Write a message for tag:\n" +" %s\n" +"Lines starting with '%c' will be kept; you may remove them yourself if you " +"want to.\n" +msgstr "" +"\n" +"Escribe un mensaje para la etiqueta:\n" +" %s\n" +"Las líneas que comienzan con '%c' serán conservadas; puedes eliminarlas por " +"ti mismo si quieres hacerlo.\n" + +#: builtin/tag.c:189 +msgid "unable to sign the tag" +msgstr "incapaz de firmar etiqueta" + +#: builtin/tag.c:191 +msgid "unable to write tag file" +msgstr "incapaz de escribir el archivo de etiqueta" + +#: builtin/tag.c:215 +msgid "bad object type." +msgstr "tipo de objeto erróneo." + +#: builtin/tag.c:261 +msgid "no tag message?" +msgstr "¿Sin mensaje de etiqueta?" + +#: builtin/tag.c:268 +#, c-format +msgid "The tag message has been left in %s\n" +msgstr "El mensaje de la etiqueta ha sido dejado en %s\n" + +#: builtin/tag.c:376 +msgid "list tag names" +msgstr "listar nombres de etiquetas" + +#: builtin/tag.c:378 +msgid "print <n> lines of each tag message" +msgstr "imprimir <n> líneas de cada mensaje de etiqueta" + +#: builtin/tag.c:380 +msgid "delete tags" +msgstr "eliminar etiquetas" + +#: builtin/tag.c:381 +msgid "verify tags" +msgstr "verificar etiquetas" + +#: builtin/tag.c:383 +msgid "Tag creation options" +msgstr "Opciones de creación de etiquetas" + +#: builtin/tag.c:385 +msgid "annotated tag, needs a message" +msgstr "etiquetas anotadas necesitan un mensaje" + +#: builtin/tag.c:387 +msgid "tag message" +msgstr "mensaje de etiqueta" + +#: builtin/tag.c:389 +msgid "annotated and GPG-signed tag" +msgstr "etiqueta anotada y firmada con GPG" + +#: builtin/tag.c:393 +msgid "use another key to sign the tag" +msgstr "usar otra clave para firmar la etiqueta" + +#: builtin/tag.c:394 +msgid "replace the tag if exists" +msgstr "remplazar etiqueta si existe" + +#: builtin/tag.c:395 builtin/update-ref.c:368 +msgid "create a reflog" +msgstr "crear un reflog" + +#: builtin/tag.c:397 +msgid "Tag listing options" +msgstr "Opciones de listado de etiqueta" + +#: builtin/tag.c:398 +msgid "show tag list in columns" +msgstr "mostrar lista de etiquetas en columnas" + +#: builtin/tag.c:399 builtin/tag.c:401 +msgid "print only tags that contain the commit" +msgstr "mostrar solo tags que contienen el commit" + +#: builtin/tag.c:400 builtin/tag.c:402 +msgid "print only tags that don't contain the commit" +msgstr "mostrar solo tags que no contienen el commit" + +#: builtin/tag.c:403 +msgid "print only tags that are merged" +msgstr "sólo imprimir las etiquetas que están fusionadas" + +#: builtin/tag.c:404 +msgid "print only tags that are not merged" +msgstr "sólo imprimir las etiquetas que no están fusionadas" + +#: builtin/tag.c:409 +msgid "print only tags of the object" +msgstr "sólo imprimir etiquetas de el objeto" + +#: builtin/tag.c:453 +msgid "--column and -n are incompatible" +msgstr "--column y -n son incompatibles" + +#: builtin/tag.c:475 +msgid "-n option is only allowed in list mode" +msgstr "opción -n solo es permitida en modo lista" + +#: builtin/tag.c:477 +msgid "--contains option is only allowed in list mode" +msgstr "opción --contains solo es permitido en modo lista" + +#: builtin/tag.c:479 +msgid "--no-contains option is only allowed in list mode" +msgstr "opción --no-contains solo es permitida en moso lista" + +#: builtin/tag.c:481 +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 +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 +msgid "only one -F or -m option is allowed." +msgstr "sólo se permite una de las opciones, -m ó -F." + +#: builtin/tag.c:513 +msgid "too many params" +msgstr "demasiados parámetros" + +#: builtin/tag.c:519 +#, c-format +msgid "'%s' is not a valid tag name." +msgstr "'%s' no es un nombre de etiqueta válido." + +#: builtin/tag.c:524 +#, c-format +msgid "tag '%s' already exists" +msgstr "la etiqueta '%s' ya existe" + +#: builtin/tag.c:554 +#, c-format +msgid "Updated tag '%s' (was %s)\n" +msgstr "Etiqueta '%s' actualizada (era %s)\n" + +#: builtin/unpack-objects.c:494 +msgid "Unpacking objects" +msgstr "Desempaquetando objetos" + +#: builtin/update-index.c:80 +#, c-format +msgid "failed to create directory %s" +msgstr "fallo al crear directorio %s" + +#: builtin/update-index.c:86 +#, c-format +msgid "failed to stat %s" +msgstr "fallo al iniciar %s" + +#: builtin/update-index.c:96 +#, c-format +msgid "failed to create file %s" +msgstr "fallo al crear el archivo %s" + +#: builtin/update-index.c:104 +#, c-format +msgid "failed to delete file %s" +msgstr "fallo al eliminar el archivo %s" + +#: builtin/update-index.c:111 builtin/update-index.c:217 +#, c-format +msgid "failed to delete directory %s" +msgstr "fallo al eliminar directorio %s" + +#: builtin/update-index.c:136 +#, c-format +msgid "Testing mtime in '%s' " +msgstr "Probando mtime en '%s' " + +#: builtin/update-index.c:150 +msgid "directory stat info does not change after adding a new file" +msgstr "info de estado del directorio no cambia tras agregar un nuevo archivo" + +#: builtin/update-index.c:163 +msgid "directory stat info does not change after adding a new directory" +msgstr "" +"info de estado del directorio no cambia tras agregar un nuevo directorio" + +#: builtin/update-index.c:176 +msgid "directory stat info changes after updating a file" +msgstr "info de estado del directorio cambia tras actualizar un archivo" + +#: builtin/update-index.c:187 +msgid "directory stat info changes after adding a file inside subdirectory" +msgstr "" +"info de estado del directorio cambia tras agregar un archivo dentro del " +"subdirectorio" + +#: builtin/update-index.c:198 +msgid "directory stat info does not change after deleting a file" +msgstr "info de estado del directorio no cambia tras borrar un archivo" + +#: builtin/update-index.c:211 +msgid "directory stat info does not change after deleting a directory" +msgstr "info de estado del directorio no cambia tras borrar un directorio" + +#: builtin/update-index.c:218 +msgid " OK" +msgstr " OK" + +#: builtin/update-index.c:571 +msgid "git update-index [<options>] [--] [<file>...]" +msgstr "git update-index [<opciones>] [--] [<archivo>...]" + +#: builtin/update-index.c:926 +msgid "continue refresh even when index needs update" +msgstr "continuar refresh incluso cuando el índice necesita actualizar" + +#: builtin/update-index.c:929 +msgid "refresh: ignore submodules" +msgstr "refresh: ignora submódulos" + +#: builtin/update-index.c:932 +msgid "do not ignore new files" +msgstr "no ignorar archivos nuevos" + +#: builtin/update-index.c:934 +msgid "let files replace directories and vice-versa" +msgstr "permitir que archivos remplacen directorios y vice-versa" + +#: builtin/update-index.c:936 +msgid "notice files missing from worktree" +msgstr "avisar de archivos faltando en el árbol de trabajo" + +#: builtin/update-index.c:938 +msgid "refresh even if index contains unmerged entries" +msgstr "ejecutar refresh incluso si el índice contiene entradas sin cambios" + +#: builtin/update-index.c:941 +msgid "refresh stat information" +msgstr "refresh información de estado" + +#: builtin/update-index.c:945 +msgid "like --refresh, but ignore assume-unchanged setting" +msgstr "como --refresh, pero ignora configuración assume-unchanged" + +#: builtin/update-index.c:949 +msgid "<mode>,<object>,<path>" +msgstr "<modo>,<objeto>,<ruta>" + +#: builtin/update-index.c:950 +msgid "add the specified entry to the index" +msgstr "agregar la entrada especificada al índice" + +#: builtin/update-index.c:959 +msgid "mark files as \"not changing\"" +msgstr "marcar archivos como \"not changing\"" + +#: builtin/update-index.c:962 +msgid "clear assumed-unchanged bit" +msgstr "limpiar bit assumed-unchanged" + +#: builtin/update-index.c:965 +msgid "mark files as \"index-only\"" +msgstr "marcar archivos como \"index-only\"" + +#: builtin/update-index.c:968 +msgid "clear skip-worktree bit" +msgstr "limpiar bit skip-worktree" + +#: builtin/update-index.c:971 +msgid "add to index only; do not add content to object database" +msgstr "" +"agregar solo al índice; no agregar contenido a la base de datos de objetos" + +#: builtin/update-index.c:973 +msgid "remove named paths even if present in worktree" +msgstr "" +"remover rutas nombradas incluso si están presentes en el árbol de trabajo" + +#: builtin/update-index.c:975 +msgid "with --stdin: input lines are terminated by null bytes" +msgstr "con --stdin: línas de entrada son terminadas con bytes null" + +#: builtin/update-index.c:977 +msgid "read list of paths to be updated from standard input" +msgstr "leer la lista de rutas para ser actualizada desde standard input" + +#: builtin/update-index.c:981 +msgid "add entries from standard input to the index" +msgstr "agregar entradas de standard input al índice" + +#: builtin/update-index.c:985 +msgid "repopulate stages #2 and #3 for the listed paths" +msgstr "repoblar stages #2 y #3 para las rutas listadas" + +#: builtin/update-index.c:989 +msgid "only update entries that differ from HEAD" +msgstr "solo actualizar entradas que difieren de HEAD" + +#: builtin/update-index.c:993 +msgid "ignore files missing from worktree" +msgstr "ignorar archivos faltantes en el árbol de trabajo" + +#: builtin/update-index.c:996 +msgid "report actions to standard output" +msgstr "reportar acciones por standard output" + +#: builtin/update-index.c:998 +msgid "(for porcelains) forget saved unresolved conflicts" +msgstr "(para porcelanas) olvidar conflictos sin resolver guardados" + +#: builtin/update-index.c:1002 +msgid "write index in this format" +msgstr "escribir índice en este formato" + +#: builtin/update-index.c:1004 +msgid "enable or disable split index" +msgstr "activar o desactivar índice dividido" + +#: builtin/update-index.c:1006 +msgid "enable/disable untracked cache" +msgstr "habilitar o deshabilitar caché no rastreado" + +#: builtin/update-index.c:1008 +msgid "test if the filesystem supports untracked cache" +msgstr "probar si el filesystem soporta caché no rastreado" + +#: builtin/update-index.c:1010 +msgid "enable untracked cache without testing the filesystem" +msgstr "habilitar caché no rastreado sin probar el filesystem" + +#: builtin/update-index.c:1107 +msgid "" +"core.splitIndex is set to false; remove or change it, if you really want to " +"enable split index" +msgstr "" +"core.splitIndex está configurado en false; remuévelo o cámbialo, si " +"realmente quieres habilitar el índice partido" + +#: builtin/update-index.c:1116 +msgid "" +"core.splitIndex is set to true; remove or change it, if you really want to " +"disable split index" +msgstr "" +"core.splitIndex está configurado en true; remuévelo o cámbialo, si realmente " +"quieres deshabilitar el índice partido" + +#: builtin/update-index.c:1127 +msgid "" +"core.untrackedCache is set to true; remove or change it, if you really want " +"to disable the untracked cache" +msgstr "" +"core.untrackedCache está configurado en true; remuévelo o cámbialo, si " +"realmente quieres deshabilitar el chaché no rastreado" + +#: builtin/update-index.c:1131 +msgid "Untracked cache disabled" +msgstr "Caché no rastreado deshabilitado" + +#: builtin/update-index.c:1139 +msgid "" +"core.untrackedCache is set to false; remove or change it, if you really want " +"to enable the untracked cache" +msgstr "" +"core.untrackedCache está configurado en false; remuévelo o cámbialo, si " +"realmente quieres habilitar el caché no rastreado" + +#: builtin/update-index.c:1143 +#, c-format +msgid "Untracked cache enabled for '%s'" +msgstr "Caché no rastreado habilitado para '%s'" + +#: builtin/update-ref.c:10 +msgid "git update-ref [<options>] -d <refname> [<old-val>]" +msgstr "git update-ref [<opciones>] -d <nombre-referencia> [<valor-anterior>]" + +#: builtin/update-ref.c:11 +msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" +msgstr "" +"git update-ref [<opciones>] <nombre-referencia> <valor-nuevo> [<valor-" +"anterior>]" + +#: builtin/update-ref.c:12 +msgid "git update-ref [<options>] --stdin [-z]" +msgstr "git update-ref [<opciones>] --stdin [-z]" + +#: builtin/update-ref.c:363 +msgid "delete the reference" +msgstr "eliminar la referencia" + +#: builtin/update-ref.c:365 +msgid "update <refname> not the one it points to" +msgstr "actualiza <refname> no a lo que apunta" + +#: builtin/update-ref.c:366 +msgid "stdin has NUL-terminated arguments" +msgstr "stdin tiene argumentos terminados en NUL" + +#: builtin/update-ref.c:367 +msgid "read updates from stdin" +msgstr "lee actualizaciones de stdin" + +#: builtin/update-server-info.c:7 +msgid "git update-server-info [--force]" +msgstr "git update-server-info [--force]" + +#: builtin/update-server-info.c:15 +msgid "update the info files from scratch" +msgstr "actualiza el archivo info desde cero" + +#: builtin/verify-commit.c:18 +msgid "git verify-commit [-v | --verbose] <commit>..." +msgstr "git verify-commit [-v | --verbose] <confirmación>..." + +#: builtin/verify-commit.c:73 +msgid "print commit contents" +msgstr "imprimir contenido de la confirmación" + +#: builtin/verify-commit.c:74 builtin/verify-tag.c:38 +msgid "print raw gpg status output" +msgstr "muestra la salida de status gpg en formato raw" + +#: builtin/verify-pack.c:55 +msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." +msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <paquete>..." + +#: builtin/verify-pack.c:65 +msgid "verbose" +msgstr "verboso" + +#: builtin/verify-pack.c:67 +msgid "show statistics only" +msgstr "solo mostrar estadísticas" + +#: builtin/verify-tag.c:19 +msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." +msgstr "git verify-tag [-v | --verbose] [--format=<formato>] <tag>..." + +#: builtin/verify-tag.c:37 +msgid "print tag contents" +msgstr "imprimir contenido de la etiqueta" + +#: builtin/worktree.c:16 +msgid "git worktree add [<options>] <path> [<branch>]" +msgstr "git worktree add [<opciones>] <ruta> [<rama>]" + +#: builtin/worktree.c:17 +msgid "git worktree list [<options>]" +msgstr "git worktree list [<opciones>]" + +#: builtin/worktree.c:18 +msgid "git worktree lock [<options>] <path>" +msgstr "git worktree lock [<opciones>] <ruta>" + +#: builtin/worktree.c:19 +msgid "git worktree prune [<options>]" +msgstr "git worktree prune [<opciones>]" + +#: builtin/worktree.c:20 +msgid "git worktree unlock <path>" +msgstr "git worktree unlock <ruta>" + +#: builtin/worktree.c:46 +#, c-format +msgid "Removing worktrees/%s: not a valid directory" +msgstr "Removiendo el worktrees/%s: no es un directorio válido" + +#: builtin/worktree.c:52 +#, c-format +msgid "Removing worktrees/%s: gitdir file does not exist" +msgstr "Removiendo worktrees/%s: archivo gitdir no existe" + +#: builtin/worktree.c:57 builtin/worktree.c:66 +#, c-format +msgid "Removing worktrees/%s: unable to read gitdir file (%s)" +msgstr "Removiendo worktrees/%s: no es posible leer el archivo gitdir (%s)" + +#: builtin/worktree.c:76 +#, c-format +msgid "" +"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " +"%<PRIuMAX>)" +msgstr "" +"Removiendo árboles de trabajo/%s: lectura corta (se esperan %<PRIuMAX> " +"bytes, %<PRIuMAX> leídos)" + +#: builtin/worktree.c:84 +#, c-format +msgid "Removing worktrees/%s: invalid gitdir file" +msgstr "Removiendo worktrees/%s: archivo gitdir inválido" + +#: builtin/worktree.c:100 +#, c-format +msgid "Removing worktrees/%s: gitdir file points to non-existent location" +msgstr "" +"Removiendo worktrees/%s: archivo gitdir apunta a una ubicación no existente" + +#: builtin/worktree.c:147 +msgid "report pruned working trees" +msgstr "reporta árboles de trabajo recortados" + +#: builtin/worktree.c:149 +msgid "expire working trees older than <time>" +msgstr "expirar árboles de trabajo más viejos a <tiempo>" + +#: builtin/worktree.c:223 +#, c-format +msgid "'%s' already exists" +msgstr "'%s' ya existe" + +#: builtin/worktree.c:254 +#, c-format +msgid "could not create directory of '%s'" +msgstr "no se pudo crear directorio de '%s'" + +#: builtin/worktree.c:293 +#, c-format +msgid "Preparing %s (identifier %s)" +msgstr "Preparando %s (identificador %s)" + +#: builtin/worktree.c:345 +msgid "checkout <branch> even if already checked out in other worktree" +msgstr "" +"hacer checkout a <rama> incluso si ya ha hecho checkout en otro árbol de " +"trabajo" + +#: builtin/worktree.c:347 +msgid "create a new branch" +msgstr "crear una nueva rama" + +#: builtin/worktree.c:349 +msgid "create or reset a branch" +msgstr "crear o restablecer una rama" + +#: builtin/worktree.c:351 +msgid "populate the new working tree" +msgstr "popular el nuevo árbol de trabajo" + +#: builtin/worktree.c:352 +msgid "keep the new working tree locked" +msgstr "mantener el nuevo árbol de trabajo bloqueado" + +#: builtin/worktree.c:360 +msgid "-b, -B, and --detach are mutually exclusive" +msgstr "-b, -B, y --detach son mutuamente exclusivas" + +#: builtin/worktree.c:499 +msgid "reason for locking" +msgstr "razón para bloquear" + +#: builtin/worktree.c:511 builtin/worktree.c:544 +#, c-format +msgid "'%s' is not a working tree" +msgstr "'%s' no es un árbol de trabajo" + +#: builtin/worktree.c:513 builtin/worktree.c:546 +msgid "The main working tree cannot be locked or unlocked" +msgstr "El árbol de trabajo principal no puede ser bloqueado ni desbloqueado" + +#: builtin/worktree.c:518 +#, c-format +msgid "'%s' is already locked, reason: %s" +msgstr "'%s' ya está bloqueado; razón: %s" + +#: builtin/worktree.c:520 +#, c-format +msgid "'%s' is already locked" +msgstr "'%s' ya está bloqueado" + +#: builtin/worktree.c:548 +#, c-format +msgid "'%s' is not locked" +msgstr "'%s' no está bloqueado" + +#: builtin/write-tree.c:14 +msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" +msgstr "git write-tree [--missing-ok] [--prefix=<prefijo>/]" + +#: builtin/write-tree.c:27 +msgid "<prefix>/" +msgstr "<prefijo>/" + +#: builtin/write-tree.c:28 +msgid "write tree object for a subdirectory <prefix>" +msgstr "escribit objeto árbol para un subdirectorio <prefijo>" + +#: builtin/write-tree.c:31 +msgid "only useful for debugging" +msgstr "sólo útil para depurar" + +#: upload-pack.c:23 +msgid "git upload-pack [<options>] <dir>" +msgstr "git upload-pack [<opciones>] <directorio>" + +#: upload-pack.c:1040 +msgid "quit after a single request/response exchange" +msgstr "sale después de un intercambio petición/respuesta único" + +#: upload-pack.c:1042 +msgid "exit immediately after initial ref advertisement" +msgstr "salir inmediatamente tras el anuncio inicial de ref" + +#: upload-pack.c:1044 +msgid "do not try <directory>/.git/ if <directory> is no Git directory" +msgstr "no intente <directorio>/.git/ si <directorio> no es un directorio Git" + +#: upload-pack.c:1046 +msgid "interrupt transfer after <n> seconds of inactivity" +msgstr "interrumpir transferencia tras <n> segundos de inactividad" + +#: credential-cache--daemon.c:222 +#, c-format +msgid "" +"The permissions on your socket directory are too loose; other\n" +"users may be able to read your cached credentials. Consider running:\n" +"\n" +"\tchmod 0700 %s" +msgstr "" +"Los permisos en su directorio de socket son demasiado flojos; otros\n" +"usuarios pueden leer sus credenciales almacenadas en caché. Considere " +"ejecutar:\n" +"\n" +"\tchmod 0700 %s" + +#: credential-cache--daemon.c:271 +msgid "print debugging messages to stderr" +msgstr "mostrar mensajes de debug en stderr" + +#: git.c:15 +msgid "" +"'git help -a' and 'git help -g' list available subcommands and some\n" +"concept guides. See 'git help <command>' or 'git help <concept>'\n" +"to read about a specific subcommand or concept." +msgstr "" +"'git help -a' y 'git help -g' listan los subcomandos disponibles y algunas\n" +"guías de concepto. Consulte 'git help <command>' o 'git help <concepto>'\n" +"para leer sobre un subcomando o concepto específico." + +#: http.c:338 +#, c-format +msgid "negative value for http.postbuffer; defaulting to %d" +msgstr "valor negativo para http.postbuffer; poniendo el default a %d" + +#: http.c:359 +msgid "Delegation control is not supported with cURL < 7.22.0" +msgstr "Delegación de control no es soportada con cURL < 7.22.0" + +#: http.c:368 +msgid "Public key pinning not supported with cURL < 7.44.0" +msgstr "Fijación de llave pública no es soportada con cURL < 7.44.0" + +#: http.c:1768 +#, c-format +msgid "" +"unable to update url base from redirection:\n" +" asked for: %s\n" +" redirect: %s" +msgstr "" +"no puede actualizar la base de url de la redirección:\n" +" preguntaba por: %s\n" +" redireccionamiento: %s" + +#: remote-curl.c:324 +#, c-format +msgid "redirecting to %s" +msgstr "redirigiendo a %s" + +#: common-cmds.h:9 +msgid "start a working area (see also: git help tutorial)" +msgstr "comienza un area de trabajo (mira tambien: git help tutorial)" + +#: common-cmds.h:10 +msgid "work on the current change (see also: git help everyday)" +msgstr "trabaja en los cambios actuales (mira tambien: git help everyday)" + +#: common-cmds.h:11 +msgid "examine the history and state (see also: git help revisions)" +msgstr "examina el historial y el estado (mira tambien: git help revisions)" + +#: common-cmds.h:12 +msgid "grow, mark and tweak your common history" +msgstr "crece, marca y ajusta tu historial comun" + +#: common-cmds.h:13 +msgid "collaborate (see also: git help workflows)" +msgstr "colabora (mira tambien: git help workflows)" + +#: common-cmds.h:17 +msgid "Add file contents to the index" +msgstr "Agrega contenido de carpetas al indice" + +#: common-cmds.h:18 +msgid "Use binary search to find the commit that introduced a bug" +msgstr "usa busqueqda binaria para encontrar el commit que introdujo el bug" + +#: common-cmds.h:19 +msgid "List, create, or delete branches" +msgstr "Lista, crea, o borra ramas" + +#: common-cmds.h:20 +msgid "Switch branches or restore working tree files" +msgstr "Cambia ramas o restaura los archivos de tu arbol de trabajo" + +#: common-cmds.h:21 +msgid "Clone a repository into a new directory" +msgstr "Clona un repositorio dentro de un nuevo directorio" + +#: common-cmds.h:22 +msgid "Record changes to the repository" +msgstr "Graba los cambios en tu repositorio" + +#: common-cmds.h:23 +msgid "Show changes between commits, commit and working tree, etc" +msgstr "Muestra los cambios entre commits, commit y arbol de trabajo, etc" + +#: common-cmds.h:24 +msgid "Download objects and refs from another repository" +msgstr "Descarga objetos y referencias de otro repositorio" + +#: common-cmds.h:25 +msgid "Print lines matching a pattern" +msgstr "Imprime las lineas que concuerdan con el patron" + +#: common-cmds.h:26 +msgid "Create an empty Git repository or reinitialize an existing one" +msgstr "Crea un repositorio de Git vacio o reinicia el que ya existe" + +#: common-cmds.h:27 +msgid "Show commit logs" +msgstr "Muestra los logs de commits" + +#: common-cmds.h:28 +msgid "Join two or more development histories together" +msgstr "Junta dos o mas historiales de desarrollo juntos" + +#: common-cmds.h:29 +msgid "Move or rename a file, a directory, or a symlink" +msgstr "Mueve o cambia el nombre a archivos, directorios o vinculos simbolicos" + +#: common-cmds.h:30 +msgid "Fetch from and integrate with another repository or a local branch" +msgstr "Realiza un fetch e integra con otro repositorio o rama local" + +#: common-cmds.h:31 +msgid "Update remote refs along with associated objects" +msgstr "Actualiza referencias remotas junto con sus objetos asociados" + +#: common-cmds.h:32 +msgid "Reapply commits on top of another base tip" +msgstr "Vuelve a aplicar commits en la punta de otra rama" + +#: common-cmds.h:33 +msgid "Reset current HEAD to the specified state" +msgstr "Reinicia el HEAD actual a un estado especifico" + +#: common-cmds.h:34 +msgid "Remove files from the working tree and from the index" +msgstr "Borra archivos del arblo de trabajo y del indice" + +#: common-cmds.h:35 +msgid "Show various types of objects" +msgstr "Muestra varios tipos de objetos" + +#: common-cmds.h:36 +msgid "Show the working tree status" +msgstr "Muestra el estado del arblo de trabajo" + +#: common-cmds.h:37 +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 +msgid "expiry-date" +msgstr "fecha de expiracion" + +#: parse-options.h:160 +msgid "no-op (backward compatibility)" +msgstr "no-op (compatibilidad con versiones anteriores)" + +#: parse-options.h:238 +msgid "be more verbose" +msgstr "ser mas verboso" + +#: parse-options.h:240 +msgid "be more quiet" +msgstr "ser mas discreto" + +#: parse-options.h:246 +msgid "use <n> digits to display SHA-1s" +msgstr "usa <n> digitos para mostrar SHA-1s" + +#: rerere.h:40 +msgid "update the index with reused conflict resolution if possible" +msgstr "" +"actualizar el índice con la resolución de conflictos reutilizada si es " +"posible" + +#: git-bisect.sh:54 +msgid "You need to start by \"git bisect start\"" +msgstr "Debes iniciar con \"git bisect start\"" + +#. TRANSLATORS: Make sure to include [Y] and [n] in your +#. translation. The program will only accept English input +#. 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]?" + +#: git-bisect.sh:121 +#, sh-format +msgid "unrecognised option: '$arg'" +msgstr "opción no reconocida: '$arg'" + +#: git-bisect.sh:125 +#, sh-format +msgid "'$arg' does not appear to be a valid revision" +msgstr "'$arg' no parece ser una revisión válida" + +#: git-bisect.sh:154 +msgid "Bad HEAD - I need a HEAD" +msgstr "Mal HEAD - Necesito un HEAD" + +#: git-bisect.sh:167 +#, sh-format +msgid "" +"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." +msgstr "" +"Error al comprobar '$start_head'. Intente 'git bisect reset <rama-válida>'." + +#: git-bisect.sh:177 +msgid "won't bisect on cg-seek'ed tree" +msgstr "no se bisectará en un árbol con cg-seek" + +#: git-bisect.sh:181 +msgid "Bad HEAD - strange symbolic ref" +msgstr "Mal HEAD - ref simbólico extraño" + +#: git-bisect.sh:233 +#, sh-format +msgid "Bad bisect_write argument: $state" +msgstr "Mal argumento bisect_write: $state" + +#: git-bisect.sh:262 +#, sh-format +msgid "Bad rev input: $arg" +msgstr "Mala entrada rev: $arg" + +#: git-bisect.sh:281 +#, sh-format +msgid "Bad rev input: $bisected_head" +msgstr "Mala entrada rev: $bisected_head" + +#: git-bisect.sh:290 +#, sh-format +msgid "Bad rev input: $rev" +msgstr "Mala entrada rev: $rev" + +#: git-bisect.sh:299 +#, sh-format +msgid "'git bisect $TERM_BAD' can take only one argument." +msgstr "'git bisect $TERM_BAD' solo puede tomar un argumento." + +#: git-bisect.sh:322 +#, sh-format +msgid "Warning: bisecting only with a $TERM_BAD commit." +msgstr "Peligro: bisectando solo con un $TERM_BAD commit." + +#. TRANSLATORS: Make sure to include [Y] and [n] in your +#. translation. The program will only accept English input +#. at this point. +#: git-bisect.sh:328 +msgid "Are you sure [Y/n]? " +msgstr "¿Estás seguro [Y/n]?" + +#: git-bisect.sh:340 +#, sh-format +msgid "" +"You need to give me at least one $bad_syn and one $good_syn revision.\n" +"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" +msgstr "" +"Tiene que dar al menos un $bad_syn y un $good_syn revision.\n" +"(Puede ver \"git bisect $bad_syn\" y \"git bisect $good_syn\" para eso.)" + +#: git-bisect.sh:343 +#, sh-format +msgid "" +"You need to start by \"git bisect start\".\n" +"You then need to give me at least one $good_syn and one $bad_syn revision.\n" +"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" +msgstr "" +"Tiene que comenzar por \"git bisect start\".\n" +"Después tiene que entregar al menos un $good_syn y un $bad_syn revision.\n" +"(Puede usar \"git bisect $bad_syn\" y \"git bisect $good_syn\" para eso.)" + +#: git-bisect.sh:414 git-bisect.sh:546 +msgid "We are not bisecting." +msgstr "No estamos bisectando." + +#: git-bisect.sh:421 +#, sh-format +msgid "'$invalid' is not a valid commit" +msgstr "'$invalid' no es una confirmación válida" + +#: git-bisect.sh:430 +#, sh-format +msgid "" +"Could not check out original HEAD '$branch'.\n" +"Try 'git bisect reset <commit>'." +msgstr "" +"No se pudo revisar el HEAD original '$branch'.\n" +"Intente 'git bisect reset <commit>'." + +#: git-bisect.sh:458 +msgid "No logfile given" +msgstr "No se entrogó logfile" + +#: git-bisect.sh:459 +#, sh-format +msgid "cannot read $file for replaying" +msgstr "no se puede leer $file para reproducir" + +#: git-bisect.sh:480 +msgid "?? what are you talking about?" +msgstr "?? ¿De qué estás hablando?" + +#: git-bisect.sh:492 +#, sh-format +msgid "running $command" +msgstr "ejecutando $command" + +#: git-bisect.sh:499 +#, sh-format +msgid "" +"bisect run failed:\n" +"exit code $res from '$command' is < 0 or >= 128" +msgstr "" +"bisect falló:\n" +"código de salida $res de '$command' es <0 o >=128" + +#: git-bisect.sh:525 +msgid "bisect run cannot continue any more" +msgstr "bisect no puede seguir continuando" + +#: git-bisect.sh:531 +#, sh-format +msgid "" +"bisect run failed:\n" +"'bisect_state $state' exited with error code $res" +msgstr "" +"bisect falló:\n" +"'bisect_state $state' salió con código de error $res" + +#: git-bisect.sh:538 +msgid "bisect run success" +msgstr "bisect exitoso" + +#: git-bisect.sh:565 +msgid "please use two different terms" +msgstr "por favor use dos terminos diferentes" + +#: git-bisect.sh:575 +#, sh-format +msgid "'$term' is not a valid term" +msgstr "'$term' no es un término válido" + +#: git-bisect.sh:578 +#, sh-format +msgid "can't use the builtin command '$term' as a term" +msgstr "no se puede usar el comando builtin '$term' como un término" + +#: git-bisect.sh:587 git-bisect.sh:593 +#, sh-format +msgid "can't change the meaning of term '$term'" +msgstr "no se puede cambiar el significado del término '$term'" + +#: git-bisect.sh:606 +#, sh-format +msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect." +msgstr "" +"Comando inválido: actualmente se encuentra en un bisect $TERM_BAD/$TERM_GOOD" + +#: git-bisect.sh:636 +msgid "no terms defined" +msgstr "no hay términos definidos" + +#: git-bisect.sh:653 +#, sh-format +msgid "" +"invalid argument $arg for 'git bisect terms'.\n" +"Supported options are: --term-good|--term-old and --term-bad|--term-new." +msgstr "" +"argumento inválido $arg para 'git bisect terms'.\n" +"Las opciones soportadas son: --term-good|--term-old and --term-bad|--term-" +"new." + +#: git-merge-octopus.sh:46 +msgid "" +"Error: Your local changes to the following files would be overwritten by " +"merge" +msgstr "" +"Error: Sus cambios locales de los siguientes archivos serán sobrescritos por " +"la fusión" + +#: git-merge-octopus.sh:61 +msgid "Automated merge did not work." +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" + +#: git-merge-octopus.sh:73 +#, sh-format +msgid "Unable to find common commit with $pretty_name" +msgstr "No es posible encontrar commit común con $pretty_name" + +#: git-merge-octopus.sh:77 +#, sh-format +msgid "Already up to date with $pretty_name" +msgstr "Ya actualizado con $pretty_name" + +#: git-merge-octopus.sh:89 +#, sh-format +msgid "Fast-forwarding to: $pretty_name" +msgstr "Realizando fast-forward a: $pretty_name" + +#: git-merge-octopus.sh:97 +#, sh-format +msgid "Trying simple merge with $pretty_name" +msgstr "Intentando fusión simple con $pretty_name" + +#: git-merge-octopus.sh:102 +msgid "Simple merge did not work, trying automatic merge." +msgstr "Fusión simple no funcionó, intentando fusión automática." + +#: git-rebase.sh:58 +msgid "" +"Resolve all conflicts manually, mark them as resolved with\n" +"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" +"You can instead skip this commit: run \"git rebase --skip\".\n" +"To abort and get back to the state before \"git rebase\", run \"git rebase --" +"abort\"." +msgstr "" +"Resuelva todos los conflictos manualmente ya sea con \n" +"\"git add/rm <archivo_conflictivo>\", luego ejecute \"git rebase --continue" +"\".\n" +"Si prefiere saltar este parche, ejecute \"git rebase --skip\" .\n" +"Para abortar y regresar al estado previo al \"git rebase\", ejecute \"git " +"rebase --abort\"." + +#: git-rebase.sh:160 git-rebase.sh:402 +#, sh-format +msgid "Could not move back to $head_name" +msgstr "No se puede regresar a $head_name" + +#: git-rebase.sh:171 +msgid "Applied autostash." +msgstr "Autostash aplicado." + +#: git-rebase.sh:174 +#, sh-format +msgid "Cannot store $stash_sha1" +msgstr "No se puede almacenar $stash_sha1" + +#: git-rebase.sh:214 +msgid "The pre-rebase hook refused to rebase." +msgstr "El hook pre-rebase rechazó el rebase." + +#: git-rebase.sh:219 +msgid "It looks like git-am is in progress. Cannot rebase." +msgstr "Parece que git-am está en progreso. No se puede hacer rebase." + +#: git-rebase.sh:363 +msgid "No rebase in progress?" +msgstr "No hay rebase en progreso?" + +#: git-rebase.sh:374 +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 +msgid "Cannot read HEAD" +msgstr "No se puede leer el HEAD" + +#: git-rebase.sh:384 +msgid "" +"You must edit all merge conflicts and then\n" +"mark them as resolved using git add" +msgstr "" +"Tienes que editar todos los conflictos de fusion y luego\n" +"marcarlos como resueltos usando git add" + +#: git-rebase.sh:424 +#, sh-format +msgid "" +"It seems that there is already a $state_dir_base directory, and\n" +"I wonder if you are in the middle of another rebase. If that is the\n" +"case, please try\n" +"\t$cmd_live_rebase\n" +"If that is not the case, please\n" +"\t$cmd_clear_stale_rebase\n" +"and run me again. I am stopping in case you still have something\n" +"valuable there." +msgstr "" +"Parece que ya hay un directorio $state_dir_base, y\n" +"me pregunto si está en medio de otro rebase. Si ese es el \n" +"caso, por favor intente\n" +"\t$cmd_live_rebase\n" +"Si no es el caso, por favor\n" +"\t$cmd_clear_stale_rebase\n" +"y ejecúteme nuevamente. Me estoy deteniendo en caso de que tenga\n" +"algo de valor ahí." + +#: git-rebase.sh:480 +#, sh-format +msgid "invalid upstream $upstream_name" +msgstr "upstream inválido $upstream_name" + +#: git-rebase.sh:504 +#, 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 +#, sh-format +msgid "$onto_name: there is no merge base" +msgstr "$onto_name: no hay base de fusión" + +#: git-rebase.sh:516 +#, sh-format +msgid "Does not point to a valid commit: $onto_name" +msgstr "No apunta a una confirmación válida: $onto_name" + +#: git-rebase.sh:539 +#, sh-format +msgid "fatal: no such branch: $branch_name" +msgstr "fatal: no existe la rama: $branch_name" + +#: git-rebase.sh:572 +msgid "Cannot autostash" +msgstr "No se puede ejecutar autostash" + +#: git-rebase.sh:577 +#, sh-format +msgid "Created autostash: $stash_abbrev" +msgstr "Autostash creado: $stash_abbrev" + +#: git-rebase.sh:581 +msgid "Please commit or stash them." +msgstr "Por favor, confírmalos o salvaguárdalos." + +#: git-rebase.sh:601 +#, sh-format +msgid "Current branch $branch_name is up to date." +msgstr "La rama actual $branch_name está actualizada." + +#: git-rebase.sh:605 +#, sh-format +msgid "Current branch $branch_name is up to date, rebase forced." +msgstr "Rama actual $branch_name está actualizada, rebase forzado." + +#: git-rebase.sh:616 +#, sh-format +msgid "Changes from $mb to $onto:" +msgstr "Cambios desde $mb a $onto:" + +#: git-rebase.sh:625 +msgid "First, rewinding head to replay your work on top of it..." +msgstr "" +"Primero, rebobinando head para reproducir tu trabajo en la cima de él..." + +#: git-rebase.sh:635 +#, sh-format +msgid "Fast-forwarded $branch_name to $onto_name." +msgstr "Avance rápido de $branch_name a $onto_name." + +#: git-stash.sh:61 +msgid "git stash clear with parameters is unimplemented" +msgstr "git stash clear con parámetros no está implementado" + +#: git-stash.sh:102 +msgid "You do not have the initial commit yet" +msgstr "Aún no tienes una confirmación inicial." + +#: git-stash.sh:117 +msgid "Cannot save the current index state" +msgstr "No se puede guardar el estado actual del índice" + +#: git-stash.sh:132 +msgid "Cannot save the untracked files" +msgstr "No se pueden guardar los archivos no rastreados" + +#: git-stash.sh:152 git-stash.sh:165 +msgid "Cannot save the current worktree state" +msgstr "No se puede guardar el estado actual del árbol de trabajo" + +#: git-stash.sh:169 +msgid "No changes selected" +msgstr "Sin cambios seleccionados" + +#: git-stash.sh:172 +msgid "Cannot remove temporary index (can't happen)" +msgstr "No se puede remover el índice temporal (no puede suceder)" + +#: git-stash.sh:185 +msgid "Cannot record working tree state" +msgstr "No se puede grabar el estado del árbol de trabajo" + +#: git-stash.sh:217 +#, sh-format +msgid "Cannot update $ref_stash with $w_commit" +msgstr "No se puede actualizar $ref_stash con $w_commit" + +#. TRANSLATORS: $option is an invalid option, like +#. `--blah-blah'. The 7 spaces at the beginning of the +#. second line correspond to "error: ". So you should line +#. up the second line with however many characters the +#. translation of "error: " takes in your language. E.g. in +#. English this is: +#. +#. $ git stash save --blah-blah 2>&1 | head -n 2 +#. error: unknown option for 'stash save': --blah-blah +#. To provide a message, use git stash save -- '--blah-blah' +#: git-stash.sh:273 +#, sh-format +msgid "" +"error: unknown option for 'stash save': $option\n" +" To provide a message, use git stash save -- '$option'" +msgstr "" +"error: opción desconocida para 'stash save': $option\n" +" Esto provee un mensaje , use git stash save -- '$option'" + +#: git-stash.sh:288 +msgid "Can't use --patch and --include-untracked or --all at the same time" +msgstr "No se puede usar --patch y --include-untracked o --all al mismo tiempo" + +#: git-stash.sh:296 +msgid "No local changes to save" +msgstr "No hay cambios locales para guardar" + +#: git-stash.sh:301 +msgid "Cannot initialize stash" +msgstr "No se puede inicializar stash" + +#: git-stash.sh:305 +msgid "Cannot save the current status" +msgstr "No se puede guardar el estado actual" + +#: git-stash.sh:306 +#, sh-format +msgid "Saved working directory and index state $stash_msg" +msgstr "Directorio de trabajo guardado y estado de índice $stash_msg" + +#: git-stash.sh:334 +msgid "Cannot remove worktree changes" +msgstr "No se pueden remover cambios del árbol de trabajo" + +#: git-stash.sh:482 +#, sh-format +msgid "unknown option: $opt" +msgstr "opción desconocida: $opt" + +#: git-stash.sh:495 +msgid "No stash entries found." +msgstr "No se encontraron entradas de stash." + +#: git-stash.sh:502 +#, sh-format +msgid "Too many revisions specified: $REV" +msgstr "Se especificaron demasiadas revisiones: $REV" + +#: git-stash.sh:517 +#, sh-format +msgid "$reference is not a valid reference" +msgstr "$reference no es una referencia válida" + +#: git-stash.sh:545 +#, sh-format +msgid "'$args' is not a stash-like commit" +msgstr "'$args' no es un commit estilo stash" + +#: git-stash.sh:556 +#, sh-format +msgid "'$args' is not a stash reference" +msgstr "'$args' no es una referencia stash" + +#: git-stash.sh:564 +msgid "unable to refresh index" +msgstr "incapaz de refrescar el índice" + +#: git-stash.sh:568 +msgid "Cannot apply a stash in the middle of a merge" +msgstr "No se puede aplicar un stash en medio de una fusión" + +#: git-stash.sh:576 +msgid "Conflicts in index. Try without --index." +msgstr "Conflictos en índice. Intente sin --index." + +#: git-stash.sh:578 +msgid "Could not save index tree" +msgstr "No se puede guardar el índice del árbol" + +#: git-stash.sh:587 +msgid "Could not restore untracked files from stash entry" +msgstr "No se pueden restaurar archivos no rastreados de la entrada stash" + +#: git-stash.sh:612 +msgid "Cannot unstage modified files" +msgstr "No se puede sacar de stage archivos modificados" + +#: git-stash.sh:627 +msgid "Index was not unstashed." +msgstr "El índice no fue sacado de stash." + +#: git-stash.sh:641 +msgid "The stash entry is kept in case you need it again." +msgstr "La entrada de stash se guardó en caso de ser necesario nuevamente." + +#: git-stash.sh:650 +#, sh-format +msgid "Dropped ${REV} ($s)" +msgstr "Botado ${REV} ($s)" + +#: git-stash.sh:651 +#, sh-format +msgid "${REV}: Could not drop stash entry" +msgstr "${REV}: No se pudo borrar entrada stash" + +#: git-stash.sh:659 +msgid "No branch name specified" +msgstr "No se especificó el nombre de la rama." + +#: git-stash.sh:738 +msgid "(To restore them type \"git stash apply\")" +msgstr "(Para restaurarlos, escribe \"git stash apply\")" + +#: git-submodule.sh:181 +msgid "Relative path can only be used from the toplevel of the working tree" +msgstr "" +"La ruta relativa sólo se puede usar desde el nivel superior del árbol de " +"trabajo" + +#: 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 ./|../" + +#: git-submodule.sh:210 +#, sh-format +msgid "'$sm_path' already exists in the index" +msgstr "'$sm_path' ya existe en el índice" + +#: git-submodule.sh:213 +#, sh-format +msgid "'$sm_path' already exists in the index and is not a submodule" +msgstr "'$sm_path' ya existe en el índice y no es un submódulo" + +#: git-submodule.sh:219 +#, sh-format +msgid "" +"The following path is ignored by one of your .gitignore files:\n" +"$sm_path\n" +"Use -f if you really want to add it." +msgstr "" +"La siguiente ruta es ignorada por uno de tus archivos .gitignore:\n" +"$sm_path\n" +"Usa -f si en verdad quieres agregarlo." + +#: 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'" + +#: git-submodule.sh:239 +#, sh-format +msgid "'$sm_path' already exists and is not a valid git repo" +msgstr "'$sm_path' ya existe y no es un repositorio git válido" + +#: git-submodule.sh:247 +#, sh-format +msgid "A git directory for '$sm_name' is found locally with remote(s):" +msgstr "" +"Se encontró localmente un directorio git para '$sm_name' con el(los) " +"remoto(s):" + +#: git-submodule.sh:249 +#, sh-format +msgid "" +"If you want to reuse this local git directory instead of cloning again from\n" +" $realrepo\n" +"use the '--force' option. If the local git directory is not the correct " +"repo\n" +"or you are unsure what this means choose another name with the '--name' " +"option." +msgstr "" +"Si quiere reusar este directorio git local en lugar de clonar nuevamente de\n" +" $realrepo\n" +"use la opción '--force'. Si el directorio git local no es el repositorio " +"correcto\n" +"o no está seguro de lo que esto significa, escoja otro nombre con la opción " +"'--name'." + +#: git-submodule.sh:255 +#, sh-format +msgid "Reactivating local git directory for submodule '$sm_name'." +msgstr "Reactivar directorio git local para el submódulo '$sm_name'." + +#: git-submodule.sh:267 +#, sh-format +msgid "Unable to checkout submodule '$sm_path'" +msgstr "No es posible hacer checkout al submódulo '$sm_path'" + +#: git-submodule.sh:272 +#, sh-format +msgid "Failed to add submodule '$sm_path'" +msgstr "Fallo al agregar el submódulo '$sm_path'" + +#: git-submodule.sh:281 +#, sh-format +msgid "Failed to register submodule '$sm_path'" +msgstr "Fallo al registrar el submódulo '$sm_path'" + +#: git-submodule.sh:342 +#, sh-format +msgid "Entering '$displaypath'" +msgstr "Entrando a '$displaypath'" + +#: git-submodule.sh:362 +#, sh-format +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 +#, 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 +#, 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 +#, sh-format +msgid "" +"Unable to find current ${remote_name}/${branch} revision in submodule path " +"'$sm_path'" +msgstr "" +"No es posible encontrar revisión actual ${remote_name}/${branch} en la ruta " +"de submódulo '$sm_path'" + +#: git-submodule.sh:670 +#, 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 +#, sh-format +msgid "" +"Fetched in submodule path '$displaypath', but it did not contain $sha1. " +"Direct fetching of that commit failed." +msgstr "" +"Fetch realizado en ruta de submódulo '$displaypath', pero no contenía $sha1. " +"Fetch directo del commit falló." + +#: git-submodule.sh:683 +#, 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 +#, sh-format +msgid "Submodule path '$displaypath': checked out '$sha1'" +msgstr "Ruta de submódulo '$displaypath': check out realizado a '$sha1'" + +#: git-submodule.sh:688 +#, 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 +#, sh-format +msgid "Submodule path '$displaypath': rebased into '$sha1'" +msgstr "Ruta de submódulo '$displaypath': rebasada en '$sha1'" + +#: git-submodule.sh:694 +#, sh-format +msgid "Unable to merge '$sha1' in submodule path '$displaypath'" +msgstr "Incapaz de fusionar '$sha1' en la ruta '$displaypath' del submódulo" + +#: git-submodule.sh:695 +#, sh-format +msgid "Submodule path '$displaypath': merged in '$sha1'" +msgstr "Ruta de submódulo '$displaypath': fusionada en '$sha1'" + +#: git-submodule.sh:700 +#, 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 +#, sh-format +msgid "Submodule path '$displaypath': '$command $sha1'" +msgstr "Ruta de submódulo '$displaypath': '$command $sha1'" + +#: git-submodule.sh:732 +#, sh-format +msgid "Failed to recurse into submodule path '$displaypath'" +msgstr "Falló al recurrir en la ruta de submódulo '$displaypath'" + +#: git-submodule.sh:840 +msgid "The --cached option cannot be used with the --files option" +msgstr "La opción --cached no puede ser usada con la opción --files" + +#: git-submodule.sh:892 +#, sh-format +msgid "unexpected mode $mod_dst" +msgstr "modo $mod_dst inesperado" + +#: git-submodule.sh:912 +#, sh-format +msgid " Warn: $display_name doesn't contain commit $sha1_src" +msgstr " Advertencia: $display_name no contiene la confirmación $sha1_src" + +#: git-submodule.sh:915 +#, sh-format +msgid " Warn: $display_name doesn't contain commit $sha1_dst" +msgstr " Advertencia: $display_name no contiene la confirmación $sha1_dst" + +#: git-submodule.sh:918 +#, sh-format +msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" +msgstr "" +"Advertencia: $display_name no contiene las confirmaciones $sha1_src y " +"$sha1_dst" + +#: git-submodule.sh:1064 +#, sh-format +msgid "Failed to recurse into submodule path '$sm_path'" +msgstr "Falló al recurrir en la ruta de submódulo '$sm_path'" + +#: git-submodule.sh:1136 +#, sh-format +msgid "Synchronizing submodule url for '$displaypath'" +msgstr "Sincronizando url de submódulo para '$displaypath'" + +#: git-parse-remote.sh:89 +#, sh-format +msgid "See git-${cmd}(1) for details." +msgstr "Véase git-${cmd}(1) para más detalles." + +#: git-rebase--interactive.sh:140 +#, sh-format +msgid "Rebasing ($new_count/$total)" +msgstr "Rebasando ($new_count/$total)" + +#: git-rebase--interactive.sh:156 +msgid "" +"\n" +"Commands:\n" +"p, pick = use commit\n" +"r, reword = use commit, but edit the commit message\n" +"e, edit = use commit, but stop for amending\n" +"s, squash = use commit, but meld into previous commit\n" +"f, fixup = like \"squash\", but discard this commit's log message\n" +"x, exec = run command (the rest of the line) using shell\n" +"d, drop = remove commit\n" +"\n" +"These lines can be re-ordered; they are executed from top to bottom.\n" +msgstr "" +"\n" +"Comandos:\n" +" p, pick = usar commit\n" +" r, reword = usar commit, pero editar el mensaje\n" +" e, edit = usar commit, pero detener para enmendar\n" +" s, squash = usar commit, pero unirlo al commit previo\n" +" f, fixup = como \"squash\", pero descartar el mensaje del commit en el log\n" +" x, exec = ejecutar comando (el resto de la línea) usando un shell\n" +" d, drop = borrar commit\n" +"\n" +"Estas líneas pueden ser re-ordenadas; son ejecutadas desde arriba hacia " +"abajo.\n" + +#: git-rebase--interactive.sh:171 +msgid "" +"\n" +"Do not remove any line. Use 'drop' explicitly to remove a commit.\n" +msgstr "" +"\n" +"No eliminar ninguna línea. Usa 'drop' explícitamente para eliminar una " +"confirmación.\n" + +#: git-rebase--interactive.sh:175 +msgid "" +"\n" +"If you remove a line here THAT COMMIT WILL BE LOST.\n" +msgstr "" +"\n" +"Si remueves una línea aquí EL COMMIT SE PERDERÁ.\n" + +#: git-rebase--interactive.sh:211 +#, sh-format +msgid "" +"You can amend the commit now, with\n" +"\n" +"\tgit commit --amend $gpg_sign_opt_quoted\n" +"\n" +"Once you are satisfied with your changes, run\n" +"\n" +"\tgit rebase --continue" +msgstr "" +"Puede enmendar el commit ahora, con\n" +"\n" +"\tgit commit --amend $gpg_sign_opt_quoted\n" +"\n" +"Una vez que esté satisfecho con los cambios, ejecute\n" +"\n" +"\tgit rebase --continue" + +#: git-rebase--interactive.sh:236 +#, 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 +#, sh-format +msgid "Invalid commit name: $sha1" +msgstr "Nombre de confirmación inválido: $sha1" + +#: git-rebase--interactive.sh:317 +msgid "Cannot write current commit's replacement sha1" +msgstr "No se puede escribir el remplazo sha1 del commit actual" + +#: git-rebase--interactive.sh:369 +#, sh-format +msgid "Fast-forward to $sha1" +msgstr "Avance rápido a $sha1" + +#: git-rebase--interactive.sh:371 +#, sh-format +msgid "Cannot fast-forward to $sha1" +msgstr "No se puede realizar avance rápido a $sha1" + +#: git-rebase--interactive.sh:380 +#, sh-format +msgid "Cannot move HEAD to $first_parent" +msgstr "No se puede mover HEAD a $first_parent" + +#: git-rebase--interactive.sh:385 +#, sh-format +msgid "Refusing to squash a merge: $sha1" +msgstr "Rehusando a ejecutar squash en fusión: $sha1" + +#: git-rebase--interactive.sh:400 +#, sh-format +msgid "Error redoing merge $sha1" +msgstr "Error rehaciendo fusión $sha1" + +#: git-rebase--interactive.sh:408 +#, sh-format +msgid "Could not pick $sha1" +msgstr "No se pudo coger $sha1" + +#: git-rebase--interactive.sh:417 +#, sh-format +msgid "This is the commit message #${n}:" +msgstr "Este es el mensaje de la confirmación #${n}:" + +#: git-rebase--interactive.sh:422 +#, sh-format +msgid "The commit message #${n} will be skipped:" +msgstr "El mensaje de confirmación #${n} será ignorado:" + +#: git-rebase--interactive.sh:433 +#, sh-format +msgid "This is a combination of $count commit." +msgid_plural "This is a combination of $count commits." +msgstr[0] "Esta es una combinación de $count confirmación." +msgstr[1] "Esta es la combinación de $count confirmaciones." + +#: git-rebase--interactive.sh:442 +#, sh-format +msgid "Cannot write $fixup_msg" +msgstr "No se puede escribir $fixup_msg" + +#: git-rebase--interactive.sh:445 +msgid "This is a combination of 2 commits." +msgstr "Esto es una combinación de 2 confirmaciones." + +#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529 +#: git-rebase--interactive.sh:532 +#, sh-format +msgid "Could not apply $sha1... $rest" +msgstr "No se puede aplicar $sha1... $rest" + +#: git-rebase--interactive.sh:560 +#, sh-format +msgid "" +"Could not amend commit after successfully picking $sha1... $rest\n" +"This is most likely due to an empty commit message, or the pre-commit hook\n" +"failed. If the pre-commit hook failed, you may need to resolve the issue " +"before\n" +"you are able to reword the commit." +msgstr "" +"No se pudo corregir commit después de seleccionar exitosamente $sha1 ... " +"$rest\n" +"Esto es probablemente debido a un mensaje de commit vacío, o el hook pre-" +"commit\n" +"ha fallado. Si el hook pre-commit falló, es posible que deba resolver el " +"problema antes\n" +"de que sea capaz de reformular el commit." + +#: git-rebase--interactive.sh:575 +#, sh-format +msgid "Stopped at $sha1_abbrev... $rest" +msgstr "Detenido en $sha1_abbrev... $rest" + +#: git-rebase--interactive.sh:590 +#, sh-format +msgid "Cannot '$squash_style' without a previous commit" +msgstr "no se puede '$squash_style' sin una confirmación previa" + +#: git-rebase--interactive.sh:632 +#, sh-format +msgid "Executing: $rest" +msgstr "Ejecutando: $rest" + +#: git-rebase--interactive.sh:640 +#, sh-format +msgid "Execution failed: $rest" +msgstr "Ejecución fallida: $rest" + +#: git-rebase--interactive.sh:642 +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 +msgid "" +"You can fix the problem, and then run\n" +"\n" +"\tgit rebase --continue" +msgstr "" +"Puedes corregir el problema y entonces ejecutar\n" +"\n" +"\tgit rebase --continue" + +#. TRANSLATORS: after these lines is a command to be issued by the user +#: git-rebase--interactive.sh:657 +#, sh-format +msgid "" +"Execution succeeded: $rest\n" +"but left changes to the index and/or the working tree\n" +"Commit or stash your changes, and then run\n" +"\n" +"\tgit rebase --continue" +msgstr "" +"La ejecución tuvo éxito: $rest\n" +"Pero dejó cambios en el índice y/o en el árbol de trabajo\n" +"Realice un commit o stash con los cambios y, a continuación, ejecute\n" +"\n" +"\tgit rebase --continue" + +#: git-rebase--interactive.sh:668 +#, sh-format +msgid "Unknown command: $command $sha1 $rest" +msgstr "Comando desconocido: $command $sha1 $rest" + +#: git-rebase--interactive.sh:669 +msgid "Please fix this using 'git rebase --edit-todo'." +msgstr "Por favor, corrige esto usando 'git rebase --edit-todo'." + +#: git-rebase--interactive.sh:704 +#, sh-format +msgid "Successfully rebased and updated $head_name." +msgstr "$head_name rebasado y actualizado satisfactoriamente." + +#: git-rebase--interactive.sh:749 +msgid "could not detach HEAD" +msgstr "No se puede desacoplar HEAD" + +#: git-rebase--interactive.sh:784 +msgid "Could not remove CHERRY_PICK_HEAD" +msgstr "No se pudo remover CHERRY_PICK_HEAD" + +#: git-rebase--interactive.sh:789 +#, sh-format +msgid "" +"You have staged changes in your working tree.\n" +"If these changes are meant to be\n" +"squashed into the previous commit, run:\n" +"\n" +" git commit --amend $gpg_sign_opt_quoted\n" +"\n" +"If they are meant to go into a new commit, run:\n" +"\n" +" git commit $gpg_sign_opt_quoted\n" +"\n" +"In both cases, once you're done, continue with:\n" +"\n" +" git rebase --continue\n" +msgstr "" +"TIene cambios en el area de stage de su arbol de trabajo.\n" +"Si estos cambios estan destinados a \n" +"ser aplastados en el commit previo, ejecute:\n" +"\n" +" git commit --amend $gpg_sign_opt_quoted\n" +"\n" +"Si estos estan destinados a ir en un nuevo comit, ejecute:\n" +"\n" +" git commit $gpg_sign_opt_quoted\n" +"\n" +"En ambos casos, cuando termite, continue con:\n" +"\n" +" git rebase --continue\n" + +#: git-rebase--interactive.sh:806 +msgid "Error trying to find the author identity to amend commit" +msgstr "" +"Error tratando de encontrar la identidad del autor para remediar el commit " + +#: git-rebase--interactive.sh:811 +msgid "" +"You have uncommitted changes in your working tree. Please commit them\n" +"first and then run 'git rebase --continue' again." +msgstr "" +"Tienes cambios sin confirmar en tu árbol de trabajo. Por favor, confírmalos\n" +"primero y entonces ejecuta 'git rebase --continue' de nuevo." + +#: git-rebase--interactive.sh:816 git-rebase--interactive.sh:820 +msgid "Could not commit staged changes." +msgstr "No se pudo realizar el commit con los cambios en el area de stage" + +#: git-rebase--interactive.sh:848 +msgid "" +"\n" +"You are editing the todo file of an ongoing interactive rebase.\n" +"To continue rebase after editing, run:\n" +" git rebase --continue\n" +"\n" +msgstr "" +"\n" +"Esta editando el archivo TODO de un rebase interactivo.\n" +"Para continuar el rebase despues de editar, ejecute:\n" +" git rebase --continue\n" +"\n" + +#: git-rebase--interactive.sh:856 git-rebase--interactive.sh:1015 +msgid "Could not execute editor" +msgstr "No se pudo ejecutar el editor" + +#: git-rebase--interactive.sh:869 +#, sh-format +msgid "Could not checkout $switch_to" +msgstr "No se pudo actualizar el árbol de trabajo a $switch_to" + +#: git-rebase--interactive.sh:874 +msgid "No HEAD?" +msgstr "¿Sin HEAD?" + +#: git-rebase--interactive.sh:875 +#, sh-format +msgid "Could not create temporary $state_dir" +msgstr "No se pudo crear $state_dir temporalmente" + +#: git-rebase--interactive.sh:877 +msgid "Could not mark as interactive" +msgstr "No se pudo marcar como interactivo" + +#: git-rebase--interactive.sh:887 git-rebase--interactive.sh:892 +msgid "Could not init rewritten commits" +msgstr "No se puede inicializar los commits reescritos" + +#: git-rebase--interactive.sh:993 +#, sh-format +msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" +msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" +msgstr[0] "Rebase $shortrevisions en $shortonto ($todocount comando)" +msgstr[1] "Rebase $shortrevisions en $shortonto ($todocount comandos)" + +#: git-rebase--interactive.sh:998 +msgid "" +"\n" +"However, if you remove everything, the rebase will be aborted.\n" +"\n" +msgstr "" +"\n" +"Como sea, si se remueve todo, el rebase sera abortado.\n" +"\n" + +#: git-rebase--interactive.sh:1005 +msgid "Note that empty commits are commented out" +msgstr "Nota que los commits vacios estan comentados" + +#: git-sh-setup.sh:89 git-sh-setup.sh:94 +#, sh-format +msgid "usage: $dashless $USAGE" +msgstr "uso: $dashless $USAGE" + +#: git-sh-setup.sh:190 +#, sh-format +msgid "Cannot chdir to $cdup, the toplevel of the working tree" +msgstr "" +"No se puede aplicar chdir a $cdup, el nivel máximo del árbol de trabajo" + +#: git-sh-setup.sh:199 git-sh-setup.sh:206 +#, sh-format +msgid "fatal: $program_name cannot be used without a working tree." +msgstr "fatal: $program_name no puede ser usado sin un arbol de trabajo." + +#: git-sh-setup.sh:220 +msgid "Cannot rebase: You have unstaged changes." +msgstr "" +"No se puede aplicar rebase: Tienes cambios que no estan en el area de stage." + +#: git-sh-setup.sh:223 +msgid "Cannot rewrite branches: You have unstaged changes." +msgstr "" +"No se puede reescribir las ramas: Tienes cambios que no estan en el area de " +"stage" + +#: git-sh-setup.sh:226 +msgid "Cannot pull with rebase: You have unstaged changes." +msgstr "" +"No se puede aplicar pull con rebase: Tienes cambios que no estan en el area " +"de stage." + +#: git-sh-setup.sh:229 +#, sh-format +msgid "Cannot $action: You have unstaged changes." +msgstr "No se puede $action: Tienes cambios que no estan en el area de stage" + +#: git-sh-setup.sh:242 +msgid "Cannot rebase: Your index contains uncommitted changes." +msgstr "" +"No se puede hacer rebase: Tu indice contiene cambios que no estan en un " +"commit." + +#: git-sh-setup.sh:245 +msgid "Cannot pull with rebase: Your index contains uncommitted changes." +msgstr "" +"No se puede hacer pull con rebase: Tu indice contiene cambios que no estan " +"en un commit." + +#: git-sh-setup.sh:248 +#, sh-format +msgid "Cannot $action: Your index contains uncommitted changes." +msgstr "No se puede $action: El índice contiene cambios sin confirmar." + +#: git-sh-setup.sh:252 +msgid "Additionally, your index contains uncommitted changes." +msgstr "Adicionalmente, tu indice contiene cambios que no estan en un commit." + +#: git-sh-setup.sh:372 +msgid "You need to run this command from the toplevel of the working tree." +msgstr "" +"Necesitas ejecutar este comando desde el nivel superior de tu árbol de " +"trabajo." + +#: git-sh-setup.sh:377 +msgid "Unable to determine absolute path of git directory" +msgstr "Incapaz de determinar la ruta absoluta del directorio git" + +#. TRANSLATORS: you can adjust this to align "git add -i" status menu +#: git-add--interactive.perl:196 +#, perl-format +msgid "%12s %12s %s" +msgstr "%12s %12s %s" + +#: git-add--interactive.perl:197 +msgid "staged" +msgstr "rastreado" + +#: git-add--interactive.perl:197 +msgid "unstaged" +msgstr "no rastreado" + +#: git-add--interactive.perl:246 git-add--interactive.perl:271 +msgid "binary" +msgstr "binario" + +#: git-add--interactive.perl:255 git-add--interactive.perl:309 +msgid "nothing" +msgstr "nada" + +#: git-add--interactive.perl:291 git-add--interactive.perl:306 +msgid "unchanged" +msgstr "sin cambios" + +#: git-add--interactive.perl:602 +#, perl-format +msgid "added %d path\n" +msgid_plural "added %d paths\n" +msgstr[0] "agregada %d ruta\n" +msgstr[1] "agregadas %d rutas\n" + +#: git-add--interactive.perl:605 +#, perl-format +msgid "updated %d path\n" +msgid_plural "updated %d paths\n" +msgstr[0] "actualizada %d ruta\n" +msgstr[1] "actualizadas %d rutas\n" + +#: git-add--interactive.perl:608 +#, perl-format +msgid "reverted %d path\n" +msgid_plural "reverted %d paths\n" +msgstr[0] "revertida %d ruta\n" +msgstr[1] "revertidas %d rutas\n" + +#: git-add--interactive.perl:611 +#, perl-format +msgid "touched %d path\n" +msgid_plural "touched %d paths\n" +msgstr[0] "touch hecho a %d ruta\n" +msgstr[1] "touch hecho a %d rutas\n" + +#: git-add--interactive.perl:620 +msgid "Update" +msgstr "Actualizar" + +#: git-add--interactive.perl:632 +msgid "Revert" +msgstr "Revertir" + +#: git-add--interactive.perl:655 +#, perl-format +msgid "note: %s is untracked now.\n" +msgstr "nota: %s no es rastreado ahora.\n" + +#: git-add--interactive.perl:666 +msgid "Add untracked" +msgstr "Agregar no rastreados" + +#: git-add--interactive.perl:672 +msgid "No untracked files.\n" +msgstr "No hay archivos sin rastrear.\n" + +#: git-add--interactive.perl:985 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for staging." +msgstr "" +"Si el parche aplica limpiamente, el hunk editado sera marcado\n" +"inmediatamente para el area de stage." + +#: git-add--interactive.perl:988 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for stashing." +msgstr "" +"Si el parche aplica limpiamente, el hunk editado sera marcado\n" +"inmediatamente para aplicar stash." + +#: git-add--interactive.perl:991 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for unstaging." +msgstr "" +"Si el parche aplica limpiamente, el hunk editado sera marcado\n" +"inmediatamente para sacar del area de stage." + +#: git-add--interactive.perl:994 git-add--interactive.perl:1003 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for applying." +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 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for discarding." +msgstr "" +"Si el parche aplica de forma limpia, el hunk editado sera marcado\n" +"inmediatamente para descarte." + +#: git-add--interactive.perl:1013 +#, perl-format +msgid "failed to open hunk edit file for writing: %s" +msgstr "fallo al abrir el archivo de edicion del hunk para escritura: %s" + +#: git-add--interactive.perl:1014 +msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" +msgstr "Modo de edicion manual de hunk -- vea abajo para una guia rapida.\n" + +#: git-add--interactive.perl:1020 +#, perl-format +msgid "" +"---\n" +"To remove '%s' lines, make them ' ' lines (context).\n" +"To remove '%s' lines, delete them.\n" +"Lines starting with %s will be removed.\n" +msgstr "" +"---\n" +"Para remover '%s' lineas, haga de ellas lineas ' ' (contexto).\n" +"Para remover '%s' lineas, borrelas.\n" +"Lineas comenzando con %s seran removidas.\n" + +#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. +#: git-add--interactive.perl:1028 +msgid "" +"If it does not apply cleanly, you will be given an opportunity to\n" +"edit again. If all lines of the hunk are removed, then the edit is\n" +"aborted and the hunk is left unchanged.\n" +msgstr "" +"Si esto no aplica de manera limpia, se le da la oportunidad de \n" +"editar nuevamente. Si todas las lineas del hunk son removidas, entonces \n" +"la edicion es abortada y el hunk queda sin cambios.\n" + +#: git-add--interactive.perl:1042 +#, perl-format +msgid "failed to open hunk edit file for reading: %s" +msgstr "fallo al abrir el archivo de edicion del hunk para lectura: %s" + +#. TRANSLATORS: do not translate [y/n] +#. The program will only accept that input +#. at this point. +#. Consider translating (saying "no" discards!) as +#. (saying "n" for "no" discards!) if the translation +#. of the word "no" does not start with n. +#: git-add--interactive.perl:1134 +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 +msgid "" +"y - stage this hunk\n" +"n - do not stage this hunk\n" +"q - quit; do not stage this hunk or any of the remaining ones\n" +"a - stage this hunk and all later hunks in the file\n" +"d - do not stage this hunk or any of the later hunks in the file" +msgstr "" +"y - aplicar stage a este hunk\n" +"n - no aplicar stage a este hunk\n" +"q - quit; no aplicar stage a este hunk o ninguno de los restantes\n" +"a - aplicar stage a este hunk y a todos los posteriores en el archivo \n" +"d - no aplicar stage a este hunk o a ninguno de los posteriores en este " +"archivo" + +#: git-add--interactive.perl:1149 +msgid "" +"y - stash this hunk\n" +"n - do not stash this hunk\n" +"q - quit; do not stash this hunk or any of the remaining ones\n" +"a - stash this hunk and all later hunks in the file\n" +"d - do not stash this hunk or any of the later hunks in the file" +msgstr "" +"y - aplicar stash a este hunk\n" +"n - no aplicar stash a este hunk\n" +"q - quit; no aplicar stash a este hunk o a ninguno de los restantes\n" +"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 +msgid "" +"y - unstage this hunk\n" +"n - do not unstage this hunk\n" +"q - quit; do not unstage this hunk or any of the remaining ones\n" +"a - unstage this hunk and all later hunks in the file\n" +"d - do not unstage this hunk or any of the later hunks in the file" +msgstr "" +"y - sacar deste hunk del area de stage\n" +"n - no sacar este hunk del area de stage\n" +"q - quit; no sacar del area de stage este hunk o ninguno de los restantes\n" +"a - sacar del area de stage este hunk y todos los posteriores en el archivo\n" +"d - no sacar del area de stage este hunk o ninguno de los posteriores en el " +"archivo" + +#: git-add--interactive.perl:1161 +msgid "" +"y - apply this hunk to index\n" +"n - do not apply this hunk to index\n" +"q - quit; do not apply this hunk or any of the remaining ones\n" +"a - apply this hunk and all later hunks in the file\n" +"d - do not apply this hunk or any of the later hunks in the file" +msgstr "" +"y - aplicar este hunk al indice\n" +"n - no aplicar este hunk al indice\n" +"q - quit; no aplicar este hunk o ninguno de los restantes\n" +"a - aplicar este hunk y todos los posteriores en el archivo\n" +"d - no aplicar este hunko ninguno de los posteriores en el archivo" + +#: git-add--interactive.perl:1167 +msgid "" +"y - discard this hunk from worktree\n" +"n - do not discard this hunk from worktree\n" +"q - quit; do not discard this hunk or any of the remaining ones\n" +"a - discard this hunk and all later hunks in the file\n" +"d - do not discard this hunk or any of the later hunks in the file" +msgstr "" +"y - descartar este hunk del arbol de trabajo\n" +"n - no descartar este hunk del arbol de trabajo\n" +"q - quit; no descartar este hunk o ninguno de los que restantes\n" +"a - descartar este hunk y todos los posteriores en este archivo\n" +"d - no descartar este hunk o ninguno de los posteriores en el archivo" + +#: git-add--interactive.perl:1173 +msgid "" +"y - discard this hunk from index and worktree\n" +"n - do not discard this hunk from index and worktree\n" +"q - quit; do not discard this hunk or any of the remaining ones\n" +"a - discard this hunk and all later hunks in the file\n" +"d - do not discard this hunk or any of the later hunks in the file" +msgstr "" +"y - descartar este hunk del indice y el arbol de trabajo\n" +"n - no descartar este hunk del indice ni el arbol de trabajo\n" +"q - quit; no descartar este hunk o ninguno de los que quedan\n" +"a - descartar este hunk y todos los posteriores en este archivo\n" +"d - no descartar este hunk o ninguno posterior en el archivo" + +#: git-add--interactive.perl:1179 +msgid "" +"y - apply this hunk to index and worktree\n" +"n - do not apply this hunk to index and worktree\n" +"q - quit; do not apply this hunk or any of the remaining ones\n" +"a - apply this hunk and all later hunks in the file\n" +"d - do not apply this hunk or any of the later hunks in the file" +msgstr "" +"y - aplicar este hunk al indice y al arbol de trabajo\n" +"n - no aplicar este hunk al indice y al arbol de trabajo\n" +"q - quit; no aplicar este hunk o ninguno de los restantes\n" +"a - aplicar este hunk y todos los posteriores en el archivo\n" +"d - no aplicar este hunk o ninguno de los siguientes en este archivo" + +#: git-add--interactive.perl:1188 +msgid "" +"g - select a hunk to go to\n" +"/ - search for a hunk matching the given regex\n" +"j - leave this hunk undecided, see next undecided hunk\n" +"J - leave this hunk undecided, see next hunk\n" +"k - leave this hunk undecided, see previous undecided hunk\n" +"K - leave this hunk undecided, see previous hunk\n" +"s - split the current hunk into smaller hunks\n" +"e - manually edit the current hunk\n" +"? - print help\n" +msgstr "" +"g - selecciona un hunk a donde ir\n" +"/ - buscar un hunk que concuerde el regex\n" +"j - dejar este hunk por definir, ver siguiente hunk por definir\n" +"J - dejar este hunk por definird, ver siguiente hunk\n" +"k - dejar este hunk por definir, ver hunk previo por definir\n" +"K - dejar este hunk por definir, ver hunk previo\n" +"s - dividir el hunk actual en hunks mas pequenos\n" +"e - editar manualmente el hunk actual\n" +"? - imprimir ayuda\n" + +#: git-add--interactive.perl:1219 +msgid "The selected hunks do not apply to the index!\n" +msgstr "Los hunks seleccionados no aplican al indice!\n" + +#: git-add--interactive.perl:1220 +msgid "Apply them to the worktree anyway? " +msgstr "Aplicarlos al arbol de trabajo de todas maneras?" + +#: git-add--interactive.perl:1223 +msgid "Nothing was applied.\n" +msgstr "Nada fue aplicado.\n" + +#: git-add--interactive.perl:1234 +#, perl-format +msgid "ignoring unmerged: %s\n" +msgstr "ignorando lo no fusionado: %s\n" + +#: git-add--interactive.perl:1243 +msgid "Only binary files changed.\n" +msgstr "Solo cambiaron archivos binarios.\n" + +#: git-add--interactive.perl:1245 +msgid "No changes.\n" +msgstr "Sin cambios.\n" + +#: git-add--interactive.perl:1253 +msgid "Patch update" +msgstr "Actualizacion de parche" + +#: git-add--interactive.perl:1305 +#, 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,?]? " + +#: git-add--interactive.perl:1306 +#, perl-format +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 +#, perl-format +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 +#, 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,?]? " + +#: git-add--interactive.perl:1311 +#, perl-format +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 +#, perl-format +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 +#, 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,?]? " + +#: git-add--interactive.perl:1316 +#, perl-format +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 +#, perl-format +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 +#, perl-format +msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? " +msgstr "Aplicarcambio de modo al indice [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1321 +#, perl-format +msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? " +msgstr "Aplicar borrado al indice [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1322 +#, perl-format +msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? " +msgstr "Aplicar este hunk al indice [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1325 +#, perl-format +msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? " +msgstr "Descartar cambio de modo del arbol de trabajo [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1326 +#, perl-format +msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? " +msgstr "Descartar borrado del arbol de trabajo [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1327 +#, perl-format +msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? " +msgstr "Descartar este hunk del arbol de trabajo [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1330 +#, perl-format +msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "" +"Descartar cambio de modo del indice y el arbol de trabajo [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1331 +#, perl-format +msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "Descartar borrado del indice y el arbol de trabajo [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1332 +#, perl-format +msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "" +"Descartar este hunk del indice y el arbol de trabajo [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1335 +#, perl-format +msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "" +"Aplicar cambio de modo para el indice y el arbol de trabajo [y,n,q,a,d,/" +"%s,?]? " + +#: git-add--interactive.perl:1336 +#, perl-format +msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "Aplicar borrado al indice y al arbol de trabajo [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1337 +#, perl-format +msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "Aplicar este hunk al indice y arbol de trabajo [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1440 +msgid "go to which hunk (<ret> to see more)? " +msgstr "A que hunk ir (<enter> para ver mas)?" + +#: git-add--interactive.perl:1442 +msgid "go to which hunk? " +msgstr "A que hunk ir?" + +#: git-add--interactive.perl:1451 +#, perl-format +msgid "Invalid number: '%s'\n" +msgstr "Numero invalido: '%s'\n" + +#: git-add--interactive.perl:1456 +#, 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 +msgid "search for regex? " +msgstr "buscar para regexp?" + +#: git-add--interactive.perl:1495 +#, perl-format +msgid "Malformed search regexp %s: %s\n" +msgstr "regexp para la busqueda mal formado %s: %s\n" + +#: git-add--interactive.perl:1505 +msgid "No hunk matches the given pattern\n" +msgstr "No hay hunks que concuerden con el patron entregado.\n" + +#: git-add--interactive.perl:1517 git-add--interactive.perl:1539 +msgid "No previous hunk\n" +msgstr "No el anterior hunk\n" + +#: git-add--interactive.perl:1526 git-add--interactive.perl:1545 +msgid "No next hunk\n" +msgstr "No el siguiente hunk\n" + +#: git-add--interactive.perl:1553 +#, 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 +msgid "Review diff" +msgstr "Revision de diff" + +#. TRANSLATORS: please do not translate the command names +#. 'status', 'update', 'revert', etc. +#: git-add--interactive.perl:1624 +msgid "" +"status - show paths with changes\n" +"update - add working tree state to the staged set of changes\n" +"revert - revert staged set of changes back to the HEAD version\n" +"patch - pick hunks and update selectively\n" +"diff - view diff between HEAD and index\n" +"add untracked - add contents of untracked files to the staged set of " +"changes\n" +msgstr "" +"status - muestra las rutas con cambioss\n" +"update - agrega el estado del arbol de trabajo al set de cambios en " +"el area de stage\n" +"revert - revierte los cambios en el area de stage de regreso a la " +"version HEAD\n" +"patch - selecciona los hunks y actualiza de forma selectiva\n" +"diff - mirar la diff entre HEAD y el indice\n" +"add untracked - agrega contenidos de archivos no rastreados al grupo de " +"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 +msgid "missing --" +msgstr "falta --" + +#: git-add--interactive.perl:1662 +#, perl-format +msgid "unknown --patch mode: %s" +msgstr "modo --patch desconocido: %s" + +#: git-add--interactive.perl:1668 git-add--interactive.perl:1674 +#, perl-format +msgid "invalid argument %s, expecting --" +msgstr "argumento invalido %s, se esperaba --" + +#: git-send-email.perl:126 +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 +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 +msgid "the editor exited uncleanly, aborting everything" +msgstr "el editor se cerro inapropiadamente, abortando todo" + +#: git-send-email.perl:290 +#, perl-format +msgid "" +"'%s' contains an intermediate version of the email you were composing.\n" +msgstr "" +"'%s' contiene una version intermedia del correo que se estaba generando.\n" + +#: git-send-email.perl:295 +#, perl-format +msgid "'%s.final' contains the composed email.\n" +msgstr "'%s.final' contiene el email generado.\n" + +#: git-send-email.perl:313 +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 +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 +#, perl-format +msgid "Unknown --suppress-cc field: '%s'\n" +msgstr "campo --suppress-cc desconocido: '%s'\n" + +#: git-send-email.perl:476 +#, perl-format +msgid "Unknown --confirm setting: '%s'\n" +msgstr "Configuracion --confirm desconocida: '%s'\n" + +#: git-send-email.perl:504 +#, 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 +#, perl-format +msgid "warning: `:include:` not supported: %s\n" +msgstr "peligro: `:include:` no soportado: %s\n" + +#: git-send-email.perl:508 +#, perl-format +msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" +msgstr "peligro: redireccion `/file` or `|pipe` no soportada : %s\n" + +#: git-send-email.perl:513 +#, perl-format +msgid "warning: sendmail line is not recognized: %s\n" +msgstr "peligro: linea sendmail no reconocida: %s\n" + +#: git-send-email.perl:595 +#, perl-format +msgid "" +"File '%s' exists but it could also be the range of commits\n" +"to produce patches for. Please disambiguate by...\n" +"\n" +" * Saying \"./%s\" if you mean a file; or\n" +" * Giving --format-patch option if you mean a range.\n" +msgstr "" +"Archivo '%s' existe pero podria ser el rango de commits \n" +"para producir los parches. Por favor elimina la ambiguedad...\n" +"\n" +" * Diciendo \"./%s\" si se quiere decir un archivo; o\n" +" * Agregando la opcion --format-patch si se quiere decir un rango.\n" + +#: git-send-email.perl:616 +#, perl-format +msgid "Failed to opendir %s: %s" +msgstr "Fallo al abrir directorio %s: %s" + +#: git-send-email.perl:640 +#, perl-format +msgid "" +"fatal: %s: %s\n" +"warning: no patches were sent\n" +msgstr "" +"fatal: %s: %s\n" +"peligro: no se mandaron parches\n" + +#: git-send-email.perl:651 +msgid "" +"\n" +"No patch files specified!\n" +"\n" +msgstr "" +"\n" +"No se especificaron parches!\n" +"\n" + +#: git-send-email.perl:664 +#, perl-format +msgid "No subject line in %s?" +msgstr "No hay linea de subject en %s?" + +#: git-send-email.perl:674 +#, perl-format +msgid "Failed to open for writing %s: %s" +msgstr "Fallo al abir para escritura %s: %s" + +#: git-send-email.perl:684 +msgid "" +"Lines beginning in \"GIT:\" will be removed.\n" +"Consider including an overall diffstat or table of contents\n" +"for the patch you are writing.\n" +"\n" +"Clear the body content if you don't wish to send a summary.\n" +msgstr "" +"Lineas que comienzan en \"GIT:\" seran removidas.\n" +"Considere incluir un diffstat global o una tabla de contenidos\n" +"para el parche que esta escribiendo.\n" +"\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 +#, 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 todavia, han sido ignorados\n" + +#: git-send-email.perl:754 +msgid "Summary email is empty, skipping it\n" +msgstr "Archivo de resumen esta vacio, saltando al siguiente\n" + +#. TRANSLATORS: please keep [y/N] as is. +#: git-send-email.perl:786 +#, perl-format +msgid "Are you sure you want to use <%s> [y/N]? " +msgstr "Esta seguro de que desea usar <%s> [y/N]?" + +#: git-send-email.perl:815 +msgid "" +"The following files are 8bit, but do not declare a Content-Transfer-" +"Encoding.\n" +msgstr "" +"Los siguientes archivos son 8bit, pero no declaran un Content-Transfer-" +"Encoding.\n" + +#: git-send-email.perl:820 +msgid "Which 8bit encoding should I declare [UTF-8]? " +msgstr "Que codificacion de 8bit deberia declarar [UTF-8]?" + +#: git-send-email.perl:828 +#, perl-format +msgid "" +"Refusing to send because the patch\n" +"\t%s\n" +"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really " +"want to send.\n" +msgstr "" +"Rehusando mandar el parche porque\n" +"\t%s\n" +"tiene el template '*** SUBJECT HERE ***'. Agrega --force si realmente lo " +"deseas mandar.\n" + +#: git-send-email.perl:847 +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 +#, 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 +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)?" + +#: git-send-email.perl:927 git-send-email.perl:935 +#, perl-format +msgid "error: unable to extract a valid address from: %s\n" +msgstr "error: no es posible extraer una direccion valida de %s\n" + +#. TRANSLATORS: Make sure to include [q] [d] [e] in your +#. translation. The program will only accept English input +#. at this point. +#: git-send-email.perl:939 +msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " +msgstr "Que hacer con esta direccion? ([q]salir|[d]botar|[e]ditar):" + +#: git-send-email.perl:1260 +#, perl-format +msgid "CA path \"%s\" does not exist" +msgstr "ruta CA \"%s\" no existe" + +#: git-send-email.perl:1335 +msgid "" +" The Cc list above has been expanded by additional\n" +" addresses found in the patch commit message. By default\n" +" send-email prompts before sending whenever this occurs.\n" +" This behavior is controlled by the sendemail.confirm\n" +" configuration setting.\n" +"\n" +" For additional information, run 'git send-email --help'.\n" +" To retain the current behavior, but squelch this message,\n" +" 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 configuracion sendemail." +"confirm.\n" +"\n" +"Para mas informacion, corre 'git sen-email --help'.\n" +"Para mantener el comportamiento actual, pero evitar este mensaje,\n" +"corre 'git config --global sendemail.confirm auto'.\n" +"\n" + +#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your +#. translation. The program will only accept English input +#. at this point. +#: git-send-email.perl:1350 +msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): " +msgstr "Mandar este email? ([y]si||[n]o|[q]salir|[a]todo):" + +#: git-send-email.perl:1353 +msgid "Send this email reply required" +msgstr "Necesitas mandar esta respuesta de email" + +#: git-send-email.perl:1379 +msgid "The required SMTP server is not properly defined." +msgstr "El servidor SMTP no esta definido adecuadamente." + +#: git-send-email.perl:1426 +#, perl-format +msgid "Server does not support STARTTLS! %s" +msgstr "Servidor no soporta STARTLS! %s" + +#: git-send-email.perl:1431 git-send-email.perl:1435 +#, perl-format +msgid "STARTTLS failed! %s" +msgstr "fallo de STARTTLS! %s" + +#: git-send-email.perl:1445 +msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." +msgstr "" +"No es posible inicializar SMTP adecuadamente. Verificar config y usar ---" +"smtp-debug." + +#: git-send-email.perl:1463 +#, perl-format +msgid "Failed to send %s\n" +msgstr "Fallo al enviar %s\n" + +#: git-send-email.perl:1466 +#, perl-format +msgid "Dry-Sent %s\n" +msgstr "Dry-Sent %s\n" + +#: git-send-email.perl:1466 +#, perl-format +msgid "Sent %s\n" +msgstr "Enviado %s\n" + +#: git-send-email.perl:1468 +msgid "Dry-OK. Log says:\n" +msgstr "Dry-OK. Log dice:\n" + +#: git-send-email.perl:1468 +msgid "OK. Log says:\n" +msgstr "OK. Log dice:\n" + +#: git-send-email.perl:1480 +msgid "Result: " +msgstr "Resultado:" + +#: git-send-email.perl:1483 +msgid "Result: OK\n" +msgstr "Resultado: OK\n" + +#: git-send-email.perl:1496 +#, perl-format +msgid "can't open file %s" +msgstr "no se puede abrir el archivo %s" + +#: git-send-email.perl:1543 git-send-email.perl:1563 +#, perl-format +msgid "(mbox) Adding cc: %s from line '%s'\n" +msgstr "(mbox) Agregando cc: %s de linea '%s'\n" + +#: git-send-email.perl:1549 +#, perl-format +msgid "(mbox) Adding to: %s from line '%s'\n" +msgstr "(mbox) Agregando para: %s de la linea '%s'\n" + +#: git-send-email.perl:1597 +#, perl-format +msgid "(non-mbox) Adding cc: %s from line '%s'\n" +msgstr "(non-mbox) Agregando cc: %s de la linea '%s'\n" + +#: git-send-email.perl:1622 +#, perl-format +msgid "(body) Adding cc: %s from line '%s'\n" +msgstr "(body) Agregando cc: %s de la linea '%s'\n" + +#: git-send-email.perl:1728 +#, perl-format +msgid "(%s) Could not execute '%s'" +msgstr "(%s) no se pudo ejecutar '%s'" + +#: git-send-email.perl:1735 +#, perl-format +msgid "(%s) Adding %s: %s from: '%s'\n" +msgstr "(%s) Agregando %s: %s de: '%s'\n" + +#: git-send-email.perl:1739 +#, perl-format +msgid "(%s) failed to close pipe to '%s'" +msgstr "(%s) fallo al cerrar el pipe para '%s'" + +#: git-send-email.perl:1766 +msgid "cannot send message as 7bit" +msgstr "no se puede mandar mensaje como 7bit" + +#: git-send-email.perl:1774 +msgid "invalid transfer encoding" +msgstr "codificacion de transferencia invalida" + +#: git-send-email.perl:1812 git-send-email.perl:1863 git-send-email.perl:1873 +#, perl-format +msgid "unable to open %s: %s\n" +msgstr "no es posible abrir %s: %s\n" + +#: git-send-email.perl:1815 +#, perl-format +msgid "%s: patch contains a line longer than 998 characters" +msgstr "%s: el parche contiene una linea con mas de 998 caracteres" + +#: git-send-email.perl:1831 +#, perl-format +msgid "Skipping %s with backup suffix '%s'.\n" +msgstr "Saltando %s con el sufijo de backup '%s'.\n" + +#. TRANSLATORS: please keep "[y|N]" as is. +#: git-send-email.perl:1835 +#, perl-format +msgid "Do you really want to send %s? [y|N]: " +msgstr "Realmente deseas mandar %s?[y|N]" + +#~ msgid "submodule update strategy not supported for submodule '%s'" +#~ msgstr "" +#~ "estrategia de actualización de submódulo no soportada para submódulo '%s'" + +#~ msgid "change upstream info" +#~ msgstr "cambie info de upstream" + +#~ msgid "" +#~ "\n" +#~ "If you wanted to make '%s' track '%s', do this:\n" +#~ "\n" +#~ msgstr "" +#~ "\n" +#~ "Si querías hacer que '%s' rastree '%s', haz esto:\n" +#~ "\n" + +#~ msgid "basename" +#~ msgstr "nombre base" + +#~ msgid "prepend parent project's basename to output" +#~ msgstr "anteponer el nombre base del proyecto padre a la salida" + +#~ msgid "" +#~ "Warning: the SHA-1 is missing or isn't a commit in the following line:\n" +#~ " - $line" +#~ msgstr "" +#~ "Peligro: falta el SHA-1 o no es un commit en la siguiente línea:\n" +#~ " - $line" + +#~ msgid "" +#~ "Warning: the command isn't recognized in the following line:\n" +#~ " - $line" +#~ msgstr "" +#~ "Peligro: el comando no es reconocido en la siguiente línea:\n" +#~ " - $line" + +#~ msgid "Or you can abort the rebase with 'git rebase --abort'." +#~ msgstr "O puedes abortar el rebasamiento con 'git rebase --abort'." diff --git a/po/git.pot b/po/git.pot index 4669c5a3c9..99a5798119 100644 --- a/po/git.pot +++ b/po/git.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2017-07-24 21:54+0800\n" +"POT-Creation-Date: 2017-10-08 09:48+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -58,7 +58,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "" -#: advice.c:117 builtin/merge.c:1184 +#: advice.c:117 builtin/merge.c:1211 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" @@ -96,82 +96,82 @@ msgstr "" msgid "unrecognized whitespace ignore option '%s'" msgstr "" -#: apply.c:126 +#: apply.c:125 msgid "--reject and --3way cannot be used together." msgstr "" -#: apply.c:128 +#: apply.c:127 msgid "--cached and --3way cannot be used together." msgstr "" -#: apply.c:131 +#: apply.c:130 msgid "--3way outside a repository" msgstr "" -#: apply.c:142 +#: apply.c:141 msgid "--index outside a repository" msgstr "" -#: apply.c:145 +#: apply.c:144 msgid "--cached outside a repository" msgstr "" -#: apply.c:836 +#: apply.c:845 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "" -#: apply.c:845 +#: apply.c:854 #, c-format msgid "regexec returned %d for input: %s" msgstr "" -#: apply.c:929 +#: apply.c:928 #, c-format msgid "unable to find filename in patch at line %d" msgstr "" -#: apply.c:967 +#: apply.c:966 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" -#: apply.c:973 +#: apply.c:972 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" -#: apply.c:974 +#: apply.c:973 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" -#: apply.c:979 +#: apply.c:978 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" -#: apply.c:1008 +#: apply.c:1007 #, c-format msgid "invalid mode on line %d: %s" msgstr "" -#: apply.c:1326 +#: apply.c:1325 #, c-format msgid "inconsistent header lines %d and %d" msgstr "" -#: apply.c:1498 +#: apply.c:1497 #, c-format msgid "recount: unexpected line: %.*s" msgstr "" -#: apply.c:1567 +#: apply.c:1566 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "" -#: apply.c:1587 +#: apply.c:1586 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -182,520 +182,521 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: apply.c:1600 +#: apply.c:1599 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" -#: apply.c:1770 +#: apply.c:1787 msgid "new file depends on old contents" msgstr "" -#: apply.c:1772 +#: apply.c:1789 msgid "deleted file still has contents" msgstr "" -#: apply.c:1806 +#: apply.c:1823 #, c-format msgid "corrupt patch at line %d" msgstr "" -#: apply.c:1843 +#: apply.c:1860 #, c-format msgid "new file %s depends on old contents" msgstr "" -#: apply.c:1845 +#: apply.c:1862 #, c-format msgid "deleted file %s still has contents" msgstr "" -#: apply.c:1848 +#: apply.c:1865 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "" -#: apply.c:1995 +#: apply.c:2012 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "" -#: apply.c:2032 +#: apply.c:2049 #, c-format msgid "unrecognized binary patch at line %d" msgstr "" -#: apply.c:2193 +#: apply.c:2209 #, c-format msgid "patch with only garbage at line %d" msgstr "" -#: apply.c:2276 +#: apply.c:2295 #, c-format msgid "unable to read symlink %s" msgstr "" -#: apply.c:2280 +#: apply.c:2299 #, c-format msgid "unable to open or read %s" msgstr "" -#: apply.c:2933 +#: apply.c:2958 #, c-format msgid "invalid start of line: '%c'" msgstr "" -#: apply.c:3052 +#: apply.c:3077 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "" msgstr[1] "" -#: apply.c:3064 +#: apply.c:3089 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: apply.c:3070 +#: apply.c:3095 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" -#: apply.c:3092 +#: apply.c:3117 #, c-format msgid "missing binary patch data for '%s'" msgstr "" -#: apply.c:3100 +#: apply.c:3125 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" -#: apply.c:3146 +#: apply.c:3171 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" -#: apply.c:3156 +#: apply.c:3181 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "" -#: apply.c:3164 +#: apply.c:3189 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "" -#: apply.c:3182 +#: apply.c:3207 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "" -#: apply.c:3195 +#: apply.c:3220 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" -#: apply.c:3201 +#: apply.c:3226 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: apply.c:3222 +#: apply.c:3247 #, c-format msgid "patch failed: %s:%ld" msgstr "" -#: apply.c:3344 +#: apply.c:3369 #, c-format msgid "cannot checkout %s" msgstr "" -#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277 +#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277 #, c-format msgid "failed to read %s" msgstr "" -#: apply.c:3400 +#: apply.c:3426 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "" -#: apply.c:3429 apply.c:3669 +#: apply.c:3455 apply.c:3695 #, c-format msgid "path %s has been renamed/deleted" msgstr "" -#: apply.c:3512 apply.c:3683 +#: apply.c:3538 apply.c:3709 #, c-format msgid "%s: does not exist in index" msgstr "" -#: apply.c:3521 apply.c:3691 +#: apply.c:3547 apply.c:3717 #, c-format msgid "%s: does not match index" msgstr "" -#: apply.c:3556 +#: apply.c:3582 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" -#: apply.c:3559 +#: apply.c:3585 #, c-format msgid "Falling back to three-way merge...\n" msgstr "" -#: apply.c:3575 apply.c:3579 +#: apply.c:3601 apply.c:3605 #, c-format msgid "cannot read the current contents of '%s'" msgstr "" -#: apply.c:3591 +#: apply.c:3617 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "" -#: apply.c:3605 +#: apply.c:3631 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "" -#: apply.c:3610 +#: apply.c:3636 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "" -#: apply.c:3636 +#: apply.c:3662 msgid "removal patch leaves file contents" msgstr "" -#: apply.c:3708 +#: apply.c:3734 #, c-format msgid "%s: wrong type" msgstr "" -#: apply.c:3710 +#: apply.c:3736 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: apply.c:3860 apply.c:3862 +#: apply.c:3886 apply.c:3888 #, c-format msgid "invalid path '%s'" msgstr "" -#: apply.c:3918 +#: apply.c:3944 #, c-format msgid "%s: already exists in index" msgstr "" -#: apply.c:3921 +#: apply.c:3947 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: apply.c:3941 +#: apply.c:3967 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: apply.c:3946 +#: apply.c:3972 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: apply.c:3966 +#: apply.c:3992 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "" -#: apply.c:3970 +#: apply.c:3996 #, c-format msgid "%s: patch does not apply" msgstr "" -#: apply.c:3985 +#: apply.c:4011 #, c-format msgid "Checking patch %s..." msgstr "" -#: apply.c:4076 +#: apply.c:4102 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "" -#: apply.c:4083 +#: apply.c:4109 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "" -#: apply.c:4086 +#: apply.c:4112 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "" -#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138 +#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: apply.c:4095 +#: apply.c:4121 #, c-format msgid "could not add %s to temporary index" msgstr "" -#: apply.c:4105 +#: apply.c:4131 #, c-format msgid "could not write temporary index to %s" msgstr "" -#: apply.c:4243 +#: apply.c:4269 #, c-format msgid "unable to remove %s from index" msgstr "" -#: apply.c:4278 +#: apply.c:4304 #, c-format msgid "corrupt patch for submodule %s" msgstr "" -#: apply.c:4284 +#: apply.c:4310 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: apply.c:4292 +#: apply.c:4318 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: apply.c:4298 apply.c:4442 +#: apply.c:4324 apply.c:4468 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: apply.c:4339 +#: apply.c:4365 #, c-format msgid "failed to write to '%s'" msgstr "" -#: apply.c:4343 +#: apply.c:4369 #, c-format msgid "closing file '%s'" msgstr "" -#: apply.c:4413 +#: apply.c:4439 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: apply.c:4511 +#: apply.c:4537 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: apply.c:4519 +#: apply.c:4545 msgid "internal error" msgstr "" -#: apply.c:4522 +#: apply.c:4548 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: apply.c:4533 +#: apply.c:4559 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988 +#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010 #, c-format msgid "cannot open %s" msgstr "" -#: apply.c:4555 +#: apply.c:4581 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: apply.c:4559 +#: apply.c:4585 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: apply.c:4669 +#: apply.c:4695 #, c-format msgid "Skipped patch '%s'." msgstr "" -#: apply.c:4677 +#: apply.c:4703 msgid "unrecognized input" msgstr "" -#: apply.c:4696 +#: apply.c:4722 msgid "unable to read index file" msgstr "" -#: apply.c:4833 +#: apply.c:4859 #, c-format msgid "can't open patch '%s': %s" msgstr "" -#: apply.c:4860 +#: apply.c:4886 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: apply.c:4866 apply.c:4881 +#: apply.c:4892 apply.c:4907 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "" msgstr[1] "" -#: apply.c:4874 +#: apply.c:4900 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "" msgstr[1] "" -#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391 +#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "" -#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260 -#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187 -#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629 -#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973 -#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161 +#: apply.c:4947 apply.c:4950 builtin/am.c:2256 builtin/am.c:2259 +#: builtin/clone.c:116 builtin/fetch.c:115 builtin/pull.c:187 +#: builtin/submodule--helper.c:301 builtin/submodule--helper.c:622 +#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:992 +#: builtin/submodule--helper.c:995 builtin/submodule--helper.c:1212 #: git-add--interactive.perl:197 msgid "path" msgstr "" -#: apply.c:4922 +#: apply.c:4948 msgid "don't apply changes matching the given path" msgstr "" -#: apply.c:4925 +#: apply.c:4951 msgid "apply changes matching the given path" msgstr "" -#: apply.c:4927 builtin/am.c:2266 +#: apply.c:4953 builtin/am.c:2265 msgid "num" msgstr "" -#: apply.c:4928 +#: apply.c:4954 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" -#: apply.c:4931 +#: apply.c:4957 msgid "ignore additions made by the patch" msgstr "" -#: apply.c:4933 +#: apply.c:4959 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: apply.c:4937 +#: apply.c:4963 msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: apply.c:4939 +#: apply.c:4965 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: apply.c:4941 +#: apply.c:4967 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: apply.c:4943 +#: apply.c:4969 msgid "make sure the patch is applicable to the current index" msgstr "" -#: apply.c:4945 +#: apply.c:4971 msgid "apply a patch without touching the working tree" msgstr "" -#: apply.c:4947 +#: apply.c:4973 msgid "accept a patch that touches outside the working area" msgstr "" -#: apply.c:4949 +#: apply.c:4975 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: apply.c:4951 +#: apply.c:4977 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: apply.c:4953 +#: apply.c:4979 msgid "build a temporary index based on embedded index information" msgstr "" -#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515 +#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513 msgid "paths are separated with NUL character" msgstr "" -#: apply.c:4958 +#: apply.c:4984 msgid "ensure at least <n> lines of context match" msgstr "" -#: apply.c:4959 builtin/am.c:2245 +#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95 +#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99 msgid "action" msgstr "" -#: apply.c:4960 +#: apply.c:4986 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: apply.c:4963 apply.c:4966 +#: apply.c:4989 apply.c:4992 msgid "ignore changes in whitespace when finding context" msgstr "" -#: apply.c:4969 +#: apply.c:4995 msgid "apply the patch in reverse" msgstr "" -#: apply.c:4971 +#: apply.c:4997 msgid "don't expect at least one line of context" msgstr "" -#: apply.c:4973 +#: apply.c:4999 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: apply.c:4975 +#: apply.c:5001 msgid "allow overlapping hunks" msgstr "" -#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21 -#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651 -#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125 +#: apply.c:5002 builtin/add.c:272 builtin/check-ignore.c:21 +#: builtin/commit.c:1347 builtin/count-objects.c:96 builtin/fsck.c:640 +#: builtin/log.c:1889 builtin/mv.c:123 builtin/read-tree.c:125 msgid "be verbose" msgstr "" -#: apply.c:4978 +#: apply.c:5004 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: apply.c:4981 +#: apply.c:5007 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: apply.c:4983 builtin/am.c:2254 +#: apply.c:5009 builtin/am.c:2253 msgid "root" msgstr "" -#: apply.c:4984 +#: apply.c:5010 msgid "prepend <root> to all filenames" msgstr "" @@ -716,108 +717,108 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "" -#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300 +#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" -#: archive.c:418 +#: archive.c:436 msgid "fmt" msgstr "" -#: archive.c:418 +#: archive.c:436 msgid "archive format" msgstr "" -#: archive.c:419 builtin/log.c:1446 +#: archive.c:437 builtin/log.c:1452 msgid "prefix" msgstr "" -#: archive.c:420 +#: archive.c:438 msgid "prepend prefix to each pathname in the archive" msgstr "" -#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61 -#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080 -#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552 -#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120 +#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61 +#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:859 +#: builtin/hash-object.c:102 builtin/ls-files.c:547 builtin/ls-files.c:550 +#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120 #: parse-options.h:153 msgid "file" msgstr "" -#: archive.c:422 builtin/archive.c:89 +#: archive.c:440 builtin/archive.c:89 msgid "write the archive to this file" msgstr "" -#: archive.c:424 +#: archive.c:442 msgid "read .gitattributes in working directory" msgstr "" -#: archive.c:425 +#: archive.c:443 msgid "report archived files on stderr" msgstr "" -#: archive.c:426 +#: archive.c:444 msgid "store only" msgstr "" -#: archive.c:427 +#: archive.c:445 msgid "compress faster" msgstr "" -#: archive.c:435 +#: archive.c:453 msgid "compress better" msgstr "" -#: archive.c:438 +#: archive.c:456 msgid "list supported archive formats" msgstr "" -#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108 -#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982 +#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109 +#: builtin/submodule--helper.c:634 builtin/submodule--helper.c:1001 msgid "repo" msgstr "" -#: archive.c:441 builtin/archive.c:91 +#: archive.c:459 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "" -#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488 +#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489 msgid "command" msgstr "" -#: archive.c:443 builtin/archive.c:93 +#: archive.c:461 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "" -#: archive.c:450 +#: archive.c:468 msgid "Unexpected option --remote" msgstr "" -#: archive.c:452 +#: archive.c:470 msgid "Option --exec can only be used together with --remote" msgstr "" -#: archive.c:454 +#: archive.c:472 msgid "Unexpected option --output" msgstr "" -#: archive.c:476 +#: archive.c:494 #, c-format msgid "Unknown archive format '%s'" msgstr "" -#: archive.c:483 +#: archive.c:501 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "" -#: attr.c:214 +#: attr.c:218 #, c-format msgid "%.*s is not a valid attribute name" msgstr "" -#: attr.c:410 +#: attr.c:415 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -880,38 +881,38 @@ msgstr "" msgid "Bisecting: a merge base must be tested\n" msgstr "" -#: bisect.c:849 +#: bisect.c:850 #, c-format msgid "a %s revision is needed" msgstr "" -#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256 +#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234 #, c-format msgid "could not create file '%s'" msgstr "" -#: bisect.c:917 +#: bisect.c:918 #, c-format msgid "could not read file '%s'" msgstr "" -#: bisect.c:947 +#: bisect.c:948 msgid "reading bisect refs failed" msgstr "" -#: bisect.c:967 +#: bisect.c:968 #, c-format msgid "%s was both %s and %s\n" msgstr "" -#: bisect.c:975 +#: bisect.c:976 #, c-format msgid "" "No testable commit found.\n" "Maybe you started with bad path parameters?\n" msgstr "" -#: bisect.c:994 +#: bisect.c:995 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -921,7 +922,7 @@ msgstr[1] "" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1000 +#: bisect.c:1001 #, 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" @@ -940,10 +941,10 @@ msgstr "" msgid "--reverse and --first-parent together require specified latest commit" msgstr "" -#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166 -#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907 -#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360 -#: builtin/shortlog.c:177 +#: blame.c:1797 bundle.c:169 ref-filter.c:1932 sequencer.c:1168 +#: sequencer.c:2351 builtin/commit.c:1065 builtin/log.c:357 builtin/log.c:911 +#: builtin/log.c:1361 builtin/log.c:1690 builtin/log.c:1938 builtin/merge.c:369 +#: builtin/shortlog.c:191 msgid "revision walk setup failed" msgstr "" @@ -978,42 +979,42 @@ msgstr "" #: branch.c:93 #, c-format -msgid "Branch %s set up to track remote branch %s from %s by rebasing." +msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." msgstr "" #: branch.c:94 #, c-format -msgid "Branch %s set up to track remote branch %s from %s." +msgid "Branch '%s' set up to track remote branch '%s' from '%s'." msgstr "" #: branch.c:98 #, c-format -msgid "Branch %s set up to track local branch %s by rebasing." +msgid "Branch '%s' set up to track local branch '%s' by rebasing." msgstr "" #: branch.c:99 #, c-format -msgid "Branch %s set up to track local branch %s." +msgid "Branch '%s' set up to track local branch '%s'." msgstr "" #: branch.c:104 #, c-format -msgid "Branch %s set up to track remote ref %s by rebasing." +msgid "Branch '%s' set up to track remote ref '%s' by rebasing." msgstr "" #: branch.c:105 #, c-format -msgid "Branch %s set up to track remote ref %s." +msgid "Branch '%s' set up to track remote ref '%s'." msgstr "" #: branch.c:109 #, c-format -msgid "Branch %s set up to track local ref %s by rebasing." +msgid "Branch '%s' set up to track local ref '%s' by rebasing." msgstr "" #: branch.c:110 #, c-format -msgid "Branch %s set up to track local ref %s." +msgid "Branch '%s' set up to track local ref '%s'." msgstr "" #: branch.c:119 @@ -1035,21 +1036,21 @@ msgstr "" msgid "A branch named '%s' already exists." msgstr "" -#: branch.c:198 +#: branch.c:197 msgid "Cannot force update the current branch." msgstr "" -#: branch.c:218 +#: branch.c:217 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "" -#: branch.c:220 +#: branch.c:219 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "" -#: branch.c:222 +#: branch.c:221 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -1061,22 +1062,22 @@ msgid "" "\"git push -u\" to set the upstream config as you push." msgstr "" -#: branch.c:265 +#: branch.c:264 #, c-format msgid "Not a valid object name: '%s'." msgstr "" -#: branch.c:285 +#: branch.c:284 #, c-format msgid "Ambiguous object name: '%s'." msgstr "" -#: branch.c:290 +#: branch.c:289 #, c-format msgid "Not a valid branch point: '%s'." msgstr "" -#: branch.c:344 +#: branch.c:343 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "" @@ -1096,7 +1097,9 @@ msgstr "" msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778 +#: bundle.c:88 sequencer.c:1346 sequencer.c:1793 sequencer.c:2500 +#: sequencer.c:2583 sequencer.c:2609 sequencer.c:2687 sequencer.c:2807 +#: sequencer.c:2949 builtin/commit.c:782 #, c-format msgid "could not open '%s'" msgstr "" @@ -1105,56 +1108,56 @@ msgstr "" msgid "Repository lacks these prerequisite commits:" msgstr "" -#: bundle.c:186 +#: bundle.c:193 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "" msgstr[1] "" -#: bundle.c:193 +#: bundle.c:200 msgid "The bundle records a complete history." msgstr "" -#: bundle.c:195 +#: bundle.c:202 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "" msgstr[1] "" -#: bundle.c:254 +#: bundle.c:261 msgid "Could not spawn pack-objects" msgstr "" -#: bundle.c:265 +#: bundle.c:272 msgid "pack-objects died" msgstr "" -#: bundle.c:307 +#: bundle.c:314 msgid "rev-list died" msgstr "" -#: bundle.c:356 +#: bundle.c:363 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "" -#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282 +#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296 #, c-format msgid "unrecognized argument: %s" msgstr "" -#: bundle.c:454 +#: bundle.c:461 msgid "Refusing to create empty bundle." msgstr "" -#: bundle.c:466 +#: bundle.c:473 #, c-format msgid "cannot create '%s'" msgstr "" -#: bundle.c:494 +#: bundle.c:501 msgid "index-pack died" msgstr "" @@ -1163,8 +1166,8 @@ msgstr "" msgid "invalid color value: %.*s" msgstr "" -#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456 -#: builtin/am.c:1469 builtin/am.c:2107 +#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465 +#: builtin/am.c:1467 builtin/am.c:2105 #, c-format msgid "could not parse %s" msgstr "" @@ -1174,7 +1177,7 @@ msgstr "" msgid "%s %s is not a commit!" msgstr "" -#: commit.c:1511 +#: commit.c:1517 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" @@ -1185,152 +1188,152 @@ msgstr "" msgid "memory exhausted" msgstr "" -#: config.c:186 +#: config.c:187 msgid "relative config include conditionals must come from files" msgstr "" -#: config.c:720 +#: config.c:721 #, c-format msgid "bad config line %d in blob %s" msgstr "" -#: config.c:724 +#: config.c:725 #, c-format msgid "bad config line %d in file %s" msgstr "" -#: config.c:728 +#: config.c:729 #, c-format msgid "bad config line %d in standard input" msgstr "" -#: config.c:732 +#: config.c:733 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "" -#: config.c:736 +#: config.c:737 #, c-format msgid "bad config line %d in command line %s" msgstr "" -#: config.c:740 +#: config.c:741 #, c-format msgid "bad config line %d in %s" msgstr "" -#: config.c:868 +#: config.c:869 msgid "out of range" msgstr "" -#: config.c:868 +#: config.c:869 msgid "invalid unit" msgstr "" -#: config.c:874 +#: config.c:875 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "" -#: config.c:879 +#: config.c:880 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "" -#: config.c:882 +#: config.c:883 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" -#: config.c:885 +#: config.c:886 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" -#: config.c:888 +#: config.c:889 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" -#: config.c:891 +#: config.c:892 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" -#: config.c:894 +#: config.c:895 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "" -#: config.c:989 +#: config.c:990 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "" -#: config.c:1084 config.c:1095 +#: config.c:1085 config.c:1096 #, c-format msgid "bad zlib compression level %d" msgstr "" -#: config.c:1212 +#: config.c:1213 #, c-format msgid "invalid mode for object creation: %s" msgstr "" -#: config.c:1368 +#: config.c:1372 #, c-format msgid "bad pack compression level %d" msgstr "" -#: config.c:1564 +#: config.c:1568 msgid "unable to parse command-line config" msgstr "" -#: config.c:1894 +#: config.c:1900 msgid "unknown error occurred while reading the configuration files" msgstr "" -#: config.c:2064 +#: config.c:2087 #, c-format msgid "Invalid %s: '%s'" msgstr "" -#: config.c:2085 +#: config.c:2130 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "" -#: config.c:2111 +#: config.c:2156 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" -#: config.c:2122 +#: config.c:2167 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" -#: config.c:2124 +#: config.c:2169 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" -#: config.c:2183 +#: config.c:2228 #, c-format msgid "%s has multiple values" msgstr "" -#: config.c:2517 config.c:2745 +#: config.c:2571 config.c:2789 #, c-format msgid "fstat on %s failed" msgstr "" -#: config.c:2635 +#: config.c:2678 #, c-format msgid "could not set '%s' to '%s'" msgstr "" -#: config.c:2637 builtin/remote.c:775 +#: config.c:2680 builtin/remote.c:776 #, c-format msgid "could not unset '%s'" msgstr "" @@ -1347,19 +1350,19 @@ msgid "" "and the repository exists." msgstr "" -#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141 +#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141 msgid "Checking connectivity" msgstr "" -#: connected.c:75 +#: connected.c:76 msgid "Could not run 'git rev-list'" msgstr "" -#: connected.c:95 +#: connected.c:96 msgid "failed write to rev-list" msgstr "" -#: connected.c:102 +#: connected.c:103 msgid "failed to close rev-list's stdin" msgstr "" @@ -1464,273 +1467,283 @@ msgstr "" msgid "Performing inexact rename detection" msgstr "" -#: diff.c:63 +#: diff.c:74 #, c-format msgid "option '%s' requires a value" msgstr "" -#: diff.c:125 +#: diff.c:152 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" -#: diff.c:130 +#: diff.c:157 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr "" -#: diff.c:282 +#: diff.c:281 +msgid "" +"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', " +"'plain'" +msgstr "" + +#: diff.c:341 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" -#: diff.c:342 +#: diff.c:398 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" -#: diff.c:3101 +#: diff.c:3861 #, c-format msgid "external diff died, stopping at %s" msgstr "" -#: diff.c:3427 +#: diff.c:4189 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" -#: diff.c:3517 +#: diff.c:4279 msgid "--follow requires exactly one pathspec" msgstr "" -#: diff.c:3680 +#: diff.c:4445 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: diff.c:3694 +#: diff.c:4459 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "" -#: diff.c:4716 +#: diff.c:5505 msgid "inexact rename detection was skipped due to too many files." msgstr "" -#: diff.c:4719 +#: diff.c:5508 msgid "only found copies from modified paths due to too many files." msgstr "" -#: diff.c:4722 +#: diff.c:5511 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "" -#: dir.c:1948 +#: dir.c:1983 msgid "failed to get kernel name and information" msgstr "" -#: dir.c:2067 +#: dir.c:2102 msgid "Untracked cache is disabled on this system or location." msgstr "" -#: dir.c:2846 dir.c:2851 +#: dir.c:2885 dir.c:2890 #, c-format msgid "could not create directories for %s" msgstr "" -#: dir.c:2876 +#: dir.c:2915 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "" -#: entry.c:281 +#: entry.c:176 +msgid "Filtering content" +msgstr "" + +#: entry.c:417 #, c-format msgid "could not stat file '%s'" msgstr "" -#: fetch-pack.c:251 +#: fetch-pack.c:252 msgid "git fetch-pack: expected shallow list" msgstr "" -#: fetch-pack.c:263 +#: fetch-pack.c:264 msgid "git fetch-pack: expected ACK/NAK, got EOF" msgstr "" -#: fetch-pack.c:282 builtin/archive.c:63 +#: fetch-pack.c:283 builtin/archive.c:63 #, c-format msgid "remote error: %s" msgstr "" -#: fetch-pack.c:283 +#: fetch-pack.c:284 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "" -#: fetch-pack.c:335 +#: fetch-pack.c:336 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "" -#: fetch-pack.c:421 +#: fetch-pack.c:422 #, c-format msgid "invalid shallow line: %s" msgstr "" -#: fetch-pack.c:427 +#: fetch-pack.c:428 #, c-format msgid "invalid unshallow line: %s" msgstr "" -#: fetch-pack.c:429 +#: fetch-pack.c:430 #, c-format msgid "object not found: %s" msgstr "" -#: fetch-pack.c:432 +#: fetch-pack.c:433 #, c-format msgid "error in object: %s" msgstr "" -#: fetch-pack.c:434 +#: fetch-pack.c:435 #, c-format msgid "no shallow found: %s" msgstr "" -#: fetch-pack.c:437 +#: fetch-pack.c:438 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "" -#: fetch-pack.c:476 +#: fetch-pack.c:477 #, c-format msgid "got %s %d %s" msgstr "" -#: fetch-pack.c:490 +#: fetch-pack.c:491 #, c-format msgid "invalid commit %s" msgstr "" -#: fetch-pack.c:523 +#: fetch-pack.c:524 msgid "giving up" msgstr "" -#: fetch-pack.c:533 progress.c:237 +#: fetch-pack.c:534 progress.c:242 msgid "done" msgstr "" -#: fetch-pack.c:545 +#: fetch-pack.c:546 #, c-format msgid "got %s (%d) %s" msgstr "" -#: fetch-pack.c:591 +#: fetch-pack.c:592 #, c-format msgid "Marking %s as complete" msgstr "" -#: fetch-pack.c:775 +#: fetch-pack.c:776 #, c-format msgid "already have %s (%s)" msgstr "" -#: fetch-pack.c:813 +#: fetch-pack.c:814 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "" -#: fetch-pack.c:821 +#: fetch-pack.c:822 msgid "protocol error: bad pack header" msgstr "" -#: fetch-pack.c:877 +#: fetch-pack.c:878 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "" -#: fetch-pack.c:893 +#: fetch-pack.c:894 #, c-format msgid "%s failed" msgstr "" -#: fetch-pack.c:895 +#: fetch-pack.c:896 msgid "error in sideband demultiplexer" msgstr "" -#: fetch-pack.c:922 +#: fetch-pack.c:923 msgid "Server does not support shallow clients" msgstr "" -#: fetch-pack.c:926 +#: fetch-pack.c:927 msgid "Server supports multi_ack_detailed" msgstr "" -#: fetch-pack.c:929 +#: fetch-pack.c:930 msgid "Server supports no-done" msgstr "" -#: fetch-pack.c:935 +#: fetch-pack.c:936 msgid "Server supports multi_ack" msgstr "" -#: fetch-pack.c:939 +#: fetch-pack.c:940 msgid "Server supports side-band-64k" msgstr "" -#: fetch-pack.c:943 +#: fetch-pack.c:944 msgid "Server supports side-band" msgstr "" -#: fetch-pack.c:947 +#: fetch-pack.c:948 msgid "Server supports allow-tip-sha1-in-want" msgstr "" -#: fetch-pack.c:951 +#: fetch-pack.c:952 msgid "Server supports allow-reachable-sha1-in-want" msgstr "" -#: fetch-pack.c:961 +#: fetch-pack.c:962 msgid "Server supports ofs-delta" msgstr "" -#: fetch-pack.c:968 +#: fetch-pack.c:969 #, c-format msgid "Server version is %.*s" msgstr "" -#: fetch-pack.c:974 +#: fetch-pack.c:975 msgid "Server does not support --shallow-since" msgstr "" -#: fetch-pack.c:978 +#: fetch-pack.c:979 msgid "Server does not support --shallow-exclude" msgstr "" -#: fetch-pack.c:980 +#: fetch-pack.c:981 msgid "Server does not support --deepen" msgstr "" -#: fetch-pack.c:991 +#: fetch-pack.c:992 msgid "no common commits" msgstr "" -#: fetch-pack.c:1003 +#: fetch-pack.c:1004 msgid "git fetch-pack: fetch failed." msgstr "" -#: fetch-pack.c:1165 +#: fetch-pack.c:1166 msgid "no matching remote head" msgstr "" -#: fetch-pack.c:1187 +#: fetch-pack.c:1188 #, c-format msgid "no such remote ref %s" msgstr "" -#: fetch-pack.c:1190 +#: fetch-pack.c:1191 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "" @@ -1743,7 +1756,7 @@ msgstr "" msgid "could not create temporary file" msgstr "" -#: gpg-interface.c:213 +#: gpg-interface.c:214 #, c-format msgid "failed writing detached signature to '%s'" msgstr "" @@ -1753,17 +1766,17 @@ msgstr "" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "" -#: grep.c:1981 +#: grep.c:1970 #, c-format msgid "'%s': unable to read %s" msgstr "" -#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134 +#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134 #, c-format msgid "failed to stat '%s'" msgstr "" -#: grep.c:2009 +#: grep.c:1998 #, c-format msgid "'%s': short read" msgstr "" @@ -1884,12 +1897,12 @@ msgstr "" msgid "name consists only of disallowed characters: %s" msgstr "" -#: ident.c:416 builtin/commit.c:612 +#: ident.c:416 builtin/commit.c:616 #, c-format msgid "invalid date format: %s" msgstr "" -#: lockfile.c:152 +#: lockfile.c:151 #, c-format msgid "" "Unable to create '%s.lock': %s.\n" @@ -1901,7 +1914,7 @@ msgid "" "remove the file manually to continue." msgstr "" -#: lockfile.c:160 +#: lockfile.c:159 #, c-format msgid "Unable to create '%s.lock': %s" msgstr "" @@ -1910,256 +1923,256 @@ msgstr "" msgid "failed to read the cache" msgstr "" -#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377 -#: builtin/checkout.c:591 builtin/clone.c:753 +#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380 +#: builtin/checkout.c:595 builtin/clone.c:754 msgid "unable to write new index file" msgstr "" -#: merge-recursive.c:210 +#: merge-recursive.c:235 msgid "(bad commit)\n" msgstr "" -#: merge-recursive.c:232 merge-recursive.c:240 +#: merge-recursive.c:257 merge-recursive.c:265 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "" -#: merge-recursive.c:304 +#: merge-recursive.c:329 msgid "error building trees" msgstr "" -#: merge-recursive.c:728 +#: merge-recursive.c:752 #, c-format msgid "failed to create path '%s'%s" msgstr "" -#: merge-recursive.c:739 +#: merge-recursive.c:763 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "" -#: merge-recursive.c:753 merge-recursive.c:772 +#: merge-recursive.c:777 merge-recursive.c:796 msgid ": perhaps a D/F conflict?" msgstr "" -#: merge-recursive.c:762 +#: merge-recursive.c:786 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" -#: merge-recursive.c:804 builtin/cat-file.c:36 +#: merge-recursive.c:828 builtin/cat-file.c:37 #, c-format msgid "cannot read object %s '%s'" msgstr "" -#: merge-recursive.c:806 +#: merge-recursive.c:830 #, c-format msgid "blob expected for %s '%s'" msgstr "" -#: merge-recursive.c:830 +#: merge-recursive.c:854 #, c-format msgid "failed to open '%s': %s" msgstr "" -#: merge-recursive.c:841 +#: merge-recursive.c:865 #, c-format msgid "failed to symlink '%s': %s" msgstr "" -#: merge-recursive.c:846 +#: merge-recursive.c:870 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" -#: merge-recursive.c:986 +#: merge-recursive.c:1010 msgid "Failed to execute internal merge" msgstr "" -#: merge-recursive.c:990 +#: merge-recursive.c:1014 #, c-format msgid "Unable to add %s to database" msgstr "" -#: merge-recursive.c:1093 +#: merge-recursive.c:1117 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree." msgstr "" -#: merge-recursive.c:1098 +#: merge-recursive.c:1122 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " "left in tree." msgstr "" -#: merge-recursive.c:1105 +#: merge-recursive.c:1129 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree at %s." msgstr "" -#: merge-recursive.c:1110 +#: merge-recursive.c:1134 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " "left in tree at %s." msgstr "" -#: merge-recursive.c:1144 +#: merge-recursive.c:1168 msgid "rename" msgstr "" -#: merge-recursive.c:1144 +#: merge-recursive.c:1168 msgid "renamed" msgstr "" -#: merge-recursive.c:1201 +#: merge-recursive.c:1225 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "" -#: merge-recursive.c:1226 +#: merge-recursive.c:1250 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" "\"->\"%s\" in \"%s\"%s" msgstr "" -#: merge-recursive.c:1231 +#: merge-recursive.c:1255 msgid " (left unresolved)" msgstr "" -#: merge-recursive.c:1293 +#: merge-recursive.c:1317 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" -#: merge-recursive.c:1326 +#: merge-recursive.c:1350 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "" -#: merge-recursive.c:1529 +#: merge-recursive.c:1553 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" -#: merge-recursive.c:1544 +#: merge-recursive.c:1568 #, c-format msgid "Adding merged %s" msgstr "" -#: merge-recursive.c:1551 merge-recursive.c:1781 +#: merge-recursive.c:1575 merge-recursive.c:1805 #, c-format msgid "Adding as %s instead" msgstr "" -#: merge-recursive.c:1608 +#: merge-recursive.c:1632 #, c-format msgid "cannot read object %s" msgstr "" -#: merge-recursive.c:1611 +#: merge-recursive.c:1635 #, c-format msgid "object %s is not a blob" msgstr "" -#: merge-recursive.c:1680 +#: merge-recursive.c:1704 msgid "modify" msgstr "" -#: merge-recursive.c:1680 +#: merge-recursive.c:1704 msgid "modified" msgstr "" -#: merge-recursive.c:1690 +#: merge-recursive.c:1714 msgid "content" msgstr "" -#: merge-recursive.c:1697 +#: merge-recursive.c:1721 msgid "add/add" msgstr "" -#: merge-recursive.c:1733 +#: merge-recursive.c:1757 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "" -#: merge-recursive.c:1747 +#: merge-recursive.c:1771 #, c-format msgid "Auto-merging %s" msgstr "" -#: merge-recursive.c:1751 git-submodule.sh:945 +#: merge-recursive.c:1775 git-submodule.sh:944 msgid "submodule" msgstr "" -#: merge-recursive.c:1752 +#: merge-recursive.c:1776 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "" -#: merge-recursive.c:1846 +#: merge-recursive.c:1870 #, c-format msgid "Removing %s" msgstr "" -#: merge-recursive.c:1872 +#: merge-recursive.c:1896 msgid "file/directory" msgstr "" -#: merge-recursive.c:1878 +#: merge-recursive.c:1902 msgid "directory/file" msgstr "" -#: merge-recursive.c:1884 +#: merge-recursive.c:1908 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -#: merge-recursive.c:1893 +#: merge-recursive.c:1917 #, c-format msgid "Adding %s" msgstr "" -#: merge-recursive.c:1930 -msgid "Already up-to-date!" +#: merge-recursive.c:1954 +msgid "Already up to date!" msgstr "" -#: merge-recursive.c:1939 +#: merge-recursive.c:1963 #, c-format msgid "merging of trees %s and %s failed" msgstr "" -#: merge-recursive.c:2022 +#: merge-recursive.c:2060 msgid "Merging:" msgstr "" -#: merge-recursive.c:2035 +#: merge-recursive.c:2073 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:2074 +#: merge-recursive.c:2112 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:2137 +#: merge-recursive.c:2175 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793 +#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814 msgid "Unable to write index." msgstr "" -#: notes-merge.c:273 +#: notes-merge.c:272 #, c-format msgid "" "You have not concluded your previous notes merge (%s exists).\n" @@ -2167,7 +2180,7 @@ msgid "" "commit/abort the previous merge before you start a new notes merge." msgstr "" -#: notes-merge.c:280 +#: notes-merge.c:279 #, c-format msgid "You have not concluded your notes merge (%s exists)." msgstr "" @@ -2195,16 +2208,30 @@ msgstr "" msgid "Bad %s value: '%s'" msgstr "" -#: object.c:240 +#: object.c:239 #, c-format msgid "unable to parse object: %s" msgstr "" +#: packfile.c:556 +msgid "offset before end of packfile (broken .idx?)" +msgstr "" + +#: packfile.c:1683 +#, c-format +msgid "offset before start of pack index for %s (corrupt index?)" +msgstr "" + +#: packfile.c:1687 +#, c-format +msgid "offset beyond end of pack index for %s (truncated index?)" +msgstr "" + #: parse-options.c:573 msgid "..." msgstr "" -#: parse-options.c:591 +#: parse-options.c:592 #, c-format msgid "usage: %s" msgstr "" @@ -2212,17 +2239,17 @@ msgstr "" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:597 +#: parse-options.c:598 #, c-format msgid " or: %s" msgstr "" -#: parse-options.c:600 +#: parse-options.c:601 #, c-format msgid " %s" msgstr "" -#: parse-options.c:634 +#: parse-options.c:640 msgid "-NUM" msgstr "" @@ -2231,7 +2258,7 @@ msgstr "" msgid "malformed object name '%s'" msgstr "" -#: path.c:890 +#: path.c:891 #, c-format msgid "Could not make %s writable by group" msgstr "" @@ -2302,18 +2329,18 @@ msgstr "" msgid "%s: pathspec magic not supported by this command: %s" msgstr "" -#: pathspec.c:575 +#: pathspec.c:571 msgid "" "empty strings as pathspecs will be made invalid in upcoming releases. please " "use . instead if you meant to match all paths" msgstr "" -#: pathspec.c:599 +#: pathspec.c:595 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "" -#: pretty.c:963 +#: pretty.c:962 msgid "unable to parse --pretty format" msgstr "" @@ -2331,48 +2358,49 @@ msgid "" "Using version %i" msgstr "" -#: read-cache.c:2308 builtin/merge.c:1019 +#: read-cache.c:2316 builtin/merge.c:1046 #, c-format msgid "could not close '%s'" msgstr "" -#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054 +#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077 #, c-format msgid "could not stat '%s'" msgstr "" -#: read-cache.c:2396 +#: read-cache.c:2407 #, c-format msgid "unable to open git dir: %s" msgstr "" -#: read-cache.c:2408 +#: read-cache.c:2419 #, c-format msgid "unable to unlink: %s" msgstr "" -#: refs.c:622 +#: refs.c:638 #, c-format msgid "Could not open '%s' for writing" msgstr "" -#: refs.c:1769 +#: refs.c:1779 msgid "ref updates forbidden inside quarantine environment" msgstr "" -#: refs/files-backend.c:1664 +#: refs/files-backend.c:1136 #, c-format -msgid "could not delete reference %s: %s" +msgid "could not remove reference %s" msgstr "" -#: refs/files-backend.c:1667 +#: refs/files-backend.c:1150 refs/packed-backend.c:1430 +#: refs/packed-backend.c:1440 #, c-format -msgid "could not delete references: %s" +msgid "could not delete reference %s: %s" msgstr "" -#: refs/files-backend.c:1676 +#: refs/files-backend.c:1153 refs/packed-backend.c:1443 #, c-format -msgid "could not remove reference %s" +msgid "could not delete references: %s" msgstr "" #: ref-filter.c:35 wt-status.c:1811 @@ -2394,157 +2422,157 @@ msgstr "" msgid "ahead %d, behind %d" msgstr "" -#: ref-filter.c:105 +#: ref-filter.c:104 #, c-format msgid "expected format: %%(color:<color>)" msgstr "" -#: ref-filter.c:107 +#: ref-filter.c:106 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "" -#: ref-filter.c:121 +#: ref-filter.c:126 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "" -#: ref-filter.c:125 +#: ref-filter.c:130 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "" -#: ref-filter.c:127 +#: ref-filter.c:132 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "" -#: ref-filter.c:167 +#: ref-filter.c:172 #, c-format msgid "%%(body) does not take arguments" msgstr "" -#: ref-filter.c:174 +#: ref-filter.c:179 #, c-format msgid "%%(subject) does not take arguments" msgstr "" -#: ref-filter.c:181 +#: ref-filter.c:186 #, c-format msgid "%%(trailers) does not take arguments" msgstr "" -#: ref-filter.c:200 +#: ref-filter.c:205 #, c-format msgid "positive value expected contents:lines=%s" msgstr "" -#: ref-filter.c:202 +#: ref-filter.c:207 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "" -#: ref-filter.c:215 +#: ref-filter.c:220 #, c-format msgid "positive value expected objectname:short=%s" msgstr "" -#: ref-filter.c:219 +#: ref-filter.c:224 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "" -#: ref-filter.c:246 +#: ref-filter.c:251 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "" -#: ref-filter.c:258 +#: ref-filter.c:263 #, c-format msgid "unrecognized position:%s" msgstr "" -#: ref-filter.c:262 +#: ref-filter.c:267 #, c-format msgid "unrecognized width:%s" msgstr "" -#: ref-filter.c:268 +#: ref-filter.c:273 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "" -#: ref-filter.c:272 +#: ref-filter.c:277 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "" -#: ref-filter.c:287 +#: ref-filter.c:292 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "" -#: ref-filter.c:378 +#: ref-filter.c:382 #, c-format msgid "malformed field name: %.*s" msgstr "" -#: ref-filter.c:404 +#: ref-filter.c:408 #, c-format msgid "unknown field name: %.*s" msgstr "" -#: ref-filter.c:508 +#: ref-filter.c:520 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "" -#: ref-filter.c:568 +#: ref-filter.c:580 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "" -#: ref-filter.c:570 +#: ref-filter.c:582 #, c-format msgid "format: %%(then) atom used more than once" msgstr "" -#: ref-filter.c:572 +#: ref-filter.c:584 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "" -#: ref-filter.c:598 +#: ref-filter.c:610 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "" -#: ref-filter.c:600 +#: ref-filter.c:612 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "" -#: ref-filter.c:602 +#: ref-filter.c:614 #, c-format msgid "format: %%(else) atom used more than once" msgstr "" -#: ref-filter.c:615 +#: ref-filter.c:627 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "" -#: ref-filter.c:670 +#: ref-filter.c:682 #, c-format msgid "malformed format string %s" msgstr "" -#: ref-filter.c:1254 +#: ref-filter.c:1268 #, c-format msgid "(no branch, rebasing %s)" msgstr "" -#: ref-filter.c:1257 +#: ref-filter.c:1271 #, c-format msgid "(no branch, bisect started on %s)" msgstr "" @@ -2552,7 +2580,7 @@ msgstr "" #. TRANSLATORS: make sure this matches "HEAD #. detached at " in wt-status.c #. -#: ref-filter.c:1265 +#: ref-filter.c:1279 #, c-format msgid "(HEAD detached at %s)" msgstr "" @@ -2560,108 +2588,108 @@ msgstr "" #. TRANSLATORS: make sure this matches "HEAD #. detached from " in wt-status.c #. -#: ref-filter.c:1272 +#: ref-filter.c:1286 #, c-format msgid "(HEAD detached from %s)" msgstr "" -#: ref-filter.c:1276 +#: ref-filter.c:1290 msgid "(no branch)" msgstr "" -#: ref-filter.c:1426 ref-filter.c:1457 +#: ref-filter.c:1439 ref-filter.c:1470 #, c-format msgid "missing object %s for %s" msgstr "" -#: ref-filter.c:1429 ref-filter.c:1460 +#: ref-filter.c:1442 ref-filter.c:1473 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "" -#: ref-filter.c:1760 +#: ref-filter.c:1773 #, c-format msgid "malformed object at '%s'" msgstr "" -#: ref-filter.c:1827 +#: ref-filter.c:1840 #, c-format msgid "ignoring ref with broken name %s" msgstr "" -#: ref-filter.c:1832 +#: ref-filter.c:1845 #, c-format msgid "ignoring broken ref %s" msgstr "" -#: ref-filter.c:2095 +#: ref-filter.c:2107 #, c-format msgid "format: %%(end) atom missing" msgstr "" -#: ref-filter.c:2176 +#: ref-filter.c:2201 #, c-format msgid "malformed object name %s" msgstr "" -#: remote.c:747 +#: remote.c:750 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "" -#: remote.c:751 +#: remote.c:754 #, c-format msgid "%s usually tracks %s, not %s" msgstr "" -#: remote.c:755 +#: remote.c:758 #, c-format msgid "%s tracks both %s and %s" msgstr "" -#: remote.c:763 +#: remote.c:766 msgid "Internal error" msgstr "" -#: remote.c:1680 remote.c:1782 +#: remote.c:1681 remote.c:1783 msgid "HEAD does not point to a branch" msgstr "" -#: remote.c:1689 +#: remote.c:1690 #, c-format msgid "no such branch: '%s'" msgstr "" -#: remote.c:1692 +#: remote.c:1693 #, c-format msgid "no upstream configured for branch '%s'" msgstr "" -#: remote.c:1698 +#: remote.c:1699 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "" -#: remote.c:1713 +#: remote.c:1714 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" -#: remote.c:1725 +#: remote.c:1726 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "" -#: remote.c:1736 +#: remote.c:1737 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "" -#: remote.c:1749 +#: remote.c:1750 msgid "push has no destination (push.default is 'nothing')" msgstr "" -#: remote.c:1771 +#: remote.c:1772 msgid "cannot resolve 'simple' push to a single destination" msgstr "" @@ -2676,7 +2704,7 @@ msgstr "" #: remote.c:2083 #, c-format -msgid "Your branch is up-to-date with '%s'.\n" +msgid "Your branch is up to date with '%s'.\n" msgstr "" #: remote.c:2087 @@ -2717,16 +2745,16 @@ msgstr[1] "" msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" -#: revision.c:2187 +#: revision.c:2256 msgid "your current branch appears to be broken" msgstr "" -#: revision.c:2190 +#: revision.c:2259 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "" -#: revision.c:2384 +#: revision.c:2453 msgid "--first-parent is incompatible with --bisect" msgstr "" @@ -2766,72 +2794,73 @@ msgstr "" msgid "the receiving end does not support push options" msgstr "" -#: sequencer.c:216 +#: sequencer.c:218 msgid "revert" msgstr "" -#: sequencer.c:218 +#: sequencer.c:220 msgid "cherry-pick" msgstr "" -#: sequencer.c:220 +#: sequencer.c:222 msgid "rebase -i" msgstr "" -#: sequencer.c:222 +#: sequencer.c:224 #, c-format msgid "Unknown action: %d" msgstr "" -#: sequencer.c:279 +#: sequencer.c:281 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" msgstr "" -#: sequencer.c:282 +#: sequencer.c:284 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" "and commit the result with 'git commit'" msgstr "" -#: sequencer.c:295 sequencer.c:1685 +#: sequencer.c:297 sequencer.c:1704 #, c-format msgid "could not lock '%s'" msgstr "" -#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704 +#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723 +#: sequencer.c:2733 sequencer.c:2749 #, c-format msgid "could not write to '%s'" msgstr "" -#: sequencer.c:302 +#: sequencer.c:304 #, c-format msgid "could not write eol to '%s'" msgstr "" -#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692 +#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711 #, c-format msgid "failed to finalize '%s'." msgstr "" -#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258 -#: builtin/commit.c:750 builtin/merge.c:1017 +#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259 +#: builtin/commit.c:754 builtin/merge.c:1044 #, c-format msgid "could not read '%s'" msgstr "" -#: sequencer.c:356 +#: sequencer.c:358 #, c-format msgid "your local changes would be overwritten by %s." msgstr "" -#: sequencer.c:360 +#: sequencer.c:362 msgid "commit your changes or stash them to proceed." msgstr "" -#: sequencer.c:389 +#: sequencer.c:391 #, c-format msgid "%s: fast-forward" msgstr "" @@ -2839,20 +2868,20 @@ msgstr "" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:472 +#: sequencer.c:474 #, c-format msgid "%s: Unable to write new index file" msgstr "" -#: sequencer.c:491 +#: sequencer.c:493 msgid "could not resolve HEAD commit\n" msgstr "" -#: sequencer.c:511 +#: sequencer.c:513 msgid "unable to update cache tree\n" msgstr "" -#: sequencer.c:595 +#: sequencer.c:597 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -2869,17 +2898,17 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:697 +#: sequencer.c:699 #, c-format msgid "could not parse commit %s\n" msgstr "" -#: sequencer.c:702 +#: sequencer.c:704 #, c-format msgid "could not parse parent commit %s\n" msgstr "" -#: sequencer.c:824 +#: sequencer.c:826 #, c-format msgid "" "unexpected 1st line of squash message:\n" @@ -2887,7 +2916,7 @@ msgid "" "\t%.*s" msgstr "" -#: sequencer.c:830 +#: sequencer.c:832 #, c-format msgid "" "invalid 1st line of squash message:\n" @@ -2895,229 +2924,230 @@ msgid "" "\t%.*s" msgstr "" -#: sequencer.c:836 sequencer.c:861 +#: sequencer.c:838 sequencer.c:863 #, c-format msgid "This is a combination of %d commits." msgstr "" -#: sequencer.c:845 +#: sequencer.c:847 sequencer.c:2681 msgid "need a HEAD to fixup" msgstr "" -#: sequencer.c:847 +#: sequencer.c:849 msgid "could not read HEAD" msgstr "" -#: sequencer.c:849 +#: sequencer.c:851 msgid "could not read HEAD's commit message" msgstr "" -#: sequencer.c:855 +#: sequencer.c:857 #, c-format msgid "cannot write '%s'" msgstr "" -#: sequencer.c:864 git-rebase--interactive.sh:445 +#: sequencer.c:866 git-rebase--interactive.sh:446 msgid "This is the 1st commit message:" msgstr "" -#: sequencer.c:872 +#: sequencer.c:874 #, c-format msgid "could not read commit message of %s" msgstr "" -#: sequencer.c:879 +#: sequencer.c:881 #, c-format msgid "This is the commit message #%d:" msgstr "" -#: sequencer.c:884 +#: sequencer.c:886 #, c-format msgid "The commit message #%d will be skipped:" msgstr "" -#: sequencer.c:889 +#: sequencer.c:891 #, c-format msgid "unknown command: %d" msgstr "" -#: sequencer.c:955 +#: sequencer.c:957 msgid "your index file is unmerged." msgstr "" -#: sequencer.c:973 +#: sequencer.c:975 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:981 +#: sequencer.c:983 #, c-format msgid "commit %s does not have parent %d" msgstr "" -#: sequencer.c:985 +#: sequencer.c:987 #, c-format msgid "mainline was specified but commit %s is not a merge." msgstr "" -#: sequencer.c:991 +#: sequencer.c:993 #, c-format msgid "cannot get commit message for %s" msgstr "" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1012 +#: sequencer.c:1014 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:1075 sequencer.c:1830 +#: sequencer.c:1077 sequencer.c:1853 #, c-format msgid "could not rename '%s' to '%s'" msgstr "" -#: sequencer.c:1126 +#: sequencer.c:1128 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:1127 +#: sequencer.c:1129 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:1169 +#: sequencer.c:1171 msgid "empty commit set passed" msgstr "" -#: sequencer.c:1179 +#: sequencer.c:1181 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:1186 +#: sequencer.c:1188 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:1306 +#: sequencer.c:1308 #, c-format msgid "invalid line %d: %.*s" msgstr "" -#: sequencer.c:1314 +#: sequencer.c:1316 #, c-format msgid "cannot '%s' without a previous commit" msgstr "" -#: sequencer.c:1347 +#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614 +#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951 #, c-format msgid "could not read '%s'." msgstr "" -#: sequencer.c:1359 +#: sequencer.c:1361 msgid "please fix this using 'git rebase --edit-todo'." msgstr "" -#: sequencer.c:1361 +#: sequencer.c:1363 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "" -#: sequencer.c:1366 +#: sequencer.c:1368 msgid "no commits parsed." msgstr "" -#: sequencer.c:1377 +#: sequencer.c:1379 msgid "cannot cherry-pick during a revert." msgstr "" -#: sequencer.c:1379 +#: sequencer.c:1381 msgid "cannot revert during a cherry-pick." msgstr "" -#: sequencer.c:1442 +#: sequencer.c:1448 #, c-format msgid "invalid key: %s" msgstr "" -#: sequencer.c:1445 +#: sequencer.c:1451 #, c-format msgid "invalid value for %s: %s" msgstr "" -#: sequencer.c:1502 +#: sequencer.c:1517 #, c-format msgid "malformed options sheet: '%s'" msgstr "" -#: sequencer.c:1540 +#: sequencer.c:1555 msgid "a cherry-pick or revert is already in progress" msgstr "" -#: sequencer.c:1541 +#: sequencer.c:1556 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "" -#: sequencer.c:1544 +#: sequencer.c:1559 #, c-format msgid "could not create sequencer directory '%s'" msgstr "" -#: sequencer.c:1558 +#: sequencer.c:1574 msgid "could not lock HEAD" msgstr "" -#: sequencer.c:1614 sequencer.c:2188 +#: sequencer.c:1632 sequencer.c:2211 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:1616 +#: sequencer.c:1634 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:1618 sequencer.c:1652 +#: sequencer.c:1636 sequencer.c:1671 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:1638 builtin/grep.c:929 +#: sequencer.c:1657 builtin/grep.c:711 #, c-format msgid "cannot open '%s'" msgstr "" -#: sequencer.c:1640 +#: sequencer.c:1659 #, c-format msgid "cannot read '%s': %s" msgstr "" -#: sequencer.c:1641 +#: sequencer.c:1660 msgid "unexpected end of file" msgstr "" -#: sequencer.c:1647 +#: sequencer.c:1666 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:1658 +#: sequencer.c:1677 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" -#: sequencer.c:1795 sequencer.c:2086 +#: sequencer.c:1818 sequencer.c:2109 msgid "cannot read HEAD" msgstr "" -#: sequencer.c:1835 builtin/difftool.c:633 +#: sequencer.c:1858 builtin/difftool.c:640 #, c-format msgid "could not copy '%s' to '%s'" msgstr "" -#: sequencer.c:1851 +#: sequencer.c:1874 msgid "could not read index" msgstr "" -#: sequencer.c:1856 +#: sequencer.c:1879 #, c-format msgid "" "execution failed: %s\n" @@ -3127,11 +3157,11 @@ msgid "" "\n" msgstr "" -#: sequencer.c:1862 +#: sequencer.c:1885 msgid "and made changes to the index and/or the working tree\n" msgstr "" -#: sequencer.c:1868 +#: sequencer.c:1891 #, c-format msgid "" "execution succeeded: %s\n" @@ -3142,17 +3172,17 @@ msgid "" "\n" msgstr "" -#: sequencer.c:1925 +#: sequencer.c:1948 #, c-format msgid "Applied autostash.\n" msgstr "" -#: sequencer.c:1937 +#: sequencer.c:1960 #, c-format msgid "cannot store %s" msgstr "" -#: sequencer.c:1940 git-rebase.sh:173 +#: sequencer.c:1963 git-rebase.sh:175 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -3160,81 +3190,155 @@ msgid "" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -#: sequencer.c:2022 +#: sequencer.c:2045 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "" -#: sequencer.c:2064 +#: sequencer.c:2087 #, c-format msgid "unknown command %d" msgstr "" -#: sequencer.c:2094 +#: sequencer.c:2117 msgid "could not read orig-head" msgstr "" -#: sequencer.c:2099 +#: sequencer.c:2122 sequencer.c:2678 msgid "could not read 'onto'" msgstr "" -#: sequencer.c:2106 +#: sequencer.c:2129 #, c-format msgid "could not update %s" msgstr "" -#: sequencer.c:2113 +#: sequencer.c:2136 #, c-format msgid "could not update HEAD to %s" msgstr "" -#: sequencer.c:2197 +#: sequencer.c:2220 msgid "cannot rebase: You have unstaged changes." msgstr "" -#: sequencer.c:2202 +#: sequencer.c:2225 msgid "could not remove CHERRY_PICK_HEAD" msgstr "" -#: sequencer.c:2211 +#: sequencer.c:2234 msgid "cannot amend non-existing commit" msgstr "" -#: sequencer.c:2213 +#: sequencer.c:2236 #, c-format msgid "invalid file: '%s'" msgstr "" -#: sequencer.c:2215 +#: sequencer.c:2238 #, c-format msgid "invalid contents: '%s'" msgstr "" -#: sequencer.c:2218 +#: sequencer.c:2241 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" "first and then run 'git rebase --continue' again." msgstr "" -#: sequencer.c:2228 +#: sequencer.c:2251 msgid "could not commit staged changes." msgstr "" -#: sequencer.c:2308 +#: sequencer.c:2331 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "" -#: sequencer.c:2312 +#: sequencer.c:2335 #, c-format msgid "%s: bad revision" msgstr "" -#: sequencer.c:2345 +#: sequencer.c:2368 msgid "can't revert as initial commit" msgstr "" +#: sequencer.c:2471 +msgid "make_script: unhandled options" +msgstr "" + +#: sequencer.c:2474 +msgid "make_script: error preparing revisions" +msgstr "" + +#: sequencer.c:2510 +#, c-format +msgid "unusable todo list: '%s'" +msgstr "" + +#: sequencer.c:2516 +#, c-format +msgid "unable to open '%s' for writing" +msgstr "" + +#: sequencer.c:2561 +#, c-format +msgid "unrecognized setting %s for optionrebase.missingCommitsCheck. Ignoring." +msgstr "" + +#: sequencer.c:2641 +#, c-format +msgid "" +"Warning: some commits may have been dropped accidentally.\n" +"Dropped commits (newer to older):\n" +msgstr "" + +#: sequencer.c:2648 +#, c-format +msgid "" +"To avoid this message, use \"drop\" to explicitly remove a commit.\n" +"\n" +"Use 'git config rebase.missingCommitsCheck' to change the level of " +"warnings.\n" +"The possible behaviours are: ignore, warn, error.\n" +"\n" +msgstr "" + +#: sequencer.c:2660 +#, c-format +msgid "" +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" +"continue'.\n" +"Or you can abort the rebase with 'git rebase --abort'.\n" +msgstr "" + +#: sequencer.c:2708 +#, c-format +msgid "could not parse commit '%s'" +msgstr "" + +#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395 +#: builtin/am.c:775 +#, c-format +msgid "could not open '%s' for writing" +msgstr "" + +#: sequencer.c:2756 +#, c-format +msgid "could not truncate '%s'" +msgstr "" + +#: sequencer.c:2848 +msgid "the script was already rearranged." +msgstr "" + +#: sequencer.c:2953 +#, c-format +msgid "could not finish '%s'" +msgstr "" + #: setup.c:171 #, c-format msgid "" @@ -3258,96 +3362,82 @@ msgid "" "'git <command> [<revision>...] -- [<file>...]'" msgstr "" -#: setup.c:504 +#: setup.c:499 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "" -#: setup.c:512 +#: setup.c:507 msgid "unknown repository extensions found:" msgstr "" -#: setup.c:810 +#: setup.c:806 #, c-format msgid "Not a git repository (or any of the parent directories): %s" msgstr "" -#: setup.c:812 builtin/index-pack.c:1652 +#: setup.c:808 builtin/index-pack.c:1653 msgid "Cannot come back to cwd" msgstr "" -#: setup.c:1050 +#: setup.c:1046 msgid "Unable to read current working directory" msgstr "" -#: setup.c:1062 setup.c:1068 +#: setup.c:1058 setup.c:1064 #, c-format msgid "Cannot change to '%s'" msgstr "" -#: setup.c:1081 +#: setup.c:1077 #, c-format msgid "" "Not a git repository (or any parent up to mount point %s)\n" "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." msgstr "" -#: setup.c:1173 +#: setup.c:1159 #, c-format msgid "" "Problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." msgstr "" -#: sha1_file.c:560 +#: sha1_file.c:528 #, c-format msgid "path '%s' does not exist" msgstr "" -#: sha1_file.c:586 +#: sha1_file.c:554 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" -#: sha1_file.c:592 +#: sha1_file.c:560 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "" -#: sha1_file.c:598 +#: sha1_file.c:566 #, c-format msgid "reference repository '%s' is shallow" msgstr "" -#: sha1_file.c:606 +#: sha1_file.c:574 #, c-format msgid "reference repository '%s' is grafted" msgstr "" -#: sha1_file.c:1245 -msgid "offset before end of packfile (broken .idx?)" -msgstr "" - -#: sha1_file.c:2729 -#, c-format -msgid "offset before start of pack index for %s (corrupt index?)" -msgstr "" - -#: sha1_file.c:2733 -#, c-format -msgid "offset beyond end of pack index for %s (truncated index?)" -msgstr "" - -#: sha1_name.c:419 +#: sha1_name.c:420 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "" -#: sha1_name.c:430 +#: sha1_name.c:431 msgid "The candidates are:" msgstr "" -#: sha1_name.c:589 +#: sha1_name.c:590 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -3360,81 +3450,86 @@ msgid "" "running \"git config advice.objectNameWarning false\"" msgstr "" -#: submodule.c:70 submodule.c:104 +#: submodule.c:93 submodule.c:127 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" -#: submodule.c:74 submodule.c:108 +#: submodule.c:97 submodule.c:131 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "" -#: submodule.c:82 +#: submodule.c:105 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "" -#: submodule.c:115 +#: submodule.c:138 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "" -#: submodule.c:126 +#: submodule.c:149 msgid "staging updated .gitmodules failed" msgstr "" -#: submodule.c:165 -msgid "negative values not allowed for submodule.fetchJobs" -msgstr "" - -#: submodule.c:376 +#: submodule.c:309 #, c-format msgid "in unpopulated submodule '%s'" msgstr "" -#: submodule.c:407 +#: submodule.c:340 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "" -#: submodule.c:1337 +#: submodule.c:799 +#, c-format +msgid "submodule entry '%s' (%s) is a %s, not a commit" +msgstr "" + +#: submodule.c:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149 +msgid "Failed to resolve HEAD as a valid ref." +msgstr "" + +#: submodule.c:1304 #, c-format msgid "'%s' not recognized as a git repository" msgstr "" -#: submodule.c:1475 +#: submodule.c:1442 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "" -#: submodule.c:1488 +#: submodule.c:1455 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "" -#: submodule.c:1581 +#: submodule.c:1548 #, c-format msgid "submodule '%s' has dirty index" msgstr "" -#: submodule.c:1845 +#: submodule.c:1809 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "" -#: submodule.c:1857 submodule.c:1913 +#: submodule.c:1821 submodule.c:1877 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "" -#: submodule.c:1861 builtin/submodule--helper.c:678 -#: builtin/submodule--helper.c:688 +#: submodule.c:1825 builtin/submodule--helper.c:671 +#: builtin/submodule--helper.c:681 #, c-format msgid "could not create directory '%s'" msgstr "" -#: submodule.c:1864 +#: submodule.c:1828 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -3442,101 +3537,105 @@ msgid "" "'%s'\n" msgstr "" -#: submodule.c:1948 +#: submodule.c:1912 #, c-format msgid "could not recurse into submodule '%s'" msgstr "" -#: submodule.c:1992 +#: submodule.c:1956 msgid "could not start ls-files in .." msgstr "" -#: submodule.c:2012 +#: submodule.c:1976 msgid "BUG: returned path string doesn't match cwd?" msgstr "" -#: submodule.c:2031 +#: submodule.c:1995 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "" -#: submodule-config.c:420 +#: submodule-config.c:263 +msgid "negative values not allowed for submodule.fetchjobs" +msgstr "" + +#: submodule-config.c:436 #, c-format msgid "invalid value for %s" msgstr "" -#: trailer.c:241 +#: trailer.c:238 #, c-format msgid "running trailer command '%s' failed" msgstr "" -#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540 -#: trailer.c:544 +#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 +#: trailer.c:557 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "" -#: trailer.c:526 trailer.c:531 builtin/remote.c:290 +#: trailer.c:539 trailer.c:544 builtin/remote.c:290 #, c-format msgid "more than one %s" msgstr "" -#: trailer.c:703 +#: trailer.c:730 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "" -#: trailer.c:723 +#: trailer.c:750 #, c-format msgid "could not read input file '%s'" msgstr "" -#: trailer.c:726 +#: trailer.c:753 msgid "could not read from stdin" msgstr "" -#: trailer.c:950 builtin/am.c:45 +#: trailer.c:1008 builtin/am.c:46 #, c-format msgid "could not stat %s" msgstr "" -#: trailer.c:952 +#: trailer.c:1010 #, c-format msgid "file %s is not a regular file" msgstr "" -#: trailer.c:954 +#: trailer.c:1012 #, c-format msgid "file %s is not writable by user" msgstr "" -#: trailer.c:966 +#: trailer.c:1024 msgid "could not open temporary file" msgstr "" -#: trailer.c:1002 +#: trailer.c:1064 #, c-format msgid "could not rename temporary file to %s" msgstr "" -#: transport.c:63 +#: transport.c:62 #, c-format msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "" -#: transport.c:152 +#: transport.c:151 #, c-format msgid "transport: invalid depth option '%s'" msgstr "" -#: transport.c:890 +#: transport.c:888 #, c-format msgid "" "The following submodule paths contain changes that can\n" "not be found on any remote:\n" msgstr "" -#: transport.c:894 +#: transport.c:892 #, c-format msgid "" "\n" @@ -3552,7 +3651,7 @@ msgid "" "\n" msgstr "" -#: transport.c:902 +#: transport.c:900 msgid "Aborting." msgstr "" @@ -3573,102 +3672,102 @@ msgstr "" msgid "empty filename in tree entry" msgstr "" -#: tree-walk.c:113 +#: tree-walk.c:114 msgid "too-short tree file" msgstr "" -#: unpack-trees.c:105 +#: unpack-trees.c:106 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%sPlease commit your changes or stash them before you switch branches." msgstr "" -#: unpack-trees.c:107 +#: unpack-trees.c:108 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%s" msgstr "" -#: unpack-trees.c:110 +#: unpack-trees.c:111 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%sPlease commit your changes or stash them before you merge." msgstr "" -#: unpack-trees.c:112 +#: unpack-trees.c:113 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:115 +#: unpack-trees.c:116 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%sPlease commit your changes or stash them before you %s." msgstr "" -#: unpack-trees.c:117 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:122 +#: unpack-trees.c:123 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" "%s" msgstr "" -#: unpack-trees.c:126 +#: unpack-trees.c:127 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%sPlease move or remove them before you switch branches." msgstr "" -#: unpack-trees.c:128 +#: unpack-trees.c:129 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%s" msgstr "" -#: unpack-trees.c:131 +#: unpack-trees.c:132 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" -#: unpack-trees.c:133 +#: unpack-trees.c:134 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:136 +#: unpack-trees.c:137 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%sPlease move or remove them before you %s." msgstr "" -#: unpack-trees.c:138 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:143 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3676,7 +3775,7 @@ msgid "" "%%sPlease move or remove them before you switch branches." msgstr "" -#: unpack-trees.c:145 +#: unpack-trees.c:146 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3684,47 +3783,47 @@ msgid "" "%%s" msgstr "" -#: unpack-trees.c:148 +#: unpack-trees.c:149 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" -#: unpack-trees.c:150 +#: unpack-trees.c:151 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:153 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%sPlease move or remove them before you %s." msgstr "" -#: unpack-trees.c:155 +#: unpack-trees.c:156 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:162 +#: unpack-trees.c:163 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "" -#: unpack-trees.c:165 +#: unpack-trees.c:166 #, c-format msgid "" -"Cannot update sparse checkout: the following entries are not up-to-date:\n" +"Cannot update sparse checkout: the following entries are not up to date:\n" "%s" msgstr "" -#: unpack-trees.c:167 +#: unpack-trees.c:168 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -3732,7 +3831,7 @@ msgid "" "%s" msgstr "" -#: unpack-trees.c:169 +#: unpack-trees.c:170 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -3740,24 +3839,19 @@ msgid "" "%s" msgstr "" -#: unpack-trees.c:171 +#: unpack-trees.c:172 #, c-format msgid "" "Cannot update submodule:\n" "%s" msgstr "" -#: unpack-trees.c:248 +#: unpack-trees.c:249 #, c-format msgid "Aborting\n" msgstr "" -#: unpack-trees.c:277 -#, c-format -msgid "submodule update strategy not supported for submodule '%s'" -msgstr "" - -#: unpack-trees.c:346 +#: unpack-trees.c:331 msgid "Checking out files" msgstr "" @@ -3800,13 +3894,8 @@ msgstr "" msgid "could not open '%s' for reading and writing" msgstr "" -#: wrapper.c:225 wrapper.c:395 builtin/am.c:766 -#, c-format -msgid "could not open '%s' for writing" -msgstr "" - -#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757 -#: builtin/am.c:849 builtin/merge.c:1014 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766 +#: builtin/am.c:858 builtin/merge.c:1041 #, c-format msgid "could not open '%s' for reading" msgstr "" @@ -3830,191 +3919,191 @@ msgstr "" msgid "could not close %s" msgstr "" -#: wt-status.c:152 +#: wt-status.c:150 msgid "Unmerged paths:" msgstr "" -#: wt-status.c:179 wt-status.c:206 +#: wt-status.c:177 wt-status.c:204 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr "" -#: wt-status.c:181 wt-status.c:208 +#: wt-status.c:179 wt-status.c:206 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr "" -#: wt-status.c:185 +#: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" msgstr "" -#: wt-status.c:187 wt-status.c:191 +#: wt-status.c:185 wt-status.c:189 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" -#: wt-status.c:189 +#: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" -#: wt-status.c:200 wt-status.c:981 +#: wt-status.c:198 wt-status.c:979 msgid "Changes to be committed:" msgstr "" -#: wt-status.c:218 wt-status.c:990 +#: wt-status.c:216 wt-status.c:988 msgid "Changes not staged for commit:" msgstr "" -#: wt-status.c:222 +#: wt-status.c:220 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" -#: wt-status.c:224 +#: wt-status.c:222 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" -#: wt-status.c:225 +#: wt-status.c:223 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" -#: wt-status.c:227 +#: wt-status.c:225 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" -#: wt-status.c:239 +#: wt-status.c:237 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" -#: wt-status.c:254 +#: wt-status.c:252 msgid "both deleted:" msgstr "" -#: wt-status.c:256 +#: wt-status.c:254 msgid "added by us:" msgstr "" -#: wt-status.c:258 +#: wt-status.c:256 msgid "deleted by them:" msgstr "" -#: wt-status.c:260 +#: wt-status.c:258 msgid "added by them:" msgstr "" -#: wt-status.c:262 +#: wt-status.c:260 msgid "deleted by us:" msgstr "" -#: wt-status.c:264 +#: wt-status.c:262 msgid "both added:" msgstr "" -#: wt-status.c:266 +#: wt-status.c:264 msgid "both modified:" msgstr "" -#: wt-status.c:276 +#: wt-status.c:274 msgid "new file:" msgstr "" -#: wt-status.c:278 +#: wt-status.c:276 msgid "copied:" msgstr "" -#: wt-status.c:280 +#: wt-status.c:278 msgid "deleted:" msgstr "" -#: wt-status.c:282 +#: wt-status.c:280 msgid "modified:" msgstr "" -#: wt-status.c:284 +#: wt-status.c:282 msgid "renamed:" msgstr "" -#: wt-status.c:286 +#: wt-status.c:284 msgid "typechange:" msgstr "" -#: wt-status.c:288 +#: wt-status.c:286 msgid "unknown:" msgstr "" -#: wt-status.c:290 +#: wt-status.c:288 msgid "unmerged:" msgstr "" -#: wt-status.c:372 +#: wt-status.c:370 msgid "new commits, " msgstr "" -#: wt-status.c:374 +#: wt-status.c:372 msgid "modified content, " msgstr "" -#: wt-status.c:376 +#: wt-status.c:374 msgid "untracked content, " msgstr "" -#: wt-status.c:821 +#: wt-status.c:819 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "" msgstr[1] "" -#: wt-status.c:853 +#: wt-status.c:851 msgid "Submodules changed but not updated:" msgstr "" -#: wt-status.c:855 +#: wt-status.c:853 msgid "Submodule changes to be committed:" msgstr "" -#: wt-status.c:937 +#: wt-status.c:935 msgid "" -"Do not touch the line above.\n" -"Everything below will be removed." +"Do not modify or remove the line above.\n" +"Everything below it will be ignored." msgstr "" -#: wt-status.c:1049 +#: wt-status.c:1048 msgid "You have unmerged paths." msgstr "" -#: wt-status.c:1052 +#: wt-status.c:1051 msgid " (fix conflicts and run \"git commit\")" msgstr "" -#: wt-status.c:1054 +#: wt-status.c:1053 msgid " (use \"git merge --abort\" to abort the merge)" msgstr "" -#: wt-status.c:1059 +#: wt-status.c:1058 msgid "All conflicts fixed but you are still merging." msgstr "" -#: wt-status.c:1062 +#: wt-status.c:1061 msgid " (use \"git commit\" to conclude merge)" msgstr "" -#: wt-status.c:1072 +#: wt-status.c:1071 msgid "You are in the middle of an am session." msgstr "" -#: wt-status.c:1075 +#: wt-status.c:1074 msgid "The current patch is empty." msgstr "" -#: wt-status.c:1079 +#: wt-status.c:1078 msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" -#: wt-status.c:1081 +#: wt-status.c:1080 msgid " (use \"git am --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1083 +#: wt-status.c:1082 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" @@ -4291,7 +4380,7 @@ msgstr "" msgid "cannot %s: Your index contains uncommitted changes." msgstr "" -#: compat/precompose_utf8.c:58 builtin/clone.c:436 +#: compat/precompose_utf8.c:58 builtin/clone.c:437 #, c-format msgid "failed to unlink '%s'" msgstr "" @@ -4305,7 +4394,7 @@ msgstr "" msgid "unexpected diff status %c" msgstr "" -#: builtin/add.c:87 builtin/commit.c:292 +#: builtin/add.c:87 builtin/commit.c:291 msgid "updating files failed" msgstr "" @@ -4314,108 +4403,108 @@ msgstr "" msgid "remove '%s'\n" msgstr "" -#: builtin/add.c:151 +#: builtin/add.c:153 msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/add.c:211 builtin/rev-parse.c:873 +#: builtin/add.c:213 builtin/rev-parse.c:888 msgid "Could not read the index" msgstr "" -#: builtin/add.c:222 +#: builtin/add.c:224 #, c-format msgid "Could not open '%s' for writing." msgstr "" -#: builtin/add.c:226 +#: builtin/add.c:228 msgid "Could not write patch" msgstr "" -#: builtin/add.c:229 +#: builtin/add.c:231 msgid "editing patch failed" msgstr "" -#: builtin/add.c:232 +#: builtin/add.c:234 #, c-format msgid "Could not stat '%s'" msgstr "" -#: builtin/add.c:234 +#: builtin/add.c:236 msgid "Empty patch. Aborted." msgstr "" -#: builtin/add.c:239 +#: builtin/add.c:241 #, c-format msgid "Could not apply '%s'" msgstr "" -#: builtin/add.c:249 +#: builtin/add.c:251 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124 +#: builtin/add.c:271 builtin/clean.c:910 builtin/fetch.c:132 builtin/mv.c:124 #: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529 -#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164 +#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164 msgid "dry run" msgstr "" -#: builtin/add.c:272 +#: builtin/add.c:274 msgid "interactive picking" msgstr "" -#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299 +#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310 msgid "select hunks interactively" msgstr "" -#: builtin/add.c:274 +#: builtin/add.c:276 msgid "edit current diff and apply" msgstr "" -#: builtin/add.c:275 +#: builtin/add.c:277 msgid "allow adding otherwise ignored files" msgstr "" -#: builtin/add.c:276 +#: builtin/add.c:278 msgid "update tracked files" msgstr "" -#: builtin/add.c:277 +#: builtin/add.c:279 msgid "record only the fact that the path will be added later" msgstr "" -#: builtin/add.c:278 +#: builtin/add.c:280 msgid "add changes from all tracked and untracked files" msgstr "" -#: builtin/add.c:281 +#: builtin/add.c:283 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" -#: builtin/add.c:283 +#: builtin/add.c:285 msgid "don't add, only refresh the index" msgstr "" -#: builtin/add.c:284 +#: builtin/add.c:286 msgid "just skip files which cannot be added because of errors" msgstr "" -#: builtin/add.c:285 +#: builtin/add.c:287 msgid "check if - even missing - files are ignored in dry run" msgstr "" -#: builtin/add.c:286 builtin/update-index.c:952 +#: builtin/add.c:288 builtin/update-index.c:954 msgid "(+/-)x" msgstr "" -#: builtin/add.c:286 builtin/update-index.c:953 +#: builtin/add.c:288 builtin/update-index.c:955 msgid "override the executable bit of the listed files" msgstr "" -#: builtin/add.c:288 +#: builtin/add.c:290 msgid "warn when adding an embedded repository" msgstr "" -#: builtin/add.c:303 +#: builtin/add.c:305 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -4433,185 +4522,185 @@ msgid "" "See \"git help submodule\" for more information." msgstr "" -#: builtin/add.c:331 +#: builtin/add.c:333 #, c-format msgid "adding embedded git repository: %s" msgstr "" -#: builtin/add.c:349 +#: builtin/add.c:351 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "" -#: builtin/add.c:357 +#: builtin/add.c:359 msgid "adding files failed" msgstr "" -#: builtin/add.c:394 +#: builtin/add.c:396 msgid "-A and -u are mutually incompatible" msgstr "" -#: builtin/add.c:401 +#: builtin/add.c:403 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" -#: builtin/add.c:405 +#: builtin/add.c:407 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "" -#: builtin/add.c:420 +#: builtin/add.c:422 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "" -#: builtin/add.c:421 +#: builtin/add.c:423 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" -#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282 -#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351 -#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272 -#: builtin/submodule--helper.c:244 +#: builtin/add.c:428 builtin/check-ignore.c:176 builtin/checkout.c:282 +#: builtin/checkout.c:479 builtin/clean.c:957 builtin/commit.c:350 +#: builtin/mv.c:143 builtin/reset.c:249 builtin/rm.c:271 +#: builtin/submodule--helper.c:243 msgid "index file corrupt" msgstr "" -#: builtin/am.c:413 +#: builtin/am.c:414 msgid "could not parse author script" msgstr "" -#: builtin/am.c:489 +#: builtin/am.c:498 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "" -#: builtin/am.c:530 +#: builtin/am.c:539 #, c-format msgid "Malformed input line: '%s'." msgstr "" -#: builtin/am.c:567 +#: builtin/am.c:576 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "" -#: builtin/am.c:593 +#: builtin/am.c:602 msgid "fseek failed" msgstr "" -#: builtin/am.c:777 +#: builtin/am.c:786 #, c-format msgid "could not parse patch '%s'" msgstr "" -#: builtin/am.c:842 +#: builtin/am.c:851 msgid "Only one StGIT patch series can be applied at once" msgstr "" -#: builtin/am.c:889 +#: builtin/am.c:899 msgid "invalid timestamp" msgstr "" -#: builtin/am.c:892 builtin/am.c:900 +#: builtin/am.c:904 builtin/am.c:916 msgid "invalid Date line" msgstr "" -#: builtin/am.c:897 +#: builtin/am.c:911 msgid "invalid timezone offset" msgstr "" -#: builtin/am.c:986 +#: builtin/am.c:1004 msgid "Patch format detection failed." msgstr "" -#: builtin/am.c:991 builtin/clone.c:401 +#: builtin/am.c:1009 builtin/clone.c:402 #, c-format msgid "failed to create directory '%s'" msgstr "" -#: builtin/am.c:995 +#: builtin/am.c:1013 msgid "Failed to split patches." msgstr "" -#: builtin/am.c:1120 builtin/commit.c:377 +#: builtin/am.c:1142 builtin/commit.c:376 msgid "unable to write index file" msgstr "" -#: builtin/am.c:1171 +#: builtin/am.c:1193 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "" -#: builtin/am.c:1172 +#: builtin/am.c:1194 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" -#: builtin/am.c:1173 +#: builtin/am.c:1195 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" -#: builtin/am.c:1304 +#: builtin/am.c:1302 msgid "Patch is empty." msgstr "" -#: builtin/am.c:1370 +#: builtin/am.c:1368 #, c-format msgid "invalid ident line: %.*s" msgstr "" -#: builtin/am.c:1392 +#: builtin/am.c:1390 #, c-format msgid "unable to parse commit %s" msgstr "" -#: builtin/am.c:1586 +#: builtin/am.c:1584 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" -#: builtin/am.c:1588 +#: builtin/am.c:1586 msgid "Using index info to reconstruct a base tree..." msgstr "" -#: builtin/am.c:1607 +#: builtin/am.c:1605 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" -#: builtin/am.c:1613 +#: builtin/am.c:1611 msgid "Falling back to patching base and 3-way merge..." msgstr "" -#: builtin/am.c:1638 +#: builtin/am.c:1636 msgid "Failed to merge in the changes." msgstr "" -#: builtin/am.c:1662 builtin/merge.c:632 +#: builtin/am.c:1660 builtin/merge.c:641 msgid "git write-tree failed to write a tree" msgstr "" -#: builtin/am.c:1669 +#: builtin/am.c:1667 msgid "applying to an empty history" msgstr "" -#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803 -#: builtin/merge.c:828 +#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824 +#: builtin/merge.c:849 msgid "failed to write commit object" msgstr "" -#: builtin/am.c:1715 builtin/am.c:1719 +#: builtin/am.c:1713 builtin/am.c:1717 #, c-format msgid "cannot resume: %s does not exist." msgstr "" -#: builtin/am.c:1735 +#: builtin/am.c:1733 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" -#: builtin/am.c:1740 +#: builtin/am.c:1738 msgid "Commit Body is:" msgstr "" @@ -4619,42 +4708,42 @@ msgstr "" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1750 +#: builtin/am.c:1748 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" -#: builtin/am.c:1800 +#: builtin/am.c:1798 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "" -#: builtin/am.c:1840 builtin/am.c:1912 +#: builtin/am.c:1838 builtin/am.c:1910 #, c-format msgid "Applying: %.*s" msgstr "" -#: builtin/am.c:1856 +#: builtin/am.c:1854 msgid "No changes -- Patch already applied." msgstr "" -#: builtin/am.c:1864 +#: builtin/am.c:1862 #, c-format msgid "Patch failed at %s %.*s" msgstr "" -#: builtin/am.c:1870 +#: builtin/am.c:1868 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "" -#: builtin/am.c:1915 +#: builtin/am.c:1913 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch." msgstr "" -#: builtin/am.c:1922 +#: builtin/am.c:1920 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -4662,172 +4751,171 @@ msgid "" "You might run `git rm` on a file to accept \"deleted by them\" for it." msgstr "" -#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323 -#: builtin/reset.c:331 +#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332 +#: builtin/reset.c:340 #, c-format msgid "Could not parse object '%s'." msgstr "" -#: builtin/am.c:2083 +#: builtin/am.c:2081 msgid "failed to clean index" msgstr "" -#: builtin/am.c:2117 +#: builtin/am.c:2116 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "" -#: builtin/am.c:2180 +#: builtin/am.c:2179 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "" -#: builtin/am.c:2213 +#: builtin/am.c:2212 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "" -#: builtin/am.c:2214 +#: builtin/am.c:2213 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "" -#: builtin/am.c:2220 +#: builtin/am.c:2219 msgid "run interactively" msgstr "" -#: builtin/am.c:2222 +#: builtin/am.c:2221 msgid "historical option -- no-op" msgstr "" -#: builtin/am.c:2224 +#: builtin/am.c:2223 msgid "allow fall back on 3way merging if needed" msgstr "" -#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57 +#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57 #: builtin/repack.c:180 msgid "be quiet" msgstr "" -#: builtin/am.c:2227 +#: builtin/am.c:2226 msgid "add a Signed-off-by line to the commit message" msgstr "" -#: builtin/am.c:2230 +#: builtin/am.c:2229 msgid "recode into utf8 (default)" msgstr "" -#: builtin/am.c:2232 +#: builtin/am.c:2231 msgid "pass -k flag to git-mailinfo" msgstr "" -#: builtin/am.c:2234 +#: builtin/am.c:2233 msgid "pass -b flag to git-mailinfo" msgstr "" -#: builtin/am.c:2236 +#: builtin/am.c:2235 msgid "pass -m flag to git-mailinfo" msgstr "" -#: builtin/am.c:2238 +#: builtin/am.c:2237 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "" -#: builtin/am.c:2241 +#: builtin/am.c:2240 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" -#: builtin/am.c:2244 +#: builtin/am.c:2243 msgid "strip everything before a scissors line" msgstr "" -#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255 -#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 -#: builtin/am.c:2273 +#: builtin/am.c:2245 builtin/am.c:2248 builtin/am.c:2251 builtin/am.c:2254 +#: builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263 builtin/am.c:2266 +#: builtin/am.c:2272 msgid "pass it through git-apply" msgstr "" -#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 -#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142 -#: builtin/pull.c:197 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:399 parse-options.h:132 parse-options.h:134 -#: parse-options.h:245 +#: builtin/am.c:2262 builtin/fmt-merge-msg.c:664 builtin/fmt-merge-msg.c:667 +#: builtin/grep.c:843 builtin/merge.c:205 builtin/pull.c:142 builtin/pull.c:197 +#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195 +#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377 +#: parse-options.h:132 parse-options.h:134 parse-options.h:245 msgid "n" msgstr "" -#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38 -#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39 +#: builtin/am.c:2268 builtin/branch.c:622 builtin/for-each-ref.c:38 +#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39 msgid "format" msgstr "" -#: builtin/am.c:2270 +#: builtin/am.c:2269 msgid "format the patch(es) are in" msgstr "" -#: builtin/am.c:2276 +#: builtin/am.c:2275 msgid "override error message when patch failure occurs" msgstr "" -#: builtin/am.c:2278 +#: builtin/am.c:2277 msgid "continue applying patches after resolving a conflict" msgstr "" -#: builtin/am.c:2281 +#: builtin/am.c:2280 msgid "synonyms for --continue" msgstr "" -#: builtin/am.c:2284 +#: builtin/am.c:2283 msgid "skip the current patch" msgstr "" -#: builtin/am.c:2287 +#: builtin/am.c:2286 msgid "restore the original branch and abort the patching operation." msgstr "" -#: builtin/am.c:2291 +#: builtin/am.c:2290 msgid "lie about committer date" msgstr "" -#: builtin/am.c:2293 +#: builtin/am.c:2292 msgid "use current timestamp for author date" msgstr "" -#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233 -#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414 +#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236 +#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392 msgid "key-id" msgstr "" -#: builtin/am.c:2296 +#: builtin/am.c:2295 msgid "GPG-sign commits" msgstr "" -#: builtin/am.c:2299 +#: builtin/am.c:2298 msgid "(internal use for git-rebase)" msgstr "" -#: builtin/am.c:2317 +#: builtin/am.c:2316 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." msgstr "" -#: builtin/am.c:2324 +#: builtin/am.c:2323 msgid "failed to read the index" msgstr "" -#: builtin/am.c:2339 +#: builtin/am.c:2338 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" -#: builtin/am.c:2363 +#: builtin/am.c:2362 #, c-format msgid "" "Stray %s directory found.\n" "Use \"git am --abort\" to remove it." msgstr "" -#: builtin/am.c:2369 +#: builtin/am.c:2368 msgid "Resolve operation not in progress, we are not resuming." msgstr "" @@ -5029,124 +5117,149 @@ msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "" #: builtin/branch.c:31 -msgid "git branch [<options>] [-r | -a] [--points-at]" +msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>" msgstr "" #: builtin/branch.c:32 +msgid "git branch [<options>] [-r | -a] [--points-at]" +msgstr "" + +#: builtin/branch.c:33 msgid "git branch [<options>] [-r | -a] [--format]" msgstr "" -#: builtin/branch.c:145 +#: builtin/branch.c:146 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD." msgstr "" -#: builtin/branch.c:149 +#: builtin/branch.c:150 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" " '%s', even though it is merged to HEAD." msgstr "" -#: builtin/branch.c:163 +#: builtin/branch.c:164 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "" -#: builtin/branch.c:167 +#: builtin/branch.c:168 #, c-format msgid "" "The branch '%s' is not fully merged.\n" "If you are sure you want to delete it, run 'git branch -D %s'." msgstr "" -#: builtin/branch.c:180 +#: builtin/branch.c:181 msgid "Update of config-file failed" msgstr "" -#: builtin/branch.c:211 +#: builtin/branch.c:212 msgid "cannot use -a with -d" msgstr "" -#: builtin/branch.c:217 +#: builtin/branch.c:218 msgid "Couldn't look up commit object for HEAD" msgstr "" -#: builtin/branch.c:231 +#: builtin/branch.c:232 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "" -#: builtin/branch.c:246 +#: builtin/branch.c:247 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "" -#: builtin/branch.c:247 +#: builtin/branch.c:248 #, c-format msgid "branch '%s' not found." msgstr "" -#: builtin/branch.c:262 +#: builtin/branch.c:263 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "" -#: builtin/branch.c:263 +#: builtin/branch.c:264 #, c-format msgid "Error deleting branch '%s'" msgstr "" -#: builtin/branch.c:270 +#: builtin/branch.c:271 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:271 +#: builtin/branch.c:272 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:445 +#: builtin/branch.c:417 builtin/tag.c:58 +msgid "unable to parse format string" +msgstr "" + +#: builtin/branch.c:450 #, c-format msgid "Branch %s is being rebased at %s" msgstr "" -#: builtin/branch.c:449 +#: builtin/branch.c:454 #, c-format msgid "Branch %s is being bisected at %s" msgstr "" -#: builtin/branch.c:464 +#: builtin/branch.c:470 +msgid "cannot copy the current branch while not on any." +msgstr "" + +#: builtin/branch.c:472 msgid "cannot rename the current branch while not on any." msgstr "" -#: builtin/branch.c:474 +#: builtin/branch.c:483 #, c-format msgid "Invalid branch name: '%s'" msgstr "" -#: builtin/branch.c:491 +#: builtin/branch.c:504 msgid "Branch rename failed" msgstr "" -#: builtin/branch.c:494 +#: builtin/branch.c:506 +msgid "Branch copy failed" +msgstr "" + +#: builtin/branch.c:510 +#, c-format +msgid "Copied a misnamed branch '%s' away" +msgstr "" + +#: builtin/branch.c:513 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "" -#: builtin/branch.c:497 +#: builtin/branch.c:519 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "" -#: builtin/branch.c:506 +#: builtin/branch.c:528 msgid "Branch is renamed, but update of config-file failed" msgstr "" -#: builtin/branch.c:522 +#: builtin/branch.c:530 +msgid "Branch is copied, but update of config-file failed" +msgstr "" + +#: builtin/branch.c:546 #, c-format msgid "" "Please edit the description for the branch\n" @@ -5154,225 +5267,224 @@ msgid "" "Lines starting with '%c' will be stripped.\n" msgstr "" -#: builtin/branch.c:555 +#: builtin/branch.c:579 msgid "Generic options" msgstr "" -#: builtin/branch.c:557 +#: builtin/branch.c:581 msgid "show hash and subject, give twice for upstream branch" msgstr "" -#: builtin/branch.c:558 +#: builtin/branch.c:582 msgid "suppress informational messages" msgstr "" -#: builtin/branch.c:559 +#: builtin/branch.c:583 msgid "set up tracking mode (see git-pull(1))" msgstr "" -#: builtin/branch.c:561 -msgid "change upstream info" +#: builtin/branch.c:585 +msgid "do not use" msgstr "" -#: builtin/branch.c:563 +#: builtin/branch.c:587 msgid "upstream" msgstr "" -#: builtin/branch.c:563 +#: builtin/branch.c:587 msgid "change the upstream info" msgstr "" -#: builtin/branch.c:564 +#: builtin/branch.c:588 msgid "Unset the upstream info" msgstr "" -#: builtin/branch.c:565 +#: builtin/branch.c:589 msgid "use colored output" msgstr "" -#: builtin/branch.c:566 +#: builtin/branch.c:590 msgid "act on remote-tracking branches" msgstr "" -#: builtin/branch.c:568 builtin/branch.c:570 +#: builtin/branch.c:592 builtin/branch.c:594 msgid "print only branches that contain the commit" msgstr "" -#: builtin/branch.c:569 builtin/branch.c:571 +#: builtin/branch.c:593 builtin/branch.c:595 msgid "print only branches that don't contain the commit" msgstr "" -#: builtin/branch.c:574 +#: builtin/branch.c:598 msgid "Specific git-branch actions:" msgstr "" -#: builtin/branch.c:575 +#: builtin/branch.c:599 msgid "list both remote-tracking and local branches" msgstr "" -#: builtin/branch.c:577 +#: builtin/branch.c:601 msgid "delete fully merged branch" msgstr "" -#: builtin/branch.c:578 +#: builtin/branch.c:602 msgid "delete branch (even if not merged)" msgstr "" -#: builtin/branch.c:579 +#: builtin/branch.c:603 msgid "move/rename a branch and its reflog" msgstr "" -#: builtin/branch.c:580 +#: builtin/branch.c:604 msgid "move/rename a branch, even if target exists" msgstr "" -#: builtin/branch.c:581 +#: builtin/branch.c:605 +msgid "copy a branch and its reflog" +msgstr "" + +#: builtin/branch.c:606 +msgid "copy a branch, even if target exists" +msgstr "" + +#: builtin/branch.c:607 msgid "list branch names" msgstr "" -#: builtin/branch.c:582 +#: builtin/branch.c:608 msgid "create the branch's reflog" msgstr "" -#: builtin/branch.c:584 +#: builtin/branch.c:610 msgid "edit the description for the branch" msgstr "" -#: builtin/branch.c:585 +#: builtin/branch.c:611 msgid "force creation, move/rename, deletion" msgstr "" -#: builtin/branch.c:586 +#: builtin/branch.c:612 msgid "print only branches that are merged" msgstr "" -#: builtin/branch.c:587 +#: builtin/branch.c:613 msgid "print only branches that are not merged" msgstr "" -#: builtin/branch.c:588 +#: builtin/branch.c:614 msgid "list branches in columns" msgstr "" -#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427 +#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405 msgid "key" msgstr "" -#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428 +#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406 msgid "field name to sort on" msgstr "" -#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407 -#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573 -#: builtin/tag.c:430 +#: builtin/branch.c:618 builtin/for-each-ref.c:43 builtin/notes.c:408 +#: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574 +#: builtin/tag.c:408 msgid "object" msgstr "" -#: builtin/branch.c:593 +#: builtin/branch.c:619 msgid "print only branches of the object" msgstr "" -#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435 +#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415 msgid "sorting and filtering are case insensitive" msgstr "" -#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434 +#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413 #: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "" -#: builtin/branch.c:615 -msgid "Failed to resolve HEAD as a valid ref." -msgstr "" - -#: builtin/branch.c:619 builtin/clone.c:728 +#: builtin/branch.c:645 builtin/clone.c:729 msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:642 +#: builtin/branch.c:668 msgid "--column and --verbose are incompatible" msgstr "" -#: builtin/branch.c:653 builtin/branch.c:705 +#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741 msgid "branch name required" msgstr "" -#: builtin/branch.c:681 +#: builtin/branch.c:708 msgid "Cannot give description to detached HEAD" msgstr "" -#: builtin/branch.c:686 +#: builtin/branch.c:713 msgid "cannot edit description of more than one branch" msgstr "" -#: builtin/branch.c:693 +#: builtin/branch.c:720 #, c-format msgid "No commit on branch '%s' yet." msgstr "" -#: builtin/branch.c:696 +#: builtin/branch.c:723 #, c-format msgid "No branch named '%s'." msgstr "" -#: builtin/branch.c:711 -msgid "too many branches for a rename operation" +#: builtin/branch.c:738 +msgid "too many branches for a copy operation" msgstr "" -#: builtin/branch.c:716 -msgid "too many branches to set new upstream" +#: builtin/branch.c:747 +msgid "too many arguments for a rename operation" msgstr "" -#: builtin/branch.c:720 +#: builtin/branch.c:752 +msgid "too many arguments to set new upstream" +msgstr "" + +#: builtin/branch.c:756 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" -#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766 +#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800 #, c-format msgid "no such branch '%s'" msgstr "" -#: builtin/branch.c:727 +#: builtin/branch.c:763 #, c-format msgid "branch '%s' does not exist" msgstr "" -#: builtin/branch.c:739 -msgid "too many branches to unset upstream" +#: builtin/branch.c:775 +msgid "too many arguments to unset upstream" msgstr "" -#: builtin/branch.c:743 +#: builtin/branch.c:779 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" -#: builtin/branch.c:749 +#: builtin/branch.c:785 #, c-format msgid "Branch '%s' has no upstream information" msgstr "" -#: builtin/branch.c:763 +#: builtin/branch.c:797 msgid "it does not make sense to create 'HEAD' manually" msgstr "" -#: builtin/branch.c:769 +#: builtin/branch.c:803 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" -#: builtin/branch.c:772 -#, c-format +#: builtin/branch.c:806 msgid "" -"The --set-upstream flag is deprecated and will be removed. Consider using --" -"track or --set-upstream-to\n" -msgstr "" - -#: builtin/branch.c:789 -#, c-format -msgid "" -"\n" -"If you wanted to make '%s' track '%s', do this:\n" -"\n" +"the '--set-upstream' option is no longer supported. Please use '--track' or " +"'--set-upstream-to' instead." msgstr "" #: builtin/bundle.c:45 @@ -5388,75 +5500,75 @@ msgstr "" msgid "Need a repository to unbundle." msgstr "" -#: builtin/cat-file.c:519 +#: builtin/cat-file.c:521 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" msgstr "" -#: builtin/cat-file.c:520 +#: builtin/cat-file.c:522 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" msgstr "" -#: builtin/cat-file.c:557 +#: builtin/cat-file.c:559 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "" -#: builtin/cat-file.c:558 +#: builtin/cat-file.c:560 msgid "show object type" msgstr "" -#: builtin/cat-file.c:559 +#: builtin/cat-file.c:561 msgid "show object size" msgstr "" -#: builtin/cat-file.c:561 +#: builtin/cat-file.c:563 msgid "exit with zero when there's no error" msgstr "" -#: builtin/cat-file.c:562 +#: builtin/cat-file.c:564 msgid "pretty-print object's content" msgstr "" -#: builtin/cat-file.c:564 +#: builtin/cat-file.c:566 msgid "for blob objects, run textconv on object's content" msgstr "" -#: builtin/cat-file.c:566 +#: builtin/cat-file.c:568 msgid "for blob objects, run filters on object's content" msgstr "" -#: builtin/cat-file.c:567 git-submodule.sh:944 +#: builtin/cat-file.c:569 git-submodule.sh:943 msgid "blob" msgstr "" -#: builtin/cat-file.c:568 +#: builtin/cat-file.c:570 msgid "use a specific path for --textconv/--filters" msgstr "" -#: builtin/cat-file.c:570 +#: builtin/cat-file.c:572 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "" -#: builtin/cat-file.c:571 +#: builtin/cat-file.c:573 msgid "buffer --batch output" msgstr "" -#: builtin/cat-file.c:573 +#: builtin/cat-file.c:575 msgid "show info and content of objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:576 +#: builtin/cat-file.c:578 msgid "show info about objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:579 +#: builtin/cat-file.c:581 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" -#: builtin/cat-file.c:581 +#: builtin/cat-file.c:583 msgid "show all objects with --batch or --batch-check" msgstr "" @@ -5484,7 +5596,7 @@ msgstr "" msgid "terminate input and output records by a NUL character" msgstr "" -#: builtin/check-ignore.c:20 builtin/checkout.c:1143 builtin/gc.c:357 +#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358 msgid "suppress progress reporting" msgstr "" @@ -5574,9 +5686,9 @@ msgid "write the content to temporary files" msgstr "" #: builtin/checkout-index.c:175 builtin/column.c:31 -#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638 -#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980 -#: builtin/worktree.c:478 +#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631 +#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999 +#: builtin/worktree.c:498 msgid "string" msgstr "" @@ -5647,54 +5759,54 @@ msgstr "" msgid "path '%s' is unmerged" msgstr "" -#: builtin/checkout.c:497 +#: builtin/checkout.c:501 msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:628 +#: builtin/checkout.c:632 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "" -#: builtin/checkout.c:669 +#: builtin/checkout.c:673 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:673 builtin/clone.c:682 +#: builtin/checkout.c:677 builtin/clone.c:683 msgid "unable to update HEAD" msgstr "" -#: builtin/checkout.c:677 +#: builtin/checkout.c:681 #, c-format msgid "Reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:680 +#: builtin/checkout.c:684 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:684 +#: builtin/checkout.c:688 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:686 builtin/checkout.c:1075 +#: builtin/checkout.c:690 builtin/checkout.c:1086 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:688 +#: builtin/checkout.c:692 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:739 +#: builtin/checkout.c:743 #, c-format msgid " ... and %d more.\n" msgstr "" -#: builtin/checkout.c:745 +#: builtin/checkout.c:749 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -5709,7 +5821,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:764 +#: builtin/checkout.c:768 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -5726,160 +5838,160 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:800 +#: builtin/checkout.c:809 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:804 +#: builtin/checkout.c:813 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:832 builtin/checkout.c:1070 +#: builtin/checkout.c:843 builtin/checkout.c:1081 msgid "You are on a branch yet to be born" msgstr "" -#: builtin/checkout.c:976 +#: builtin/checkout.c:987 #, c-format msgid "only one reference expected, %d given." msgstr "" -#: builtin/checkout.c:1016 builtin/worktree.c:215 +#: builtin/checkout.c:1027 builtin/worktree.c:233 #, c-format msgid "invalid reference: %s" msgstr "" -#: builtin/checkout.c:1045 +#: builtin/checkout.c:1056 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:1084 +#: builtin/checkout.c:1095 msgid "paths cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1087 builtin/checkout.c:1091 +#: builtin/checkout.c:1098 builtin/checkout.c:1102 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103 -#: builtin/checkout.c:1106 +#: builtin/checkout.c:1106 builtin/checkout.c:1109 builtin/checkout.c:1114 +#: builtin/checkout.c:1117 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "" -#: builtin/checkout.c:1111 +#: builtin/checkout.c:1122 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" -#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113 -#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328 -#: builtin/worktree.c:330 +#: builtin/checkout.c:1154 builtin/checkout.c:1156 builtin/clone.c:114 +#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:346 +#: builtin/worktree.c:348 msgid "branch" msgstr "" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1155 msgid "create and checkout a new branch" msgstr "" -#: builtin/checkout.c:1147 +#: builtin/checkout.c:1157 msgid "create/reset and checkout a branch" msgstr "" -#: builtin/checkout.c:1148 +#: builtin/checkout.c:1158 msgid "create reflog for new branch" msgstr "" -#: builtin/checkout.c:1149 builtin/worktree.c:332 +#: builtin/checkout.c:1159 builtin/worktree.c:350 msgid "detach HEAD at named commit" msgstr "" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1160 msgid "set upstream info for new branch" msgstr "" -#: builtin/checkout.c:1152 +#: builtin/checkout.c:1162 msgid "new-branch" msgstr "" -#: builtin/checkout.c:1152 +#: builtin/checkout.c:1162 msgid "new unparented branch" msgstr "" -#: builtin/checkout.c:1153 +#: builtin/checkout.c:1163 msgid "checkout our version for unmerged files" msgstr "" -#: builtin/checkout.c:1155 +#: builtin/checkout.c:1165 msgid "checkout their version for unmerged files" msgstr "" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1167 msgid "force checkout (throw away local modifications)" msgstr "" -#: builtin/checkout.c:1158 +#: builtin/checkout.c:1168 msgid "perform a 3-way merge with the new branch" msgstr "" -#: builtin/checkout.c:1159 builtin/merge.c:235 +#: builtin/checkout.c:1169 builtin/merge.c:238 msgid "update ignored files (default)" msgstr "" -#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251 +#: builtin/checkout.c:1170 builtin/log.c:1489 parse-options.h:251 msgid "style" msgstr "" -#: builtin/checkout.c:1161 +#: builtin/checkout.c:1171 msgid "conflict style (merge or diff3)" msgstr "" -#: builtin/checkout.c:1164 +#: builtin/checkout.c:1174 msgid "do not limit pathspecs to sparse entries only" msgstr "" -#: builtin/checkout.c:1166 +#: builtin/checkout.c:1176 msgid "second guess 'git checkout <no-such-branch>'" msgstr "" -#: builtin/checkout.c:1168 +#: builtin/checkout.c:1178 msgid "do not check if another worktree is holding the given ref" msgstr "" -#: builtin/checkout.c:1172 builtin/clone.c:80 builtin/fetch.c:114 -#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544 +#: builtin/checkout.c:1182 builtin/clone.c:81 builtin/fetch.c:136 +#: builtin/merge.c:235 builtin/pull.c:120 builtin/push.c:544 #: builtin/send-pack.c:173 msgid "force progress reporting" msgstr "" -#: builtin/checkout.c:1203 +#: builtin/checkout.c:1212 msgid "-b, -B and --orphan are mutually exclusive" msgstr "" -#: builtin/checkout.c:1220 +#: builtin/checkout.c:1229 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:1225 +#: builtin/checkout.c:1234 msgid "Missing branch name; try -b" msgstr "" -#: builtin/checkout.c:1261 +#: builtin/checkout.c:1270 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1268 +#: builtin/checkout.c:1277 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" -#: builtin/checkout.c:1272 +#: builtin/checkout.c:1281 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" -#: builtin/checkout.c:1276 +#: builtin/checkout.c:1285 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -5915,7 +6027,7 @@ msgstr "" msgid "failed to remove %s" msgstr "" -#: builtin/clean.c:298 git-add--interactive.perl:572 +#: builtin/clean.c:301 git-add--interactive.perl:572 #, c-format msgid "" "Prompt help:\n" @@ -5924,7 +6036,7 @@ msgid "" " - (empty) select nothing\n" msgstr "" -#: builtin/clean.c:302 git-add--interactive.perl:581 +#: builtin/clean.c:305 git-add--interactive.perl:581 #, c-format msgid "" "Prompt help:\n" @@ -5937,38 +6049,38 @@ msgid "" " - (empty) finish selecting\n" msgstr "" -#: builtin/clean.c:518 git-add--interactive.perl:547 +#: builtin/clean.c:521 git-add--interactive.perl:547 #: git-add--interactive.perl:552 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "" -#: builtin/clean.c:660 +#: builtin/clean.c:663 #, c-format msgid "Input ignore patterns>> " msgstr "" -#: builtin/clean.c:697 +#: builtin/clean.c:700 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "" -#: builtin/clean.c:718 +#: builtin/clean.c:721 msgid "Select items to delete" msgstr "" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:759 +#: builtin/clean.c:762 #, c-format msgid "Remove %s [y/N]? " msgstr "" -#: builtin/clean.c:784 git-add--interactive.perl:1616 +#: builtin/clean.c:787 git-add--interactive.perl:1616 #, c-format msgid "Bye.\n" msgstr "" -#: builtin/clean.c:792 +#: builtin/clean.c:795 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -5979,386 +6091,386 @@ msgid "" "? - help for prompt selection" msgstr "" -#: builtin/clean.c:819 git-add--interactive.perl:1692 +#: builtin/clean.c:822 git-add--interactive.perl:1692 msgid "*** Commands ***" msgstr "" -#: builtin/clean.c:820 git-add--interactive.perl:1689 +#: builtin/clean.c:823 git-add--interactive.perl:1689 msgid "What now" msgstr "" -#: builtin/clean.c:828 +#: builtin/clean.c:831 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "" msgstr[1] "" -#: builtin/clean.c:844 +#: builtin/clean.c:847 msgid "No more files to clean, exiting." msgstr "" -#: builtin/clean.c:906 +#: builtin/clean.c:909 msgid "do not print names of files removed" msgstr "" -#: builtin/clean.c:908 +#: builtin/clean.c:911 msgid "force" msgstr "" -#: builtin/clean.c:909 +#: builtin/clean.c:912 msgid "interactive cleaning" msgstr "" -#: builtin/clean.c:911 +#: builtin/clean.c:914 msgid "remove whole directories" msgstr "" -#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454 -#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397 +#: builtin/clean.c:915 builtin/describe.c:463 builtin/describe.c:465 +#: builtin/grep.c:861 builtin/ls-files.c:544 builtin/name-rev.c:397 #: builtin/name-rev.c:399 builtin/show-ref.c:176 msgid "pattern" msgstr "" -#: builtin/clean.c:913 +#: builtin/clean.c:916 msgid "add <pattern> to ignore rules" msgstr "" -#: builtin/clean.c:914 +#: builtin/clean.c:917 msgid "remove ignored files, too" msgstr "" -#: builtin/clean.c:916 +#: builtin/clean.c:919 msgid "remove only ignored files" msgstr "" -#: builtin/clean.c:934 +#: builtin/clean.c:937 msgid "-x and -X cannot be used together" msgstr "" -#: builtin/clean.c:938 +#: builtin/clean.c:941 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" -#: builtin/clean.c:941 +#: builtin/clean.c:944 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "" -#: builtin/clone.c:38 +#: builtin/clone.c:39 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "" -#: builtin/clone.c:82 +#: builtin/clone.c:83 msgid "don't create a checkout" msgstr "" -#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479 +#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479 msgid "create a bare repository" msgstr "" -#: builtin/clone.c:87 +#: builtin/clone.c:88 msgid "create a mirror repository (implies bare)" msgstr "" -#: builtin/clone.c:89 +#: builtin/clone.c:90 msgid "to clone from a local repository" msgstr "" -#: builtin/clone.c:91 +#: builtin/clone.c:92 msgid "don't use local hardlinks, always copy" msgstr "" -#: builtin/clone.c:93 +#: builtin/clone.c:94 msgid "setup as shared repository" msgstr "" -#: builtin/clone.c:95 builtin/clone.c:99 +#: builtin/clone.c:96 builtin/clone.c:100 msgid "pathspec" msgstr "" -#: builtin/clone.c:95 builtin/clone.c:99 +#: builtin/clone.c:96 builtin/clone.c:100 msgid "initialize submodules in the clone" msgstr "" -#: builtin/clone.c:102 +#: builtin/clone.c:103 msgid "number of submodules cloned in parallel" msgstr "" -#: builtin/clone.c:103 builtin/init-db.c:476 +#: builtin/clone.c:104 builtin/init-db.c:476 msgid "template-directory" msgstr "" -#: builtin/clone.c:104 builtin/init-db.c:477 +#: builtin/clone.c:105 builtin/init-db.c:477 msgid "directory from which templates will be used" msgstr "" -#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642 -#: builtin/submodule--helper.c:983 +#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:635 +#: builtin/submodule--helper.c:1002 msgid "reference repository" msgstr "" -#: builtin/clone.c:110 +#: builtin/clone.c:111 msgid "use --reference only while cloning" msgstr "" -#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44 +#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44 msgid "name" msgstr "" -#: builtin/clone.c:112 +#: builtin/clone.c:113 msgid "use <name> instead of 'origin' to track upstream" msgstr "" -#: builtin/clone.c:114 +#: builtin/clone.c:115 msgid "checkout <branch> instead of the remote's HEAD" msgstr "" -#: builtin/clone.c:116 +#: builtin/clone.c:117 msgid "path to git-upload-pack on the remote" msgstr "" -#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025 +#: builtin/clone.c:118 builtin/fetch.c:137 builtin/grep.c:804 #: builtin/pull.c:205 msgid "depth" msgstr "" -#: builtin/clone.c:118 +#: builtin/clone.c:119 msgid "create a shallow clone of that depth" msgstr "" -#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932 +#: builtin/clone.c:120 builtin/fetch.c:139 builtin/pack-objects.c:2938 #: parse-options.h:142 msgid "time" msgstr "" -#: builtin/clone.c:120 +#: builtin/clone.c:121 msgid "create a shallow clone since a specific time" msgstr "" -#: builtin/clone.c:121 builtin/fetch.c:119 +#: builtin/clone.c:122 builtin/fetch.c:141 msgid "revision" msgstr "" -#: builtin/clone.c:122 builtin/fetch.c:120 +#: builtin/clone.c:123 builtin/fetch.c:142 msgid "deepen history of shallow clone, excluding rev" msgstr "" -#: builtin/clone.c:124 +#: builtin/clone.c:125 msgid "clone only one branch, HEAD or --branch" msgstr "" -#: builtin/clone.c:126 +#: builtin/clone.c:127 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "" -#: builtin/clone.c:128 +#: builtin/clone.c:129 msgid "any cloned submodules will be shallow" msgstr "" -#: builtin/clone.c:129 builtin/init-db.c:485 +#: builtin/clone.c:130 builtin/init-db.c:485 msgid "gitdir" msgstr "" -#: builtin/clone.c:130 builtin/init-db.c:486 +#: builtin/clone.c:131 builtin/init-db.c:486 msgid "separate git dir from working tree" msgstr "" -#: builtin/clone.c:131 +#: builtin/clone.c:132 msgid "key=value" msgstr "" -#: builtin/clone.c:132 +#: builtin/clone.c:133 msgid "set config inside the new repository" msgstr "" -#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555 +#: builtin/clone.c:134 builtin/fetch.c:159 builtin/push.c:555 msgid "use IPv4 addresses only" msgstr "" -#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557 +#: builtin/clone.c:136 builtin/fetch.c:161 builtin/push.c:557 msgid "use IPv6 addresses only" msgstr "" -#: builtin/clone.c:272 +#: builtin/clone.c:273 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" msgstr "" -#: builtin/clone.c:325 +#: builtin/clone.c:326 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "" -#: builtin/clone.c:397 +#: builtin/clone.c:398 #, c-format msgid "failed to open '%s'" msgstr "" -#: builtin/clone.c:405 +#: builtin/clone.c:406 #, c-format msgid "%s exists and is not a directory" msgstr "" -#: builtin/clone.c:419 +#: builtin/clone.c:420 #, c-format msgid "failed to stat %s\n" msgstr "" -#: builtin/clone.c:441 +#: builtin/clone.c:442 #, c-format msgid "failed to create link '%s'" msgstr "" -#: builtin/clone.c:445 +#: builtin/clone.c:446 #, c-format msgid "failed to copy file to '%s'" msgstr "" -#: builtin/clone.c:470 +#: builtin/clone.c:471 #, c-format msgid "done.\n" msgstr "" -#: builtin/clone.c:482 +#: builtin/clone.c:483 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" "and retry the checkout with 'git checkout -f HEAD'\n" msgstr "" -#: builtin/clone.c:559 +#: builtin/clone.c:560 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" -#: builtin/clone.c:654 +#: builtin/clone.c:655 msgid "remote did not send all necessary objects" msgstr "" -#: builtin/clone.c:670 +#: builtin/clone.c:671 #, c-format msgid "unable to update %s" msgstr "" -#: builtin/clone.c:719 +#: builtin/clone.c:720 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -#: builtin/clone.c:750 +#: builtin/clone.c:751 msgid "unable to checkout working tree" msgstr "" -#: builtin/clone.c:792 +#: builtin/clone.c:796 msgid "unable to write parameters to config file" msgstr "" -#: builtin/clone.c:855 +#: builtin/clone.c:859 msgid "cannot repack to clean up" msgstr "" -#: builtin/clone.c:857 +#: builtin/clone.c:861 msgid "cannot unlink temporary alternates file" msgstr "" -#: builtin/clone.c:890 builtin/receive-pack.c:1945 +#: builtin/clone.c:894 builtin/receive-pack.c:1944 msgid "Too many arguments." msgstr "" -#: builtin/clone.c:894 +#: builtin/clone.c:898 msgid "You must specify a repository to clone." msgstr "" -#: builtin/clone.c:907 +#: builtin/clone.c:911 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:910 +#: builtin/clone.c:914 msgid "--bare and --separate-git-dir are incompatible." msgstr "" -#: builtin/clone.c:923 +#: builtin/clone.c:927 #, c-format msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:929 builtin/fetch.c:1337 +#: builtin/clone.c:933 builtin/fetch.c:1360 #, c-format msgid "depth %s is not a positive number" msgstr "" -#: builtin/clone.c:939 +#: builtin/clone.c:943 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:949 +#: builtin/clone.c:953 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260 -#: builtin/worktree.c:222 builtin/worktree.c:252 +#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270 +#: builtin/worktree.c:240 builtin/worktree.c:270 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:967 +#: builtin/clone.c:971 #, c-format msgid "could not create work tree dir '%s'" msgstr "" -#: builtin/clone.c:979 +#: builtin/clone.c:983 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:981 +#: builtin/clone.c:985 #, c-format msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/clone.c:1005 +#: builtin/clone.c:1009 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "" -#: builtin/clone.c:1067 +#: builtin/clone.c:1071 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1069 +#: builtin/clone.c:1073 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1071 +#: builtin/clone.c:1075 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1074 +#: builtin/clone.c:1078 msgid "source repository is shallow, ignoring --local" msgstr "" -#: builtin/clone.c:1079 +#: builtin/clone.c:1083 msgid "--local is ignored" msgstr "" -#: builtin/clone.c:1083 +#: builtin/clone.c:1087 #, c-format msgid "Don't know how to clone %s" msgstr "" -#: builtin/clone.c:1138 builtin/clone.c:1146 +#: builtin/clone.c:1142 builtin/clone.c:1150 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:1149 +#: builtin/clone.c:1153 msgid "You appear to have cloned an empty repository." msgstr "" @@ -6461,98 +6573,98 @@ msgid "" "the remaining commits.\n" msgstr "" -#: builtin/commit.c:319 +#: builtin/commit.c:318 msgid "failed to unpack HEAD tree object" msgstr "" -#: builtin/commit.c:360 +#: builtin/commit.c:359 msgid "unable to create temporary index" msgstr "" -#: builtin/commit.c:366 +#: builtin/commit.c:365 msgid "interactive add failed" msgstr "" -#: builtin/commit.c:379 +#: builtin/commit.c:378 msgid "unable to update temporary index" msgstr "" -#: builtin/commit.c:381 +#: builtin/commit.c:380 msgid "Failed to update main cache tree" msgstr "" -#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477 +#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478 msgid "unable to write new_index file" msgstr "" -#: builtin/commit.c:459 +#: builtin/commit.c:461 msgid "cannot do a partial commit during a merge." msgstr "" -#: builtin/commit.c:461 +#: builtin/commit.c:463 msgid "cannot do a partial commit during a cherry-pick." msgstr "" -#: builtin/commit.c:470 +#: builtin/commit.c:471 msgid "cannot read the index" msgstr "" -#: builtin/commit.c:489 +#: builtin/commit.c:490 msgid "unable to write temporary index file" msgstr "" -#: builtin/commit.c:583 +#: builtin/commit.c:587 #, c-format msgid "commit '%s' lacks author header" msgstr "" -#: builtin/commit.c:585 +#: builtin/commit.c:589 #, c-format msgid "commit '%s' has malformed author line" msgstr "" -#: builtin/commit.c:604 +#: builtin/commit.c:608 msgid "malformed --author parameter" msgstr "" -#: builtin/commit.c:656 +#: builtin/commit.c:660 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "" -#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093 +#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1100 #, c-format msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:705 builtin/shortlog.c:295 +#: builtin/commit.c:709 builtin/shortlog.c:309 #, c-format msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/commit.c:707 +#: builtin/commit.c:711 msgid "could not read log from standard input" msgstr "" -#: builtin/commit.c:711 +#: builtin/commit.c:715 #, c-format msgid "could not read log file '%s'" msgstr "" -#: builtin/commit.c:738 builtin/commit.c:746 +#: builtin/commit.c:742 builtin/commit.c:750 msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/commit.c:743 +#: builtin/commit.c:747 msgid "could not read MERGE_MSG" msgstr "" -#: builtin/commit.c:797 +#: builtin/commit.c:801 msgid "could not write commit template" msgstr "" -#: builtin/commit.c:815 +#: builtin/commit.c:819 #, c-format msgid "" "\n" @@ -6562,7 +6674,7 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:820 +#: builtin/commit.c:824 #, c-format msgid "" "\n" @@ -6572,14 +6684,14 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:833 +#: builtin/commit.c:837 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:840 +#: builtin/commit.c:844 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -6587,341 +6699,342 @@ msgid "" "An empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:857 +#: builtin/commit.c:861 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:865 +#: builtin/commit.c:869 #, c-format msgid "%sDate: %s" msgstr "" -#: builtin/commit.c:872 +#: builtin/commit.c:876 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:889 +#: builtin/commit.c:893 msgid "Cannot read index" msgstr "" -#: builtin/commit.c:951 +#: builtin/commit.c:958 msgid "Error building trees" msgstr "" -#: builtin/commit.c:965 builtin/tag.c:274 +#: builtin/commit.c:972 builtin/tag.c:252 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/commit.c:1068 +#: builtin/commit.c:1075 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" -#: builtin/commit.c:1083 builtin/commit.c:1328 +#: builtin/commit.c:1090 builtin/commit.c:1335 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:1121 +#: builtin/commit.c:1128 msgid "--long and -z are incompatible" msgstr "" -#: builtin/commit.c:1151 +#: builtin/commit.c:1158 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:1160 +#: builtin/commit.c:1167 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:1163 +#: builtin/commit.c:1170 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/commit.c:1165 +#: builtin/commit.c:1172 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/commit.c:1168 +#: builtin/commit.c:1175 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1178 +#: builtin/commit.c:1185 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:1180 +#: builtin/commit.c:1187 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "" -#: builtin/commit.c:1188 +#: builtin/commit.c:1195 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1205 +#: builtin/commit.c:1212 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:1207 +#: builtin/commit.c:1214 msgid "No paths with --include/--only does not make sense." msgstr "" -#: builtin/commit.c:1219 builtin/tag.c:552 +#: builtin/commit.c:1226 builtin/tag.c:535 #, c-format msgid "Invalid cleanup mode %s" msgstr "" -#: builtin/commit.c:1224 +#: builtin/commit.c:1231 msgid "Paths with -a does not make sense." msgstr "" -#: builtin/commit.c:1342 builtin/commit.c:1617 +#: builtin/commit.c:1349 builtin/commit.c:1626 msgid "show status concisely" msgstr "" -#: builtin/commit.c:1344 builtin/commit.c:1619 +#: builtin/commit.c:1351 builtin/commit.c:1628 msgid "show branch information" msgstr "" -#: builtin/commit.c:1346 +#: builtin/commit.c:1353 msgid "show stash information" msgstr "" -#: builtin/commit.c:1348 +#: builtin/commit.c:1355 msgid "version" msgstr "" -#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530 -#: builtin/worktree.c:449 +#: builtin/commit.c:1355 builtin/commit.c:1630 builtin/push.c:530 +#: builtin/worktree.c:469 msgid "machine-readable output" msgstr "" -#: builtin/commit.c:1351 builtin/commit.c:1623 +#: builtin/commit.c:1358 builtin/commit.c:1632 msgid "show status in long format (default)" msgstr "" -#: builtin/commit.c:1354 builtin/commit.c:1626 +#: builtin/commit.c:1361 builtin/commit.c:1635 msgid "terminate entries with NUL" msgstr "" -#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983 -#: builtin/fast-export.c:986 builtin/tag.c:412 +#: builtin/commit.c:1363 builtin/commit.c:1638 builtin/fast-export.c:999 +#: builtin/fast-export.c:1002 builtin/tag.c:390 msgid "mode" msgstr "" -#: builtin/commit.c:1357 builtin/commit.c:1629 +#: builtin/commit.c:1364 builtin/commit.c:1638 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -#: builtin/commit.c:1360 +#: builtin/commit.c:1367 msgid "show ignored files" msgstr "" -#: builtin/commit.c:1361 parse-options.h:155 +#: builtin/commit.c:1368 parse-options.h:155 msgid "when" msgstr "" -#: builtin/commit.c:1362 +#: builtin/commit.c:1369 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" -#: builtin/commit.c:1364 +#: builtin/commit.c:1371 msgid "list untracked files in columns" msgstr "" -#: builtin/commit.c:1440 +#: builtin/commit.c:1449 msgid "couldn't look up newly created commit" msgstr "" -#: builtin/commit.c:1442 +#: builtin/commit.c:1451 msgid "could not parse newly created commit" msgstr "" -#: builtin/commit.c:1487 +#: builtin/commit.c:1496 msgid "detached HEAD" msgstr "" -#: builtin/commit.c:1490 +#: builtin/commit.c:1499 msgid " (root-commit)" msgstr "" -#: builtin/commit.c:1587 +#: builtin/commit.c:1596 msgid "suppress summary after successful commit" msgstr "" -#: builtin/commit.c:1588 +#: builtin/commit.c:1597 msgid "show diff in commit message template" msgstr "" -#: builtin/commit.c:1590 +#: builtin/commit.c:1599 msgid "Commit message options" msgstr "" -#: builtin/commit.c:1591 builtin/tag.c:410 +#: builtin/commit.c:1600 builtin/tag.c:388 msgid "read message from file" msgstr "" -#: builtin/commit.c:1592 +#: builtin/commit.c:1601 msgid "author" msgstr "" -#: builtin/commit.c:1592 +#: builtin/commit.c:1601 msgid "override author for commit" msgstr "" -#: builtin/commit.c:1593 builtin/gc.c:358 +#: builtin/commit.c:1602 builtin/gc.c:359 msgid "date" msgstr "" -#: builtin/commit.c:1593 +#: builtin/commit.c:1602 msgid "override date for commit" msgstr "" -#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401 -#: builtin/notes.c:564 builtin/tag.c:408 +#: builtin/commit.c:1603 builtin/merge.c:225 builtin/notes.c:402 +#: builtin/notes.c:565 builtin/tag.c:386 msgid "message" msgstr "" -#: builtin/commit.c:1594 +#: builtin/commit.c:1603 msgid "commit message" msgstr "" -#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597 -#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77 +#: builtin/commit.c:1604 builtin/commit.c:1605 builtin/commit.c:1606 +#: builtin/commit.c:1607 parse-options.h:257 ref-filter.h:92 msgid "commit" msgstr "" -#: builtin/commit.c:1595 +#: builtin/commit.c:1604 msgid "reuse and edit message from specified commit" msgstr "" -#: builtin/commit.c:1596 +#: builtin/commit.c:1605 msgid "reuse message from specified commit" msgstr "" -#: builtin/commit.c:1597 +#: builtin/commit.c:1606 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -#: builtin/commit.c:1598 +#: builtin/commit.c:1607 msgid "use autosquash formatted message to squash specified commit" msgstr "" -#: builtin/commit.c:1599 +#: builtin/commit.c:1608 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1600 builtin/log.c:1430 builtin/revert.c:105 +#: builtin/commit.c:1609 builtin/log.c:1436 builtin/merge.c:239 +#: builtin/revert.c:105 msgid "add Signed-off-by:" msgstr "" -#: builtin/commit.c:1601 +#: builtin/commit.c:1610 msgid "use specified template file" msgstr "" -#: builtin/commit.c:1602 +#: builtin/commit.c:1611 msgid "force edit of commit" msgstr "" -#: builtin/commit.c:1603 +#: builtin/commit.c:1612 msgid "default" msgstr "" -#: builtin/commit.c:1603 builtin/tag.c:413 +#: builtin/commit.c:1612 builtin/tag.c:391 msgid "how to strip spaces and #comments from message" msgstr "" -#: builtin/commit.c:1604 +#: builtin/commit.c:1613 msgid "include status in commit message template" msgstr "" -#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173 +#: builtin/commit.c:1615 builtin/merge.c:237 builtin/pull.c:173 #: builtin/revert.c:113 msgid "GPG sign commit" msgstr "" -#: builtin/commit.c:1609 +#: builtin/commit.c:1618 msgid "Commit contents options" msgstr "" -#: builtin/commit.c:1610 +#: builtin/commit.c:1619 msgid "commit all changed files" msgstr "" -#: builtin/commit.c:1611 +#: builtin/commit.c:1620 msgid "add specified files to index for commit" msgstr "" -#: builtin/commit.c:1612 +#: builtin/commit.c:1621 msgid "interactively add files" msgstr "" -#: builtin/commit.c:1613 +#: builtin/commit.c:1622 msgid "interactively add changes" msgstr "" -#: builtin/commit.c:1614 +#: builtin/commit.c:1623 msgid "commit only specified files" msgstr "" -#: builtin/commit.c:1615 +#: builtin/commit.c:1624 msgid "bypass pre-commit and commit-msg hooks" msgstr "" -#: builtin/commit.c:1616 +#: builtin/commit.c:1625 msgid "show what would be committed" msgstr "" -#: builtin/commit.c:1627 +#: builtin/commit.c:1636 msgid "amend previous commit" msgstr "" -#: builtin/commit.c:1628 +#: builtin/commit.c:1637 msgid "bypass post-rewrite hook" msgstr "" -#: builtin/commit.c:1633 +#: builtin/commit.c:1642 msgid "ok to record an empty change" msgstr "" -#: builtin/commit.c:1635 +#: builtin/commit.c:1644 msgid "ok to record a change with an empty message" msgstr "" -#: builtin/commit.c:1665 +#: builtin/commit.c:1674 msgid "could not parse HEAD commit" msgstr "" -#: builtin/commit.c:1710 +#: builtin/commit.c:1719 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1717 +#: builtin/commit.c:1726 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1736 +#: builtin/commit.c:1745 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1747 +#: builtin/commit.c:1756 #, c-format -msgid "Aborting commit; you did not edit the message.\n" +msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1752 +#: builtin/commit.c:1761 #, c-format -msgid "Aborting commit due to empty commit message.\n" +msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1800 +#: builtin/commit.c:1809 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -7078,23 +7191,23 @@ msgstr "" msgid "--local can only be used inside a git repository" msgstr "" -#: builtin/config.c:621 +#: builtin/config.c:624 #, c-format msgid "cannot create configuration file %s" msgstr "" -#: builtin/config.c:633 +#: builtin/config.c:637 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" " Use a regexp, --add or --replace-all to change %s." msgstr "" -#: builtin/count-objects.c:87 +#: builtin/count-objects.c:88 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "" -#: builtin/count-objects.c:97 +#: builtin/count-objects.c:98 msgid "print sizes in human readable format" msgstr "" @@ -7118,141 +7231,141 @@ msgstr "" msgid "annotated" msgstr "" -#: builtin/describe.c:253 +#: builtin/describe.c:264 #, c-format msgid "annotated tag %s not available" msgstr "" -#: builtin/describe.c:257 +#: builtin/describe.c:268 #, c-format msgid "annotated tag %s has no embedded name" msgstr "" -#: builtin/describe.c:259 +#: builtin/describe.c:270 #, c-format msgid "tag '%s' is really '%s' here" msgstr "" -#: builtin/describe.c:286 builtin/log.c:489 +#: builtin/describe.c:297 builtin/log.c:493 #, c-format msgid "Not a valid object name %s" msgstr "" -#: builtin/describe.c:289 +#: builtin/describe.c:300 #, c-format msgid "%s is not a valid '%s' object" msgstr "" -#: builtin/describe.c:306 +#: builtin/describe.c:317 #, c-format msgid "no tag exactly matches '%s'" msgstr "" -#: builtin/describe.c:308 +#: builtin/describe.c:319 #, c-format msgid "searching to describe %s\n" msgstr "" -#: builtin/describe.c:355 +#: builtin/describe.c:366 #, c-format msgid "finished search at %s\n" msgstr "" -#: builtin/describe.c:382 +#: builtin/describe.c:393 #, c-format msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "" -#: builtin/describe.c:386 +#: builtin/describe.c:397 #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" -#: builtin/describe.c:416 +#: builtin/describe.c:427 #, c-format msgid "traversed %lu commits\n" msgstr "" -#: builtin/describe.c:419 +#: builtin/describe.c:430 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "" -#: builtin/describe.c:441 +#: builtin/describe.c:452 msgid "find the tag that comes after the commit" msgstr "" -#: builtin/describe.c:442 +#: builtin/describe.c:453 msgid "debug search strategy on stderr" msgstr "" -#: builtin/describe.c:443 +#: builtin/describe.c:454 msgid "use any ref" msgstr "" -#: builtin/describe.c:444 +#: builtin/describe.c:455 msgid "use any tag, even unannotated" msgstr "" -#: builtin/describe.c:445 +#: builtin/describe.c:456 msgid "always use long format" msgstr "" -#: builtin/describe.c:446 +#: builtin/describe.c:457 msgid "only follow first parent" msgstr "" -#: builtin/describe.c:449 +#: builtin/describe.c:460 msgid "only output exact matches" msgstr "" -#: builtin/describe.c:451 +#: builtin/describe.c:462 msgid "consider <n> most recent tags (default: 10)" msgstr "" -#: builtin/describe.c:453 +#: builtin/describe.c:464 msgid "only consider tags matching <pattern>" msgstr "" -#: builtin/describe.c:455 +#: builtin/describe.c:466 msgid "do not consider tags matching <pattern>" msgstr "" -#: builtin/describe.c:457 builtin/name-rev.c:406 +#: builtin/describe.c:468 builtin/name-rev.c:406 msgid "show abbreviated commit object as fallback" msgstr "" -#: builtin/describe.c:458 builtin/describe.c:461 +#: builtin/describe.c:469 builtin/describe.c:472 msgid "mark" msgstr "" -#: builtin/describe.c:459 +#: builtin/describe.c:470 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "" -#: builtin/describe.c:462 +#: builtin/describe.c:473 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "" -#: builtin/describe.c:480 +#: builtin/describe.c:491 msgid "--long is incompatible with --abbrev=0" msgstr "" -#: builtin/describe.c:509 +#: builtin/describe.c:520 msgid "No names found, cannot describe anything." msgstr "" -#: builtin/describe.c:552 +#: builtin/describe.c:563 msgid "--dirty is incompatible with commit-ishes" msgstr "" -#: builtin/describe.c:554 +#: builtin/describe.c:565 msgid "--broken is incompatible with commit-ishes" msgstr "" @@ -7266,21 +7379,21 @@ msgstr "" msgid "invalid option: %s" msgstr "" -#: builtin/diff.c:359 +#: builtin/diff.c:357 msgid "Not a git repository" msgstr "" -#: builtin/diff.c:402 +#: builtin/diff.c:400 #, c-format msgid "invalid object '%s' given." msgstr "" -#: builtin/diff.c:411 +#: builtin/diff.c:409 #, c-format msgid "more than two blobs given: '%s'" msgstr "" -#: builtin/diff.c:416 +#: builtin/diff.c:414 #, c-format msgid "unhandled object '%s' given." msgstr "" @@ -7289,97 +7402,97 @@ msgstr "" msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "" -#: builtin/difftool.c:249 +#: builtin/difftool.c:259 #, c-format msgid "failed: %d" msgstr "" -#: builtin/difftool.c:291 +#: builtin/difftool.c:301 #, c-format msgid "could not read symlink %s" msgstr "" -#: builtin/difftool.c:293 +#: builtin/difftool.c:303 #, c-format msgid "could not read symlink file %s" msgstr "" -#: builtin/difftool.c:301 +#: builtin/difftool.c:311 #, c-format msgid "could not read object %s for symlink %s" msgstr "" -#: builtin/difftool.c:403 +#: builtin/difftool.c:412 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." msgstr "" -#: builtin/difftool.c:626 +#: builtin/difftool.c:633 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "" -#: builtin/difftool.c:628 +#: builtin/difftool.c:635 msgid "working tree file has been left." msgstr "" -#: builtin/difftool.c:639 +#: builtin/difftool.c:646 #, c-format msgid "temporary files exist in '%s'." msgstr "" -#: builtin/difftool.c:640 +#: builtin/difftool.c:647 msgid "you may want to cleanup or recover these." msgstr "" -#: builtin/difftool.c:689 +#: builtin/difftool.c:696 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "" -#: builtin/difftool.c:691 +#: builtin/difftool.c:698 msgid "perform a full-directory diff" msgstr "" -#: builtin/difftool.c:693 +#: builtin/difftool.c:700 msgid "do not prompt before launching a diff tool" msgstr "" -#: builtin/difftool.c:699 +#: builtin/difftool.c:706 msgid "use symlinks in dir-diff mode" msgstr "" -#: builtin/difftool.c:700 +#: builtin/difftool.c:707 msgid "<tool>" msgstr "" -#: builtin/difftool.c:701 +#: builtin/difftool.c:708 msgid "use the specified diff tool" msgstr "" -#: builtin/difftool.c:703 +#: builtin/difftool.c:710 msgid "print a list of diff tools that may be used with `--tool`" msgstr "" -#: builtin/difftool.c:706 +#: builtin/difftool.c:713 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" msgstr "" -#: builtin/difftool.c:708 +#: builtin/difftool.c:715 msgid "<command>" msgstr "" -#: builtin/difftool.c:709 +#: builtin/difftool.c:716 msgid "specify a custom command for viewing diffs" msgstr "" -#: builtin/difftool.c:733 +#: builtin/difftool.c:740 msgid "no <tool> given for --tool=<tool>" msgstr "" -#: builtin/difftool.c:740 +#: builtin/difftool.c:747 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "" @@ -7387,325 +7500,325 @@ msgstr "" msgid "git fast-export [rev-list-opts]" msgstr "" -#: builtin/fast-export.c:982 +#: builtin/fast-export.c:998 msgid "show progress after <n> objects" msgstr "" -#: builtin/fast-export.c:984 +#: builtin/fast-export.c:1000 msgid "select handling of signed tags" msgstr "" -#: builtin/fast-export.c:987 +#: builtin/fast-export.c:1003 msgid "select handling of tags that tag filtered objects" msgstr "" -#: builtin/fast-export.c:990 +#: builtin/fast-export.c:1006 msgid "Dump marks to this file" msgstr "" -#: builtin/fast-export.c:992 +#: builtin/fast-export.c:1008 msgid "Import marks from this file" msgstr "" -#: builtin/fast-export.c:994 +#: builtin/fast-export.c:1010 msgid "Fake a tagger when tags lack one" msgstr "" -#: builtin/fast-export.c:996 +#: builtin/fast-export.c:1012 msgid "Output full tree for each commit" msgstr "" -#: builtin/fast-export.c:998 +#: builtin/fast-export.c:1014 msgid "Use the done feature to terminate the stream" msgstr "" -#: builtin/fast-export.c:999 +#: builtin/fast-export.c:1015 msgid "Skip output of blob data" msgstr "" -#: builtin/fast-export.c:1000 +#: builtin/fast-export.c:1016 msgid "refspec" msgstr "" -#: builtin/fast-export.c:1001 +#: builtin/fast-export.c:1017 msgid "Apply refspec to exported refs" msgstr "" -#: builtin/fast-export.c:1002 +#: builtin/fast-export.c:1018 msgid "anonymize output" msgstr "" -#: builtin/fetch.c:22 +#: builtin/fetch.c:23 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "" -#: builtin/fetch.c:23 +#: builtin/fetch.c:24 msgid "git fetch [<options>] <group>" msgstr "" -#: builtin/fetch.c:24 +#: builtin/fetch.c:25 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "" -#: builtin/fetch.c:25 +#: builtin/fetch.c:26 msgid "git fetch --all [<options>]" msgstr "" -#: builtin/fetch.c:90 builtin/pull.c:182 +#: builtin/fetch.c:112 builtin/pull.c:182 msgid "fetch from all remotes" msgstr "" -#: builtin/fetch.c:92 builtin/pull.c:185 +#: builtin/fetch.c:114 builtin/pull.c:185 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "" -#: builtin/fetch.c:94 builtin/pull.c:188 +#: builtin/fetch.c:116 builtin/pull.c:188 msgid "path to upload pack on remote end" msgstr "" -#: builtin/fetch.c:95 builtin/pull.c:190 +#: builtin/fetch.c:117 builtin/pull.c:190 msgid "force overwrite of local branch" msgstr "" -#: builtin/fetch.c:97 +#: builtin/fetch.c:119 msgid "fetch from multiple remotes" msgstr "" -#: builtin/fetch.c:99 builtin/pull.c:192 +#: builtin/fetch.c:121 builtin/pull.c:192 msgid "fetch all tags and associated objects" msgstr "" -#: builtin/fetch.c:101 +#: builtin/fetch.c:123 msgid "do not fetch all tags (--no-tags)" msgstr "" -#: builtin/fetch.c:103 +#: builtin/fetch.c:125 msgid "number of submodules fetched in parallel" msgstr "" -#: builtin/fetch.c:105 builtin/pull.c:195 +#: builtin/fetch.c:127 builtin/pull.c:195 msgid "prune remote-tracking branches no longer on remote" msgstr "" -#: builtin/fetch.c:106 builtin/fetch.c:129 builtin/pull.c:123 +#: builtin/fetch.c:128 builtin/fetch.c:151 builtin/pull.c:123 msgid "on-demand" msgstr "" -#: builtin/fetch.c:107 +#: builtin/fetch.c:129 msgid "control recursive fetching of submodules" msgstr "" -#: builtin/fetch.c:111 builtin/pull.c:203 +#: builtin/fetch.c:133 builtin/pull.c:203 msgid "keep downloaded pack" msgstr "" -#: builtin/fetch.c:113 +#: builtin/fetch.c:135 msgid "allow updating of HEAD ref" msgstr "" -#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206 +#: builtin/fetch.c:138 builtin/fetch.c:144 builtin/pull.c:206 msgid "deepen history of shallow clone" msgstr "" -#: builtin/fetch.c:118 +#: builtin/fetch.c:140 msgid "deepen history of shallow repository based on time" msgstr "" -#: builtin/fetch.c:124 builtin/pull.c:209 +#: builtin/fetch.c:146 builtin/pull.c:209 msgid "convert to a complete repository" msgstr "" -#: builtin/fetch.c:126 builtin/log.c:1450 +#: builtin/fetch.c:148 builtin/log.c:1456 msgid "dir" msgstr "" -#: builtin/fetch.c:127 +#: builtin/fetch.c:149 msgid "prepend this to submodule path output" msgstr "" -#: builtin/fetch.c:130 +#: builtin/fetch.c:152 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "" -#: builtin/fetch.c:134 builtin/pull.c:212 +#: builtin/fetch.c:156 builtin/pull.c:212 msgid "accept refs that update .git/shallow" msgstr "" -#: builtin/fetch.c:135 builtin/pull.c:214 +#: builtin/fetch.c:157 builtin/pull.c:214 msgid "refmap" msgstr "" -#: builtin/fetch.c:136 builtin/pull.c:215 +#: builtin/fetch.c:158 builtin/pull.c:215 msgid "specify fetch refmap" msgstr "" -#: builtin/fetch.c:394 +#: builtin/fetch.c:416 msgid "Couldn't find remote ref HEAD" msgstr "" -#: builtin/fetch.c:512 +#: builtin/fetch.c:534 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "" -#: builtin/fetch.c:605 +#: builtin/fetch.c:627 #, c-format msgid "object %s not found" msgstr "" -#: builtin/fetch.c:609 +#: builtin/fetch.c:631 msgid "[up to date]" msgstr "" -#: builtin/fetch.c:622 builtin/fetch.c:702 +#: builtin/fetch.c:644 builtin/fetch.c:724 msgid "[rejected]" msgstr "" -#: builtin/fetch.c:623 +#: builtin/fetch.c:645 msgid "can't fetch in current branch" msgstr "" -#: builtin/fetch.c:632 +#: builtin/fetch.c:654 msgid "[tag update]" msgstr "" -#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682 -#: builtin/fetch.c:697 +#: builtin/fetch.c:655 builtin/fetch.c:688 builtin/fetch.c:704 +#: builtin/fetch.c:719 msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:652 +#: builtin/fetch.c:674 msgid "[new tag]" msgstr "" -#: builtin/fetch.c:655 +#: builtin/fetch.c:677 msgid "[new branch]" msgstr "" -#: builtin/fetch.c:658 +#: builtin/fetch.c:680 msgid "[new ref]" msgstr "" -#: builtin/fetch.c:697 +#: builtin/fetch.c:719 msgid "forced update" msgstr "" -#: builtin/fetch.c:702 +#: builtin/fetch.c:724 msgid "non-fast-forward" msgstr "" -#: builtin/fetch.c:747 +#: builtin/fetch.c:769 #, c-format msgid "%s did not send all necessary objects\n" msgstr "" -#: builtin/fetch.c:767 +#: builtin/fetch.c:789 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" -#: builtin/fetch.c:855 builtin/fetch.c:951 +#: builtin/fetch.c:877 builtin/fetch.c:973 #, c-format msgid "From %.*s\n" msgstr "" -#: builtin/fetch.c:866 +#: builtin/fetch.c:888 #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" -#: builtin/fetch.c:921 +#: builtin/fetch.c:943 #, c-format msgid " (%s will become dangling)" msgstr "" -#: builtin/fetch.c:922 +#: builtin/fetch.c:944 #, c-format msgid " (%s has become dangling)" msgstr "" -#: builtin/fetch.c:954 +#: builtin/fetch.c:976 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:955 builtin/remote.c:1023 +#: builtin/fetch.c:977 builtin/remote.c:1024 msgid "(none)" msgstr "" -#: builtin/fetch.c:978 +#: builtin/fetch.c:1000 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:997 +#: builtin/fetch.c:1019 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/fetch.c:1000 +#: builtin/fetch.c:1022 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" -#: builtin/fetch.c:1076 +#: builtin/fetch.c:1098 #, c-format msgid "Don't know how to fetch from %s" msgstr "" -#: builtin/fetch.c:1236 +#: builtin/fetch.c:1258 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:1238 builtin/remote.c:97 +#: builtin/fetch.c:1260 builtin/remote.c:97 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:1256 +#: builtin/fetch.c:1278 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "" -#: builtin/fetch.c:1279 +#: builtin/fetch.c:1301 msgid "You need to specify a tag name." msgstr "" -#: builtin/fetch.c:1321 +#: builtin/fetch.c:1344 msgid "Negative depth in --deepen is not supported" msgstr "" -#: builtin/fetch.c:1323 +#: builtin/fetch.c:1346 msgid "--deepen and --depth are mutually exclusive" msgstr "" -#: builtin/fetch.c:1328 +#: builtin/fetch.c:1351 msgid "--depth and --unshallow cannot be used together" msgstr "" -#: builtin/fetch.c:1330 +#: builtin/fetch.c:1353 msgid "--unshallow on a complete repository does not make sense" msgstr "" -#: builtin/fetch.c:1349 +#: builtin/fetch.c:1366 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:1351 +#: builtin/fetch.c:1368 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:1362 +#: builtin/fetch.c:1379 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:1370 +#: builtin/fetch.c:1387 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" @@ -7714,23 +7827,23 @@ msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" -#: builtin/fmt-merge-msg.c:664 +#: builtin/fmt-merge-msg.c:665 msgid "populate log with at most <n> entries from shortlog" msgstr "" -#: builtin/fmt-merge-msg.c:667 +#: builtin/fmt-merge-msg.c:668 msgid "alias for --log (deprecated)" msgstr "" -#: builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:671 msgid "text" msgstr "" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:672 msgid "use <text> as start of message" msgstr "" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:673 msgid "file to read from" msgstr "" @@ -7770,101 +7883,105 @@ msgstr "" msgid "show only <n> matched refs" msgstr "" -#: builtin/for-each-ref.c:42 +#: builtin/for-each-ref.c:39 builtin/tag.c:414 +msgid "respect format colors" +msgstr "" + +#: builtin/for-each-ref.c:43 msgid "print only refs which points at the given object" msgstr "" -#: builtin/for-each-ref.c:44 +#: builtin/for-each-ref.c:45 msgid "print only refs that are merged" msgstr "" -#: builtin/for-each-ref.c:45 +#: builtin/for-each-ref.c:46 msgid "print only refs that are not merged" msgstr "" -#: builtin/for-each-ref.c:46 +#: builtin/for-each-ref.c:47 msgid "print only refs which contain the commit" msgstr "" -#: builtin/for-each-ref.c:47 +#: builtin/for-each-ref.c:48 msgid "print only refs which don't contain the commit" msgstr "" -#: builtin/fsck.c:554 +#: builtin/fsck.c:543 msgid "Checking object directories" msgstr "" -#: builtin/fsck.c:646 +#: builtin/fsck.c:635 msgid "git fsck [<options>] [<object>...]" msgstr "" -#: builtin/fsck.c:652 +#: builtin/fsck.c:641 msgid "show unreachable objects" msgstr "" -#: builtin/fsck.c:653 +#: builtin/fsck.c:642 msgid "show dangling objects" msgstr "" -#: builtin/fsck.c:654 +#: builtin/fsck.c:643 msgid "report tags" msgstr "" -#: builtin/fsck.c:655 +#: builtin/fsck.c:644 msgid "report root nodes" msgstr "" -#: builtin/fsck.c:656 +#: builtin/fsck.c:645 msgid "make index objects head nodes" msgstr "" -#: builtin/fsck.c:657 +#: builtin/fsck.c:646 msgid "make reflogs head nodes (default)" msgstr "" -#: builtin/fsck.c:658 +#: builtin/fsck.c:647 msgid "also consider packs and alternate objects" msgstr "" -#: builtin/fsck.c:659 +#: builtin/fsck.c:648 msgid "check only connectivity" msgstr "" -#: builtin/fsck.c:660 +#: builtin/fsck.c:649 msgid "enable more strict checking" msgstr "" -#: builtin/fsck.c:662 +#: builtin/fsck.c:651 msgid "write dangling objects in .git/lost-found" msgstr "" -#: builtin/fsck.c:663 builtin/prune.c:107 +#: builtin/fsck.c:652 builtin/prune.c:107 msgid "show progress" msgstr "" -#: builtin/fsck.c:664 +#: builtin/fsck.c:653 msgid "show verbose names for reachable objects" msgstr "" -#: builtin/fsck.c:725 +#: builtin/fsck.c:714 msgid "Checking objects" msgstr "" -#: builtin/gc.c:26 +#: builtin/gc.c:27 msgid "git gc [<options>]" msgstr "" -#: builtin/gc.c:79 +#: builtin/gc.c:80 #, c-format msgid "Failed to fstat %s: %s" msgstr "" -#: builtin/gc.c:311 +#: builtin/gc.c:312 #, c-format msgid "Can't stat %s" msgstr "" -#: builtin/gc.c:320 +#: builtin/gc.c:321 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -7874,49 +7991,49 @@ msgid "" "%s" msgstr "" -#: builtin/gc.c:359 +#: builtin/gc.c:360 msgid "prune unreferenced objects" msgstr "" -#: builtin/gc.c:361 +#: builtin/gc.c:362 msgid "be more thorough (increased runtime)" msgstr "" -#: builtin/gc.c:362 +#: builtin/gc.c:363 msgid "enable auto-gc mode" msgstr "" -#: builtin/gc.c:363 +#: builtin/gc.c:364 msgid "force running gc even if there may be another gc running" msgstr "" -#: builtin/gc.c:380 +#: builtin/gc.c:381 #, c-format msgid "Failed to parse gc.logexpiry value %s" msgstr "" -#: builtin/gc.c:408 +#: builtin/gc.c:409 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" -#: builtin/gc.c:410 +#: builtin/gc.c:411 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "" -#: builtin/gc.c:411 +#: builtin/gc.c:412 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "" -#: builtin/gc.c:436 +#: builtin/gc.c:437 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "" -#: builtin/gc.c:480 +#: builtin/gc.c:481 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -7925,12 +8042,12 @@ msgstr "" msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "" -#: builtin/grep.c:235 +#: builtin/grep.c:226 #, c-format msgid "grep: failed to create thread: %s" msgstr "" -#: builtin/grep.c:293 +#: builtin/grep.c:284 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "" @@ -7939,249 +8056,241 @@ msgstr "" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692 +#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1693 #, c-format msgid "no threads support, ignoring %s" msgstr "" -#: builtin/grep.c:788 builtin/grep.c:829 +#: builtin/grep.c:451 builtin/grep.c:571 builtin/grep.c:613 #, c-format msgid "unable to read tree (%s)" msgstr "" -#: builtin/grep.c:848 +#: builtin/grep.c:628 #, c-format msgid "unable to grep from object of type %s" msgstr "" -#: builtin/grep.c:912 +#: builtin/grep.c:694 #, c-format msgid "switch `%c' expects a numerical value" msgstr "" -#: builtin/grep.c:999 +#: builtin/grep.c:781 msgid "search in index instead of in the work tree" msgstr "" -#: builtin/grep.c:1001 +#: builtin/grep.c:783 msgid "find in contents not managed by git" msgstr "" -#: builtin/grep.c:1003 +#: builtin/grep.c:785 msgid "search in both tracked and untracked files" msgstr "" -#: builtin/grep.c:1005 +#: builtin/grep.c:787 msgid "ignore files specified via '.gitignore'" msgstr "" -#: builtin/grep.c:1007 +#: builtin/grep.c:789 msgid "recursively search in each submodule" msgstr "" -#: builtin/grep.c:1009 -msgid "basename" -msgstr "" - -#: builtin/grep.c:1010 -msgid "prepend parent project's basename to output" -msgstr "" - -#: builtin/grep.c:1013 +#: builtin/grep.c:792 msgid "show non-matching lines" msgstr "" -#: builtin/grep.c:1015 +#: builtin/grep.c:794 msgid "case insensitive matching" msgstr "" -#: builtin/grep.c:1017 +#: builtin/grep.c:796 msgid "match patterns only at word boundaries" msgstr "" -#: builtin/grep.c:1019 +#: builtin/grep.c:798 msgid "process binary files as text" msgstr "" -#: builtin/grep.c:1021 +#: builtin/grep.c:800 msgid "don't match patterns in binary files" msgstr "" -#: builtin/grep.c:1024 +#: builtin/grep.c:803 msgid "process binary files with textconv filters" msgstr "" -#: builtin/grep.c:1026 +#: builtin/grep.c:805 msgid "descend at most <depth> levels" msgstr "" -#: builtin/grep.c:1030 +#: builtin/grep.c:809 msgid "use extended POSIX regular expressions" msgstr "" -#: builtin/grep.c:1033 +#: builtin/grep.c:812 msgid "use basic POSIX regular expressions (default)" msgstr "" -#: builtin/grep.c:1036 +#: builtin/grep.c:815 msgid "interpret patterns as fixed strings" msgstr "" -#: builtin/grep.c:1039 +#: builtin/grep.c:818 msgid "use Perl-compatible regular expressions" msgstr "" -#: builtin/grep.c:1042 +#: builtin/grep.c:821 msgid "show line numbers" msgstr "" -#: builtin/grep.c:1043 +#: builtin/grep.c:822 msgid "don't show filenames" msgstr "" -#: builtin/grep.c:1044 +#: builtin/grep.c:823 msgid "show filenames" msgstr "" -#: builtin/grep.c:1046 +#: builtin/grep.c:825 msgid "show filenames relative to top directory" msgstr "" -#: builtin/grep.c:1048 +#: builtin/grep.c:827 msgid "show only filenames instead of matching lines" msgstr "" -#: builtin/grep.c:1050 +#: builtin/grep.c:829 msgid "synonym for --files-with-matches" msgstr "" -#: builtin/grep.c:1053 +#: builtin/grep.c:832 msgid "show only the names of files without match" msgstr "" -#: builtin/grep.c:1055 +#: builtin/grep.c:834 msgid "print NUL after filenames" msgstr "" -#: builtin/grep.c:1057 +#: builtin/grep.c:836 msgid "show the number of matches instead of matching lines" msgstr "" -#: builtin/grep.c:1058 +#: builtin/grep.c:837 msgid "highlight matches" msgstr "" -#: builtin/grep.c:1060 +#: builtin/grep.c:839 msgid "print empty line between matches from different files" msgstr "" -#: builtin/grep.c:1062 +#: builtin/grep.c:841 msgid "show filename only once above matches from same file" msgstr "" -#: builtin/grep.c:1065 +#: builtin/grep.c:844 msgid "show <n> context lines before and after matches" msgstr "" -#: builtin/grep.c:1068 +#: builtin/grep.c:847 msgid "show <n> context lines before matches" msgstr "" -#: builtin/grep.c:1070 +#: builtin/grep.c:849 msgid "show <n> context lines after matches" msgstr "" -#: builtin/grep.c:1072 +#: builtin/grep.c:851 msgid "use <n> worker threads" msgstr "" -#: builtin/grep.c:1073 +#: builtin/grep.c:852 msgid "shortcut for -C NUM" msgstr "" -#: builtin/grep.c:1076 +#: builtin/grep.c:855 msgid "show a line with the function name before matches" msgstr "" -#: builtin/grep.c:1078 +#: builtin/grep.c:857 msgid "show the surrounding function" msgstr "" -#: builtin/grep.c:1081 +#: builtin/grep.c:860 msgid "read patterns from file" msgstr "" -#: builtin/grep.c:1083 +#: builtin/grep.c:862 msgid "match <pattern>" msgstr "" -#: builtin/grep.c:1085 +#: builtin/grep.c:864 msgid "combine patterns specified with -e" msgstr "" -#: builtin/grep.c:1097 +#: builtin/grep.c:876 msgid "indicate hit with exit status without output" msgstr "" -#: builtin/grep.c:1099 +#: builtin/grep.c:878 msgid "show only matches from files that match all patterns" msgstr "" -#: builtin/grep.c:1101 +#: builtin/grep.c:880 msgid "show parse tree for grep expression" msgstr "" -#: builtin/grep.c:1105 +#: builtin/grep.c:884 msgid "pager" msgstr "" -#: builtin/grep.c:1105 +#: builtin/grep.c:884 msgid "show matching files in the pager" msgstr "" -#: builtin/grep.c:1108 +#: builtin/grep.c:887 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" -#: builtin/grep.c:1172 +#: builtin/grep.c:950 msgid "no pattern given." msgstr "" -#: builtin/grep.c:1204 +#: builtin/grep.c:982 msgid "--no-index or --untracked cannot be used with revs" msgstr "" -#: builtin/grep.c:1211 +#: builtin/grep.c:989 #, c-format msgid "unable to resolve revision: %s" msgstr "" -#: builtin/grep.c:1245 builtin/index-pack.c:1490 +#: builtin/grep.c:1023 builtin/index-pack.c:1491 #, c-format msgid "invalid number of threads specified (%d)" msgstr "" -#: builtin/grep.c:1250 +#: builtin/grep.c:1028 msgid "no threads support, ignoring --threads" msgstr "" -#: builtin/grep.c:1281 +#: builtin/grep.c:1052 msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/grep.c:1304 +#: builtin/grep.c:1075 msgid "option not supported with --recurse-submodules." msgstr "" -#: builtin/grep.c:1310 +#: builtin/grep.c:1081 msgid "--cached or --untracked cannot be used with --no-index." msgstr "" -#: builtin/grep.c:1316 +#: builtin/grep.c:1087 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" -#: builtin/grep.c:1324 +#: builtin/grep.c:1095 msgid "both --cached and trees are given." msgstr "" @@ -8270,370 +8379,370 @@ msgstr "" msgid "emacsclient version '%d' too old (< 22)." msgstr "" -#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171 +#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173 #, c-format msgid "failed to exec '%s'" msgstr "" -#: builtin/help.c:208 +#: builtin/help.c:211 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man.<tool>.cmd' instead." msgstr "" -#: builtin/help.c:220 +#: builtin/help.c:223 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man.<tool>.path' instead." msgstr "" -#: builtin/help.c:337 +#: builtin/help.c:340 #, c-format msgid "'%s': unknown man viewer." msgstr "" -#: builtin/help.c:354 +#: builtin/help.c:357 msgid "no man viewer handled the request" msgstr "" -#: builtin/help.c:362 +#: builtin/help.c:365 msgid "no info viewer handled the request" msgstr "" -#: builtin/help.c:404 +#: builtin/help.c:407 msgid "Defining attributes per path" msgstr "" -#: builtin/help.c:405 +#: builtin/help.c:408 msgid "Everyday Git With 20 Commands Or So" msgstr "" -#: builtin/help.c:406 +#: builtin/help.c:409 msgid "A Git glossary" msgstr "" -#: builtin/help.c:407 +#: builtin/help.c:410 msgid "Specifies intentionally untracked files to ignore" msgstr "" -#: builtin/help.c:408 +#: builtin/help.c:411 msgid "Defining submodule properties" msgstr "" -#: builtin/help.c:409 +#: builtin/help.c:412 msgid "Specifying revisions and ranges for Git" msgstr "" -#: builtin/help.c:410 +#: builtin/help.c:413 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "" -#: builtin/help.c:411 +#: builtin/help.c:414 msgid "An overview of recommended workflows with Git" msgstr "" -#: builtin/help.c:423 +#: builtin/help.c:426 msgid "The common Git guides are:\n" msgstr "" -#: builtin/help.c:441 +#: builtin/help.c:444 #, c-format -msgid "`git %s' is aliased to `%s'" +msgid "'%s' is aliased to '%s'" msgstr "" -#: builtin/help.c:463 builtin/help.c:480 +#: builtin/help.c:466 builtin/help.c:483 #, c-format msgid "usage: %s%s" msgstr "" -#: builtin/index-pack.c:155 +#: builtin/index-pack.c:156 #, c-format msgid "unable to open %s" msgstr "" -#: builtin/index-pack.c:205 +#: builtin/index-pack.c:206 #, c-format msgid "object type mismatch at %s" msgstr "" -#: builtin/index-pack.c:225 +#: builtin/index-pack.c:226 #, c-format msgid "did not receive expected object %s" msgstr "" -#: builtin/index-pack.c:228 +#: builtin/index-pack.c:229 #, c-format msgid "object %s: expected type %s, found %s" msgstr "" -#: builtin/index-pack.c:270 +#: builtin/index-pack.c:271 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:280 +#: builtin/index-pack.c:281 msgid "early EOF" msgstr "" -#: builtin/index-pack.c:281 +#: builtin/index-pack.c:282 msgid "read error on input" msgstr "" -#: builtin/index-pack.c:293 +#: builtin/index-pack.c:294 msgid "used more bytes than were available" msgstr "" -#: builtin/index-pack.c:300 +#: builtin/index-pack.c:301 msgid "pack too large for current definition of off_t" msgstr "" -#: builtin/index-pack.c:303 builtin/unpack-objects.c:93 +#: builtin/index-pack.c:304 builtin/unpack-objects.c:93 msgid "pack exceeds maximum allowed size" msgstr "" -#: builtin/index-pack.c:318 +#: builtin/index-pack.c:319 #, c-format msgid "unable to create '%s'" msgstr "" -#: builtin/index-pack.c:324 +#: builtin/index-pack.c:325 #, c-format msgid "cannot open packfile '%s'" msgstr "" -#: builtin/index-pack.c:338 +#: builtin/index-pack.c:339 msgid "pack signature mismatch" msgstr "" -#: builtin/index-pack.c:340 +#: builtin/index-pack.c:341 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "" -#: builtin/index-pack.c:358 +#: builtin/index-pack.c:359 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "" -#: builtin/index-pack.c:479 +#: builtin/index-pack.c:480 #, c-format msgid "inflate returned %d" msgstr "" -#: builtin/index-pack.c:528 +#: builtin/index-pack.c:529 msgid "offset value overflow for delta base object" msgstr "" -#: builtin/index-pack.c:536 +#: builtin/index-pack.c:537 msgid "delta base offset is out of bound" msgstr "" -#: builtin/index-pack.c:544 +#: builtin/index-pack.c:545 #, c-format msgid "unknown object type %d" msgstr "" -#: builtin/index-pack.c:575 +#: builtin/index-pack.c:576 msgid "cannot pread pack file" msgstr "" -#: builtin/index-pack.c:577 +#: builtin/index-pack.c:578 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:603 +#: builtin/index-pack.c:604 msgid "serious inflate inconsistency" msgstr "" -#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777 -#: builtin/index-pack.c:816 builtin/index-pack.c:825 +#: 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 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" -#: builtin/index-pack.c:751 builtin/pack-objects.c:167 -#: builtin/pack-objects.c:261 +#: builtin/index-pack.c:752 builtin/pack-objects.c:168 +#: builtin/pack-objects.c:262 #, c-format msgid "unable to read %s" msgstr "" -#: builtin/index-pack.c:814 +#: builtin/index-pack.c:815 #, c-format msgid "cannot read existing object info %s" msgstr "" -#: builtin/index-pack.c:822 +#: builtin/index-pack.c:823 #, c-format msgid "cannot read existing object %s" msgstr "" -#: builtin/index-pack.c:836 +#: builtin/index-pack.c:837 #, c-format msgid "invalid blob object %s" msgstr "" -#: builtin/index-pack.c:851 +#: builtin/index-pack.c:852 #, c-format msgid "invalid %s" msgstr "" -#: builtin/index-pack.c:854 +#: builtin/index-pack.c:855 msgid "Error in object" msgstr "" -#: builtin/index-pack.c:856 +#: builtin/index-pack.c:857 #, c-format msgid "Not all child objects of %s are reachable" msgstr "" -#: builtin/index-pack.c:928 builtin/index-pack.c:959 +#: builtin/index-pack.c:929 builtin/index-pack.c:960 msgid "failed to apply delta" msgstr "" -#: builtin/index-pack.c:1130 +#: builtin/index-pack.c:1131 msgid "Receiving objects" msgstr "" -#: builtin/index-pack.c:1130 +#: builtin/index-pack.c:1131 msgid "Indexing objects" msgstr "" -#: builtin/index-pack.c:1164 +#: builtin/index-pack.c:1165 msgid "pack is corrupted (SHA1 mismatch)" msgstr "" -#: builtin/index-pack.c:1169 +#: builtin/index-pack.c:1170 msgid "cannot fstat packfile" msgstr "" -#: builtin/index-pack.c:1172 +#: builtin/index-pack.c:1173 msgid "pack has junk at the end" msgstr "" -#: builtin/index-pack.c:1184 +#: builtin/index-pack.c:1185 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "" -#: builtin/index-pack.c:1207 +#: builtin/index-pack.c:1208 msgid "Resolving deltas" msgstr "" -#: builtin/index-pack.c:1218 +#: builtin/index-pack.c:1219 #, c-format msgid "unable to create thread: %s" msgstr "" -#: builtin/index-pack.c:1260 +#: builtin/index-pack.c:1261 msgid "confusion beyond insanity" msgstr "" -#: builtin/index-pack.c:1266 +#: builtin/index-pack.c:1267 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1278 +#: builtin/index-pack.c:1279 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" -#: builtin/index-pack.c:1282 +#: builtin/index-pack.c:1283 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1306 +#: builtin/index-pack.c:1307 #, c-format msgid "unable to deflate appended object (%d)" msgstr "" -#: builtin/index-pack.c:1382 +#: builtin/index-pack.c:1383 #, c-format msgid "local object %s is corrupt" msgstr "" -#: builtin/index-pack.c:1408 +#: builtin/index-pack.c:1409 msgid "error while closing pack file" msgstr "" -#: builtin/index-pack.c:1420 +#: builtin/index-pack.c:1421 #, c-format msgid "cannot write keep file '%s'" msgstr "" -#: builtin/index-pack.c:1428 +#: builtin/index-pack.c:1429 #, c-format msgid "cannot close written keep file '%s'" msgstr "" -#: builtin/index-pack.c:1438 +#: builtin/index-pack.c:1439 msgid "cannot store pack file" msgstr "" -#: builtin/index-pack.c:1446 +#: builtin/index-pack.c:1447 msgid "cannot store index file" msgstr "" -#: builtin/index-pack.c:1484 +#: builtin/index-pack.c:1485 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "" -#: builtin/index-pack.c:1552 +#: builtin/index-pack.c:1553 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "" -#: builtin/index-pack.c:1554 +#: builtin/index-pack.c:1555 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "" -#: builtin/index-pack.c:1602 +#: builtin/index-pack.c:1603 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1609 +#: builtin/index-pack.c:1610 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1622 +#: builtin/index-pack.c:1623 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "" -#: builtin/index-pack.c:1704 builtin/index-pack.c:1707 -#: builtin/index-pack.c:1723 builtin/index-pack.c:1727 +#: builtin/index-pack.c:1705 builtin/index-pack.c:1708 +#: builtin/index-pack.c:1724 builtin/index-pack.c:1728 #, c-format msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1743 +#: builtin/index-pack.c:1744 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1745 +#: builtin/index-pack.c:1746 msgid "--stdin requires a git repository" msgstr "" -#: builtin/index-pack.c:1753 +#: builtin/index-pack.c:1754 msgid "--verify with no packfile name given" msgstr "" @@ -8759,452 +8868,492 @@ msgid "" "<token>[(=|:)<value>])...] [<file>...]" msgstr "" -#: builtin/interpret-trailers.c:26 +#: builtin/interpret-trailers.c:92 msgid "edit files in place" msgstr "" -#: builtin/interpret-trailers.c:27 +#: builtin/interpret-trailers.c:93 msgid "trim empty trailers" msgstr "" -#: builtin/interpret-trailers.c:28 +#: builtin/interpret-trailers.c:96 +msgid "where to place the new trailer" +msgstr "" + +#: builtin/interpret-trailers.c:98 +msgid "action if trailer already exists" +msgstr "" + +#: builtin/interpret-trailers.c:100 +msgid "action if trailer is missing" +msgstr "" + +#: builtin/interpret-trailers.c:102 +msgid "output only the trailers" +msgstr "" + +#: builtin/interpret-trailers.c:103 +msgid "do not apply config rules" +msgstr "" + +#: builtin/interpret-trailers.c:104 +msgid "join whitespace-continued values" +msgstr "" + +#: builtin/interpret-trailers.c:105 +msgid "set parsing options" +msgstr "" + +#: builtin/interpret-trailers.c:107 msgid "trailer" msgstr "" -#: builtin/interpret-trailers.c:29 +#: builtin/interpret-trailers.c:108 msgid "trailer(s) to add" msgstr "" -#: builtin/interpret-trailers.c:42 +#: builtin/interpret-trailers.c:117 +msgid "--trailer with --only-input does not make sense" +msgstr "" + +#: builtin/interpret-trailers.c:127 msgid "no input file given for in-place editing" msgstr "" -#: builtin/log.c:45 +#: builtin/log.c:46 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "" -#: builtin/log.c:46 +#: builtin/log.c:47 msgid "git show [<options>] <object>..." msgstr "" -#: builtin/log.c:90 +#: builtin/log.c:91 #, c-format msgid "invalid --decorate option: %s" msgstr "" -#: builtin/log.c:147 +#: builtin/log.c:148 msgid "suppress diff output" msgstr "" -#: builtin/log.c:148 +#: builtin/log.c:149 msgid "show source" msgstr "" -#: builtin/log.c:149 +#: builtin/log.c:150 msgid "Use mail map file" msgstr "" -#: builtin/log.c:150 +#: builtin/log.c:151 msgid "decorate options" msgstr "" -#: builtin/log.c:153 +#: builtin/log.c:154 msgid "Process line range n,m in file, counting from 1" msgstr "" -#: builtin/log.c:249 +#: builtin/log.c:250 #, c-format msgid "Final output: %d %s\n" msgstr "" -#: builtin/log.c:497 +#: builtin/log.c:501 #, c-format msgid "git show %s: bad file" msgstr "" -#: builtin/log.c:512 builtin/log.c:606 +#: builtin/log.c:516 builtin/log.c:610 #, c-format msgid "Could not read object %s" msgstr "" -#: builtin/log.c:630 +#: builtin/log.c:634 #, c-format msgid "Unknown type: %d" msgstr "" -#: builtin/log.c:751 +#: builtin/log.c:755 msgid "format.headers without value" msgstr "" -#: builtin/log.c:852 +#: builtin/log.c:856 msgid "name of output directory is too long" msgstr "" -#: builtin/log.c:868 +#: builtin/log.c:872 #, c-format msgid "Cannot open patch file %s" msgstr "" -#: builtin/log.c:885 +#: builtin/log.c:889 msgid "Need exactly one range." msgstr "" -#: builtin/log.c:895 +#: builtin/log.c:899 msgid "Not a range." msgstr "" -#: builtin/log.c:1001 +#: builtin/log.c:1005 msgid "Cover letter needs email format" msgstr "" -#: builtin/log.c:1081 +#: builtin/log.c:1085 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:1108 +#: builtin/log.c:1112 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "" -#: builtin/log.c:1158 +#: builtin/log.c:1162 msgid "Two output directories?" msgstr "" -#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922 +#: builtin/log.c:1269 builtin/log.c:1920 builtin/log.c:1922 builtin/log.c:1934 #, c-format msgid "Unknown commit %s" msgstr "" -#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533 +#: builtin/log.c:1279 builtin/notes.c:887 builtin/tag.c:516 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "" -#: builtin/log.c:1280 +#: builtin/log.c:1284 msgid "Could not find exact merge base." msgstr "" -#: builtin/log.c:1284 +#: builtin/log.c:1288 msgid "" "Failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" "Or you could specify base commit by --base=<base-commit-id> manually." msgstr "" -#: builtin/log.c:1304 +#: builtin/log.c:1308 msgid "Failed to find exact merge base" msgstr "" -#: builtin/log.c:1315 +#: builtin/log.c:1319 msgid "base commit should be the ancestor of revision list" msgstr "" -#: builtin/log.c:1319 +#: builtin/log.c:1323 msgid "base commit shouldn't be in revision list" msgstr "" -#: builtin/log.c:1368 +#: builtin/log.c:1372 msgid "cannot get patch id" msgstr "" -#: builtin/log.c:1425 +#: builtin/log.c:1431 msgid "use [PATCH n/m] even with a single patch" msgstr "" -#: builtin/log.c:1428 +#: builtin/log.c:1434 msgid "use [PATCH] even with multiple patches" msgstr "" -#: builtin/log.c:1432 +#: builtin/log.c:1438 msgid "print patches to standard out" msgstr "" -#: builtin/log.c:1434 +#: builtin/log.c:1440 msgid "generate a cover letter" msgstr "" -#: builtin/log.c:1436 +#: builtin/log.c:1442 msgid "use simple number sequence for output file names" msgstr "" -#: builtin/log.c:1437 +#: builtin/log.c:1443 msgid "sfx" msgstr "" -#: builtin/log.c:1438 +#: builtin/log.c:1444 msgid "use <sfx> instead of '.patch'" msgstr "" -#: builtin/log.c:1440 +#: builtin/log.c:1446 msgid "start numbering patches at <n> instead of 1" msgstr "" -#: builtin/log.c:1442 +#: builtin/log.c:1448 msgid "mark the series as Nth re-roll" msgstr "" -#: builtin/log.c:1444 +#: builtin/log.c:1450 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "" -#: builtin/log.c:1447 +#: builtin/log.c:1453 msgid "Use [<prefix>] instead of [PATCH]" msgstr "" -#: builtin/log.c:1450 +#: builtin/log.c:1456 msgid "store resulting files in <dir>" msgstr "" -#: builtin/log.c:1453 +#: builtin/log.c:1459 msgid "don't strip/add [PATCH]" msgstr "" -#: builtin/log.c:1456 +#: builtin/log.c:1462 msgid "don't output binary diffs" msgstr "" -#: builtin/log.c:1458 +#: builtin/log.c:1464 msgid "output all-zero hash in From header" msgstr "" -#: builtin/log.c:1460 +#: builtin/log.c:1466 msgid "don't include a patch matching a commit upstream" msgstr "" -#: builtin/log.c:1462 +#: builtin/log.c:1468 msgid "show patch format instead of default (patch + stat)" msgstr "" -#: builtin/log.c:1464 +#: builtin/log.c:1470 msgid "Messaging" msgstr "" -#: builtin/log.c:1465 +#: builtin/log.c:1471 msgid "header" msgstr "" -#: builtin/log.c:1466 +#: builtin/log.c:1472 msgid "add email header" msgstr "" -#: builtin/log.c:1467 builtin/log.c:1469 +#: builtin/log.c:1473 builtin/log.c:1475 msgid "email" msgstr "" -#: builtin/log.c:1467 +#: builtin/log.c:1473 msgid "add To: header" msgstr "" -#: builtin/log.c:1469 +#: builtin/log.c:1475 msgid "add Cc: header" msgstr "" -#: builtin/log.c:1471 +#: builtin/log.c:1477 msgid "ident" msgstr "" -#: builtin/log.c:1472 +#: builtin/log.c:1478 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" -#: builtin/log.c:1474 +#: builtin/log.c:1480 msgid "message-id" msgstr "" -#: builtin/log.c:1475 +#: builtin/log.c:1481 msgid "make first mail a reply to <message-id>" msgstr "" -#: builtin/log.c:1476 builtin/log.c:1479 +#: builtin/log.c:1482 builtin/log.c:1485 msgid "boundary" msgstr "" -#: builtin/log.c:1477 +#: builtin/log.c:1483 msgid "attach the patch" msgstr "" -#: builtin/log.c:1480 +#: builtin/log.c:1486 msgid "inline the patch" msgstr "" -#: builtin/log.c:1484 +#: builtin/log.c:1490 msgid "enable message threading, styles: shallow, deep" msgstr "" -#: builtin/log.c:1486 +#: builtin/log.c:1492 msgid "signature" msgstr "" -#: builtin/log.c:1487 +#: builtin/log.c:1493 msgid "add a signature" msgstr "" -#: builtin/log.c:1488 +#: builtin/log.c:1494 msgid "base-commit" msgstr "" -#: builtin/log.c:1489 +#: builtin/log.c:1495 msgid "add prerequisite tree info to the patch series" msgstr "" -#: builtin/log.c:1491 +#: builtin/log.c:1497 msgid "add a signature from a file" msgstr "" -#: builtin/log.c:1492 +#: builtin/log.c:1498 msgid "don't print the patch filenames" msgstr "" -#: builtin/log.c:1567 +#: builtin/log.c:1500 +msgid "show progress while generating patches" +msgstr "" + +#: builtin/log.c:1575 #, c-format msgid "invalid ident line: %s" msgstr "" -#: builtin/log.c:1582 +#: builtin/log.c:1590 msgid "-n and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1584 +#: builtin/log.c:1592 msgid "--subject-prefix/--rfc and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1592 +#: builtin/log.c:1600 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1594 +#: builtin/log.c:1602 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1596 +#: builtin/log.c:1604 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1626 +#: builtin/log.c:1634 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:1628 +#: builtin/log.c:1636 #, c-format msgid "Could not create directory '%s'" msgstr "" -#: builtin/log.c:1722 +#: builtin/log.c:1729 #, c-format msgid "unable to read signature file '%s'" msgstr "" -#: builtin/log.c:1794 +#: builtin/log.c:1761 +msgid "Generating patches" +msgstr "" + +#: builtin/log.c:1805 msgid "Failed to create output files" msgstr "" -#: builtin/log.c:1843 +#: builtin/log.c:1855 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "" -#: builtin/log.c:1897 +#: builtin/log.c:1909 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "" -#: builtin/ls-files.c:468 +#: builtin/ls-files.c:466 msgid "git ls-files [<options>] [<file>...]" msgstr "" -#: builtin/ls-files.c:517 +#: builtin/ls-files.c:515 msgid "identify the file status with tags" msgstr "" -#: builtin/ls-files.c:519 +#: builtin/ls-files.c:517 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" -#: builtin/ls-files.c:521 +#: builtin/ls-files.c:519 msgid "show cached files in the output (default)" msgstr "" -#: builtin/ls-files.c:523 +#: builtin/ls-files.c:521 msgid "show deleted files in the output" msgstr "" -#: builtin/ls-files.c:525 +#: builtin/ls-files.c:523 msgid "show modified files in the output" msgstr "" -#: builtin/ls-files.c:527 +#: builtin/ls-files.c:525 msgid "show other files in the output" msgstr "" -#: builtin/ls-files.c:529 +#: builtin/ls-files.c:527 msgid "show ignored files in the output" msgstr "" -#: builtin/ls-files.c:532 +#: builtin/ls-files.c:530 msgid "show staged contents' object name in the output" msgstr "" -#: builtin/ls-files.c:534 +#: builtin/ls-files.c:532 msgid "show files on the filesystem that need to be removed" msgstr "" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:534 msgid "show 'other' directories' names only" msgstr "" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:536 msgid "show line endings of files" msgstr "" -#: builtin/ls-files.c:540 +#: builtin/ls-files.c:538 msgid "don't show empty directories" msgstr "" -#: builtin/ls-files.c:543 +#: builtin/ls-files.c:541 msgid "show unmerged files in the output" msgstr "" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:543 msgid "show resolve-undo information" msgstr "" -#: builtin/ls-files.c:547 +#: builtin/ls-files.c:545 msgid "skip files matching pattern" msgstr "" -#: builtin/ls-files.c:550 +#: builtin/ls-files.c:548 msgid "exclude patterns are read from <file>" msgstr "" -#: builtin/ls-files.c:553 +#: builtin/ls-files.c:551 msgid "read additional per-directory exclude patterns in <file>" msgstr "" -#: builtin/ls-files.c:555 +#: builtin/ls-files.c:553 msgid "add the standard git exclusions" msgstr "" -#: builtin/ls-files.c:558 +#: builtin/ls-files.c:556 msgid "make the output relative to the project top directory" msgstr "" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:559 msgid "recurse through submodules" msgstr "" -#: builtin/ls-files.c:563 +#: builtin/ls-files.c:561 msgid "if any <file> is not in the index, treat this as an error" msgstr "" -#: builtin/ls-files.c:564 +#: builtin/ls-files.c:562 msgid "tree-ish" msgstr "" -#: builtin/ls-files.c:565 +#: builtin/ls-files.c:563 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" -#: builtin/ls-files.c:567 +#: builtin/ls-files.c:565 msgid "show debugging data" msgstr "" @@ -9292,176 +9441,180 @@ msgstr "" msgid "empty mbox: '%s'" msgstr "" -#: builtin/merge.c:47 +#: builtin/merge.c:48 msgid "git merge [<options>] [<commit>...]" msgstr "" -#: builtin/merge.c:48 +#: builtin/merge.c:49 msgid "git merge --abort" msgstr "" -#: builtin/merge.c:49 +#: builtin/merge.c:50 msgid "git merge --continue" msgstr "" -#: builtin/merge.c:104 +#: builtin/merge.c:107 msgid "switch `m' requires a value" msgstr "" -#: builtin/merge.c:141 +#: builtin/merge.c:144 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "" -#: builtin/merge.c:142 +#: builtin/merge.c:145 #, c-format msgid "Available strategies are:" msgstr "" -#: builtin/merge.c:147 +#: builtin/merge.c:150 #, c-format msgid "Available custom strategies are:" msgstr "" -#: builtin/merge.c:197 builtin/pull.c:134 +#: builtin/merge.c:200 builtin/pull.c:134 msgid "do not show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:200 builtin/pull.c:137 +#: builtin/merge.c:203 builtin/pull.c:137 msgid "show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:201 builtin/pull.c:140 +#: builtin/merge.c:204 builtin/pull.c:140 msgid "(synonym to --stat)" msgstr "" -#: builtin/merge.c:203 builtin/pull.c:143 +#: builtin/merge.c:206 builtin/pull.c:143 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" -#: builtin/merge.c:206 builtin/pull.c:146 +#: builtin/merge.c:209 builtin/pull.c:146 msgid "create a single commit instead of doing a merge" msgstr "" -#: builtin/merge.c:208 builtin/pull.c:149 +#: builtin/merge.c:211 builtin/pull.c:149 msgid "perform a commit if the merge succeeds (default)" msgstr "" -#: builtin/merge.c:210 builtin/pull.c:152 +#: builtin/merge.c:213 builtin/pull.c:152 msgid "edit message before committing" msgstr "" -#: builtin/merge.c:211 +#: builtin/merge.c:214 msgid "allow fast-forward (default)" msgstr "" -#: builtin/merge.c:213 builtin/pull.c:158 +#: builtin/merge.c:216 builtin/pull.c:158 msgid "abort if fast-forward is not possible" msgstr "" -#: builtin/merge.c:217 builtin/pull.c:161 +#: builtin/merge.c:220 builtin/pull.c:161 msgid "verify that the named commit has a valid GPG signature" msgstr "" -#: builtin/merge.c:218 builtin/notes.c:776 builtin/pull.c:165 +#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:165 #: builtin/revert.c:109 msgid "strategy" msgstr "" -#: builtin/merge.c:219 builtin/pull.c:166 +#: builtin/merge.c:222 builtin/pull.c:166 msgid "merge strategy to use" msgstr "" -#: builtin/merge.c:220 builtin/pull.c:169 +#: builtin/merge.c:223 builtin/pull.c:169 msgid "option=value" msgstr "" -#: builtin/merge.c:221 builtin/pull.c:170 +#: builtin/merge.c:224 builtin/pull.c:170 msgid "option for selected merge strategy" msgstr "" -#: builtin/merge.c:223 +#: builtin/merge.c:226 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" -#: builtin/merge.c:227 +#: builtin/merge.c:230 msgid "abort the current in-progress merge" msgstr "" -#: builtin/merge.c:229 +#: builtin/merge.c:232 msgid "continue the current in-progress merge" msgstr "" -#: builtin/merge.c:231 builtin/pull.c:177 +#: builtin/merge.c:234 builtin/pull.c:177 msgid "allow merging unrelated histories" msgstr "" -#: builtin/merge.c:259 +#: builtin/merge.c:240 +msgid "verify commit-msg hook" +msgstr "" + +#: builtin/merge.c:265 msgid "could not run stash." msgstr "" -#: builtin/merge.c:264 +#: builtin/merge.c:270 msgid "stash failed" msgstr "" -#: builtin/merge.c:269 +#: builtin/merge.c:275 #, c-format msgid "not a valid object: %s" msgstr "" -#: builtin/merge.c:288 builtin/merge.c:305 +#: builtin/merge.c:297 builtin/merge.c:314 msgid "read-tree failed" msgstr "" -#: builtin/merge.c:335 +#: builtin/merge.c:344 msgid " (nothing to squash)" msgstr "" -#: builtin/merge.c:346 +#: builtin/merge.c:355 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:396 +#: builtin/merge.c:405 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:447 +#: builtin/merge.c:456 #, c-format msgid "'%s' does not point to a commit" msgstr "" -#: builtin/merge.c:537 +#: builtin/merge.c:546 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" -#: builtin/merge.c:657 +#: builtin/merge.c:666 msgid "Not handling anything other than two heads merge." msgstr "" -#: builtin/merge.c:671 +#: builtin/merge.c:680 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" -#: builtin/merge.c:686 +#: builtin/merge.c:695 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:738 +#: builtin/merge.c:747 #, c-format msgid "Could not read from '%s'" msgstr "" -#: builtin/merge.c:747 +#: builtin/merge.c:756 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -#: builtin/merge.c:753 +#: builtin/merge.c:762 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -9471,185 +9624,185 @@ msgid "" "the commit.\n" msgstr "" -#: builtin/merge.c:777 +#: builtin/merge.c:798 msgid "Empty commit message." msgstr "" -#: builtin/merge.c:797 +#: builtin/merge.c:818 #, c-format msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:850 +#: builtin/merge.c:871 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:889 +#: builtin/merge.c:910 msgid "No current branch." msgstr "" -#: builtin/merge.c:891 +#: builtin/merge.c:912 msgid "No remote for the current branch." msgstr "" -#: builtin/merge.c:893 +#: builtin/merge.c:914 msgid "No default upstream defined for the current branch." msgstr "" -#: builtin/merge.c:898 +#: builtin/merge.c:919 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:945 +#: builtin/merge.c:972 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "" -#: builtin/merge.c:1046 +#: builtin/merge.c:1073 #, c-format msgid "not something we can merge in %s: %s" msgstr "" -#: builtin/merge.c:1080 +#: builtin/merge.c:1107 msgid "not something we can merge" msgstr "" -#: builtin/merge.c:1145 +#: builtin/merge.c:1172 msgid "--abort expects no arguments" msgstr "" -#: builtin/merge.c:1149 +#: builtin/merge.c:1176 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1161 +#: builtin/merge.c:1188 msgid "--continue expects no arguments" msgstr "" -#: builtin/merge.c:1165 +#: builtin/merge.c:1192 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1181 +#: builtin/merge.c:1208 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1188 +#: builtin/merge.c:1215 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1191 +#: builtin/merge.c:1218 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1200 +#: builtin/merge.c:1227 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1208 +#: builtin/merge.c:1235 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1225 +#: builtin/merge.c:1252 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1227 +#: builtin/merge.c:1254 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1232 +#: builtin/merge.c:1259 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1234 +#: builtin/merge.c:1261 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:1268 +#: builtin/merge.c:1295 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" -#: builtin/merge.c:1271 +#: builtin/merge.c:1298 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" -#: builtin/merge.c:1274 +#: builtin/merge.c:1301 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "" -#: builtin/merge.c:1277 +#: builtin/merge.c:1304 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "" -#: builtin/merge.c:1339 +#: builtin/merge.c:1366 msgid "refusing to merge unrelated histories" msgstr "" -#: builtin/merge.c:1348 -msgid "Already up-to-date." +#: builtin/merge.c:1375 +msgid "Already up to date." msgstr "" -#: builtin/merge.c:1358 +#: builtin/merge.c:1385 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1399 +#: builtin/merge.c:1426 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1406 +#: builtin/merge.c:1433 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1431 -msgid "Already up-to-date. Yeeah!" +#: builtin/merge.c:1458 +msgid "Already up to date. Yeeah!" msgstr "" -#: builtin/merge.c:1437 +#: builtin/merge.c:1464 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1460 builtin/merge.c:1539 +#: builtin/merge.c:1487 builtin/merge.c:1566 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1464 +#: builtin/merge.c:1491 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1530 +#: builtin/merge.c:1557 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1532 +#: builtin/merge.c:1559 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1541 +#: builtin/merge.c:1568 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1553 +#: builtin/merge.c:1580 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -9788,7 +9941,7 @@ msgstr "" msgid "Directory %s is in index and no submodule?" msgstr "" -#: builtin/mv.c:85 builtin/rm.c:290 +#: builtin/mv.c:85 builtin/rm.c:289 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" @@ -9805,68 +9958,68 @@ msgstr "" msgid "skip move/rename errors" msgstr "" -#: builtin/mv.c:168 +#: builtin/mv.c:167 #, c-format msgid "destination '%s' is not a directory" msgstr "" -#: builtin/mv.c:179 +#: builtin/mv.c:178 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "" -#: builtin/mv.c:183 +#: builtin/mv.c:182 msgid "bad source" msgstr "" -#: builtin/mv.c:186 +#: builtin/mv.c:185 msgid "can not move directory into itself" msgstr "" -#: builtin/mv.c:189 +#: builtin/mv.c:188 msgid "cannot move directory over file" msgstr "" -#: builtin/mv.c:198 +#: builtin/mv.c:197 msgid "source directory is empty" msgstr "" -#: builtin/mv.c:223 +#: builtin/mv.c:222 msgid "not under version control" msgstr "" -#: builtin/mv.c:226 +#: builtin/mv.c:225 msgid "destination exists" msgstr "" -#: builtin/mv.c:234 +#: builtin/mv.c:233 #, c-format msgid "overwriting '%s'" msgstr "" -#: builtin/mv.c:237 +#: builtin/mv.c:236 msgid "Cannot overwrite" msgstr "" -#: builtin/mv.c:240 +#: builtin/mv.c:239 msgid "multiple sources for the same target" msgstr "" -#: builtin/mv.c:242 +#: builtin/mv.c:241 msgid "destination directory does not exist" msgstr "" -#: builtin/mv.c:249 +#: builtin/mv.c:248 #, c-format msgid "%s, source=%s, destination=%s" msgstr "" -#: builtin/mv.c:270 +#: builtin/mv.c:269 #, c-format msgid "Renaming %s to %s\n" msgstr "" -#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390 +#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390 #, c-format msgid "renaming '%s' failed" msgstr "" @@ -10051,19 +10204,19 @@ msgstr "" msgid "the note contents have been left in %s" msgstr "" -#: builtin/notes.c:234 builtin/tag.c:517 +#: builtin/notes.c:234 builtin/tag.c:500 #, c-format msgid "cannot read '%s'" msgstr "" -#: builtin/notes.c:236 builtin/tag.c:520 +#: builtin/notes.c:236 builtin/tag.c:503 #, c-format msgid "could not open or read '%s'" msgstr "" #: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308 -#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516 -#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661 +#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517 +#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662 #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "" @@ -10091,185 +10244,185 @@ msgstr "" #. TRANSLATORS: the first %s will be replaced by a git #. notes command: 'add', 'merge', 'remove', etc. #. -#: builtin/notes.c:348 +#: builtin/notes.c:349 #, c-format msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "" -#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499 -#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654 -#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972 +#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500 +#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655 +#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973 msgid "too many parameters" msgstr "" -#: builtin/notes.c:381 builtin/notes.c:667 +#: builtin/notes.c:382 builtin/notes.c:668 #, c-format msgid "no note found for object %s." msgstr "" -#: builtin/notes.c:402 builtin/notes.c:565 +#: builtin/notes.c:403 builtin/notes.c:566 msgid "note contents as a string" msgstr "" -#: builtin/notes.c:405 builtin/notes.c:568 +#: builtin/notes.c:406 builtin/notes.c:569 msgid "note contents in a file" msgstr "" -#: builtin/notes.c:408 builtin/notes.c:571 +#: builtin/notes.c:409 builtin/notes.c:572 msgid "reuse and edit specified note object" msgstr "" -#: builtin/notes.c:411 builtin/notes.c:574 +#: builtin/notes.c:412 builtin/notes.c:575 msgid "reuse specified note object" msgstr "" -#: builtin/notes.c:414 builtin/notes.c:577 +#: builtin/notes.c:415 builtin/notes.c:578 msgid "allow storing empty note" msgstr "" -#: builtin/notes.c:415 builtin/notes.c:486 +#: builtin/notes.c:416 builtin/notes.c:487 msgid "replace existing notes" msgstr "" -#: builtin/notes.c:440 +#: builtin/notes.c:441 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -#: builtin/notes.c:455 builtin/notes.c:534 +#: builtin/notes.c:456 builtin/notes.c:535 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "" -#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891 +#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892 #, c-format msgid "Removing note for object %s\n" msgstr "" -#: builtin/notes.c:487 +#: builtin/notes.c:488 msgid "read objects from stdin" msgstr "" -#: builtin/notes.c:489 +#: builtin/notes.c:490 msgid "load rewriting config for <command> (implies --stdin)" msgstr "" -#: builtin/notes.c:507 +#: builtin/notes.c:508 msgid "too few parameters" msgstr "" -#: builtin/notes.c:528 +#: builtin/notes.c:529 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -#: builtin/notes.c:540 +#: builtin/notes.c:541 #, c-format msgid "missing notes on source object %s. Cannot copy." msgstr "" -#: builtin/notes.c:592 +#: builtin/notes.c:593 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" msgstr "" -#: builtin/notes.c:687 +#: builtin/notes.c:688 msgid "failed to delete ref NOTES_MERGE_PARTIAL" msgstr "" -#: builtin/notes.c:689 +#: builtin/notes.c:690 msgid "failed to delete ref NOTES_MERGE_REF" msgstr "" -#: builtin/notes.c:691 +#: builtin/notes.c:692 msgid "failed to remove 'git notes merge' worktree" msgstr "" -#: builtin/notes.c:711 +#: builtin/notes.c:712 msgid "failed to read ref NOTES_MERGE_PARTIAL" msgstr "" -#: builtin/notes.c:713 +#: builtin/notes.c:714 msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "" -#: builtin/notes.c:715 +#: builtin/notes.c:716 msgid "could not parse commit from NOTES_MERGE_PARTIAL." msgstr "" -#: builtin/notes.c:728 +#: builtin/notes.c:729 msgid "failed to resolve NOTES_MERGE_REF" msgstr "" -#: builtin/notes.c:731 +#: builtin/notes.c:732 msgid "failed to finalize notes merge" msgstr "" -#: builtin/notes.c:757 +#: builtin/notes.c:758 #, c-format msgid "unknown notes merge strategy %s" msgstr "" -#: builtin/notes.c:773 +#: builtin/notes.c:774 msgid "General options" msgstr "" -#: builtin/notes.c:775 +#: builtin/notes.c:776 msgid "Merge options" msgstr "" -#: builtin/notes.c:777 +#: builtin/notes.c:778 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" msgstr "" -#: builtin/notes.c:779 +#: builtin/notes.c:780 msgid "Committing unmerged notes" msgstr "" -#: builtin/notes.c:781 +#: builtin/notes.c:782 msgid "finalize notes merge by committing unmerged notes" msgstr "" -#: builtin/notes.c:783 +#: builtin/notes.c:784 msgid "Aborting notes merge resolution" msgstr "" -#: builtin/notes.c:785 +#: builtin/notes.c:786 msgid "abort notes merge" msgstr "" -#: builtin/notes.c:796 +#: builtin/notes.c:797 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "" -#: builtin/notes.c:801 +#: builtin/notes.c:802 msgid "must specify a notes ref to merge" msgstr "" -#: builtin/notes.c:825 +#: builtin/notes.c:826 #, c-format msgid "unknown -s/--strategy: %s" msgstr "" -#: builtin/notes.c:862 +#: builtin/notes.c:863 #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "" -#: builtin/notes.c:865 +#: builtin/notes.c:866 #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "" -#: builtin/notes.c:867 +#: builtin/notes.c:868 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " @@ -10277,218 +10430,218 @@ msgid "" "abort'.\n" msgstr "" -#: builtin/notes.c:889 +#: builtin/notes.c:890 #, c-format msgid "Object %s has no note\n" msgstr "" -#: builtin/notes.c:901 +#: builtin/notes.c:902 msgid "attempt to remove non-existent note is not an error" msgstr "" -#: builtin/notes.c:904 +#: builtin/notes.c:905 msgid "read object names from the standard input" msgstr "" -#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128 +#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:146 msgid "do not remove, show only" msgstr "" -#: builtin/notes.c:943 +#: builtin/notes.c:944 msgid "report pruned notes" msgstr "" -#: builtin/notes.c:985 +#: builtin/notes.c:986 msgid "notes-ref" msgstr "" -#: builtin/notes.c:986 +#: builtin/notes.c:987 msgid "use notes from <notes-ref>" msgstr "" -#: builtin/notes.c:1021 +#: builtin/notes.c:1022 #, c-format msgid "unknown subcommand: %s" msgstr "" -#: builtin/pack-objects.c:30 +#: builtin/pack-objects.c:31 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" -#: builtin/pack-objects.c:31 +#: builtin/pack-objects.c:32 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" -#: builtin/pack-objects.c:180 builtin/pack-objects.c:183 +#: builtin/pack-objects.c:181 builtin/pack-objects.c:184 #, c-format msgid "deflate error (%d)" msgstr "" -#: builtin/pack-objects.c:776 +#: builtin/pack-objects.c:777 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" -#: builtin/pack-objects.c:789 +#: builtin/pack-objects.c:790 msgid "Writing objects" msgstr "" -#: builtin/pack-objects.c:1069 +#: builtin/pack-objects.c:1070 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" -#: builtin/pack-objects.c:2434 +#: builtin/pack-objects.c:2440 msgid "Compressing objects" msgstr "" -#: builtin/pack-objects.c:2843 +#: builtin/pack-objects.c:2849 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:2847 +#: builtin/pack-objects.c:2853 #, c-format msgid "bad index version '%s'" msgstr "" -#: builtin/pack-objects.c:2877 +#: builtin/pack-objects.c:2883 msgid "do not show progress meter" msgstr "" -#: builtin/pack-objects.c:2879 +#: builtin/pack-objects.c:2885 msgid "show progress meter" msgstr "" -#: builtin/pack-objects.c:2881 +#: builtin/pack-objects.c:2887 msgid "show progress meter during object writing phase" msgstr "" -#: builtin/pack-objects.c:2884 +#: builtin/pack-objects.c:2890 msgid "similar to --all-progress when progress meter is shown" msgstr "" -#: builtin/pack-objects.c:2885 +#: builtin/pack-objects.c:2891 msgid "version[,offset]" msgstr "" -#: builtin/pack-objects.c:2886 +#: builtin/pack-objects.c:2892 msgid "write the pack index file in the specified idx format version" msgstr "" -#: builtin/pack-objects.c:2889 +#: builtin/pack-objects.c:2895 msgid "maximum size of each output pack file" msgstr "" -#: builtin/pack-objects.c:2891 +#: builtin/pack-objects.c:2897 msgid "ignore borrowed objects from alternate object store" msgstr "" -#: builtin/pack-objects.c:2893 +#: builtin/pack-objects.c:2899 msgid "ignore packed objects" msgstr "" -#: builtin/pack-objects.c:2895 +#: builtin/pack-objects.c:2901 msgid "limit pack window by objects" msgstr "" -#: builtin/pack-objects.c:2897 +#: builtin/pack-objects.c:2903 msgid "limit pack window by memory in addition to object limit" msgstr "" -#: builtin/pack-objects.c:2899 +#: builtin/pack-objects.c:2905 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" -#: builtin/pack-objects.c:2901 +#: builtin/pack-objects.c:2907 msgid "reuse existing deltas" msgstr "" -#: builtin/pack-objects.c:2903 +#: builtin/pack-objects.c:2909 msgid "reuse existing objects" msgstr "" -#: builtin/pack-objects.c:2905 +#: builtin/pack-objects.c:2911 msgid "use OFS_DELTA objects" msgstr "" -#: builtin/pack-objects.c:2907 +#: builtin/pack-objects.c:2913 msgid "use threads when searching for best delta matches" msgstr "" -#: builtin/pack-objects.c:2909 +#: builtin/pack-objects.c:2915 msgid "do not create an empty pack output" msgstr "" -#: builtin/pack-objects.c:2911 +#: builtin/pack-objects.c:2917 msgid "read revision arguments from standard input" msgstr "" -#: builtin/pack-objects.c:2913 +#: builtin/pack-objects.c:2919 msgid "limit the objects to those that are not yet packed" msgstr "" -#: builtin/pack-objects.c:2916 +#: builtin/pack-objects.c:2922 msgid "include objects reachable from any reference" msgstr "" -#: builtin/pack-objects.c:2919 +#: builtin/pack-objects.c:2925 msgid "include objects referred by reflog entries" msgstr "" -#: builtin/pack-objects.c:2922 +#: builtin/pack-objects.c:2928 msgid "include objects referred to by the index" msgstr "" -#: builtin/pack-objects.c:2925 +#: builtin/pack-objects.c:2931 msgid "output pack to stdout" msgstr "" -#: builtin/pack-objects.c:2927 +#: builtin/pack-objects.c:2933 msgid "include tag objects that refer to objects to be packed" msgstr "" -#: builtin/pack-objects.c:2929 +#: builtin/pack-objects.c:2935 msgid "keep unreachable objects" msgstr "" -#: builtin/pack-objects.c:2931 +#: builtin/pack-objects.c:2937 msgid "pack loose unreachable objects" msgstr "" -#: builtin/pack-objects.c:2933 +#: builtin/pack-objects.c:2939 msgid "unpack unreachable objects newer than <time>" msgstr "" -#: builtin/pack-objects.c:2936 +#: builtin/pack-objects.c:2942 msgid "create thin packs" msgstr "" -#: builtin/pack-objects.c:2938 +#: builtin/pack-objects.c:2944 msgid "create packs suitable for shallow fetches" msgstr "" -#: builtin/pack-objects.c:2940 +#: builtin/pack-objects.c:2946 msgid "ignore packs that have companion .keep file" msgstr "" -#: builtin/pack-objects.c:2942 +#: builtin/pack-objects.c:2948 msgid "pack compression level" msgstr "" -#: builtin/pack-objects.c:2944 +#: builtin/pack-objects.c:2950 msgid "do not hide commits by grafts" msgstr "" -#: builtin/pack-objects.c:2946 +#: builtin/pack-objects.c:2952 msgid "use a bitmap index if available to speed up counting objects" msgstr "" -#: builtin/pack-objects.c:2948 +#: builtin/pack-objects.c:2954 msgid "write a bitmap index together with the pack index" msgstr "" -#: builtin/pack-objects.c:3075 +#: builtin/pack-objects.c:3081 msgid "Counting objects" msgstr "" @@ -10504,11 +10657,11 @@ msgstr "" msgid "prune loose refs (default)" msgstr "" -#: builtin/prune-packed.c:7 +#: builtin/prune-packed.c:8 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" msgstr "" -#: builtin/prune-packed.c:40 +#: builtin/prune-packed.c:41 msgid "Removing duplicate objects" msgstr "" @@ -10549,7 +10702,7 @@ msgstr "" msgid "incorporate changes by rebasing rather than merging" msgstr "" -#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121 +#: builtin/pull.c:155 builtin/rebase--helper.c:21 builtin/revert.c:121 msgid "allow fast-forward" msgstr "" @@ -10570,24 +10723,24 @@ msgstr "" msgid "Invalid value for pull.ff: %s" msgstr "" -#: builtin/pull.c:399 +#: builtin/pull.c:403 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "" -#: builtin/pull.c:401 +#: builtin/pull.c:405 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" -#: builtin/pull.c:402 +#: builtin/pull.c:406 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "" -#: builtin/pull.c:405 +#: builtin/pull.c:409 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -10595,69 +10748,69 @@ msgid "" "for your current branch, you must specify a branch on the command line." msgstr "" -#: builtin/pull.c:410 git-parse-remote.sh:73 +#: builtin/pull.c:414 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "" -#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79 +#: builtin/pull.c:416 builtin/pull.c:431 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "" -#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82 +#: builtin/pull.c:418 builtin/pull.c:433 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "" -#: builtin/pull.c:415 builtin/pull.c:430 +#: builtin/pull.c:419 builtin/pull.c:434 msgid "See git-pull(1) for details." msgstr "" -#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432 +#: builtin/pull.c:421 builtin/pull.c:427 builtin/pull.c:436 #: git-parse-remote.sh:64 msgid "<remote>" msgstr "" -#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456 +#: builtin/pull.c:421 builtin/pull.c:436 builtin/pull.c:441 git-rebase.sh:466 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "" -#: builtin/pull.c:425 git-parse-remote.sh:75 +#: builtin/pull.c:429 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "" -#: builtin/pull.c:434 git-parse-remote.sh:95 +#: builtin/pull.c:438 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" -#: builtin/pull.c:439 +#: builtin/pull.c:443 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" "from the remote, but no such ref was fetched." msgstr "" -#: builtin/pull.c:792 +#: builtin/pull.c:796 msgid "ignoring --verify-signatures for rebase" msgstr "" -#: builtin/pull.c:840 +#: builtin/pull.c:844 msgid "--[no-]autostash option is only valid with --rebase." msgstr "" -#: builtin/pull.c:848 +#: builtin/pull.c:852 msgid "Updating an unborn branch with changes added to the index." msgstr "" -#: builtin/pull.c:851 +#: builtin/pull.c:855 msgid "pull with rebase" msgstr "" -#: builtin/pull.c:852 +#: builtin/pull.c:856 msgid "please commit or stash them." msgstr "" -#: builtin/pull.c:877 +#: builtin/pull.c:881 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -10665,7 +10818,7 @@ msgid "" "commit %s." msgstr "" -#: builtin/pull.c:882 +#: builtin/pull.c:886 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -10676,15 +10829,15 @@ msgid "" "to recover." msgstr "" -#: builtin/pull.c:897 +#: builtin/pull.c:901 msgid "Cannot merge multiple branches into empty head." msgstr "" -#: builtin/pull.c:901 +#: builtin/pull.c:905 msgid "Cannot rebase onto multiple branches." msgstr "" -#: builtin/pull.c:908 +#: builtin/pull.c:912 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" @@ -11006,19 +11159,47 @@ msgstr "" msgid "git rebase--helper [<options>]" msgstr "" -#: builtin/rebase--helper.c:20 +#: builtin/rebase--helper.c:22 +msgid "keep empty commits" +msgstr "" + +#: builtin/rebase--helper.c:23 msgid "continue rebase" msgstr "" -#: builtin/rebase--helper.c:22 +#: builtin/rebase--helper.c:25 msgid "abort rebase" msgstr "" -#: builtin/receive-pack.c:28 +#: builtin/rebase--helper.c:28 +msgid "make rebase script" +msgstr "" + +#: builtin/rebase--helper.c:30 +msgid "shorten SHA-1s in the todo list" +msgstr "" + +#: builtin/rebase--helper.c:32 +msgid "expand SHA-1s in the todo list" +msgstr "" + +#: builtin/rebase--helper.c:34 +msgid "check the todo list" +msgstr "" + +#: builtin/rebase--helper.c:36 +msgid "skip unnecessary picks" +msgstr "" + +#: builtin/rebase--helper.c:38 +msgid "rearrange fixup/squash lines" +msgstr "" + +#: builtin/receive-pack.c:29 msgid "git receive-pack <git-dir>" msgstr "" -#: builtin/receive-pack.c:838 +#: builtin/receive-pack.c:839 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" @@ -11035,7 +11216,7 @@ msgid "" "'receive.denyCurrentBranch' configuration variable to 'refuse'." msgstr "" -#: builtin/receive-pack.c:858 +#: builtin/receive-pack.c:859 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" @@ -11047,11 +11228,11 @@ msgid "" "To squelch this message, you can set it to 'refuse'." msgstr "" -#: builtin/receive-pack.c:1933 +#: builtin/receive-pack.c:1932 msgid "quiet" msgstr "" -#: builtin/receive-pack.c:1947 +#: builtin/receive-pack.c:1946 msgid "You must specify a directory." msgstr "" @@ -11196,12 +11377,12 @@ msgstr "" msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "" -#: builtin/remote.c:191 builtin/remote.c:630 +#: builtin/remote.c:191 builtin/remote.c:631 #, c-format msgid "remote %s already exists." msgstr "" -#: builtin/remote.c:195 builtin/remote.c:634 +#: builtin/remote.c:195 builtin/remote.c:635 #, c-format msgid "'%s' is not a valid remote name" msgstr "" @@ -11224,17 +11405,17 @@ msgstr "" msgid "(delete)" msgstr "" -#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857 +#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858 #, c-format msgid "No such remote: %s" msgstr "" -#: builtin/remote.c:640 +#: builtin/remote.c:641 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "" -#: builtin/remote.c:660 +#: builtin/remote.c:661 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -11242,17 +11423,17 @@ msgid "" "\tPlease update the configuration manually if necessary." msgstr "" -#: builtin/remote.c:696 +#: builtin/remote.c:697 #, c-format msgid "deleting '%s' failed" msgstr "" -#: builtin/remote.c:730 +#: builtin/remote.c:731 #, c-format msgid "creating '%s' failed" msgstr "" -#: builtin/remote.c:795 +#: builtin/remote.c:796 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -11262,113 +11443,113 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:809 +#: builtin/remote.c:810 #, c-format msgid "Could not remove config section '%s'" msgstr "" -#: builtin/remote.c:910 +#: builtin/remote.c:911 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr "" -#: builtin/remote.c:913 +#: builtin/remote.c:914 msgid " tracked" msgstr "" -#: builtin/remote.c:915 +#: builtin/remote.c:916 msgid " stale (use 'git remote prune' to remove)" msgstr "" -#: builtin/remote.c:917 +#: builtin/remote.c:918 msgid " ???" msgstr "" -#: builtin/remote.c:958 +#: builtin/remote.c:959 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "" -#: builtin/remote.c:966 +#: builtin/remote.c:967 #, c-format msgid "rebases interactively onto remote %s" msgstr "" -#: builtin/remote.c:967 +#: builtin/remote.c:968 #, c-format msgid "rebases onto remote %s" msgstr "" -#: builtin/remote.c:970 +#: builtin/remote.c:971 #, c-format msgid " merges with remote %s" msgstr "" -#: builtin/remote.c:973 +#: builtin/remote.c:974 #, c-format msgid "merges with remote %s" msgstr "" -#: builtin/remote.c:976 +#: builtin/remote.c:977 #, c-format msgid "%-*s and with remote %s\n" msgstr "" -#: builtin/remote.c:1019 +#: builtin/remote.c:1020 msgid "create" msgstr "" -#: builtin/remote.c:1022 +#: builtin/remote.c:1023 msgid "delete" msgstr "" -#: builtin/remote.c:1026 +#: builtin/remote.c:1027 msgid "up to date" msgstr "" -#: builtin/remote.c:1029 +#: builtin/remote.c:1030 msgid "fast-forwardable" msgstr "" -#: builtin/remote.c:1032 +#: builtin/remote.c:1033 msgid "local out of date" msgstr "" -#: builtin/remote.c:1039 +#: builtin/remote.c:1040 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr "" -#: builtin/remote.c:1042 +#: builtin/remote.c:1043 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr "" -#: builtin/remote.c:1046 +#: builtin/remote.c:1047 #, c-format msgid " %-*s forces to %s" msgstr "" -#: builtin/remote.c:1049 +#: builtin/remote.c:1050 #, c-format msgid " %-*s pushes to %s" msgstr "" -#: builtin/remote.c:1117 +#: builtin/remote.c:1118 msgid "do not query remotes" msgstr "" -#: builtin/remote.c:1144 +#: builtin/remote.c:1145 #, c-format msgid "* remote %s" msgstr "" -#: builtin/remote.c:1145 +#: builtin/remote.c:1146 #, c-format msgid " Fetch URL: %s" msgstr "" -#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301 +#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302 msgid "(no URL)" msgstr "" @@ -11376,184 +11557,184 @@ msgstr "" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1160 builtin/remote.c:1162 +#: builtin/remote.c:1161 builtin/remote.c:1163 #, c-format msgid " Push URL: %s" msgstr "" -#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168 +#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169 #, c-format msgid " HEAD branch: %s" msgstr "" -#: builtin/remote.c:1164 +#: builtin/remote.c:1165 msgid "(not queried)" msgstr "" -#: builtin/remote.c:1166 +#: builtin/remote.c:1167 msgid "(unknown)" msgstr "" -#: builtin/remote.c:1170 +#: builtin/remote.c:1171 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr "" -#: builtin/remote.c:1182 +#: builtin/remote.c:1183 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1185 builtin/remote.c:1211 +#: builtin/remote.c:1186 builtin/remote.c:1212 msgid " (status not queried)" msgstr "" -#: builtin/remote.c:1194 +#: builtin/remote.c:1195 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1202 +#: builtin/remote.c:1203 msgid " Local refs will be mirrored by 'git push'" msgstr "" -#: builtin/remote.c:1208 +#: builtin/remote.c:1209 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1229 +#: builtin/remote.c:1230 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "" -#: builtin/remote.c:1231 +#: builtin/remote.c:1232 msgid "delete refs/remotes/<name>/HEAD" msgstr "" -#: builtin/remote.c:1246 +#: builtin/remote.c:1247 msgid "Cannot determine remote HEAD" msgstr "" -#: builtin/remote.c:1248 +#: builtin/remote.c:1249 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" -#: builtin/remote.c:1258 +#: builtin/remote.c:1259 #, c-format msgid "Could not delete %s" msgstr "" -#: builtin/remote.c:1266 +#: builtin/remote.c:1267 #, c-format msgid "Not a valid ref: %s" msgstr "" -#: builtin/remote.c:1268 +#: builtin/remote.c:1269 #, c-format msgid "Could not setup %s" msgstr "" -#: builtin/remote.c:1286 +#: builtin/remote.c:1287 #, c-format msgid " %s will become dangling!" msgstr "" -#: builtin/remote.c:1287 +#: builtin/remote.c:1288 #, c-format msgid " %s has become dangling!" msgstr "" -#: builtin/remote.c:1297 +#: builtin/remote.c:1298 #, c-format msgid "Pruning %s" msgstr "" -#: builtin/remote.c:1298 +#: builtin/remote.c:1299 #, c-format msgid "URL: %s" msgstr "" -#: builtin/remote.c:1314 +#: builtin/remote.c:1315 #, c-format msgid " * [would prune] %s" msgstr "" -#: builtin/remote.c:1317 +#: builtin/remote.c:1318 #, c-format msgid " * [pruned] %s" msgstr "" -#: builtin/remote.c:1362 +#: builtin/remote.c:1363 msgid "prune remotes after fetching" msgstr "" -#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547 +#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548 #, c-format msgid "No such remote '%s'" msgstr "" -#: builtin/remote.c:1441 +#: builtin/remote.c:1442 msgid "add branch" msgstr "" -#: builtin/remote.c:1448 +#: builtin/remote.c:1449 msgid "no remote specified" msgstr "" -#: builtin/remote.c:1465 +#: builtin/remote.c:1466 msgid "query push URLs rather than fetch URLs" msgstr "" -#: builtin/remote.c:1467 +#: builtin/remote.c:1468 msgid "return all URLs" msgstr "" -#: builtin/remote.c:1495 +#: builtin/remote.c:1496 #, c-format msgid "no URLs configured for remote '%s'" msgstr "" -#: builtin/remote.c:1521 +#: builtin/remote.c:1522 msgid "manipulate push URLs" msgstr "" -#: builtin/remote.c:1523 +#: builtin/remote.c:1524 msgid "add URL" msgstr "" -#: builtin/remote.c:1525 +#: builtin/remote.c:1526 msgid "delete URLs" msgstr "" -#: builtin/remote.c:1532 +#: builtin/remote.c:1533 msgid "--add --delete doesn't make sense" msgstr "" -#: builtin/remote.c:1573 +#: builtin/remote.c:1572 #, c-format msgid "Invalid old URL pattern: %s" msgstr "" -#: builtin/remote.c:1581 +#: builtin/remote.c:1580 #, c-format msgid "No such URL found: %s" msgstr "" -#: builtin/remote.c:1583 +#: builtin/remote.c:1582 msgid "Will not delete all non-push URLs" msgstr "" -#: builtin/remote.c:1597 +#: builtin/remote.c:1598 msgid "be verbose; must be placed before a subcommand" msgstr "" -#: builtin/remote.c:1628 +#: builtin/remote.c:1629 #, c-format msgid "Unknown subcommand: %s" msgstr "" @@ -11648,7 +11829,7 @@ msgstr "" msgid "--keep-unreachable and -A are incompatible" msgstr "" -#: builtin/repack.c:406 builtin/worktree.c:116 +#: builtin/repack.c:406 builtin/worktree.c:134 #, c-format msgid "failed to remove '%s'" msgstr "" @@ -11778,119 +11959,119 @@ msgstr "" msgid "keep" msgstr "" -#: builtin/reset.c:77 +#: builtin/reset.c:78 msgid "You do not have a valid HEAD." msgstr "" -#: builtin/reset.c:79 +#: builtin/reset.c:80 msgid "Failed to find tree of HEAD." msgstr "" -#: builtin/reset.c:85 +#: builtin/reset.c:86 #, c-format msgid "Failed to find tree of %s." msgstr "" -#: builtin/reset.c:103 +#: builtin/reset.c:113 #, c-format msgid "HEAD is now at %s" msgstr "" -#: builtin/reset.c:186 +#: builtin/reset.c:197 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "" -#: builtin/reset.c:286 +#: builtin/reset.c:297 msgid "be quiet, only report errors" msgstr "" -#: builtin/reset.c:288 +#: builtin/reset.c:299 msgid "reset HEAD and index" msgstr "" -#: builtin/reset.c:289 +#: builtin/reset.c:300 msgid "reset only HEAD" msgstr "" -#: builtin/reset.c:291 builtin/reset.c:293 +#: builtin/reset.c:302 builtin/reset.c:304 msgid "reset HEAD, index and working tree" msgstr "" -#: builtin/reset.c:295 +#: builtin/reset.c:306 msgid "reset HEAD but keep local changes" msgstr "" -#: builtin/reset.c:301 +#: builtin/reset.c:312 msgid "record only the fact that removed paths will be added later" msgstr "" -#: builtin/reset.c:320 +#: builtin/reset.c:329 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "" -#: builtin/reset.c:328 +#: builtin/reset.c:337 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "" -#: builtin/reset.c:337 +#: builtin/reset.c:346 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "" -#: builtin/reset.c:346 +#: builtin/reset.c:355 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" -#: builtin/reset.c:348 +#: builtin/reset.c:357 #, c-format msgid "Cannot do %s reset with paths." msgstr "" -#: builtin/reset.c:358 +#: builtin/reset.c:367 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "" -#: builtin/reset.c:362 +#: builtin/reset.c:371 msgid "-N can only be used with --mixed" msgstr "" -#: builtin/reset.c:379 +#: builtin/reset.c:388 msgid "Unstaged changes after reset:" msgstr "" -#: builtin/reset.c:385 +#: builtin/reset.c:394 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "" -#: builtin/reset.c:389 +#: builtin/reset.c:398 msgid "Could not write new index file." msgstr "" -#: builtin/rev-list.c:358 +#: builtin/rev-list.c:361 msgid "rev-list does not support display of notes" msgstr "" -#: builtin/rev-parse.c:394 +#: builtin/rev-parse.c:402 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "" -#: builtin/rev-parse.c:399 +#: builtin/rev-parse.c:407 msgid "keep the `--` passed as an arg" msgstr "" -#: builtin/rev-parse.c:401 +#: builtin/rev-parse.c:409 msgid "stop parsing after the first non-option argument" msgstr "" -#: builtin/rev-parse.c:404 +#: builtin/rev-parse.c:412 msgid "output in stuck long form" msgstr "" -#: builtin/rev-parse.c:535 +#: builtin/rev-parse.c:545 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -11976,11 +12157,11 @@ msgstr "" msgid "keep redundant, empty commits" msgstr "" -#: builtin/revert.c:212 +#: builtin/revert.c:214 msgid "revert failed" msgstr "" -#: builtin/revert.c:225 +#: builtin/revert.c:227 msgid "cherry-pick failed" msgstr "" @@ -12042,17 +12223,17 @@ msgstr "" msgid "exit with a zero status even if nothing matched" msgstr "" -#: builtin/rm.c:308 +#: builtin/rm.c:307 #, c-format msgid "not removing '%s' recursively without -r" msgstr "" -#: builtin/rm.c:347 +#: builtin/rm.c:346 #, c-format msgid "git rm: unable to remove %s" msgstr "" -#: builtin/rm.c:370 +#: builtin/rm.c:369 #, c-format msgid "could not remove '%s'" msgstr "" @@ -12085,27 +12266,27 @@ msgstr "" msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" msgstr "" -#: builtin/shortlog.c:249 +#: builtin/shortlog.c:263 msgid "Group by committer rather than author" msgstr "" -#: builtin/shortlog.c:251 +#: builtin/shortlog.c:265 msgid "sort output according to the number of commits per author" msgstr "" -#: builtin/shortlog.c:253 +#: builtin/shortlog.c:267 msgid "Suppress commit descriptions, only provides commit count" msgstr "" -#: builtin/shortlog.c:255 +#: builtin/shortlog.c:269 msgid "Show the email address of each author" msgstr "" -#: builtin/shortlog.c:256 +#: builtin/shortlog.c:270 msgid "w[,i1[,i2]]" msgstr "" -#: builtin/shortlog.c:257 +#: builtin/shortlog.c:271 msgid "Linewrap output" msgstr "" @@ -12297,215 +12478,215 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "" -#: builtin/submodule--helper.c:25 builtin/submodule--helper.c:1075 +#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1094 #, c-format msgid "No such ref: %s" msgstr "" -#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084 +#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1103 #, c-format msgid "Expecting a full ref name, got %s" msgstr "" -#: builtin/submodule--helper.c:72 +#: builtin/submodule--helper.c:71 #, c-format msgid "cannot strip one component off url '%s'" msgstr "" -#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630 +#: builtin/submodule--helper.c:302 builtin/submodule--helper.c:623 msgid "alternative anchor for relative paths" msgstr "" -#: builtin/submodule--helper.c:310 +#: builtin/submodule--helper.c:307 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "" -#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380 +#: builtin/submodule--helper.c:350 builtin/submodule--helper.c:374 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "" -#: builtin/submodule--helper.c:395 +#: builtin/submodule--helper.c:389 #, c-format msgid "" "could not lookup configuration '%s'. Assuming this repository is its own " "authoritative upstream." msgstr "" -#: builtin/submodule--helper.c:406 +#: builtin/submodule--helper.c:400 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:410 +#: builtin/submodule--helper.c:404 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "" -#: builtin/submodule--helper.c:420 +#: builtin/submodule--helper.c:414 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "" -#: builtin/submodule--helper.c:427 +#: builtin/submodule--helper.c:421 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:443 +#: builtin/submodule--helper.c:437 msgid "Suppress output for initializing a submodule" msgstr "" -#: builtin/submodule--helper.c:448 +#: builtin/submodule--helper.c:442 msgid "git submodule--helper init [<path>]" msgstr "" -#: builtin/submodule--helper.c:476 +#: builtin/submodule--helper.c:470 msgid "git submodule--helper name <path>" msgstr "" -#: builtin/submodule--helper.c:482 +#: builtin/submodule--helper.c:475 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "" -#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568 +#: builtin/submodule--helper.c:558 builtin/submodule--helper.c:561 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "" -#: builtin/submodule--helper.c:604 +#: builtin/submodule--helper.c:597 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "" -#: builtin/submodule--helper.c:611 +#: builtin/submodule--helper.c:604 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "" -#: builtin/submodule--helper.c:633 +#: builtin/submodule--helper.c:626 msgid "where the new submodule will be cloned to" msgstr "" -#: builtin/submodule--helper.c:636 +#: builtin/submodule--helper.c:629 msgid "name of the new submodule" msgstr "" -#: builtin/submodule--helper.c:639 +#: builtin/submodule--helper.c:632 msgid "url where to clone the submodule from" msgstr "" -#: builtin/submodule--helper.c:645 +#: builtin/submodule--helper.c:638 msgid "depth for shallow clones" msgstr "" -#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993 +#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:1012 msgid "force cloning progress" msgstr "" -#: builtin/submodule--helper.c:653 +#: builtin/submodule--helper.c:646 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" msgstr "" -#: builtin/submodule--helper.c:684 +#: builtin/submodule--helper.c:677 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "" -#: builtin/submodule--helper.c:699 +#: builtin/submodule--helper.c:692 #, c-format msgid "could not get submodule directory for '%s'" msgstr "" -#: builtin/submodule--helper.c:764 +#: builtin/submodule--helper.c:757 #, c-format msgid "Submodule path '%s' not initialized" msgstr "" -#: builtin/submodule--helper.c:768 +#: builtin/submodule--helper.c:761 msgid "Maybe you want to use 'update --init'?" msgstr "" -#: builtin/submodule--helper.c:793 +#: builtin/submodule--helper.c:790 #, c-format msgid "Skipping unmerged submodule %s" msgstr "" -#: builtin/submodule--helper.c:814 +#: builtin/submodule--helper.c:819 #, c-format msgid "Skipping submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:942 +#: builtin/submodule--helper.c:952 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "" -#: builtin/submodule--helper.c:953 +#: builtin/submodule--helper.c:963 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "" -#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162 +#: builtin/submodule--helper.c:993 builtin/submodule--helper.c:1213 msgid "path into the working tree" msgstr "" -#: builtin/submodule--helper.c:977 +#: builtin/submodule--helper.c:996 msgid "path into the working tree, across nested submodule boundaries" msgstr "" -#: builtin/submodule--helper.c:981 +#: builtin/submodule--helper.c:1000 msgid "rebase, merge, checkout or none" msgstr "" -#: builtin/submodule--helper.c:985 +#: builtin/submodule--helper.c:1004 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "" -#: builtin/submodule--helper.c:988 +#: builtin/submodule--helper.c:1007 msgid "parallel jobs" msgstr "" -#: builtin/submodule--helper.c:990 +#: builtin/submodule--helper.c:1009 msgid "whether the initial clone should follow the shallow recommendation" msgstr "" -#: builtin/submodule--helper.c:991 +#: builtin/submodule--helper.c:1010 msgid "don't print cloning progress" msgstr "" -#: builtin/submodule--helper.c:998 +#: builtin/submodule--helper.c:1017 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "" -#: builtin/submodule--helper.c:1008 +#: builtin/submodule--helper.c:1030 msgid "bad value for update parameter" msgstr "" -#: builtin/submodule--helper.c:1079 +#: builtin/submodule--helper.c:1098 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " "the superproject is not on any branch" msgstr "" -#: builtin/submodule--helper.c:1163 +#: builtin/submodule--helper.c:1214 msgid "recurse into submodules" msgstr "" -#: builtin/submodule--helper.c:1169 +#: builtin/submodule--helper.c:1220 msgid "git submodule--helper embed-git-dir [<path>...]" msgstr "" -#: builtin/submodule--helper.c:1232 +#: builtin/submodule--helper.c:1278 #, c-format msgid "%s doesn't support --super-prefix" msgstr "" -#: builtin/submodule--helper.c:1238 +#: builtin/submodule--helper.c:1284 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "" @@ -12518,23 +12699,23 @@ msgstr "" msgid "git symbolic-ref -d [-q] <name>" msgstr "" -#: builtin/symbolic-ref.c:41 +#: builtin/symbolic-ref.c:40 msgid "suppress error message for non-symbolic (detached) refs" msgstr "" -#: builtin/symbolic-ref.c:42 +#: builtin/symbolic-ref.c:41 msgid "delete symbolic ref" msgstr "" -#: builtin/symbolic-ref.c:43 +#: builtin/symbolic-ref.c:42 msgid "shorten ref output" msgstr "" -#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason" msgstr "" -#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason of the update" msgstr "" @@ -12559,17 +12740,17 @@ msgstr "" msgid "git tag -v [--format=<format>] <tagname>..." msgstr "" -#: builtin/tag.c:84 +#: builtin/tag.c:86 #, c-format msgid "tag '%s' not found." msgstr "" -#: builtin/tag.c:100 +#: builtin/tag.c:102 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "" -#: builtin/tag.c:129 +#: builtin/tag.c:131 #, c-format msgid "" "\n" @@ -12578,7 +12759,7 @@ msgid "" "Lines starting with '%c' will be ignored.\n" msgstr "" -#: builtin/tag.c:133 +#: builtin/tag.c:135 #, c-format msgid "" "\n" @@ -12588,142 +12769,142 @@ msgid "" "want to.\n" msgstr "" -#: builtin/tag.c:211 +#: builtin/tag.c:189 msgid "unable to sign the tag" msgstr "" -#: builtin/tag.c:213 +#: builtin/tag.c:191 msgid "unable to write tag file" msgstr "" -#: builtin/tag.c:237 +#: builtin/tag.c:215 msgid "bad object type." msgstr "" -#: builtin/tag.c:283 +#: builtin/tag.c:261 msgid "no tag message?" msgstr "" -#: builtin/tag.c:290 +#: builtin/tag.c:268 #, c-format msgid "The tag message has been left in %s\n" msgstr "" -#: builtin/tag.c:398 +#: builtin/tag.c:376 msgid "list tag names" msgstr "" -#: builtin/tag.c:400 +#: builtin/tag.c:378 msgid "print <n> lines of each tag message" msgstr "" -#: builtin/tag.c:402 +#: builtin/tag.c:380 msgid "delete tags" msgstr "" -#: builtin/tag.c:403 +#: builtin/tag.c:381 msgid "verify tags" msgstr "" -#: builtin/tag.c:405 +#: builtin/tag.c:383 msgid "Tag creation options" msgstr "" -#: builtin/tag.c:407 +#: builtin/tag.c:385 msgid "annotated tag, needs a message" msgstr "" -#: builtin/tag.c:409 +#: builtin/tag.c:387 msgid "tag message" msgstr "" -#: builtin/tag.c:411 +#: builtin/tag.c:389 msgid "annotated and GPG-signed tag" msgstr "" -#: builtin/tag.c:415 +#: builtin/tag.c:393 msgid "use another key to sign the tag" msgstr "" -#: builtin/tag.c:416 +#: builtin/tag.c:394 msgid "replace the tag if exists" msgstr "" -#: builtin/tag.c:417 builtin/update-ref.c:369 +#: builtin/tag.c:395 builtin/update-ref.c:368 msgid "create a reflog" msgstr "" -#: builtin/tag.c:419 +#: builtin/tag.c:397 msgid "Tag listing options" msgstr "" -#: builtin/tag.c:420 +#: builtin/tag.c:398 msgid "show tag list in columns" msgstr "" -#: builtin/tag.c:421 builtin/tag.c:423 +#: builtin/tag.c:399 builtin/tag.c:401 msgid "print only tags that contain the commit" msgstr "" -#: builtin/tag.c:422 builtin/tag.c:424 +#: builtin/tag.c:400 builtin/tag.c:402 msgid "print only tags that don't contain the commit" msgstr "" -#: builtin/tag.c:425 +#: builtin/tag.c:403 msgid "print only tags that are merged" msgstr "" -#: builtin/tag.c:426 +#: builtin/tag.c:404 msgid "print only tags that are not merged" msgstr "" -#: builtin/tag.c:431 +#: builtin/tag.c:409 msgid "print only tags of the object" msgstr "" -#: builtin/tag.c:470 +#: builtin/tag.c:453 msgid "--column and -n are incompatible" msgstr "" -#: builtin/tag.c:492 +#: builtin/tag.c:475 msgid "-n option is only allowed in list mode" msgstr "" -#: builtin/tag.c:494 +#: builtin/tag.c:477 msgid "--contains option is only allowed in list mode" msgstr "" -#: builtin/tag.c:496 +#: builtin/tag.c:479 msgid "--no-contains option is only allowed in list mode" msgstr "" -#: builtin/tag.c:498 +#: builtin/tag.c:481 msgid "--points-at option is only allowed in list mode" msgstr "" -#: builtin/tag.c:500 +#: builtin/tag.c:483 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "" -#: builtin/tag.c:511 +#: builtin/tag.c:494 msgid "only one -F or -m option is allowed." msgstr "" -#: builtin/tag.c:530 +#: builtin/tag.c:513 msgid "too many params" msgstr "" -#: builtin/tag.c:536 +#: builtin/tag.c:519 #, c-format msgid "'%s' is not a valid tag name." msgstr "" -#: builtin/tag.c:541 +#: builtin/tag.c:524 #, c-format msgid "tag '%s' already exists" msgstr "" -#: builtin/tag.c:571 +#: builtin/tag.c:554 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "" @@ -12790,155 +12971,155 @@ msgstr "" msgid " OK" msgstr "" -#: builtin/update-index.c:569 +#: builtin/update-index.c:571 msgid "git update-index [<options>] [--] [<file>...]" msgstr "" -#: builtin/update-index.c:924 +#: builtin/update-index.c:926 msgid "continue refresh even when index needs update" msgstr "" -#: builtin/update-index.c:927 +#: builtin/update-index.c:929 msgid "refresh: ignore submodules" msgstr "" -#: builtin/update-index.c:930 +#: builtin/update-index.c:932 msgid "do not ignore new files" msgstr "" -#: builtin/update-index.c:932 +#: builtin/update-index.c:934 msgid "let files replace directories and vice-versa" msgstr "" -#: builtin/update-index.c:934 +#: builtin/update-index.c:936 msgid "notice files missing from worktree" msgstr "" -#: builtin/update-index.c:936 +#: builtin/update-index.c:938 msgid "refresh even if index contains unmerged entries" msgstr "" -#: builtin/update-index.c:939 +#: builtin/update-index.c:941 msgid "refresh stat information" msgstr "" -#: builtin/update-index.c:943 +#: builtin/update-index.c:945 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "" -#: builtin/update-index.c:947 +#: builtin/update-index.c:949 msgid "<mode>,<object>,<path>" msgstr "" -#: builtin/update-index.c:948 +#: builtin/update-index.c:950 msgid "add the specified entry to the index" msgstr "" -#: builtin/update-index.c:957 +#: builtin/update-index.c:959 msgid "mark files as \"not changing\"" msgstr "" -#: builtin/update-index.c:960 +#: builtin/update-index.c:962 msgid "clear assumed-unchanged bit" msgstr "" -#: builtin/update-index.c:963 +#: builtin/update-index.c:965 msgid "mark files as \"index-only\"" msgstr "" -#: builtin/update-index.c:966 +#: builtin/update-index.c:968 msgid "clear skip-worktree bit" msgstr "" -#: builtin/update-index.c:969 +#: builtin/update-index.c:971 msgid "add to index only; do not add content to object database" msgstr "" -#: builtin/update-index.c:971 +#: builtin/update-index.c:973 msgid "remove named paths even if present in worktree" msgstr "" -#: builtin/update-index.c:973 +#: builtin/update-index.c:975 msgid "with --stdin: input lines are terminated by null bytes" msgstr "" -#: builtin/update-index.c:975 +#: builtin/update-index.c:977 msgid "read list of paths to be updated from standard input" msgstr "" -#: builtin/update-index.c:979 +#: builtin/update-index.c:981 msgid "add entries from standard input to the index" msgstr "" -#: builtin/update-index.c:983 +#: builtin/update-index.c:985 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" -#: builtin/update-index.c:987 +#: builtin/update-index.c:989 msgid "only update entries that differ from HEAD" msgstr "" -#: builtin/update-index.c:991 +#: builtin/update-index.c:993 msgid "ignore files missing from worktree" msgstr "" -#: builtin/update-index.c:994 +#: builtin/update-index.c:996 msgid "report actions to standard output" msgstr "" -#: builtin/update-index.c:996 +#: builtin/update-index.c:998 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" -#: builtin/update-index.c:1000 +#: builtin/update-index.c:1002 msgid "write index in this format" msgstr "" -#: builtin/update-index.c:1002 +#: builtin/update-index.c:1004 msgid "enable or disable split index" msgstr "" -#: builtin/update-index.c:1004 +#: builtin/update-index.c:1006 msgid "enable/disable untracked cache" msgstr "" -#: builtin/update-index.c:1006 +#: builtin/update-index.c:1008 msgid "test if the filesystem supports untracked cache" msgstr "" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1010 msgid "enable untracked cache without testing the filesystem" msgstr "" -#: builtin/update-index.c:1108 +#: builtin/update-index.c:1107 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" msgstr "" -#: builtin/update-index.c:1117 +#: builtin/update-index.c:1116 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" msgstr "" -#: builtin/update-index.c:1128 +#: builtin/update-index.c:1127 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" msgstr "" -#: builtin/update-index.c:1132 +#: builtin/update-index.c:1131 msgid "Untracked cache disabled" msgstr "" -#: builtin/update-index.c:1140 +#: builtin/update-index.c:1139 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" msgstr "" -#: builtin/update-index.c:1144 +#: builtin/update-index.c:1143 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "" @@ -12955,19 +13136,19 @@ msgstr "" msgid "git update-ref [<options>] --stdin [-z]" msgstr "" -#: builtin/update-ref.c:364 +#: builtin/update-ref.c:363 msgid "delete the reference" msgstr "" -#: builtin/update-ref.c:366 +#: builtin/update-ref.c:365 msgid "update <refname> not the one it points to" msgstr "" -#: builtin/update-ref.c:367 +#: builtin/update-ref.c:366 msgid "stdin has NUL-terminated arguments" msgstr "" -#: builtin/update-ref.c:368 +#: builtin/update-ref.c:367 msgid "read updates from stdin" msgstr "" @@ -13031,102 +13212,109 @@ msgstr "" msgid "git worktree unlock <path>" msgstr "" -#: builtin/worktree.c:44 +#: builtin/worktree.c:46 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "" -#: builtin/worktree.c:50 +#: builtin/worktree.c:52 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "" -#: builtin/worktree.c:55 +#: builtin/worktree.c:57 builtin/worktree.c:66 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "" -#: builtin/worktree.c:66 +#: builtin/worktree.c:76 +#, c-format +msgid "" +"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " +"%<PRIuMAX>)" +msgstr "" + +#: builtin/worktree.c:84 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "" -#: builtin/worktree.c:82 +#: builtin/worktree.c:100 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "" -#: builtin/worktree.c:129 +#: builtin/worktree.c:147 msgid "report pruned working trees" msgstr "" -#: builtin/worktree.c:131 +#: builtin/worktree.c:149 msgid "expire working trees older than <time>" msgstr "" -#: builtin/worktree.c:205 +#: builtin/worktree.c:223 #, c-format msgid "'%s' already exists" msgstr "" -#: builtin/worktree.c:236 +#: builtin/worktree.c:254 #, c-format msgid "could not create directory of '%s'" msgstr "" -#: builtin/worktree.c:275 +#: builtin/worktree.c:293 #, c-format msgid "Preparing %s (identifier %s)" msgstr "" -#: builtin/worktree.c:327 +#: builtin/worktree.c:345 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" -#: builtin/worktree.c:329 +#: builtin/worktree.c:347 msgid "create a new branch" msgstr "" -#: builtin/worktree.c:331 +#: builtin/worktree.c:349 msgid "create or reset a branch" msgstr "" -#: builtin/worktree.c:333 +#: builtin/worktree.c:351 msgid "populate the new working tree" msgstr "" -#: builtin/worktree.c:334 +#: builtin/worktree.c:352 msgid "keep the new working tree locked" msgstr "" -#: builtin/worktree.c:342 +#: builtin/worktree.c:360 msgid "-b, -B, and --detach are mutually exclusive" msgstr "" -#: builtin/worktree.c:479 +#: builtin/worktree.c:499 msgid "reason for locking" msgstr "" -#: builtin/worktree.c:491 builtin/worktree.c:524 +#: builtin/worktree.c:511 builtin/worktree.c:544 #, c-format msgid "'%s' is not a working tree" msgstr "" -#: builtin/worktree.c:493 builtin/worktree.c:526 +#: builtin/worktree.c:513 builtin/worktree.c:546 msgid "The main working tree cannot be locked or unlocked" msgstr "" -#: builtin/worktree.c:498 +#: builtin/worktree.c:518 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "" -#: builtin/worktree.c:500 +#: builtin/worktree.c:520 #, c-format msgid "'%s' is already locked" msgstr "" -#: builtin/worktree.c:528 +#: builtin/worktree.c:548 #, c-format msgid "'%s' is not locked" msgstr "" @@ -13151,23 +13339,23 @@ msgstr "" msgid "git upload-pack [<options>] <dir>" msgstr "" -#: upload-pack.c:1041 +#: upload-pack.c:1040 msgid "quit after a single request/response exchange" msgstr "" -#: upload-pack.c:1043 +#: upload-pack.c:1042 msgid "exit immediately after initial ref advertisement" msgstr "" -#: upload-pack.c:1045 +#: upload-pack.c:1044 msgid "do not try <directory>/.git/ if <directory> is no Git directory" msgstr "" -#: upload-pack.c:1047 +#: upload-pack.c:1046 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "" -#: credential-cache--daemon.c:224 +#: credential-cache--daemon.c:222 #, c-format msgid "" "The permissions on your socket directory are too loose; other\n" @@ -13176,7 +13364,7 @@ msgid "" "\tchmod 0700 %s" msgstr "" -#: credential-cache--daemon.c:272 +#: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "" @@ -13187,20 +13375,20 @@ msgid "" "to read about a specific subcommand or concept." msgstr "" -#: http.c:337 +#: http.c:338 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "" -#: http.c:358 +#: http.c:359 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "" -#: http.c:367 +#: http.c:368 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "" -#: http.c:1764 +#: http.c:1768 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -13544,7 +13732,7 @@ msgstr "" #: git-merge-octopus.sh:77 #, sh-format -msgid "Already up-to-date with $pretty_name" +msgid "Already up to date with $pretty_name" msgstr "" #: git-merge-octopus.sh:89 @@ -13563,53 +13751,54 @@ msgstr "" #: git-rebase.sh:58 msgid "" -"When you have resolved this problem, run \"git rebase --continue\".\n" -"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" -"To check out the original branch and stop rebasing, run \"git rebase --abort" -"\"." +"Resolve all conflicts manually, mark them as resolved with\n" +"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" +"You can instead skip this commit: run \"git rebase --skip\".\n" +"To abort and get back to the state before \"git rebase\", run \"git rebase --" +"abort\"." msgstr "" -#: git-rebase.sh:158 git-rebase.sh:397 +#: git-rebase.sh:160 git-rebase.sh:402 #, sh-format msgid "Could not move back to $head_name" msgstr "" -#: git-rebase.sh:169 +#: git-rebase.sh:171 msgid "Applied autostash." msgstr "" -#: git-rebase.sh:172 +#: git-rebase.sh:174 #, sh-format msgid "Cannot store $stash_sha1" msgstr "" -#: git-rebase.sh:212 +#: git-rebase.sh:214 msgid "The pre-rebase hook refused to rebase." msgstr "" -#: git-rebase.sh:217 +#: git-rebase.sh:219 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "" -#: git-rebase.sh:358 +#: git-rebase.sh:363 msgid "No rebase in progress?" msgstr "" -#: git-rebase.sh:369 +#: git-rebase.sh:374 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" -#: git-rebase.sh:376 +#: git-rebase.sh:381 msgid "Cannot read HEAD" msgstr "" -#: git-rebase.sh:379 +#: git-rebase.sh:384 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" msgstr "" -#: git-rebase.sh:419 +#: git-rebase.sh:424 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -13622,101 +13811,101 @@ msgid "" "valuable there." msgstr "" -#: git-rebase.sh:470 +#: git-rebase.sh:480 #, sh-format msgid "invalid upstream $upstream_name" msgstr "" -#: git-rebase.sh:494 +#: git-rebase.sh:504 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "" -#: git-rebase.sh:497 git-rebase.sh:501 +#: git-rebase.sh:507 git-rebase.sh:511 #, sh-format msgid "$onto_name: there is no merge base" msgstr "" -#: git-rebase.sh:506 +#: git-rebase.sh:516 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "" -#: git-rebase.sh:529 +#: git-rebase.sh:539 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "" -#: git-rebase.sh:562 +#: git-rebase.sh:572 msgid "Cannot autostash" msgstr "" -#: git-rebase.sh:567 +#: git-rebase.sh:577 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "" -#: git-rebase.sh:571 +#: git-rebase.sh:581 msgid "Please commit or stash them." msgstr "" -#: git-rebase.sh:591 +#: git-rebase.sh:601 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "" -#: git-rebase.sh:595 +#: git-rebase.sh:605 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "" -#: git-rebase.sh:606 +#: git-rebase.sh:616 #, sh-format msgid "Changes from $mb to $onto:" msgstr "" -#: git-rebase.sh:615 +#: git-rebase.sh:625 msgid "First, rewinding head to replay your work on top of it..." msgstr "" -#: git-rebase.sh:625 +#: git-rebase.sh:635 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "" -#: git-stash.sh:54 +#: git-stash.sh:61 msgid "git stash clear with parameters is unimplemented" msgstr "" -#: git-stash.sh:95 +#: git-stash.sh:102 msgid "You do not have the initial commit yet" msgstr "" -#: git-stash.sh:110 +#: git-stash.sh:117 msgid "Cannot save the current index state" msgstr "" -#: git-stash.sh:125 +#: git-stash.sh:132 msgid "Cannot save the untracked files" msgstr "" -#: git-stash.sh:145 git-stash.sh:158 +#: git-stash.sh:152 git-stash.sh:165 msgid "Cannot save the current worktree state" msgstr "" -#: git-stash.sh:162 +#: git-stash.sh:169 msgid "No changes selected" msgstr "" -#: git-stash.sh:165 +#: git-stash.sh:172 msgid "Cannot remove temporary index (can't happen)" msgstr "" -#: git-stash.sh:178 +#: git-stash.sh:185 msgid "Cannot record working tree state" msgstr "" -#: git-stash.sh:210 +#: git-stash.sh:217 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "" @@ -13731,114 +13920,114 @@ msgstr "" #. $ git stash save --blah-blah 2>&1 | head -n 2 #. error: unknown option for 'stash save': --blah-blah #. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:266 +#: git-stash.sh:273 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" " To provide a message, use git stash save -- '$option'" msgstr "" -#: git-stash.sh:281 +#: git-stash.sh:288 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "" -#: git-stash.sh:289 +#: git-stash.sh:296 msgid "No local changes to save" msgstr "" -#: git-stash.sh:294 +#: git-stash.sh:301 msgid "Cannot initialize stash" msgstr "" -#: git-stash.sh:298 +#: git-stash.sh:305 msgid "Cannot save the current status" msgstr "" -#: git-stash.sh:299 +#: git-stash.sh:306 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "" -#: git-stash.sh:326 +#: git-stash.sh:334 msgid "Cannot remove worktree changes" msgstr "" -#: git-stash.sh:474 +#: git-stash.sh:482 #, sh-format msgid "unknown option: $opt" msgstr "" -#: git-stash.sh:487 +#: git-stash.sh:495 msgid "No stash entries found." msgstr "" -#: git-stash.sh:494 +#: git-stash.sh:502 #, sh-format msgid "Too many revisions specified: $REV" msgstr "" -#: git-stash.sh:509 +#: git-stash.sh:517 #, sh-format msgid "$reference is not a valid reference" msgstr "" -#: git-stash.sh:537 +#: git-stash.sh:545 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "" -#: git-stash.sh:548 +#: git-stash.sh:556 #, sh-format msgid "'$args' is not a stash reference" msgstr "" -#: git-stash.sh:556 +#: git-stash.sh:564 msgid "unable to refresh index" msgstr "" -#: git-stash.sh:560 +#: git-stash.sh:568 msgid "Cannot apply a stash in the middle of a merge" msgstr "" -#: git-stash.sh:568 +#: git-stash.sh:576 msgid "Conflicts in index. Try without --index." msgstr "" -#: git-stash.sh:570 +#: git-stash.sh:578 msgid "Could not save index tree" msgstr "" -#: git-stash.sh:579 +#: git-stash.sh:587 msgid "Could not restore untracked files from stash entry" msgstr "" -#: git-stash.sh:604 +#: git-stash.sh:612 msgid "Cannot unstage modified files" msgstr "" -#: git-stash.sh:619 +#: git-stash.sh:627 msgid "Index was not unstashed." msgstr "" -#: git-stash.sh:633 +#: git-stash.sh:641 msgid "The stash entry is kept in case you need it again." msgstr "" -#: git-stash.sh:642 +#: git-stash.sh:650 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "" -#: git-stash.sh:643 +#: git-stash.sh:651 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "" -#: git-stash.sh:651 +#: git-stash.sh:659 msgid "No branch name specified" msgstr "" -#: git-stash.sh:730 +#: git-stash.sh:738 msgid "(To restore them type \"git stash apply\")" msgstr "" @@ -13969,110 +14158,110 @@ msgstr "" msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" -#: git-submodule.sh:638 +#: git-submodule.sh:637 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:648 +#: git-submodule.sh:647 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:653 +#: git-submodule.sh:652 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " "'$sm_path'" msgstr "" -#: git-submodule.sh:671 +#: git-submodule.sh:670 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:677 +#: git-submodule.sh:676 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " "Direct fetching of that commit failed." msgstr "" -#: git-submodule.sh:684 +#: git-submodule.sh:683 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:685 +#: git-submodule.sh:684 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "" -#: git-submodule.sh:689 +#: git-submodule.sh:688 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:690 +#: git-submodule.sh:689 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "" -#: git-submodule.sh:695 +#: git-submodule.sh:694 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:696 +#: git-submodule.sh:695 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "" -#: git-submodule.sh:701 +#: git-submodule.sh:700 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:702 +#: git-submodule.sh:701 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "" -#: git-submodule.sh:733 +#: git-submodule.sh:732 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:841 +#: git-submodule.sh:840 msgid "The --cached option cannot be used with the --files option" msgstr "" -#: git-submodule.sh:893 +#: git-submodule.sh:892 #, sh-format msgid "unexpected mode $mod_dst" msgstr "" -#: git-submodule.sh:913 +#: git-submodule.sh:912 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr "" -#: git-submodule.sh:916 +#: git-submodule.sh:915 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr "" -#: git-submodule.sh:919 +#: git-submodule.sh:918 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" -#: git-submodule.sh:1065 +#: git-submodule.sh:1064 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:1137 +#: git-submodule.sh:1136 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "" @@ -14091,13 +14280,13 @@ msgstr "" msgid "" "\n" "Commands:\n" -" p, pick = use commit\n" -" r, reword = use commit, but edit the commit message\n" -" e, edit = use commit, but stop for amending\n" -" s, squash = use commit, but meld into previous commit\n" -" f, fixup = like \"squash\", but discard this commit's log message\n" -" x, exec = run command (the rest of the line) using shell\n" -" d, drop = remove commit\n" +"p, pick = use commit\n" +"r, reword = use commit, but edit the commit message\n" +"e, edit = use commit, but stop for amending\n" +"s, squash = use commit, but meld into previous commit\n" +"f, fixup = like \"squash\", but discard this commit's log message\n" +"x, exec = run command (the rest of the line) using shell\n" +"d, drop = remove commit\n" "\n" "These lines can be re-ordered; they are executed from top to bottom.\n" msgstr "" @@ -14160,49 +14349,49 @@ msgstr "" msgid "Refusing to squash a merge: $sha1" msgstr "" -#: git-rebase--interactive.sh:399 +#: git-rebase--interactive.sh:400 #, sh-format msgid "Error redoing merge $sha1" msgstr "" -#: git-rebase--interactive.sh:407 +#: git-rebase--interactive.sh:408 #, sh-format msgid "Could not pick $sha1" msgstr "" -#: git-rebase--interactive.sh:416 +#: git-rebase--interactive.sh:417 #, sh-format msgid "This is the commit message #${n}:" msgstr "" -#: git-rebase--interactive.sh:421 +#: git-rebase--interactive.sh:422 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "" -#: git-rebase--interactive.sh:432 +#: git-rebase--interactive.sh:433 #, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." msgstr[0] "" msgstr[1] "" -#: git-rebase--interactive.sh:441 +#: git-rebase--interactive.sh:442 #, sh-format msgid "Cannot write $fixup_msg" msgstr "" -#: git-rebase--interactive.sh:444 +#: git-rebase--interactive.sh:445 msgid "This is a combination of 2 commits." msgstr "" -#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528 -#: git-rebase--interactive.sh:531 +#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529 +#: git-rebase--interactive.sh:532 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "" -#: git-rebase--interactive.sh:559 +#: git-rebase--interactive.sh:560 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -14212,31 +14401,31 @@ msgid "" "you are able to reword the commit." msgstr "" -#: git-rebase--interactive.sh:574 +#: git-rebase--interactive.sh:575 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "" -#: git-rebase--interactive.sh:589 +#: git-rebase--interactive.sh:590 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "" -#: git-rebase--interactive.sh:631 +#: git-rebase--interactive.sh:632 #, sh-format msgid "Executing: $rest" msgstr "" -#: git-rebase--interactive.sh:639 +#: git-rebase--interactive.sh:640 #, sh-format msgid "Execution failed: $rest" msgstr "" -#: git-rebase--interactive.sh:641 +#: git-rebase--interactive.sh:642 msgid "and made changes to the index and/or the working tree" msgstr "" -#: git-rebase--interactive.sh:643 +#: git-rebase--interactive.sh:644 msgid "" "You can fix the problem, and then run\n" "\n" @@ -14244,7 +14433,7 @@ msgid "" msgstr "" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--interactive.sh:656 +#: git-rebase--interactive.sh:657 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -14254,79 +14443,29 @@ msgid "" "\tgit rebase --continue" msgstr "" -#: git-rebase--interactive.sh:667 +#: git-rebase--interactive.sh:668 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "" -#: git-rebase--interactive.sh:668 +#: git-rebase--interactive.sh:669 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "" -#: git-rebase--interactive.sh:703 +#: git-rebase--interactive.sh:704 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "" -#: git-rebase--interactive.sh:750 -msgid "Could not skip unnecessary pick commands" -msgstr "" - -#: git-rebase--interactive.sh:908 -#, sh-format -msgid "" -"Warning: the SHA-1 is missing or isn't a commit in the following line:\n" -" - $line" -msgstr "" - -#: git-rebase--interactive.sh:941 -#, sh-format -msgid "" -"Warning: the command isn't recognized in the following line:\n" -" - $line" -msgstr "" - -#: git-rebase--interactive.sh:980 +#: git-rebase--interactive.sh:749 msgid "could not detach HEAD" msgstr "" -#: git-rebase--interactive.sh:1018 -msgid "" -"Warning: some commits may have been dropped accidentally.\n" -"Dropped commits (newer to older):" -msgstr "" - -#: git-rebase--interactive.sh:1026 -msgid "" -"To avoid this message, use \"drop\" to explicitly remove a commit.\n" -"\n" -"Use 'git config rebase.missingCommitsCheck' to change the level of " -"warnings.\n" -"The possible behaviours are: ignore, warn, error." -msgstr "" - -#: git-rebase--interactive.sh:1037 -#, sh-format -msgid "" -"Unrecognized setting $check_level for option rebase.missingCommitsCheck. " -"Ignoring." -msgstr "" - -#: git-rebase--interactive.sh:1054 -msgid "" -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" -"continue'." -msgstr "" - -#: git-rebase--interactive.sh:1055 -msgid "Or you can abort the rebase with 'git rebase --abort'." -msgstr "" - -#: git-rebase--interactive.sh:1083 +#: git-rebase--interactive.sh:784 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "" -#: git-rebase--interactive.sh:1088 +#: git-rebase--interactive.sh:789 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -14344,21 +14483,21 @@ msgid "" " git rebase --continue\n" msgstr "" -#: git-rebase--interactive.sh:1105 +#: git-rebase--interactive.sh:806 msgid "Error trying to find the author identity to amend commit" msgstr "" -#: git-rebase--interactive.sh:1110 +#: git-rebase--interactive.sh:811 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." msgstr "" -#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119 +#: git-rebase--interactive.sh:816 git-rebase--interactive.sh:820 msgid "Could not commit staged changes." msgstr "" -#: git-rebase--interactive.sh:1147 +#: git-rebase--interactive.sh:848 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -14367,47 +14506,47 @@ msgid "" "\n" msgstr "" -#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313 +#: git-rebase--interactive.sh:856 git-rebase--interactive.sh:1015 msgid "Could not execute editor" msgstr "" -#: git-rebase--interactive.sh:1168 +#: git-rebase--interactive.sh:869 #, sh-format msgid "Could not checkout $switch_to" msgstr "" -#: git-rebase--interactive.sh:1173 +#: git-rebase--interactive.sh:874 msgid "No HEAD?" msgstr "" -#: git-rebase--interactive.sh:1174 +#: git-rebase--interactive.sh:875 #, sh-format msgid "Could not create temporary $state_dir" msgstr "" -#: git-rebase--interactive.sh:1176 +#: git-rebase--interactive.sh:877 msgid "Could not mark as interactive" msgstr "" -#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191 +#: git-rebase--interactive.sh:887 git-rebase--interactive.sh:892 msgid "Could not init rewritten commits" msgstr "" -#: git-rebase--interactive.sh:1291 +#: git-rebase--interactive.sh:993 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "" msgstr[1] "" -#: git-rebase--interactive.sh:1296 +#: git-rebase--interactive.sh:998 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" "\n" msgstr "" -#: git-rebase--interactive.sh:1303 +#: git-rebase--interactive.sh:1005 msgid "Note that empty commits are commented out" msgstr "" @@ -14914,60 +15053,60 @@ msgstr "" msgid "local time offset greater than or equal to 24 hours\n" msgstr "" -#: git-send-email.perl:208 git-send-email.perl:214 +#: git-send-email.perl:207 git-send-email.perl:213 msgid "the editor exited uncleanly, aborting everything" msgstr "" -#: git-send-email.perl:291 +#: git-send-email.perl:290 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "" -#: git-send-email.perl:296 +#: git-send-email.perl:295 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "" -#: git-send-email.perl:314 +#: git-send-email.perl:313 msgid "--dump-aliases incompatible with other options\n" msgstr "" -#: git-send-email.perl:379 git-send-email.perl:634 +#: git-send-email.perl:378 git-send-email.perl:629 msgid "Cannot run git format-patch from outside a repository\n" msgstr "" -#: git-send-email.perl:448 +#: git-send-email.perl:447 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "" -#: git-send-email.perl:477 +#: git-send-email.perl:476 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "" -#: git-send-email.perl:509 +#: git-send-email.perl:504 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "" -#: git-send-email.perl:511 +#: git-send-email.perl:506 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "" -#: git-send-email.perl:513 +#: git-send-email.perl:508 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "" -#: git-send-email.perl:518 +#: git-send-email.perl:513 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "" -#: git-send-email.perl:600 +#: git-send-email.perl:595 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -14977,36 +15116,36 @@ msgid "" " * Giving --format-patch option if you mean a range.\n" msgstr "" -#: git-send-email.perl:621 +#: git-send-email.perl:616 #, perl-format msgid "Failed to opendir %s: %s" msgstr "" -#: git-send-email.perl:645 +#: git-send-email.perl:640 #, perl-format msgid "" "fatal: %s: %s\n" "warning: no patches were sent\n" msgstr "" -#: git-send-email.perl:656 +#: git-send-email.perl:651 msgid "" "\n" "No patch files specified!\n" "\n" msgstr "" -#: git-send-email.perl:669 +#: git-send-email.perl:664 #, perl-format msgid "No subject line in %s?" msgstr "" -#: git-send-email.perl:679 +#: git-send-email.perl:674 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "" -#: git-send-email.perl:689 +#: git-send-email.perl:684 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -15015,41 +15154,41 @@ msgid "" "Clear the body content if you don't wish to send a summary.\n" msgstr "" -#: git-send-email.perl:712 +#: git-send-email.perl:707 #, perl-format msgid "Failed to open %s.final: %s" msgstr "" -#: git-send-email.perl:715 +#: git-send-email.perl:710 #, perl-format msgid "Failed to open %s: %s" msgstr "" -#: git-send-email.perl:750 +#: git-send-email.perl:745 msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n" msgstr "" -#: git-send-email.perl:759 +#: git-send-email.perl:754 msgid "Summary email is empty, skipping it\n" msgstr "" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:791 +#: git-send-email.perl:786 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "" -#: git-send-email.perl:820 +#: git-send-email.perl:815 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" msgstr "" -#: git-send-email.perl:825 +#: git-send-email.perl:820 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "" -#: git-send-email.perl:833 +#: git-send-email.perl:828 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -15058,20 +15197,20 @@ msgid "" "want to send.\n" msgstr "" -#: git-send-email.perl:852 +#: git-send-email.perl:847 msgid "To whom should the emails be sent (if anyone)?" msgstr "" -#: git-send-email.perl:870 +#: git-send-email.perl:865 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "" -#: git-send-email.perl:882 +#: git-send-email.perl:877 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "" -#: git-send-email.perl:932 git-send-email.perl:940 +#: git-send-email.perl:927 git-send-email.perl:935 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "" @@ -15079,16 +15218,16 @@ msgstr "" #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:944 +#: git-send-email.perl:939 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "" -#: git-send-email.perl:1245 +#: git-send-email.perl:1260 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "" -#: git-send-email.perl:1320 +#: git-send-email.perl:1335 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -15105,128 +15244,128 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1335 +#: git-send-email.perl:1350 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): " msgstr "" -#: git-send-email.perl:1338 +#: git-send-email.perl:1353 msgid "Send this email reply required" msgstr "" -#: git-send-email.perl:1364 +#: git-send-email.perl:1379 msgid "The required SMTP server is not properly defined." msgstr "" -#: git-send-email.perl:1411 +#: git-send-email.perl:1426 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "" -#: git-send-email.perl:1416 git-send-email.perl:1420 +#: git-send-email.perl:1431 git-send-email.perl:1435 #, perl-format msgid "STARTTLS failed! %s" msgstr "" -#: git-send-email.perl:1430 +#: git-send-email.perl:1445 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" -#: git-send-email.perl:1448 +#: git-send-email.perl:1463 #, perl-format msgid "Failed to send %s\n" msgstr "" -#: git-send-email.perl:1451 +#: git-send-email.perl:1466 #, perl-format msgid "Dry-Sent %s\n" msgstr "" -#: git-send-email.perl:1451 +#: git-send-email.perl:1466 #, perl-format msgid "Sent %s\n" msgstr "" -#: git-send-email.perl:1453 +#: git-send-email.perl:1468 msgid "Dry-OK. Log says:\n" msgstr "" -#: git-send-email.perl:1453 +#: git-send-email.perl:1468 msgid "OK. Log says:\n" msgstr "" -#: git-send-email.perl:1465 +#: git-send-email.perl:1480 msgid "Result: " msgstr "" -#: git-send-email.perl:1468 +#: git-send-email.perl:1483 msgid "Result: OK\n" msgstr "" -#: git-send-email.perl:1481 +#: git-send-email.perl:1496 #, perl-format msgid "can't open file %s" msgstr "" -#: git-send-email.perl:1528 git-send-email.perl:1548 +#: git-send-email.perl:1543 git-send-email.perl:1563 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1534 +#: git-send-email.perl:1549 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1582 +#: git-send-email.perl:1597 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1605 +#: git-send-email.perl:1622 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1711 +#: git-send-email.perl:1728 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "" -#: git-send-email.perl:1718 +#: git-send-email.perl:1735 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "" -#: git-send-email.perl:1722 +#: git-send-email.perl:1739 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "" -#: git-send-email.perl:1749 +#: git-send-email.perl:1766 msgid "cannot send message as 7bit" msgstr "" -#: git-send-email.perl:1757 +#: git-send-email.perl:1774 msgid "invalid transfer encoding" msgstr "" -#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856 +#: git-send-email.perl:1812 git-send-email.perl:1863 git-send-email.perl:1873 #, perl-format msgid "unable to open %s: %s\n" msgstr "" -#: git-send-email.perl:1798 +#: git-send-email.perl:1815 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "" -#: git-send-email.perl:1814 +#: git-send-email.perl:1831 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1818 +#: git-send-email.perl:1835 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "" @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: Git Russian Localization Project\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2017-07-24 21:54+0800\n" -"PO-Revision-Date: 2017-07-30 09:20+0000\n" +"POT-Creation-Date: 2017-10-08 09:48+0800\n" +"PO-Revision-Date: 2017-10-15 09:56+0000\n" "Last-Translator: Dimitriy Ryazantcev <DJm00n@mail.ru>\n" "Language-Team: Russian (http://www.transifex.com/djm00n/git-po-ru/language/ru/)\n" "MIME-Version: 1.0\n" @@ -60,7 +60,7 @@ msgstr "Исправьте их в рабочем каталоге, затем msgid "Exiting because of an unresolved conflict." msgstr "Выход из-за неразрешенного конфликта." -#: advice.c:117 builtin/merge.c:1184 +#: advice.c:117 builtin/merge.c:1211 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Вы не завершили слияние (присутствует файл MERGE_HEAD)." @@ -98,82 +98,82 @@ msgstr "неопознанная опция для пробелов «%s»" msgid "unrecognized whitespace ignore option '%s'" msgstr "неопознанная опция для игнорирования пробелов «%s»" -#: apply.c:126 +#: apply.c:125 msgid "--reject and --3way cannot be used together." msgstr "--reject и --3way нельзя использовать одновременно." -#: apply.c:128 +#: apply.c:127 msgid "--cached and --3way cannot be used together." msgstr "--cached и --3way нельзя использовать одновременно." -#: apply.c:131 +#: apply.c:130 msgid "--3way outside a repository" msgstr "--3way вне репозитория" -#: apply.c:142 +#: apply.c:141 msgid "--index outside a repository" msgstr "--index вне репозитория" -#: apply.c:145 +#: apply.c:144 msgid "--cached outside a repository" msgstr "--cached вне репозитория" -#: apply.c:836 +#: apply.c:845 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Не удалось подготовить регулярное выражение для метки времени %s" -#: apply.c:845 +#: apply.c:854 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec возвратил %d для ввода: %s" -#: apply.c:929 +#: apply.c:928 #, c-format msgid "unable to find filename in patch at line %d" msgstr "не удалось найти имя файла в строке патча %d" -#: apply.c:967 +#: apply.c:966 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git apply: плохой git-diff — ожидалось /dev/null, получено %s на строке %d" -#: apply.c:973 +#: apply.c:972 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply: плохой git-diff — не согласующееся новое имя файла на строке %d" -#: apply.c:974 +#: apply.c:973 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply: плохой git-diff — не согласующееся старое имя файла на строке %d" -#: apply.c:979 +#: apply.c:978 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: плохой git-diff — ожидалось /dev/null на строке %d" -#: apply.c:1008 +#: apply.c:1007 #, c-format msgid "invalid mode on line %d: %s" msgstr "недопустимый режим %d: %s" -#: apply.c:1326 +#: apply.c:1325 #, c-format msgid "inconsistent header lines %d and %d" msgstr "противоречивые строки заголовка %d и %d" -#: apply.c:1498 +#: apply.c:1497 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: не ожидаемая строка: %.*s" -#: apply.c:1567 +#: apply.c:1566 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "фрагмент изменений без заголовка на строке %d: %.*s" -#: apply.c:1587 +#: apply.c:1586 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname" @@ -186,70 +186,70 @@ msgstr[1] "заголовок git diff не нашел информацию об msgstr[2] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (строка %d)" msgstr[3] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (строка %d)" -#: apply.c:1600 +#: apply.c:1599 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "заголовок git diff не содержит информации об имени файла (строка %d)" -#: apply.c:1770 +#: apply.c:1787 msgid "new file depends on old contents" msgstr "новый файл зависит от старого содержимого" -#: apply.c:1772 +#: apply.c:1789 msgid "deleted file still has contents" msgstr "удаленный файл все еще имеет содержимое" -#: apply.c:1806 +#: apply.c:1823 #, c-format msgid "corrupt patch at line %d" msgstr "патч поврежден на строке %d" -#: apply.c:1843 +#: apply.c:1860 #, c-format msgid "new file %s depends on old contents" msgstr "новый файл %s зависит от старого содержимого" -#: apply.c:1845 +#: apply.c:1862 #, c-format msgid "deleted file %s still has contents" msgstr "удаленный файл %s все еще имеет содержимое" -#: apply.c:1848 +#: apply.c:1865 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** предупреждение: файл %s становится пустым, но не удаляется" -#: apply.c:1995 +#: apply.c:2012 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "поврежденный двоичный патч на строке %d: %.*s" -#: apply.c:2032 +#: apply.c:2049 #, c-format msgid "unrecognized binary patch at line %d" msgstr "неопознанный двоичный патч на строке %d" -#: apply.c:2193 +#: apply.c:2209 #, c-format msgid "patch with only garbage at line %d" msgstr "патч с мусором на строке %d" -#: apply.c:2276 +#: apply.c:2295 #, c-format msgid "unable to read symlink %s" msgstr "не удалось прочитать символьную ссылку %s" -#: apply.c:2280 +#: apply.c:2299 #, c-format msgid "unable to open or read %s" msgstr "не удалось открыть или прочесть %s" -#: apply.c:2933 +#: apply.c:2958 #, c-format msgid "invalid start of line: '%c'" msgstr "неправильное начало строки: «%c»" -#: apply.c:3052 +#: apply.c:3077 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." @@ -258,257 +258,257 @@ msgstr[1] "Часть #%d успешно применена на %d (со сдв msgstr[2] "Часть #%d успешно применена на %d (со сдвигом в %d строк)." msgstr[3] "Часть #%d успешно применена на %d (со сдвигом в %d строк)." -#: apply.c:3064 +#: apply.c:3089 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Контекст сужен до (%ld/%ld), чтобы применить фрагмент на %d строке" -#: apply.c:3070 +#: apply.c:3095 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "при поиске:\n%.*s" -#: apply.c:3092 +#: apply.c:3117 #, c-format msgid "missing binary patch data for '%s'" msgstr "пропущены данные двоичного патча для «%s»" -#: apply.c:3100 +#: apply.c:3125 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "невозможно выполнить reverse-apply для двоичного патча, без обращения изменений блока «%s»" -#: apply.c:3146 +#: apply.c:3171 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "невозможно применить двоичный патч «%s» без строки с указанной полной версией индекса" -#: apply.c:3156 +#: apply.c:3181 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "патч применятся к файлу «%s» (%s), но его текущее содержимое не соотвествует ожидаемому." -#: apply.c:3164 +#: apply.c:3189 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "патч применяется к пустому файлу «%s», но файл не пустой" -#: apply.c:3182 +#: apply.c:3207 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "не удалось прочитать необходимую посылку %s для «%s»" -#: apply.c:3195 +#: apply.c:3220 #, c-format msgid "binary patch does not apply to '%s'" msgstr "не удалось применить двоичный патч к «%s»" -#: apply.c:3201 +#: apply.c:3226 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "после применения двоичного патча для «%s» был получен неправильный результат (ожидалось %s, получено %s)" -#: apply.c:3222 +#: apply.c:3247 #, c-format msgid "patch failed: %s:%ld" msgstr "ошибка применения изменений: %s:%ld" -#: apply.c:3344 +#: apply.c:3369 #, c-format msgid "cannot checkout %s" msgstr "не удалось переключить состояние на %s" -#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277 +#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277 #, c-format msgid "failed to read %s" msgstr "не удалось прочитать %s" -#: apply.c:3400 +#: apply.c:3426 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "чтение из «%s» за символической ссылкой" -#: apply.c:3429 apply.c:3669 +#: apply.c:3455 apply.c:3695 #, c-format msgid "path %s has been renamed/deleted" msgstr "путь %s был переименован/удален" -#: apply.c:3512 apply.c:3683 +#: apply.c:3538 apply.c:3709 #, c-format msgid "%s: does not exist in index" msgstr "%s: нет в индексе" -#: apply.c:3521 apply.c:3691 +#: apply.c:3547 apply.c:3717 #, c-format msgid "%s: does not match index" msgstr "%s: не совпадает с индексом" -#: apply.c:3556 +#: apply.c:3582 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "в репозитории отсутствует необходимый двоичный объект для отката к трёхходовому слиянию." -#: apply.c:3559 +#: apply.c:3585 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Откат к трёхходовому слиянию…\n" -#: apply.c:3575 apply.c:3579 +#: apply.c:3601 apply.c:3605 #, c-format msgid "cannot read the current contents of '%s'" msgstr "не удалось прочитать текущее содержимое «%s»" -#: apply.c:3591 +#: apply.c:3617 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Не удалось откатиться к трёхходовому слиянию…\n" -#: apply.c:3605 +#: apply.c:3631 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Патч применен к «%s» с конфликтами.\n" -#: apply.c:3610 +#: apply.c:3636 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Патч применен к «%s» без ошибок.\n" -#: apply.c:3636 +#: apply.c:3662 msgid "removal patch leaves file contents" msgstr "патч удаления не удалил содержимое файла" -#: apply.c:3708 +#: apply.c:3734 #, c-format msgid "%s: wrong type" msgstr "%s: неправильный тип" -#: apply.c:3710 +#: apply.c:3736 #, c-format msgid "%s has type %o, expected %o" msgstr "%s имеет тип %o, а ожидался %o" -#: apply.c:3860 apply.c:3862 +#: apply.c:3886 apply.c:3888 #, c-format msgid "invalid path '%s'" msgstr "неправильный путь «%s»" -#: apply.c:3918 +#: apply.c:3944 #, c-format msgid "%s: already exists in index" msgstr "%s: уже содержится в индексе" -#: apply.c:3921 +#: apply.c:3947 #, c-format msgid "%s: already exists in working directory" msgstr "%s: уже содержится в рабочем каталоге" -#: apply.c:3941 +#: apply.c:3967 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "новый режим доступа (%o) для %s не соответствует старому режиму доступа (%o)" -#: apply.c:3946 +#: apply.c:3972 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "новый режим доступа (%o) для %s не соответствует старому режиму доступа (%o) для %s" -#: apply.c:3966 +#: apply.c:3992 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "затронутый файл «%s» находится за символической ссылкой" -#: apply.c:3970 +#: apply.c:3996 #, c-format msgid "%s: patch does not apply" msgstr "%s: не удалось применить патч" -#: apply.c:3985 +#: apply.c:4011 #, c-format msgid "Checking patch %s..." msgstr "Проверка патча %s…" -#: apply.c:4076 +#: apply.c:4102 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "информация об sha1 отсутствует или бесполезна для подмодуля %s" -#: apply.c:4083 +#: apply.c:4109 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "изменен режим для %s, который не находится в текущем HEAD" -#: apply.c:4086 +#: apply.c:4112 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "информация об sha1 отсутствует или бесполезна (%s)." -#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138 +#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "сбой make_cache_entry для пути «%s»" -#: apply.c:4095 +#: apply.c:4121 #, c-format msgid "could not add %s to temporary index" msgstr "не удалось добавить %s во временный индекс" -#: apply.c:4105 +#: apply.c:4131 #, c-format msgid "could not write temporary index to %s" msgstr "не удалось записать временный индкекс в %s" -#: apply.c:4243 +#: apply.c:4269 #, c-format msgid "unable to remove %s from index" msgstr "не удалось удалить %s из индекса" -#: apply.c:4278 +#: apply.c:4304 #, c-format msgid "corrupt patch for submodule %s" msgstr "поврежденный патч для подмодуля %s" -#: apply.c:4284 +#: apply.c:4310 #, c-format msgid "unable to stat newly created file '%s'" msgstr "не удалось выполнить stat для созданного файла «%s»" -#: apply.c:4292 +#: apply.c:4318 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "не удалось создать вспомогательный файл для созданного файла %s" -#: apply.c:4298 apply.c:4442 +#: apply.c:4324 apply.c:4468 #, c-format msgid "unable to add cache entry for %s" msgstr "не удалось создать запись в кэше для %s" -#: apply.c:4339 +#: apply.c:4365 #, c-format msgid "failed to write to '%s'" msgstr "не удалось записать в «%s»" -#: apply.c:4343 +#: apply.c:4369 #, c-format msgid "closing file '%s'" msgstr "закрытие файла «%s»" -#: apply.c:4413 +#: apply.c:4439 #, c-format msgid "unable to write file '%s' mode %o" msgstr "не удалось записать файл «%s» с режимом доступа %o" -#: apply.c:4511 +#: apply.c:4537 #, c-format msgid "Applied patch %s cleanly." msgstr "Патч %s применен без ошибок." -#: apply.c:4519 +#: apply.c:4545 msgid "internal error" msgstr "внутренняя ошибка" -#: apply.c:4522 +#: apply.c:4548 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." @@ -517,45 +517,45 @@ msgstr[1] "Применение патча %%s с %d отказами…" msgstr[2] "Применение патча %%s с %d отказами…" msgstr[3] "Применение патча %%s с %d отказами…" -#: apply.c:4533 +#: apply.c:4559 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "усечение имени .rej файла до %.*s.rej" -#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988 +#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010 #, c-format msgid "cannot open %s" msgstr "не удалось открыть %s" -#: apply.c:4555 +#: apply.c:4581 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Блок №%d применен без ошибок." -#: apply.c:4559 +#: apply.c:4585 #, c-format msgid "Rejected hunk #%d." msgstr "Блок №%d отклонен." -#: apply.c:4669 +#: apply.c:4695 #, c-format msgid "Skipped patch '%s'." msgstr "Патч «%s» пропущен." -#: apply.c:4677 +#: apply.c:4703 msgid "unrecognized input" msgstr "не распознанный ввод" -#: apply.c:4696 +#: apply.c:4722 msgid "unable to read index file" msgstr "не удалось прочитать файл индекса" -#: apply.c:4833 +#: apply.c:4859 #, c-format msgid "can't open patch '%s': %s" msgstr "не удалось открыть патч «%s»: %s" -#: apply.c:4860 +#: apply.c:4886 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" @@ -564,7 +564,7 @@ msgstr[1] "пропущено %d ошибки в пробельных симво msgstr[2] "пропущено %d ошибок в пробельных символах" msgstr[3] "пропущено %d ошибок в пробельных символах" -#: apply.c:4866 apply.c:4881 +#: apply.c:4892 apply.c:4907 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -573,7 +573,7 @@ msgstr[1] "%d строки добавили ошибки в пробельных msgstr[2] "%d строк добавили ошибки в пробельных символах." msgstr[3] "%d строк добавили ошибки в пробельных символах." -#: apply.c:4874 +#: apply.c:4900 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." @@ -582,134 +582,135 @@ msgstr[1] "%d строки добавлено после исправления msgstr[2] "%d строк добавлено после исправления ошибок в пробелах." msgstr[3] "%d строки добавлено после исправления ошибок в пробелах." -#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391 +#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "Не удалось записать новый файл индекса" -#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260 -#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187 -#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629 -#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973 -#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161 +#: apply.c:4947 apply.c:4950 builtin/am.c:2256 builtin/am.c:2259 +#: builtin/clone.c:116 builtin/fetch.c:115 builtin/pull.c:187 +#: builtin/submodule--helper.c:301 builtin/submodule--helper.c:622 +#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:992 +#: builtin/submodule--helper.c:995 builtin/submodule--helper.c:1212 #: git-add--interactive.perl:197 msgid "path" msgstr "путь" -#: apply.c:4922 +#: apply.c:4948 msgid "don't apply changes matching the given path" msgstr "не применять изменения по указанному пути" -#: apply.c:4925 +#: apply.c:4951 msgid "apply changes matching the given path" msgstr "применять изменения по указанному пути" -#: apply.c:4927 builtin/am.c:2266 +#: apply.c:4953 builtin/am.c:2265 msgid "num" msgstr "количество" -#: apply.c:4928 +#: apply.c:4954 msgid "remove <num> leading slashes from traditional diff paths" msgstr "удалить <количество> ведущих косых черт из традиционных путей списка изменений" -#: apply.c:4931 +#: apply.c:4957 msgid "ignore additions made by the patch" msgstr "игнорировать добавления, сделанные этим патчем" -#: apply.c:4933 +#: apply.c:4959 msgid "instead of applying the patch, output diffstat for the input" msgstr "вместо применения патча вывести статистику добавлений и удалений для ввода" -#: apply.c:4937 +#: apply.c:4963 msgid "show number of added and deleted lines in decimal notation" msgstr "показать количество добавленных и удаленных строк в десятичном представлении" -#: apply.c:4939 +#: apply.c:4965 msgid "instead of applying the patch, output a summary for the input" msgstr "вместо применения патча вывести статистику изменений для ввода" -#: apply.c:4941 +#: apply.c:4967 msgid "instead of applying the patch, see if the patch is applicable" msgstr "вместо применения патча проверить подходит ли он" -#: apply.c:4943 +#: apply.c:4969 msgid "make sure the patch is applicable to the current index" msgstr "проверить, что патч применяется к текущему индексу" -#: apply.c:4945 +#: apply.c:4971 msgid "apply a patch without touching the working tree" msgstr "применить патч, не изменяя рабочий каталог" -#: apply.c:4947 +#: apply.c:4973 msgid "accept a patch that touches outside the working area" msgstr "принять патч, который затрагивает файлы за рабочим каталогом" -#: apply.c:4949 +#: apply.c:4975 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "а также применить патч (используйте с --stat/--summary/--check)" -#: apply.c:4951 +#: apply.c:4977 msgid "attempt three-way merge if a patch does not apply" msgstr "попытаться сделать трехходовое слияние, если патч не применяется" -#: apply.c:4953 +#: apply.c:4979 msgid "build a temporary index based on embedded index information" msgstr "построить временный индекс, основанный на встроенной информации об индексе" -#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515 +#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513 msgid "paths are separated with NUL character" msgstr "пути, отделённые НУЛЕВЫМ символом" -#: apply.c:4958 +#: apply.c:4984 msgid "ensure at least <n> lines of context match" msgstr "удостовериться, что по крайней мере <n> строк контекста совпадают" -#: apply.c:4959 builtin/am.c:2245 +#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95 +#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99 msgid "action" msgstr "действие" -#: apply.c:4960 +#: apply.c:4986 msgid "detect new or modified lines that have whitespace errors" msgstr "определять новые или модифицированные строки, у которых есть ошибки в пробельных символах" -#: apply.c:4963 apply.c:4966 +#: apply.c:4989 apply.c:4992 msgid "ignore changes in whitespace when finding context" msgstr "игнорировать изменения в пробельных символах при поиске контекста" -#: apply.c:4969 +#: apply.c:4995 msgid "apply the patch in reverse" msgstr "применить патч с обращением изменений" -#: apply.c:4971 +#: apply.c:4997 msgid "don't expect at least one line of context" msgstr "не ожидать как минимум одной строки контекста" -#: apply.c:4973 +#: apply.c:4999 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "оставить отклоненные блоки изменений в соответствующих *.rej файлах" -#: apply.c:4975 +#: apply.c:5001 msgid "allow overlapping hunks" msgstr "разрешить перекрывающиеся блоки изменений" -#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21 -#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651 -#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125 +#: apply.c:5002 builtin/add.c:272 builtin/check-ignore.c:21 +#: builtin/commit.c:1347 builtin/count-objects.c:96 builtin/fsck.c:640 +#: builtin/log.c:1889 builtin/mv.c:123 builtin/read-tree.c:125 msgid "be verbose" msgstr "быть многословнее" -#: apply.c:4978 +#: apply.c:5004 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "разрешить некорректно определенные пропущенные пустые строки в конце файла" -#: apply.c:4981 +#: apply.c:5007 msgid "do not trust the line counts in the hunk headers" msgstr "не доверять количеству строк из заголовка блока изменений" -#: apply.c:4983 builtin/am.c:2254 +#: apply.c:5009 builtin/am.c:2253 msgid "root" msgstr "корень" -#: apply.c:4984 +#: apply.c:5010 msgid "prepend <root> to all filenames" msgstr "добавить <корень> спереди ко всем именам файлов" @@ -731,108 +732,108 @@ msgstr "git archive --remote <репозиторий> [--exec <команда>] msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <репозиторий> [--exec <команда>] --list" -#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300 +#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "спецификатор пути «%s» не соответствует ни одному файлу" -#: archive.c:418 +#: archive.c:436 msgid "fmt" msgstr "формат" -#: archive.c:418 +#: archive.c:436 msgid "archive format" msgstr "формат архива" -#: archive.c:419 builtin/log.c:1446 +#: archive.c:437 builtin/log.c:1452 msgid "prefix" msgstr "префикс" -#: archive.c:420 +#: archive.c:438 msgid "prepend prefix to each pathname in the archive" msgstr "добавлять префикс перед каждым путем файла в архиве" -#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61 -#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080 -#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552 -#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120 +#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61 +#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:859 +#: builtin/hash-object.c:102 builtin/ls-files.c:547 builtin/ls-files.c:550 +#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120 #: parse-options.h:153 msgid "file" msgstr "файл" -#: archive.c:422 builtin/archive.c:89 +#: archive.c:440 builtin/archive.c:89 msgid "write the archive to this file" msgstr "запись архива в этот файл" -#: archive.c:424 +#: archive.c:442 msgid "read .gitattributes in working directory" msgstr "читать .gitattributes в рабочем каталоге" -#: archive.c:425 +#: archive.c:443 msgid "report archived files on stderr" msgstr "отчет об архивированных файлах в stderr" -#: archive.c:426 +#: archive.c:444 msgid "store only" msgstr "только хранение" -#: archive.c:427 +#: archive.c:445 msgid "compress faster" msgstr "сжимать быстрее" -#: archive.c:435 +#: archive.c:453 msgid "compress better" msgstr "сжимать лучше" -#: archive.c:438 +#: archive.c:456 msgid "list supported archive formats" msgstr "перечислить поддерживаемые форматы архивов" -#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108 -#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982 +#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109 +#: builtin/submodule--helper.c:634 builtin/submodule--helper.c:1001 msgid "repo" msgstr "репозиторий" -#: archive.c:441 builtin/archive.c:91 +#: archive.c:459 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "получить архив из внешнего <репозитория>" -#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488 +#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489 msgid "command" msgstr "команда" -#: archive.c:443 builtin/archive.c:93 +#: archive.c:461 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "путь к команде git-upload-archive на машине с внешним репозиторием" -#: archive.c:450 +#: archive.c:468 msgid "Unexpected option --remote" msgstr "Неожиданная опция --remote" -#: archive.c:452 +#: archive.c:470 msgid "Option --exec can only be used together with --remote" msgstr "Опция --exec может использоваться только вместе с --remote" -#: archive.c:454 +#: archive.c:472 msgid "Unexpected option --output" msgstr "Неожиданная опция --output" -#: archive.c:476 +#: archive.c:494 #, c-format msgid "Unknown archive format '%s'" msgstr "Неизвестный формат архива «%s»" -#: archive.c:483 +#: archive.c:501 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Аргумент не поддерживается для формата «%s»: -%d" -#: attr.c:214 +#: attr.c:218 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s не является допустимым именем атрибута" -#: attr.c:410 +#: attr.c:415 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -895,38 +896,38 @@ msgstr "База слияния между %s и [%s] должно быть пр msgid "Bisecting: a merge base must be tested\n" msgstr "Бинарный поиск: база слияния должна быть проверена\n" -#: bisect.c:849 +#: bisect.c:850 #, c-format msgid "a %s revision is needed" msgstr "нужно указать %s редакцию" -#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256 +#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234 #, c-format msgid "could not create file '%s'" msgstr "не удалось создать файл «%s»" -#: bisect.c:917 +#: bisect.c:918 #, c-format msgid "could not read file '%s'" msgstr "не удалось прочитать файл «%s»" -#: bisect.c:947 +#: bisect.c:948 msgid "reading bisect refs failed" msgstr "сбой при чтении ссылок двоичного поиска" -#: bisect.c:967 +#: bisect.c:968 #, c-format msgid "%s was both %s and %s\n" msgstr "%s была одновременно и %s и %s\n" -#: bisect.c:975 +#: bisect.c:976 #, c-format msgid "" "No testable commit found.\n" "Maybe you started with bad path parameters?\n" msgstr "Тестируемый коммит не найден.\nВозможно, вы начали поиск с указанием неправильного параметра пути?\n" -#: bisect.c:994 +#: bisect.c:995 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -937,7 +938,7 @@ msgstr[3] "(примерно %d шагов)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. -#: bisect.c:1000 +#: bisect.c:1001 #, 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" @@ -958,10 +959,10 @@ msgstr "нельзя использовать --contents с указанием msgid "--reverse and --first-parent together require specified latest commit" msgstr "при --reverse и --first-parent вместе нужно указывать конкретный последний коммит" -#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166 -#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907 -#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 -#: builtin/merge.c:360 builtin/shortlog.c:177 +#: blame.c:1797 bundle.c:169 ref-filter.c:1932 sequencer.c:1168 +#: sequencer.c:2351 builtin/commit.c:1065 builtin/log.c:357 builtin/log.c:911 +#: builtin/log.c:1361 builtin/log.c:1690 builtin/log.c:1938 +#: builtin/merge.c:369 builtin/shortlog.c:191 msgid "revision walk setup failed" msgstr "сбой инициализации прохода по редакциям" @@ -996,43 +997,43 @@ msgstr "Не устанавливаю ветку %s, так так она при #: branch.c:93 #, c-format -msgid "Branch %s set up to track remote branch %s from %s by rebasing." -msgstr "Ветка %s отслеживает внешнюю ветку %s из %s перемещением." +msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." +msgstr "Ветка «%s» отслеживает внешнюю ветку «%s» из «%s» перемещением." #: branch.c:94 #, c-format -msgid "Branch %s set up to track remote branch %s from %s." -msgstr "Ветка %s отслеживает внешнюю ветку %s из %s." +msgid "Branch '%s' set up to track remote branch '%s' from '%s'." +msgstr "Ветка «%s» отслеживает внешнюю ветку «%s» из «%s»." #: branch.c:98 #, c-format -msgid "Branch %s set up to track local branch %s by rebasing." -msgstr "Ветка %s отслеживает локальную ветку %s перемещением." +msgid "Branch '%s' set up to track local branch '%s' by rebasing." +msgstr "Ветка «%s» отслеживает локальную ветку «%s» перемещением." #: branch.c:99 #, c-format -msgid "Branch %s set up to track local branch %s." -msgstr "Ветка %s отслеживает локальную ветку %s." +msgid "Branch '%s' set up to track local branch '%s'." +msgstr "Ветка «%s» отслеживает локальную ветку «%s»." #: branch.c:104 #, c-format -msgid "Branch %s set up to track remote ref %s by rebasing." -msgstr "Ветка %s отслеживает внешнюю ссылку %s перемещением." +msgid "Branch '%s' set up to track remote ref '%s' by rebasing." +msgstr "Ветка «%s» отслеживает внешнюю ссылку «%s» перемещением." #: branch.c:105 #, c-format -msgid "Branch %s set up to track remote ref %s." -msgstr "Ветка %s отслеживает внешнюю ссылку %s." +msgid "Branch '%s' set up to track remote ref '%s'." +msgstr "Ветка «%s» отслеживает внешнюю ссылку «%s»." #: branch.c:109 #, c-format -msgid "Branch %s set up to track local ref %s by rebasing." -msgstr "Ветка %s отслеживает локальную ссылку %s перемещением." +msgid "Branch '%s' set up to track local ref '%s' by rebasing." +msgstr "Ветка «%s» отслеживает локальную ссылку «%s» перемещением." #: branch.c:110 #, c-format -msgid "Branch %s set up to track local ref %s." -msgstr "Ветка %s отслеживает локальную ссылку %s." +msgid "Branch '%s' set up to track local ref '%s'." +msgstr "Ветка «%s» отслеживает локальную ссылку «%s»." #: branch.c:119 msgid "Unable to write upstream branch configuration" @@ -1053,22 +1054,22 @@ msgstr "«%s» не является действительным именем msgid "A branch named '%s' already exists." msgstr "Ветка с именем «%s» уже существует." -#: branch.c:198 +#: branch.c:197 msgid "Cannot force update the current branch." msgstr "Не удалось принудительно обновить текущую ветку." -#: branch.c:218 +#: branch.c:217 #, c-format msgid "" "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "Не удалось настроить информацию отслеживания; стартовая точка «%s» не является веткой." -#: branch.c:220 +#: branch.c:219 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "запрошенная ветка вышестоящего репозитория «%s» не существует" -#: branch.c:222 +#: branch.c:221 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -1080,22 +1081,22 @@ msgid "" "\"git push -u\" to set the upstream config as you push." msgstr "\nЕсли вы планируете основывать свою работу на вышестоящей ветке, которая уже существует во внешнем репозитории, вам может потребоваться запустить «git fetch» для ее получения.\n\nЕсли вы планируете отправить новую локальную ветку, которая будет отслеживаться, во внешний репозиторий, вам может потребоваться запустить «git push -u» — чтобы сохранить настройку вышестоящего репозитория для отправки." -#: branch.c:265 +#: branch.c:264 #, c-format msgid "Not a valid object name: '%s'." msgstr "Недопустимое имя объекта: «%s»." -#: branch.c:285 +#: branch.c:284 #, c-format msgid "Ambiguous object name: '%s'." msgstr "Неоднозначное имя объекта: «%s»." -#: branch.c:290 +#: branch.c:289 #, c-format msgid "Not a valid branch point: '%s'." msgstr "Недопустимая точка ветки: «%s»." -#: branch.c:344 +#: branch.c:343 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "«%s» уже находится на «%s»" @@ -1115,7 +1116,9 @@ msgstr "«%s» не похож на файл пакета версии 2" msgid "unrecognized header: %s%s (%d)" msgstr "неопознанный заголовок: %s%s (%d)" -#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778 +#: bundle.c:88 sequencer.c:1346 sequencer.c:1793 sequencer.c:2500 +#: sequencer.c:2583 sequencer.c:2609 sequencer.c:2687 sequencer.c:2807 +#: sequencer.c:2949 builtin/commit.c:782 #, c-format msgid "could not open '%s'" msgstr "не удалось открыть «%s»" @@ -1124,7 +1127,7 @@ msgstr "не удалось открыть «%s»" msgid "Repository lacks these prerequisite commits:" msgstr "В репозитории отсутствуют необходимые коммиты:" -#: bundle.c:186 +#: bundle.c:193 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" @@ -1133,11 +1136,11 @@ msgstr[1] "Пакет содержит эти %d ссылки:" msgstr[2] "Пакет содержит эти %d ссылок:" msgstr[3] "Пакет содержит эти %d ссылок:" -#: bundle.c:193 +#: bundle.c:200 msgid "The bundle records a complete history." msgstr "Пакет содержит полную историю." -#: bundle.c:195 +#: bundle.c:202 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" @@ -1146,38 +1149,38 @@ msgstr[1] "Пакет требует эти %d ссылки:" msgstr[2] "Пакет требует эти %d ссылок:" msgstr[3] "Пакет требует эти %d ссылок:" -#: bundle.c:254 +#: bundle.c:261 msgid "Could not spawn pack-objects" msgstr "Не удалось создать объекты пакета" -#: bundle.c:265 +#: bundle.c:272 msgid "pack-objects died" msgstr "критическая ошибка pack-objects" -#: bundle.c:307 +#: bundle.c:314 msgid "rev-list died" msgstr "критическая ошибка rev-list" -#: bundle.c:356 +#: bundle.c:363 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "ссылка «%s» исключена в соответствии с опциями rev-list" -#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282 +#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296 #, c-format msgid "unrecognized argument: %s" msgstr "неопознанный аргумент: %s" -#: bundle.c:454 +#: bundle.c:461 msgid "Refusing to create empty bundle." msgstr "Отклонение создания пустого пакета." -#: bundle.c:466 +#: bundle.c:473 #, c-format msgid "cannot create '%s'" msgstr "не удалось создать «%s»" -#: bundle.c:494 +#: bundle.c:501 msgid "index-pack died" msgstr "критическая ошибка index-pack" @@ -1186,8 +1189,8 @@ msgstr "критическая ошибка index-pack" msgid "invalid color value: %.*s" msgstr "недопустимое значение цвета: %.*s" -#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456 -#: builtin/am.c:1469 builtin/am.c:2107 +#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465 +#: builtin/am.c:1467 builtin/am.c:2105 #, c-format msgid "could not parse %s" msgstr "не удалось разобрать %s" @@ -1197,7 +1200,7 @@ msgstr "не удалось разобрать %s" msgid "%s %s is not a commit!" msgstr "%s %s не является коммитом!" -#: commit.c:1511 +#: commit.c:1517 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" @@ -1208,152 +1211,152 @@ msgstr "Предупреждение: сообщение коммита не с msgid "memory exhausted" msgstr "память исчерпана" -#: config.c:186 +#: config.c:187 msgid "relative config include conditionals must come from files" msgstr "относительные условные включения конфигурации должны исходить из файлов" -#: config.c:720 +#: config.c:721 #, c-format msgid "bad config line %d in blob %s" msgstr "ошибка в %d строке двоичного объекта %s" -#: config.c:724 +#: config.c:725 #, c-format msgid "bad config line %d in file %s" msgstr "ошибка в %d строке файла %s" -#: config.c:728 +#: config.c:729 #, c-format msgid "bad config line %d in standard input" msgstr "ошибка в %d строке стандартного ввода" -#: config.c:732 +#: config.c:733 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "ошибка в %d строке двоичного объекта подмодуля %s" -#: config.c:736 +#: config.c:737 #, c-format msgid "bad config line %d in command line %s" msgstr "ошибка в %d строке коммандной строки %s" -#: config.c:740 +#: config.c:741 #, c-format msgid "bad config line %d in %s" msgstr "ошибка в %d строке в %s" -#: config.c:868 +#: config.c:869 msgid "out of range" msgstr "вне диапазона" -#: config.c:868 +#: config.c:869 msgid "invalid unit" msgstr "неправильное число" -#: config.c:874 +#: config.c:875 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "неправильное числовое значение «%s» для «%s»: %s" -#: config.c:879 +#: config.c:880 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "неправильное числовое значение «%s» для «%s» в двоичном объекте %s: %s" -#: config.c:882 +#: config.c:883 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "неправильное числовое значение «%s» для «%s» в файле %s: %s" -#: config.c:885 +#: config.c:886 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "неправильное числовое значение «%s» для «%s» на стандартном вводе: %s" -#: config.c:888 +#: config.c:889 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "неправильное числовое значение «%s» для «%s» в двоичном объекте подмодуля %s: %s" -#: config.c:891 +#: config.c:892 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "неправильное числовое значение «%s» для «%s» на коммандной строке %s: %s" -#: config.c:894 +#: config.c:895 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "неправильное числовое значение «%s» для «%s» в %s: %s" -#: config.c:989 +#: config.c:990 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "сбой разворачивания пути каталога пользователя: «%s»" -#: config.c:1084 config.c:1095 +#: config.c:1085 config.c:1096 #, c-format msgid "bad zlib compression level %d" msgstr "неправильный уровень сжатия zlib %d" -#: config.c:1212 +#: config.c:1213 #, c-format msgid "invalid mode for object creation: %s" msgstr "недопустимый режим создания объекта: %s" -#: config.c:1368 +#: config.c:1372 #, c-format msgid "bad pack compression level %d" msgstr "неправильный уровень сжатия пакета %d" -#: config.c:1564 +#: config.c:1568 msgid "unable to parse command-line config" msgstr "не удалось разобрать конфигурацию из командной строки" -#: config.c:1894 +#: config.c:1900 msgid "unknown error occurred while reading the configuration files" msgstr "произошла неизвестная ошибка при чтении файлов конфигурации" -#: config.c:2064 +#: config.c:2087 #, c-format msgid "Invalid %s: '%s'" msgstr "Недействительный %s: «%s»" -#: config.c:2085 +#: config.c:2130 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "неизвестное значение «%s» для core.untrackedCache; использую стандартное значение «keep»" -#: config.c:2111 +#: config.c:2156 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "значение «%d» для splitIndex.maxPercentChange должно быть от 0 до 100" -#: config.c:2122 +#: config.c:2167 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "не удалось разобрать «%s» в конфигурации из командной строки" -#: config.c:2124 +#: config.c:2169 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "неправильная переменная конфигурации «%s» в файле «%s» на строке %d" -#: config.c:2183 +#: config.c:2228 #, c-format msgid "%s has multiple values" msgstr "%s имеет несколько значений" -#: config.c:2517 config.c:2745 +#: config.c:2571 config.c:2789 #, c-format msgid "fstat on %s failed" msgstr "сбой при выполнении fstat на файле %s" -#: config.c:2635 +#: config.c:2678 #, c-format msgid "could not set '%s' to '%s'" msgstr "не удалось установить «%s» в «%s»" -#: config.c:2637 builtin/remote.c:775 +#: config.c:2680 builtin/remote.c:776 #, c-format msgid "could not unset '%s'" msgstr "не удалось сбросить значение для «%s»" @@ -1370,19 +1373,19 @@ msgid "" "and the repository exists." msgstr "Не удалось прочитать из внешнего репозитория.\n\nУдостоверьтесь, что у вас есть необходимые права доступа\nи репозиторий существует." -#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141 +#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141 msgid "Checking connectivity" msgstr "Проверка соединения" -#: connected.c:75 +#: connected.c:76 msgid "Could not run 'git rev-list'" msgstr "Не удалось запустить «git rev-list»" -#: connected.c:95 +#: connected.c:96 msgid "failed write to rev-list" msgstr "сбой записи в rev-list" -#: connected.c:102 +#: connected.c:103 msgid "failed to close rev-list's stdin" msgstr "сбой закрытия стандартного ввода у rev-list" @@ -1391,7 +1394,7 @@ msgstr "сбой закрытия стандартного ввода у rev-lis msgid "" "CRLF will be replaced by LF in %s.\n" "The file will have its original line endings in your working directory." -msgstr "CRLF будет заменен на LF в %s.\nФайл будет иметь свои оригинальные концы строк в рашей рабочей копии." +msgstr "CRLF будет заменен на LF в %s.\nФайл будет иметь свои оригинальные концы строк в вашей рабочей копии." #: convert.c:209 #, c-format @@ -1403,7 +1406,7 @@ msgstr "CRLF будет заменен на LF в %s." msgid "" "LF will be replaced by CRLF in %s.\n" "The file will have its original line endings in your working directory." -msgstr "LF будет заменен на CRLF в %s.\nФайл будет иметь свои оригинальные концы строк в рашей рабочей копии." +msgstr "LF будет заменен на CRLF в %s.\nФайл будет иметь свои оригинальные концы строк в вашей рабочей копии." #: convert.c:219 #, c-format @@ -1505,273 +1508,283 @@ msgstr "сбой чтения orderfile «%s»" msgid "Performing inexact rename detection" msgstr "Выполняется неточное определение переименования" -#: diff.c:63 +#: diff.c:74 #, c-format msgid "option '%s' requires a value" msgstr "параметр «%s» требует указания значения" -#: diff.c:125 +#: diff.c:152 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " Сбой разбора величины среза (cut-off) у dirstat «%s»\n" -#: diff.c:130 +#: diff.c:157 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr "Неизвестный параметр dirstat: «%s»\n" -#: diff.c:282 +#: diff.c:281 +msgid "" +"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra'," +" 'plain'" +msgstr "значение настройки цвета для перемещённых строк должно быть одно из «no» «default», «zebra», «dimmed_zebra», «plain»" + +#: diff.c:341 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Неизвестное значения для переменной «diff.submodule»: «%s»" -#: diff.c:342 +#: diff.c:398 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "Найдены ошибки в переменной «diff.dirstat»:\n%s" -#: diff.c:3101 +#: diff.c:3861 #, c-format msgid "external diff died, stopping at %s" msgstr "критическая ошибка при внешнем сравнении, останов на %s" -#: diff.c:3427 +#: diff.c:4189 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check и -s нельзя использовать одновременно" -#: diff.c:3517 +#: diff.c:4279 msgid "--follow requires exactly one pathspec" msgstr "--follow требует ровно одного спецификатора пути" -#: diff.c:3680 +#: diff.c:4445 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "Сбой разбора параметра опции --dirstat/-X :\n%s" -#: diff.c:3694 +#: diff.c:4459 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Сбой разбора параметра опции --submodule: «%s»" -#: diff.c:4716 +#: diff.c:5505 msgid "inexact rename detection was skipped due to too many files." msgstr "неточное определение переименования было пропущено из-за слишком большого количества файлов." -#: diff.c:4719 +#: diff.c:5508 msgid "only found copies from modified paths due to too many files." msgstr "найдены только копии из измененных путей из-за слишком большого количества файлов." -#: diff.c:4722 +#: diff.c:5511 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "возможно вы захотите установить переменную %s в как минимум значение %d и повторить вызов команды." -#: dir.c:1948 +#: dir.c:1983 msgid "failed to get kernel name and information" msgstr "не удалось получить имя ядра и информацию" -#: dir.c:2067 +#: dir.c:2102 msgid "Untracked cache is disabled on this system or location." msgstr "Кэш неотслеживаемых файлов отключен на этой системе или в этом месте." -#: dir.c:2846 dir.c:2851 +#: dir.c:2885 dir.c:2890 #, c-format msgid "could not create directories for %s" msgstr "не удалось создать каталоги для %s" -#: dir.c:2876 +#: dir.c:2915 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "не удалось переместить каталог git с «%s» в «%s»" -#: entry.c:281 +#: entry.c:176 +msgid "Filtering content" +msgstr "Фильтруется содержимое" + +#: entry.c:417 #, c-format msgid "could not stat file '%s'" msgstr "не удалось выполнить stat для файла «%s»" -#: fetch-pack.c:251 +#: fetch-pack.c:252 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: ожидается передача списка для получение части" -#: fetch-pack.c:263 +#: fetch-pack.c:264 msgid "git fetch-pack: expected ACK/NAK, got EOF" msgstr "git fetch-pack: ожидается ACK/NAK, а получено EOF" -#: fetch-pack.c:282 builtin/archive.c:63 +#: fetch-pack.c:283 builtin/archive.c:63 #, c-format msgid "remote error: %s" msgstr "ошибка внешнего репозитория: %s" -#: fetch-pack.c:283 +#: fetch-pack.c:284 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: ожидается ACK/NAK, а получено «%s»" -#: fetch-pack.c:335 +#: fetch-pack.c:336 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc требует multi_ack_detailed" -#: fetch-pack.c:421 +#: fetch-pack.c:422 #, c-format msgid "invalid shallow line: %s" msgstr "неправильная строка частичного получения: %s" -#: fetch-pack.c:427 +#: fetch-pack.c:428 #, c-format msgid "invalid unshallow line: %s" msgstr "неправильная строка полного получения: %s" -#: fetch-pack.c:429 +#: fetch-pack.c:430 #, c-format msgid "object not found: %s" msgstr "объект не найден: %s" -#: fetch-pack.c:432 +#: fetch-pack.c:433 #, c-format msgid "error in object: %s" msgstr "ошибка в объекте: %s" -#: fetch-pack.c:434 +#: fetch-pack.c:435 #, c-format msgid "no shallow found: %s" msgstr "частичный клон не найден: %s" -#: fetch-pack.c:437 +#: fetch-pack.c:438 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "ожидалось shallow/unshallow, а получено %s" -#: fetch-pack.c:476 +#: fetch-pack.c:477 #, c-format msgid "got %s %d %s" msgstr "получено %s %d %s" -#: fetch-pack.c:490 +#: fetch-pack.c:491 #, c-format msgid "invalid commit %s" msgstr "недопустимый коммит %s" -#: fetch-pack.c:523 +#: fetch-pack.c:524 msgid "giving up" msgstr "останавливаю дальнейшие попытки" -#: fetch-pack.c:533 progress.c:237 +#: fetch-pack.c:534 progress.c:242 msgid "done" msgstr "готово" -#: fetch-pack.c:545 +#: fetch-pack.c:546 #, c-format msgid "got %s (%d) %s" msgstr "получено %s (%d) %s" -#: fetch-pack.c:591 +#: fetch-pack.c:592 #, c-format msgid "Marking %s as complete" msgstr "Помечаю %s как завершенный" -#: fetch-pack.c:775 +#: fetch-pack.c:776 #, c-format msgid "already have %s (%s)" msgstr "уже есть %s (%s)" -#: fetch-pack.c:813 +#: fetch-pack.c:814 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: не удалось запустить программу разбора данных" -#: fetch-pack.c:821 +#: fetch-pack.c:822 msgid "protocol error: bad pack header" msgstr "ошибка протокола: неправильный заголовок потока" -#: fetch-pack.c:877 +#: fetch-pack.c:878 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: не удалось запустить программу %s" -#: fetch-pack.c:893 +#: fetch-pack.c:894 #, c-format msgid "%s failed" msgstr "%s завершен с ошибкой" -#: fetch-pack.c:895 +#: fetch-pack.c:896 msgid "error in sideband demultiplexer" msgstr "произошла ошибка в программе разбора данных" -#: fetch-pack.c:922 +#: fetch-pack.c:923 msgid "Server does not support shallow clients" msgstr "Сервер не поддерживает клиентов с частичным клонированием" -#: fetch-pack.c:926 +#: fetch-pack.c:927 msgid "Server supports multi_ack_detailed" msgstr "Сервер поддерживает multi_ack_detailed" -#: fetch-pack.c:929 +#: fetch-pack.c:930 msgid "Server supports no-done" msgstr "Сервер поддерживает no-done" -#: fetch-pack.c:935 +#: fetch-pack.c:936 msgid "Server supports multi_ack" msgstr "Сервер поддерживает multi_ack" -#: fetch-pack.c:939 +#: fetch-pack.c:940 msgid "Server supports side-band-64k" msgstr "Сервер поддерживает side-band-64k" -#: fetch-pack.c:943 +#: fetch-pack.c:944 msgid "Server supports side-band" msgstr "Сервер поддерживает side-band" -#: fetch-pack.c:947 +#: fetch-pack.c:948 msgid "Server supports allow-tip-sha1-in-want" msgstr "Сервер поддерживает allow-tip-sha1-in-want" -#: fetch-pack.c:951 +#: fetch-pack.c:952 msgid "Server supports allow-reachable-sha1-in-want" msgstr "Сервер поддерживает allow-reachable-sha1-in-want" -#: fetch-pack.c:961 +#: fetch-pack.c:962 msgid "Server supports ofs-delta" msgstr "Сервер поддерживает ofs-delta" -#: fetch-pack.c:968 +#: fetch-pack.c:969 #, c-format msgid "Server version is %.*s" msgstr "Версия сервера %.*s" -#: fetch-pack.c:974 +#: fetch-pack.c:975 msgid "Server does not support --shallow-since" msgstr "Сервер не поддерживает --shallow-since" -#: fetch-pack.c:978 +#: fetch-pack.c:979 msgid "Server does not support --shallow-exclude" msgstr "Сервер не поддерживает --shallow-exclude" -#: fetch-pack.c:980 +#: fetch-pack.c:981 msgid "Server does not support --deepen" msgstr "Сервер не поддерживает --deepen" -#: fetch-pack.c:991 +#: fetch-pack.c:992 msgid "no common commits" msgstr "не общих коммитов" -#: fetch-pack.c:1003 +#: fetch-pack.c:1004 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: ошибка при получении данных." -#: fetch-pack.c:1165 +#: fetch-pack.c:1166 msgid "no matching remote head" msgstr "нет соотвествующего внешнего указателя на ветку" -#: fetch-pack.c:1187 +#: fetch-pack.c:1188 #, c-format msgid "no such remote ref %s" msgstr "нет такой внешней ссылки %s" -#: fetch-pack.c:1190 +#: fetch-pack.c:1191 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Сервер не поддерживает запрос необъявленного объекта %s" @@ -1784,7 +1797,7 @@ msgstr "gpg не удалось подписать данные" msgid "could not create temporary file" msgstr "не удалось создать временный файл" -#: gpg-interface.c:213 +#: gpg-interface.c:214 #, c-format msgid "failed writing detached signature to '%s'" msgstr "сбой записи отсоединенной подписи в «%s»" @@ -1794,17 +1807,17 @@ msgstr "сбой записи отсоединенной подписи в «%s msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "игнорирую недопустимый цвет «%.*s» в log.graphColors" -#: grep.c:1981 +#: grep.c:1970 #, c-format msgid "'%s': unable to read %s" msgstr "«%s»: не удалось прочесть %s" -#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134 +#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134 #, c-format msgid "failed to stat '%s'" msgstr "не удалось выполнить stat «%s»" -#: grep.c:2009 +#: grep.c:1998 #, c-format msgid "'%s': short read" msgstr "«%s»: слишком мало данных прочитано" @@ -1929,12 +1942,12 @@ msgstr "пустое имя идентификатора (для <%s>) не ра msgid "name consists only of disallowed characters: %s" msgstr "имя состоит только из неразрешенных симоволов: %s" -#: ident.c:416 builtin/commit.c:612 +#: ident.c:416 builtin/commit.c:616 #, c-format msgid "invalid date format: %s" msgstr "неправильный формат даты: %s" -#: lockfile.c:152 +#: lockfile.c:151 #, c-format msgid "" "Unable to create '%s.lock': %s.\n" @@ -1946,7 +1959,7 @@ msgid "" "remove the file manually to continue." msgstr "Не удалось создать «%s.lock»: %s.\n\nПохоже, что другой процесс git запущен в этом репозитории,\nнапример редактор открыт из «git commit». Пожалуйста, убедитесь,\nчто все процессы были завершены и потом попробуйте снова.\nЕсли это не поможет, то возможно процесс git был ранее завершен\nс ошибкой в этом репозитории: \nудалите файл вручную для продолжения." -#: lockfile.c:160 +#: lockfile.c:159 #, c-format msgid "Unable to create '%s.lock': %s" msgstr "Не удалось создать «%s.lock»: %s" @@ -1955,237 +1968,237 @@ msgstr "Не удалось создать «%s.lock»: %s" msgid "failed to read the cache" msgstr "сбой чтения кэша" -#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377 -#: builtin/checkout.c:591 builtin/clone.c:753 +#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380 +#: builtin/checkout.c:595 builtin/clone.c:754 msgid "unable to write new index file" msgstr "не удалось записать новый файл индекса" -#: merge-recursive.c:210 +#: merge-recursive.c:235 msgid "(bad commit)\n" msgstr "(плохой коммит)\n" -#: merge-recursive.c:232 merge-recursive.c:240 +#: merge-recursive.c:257 merge-recursive.c:265 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "сбой addinfo_cache для пути «%s»" -#: merge-recursive.c:304 +#: merge-recursive.c:329 msgid "error building trees" msgstr "ошибка при построении деревьев" -#: merge-recursive.c:728 +#: merge-recursive.c:752 #, c-format msgid "failed to create path '%s'%s" msgstr "не удалось создать путь «%s»%s" -#: merge-recursive.c:739 +#: merge-recursive.c:763 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Удаление %s, чтобы освободить место для подкаталогов\n" -#: merge-recursive.c:753 merge-recursive.c:772 +#: merge-recursive.c:777 merge-recursive.c:796 msgid ": perhaps a D/F conflict?" msgstr ": возможно, конфликт каталогов/файлов?" -#: merge-recursive.c:762 +#: merge-recursive.c:786 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "отказ потери неотслеживаемого файла в «%s»" -#: merge-recursive.c:804 builtin/cat-file.c:36 +#: merge-recursive.c:828 builtin/cat-file.c:37 #, c-format msgid "cannot read object %s '%s'" msgstr "невозможно прочитать объект %s «%s»" -#: merge-recursive.c:806 +#: merge-recursive.c:830 #, c-format msgid "blob expected for %s '%s'" msgstr "ожидается двоичный объект для %s «%s»" -#: merge-recursive.c:830 +#: merge-recursive.c:854 #, c-format msgid "failed to open '%s': %s" msgstr "не удалось открыть «%s»: %s" -#: merge-recursive.c:841 +#: merge-recursive.c:865 #, c-format msgid "failed to symlink '%s': %s" msgstr "не удалось создать символьную ссылку «%s»: %s" -#: merge-recursive.c:846 +#: merge-recursive.c:870 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "не понятно, что делать с %06o %s «%s»" -#: merge-recursive.c:986 +#: merge-recursive.c:1010 msgid "Failed to execute internal merge" msgstr "Не удалось запустить внутреннее слияние" -#: merge-recursive.c:990 +#: merge-recursive.c:1014 #, c-format msgid "Unable to add %s to database" msgstr "Не удалось добавить %s в базу данных" -#: merge-recursive.c:1093 +#: merge-recursive.c:1117 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree." msgstr "КОНФЛИКТ (%s/удаление): %s удалено в %s и %s в %s. Версия %s из %s оставлена в дереве." -#: merge-recursive.c:1098 +#: merge-recursive.c:1122 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " "left in tree." msgstr "КОНФЛИКТ (%s/удаление): %s удалено в %s и от %s до %s в %s. Версия %s из %s оставлена в дереве." -#: merge-recursive.c:1105 +#: merge-recursive.c:1129 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree at %s." msgstr "КОНФЛИКТ (%s/удаление): %s удалено в %s и %s в %s. Версия %s из %s оставлена в дереве на %s." -#: merge-recursive.c:1110 +#: merge-recursive.c:1134 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " "left in tree at %s." msgstr "КОНФЛИКТ (%s/удаление): %s удалено в %s и от %s до %s в %s. Версия %s из %s оставлена в дереве на %s." -#: merge-recursive.c:1144 +#: merge-recursive.c:1168 msgid "rename" msgstr "переименование" -#: merge-recursive.c:1144 +#: merge-recursive.c:1168 msgid "renamed" msgstr "переименовано" -#: merge-recursive.c:1201 +#: merge-recursive.c:1225 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s — это каталог в %s, добавляем как %s вместо этого" -#: merge-recursive.c:1226 +#: merge-recursive.c:1250 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename " "\"%s\"->\"%s\" in \"%s\"%s" msgstr "КОНФЛИКТ (переименование/переименование): Переименование «%s»→«%s» в ветке «%s» и переименование «%s»→«%s» в ветке «%s»%s" -#: merge-recursive.c:1231 +#: merge-recursive.c:1255 msgid " (left unresolved)" msgstr " (оставлено неразрешенным)" -#: merge-recursive.c:1293 +#: merge-recursive.c:1317 #, 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:1326 +#: merge-recursive.c:1350 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "Переименовываю %s в %s и %s в %s вместо этого" -#: merge-recursive.c:1529 +#: merge-recursive.c:1553 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "КОНФЛИКТ (переименование/добавление): Переименование «%s»→«%s» в ветке «%s» и добавление «%s» в ветке «%s»" -#: merge-recursive.c:1544 +#: merge-recursive.c:1568 #, c-format msgid "Adding merged %s" msgstr "Добавление слитого %s" -#: merge-recursive.c:1551 merge-recursive.c:1781 +#: merge-recursive.c:1575 merge-recursive.c:1805 #, c-format msgid "Adding as %s instead" msgstr "Добавление вместо этого как %s" -#: merge-recursive.c:1608 +#: merge-recursive.c:1632 #, c-format msgid "cannot read object %s" msgstr "невозможно прочитать объект «%s»" -#: merge-recursive.c:1611 +#: merge-recursive.c:1635 #, c-format msgid "object %s is not a blob" msgstr "объект %s не является двоичным объектом" -#: merge-recursive.c:1680 +#: merge-recursive.c:1704 msgid "modify" msgstr "изменение" -#: merge-recursive.c:1680 +#: merge-recursive.c:1704 msgid "modified" msgstr "изменено" -#: merge-recursive.c:1690 +#: merge-recursive.c:1714 msgid "content" msgstr "содержимое" -#: merge-recursive.c:1697 +#: merge-recursive.c:1721 msgid "add/add" msgstr "добавление/добавление" -#: merge-recursive.c:1733 +#: merge-recursive.c:1757 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Пропуск %s (слиты одинаковые изменения как существующие)" -#: merge-recursive.c:1747 +#: merge-recursive.c:1771 #, c-format msgid "Auto-merging %s" msgstr "Автослияние %s" -#: merge-recursive.c:1751 git-submodule.sh:945 +#: merge-recursive.c:1775 git-submodule.sh:944 msgid "submodule" msgstr "подмодуль" -#: merge-recursive.c:1752 +#: merge-recursive.c:1776 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "КОНФЛИКТ (%s): Конфликт слияния в %s" -#: merge-recursive.c:1846 +#: merge-recursive.c:1870 #, c-format msgid "Removing %s" msgstr "Удаление %s" -#: merge-recursive.c:1872 +#: merge-recursive.c:1896 msgid "file/directory" msgstr "файл/каталог" -#: merge-recursive.c:1878 +#: merge-recursive.c:1902 msgid "directory/file" msgstr "каталог/файл" -#: merge-recursive.c:1884 +#: merge-recursive.c:1908 #, 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:1893 +#: merge-recursive.c:1917 #, c-format msgid "Adding %s" msgstr "Добавление %s" -#: merge-recursive.c:1930 -msgid "Already up-to-date!" +#: merge-recursive.c:1954 +msgid "Already up to date!" msgstr "Уже обновлено!" -#: merge-recursive.c:1939 +#: merge-recursive.c:1963 #, c-format msgid "merging of trees %s and %s failed" msgstr "сбой слияния деревьев «%s» и «%s»" -#: merge-recursive.c:2022 +#: merge-recursive.c:2060 msgid "Merging:" msgstr "Слияние:" -#: merge-recursive.c:2035 +#: merge-recursive.c:2073 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" @@ -2194,27 +2207,27 @@ msgstr[1] "найдено %u общих предка:" msgstr[2] "найдено %u общих предков:" msgstr[3] "найдено %u общих предков:" -#: merge-recursive.c:2074 +#: merge-recursive.c:2112 msgid "merge returned no commit" msgstr "слияние не вернуло коммит" -#: merge-recursive.c:2137 +#: merge-recursive.c:2175 #, c-format msgid "Could not parse object '%s'" msgstr "Не удалось разобрать объект «%s»" -#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793 +#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814 msgid "Unable to write index." msgstr "Не удается записать индекс." -#: notes-merge.c:273 +#: notes-merge.c:272 #, c-format msgid "" "You have not concluded your previous notes merge (%s exists).\n" "Please, use 'git notes merge --commit' or 'git notes merge --abort' to commit/abort the previous merge before you start a new notes merge." msgstr "Вы не закончили предыдущее слияние заметок (%s существует).\nЗапустите «git notes merge --commit» или «git notes merge --abort» для коммита или отмены предыдущего слияния и запуска нового слияния заметок." -#: notes-merge.c:280 +#: notes-merge.c:279 #, c-format msgid "You have not concluded your notes merge (%s exists)." msgstr "Вы не закончили предыдущее слияние заметок (%s существует)." @@ -2241,33 +2254,47 @@ msgstr "Отказ в перезаписи заметок в %s (за преде msgid "Bad %s value: '%s'" msgstr "Неправильное значение переменной %s: «%s»" -#: object.c:240 +#: object.c:239 #, c-format msgid "unable to parse object: %s" msgstr "не удалось разобрать объект: %s" +#: packfile.c:556 +msgid "offset before end of packfile (broken .idx?)" +msgstr "сдвиг до конца файла пакета (возможно, повреждён файл .idx?)" + +#: packfile.c:1683 +#, c-format +msgid "offset before start of pack index for %s (corrupt index?)" +msgstr "сдвиг до начала индекса пакета для %s (повреждён индекс?)" + +#: packfile.c:1687 +#, c-format +msgid "offset beyond end of pack index for %s (truncated index?)" +msgstr "сдвиг за пределами индекса пакета для %s (обрезан индекс?)" + #: parse-options.c:573 msgid "..." msgstr "…" -#: parse-options.c:591 +#: parse-options.c:592 #, c-format msgid "usage: %s" msgstr "использование: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. -#: parse-options.c:597 +#: parse-options.c:598 #, c-format msgid " or: %s" msgstr " или: %s" -#: parse-options.c:600 +#: parse-options.c:601 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:634 +#: parse-options.c:640 msgid "-NUM" msgstr "-КОЛИЧЕСТВО" @@ -2276,7 +2303,7 @@ msgstr "-КОЛИЧЕСТВО" msgid "malformed object name '%s'" msgstr "Неправильное имя объекта «%s»" -#: path.c:890 +#: path.c:891 #, c-format msgid "Could not make %s writable by group" msgstr "Не удалось предоставить доступ к %s на запись" @@ -2347,18 +2374,18 @@ msgstr "«%s» (мнемоника: «%c»)" msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: магические слова в спецификаторе пути не поддерживаются командой: %s" -#: pathspec.c:575 +#: pathspec.c:571 msgid "" "empty strings as pathspecs will be made invalid in upcoming releases. please" " use . instead if you meant to match all paths" msgstr "пустые строки как спецификаторы пути будут сделаны недопустимыми в следующих версиях. используйте вместо них «.», что значит соотвествие всем путям" -#: pathspec.c:599 +#: pathspec.c:595 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "спецификатор пути «%s» находится за символической ссылкой" -#: pretty.c:963 +#: pretty.c:962 msgid "unable to parse --pretty format" msgstr "не удалось разобрать формат для --pretty" @@ -2376,50 +2403,51 @@ msgid "" "Using version %i" msgstr "GIT_INDEX_VERSION указан, но значение недействительное.\nИспользую версию %i" -#: read-cache.c:2308 builtin/merge.c:1019 +#: read-cache.c:2316 builtin/merge.c:1046 #, c-format msgid "could not close '%s'" msgstr "не удалось закрыть «%s»" -#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054 +#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077 #, c-format msgid "could not stat '%s'" msgstr "не удалось выполнить stat для «%s»" -#: read-cache.c:2396 +#: read-cache.c:2407 #, c-format msgid "unable to open git dir: %s" msgstr "не удалось открыть каталог git: %s" -#: read-cache.c:2408 +#: read-cache.c:2419 #, c-format msgid "unable to unlink: %s" msgstr "не удалось отсоединить: %s" -#: refs.c:622 +#: refs.c:638 #, c-format msgid "Could not open '%s' for writing" msgstr "Не удалось открыть «%s» для записи" -#: refs.c:1769 +#: refs.c:1779 msgid "ref updates forbidden inside quarantine environment" msgstr "обновление ссылок запрещено в изолированном окружении" -#: refs/files-backend.c:1664 +#: refs/files-backend.c:1136 +#, c-format +msgid "could not remove reference %s" +msgstr "не удалось удалить ссылки %s" + +#: refs/files-backend.c:1150 refs/packed-backend.c:1430 +#: refs/packed-backend.c:1440 #, c-format msgid "could not delete reference %s: %s" msgstr "не удалось удалить ссылку %s: %s" -#: refs/files-backend.c:1667 +#: refs/files-backend.c:1153 refs/packed-backend.c:1443 #, c-format msgid "could not delete references: %s" msgstr "не удалось удалить ссылки: %s" -#: refs/files-backend.c:1676 -#, c-format -msgid "could not remove reference %s" -msgstr "не удалось удалить ссылки %s" - #: ref-filter.c:35 wt-status.c:1811 msgid "gone" msgstr "исчез" @@ -2439,272 +2467,272 @@ msgstr "позади %d" msgid "ahead %d, behind %d" msgstr "впереди %d, позади %d" -#: ref-filter.c:105 +#: ref-filter.c:104 #, c-format msgid "expected format: %%(color:<color>)" msgstr "ожидаемый формат: %%(color:<color>)" -#: ref-filter.c:107 +#: ref-filter.c:106 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "неопознанный цвет: %%(color:%s)" -#: ref-filter.c:121 +#: ref-filter.c:126 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Ожидается целочисленное значение refname:lstrip=%s" -#: ref-filter.c:125 +#: ref-filter.c:130 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Ожидается целочисленное значение refname:rstrip=%s" -#: ref-filter.c:127 +#: ref-filter.c:132 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "неопознанный аргумент %%(%s): %s" -#: ref-filter.c:167 +#: ref-filter.c:172 #, c-format msgid "%%(body) does not take arguments" msgstr "параметр %%(body) не принимает аргументы" -#: ref-filter.c:174 +#: ref-filter.c:179 #, c-format msgid "%%(subject) does not take arguments" msgstr "параметр %%(subject) не принимает аргументы" -#: ref-filter.c:181 +#: ref-filter.c:186 #, c-format msgid "%%(trailers) does not take arguments" msgstr "параметр %%(trailers) не принимает аргументы" -#: ref-filter.c:200 +#: ref-filter.c:205 #, c-format msgid "positive value expected contents:lines=%s" msgstr "положительное значение ожидает contents:lines=%s" -#: ref-filter.c:202 +#: ref-filter.c:207 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "неопознанный аргумент %%(contents): %s" -#: ref-filter.c:215 +#: ref-filter.c:220 #, c-format msgid "positive value expected objectname:short=%s" msgstr "ожидается положительное значение objectname:short=%s" -#: ref-filter.c:219 +#: ref-filter.c:224 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "неопознанный аргумент %%(objectname): %s" -#: ref-filter.c:246 +#: ref-filter.c:251 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "ожидаемый формат: %%(align:<width>,<position>)" -#: ref-filter.c:258 +#: ref-filter.c:263 #, c-format msgid "unrecognized position:%s" msgstr "неопознанная позиция:%s" -#: ref-filter.c:262 +#: ref-filter.c:267 #, c-format msgid "unrecognized width:%s" msgstr "неопознанная ширина:%s" -#: ref-filter.c:268 +#: ref-filter.c:273 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "неопознанный аргумент %%(align): %s" -#: ref-filter.c:272 +#: ref-filter.c:277 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "ожидается положительная ширина с указанием частицы %%(align)" -#: ref-filter.c:287 +#: ref-filter.c:292 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "неопознанный аргумент %%(if): %s" -#: ref-filter.c:378 +#: ref-filter.c:382 #, c-format msgid "malformed field name: %.*s" msgstr "неправильное имя поля: %.*s" -#: ref-filter.c:404 +#: ref-filter.c:408 #, c-format msgid "unknown field name: %.*s" msgstr "неизвестное имя поля: %.*s" -#: ref-filter.c:508 +#: ref-filter.c:520 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "формат: частица %%(if) использована без частицы %%(then)" -#: ref-filter.c:568 +#: ref-filter.c:580 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "формат: частица %%(then) использована без частицы %%(if)" -#: ref-filter.c:570 +#: ref-filter.c:582 #, c-format msgid "format: %%(then) atom used more than once" msgstr "формат: частица %%(then) использована более одного раза" -#: ref-filter.c:572 +#: ref-filter.c:584 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "формат: частица %%(then) использована после %%(else)" -#: ref-filter.c:598 +#: ref-filter.c:610 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "формат: частица %%(else) использована без частицы %%(if)" -#: ref-filter.c:600 +#: ref-filter.c:612 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "формат: частица %%(else) использована без частицы %%(then)" -#: ref-filter.c:602 +#: ref-filter.c:614 #, c-format msgid "format: %%(else) atom used more than once" msgstr "формат: частица %%(else) использована более одного раза" -#: ref-filter.c:615 +#: ref-filter.c:627 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "формат: частица %%(end) использована без соответствующей частицы" -#: ref-filter.c:670 +#: ref-filter.c:682 #, c-format msgid "malformed format string %s" msgstr "неправильная строка формата %s" -#: ref-filter.c:1254 +#: ref-filter.c:1268 #, c-format msgid "(no branch, rebasing %s)" msgstr "(нет ветки, перемещение %s)" -#: ref-filter.c:1257 +#: ref-filter.c:1271 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(нет ветки, двоичный поиск начат на %s)" #. TRANSLATORS: make sure this matches "HEAD #. detached at " in wt-status.c -#: ref-filter.c:1265 +#: ref-filter.c:1279 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD отделён на %s)" #. TRANSLATORS: make sure this matches "HEAD #. detached from " in wt-status.c -#: ref-filter.c:1272 +#: ref-filter.c:1286 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD отделён начиная с %s)" -#: ref-filter.c:1276 +#: ref-filter.c:1290 msgid "(no branch)" msgstr "(нет ветки)" -#: ref-filter.c:1426 ref-filter.c:1457 +#: ref-filter.c:1439 ref-filter.c:1470 #, c-format msgid "missing object %s for %s" msgstr "не найден объект %s для %s" -#: ref-filter.c:1429 ref-filter.c:1460 +#: ref-filter.c:1442 ref-filter.c:1473 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "сбой при выполнении parse_object_buffer на %s для %s" -#: ref-filter.c:1760 +#: ref-filter.c:1773 #, c-format msgid "malformed object at '%s'" msgstr "Повреждённый объект «%s»" -#: ref-filter.c:1827 +#: ref-filter.c:1840 #, c-format msgid "ignoring ref with broken name %s" msgstr "игнорирую ссылку с неправильным именем %s" -#: ref-filter.c:1832 +#: ref-filter.c:1845 #, c-format msgid "ignoring broken ref %s" msgstr "игнорирую неправильную ссылку %s" -#: ref-filter.c:2095 +#: ref-filter.c:2107 #, c-format msgid "format: %%(end) atom missing" msgstr "format: пропущена частица %%(end)" -#: ref-filter.c:2176 +#: ref-filter.c:2201 #, c-format msgid "malformed object name %s" msgstr "неправильное имя объекта %s" -#: remote.c:747 +#: remote.c:750 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Нельзя извлечь одновременно %s и %s в %s" -#: remote.c:751 +#: remote.c:754 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s обычно отслеживает %s, а не %s" -#: remote.c:755 +#: remote.c:758 #, c-format msgid "%s tracks both %s and %s" msgstr "%s отслеживает и %s и %s" -#: remote.c:763 +#: remote.c:766 msgid "Internal error" msgstr "Внутренняя ошибка" -#: remote.c:1680 remote.c:1782 +#: remote.c:1681 remote.c:1783 msgid "HEAD does not point to a branch" msgstr "HEAD не указывает на ветку" -#: remote.c:1689 +#: remote.c:1690 #, c-format msgid "no such branch: '%s'" msgstr "нет такой ветки: «%s»" -#: remote.c:1692 +#: remote.c:1693 #, c-format msgid "no upstream configured for branch '%s'" msgstr "вышестоящая ветка не настроена для ветки «%s»" -#: remote.c:1698 +#: remote.c:1699 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "вышестоящая ветка «%s» не сохранена как отслеживаемая ветка" -#: remote.c:1713 +#: remote.c:1714 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "назначение для отправки «%s» на внешнем сервере «%s» не имеет локальной отслеживаемой ветки" -#: remote.c:1725 +#: remote.c:1726 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "ветка «%s» не имеет внешнего сервера для отправки" -#: remote.c:1736 +#: remote.c:1737 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "спецификаторы пути для отправки «%s» не включают в себя «%s»" -#: remote.c:1749 +#: remote.c:1750 msgid "push has no destination (push.default is 'nothing')" msgstr "отправка не имеет точки назначения (push.default выставлен в «nothing»)" -#: remote.c:1771 +#: remote.c:1772 msgid "cannot resolve 'simple' push to a single destination" msgstr "не удалось выполнить «simple» отправку в единственную точку назначения" @@ -2719,7 +2747,7 @@ msgstr "(для исправления запустите «git branch --unset-u #: remote.c:2083 #, c-format -msgid "Your branch is up-to-date with '%s'.\n" +msgid "Your branch is up to date with '%s'.\n" msgstr "Ваша ветка обновлена в соответствии с «%s».\n" #: remote.c:2087 @@ -2766,16 +2794,16 @@ msgstr[3] "Ваша ветка и «%s» разделились\nи теперь msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (используйте «git pull», чтобы слить внешнюю ветку в вашу)\n" -#: revision.c:2187 +#: revision.c:2256 msgid "your current branch appears to be broken" msgstr "похоже, ваша текущая ветка повреждена" -#: revision.c:2190 +#: revision.c:2259 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "ваша текущая ветка «%s» еще не содержит ни одного коммита" -#: revision.c:2384 +#: revision.c:2453 msgid "--first-parent is incompatible with --bisect" msgstr "опцию --first-parent нельзя использовать одновременно с --bisect" @@ -2815,92 +2843,93 @@ msgstr "принимающая сторона не поддерживает от msgid "the receiving end does not support push options" msgstr "принимающая сторона не поддерживает отправку с опциями" -#: sequencer.c:216 +#: sequencer.c:218 msgid "revert" msgstr "обратить изменения" -#: sequencer.c:218 +#: sequencer.c:220 msgid "cherry-pick" msgstr "копировать коммит" -#: sequencer.c:220 +#: sequencer.c:222 msgid "rebase -i" msgstr "rebase -i" -#: sequencer.c:222 +#: sequencer.c:224 #, c-format msgid "Unknown action: %d" msgstr "Неизвестное действие: %d" -#: sequencer.c:279 +#: sequencer.c:281 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" msgstr "после разрешения конфликтов, пометьте исправленные пути\nс помощью «git add <пути>» или «git rm <пути>»" -#: sequencer.c:282 +#: sequencer.c:284 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" "and commit the result with 'git commit'" msgstr "после разрешения конфликтов, пометьте исправленные пути\nс помощью «git add <пути>» или «git rm <пути>»\nи сделайте коммит с помощью «git commit»" -#: sequencer.c:295 sequencer.c:1685 +#: sequencer.c:297 sequencer.c:1704 #, c-format msgid "could not lock '%s'" msgstr "не удалось заблокировать «%s»" -#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704 +#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723 +#: sequencer.c:2733 sequencer.c:2749 #, c-format msgid "could not write to '%s'" msgstr "не удалось записать в «%s»" -#: sequencer.c:302 +#: sequencer.c:304 #, c-format msgid "could not write eol to '%s'" msgstr "не удалось записать eol в «%s»" -#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692 +#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711 #, c-format msgid "failed to finalize '%s'." msgstr "не удалось завершить «%s»." -#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258 -#: builtin/commit.c:750 builtin/merge.c:1017 +#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259 +#: builtin/commit.c:754 builtin/merge.c:1044 #, c-format msgid "could not read '%s'" msgstr "не удалось прочитать «%s»" -#: sequencer.c:356 +#: sequencer.c:358 #, c-format msgid "your local changes would be overwritten by %s." msgstr "ваши локальные изменения будут перезаписаны %s." -#: sequencer.c:360 +#: sequencer.c:362 msgid "commit your changes or stash them to proceed." msgstr "для продолжения закоммитьте ваши изменения или спрячьте их." -#: sequencer.c:389 +#: sequencer.c:391 #, c-format msgid "%s: fast-forward" msgstr "%s: перемотка вперед" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". -#: sequencer.c:472 +#: sequencer.c:474 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Не удалось записать файл индекса" -#: sequencer.c:491 +#: sequencer.c:493 msgid "could not resolve HEAD commit\n" msgstr "не удалось распознать HEAD коммит\n" -#: sequencer.c:511 +#: sequencer.c:513 msgid "unable to update cache tree\n" msgstr "не удалось обновить дерево кэша\n" -#: sequencer.c:595 +#: sequencer.c:597 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -2917,17 +2946,17 @@ msgid "" " git rebase --continue\n" msgstr "у вас имеются проиндексированные изменения в рабочем каталоге. Если эти изменения должны быть объеденены с предыдущим коммитом, то запустите:\n\n git commit --amend %s\n\nЕсли же они должны быть помещены в новый коммит, то запустите:\n\n git commit %s\n\nВ любом случае, после того как вы закончите, продолжить перемещение можно выполнив:\n\n git rebase --continue\n" -#: sequencer.c:697 +#: sequencer.c:699 #, c-format msgid "could not parse commit %s\n" msgstr "не удалось разобрать коммит %s\n" -#: sequencer.c:702 +#: sequencer.c:704 #, c-format msgid "could not parse parent commit %s\n" msgstr "не удалось разобрать родительский коммит %s\n" -#: sequencer.c:824 +#: sequencer.c:826 #, c-format msgid "" "unexpected 1st line of squash message:\n" @@ -2935,7 +2964,7 @@ msgid "" "\t%.*s" msgstr "неожиданная первая строка сообщения уплотнения:\n\n\t%.*s" -#: sequencer.c:830 +#: sequencer.c:832 #, c-format msgid "" "invalid 1st line of squash message:\n" @@ -2943,229 +2972,230 @@ msgid "" "\t%.*s" msgstr "недопустимая первая строка сообщения уплотнения:\n\n\t%.*s" -#: sequencer.c:836 sequencer.c:861 +#: sequencer.c:838 sequencer.c:863 #, c-format msgid "This is a combination of %d commits." msgstr "Это объединение %d коммитов." -#: sequencer.c:845 +#: sequencer.c:847 sequencer.c:2681 msgid "need a HEAD to fixup" msgstr "нужен HEAD для исправления" -#: sequencer.c:847 +#: sequencer.c:849 msgid "could not read HEAD" msgstr "не удалось прочитать HEAD" -#: sequencer.c:849 +#: sequencer.c:851 msgid "could not read HEAD's commit message" msgstr "не удалось прочитать сообщение коммита текущего HEAD" -#: sequencer.c:855 +#: sequencer.c:857 #, c-format msgid "cannot write '%s'" msgstr "не удалось записать «%s»" -#: sequencer.c:864 git-rebase--interactive.sh:445 +#: sequencer.c:866 git-rebase--interactive.sh:446 msgid "This is the 1st commit message:" msgstr "Это 1-е сообщение коммита:" -#: sequencer.c:872 +#: sequencer.c:874 #, c-format msgid "could not read commit message of %s" msgstr "не удалось прочитать сообщение коммита для %s" -#: sequencer.c:879 +#: sequencer.c:881 #, c-format msgid "This is the commit message #%d:" msgstr "Это сообщение коммита номер #%d:" -#: sequencer.c:884 +#: sequencer.c:886 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Сообщение коммита номер #%d будет пропущено:" -#: sequencer.c:889 +#: sequencer.c:891 #, c-format msgid "unknown command: %d" msgstr "неизвестная команда: %d" -#: sequencer.c:955 +#: sequencer.c:957 msgid "your index file is unmerged." msgstr "ваш индекс не слит." -#: sequencer.c:973 +#: sequencer.c:975 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "коммит %s — это коммит-слияние, но опция -m не указана." -#: sequencer.c:981 +#: sequencer.c:983 #, c-format msgid "commit %s does not have parent %d" msgstr "у коммита %s нет предка %d" -#: sequencer.c:985 +#: sequencer.c:987 #, c-format msgid "mainline was specified but commit %s is not a merge." msgstr "основная ветка указана, но коммит %s не является слиянием." -#: sequencer.c:991 +#: sequencer.c:993 #, 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:1012 +#: sequencer.c:1014 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: не удалось разобрать родительский коммит для %s" -#: sequencer.c:1075 sequencer.c:1830 +#: sequencer.c:1077 sequencer.c:1853 #, c-format msgid "could not rename '%s' to '%s'" msgstr "не удалось переименовать «%s» в «%s»" -#: sequencer.c:1126 +#: sequencer.c:1128 #, c-format msgid "could not revert %s... %s" msgstr "не удалось обратить изменения коммита %s… %s" -#: sequencer.c:1127 +#: sequencer.c:1129 #, c-format msgid "could not apply %s... %s" msgstr "не удалось применить коммит %s… %s" -#: sequencer.c:1169 +#: sequencer.c:1171 msgid "empty commit set passed" msgstr "передан пустой набор коммитов" -#: sequencer.c:1179 +#: sequencer.c:1181 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: сбой чтения индекса" -#: sequencer.c:1186 +#: sequencer.c:1188 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: сбой обновления индекса" -#: sequencer.c:1306 +#: sequencer.c:1308 #, c-format msgid "invalid line %d: %.*s" msgstr "неправильная строка %d: %.*s" -#: sequencer.c:1314 +#: sequencer.c:1316 #, c-format msgid "cannot '%s' without a previous commit" msgstr "нельзя выполнить «%s» без указания предыдущего коммита" -#: sequencer.c:1347 +#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614 +#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951 #, c-format msgid "could not read '%s'." msgstr "не удалось прочитать «%s»." -#: sequencer.c:1359 +#: sequencer.c:1361 msgid "please fix this using 'git rebase --edit-todo'." msgstr "пожалуйста исправьте это с помощью «git rebase --edit-todo»." -#: sequencer.c:1361 +#: sequencer.c:1363 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "непригодная для использования карта с инструкциями: «%s»" -#: sequencer.c:1366 +#: sequencer.c:1368 msgid "no commits parsed." msgstr "коммиты не разобраны." -#: sequencer.c:1377 +#: sequencer.c:1379 msgid "cannot cherry-pick during a revert." msgstr "нельзя скопировать коммит во время процесса обращения коммита." -#: sequencer.c:1379 +#: sequencer.c:1381 msgid "cannot revert during a cherry-pick." msgstr "нельзя обратить изменения коммита во время копирования коммита." -#: sequencer.c:1442 +#: sequencer.c:1448 #, c-format msgid "invalid key: %s" msgstr "недействительный ключ: %s" -#: sequencer.c:1445 +#: sequencer.c:1451 #, c-format msgid "invalid value for %s: %s" msgstr "неправильное значение %s: %s" -#: sequencer.c:1502 +#: sequencer.c:1517 #, c-format msgid "malformed options sheet: '%s'" msgstr "испорченная карта с опциями: «%s»" -#: sequencer.c:1540 +#: sequencer.c:1555 msgid "a cherry-pick or revert is already in progress" msgstr "копирование или обращение изменений коммита уже выполняются" -#: sequencer.c:1541 +#: sequencer.c:1556 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "попробуйте «git cherry-pick (--continue | --quit | --abort)»" -#: sequencer.c:1544 +#: sequencer.c:1559 #, c-format msgid "could not create sequencer directory '%s'" msgstr "не удалось создать каталог для указателя следования коммитов «%s»" -#: sequencer.c:1558 +#: sequencer.c:1574 msgid "could not lock HEAD" msgstr "не удалось заблокировать HEAD" -#: sequencer.c:1614 sequencer.c:2188 +#: sequencer.c:1632 sequencer.c:2211 msgid "no cherry-pick or revert in progress" msgstr "копирование или обращение изменений коммита уже выполняются" -#: sequencer.c:1616 +#: sequencer.c:1634 msgid "cannot resolve HEAD" msgstr "не удалось определить HEAD" -#: sequencer.c:1618 sequencer.c:1652 +#: sequencer.c:1636 sequencer.c:1671 msgid "cannot abort from a branch yet to be born" msgstr "нельзя отменить изменения с ветки, которая еще не создана" -#: sequencer.c:1638 builtin/grep.c:929 +#: sequencer.c:1657 builtin/grep.c:711 #, c-format msgid "cannot open '%s'" msgstr "не удалось открыть «%s»" -#: sequencer.c:1640 +#: sequencer.c:1659 #, c-format msgid "cannot read '%s': %s" msgstr "не удалось прочитать «%s»: %s" -#: sequencer.c:1641 +#: sequencer.c:1660 msgid "unexpected end of file" msgstr "неожиданный конец файла" -#: sequencer.c:1647 +#: sequencer.c:1666 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "сохраненный файл с HEAD перед копированием коммита «%s» поврежден" -#: sequencer.c:1658 +#: sequencer.c:1677 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "Похоже, что вы переместили HEAD. Перемотка не выполняется, проверьте свой указатель HEAD!" -#: sequencer.c:1795 sequencer.c:2086 +#: sequencer.c:1818 sequencer.c:2109 msgid "cannot read HEAD" msgstr "не удалось прочитать HEAD" -#: sequencer.c:1835 builtin/difftool.c:633 +#: sequencer.c:1858 builtin/difftool.c:640 #, c-format msgid "could not copy '%s' to '%s'" msgstr "не удалось скопировать «%s» в «%s»" -#: sequencer.c:1851 +#: sequencer.c:1874 msgid "could not read index" msgstr "не удалось прочитать индекс" -#: sequencer.c:1856 +#: sequencer.c:1879 #, c-format msgid "" "execution failed: %s\n" @@ -3175,11 +3205,11 @@ msgid "" "\n" msgstr "ошибка выполнения: %s\n%sВы можете исправить ошибку, а затем запустить\n\n git rebase --continue\n\n" -#: sequencer.c:1862 +#: sequencer.c:1885 msgid "and made changes to the index and/or the working tree\n" msgstr "и были сделаны изменения в индексе и/или в рабочем каталоге\n" -#: sequencer.c:1868 +#: sequencer.c:1891 #, c-format msgid "" "execution succeeded: %s\n" @@ -3190,17 +3220,17 @@ msgid "" "\n" msgstr "успешное выполнение: %s\nно остались изменения в индексе и/или в рабочем каталоге\nСделайте коммит или спрячьте ваши изменения, а затем выполните\n\n git rebase --continue\n\n" -#: sequencer.c:1925 +#: sequencer.c:1948 #, c-format msgid "Applied autostash.\n" msgstr "Применены автоматически спрятанные изменения.\n" -#: sequencer.c:1937 +#: sequencer.c:1960 #, c-format msgid "cannot store %s" msgstr "не удалось сохранить %s" -#: sequencer.c:1940 git-rebase.sh:173 +#: sequencer.c:1963 git-rebase.sh:175 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -3208,81 +3238,154 @@ msgid "" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "Применение автоматически спрятанных изменений вызвало конфликты.\nВаши изменения спрятаны и в безопасности.\nВы можете выполнить «git stash pop» или «git stash drop» в любой момент.\n" -#: sequencer.c:2022 +#: sequencer.c:2045 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Остановлено на %s … %.*s\n" -#: sequencer.c:2064 +#: sequencer.c:2087 #, c-format msgid "unknown command %d" msgstr "неизвестная команда %d" -#: sequencer.c:2094 +#: sequencer.c:2117 msgid "could not read orig-head" msgstr "не удалось прочитать orig-head" -#: sequencer.c:2099 +#: sequencer.c:2122 sequencer.c:2678 msgid "could not read 'onto'" msgstr "не удалось прочитать «onto»" -#: sequencer.c:2106 +#: sequencer.c:2129 #, c-format msgid "could not update %s" msgstr "не удалось обновить %s" -#: sequencer.c:2113 +#: sequencer.c:2136 #, c-format msgid "could not update HEAD to %s" msgstr "не удалось обновить HEAD на %s" -#: sequencer.c:2197 +#: sequencer.c:2220 msgid "cannot rebase: You have unstaged changes." msgstr "не удалось выполнить перемещение коммитов: У вас есть непроиндексированные изменения." -#: sequencer.c:2202 +#: sequencer.c:2225 msgid "could not remove CHERRY_PICK_HEAD" msgstr "не удалось удалить CHERRY_PICK_HEAD" -#: sequencer.c:2211 +#: sequencer.c:2234 msgid "cannot amend non-existing commit" msgstr "не удалось исправить несуществующий коммит" -#: sequencer.c:2213 +#: sequencer.c:2236 #, c-format msgid "invalid file: '%s'" msgstr "недопустимый файл: «%s»" -#: sequencer.c:2215 +#: sequencer.c:2238 #, c-format msgid "invalid contents: '%s'" msgstr "недопустимое содержимое: «%s»" -#: sequencer.c:2218 +#: sequencer.c:2241 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" "first and then run 'git rebase --continue' again." msgstr "\nУ вас имеются незакоммиченные изменения в рабочем каталоге. Сделайте коммит, а затем запустите «git rebase --continue» снова." -#: sequencer.c:2228 +#: sequencer.c:2251 msgid "could not commit staged changes." msgstr "не удалось закоммитить проиндексированные изменения." -#: sequencer.c:2308 +#: sequencer.c:2331 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: не удалось скопировать коммит %s" -#: sequencer.c:2312 +#: sequencer.c:2335 #, c-format msgid "%s: bad revision" msgstr "%s: плохая редакция" -#: sequencer.c:2345 +#: sequencer.c:2368 msgid "can't revert as initial commit" msgstr "нельзя возвратить изначальный коммит" +#: sequencer.c:2471 +msgid "make_script: unhandled options" +msgstr "make_script: не обработанные опции" + +#: sequencer.c:2474 +msgid "make_script: error preparing revisions" +msgstr "make_script: ошибка при обновлении редакций" + +#: sequencer.c:2510 +#, c-format +msgid "unusable todo list: '%s'" +msgstr "непригодный для использования список дел: «%s»" + +#: sequencer.c:2516 +#, c-format +msgid "unable to open '%s' for writing" +msgstr "не удалось открыть «%s» для записи" + +#: sequencer.c:2561 +#, c-format +msgid "" +"unrecognized setting %s for optionrebase.missingCommitsCheck. Ignoring." +msgstr "нераспознанная настройка %s для опции optionrebase.missingCommitsCheck. Игнорирую." + +#: sequencer.c:2641 +#, c-format +msgid "" +"Warning: some commits may have been dropped accidentally.\n" +"Dropped commits (newer to older):\n" +msgstr "Внимание: некоторые коммиты могли быть отброшены по ошибке.\nОтброшенные коммиты (от новых к старым):\n" + +#: sequencer.c:2648 +#, c-format +msgid "" +"To avoid this message, use \"drop\" to explicitly remove a commit.\n" +"\n" +"Use 'git config rebase.missingCommitsCheck' to change the level of warnings.\n" +"The possible behaviours are: ignore, warn, error.\n" +"\n" +msgstr "Для избежания этого сообщения, используйте «drop» чтобы явно удалить коммит.\n\nИспользуйте опцию «git config rebase.missingCommitsCheck» для изменения количества предупреждений.\nВозможные значения: ignore, warn, error.\n\n" + +#: sequencer.c:2660 +#, c-format +msgid "" +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.\n" +"Or you can abort the rebase with 'git rebase --abort'.\n" +msgstr "Вы можете исправить это с помощью «git rebase --edit-todo», а потом запустив «git rebase --continue».\nИли вы можете прервать процесс перемещения, выполнив «git rebase --abort»\n" + +#: sequencer.c:2708 +#, c-format +msgid "could not parse commit '%s'" +msgstr "не удалось разобрать коммит «%s»" + +#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395 +#: builtin/am.c:775 +#, c-format +msgid "could not open '%s' for writing" +msgstr "не удалось открыть «%s» для записи" + +#: sequencer.c:2756 +#, c-format +msgid "could not truncate '%s'" +msgstr "не удалось обрезать «%s»" + +#: sequencer.c:2848 +msgid "the script was already rearranged." +msgstr "сценарий уже был перестроен." + +#: sequencer.c:2953 +#, c-format +msgid "could not finish '%s'" +msgstr "не удалось закончить «%s»" + #: setup.c:171 #, c-format msgid "" @@ -3306,96 +3409,82 @@ msgid "" "'git <command> [<revision>...] -- [<file>...]'" msgstr "неоднозначный аргумент «%s»: является одновременно и редакцией и именем файла.\nИспользуйте «--» для отделения путей от редакций, вот так:\n«git <команда> [<редакция>…] -- [<файл>…]»" -#: setup.c:504 +#: setup.c:499 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Ожидаемая версия git репозитория <= %d, а обнаружена %d" -#: setup.c:512 +#: setup.c:507 msgid "unknown repository extensions found:" msgstr "обнаружены неизвестные расширения репозитория:" -#: setup.c:810 +#: setup.c:806 #, c-format msgid "Not a git repository (or any of the parent directories): %s" msgstr "Не найден git репозитоий (или один из его каталогов): %s" -#: setup.c:812 builtin/index-pack.c:1652 +#: setup.c:808 builtin/index-pack.c:1653 msgid "Cannot come back to cwd" msgstr "Не удалось вернуться в текущий рабочий каталог" -#: setup.c:1050 +#: setup.c:1046 msgid "Unable to read current working directory" msgstr "Не удалось прочитать текущий рабочий каталог" -#: setup.c:1062 setup.c:1068 +#: setup.c:1058 setup.c:1064 #, c-format msgid "Cannot change to '%s'" msgstr "Не удалось изменить на «%s»" -#: setup.c:1081 +#: setup.c:1077 #, c-format msgid "" "Not a git repository (or any parent up to mount point %s)\n" "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." msgstr "Не найден git репозитоий (или один из его каталогов вплоть до точки монтирования %s)\nОстанавливаю поиск на границе файловой системы (так как GIT_DISCOVERY_ACROSS_FILESYSTEM не установлен)." -#: setup.c:1173 +#: setup.c:1159 #, c-format msgid "" "Problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." msgstr "Проблема со значением режима доступа к файлу core.sharedRepository (0%.3o).\nВладелец файлов должен всегда иметь права на чтение и на запись." -#: sha1_file.c:560 +#: sha1_file.c:528 #, c-format msgid "path '%s' does not exist" msgstr "путь «%s» не существует" -#: sha1_file.c:586 +#: sha1_file.c:554 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "ссылаемый репозиторий «%s» как связанное состояние, пока не поддерживается." -#: sha1_file.c:592 +#: sha1_file.c:560 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "ссылаемый репозиторий «%s» не является локальным." -#: sha1_file.c:598 +#: sha1_file.c:566 #, c-format msgid "reference repository '%s' is shallow" msgstr "ссылаемый репозиторий «%s» является частичным" -#: sha1_file.c:606 +#: sha1_file.c:574 #, c-format msgid "reference repository '%s' is grafted" msgstr "ссылаемый репозиторий «%s» является сращенным" -#: sha1_file.c:1245 -msgid "offset before end of packfile (broken .idx?)" -msgstr "сдвиг до конца файла пакета (возможно, повреждён файл .idx?)" - -#: sha1_file.c:2729 -#, c-format -msgid "offset before start of pack index for %s (corrupt index?)" -msgstr "сдвиг до начала индекса пакета для %s (повреждён индекс?)" - -#: sha1_file.c:2733 -#, c-format -msgid "offset beyond end of pack index for %s (truncated index?)" -msgstr "сдвиг за пределами индекса пакета для %s (обрезан индекс?)" - -#: sha1_name.c:419 +#: sha1_name.c:420 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "сокращённый SHA1 идентификатор %s неоднозначен" -#: sha1_name.c:430 +#: sha1_name.c:431 msgid "The candidates are:" msgstr "Возможно, вы имели в виду:" -#: sha1_name.c:589 +#: sha1_name.c:590 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -3408,81 +3497,86 @@ msgid "" "running \"git config advice.objectNameWarning false\"" msgstr "Обычно Git не создает ссылки, оканчивающиеся на 40 шестнадцатеричных\nсимволов, потому, что они будут игнорироваться, когда вы просто\nукажете это 40-символьное шестнадцатеричное число. Такие ссылки\nмогли быть созданы по ошибке. Например, с помощью:\n\n git checkout -b $br $(git rev-parse …)\n\n, если «$br» оказался пустым, то ссылка с 40-символьным\nшестнадцатеричным числом будет создана. Пожалуйста, просмотрите эти\nссылки и, возможно, удалите их. Вы можете отключить это сообщение\nзапустив «git config advice.objectNameWarning false»" -#: submodule.c:70 submodule.c:104 +#: submodule.c:93 submodule.c:127 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "Не удалось изменить не слитый .gitmodules, сначала разрешите конфликты" -#: submodule.c:74 submodule.c:108 +#: submodule.c:97 submodule.c:131 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "Не удалось найти раздел в .gitmodules, где путь равен %s" -#: submodule.c:82 +#: submodule.c:105 #, c-format msgid "Could not update .gitmodules entry %s" msgstr " Не удалось обновить .gitmodules запись %s" -#: submodule.c:115 +#: submodule.c:138 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "Не удалось удалить запись в .gitmodules для %s" -#: submodule.c:126 +#: submodule.c:149 msgid "staging updated .gitmodules failed" msgstr "сбой индексирования обновленного .gitmodules" -#: submodule.c:165 -msgid "negative values not allowed for submodule.fetchJobs" -msgstr "нельзя использовать отприцательные значения для submodule.fetchJobs" - -#: submodule.c:376 +#: submodule.c:309 #, c-format msgid "in unpopulated submodule '%s'" msgstr "в пустом подмодуле «%s»" -#: submodule.c:407 +#: submodule.c:340 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Спецификатор пути «%s» в подмодуле «%.*s»" -#: submodule.c:1337 +#: submodule.c:799 +#, c-format +msgid "submodule entry '%s' (%s) is a %s, not a commit" +msgstr "запись подмодуля «%s» (%s) является %s, а не является коммитом" + +#: submodule.c:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149 +msgid "Failed to resolve HEAD as a valid ref." +msgstr "Не удалось определить HEAD как действительную ссылку." + +#: submodule.c:1304 #, c-format msgid "'%s' not recognized as a git repository" msgstr "«%s» не распознан как репозиторий git" -#: submodule.c:1475 +#: submodule.c:1442 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "не удалось запустить «git status» в подмодуле «%s»" -#: submodule.c:1488 +#: submodule.c:1455 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "не удалось запустить «git status» в подмодуле «%s»" -#: submodule.c:1581 +#: submodule.c:1548 #, c-format msgid "submodule '%s' has dirty index" msgstr "подмодуль «%s» имеет изменённый индекс" -#: submodule.c:1845 +#: submodule.c:1809 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "relocate_gitdir для подмодуля «%s» с указанием более одного рабочего дерева не поддерживается" -#: submodule.c:1857 submodule.c:1913 +#: submodule.c:1821 submodule.c:1877 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "не удалось запросить имя подмодуля «%s»" -#: submodule.c:1861 builtin/submodule--helper.c:678 -#: builtin/submodule--helper.c:688 +#: submodule.c:1825 builtin/submodule--helper.c:671 +#: builtin/submodule--helper.c:681 #, c-format msgid "could not create directory '%s'" msgstr "не удалось создать каталог «%s»" -#: submodule.c:1864 +#: submodule.c:1828 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -3490,101 +3584,105 @@ msgid "" "'%s'\n" msgstr "Перемещение каталога git для «%s%s» из\n«%s» в\n«%s»\n" -#: submodule.c:1948 +#: submodule.c:1912 #, c-format msgid "could not recurse into submodule '%s'" msgstr "не удалось рекурсивно зайти в подмодуль «%s»" -#: submodule.c:1992 +#: submodule.c:1956 msgid "could not start ls-files in .." msgstr "не удалось выполнить stat ls-files в .." -#: submodule.c:2012 +#: submodule.c:1976 msgid "BUG: returned path string doesn't match cwd?" msgstr "ОШИБКА: возвращенная строка не соответсвует cwd?" -#: submodule.c:2031 +#: submodule.c:1995 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree вернул неожиданный код %d" -#: submodule-config.c:420 +#: submodule-config.c:263 +msgid "negative values not allowed for submodule.fetchjobs" +msgstr "нельзя использовать отрицательные значения для submodule.fetchjobs" + +#: submodule-config.c:436 #, c-format msgid "invalid value for %s" msgstr "неправильное значение %s" -#: trailer.c:241 +#: trailer.c:238 #, c-format msgid "running trailer command '%s' failed" msgstr "сбой при запуске команды завершителя «%s»" -#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540 -#: trailer.c:544 +#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 +#: trailer.c:557 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "неизвестное значение «%s» для ключа «%s»" -#: trailer.c:526 trailer.c:531 builtin/remote.c:290 +#: trailer.c:539 trailer.c:544 builtin/remote.c:290 #, c-format msgid "more than one %s" msgstr "больше одного %s" -#: trailer.c:703 +#: trailer.c:730 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "пустая последняя лексема в завершителе «%.*s»" -#: trailer.c:723 +#: trailer.c:750 #, c-format msgid "could not read input file '%s'" msgstr "не удалось прочитать входной файл «%s»" -#: trailer.c:726 +#: trailer.c:753 msgid "could not read from stdin" msgstr "не удалось прочитать из стандартного ввода" -#: trailer.c:950 builtin/am.c:45 +#: trailer.c:1008 builtin/am.c:46 #, c-format msgid "could not stat %s" msgstr "не удалось выполнить stat для %s" -#: trailer.c:952 +#: trailer.c:1010 #, c-format msgid "file %s is not a regular file" msgstr "файл %s не является обычным файлом" -#: trailer.c:954 +#: trailer.c:1012 #, c-format msgid "file %s is not writable by user" msgstr "файл %s не доступен на запись пользователю" -#: trailer.c:966 +#: trailer.c:1024 msgid "could not open temporary file" msgstr "не удалось создать временный файл" -#: trailer.c:1002 +#: trailer.c:1064 #, c-format msgid "could not rename temporary file to %s" msgstr "не удалось переименовать временный файл в %s" -#: transport.c:63 +#: transport.c:62 #, c-format msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "Будет установлен вышестоящий репозиторий для «%s» на «%s» с «%s»\n" -#: transport.c:152 +#: transport.c:151 #, c-format msgid "transport: invalid depth option '%s'" msgstr "транспорт: неправильный параметр глубины «%s»" -#: transport.c:890 +#: transport.c:888 #, c-format msgid "" "The following submodule paths contain changes that can\n" "not be found on any remote:\n" msgstr "Подмодули по указанным путям содержат изменения, которые не найдены ни на одном из внешних репозиториев:\n" -#: transport.c:894 +#: transport.c:892 #, c-format msgid "" "\n" @@ -3600,7 +3698,7 @@ msgid "" "\n" msgstr "\nПопробуйте выполнить\n\n\tgit push --recurse-submodules=on-demand\n\nили перейти в каталог с помощью команды cd и выполнить\n\n\tgit push\n\nдля их отправки на внешний репозиторий.\n" -#: transport.c:902 +#: transport.c:900 msgid "Aborting." msgstr "Прерываю." @@ -3621,187 +3719,182 @@ msgstr "неправильный режим в записи дерева" msgid "empty filename in tree entry" msgstr "пустое имя файла в записи дерева" -#: tree-walk.c:113 +#: tree-walk.c:114 msgid "too-short tree file" msgstr "слишком короткий файл дерева" -#: unpack-trees.c:105 +#: unpack-trees.c:106 #, 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 "Ваши локальные изменения в указанных файлах будут перезаписаны при переключении на состояние:\n%%sСделайте коммит или спрячьте ваши изменения перед переключением веток." -#: unpack-trees.c:107 +#: unpack-trees.c:108 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%s" msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при переключении на состояние:\n%%s" -#: unpack-trees.c:110 +#: unpack-trees.c:111 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%sPlease commit your changes or stash them before you merge." msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при слиянии:\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" "%%s" msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при слиянии:\n%%s" -#: unpack-trees.c:115 +#: unpack-trees.c:116 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%sPlease commit your changes or stash them before you %s." msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при %s:\n%%sСделайте коммит или спрячьте ваши изменения перед %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" "%%s" msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при %s:\n%%s" -#: unpack-trees.c:122 +#: unpack-trees.c:123 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" "%s" msgstr "Обновление указанных каталогов приведет к потере неотслеживаемых файлов в них:\n%s" -#: unpack-trees.c:126 +#: unpack-trees.c:127 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%sPlease move or remove them before you switch branches." msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при переключении на состояние:\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" "%%s" msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при переключении на состояние:\n%%s" -#: unpack-trees.c:131 +#: unpack-trees.c:132 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%sPlease move or remove them before you merge." 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" "%%s" msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при слиянии:\n%%s" -#: unpack-trees.c:136 +#: unpack-trees.c:137 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%sPlease move or remove them before you %s." msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при %s:\n%%sПереместите эти файлы или удалите их перед %s." -#: unpack-trees.c:138 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%s" msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при %s:\n%%s" -#: unpack-trees.c:143 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be overwritten by checkout:\n" "%%sPlease move or remove them before you switch branches." msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при переключении на состояние:\n%%sПереместите эти файлы или удалите их перед переключением веток." -#: unpack-trees.c:145 +#: unpack-trees.c:146 #, c-format msgid "" "The following untracked working tree files would be overwritten by checkout:\n" "%%s" msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при переключении на состояние:\n%%s" -#: unpack-trees.c:148 +#: unpack-trees.c:149 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%sPlease move or remove them before you merge." 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" "%%s" msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при слиянии:\n%%s" -#: unpack-trees.c:153 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%sPlease move or remove them before you %s." msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при %s:\n%%sПереместите эти файлы или удалите их перед %s." -#: unpack-trees.c:155 +#: unpack-trees.c:156 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%s" msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при %s:\n%%s" -#: unpack-trees.c:162 +#: unpack-trees.c:163 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "Запись «%s» частично совпадает с «%s». Не удалось назначить соответствие." -#: unpack-trees.c:165 +#: unpack-trees.c:166 #, c-format msgid "" -"Cannot update sparse checkout: the following entries are not up-to-date:\n" +"Cannot update sparse checkout: the following entries are not up to date:\n" "%s" msgstr "Не удалось обновить частичное состояние: следующие элементы не последней версии:\n%s" -#: unpack-trees.c:167 +#: unpack-trees.c:168 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout update:\n" "%s" msgstr "Указанные файлы из рабочего каталога будут перезаписаны при обновлении частичного состояния:\n%s" -#: unpack-trees.c:169 +#: unpack-trees.c:170 #, c-format msgid "" "The following working tree files would be removed by sparse checkout update:\n" "%s" msgstr "Указанные файлы из рабочего каталога будут удалены при обновлении частичного состояния:\n%s" -#: unpack-trees.c:171 +#: unpack-trees.c:172 #, c-format msgid "" "Cannot update submodule:\n" "%s" msgstr "Не удолось обновить подмодуль:\n%s" -#: unpack-trees.c:248 +#: unpack-trees.c:249 #, c-format msgid "Aborting\n" msgstr "Прерываю\n" -#: unpack-trees.c:277 -#, c-format -msgid "submodule update strategy not supported for submodule '%s'" -msgstr "стратегия обновления подмодуля не поддерживается подмодулем «%s»" - -#: unpack-trees.c:346 +#: unpack-trees.c:331 msgid "Checking out files" msgstr "Распаковка файлов" @@ -3844,13 +3937,8 @@ msgstr "не удалось прочитать «%s»" msgid "could not open '%s' for reading and writing" msgstr "не удалось открыть «%s» для чтения и записи" -#: wrapper.c:225 wrapper.c:395 builtin/am.c:766 -#, c-format -msgid "could not open '%s' for writing" -msgstr "не удалось открыть «%s» для записи" - -#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757 -#: builtin/am.c:849 builtin/merge.c:1014 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766 +#: builtin/am.c:858 builtin/merge.c:1041 #, c-format msgid "could not open '%s' for reading" msgstr "не удалось открыть «%s» для чтения" @@ -3874,135 +3962,135 @@ msgstr "не удалось записать в %s" msgid "could not close %s" msgstr "не удалось закрыть %s" -#: wt-status.c:152 +#: wt-status.c:150 msgid "Unmerged paths:" msgstr "Не слитые пути:" -#: wt-status.c:179 wt-status.c:206 +#: wt-status.c:177 wt-status.c:204 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (используйте «git reset %s <файл>…», чтобы убрать из индекса)" -#: wt-status.c:181 wt-status.c:208 +#: wt-status.c:179 wt-status.c:206 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (используйте «git rm --cached <файл>…», чтобы убрать из индекса)" -#: wt-status.c:185 +#: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (используйте «git add <файл>…», чтобы пометить разрешение конфликта)" -#: wt-status.c:187 wt-status.c:191 +#: wt-status.c:185 wt-status.c:189 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr " (используйте «git add/rm <файл>…», чтобы пометить выбранное разрешение конфликта)" -#: wt-status.c:189 +#: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (используйте «git rm <файл>…», чтобы пометить разрешение конфликта)" -#: wt-status.c:200 wt-status.c:981 +#: wt-status.c:198 wt-status.c:979 msgid "Changes to be committed:" msgstr "Изменения, которые будут включены в коммит:" -#: wt-status.c:218 wt-status.c:990 +#: wt-status.c:216 wt-status.c:988 msgid "Changes not staged for commit:" msgstr "Изменения, которые не в индексе для коммита:" -#: wt-status.c:222 +#: wt-status.c:220 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr " (используйте «git add <файл>…», чтобы добавить файл в индекс)" -#: wt-status.c:224 +#: wt-status.c:222 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr " (используйте «git add/rm <файл>…», чтобы добавить или удалить файл из индекса)" -#: wt-status.c:225 +#: wt-status.c:223 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working " "directory)" msgstr " (используйте «git checkout -- <файл>…», чтобы отменить изменения\n в рабочем каталоге)" -#: wt-status.c:227 +#: wt-status.c:225 msgid " (commit or discard the untracked or modified content in submodules)" msgstr " (сделайте коммит или отмените изменения в неотслеживаемом или измененном содержимом в подмодулях)" -#: wt-status.c:239 +#: wt-status.c:237 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr " (используйте «git %s <файл>…», чтобы добавить в то, что будет включено в коммит)" -#: wt-status.c:254 +#: wt-status.c:252 msgid "both deleted:" msgstr "оба удалены:" -#: wt-status.c:256 +#: wt-status.c:254 msgid "added by us:" msgstr "добавлено нами:" -#: wt-status.c:258 +#: wt-status.c:256 msgid "deleted by them:" msgstr "удалено ими:" -#: wt-status.c:260 +#: wt-status.c:258 msgid "added by them:" msgstr "добавлено ими:" -#: wt-status.c:262 +#: wt-status.c:260 msgid "deleted by us:" msgstr "удалено нами:" -#: wt-status.c:264 +#: wt-status.c:262 msgid "both added:" msgstr "оба добавлены:" -#: wt-status.c:266 +#: wt-status.c:264 msgid "both modified:" msgstr "оба изменены:" -#: wt-status.c:276 +#: wt-status.c:274 msgid "new file:" msgstr "новый файл:" -#: wt-status.c:278 +#: wt-status.c:276 msgid "copied:" msgstr "скопировано:" -#: wt-status.c:280 +#: wt-status.c:278 msgid "deleted:" msgstr "удалено:" -#: wt-status.c:282 +#: wt-status.c:280 msgid "modified:" msgstr "изменено:" -#: wt-status.c:284 +#: wt-status.c:282 msgid "renamed:" msgstr "переименовано:" -#: wt-status.c:286 +#: wt-status.c:284 msgid "typechange:" msgstr "изменен тип:" -#: wt-status.c:288 +#: wt-status.c:286 msgid "unknown:" msgstr "неизвестно:" -#: wt-status.c:290 +#: wt-status.c:288 msgid "unmerged:" msgstr "не слитые:" -#: wt-status.c:372 +#: wt-status.c:370 msgid "new commits, " msgstr "новые коммиты, " -#: wt-status.c:374 +#: wt-status.c:372 msgid "modified content, " msgstr "изменено содержимое, " -#: wt-status.c:376 +#: wt-status.c:374 msgid "untracked content, " msgstr "неотслеживаемое содержимое, " -#: wt-status.c:821 +#: wt-status.c:819 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" @@ -4011,57 +4099,57 @@ msgstr[1] "У вас сейчас спрятаны %d записи" msgstr[2] "У вас сейчас спрятано %d записей" msgstr[3] "У вас сейчас спрятаны %d записи" -#: wt-status.c:853 +#: wt-status.c:851 msgid "Submodules changed but not updated:" msgstr "Измененные, но не обновленные подмодули:" -#: wt-status.c:855 +#: wt-status.c:853 msgid "Submodule changes to be committed:" msgstr "Изменения в подмодулях, которые будут закоммичены:" -#: wt-status.c:937 +#: wt-status.c:935 msgid "" -"Do not touch the line above.\n" -"Everything below will be removed." -msgstr "Не трогайте строку выше этой.\nВсё, что ниже — будет удалено." +"Do not modify or remove the line above.\n" +"Everything below it will be ignored." +msgstr "Не изменяйте или удаляйте строку выше этой.\nВсё, что ниже — будет проигнорировано." -#: wt-status.c:1049 +#: wt-status.c:1048 msgid "You have unmerged paths." msgstr "У вас есть не слитые пути." -#: wt-status.c:1052 +#: wt-status.c:1051 msgid " (fix conflicts and run \"git commit\")" msgstr " (разрешите конфликты, затем запустите «git commit»)" -#: wt-status.c:1054 +#: wt-status.c:1053 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (используйте «git merge --abort», чтобы остановить операцию слияния)" -#: wt-status.c:1059 +#: wt-status.c:1058 msgid "All conflicts fixed but you are still merging." msgstr "Все конфликты исправлены, но вы все еще в процессе слияния." -#: wt-status.c:1062 +#: wt-status.c:1061 msgid " (use \"git commit\" to conclude merge)" msgstr " (используйте «git commit», чтобы завершить слияние)" -#: wt-status.c:1072 +#: wt-status.c:1071 msgid "You are in the middle of an am session." msgstr "Вы в процессе сессии am." -#: wt-status.c:1075 +#: wt-status.c:1074 msgid "The current patch is empty." msgstr "Текущий патч пустой." -#: wt-status.c:1079 +#: wt-status.c:1078 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (разрешите конфликты, затем запустите «git am --continue»)" -#: wt-status.c:1081 +#: wt-status.c:1080 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (используйте «git am --skip», чтобы пропустить этот патч)" -#: wt-status.c:1083 +#: wt-status.c:1082 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (используйте «git am --abort», чтобы восстановить оригинальную ветку)" @@ -4341,7 +4429,7 @@ msgstr "к тому же, в вашем индексе есть незакомм msgid "cannot %s: Your index contains uncommitted changes." msgstr "не удалось выполнить %s: В вашем индексе есть незакоммиченные изменения." -#: compat/precompose_utf8.c:58 builtin/clone.c:436 +#: compat/precompose_utf8.c:58 builtin/clone.c:437 #, c-format msgid "failed to unlink '%s'" msgstr "сбой отсоединения «%s»" @@ -4355,7 +4443,7 @@ msgstr "git add [<опции>] [--] <спецификатор-пути>…" msgid "unexpected diff status %c" msgstr "неожиданный статус различий %c" -#: builtin/add.c:87 builtin/commit.c:292 +#: builtin/add.c:87 builtin/commit.c:291 msgid "updating files failed" msgstr "сбой при обновлении файлов" @@ -4364,108 +4452,108 @@ msgstr "сбой при обновлении файлов" msgid "remove '%s'\n" msgstr "удалить «%s»\n" -#: builtin/add.c:151 +#: builtin/add.c:153 msgid "Unstaged changes after refreshing the index:" msgstr "Непроиндексированные изменения после обновления индекса:" -#: builtin/add.c:211 builtin/rev-parse.c:873 +#: builtin/add.c:213 builtin/rev-parse.c:888 msgid "Could not read the index" msgstr "Не удалось прочитать индекс" -#: builtin/add.c:222 +#: builtin/add.c:224 #, c-format msgid "Could not open '%s' for writing." msgstr "Не удалось открыть «%s» для записи." -#: builtin/add.c:226 +#: builtin/add.c:228 msgid "Could not write patch" msgstr "Не удалось записать патч" -#: builtin/add.c:229 +#: builtin/add.c:231 msgid "editing patch failed" msgstr "сбой при редактировании патча" -#: builtin/add.c:232 +#: builtin/add.c:234 #, c-format msgid "Could not stat '%s'" msgstr "Не удалось выполнить stat для «%s»" -#: builtin/add.c:234 +#: builtin/add.c:236 msgid "Empty patch. Aborted." msgstr "Пустой патч. Операция прервана." -#: builtin/add.c:239 +#: builtin/add.c:241 #, c-format msgid "Could not apply '%s'" msgstr "Не удалось применить «%s»" -#: builtin/add.c:249 +#: builtin/add.c:251 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "Следующие пути игнорируются одним из ваших файлов .gitignore:\n" -#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124 +#: builtin/add.c:271 builtin/clean.c:910 builtin/fetch.c:132 builtin/mv.c:124 #: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529 -#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164 +#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164 msgid "dry run" msgstr "пробный запуск" -#: builtin/add.c:272 +#: builtin/add.c:274 msgid "interactive picking" msgstr "интерактивный выбор" -#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299 +#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310 msgid "select hunks interactively" msgstr "интерактивный выбор блоков" -#: builtin/add.c:274 +#: builtin/add.c:276 msgid "edit current diff and apply" msgstr "отредактировать текущий файл различий и применить его" -#: builtin/add.c:275 +#: builtin/add.c:277 msgid "allow adding otherwise ignored files" msgstr "разрешить добавление игнорируемых иначе файлов" -#: builtin/add.c:276 +#: builtin/add.c:278 msgid "update tracked files" msgstr "обновить отслеживаемые файлы" -#: builtin/add.c:277 +#: builtin/add.c:279 msgid "record only the fact that the path will be added later" msgstr "записать только факт, что путь будет добавлен позже" -#: builtin/add.c:278 +#: builtin/add.c:280 msgid "add changes from all tracked and untracked files" msgstr "добавить изменения из всех отслеживаемых и неотслеживаемых файлов" -#: builtin/add.c:281 +#: builtin/add.c:283 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "игнорировать пути удаленные из рабочего каталога (тоже, что и --no-all)" -#: builtin/add.c:283 +#: builtin/add.c:285 msgid "don't add, only refresh the index" msgstr "не добавлять, только обновить индекс" -#: builtin/add.c:284 +#: builtin/add.c:286 msgid "just skip files which cannot be added because of errors" msgstr "пропускать файлы, которые не могут быть добавлены из-за ошибок" -#: builtin/add.c:285 +#: builtin/add.c:287 msgid "check if - even missing - files are ignored in dry run" msgstr "удостовериться, что даже недостающие файлы будут проигнорированы при пробном запуске" -#: builtin/add.c:286 builtin/update-index.c:952 +#: builtin/add.c:288 builtin/update-index.c:954 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/add.c:286 builtin/update-index.c:953 +#: builtin/add.c:288 builtin/update-index.c:955 msgid "override the executable bit of the listed files" msgstr "переопределить бит выполнения на указанных файлах" -#: builtin/add.c:288 +#: builtin/add.c:290 msgid "warn when adding an embedded repository" msgstr "предупреждать при добавлении встроенного git репозитория" -#: builtin/add.c:303 +#: builtin/add.c:305 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -4483,399 +4571,399 @@ msgid "" "See \"git help submodule\" for more information." msgstr "Вы добавили другой репозиторий git внутри текущего репозитория\nКлоны внешнего репозитория не будут содержать внутренний\nрепозиторий и не будут знать как его получить.\nЕсли вы хотели добавить подмодуль, то запустите:\n\n\tgit submodule add <url> %s\n\nЕсли бы добавили этот путь по ошибке, то вы можете удалить его\nиз индекса с помощью:\n\n\tgit rm --cached %s\n\nДля дополнительной информации смотрите «git help submodule»." -#: builtin/add.c:331 +#: builtin/add.c:333 #, c-format msgid "adding embedded git repository: %s" msgstr "добавление встроенного git репозитория: %s" -#: builtin/add.c:349 +#: builtin/add.c:351 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Используйте -f, если вы действительно хотите добавить их.\n" -#: builtin/add.c:357 +#: builtin/add.c:359 msgid "adding files failed" msgstr "ошибка при добавлении файлов" -#: builtin/add.c:394 +#: builtin/add.c:396 msgid "-A and -u are mutually incompatible" msgstr "-A и -u нельзя использовать одновременно" -#: builtin/add.c:401 +#: builtin/add.c:403 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "Опция --ignore-missing может использоваться только вместе с --dry-run" -#: builtin/add.c:405 +#: builtin/add.c:407 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "параметр --chmod «%s» должен быть -x или +x" -#: builtin/add.c:420 +#: builtin/add.c:422 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Ничего не указано, ничего не добавлено.\n" -#: builtin/add.c:421 +#: builtin/add.c:423 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Возможно, вы имели в виду «git add .»?\n" -#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282 -#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351 -#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272 -#: builtin/submodule--helper.c:244 +#: builtin/add.c:428 builtin/check-ignore.c:176 builtin/checkout.c:282 +#: builtin/checkout.c:479 builtin/clean.c:957 builtin/commit.c:350 +#: builtin/mv.c:143 builtin/reset.c:249 builtin/rm.c:271 +#: builtin/submodule--helper.c:243 msgid "index file corrupt" msgstr "файл индекса поврежден" -#: builtin/am.c:413 +#: builtin/am.c:414 msgid "could not parse author script" msgstr "не удалось разобрать сценарий авторства" -#: builtin/am.c:489 +#: builtin/am.c:498 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "«%s» был удален перехватчиком applypatch-msg" -#: builtin/am.c:530 +#: builtin/am.c:539 #, c-format msgid "Malformed input line: '%s'." msgstr "Неправильная строка ввода: «%s»." -#: builtin/am.c:567 +#: builtin/am.c:576 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Не удалось скопировать заметку из «%s» в «%s»" -#: builtin/am.c:593 +#: builtin/am.c:602 msgid "fseek failed" msgstr "сбой при выполнении fseek" -#: builtin/am.c:777 +#: builtin/am.c:786 #, c-format msgid "could not parse patch '%s'" msgstr "не удалось разобрать патч «%s»" -#: builtin/am.c:842 +#: builtin/am.c:851 msgid "Only one StGIT patch series can be applied at once" msgstr "Только серия патчей StGIT может быть применена за раз" -#: builtin/am.c:889 +#: builtin/am.c:899 msgid "invalid timestamp" msgstr "недопустимая метка даты/времени" -#: builtin/am.c:892 builtin/am.c:900 +#: builtin/am.c:904 builtin/am.c:916 msgid "invalid Date line" msgstr "недопустимая строка даты" -#: builtin/am.c:897 +#: builtin/am.c:911 msgid "invalid timezone offset" msgstr "недопустимое смещение часового пояса" -#: builtin/am.c:986 +#: builtin/am.c:1004 msgid "Patch format detection failed." msgstr "Сбой определения формата патча." -#: builtin/am.c:991 builtin/clone.c:401 +#: builtin/am.c:1009 builtin/clone.c:402 #, c-format msgid "failed to create directory '%s'" msgstr "не удалось создать каталог «%s»" -#: builtin/am.c:995 +#: builtin/am.c:1013 msgid "Failed to split patches." msgstr "Не удалось разделить патчи на части." -#: builtin/am.c:1120 builtin/commit.c:377 +#: builtin/am.c:1142 builtin/commit.c:376 msgid "unable to write index file" msgstr "не удалось записать индекс" -#: builtin/am.c:1171 +#: builtin/am.c:1193 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Когда вы устраните эту проблему, запустите «%s --continue»." -#: builtin/am.c:1172 +#: builtin/am.c:1194 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Если вы хотите пропустить этот патч, то запустите «%s --skip»." -#: builtin/am.c:1173 +#: builtin/am.c:1195 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "Чтобы вернуться на предыдущую ветку и остановить применение изменений, запустите «%s --abort»." -#: builtin/am.c:1304 +#: builtin/am.c:1302 msgid "Patch is empty." msgstr "Патч пустой." -#: builtin/am.c:1370 +#: builtin/am.c:1368 #, c-format msgid "invalid ident line: %.*s" msgstr "неправильная строка идентификации: %.*s" -#: builtin/am.c:1392 +#: builtin/am.c:1390 #, c-format msgid "unable to parse commit %s" msgstr "не удалось разобрать коммит %s" -#: builtin/am.c:1586 +#: builtin/am.c:1584 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "В репозитории отсутствуют двоичные объекты, необходимые для отката к трехходовому слиянию." -#: builtin/am.c:1588 +#: builtin/am.c:1586 msgid "Using index info to reconstruct a base tree..." msgstr "Использую индекс для реконструкции базового дерева…" -#: builtin/am.c:1607 +#: builtin/am.c:1605 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "Вы вручную изменяли патч?\nОн не накладывается без ошибок на двоичные объекты, записанные в его заголовке." -#: builtin/am.c:1613 +#: builtin/am.c:1611 msgid "Falling back to patching base and 3-way merge..." msgstr "Откат к применению изменений к базовому коммиту с помощью трехходового слияния…" -#: builtin/am.c:1638 +#: builtin/am.c:1636 msgid "Failed to merge in the changes." msgstr "Не удалось слить изменения." -#: builtin/am.c:1662 builtin/merge.c:632 +#: builtin/am.c:1660 builtin/merge.c:641 msgid "git write-tree failed to write a tree" msgstr "git write-tree не удалось записать дерево" -#: builtin/am.c:1669 +#: builtin/am.c:1667 msgid "applying to an empty history" msgstr "применение к пустой истории" -#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803 -#: builtin/merge.c:828 +#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824 +#: builtin/merge.c:849 msgid "failed to write commit object" msgstr "сбой записи объекта коммита" -#: builtin/am.c:1715 builtin/am.c:1719 +#: builtin/am.c:1713 builtin/am.c:1717 #, c-format msgid "cannot resume: %s does not exist." msgstr "нельзя продолжнить: %s не существует " -#: builtin/am.c:1735 +#: builtin/am.c:1733 msgid "cannot be interactive without stdin connected to a terminal." msgstr "не удалось использовать интерактивное поведение, без stdin подключенного к терминалу." -#: builtin/am.c:1740 +#: builtin/am.c:1738 msgid "Commit Body is:" msgstr "Тело коммита:" #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. -#: builtin/am.c:1750 +#: builtin/am.c:1748 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Применить? [y] - да/[n] - нет/[e] - редактировать/[v] - просмотреть патч/[a] - применить всё: " -#: builtin/am.c:1800 +#: builtin/am.c:1798 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Индекс не пустой: нельзя применять патчи (в индексе: %s)" -#: builtin/am.c:1840 builtin/am.c:1912 +#: builtin/am.c:1838 builtin/am.c:1910 #, c-format msgid "Applying: %.*s" msgstr "Применение: %.*s" -#: builtin/am.c:1856 +#: builtin/am.c:1854 msgid "No changes -- Patch already applied." msgstr "Нет изменений — Патч уже применен." -#: builtin/am.c:1864 +#: builtin/am.c:1862 #, c-format msgid "Patch failed at %s %.*s" msgstr "Ошибка применения изменений на %s %.*s" -#: builtin/am.c:1870 +#: builtin/am.c:1868 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "Копию изменений, которые не удалось применить, вы можете найти в: %s" -#: builtin/am.c:1915 +#: builtin/am.c:1913 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch." msgstr "Нет изменений — возможно, вы забыли вызвать «git add»?\nЕсли ничего не осталось для индексации, то, скорее всего, что-то другое уже сделало те же изменения; возможно, вам следует пропустить этот патч." -#: builtin/am.c:1922 +#: builtin/am.c:1920 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as such.\n" "You might run `git rm` on a file to accept \"deleted by them\" for it." msgstr "У вас есть не слитые пути в индексе.\nВы должны выполнить «git add» для каждого файла с разрешенными конфликтами, чтобы пометить их таковыми.\nВы можете запустить «git rm» с именем файла, чтобы пометить его как «удалено ими»." -#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323 -#: builtin/reset.c:331 +#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332 +#: builtin/reset.c:340 #, c-format msgid "Could not parse object '%s'." msgstr "Не удалось разобрать объект «%s»." -#: builtin/am.c:2083 +#: builtin/am.c:2081 msgid "failed to clean index" msgstr "не удалось очистить индекс" -#: builtin/am.c:2117 +#: builtin/am.c:2116 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "Похоже, что вы переместили HEAD с момента последней ошибки выполнения «am».\nПеремотка на ORIG_HEAD не выполняется" -#: builtin/am.c:2180 +#: builtin/am.c:2179 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Неправильное значение для --patch-format: %s" -#: builtin/am.c:2213 +#: builtin/am.c:2212 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<опции>] [(<mbox> | <Maildir>)…]" -#: builtin/am.c:2214 +#: builtin/am.c:2213 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<опции>] (--continue | --skip | --abort)" -#: builtin/am.c:2220 +#: builtin/am.c:2219 msgid "run interactively" msgstr "запустить в интерактивном режиме" -#: builtin/am.c:2222 +#: builtin/am.c:2221 msgid "historical option -- no-op" msgstr "историческая опция — ничего не делает" -#: builtin/am.c:2224 +#: builtin/am.c:2223 msgid "allow fall back on 3way merging if needed" msgstr "разрешить откатиться к трехходовому слиянию, если нужно" -#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57 +#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57 #: builtin/repack.c:180 msgid "be quiet" msgstr "тихий режим" -#: builtin/am.c:2227 +#: builtin/am.c:2226 msgid "add a Signed-off-by line to the commit message" msgstr "добавить строку Signed-off-by к сообщению коммита" -#: builtin/am.c:2230 +#: builtin/am.c:2229 msgid "recode into utf8 (default)" msgstr "перекодировать в utf8 (по умолчанию)" -#: builtin/am.c:2232 +#: builtin/am.c:2231 msgid "pass -k flag to git-mailinfo" msgstr "передать флаг -k в git-mailinfo" -#: builtin/am.c:2234 +#: builtin/am.c:2233 msgid "pass -b flag to git-mailinfo" msgstr "передать флаг -b в git-mailinfo" -#: builtin/am.c:2236 +#: builtin/am.c:2235 msgid "pass -m flag to git-mailinfo" msgstr "передать флаг -m в git-mailinfo" -#: builtin/am.c:2238 +#: builtin/am.c:2237 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "передать флаг --keep-cr в git-mailsplit для формата mbox" -#: builtin/am.c:2241 +#: builtin/am.c:2240 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "не передавать --keep-cr флаг в git-mailsplit вне зависимости от am.keepcr" -#: builtin/am.c:2244 +#: builtin/am.c:2243 msgid "strip everything before a scissors line" msgstr "обрезать все до строки обрезки" -#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255 -#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 -#: builtin/am.c:2273 +#: builtin/am.c:2245 builtin/am.c:2248 builtin/am.c:2251 builtin/am.c:2254 +#: builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263 builtin/am.c:2266 +#: builtin/am.c:2272 msgid "pass it through git-apply" msgstr "передать его в git-apply" -#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 -#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142 +#: builtin/am.c:2262 builtin/fmt-merge-msg.c:664 builtin/fmt-merge-msg.c:667 +#: builtin/grep.c:843 builtin/merge.c:205 builtin/pull.c:142 #: builtin/pull.c:197 builtin/repack.c:189 builtin/repack.c:193 #: builtin/repack.c:195 builtin/show-branch.c:631 builtin/show-ref.c:169 -#: builtin/tag.c:399 parse-options.h:132 parse-options.h:134 +#: builtin/tag.c:377 parse-options.h:132 parse-options.h:134 #: parse-options.h:245 msgid "n" msgstr "n" -#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38 -#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39 +#: builtin/am.c:2268 builtin/branch.c:622 builtin/for-each-ref.c:38 +#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39 msgid "format" msgstr "формат" -#: builtin/am.c:2270 +#: builtin/am.c:2269 msgid "format the patch(es) are in" msgstr "формат, в котором находятся патчи" -#: builtin/am.c:2276 +#: builtin/am.c:2275 msgid "override error message when patch failure occurs" msgstr "переопределить сообщение об ошибке, если не удалось наложить изменения" -#: builtin/am.c:2278 +#: builtin/am.c:2277 msgid "continue applying patches after resolving a conflict" msgstr "продолжить применение изменений после разрешения конфиликта" -#: builtin/am.c:2281 +#: builtin/am.c:2280 msgid "synonyms for --continue" msgstr "синоним для --continue" -#: builtin/am.c:2284 +#: builtin/am.c:2283 msgid "skip the current patch" msgstr "пропустить текущий патч" -#: builtin/am.c:2287 +#: builtin/am.c:2286 msgid "restore the original branch and abort the patching operation." msgstr "восстановить оригинальную ветку и отменить операцию применения изменений." -#: builtin/am.c:2291 +#: builtin/am.c:2290 msgid "lie about committer date" msgstr "соврать о дате коммитера" -#: builtin/am.c:2293 +#: builtin/am.c:2292 msgid "use current timestamp for author date" msgstr "использовать текущее время как время авторства" -#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233 -#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414 +#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236 +#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2296 +#: builtin/am.c:2295 msgid "GPG-sign commits" msgstr "подписать коммиты с помощью GPG" -#: builtin/am.c:2299 +#: builtin/am.c:2298 msgid "(internal use for git-rebase)" msgstr "(внутреннее использование для git-rebase)" -#: builtin/am.c:2317 +#: builtin/am.c:2316 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." msgstr "Опция -b/--binary уже долгое время ничего не делает и будет удалена с следующих версиях Git. Пожалуйста, не используйте ее." -#: builtin/am.c:2324 +#: builtin/am.c:2323 msgid "failed to read the index" msgstr "сбой чтения индекса" -#: builtin/am.c:2339 +#: builtin/am.c:2338 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "предыдущий каталог перемещения %s еще существует, но передан mbox." -#: builtin/am.c:2363 +#: builtin/am.c:2362 #, c-format msgid "" "Stray %s directory found.\n" "Use \"git am --abort\" to remove it." msgstr "Найден забытый каталог %s.\nИспользуйте «git am --abort», чтобы удалить его." -#: builtin/am.c:2369 +#: builtin/am.c:2368 msgid "Resolve operation not in progress, we are not resuming." msgstr "Операция разрешения конфликтов не в процессе выполнения, не продолжаем." @@ -5078,124 +5166,149 @@ msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [<опции>] (-m | -M) [<старая-ветка>] <новая-ветка>" #: builtin/branch.c:31 +msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>" +msgstr "git branch [<опции>] (-c | -C) [<старая-ветка>] <новая-ветка>" + +#: builtin/branch.c:32 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [<опции>] [-r | -a] [--points-at]" -#: builtin/branch.c:32 +#: builtin/branch.c:33 msgid "git branch [<options>] [-r | -a] [--format]" msgstr "git branch [<опции>] [-r | -a] [--format]" -#: builtin/branch.c:145 +#: builtin/branch.c:146 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD." msgstr "удаление ветки «%s», которая была слита с\n «%s», но не слита с HEAD." -#: builtin/branch.c:149 +#: builtin/branch.c:150 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" " '%s', even though it is merged to HEAD." msgstr "не удаление ветки «%s», которая еще не слита с\n «%s», хотя уже слита с HEAD." -#: builtin/branch.c:163 +#: builtin/branch.c:164 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Не удалось найти объект коммита для «%s»" -#: builtin/branch.c:167 +#: builtin/branch.c:168 #, c-format msgid "" "The branch '%s' is not fully merged.\n" "If you are sure you want to delete it, run 'git branch -D %s'." msgstr "Ветка «%s» не слита полностью.\nЕсли вы уверены, что хотите ее удалить, запустите «git branch -D %s»." -#: builtin/branch.c:180 +#: builtin/branch.c:181 msgid "Update of config-file failed" msgstr "Не удалось обновить файл конфигурации" -#: builtin/branch.c:211 +#: builtin/branch.c:212 msgid "cannot use -a with -d" msgstr "нельзя использовать одновременно ключи -a и -d" -#: builtin/branch.c:217 +#: builtin/branch.c:218 msgid "Couldn't look up commit object for HEAD" msgstr "Не удалось найти объект коммита для HEAD" -#: builtin/branch.c:231 +#: builtin/branch.c:232 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "Нельзя удалить ветку «%s» т.к. она активна на «%s»" -#: builtin/branch.c:246 +#: builtin/branch.c:247 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "внешняя отслеживаемая ветка «%s» не найдена." -#: builtin/branch.c:247 +#: builtin/branch.c:248 #, c-format msgid "branch '%s' not found." msgstr "ветка «%s» не найдена." -#: builtin/branch.c:262 +#: builtin/branch.c:263 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "Ошибка удаления внешней отслеживаемой ветки «%s»" -#: builtin/branch.c:263 +#: builtin/branch.c:264 #, c-format msgid "Error deleting branch '%s'" msgstr "Ошибка удаления ветки «%s»" -#: builtin/branch.c:270 +#: builtin/branch.c:271 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Внешняя отслеживаемая ветка %s удалена (была %s).\n" -#: builtin/branch.c:271 +#: builtin/branch.c:272 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Ветка %s удалена (была %s).\n" -#: builtin/branch.c:445 +#: builtin/branch.c:417 builtin/tag.c:58 +msgid "unable to parse format string" +msgstr "не удалось разобрать строку формата" + +#: builtin/branch.c:450 #, c-format msgid "Branch %s is being rebased at %s" msgstr "Производится перемещение ветки %s на %s" -#: builtin/branch.c:449 +#: builtin/branch.c:454 #, c-format msgid "Branch %s is being bisected at %s" msgstr "Производится двоичный поиск в ветке %s на %s" -#: builtin/branch.c:464 +#: builtin/branch.c:470 +msgid "cannot copy the current branch while not on any." +msgstr "невозможно скопировать текущую ветку, если вы не находитесь ни на одной из веток." + +#: builtin/branch.c:472 msgid "cannot rename the current branch while not on any." msgstr "невозможно переименовать текущую ветку, если вы не находитесь ни на одной из них." -#: builtin/branch.c:474 +#: builtin/branch.c:483 #, c-format msgid "Invalid branch name: '%s'" msgstr "Недействительное имя ветки: «%s»" -#: builtin/branch.c:491 +#: builtin/branch.c:504 msgid "Branch rename failed" msgstr "Сбой переименования ветки" -#: builtin/branch.c:494 +#: builtin/branch.c:506 +msgid "Branch copy failed" +msgstr "Сбой копирования ветки" + +#: builtin/branch.c:510 +#, c-format +msgid "Copied a misnamed branch '%s' away" +msgstr "Скопирована неправильно названная ветка «%s»" + +#: builtin/branch.c:513 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Переименована неправильно названная ветка «%s»" -#: builtin/branch.c:497 +#: builtin/branch.c:519 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Ветка переименована в %s, но HEAD не обновлен!" -#: builtin/branch.c:506 +#: builtin/branch.c:528 msgid "Branch is renamed, but update of config-file failed" msgstr "Ветка переименована, но произошел сбой обновления файла конфигурации" -#: builtin/branch.c:522 +#: builtin/branch.c:530 +msgid "Branch is copied, but update of config-file failed" +msgstr "Ветка скопирована, но произошел сбой обновления файла конфигурации" + +#: builtin/branch.c:546 #, c-format msgid "" "Please edit the description for the branch\n" @@ -5203,226 +5316,225 @@ msgid "" "Lines starting with '%c' will be stripped.\n" msgstr "Измените описание для ветки:\n %s\nСтроки, начинающиеся с «%c» будут вырезаны.\n" -#: builtin/branch.c:555 +#: builtin/branch.c:579 msgid "Generic options" msgstr "Общие параметры" -#: builtin/branch.c:557 +#: builtin/branch.c:581 msgid "show hash and subject, give twice for upstream branch" msgstr "показывать хэш-сумму и тему, укажите дважды для вышестоящей ветки" -#: builtin/branch.c:558 +#: builtin/branch.c:582 msgid "suppress informational messages" msgstr "не выводить информационные сообщения" -#: builtin/branch.c:559 +#: builtin/branch.c:583 msgid "set up tracking mode (see git-pull(1))" msgstr "установить режим отслеживания вышестоящей ветки (см. git-pull(1))" -#: builtin/branch.c:561 -msgid "change upstream info" -msgstr "изменить информацию о вышестоящей ветке" +#: builtin/branch.c:585 +msgid "do not use" +msgstr "не используйте" -#: builtin/branch.c:563 +#: builtin/branch.c:587 msgid "upstream" msgstr "вышестоящая" -#: builtin/branch.c:563 +#: builtin/branch.c:587 msgid "change the upstream info" msgstr "изменить информацию о вышестоящей ветке" -#: builtin/branch.c:564 +#: builtin/branch.c:588 msgid "Unset the upstream info" msgstr "Убрать информацию о вышестоящей ветке" -#: builtin/branch.c:565 +#: builtin/branch.c:589 msgid "use colored output" msgstr "использовать цветной вывод" -#: builtin/branch.c:566 +#: builtin/branch.c:590 msgid "act on remote-tracking branches" msgstr "выполнить действия на отслеживаемых внешних ветках" -#: builtin/branch.c:568 builtin/branch.c:570 +#: builtin/branch.c:592 builtin/branch.c:594 msgid "print only branches that contain the commit" msgstr "вывод только веток, которые содержат коммит" -#: builtin/branch.c:569 builtin/branch.c:571 +#: builtin/branch.c:593 builtin/branch.c:595 msgid "print only branches that don't contain the commit" msgstr "вывод только веток, которые не содержат коммит" -#: builtin/branch.c:574 +#: builtin/branch.c:598 msgid "Specific git-branch actions:" msgstr "Специфичные для git-branch действия:" -#: builtin/branch.c:575 +#: builtin/branch.c:599 msgid "list both remote-tracking and local branches" msgstr "показать список и отслеживаемых и локальных веток" -#: builtin/branch.c:577 +#: builtin/branch.c:601 msgid "delete fully merged branch" msgstr "удалить полностью слитую ветку" -#: builtin/branch.c:578 +#: builtin/branch.c:602 msgid "delete branch (even if not merged)" msgstr "удалить ветку (даже никуда не слитую)" -#: builtin/branch.c:579 +#: builtin/branch.c:603 msgid "move/rename a branch and its reflog" msgstr "переместить/переименовать ветки и ее журнал ссылок" -#: builtin/branch.c:580 +#: builtin/branch.c:604 msgid "move/rename a branch, even if target exists" msgstr "переместить/переименовать ветку, даже если целевое имя уже существует" -#: builtin/branch.c:581 +#: builtin/branch.c:605 +msgid "copy a branch and its reflog" +msgstr "скопировать ветку и её журнал ссылок" + +#: builtin/branch.c:606 +msgid "copy a branch, even if target exists" +msgstr "скопировать ветку, даже если целевое имя уже существует" + +#: builtin/branch.c:607 msgid "list branch names" msgstr "показать список имен веток" -#: builtin/branch.c:582 +#: builtin/branch.c:608 msgid "create the branch's reflog" msgstr "создать журнал ссылок ветки" -#: builtin/branch.c:584 +#: builtin/branch.c:610 msgid "edit the description for the branch" msgstr "изменить описание ветки" -#: builtin/branch.c:585 +#: builtin/branch.c:611 msgid "force creation, move/rename, deletion" msgstr "принудительное создание, перемещение или удаление ветки" -#: builtin/branch.c:586 +#: builtin/branch.c:612 msgid "print only branches that are merged" msgstr "вывод только слитых веток" -#: builtin/branch.c:587 +#: builtin/branch.c:613 msgid "print only branches that are not merged" msgstr "вывод только не слитых веток" -#: builtin/branch.c:588 +#: builtin/branch.c:614 msgid "list branches in columns" msgstr "показать список веток по столбцам" -#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427 +#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405 msgid "key" msgstr "ключ" -#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428 +#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406 msgid "field name to sort on" msgstr "имя поля, по которому выполнить сортировку" -#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407 -#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573 -#: builtin/tag.c:430 +#: builtin/branch.c:618 builtin/for-each-ref.c:43 builtin/notes.c:408 +#: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574 +#: builtin/tag.c:408 msgid "object" msgstr "объект" -#: builtin/branch.c:593 +#: builtin/branch.c:619 msgid "print only branches of the object" msgstr "вывод только веток, определенного объекта" -#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435 +#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415 msgid "sorting and filtering are case insensitive" msgstr "сортировка и фильтрация не зависят от регистра" -#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434 +#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413 #: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "использовать формат для вывода" -#: builtin/branch.c:615 -msgid "Failed to resolve HEAD as a valid ref." -msgstr "Не удалось определить HEAD как действительную ссылку." - -#: builtin/branch.c:619 builtin/clone.c:728 +#: builtin/branch.c:645 builtin/clone.c:729 msgid "HEAD not found below refs/heads!" msgstr "HEAD не найден в refs/heads!" -#: builtin/branch.c:642 +#: builtin/branch.c:668 msgid "--column and --verbose are incompatible" msgstr "--column и --verbose нельзя использовать одновременно" -#: builtin/branch.c:653 builtin/branch.c:705 +#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741 msgid "branch name required" msgstr "требуется имя ветки" -#: builtin/branch.c:681 +#: builtin/branch.c:708 msgid "Cannot give description to detached HEAD" msgstr "Нельзя дать описание отделённому HEAD" -#: builtin/branch.c:686 +#: builtin/branch.c:713 msgid "cannot edit description of more than one branch" msgstr "нельзя изменить описание более одной ветки за раз" -#: builtin/branch.c:693 +#: builtin/branch.c:720 #, c-format msgid "No commit on branch '%s' yet." msgstr "Еще нет коммита на ветке «%s»." -#: builtin/branch.c:696 +#: builtin/branch.c:723 #, c-format msgid "No branch named '%s'." msgstr "Нет ветки с именем «%s»." -#: builtin/branch.c:711 -msgid "too many branches for a rename operation" -msgstr "слишком много веток для операции переименования" +#: builtin/branch.c:738 +msgid "too many branches for a copy operation" +msgstr "слишком много веток для операции копирования" -#: builtin/branch.c:716 -msgid "too many branches to set new upstream" -msgstr "слишком много веток для указания новых вышестоящих" +#: builtin/branch.c:747 +msgid "too many arguments for a rename operation" +msgstr "слишком много аргументов для операции переименования" -#: builtin/branch.c:720 +#: builtin/branch.c:752 +msgid "too many arguments to set new upstream" +msgstr "слишком много аргументов для указания новой вышестоящей ветки" + +#: builtin/branch.c:756 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "невозможно установить вышестоящий репозиторий для HEAD на %s, так как он не указывает ни на одну ветку." -#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766 +#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800 #, c-format msgid "no such branch '%s'" msgstr "нет такой ветки «%s»" -#: builtin/branch.c:727 +#: builtin/branch.c:763 #, c-format msgid "branch '%s' does not exist" msgstr "ветка «%s» не существует" -#: builtin/branch.c:739 -msgid "too many branches to unset upstream" -msgstr "слишком много веток для убирания вышестоящих" +#: builtin/branch.c:775 +msgid "too many arguments to unset upstream" +msgstr "слишком много аргументов для сброса указания вышестоящей ветки" -#: builtin/branch.c:743 +#: builtin/branch.c:779 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "невозможно убрать вышестоящий репозиторий для HEAD, так как он не указывает ни на одну ветку." -#: builtin/branch.c:749 +#: builtin/branch.c:785 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Ветка «%s» не имеет информации о вышестоящей ветке" -#: builtin/branch.c:763 +#: builtin/branch.c:797 msgid "it does not make sense to create 'HEAD' manually" msgstr "не имеет смысла создавать «HEAD» вручную" -#: builtin/branch.c:769 +#: builtin/branch.c:803 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "параметры -a и -r для «git branch» не имеют смысла с указанием имени ветки" -#: builtin/branch.c:772 -#, c-format -msgid "" -"The --set-upstream flag is deprecated and will be removed. Consider using " -"--track or --set-upstream-to\n" -msgstr "Флаг --set-upstream устарел и будет удален в будущем. Вместо него используйте --track или --set-upstream-to\n" - -#: builtin/branch.c:789 -#, c-format +#: builtin/branch.c:806 msgid "" -"\n" -"If you wanted to make '%s' track '%s', do this:\n" -"\n" -msgstr "\nЕсли вы хотите, чтобы «%s» отслеживала «%s», сделайте следующее:\n\n" +"the '--set-upstream' option is no longer supported. Please use '--track' or " +"'--set-upstream-to' instead." +msgstr "опция --set-upstream больше не поддерживается. Вместо неё используйте «--track» или «--set-upstream-to»" #: builtin/bundle.c:45 #, c-format @@ -5437,75 +5549,75 @@ msgstr "Требуется репозиторий для создания пак msgid "Need a repository to unbundle." msgstr "Требуется репозиторий для распаковки." -#: builtin/cat-file.c:519 +#: builtin/cat-file.c:521 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | " "-p | <type> | --textconv | --filters) [--path=<path>] <object>" msgstr "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <тип> | --textconv | --filters) [--path=<путь>] <объект>" -#: builtin/cat-file.c:520 +#: builtin/cat-file.c:522 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | " "--filters]" msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]" -#: builtin/cat-file.c:557 +#: builtin/cat-file.c:559 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<тип> может быть одним из: blob, tree, commit, tag" -#: builtin/cat-file.c:558 +#: builtin/cat-file.c:560 msgid "show object type" msgstr "показать тип объекта" -#: builtin/cat-file.c:559 +#: builtin/cat-file.c:561 msgid "show object size" msgstr "показать размер объекта" -#: builtin/cat-file.c:561 +#: builtin/cat-file.c:563 msgid "exit with zero when there's no error" msgstr "выйти с нулевым кодом возврата, если нет ошибки" -#: builtin/cat-file.c:562 +#: builtin/cat-file.c:564 msgid "pretty-print object's content" msgstr "структурированный вывод содержимого объекта" -#: builtin/cat-file.c:564 +#: builtin/cat-file.c:566 msgid "for blob objects, run textconv on object's content" msgstr "запустить texconv на содержимом двоичных объектов " -#: builtin/cat-file.c:566 +#: builtin/cat-file.c:568 msgid "for blob objects, run filters on object's content" msgstr "запуск фильтров на содержимом двоичных объектов " -#: builtin/cat-file.c:567 git-submodule.sh:944 +#: builtin/cat-file.c:569 git-submodule.sh:943 msgid "blob" msgstr "двоичный объект" -#: builtin/cat-file.c:568 +#: builtin/cat-file.c:570 msgid "use a specific path for --textconv/--filters" msgstr "использовать определенный путь для --textconv/--filters" -#: builtin/cat-file.c:570 +#: builtin/cat-file.c:572 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "разрешить -s и -t работать с повреждёнными объектами" -#: builtin/cat-file.c:571 +#: builtin/cat-file.c:573 msgid "buffer --batch output" msgstr "буфферировать вывод --batch" -#: builtin/cat-file.c:573 +#: builtin/cat-file.c:575 msgid "show info and content of objects fed from the standard input" msgstr "показать информацию и содержимое объектов, переданных из стандартного ввода" -#: builtin/cat-file.c:576 +#: builtin/cat-file.c:578 msgid "show info about objects fed from the standard input" msgstr "показать информацию об объектах, переданных из стандартного ввода" -#: builtin/cat-file.c:579 +#: builtin/cat-file.c:581 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "переходить по символьным ссылкам внутри дерева (используется с опциями --batch и --batch-check)" -#: builtin/cat-file.c:581 +#: builtin/cat-file.c:583 msgid "show all objects with --batch or --batch-check" msgstr "показать все объекты с опциями --batch или --batch-check" @@ -5533,7 +5645,7 @@ msgstr "прочитать имена файлов из стандартного msgid "terminate input and output records by a NUL character" msgstr "окончание ввода и вывода записей по НУЛЕВОМУ символу" -#: builtin/check-ignore.c:20 builtin/checkout.c:1143 builtin/gc.c:357 +#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358 msgid "suppress progress reporting" msgstr "не выводить прогресс выполнения" @@ -5623,9 +5735,9 @@ msgid "write the content to temporary files" msgstr "записать содержимое во временные файлы" #: builtin/checkout-index.c:175 builtin/column.c:31 -#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638 -#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980 -#: builtin/worktree.c:478 +#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631 +#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999 +#: builtin/worktree.c:498 msgid "string" msgstr "строка" @@ -5696,54 +5808,54 @@ msgstr "Нельзя обновлять пути и переключаться msgid "path '%s' is unmerged" msgstr "путь «%s» не слит" -#: builtin/checkout.c:497 +#: builtin/checkout.c:501 msgid "you need to resolve your current index first" msgstr "сначала нужно разрешить конфликты в вашем текущем индексе" -#: builtin/checkout.c:628 +#: builtin/checkout.c:632 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Не удалось создать журнал ссылок для «%s»: %s\n" -#: builtin/checkout.c:669 +#: builtin/checkout.c:673 msgid "HEAD is now at" msgstr "HEAD сейчас на" -#: builtin/checkout.c:673 builtin/clone.c:682 +#: builtin/checkout.c:677 builtin/clone.c:683 msgid "unable to update HEAD" msgstr "не удалось обновить HEAD" -#: builtin/checkout.c:677 +#: builtin/checkout.c:681 #, c-format msgid "Reset branch '%s'\n" msgstr "Сброс ветки «%s»\n" -#: builtin/checkout.c:680 +#: builtin/checkout.c:684 #, c-format msgid "Already on '%s'\n" msgstr "Уже на «%s»\n" -#: builtin/checkout.c:684 +#: builtin/checkout.c:688 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Переключение и сброс ветки «%s»\n" -#: builtin/checkout.c:686 builtin/checkout.c:1075 +#: builtin/checkout.c:690 builtin/checkout.c:1086 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Переключено на новую ветку «%s»\n" -#: builtin/checkout.c:688 +#: builtin/checkout.c:692 #, c-format msgid "Switched to branch '%s'\n" msgstr "Переключено на ветку «%s»\n" -#: builtin/checkout.c:739 +#: builtin/checkout.c:743 #, c-format msgid " ... and %d more.\n" msgstr " … и еще %d.\n" -#: builtin/checkout.c:745 +#: builtin/checkout.c:749 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -5760,7 +5872,7 @@ msgstr[1] "Предупреждение: вы оставляете позади msgstr[2] "Предупреждение: вы оставляете позади %d коммитов не соединенные ни с одной из ваших веток:\n\n%s\n" msgstr[3] "Предупреждение: вы оставляете позади %d коммитов не соединенные ни с одной из ваших веток:\n\n%s\n" -#: builtin/checkout.c:764 +#: builtin/checkout.c:768 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -5779,160 +5891,160 @@ msgstr[1] "Если вы хотите сохранить их с помощью msgstr[2] "Если вы хотите сохранить их с помощью создания новой ветки, то сейчас самое время\nсделать это с помощью:\n\n git branch <имя-новой-ветки> %s\n" msgstr[3] "Если вы хотите сохранить их с помощью создания новой ветки, то сейчас самое время\nсделать это с помощью:\n\n git branch <имя-новой-ветки> %s\n" -#: builtin/checkout.c:800 +#: builtin/checkout.c:809 msgid "internal error in revision walk" msgstr "внутренняя ошибка при хождении по редакциям" -#: builtin/checkout.c:804 +#: builtin/checkout.c:813 msgid "Previous HEAD position was" msgstr "Предыдущая позиция HEAD была" -#: builtin/checkout.c:832 builtin/checkout.c:1070 +#: builtin/checkout.c:843 builtin/checkout.c:1081 msgid "You are on a branch yet to be born" msgstr "Вы находитесь на еще не созданной ветке" -#: builtin/checkout.c:976 +#: builtin/checkout.c:987 #, c-format msgid "only one reference expected, %d given." msgstr "ожидается только одна ссылка, а передано %d." -#: builtin/checkout.c:1016 builtin/worktree.c:215 +#: builtin/checkout.c:1027 builtin/worktree.c:233 #, c-format msgid "invalid reference: %s" msgstr "неправильная ссылка: %s" -#: builtin/checkout.c:1045 +#: builtin/checkout.c:1056 #, c-format msgid "reference is not a tree: %s" msgstr "в дереве нет такой ссылки: %s" -#: builtin/checkout.c:1084 +#: builtin/checkout.c:1095 msgid "paths cannot be used with switching branches" msgstr "нельзя использовать пути при переключении веток" -#: builtin/checkout.c:1087 builtin/checkout.c:1091 +#: builtin/checkout.c:1098 builtin/checkout.c:1102 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "нельзя использовать «%s» при переключении веток" -#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103 -#: builtin/checkout.c:1106 +#: builtin/checkout.c:1106 builtin/checkout.c:1109 builtin/checkout.c:1114 +#: builtin/checkout.c:1117 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "«%s» нельзя использовать одновременно с «%s»" -#: builtin/checkout.c:1111 +#: builtin/checkout.c:1122 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Нельзя переключить ветку на не коммит «%s»" -#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113 -#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328 -#: builtin/worktree.c:330 +#: builtin/checkout.c:1154 builtin/checkout.c:1156 builtin/clone.c:114 +#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:346 +#: builtin/worktree.c:348 msgid "branch" msgstr "ветка" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1155 msgid "create and checkout a new branch" msgstr "создать и переключиться на новую ветку" -#: builtin/checkout.c:1147 +#: builtin/checkout.c:1157 msgid "create/reset and checkout a branch" msgstr "создать/сбросить и перключиться на новую ветку" -#: builtin/checkout.c:1148 +#: builtin/checkout.c:1158 msgid "create reflog for new branch" msgstr "создать журнал ссылок для новой ветки" -#: builtin/checkout.c:1149 builtin/worktree.c:332 +#: builtin/checkout.c:1159 builtin/worktree.c:350 msgid "detach HEAD at named commit" msgstr "отсоединить HEAD на указанном коммите" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1160 msgid "set upstream info for new branch" msgstr "установить информацию о вышестоящей ветке для новой ветки" -#: builtin/checkout.c:1152 +#: builtin/checkout.c:1162 msgid "new-branch" msgstr "новая-ветка" -#: builtin/checkout.c:1152 +#: builtin/checkout.c:1162 msgid "new unparented branch" msgstr "новая ветка без родителей" -#: builtin/checkout.c:1153 +#: builtin/checkout.c:1163 msgid "checkout our version for unmerged files" msgstr "переключиться на нашу версию для не слитых файлов" -#: builtin/checkout.c:1155 +#: builtin/checkout.c:1165 msgid "checkout their version for unmerged files" msgstr "переключиться на их версию для не слитых файлов" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1167 msgid "force checkout (throw away local modifications)" msgstr "принудительное переключение на состояние (отбрасывает все локальные изменения)" -#: builtin/checkout.c:1158 +#: builtin/checkout.c:1168 msgid "perform a 3-way merge with the new branch" msgstr "выполнить трехходовое слияние с новой веткой" -#: builtin/checkout.c:1159 builtin/merge.c:235 +#: builtin/checkout.c:1169 builtin/merge.c:238 msgid "update ignored files (default)" msgstr "обновить игнорируемые файлы (по умолчанию)" -#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251 +#: builtin/checkout.c:1170 builtin/log.c:1489 parse-options.h:251 msgid "style" msgstr "стиль" -#: builtin/checkout.c:1161 +#: builtin/checkout.c:1171 msgid "conflict style (merge or diff3)" msgstr "стиль конфликтов слияния (merge или diff3)" -#: builtin/checkout.c:1164 +#: builtin/checkout.c:1174 msgid "do not limit pathspecs to sparse entries only" msgstr "не ограничивать спецификаторы пути только частичными записями" -#: builtin/checkout.c:1166 +#: builtin/checkout.c:1176 msgid "second guess 'git checkout <no-such-branch>'" msgstr "пересмотр «git checkout <нет-такой-ветки>»" -#: builtin/checkout.c:1168 +#: builtin/checkout.c:1178 msgid "do not check if another worktree is holding the given ref" msgstr "не проверять, что другое дерево уже содержит указанную ссылку" -#: builtin/checkout.c:1172 builtin/clone.c:80 builtin/fetch.c:114 -#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544 +#: builtin/checkout.c:1182 builtin/clone.c:81 builtin/fetch.c:136 +#: builtin/merge.c:235 builtin/pull.c:120 builtin/push.c:544 #: builtin/send-pack.c:173 msgid "force progress reporting" msgstr "принудительно выводить прогресс" -#: builtin/checkout.c:1203 +#: builtin/checkout.c:1212 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B и --orphan нельзя использовать одновременно" -#: builtin/checkout.c:1220 +#: builtin/checkout.c:1229 msgid "--track needs a branch name" msgstr "--track требует имя ветки" -#: builtin/checkout.c:1225 +#: builtin/checkout.c:1234 msgid "Missing branch name; try -b" msgstr "Пропущено имя ветки; попробуйте -b" -#: builtin/checkout.c:1261 +#: builtin/checkout.c:1270 msgid "invalid path specification" msgstr "недопустимый спецификатор пути" -#: builtin/checkout.c:1268 +#: builtin/checkout.c:1277 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "«%s» не является коммитом, поэтому невозможно создать из него ветку «%s»" -#: builtin/checkout.c:1272 +#: builtin/checkout.c:1281 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach не принимает путь «%s» как аргумент" -#: builtin/checkout.c:1276 +#: builtin/checkout.c:1285 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -5968,7 +6080,7 @@ msgstr "Будет пропущен репозиторий %s\n" msgid "failed to remove %s" msgstr "сбой удаления %s" -#: builtin/clean.c:298 git-add--interactive.perl:572 +#: builtin/clean.c:301 git-add--interactive.perl:572 #, c-format msgid "" "Prompt help:\n" @@ -5977,7 +6089,7 @@ msgid "" " - (empty) select nothing\n" msgstr "Справка по выделению:\n1 - выбрать указанный элемент\nfoo - выбрать элемент с указанным префиксом\n - (пусто) не выбирать ничего\n" -#: builtin/clean.c:302 git-add--interactive.perl:581 +#: builtin/clean.c:305 git-add--interactive.perl:581 #, c-format msgid "" "Prompt help:\n" @@ -5990,38 +6102,38 @@ msgid "" " - (empty) finish selecting\n" msgstr "Справка по выделению:\n1 - выбрать один элемент\n3-5 - выбрать диапазон элементов\n2-3,6-9 - выбрать несколько диапазонов\nfoo - выбрать элемент с указанным префиксом\n-… - убрать выделение с указанных элементов\n* - выбрать все элементы\n - (пусто) завершить выделение\n" -#: builtin/clean.c:518 git-add--interactive.perl:547 +#: builtin/clean.c:521 git-add--interactive.perl:547 #: git-add--interactive.perl:552 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Хм (%s)?\n" -#: builtin/clean.c:660 +#: builtin/clean.c:663 #, c-format msgid "Input ignore patterns>> " msgstr "Шаблоны игнорирования ввода>> " -#: builtin/clean.c:697 +#: builtin/clean.c:700 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "ПРЕДУПРЕЖДЕНИЕ: Не удалось найти элементы соответствующие: %s" -#: builtin/clean.c:718 +#: builtin/clean.c:721 msgid "Select items to delete" msgstr "Укажите элементы для удаления" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:759 +#: builtin/clean.c:762 #, c-format msgid "Remove %s [y/N]? " msgstr "Удалить %s [y - да/N - нет]? " -#: builtin/clean.c:784 git-add--interactive.perl:1616 +#: builtin/clean.c:787 git-add--interactive.perl:1616 #, c-format msgid "Bye.\n" msgstr "До свидания.\n" -#: builtin/clean.c:792 +#: builtin/clean.c:795 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -6032,15 +6144,15 @@ msgid "" "? - help for prompt selection" msgstr "clean - начать очистку\nfilter by pattern - исключить удаление элементов\nselect by numbers - исключить удаление элементов по номерам\nask each - запрашивать подтверждение на удаление каждого элемента (как «rm -i»)\nquit - прекратить очистку\nhelp - этот экран\n? - справка по выделению" -#: builtin/clean.c:819 git-add--interactive.perl:1692 +#: builtin/clean.c:822 git-add--interactive.perl:1692 msgid "*** Commands ***" msgstr "*** Команды ***" -#: builtin/clean.c:820 git-add--interactive.perl:1689 +#: builtin/clean.c:823 git-add--interactive.perl:1689 msgid "What now" msgstr "Что теперь" -#: builtin/clean.c:828 +#: builtin/clean.c:831 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Удалить следующие элементы:" @@ -6048,372 +6160,372 @@ msgstr[1] "Удалить следующие элементы:" msgstr[2] "Удалить следующие элементы:" msgstr[3] "Удалить следующие элементы:" -#: builtin/clean.c:844 +#: builtin/clean.c:847 msgid "No more files to clean, exiting." msgstr "Больше нет файлов для очистки, выходим." -#: builtin/clean.c:906 +#: builtin/clean.c:909 msgid "do not print names of files removed" msgstr "не выводить имена удаляемых файлов" -#: builtin/clean.c:908 +#: builtin/clean.c:911 msgid "force" msgstr "принудительно" -#: builtin/clean.c:909 +#: builtin/clean.c:912 msgid "interactive cleaning" msgstr "интерактивная очистка" -#: builtin/clean.c:911 +#: builtin/clean.c:914 msgid "remove whole directories" msgstr "удалить каталоги полностью" -#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454 -#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397 +#: builtin/clean.c:915 builtin/describe.c:463 builtin/describe.c:465 +#: builtin/grep.c:861 builtin/ls-files.c:544 builtin/name-rev.c:397 #: builtin/name-rev.c:399 builtin/show-ref.c:176 msgid "pattern" msgstr "шаблон" -#: builtin/clean.c:913 +#: builtin/clean.c:916 msgid "add <pattern> to ignore rules" msgstr "добавить <шаблон> в правила игнорирования" -#: builtin/clean.c:914 +#: builtin/clean.c:917 msgid "remove ignored files, too" msgstr "также удалить игнорируемые файлы" -#: builtin/clean.c:916 +#: builtin/clean.c:919 msgid "remove only ignored files" msgstr "удалить только игнорируемые файлы" -#: builtin/clean.c:934 +#: builtin/clean.c:937 msgid "-x and -X cannot be used together" msgstr "нельзя использовать одновременно -x и -X" -#: builtin/clean.c:938 +#: builtin/clean.c:941 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to" " clean" msgstr "clean.requireForce установлен как true и ни одна из опций -i, -n или -f не указана; отказ очистки" -#: builtin/clean.c:941 +#: builtin/clean.c:944 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "clean.requireForce установлен по умолчанию как true и ни одна из опций -i, -n или -f не указана; отказ очистки" -#: builtin/clone.c:38 +#: builtin/clone.c:39 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<опции>] [--] <репозиторий> [<каталог>]" -#: builtin/clone.c:82 +#: builtin/clone.c:83 msgid "don't create a checkout" msgstr "не переключать рабочую копию на HEAD" -#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479 +#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479 msgid "create a bare repository" msgstr "создать голый репозиторий" -#: builtin/clone.c:87 +#: builtin/clone.c:88 msgid "create a mirror repository (implies bare)" msgstr "создать зеркало репозитория (включает в себя и параметр bare)" -#: builtin/clone.c:89 +#: builtin/clone.c:90 msgid "to clone from a local repository" msgstr "для клонирования из локального репозитория" -#: builtin/clone.c:91 +#: builtin/clone.c:92 msgid "don't use local hardlinks, always copy" msgstr "не использовать жесткие ссылки, всегда копировать файлы" -#: builtin/clone.c:93 +#: builtin/clone.c:94 msgid "setup as shared repository" msgstr "настроить как общедоступный репозиторий" -#: builtin/clone.c:95 builtin/clone.c:99 +#: builtin/clone.c:96 builtin/clone.c:100 msgid "pathspec" msgstr "спецификатор-пути" -#: builtin/clone.c:95 builtin/clone.c:99 +#: builtin/clone.c:96 builtin/clone.c:100 msgid "initialize submodules in the clone" msgstr "инициализировать подмодули в клоне" -#: builtin/clone.c:102 +#: builtin/clone.c:103 msgid "number of submodules cloned in parallel" msgstr "количество подмодулей, которые будут клонированы парралельно" -#: builtin/clone.c:103 builtin/init-db.c:476 +#: builtin/clone.c:104 builtin/init-db.c:476 msgid "template-directory" msgstr "каталог-шаблонов" -#: builtin/clone.c:104 builtin/init-db.c:477 +#: builtin/clone.c:105 builtin/init-db.c:477 msgid "directory from which templates will be used" msgstr "каталог, шаблоны из которого будут использованы" -#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642 -#: builtin/submodule--helper.c:983 +#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:635 +#: builtin/submodule--helper.c:1002 msgid "reference repository" msgstr "ссылаемый репозиторий" -#: builtin/clone.c:110 +#: builtin/clone.c:111 msgid "use --reference only while cloning" msgstr "используйте --reference только при клонировании" -#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44 +#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44 msgid "name" msgstr "имя" -#: builtin/clone.c:112 +#: builtin/clone.c:113 msgid "use <name> instead of 'origin' to track upstream" msgstr "использовать <имя> вместо «origin» для отслеживания вышестоящего репозитория" -#: builtin/clone.c:114 +#: builtin/clone.c:115 msgid "checkout <branch> instead of the remote's HEAD" msgstr "переключиться на <ветку>, вместо HEAD внешнего репозитория" -#: builtin/clone.c:116 +#: builtin/clone.c:117 msgid "path to git-upload-pack on the remote" msgstr "путь к git-upload-pack на внешнем репозитории" -#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025 +#: builtin/clone.c:118 builtin/fetch.c:137 builtin/grep.c:804 #: builtin/pull.c:205 msgid "depth" msgstr "глубина" -#: builtin/clone.c:118 +#: builtin/clone.c:119 msgid "create a shallow clone of that depth" msgstr "сделать частичный клон указанной глубины" -#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932 +#: builtin/clone.c:120 builtin/fetch.c:139 builtin/pack-objects.c:2938 #: parse-options.h:142 msgid "time" msgstr "время" -#: builtin/clone.c:120 +#: builtin/clone.c:121 msgid "create a shallow clone since a specific time" msgstr "сделать частичный клон до определенного времени" -#: builtin/clone.c:121 builtin/fetch.c:119 +#: builtin/clone.c:122 builtin/fetch.c:141 msgid "revision" msgstr "редакция" -#: builtin/clone.c:122 builtin/fetch.c:120 +#: builtin/clone.c:123 builtin/fetch.c:142 msgid "deepen history of shallow clone, excluding rev" msgstr "углубить историю частичного клона исключая редакцию" -#: builtin/clone.c:124 +#: builtin/clone.c:125 msgid "clone only one branch, HEAD or --branch" msgstr "клонировать только одну ветку, HEAD или --branch" -#: builtin/clone.c:126 +#: builtin/clone.c:127 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "не клонировать метки, а также настроить, чтобы не клонировались и в дальнейшем" -#: builtin/clone.c:128 +#: builtin/clone.c:129 msgid "any cloned submodules will be shallow" msgstr "все склонированные подмодули будут частичными клонами" -#: builtin/clone.c:129 builtin/init-db.c:485 +#: builtin/clone.c:130 builtin/init-db.c:485 msgid "gitdir" msgstr "каталог-git" -#: builtin/clone.c:130 builtin/init-db.c:486 +#: builtin/clone.c:131 builtin/init-db.c:486 msgid "separate git dir from working tree" msgstr "разместить каталог git отдельно от рабочей копии" -#: builtin/clone.c:131 +#: builtin/clone.c:132 msgid "key=value" msgstr "ключ=значение" -#: builtin/clone.c:132 +#: builtin/clone.c:133 msgid "set config inside the new repository" msgstr "установить параметры внутри нового репозитория" -#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555 +#: builtin/clone.c:134 builtin/fetch.c:159 builtin/push.c:555 msgid "use IPv4 addresses only" msgstr "использовать только IPv4 адреса" -#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557 +#: builtin/clone.c:136 builtin/fetch.c:161 builtin/push.c:557 msgid "use IPv6 addresses only" msgstr "использовать только IPv6 адреса" -#: builtin/clone.c:272 +#: builtin/clone.c:273 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" msgstr "Имя каталога не может быть угадано.\nУкажите имя каталога с помощью параметра командной строки" -#: builtin/clone.c:325 +#: builtin/clone.c:326 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "информация: Не удалось добавить альтернативу для «%s»: %s\n" -#: builtin/clone.c:397 +#: builtin/clone.c:398 #, c-format msgid "failed to open '%s'" msgstr "не удалось открыть «%s»" -#: builtin/clone.c:405 +#: builtin/clone.c:406 #, c-format msgid "%s exists and is not a directory" msgstr "%s уже существует и не является каталогом" -#: builtin/clone.c:419 +#: builtin/clone.c:420 #, c-format msgid "failed to stat %s\n" msgstr "не удалось выполнить stat %s\n" -#: builtin/clone.c:441 +#: builtin/clone.c:442 #, c-format msgid "failed to create link '%s'" msgstr "не удалось создать ссылку «%s»" -#: builtin/clone.c:445 +#: builtin/clone.c:446 #, c-format msgid "failed to copy file to '%s'" msgstr "не удалось копировать файл в «%s»" -#: builtin/clone.c:470 +#: builtin/clone.c:471 #, c-format msgid "done.\n" msgstr "готово.\n" -#: builtin/clone.c:482 +#: builtin/clone.c:483 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" "and retry the checkout with 'git checkout -f HEAD'\n" msgstr "Клонирование прошло успешно, но во время переключения состояния произошла ошибка.\nС помощь команды «git status» вы можете просмотреть, какие файлы были обновлены, а повторить попытку переключения на ветку с помощью «git checkout -f HEAD»\n" -#: builtin/clone.c:559 +#: builtin/clone.c:560 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Не удалось найти внешнюю ветку %s для клонирования." -#: builtin/clone.c:654 +#: builtin/clone.c:655 msgid "remote did not send all necessary objects" msgstr "внешний репозиторий прислал не все необходимые объекты" -#: builtin/clone.c:670 +#: builtin/clone.c:671 #, c-format msgid "unable to update %s" msgstr "не удалось обновить %s" -#: builtin/clone.c:719 +#: builtin/clone.c:720 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "внешний HEAD ссылается на несуществующую ссылку, нельзя переключиться на такую версию.\n" -#: builtin/clone.c:750 +#: builtin/clone.c:751 msgid "unable to checkout working tree" msgstr "не удалось переключиться на версию в рабочем каталоге" -#: builtin/clone.c:792 +#: builtin/clone.c:796 msgid "unable to write parameters to config file" msgstr "не удалось записать параметры в файл конфигурации" -#: builtin/clone.c:855 +#: builtin/clone.c:859 msgid "cannot repack to clean up" msgstr "не удалось выполнить перепаковку для очистки" -#: builtin/clone.c:857 +#: builtin/clone.c:861 msgid "cannot unlink temporary alternates file" msgstr "не удалось отсоединить временные альтернативные файлы" -#: builtin/clone.c:890 builtin/receive-pack.c:1945 +#: builtin/clone.c:894 builtin/receive-pack.c:1944 msgid "Too many arguments." msgstr "Слишком много аргументов." -#: builtin/clone.c:894 +#: builtin/clone.c:898 msgid "You must specify a repository to clone." msgstr "Вы должны указать репозиторий для клонирования." -#: builtin/clone.c:907 +#: builtin/clone.c:911 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare и --origin %s нельзя использовать одновременно." -#: builtin/clone.c:910 +#: builtin/clone.c:914 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare и --separate-git-dir нельзя использовать одновременно." -#: builtin/clone.c:923 +#: builtin/clone.c:927 #, c-format msgid "repository '%s' does not exist" msgstr "репозиторий «%s» не существует" -#: builtin/clone.c:929 builtin/fetch.c:1337 +#: builtin/clone.c:933 builtin/fetch.c:1360 #, c-format msgid "depth %s is not a positive number" msgstr "глубина %s не является положительным числом" -#: builtin/clone.c:939 +#: builtin/clone.c:943 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "целевой путь «%s» уже существует и не является пустым каталогом." -#: builtin/clone.c:949 +#: builtin/clone.c:953 #, c-format msgid "working tree '%s' already exists." msgstr "рабочий каталог «%s» уже существует." -#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260 -#: builtin/worktree.c:222 builtin/worktree.c:252 +#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270 +#: builtin/worktree.c:240 builtin/worktree.c:270 #, c-format msgid "could not create leading directories of '%s'" msgstr "не удалось создать родительские каталоги для «%s»" -#: builtin/clone.c:967 +#: builtin/clone.c:971 #, c-format msgid "could not create work tree dir '%s'" msgstr "не удалось создать рабочий каталог «%s»" -#: builtin/clone.c:979 +#: builtin/clone.c:983 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Клонирование в голый репозиторий «%s»…\n" -#: builtin/clone.c:981 +#: builtin/clone.c:985 #, c-format msgid "Cloning into '%s'...\n" msgstr "Клонирование в «%s»…\n" -#: builtin/clone.c:1005 +#: builtin/clone.c:1009 msgid "" "clone --recursive is not compatible with both --reference and --reference-" "if-able" msgstr "клонирование с параметром --recursive нельзя использовать одновременно ни с --reference, ни с --reference-if-able" -#: builtin/clone.c:1067 +#: builtin/clone.c:1071 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth игнорируется на локальных клонах; вместо этого используйте file://." -#: builtin/clone.c:1069 +#: builtin/clone.c:1073 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "--shallow-since игнорируется на локальных клонах; используйте file:// вместо этого." -#: builtin/clone.c:1071 +#: builtin/clone.c:1075 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "--shallow-exclude игнорируется на локальных клонах; используйте file:// вместо этого." -#: builtin/clone.c:1074 +#: builtin/clone.c:1078 msgid "source repository is shallow, ignoring --local" msgstr "исходный репозиторий является частичным, --local игнорируется" -#: builtin/clone.c:1079 +#: builtin/clone.c:1083 msgid "--local is ignored" msgstr "--local игнорируется" -#: builtin/clone.c:1083 +#: builtin/clone.c:1087 #, c-format msgid "Don't know how to clone %s" msgstr "Не знаю как клонировать %s" -#: builtin/clone.c:1138 builtin/clone.c:1146 +#: builtin/clone.c:1142 builtin/clone.c:1150 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Внешняя ветка %s не найдена в вышестоящем репозитории %s" -#: builtin/clone.c:1149 +#: builtin/clone.c:1153 msgid "You appear to have cloned an empty repository." msgstr "Похоже, что вы клонировали пустой репозиторий." @@ -6516,98 +6628,98 @@ msgid "" "the remaining commits.\n" msgstr "Если вы хотите пропустит этот коммит, используйте команду:\n\n git reset\n\nПосле этого «git cherry-pick --continue» продолжит копирование оставшихся коммитов.\n" -#: builtin/commit.c:319 +#: builtin/commit.c:318 msgid "failed to unpack HEAD tree object" msgstr "сбой распаковки объекта дерева HEAD" -#: builtin/commit.c:360 +#: builtin/commit.c:359 msgid "unable to create temporary index" msgstr "не удалось создать временный индекс" -#: builtin/commit.c:366 +#: builtin/commit.c:365 msgid "interactive add failed" msgstr "сбой интерактивного добавления" -#: builtin/commit.c:379 +#: builtin/commit.c:378 msgid "unable to update temporary index" msgstr "не удалось обновить временный индекс" -#: builtin/commit.c:381 +#: builtin/commit.c:380 msgid "Failed to update main cache tree" msgstr "Сбой при обновлении основного кэша дерева" -#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477 +#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478 msgid "unable to write new_index file" msgstr "не удалось записать файл new_index" -#: builtin/commit.c:459 +#: builtin/commit.c:461 msgid "cannot do a partial commit during a merge." msgstr "нельзя создать частичный коммит во время слияния." -#: builtin/commit.c:461 +#: builtin/commit.c:463 msgid "cannot do a partial commit during a cherry-pick." msgstr "нельзя создать частичный коммит во время копирования коммита." -#: builtin/commit.c:470 +#: builtin/commit.c:471 msgid "cannot read the index" msgstr "не удалось прочитать индекс" -#: builtin/commit.c:489 +#: builtin/commit.c:490 msgid "unable to write temporary index file" msgstr "не удалось записать временный файл индекса" -#: builtin/commit.c:583 +#: builtin/commit.c:587 #, c-format msgid "commit '%s' lacks author header" msgstr "у коммита «%s» отсутствует автор в заголовке" -#: builtin/commit.c:585 +#: builtin/commit.c:589 #, c-format msgid "commit '%s' has malformed author line" msgstr "у коммита «%s» строка автора в неправильном формате" -#: builtin/commit.c:604 +#: builtin/commit.c:608 msgid "malformed --author parameter" msgstr "параметр --author в неправильном формате" -#: builtin/commit.c:656 +#: builtin/commit.c:660 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "нельзя выбрать символ комментария, который\nне используется в текущем сообщении коммита" -#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093 +#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1100 #, c-format msgid "could not lookup commit %s" msgstr "не удалось запросить коммит %s" -#: builtin/commit.c:705 builtin/shortlog.c:295 +#: builtin/commit.c:709 builtin/shortlog.c:309 #, c-format msgid "(reading log message from standard input)\n" msgstr "(чтение файла журнала из стандартного ввода)\n" -#: builtin/commit.c:707 +#: builtin/commit.c:711 msgid "could not read log from standard input" msgstr "не удалось прочитать файл журнала из стандартного ввода" -#: builtin/commit.c:711 +#: builtin/commit.c:715 #, c-format msgid "could not read log file '%s'" msgstr "не удалось прочитать файл журнала «%s»" -#: builtin/commit.c:738 builtin/commit.c:746 +#: builtin/commit.c:742 builtin/commit.c:750 msgid "could not read SQUASH_MSG" msgstr "не удалось прочитать SQUASH_MSG" -#: builtin/commit.c:743 +#: builtin/commit.c:747 msgid "could not read MERGE_MSG" msgstr "не удалось прочитать MERGE_MSG" -#: builtin/commit.c:797 +#: builtin/commit.c:801 msgid "could not write commit template" msgstr "не удалось записать шаблон описания коммита" -#: builtin/commit.c:815 +#: builtin/commit.c:819 #, c-format msgid "" "\n" @@ -6617,7 +6729,7 @@ msgid "" "and try again.\n" msgstr "\nПохоже, что вы пытаетесь закоммитить слияние.\nЕсли это ошибка, пожалуйста удалите файл\n\t%s\nи попробуйте снова.\n" -#: builtin/commit.c:820 +#: builtin/commit.c:824 #, c-format msgid "" "\n" @@ -6627,14 +6739,14 @@ msgid "" "and try again.\n" msgstr "\nПохоже, что вы пытаетесь закоммитить при копировании коммита.\nЕсли это не так, то удалите файл\n\t%s\nи попробуйте снова.\n" -#: builtin/commit.c:833 +#: builtin/commit.c:837 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "Пожалуйста, введите сообщение коммита для ваших изменений. Строки,\nначинающиеся с «%c» будут проигнорированы, а пустое сообщение\nотменяет процесс коммита.\n" -#: builtin/commit.c:840 +#: builtin/commit.c:844 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -6642,341 +6754,342 @@ msgid "" "An empty message aborts the commit.\n" msgstr "Пожалуйста, введите сообщение коммита для ваших изменений. Строки,\nначинающиеся с «%c» будут оставлены; вы можете удалить их вручную,\nесли хотите. Пустое сообщение отменяет процесс коммита.\n" -#: builtin/commit.c:857 +#: builtin/commit.c:861 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sАвтор: %.*s <%.*s>" -#: builtin/commit.c:865 +#: builtin/commit.c:869 #, c-format msgid "%sDate: %s" msgstr "%sДата: %s" -#: builtin/commit.c:872 +#: builtin/commit.c:876 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sКоммитер: %.*s <%.*s>" -#: builtin/commit.c:889 +#: builtin/commit.c:893 msgid "Cannot read index" msgstr "Не удалось прочитать индекс" -#: builtin/commit.c:951 +#: builtin/commit.c:958 msgid "Error building trees" msgstr "Ошибка при построении деревьев" -#: builtin/commit.c:965 builtin/tag.c:274 +#: builtin/commit.c:972 builtin/tag.c:252 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Пожалуйста, укажите сообщение, при указании опций -m или -F.\n" -#: builtin/commit.c:1068 +#: builtin/commit.c:1075 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "--author «%s» не в формате «Имя <почта>» и не совпадает с существующим автором" -#: builtin/commit.c:1083 builtin/commit.c:1328 +#: builtin/commit.c:1090 builtin/commit.c:1335 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Неправильный режим неотслеживаемых файлов «%s»" -#: builtin/commit.c:1121 +#: builtin/commit.c:1128 msgid "--long and -z are incompatible" msgstr "--long и -z нельзя использовать одновременно" -#: builtin/commit.c:1151 +#: builtin/commit.c:1158 msgid "Using both --reset-author and --author does not make sense" msgstr "Указание одновременно опций --reset-author и --author не имеет смысла" -#: builtin/commit.c:1160 +#: builtin/commit.c:1167 msgid "You have nothing to amend." msgstr "Нечего исправлять." -#: builtin/commit.c:1163 +#: builtin/commit.c:1170 msgid "You are in the middle of a merge -- cannot amend." msgstr "Вы в процессе слияния — сейчас нельзя исправлять." -#: builtin/commit.c:1165 +#: builtin/commit.c:1172 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Вы в процессе копирования коммита — сейчас нельзя исправлять." -#: builtin/commit.c:1168 +#: builtin/commit.c:1175 msgid "Options --squash and --fixup cannot be used together" msgstr "Опции --squash и --fixup не могут использоваться одновременно" -#: builtin/commit.c:1178 +#: builtin/commit.c:1185 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Может использоваться только одна из опций -c/-C/-F/--fixup." -#: builtin/commit.c:1180 +#: builtin/commit.c:1187 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "Опция -m не может использоваться с -c/-C/-F/--fixup." -#: builtin/commit.c:1188 +#: builtin/commit.c:1195 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author может использоваться только одновременно с опциями -C, -c или --amend." -#: builtin/commit.c:1205 +#: builtin/commit.c:1212 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "Может использоваться только одна из опций --include/--only/--all/--interactive/--patch." -#: builtin/commit.c:1207 +#: builtin/commit.c:1214 msgid "No paths with --include/--only does not make sense." msgstr "Указание путей каталогов с опциями --include/--only не имеет смысла." -#: builtin/commit.c:1219 builtin/tag.c:552 +#: builtin/commit.c:1226 builtin/tag.c:535 #, c-format msgid "Invalid cleanup mode %s" msgstr "Неправильное значение режима очистки %s" -#: builtin/commit.c:1224 +#: builtin/commit.c:1231 msgid "Paths with -a does not make sense." msgstr "С опцией -a указание пути не имеет смысла." -#: builtin/commit.c:1342 builtin/commit.c:1617 +#: builtin/commit.c:1349 builtin/commit.c:1626 msgid "show status concisely" msgstr "кратко показать статус" -#: builtin/commit.c:1344 builtin/commit.c:1619 +#: builtin/commit.c:1351 builtin/commit.c:1628 msgid "show branch information" msgstr "показать информацию о версии" -#: builtin/commit.c:1346 +#: builtin/commit.c:1353 msgid "show stash information" msgstr "показать информацию о спрятанном" -#: builtin/commit.c:1348 +#: builtin/commit.c:1355 msgid "version" msgstr "версия" -#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530 -#: builtin/worktree.c:449 +#: builtin/commit.c:1355 builtin/commit.c:1630 builtin/push.c:530 +#: builtin/worktree.c:469 msgid "machine-readable output" msgstr "машиночитаемый вывод" -#: builtin/commit.c:1351 builtin/commit.c:1623 +#: builtin/commit.c:1358 builtin/commit.c:1632 msgid "show status in long format (default)" msgstr "показать статус в длинном формате (по умолчанию)" -#: builtin/commit.c:1354 builtin/commit.c:1626 +#: builtin/commit.c:1361 builtin/commit.c:1635 msgid "terminate entries with NUL" msgstr "завершать записи НУЛЕВЫМ байтом" -#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983 -#: builtin/fast-export.c:986 builtin/tag.c:412 +#: builtin/commit.c:1363 builtin/commit.c:1638 builtin/fast-export.c:999 +#: builtin/fast-export.c:1002 builtin/tag.c:390 msgid "mode" msgstr "режим" -#: builtin/commit.c:1357 builtin/commit.c:1629 +#: builtin/commit.c:1364 builtin/commit.c:1638 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "показать неотслеживаемые файлы, опциональные режимы: all (все), normal (как обычно), no (нет). (По умолчанию: all)" -#: builtin/commit.c:1360 +#: builtin/commit.c:1367 msgid "show ignored files" msgstr "показать игнорируемые файлы" -#: builtin/commit.c:1361 parse-options.h:155 +#: builtin/commit.c:1368 parse-options.h:155 msgid "when" msgstr "когда" -#: builtin/commit.c:1362 +#: builtin/commit.c:1369 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "игнорировать изменения в подмодулях, опционально когда: all (всегда), dirty (измененные), untracked (неотслеживаемые). (По умолчанию: all)" -#: builtin/commit.c:1364 +#: builtin/commit.c:1371 msgid "list untracked files in columns" msgstr "показать неотслеживаемые файлы по столбцам" -#: builtin/commit.c:1440 +#: builtin/commit.c:1449 msgid "couldn't look up newly created commit" msgstr "нельзя запросить новосозданный коммит" -#: builtin/commit.c:1442 +#: builtin/commit.c:1451 msgid "could not parse newly created commit" msgstr "нельзя разобрать новосозданный коммит" -#: builtin/commit.c:1487 +#: builtin/commit.c:1496 msgid "detached HEAD" msgstr "отделённый HEAD" -#: builtin/commit.c:1490 +#: builtin/commit.c:1499 msgid " (root-commit)" msgstr " (корневой коммит)" -#: builtin/commit.c:1587 +#: builtin/commit.c:1596 msgid "suppress summary after successful commit" msgstr "не выводить сводку после успешного коммита" -#: builtin/commit.c:1588 +#: builtin/commit.c:1597 msgid "show diff in commit message template" msgstr "добавить список изменений в шаблон сообщения коммита" -#: builtin/commit.c:1590 +#: builtin/commit.c:1599 msgid "Commit message options" msgstr "Опции сообщения коммита" -#: builtin/commit.c:1591 builtin/tag.c:410 +#: builtin/commit.c:1600 builtin/tag.c:388 msgid "read message from file" msgstr "прочитать сообщение из файла" -#: builtin/commit.c:1592 +#: builtin/commit.c:1601 msgid "author" msgstr "автор" -#: builtin/commit.c:1592 +#: builtin/commit.c:1601 msgid "override author for commit" msgstr "подменить автора коммита" -#: builtin/commit.c:1593 builtin/gc.c:358 +#: builtin/commit.c:1602 builtin/gc.c:359 msgid "date" msgstr "дата" -#: builtin/commit.c:1593 +#: builtin/commit.c:1602 msgid "override date for commit" msgstr "подменить дату коммита" -#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401 -#: builtin/notes.c:564 builtin/tag.c:408 +#: builtin/commit.c:1603 builtin/merge.c:225 builtin/notes.c:402 +#: builtin/notes.c:565 builtin/tag.c:386 msgid "message" msgstr "сообщение" -#: builtin/commit.c:1594 +#: builtin/commit.c:1603 msgid "commit message" msgstr "сообщение коммита" -#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597 -#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77 +#: builtin/commit.c:1604 builtin/commit.c:1605 builtin/commit.c:1606 +#: builtin/commit.c:1607 parse-options.h:257 ref-filter.h:92 msgid "commit" msgstr "коммит" -#: builtin/commit.c:1595 +#: builtin/commit.c:1604 msgid "reuse and edit message from specified commit" msgstr "использовать и отредактировать сообщение от указанного коммита" -#: builtin/commit.c:1596 +#: builtin/commit.c:1605 msgid "reuse message from specified commit" msgstr "использовать сообщение указанного коммита" -#: builtin/commit.c:1597 +#: builtin/commit.c:1606 msgid "use autosquash formatted message to fixup specified commit" msgstr "использовать форматированное сообщение автоуплотнения для исправления указанного коммита" -#: builtin/commit.c:1598 +#: builtin/commit.c:1607 msgid "use autosquash formatted message to squash specified commit" msgstr "использовать форматированное сообщение автоуплотнения для уплотнения указанного коммита" -#: builtin/commit.c:1599 +#: builtin/commit.c:1608 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "коммит теперь за моим авторством (используется с -C/-c/--amend)" -#: builtin/commit.c:1600 builtin/log.c:1430 builtin/revert.c:105 +#: builtin/commit.c:1609 builtin/log.c:1436 builtin/merge.c:239 +#: builtin/revert.c:105 msgid "add Signed-off-by:" msgstr "добавить Signed-off-by:" -#: builtin/commit.c:1601 +#: builtin/commit.c:1610 msgid "use specified template file" msgstr "использовать указанный файл шаблона" -#: builtin/commit.c:1602 +#: builtin/commit.c:1611 msgid "force edit of commit" msgstr "принудительно редактировать коммит" -#: builtin/commit.c:1603 +#: builtin/commit.c:1612 msgid "default" msgstr "по-умолчанию" -#: builtin/commit.c:1603 builtin/tag.c:413 +#: builtin/commit.c:1612 builtin/tag.c:391 msgid "how to strip spaces and #comments from message" msgstr "как удалять пробелы и #комментарии из сообщения коммита" -#: builtin/commit.c:1604 +#: builtin/commit.c:1613 msgid "include status in commit message template" msgstr "включить статус файлов в шаблон сообщения коммита" -#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173 +#: builtin/commit.c:1615 builtin/merge.c:237 builtin/pull.c:173 #: builtin/revert.c:113 msgid "GPG sign commit" msgstr "подписать коммит с помощью GPG" -#: builtin/commit.c:1609 +#: builtin/commit.c:1618 msgid "Commit contents options" msgstr "Опции содержимого коммита" -#: builtin/commit.c:1610 +#: builtin/commit.c:1619 msgid "commit all changed files" msgstr "закоммитить все измененные файлы" -#: builtin/commit.c:1611 +#: builtin/commit.c:1620 msgid "add specified files to index for commit" msgstr "добавить указанные файлы в индекс для коммита" -#: builtin/commit.c:1612 +#: builtin/commit.c:1621 msgid "interactively add files" msgstr "интерактивное добавление файлов" -#: builtin/commit.c:1613 +#: builtin/commit.c:1622 msgid "interactively add changes" msgstr "интерактивное добавление изменений" -#: builtin/commit.c:1614 +#: builtin/commit.c:1623 msgid "commit only specified files" msgstr "закоммитить только указанные файлы" -#: builtin/commit.c:1615 +#: builtin/commit.c:1624 msgid "bypass pre-commit and commit-msg hooks" msgstr "пропустить перехватчик pre-commit и commit-msg" -#: builtin/commit.c:1616 +#: builtin/commit.c:1625 msgid "show what would be committed" msgstr "показать, что будет закоммичено" -#: builtin/commit.c:1627 +#: builtin/commit.c:1636 msgid "amend previous commit" msgstr "исправить предыдущий коммит" -#: builtin/commit.c:1628 +#: builtin/commit.c:1637 msgid "bypass post-rewrite hook" msgstr "пропустить перехватчик post-rewrite" -#: builtin/commit.c:1633 +#: builtin/commit.c:1642 msgid "ok to record an empty change" msgstr "разрешить запись пустого коммита" -#: builtin/commit.c:1635 +#: builtin/commit.c:1644 msgid "ok to record a change with an empty message" msgstr "разрешить запись изменений с пустым сообщением" -#: builtin/commit.c:1665 +#: builtin/commit.c:1674 msgid "could not parse HEAD commit" msgstr "не удалось разобрать HEAD коммит" -#: builtin/commit.c:1710 +#: builtin/commit.c:1719 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Файл MERGE_HEAD поврежден (%s)" -#: builtin/commit.c:1717 +#: builtin/commit.c:1726 msgid "could not read MERGE_MODE" msgstr "не удалось прочитать MERGE_MODE" -#: builtin/commit.c:1736 +#: builtin/commit.c:1745 #, c-format msgid "could not read commit message: %s" msgstr "не удалось открыть сообщение коммита: %s" -#: builtin/commit.c:1747 -#, c-format -msgid "Aborting commit; you did not edit the message.\n" -msgstr "Отмена коммита; вы не изменили сообщение.\n" - -#: builtin/commit.c:1752 +#: builtin/commit.c:1756 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Отмена коммита из-за пустого сообщения коммита.\n" -#: builtin/commit.c:1800 +#: builtin/commit.c:1761 +#, c-format +msgid "Aborting commit; you did not edit the message.\n" +msgstr "Отмена коммита; вы не изменили сообщение.\n" + +#: builtin/commit.c:1809 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -7133,23 +7246,23 @@ msgstr "# Это файл конфигурации пользователя Git. msgid "--local can only be used inside a git repository" msgstr "--local можно использовать только внутри git репозитория" -#: builtin/config.c:621 +#: builtin/config.c:624 #, c-format msgid "cannot create configuration file %s" msgstr "не удалось создать файл конфигурации %s" -#: builtin/config.c:633 +#: builtin/config.c:637 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" " Use a regexp, --add or --replace-all to change %s." msgstr "нельзя перезаписать несколько значений одним\n Используйте регулярные выражения, параметры --add или --replace-all, чтобы изменить %s." -#: builtin/count-objects.c:87 +#: builtin/count-objects.c:88 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "git count-objects [-v] [-H | --human-readable]" -#: builtin/count-objects.c:97 +#: builtin/count-objects.c:98 msgid "print sizes in human readable format" msgstr "вывод размеров в удобочитаемом для человека виде" @@ -7173,141 +7286,141 @@ msgstr "легковесный" msgid "annotated" msgstr "аннотированный" -#: builtin/describe.c:253 +#: builtin/describe.c:264 #, c-format msgid "annotated tag %s not available" msgstr "аннотированная метка %s не доступна" -#: builtin/describe.c:257 +#: builtin/describe.c:268 #, c-format msgid "annotated tag %s has no embedded name" msgstr "аннотированная метка %s не содержит встроенного названия" -#: builtin/describe.c:259 +#: builtin/describe.c:270 #, c-format msgid "tag '%s' is really '%s' here" msgstr "метка «%s» уже здесь «%s»" -#: builtin/describe.c:286 builtin/log.c:489 +#: builtin/describe.c:297 builtin/log.c:493 #, c-format msgid "Not a valid object name %s" msgstr "Недопустимое имя объекта %s" -#: builtin/describe.c:289 +#: builtin/describe.c:300 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s не является действительным объектом «%s»" -#: builtin/describe.c:306 +#: builtin/describe.c:317 #, c-format msgid "no tag exactly matches '%s'" msgstr "нет меток, точно соответствующих «%s»" -#: builtin/describe.c:308 +#: builtin/describe.c:319 #, c-format msgid "searching to describe %s\n" msgstr "поиск описания для %s\n" -#: builtin/describe.c:355 +#: builtin/describe.c:366 #, c-format msgid "finished search at %s\n" msgstr "поиск окончен на %s\n" -#: builtin/describe.c:382 +#: builtin/describe.c:393 #, c-format msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "Нет аннотированных меток, которые могут описать «%s».\nНо имеются неаннотированные метки: попробуйте добавить параметр --tags." -#: builtin/describe.c:386 +#: builtin/describe.c:397 #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "Нет меток, которые могут описать «%s….\nПопробуйте добавить параметр --always или создать какие-нибудь метки." -#: builtin/describe.c:416 +#: builtin/describe.c:427 #, c-format msgid "traversed %lu commits\n" msgstr "посещено %lu коммитов\n" -#: builtin/describe.c:419 +#: builtin/describe.c:430 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "более %i меток найдено; показано последние %i\nостановлен поиск после %s\n" -#: builtin/describe.c:441 +#: builtin/describe.c:452 msgid "find the tag that comes after the commit" msgstr "поиск метки, которая идет после коммита" -#: builtin/describe.c:442 +#: builtin/describe.c:453 msgid "debug search strategy on stderr" msgstr "вывод отладочной информации стратегии поиска на стандартный вывод" -#: builtin/describe.c:443 +#: builtin/describe.c:454 msgid "use any ref" msgstr "использовать любую ссылку" -#: builtin/describe.c:444 +#: builtin/describe.c:455 msgid "use any tag, even unannotated" msgstr "использовать любую метку, даже неаннотированную" -#: builtin/describe.c:445 +#: builtin/describe.c:456 msgid "always use long format" msgstr "всегда использовать длинный формат вывода" -#: builtin/describe.c:446 +#: builtin/describe.c:457 msgid "only follow first parent" msgstr "следовать только за первым родителем" -#: builtin/describe.c:449 +#: builtin/describe.c:460 msgid "only output exact matches" msgstr "выводить только точные совпадения" -#: builtin/describe.c:451 +#: builtin/describe.c:462 msgid "consider <n> most recent tags (default: 10)" msgstr "рассматривать последние <n> меток (по умолчанию: 10)" -#: builtin/describe.c:453 +#: builtin/describe.c:464 msgid "only consider tags matching <pattern>" msgstr "рассматривать только метки по <шаблону>" -#: builtin/describe.c:455 +#: builtin/describe.c:466 msgid "do not consider tags matching <pattern>" msgstr "не учитывать метки, которые соответствуют <шаблону>" -#: builtin/describe.c:457 builtin/name-rev.c:406 +#: builtin/describe.c:468 builtin/name-rev.c:406 msgid "show abbreviated commit object as fallback" msgstr "если не найдено, показать сокращенный номер редакции коммита" -#: builtin/describe.c:458 builtin/describe.c:461 +#: builtin/describe.c:469 builtin/describe.c:472 msgid "mark" msgstr "пометка" -#: builtin/describe.c:459 +#: builtin/describe.c:470 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "добавить <пометку> при измененном рабочем каталоге (по умолчанию: «-dirty»)" -#: builtin/describe.c:462 +#: builtin/describe.c:473 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "добавить <пометку> на повреждённое рабочее дерево (по умолчанию: «-broken»)" -#: builtin/describe.c:480 +#: builtin/describe.c:491 msgid "--long is incompatible with --abbrev=0" msgstr "--long несовместимо с --abbrev=0" -#: builtin/describe.c:509 +#: builtin/describe.c:520 msgid "No names found, cannot describe anything." msgstr "Имена не найдены, не могу ничего описать." -#: builtin/describe.c:552 +#: builtin/describe.c:563 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty несовместимо с указанием указателей коммитов" -#: builtin/describe.c:554 +#: builtin/describe.c:565 msgid "--broken is incompatible with commit-ishes" msgstr "--broken несовместимо с указанием указателей коммитов" @@ -7321,21 +7434,21 @@ msgstr "«%s»: не является обычным файлом или сим msgid "invalid option: %s" msgstr "неправильный параметр: %s" -#: builtin/diff.c:359 +#: builtin/diff.c:357 msgid "Not a git repository" msgstr "Не найден git репозитоий" -#: builtin/diff.c:402 +#: builtin/diff.c:400 #, c-format msgid "invalid object '%s' given." msgstr "передан неправильный объект «%s»." -#: builtin/diff.c:411 +#: builtin/diff.c:409 #, c-format msgid "more than two blobs given: '%s'" msgstr "передано больше двух двоичных объектов: «%s»" -#: builtin/diff.c:416 +#: builtin/diff.c:414 #, c-format msgid "unhandled object '%s' given." msgstr "передан необработанный объект «%s»." @@ -7344,97 +7457,97 @@ msgstr "передан необработанный объект «%s»." msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<опции>] [<коммит> [<коммит>]] [--] [<путь>…]" -#: builtin/difftool.c:249 +#: builtin/difftool.c:259 #, c-format msgid "failed: %d" msgstr "сбой: %d" -#: builtin/difftool.c:291 +#: builtin/difftool.c:301 #, c-format msgid "could not read symlink %s" msgstr "не удалось прочитать символьную ссылку %s" -#: builtin/difftool.c:293 +#: builtin/difftool.c:303 #, c-format msgid "could not read symlink file %s" msgstr "не удалось прочитать файл символьной ссылки %s" -#: builtin/difftool.c:301 +#: builtin/difftool.c:311 #, c-format msgid "could not read object %s for symlink %s" msgstr "не удалось прочитать объект %s для символьной ссылки %s" -#: builtin/difftool.c:403 +#: builtin/difftool.c:412 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." msgstr "комбинированные форматы различий файлов(«-c» и «--cc») не поддерживаются в режиме сравнения каталогов(«-d» и «--dir-diff»)." -#: builtin/difftool.c:626 +#: builtin/difftool.c:633 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "оба файла изменены: «%s» и «%s»." -#: builtin/difftool.c:628 +#: builtin/difftool.c:635 msgid "working tree file has been left." msgstr "рабочий каталог был покинут." -#: builtin/difftool.c:639 +#: builtin/difftool.c:646 #, c-format msgid "temporary files exist in '%s'." msgstr "временные файлы уже находятся в «%s»." -#: builtin/difftool.c:640 +#: builtin/difftool.c:647 msgid "you may want to cleanup or recover these." msgstr "возможно вы хотите их удалить или восстановить." -#: builtin/difftool.c:689 +#: builtin/difftool.c:696 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "использовать «diff.guitool» вместо «diff.tool»" -#: builtin/difftool.c:691 +#: builtin/difftool.c:698 msgid "perform a full-directory diff" msgstr "выполнить пофайловое сравнение всего каталога" -#: builtin/difftool.c:693 +#: builtin/difftool.c:700 msgid "do not prompt before launching a diff tool" msgstr "не спрашивать перед запуском утилиты сравнения" -#: builtin/difftool.c:699 +#: builtin/difftool.c:706 msgid "use symlinks in dir-diff mode" msgstr "использовать символьные ссылки в режиме сравнения каталога" -#: builtin/difftool.c:700 +#: builtin/difftool.c:707 msgid "<tool>" msgstr "<утилита>" -#: builtin/difftool.c:701 +#: builtin/difftool.c:708 msgid "use the specified diff tool" msgstr "использовать указанную утилиту сравнения" -#: builtin/difftool.c:703 +#: builtin/difftool.c:710 msgid "print a list of diff tools that may be used with `--tool`" msgstr "вывести список утилит, которые можно использовать с параметром «--tool»" -#: builtin/difftool.c:706 +#: builtin/difftool.c:713 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit" " code" msgstr "выходить из «git-difftool», если вызванная утилита сравнения вернула не нулевой код возврата" -#: builtin/difftool.c:708 +#: builtin/difftool.c:715 msgid "<command>" msgstr "<команда>" -#: builtin/difftool.c:709 +#: builtin/difftool.c:716 msgid "specify a custom command for viewing diffs" msgstr "использовать особую команду для просмотра различий" -#: builtin/difftool.c:733 +#: builtin/difftool.c:740 msgid "no <tool> given for --tool=<tool>" msgstr "не передана <утилита> для --tool=<утилита>" -#: builtin/difftool.c:740 +#: builtin/difftool.c:747 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "не передана <команда> для --extcmd=<команда>" @@ -7442,325 +7555,325 @@ msgstr "не передана <команда> для --extcmd=<команда>" msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [опции-rev-list]" -#: builtin/fast-export.c:982 +#: builtin/fast-export.c:998 msgid "show progress after <n> objects" msgstr "показать прогресс после <n> объектов" -#: builtin/fast-export.c:984 +#: builtin/fast-export.c:1000 msgid "select handling of signed tags" msgstr "выбор обработки подписанных меток" -#: builtin/fast-export.c:987 +#: builtin/fast-export.c:1003 msgid "select handling of tags that tag filtered objects" msgstr "выбор обработки меток, которыми помечены отфильтрованные объекты" -#: builtin/fast-export.c:990 +#: builtin/fast-export.c:1006 msgid "Dump marks to this file" msgstr "Записать пометки в этот файл" -#: builtin/fast-export.c:992 +#: builtin/fast-export.c:1008 msgid "Import marks from this file" msgstr "Импортировать пометки из этого файла" -#: builtin/fast-export.c:994 +#: builtin/fast-export.c:1010 msgid "Fake a tagger when tags lack one" msgstr "Подделать автора метки, если у метки он отсутствует" -#: builtin/fast-export.c:996 +#: builtin/fast-export.c:1012 msgid "Output full tree for each commit" msgstr "Вывести полное дерево для каждого коммита" -#: builtin/fast-export.c:998 +#: builtin/fast-export.c:1014 msgid "Use the done feature to terminate the stream" msgstr "Использовать пометку завершения в конце потока" -#: builtin/fast-export.c:999 +#: builtin/fast-export.c:1015 msgid "Skip output of blob data" msgstr "Пропустить вывод данных двоичных объектов" -#: builtin/fast-export.c:1000 +#: builtin/fast-export.c:1016 msgid "refspec" msgstr "спецификатор ссылки" -#: builtin/fast-export.c:1001 +#: builtin/fast-export.c:1017 msgid "Apply refspec to exported refs" msgstr "Применить спецификатор ссылки к экспортируемым ссылкам" -#: builtin/fast-export.c:1002 +#: builtin/fast-export.c:1018 msgid "anonymize output" msgstr "сделать вывод анонимным" -#: builtin/fetch.c:22 +#: builtin/fetch.c:23 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<опции>] [<репозиторий> [<спецификатор-ссылки>…]]" -#: builtin/fetch.c:23 +#: builtin/fetch.c:24 msgid "git fetch [<options>] <group>" msgstr "git fetch [<опции>] <группа>" -#: builtin/fetch.c:24 +#: builtin/fetch.c:25 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<опции>] [(<репозиторий> | <группа>)…]" -#: builtin/fetch.c:25 +#: builtin/fetch.c:26 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<опции>]" -#: builtin/fetch.c:90 builtin/pull.c:182 +#: builtin/fetch.c:112 builtin/pull.c:182 msgid "fetch from all remotes" msgstr "извлечь со всех внешних репозиториев" -#: builtin/fetch.c:92 builtin/pull.c:185 +#: builtin/fetch.c:114 builtin/pull.c:185 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "дописать к .git/FETCH_HEAD вместо перезаписи" -#: builtin/fetch.c:94 builtin/pull.c:188 +#: builtin/fetch.c:116 builtin/pull.c:188 msgid "path to upload pack on remote end" msgstr "путь к программе упаковки пакета на машине с внешним репозиторием" -#: builtin/fetch.c:95 builtin/pull.c:190 +#: builtin/fetch.c:117 builtin/pull.c:190 msgid "force overwrite of local branch" msgstr "принудительная перезапись локальной ветки" -#: builtin/fetch.c:97 +#: builtin/fetch.c:119 msgid "fetch from multiple remotes" msgstr "извлечь с нескольких внешних репозиториев" -#: builtin/fetch.c:99 builtin/pull.c:192 +#: builtin/fetch.c:121 builtin/pull.c:192 msgid "fetch all tags and associated objects" msgstr "извлечь все метки и связанные объекты" -#: builtin/fetch.c:101 +#: builtin/fetch.c:123 msgid "do not fetch all tags (--no-tags)" msgstr "не извлекать все метки (--no-tags)" -#: builtin/fetch.c:103 +#: builtin/fetch.c:125 msgid "number of submodules fetched in parallel" msgstr "количество подмодулей, которые будут скачаны парралельно" -#: builtin/fetch.c:105 builtin/pull.c:195 +#: builtin/fetch.c:127 builtin/pull.c:195 msgid "prune remote-tracking branches no longer on remote" msgstr "почистить отслеживаемые внешние ветки, которых уже нет на внешнем репозитории" -#: builtin/fetch.c:106 builtin/fetch.c:129 builtin/pull.c:123 +#: builtin/fetch.c:128 builtin/fetch.c:151 builtin/pull.c:123 msgid "on-demand" msgstr "по требованию" -#: builtin/fetch.c:107 +#: builtin/fetch.c:129 msgid "control recursive fetching of submodules" msgstr "управление рекурсивным извлечением подмодулей" -#: builtin/fetch.c:111 builtin/pull.c:203 +#: builtin/fetch.c:133 builtin/pull.c:203 msgid "keep downloaded pack" msgstr "оставить загруженный пакет данных" -#: builtin/fetch.c:113 +#: builtin/fetch.c:135 msgid "allow updating of HEAD ref" msgstr "разрешить обновление ссылки HEAD" -#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206 +#: builtin/fetch.c:138 builtin/fetch.c:144 builtin/pull.c:206 msgid "deepen history of shallow clone" msgstr "улугубить историю частичного клона" -#: builtin/fetch.c:118 +#: builtin/fetch.c:140 msgid "deepen history of shallow repository based on time" msgstr "углубить историю частичного клона основываясь на времени" -#: builtin/fetch.c:124 builtin/pull.c:209 +#: builtin/fetch.c:146 builtin/pull.c:209 msgid "convert to a complete repository" msgstr "преобразовать в полный репозиторий" -#: builtin/fetch.c:126 builtin/log.c:1450 +#: builtin/fetch.c:148 builtin/log.c:1456 msgid "dir" msgstr "каталог" -#: builtin/fetch.c:127 +#: builtin/fetch.c:149 msgid "prepend this to submodule path output" msgstr "присоединять это спереди к выводу путей подмодуля" -#: builtin/fetch.c:130 +#: builtin/fetch.c:152 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "настроить по умолчанию рекурсивное извлечение подмодулей (более низкий приоритет, чем файлы конфигурации)" -#: builtin/fetch.c:134 builtin/pull.c:212 +#: builtin/fetch.c:156 builtin/pull.c:212 msgid "accept refs that update .git/shallow" msgstr "принимать ссылки, которые обновляют .git/shallow" -#: builtin/fetch.c:135 builtin/pull.c:214 +#: builtin/fetch.c:157 builtin/pull.c:214 msgid "refmap" msgstr "соответствие-ссылок" -#: builtin/fetch.c:136 builtin/pull.c:215 +#: builtin/fetch.c:158 builtin/pull.c:215 msgid "specify fetch refmap" msgstr "указать соответствие ссылок при извлечении" -#: builtin/fetch.c:394 +#: builtin/fetch.c:416 msgid "Couldn't find remote ref HEAD" msgstr "Не удалось найти ссылку HEAD на внешнем репозитории" -#: builtin/fetch.c:512 +#: builtin/fetch.c:534 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "опция fetch.output содержит неправильное значение для %s" -#: builtin/fetch.c:605 +#: builtin/fetch.c:627 #, c-format msgid "object %s not found" msgstr "объект %s не найден" -#: builtin/fetch.c:609 +#: builtin/fetch.c:631 msgid "[up to date]" msgstr "[актуально]" -#: builtin/fetch.c:622 builtin/fetch.c:702 +#: builtin/fetch.c:644 builtin/fetch.c:724 msgid "[rejected]" msgstr "[отклонено]" -#: builtin/fetch.c:623 +#: builtin/fetch.c:645 msgid "can't fetch in current branch" msgstr "нельзя извлечь текущую ветку" -#: builtin/fetch.c:632 +#: builtin/fetch.c:654 msgid "[tag update]" msgstr "[обновление метки]" -#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682 -#: builtin/fetch.c:697 +#: builtin/fetch.c:655 builtin/fetch.c:688 builtin/fetch.c:704 +#: builtin/fetch.c:719 msgid "unable to update local ref" msgstr "не удалось обновить локальную ссылку" -#: builtin/fetch.c:652 +#: builtin/fetch.c:674 msgid "[new tag]" msgstr "[новая метка]" -#: builtin/fetch.c:655 +#: builtin/fetch.c:677 msgid "[new branch]" msgstr "[новая ветка]" -#: builtin/fetch.c:658 +#: builtin/fetch.c:680 msgid "[new ref]" msgstr "[новая ссылка]" -#: builtin/fetch.c:697 +#: builtin/fetch.c:719 msgid "forced update" msgstr "принудительное обновление" -#: builtin/fetch.c:702 +#: builtin/fetch.c:724 msgid "non-fast-forward" msgstr "без перемотки вперед" -#: builtin/fetch.c:747 +#: builtin/fetch.c:769 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s не отправил все необходимые объекты\n" -#: builtin/fetch.c:767 +#: builtin/fetch.c:789 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "%s отклонено из-за того, что частичные корни не разрешено обновлять" -#: builtin/fetch.c:855 builtin/fetch.c:951 +#: builtin/fetch.c:877 builtin/fetch.c:973 #, c-format msgid "From %.*s\n" msgstr "Из %.*s\n" -#: builtin/fetch.c:866 +#: builtin/fetch.c:888 #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "не удалось обновить некоторые локальные ссылки; попробуйте запустить «git remote prune %s», чтобы почистить старые, конфликтующие ветки" -#: builtin/fetch.c:921 +#: builtin/fetch.c:943 #, c-format msgid " (%s will become dangling)" msgstr " (%s будет висящей веткой)" -#: builtin/fetch.c:922 +#: builtin/fetch.c:944 #, c-format msgid " (%s has become dangling)" msgstr " (%s стала висящей веткой)" -#: builtin/fetch.c:954 +#: builtin/fetch.c:976 msgid "[deleted]" msgstr "[удалено]" -#: builtin/fetch.c:955 builtin/remote.c:1023 +#: builtin/fetch.c:977 builtin/remote.c:1024 msgid "(none)" msgstr "(нет)" -#: builtin/fetch.c:978 +#: builtin/fetch.c:1000 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Отказ получения в текущую ветку %s не голого репозитория" -#: builtin/fetch.c:997 +#: builtin/fetch.c:1019 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Неправильное значение «%2$s» для параметра «%1$s» для %3$s" -#: builtin/fetch.c:1000 +#: builtin/fetch.c:1022 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Параметр «%s» игнорируется для %s\n" -#: builtin/fetch.c:1076 +#: builtin/fetch.c:1098 #, c-format msgid "Don't know how to fetch from %s" msgstr "Не знаю как извлечь с %s" -#: builtin/fetch.c:1236 +#: builtin/fetch.c:1258 #, c-format msgid "Fetching %s\n" msgstr "Извлечение из %s\n" -#: builtin/fetch.c:1238 builtin/remote.c:97 +#: builtin/fetch.c:1260 builtin/remote.c:97 #, c-format msgid "Could not fetch %s" msgstr "Не удалось извлечь %s" -#: builtin/fetch.c:1256 +#: builtin/fetch.c:1278 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "Не указан внешний репозиторий. Укажите URL или имя внешнего репозитория из которого должны извлекаться новые редакции." -#: builtin/fetch.c:1279 +#: builtin/fetch.c:1301 msgid "You need to specify a tag name." msgstr "Вам нужно указать имя метки." -#: builtin/fetch.c:1321 +#: builtin/fetch.c:1344 msgid "Negative depth in --deepen is not supported" msgstr "Отрицательная грубина для --deepen не поддерживается" -#: builtin/fetch.c:1323 +#: builtin/fetch.c:1346 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen и --depth нельзя использовать одновременно" -#: builtin/fetch.c:1328 +#: builtin/fetch.c:1351 msgid "--depth and --unshallow cannot be used together" msgstr "нельзя использовать одновременно --depth и --unshallow" -#: builtin/fetch.c:1330 +#: builtin/fetch.c:1353 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow не имеет смысла на полном репозитории" -#: builtin/fetch.c:1349 +#: builtin/fetch.c:1366 msgid "fetch --all does not take a repository argument" msgstr "fetch --all не принимает имя репозитория как аргумент" -#: builtin/fetch.c:1351 +#: builtin/fetch.c:1368 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all не имеет смысла при указании спецификаторов ссылок" -#: builtin/fetch.c:1362 +#: builtin/fetch.c:1379 #, c-format msgid "No such remote or remote group: %s" msgstr "Нет такого внешнего репозитория или группы: %s" -#: builtin/fetch.c:1370 +#: builtin/fetch.c:1387 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Получение группы и указание спецификаций ссылок не имеет смысла" @@ -7769,23 +7882,23 @@ msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "git fmt-merge-msg [-m <сообщение>] [--log[=<n>] | --no-log] [--file <файл>]" -#: builtin/fmt-merge-msg.c:664 +#: builtin/fmt-merge-msg.c:665 msgid "populate log with at most <n> entries from shortlog" msgstr "отправить в журнал <n> записей из короткого журнала" -#: builtin/fmt-merge-msg.c:667 +#: builtin/fmt-merge-msg.c:668 msgid "alias for --log (deprecated)" msgstr "сокращение для --log (устаревшее)" -#: builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:671 msgid "text" msgstr "текст" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:672 msgid "use <text> as start of message" msgstr "использовать <текст> как начальное сообщение" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:673 msgid "file to read from" msgstr "файл для чтения" @@ -7825,101 +7938,105 @@ msgstr "выводить указатели места заполнения в msgid "show only <n> matched refs" msgstr "показать только <n> совпадающих ссылок" -#: builtin/for-each-ref.c:42 +#: builtin/for-each-ref.c:39 builtin/tag.c:414 +msgid "respect format colors" +msgstr "использовать цвета из формата" + +#: builtin/for-each-ref.c:43 msgid "print only refs which points at the given object" msgstr "вывод только ссылок, которые указывают на переданный объект" -#: builtin/for-each-ref.c:44 +#: builtin/for-each-ref.c:45 msgid "print only refs that are merged" msgstr "вывод только слитых ссылок" -#: builtin/for-each-ref.c:45 +#: builtin/for-each-ref.c:46 msgid "print only refs that are not merged" msgstr "вывод только не слитых ссылок" -#: builtin/for-each-ref.c:46 +#: builtin/for-each-ref.c:47 msgid "print only refs which contain the commit" msgstr "вывод только ссылок, которые содержат коммит" -#: builtin/for-each-ref.c:47 +#: builtin/for-each-ref.c:48 msgid "print only refs which don't contain the commit" msgstr "вывод только ссылок, которые не содержат коммит" -#: builtin/fsck.c:554 +#: builtin/fsck.c:543 msgid "Checking object directories" msgstr "Проверка каталогов объектов" -#: builtin/fsck.c:646 +#: builtin/fsck.c:635 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<опции>] [<объект>…]" -#: builtin/fsck.c:652 +#: builtin/fsck.c:641 msgid "show unreachable objects" msgstr "показать недоступные объекты" -#: builtin/fsck.c:653 +#: builtin/fsck.c:642 msgid "show dangling objects" msgstr "показать объекты, на которые нет ссылок" -#: builtin/fsck.c:654 +#: builtin/fsck.c:643 msgid "report tags" msgstr "вывести отчет по меткам" -#: builtin/fsck.c:655 +#: builtin/fsck.c:644 msgid "report root nodes" msgstr "вывести отчет по корневым узлам" -#: builtin/fsck.c:656 +#: builtin/fsck.c:645 msgid "make index objects head nodes" msgstr "воспринимать объекты в индексе как корневые узлы" -#: builtin/fsck.c:657 +#: builtin/fsck.c:646 msgid "make reflogs head nodes (default)" msgstr "создать корневые узлы журналов ссылок (по умолчанию)" -#: builtin/fsck.c:658 +#: builtin/fsck.c:647 msgid "also consider packs and alternate objects" msgstr "также проверять пакеты и альтернативные объекты" -#: builtin/fsck.c:659 +#: builtin/fsck.c:648 msgid "check only connectivity" msgstr "только проверить соединение" -#: builtin/fsck.c:660 +#: builtin/fsck.c:649 msgid "enable more strict checking" msgstr "использовать более строгую проверку" -#: builtin/fsck.c:662 +#: builtin/fsck.c:651 msgid "write dangling objects in .git/lost-found" msgstr "записать объекты на которые нет ссылок в .git/lost-found" -#: builtin/fsck.c:663 builtin/prune.c:107 +#: builtin/fsck.c:652 builtin/prune.c:107 msgid "show progress" msgstr "показать прогресс выполнения" -#: builtin/fsck.c:664 +#: builtin/fsck.c:653 msgid "show verbose names for reachable objects" msgstr "показать подробные имена для недоступных объектов" -#: builtin/fsck.c:725 +#: builtin/fsck.c:714 msgid "Checking objects" msgstr "Проверка объектов" -#: builtin/gc.c:26 +#: builtin/gc.c:27 msgid "git gc [<options>]" msgstr "git gc [<опции>]" -#: builtin/gc.c:79 +#: builtin/gc.c:80 #, c-format msgid "Failed to fstat %s: %s" msgstr "Не удалось выполнить fstat %s: %s" -#: builtin/gc.c:311 +#: builtin/gc.c:312 #, c-format msgid "Can't stat %s" msgstr "Не удалось выполнить stat для %s" -#: builtin/gc.c:320 +#: builtin/gc.c:321 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -7929,49 +8046,49 @@ msgid "" "%s" msgstr "Последний запуск gc сообщил следующее. Пожалуйста, исправьте ошибку и удалите %s.\nАвтоматическая очистка репозитория не будет производиться, пока этот файл не удалён.\n\n%s" -#: builtin/gc.c:359 +#: builtin/gc.c:360 msgid "prune unreferenced objects" msgstr "почистить объекты, на которые нет ссылок" -#: builtin/gc.c:361 +#: builtin/gc.c:362 msgid "be more thorough (increased runtime)" msgstr "проверять более внимательно (занимает больше времени)" -#: builtin/gc.c:362 +#: builtin/gc.c:363 msgid "enable auto-gc mode" msgstr "включить режим auto-gc" -#: builtin/gc.c:363 +#: builtin/gc.c:364 msgid "force running gc even if there may be another gc running" msgstr "принудительно запустить gc, даже есть другая копия gc уже запущена" -#: builtin/gc.c:380 +#: builtin/gc.c:381 #, c-format msgid "Failed to parse gc.logexpiry value %s" msgstr "Не удалось разобрать значение %s для gc.logexpiry" -#: builtin/gc.c:408 +#: builtin/gc.c:409 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "Автоматическая упаковка репозитория в фоне, для оптимальной производительности.\n" -#: builtin/gc.c:410 +#: builtin/gc.c:411 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Автоматическая упаковка репозитория, для оптимальной производительности.\n" -#: builtin/gc.c:411 +#: builtin/gc.c:412 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Смотрите «git help gc» руководства по ручной очистке.\n" -#: builtin/gc.c:436 +#: builtin/gc.c:437 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "gc уже запущен на этом компьютере «%s» pid %<PRIuMAX> (если нет, используйте --force)" -#: builtin/gc.c:480 +#: builtin/gc.c:481 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove " "them." @@ -7981,12 +8098,12 @@ msgstr "Имеется слишком много объектов, на кото msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<опции>] [-e] <шаблон> [<редакция>…] [[--] <путь>…]" -#: builtin/grep.c:235 +#: builtin/grep.c:226 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep: сбой создания потока: %s" -#: builtin/grep.c:293 +#: builtin/grep.c:284 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "указано недопустимое количество потоков (%d) для %s" @@ -7994,249 +8111,241 @@ msgstr "указано недопустимое количество поток #. TRANSLATORS: %s is the configuration #. variable for tweaking threads, currently #. grep.threads -#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692 +#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1693 #, c-format msgid "no threads support, ignoring %s" msgstr "нет поддержки потоков, игнорирование %s" -#: builtin/grep.c:788 builtin/grep.c:829 +#: builtin/grep.c:451 builtin/grep.c:571 builtin/grep.c:613 #, c-format msgid "unable to read tree (%s)" msgstr "не удалось прочитать дерево (%s)" -#: builtin/grep.c:848 +#: builtin/grep.c:628 #, c-format msgid "unable to grep from object of type %s" msgstr "не удалось выполнить grep из объекта типа %s" -#: builtin/grep.c:912 +#: builtin/grep.c:694 #, c-format msgid "switch `%c' expects a numerical value" msgstr "параметр «%c» ожидает числовое значение" -#: builtin/grep.c:999 +#: builtin/grep.c:781 msgid "search in index instead of in the work tree" msgstr "искать в индексе, а не в рабочем каталоге" -#: builtin/grep.c:1001 +#: builtin/grep.c:783 msgid "find in contents not managed by git" msgstr "искать в содержимом не управляемым git" -#: builtin/grep.c:1003 +#: builtin/grep.c:785 msgid "search in both tracked and untracked files" msgstr "искать и в отслеживаемых, и в неотслеживаемых файлах" -#: builtin/grep.c:1005 +#: builtin/grep.c:787 msgid "ignore files specified via '.gitignore'" msgstr "игнорировать файлы указанные в «.gitignore»" -#: builtin/grep.c:1007 +#: builtin/grep.c:789 msgid "recursively search in each submodule" msgstr "рекурсивный поиск по всем подмодулям" -#: builtin/grep.c:1009 -msgid "basename" -msgstr "базовое имя" - -#: builtin/grep.c:1010 -msgid "prepend parent project's basename to output" -msgstr "добавить базовое имя проекта спереди ко всему выводимому" - -#: builtin/grep.c:1013 +#: builtin/grep.c:792 msgid "show non-matching lines" msgstr "искать в несовпадающих строках" -#: builtin/grep.c:1015 +#: builtin/grep.c:794 msgid "case insensitive matching" msgstr "без учета регистра" -#: builtin/grep.c:1017 +#: builtin/grep.c:796 msgid "match patterns only at word boundaries" msgstr "искать совпадения шаблона только на границах слов" -#: builtin/grep.c:1019 +#: builtin/grep.c:798 msgid "process binary files as text" msgstr "обработка двоичных файлов как текста" -#: builtin/grep.c:1021 +#: builtin/grep.c:800 msgid "don't match patterns in binary files" msgstr "не искать совпадения шаблона в двоичных файлах" -#: builtin/grep.c:1024 +#: builtin/grep.c:803 msgid "process binary files with textconv filters" msgstr "обрабатываться двоичные файлы с помощью фильтров textconv" -#: builtin/grep.c:1026 +#: builtin/grep.c:805 msgid "descend at most <depth> levels" msgstr "на глубине максиму <глубина> уровней" -#: builtin/grep.c:1030 +#: builtin/grep.c:809 msgid "use extended POSIX regular expressions" msgstr "использовать расширенные регулярные выражения POSIX" -#: builtin/grep.c:1033 +#: builtin/grep.c:812 msgid "use basic POSIX regular expressions (default)" msgstr "использовать базовые регулярные выражения POSIX (по умолчанию)" -#: builtin/grep.c:1036 +#: builtin/grep.c:815 msgid "interpret patterns as fixed strings" msgstr "интерпретировать шаблоны как фиксированные строки" -#: builtin/grep.c:1039 +#: builtin/grep.c:818 msgid "use Perl-compatible regular expressions" msgstr "использовать Perl-совместимые регулярные выражения" -#: builtin/grep.c:1042 +#: builtin/grep.c:821 msgid "show line numbers" msgstr "вывести номера строк" -#: builtin/grep.c:1043 +#: builtin/grep.c:822 msgid "don't show filenames" msgstr "не выводить имена файлов" -#: builtin/grep.c:1044 +#: builtin/grep.c:823 msgid "show filenames" msgstr "выводить имена файлов" -#: builtin/grep.c:1046 +#: builtin/grep.c:825 msgid "show filenames relative to top directory" msgstr "выводить имена файлов относительно каталога репозитория" -#: builtin/grep.c:1048 +#: builtin/grep.c:827 msgid "show only filenames instead of matching lines" msgstr "выводить только имена файлов, а не совпадающие строки" -#: builtin/grep.c:1050 +#: builtin/grep.c:829 msgid "synonym for --files-with-matches" msgstr "синоним для --files-with-matches" -#: builtin/grep.c:1053 +#: builtin/grep.c:832 msgid "show only the names of files without match" msgstr "выводить только несовпадающие имена файлов" -#: builtin/grep.c:1055 +#: builtin/grep.c:834 msgid "print NUL after filenames" msgstr "выводить двоичный НОЛЬ после списка имен файлов" -#: builtin/grep.c:1057 +#: builtin/grep.c:836 msgid "show the number of matches instead of matching lines" msgstr "выводить количество совпадений, а не совпадающие строки" -#: builtin/grep.c:1058 +#: builtin/grep.c:837 msgid "highlight matches" msgstr "подсвечивать совпадения" -#: builtin/grep.c:1060 +#: builtin/grep.c:839 msgid "print empty line between matches from different files" msgstr "выводить пустую строку после совпадений из разных файлов" -#: builtin/grep.c:1062 +#: builtin/grep.c:841 msgid "show filename only once above matches from same file" msgstr "выводить имя файла только раз на несколько совпадений в одном файле" -#: builtin/grep.c:1065 +#: builtin/grep.c:844 msgid "show <n> context lines before and after matches" msgstr "показать <n> строк контекста перед и после совпадения" -#: builtin/grep.c:1068 +#: builtin/grep.c:847 msgid "show <n> context lines before matches" msgstr "показать <n> строк контекста перед совпадением" -#: builtin/grep.c:1070 +#: builtin/grep.c:849 msgid "show <n> context lines after matches" msgstr "показать <n> строк контекста после совпадения" -#: builtin/grep.c:1072 +#: builtin/grep.c:851 msgid "use <n> worker threads" msgstr "использовать <кол> рабочих потоков" -#: builtin/grep.c:1073 +#: builtin/grep.c:852 msgid "shortcut for -C NUM" msgstr "тоже, что и -C КОЛИЧЕСТВО" -#: builtin/grep.c:1076 +#: builtin/grep.c:855 msgid "show a line with the function name before matches" msgstr "показать строку с именем функции перед совпадением" -#: builtin/grep.c:1078 +#: builtin/grep.c:857 msgid "show the surrounding function" msgstr "показать окружающую функцию" -#: builtin/grep.c:1081 +#: builtin/grep.c:860 msgid "read patterns from file" msgstr "прочитать шаблоны из файла" -#: builtin/grep.c:1083 +#: builtin/grep.c:862 msgid "match <pattern>" msgstr "поиск соответствий с <шаблоном>" -#: builtin/grep.c:1085 +#: builtin/grep.c:864 msgid "combine patterns specified with -e" msgstr "объединить шаблоны указанные с помощью -e" -#: builtin/grep.c:1097 +#: builtin/grep.c:876 msgid "indicate hit with exit status without output" msgstr "ничего не выводить, указать на совпадение с помощью кода выхода" -#: builtin/grep.c:1099 +#: builtin/grep.c:878 msgid "show only matches from files that match all patterns" msgstr "показать только совпадения из файлов в которых совпадают все шаблоны" -#: builtin/grep.c:1101 +#: builtin/grep.c:880 msgid "show parse tree for grep expression" msgstr "показать дерево разбора для выражения поиска" -#: builtin/grep.c:1105 +#: builtin/grep.c:884 msgid "pager" msgstr "пейджер" -#: builtin/grep.c:1105 +#: builtin/grep.c:884 msgid "show matching files in the pager" msgstr "показать совпадающие файлы с помощью программы-пейджера" -#: builtin/grep.c:1108 +#: builtin/grep.c:887 msgid "allow calling of grep(1) (ignored by this build)" msgstr "разрешить вызов grep(1) (игнорируется в этой сборке)" -#: builtin/grep.c:1172 +#: builtin/grep.c:950 msgid "no pattern given." msgstr "не задан шаблон." -#: builtin/grep.c:1204 +#: builtin/grep.c:982 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index или --untracked нельзя использовать одновременно с указанием ревизии" -#: builtin/grep.c:1211 +#: builtin/grep.c:989 #, c-format msgid "unable to resolve revision: %s" msgstr "не удалось определить редакцию: %s" -#: builtin/grep.c:1245 builtin/index-pack.c:1490 +#: builtin/grep.c:1023 builtin/index-pack.c:1491 #, c-format msgid "invalid number of threads specified (%d)" msgstr "указано неправильное количество потоков (%d)" -#: builtin/grep.c:1250 +#: builtin/grep.c:1028 msgid "no threads support, ignoring --threads" msgstr "нет поддержки потоков, игнорирование --threads" -#: builtin/grep.c:1281 +#: builtin/grep.c:1052 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager работает только в рабочем каталоге" -#: builtin/grep.c:1304 +#: builtin/grep.c:1075 msgid "option not supported with --recurse-submodules." msgstr "опция не поддерживается одновременно с --recurse-submodules." -#: builtin/grep.c:1310 +#: builtin/grep.c:1081 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached или --untracked нельзя использовать одновременно с --no-index." -#: builtin/grep.c:1316 +#: builtin/grep.c:1087 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard не может использоваться для отслеживаемого содержимого." -#: builtin/grep.c:1324 +#: builtin/grep.c:1095 msgid "both --cached and trees are given." msgstr "указано одновременно --cached и дерево." @@ -8325,105 +8434,105 @@ msgstr "Сбой при определении версии emacsclient." msgid "emacsclient version '%d' too old (< 22)." msgstr "версия emacsclient «%d» слишком старая (< 22)." -#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171 +#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173 #, c-format msgid "failed to exec '%s'" msgstr "сбой при запуске «%s»" -#: builtin/help.c:208 +#: builtin/help.c:211 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man.<tool>.cmd' instead." msgstr "«%s»: путь для неподдерживаемой программы просмотра man.\nВместо этого используйте «man.<программа>.cmd»." -#: builtin/help.c:220 +#: builtin/help.c:223 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man.<tool>.path' instead." msgstr "«%s»: команда для неподдерживаемой программы просмотра man.\nВместо этого используйте «man.<программа>.path»." -#: builtin/help.c:337 +#: builtin/help.c:340 #, c-format msgid "'%s': unknown man viewer." msgstr "«%s»: неизвестная программа просмотра man." -#: builtin/help.c:354 +#: builtin/help.c:357 msgid "no man viewer handled the request" msgstr "программа просмотра man не обработала запрос" -#: builtin/help.c:362 +#: builtin/help.c:365 msgid "no info viewer handled the request" msgstr "программа просмотра info не обработала запрос" -#: builtin/help.c:404 +#: builtin/help.c:407 msgid "Defining attributes per path" msgstr "Определение атрибутов для путей файлов или каталогов" -#: builtin/help.c:405 +#: builtin/help.c:408 msgid "Everyday Git With 20 Commands Or So" msgstr "Повседневный Git с 20 командами или около того" -#: builtin/help.c:406 +#: builtin/help.c:409 msgid "A Git glossary" msgstr "Глоссарий Git" -#: builtin/help.c:407 +#: builtin/help.c:410 msgid "Specifies intentionally untracked files to ignore" msgstr "Указание специально игнорируемых файлов" -#: builtin/help.c:408 +#: builtin/help.c:411 msgid "Defining submodule properties" msgstr "Определение свойств подмодулей" -#: builtin/help.c:409 +#: builtin/help.c:412 msgid "Specifying revisions and ranges for Git" msgstr "Указание редакций и диапазонов для Git" -#: builtin/help.c:410 +#: builtin/help.c:413 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "Учебное введение в Git (для версии 1.5.1 или новее)" -#: builtin/help.c:411 +#: builtin/help.c:414 msgid "An overview of recommended workflows with Git" msgstr "Обзор рекомендуемых последовательностей выполняемых действий с Git" -#: builtin/help.c:423 +#: builtin/help.c:426 msgid "The common Git guides are:\n" msgstr "Основные руководства Git:\n" -#: builtin/help.c:441 +#: builtin/help.c:444 #, c-format -msgid "`git %s' is aliased to `%s'" -msgstr "«git %s» — это сокращение для «%s»" +msgid "'%s' is aliased to '%s'" +msgstr "«%s» — это сокращение для «%s»" -#: builtin/help.c:463 builtin/help.c:480 +#: builtin/help.c:466 builtin/help.c:483 #, c-format msgid "usage: %s%s" msgstr "использование: %s%s" -#: builtin/index-pack.c:155 +#: builtin/index-pack.c:156 #, c-format msgid "unable to open %s" msgstr "не удалось открыть %s" -#: builtin/index-pack.c:205 +#: builtin/index-pack.c:206 #, c-format msgid "object type mismatch at %s" msgstr "несоответствие типа объекта на %s" -#: builtin/index-pack.c:225 +#: builtin/index-pack.c:226 #, c-format msgid "did not receive expected object %s" msgstr "ожидаемый объект не получен на %s" -#: builtin/index-pack.c:228 +#: builtin/index-pack.c:229 #, c-format msgid "object %s: expected type %s, found %s" msgstr "объект %s: ожидаемый тип %s, получен %s" -#: builtin/index-pack.c:270 +#: builtin/index-pack.c:271 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" @@ -8432,73 +8541,73 @@ msgstr[1] "не удалось заполнить %d байта" msgstr[2] "не удалось заполнить %d байтов" msgstr[3] "не удалось заполнить %d байтов" -#: builtin/index-pack.c:280 +#: builtin/index-pack.c:281 msgid "early EOF" msgstr "неожиданный конец файла" -#: builtin/index-pack.c:281 +#: builtin/index-pack.c:282 msgid "read error on input" msgstr "ошибка чтения ввода" -#: builtin/index-pack.c:293 +#: builtin/index-pack.c:294 msgid "used more bytes than were available" msgstr "использовано больше байт, чем было доступно" -#: builtin/index-pack.c:300 +#: builtin/index-pack.c:301 msgid "pack too large for current definition of off_t" msgstr "пакет слишком большой для текущего определения off_t" -#: builtin/index-pack.c:303 builtin/unpack-objects.c:93 +#: builtin/index-pack.c:304 builtin/unpack-objects.c:93 msgid "pack exceeds maximum allowed size" msgstr "размер пакета превышает максимальный допустимый" -#: builtin/index-pack.c:318 +#: builtin/index-pack.c:319 #, c-format msgid "unable to create '%s'" msgstr "не удалось создать «%s»" -#: builtin/index-pack.c:324 +#: builtin/index-pack.c:325 #, c-format msgid "cannot open packfile '%s'" msgstr "не удалось открыть файл пакета «%s»" -#: builtin/index-pack.c:338 +#: builtin/index-pack.c:339 msgid "pack signature mismatch" msgstr "несоответствие подписи пакета" -#: builtin/index-pack.c:340 +#: builtin/index-pack.c:341 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "версия пакета %<PRIu32> не поддерживается" -#: builtin/index-pack.c:358 +#: builtin/index-pack.c:359 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "пакет содержит плохой объект по смещению %<PRIuMAX>: %s" -#: builtin/index-pack.c:479 +#: builtin/index-pack.c:480 #, c-format msgid "inflate returned %d" msgstr "программа сжатия вернула %d" -#: builtin/index-pack.c:528 +#: builtin/index-pack.c:529 msgid "offset value overflow for delta base object" msgstr "переполнение значения смещения у базового объекта дельты" -#: builtin/index-pack.c:536 +#: builtin/index-pack.c:537 msgid "delta base offset is out of bound" msgstr "смещение базовой дельты вышло за допустимые пределы" -#: builtin/index-pack.c:544 +#: builtin/index-pack.c:545 #, c-format msgid "unknown object type %d" msgstr "неизвестный тип объекта %d" -#: builtin/index-pack.c:575 +#: builtin/index-pack.c:576 msgid "cannot pread pack file" msgstr "не удалось выполнить pread для файла пакета" -#: builtin/index-pack.c:577 +#: builtin/index-pack.c:578 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" @@ -8507,93 +8616,93 @@ msgstr[1] "преждевременное окончание файла паке msgstr[2] "преждевременное окончание файла пакета, %<PRIuMAX> байтов отсутствует" msgstr[3] "преждевременное окончание файла пакета, %<PRIuMAX> байтов отсутствует" -#: builtin/index-pack.c:603 +#: builtin/index-pack.c:604 msgid "serious inflate inconsistency" msgstr "серьезное несоответствие при распаковке" -#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777 -#: builtin/index-pack.c:816 builtin/index-pack.c:825 +#: 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 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "НАЙДЕНА КОЛЛИЗИЯ SHA1 С %s !" -#: builtin/index-pack.c:751 builtin/pack-objects.c:167 -#: builtin/pack-objects.c:261 +#: builtin/index-pack.c:752 builtin/pack-objects.c:168 +#: builtin/pack-objects.c:262 #, c-format msgid "unable to read %s" msgstr "не удалось прочитать %s" -#: builtin/index-pack.c:814 +#: builtin/index-pack.c:815 #, c-format msgid "cannot read existing object info %s" msgstr "не удалось прочитать информацию существующего объекта %s" -#: builtin/index-pack.c:822 +#: builtin/index-pack.c:823 #, c-format msgid "cannot read existing object %s" msgstr "не удалось прочитать существующий объект %s" -#: builtin/index-pack.c:836 +#: builtin/index-pack.c:837 #, c-format msgid "invalid blob object %s" msgstr "неправильный файл двоичного объекта %s" -#: builtin/index-pack.c:851 +#: builtin/index-pack.c:852 #, c-format msgid "invalid %s" msgstr "неправильный %s" -#: builtin/index-pack.c:854 +#: builtin/index-pack.c:855 msgid "Error in object" msgstr "Ошибка в объекте" -#: builtin/index-pack.c:856 +#: builtin/index-pack.c:857 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Не все дочерние объекты %s достижимы" -#: builtin/index-pack.c:928 builtin/index-pack.c:959 +#: builtin/index-pack.c:929 builtin/index-pack.c:960 msgid "failed to apply delta" msgstr "сбой при применении дельты" -#: builtin/index-pack.c:1130 +#: builtin/index-pack.c:1131 msgid "Receiving objects" msgstr "Получение объектов" -#: builtin/index-pack.c:1130 +#: builtin/index-pack.c:1131 msgid "Indexing objects" msgstr "Индексирование объектов" -#: builtin/index-pack.c:1164 +#: builtin/index-pack.c:1165 msgid "pack is corrupted (SHA1 mismatch)" msgstr "пакет поврежден (несоответствие SHA1)" -#: builtin/index-pack.c:1169 +#: builtin/index-pack.c:1170 msgid "cannot fstat packfile" msgstr "не удалось выполнить fstat для файла пакета" -#: builtin/index-pack.c:1172 +#: builtin/index-pack.c:1173 msgid "pack has junk at the end" msgstr "файл пакета содержит мусор в конце" -#: builtin/index-pack.c:1184 +#: builtin/index-pack.c:1185 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "безумная путаница в parse_pack_objects()" -#: builtin/index-pack.c:1207 +#: builtin/index-pack.c:1208 msgid "Resolving deltas" msgstr "Определение изменений" -#: builtin/index-pack.c:1218 +#: builtin/index-pack.c:1219 #, c-format msgid "unable to create thread: %s" msgstr "не удалось создать поток: %s" -#: builtin/index-pack.c:1260 +#: builtin/index-pack.c:1261 msgid "confusion beyond insanity" msgstr "безумная путаница" -#: builtin/index-pack.c:1266 +#: builtin/index-pack.c:1267 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" @@ -8602,12 +8711,12 @@ msgstr[1] "завершено с %d локальными объектами" msgstr[2] "завершено с %d локальными объектами" msgstr[3] "завершено с %d локальными объектами" -#: builtin/index-pack.c:1278 +#: builtin/index-pack.c:1279 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Неожиданная контрольная сумма в конце %s (диск поврежден?)" -#: builtin/index-pack.c:1282 +#: builtin/index-pack.c:1283 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" @@ -8616,54 +8725,54 @@ msgstr[1] "пакет содержит %d неразрешенные дельт msgstr[2] "пакет содержит %d неразрешенных дельт" msgstr[3] "пакет содержит %d неразрешенных дельт" -#: builtin/index-pack.c:1306 +#: builtin/index-pack.c:1307 #, c-format msgid "unable to deflate appended object (%d)" msgstr "нельзя сжать присоединенный объект (%d)" -#: builtin/index-pack.c:1382 +#: builtin/index-pack.c:1383 #, c-format msgid "local object %s is corrupt" msgstr "локальный объект %s поврежден" -#: builtin/index-pack.c:1408 +#: builtin/index-pack.c:1409 msgid "error while closing pack file" msgstr "ошибка при закрытии файла пакета" -#: builtin/index-pack.c:1420 +#: builtin/index-pack.c:1421 #, c-format msgid "cannot write keep file '%s'" msgstr "не удалось записать файл удержания «%s»" -#: builtin/index-pack.c:1428 +#: builtin/index-pack.c:1429 #, c-format msgid "cannot close written keep file '%s'" msgstr "не удалось закрыть записанный файл удержания «%s»" -#: builtin/index-pack.c:1438 +#: builtin/index-pack.c:1439 msgid "cannot store pack file" msgstr "не удалось сохранить файл пакета" -#: builtin/index-pack.c:1446 +#: builtin/index-pack.c:1447 msgid "cannot store index file" msgstr "не удалось сохранить файл индекса" -#: builtin/index-pack.c:1484 +#: builtin/index-pack.c:1485 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "плохой pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1552 +#: builtin/index-pack.c:1553 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Не удалось открыть существующий файл пакета «%s»" -#: builtin/index-pack.c:1554 +#: builtin/index-pack.c:1555 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Не удалось открыть существующий файл индекса для «%s»" -#: builtin/index-pack.c:1602 +#: builtin/index-pack.c:1603 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" @@ -8672,7 +8781,7 @@ msgstr[1] "не дельты: %d объекта" msgstr[2] "не дельты: %d объектов" msgstr[3] "не дельты: %d объектов" -#: builtin/index-pack.c:1609 +#: builtin/index-pack.c:1610 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" @@ -8681,26 +8790,26 @@ msgstr[1] "длина цепочки = %d: %lu объекта" msgstr[2] "длина цепочки = %d: %lu объектов" msgstr[3] "длина цепочки = %d: %lu объектов" -#: builtin/index-pack.c:1622 +#: builtin/index-pack.c:1623 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "имя пакета «%s» не оканчивается на «.pack»" -#: builtin/index-pack.c:1704 builtin/index-pack.c:1707 -#: builtin/index-pack.c:1723 builtin/index-pack.c:1727 +#: builtin/index-pack.c:1705 builtin/index-pack.c:1708 +#: builtin/index-pack.c:1724 builtin/index-pack.c:1728 #, c-format msgid "bad %s" msgstr "плохой %s" -#: builtin/index-pack.c:1743 +#: builtin/index-pack.c:1744 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin нельзя использовать без --stdin" -#: builtin/index-pack.c:1745 +#: builtin/index-pack.c:1746 msgid "--stdin requires a git repository" msgstr "опция --stdin требует наличия репозитория git" -#: builtin/index-pack.c:1753 +#: builtin/index-pack.c:1754 msgid "--verify with no packfile name given" msgstr "--verify без указания имени файла пакета" @@ -8826,453 +8935,493 @@ msgid "" "<token>[(=|:)<value>])...] [<file>...]" msgstr "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <ключ>[(=|:)<значение>])…] [<файл>…]" -#: builtin/interpret-trailers.c:26 +#: builtin/interpret-trailers.c:92 msgid "edit files in place" msgstr "редактировать файлы на месте" -#: builtin/interpret-trailers.c:27 +#: builtin/interpret-trailers.c:93 msgid "trim empty trailers" msgstr "удалять пустые завершители" -#: builtin/interpret-trailers.c:28 +#: builtin/interpret-trailers.c:96 +msgid "where to place the new trailer" +msgstr "где поместить новый завершитель" + +#: builtin/interpret-trailers.c:98 +msgid "action if trailer already exists" +msgstr "действие, если завершитель уже существует" + +#: builtin/interpret-trailers.c:100 +msgid "action if trailer is missing" +msgstr "действие, если завершитель не существует" + +#: builtin/interpret-trailers.c:102 +msgid "output only the trailers" +msgstr "вывести только завершители" + +#: builtin/interpret-trailers.c:103 +msgid "do not apply config rules" +msgstr "не применять правила из файла конфигурации" + +#: builtin/interpret-trailers.c:104 +msgid "join whitespace-continued values" +msgstr "объединить значения разделенные пробелом" + +#: builtin/interpret-trailers.c:105 +msgid "set parsing options" +msgstr "указание опций разбора" + +#: builtin/interpret-trailers.c:107 msgid "trailer" msgstr "завершитель" -#: builtin/interpret-trailers.c:29 +#: builtin/interpret-trailers.c:108 msgid "trailer(s) to add" msgstr "завершители для добавления" -#: builtin/interpret-trailers.c:42 +#: builtin/interpret-trailers.c:117 +msgid "--trailer with --only-input does not make sense" +msgstr "--trailer одновременно с --only-input не имеет смысла" + +#: builtin/interpret-trailers.c:127 msgid "no input file given for in-place editing" msgstr "ничего не передано, для редактирования файлов на месте" -#: builtin/log.c:45 +#: builtin/log.c:46 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<опции>] [<диапазон-редакций>] [[--] <путь>…]" -#: builtin/log.c:46 +#: builtin/log.c:47 msgid "git show [<options>] <object>..." msgstr "git show [<опции>] <объект>…" -#: builtin/log.c:90 +#: builtin/log.c:91 #, c-format msgid "invalid --decorate option: %s" msgstr "неправильный параметр для --decorate: %s" -#: builtin/log.c:147 +#: builtin/log.c:148 msgid "suppress diff output" msgstr "не выводить различия" -#: builtin/log.c:148 +#: builtin/log.c:149 msgid "show source" msgstr "показать источник" -#: builtin/log.c:149 +#: builtin/log.c:150 msgid "Use mail map file" msgstr "Использовать файл соответствия почтовых адресов" -#: builtin/log.c:150 +#: builtin/log.c:151 msgid "decorate options" msgstr "опции формата вывода ссылок" -#: builtin/log.c:153 +#: builtin/log.c:154 msgid "Process line range n,m in file, counting from 1" msgstr "Обработать диапазон строк n,m из файла, начиная с 1" -#: builtin/log.c:249 +#: builtin/log.c:250 #, c-format msgid "Final output: %d %s\n" msgstr "Финальный вывод: %d %s\n" -#: builtin/log.c:497 +#: builtin/log.c:501 #, c-format msgid "git show %s: bad file" msgstr "git show %s: плохой файл" -#: builtin/log.c:512 builtin/log.c:606 +#: builtin/log.c:516 builtin/log.c:610 #, c-format msgid "Could not read object %s" msgstr "Не удалось прочитать объект %s" -#: builtin/log.c:630 +#: builtin/log.c:634 #, c-format msgid "Unknown type: %d" msgstr "Неизвестный тип объекта: %d" -#: builtin/log.c:751 +#: builtin/log.c:755 msgid "format.headers without value" msgstr "в format.headers не указано значение" -#: builtin/log.c:852 +#: builtin/log.c:856 msgid "name of output directory is too long" msgstr "слишком длинное имя выходного каталога" -#: builtin/log.c:868 +#: builtin/log.c:872 #, c-format msgid "Cannot open patch file %s" msgstr "Ну удалось открыть файл изменений %s" -#: builtin/log.c:885 +#: builtin/log.c:889 msgid "Need exactly one range." msgstr "Нужен только один диапазон." -#: builtin/log.c:895 +#: builtin/log.c:899 msgid "Not a range." msgstr "Не является диапазоном." -#: builtin/log.c:1001 +#: builtin/log.c:1005 msgid "Cover letter needs email format" msgstr "Сопроводительное письмо должно быть в формате электронной почты" -#: builtin/log.c:1081 +#: builtin/log.c:1085 #, c-format msgid "insane in-reply-to: %s" msgstr "ошибка в поле in-reply-to: %s" -#: builtin/log.c:1108 +#: builtin/log.c:1112 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<опции>] [<начиная-с> | <диапазон-редакций>]" -#: builtin/log.c:1158 +#: builtin/log.c:1162 msgid "Two output directories?" msgstr "Два выходных каталога?" -#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922 +#: builtin/log.c:1269 builtin/log.c:1920 builtin/log.c:1922 builtin/log.c:1934 #, c-format msgid "Unknown commit %s" msgstr "Неизвестный коммит %s" -#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533 +#: builtin/log.c:1279 builtin/notes.c:887 builtin/tag.c:516 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Не удалось разрешить «%s» как ссылку." -#: builtin/log.c:1280 +#: builtin/log.c:1284 msgid "Could not find exact merge base." msgstr "Не удалось найти точную базу слияния." -#: builtin/log.c:1284 +#: builtin/log.c:1288 msgid "" "Failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" "Or you could specify base commit by --base=<base-commit-id> manually." msgstr "Не удалось получить вышестоящую ветку. Если вы хотите записать базовый коммит автомитически, то используйте git branch --set-upstream-to для отслеживания внешней ветки.\nИли же вы можете указать базовый коммит указанием --base=<идентификатор-базового-коммита> вручную." -#: builtin/log.c:1304 +#: builtin/log.c:1308 msgid "Failed to find exact merge base" msgstr "Не удалось найти точную базу слияния" -#: builtin/log.c:1315 +#: builtin/log.c:1319 msgid "base commit should be the ancestor of revision list" msgstr "базовый коммит должен быть предком списка редакций" -#: builtin/log.c:1319 +#: builtin/log.c:1323 msgid "base commit shouldn't be in revision list" msgstr "базовый коммит не должен быть в списке редакций" -#: builtin/log.c:1368 +#: builtin/log.c:1372 msgid "cannot get patch id" msgstr "не удалось получить идентификатор патча" -#: builtin/log.c:1425 +#: builtin/log.c:1431 msgid "use [PATCH n/m] even with a single patch" msgstr "выводить [PATCH n/m] даже когда один патч" -#: builtin/log.c:1428 +#: builtin/log.c:1434 msgid "use [PATCH] even with multiple patches" msgstr "выводить [PATCH] даже когда несколько патчей" -#: builtin/log.c:1432 +#: builtin/log.c:1438 msgid "print patches to standard out" msgstr "выводить патчи на стандартный вывод" -#: builtin/log.c:1434 +#: builtin/log.c:1440 msgid "generate a cover letter" -msgstr "генерировать сопроводительное письмо" +msgstr "создать сопроводительное письмо" -#: builtin/log.c:1436 +#: builtin/log.c:1442 msgid "use simple number sequence for output file names" msgstr "использовать простую последовательность чисел для имен выходных файлов" -#: builtin/log.c:1437 +#: builtin/log.c:1443 msgid "sfx" msgstr "суффикс" -#: builtin/log.c:1438 +#: builtin/log.c:1444 msgid "use <sfx> instead of '.patch'" msgstr "использовать суффикс <суффикс> вместо «.patch»" -#: builtin/log.c:1440 +#: builtin/log.c:1446 msgid "start numbering patches at <n> instead of 1" msgstr "начать нумерацию патчей с <n>, а не с 1" -#: builtin/log.c:1442 +#: builtin/log.c:1448 msgid "mark the series as Nth re-roll" msgstr "пометить серию как энную попытку" -#: builtin/log.c:1444 +#: builtin/log.c:1450 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Использовать [RFC PATCH] вместо [PATCH]" -#: builtin/log.c:1447 +#: builtin/log.c:1453 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Использовать [<префикс>] вместо [PATCH]" -#: builtin/log.c:1450 +#: builtin/log.c:1456 msgid "store resulting files in <dir>" msgstr "сохранить результирующие файлы в <каталог>" -#: builtin/log.c:1453 +#: builtin/log.c:1459 msgid "don't strip/add [PATCH]" msgstr "не обрезать/добавлять [PATCH]" -#: builtin/log.c:1456 +#: builtin/log.c:1462 msgid "don't output binary diffs" msgstr "не выводить двоичные различия" -#: builtin/log.c:1458 +#: builtin/log.c:1464 msgid "output all-zero hash in From header" msgstr "выводить нулевую хэш-сумму в заголовке From" -#: builtin/log.c:1460 +#: builtin/log.c:1466 msgid "don't include a patch matching a commit upstream" msgstr "не включать патч, если коммит уже есть в вышестоящей ветке" -#: builtin/log.c:1462 +#: builtin/log.c:1468 msgid "show patch format instead of default (patch + stat)" msgstr "выводить в формате патча, а не в стандартном (патч + статистика)" -#: builtin/log.c:1464 +#: builtin/log.c:1470 msgid "Messaging" msgstr "Передача сообщений" -#: builtin/log.c:1465 +#: builtin/log.c:1471 msgid "header" msgstr "заголовок" -#: builtin/log.c:1466 +#: builtin/log.c:1472 msgid "add email header" msgstr "добавить заголовок сообщения" -#: builtin/log.c:1467 builtin/log.c:1469 +#: builtin/log.c:1473 builtin/log.c:1475 msgid "email" msgstr "почта" -#: builtin/log.c:1467 +#: builtin/log.c:1473 msgid "add To: header" msgstr "добавить заголовок To:" -#: builtin/log.c:1469 +#: builtin/log.c:1475 msgid "add Cc: header" msgstr "добавить заголовок Cc:" -#: builtin/log.c:1471 +#: builtin/log.c:1477 msgid "ident" msgstr "идентификатор" -#: builtin/log.c:1472 +#: builtin/log.c:1478 msgid "set From address to <ident> (or committer ident if absent)" msgstr "установить адрес отправителя на <идентификатор> (или на идентификатор коммитера, если отсутствует)" -#: builtin/log.c:1474 +#: builtin/log.c:1480 msgid "message-id" msgstr "идентификатор-сообщения" -#: builtin/log.c:1475 +#: builtin/log.c:1481 msgid "make first mail a reply to <message-id>" msgstr "сделать первое письмо ответом на <идентификатор-сообщения>" -#: builtin/log.c:1476 builtin/log.c:1479 +#: builtin/log.c:1482 builtin/log.c:1485 msgid "boundary" msgstr "вложение" -#: builtin/log.c:1477 +#: builtin/log.c:1483 msgid "attach the patch" msgstr "приложить патч" -#: builtin/log.c:1480 +#: builtin/log.c:1486 msgid "inline the patch" msgstr "включить патч в текст письма" -#: builtin/log.c:1484 +#: builtin/log.c:1490 msgid "enable message threading, styles: shallow, deep" msgstr "включить в письмах иерархичность, стили: shallow (частичную), deep (глубокую)" -#: builtin/log.c:1486 +#: builtin/log.c:1492 msgid "signature" msgstr "подпись" -#: builtin/log.c:1487 +#: builtin/log.c:1493 msgid "add a signature" msgstr "добавить подпись" -#: builtin/log.c:1488 +#: builtin/log.c:1494 msgid "base-commit" msgstr "базовый коммит" -#: builtin/log.c:1489 +#: builtin/log.c:1495 msgid "add prerequisite tree info to the patch series" msgstr "добавить информацию о требовании дерева к серии патчей" -#: builtin/log.c:1491 +#: builtin/log.c:1497 msgid "add a signature from a file" msgstr "добавить подпись из файла" -#: builtin/log.c:1492 +#: builtin/log.c:1498 msgid "don't print the patch filenames" msgstr "не выводить имена файлов патчей" -#: builtin/log.c:1567 +#: builtin/log.c:1500 +msgid "show progress while generating patches" +msgstr "показать прогресс выполнения во создания патчей" + +#: builtin/log.c:1575 #, c-format msgid "invalid ident line: %s" msgstr "неправильная строка идентификации: %s" -#: builtin/log.c:1582 +#: builtin/log.c:1590 msgid "-n and -k are mutually exclusive." msgstr "-n и -k нельзя использовать одновременно" -#: builtin/log.c:1584 +#: builtin/log.c:1592 msgid "--subject-prefix/--rfc and -k are mutually exclusive." msgstr "--subject-prefix/--rfc и -k нельзя использовать одновременно." -#: builtin/log.c:1592 +#: builtin/log.c:1600 msgid "--name-only does not make sense" msgstr "--name-only не имеет смысла" -#: builtin/log.c:1594 +#: builtin/log.c:1602 msgid "--name-status does not make sense" msgstr "--name-status не имеет смысла" -#: builtin/log.c:1596 +#: builtin/log.c:1604 msgid "--check does not make sense" msgstr "--check не имеет смысла" -#: builtin/log.c:1626 +#: builtin/log.c:1634 msgid "standard output, or directory, which one?" msgstr "стандартный вывод или каталог?" -#: builtin/log.c:1628 +#: builtin/log.c:1636 #, c-format msgid "Could not create directory '%s'" msgstr "Не удалось создать каталог «%s»" -#: builtin/log.c:1722 +#: builtin/log.c:1729 #, c-format msgid "unable to read signature file '%s'" msgstr "не удалось прочитать файл подписи «%s»" -#: builtin/log.c:1794 +#: builtin/log.c:1761 +msgid "Generating patches" +msgstr "Создание патчей" + +#: builtin/log.c:1805 msgid "Failed to create output files" msgstr "Сбой при создании выходных файлов" -#: builtin/log.c:1843 +#: builtin/log.c:1855 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<вышестоящая-ветка> [<голова> [<ограничение>]]]" -#: builtin/log.c:1897 +#: builtin/log.c:1909 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> " "manually.\n" msgstr "Не удалось найти отслеживаемую внешнюю ветку, укажите <вышестоящую-ветку> вручную.\n" -#: builtin/ls-files.c:468 +#: builtin/ls-files.c:466 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<опции>] [<файл>…]" -#: builtin/ls-files.c:517 +#: builtin/ls-files.c:515 msgid "identify the file status with tags" msgstr "выводить имена файлов с метками" -#: builtin/ls-files.c:519 +#: builtin/ls-files.c:517 msgid "use lowercase letters for 'assume unchanged' files" msgstr "использовать символы в нижнем регистре для «предположительно без изменений» файлов" -#: builtin/ls-files.c:521 +#: builtin/ls-files.c:519 msgid "show cached files in the output (default)" msgstr "показывать кэшированные файлы при выводе (по умолчанию)" -#: builtin/ls-files.c:523 +#: builtin/ls-files.c:521 msgid "show deleted files in the output" msgstr "показывать удаленные файлы при выводе" -#: builtin/ls-files.c:525 +#: builtin/ls-files.c:523 msgid "show modified files in the output" msgstr "показывать измененные файлы при выводе" -#: builtin/ls-files.c:527 +#: builtin/ls-files.c:525 msgid "show other files in the output" msgstr "показывать другие файлы при выводе" -#: builtin/ls-files.c:529 +#: builtin/ls-files.c:527 msgid "show ignored files in the output" msgstr "показывать игнорируемые файлы при выводе" -#: builtin/ls-files.c:532 +#: builtin/ls-files.c:530 msgid "show staged contents' object name in the output" msgstr "показывать имя индексированного объекта на выводе" -#: builtin/ls-files.c:534 +#: builtin/ls-files.c:532 msgid "show files on the filesystem that need to be removed" msgstr "показывать файлы в файловой системе, которые должны быть удалены" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:534 msgid "show 'other' directories' names only" msgstr "показывать только имена у «других» каталогов" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:536 msgid "show line endings of files" msgstr "показать концы строк файлов" -#: builtin/ls-files.c:540 +#: builtin/ls-files.c:538 msgid "don't show empty directories" msgstr "не показывать пустые каталоги" -#: builtin/ls-files.c:543 +#: builtin/ls-files.c:541 msgid "show unmerged files in the output" msgstr "показывать не слитые файлы на выводе" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:543 msgid "show resolve-undo information" msgstr "показывать информации о разрешении конфликтов и отмене" -#: builtin/ls-files.c:547 +#: builtin/ls-files.c:545 msgid "skip files matching pattern" msgstr "пропустить файлы, соответствующие шаблону" -#: builtin/ls-files.c:550 +#: builtin/ls-files.c:548 msgid "exclude patterns are read from <file>" msgstr "прочитать шаблоны исключения из <файл>" -#: builtin/ls-files.c:553 +#: builtin/ls-files.c:551 msgid "read additional per-directory exclude patterns in <file>" msgstr "прочитать дополнительные покаталожные шаблоны исключения из <файл>" -#: builtin/ls-files.c:555 +#: builtin/ls-files.c:553 msgid "add the standard git exclusions" msgstr "добавить стандартные исключения git" -#: builtin/ls-files.c:558 +#: builtin/ls-files.c:556 msgid "make the output relative to the project top directory" msgstr "выводить пути относительно корневого каталога проекта" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:559 msgid "recurse through submodules" msgstr "рекурсивно по подмодулям" -#: builtin/ls-files.c:563 +#: builtin/ls-files.c:561 msgid "if any <file> is not in the index, treat this as an error" msgstr "если какой-либо <файл> не в индексе, считать это ошибкой" -#: builtin/ls-files.c:564 +#: builtin/ls-files.c:562 msgid "tree-ish" msgstr "указатель-дерева" -#: builtin/ls-files.c:565 +#: builtin/ls-files.c:563 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "притвориться, что пути удалены, т.к. <указатель-дерева> еще существует" -#: builtin/ls-files.c:567 +#: builtin/ls-files.c:565 msgid "show debugging data" msgstr "показать отладочную информацию" @@ -9360,176 +9509,180 @@ msgstr "вывести полное дерево; не только текущи msgid "empty mbox: '%s'" msgstr "пустой mbox: «%s»" -#: builtin/merge.c:47 +#: builtin/merge.c:48 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<опции>] [<коммит>…]" -#: builtin/merge.c:48 +#: builtin/merge.c:49 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:49 +#: builtin/merge.c:50 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:104 +#: builtin/merge.c:107 msgid "switch `m' requires a value" msgstr "при указании параметра «m» требуется указать значение" -#: builtin/merge.c:141 +#: builtin/merge.c:144 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Не удалось найти стратегию слияния «%s».\n" -#: builtin/merge.c:142 +#: builtin/merge.c:145 #, c-format msgid "Available strategies are:" msgstr "Доступные стратегии:" -#: builtin/merge.c:147 +#: builtin/merge.c:150 #, c-format msgid "Available custom strategies are:" msgstr "Доступные пользовательские стратегии:" -#: builtin/merge.c:197 builtin/pull.c:134 +#: builtin/merge.c:200 builtin/pull.c:134 msgid "do not show a diffstat at the end of the merge" msgstr "не выводить статистику изменений после окончания слияния" -#: builtin/merge.c:200 builtin/pull.c:137 +#: builtin/merge.c:203 builtin/pull.c:137 msgid "show a diffstat at the end of the merge" msgstr "вывести статистику изменений после окончания слияния" -#: builtin/merge.c:201 builtin/pull.c:140 +#: builtin/merge.c:204 builtin/pull.c:140 msgid "(synonym to --stat)" msgstr "(синоним для --stat)" -#: builtin/merge.c:203 builtin/pull.c:143 +#: builtin/merge.c:206 builtin/pull.c:143 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "добавить (максимум <n>) записей из короткого журнала в сообщение коммита у слияния" -#: builtin/merge.c:206 builtin/pull.c:146 +#: builtin/merge.c:209 builtin/pull.c:146 msgid "create a single commit instead of doing a merge" msgstr "создать один коммит, вместо выполнения слияния" -#: builtin/merge.c:208 builtin/pull.c:149 +#: builtin/merge.c:211 builtin/pull.c:149 msgid "perform a commit if the merge succeeds (default)" msgstr "сделать коммит, если слияние прошло успешно (по умолчанию)" -#: builtin/merge.c:210 builtin/pull.c:152 +#: builtin/merge.c:213 builtin/pull.c:152 msgid "edit message before committing" msgstr "отредактировать сообщение перед выполнением коммита" -#: builtin/merge.c:211 +#: builtin/merge.c:214 msgid "allow fast-forward (default)" msgstr "разрешить перемотку вперед (по умолчанию)" -#: builtin/merge.c:213 builtin/pull.c:158 +#: builtin/merge.c:216 builtin/pull.c:158 msgid "abort if fast-forward is not possible" msgstr "отменить выполнение слияния, если перемотка вперед невозможна" -#: builtin/merge.c:217 builtin/pull.c:161 +#: builtin/merge.c:220 builtin/pull.c:161 msgid "verify that the named commit has a valid GPG signature" msgstr "проверить, что указанный коммит имеет верную электронную подпись GPG" -#: builtin/merge.c:218 builtin/notes.c:776 builtin/pull.c:165 +#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:165 #: builtin/revert.c:109 msgid "strategy" msgstr "стратегия" -#: builtin/merge.c:219 builtin/pull.c:166 +#: builtin/merge.c:222 builtin/pull.c:166 msgid "merge strategy to use" msgstr "используемая стратегия слияния" -#: builtin/merge.c:220 builtin/pull.c:169 +#: builtin/merge.c:223 builtin/pull.c:169 msgid "option=value" msgstr "опция=значение" -#: builtin/merge.c:221 builtin/pull.c:170 +#: builtin/merge.c:224 builtin/pull.c:170 msgid "option for selected merge strategy" msgstr "опции для выбранной стратегии слияния" -#: builtin/merge.c:223 +#: builtin/merge.c:226 msgid "merge commit message (for a non-fast-forward merge)" msgstr "сообщение коммита для слияния (для слияния без перемотки вперед)" -#: builtin/merge.c:227 +#: builtin/merge.c:230 msgid "abort the current in-progress merge" msgstr "отменить выполнение происходящего слияния" -#: builtin/merge.c:229 +#: builtin/merge.c:232 msgid "continue the current in-progress merge" msgstr "продолжить выполнение происходящего слияния" -#: builtin/merge.c:231 builtin/pull.c:177 +#: builtin/merge.c:234 builtin/pull.c:177 msgid "allow merging unrelated histories" msgstr "разрешить слияние несвязанных историй изменений" -#: builtin/merge.c:259 +#: builtin/merge.c:240 +msgid "verify commit-msg hook" +msgstr "проверить перехватчик commit-msg" + +#: builtin/merge.c:265 msgid "could not run stash." msgstr "не удалось выполнить stash." -#: builtin/merge.c:264 +#: builtin/merge.c:270 msgid "stash failed" msgstr "сбой при выполнении stash" -#: builtin/merge.c:269 +#: builtin/merge.c:275 #, c-format msgid "not a valid object: %s" msgstr "неправильный объект: %s" -#: builtin/merge.c:288 builtin/merge.c:305 +#: builtin/merge.c:297 builtin/merge.c:314 msgid "read-tree failed" msgstr "сбой при выполнении read-tree" -#: builtin/merge.c:335 +#: builtin/merge.c:344 msgid " (nothing to squash)" msgstr " (нечего уплотнять)" -#: builtin/merge.c:346 +#: builtin/merge.c:355 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Уплотнение коммита — не обновляя HEAD\n" -#: builtin/merge.c:396 +#: builtin/merge.c:405 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Нет сообщения слияния — не обновляем HEAD\n" -#: builtin/merge.c:447 +#: builtin/merge.c:456 #, c-format msgid "'%s' does not point to a commit" msgstr "«%s» не указывает на коммит" -#: builtin/merge.c:537 +#: builtin/merge.c:546 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Неправильная строка branch.%s.mergeoptions: %s" -#: builtin/merge.c:657 +#: builtin/merge.c:666 msgid "Not handling anything other than two heads merge." msgstr "Не обрабатываю ничего, кроме слияния двух указателей на ветки." -#: builtin/merge.c:671 +#: builtin/merge.c:680 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Неизвестный параметр merge-recursive: -X%s" -#: builtin/merge.c:686 +#: builtin/merge.c:695 #, c-format msgid "unable to write %s" msgstr "не удалось записать %s" -#: builtin/merge.c:738 +#: builtin/merge.c:747 #, c-format msgid "Could not read from '%s'" msgstr "Не удалось прочесть из «%s»" -#: builtin/merge.c:747 +#: builtin/merge.c:756 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "Не выполняю коммит слияния; используйте «git commit» для завершения слияния.\n" -#: builtin/merge.c:753 +#: builtin/merge.c:762 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -9539,185 +9692,185 @@ msgid "" "the commit.\n" msgstr "Пожалуйста, введите сообщение коммита, для объяснения, зачем нужно\nэто слияние, особенно, если это слияние обновленной вышестоящей\nветки в тематическую ветку.\n\nСтроки, начинающиеся с «%c» будут проигнорированы, а пустое\nсообщение отменяет процесс коммита.\n" -#: builtin/merge.c:777 +#: builtin/merge.c:798 msgid "Empty commit message." msgstr "Пустое сообщение коммита." -#: builtin/merge.c:797 +#: builtin/merge.c:818 #, c-format msgid "Wonderful.\n" msgstr "Прекрасно.\n" -#: builtin/merge.c:850 +#: builtin/merge.c:871 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "Не удалось провести автоматическое слияние; исправьте конфликты и сделайте коммит результата.\n" -#: builtin/merge.c:889 +#: builtin/merge.c:910 msgid "No current branch." msgstr "Нет текущей ветки." -#: builtin/merge.c:891 +#: builtin/merge.c:912 msgid "No remote for the current branch." msgstr "У текущей ветки нет внешнего репозитория." -#: builtin/merge.c:893 +#: builtin/merge.c:914 msgid "No default upstream defined for the current branch." msgstr "Для текущей ветки не указана вышестоящая ветка по умолчанию." -#: builtin/merge.c:898 +#: builtin/merge.c:919 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Не указана внешняя отслеживаемая ветка для %s на %s" -#: builtin/merge.c:945 +#: builtin/merge.c:972 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Плохое значение «%s» в переменной окружения «%s»" -#: builtin/merge.c:1046 +#: builtin/merge.c:1073 #, c-format msgid "not something we can merge in %s: %s" msgstr "не является тем, что можно слить в %s: %s" -#: builtin/merge.c:1080 +#: builtin/merge.c:1107 msgid "not something we can merge" msgstr "не является тем, что можно слить" -#: builtin/merge.c:1145 +#: builtin/merge.c:1172 msgid "--abort expects no arguments" msgstr "опция --abort не принимает аргументы" -#: builtin/merge.c:1149 +#: builtin/merge.c:1176 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Нет слияния, которое можно отменить (отсутствует файл MERGE_HEAD)." -#: builtin/merge.c:1161 +#: builtin/merge.c:1188 msgid "--continue expects no arguments" msgstr "опция --continue не принимает аргументы" -#: builtin/merge.c:1165 +#: builtin/merge.c:1192 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Сейчас не происходит слияние (отсутствует файл MERGE_HEAD)." -#: builtin/merge.c:1181 +#: builtin/merge.c:1208 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "Вы не завершили слияние (присутствует файл MERGE_HEAD).\nВыполните коммит ваших изменений, перед слиянием." -#: builtin/merge.c:1188 +#: builtin/merge.c:1215 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "Вы не завершили копирование коммита (присутствует файл CHERRY_PICK_HEAD).\nПожалуйста, закоммитьте ваши изменения, перед слиянием." -#: builtin/merge.c:1191 +#: builtin/merge.c:1218 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Вы не завершили копирование коммита (присутствует файл CHERRY_PICK_HEAD)." -#: builtin/merge.c:1200 +#: builtin/merge.c:1227 msgid "You cannot combine --squash with --no-ff." msgstr "Нельзя использовать одновременно --squash и --no-ff." -#: builtin/merge.c:1208 +#: builtin/merge.c:1235 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Коммит не указан и параметр merge.defaultToUpstream не установлен." -#: builtin/merge.c:1225 +#: builtin/merge.c:1252 msgid "Squash commit into empty head not supported yet" msgstr "Уплотнение коммита в пустую ветку еще не поддерживается" -#: builtin/merge.c:1227 +#: builtin/merge.c:1254 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Коммит, не являющийся перемоткой вперед, нет смысла делать в пустую ветку." -#: builtin/merge.c:1232 +#: builtin/merge.c:1259 #, c-format msgid "%s - not something we can merge" msgstr "%s не является тем, что можно слить" -#: builtin/merge.c:1234 +#: builtin/merge.c:1261 msgid "Can merge only exactly one commit into empty head" msgstr "Можно только один коммит в пустую ветку." -#: builtin/merge.c:1268 +#: builtin/merge.c:1295 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "Коммит %s содержит не доверенную GPG подпись, предположительно от %s." -#: builtin/merge.c:1271 +#: builtin/merge.c:1298 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "Коммит %s содержит плохую GPG подпись, предположительно от %s." -#: builtin/merge.c:1274 +#: builtin/merge.c:1301 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Коммит %s не содержит GPG подпись." -#: builtin/merge.c:1277 +#: builtin/merge.c:1304 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Коммит %s содержит действительную GPG подпись, от %s.\n" -#: builtin/merge.c:1339 +#: builtin/merge.c:1366 msgid "refusing to merge unrelated histories" msgstr "отказ слияния несвязанных историй изменений" -#: builtin/merge.c:1348 -msgid "Already up-to-date." +#: builtin/merge.c:1375 +msgid "Already up to date." msgstr "Уже обновлено." -#: builtin/merge.c:1358 +#: builtin/merge.c:1385 #, c-format msgid "Updating %s..%s\n" msgstr "Обновление %s..%s\n" -#: builtin/merge.c:1399 +#: builtin/merge.c:1426 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Попытка тривиального слияния в индексе…\n" -#: builtin/merge.c:1406 +#: builtin/merge.c:1433 #, c-format msgid "Nope.\n" msgstr "Не вышло.\n" -#: builtin/merge.c:1431 -msgid "Already up-to-date. Yeeah!" +#: builtin/merge.c:1458 +msgid "Already up to date. Yeeah!" msgstr "Уже обновлено. Круто!" -#: builtin/merge.c:1437 +#: builtin/merge.c:1464 msgid "Not possible to fast-forward, aborting." msgstr "Перемотка вперед невозможна, отмена." -#: builtin/merge.c:1460 builtin/merge.c:1539 +#: builtin/merge.c:1487 builtin/merge.c:1566 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Перемотка дерева к исходному состоянию…\n" -#: builtin/merge.c:1464 +#: builtin/merge.c:1491 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Попытка слияния с помощью стратегии %s…\n" -#: builtin/merge.c:1530 +#: builtin/merge.c:1557 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ни одна стратегия слияния не обработала слияние.\n" -#: builtin/merge.c:1532 +#: builtin/merge.c:1559 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Сбой при слиянии с помощью стратегии %s.\n" -#: builtin/merge.c:1541 +#: builtin/merge.c:1568 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Использую %s для подготовки ручного разрешения конфликтов.\n" -#: builtin/merge.c:1553 +#: builtin/merge.c:1580 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "Автоматическое слияние прошло успешно; как и запрашивали, остановлено перед выполнением коммита\n" @@ -9858,7 +10011,7 @@ msgstr "git mv [<опции>] <источник>… <назначение>" msgid "Directory %s is in index and no submodule?" msgstr "Каталог %s в индексе и не является подмодулем?" -#: builtin/mv.c:85 builtin/rm.c:290 +#: builtin/mv.c:85 builtin/rm.c:289 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "Чтобы продолжить, проиндексируйте или спрячьте ваши изменения в файле .gitmodules" @@ -9875,68 +10028,68 @@ msgstr "принудительно перемещать/переименоват msgid "skip move/rename errors" msgstr "пропускать ошибки при перемещении/переименовании" -#: builtin/mv.c:168 +#: builtin/mv.c:167 #, c-format msgid "destination '%s' is not a directory" msgstr "целевой путь «%s» не является каталогом" -#: builtin/mv.c:179 +#: builtin/mv.c:178 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Проверка переименования из «%s» в «%s»\n" -#: builtin/mv.c:183 +#: builtin/mv.c:182 msgid "bad source" msgstr "плохой источник" -#: builtin/mv.c:186 +#: builtin/mv.c:185 msgid "can not move directory into itself" msgstr "нельзя переместить каталог в самого себя" -#: builtin/mv.c:189 +#: builtin/mv.c:188 msgid "cannot move directory over file" msgstr "нельзя переместить каталог в файл" -#: builtin/mv.c:198 +#: builtin/mv.c:197 msgid "source directory is empty" msgstr "исходный каталог пуст" -#: builtin/mv.c:223 +#: builtin/mv.c:222 msgid "not under version control" msgstr "не под версионным контролем" -#: builtin/mv.c:226 +#: builtin/mv.c:225 msgid "destination exists" msgstr "целевой путь уже существует" -#: builtin/mv.c:234 +#: builtin/mv.c:233 #, c-format msgid "overwriting '%s'" msgstr "перезапись «%s»" -#: builtin/mv.c:237 +#: builtin/mv.c:236 msgid "Cannot overwrite" msgstr "Не удалось перезаписать" -#: builtin/mv.c:240 +#: builtin/mv.c:239 msgid "multiple sources for the same target" msgstr "несколько источников для одного целевого пути" -#: builtin/mv.c:242 +#: builtin/mv.c:241 msgid "destination directory does not exist" msgstr "целевой каталог не существует" -#: builtin/mv.c:249 +#: builtin/mv.c:248 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, откуда=%s, куда=%s" -#: builtin/mv.c:270 +#: builtin/mv.c:269 #, c-format msgid "Renaming %s to %s\n" msgstr "Переименование %s в %s\n" -#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390 +#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390 #, c-format msgid "renaming '%s' failed" msgstr "сбой при переименовании «%s»" @@ -10121,19 +10274,19 @@ msgstr "не удалось записать объект заметки" msgid "the note contents have been left in %s" msgstr "содержимое заметки осталось в %s" -#: builtin/notes.c:234 builtin/tag.c:517 +#: builtin/notes.c:234 builtin/tag.c:500 #, c-format msgid "cannot read '%s'" msgstr "не удалось прочитать «%s»" -#: builtin/notes.c:236 builtin/tag.c:520 +#: builtin/notes.c:236 builtin/tag.c:503 #, c-format msgid "could not open or read '%s'" msgstr "не удалось открыть или прочитать «%s»" #: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308 -#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516 -#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661 +#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517 +#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662 #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "не удалось разрешить «%s» как ссылку." @@ -10160,185 +10313,185 @@ msgstr "не удалось скопировать заметку из «%s» в #. TRANSLATORS: the first %s will be replaced by a git #. notes command: 'add', 'merge', 'remove', etc. -#: builtin/notes.c:348 +#: builtin/notes.c:349 #, c-format msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "отказ в перезаписи %s заметок в %s (за пределами refs/notes/)" -#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499 -#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654 -#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972 +#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500 +#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655 +#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973 msgid "too many parameters" msgstr "передано слишком много параметров" -#: builtin/notes.c:381 builtin/notes.c:667 +#: builtin/notes.c:382 builtin/notes.c:668 #, c-format msgid "no note found for object %s." msgstr "не найдена заметка для объекта %s." -#: builtin/notes.c:402 builtin/notes.c:565 +#: builtin/notes.c:403 builtin/notes.c:566 msgid "note contents as a string" msgstr "текстовое содержимое заметки" -#: builtin/notes.c:405 builtin/notes.c:568 +#: builtin/notes.c:406 builtin/notes.c:569 msgid "note contents in a file" msgstr "содержимое заметки в файле" -#: builtin/notes.c:408 builtin/notes.c:571 +#: builtin/notes.c:409 builtin/notes.c:572 msgid "reuse and edit specified note object" msgstr "использовать и отредактировать указанный объект заметки" -#: builtin/notes.c:411 builtin/notes.c:574 +#: builtin/notes.c:412 builtin/notes.c:575 msgid "reuse specified note object" msgstr "использовать указанный объект заметки" -#: builtin/notes.c:414 builtin/notes.c:577 +#: builtin/notes.c:415 builtin/notes.c:578 msgid "allow storing empty note" msgstr "разрешить сохранение пустой заметки" -#: builtin/notes.c:415 builtin/notes.c:486 +#: builtin/notes.c:416 builtin/notes.c:487 msgid "replace existing notes" msgstr "заменить существующие заметки" -#: builtin/notes.c:440 +#: builtin/notes.c:441 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "Не удалось добавить заметку. Найдена существующая заметка у объекта %s. Используйте параметр «-f» для перезаписи существующих заметок." -#: builtin/notes.c:455 builtin/notes.c:534 +#: builtin/notes.c:456 builtin/notes.c:535 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Перезапись существующих заметок у объекта %s\n" -#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891 +#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892 #, c-format msgid "Removing note for object %s\n" msgstr "Удаление заметки у объекта %s\n" -#: builtin/notes.c:487 +#: builtin/notes.c:488 msgid "read objects from stdin" msgstr "прочитать объекты из стандартного ввода" -#: builtin/notes.c:489 +#: builtin/notes.c:490 msgid "load rewriting config for <command> (implies --stdin)" msgstr "загрузить настройки перезаписи для команды <команда> (включает в себя --stdin)" -#: builtin/notes.c:507 +#: builtin/notes.c:508 msgid "too few parameters" msgstr "передано слишком мало параметров" -#: builtin/notes.c:528 +#: builtin/notes.c:529 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite" " existing notes" msgstr "Не удалось скопировать заметку. Найдена существующая заметка у объекта %s. Используйте параметр «-f» для перезаписи существующих заметок." -#: builtin/notes.c:540 +#: builtin/notes.c:541 #, c-format msgid "missing notes on source object %s. Cannot copy." msgstr "нет заметок у исходного объекта %s. Нельзя скопировать." -#: builtin/notes.c:592 +#: builtin/notes.c:593 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" msgstr "Опции -m/-F/-c/-C для подкоманды «edit» устарели.\nИспользуйте вместо них «git notes add -f -m/-F/-c/-C».\n" -#: builtin/notes.c:687 +#: builtin/notes.c:688 msgid "failed to delete ref NOTES_MERGE_PARTIAL" msgstr "не удалось удалить ссылку NOTES_MERGE_PARTIAL" -#: builtin/notes.c:689 +#: builtin/notes.c:690 msgid "failed to delete ref NOTES_MERGE_REF" msgstr "не удалось удалить ссылку NOTES_MERGE_REF" -#: builtin/notes.c:691 +#: builtin/notes.c:692 msgid "failed to remove 'git notes merge' worktree" msgstr "не удалось удалить рабочий каталог «git notes merge»" -#: builtin/notes.c:711 +#: builtin/notes.c:712 msgid "failed to read ref NOTES_MERGE_PARTIAL" msgstr "не удалось прочитать ссылку NOTES_MERGE_PARTIAL" -#: builtin/notes.c:713 +#: builtin/notes.c:714 msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "не удалось найти коммит из NOTES_MERGE_PARTIAL." -#: builtin/notes.c:715 +#: builtin/notes.c:716 msgid "could not parse commit from NOTES_MERGE_PARTIAL." msgstr "не удалось разобрать коммит из NOTES_MERGE_PARTIAL." -#: builtin/notes.c:728 +#: builtin/notes.c:729 msgid "failed to resolve NOTES_MERGE_REF" msgstr "не удалось разрешить NOTES_MERGE_REF" -#: builtin/notes.c:731 +#: builtin/notes.c:732 msgid "failed to finalize notes merge" msgstr "не удалось завершить слиние заметок" -#: builtin/notes.c:757 +#: builtin/notes.c:758 #, c-format msgid "unknown notes merge strategy %s" msgstr "неизвестная стратегия слияния заметок %s" -#: builtin/notes.c:773 +#: builtin/notes.c:774 msgid "General options" msgstr "Общие опции" -#: builtin/notes.c:775 +#: builtin/notes.c:776 msgid "Merge options" msgstr "Опции слияния" -#: builtin/notes.c:777 +#: builtin/notes.c:778 msgid "" "resolve notes conflicts using the given strategy " "(manual/ours/theirs/union/cat_sort_uniq)" msgstr "разрешить конфликты заметок с помощью указанной стратегии (manual/ours/theirs/union/cat_sort_uniq)" -#: builtin/notes.c:779 +#: builtin/notes.c:780 msgid "Committing unmerged notes" msgstr "Коммит не слитых заметок" -#: builtin/notes.c:781 +#: builtin/notes.c:782 msgid "finalize notes merge by committing unmerged notes" msgstr "завершить слияние заметок коммитом не слитых заметок" -#: builtin/notes.c:783 +#: builtin/notes.c:784 msgid "Aborting notes merge resolution" msgstr "Отмена разрешения слияния заметок" -#: builtin/notes.c:785 +#: builtin/notes.c:786 msgid "abort notes merge" msgstr "отменить слияние заметок" -#: builtin/notes.c:796 +#: builtin/notes.c:797 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "нельзя использовать одновременно --commit, --abort и -s/--strategy" -#: builtin/notes.c:801 +#: builtin/notes.c:802 msgid "must specify a notes ref to merge" msgstr "вы должны указать ссылку заметки для слияния" -#: builtin/notes.c:825 +#: builtin/notes.c:826 #, c-format msgid "unknown -s/--strategy: %s" msgstr "неизвестный параметр для -s/--strategy: %s" -#: builtin/notes.c:862 +#: builtin/notes.c:863 #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "слияние заметок в %s уже выполняется на %s" -#: builtin/notes.c:865 +#: builtin/notes.c:866 #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "не удалось сохранить адрес текущей ссылки на заметку (%s)" -#: builtin/notes.c:867 +#: builtin/notes.c:868 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with" @@ -10346,218 +10499,218 @@ msgid "" "--abort'.\n" msgstr "Не удалось автоматически слить заметки. Исправьте конфликты в %s и закоммитьте результат с помощью «git notes merge --commit», или прервите процесс слияния с помощью «git notes merge --abort».\n" -#: builtin/notes.c:889 +#: builtin/notes.c:890 #, c-format msgid "Object %s has no note\n" msgstr "У объекта %s нет заметки\n" -#: builtin/notes.c:901 +#: builtin/notes.c:902 msgid "attempt to remove non-existent note is not an error" msgstr "попытка удаления несуществующей заметки не является ошибкой" -#: builtin/notes.c:904 +#: builtin/notes.c:905 msgid "read object names from the standard input" msgstr "прочитать имена объектов из стандартного ввода" -#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128 +#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:146 msgid "do not remove, show only" msgstr "не удалять, только показать список" -#: builtin/notes.c:943 +#: builtin/notes.c:944 msgid "report pruned notes" msgstr "вывести список удаленных заметок" -#: builtin/notes.c:985 +#: builtin/notes.c:986 msgid "notes-ref" msgstr "ссылка-на-заметку" -#: builtin/notes.c:986 +#: builtin/notes.c:987 msgid "use notes from <notes-ref>" msgstr "использовать заметку из <ссылка-на-заметку>" -#: builtin/notes.c:1021 +#: builtin/notes.c:1022 #, c-format msgid "unknown subcommand: %s" msgstr "неизвестная подкоманда: %s" -#: builtin/pack-objects.c:30 +#: builtin/pack-objects.c:31 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "git pack-objects --stdout [<опции>…] [< <список-ссылок> | < <список-объектов>]" -#: builtin/pack-objects.c:31 +#: builtin/pack-objects.c:32 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "git pack-objects [<опции>…] <имя-базы> [< <список-ссылок> | < <список-объектов>]" -#: builtin/pack-objects.c:180 builtin/pack-objects.c:183 +#: builtin/pack-objects.c:181 builtin/pack-objects.c:184 #, c-format msgid "deflate error (%d)" msgstr "ошибка сжатия (%d)" -#: builtin/pack-objects.c:776 +#: builtin/pack-objects.c:777 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "отключение записи битовых карт, так как карты были разбиты на части из-за pack.packSizeLimit" -#: builtin/pack-objects.c:789 +#: builtin/pack-objects.c:790 msgid "Writing objects" msgstr "Запись объектов" -#: builtin/pack-objects.c:1069 +#: builtin/pack-objects.c:1070 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "отключение записи битовых карт, так как некоторые объекты не были упакованы" -#: builtin/pack-objects.c:2434 +#: builtin/pack-objects.c:2440 msgid "Compressing objects" msgstr "Сжатие объектов" -#: builtin/pack-objects.c:2843 +#: builtin/pack-objects.c:2849 #, c-format msgid "unsupported index version %s" msgstr "неподдерживаемая версия индекса %s" -#: builtin/pack-objects.c:2847 +#: builtin/pack-objects.c:2853 #, c-format msgid "bad index version '%s'" msgstr "плохая версия индекса «%s»" -#: builtin/pack-objects.c:2877 +#: builtin/pack-objects.c:2883 msgid "do not show progress meter" msgstr "не выводить прогресс выполнения" -#: builtin/pack-objects.c:2879 +#: builtin/pack-objects.c:2885 msgid "show progress meter" msgstr "показать прогресс выполнения" -#: builtin/pack-objects.c:2881 +#: builtin/pack-objects.c:2887 msgid "show progress meter during object writing phase" msgstr "показать прогресс выполнения во время записи объектов" -#: builtin/pack-objects.c:2884 +#: builtin/pack-objects.c:2890 msgid "similar to --all-progress when progress meter is shown" msgstr "похоже на --all-progress при включенном прогрессе выполнения" -#: builtin/pack-objects.c:2885 +#: builtin/pack-objects.c:2891 msgid "version[,offset]" msgstr "версия[,смещение]" -#: builtin/pack-objects.c:2886 +#: builtin/pack-objects.c:2892 msgid "write the pack index file in the specified idx format version" msgstr "записать файл индекса пакета в указанной версии формата" -#: builtin/pack-objects.c:2889 +#: builtin/pack-objects.c:2895 msgid "maximum size of each output pack file" msgstr "максимальный размер каждого выходного файла пакета" -#: builtin/pack-objects.c:2891 +#: builtin/pack-objects.c:2897 msgid "ignore borrowed objects from alternate object store" msgstr "игнорировать чужие объекты, взятые из альтернативного хранилища объектов" -#: builtin/pack-objects.c:2893 +#: builtin/pack-objects.c:2899 msgid "ignore packed objects" msgstr "игнорировать упакованные объекты" -#: builtin/pack-objects.c:2895 +#: builtin/pack-objects.c:2901 msgid "limit pack window by objects" msgstr "ограничить окно пакета по количеству объектов" -#: builtin/pack-objects.c:2897 +#: builtin/pack-objects.c:2903 msgid "limit pack window by memory in addition to object limit" msgstr "дополнительно к количеству объектов ограничить окно пакета по памяти" -#: builtin/pack-objects.c:2899 +#: builtin/pack-objects.c:2905 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "максимальная разрешенная длина цепочки дельт в результирующем пакете" -#: builtin/pack-objects.c:2901 +#: builtin/pack-objects.c:2907 msgid "reuse existing deltas" msgstr "использовать повторно существующие дельты" -#: builtin/pack-objects.c:2903 +#: builtin/pack-objects.c:2909 msgid "reuse existing objects" msgstr "использовать повторно существующие объекты" -#: builtin/pack-objects.c:2905 +#: builtin/pack-objects.c:2911 msgid "use OFS_DELTA objects" msgstr "использовать объекты OFS_DELTA" -#: builtin/pack-objects.c:2907 +#: builtin/pack-objects.c:2913 msgid "use threads when searching for best delta matches" msgstr "использовать многопоточность при поиске лучших совпадений дельт" -#: builtin/pack-objects.c:2909 +#: builtin/pack-objects.c:2915 msgid "do not create an empty pack output" msgstr "не создавать пустые выходные пакеты" -#: builtin/pack-objects.c:2911 +#: builtin/pack-objects.c:2917 msgid "read revision arguments from standard input" msgstr "прочитать аргументы редакций из стандартного ввода" -#: builtin/pack-objects.c:2913 +#: builtin/pack-objects.c:2919 msgid "limit the objects to those that are not yet packed" msgstr "ограничиться объектами, которые еще не упакованы" -#: builtin/pack-objects.c:2916 +#: builtin/pack-objects.c:2922 msgid "include objects reachable from any reference" msgstr "включить объекты, которые достижимы по любой из ссылок" -#: builtin/pack-objects.c:2919 +#: builtin/pack-objects.c:2925 msgid "include objects referred by reflog entries" msgstr "включить объекты, на которые ссылаются записи журнала ссылок" -#: builtin/pack-objects.c:2922 +#: builtin/pack-objects.c:2928 msgid "include objects referred to by the index" msgstr "включить объекты, на которые ссылается индекс" -#: builtin/pack-objects.c:2925 +#: builtin/pack-objects.c:2931 msgid "output pack to stdout" msgstr "вывести пакет на стандартный вывод" -#: builtin/pack-objects.c:2927 +#: builtin/pack-objects.c:2933 msgid "include tag objects that refer to objects to be packed" msgstr "включить объекты меток, которые ссылаются на упаковываемые объекты" -#: builtin/pack-objects.c:2929 +#: builtin/pack-objects.c:2935 msgid "keep unreachable objects" msgstr "сохранять ссылки на недоступные объекты" -#: builtin/pack-objects.c:2931 +#: builtin/pack-objects.c:2937 msgid "pack loose unreachable objects" msgstr "паковать недостижимые объекты" -#: builtin/pack-objects.c:2933 +#: builtin/pack-objects.c:2939 msgid "unpack unreachable objects newer than <time>" msgstr "распаковать недоступные объекты, которые новее, чем <время>" -#: builtin/pack-objects.c:2936 +#: builtin/pack-objects.c:2942 msgid "create thin packs" msgstr "создавать тонкие пакеты" -#: builtin/pack-objects.c:2938 +#: builtin/pack-objects.c:2944 msgid "create packs suitable for shallow fetches" msgstr "создавать пакеты, подходящие для частичных извлечений" -#: builtin/pack-objects.c:2940 +#: builtin/pack-objects.c:2946 msgid "ignore packs that have companion .keep file" msgstr "игнорировать пакеты, рядом с которыми лежит .keep файл" -#: builtin/pack-objects.c:2942 +#: builtin/pack-objects.c:2948 msgid "pack compression level" msgstr "уровень сжатия пакета" -#: builtin/pack-objects.c:2944 +#: builtin/pack-objects.c:2950 msgid "do not hide commits by grafts" msgstr "не скрывать коммиты сращениями" -#: builtin/pack-objects.c:2946 +#: builtin/pack-objects.c:2952 msgid "use a bitmap index if available to speed up counting objects" msgstr "по возможности использовать индекс в битовых картах, для ускорения подсчета объектов" -#: builtin/pack-objects.c:2948 +#: builtin/pack-objects.c:2954 msgid "write a bitmap index together with the pack index" msgstr "запись индекса в битовых картах вместе с индексом пакета" -#: builtin/pack-objects.c:3075 +#: builtin/pack-objects.c:3081 msgid "Counting objects" msgstr "Подсчет объектов" @@ -10573,11 +10726,11 @@ msgstr "паковать всё" msgid "prune loose refs (default)" msgstr "почистить слабые ссылки (по умолчанию)" -#: builtin/prune-packed.c:7 +#: builtin/prune-packed.c:8 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" -#: builtin/prune-packed.c:40 +#: builtin/prune-packed.c:41 msgid "Removing duplicate objects" msgstr "Удаление дублирующихся объектов" @@ -10616,9 +10769,9 @@ msgstr "Опции, связанные со слиянием" #: builtin/pull.c:131 msgid "incorporate changes by rebasing rather than merging" -msgstr "забрать изменения с помощью перебазирования, а не слияния" +msgstr "забрать изменения с помощью перемещения, а не слияния" -#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121 +#: builtin/pull.c:155 builtin/rebase--helper.c:21 builtin/revert.c:121 msgid "allow fast-forward" msgstr "разрешить перемотку вперед" @@ -10639,24 +10792,24 @@ msgstr "количество подмодулей, которые будут п msgid "Invalid value for pull.ff: %s" msgstr "Неправильное значение для pull.ff: %s" -#: builtin/pull.c:399 +#: builtin/pull.c:403 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "Нет претендентов для перемещения среди ссылок, которые вы только что получили." -#: builtin/pull.c:401 +#: builtin/pull.c:405 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "Нет претендентов для слияния среди ссылок, которые вы только что получили." -#: builtin/pull.c:402 +#: builtin/pull.c:406 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "Обычно это означает, что вы передали спецификацию ссылки с помощью шаблона и этот шаблон ни с чем не совпал на внешнем репозитории." -#: builtin/pull.c:405 +#: builtin/pull.c:409 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -10664,69 +10817,69 @@ msgid "" "for your current branch, you must specify a branch on the command line." msgstr "Вы попросили получить изменения со внешнего репозитория «%s», но не указали ветку. Так как это не репозиторий по умолчанию для вашей текущей ветки, вы должны указать ветку в командной строке." -#: builtin/pull.c:410 git-parse-remote.sh:73 +#: builtin/pull.c:414 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Вы сейчас ни на одной из веток." -#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79 +#: builtin/pull.c:416 builtin/pull.c:431 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Пожалуйста, укажите на какую ветку вы хотите переместить изменения." -#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82 +#: builtin/pull.c:418 builtin/pull.c:433 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Пожалуйста, укажите с какой веткой вы хотите слить изменения." -#: builtin/pull.c:415 builtin/pull.c:430 +#: builtin/pull.c:419 builtin/pull.c:434 msgid "See git-pull(1) for details." msgstr "Для дополнительной информации, смотрите git-pull(1)." -#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432 +#: builtin/pull.c:421 builtin/pull.c:427 builtin/pull.c:436 #: git-parse-remote.sh:64 msgid "<remote>" msgstr "<внешний-репозиторий>" -#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456 +#: builtin/pull.c:421 builtin/pull.c:436 builtin/pull.c:441 git-rebase.sh:466 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<ветка>" -#: builtin/pull.c:425 git-parse-remote.sh:75 +#: builtin/pull.c:429 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "У текущей ветки нет информации об отслеживании." -#: builtin/pull.c:434 git-parse-remote.sh:95 +#: builtin/pull.c:438 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "Если вы хотите указать информацию о отслеживаемой ветке, выполните:" -#: builtin/pull.c:439 +#: builtin/pull.c:443 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" "from the remote, but no such ref was fetched." msgstr "Ваша конфигурация указывает, что нужно слить изменения со ссылкой\n«%s» из внешнего репозитория, но такая ссылка не была получена." -#: builtin/pull.c:792 +#: builtin/pull.c:796 msgid "ignoring --verify-signatures for rebase" msgstr "игнорирование --verify-signatures при перемещении" -#: builtin/pull.c:840 +#: builtin/pull.c:844 msgid "--[no-]autostash option is only valid with --rebase." msgstr "--[no-]autostash можно использовать только вместе с --rebase." -#: builtin/pull.c:848 +#: builtin/pull.c:852 msgid "Updating an unborn branch with changes added to the index." msgstr "Обновление еще не начавшейся ветки с изменениями, добавленными в индекс." -#: builtin/pull.c:851 +#: builtin/pull.c:855 msgid "pull with rebase" msgstr "получение с перемещением" -#: builtin/pull.c:852 +#: builtin/pull.c:856 msgid "please commit or stash them." msgstr "сделайте коммит или спрячьте их." -#: builtin/pull.c:877 +#: builtin/pull.c:881 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -10734,7 +10887,7 @@ msgid "" "commit %s." msgstr "извлечение обновило указатель на вашу текущую ветку.\nперемотка вашего рабочего каталога\nс коммита %s." -#: builtin/pull.c:882 +#: builtin/pull.c:886 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -10745,15 +10898,15 @@ msgid "" "to recover." msgstr "Не удалось перемотать вперёд изменения в вашем рабочем каталоге.\nПосле того, как вы убедитесь, что вы сохранили всё необходимое из вывода\n$ git diff %s\n, запустите\n$ git reset --hard\nдля восстановления исходного состояния." -#: builtin/pull.c:897 +#: builtin/pull.c:901 msgid "Cannot merge multiple branches into empty head." msgstr "Нельзя слить несколько веток в пустой указатель на ветку." -#: builtin/pull.c:901 +#: builtin/pull.c:905 msgid "Cannot rebase onto multiple branches." msgstr "Невозможно переместить над несколькими ветками." -#: builtin/pull.c:908 +#: builtin/pull.c:912 msgid "cannot rebase with locally recorded submodule modifications" msgstr "невозможно выполнить перемещение с записанными локальными изменениями в подмодулях" @@ -11074,19 +11227,47 @@ msgstr "отладка unpack-trees" msgid "git rebase--helper [<options>]" msgstr "git rebase--helper [<опции>]" -#: builtin/rebase--helper.c:20 +#: builtin/rebase--helper.c:22 +msgid "keep empty commits" +msgstr "оставить пустые коммиты" + +#: builtin/rebase--helper.c:23 msgid "continue rebase" msgstr "продолжить перемещение" -#: builtin/rebase--helper.c:22 +#: builtin/rebase--helper.c:25 msgid "abort rebase" msgstr "остановить перемещение" -#: builtin/receive-pack.c:28 +#: builtin/rebase--helper.c:28 +msgid "make rebase script" +msgstr "создать сценарий перемещения" + +#: builtin/rebase--helper.c:30 +msgid "shorten SHA-1s in the todo list" +msgstr "сократить контрольные суммы SHA-1 в списке дел" + +#: builtin/rebase--helper.c:32 +msgid "expand SHA-1s in the todo list" +msgstr "расширить контрольные суммы SHA-1 в списке дел" + +#: builtin/rebase--helper.c:34 +msgid "check the todo list" +msgstr "проверить список дел" + +#: builtin/rebase--helper.c:36 +msgid "skip unnecessary picks" +msgstr "пропустить ненужные команды pick" + +#: builtin/rebase--helper.c:38 +msgid "rearrange fixup/squash lines" +msgstr "переставить строки fixup/squash" + +#: builtin/receive-pack.c:29 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <каталог-git>" -#: builtin/receive-pack.c:838 +#: builtin/receive-pack.c:839 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" @@ -11103,7 +11284,7 @@ msgid "" "'receive.denyCurrentBranch' configuration variable to 'refuse'." msgstr "По умолчанию, обновлять текущую ветку в репозитории с рабочей\nкопией (не голом) запрещено, так как это сделает состояние индекса\nи рабочего каталога противоречивым, и вам прийдется выполнить\n«git reset --hard», чтобы состояние рабочего каталога снова\nсоответствовало HEAD.\n\nВы можете установить значение опции «receive.denyCurrentBranch»\nв «ignore» или «warn» во внешнем репозитории, чтобы разрешить\nотправку в его текущую ветку; но это не рекомендуется, если только\nвы не намерены обновить его рабочий каталог способом подобным\nвышеописанному.\n\nЧтобы пропустить это сообщение и все равно оставить поведение\nпо умолчанию, установите значение опции «receive.denyCurrentBranch»\nв «refuse»." -#: builtin/receive-pack.c:858 +#: builtin/receive-pack.c:859 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" @@ -11115,11 +11296,11 @@ msgid "" "To squelch this message, you can set it to 'refuse'." msgstr "По умолчанию, удаление текущей ветки запрещено, так как последующий\n«git clone» не сможет получить никаких файлов, что приведет к путанице.\n\nВы можете установить значение опции «receive.denyDeleteCurrent»\nв «warn» или «ignore», во внешнем репозитории, чтобы разрешить\nудаление текущей ветки с или без предупреждающего сообщения.\n\nЧтобы пропустить это сообщение, вы можете установить значение опции\nв «refuse»." -#: builtin/receive-pack.c:1933 +#: builtin/receive-pack.c:1932 msgid "quiet" msgstr "тихий режим" -#: builtin/receive-pack.c:1947 +#: builtin/receive-pack.c:1946 msgid "You must specify a directory." msgstr "Вы должны указать каталог." @@ -11264,12 +11445,12 @@ msgstr "указание мастер ветки не имеет смысла с msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "указание отслеживаемых веток имеет смысл только при зеркальном извлечении" -#: builtin/remote.c:191 builtin/remote.c:630 +#: builtin/remote.c:191 builtin/remote.c:631 #, c-format msgid "remote %s already exists." msgstr "внешний репозиторий %s уже существует" -#: builtin/remote.c:195 builtin/remote.c:634 +#: builtin/remote.c:195 builtin/remote.c:635 #, c-format msgid "'%s' is not a valid remote name" msgstr "«%s» не является допустимым именем внешнего репозитория." @@ -11292,17 +11473,17 @@ msgstr "(соответствующая)" msgid "(delete)" msgstr "(удаленная)" -#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857 +#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858 #, c-format msgid "No such remote: %s" msgstr "Нет такого внешнего репозитория: %s" -#: builtin/remote.c:640 +#: builtin/remote.c:641 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Не удалось переименовать секцию конфигурации с «%s» на «%s»" -#: builtin/remote.c:660 +#: builtin/remote.c:661 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -11310,17 +11491,17 @@ msgid "" "\tPlease update the configuration manually if necessary." msgstr "Не обновляю нестандартную спецификатор ссылки для извлечения\n\t%s\n\tПожалуйста, если требуется, обновите конфигурацию вручную." -#: builtin/remote.c:696 +#: builtin/remote.c:697 #, c-format msgid "deleting '%s' failed" msgstr "не удалось удалить «%s»" -#: builtin/remote.c:730 +#: builtin/remote.c:731 #, c-format msgid "creating '%s' failed" msgstr "не удалось создать «%s»" -#: builtin/remote.c:795 +#: builtin/remote.c:796 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -11332,143 +11513,143 @@ msgstr[1] "Примечание: Некоторые ветки вне иерар msgstr[2] "Примечание: Некоторые ветки вне иерархии refs/remotes/ не будут удалены;\nчтобы удалить их, используйте:" msgstr[3] "Примечание: Некоторые ветки вне иерархии refs/remotes/ не будут удалены;\nчтобы удалить их, используйте:" -#: builtin/remote.c:809 +#: builtin/remote.c:810 #, c-format msgid "Could not remove config section '%s'" msgstr "Не удалось удалить секцию файла конфигурации «%s»" -#: builtin/remote.c:910 +#: builtin/remote.c:911 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " новая (следующее извлечение сохранит ее в remotes/%s)" -#: builtin/remote.c:913 +#: builtin/remote.c:914 msgid " tracked" msgstr " отслеживается" -#: builtin/remote.c:915 +#: builtin/remote.c:916 msgid " stale (use 'git remote prune' to remove)" msgstr " недействительна (используйте «git remote prune», чтобы удалить)" -#: builtin/remote.c:917 +#: builtin/remote.c:918 msgid " ???" msgstr " ???" -#: builtin/remote.c:958 +#: builtin/remote.c:959 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "неправильный параметр конфигурации branch.%s.merge; невозможно переместить более чем над 1 веткой" -#: builtin/remote.c:966 +#: builtin/remote.c:967 #, c-format msgid "rebases interactively onto remote %s" msgstr "перемещается интерактивно над внешней веткой %s" -#: builtin/remote.c:967 +#: builtin/remote.c:968 #, c-format msgid "rebases onto remote %s" msgstr "перемещается над внешней веткой %s" -#: builtin/remote.c:970 +#: builtin/remote.c:971 #, c-format msgid " merges with remote %s" msgstr " будет слита с внешней веткой %s" -#: builtin/remote.c:973 +#: builtin/remote.c:974 #, c-format msgid "merges with remote %s" msgstr "будет слита с внешней веткой %s" -#: builtin/remote.c:976 +#: builtin/remote.c:977 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s и с внешней веткой %s\n" -#: builtin/remote.c:1019 +#: builtin/remote.c:1020 msgid "create" msgstr "создана" -#: builtin/remote.c:1022 +#: builtin/remote.c:1023 msgid "delete" msgstr "удалена" -#: builtin/remote.c:1026 +#: builtin/remote.c:1027 msgid "up to date" msgstr "уже актуальна" -#: builtin/remote.c:1029 +#: builtin/remote.c:1030 msgid "fast-forwardable" msgstr "возможна перемотка вперед" -#: builtin/remote.c:1032 +#: builtin/remote.c:1033 msgid "local out of date" msgstr "локальная ветка устарела" -#: builtin/remote.c:1039 +#: builtin/remote.c:1040 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s будет принудительно отправлена в %-*s (%s)" -#: builtin/remote.c:1042 +#: builtin/remote.c:1043 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s будет отправлена в %-*s (%s)" -#: builtin/remote.c:1046 +#: builtin/remote.c:1047 #, c-format msgid " %-*s forces to %s" msgstr " %-*s будет принудительно отправлена в %s" -#: builtin/remote.c:1049 +#: builtin/remote.c:1050 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s будет отправлена в %s" -#: builtin/remote.c:1117 +#: builtin/remote.c:1118 msgid "do not query remotes" msgstr "не опрашивать внешние репозитории" -#: builtin/remote.c:1144 +#: builtin/remote.c:1145 #, c-format msgid "* remote %s" msgstr "* внешний репозиторий %s" -#: builtin/remote.c:1145 +#: builtin/remote.c:1146 #, c-format msgid " Fetch URL: %s" msgstr " URL для извлечения: %s" -#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301 +#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302 msgid "(no URL)" msgstr "(нет URL)" #. TRANSLATORS: the colon ':' should align #. with the one in " Fetch URL: %s" #. translation. -#: builtin/remote.c:1160 builtin/remote.c:1162 +#: builtin/remote.c:1161 builtin/remote.c:1163 #, c-format msgid " Push URL: %s" msgstr " URL для отправки: %s" -#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168 +#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169 #, c-format msgid " HEAD branch: %s" msgstr " HEAD ветка: %s" -#: builtin/remote.c:1164 +#: builtin/remote.c:1165 msgid "(not queried)" msgstr "(не запрашивался)" -#: builtin/remote.c:1166 +#: builtin/remote.c:1167 msgid "(unknown)" msgstr "(неизвестно)" -#: builtin/remote.c:1170 +#: builtin/remote.c:1171 #, c-format msgid " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " HEAD ветка (HEAD внешнего репозитория неоднозначный, может быть одним из):\n" -#: builtin/remote.c:1182 +#: builtin/remote.c:1183 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" @@ -11477,11 +11658,11 @@ msgstr[1] " Внешние ветки:%s" msgstr[2] " Внешние ветки:%s" msgstr[3] " Внешние ветки:%s" -#: builtin/remote.c:1185 builtin/remote.c:1211 +#: builtin/remote.c:1186 builtin/remote.c:1212 msgid " (status not queried)" msgstr " (статус не запрашивался)" -#: builtin/remote.c:1194 +#: builtin/remote.c:1195 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Локальная ветка, настроенная для «git pull»:" @@ -11489,11 +11670,11 @@ msgstr[1] " Локальные ветки, настроенные для «git msgstr[2] " Локальные ветки, настроенные для «git pull»:" msgstr[3] " Локальные ветки, настроенные для «git pull»:" -#: builtin/remote.c:1202 +#: builtin/remote.c:1203 msgid " Local refs will be mirrored by 'git push'" msgstr " Локальные ссылки, зеркалируемые с помощью «git push»" -#: builtin/remote.c:1208 +#: builtin/remote.c:1209 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" @@ -11502,132 +11683,132 @@ msgstr[1] " Локальные ссылки, настроенные для «gi msgstr[2] " Локальные ссылки, настроенные для «git push»%s:" msgstr[3] " Локальные ссылки, настроенные для «git push»%s:" -#: builtin/remote.c:1229 +#: builtin/remote.c:1230 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "установить refs/remotes/<имя>/HEAD в зависимости от внешнего репозитория" -#: builtin/remote.c:1231 +#: builtin/remote.c:1232 msgid "delete refs/remotes/<name>/HEAD" msgstr "удалить refs/remotes/<имя>/HEAD" -#: builtin/remote.c:1246 +#: builtin/remote.c:1247 msgid "Cannot determine remote HEAD" msgstr "Не удалось определить внешний HEAD" -#: builtin/remote.c:1248 +#: builtin/remote.c:1249 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "Несколько внешних HEAD веток. Укажите явно одну из них:" -#: builtin/remote.c:1258 +#: builtin/remote.c:1259 #, c-format msgid "Could not delete %s" msgstr "Не удалось удалить %s" -#: builtin/remote.c:1266 +#: builtin/remote.c:1267 #, c-format msgid "Not a valid ref: %s" msgstr "Недопустимая ссылка: %s" -#: builtin/remote.c:1268 +#: builtin/remote.c:1269 #, c-format msgid "Could not setup %s" msgstr "Не удалось настроить %s" -#: builtin/remote.c:1286 +#: builtin/remote.c:1287 #, c-format msgid " %s will become dangling!" msgstr " %s будет висящей веткой!" -#: builtin/remote.c:1287 +#: builtin/remote.c:1288 #, c-format msgid " %s has become dangling!" msgstr " %s стала висящей веткой!" -#: builtin/remote.c:1297 +#: builtin/remote.c:1298 #, c-format msgid "Pruning %s" msgstr "Очистка %s" -#: builtin/remote.c:1298 +#: builtin/remote.c:1299 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1314 +#: builtin/remote.c:1315 #, c-format msgid " * [would prune] %s" msgstr " * [будет удалена] %s" -#: builtin/remote.c:1317 +#: builtin/remote.c:1318 #, c-format msgid " * [pruned] %s" msgstr " * [удалена] %s" -#: builtin/remote.c:1362 +#: builtin/remote.c:1363 msgid "prune remotes after fetching" msgstr "почистить внешние репозитории после извлечения" -#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547 +#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548 #, c-format msgid "No such remote '%s'" msgstr "Нет такого внешнего репозитория «%s»" -#: builtin/remote.c:1441 +#: builtin/remote.c:1442 msgid "add branch" msgstr "добавить ветку" -#: builtin/remote.c:1448 +#: builtin/remote.c:1449 msgid "no remote specified" msgstr "не указан внешний репозиторий" -#: builtin/remote.c:1465 +#: builtin/remote.c:1466 msgid "query push URLs rather than fetch URLs" msgstr "запросить URL отправки, вместо URL извлечения" -#: builtin/remote.c:1467 +#: builtin/remote.c:1468 msgid "return all URLs" msgstr "вернуть все URL" -#: builtin/remote.c:1495 +#: builtin/remote.c:1496 #, c-format msgid "no URLs configured for remote '%s'" msgstr "URL не настроены для внешнего репозитория «%s»" -#: builtin/remote.c:1521 +#: builtin/remote.c:1522 msgid "manipulate push URLs" msgstr "управление URL отправки" -#: builtin/remote.c:1523 +#: builtin/remote.c:1524 msgid "add URL" msgstr "добавить URL" -#: builtin/remote.c:1525 +#: builtin/remote.c:1526 msgid "delete URLs" msgstr "удалить URL" -#: builtin/remote.c:1532 +#: builtin/remote.c:1533 msgid "--add --delete doesn't make sense" msgstr "--add нельзя использовать одновременно с --delete" -#: builtin/remote.c:1573 +#: builtin/remote.c:1572 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Неправильный шаблон старого URL: %s" -#: builtin/remote.c:1581 +#: builtin/remote.c:1580 #, c-format msgid "No such URL found: %s" msgstr "Не найдены совпадения URL: %s" -#: builtin/remote.c:1583 +#: builtin/remote.c:1582 msgid "Will not delete all non-push URLs" msgstr "Нельзя удалить все URL не-отправки" -#: builtin/remote.c:1597 +#: builtin/remote.c:1598 msgid "be verbose; must be placed before a subcommand" msgstr "быть многословнее; должно стоять перед подкомандой" -#: builtin/remote.c:1628 +#: builtin/remote.c:1629 #, c-format msgid "Unknown subcommand: %s" msgstr "Неизвестная подкоманда: %s" @@ -11722,7 +11903,7 @@ msgstr "нельзя удалять пакеты в precious-objects репоз msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable и -A нельзя использовать одновременно" -#: builtin/repack.c:406 builtin/worktree.c:116 +#: builtin/repack.c:406 builtin/worktree.c:134 #, c-format msgid "failed to remove '%s'" msgstr "сбой удаления «%s»" @@ -11852,119 +12033,119 @@ msgstr "слиянием" msgid "keep" msgstr "оставлением" -#: builtin/reset.c:77 +#: builtin/reset.c:78 msgid "You do not have a valid HEAD." msgstr "У вас нет верного HEAD." -#: builtin/reset.c:79 +#: builtin/reset.c:80 msgid "Failed to find tree of HEAD." msgstr "Не удалось найти дерево у HEAD." -#: builtin/reset.c:85 +#: builtin/reset.c:86 #, c-format msgid "Failed to find tree of %s." msgstr "Не удалось найти дерево у %s." -#: builtin/reset.c:103 +#: builtin/reset.c:113 #, c-format msgid "HEAD is now at %s" msgstr "HEAD сейчас на %s" -#: builtin/reset.c:186 +#: builtin/reset.c:197 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "Нельзя выполнить сброс в режиме «%s» во время слияния." -#: builtin/reset.c:286 +#: builtin/reset.c:297 msgid "be quiet, only report errors" msgstr "тихий режим, выводить только ошибки" -#: builtin/reset.c:288 +#: builtin/reset.c:299 msgid "reset HEAD and index" msgstr "сбросить HEAD и индекс" -#: builtin/reset.c:289 +#: builtin/reset.c:300 msgid "reset only HEAD" msgstr "сбросить только HEAD" -#: builtin/reset.c:291 builtin/reset.c:293 +#: builtin/reset.c:302 builtin/reset.c:304 msgid "reset HEAD, index and working tree" msgstr "сбросить HEAD, индекс и рабочий каталог" -#: builtin/reset.c:295 +#: builtin/reset.c:306 msgid "reset HEAD but keep local changes" msgstr "сбросить HEAD, но оставить локальные изменения" -#: builtin/reset.c:301 +#: builtin/reset.c:312 msgid "record only the fact that removed paths will be added later" msgstr "записать только факт того, что удаленные пути будут добавлены позже" -#: builtin/reset.c:320 +#: builtin/reset.c:329 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Не удалось распознать «%s» как действительную редакцию." -#: builtin/reset.c:328 +#: builtin/reset.c:337 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "Не удалось распознать «%s» как действительное дерево." -#: builtin/reset.c:337 +#: builtin/reset.c:346 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch нельзя использовать одновременно с --{hard,mixed,soft}" -#: builtin/reset.c:346 +#: builtin/reset.c:355 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "использование опции --mixed с путями устарело; используйте «git reset -- <пути>» instead." -#: builtin/reset.c:348 +#: builtin/reset.c:357 #, c-format msgid "Cannot do %s reset with paths." msgstr "Нельзя выполнить сброс в режиме «%s» вместе с указанием пути." -#: builtin/reset.c:358 +#: builtin/reset.c:367 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "сброс «%s» разрешен только с голым репозиторием" -#: builtin/reset.c:362 +#: builtin/reset.c:371 msgid "-N can only be used with --mixed" msgstr "-N можно использовать вместе с --mixed" -#: builtin/reset.c:379 +#: builtin/reset.c:388 msgid "Unstaged changes after reset:" msgstr "Непроиндексированные изменения после сброса:" -#: builtin/reset.c:385 +#: builtin/reset.c:394 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Не удалось сбросить файл индекса на редакцию «%s»." -#: builtin/reset.c:389 +#: builtin/reset.c:398 msgid "Could not write new index file." msgstr "Не удалось записать новый файл индекса." -#: builtin/rev-list.c:358 +#: builtin/rev-list.c:361 msgid "rev-list does not support display of notes" msgstr "rev-list не поддерживает отображение заметок" -#: builtin/rev-parse.c:394 +#: builtin/rev-parse.c:402 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<опции>] -- [<аргументы>…]" -#: builtin/rev-parse.c:399 +#: builtin/rev-parse.c:407 msgid "keep the `--` passed as an arg" msgstr "передавать далее «--» как аргумент" -#: builtin/rev-parse.c:401 +#: builtin/rev-parse.c:409 msgid "stop parsing after the first non-option argument" msgstr "остановить разбор после первого аргумента не являющегося опцией" -#: builtin/rev-parse.c:404 +#: builtin/rev-parse.c:412 msgid "output in stuck long form" msgstr "выводить аргументы в длинном формате" -#: builtin/rev-parse.c:535 +#: builtin/rev-parse.c:545 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -12050,11 +12231,11 @@ msgstr "разрешить коммиты с пустыми сообщениям msgid "keep redundant, empty commits" msgstr "оставить избыточные, пустые коммиты" -#: builtin/revert.c:212 +#: builtin/revert.c:214 msgid "revert failed" msgstr "сбой обращения изменений коммита" -#: builtin/revert.c:225 +#: builtin/revert.c:227 msgid "cherry-pick failed" msgstr "сбой при копировании коммита" @@ -12122,17 +12303,17 @@ msgstr "разрешить рекурсивное удаление" msgid "exit with a zero status even if nothing matched" msgstr "выход с нулевым кодом возврата, даже если ничего не найдено" -#: builtin/rm.c:308 +#: builtin/rm.c:307 #, c-format msgid "not removing '%s' recursively without -r" msgstr "не удаляю рекурсивно «%s» без указания опции -r" -#: builtin/rm.c:347 +#: builtin/rm.c:346 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: не удалось удалить %s" -#: builtin/rm.c:370 +#: builtin/rm.c:369 #, c-format msgid "could not remove '%s'" msgstr "не удалось удалить «%s»" @@ -12163,27 +12344,27 @@ msgstr "вывести статус от скрипта внешнего сер msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" msgstr "git shortlog [<опции>] [<диапазон-редакций>] [[--] [<путь>…]]" -#: builtin/shortlog.c:249 +#: builtin/shortlog.c:263 msgid "Group by committer rather than author" msgstr "Группировать по коммитеру, а не по автору" -#: builtin/shortlog.c:251 +#: builtin/shortlog.c:265 msgid "sort output according to the number of commits per author" msgstr "отсортировать вывод по количеству коммитов у автора" -#: builtin/shortlog.c:253 +#: builtin/shortlog.c:267 msgid "Suppress commit descriptions, only provides commit count" msgstr "Не выводить описания коммитов, а только их количество" -#: builtin/shortlog.c:255 +#: builtin/shortlog.c:269 msgid "Show the email address of each author" msgstr "Показать почту каждого из авторов" -#: builtin/shortlog.c:256 +#: builtin/shortlog.c:270 msgid "w[,i1[,i2]]" msgstr "w[,i1[,i2]]" -#: builtin/shortlog.c:257 +#: builtin/shortlog.c:271 msgid "Linewrap output" msgstr "Перенос строк на выводе" @@ -12382,215 +12563,215 @@ msgstr "пропустить и удалить все строки, начина msgid "prepend comment character and space to each line" msgstr "добавить перед каждой строкой символ комметария и пробел" -#: builtin/submodule--helper.c:25 builtin/submodule--helper.c:1075 +#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1094 #, c-format msgid "No such ref: %s" msgstr "Нет такой ссылки: %s" -#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084 +#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1103 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Ожидалось полное имя ссылки, а получено %s" -#: builtin/submodule--helper.c:72 +#: builtin/submodule--helper.c:71 #, c-format msgid "cannot strip one component off url '%s'" msgstr "не удалось обрезать один компонент url «%s»" -#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630 +#: builtin/submodule--helper.c:302 builtin/submodule--helper.c:623 msgid "alternative anchor for relative paths" msgstr "альтернативный символ для относительных путей" -#: builtin/submodule--helper.c:310 +#: builtin/submodule--helper.c:307 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<путь>] [<путь>…]" -#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380 +#: builtin/submodule--helper.c:350 builtin/submodule--helper.c:374 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "URL для подмодуля по пути «%s» не найден в .gitmodules" -#: builtin/submodule--helper.c:395 +#: builtin/submodule--helper.c:389 #, c-format msgid "" "could not lookup configuration '%s'. Assuming this repository is its own " "authoritative upstream." msgstr "не удалось запросить конфигурацию «%s». Предполагаю, что этот репозиторий имеет свой собственный вышестоящий репозиторий." -#: builtin/submodule--helper.c:406 +#: builtin/submodule--helper.c:400 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Сбой регистрации адреса для пути подмодуля «%s»" -#: builtin/submodule--helper.c:410 +#: builtin/submodule--helper.c:404 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Подмодуль «%s» (%s) зарегистрирован по пути «%s»\n" -#: builtin/submodule--helper.c:420 +#: builtin/submodule--helper.c:414 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "внимание: предполагаемый режим обновления для подмодуля «%s»\n" -#: builtin/submodule--helper.c:427 +#: builtin/submodule--helper.c:421 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "Сбой регистрации режима обновления для пути подмодуля «%s»" -#: builtin/submodule--helper.c:443 +#: builtin/submodule--helper.c:437 msgid "Suppress output for initializing a submodule" msgstr "Не выводить информацию о инициализации подмодуля" -#: builtin/submodule--helper.c:448 +#: builtin/submodule--helper.c:442 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper init [<путь>]" -#: builtin/submodule--helper.c:476 +#: builtin/submodule--helper.c:470 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <путь>" -#: builtin/submodule--helper.c:482 +#: builtin/submodule--helper.c:475 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "не найдено соответствие подмодулей в .gitmodules для пути «%s»" -#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568 +#: builtin/submodule--helper.c:558 builtin/submodule--helper.c:561 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "подмодулю «%s» не удалось добавить альтернативу: %s" -#: builtin/submodule--helper.c:604 +#: builtin/submodule--helper.c:597 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Значение «%s» для параметра submodule.alternateErrorStrategy не рапознано" -#: builtin/submodule--helper.c:611 +#: builtin/submodule--helper.c:604 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Значение «%s» для параметра submodule.alternateLocation не рапознано" -#: builtin/submodule--helper.c:633 +#: builtin/submodule--helper.c:626 msgid "where the new submodule will be cloned to" msgstr "куда должен быть склонирован новый подмодуль" -#: builtin/submodule--helper.c:636 +#: builtin/submodule--helper.c:629 msgid "name of the new submodule" msgstr "имя нового подмодуля" -#: builtin/submodule--helper.c:639 +#: builtin/submodule--helper.c:632 msgid "url where to clone the submodule from" msgstr "url откуда должен был склонирован новый подмодуль" -#: builtin/submodule--helper.c:645 +#: builtin/submodule--helper.c:638 msgid "depth for shallow clones" msgstr "глубина для частичного клона" -#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993 +#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:1012 msgid "force cloning progress" msgstr "принудительно выводить прогресс клонирования" -#: builtin/submodule--helper.c:653 +#: builtin/submodule--helper.c:646 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" msgstr "git submodule--helper clone [--prefix=<путь>] [--quiet] [--reference <репозиторий>] [--name <имя>] [--depth <глубина>] --url <url> --path <путь>" -#: builtin/submodule--helper.c:684 +#: builtin/submodule--helper.c:677 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "не удалось клонировать «%s» в подмодуль по пути «%s»" -#: builtin/submodule--helper.c:699 +#: builtin/submodule--helper.c:692 #, c-format msgid "could not get submodule directory for '%s'" msgstr "не удалось получить каталог для подмодуля «%s»" -#: builtin/submodule--helper.c:764 +#: builtin/submodule--helper.c:757 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Подмодуль по пути «%s» не инициализирован" -#: builtin/submodule--helper.c:768 +#: builtin/submodule--helper.c:761 msgid "Maybe you want to use 'update --init'?" msgstr "Возможно, вы хотели использовать «update --init»?" -#: builtin/submodule--helper.c:793 +#: builtin/submodule--helper.c:790 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Пропуск не слитого подмодуля %s" -#: builtin/submodule--helper.c:814 +#: builtin/submodule--helper.c:819 #, c-format msgid "Skipping submodule '%s'" msgstr "Пропуск подмодуля «%s»" -#: builtin/submodule--helper.c:942 +#: builtin/submodule--helper.c:952 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Не удалось клонировать «%s». Запланирована повторная попытка" -#: builtin/submodule--helper.c:953 +#: builtin/submodule--helper.c:963 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Не удалось клонировать «%s» со второй попытки, отмена" -#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162 +#: builtin/submodule--helper.c:993 builtin/submodule--helper.c:1213 msgid "path into the working tree" msgstr "путь в рабочем каталоге" -#: builtin/submodule--helper.c:977 +#: builtin/submodule--helper.c:996 msgid "path into the working tree, across nested submodule boundaries" msgstr "путь в рабочем каталоге, в пределах границ подмодуля" -#: builtin/submodule--helper.c:981 +#: builtin/submodule--helper.c:1000 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout или none" -#: builtin/submodule--helper.c:985 +#: builtin/submodule--helper.c:1004 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "Создать частичный клон, ограниченный указанным количеством редакций" -#: builtin/submodule--helper.c:988 +#: builtin/submodule--helper.c:1007 msgid "parallel jobs" msgstr "параллельные задачи" -#: builtin/submodule--helper.c:990 +#: builtin/submodule--helper.c:1009 msgid "whether the initial clone should follow the shallow recommendation" msgstr "должен ли изначальный процесс клонирования следовать рекомендации о частичности" -#: builtin/submodule--helper.c:991 +#: builtin/submodule--helper.c:1010 msgid "don't print cloning progress" msgstr "вы выводить прогресс клонирования" -#: builtin/submodule--helper.c:998 +#: builtin/submodule--helper.c:1017 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update_clone [--prefix=<путь>] [<путь>…]" -#: builtin/submodule--helper.c:1008 +#: builtin/submodule--helper.c:1030 msgid "bad value for update parameter" msgstr "плохое значение для параметра update" -#: builtin/submodule--helper.c:1079 +#: builtin/submodule--helper.c:1098 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " "the superproject is not on any branch" msgstr "Ветка подмодуля (%s) настроена на наследование ветки из родительского проекта, но он не находится ни на одной ветке" -#: builtin/submodule--helper.c:1163 +#: builtin/submodule--helper.c:1214 msgid "recurse into submodules" msgstr "рекурсивно по подмодулям" -#: builtin/submodule--helper.c:1169 +#: builtin/submodule--helper.c:1220 msgid "git submodule--helper embed-git-dir [<path>...]" msgstr "git submodule--helper embed-git-dir [<путь>…]" -#: builtin/submodule--helper.c:1232 +#: builtin/submodule--helper.c:1278 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s не поддерживает параметр --super-prefix" -#: builtin/submodule--helper.c:1238 +#: builtin/submodule--helper.c:1284 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "«%s» не является подкомандой submodule--helper" @@ -12603,23 +12784,23 @@ msgstr "git symbolic-ref [<опции>] <имя> [<ссылка>]" msgid "git symbolic-ref -d [-q] <name>" msgstr "git symbolic-ref -d [-q] <имя>" -#: builtin/symbolic-ref.c:41 +#: builtin/symbolic-ref.c:40 msgid "suppress error message for non-symbolic (detached) refs" msgstr "не выводить сообщения об ошибках для несимвольных (отсоединенных) ссылок" -#: builtin/symbolic-ref.c:42 +#: builtin/symbolic-ref.c:41 msgid "delete symbolic ref" msgstr "удалить символьные ссылки" -#: builtin/symbolic-ref.c:43 +#: builtin/symbolic-ref.c:42 msgid "shorten ref output" msgstr "укороченный вывод ссылок" -#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason" msgstr "причина" -#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason of the update" msgstr "причина обновления" @@ -12643,17 +12824,17 @@ msgstr "git tag -l [-n[<количество>]] [--contains <коммит>] [--n msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<формат>] <имя-метки>…" -#: builtin/tag.c:84 +#: builtin/tag.c:86 #, c-format msgid "tag '%s' not found." msgstr "метка «%s» не найдена." -#: builtin/tag.c:100 +#: builtin/tag.c:102 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Метка «%s» удалена (была %s)\n" -#: builtin/tag.c:129 +#: builtin/tag.c:131 #, c-format msgid "" "\n" @@ -12662,7 +12843,7 @@ msgid "" "Lines starting with '%c' will be ignored.\n" msgstr "\nВведите сообщение для метки:\n %s\nСтроки, начинающиеся с «%c» будут проигнорированы.\n" -#: builtin/tag.c:133 +#: builtin/tag.c:135 #, c-format msgid "" "\n" @@ -12671,142 +12852,142 @@ msgid "" "Lines starting with '%c' will be kept; you may remove them yourself if you want to.\n" msgstr "\nВведите сообщение для метки:\n %s\nСтроки, начинающиеся с «%c» будут оставлены; вы можете удалить их вручную, если хотите.\n" -#: builtin/tag.c:211 +#: builtin/tag.c:189 msgid "unable to sign the tag" msgstr "не удалось подписать метку" -#: builtin/tag.c:213 +#: builtin/tag.c:191 msgid "unable to write tag file" msgstr "не удалось записать файл метки" -#: builtin/tag.c:237 +#: builtin/tag.c:215 msgid "bad object type." msgstr "неправильный тип объекта" -#: builtin/tag.c:283 +#: builtin/tag.c:261 msgid "no tag message?" msgstr "нет описания метки?" -#: builtin/tag.c:290 +#: builtin/tag.c:268 #, c-format msgid "The tag message has been left in %s\n" msgstr "Сообщение метки было оставлено в %s\n" -#: builtin/tag.c:398 +#: builtin/tag.c:376 msgid "list tag names" msgstr "список названий меток" -#: builtin/tag.c:400 +#: builtin/tag.c:378 msgid "print <n> lines of each tag message" msgstr "печатать <n> строк описания от каждой метки" -#: builtin/tag.c:402 +#: builtin/tag.c:380 msgid "delete tags" msgstr "удалить метки" -#: builtin/tag.c:403 +#: builtin/tag.c:381 msgid "verify tags" msgstr "проверить метки" -#: builtin/tag.c:405 +#: builtin/tag.c:383 msgid "Tag creation options" msgstr "Настройки создания метки" -#: builtin/tag.c:407 +#: builtin/tag.c:385 msgid "annotated tag, needs a message" msgstr "для аннотированной метки нужно сообщение" -#: builtin/tag.c:409 +#: builtin/tag.c:387 msgid "tag message" msgstr "описание метки" -#: builtin/tag.c:411 +#: builtin/tag.c:389 msgid "annotated and GPG-signed tag" msgstr "аннотированная и подписанная с помощью GPG метка" -#: builtin/tag.c:415 +#: builtin/tag.c:393 msgid "use another key to sign the tag" msgstr "использовать другой ключ для подписания метки" -#: builtin/tag.c:416 +#: builtin/tag.c:394 msgid "replace the tag if exists" msgstr "замена метки, если она существует" -#: builtin/tag.c:417 builtin/update-ref.c:369 +#: builtin/tag.c:395 builtin/update-ref.c:368 msgid "create a reflog" msgstr "создать журнал ссылок" -#: builtin/tag.c:419 +#: builtin/tag.c:397 msgid "Tag listing options" msgstr "Настройки вывода списка меток" -#: builtin/tag.c:420 +#: builtin/tag.c:398 msgid "show tag list in columns" msgstr "показать список меток по столбцам" -#: builtin/tag.c:421 builtin/tag.c:423 +#: builtin/tag.c:399 builtin/tag.c:401 msgid "print only tags that contain the commit" msgstr "вывод только меток, которые содержат коммит" -#: builtin/tag.c:422 builtin/tag.c:424 +#: builtin/tag.c:400 builtin/tag.c:402 msgid "print only tags that don't contain the commit" msgstr "вывод только меток, которые не содержат коммит" -#: builtin/tag.c:425 +#: builtin/tag.c:403 msgid "print only tags that are merged" msgstr "вывод только слитых меток" -#: builtin/tag.c:426 +#: builtin/tag.c:404 msgid "print only tags that are not merged" msgstr "вывод только не слитых меток" -#: builtin/tag.c:431 +#: builtin/tag.c:409 msgid "print only tags of the object" msgstr "вывод только меток, определенного объекта" -#: builtin/tag.c:470 +#: builtin/tag.c:453 msgid "--column and -n are incompatible" msgstr "--column и -n нельзя использовать одновременно" -#: builtin/tag.c:492 +#: builtin/tag.c:475 msgid "-n option is only allowed in list mode" msgstr "опцию -n можно использовать только в режиме списка" -#: builtin/tag.c:494 +#: builtin/tag.c:477 msgid "--contains option is only allowed in list mode" msgstr "опцию --contains можно использовать только в режиме списка" -#: builtin/tag.c:496 +#: builtin/tag.c:479 msgid "--no-contains option is only allowed in list mode" msgstr "опцию --no-contains можно использовать только в режиме списка" -#: builtin/tag.c:498 +#: builtin/tag.c:481 msgid "--points-at option is only allowed in list mode" msgstr "опцию --points-at можно использовать только в режиме списка" -#: builtin/tag.c:500 +#: builtin/tag.c:483 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "опции --merged и --no-merged можно использовать только в режиме списка" -#: builtin/tag.c:511 +#: builtin/tag.c:494 msgid "only one -F or -m option is allowed." msgstr "-F и -m нельзя использовать одновременно." -#: builtin/tag.c:530 +#: builtin/tag.c:513 msgid "too many params" msgstr "передано слишком много параметров" -#: builtin/tag.c:536 +#: builtin/tag.c:519 #, c-format msgid "'%s' is not a valid tag name." msgstr "«%s» не является допустимым именем метки." -#: builtin/tag.c:541 +#: builtin/tag.c:524 #, c-format msgid "tag '%s' already exists" msgstr "метка «%s» уже существует" -#: builtin/tag.c:571 +#: builtin/tag.c:554 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Метка «%s» обновлена (была %s)\n" @@ -12873,155 +13054,155 @@ msgstr "информация статистики каталога не изме msgid " OK" msgstr " OK" -#: builtin/update-index.c:569 +#: builtin/update-index.c:571 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<опции>] [--] [<файл>…]" -#: builtin/update-index.c:924 +#: builtin/update-index.c:926 msgid "continue refresh even when index needs update" msgstr "продолжить обновление, даже если индекс требует обновления" -#: builtin/update-index.c:927 +#: builtin/update-index.c:929 msgid "refresh: ignore submodules" msgstr "обновление: игнорировать подмодули" -#: builtin/update-index.c:930 +#: builtin/update-index.c:932 msgid "do not ignore new files" msgstr "не игнорировать новые файлы" -#: builtin/update-index.c:932 +#: builtin/update-index.c:934 msgid "let files replace directories and vice-versa" msgstr "разрешить файлам заменять каталоги и наоборот" -#: builtin/update-index.c:934 +#: builtin/update-index.c:936 msgid "notice files missing from worktree" msgstr "замечать файлы отсутствующие в рабочем каталоге" -#: builtin/update-index.c:936 +#: builtin/update-index.c:938 msgid "refresh even if index contains unmerged entries" msgstr "обновить, даже если в индексе имеются не слитые записи" -#: builtin/update-index.c:939 +#: builtin/update-index.c:941 msgid "refresh stat information" msgstr "обновить информацию о статусе файлов" -#: builtin/update-index.c:943 +#: builtin/update-index.c:945 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "как --refresh, но игнорировать настройку assume-unchanged" -#: builtin/update-index.c:947 +#: builtin/update-index.c:949 msgid "<mode>,<object>,<path>" msgstr "<режим доступа>,<объект>,<путь>" -#: builtin/update-index.c:948 +#: builtin/update-index.c:950 msgid "add the specified entry to the index" msgstr "добавить указанную запись в индекс" -#: builtin/update-index.c:957 +#: builtin/update-index.c:959 msgid "mark files as \"not changing\"" msgstr "пометить файлы как «не измененные»" -#: builtin/update-index.c:960 +#: builtin/update-index.c:962 msgid "clear assumed-unchanged bit" msgstr "убрать пометку assumed-unchanged" -#: builtin/update-index.c:963 +#: builtin/update-index.c:965 msgid "mark files as \"index-only\"" msgstr "пометить файлы как «только в индексе»" -#: builtin/update-index.c:966 +#: builtin/update-index.c:968 msgid "clear skip-worktree bit" msgstr "убрать пометку skip-worktree" -#: builtin/update-index.c:969 +#: builtin/update-index.c:971 msgid "add to index only; do not add content to object database" msgstr "только добавить в индекс; не добавлять содержимое в базу данных объектов" -#: builtin/update-index.c:971 +#: builtin/update-index.c:973 msgid "remove named paths even if present in worktree" msgstr "удалить указанные пути, даже если они существуют в рабочем каталоге" -#: builtin/update-index.c:973 +#: builtin/update-index.c:975 msgid "with --stdin: input lines are terminated by null bytes" msgstr "с опцией --stdin: строки на вводе отделяются НУЛЕВЫМ байтом" -#: builtin/update-index.c:975 +#: builtin/update-index.c:977 msgid "read list of paths to be updated from standard input" msgstr "прочитать список обновляемых путей из стандартного ввода" -#: builtin/update-index.c:979 +#: builtin/update-index.c:981 msgid "add entries from standard input to the index" msgstr "добавить записи из стандартного ввода в индекс" -#: builtin/update-index.c:983 +#: builtin/update-index.c:985 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "заново заполнить индекс #2 и #3 для указанных путей" -#: builtin/update-index.c:987 +#: builtin/update-index.c:989 msgid "only update entries that differ from HEAD" msgstr "обновить только записи, которые отличаются от HEAD" -#: builtin/update-index.c:991 +#: builtin/update-index.c:993 msgid "ignore files missing from worktree" msgstr "игнорировать файлы, отсутствующие в рабочем каталоге" -#: builtin/update-index.c:994 +#: builtin/update-index.c:996 msgid "report actions to standard output" msgstr "вывести выполняемые действия на стандартный вывод" -#: builtin/update-index.c:996 +#: builtin/update-index.c:998 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(для машинной обработки) забыть сохраненные неразрешенные конфликты" -#: builtin/update-index.c:1000 +#: builtin/update-index.c:1002 msgid "write index in this format" msgstr "записать индекс в указанном формате" -#: builtin/update-index.c:1002 +#: builtin/update-index.c:1004 msgid "enable or disable split index" msgstr "разрешить или запретить раздельный индекс" -#: builtin/update-index.c:1004 +#: builtin/update-index.c:1006 msgid "enable/disable untracked cache" msgstr "включить/отключить кэш неотслеживаемых файлов" -#: builtin/update-index.c:1006 +#: builtin/update-index.c:1008 msgid "test if the filesystem supports untracked cache" msgstr "проверить, что файловая система поддерживает кэш неотслеживаемых файлов" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1010 msgid "enable untracked cache without testing the filesystem" msgstr "включить кэш неотслеживаемых файлов без проверки файловой системы" -#: builtin/update-index.c:1108 +#: builtin/update-index.c:1107 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" msgstr "параметр core.splitIndex установлен в false; удалите или измените его, если вы действительно хотите включить разделенный индекс" -#: builtin/update-index.c:1117 +#: builtin/update-index.c:1116 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" msgstr "параметр core.splitIndex установлен в true; удалите или измените его, если вы действительно хотите отключить разделенный индекс" -#: builtin/update-index.c:1128 +#: builtin/update-index.c:1127 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" msgstr "параметр core.untrackedCache установлен true; удалите или измените его, если вы действительно хотите удалить кэш неотслеживаемых файлов" -#: builtin/update-index.c:1132 +#: builtin/update-index.c:1131 msgid "Untracked cache disabled" msgstr "Кэш неотслеживаемых файлов отключен" -#: builtin/update-index.c:1140 +#: builtin/update-index.c:1139 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want" " to enable the untracked cache" msgstr "параметр core.untrackedCache установлен false; удалите или измените его, если вы действительно хотите включить кэш неотслеживаемых файлов" -#: builtin/update-index.c:1144 +#: builtin/update-index.c:1143 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Кэш неотслеживаемых файлов включен для «%s»" @@ -13038,19 +13219,19 @@ msgstr "git update-ref [<опции>] <имя-ссылки> <новое-зн msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [<опции>] --stdin [-z]" -#: builtin/update-ref.c:364 +#: builtin/update-ref.c:363 msgid "delete the reference" msgstr "удалить ссылку" -#: builtin/update-ref.c:366 +#: builtin/update-ref.c:365 msgid "update <refname> not the one it points to" msgstr "обновить <имя-ссылки> а не то, на что она указывает" -#: builtin/update-ref.c:367 +#: builtin/update-ref.c:366 msgid "stdin has NUL-terminated arguments" msgstr "ввод отделённый НУЛЕВЫМИ символами" -#: builtin/update-ref.c:368 +#: builtin/update-ref.c:367 msgid "read updates from stdin" msgstr "прочитать обновления из стандартного ввода" @@ -13114,102 +13295,109 @@ msgstr "git worktree prune [<опции>]" msgid "git worktree unlock <path>" msgstr "git worktree unlock <путь>" -#: builtin/worktree.c:44 +#: builtin/worktree.c:46 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Удаление рабочих каталогов/%s: не является каталогом" -#: builtin/worktree.c:50 +#: builtin/worktree.c:52 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Удаление рабочих каталогов/%s: файл gitdir не существует" -#: builtin/worktree.c:55 +#: builtin/worktree.c:57 builtin/worktree.c:66 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "Удаление рабочих каталогов/%s: не удалось прочитать файл gitdir (%s)" -#: builtin/worktree.c:66 +#: builtin/worktree.c:76 +#, c-format +msgid "" +"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " +"%<PRIuMAX>)" +msgstr "Удаление рабочего каталога/%s: прочитано мало данных (ожидалось %<PRIuMAX> байт, прочитано %<PRIuMAX>)" + +#: builtin/worktree.c:84 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Удаление рабочих каталогов/%s: недействительный файл gitdir" -#: builtin/worktree.c:82 +#: builtin/worktree.c:100 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "Удаление рабочих каталогов/%s: gitdir указывает на несуществующее расположение" -#: builtin/worktree.c:129 +#: builtin/worktree.c:147 msgid "report pruned working trees" msgstr "вывести список удаленных рабочих каталогов" -#: builtin/worktree.c:131 +#: builtin/worktree.c:149 msgid "expire working trees older than <time>" msgstr "удалить рабочие каталоги старее чем <дата-окончания>" -#: builtin/worktree.c:205 +#: builtin/worktree.c:223 #, c-format msgid "'%s' already exists" msgstr "«%s» уже существует" -#: builtin/worktree.c:236 +#: builtin/worktree.c:254 #, c-format msgid "could not create directory of '%s'" msgstr "не удалось создать каталог «%s»" -#: builtin/worktree.c:275 +#: builtin/worktree.c:293 #, c-format msgid "Preparing %s (identifier %s)" msgstr "Подготовка %s (идентификатор %s)" -#: builtin/worktree.c:327 +#: builtin/worktree.c:345 msgid "checkout <branch> even if already checked out in other worktree" msgstr "переключиться на <ветка> даже если она уже активна в другом рабочесм каталоге" -#: builtin/worktree.c:329 +#: builtin/worktree.c:347 msgid "create a new branch" msgstr "создать новую ветку" -#: builtin/worktree.c:331 +#: builtin/worktree.c:349 msgid "create or reset a branch" msgstr "создать или перейти на ветку" -#: builtin/worktree.c:333 +#: builtin/worktree.c:351 msgid "populate the new working tree" msgstr "наполнить новый рабочий каталог" -#: builtin/worktree.c:334 +#: builtin/worktree.c:352 msgid "keep the new working tree locked" msgstr "держать рабочий каталог заблокированным" -#: builtin/worktree.c:342 +#: builtin/worktree.c:360 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B и --detach нельзя использовать одновременно" -#: builtin/worktree.c:479 +#: builtin/worktree.c:499 msgid "reason for locking" msgstr "причина блокировки" -#: builtin/worktree.c:491 builtin/worktree.c:524 +#: builtin/worktree.c:511 builtin/worktree.c:544 #, c-format msgid "'%s' is not a working tree" msgstr "«%s» не является рабочим каталогом" -#: builtin/worktree.c:493 builtin/worktree.c:526 +#: builtin/worktree.c:513 builtin/worktree.c:546 msgid "The main working tree cannot be locked or unlocked" msgstr "Главный рабочий каталог не может быть заблокирован или разблокирован" -#: builtin/worktree.c:498 +#: builtin/worktree.c:518 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "«%s» уже заблокирован, причина: %s" -#: builtin/worktree.c:500 +#: builtin/worktree.c:520 #, c-format msgid "'%s' is already locked" msgstr "«%s» уже заблокирован" -#: builtin/worktree.c:528 +#: builtin/worktree.c:548 #, c-format msgid "'%s' is not locked" msgstr "«%s» не заблокирован" @@ -13234,23 +13422,23 @@ msgstr "используется только при отладке" msgid "git upload-pack [<options>] <dir>" msgstr "git upload-pack [<опции>] <каталог>" -#: upload-pack.c:1041 +#: upload-pack.c:1040 msgid "quit after a single request/response exchange" msgstr "выход после обмена одним запросом/ответом" -#: upload-pack.c:1043 +#: upload-pack.c:1042 msgid "exit immediately after initial ref advertisement" msgstr "выходить сразу после начального объявления списка ссылок" -#: upload-pack.c:1045 +#: upload-pack.c:1044 msgid "do not try <directory>/.git/ if <directory> is no Git directory" msgstr "не проверять <каталог>/.git/ если <каталог> не является каталогом Git" -#: upload-pack.c:1047 +#: upload-pack.c:1046 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "прервать передачу после <кол> секунд простоя" -#: credential-cache--daemon.c:224 +#: credential-cache--daemon.c:222 #, c-format msgid "" "The permissions on your socket directory are too loose; other\n" @@ -13259,7 +13447,7 @@ msgid "" "\tchmod 0700 %s" msgstr "Права доступа к вашему каталогу сокетов слишком свободны; друге пользователи могуи читать ваши закэшированные пароли доступа. Обдумайте запуск команды:\n\n\tchmod 0700 %s" -#: credential-cache--daemon.c:272 +#: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "вывод отладочных сообщений на stderr" @@ -13270,20 +13458,20 @@ msgid "" "to read about a specific subcommand or concept." msgstr "«git help -а» и «git help -g» выводит список доступных подкоманд и\nнекоторые руководства по темам. Запустите «git help <команда>» или\n«git help <термин>», чтобы прочесть о конкретных подкоманде или теме." -#: http.c:337 +#: http.c:338 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "отрицательное значение http.postbuffer; использую стандартное значение %d" -#: http.c:358 +#: http.c:359 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "Делегация проверки полномочий не поддерживается с cURL < 7.22.0" -#: http.c:367 +#: http.c:368 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "Public key pinning не поддерживается с cURL < 7.44.0" -#: http.c:1764 +#: http.c:1768 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -13627,7 +13815,7 @@ msgstr "Не удалось найти общий коммит с $pretty_name" #: git-merge-octopus.sh:77 #, sh-format -msgid "Already up-to-date with $pretty_name" +msgid "Already up to date with $pretty_name" msgstr "Уже обновлено в соответствии с $pretty_name" #: git-merge-octopus.sh:89 @@ -13646,52 +13834,53 @@ msgstr "Простое слияние не удалось, попытка авт #: git-rebase.sh:58 msgid "" -"When you have resolved this problem, run \"git rebase --continue\".\n" -"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" -"To check out the original branch and stop rebasing, run \"git rebase --abort\"." -msgstr "Когда вы разрешите этот конфликт, запустите «git rebase --continue».\nЕсли вы хотите пропустить этот патч, то запустите «git rebase --skip».\nЧтобы перейти на оригинальную ветку и остановить перемещение, запустите «git rebase --abort»." +"Resolve all conflicts manually, mark them as resolved with\n" +"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" +"You can instead skip this commit: run \"git rebase --skip\".\n" +"To abort and get back to the state before \"git rebase\", run \"git rebase --abort\"." +msgstr "Разрешите все конфликты вручную, пометьте их разрешёнными с помощью «git add/rm <конфликтующие-файлы>», а затем запустите «git rebase --continue».\nЕсли вы хотите пропустить этот коммит, то запустите «git rebase --skip».\nЧтобы вернуться на состояние до «git rebase», запустите «git rebase --abort»." -#: git-rebase.sh:158 git-rebase.sh:397 +#: git-rebase.sh:160 git-rebase.sh:402 #, sh-format msgid "Could not move back to $head_name" msgstr "Не удалось перейти назад на $head_name" -#: git-rebase.sh:169 +#: git-rebase.sh:171 msgid "Applied autostash." msgstr "Применены автоматически спрятанные изменения." -#: git-rebase.sh:172 +#: git-rebase.sh:174 #, sh-format msgid "Cannot store $stash_sha1" msgstr "Не удалось сохранить $stash_sha1" -#: git-rebase.sh:212 +#: git-rebase.sh:214 msgid "The pre-rebase hook refused to rebase." msgstr "Перехватчик pre-rebase отказал в перемещении." -#: git-rebase.sh:217 +#: git-rebase.sh:219 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "Похоже, git-am выполняется. Перемещение невозможно." -#: git-rebase.sh:358 +#: git-rebase.sh:363 msgid "No rebase in progress?" msgstr "Нет перемещения в процессе?" -#: git-rebase.sh:369 +#: git-rebase.sh:374 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "Действие --edit-todo может использоваться только при интерактивном перемещении." -#: git-rebase.sh:376 +#: git-rebase.sh:381 msgid "Cannot read HEAD" msgstr "Не удалось прочитать HEAD" -#: git-rebase.sh:379 +#: git-rebase.sh:384 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" msgstr "Вы должны отредактировать все\nконфликты слияния, а потом пометить\nих как разрешенные с помощью git add" -#: git-rebase.sh:419 +#: git-rebase.sh:424 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -13704,101 +13893,101 @@ msgid "" "valuable there." msgstr "Похоже, каталог $state_dir_base уже существует и я предполагаю, что вы в процессе другого перемещения. Если это так, попробуйте\n\t$cmd_live_rebase\nЕсли нет\n\t$cmd_clear_stale_rebase\nи запустите меня снова. Я останавливаюсь, чтобы вы не потеряли что-то важное." -#: git-rebase.sh:470 +#: git-rebase.sh:480 #, sh-format msgid "invalid upstream $upstream_name" msgstr "недействительная вышестоящая ветка $upstream_name" -#: git-rebase.sh:494 +#: git-rebase.sh:504 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: имеется больше одной базы слияния" -#: git-rebase.sh:497 git-rebase.sh:501 +#: git-rebase.sh:507 git-rebase.sh:511 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: нет базы слияния" -#: git-rebase.sh:506 +#: git-rebase.sh:516 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "Не указывает на действительный коммит: $onto_name" -#: git-rebase.sh:529 +#: git-rebase.sh:539 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "критическая ошибка: нет такой ветки: $branch_name" -#: git-rebase.sh:562 +#: git-rebase.sh:572 msgid "Cannot autostash" msgstr "Не удалось автоматически спрятать изменения" -#: git-rebase.sh:567 +#: git-rebase.sh:577 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Изменения автоматически спрятаны: $stash_abbrev" -#: git-rebase.sh:571 +#: git-rebase.sh:581 msgid "Please commit or stash them." msgstr "Сделайте коммит или спрячьте их." -#: git-rebase.sh:591 +#: git-rebase.sh:601 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "Текущая ветка $branch_name уже свежая." -#: git-rebase.sh:595 +#: git-rebase.sh:605 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "Текущая ветка $branch_name уже свежая, принудительное перемещение." -#: git-rebase.sh:606 +#: git-rebase.sh:616 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Изменения от $mb до $onto:" -#: git-rebase.sh:615 +#: git-rebase.sh:625 msgid "First, rewinding head to replay your work on top of it..." msgstr "Сначала перематываем указатель текущего коммита, чтобы применить ваши изменения поверх него…" -#: git-rebase.sh:625 +#: git-rebase.sh:635 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "Перемотана вперед $branch_name до $onto_name." -#: git-stash.sh:54 +#: git-stash.sh:61 msgid "git stash clear with parameters is unimplemented" msgstr "git stash очистка с параметрами не реализована" -#: git-stash.sh:95 +#: git-stash.sh:102 msgid "You do not have the initial commit yet" msgstr "У вас еще нет начального коммита" -#: git-stash.sh:110 +#: git-stash.sh:117 msgid "Cannot save the current index state" msgstr "Не удалось сохранить текущее состояние индекса" -#: git-stash.sh:125 +#: git-stash.sh:132 msgid "Cannot save the untracked files" msgstr "Невозможно сохранить неотслеживаемые файлы" -#: git-stash.sh:145 git-stash.sh:158 +#: git-stash.sh:152 git-stash.sh:165 msgid "Cannot save the current worktree state" msgstr "Не удалось сохранить текущее состояние рабочего каталога" -#: git-stash.sh:162 +#: git-stash.sh:169 msgid "No changes selected" msgstr "Изменения не выбраны" -#: git-stash.sh:165 +#: git-stash.sh:172 msgid "Cannot remove temporary index (can't happen)" msgstr "Не удалось удалить временный индекс (не должно случаться)" -#: git-stash.sh:178 +#: git-stash.sh:185 msgid "Cannot record working tree state" msgstr "Не удалось записать состояние рабочего каталога" -#: git-stash.sh:210 +#: git-stash.sh:217 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "Не удалось обновить $ref_stash с помощью $w_commit" @@ -13812,114 +14001,114 @@ msgstr "Не удалось обновить $ref_stash с помощью $w_com #. $ git stash save --blah-blah 2>&1 | head -n 2 #. error: unknown option for 'stash save': --blah-blah #. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:266 +#: git-stash.sh:273 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" " To provide a message, use git stash save -- '$option'" msgstr "ошибка: неизвестная опция для «stash save»: $option\n Для предоставления сообщения, используйте git stash save -- «$option»" -#: git-stash.sh:281 +#: git-stash.sh:288 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "Нельзя использовать --patch и --include-untracked или --all одновременно" -#: git-stash.sh:289 +#: git-stash.sh:296 msgid "No local changes to save" msgstr "Нет локальных изменений для сохранения" -#: git-stash.sh:294 +#: git-stash.sh:301 msgid "Cannot initialize stash" msgstr "Не удалось инициализировать спрятанные изменения" -#: git-stash.sh:298 +#: git-stash.sh:305 msgid "Cannot save the current status" msgstr "Не удалось сохранить текущий статус" -#: git-stash.sh:299 +#: git-stash.sh:306 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "Рабочий каталог и состояние индекса сохранены $stash_msg" -#: git-stash.sh:326 +#: git-stash.sh:334 msgid "Cannot remove worktree changes" msgstr "Не удалось удалить изменения рабочего каталога" -#: git-stash.sh:474 +#: git-stash.sh:482 #, sh-format msgid "unknown option: $opt" msgstr "неизвестная опция: $opt" -#: git-stash.sh:487 +#: git-stash.sh:495 msgid "No stash entries found." msgstr "Не найдены спрятанные изменения." -#: git-stash.sh:494 +#: git-stash.sh:502 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Передано слишком много редакций: $REV" -#: git-stash.sh:509 +#: git-stash.sh:517 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference не является действительной ссылкой" -#: git-stash.sh:537 +#: git-stash.sh:545 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "«$args» не похоже на коммит со спрятанными изменениями" -#: git-stash.sh:548 +#: git-stash.sh:556 #, sh-format msgid "'$args' is not a stash reference" msgstr "«$args» не является ссылкой на спрятанные изменения" -#: git-stash.sh:556 +#: git-stash.sh:564 msgid "unable to refresh index" msgstr "не удалось обновить индекс" -#: git-stash.sh:560 +#: git-stash.sh:568 msgid "Cannot apply a stash in the middle of a merge" msgstr "Нельзя применить спрятанные изменения во время выполнения слияния" -#: git-stash.sh:568 +#: git-stash.sh:576 msgid "Conflicts in index. Try without --index." msgstr "Конфликты в индексе. Попробуйте без --index." -#: git-stash.sh:570 +#: git-stash.sh:578 msgid "Could not save index tree" msgstr "Не удалось сохранить дерево индекса" -#: git-stash.sh:579 +#: git-stash.sh:587 msgid "Could not restore untracked files from stash entry" msgstr "Невозможно восстановить неотслеживаемые файлы из спрятанных изменений" -#: git-stash.sh:604 +#: git-stash.sh:612 msgid "Cannot unstage modified files" msgstr "Невозможно убрать из индекса измененные файлы" -#: git-stash.sh:619 +#: git-stash.sh:627 msgid "Index was not unstashed." msgstr "Индекс не был извлечён из спрятанных изменений." -#: git-stash.sh:633 +#: git-stash.sh:641 msgid "The stash entry is kept in case you need it again." msgstr "Спрятанные изменения сохранены, на случай если они снова вам понадобятся." -#: git-stash.sh:642 +#: git-stash.sh:650 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Отброшено ${REV} ($s)" -#: git-stash.sh:643 +#: git-stash.sh:651 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Не удалось отбросить запись из спрятанных изменений" -#: git-stash.sh:651 +#: git-stash.sh:659 msgid "No branch name specified" msgstr "Не указано имя ветки" -#: git-stash.sh:730 +#: git-stash.sh:738 msgid "(To restore them type \"git stash apply\")" msgstr "(Чтобы восстановить их, наберите «git stash apply»)" @@ -14048,110 +14237,110 @@ msgstr "Не удалось создать пустой каталог подм msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "Подмодуль «$name» ($url) был снят с регистрации по пути «$displaypath»" -#: git-submodule.sh:638 +#: git-submodule.sh:637 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "Не удалось найти текущую редакцию для подмодуля по пути «$displaypath»" -#: git-submodule.sh:648 +#: git-submodule.sh:647 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Не удалось выполнить извлечение для подмодуля по пути «$sm_path»" -#: git-submodule.sh:653 +#: git-submodule.sh:652 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " "'$sm_path'" msgstr "Не удалось найти текущую редакцию ${remote_name}/${branch} для подмодуля по пути «$sm_path»" -#: git-submodule.sh:671 +#: git-submodule.sh:670 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "Не удалось выполнить извлечение для подмодуля по пути «$displaypath»" -#: git-submodule.sh:677 +#: git-submodule.sh:676 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " "Direct fetching of that commit failed." msgstr "Получен по пути подмодуля «$displaypath», но не содержит $sha1. Сбой при прямом получении коммита." -#: git-submodule.sh:684 +#: git-submodule.sh:683 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "Не удалось переключиться на состояние «$sha1» для подмодуля по пути «$displaypath»" -#: git-submodule.sh:685 +#: git-submodule.sh:684 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Подмодуль по пути «$displaypath»: забрано состояние «$sha1»" -#: git-submodule.sh:689 +#: git-submodule.sh:688 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "Не удалось переместить «$sha1» для подмодуля по пути «$displaypath»" -#: git-submodule.sh:690 +#: git-submodule.sh:689 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Подмодуль по пути «$displaypath»: перемещен над «$sha1»" -#: git-submodule.sh:695 +#: git-submodule.sh:694 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "Не удалось выполнить слияние с «$sha1» для подмодуля по пути «$displaypath»" -#: git-submodule.sh:696 +#: git-submodule.sh:695 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Подмодуль по пути «$displaypath»: слито с «$sha1»" -#: git-submodule.sh:701 +#: git-submodule.sh:700 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "Сбой выполнения «$command $sha1» для подмодуля по пути «$displaypath»" -#: git-submodule.sh:702 +#: git-submodule.sh:701 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Подмодуль по пути «$displaypath»: «$command $sha1»" -#: git-submodule.sh:733 +#: git-submodule.sh:732 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Не удалось выполнить рекурсивно для подмодуля по пути «$displaypath»" -#: git-submodule.sh:841 +#: git-submodule.sh:840 msgid "The --cached option cannot be used with the --files option" msgstr "Опцию --cached нельзя использовать одновременно с опцией --files" -#: git-submodule.sh:893 +#: git-submodule.sh:892 #, sh-format msgid "unexpected mode $mod_dst" msgstr "неизвестный режим $mod_dst" -#: git-submodule.sh:913 +#: git-submodule.sh:912 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Предупреждение: $display_name не содержит коммит $sha1_src" -#: git-submodule.sh:916 +#: git-submodule.sh:915 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Предупреждение: $display_name не содержит коммит $sha1_dst" -#: git-submodule.sh:919 +#: git-submodule.sh:918 #, 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:1065 +#: git-submodule.sh:1064 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "Не удалось выполнить рекурсивно для подмодуля по пути «$sm_path»" -#: git-submodule.sh:1137 +#: git-submodule.sh:1136 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Синхронизация url для подмодуля «$displaypath»" @@ -14170,16 +14359,16 @@ msgstr "Перемещение ($new_count/$total)" msgid "" "\n" "Commands:\n" -" p, pick = use commit\n" -" r, reword = use commit, but edit the commit message\n" -" e, edit = use commit, but stop for amending\n" -" s, squash = use commit, but meld into previous commit\n" -" f, fixup = like \"squash\", but discard this commit's log message\n" -" x, exec = run command (the rest of the line) using shell\n" -" d, drop = remove commit\n" +"p, pick = use commit\n" +"r, reword = use commit, but edit the commit message\n" +"e, edit = use commit, but stop for amending\n" +"s, squash = use commit, but meld into previous commit\n" +"f, fixup = like \"squash\", but discard this commit's log message\n" +"x, exec = run command (the rest of the line) using shell\n" +"d, drop = remove commit\n" "\n" "These lines can be re-ordered; they are executed from top to bottom.\n" -msgstr "\nКоманды:\n p, pick = использовать коммит\n r, reword = использовать коммит, но изменить сообщение коммита\n e, edit = использовать коммит, но остановиться для внесения правок\n s, squash = использовать коммит, но объединить его с предыдущим коммитом\n f, fixup = как «squash», но отбросить сообщение этого коммита\n x, exec = выполнить команду (остаток строки) с помощью командной оболочки\n d, drop = удалить коммит\n\nЭти строки могут быть перемещены; выполняются по очереди сверху вниз.\n" +msgstr "\nКоманды:\np, pick = использовать коммит\nr, reword = использовать коммит, но изменить сообщение коммита\ne, edit = использовать коммит, но остановиться для внесения правок\ns, squash = использовать коммит, но объединить его с предыдущим коммитом\nf, fixup = как «squash», но отбросить сообщение этого коммита\nx, exec = выполнить команду (остаток строки) с помощью командной оболочки\nd, drop = удалить коммит\n\nЭти строки могут быть перемещены; выполняются по очереди сверху вниз.\n" #: git-rebase--interactive.sh:171 msgid "" @@ -14239,27 +14428,27 @@ msgstr "Не удалось переместить HEAD на $first_parent" msgid "Refusing to squash a merge: $sha1" msgstr "Нельзя уплотнить слияние: $sha1" -#: git-rebase--interactive.sh:399 +#: git-rebase--interactive.sh:400 #, sh-format msgid "Error redoing merge $sha1" msgstr "Ошибка при повторении слияния $sha1" -#: git-rebase--interactive.sh:407 +#: git-rebase--interactive.sh:408 #, sh-format msgid "Could not pick $sha1" msgstr "Не удалось взять $sha1" -#: git-rebase--interactive.sh:416 +#: git-rebase--interactive.sh:417 #, sh-format msgid "This is the commit message #${n}:" msgstr "Это сообщение коммита номер #${n}:" -#: git-rebase--interactive.sh:421 +#: git-rebase--interactive.sh:422 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "Сообщение коммита номер #${n} будет пропущено:" -#: git-rebase--interactive.sh:432 +#: git-rebase--interactive.sh:433 #, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." @@ -14268,22 +14457,22 @@ msgstr[1] "Это объединение $count коммитов" msgstr[2] "Это объединение $count коммитов" msgstr[3] "Это объединение $count коммитов" -#: git-rebase--interactive.sh:441 +#: git-rebase--interactive.sh:442 #, sh-format msgid "Cannot write $fixup_msg" msgstr "Не удалось записать $fixup_msg" -#: git-rebase--interactive.sh:444 +#: git-rebase--interactive.sh:445 msgid "This is a combination of 2 commits." msgstr "Это объединение 2 коммитов" -#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528 -#: git-rebase--interactive.sh:531 +#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529 +#: git-rebase--interactive.sh:532 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "Не удалось применить $sha1… $rest" -#: git-rebase--interactive.sh:559 +#: git-rebase--interactive.sh:560 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -14292,31 +14481,31 @@ msgid "" "you are able to reword the commit." msgstr "Не удолось исправить коммит после успешного перехода на $sha1… $rest\nЭто произошло, скорее всего, из-за пустого сообщения коммита или из-за перехватчика перед коммитом. Если же это произошло из-за перехватчика перед коммитом, то вам нужно решить с ним проблему и повторить попытку снова." -#: git-rebase--interactive.sh:574 +#: git-rebase--interactive.sh:575 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "Остановлено на $sha1_abbrev… $rest" -#: git-rebase--interactive.sh:589 +#: git-rebase--interactive.sh:590 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "Нельзя сделать «$squash_style» без указания предыдущего коммита" -#: git-rebase--interactive.sh:631 +#: git-rebase--interactive.sh:632 #, sh-format msgid "Executing: $rest" msgstr "Выполнение: $rest" -#: git-rebase--interactive.sh:639 +#: git-rebase--interactive.sh:640 #, sh-format msgid "Execution failed: $rest" msgstr "Не удалось выполнить: $rest" -#: git-rebase--interactive.sh:641 +#: git-rebase--interactive.sh:642 msgid "and made changes to the index and/or the working tree" msgstr "и были сделаны изменения в индексе и/или в рабочем каталоге" -#: git-rebase--interactive.sh:643 +#: git-rebase--interactive.sh:644 msgid "" "You can fix the problem, and then run\n" "\n" @@ -14324,7 +14513,7 @@ msgid "" msgstr "Вы можете исправить ошибку, а затем запустить\n\n\tgit rebase --continue" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--interactive.sh:656 +#: git-rebase--interactive.sh:657 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -14334,78 +14523,29 @@ msgid "" "\tgit rebase --continue" msgstr "Успешное выполнение: $rest\nно остались изменения в индексе и/или в рабочем каталоге\nСделайте коммит или спрячьте ваши изменения, а затем выполните\n\n\tgit rebase --continue" -#: git-rebase--interactive.sh:667 +#: git-rebase--interactive.sh:668 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "Неопознанная команда: $command $sha1 $rest" -#: git-rebase--interactive.sh:668 +#: git-rebase--interactive.sh:669 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "Пожалуйста исправьте это с помощью «git rebase --edit-todo»." -#: git-rebase--interactive.sh:703 +#: git-rebase--interactive.sh:704 #, sh-format msgid "Successfully rebased and updated $head_name." -msgstr "Успешно перебазирован и обновлён $head_name." +msgstr "Успешно перемещён и обновлён $head_name." -#: git-rebase--interactive.sh:750 -msgid "Could not skip unnecessary pick commands" -msgstr "Не удалось пропустить ненужные команды отбора (pick)" - -#: git-rebase--interactive.sh:908 -#, sh-format -msgid "" -"Warning: the SHA-1 is missing or isn't a commit in the following line:\n" -" - $line" -msgstr "Внимание: не найден SHA-1 или он не указывает на коммит. На строке:\n - $line" - -#: git-rebase--interactive.sh:941 -#, sh-format -msgid "" -"Warning: the command isn't recognized in the following line:\n" -" - $line" -msgstr "Внимание: команда не распознана на строке:\n - $line" - -#: git-rebase--interactive.sh:980 +#: git-rebase--interactive.sh:749 msgid "could not detach HEAD" msgstr "не удалось отделить HEAD" -#: git-rebase--interactive.sh:1018 -msgid "" -"Warning: some commits may have been dropped accidentally.\n" -"Dropped commits (newer to older):" -msgstr "Внимание: некоторые коммиты могли быть отброшены по ошибке.\nОтброшенные коммиты (от новых к старым):" - -#: git-rebase--interactive.sh:1026 -msgid "" -"To avoid this message, use \"drop\" to explicitly remove a commit.\n" -"\n" -"Use 'git config rebase.missingCommitsCheck' to change the level of warnings.\n" -"The possible behaviours are: ignore, warn, error." -msgstr "Для избежания этого сообщения, используйте «drop» чтобы явно удалить коммит.\n\nИспользуйте опцию «git config rebase.missingCommitsCheck» для изменения количества предупреждений.\nВозможные значения: ignore, warn, error." - -#: git-rebase--interactive.sh:1037 -#, sh-format -msgid "" -"Unrecognized setting $check_level for option rebase.missingCommitsCheck. " -"Ignoring." -msgstr "Нераспознанная настройка $check_level для опции rebase.missingCommitsCheck. Игнорирую." - -#: git-rebase--interactive.sh:1054 -msgid "" -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase " -"--continue'." -msgstr "Вы можете исправить это с помощью «git rebase --edit-todo», а потом запустив «git rebase --continue»." - -#: git-rebase--interactive.sh:1055 -msgid "Or you can abort the rebase with 'git rebase --abort'." -msgstr "Или вы можете отменить процесс перебазирования с помощью «git rebase --abort»." - -#: git-rebase--interactive.sh:1083 +#: git-rebase--interactive.sh:784 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "Не удалось удалить CHERRY_PICK_HEAD" -#: git-rebase--interactive.sh:1088 +#: git-rebase--interactive.sh:789 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -14423,21 +14563,21 @@ msgid "" " git rebase --continue\n" msgstr "У вас имеются проиндексированные изменения в рабочем каталоге.\nЕсли эти изменения должны быть объеденены с предыдущим коммитом, то запустите:\n\n git commit --amend $gpg_sign_opt_quoted\n\nЕсли же они должны быть помещены в новый коммит, то запустите:\n\n git commit $gpg_sign_opt_quoted\n\nВ любом случае, после того как вы закончите, продолжить перемещение можно выполнив:\n\n git rebase --continue\n" -#: git-rebase--interactive.sh:1105 +#: git-rebase--interactive.sh:806 msgid "Error trying to find the author identity to amend commit" msgstr "Произошла ошибка при поиске автора для исправления коммита" -#: git-rebase--interactive.sh:1110 +#: git-rebase--interactive.sh:811 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." msgstr "У вас имеются незакоммиченные изменения в рабочем каталоге. Сделайте коммит, а затем запустите «git rebase --continue» снова." -#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119 +#: git-rebase--interactive.sh:816 git-rebase--interactive.sh:820 msgid "Could not commit staged changes." msgstr "Не удалось закоммитить проиндексированные изменения." -#: git-rebase--interactive.sh:1147 +#: git-rebase--interactive.sh:848 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -14446,33 +14586,33 @@ msgid "" "\n" msgstr "\nВы сейчас редактируете файл со списком дел для интерактивного перемещения.\nДля продолжения перемещения, после редактирования файла запустите:\n git rebase --continue\n\n" -#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313 +#: git-rebase--interactive.sh:856 git-rebase--interactive.sh:1015 msgid "Could not execute editor" msgstr "Не удалось запустить редактор" -#: git-rebase--interactive.sh:1168 +#: git-rebase--interactive.sh:869 #, sh-format msgid "Could not checkout $switch_to" msgstr "Не удалось перейти на версию $switch_to" -#: git-rebase--interactive.sh:1173 +#: git-rebase--interactive.sh:874 msgid "No HEAD?" msgstr "Нет указателя HEAD?" -#: git-rebase--interactive.sh:1174 +#: git-rebase--interactive.sh:875 #, sh-format msgid "Could not create temporary $state_dir" msgstr "Не удалось создать временный каталог $state_dir" -#: git-rebase--interactive.sh:1176 +#: git-rebase--interactive.sh:877 msgid "Could not mark as interactive" msgstr "Не удалось пометить как интерактивный" -#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191 +#: git-rebase--interactive.sh:887 git-rebase--interactive.sh:892 msgid "Could not init rewritten commits" msgstr "Не удалось инициализировать перезаписанные коммиты" -#: git-rebase--interactive.sh:1291 +#: git-rebase--interactive.sh:993 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" @@ -14481,14 +14621,14 @@ msgstr[1] "Перемещение $shortrevisions над $shortonto ($todocount msgstr[2] "Перемещение $shortrevisions над $shortonto ($todocount команд)" msgstr[3] "Перемещение $shortrevisions над $shortonto ($todocount команд)" -#: git-rebase--interactive.sh:1296 +#: git-rebase--interactive.sh:998 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" "\n" msgstr "\nНо если вы удалите все, то процесс перемещения будет будет прерван.\n\n" -#: git-rebase--interactive.sh:1303 +#: git-rebase--interactive.sh:1005 msgid "Note that empty commits are commented out" msgstr "Заметьте, что пустые коммиты закомментированны" @@ -15007,59 +15147,59 @@ msgstr "локальный часовой пояс отличается от GMT msgid "local time offset greater than or equal to 24 hours\n" msgstr "локальный сдвиг времени больше или равен 24 часа\n" -#: git-send-email.perl:208 git-send-email.perl:214 +#: git-send-email.perl:207 git-send-email.perl:213 msgid "the editor exited uncleanly, aborting everything" msgstr "редактор был завершен с ошибкой, отменяю всё" -#: git-send-email.perl:291 +#: git-send-email.perl:290 #, perl-format msgid "'%s' contains an intermediate version of the email you were composing.\n" msgstr "«%s» содержит промежуточную версию письма, которое вы готовите.\n" -#: git-send-email.perl:296 +#: git-send-email.perl:295 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "«%s.final» содержит подготовленное письмо.\n" -#: git-send-email.perl:314 +#: git-send-email.perl:313 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases не совместимо с другими опциями\n" -#: git-send-email.perl:379 git-send-email.perl:634 +#: git-send-email.perl:378 git-send-email.perl:629 msgid "Cannot run git format-patch from outside a repository\n" msgstr "Нельзя запускать git format-patch вне репозитория\n" -#: git-send-email.perl:448 +#: git-send-email.perl:447 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "Неизвестное поле --suppress-cc: «%s»\n" -#: git-send-email.perl:477 +#: git-send-email.perl:476 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "Неизвестный параметр --confirm: «%s»\n" -#: git-send-email.perl:509 +#: git-send-email.perl:504 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "предупреждение: сокращение для sendmail с кавычками не поддерживается: %s\n" -#: git-send-email.perl:511 +#: git-send-email.perl:506 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "предупреждение: «:include:» не поддерживается: %s\n" -#: git-send-email.perl:513 +#: git-send-email.perl:508 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "предупреждение: перенаправление «/file» или «|pipe» не поддерживается: %s\n" -#: git-send-email.perl:518 +#: git-send-email.perl:513 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "предупреждение: строка sendmail не распознана: %s\n" -#: git-send-email.perl:600 +#: git-send-email.perl:595 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -15069,36 +15209,36 @@ msgid "" " * Giving --format-patch option if you mean a range.\n" msgstr "Файл «%s» существует, но это также может быть и\nдиапазоном коммитов для которых нужно сделать патчи. \nУстраните неоднозначность…\n\n * Указав \"./%s\" если вы имеете в виду имя файла; или\n * Передав опцию --format-patch если вы имеете в виду диапазон коммитов.\n" -#: git-send-email.perl:621 +#: git-send-email.perl:616 #, perl-format msgid "Failed to opendir %s: %s" msgstr "Не удалось выполнить opendir %s: %s" -#: git-send-email.perl:645 +#: git-send-email.perl:640 #, perl-format msgid "" "fatal: %s: %s\n" "warning: no patches were sent\n" msgstr "критическая ошибка: %s: %s\nпредупреждение: патчи не были отправлены\n" -#: git-send-email.perl:656 +#: git-send-email.perl:651 msgid "" "\n" "No patch files specified!\n" "\n" msgstr "\nФайл с патчем не указан!\n\n" -#: git-send-email.perl:669 +#: git-send-email.perl:664 #, perl-format msgid "No subject line in %s?" msgstr "Нет строки с темой в %s?" -#: git-send-email.perl:679 +#: git-send-email.perl:674 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "Не удалось открыть для записи %s: %s" -#: git-send-email.perl:689 +#: git-send-email.perl:684 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -15107,41 +15247,41 @@ msgid "" "Clear the body content if you don't wish to send a summary.\n" msgstr "Строки, начинающиеся с «GIT:» будут удалены.\nВозможно будет полезно включить статистику добавлений\nи удалений или таблицу содержимого в патч, который вы пишете.\n\nОчистите содержимое, если вы не хотите отправлять письмо с краткой информацией.\n" -#: git-send-email.perl:712 +#: git-send-email.perl:707 #, perl-format msgid "Failed to open %s.final: %s" msgstr "Не удалось открыть %s.final: %s" -#: git-send-email.perl:715 +#: git-send-email.perl:710 #, perl-format msgid "Failed to open %s: %s" msgstr "Не удалось открыть %s: %s" -#: git-send-email.perl:750 +#: 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:759 +#: git-send-email.perl:754 msgid "Summary email is empty, skipping it\n" msgstr "Письмо с краткой информацией пустое, попускаю его\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:791 +#: git-send-email.perl:786 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "Вы уверены, что хотите использовать <%s> [y/N]? " -#: git-send-email.perl:820 +#: git-send-email.perl:815 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" msgstr "Следующие файлы 8 битные, но не содержат Content-Transfer-Encoding.\n" -#: git-send-email.perl:825 +#: git-send-email.perl:820 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "Какую 8 битную кодировку нужно указать [UTF-8]? " -#: git-send-email.perl:833 +#: git-send-email.perl:828 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -15149,20 +15289,20 @@ msgid "" "has the template subject '*** SUBJECT HERE ***'. Pass --force if you really want to send.\n" msgstr "Отказываюсь отправить, т.к. патч\n\t%s\nсодержит шаблонный заголовок «*** SUBJECT HERE ***». Укажите параметр --force, если вы действительно хотите отправить его.\n" -#: git-send-email.perl:852 +#: git-send-email.perl:847 msgid "To whom should the emails be sent (if anyone)?" msgstr "Кому должны быть отправлены письма (если нужно)?" -#: git-send-email.perl:870 +#: git-send-email.perl:865 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "критическая ошибка: сокращение «%s» раскрывается само в себя\n" -#: git-send-email.perl:882 +#: git-send-email.perl:877 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:932 git-send-email.perl:940 +#: git-send-email.perl:927 git-send-email.perl:935 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "ошибка: не удалось выделить действительный адрес из: %s\n" @@ -15170,16 +15310,16 @@ msgstr "ошибка: не удалось выделить действител #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:944 +#: git-send-email.perl:939 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "Что нужно сделать с этим адресом? ([q] - выход|[d] - отбросить|[e] - редактировать): " -#: git-send-email.perl:1245 +#: git-send-email.perl:1260 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "путь CA «%s» не существует" -#: git-send-email.perl:1320 +#: git-send-email.perl:1335 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -15196,128 +15336,128 @@ msgstr " Список Cc (получателей копии письма) б #. 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:1335 +#: git-send-email.perl:1350 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): " msgstr "Отправить это письмо? ([y] - да|[n] - нет|[q] - выход|[a] - все): " -#: git-send-email.perl:1338 +#: git-send-email.perl:1353 msgid "Send this email reply required" msgstr "Отправка этого ответа на письмо обязательна" -#: git-send-email.perl:1364 +#: git-send-email.perl:1379 msgid "The required SMTP server is not properly defined." msgstr "Требуемый SMTP сервер не был правильно объявлен." -#: git-send-email.perl:1411 +#: git-send-email.perl:1426 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Сервер не поддерживает STARTTLS! %s" -#: git-send-email.perl:1416 git-send-email.perl:1420 +#: git-send-email.perl:1431 git-send-email.perl:1435 #, perl-format msgid "STARTTLS failed! %s" msgstr "Ошибка STARTTLS! %s" -#: git-send-email.perl:1430 +#: git-send-email.perl:1445 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "Не удалось инициализировать SMTP. Проверьте ваши настройки и попробуйте запустить в параметром --smtp-debug." -#: git-send-email.perl:1448 +#: git-send-email.perl:1463 #, perl-format msgid "Failed to send %s\n" msgstr "Не удалось отправить %s\n" -#: git-send-email.perl:1451 +#: git-send-email.perl:1466 #, perl-format msgid "Dry-Sent %s\n" msgstr "Имитация отправки %s\n" -#: git-send-email.perl:1451 +#: git-send-email.perl:1466 #, perl-format msgid "Sent %s\n" msgstr "Отправлено %s\n" -#: git-send-email.perl:1453 +#: git-send-email.perl:1468 msgid "Dry-OK. Log says:\n" msgstr "Имитация OK. Журнал содержит:\n" -#: git-send-email.perl:1453 +#: git-send-email.perl:1468 msgid "OK. Log says:\n" msgstr "OK. Журнал содержит:\n" -#: git-send-email.perl:1465 +#: git-send-email.perl:1480 msgid "Result: " msgstr "Результат: " -#: git-send-email.perl:1468 +#: git-send-email.perl:1483 msgid "Result: OK\n" msgstr "Результат: OK\n" -#: git-send-email.perl:1481 +#: git-send-email.perl:1496 #, perl-format msgid "can't open file %s" msgstr "не удалось открыть файл %s" -#: git-send-email.perl:1528 git-send-email.perl:1548 +#: git-send-email.perl:1543 git-send-email.perl:1563 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Добавление cc: %s со строки «%s»\n" -#: git-send-email.perl:1534 +#: git-send-email.perl:1549 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) Добавление to: %s со строки «%s»\n" -#: git-send-email.perl:1582 +#: git-send-email.perl:1597 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) Добавление cc: %s со строки «%s»\n" -#: git-send-email.perl:1605 +#: git-send-email.perl:1622 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(body) Добавление cc: %s со строки «%s»\n" -#: git-send-email.perl:1711 +#: git-send-email.perl:1728 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Не удалось выполнить «%s»" -#: git-send-email.perl:1718 +#: git-send-email.perl:1735 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Добавление %s: %s из: «%s»\n" -#: git-send-email.perl:1722 +#: git-send-email.perl:1739 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) не удалось закрыть поток к «%s»" -#: git-send-email.perl:1749 +#: git-send-email.perl:1766 msgid "cannot send message as 7bit" msgstr "не удалось отправить сообщение в 7 битной кодировке" -#: git-send-email.perl:1757 +#: git-send-email.perl:1774 msgid "invalid transfer encoding" msgstr "недопустимая кодировка передачи" -#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856 +#: git-send-email.perl:1812 git-send-email.perl:1863 git-send-email.perl:1873 #, perl-format msgid "unable to open %s: %s\n" msgstr "не удалось открыть %s: %s\n" -#: git-send-email.perl:1798 +#: git-send-email.perl:1815 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "%s: патч содержит строку длиннее чем 998 символов" -#: git-send-email.perl:1814 +#: git-send-email.perl:1831 #, 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:1818 +#: git-send-email.perl:1835 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Вы действительно хотите отправить %s? [y - да|N - нет]: " @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: git 2.14.0\n" +"Project-Id-Version: git 2.15.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2017-07-19 22:35+0200\n" -"PO-Revision-Date: 2017-07-20 22:56+0200\n" +"POT-Creation-Date: 2017-10-08 09:48+0800\n" +"PO-Revision-Date: 2017-10-11 11:31+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.0.2\n" +"X-Generator: Gtranslator 2.91.7\n" #: advice.c:58 #, c-format @@ -70,7 +70,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "Avslutar på grund av olöst konflikgt." -#: advice.c:117 builtin/merge.c:1184 +#: advice.c:117 builtin/merge.c:1211 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." @@ -121,82 +121,82 @@ msgstr "okänt alternativ för whitespace: \"%s\"" msgid "unrecognized whitespace ignore option '%s'" msgstr "okänt alternativ för ignore-whitespace: \"%s\"" -#: apply.c:126 +#: apply.c:125 msgid "--reject and --3way cannot be used together." msgstr "--reject och --3way kan inte användas samtidigt." -#: apply.c:128 +#: apply.c:127 msgid "--cached and --3way cannot be used together." msgstr "--cached och --3way kan inte användas samtidigt." -#: apply.c:131 +#: apply.c:130 msgid "--3way outside a repository" msgstr "--3way utanför arkiv" -#: apply.c:142 +#: apply.c:141 msgid "--index outside a repository" msgstr "--index utanför arkiv" -#: apply.c:145 +#: apply.c:144 msgid "--cached outside a repository" msgstr "--cached utanför arkiv" -#: apply.c:836 +#: apply.c:845 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s" -#: apply.c:845 +#: apply.c:854 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec returnerade %d för indata: %s" -#: apply.c:929 +#: apply.c:928 #, c-format msgid "unable to find filename in patch at line %d" msgstr "kan inte hitta filnamn i patchen på rad %d" -#: apply.c:967 +#: apply.c:966 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git apply: dålig git-diff - förväntade /dev/null, fick %s på rad %d" -#: apply.c:973 +#: apply.c:972 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply: dålig git-diff - motsägande nytt filnamn på rad %d" -#: apply.c:974 +#: apply.c:973 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply: dålig git-diff - motsägande gammalt filnamn på rad %d" -#: apply.c:979 +#: apply.c:978 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: dålig git-diff - förväntade /dev/null på rad %d" -#: apply.c:1008 +#: apply.c:1007 #, c-format msgid "invalid mode on line %d: %s" msgstr "ogiltigt läge på rad %d: %s" -#: apply.c:1326 +#: apply.c:1325 #, c-format msgid "inconsistent header lines %d and %d" msgstr "huvudet är inkonsekvent mellan rad %d och %d" -#: apply.c:1498 +#: apply.c:1497 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: förväntade rad: %.*s" -#: apply.c:1567 +#: apply.c:1566 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "patch-fragment utan huvud på rad %d: %.*s" -#: apply.c:1587 +#: apply.c:1586 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -212,82 +212,82 @@ msgstr[1] "" "sökvägskomponenter\n" "tas bort (rad %d)" -#: apply.c:1600 +#: apply.c:1599 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "git-diff-huvudet saknar filnamnsinformation (rad %d)" -#: apply.c:1770 +#: apply.c:1787 msgid "new file depends on old contents" msgstr "ny fil beror på gammalt innehåll" -#: apply.c:1772 +#: apply.c:1789 msgid "deleted file still has contents" msgstr "borttagen fil har fortfarande innehåll" -#: apply.c:1806 +#: apply.c:1823 #, c-format msgid "corrupt patch at line %d" msgstr "trasig patch på rad %d" -#: apply.c:1843 +#: apply.c:1860 #, c-format msgid "new file %s depends on old contents" msgstr "nya filen %s beror på gammalt innehåll" -#: apply.c:1845 +#: apply.c:1862 #, c-format msgid "deleted file %s still has contents" msgstr "borttagna filen %s har fortfarande innehåll" -#: apply.c:1848 +#: apply.c:1865 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** varning: filen %s blir tom men har inte tagits bort" -#: apply.c:1995 +#: apply.c:2012 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "trasig binärpatch på rad %d: %.*s" -#: apply.c:2032 +#: apply.c:2049 #, c-format msgid "unrecognized binary patch at line %d" msgstr "binärpatchen på rad %d känns inte igen" -#: apply.c:2193 +#: apply.c:2209 #, c-format msgid "patch with only garbage at line %d" msgstr "patch med bara skräp på rad %d" -#: apply.c:2276 +#: apply.c:2295 #, c-format msgid "unable to read symlink %s" msgstr "kunde inte läsa symboliska länken %s" -#: apply.c:2280 +#: apply.c:2299 #, c-format msgid "unable to open or read %s" msgstr "kunde inte öppna eller läsa %s" -#: apply.c:2933 +#: apply.c:2958 #, c-format msgid "invalid start of line: '%c'" msgstr "felaktig inledning på rad: \"%c\"" -#: apply.c:3052 +#: apply.c:3077 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "Stycke %d lyckades på %d (offset %d rad)." msgstr[1] "Stycke %d lyckades på %d (offset %d rader)." -#: apply.c:3064 +#: apply.c:3089 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Sammanhang reducerat till (%ld/%ld) för att tillämpa fragment vid %d" -#: apply.c:3070 +#: apply.c:3095 #, c-format msgid "" "while searching for:\n" @@ -296,25 +296,25 @@ msgstr "" "vid sökning efter:\n" "%.*s" -#: apply.c:3092 +#: apply.c:3117 #, c-format msgid "missing binary patch data for '%s'" msgstr "saknar binära patchdata för \"%s\"" -#: apply.c:3100 +#: apply.c:3125 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "kan inte applicera en binärpatch baklänges utan den omvända patchen för \"%s" "\"" -#: apply.c:3146 +#: apply.c:3171 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" "kan inte applicera binärpatch på \"%s\" utan den fullständiga indexraden" -#: apply.c:3156 +#: apply.c:3181 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -322,419 +322,420 @@ msgstr "" "patchen appliceras på \"%s\" (%s), som inte motsvarar det nuvarande " "innehållet." -#: apply.c:3164 +#: apply.c:3189 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "patchen appliceras på en tom \"%s\", men den är inte tom" -#: apply.c:3182 +#: apply.c:3207 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "nödvändig efterbild %s för \"%s\" kan inte läsas" -#: apply.c:3195 +#: apply.c:3220 #, c-format msgid "binary patch does not apply to '%s'" msgstr "binärpatchen kan inte tillämpas på \"%s\"" -#: apply.c:3201 +#: apply.c:3226 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "binärpatchen på \"%s\" ger felaktigt resultat (förväntade %s, fick %s)" -#: apply.c:3222 +#: apply.c:3247 #, c-format msgid "patch failed: %s:%ld" msgstr "patch misslyckades: %s:%ld" -#: apply.c:3344 +#: apply.c:3369 #, c-format msgid "cannot checkout %s" msgstr "kan inte checka ut %s" -#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277 +#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277 #, c-format msgid "failed to read %s" msgstr "misslyckades läsa %s" -#: apply.c:3400 +#: apply.c:3426 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "läser från \"%s\" som är på andra sidan av en symbolisk länk" -#: apply.c:3429 apply.c:3669 +#: apply.c:3455 apply.c:3695 #, c-format msgid "path %s has been renamed/deleted" msgstr "sökvägen %s har ändrat namn/tagits bort" -#: apply.c:3512 apply.c:3683 +#: apply.c:3538 apply.c:3709 #, c-format msgid "%s: does not exist in index" msgstr "%s: finns inte i indexet" -#: apply.c:3521 apply.c:3691 +#: apply.c:3547 apply.c:3717 #, c-format msgid "%s: does not match index" msgstr "%s: motsvarar inte indexet" -#: apply.c:3556 +#: apply.c:3582 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" "arkivet saknar objekt som behövs för att falla tillbaka på 3-" "vägssammanslagning." -#: apply.c:3559 +#: apply.c:3585 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Faller tillbaka på trevägssammanslagning...\n" -#: apply.c:3575 apply.c:3579 +#: apply.c:3601 apply.c:3605 #, c-format msgid "cannot read the current contents of '%s'" msgstr "kunde inte läsa aktuellt innehåll i \"%s\"" -#: apply.c:3591 +#: apply.c:3617 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Misslyckades falla tillbaka på trevägssammanslagning...\n" -#: apply.c:3605 +#: apply.c:3631 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Applicerade patchen på \"%s\" med konflikter.\n" -#: apply.c:3610 +#: apply.c:3636 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Tillämpade patchen på \"%s\" rent.\n" -#: apply.c:3636 +#: apply.c:3662 msgid "removal patch leaves file contents" msgstr "patch för borttagning lämnar kvar filinnehåll" -#: apply.c:3708 +#: apply.c:3734 #, c-format msgid "%s: wrong type" msgstr "%s: fel typ" -#: apply.c:3710 +#: apply.c:3736 #, c-format msgid "%s has type %o, expected %o" msgstr "%s har typen %o, förväntade %o" -#: apply.c:3860 apply.c:3862 +#: apply.c:3886 apply.c:3888 #, c-format msgid "invalid path '%s'" msgstr "ogiltig sökväg ”%s”" -#: apply.c:3918 +#: apply.c:3944 #, c-format msgid "%s: already exists in index" msgstr "%s: finns redan i indexet" -#: apply.c:3921 +#: apply.c:3947 #, c-format msgid "%s: already exists in working directory" msgstr "%s: finns redan i arbetskatalogen" -#: apply.c:3941 +#: apply.c:3967 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o)" -#: apply.c:3946 +#: apply.c:3972 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o) för %s" -#: apply.c:3966 +#: apply.c:3992 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "den berörda filen \"%s\" är på andra sidan av en symbolisk länk" -#: apply.c:3970 +#: apply.c:3996 #, c-format msgid "%s: patch does not apply" msgstr "%s: patchen kan inte tillämpas" -#: apply.c:3985 +#: apply.c:4011 #, c-format msgid "Checking patch %s..." msgstr "Kontrollerar patchen %s..." -#: apply.c:4076 +#: apply.c:4102 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "sha1-informationen saknas eller är oanvändbar för undermodulen %s" -#: apply.c:4083 +#: apply.c:4109 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "nytt läge för %s, som inte finns i nuvarande HEAD" -#: apply.c:4086 +#: apply.c:4112 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1-informationen saknas eller är oanvändbar (%s)." -#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138 +#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry misslyckades för sökvägen \"%s\"" -#: apply.c:4095 +#: apply.c:4121 #, c-format msgid "could not add %s to temporary index" msgstr "kunde inte lägga till %s till temporärt index" -#: apply.c:4105 +#: apply.c:4131 #, c-format msgid "could not write temporary index to %s" msgstr "kunde inte skriva temporärt index till %s" -#: apply.c:4243 +#: apply.c:4269 #, c-format msgid "unable to remove %s from index" msgstr "kan inte ta bort %s från indexet" -#: apply.c:4278 +#: apply.c:4304 #, c-format msgid "corrupt patch for submodule %s" msgstr "trasig patch för undermodulen %s" -#: apply.c:4284 +#: apply.c:4310 #, c-format msgid "unable to stat newly created file '%s'" msgstr "kan inte ta status på nyligen skapade filen \"%s\"" -#: apply.c:4292 +#: apply.c:4318 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s" -#: apply.c:4298 apply.c:4442 +#: apply.c:4324 apply.c:4468 #, c-format msgid "unable to add cache entry for %s" msgstr "kan inte lägga till cachepost för %s" -#: apply.c:4339 +#: apply.c:4365 #, c-format msgid "failed to write to '%s'" msgstr "misslyckades skriva till \"%s\"" -#: apply.c:4343 +#: apply.c:4369 #, c-format msgid "closing file '%s'" msgstr "stänger filen \"%s\"" -#: apply.c:4413 +#: apply.c:4439 #, c-format msgid "unable to write file '%s' mode %o" msgstr "kan inte skriva filen \"%s\" läge %o" -#: apply.c:4511 +#: apply.c:4537 #, c-format msgid "Applied patch %s cleanly." msgstr "Tillämpade patchen %s rent." -#: apply.c:4519 +#: apply.c:4545 msgid "internal error" msgstr "internt fel" -#: apply.c:4522 +#: apply.c:4548 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Tillämpade patchen %%s med %d refuserad..." msgstr[1] "Tillämpade patchen %%s med %d refuserade..." -#: apply.c:4533 +#: apply.c:4559 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "trunkerar .rej-filnamnet till %.*s.rej" -#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988 +#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010 #, c-format msgid "cannot open %s" msgstr "kan inte öppna %s" -#: apply.c:4555 +#: apply.c:4581 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Stycke %d tillämpades rent." -#: apply.c:4559 +#: apply.c:4585 #, c-format msgid "Rejected hunk #%d." msgstr "Refuserar stycke %d." -#: apply.c:4669 +#: apply.c:4695 #, c-format msgid "Skipped patch '%s'." msgstr "Ignorerar patch \"%s\"." -#: apply.c:4677 +#: apply.c:4703 msgid "unrecognized input" msgstr "indata känns inte igen" -#: apply.c:4696 +#: apply.c:4722 msgid "unable to read index file" msgstr "kan inte läsa indexfilen" -#: apply.c:4833 +#: apply.c:4859 #, c-format msgid "can't open patch '%s': %s" msgstr "kan inte öppna patchen \"%s\": %s" -#: apply.c:4860 +#: apply.c:4886 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "undertryckte %d fel i blanksteg" msgstr[1] "undertryckte %d fel i blanksteg" -#: apply.c:4866 apply.c:4881 +#: apply.c:4892 apply.c:4907 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d rad lägger till fel i blanksteg." msgstr[1] "%d rader lägger till fel i blanksteg." -#: apply.c:4874 +#: apply.c:4900 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "%d rad applicerade efter att ha rättat fel i blanksteg." msgstr[1] "%d rader applicerade efter att ha rättat fel i blanksteg." -#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391 +#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" -#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260 -#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187 -#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629 -#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973 -#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161 +#: apply.c:4947 apply.c:4950 builtin/am.c:2256 builtin/am.c:2259 +#: builtin/clone.c:116 builtin/fetch.c:115 builtin/pull.c:187 +#: builtin/submodule--helper.c:301 builtin/submodule--helper.c:622 +#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:992 +#: builtin/submodule--helper.c:995 builtin/submodule--helper.c:1212 #: git-add--interactive.perl:197 msgid "path" msgstr "sökväg" -#: apply.c:4922 +#: apply.c:4948 msgid "don't apply changes matching the given path" msgstr "tillämpa inte ändringar som motsvarar given sökväg" -#: apply.c:4925 +#: apply.c:4951 msgid "apply changes matching the given path" msgstr "tillämpa ändringar som motsvarar given sökväg" -#: apply.c:4927 builtin/am.c:2266 +#: apply.c:4953 builtin/am.c:2265 msgid "num" msgstr "antal" -#: apply.c:4928 +#: apply.c:4954 msgid "remove <num> leading slashes from traditional diff paths" msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar" -#: apply.c:4931 +#: apply.c:4957 msgid "ignore additions made by the patch" msgstr "ignorera tillägg gjorda av patchen" -#: apply.c:4933 +#: apply.c:4959 msgid "instead of applying the patch, output diffstat for the input" msgstr "istället för att tillämpa patchen, skriv ut diffstat för indata" -#: apply.c:4937 +#: apply.c:4963 msgid "show number of added and deleted lines in decimal notation" msgstr "visa antal tillagda och borttagna rader decimalt" -#: apply.c:4939 +#: apply.c:4965 msgid "instead of applying the patch, output a summary for the input" msgstr "istället för att tillämpa patchen, skriv ut en summering av indata" -#: apply.c:4941 +#: apply.c:4967 msgid "instead of applying the patch, see if the patch is applicable" msgstr "istället för att tillämpa patchen, se om patchen kan tillämpas" -#: apply.c:4943 +#: apply.c:4969 msgid "make sure the patch is applicable to the current index" msgstr "se till att patchen kan tillämpas på aktuellt index" -#: apply.c:4945 +#: apply.c:4971 msgid "apply a patch without touching the working tree" msgstr "tillämpa en patch utan att röra arbetskatalogen" -#: apply.c:4947 +#: apply.c:4973 msgid "accept a patch that touches outside the working area" msgstr "godta en patch som rör filer utanför arbetskatalogen" -#: apply.c:4949 +#: apply.c:4975 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "tillämpa också patchen (använd med --stat/--summary/--check)" -#: apply.c:4951 +#: apply.c:4977 msgid "attempt three-way merge if a patch does not apply" msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas" -#: apply.c:4953 +#: apply.c:4979 msgid "build a temporary index based on embedded index information" msgstr "bygg ett temporärt index baserat på inbyggd indexinformation" -#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515 +#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513 msgid "paths are separated with NUL character" msgstr "sökvägar avdelas med NUL-tecken" -#: apply.c:4958 +#: apply.c:4984 msgid "ensure at least <n> lines of context match" msgstr "se till att åtminstone <n> rader sammanhang är lika" -#: apply.c:4959 builtin/am.c:2245 +#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95 +#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99 msgid "action" msgstr "åtgärd" -#: apply.c:4960 +#: apply.c:4986 msgid "detect new or modified lines that have whitespace errors" msgstr "detektera nya eller ändrade rader som har fel i blanktecken" -#: apply.c:4963 apply.c:4966 +#: apply.c:4989 apply.c:4992 msgid "ignore changes in whitespace when finding context" msgstr "ignorera ändringar i blanktecken för sammanhang" -#: apply.c:4969 +#: apply.c:4995 msgid "apply the patch in reverse" msgstr "tillämpa patchen baklänges" -#: apply.c:4971 +#: apply.c:4997 msgid "don't expect at least one line of context" msgstr "förvänta inte minst en rad sammanhang" -#: apply.c:4973 +#: apply.c:4999 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "lämna refuserade stycken i motsvarande *.rej-filer" -#: apply.c:4975 +#: apply.c:5001 msgid "allow overlapping hunks" msgstr "tillåt överlappande stycken" -#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21 -#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651 -#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125 +#: apply.c:5002 builtin/add.c:272 builtin/check-ignore.c:21 +#: builtin/commit.c:1347 builtin/count-objects.c:96 builtin/fsck.c:640 +#: builtin/log.c:1889 builtin/mv.c:123 builtin/read-tree.c:125 msgid "be verbose" msgstr "var pratsam" -#: apply.c:4978 +#: apply.c:5004 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut" -#: apply.c:4981 +#: apply.c:5007 msgid "do not trust the line counts in the hunk headers" msgstr "lite inte på antalet linjer i styckehuvuden" -#: apply.c:4983 builtin/am.c:2254 +#: apply.c:5009 builtin/am.c:2253 msgid "root" msgstr "rot" -#: apply.c:4984 +#: apply.c:5010 msgid "prepend <root> to all filenames" msgstr "lägg till <rot> i alla filnamn" @@ -757,108 +758,108 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <arkiv> [--exec <kmd>] --list" -#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300 +#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer" -#: archive.c:418 +#: archive.c:436 msgid "fmt" msgstr "fmt" -#: archive.c:418 +#: archive.c:436 msgid "archive format" msgstr "arkivformat" -#: archive.c:419 builtin/log.c:1446 +#: archive.c:437 builtin/log.c:1452 msgid "prefix" msgstr "prefix" -#: archive.c:420 +#: archive.c:438 msgid "prepend prefix to each pathname in the archive" msgstr "lägg till prefix till varje sökväg i arkivet" -#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61 -#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080 -#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552 -#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120 +#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61 +#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:859 +#: builtin/hash-object.c:102 builtin/ls-files.c:547 builtin/ls-files.c:550 +#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120 #: parse-options.h:153 msgid "file" msgstr "fil" -#: archive.c:422 builtin/archive.c:89 +#: archive.c:440 builtin/archive.c:89 msgid "write the archive to this file" msgstr "skriv arkivet till filen" -#: archive.c:424 +#: archive.c:442 msgid "read .gitattributes in working directory" msgstr "läs .gitattributes i arbetskatalogen" -#: archive.c:425 +#: archive.c:443 msgid "report archived files on stderr" msgstr "rapportera arkiverade filer på standard fel" -#: archive.c:426 +#: archive.c:444 msgid "store only" msgstr "endast spara" -#: archive.c:427 +#: archive.c:445 msgid "compress faster" msgstr "komprimera snabbare" -#: archive.c:435 +#: archive.c:453 msgid "compress better" msgstr "komprimera bättre" -#: archive.c:438 +#: archive.c:456 msgid "list supported archive formats" msgstr "visa understödda arkivformat" -#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108 -#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982 +#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109 +#: builtin/submodule--helper.c:634 builtin/submodule--helper.c:1001 msgid "repo" msgstr "arkiv" -#: archive.c:441 builtin/archive.c:91 +#: archive.c:459 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "hämta arkivet från fjärrarkivet <arkiv>" -#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488 +#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489 msgid "command" msgstr "kommando" -#: archive.c:443 builtin/archive.c:93 +#: archive.c:461 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "sökväg till kommandot git-upload-archive på fjärren" -#: archive.c:450 +#: archive.c:468 msgid "Unexpected option --remote" msgstr "Oväntad flagga --remote" -#: archive.c:452 +#: archive.c:470 msgid "Option --exec can only be used together with --remote" msgstr "Flaggan --exec kan endast användas tillsammans med --remote" -#: archive.c:454 +#: archive.c:472 msgid "Unexpected option --output" msgstr "Oväntad flagga --output" -#: archive.c:476 +#: archive.c:494 #, c-format msgid "Unknown archive format '%s'" msgstr "Okänt arkivformat \"%s\"" -#: archive.c:483 +#: archive.c:501 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Argumentet stöd inte för formatet \"%s\": -%d" -#: attr.c:214 +#: attr.c:218 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%-*s är inte ett giltigt namn på attribut" -#: attr.c:410 +#: attr.c:415 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -936,31 +937,31 @@ msgstr "" msgid "Bisecting: a merge base must be tested\n" msgstr "Bisect: en sammanslagningsbas måste testas\n" -#: bisect.c:849 +#: bisect.c:850 #, c-format msgid "a %s revision is needed" msgstr "en %s-revision behövs" -#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256 +#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234 #, c-format msgid "could not create file '%s'" msgstr "kunde inte skapa filen \"%s\"" -#: bisect.c:917 +#: bisect.c:918 #, c-format msgid "could not read file '%s'" msgstr "kunde inte läsa filen \"%s\"" -#: bisect.c:947 +#: bisect.c:948 msgid "reading bisect refs failed" msgstr "misslyckades läsa bisect-referenser" -#: bisect.c:967 +#: bisect.c:968 #, c-format msgid "%s was both %s and %s\n" msgstr "%s var både %s och %s\n" -#: bisect.c:975 +#: bisect.c:976 #, c-format msgid "" "No testable commit found.\n" @@ -969,7 +970,7 @@ msgstr "" "Ingen testbar incheckning hittades.\n" "Kanske du startade med felaktiga sökvägsparametrar?\n" -#: bisect.c:994 +#: bisect.c:995 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -979,7 +980,7 @@ msgstr[1] "(ungefär %d steg)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1000 +#: bisect.c:1001 #, 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" @@ -1000,10 +1001,10 @@ msgstr "" "--reverse och --first-parent tillsammans kräver att du anger senaste " "incheckningen" -#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166 -#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907 -#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360 -#: builtin/shortlog.c:177 +#: blame.c:1797 bundle.c:169 ref-filter.c:1932 sequencer.c:1168 +#: sequencer.c:2351 builtin/commit.c:1065 builtin/log.c:357 builtin/log.c:911 +#: builtin/log.c:1361 builtin/log.c:1690 builtin/log.c:1938 builtin/merge.c:369 +#: builtin/shortlog.c:191 msgid "revision walk setup failed" msgstr "misslyckades skapa revisionstraversering" @@ -1044,45 +1045,50 @@ msgstr "Ställer inte in grenen %s som sin egen uppströmsgren." #: branch.c:93 #, c-format -msgid "Branch %s set up to track remote branch %s from %s by rebasing." +msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." msgstr "" -"Grenen %s ställdes in att spåra fjärrgrenen %s från %s genom ombasering." +"Grenen %s ställdes in att spåra fjärrgrenen \"%s\" från \"%s\" genom " +"ombasering." #: branch.c:94 #, c-format -msgid "Branch %s set up to track remote branch %s from %s." -msgstr "Grenen %s ställdes in att spåra fjärrgrenen %s från %s." +msgid "Branch '%s' set up to track remote branch '%s' from '%s'." +msgstr "Grenen %s ställdes in att spåra fjärrgrenen \"%s\" från \"%s\"." #: branch.c:98 #, c-format -msgid "Branch %s set up to track local branch %s by rebasing." -msgstr "Grenen %s ställdes in att spåra den lokala grenen %s genom ombasering." +msgid "Branch '%s' set up to track local branch '%s' by rebasing." +msgstr "" +"Grenen \"%s\" ställdes in att spåra den lokala grenen \"%s\" genom " +"ombasering." #: branch.c:99 #, c-format -msgid "Branch %s set up to track local branch %s." -msgstr "Grenen %s ställdes in att spåra den lokala grenen %s." +msgid "Branch '%s' set up to track local branch '%s'." +msgstr "Grenen \"%s\" ställdes in att spåra den lokala grenen \"%s\"." #: branch.c:104 #, c-format -msgid "Branch %s set up to track remote ref %s by rebasing." -msgstr "Grenen %s ställdes in att spåra fjärreferensen %s genom ombasering." +msgid "Branch '%s' set up to track remote ref '%s' by rebasing." +msgstr "" +"Grenen \"%s\" ställdes in att spåra fjärreferensen \"%s\" genom ombasering." #: branch.c:105 #, c-format -msgid "Branch %s set up to track remote ref %s." -msgstr "Grenen %s ställdes in att spåra fjärreferensen %s." +msgid "Branch '%s' set up to track remote ref '%s'." +msgstr "Grenen \"%s\" ställdes in att spåra fjärreferensen \"%s\"." #: branch.c:109 #, c-format -msgid "Branch %s set up to track local ref %s by rebasing." +msgid "Branch '%s' set up to track local ref '%s' by rebasing." msgstr "" -"Grenen %s ställdes in att spåra den lokala referensen %s genom ombasering." +"Grenen \"%s\" ställdes in att spåra den lokala referensen \"%s\" genom " +"ombasering." #: branch.c:110 #, c-format -msgid "Branch %s set up to track local ref %s." -msgstr "Grenen %s ställdes in att spåra den lokala referensen %s." +msgid "Branch '%s' set up to track local ref '%s'." +msgstr "Grenen \"%s\" ställdes in att spåra den lokala referensen \"%s\"." #: branch.c:119 msgid "Unable to write upstream branch configuration" @@ -1103,21 +1109,21 @@ msgstr "\"%s\" är inte ett giltigt grennamn." msgid "A branch named '%s' already exists." msgstr "Det finns redan en gren som heter ”%s”." -#: branch.c:198 +#: branch.c:197 msgid "Cannot force update the current branch." msgstr "Kan inte tvinga uppdatering av aktuell gren." -#: branch.c:218 +#: branch.c:217 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "Kan inte ställa in spårning; startpunkten \"%s\" är inte en gren." -#: branch.c:220 +#: branch.c:219 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "den efterfrågade uppströmsgrenen \"%s\" finns inte" -#: branch.c:222 +#: branch.c:221 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -1137,22 +1143,22 @@ msgstr "" "spåra dess fjärrmotsvarighet kan du använda \"git push -u\"\n" "för att ställa in uppströmskonfigurationen när du sänder in." -#: branch.c:265 +#: branch.c:264 #, c-format msgid "Not a valid object name: '%s'." msgstr "Objektnamnet är inte giltigt: \"%s\"." -#: branch.c:285 +#: branch.c:284 #, c-format msgid "Ambiguous object name: '%s'." msgstr "Objektnamnet är tvetydigt: \"%s\"." -#: branch.c:290 +#: branch.c:289 #, c-format msgid "Not a valid branch point: '%s'." msgstr "Avgreningspunkten är inte giltig: ”%s”." -#: branch.c:344 +#: branch.c:343 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "\"%s\" är redan utcheckad på \"%s\"" @@ -1172,7 +1178,9 @@ msgstr "'%s' ser inte ut som en v2-bundle-fil" msgid "unrecognized header: %s%s (%d)" msgstr "okänt huvud: %s%s (%d)" -#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778 +#: bundle.c:88 sequencer.c:1346 sequencer.c:1793 sequencer.c:2500 +#: sequencer.c:2583 sequencer.c:2609 sequencer.c:2687 sequencer.c:2807 +#: sequencer.c:2949 builtin/commit.c:782 #, c-format msgid "could not open '%s'" msgstr "kunde inte öppna \"%s\"" @@ -1181,56 +1189,56 @@ msgstr "kunde inte öppna \"%s\"" msgid "Repository lacks these prerequisite commits:" msgstr "Arkivet saknar dessa nödvändiga incheckningar:" -#: bundle.c:186 +#: bundle.c:193 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "Paketet (bundlen) innehåller denna referens:" msgstr[1] "Paketet (bundlen) innehåller dessa %d referenser:" -#: bundle.c:193 +#: bundle.c:200 msgid "The bundle records a complete history." msgstr "Paketet (bundlen) beskriver en komplett historik." -#: bundle.c:195 +#: bundle.c:202 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "Paketet (bundlen) kräver denna referens:" msgstr[1] "Paketet (bundlen) kräver dessa %d referenser:" -#: bundle.c:254 +#: bundle.c:261 msgid "Could not spawn pack-objects" msgstr "Kunde inte starta pack-objects" -#: bundle.c:265 +#: bundle.c:272 msgid "pack-objects died" msgstr "pack-objects misslyckades" -#: bundle.c:307 +#: bundle.c:314 msgid "rev-list died" msgstr "rev-list dog" -#: bundle.c:356 +#: bundle.c:363 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "referensen \"%s\" exkluderas av argumenten till rev-list" -#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282 +#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296 #, c-format msgid "unrecognized argument: %s" msgstr "okänt argument: %s" -#: bundle.c:454 +#: bundle.c:461 msgid "Refusing to create empty bundle." msgstr "Vägrar skapa ett tomt paket (bundle)." -#: bundle.c:466 +#: bundle.c:473 #, c-format msgid "cannot create '%s'" msgstr "kan inte skapa \"%s\"" -#: bundle.c:494 +#: bundle.c:501 msgid "index-pack died" msgstr "index-pack dog" @@ -1239,8 +1247,8 @@ msgstr "index-pack dog" msgid "invalid color value: %.*s" msgstr "felaktigt färgvärde: %.*s" -#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456 -#: builtin/am.c:1469 builtin/am.c:2107 +#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465 +#: builtin/am.c:1467 builtin/am.c:2105 #, c-format msgid "could not parse %s" msgstr "kunde inte tolka %s" @@ -1250,7 +1258,7 @@ msgstr "kunde inte tolka %s" msgid "%s %s is not a commit!" msgstr "%s %s är inte en incheckning!" -#: commit.c:1511 +#: commit.c:1517 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" @@ -1264,160 +1272,160 @@ msgstr "" msgid "memory exhausted" msgstr "minnet slut" -#: config.c:186 +#: config.c:187 msgid "relative config include conditionals must come from files" msgstr "relativa konfigureringsinkluderingsvillkor måste komma från filer" -#: config.c:720 +#: config.c:721 #, c-format msgid "bad config line %d in blob %s" msgstr "felaktig konfigurationsfil rad %d i blob:en %s" -#: config.c:724 +#: config.c:725 #, c-format msgid "bad config line %d in file %s" msgstr "felaktig konfigurationsfil rad %d i filen %s" -#: config.c:728 +#: config.c:729 #, c-format msgid "bad config line %d in standard input" msgstr "felaktig konfigurationsfil rad %d i standard in" -#: config.c:732 +#: config.c:733 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s" -#: config.c:736 +#: config.c:737 #, c-format msgid "bad config line %d in command line %s" msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s" -#: config.c:740 +#: config.c:741 #, c-format msgid "bad config line %d in %s" msgstr "felaktig konfigurationsfil rad %d i %s" -#: config.c:868 +#: config.c:869 msgid "out of range" msgstr "utanför intervallet" -#: config.c:868 +#: config.c:869 msgid "invalid unit" msgstr "ogiltig enhet" -#: config.c:874 +#: config.c:875 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s" -#: config.c:879 +#: config.c:880 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "" "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i blob:en %s: %s" -#: config.c:882 +#: config.c:883 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i filen %s: %s" -#: config.c:885 +#: config.c:886 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i standard in: %s" -#: config.c:888 +#: config.c:889 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i undermodul-blob:" "en %s: %s" -#: config.c:891 +#: config.c:892 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i kommandoraden " "%s: %s" -#: config.c:894 +#: config.c:895 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: %s" -#: config.c:989 +#: config.c:990 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "misslyckades expandera användarkatalog i: \"%s\"" -#: config.c:1084 config.c:1095 +#: config.c:1085 config.c:1096 #, c-format msgid "bad zlib compression level %d" msgstr "felaktigt zlib-komprimeringsgrad %d" -#: config.c:1212 +#: config.c:1213 #, c-format msgid "invalid mode for object creation: %s" msgstr "felaktigt läge för skapande av objekt: %s" -#: config.c:1368 +#: config.c:1372 #, c-format msgid "bad pack compression level %d" msgstr "felaktig paketkomprimeringsgrad %d" -#: config.c:1564 +#: config.c:1568 msgid "unable to parse command-line config" msgstr "kan inte tolka kommandoradskonfiguration" -#: config.c:1894 +#: config.c:1900 msgid "unknown error occurred while reading the configuration files" msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna" -#: config.c:2064 +#: config.c:2087 #, c-format msgid "Invalid %s: '%s'" msgstr "Felaktigt %s: \"%s\"" -#: config.c:2085 +#: config.c:2130 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "" "okänt värde \"%s\" för core.untrackedCache; använder standardvärdet \"keep\"" -#: config.c:2111 +#: config.c:2156 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "värdet \"%d\" för splitIndex.maxPercentage borde vara mellan 0 och 100" -#: config.c:2122 +#: config.c:2167 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration" -#: config.c:2124 +#: config.c:2169 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" på rad %d" -#: config.c:2183 +#: config.c:2228 #, c-format msgid "%s has multiple values" msgstr "%s har flera värden" -#: config.c:2517 config.c:2745 +#: config.c:2571 config.c:2789 #, c-format msgid "fstat on %s failed" msgstr "fstat misslyckades på %s" -#: config.c:2635 +#: config.c:2678 #, c-format msgid "could not set '%s' to '%s'" msgstr "kunde inte ställa in \"%s\" till \"%s\"" -#: config.c:2637 builtin/remote.c:775 +#: config.c:2680 builtin/remote.c:776 #, c-format msgid "could not unset '%s'" msgstr "kunde inte ta bort inställning för \"%s\"" @@ -1440,19 +1448,19 @@ msgstr "" # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141 +#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141 msgid "Checking connectivity" msgstr "Kontrollerar konnektivitet" -#: connected.c:75 +#: connected.c:76 msgid "Could not run 'git rev-list'" msgstr "Kunde inte köra \"git rev-list\"" -#: connected.c:95 +#: connected.c:96 msgid "failed write to rev-list" msgstr "kunde inte skriva till rev-list" -#: connected.c:102 +#: connected.c:103 msgid "failed to close rev-list's stdin" msgstr "kunde inte stänga rev-list:s standard in" @@ -1488,19 +1496,69 @@ msgstr "LF skulle ersättas av CRLF i %s" msgid "in the future" msgstr "i framtiden" -#: date.c:122 date.c:129 date.c:136 date.c:143 date.c:149 date.c:156 date.c:167 -#: date.c:175 date.c:180 -msgid "%" -msgid_plural "%" -msgstr[0] "%" -msgstr[1] "%" +#: date.c:122 +#, c-format +msgid "%<PRIuMAX> second ago" +msgid_plural "%<PRIuMAX> seconds ago" +msgstr[0] "%<PRIuMAX> sekund sedan" +msgstr[1] "%<PRIuMAX> sekunder sedan" + +#: date.c:129 +#, c-format +msgid "%<PRIuMAX> minute ago" +msgid_plural "%<PRIuMAX> minutes ago" +msgstr[0] "%<PRIuMAX> minut sedan" +msgstr[1] "%<PRIuMAX> minuter sedan" + +#: date.c:136 +#, c-format +msgid "%<PRIuMAX> hour ago" +msgid_plural "%<PRIuMAX> hours ago" +msgstr[0] "%<PRIuMAX> timme sedan" +msgstr[1] "%<PRIuMAX> timmar sedan" + +#: date.c:143 +#, c-format +msgid "%<PRIuMAX> day ago" +msgid_plural "%<PRIuMAX> days ago" +msgstr[0] "%<PRIuMAX> dag sedan" +msgstr[1] "%<PRIuMAX> dagar sedan" + +#: date.c:149 +#, c-format +msgid "%<PRIuMAX> week ago" +msgid_plural "%<PRIuMAX> weeks ago" +msgstr[0] "%<PRIuMAX> vecka sedan" +msgstr[1] "%<PRIuMAX> veckor sedan" + +#: date.c:156 +#, c-format +msgid "%<PRIuMAX> month ago" +msgid_plural "%<PRIuMAX> months ago" +msgstr[0] "%<PRIuMAX> månad sedan" +msgstr[1] "%<PRIuMAX> månader sedan" + +#: date.c:167 +#, c-format +msgid "%<PRIuMAX> year" +msgid_plural "%<PRIuMAX> years" +msgstr[0] "%<PRIuMAX> år" +msgstr[1] "%<PRIuMAX> år" #. TRANSLATORS: "%s" is "<n> years" #: date.c:170 -msgid "%s, %" -msgid_plural "%s, %" -msgstr[0] "%s. %" -msgstr[1] "%s. %" +#, c-format +msgid "%s, %<PRIuMAX> month ago" +msgid_plural "%s, %<PRIuMAX> months ago" +msgstr[0] "%s, %<PRIuMAX> månad sedan" +msgstr[1] "%s, %<PRIuMAX> månader sedan" + +#: date.c:175 date.c:180 +#, c-format +msgid "%<PRIuMAX> year ago" +msgid_plural "%<PRIuMAX> years ago" +msgstr[0] "%<PRIuMAX> år sedan" +msgstr[1] "%<PRIuMAX> år sedan" #: diffcore-order.c:24 #, c-format @@ -1511,27 +1569,35 @@ msgstr "kunde inte läsa orderfilen \"%s\"" msgid "Performing inexact rename detection" msgstr "Utför onöjaktig namnbytesdetektering" -#: diff.c:63 +#: diff.c:74 #, c-format msgid "option '%s' requires a value" msgstr "flaggan \"%s\" behöver ett värde" -#: diff.c:125 +#: diff.c:152 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n" -#: diff.c:130 +#: diff.c:157 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Okänd dirstat-parameter \"%s\"\n" -#: diff.c:282 +#: diff.c:281 +msgid "" +"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', " +"'plain'" +msgstr "" +"färginställningen för flyttade block måste vara en av \"no\", \"default\", " +"\"zebra\", \"dimmed_zebra\", \"plain\"" + +#: diff.c:341 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\"" -#: diff.c:342 +#: diff.c:398 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -1540,20 +1606,20 @@ msgstr "" "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" "%s" -#: diff.c:3101 +#: diff.c:3861 #, c-format msgid "external diff died, stopping at %s" msgstr "extern diff dog, stannar vid %s" -#: diff.c:3427 +#: diff.c:4189 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, -check och -s är ömsesidigt uteslutande" -#: diff.c:3517 +#: diff.c:4279 msgid "--follow requires exactly one pathspec" msgstr "--follow kräver exakt en sökvägsangivelse" -#: diff.c:3680 +#: diff.c:4445 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -1562,228 +1628,232 @@ msgstr "" "Misslyckades tolka argument till flaggan --dirstat/-X;\n" "%s" -#: diff.c:3694 +#: diff.c:4459 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\"" -#: diff.c:4716 +#: diff.c:5505 msgid "inexact rename detection was skipped due to too many files." msgstr "" "onöjaktig namnbytesdetektering utfördes inte på grund av för många filer." -#: diff.c:4719 +#: diff.c:5508 msgid "only found copies from modified paths due to too many files." msgstr "hittade bara kopior från ändrade sökvägar på grund av för många filer." -#: diff.c:4722 +#: diff.c:5511 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "" "du kan sätta variabeln %s till åtminstone %d och försöka kommandot på nytt." -#: dir.c:1948 +#: dir.c:1983 msgid "failed to get kernel name and information" msgstr "misslyckades hämta kärnans namn och information" -#: dir.c:2067 +#: dir.c:2102 msgid "Untracked cache is disabled on this system or location." msgstr "Ospårad cache är inaktiverad på systemet eller platsen." -#: dir.c:2846 dir.c:2851 +#: dir.c:2885 dir.c:2890 #, c-format msgid "could not create directories for %s" msgstr "kunde inte skapa kataloger för %s" -#: dir.c:2876 +#: dir.c:2915 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\"" -#: entry.c:281 +#: entry.c:176 +msgid "Filtering content" +msgstr "Filtrerar innehåll" + +#: entry.c:417 #, c-format msgid "could not stat file '%s'" msgstr "kunde inte ta status på filen \"%s\"" -#: fetch-pack.c:251 +#: fetch-pack.c:252 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: förväntade grund lista" -#: fetch-pack.c:263 +#: fetch-pack.c:264 msgid "git fetch-pack: expected ACK/NAK, got EOF" msgstr "git fetch-patch: förväntade ACK/NAK, fick EOF" -#: fetch-pack.c:282 builtin/archive.c:63 +#: fetch-pack.c:283 builtin/archive.c:63 #, c-format msgid "remote error: %s" msgstr "fjärrfel: %s" -#: fetch-pack.c:283 +#: fetch-pack.c:284 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: förväntade ACK/NAK, fick \"%s\"" -#: fetch-pack.c:335 +#: fetch-pack.c:336 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc kräver ”multi_ack_detailed”" -#: fetch-pack.c:421 +#: fetch-pack.c:422 #, c-format msgid "invalid shallow line: %s" msgstr "ogiltig \"shallow\"-rad: %s" -#: fetch-pack.c:427 +#: fetch-pack.c:428 #, c-format msgid "invalid unshallow line: %s" msgstr "ogiltig \"unshallow\"-rad: %s" -#: fetch-pack.c:429 +#: fetch-pack.c:430 #, c-format msgid "object not found: %s" msgstr "objektet hittades inte: %s" -#: fetch-pack.c:432 +#: fetch-pack.c:433 #, c-format msgid "error in object: %s" msgstr "fel i objekt: %s" -#: fetch-pack.c:434 +#: fetch-pack.c:435 #, c-format msgid "no shallow found: %s" msgstr "ingen \"shallow\" hittades: %s" -#: fetch-pack.c:437 +#: fetch-pack.c:438 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "förväntade shallow/unshallow, fick %s" -#: fetch-pack.c:476 +#: fetch-pack.c:477 #, c-format msgid "got %s %d %s" msgstr "fick %s %d %s" -#: fetch-pack.c:490 +#: fetch-pack.c:491 #, c-format msgid "invalid commit %s" msgstr "ogiltig incheckning %s" -#: fetch-pack.c:523 +#: fetch-pack.c:524 msgid "giving up" msgstr "ger upp" -#: fetch-pack.c:533 progress.c:235 +#: fetch-pack.c:534 progress.c:242 msgid "done" msgstr "klart" -#: fetch-pack.c:545 +#: fetch-pack.c:546 #, c-format msgid "got %s (%d) %s" msgstr "fick %s (%d) %s" -#: fetch-pack.c:591 +#: fetch-pack.c:592 #, c-format msgid "Marking %s as complete" msgstr "Markerar %s som komplett" -#: fetch-pack.c:775 +#: fetch-pack.c:776 #, c-format msgid "already have %s (%s)" msgstr "har redan %s (%s)" -#: fetch-pack.c:813 +#: fetch-pack.c:814 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare" -#: fetch-pack.c:821 +#: fetch-pack.c:822 msgid "protocol error: bad pack header" msgstr "protokollfel: felaktigt packhuvud" -#: fetch-pack.c:877 +#: fetch-pack.c:878 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-patch: kunde inte grena av %s" -#: fetch-pack.c:893 +#: fetch-pack.c:894 #, c-format msgid "%s failed" msgstr "%s misslyckades" -#: fetch-pack.c:895 +#: fetch-pack.c:896 msgid "error in sideband demultiplexer" msgstr "fel i sidbands-avmultiplexare" -#: fetch-pack.c:922 +#: fetch-pack.c:923 msgid "Server does not support shallow clients" msgstr "Servern stöder inte klienter med grunda arkiv" -#: fetch-pack.c:926 +#: fetch-pack.c:927 msgid "Server supports multi_ack_detailed" msgstr "Servern stöder \"multi_ack_detailed\"" -#: fetch-pack.c:929 +#: fetch-pack.c:930 msgid "Server supports no-done" msgstr "Servern stöder \"no-done\"" -#: fetch-pack.c:935 +#: fetch-pack.c:936 msgid "Server supports multi_ack" msgstr "Servern stöder \"multi_ack\"" -#: fetch-pack.c:939 +#: fetch-pack.c:940 msgid "Server supports side-band-64k" msgstr "Servern stöder \"side-band-64k\"" -#: fetch-pack.c:943 +#: fetch-pack.c:944 msgid "Server supports side-band" msgstr "Servern stöder \"side-band\"" -#: fetch-pack.c:947 +#: fetch-pack.c:948 msgid "Server supports allow-tip-sha1-in-want" msgstr "Servern stöder \"allow-tip-sha1-in-want\"" -#: fetch-pack.c:951 +#: fetch-pack.c:952 msgid "Server supports allow-reachable-sha1-in-want" msgstr "Servern stöder \"allow-reachable-sha1-in-want\"" -#: fetch-pack.c:961 +#: fetch-pack.c:962 msgid "Server supports ofs-delta" msgstr "Servern stöder \"ofs-delta\"" -#: fetch-pack.c:968 +#: fetch-pack.c:969 #, c-format msgid "Server version is %.*s" msgstr "Serverversionen är %.*s" -#: fetch-pack.c:974 +#: fetch-pack.c:975 msgid "Server does not support --shallow-since" msgstr "Servern stöder inte --shallow-since" -#: fetch-pack.c:978 +#: fetch-pack.c:979 msgid "Server does not support --shallow-exclude" msgstr "Servern stöder inte --shallow-exclude" -#: fetch-pack.c:980 +#: fetch-pack.c:981 msgid "Server does not support --deepen" msgstr "Servern stöder inte --deepen" -#: fetch-pack.c:991 +#: fetch-pack.c:992 msgid "no common commits" msgstr "inga gemensamma incheckningar" -#: fetch-pack.c:1003 +#: fetch-pack.c:1004 msgid "git fetch-pack: fetch failed." msgstr "git fetch-patch: hämtning misslyckades." -#: fetch-pack.c:1165 +#: fetch-pack.c:1166 msgid "no matching remote head" msgstr "inget motsvarande fjärrhuvud" -#: fetch-pack.c:1187 +#: fetch-pack.c:1188 #, c-format msgid "no such remote ref %s" msgstr "ingen sådan fjärreferens: %s" -#: fetch-pack.c:1190 +#: fetch-pack.c:1191 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Servern tillåter inte förfrågan om ej tillkännagivet objekt %s" @@ -1796,7 +1866,7 @@ msgstr "gpg misslyckades signera data" msgid "could not create temporary file" msgstr "kunde inte skapa temporära fil" -#: gpg-interface.c:213 +#: gpg-interface.c:214 #, c-format msgid "failed writing detached signature to '%s'" msgstr "misslyckades skriva fristående signatur till \"%s\"" @@ -1806,17 +1876,17 @@ msgstr "misslyckades skriva fristående signatur till \"%s\"" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "ignorera felaktig färg \"%.*s\" i log.graphColors" -#: grep.c:1981 +#: grep.c:1970 #, c-format msgid "'%s': unable to read %s" msgstr "\"%s\" kunde inte läsa %s" -#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134 +#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134 #, c-format msgid "failed to stat '%s'" msgstr "misslyckades ta status på \"%s\"" -#: grep.c:2009 +#: grep.c:1998 #, c-format msgid "'%s': short read" msgstr "\"%s\": kort läsning" @@ -1959,12 +2029,12 @@ msgstr "tomt ident-namn (för <%s>) ej tillåtet" msgid "name consists only of disallowed characters: %s" msgstr "namnet består enbart av ej tillåtna tecken: %s" -#: ident.c:416 builtin/commit.c:612 +#: ident.c:416 builtin/commit.c:616 #, c-format msgid "invalid date format: %s" msgstr "felaktigt datumformat: %s" -#: lockfile.c:152 +#: lockfile.c:151 #, c-format msgid "" "Unable to create '%s.lock': %s.\n" @@ -1984,7 +2054,7 @@ msgstr "" "tidigare:\n" "ta bort filen manuellt för att fortsätta." -#: lockfile.c:160 +#: lockfile.c:159 #, c-format msgid "Unable to create '%s.lock': %s" msgstr "Kunde inte skapa \"%s.lock\": %s" @@ -1993,78 +2063,78 @@ msgstr "Kunde inte skapa \"%s.lock\": %s" msgid "failed to read the cache" msgstr "misslyckades läsa cachen" -#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377 -#: builtin/checkout.c:591 builtin/clone.c:753 +#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380 +#: builtin/checkout.c:595 builtin/clone.c:754 msgid "unable to write new index file" msgstr "kunde inte skriva ny indexfil" -#: merge-recursive.c:210 +#: merge-recursive.c:235 msgid "(bad commit)\n" msgstr "(felaktig incheckning)\n" -#: merge-recursive.c:232 merge-recursive.c:240 +#: merge-recursive.c:257 merge-recursive.c:265 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "addinfo_cache misslyckades för sökvägen \"%s\"" -#: merge-recursive.c:304 +#: merge-recursive.c:329 msgid "error building trees" msgstr "fel vid byggande av träd" -#: merge-recursive.c:728 +#: merge-recursive.c:752 #, c-format msgid "failed to create path '%s'%s" msgstr "misslyckades skapa sökvägen \"%s\"%s" -#: merge-recursive.c:739 +#: merge-recursive.c:763 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Tar bort %s för att göra plats för underkatalog\n" -#: merge-recursive.c:753 merge-recursive.c:772 +#: merge-recursive.c:777 merge-recursive.c:796 msgid ": perhaps a D/F conflict?" msgstr ": kanske en K/F-konflikt?" -#: merge-recursive.c:762 +#: merge-recursive.c:786 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "vägrar förlora ospårad fil vid \"%s\"" -#: merge-recursive.c:804 builtin/cat-file.c:36 +#: merge-recursive.c:828 builtin/cat-file.c:37 #, c-format msgid "cannot read object %s '%s'" msgstr "kan inte läsa objektet %s: \"%s\"" -#: merge-recursive.c:806 +#: merge-recursive.c:830 #, c-format msgid "blob expected for %s '%s'" msgstr "blob förväntades för %s \"%s\"" -#: merge-recursive.c:830 +#: merge-recursive.c:854 #, c-format msgid "failed to open '%s': %s" msgstr "misslyckades öppna \"%s\": %s" -#: merge-recursive.c:841 +#: merge-recursive.c:865 #, c-format msgid "failed to symlink '%s': %s" msgstr "misslyckades skapa symboliska länken \"%s\": %s" -#: merge-recursive.c:846 +#: merge-recursive.c:870 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "vet inte hur %06o %s \"%s\" skall hanteras" -#: merge-recursive.c:986 +#: merge-recursive.c:1010 msgid "Failed to execute internal merge" msgstr "Misslyckades exekvera intern sammanslagning" -#: merge-recursive.c:990 +#: merge-recursive.c:1014 #, c-format msgid "Unable to add %s to database" msgstr "Kunde inte lägga till %s till databasen" -#: merge-recursive.c:1093 +#: merge-recursive.c:1117 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2073,7 +2143,7 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad " "i trädet." -#: merge-recursive.c:1098 +#: merge-recursive.c:1122 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -2082,7 +2152,7 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av " "%s lämnad i trädet." -#: merge-recursive.c:1105 +#: merge-recursive.c:1129 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2091,7 +2161,7 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad " "i trädet vid %s." -#: merge-recursive.c:1110 +#: merge-recursive.c:1134 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -2100,20 +2170,20 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av " "%s lämnad i trädet vid %s." -#: merge-recursive.c:1144 +#: merge-recursive.c:1168 msgid "rename" msgstr "namnbyte" -#: merge-recursive.c:1144 +#: merge-recursive.c:1168 msgid "renamed" msgstr "namnbytt" -#: merge-recursive.c:1201 +#: merge-recursive.c:1225 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s är en katalog i %s lägger till som %s istället" -#: merge-recursive.c:1226 +#: merge-recursive.c:1250 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -2122,139 +2192,139 @@ msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" " "namnbyte \"%s\"->\"%s\" i \"%s\"%s" -#: merge-recursive.c:1231 +#: merge-recursive.c:1255 msgid " (left unresolved)" msgstr " (lämnad olöst)" -#: merge-recursive.c:1293 +#: merge-recursive.c:1317 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbyte %s->%s i %s. Namnbyte %s->%s i %s" -#: merge-recursive.c:1326 +#: merge-recursive.c:1350 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "Byter namn på %s till %s och %s till %s istället" -#: merge-recursive.c:1529 +#: merge-recursive.c:1553 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. %s tillagd i %s" -#: merge-recursive.c:1544 +#: merge-recursive.c:1568 #, c-format msgid "Adding merged %s" msgstr "Lägger till sammanslagen %s" -#: merge-recursive.c:1551 merge-recursive.c:1781 +#: merge-recursive.c:1575 merge-recursive.c:1805 #, c-format msgid "Adding as %s instead" msgstr "Lägger till som %s istället" -#: merge-recursive.c:1608 +#: merge-recursive.c:1632 #, c-format msgid "cannot read object %s" msgstr "kan inte läsa objektet %s" -#: merge-recursive.c:1611 +#: merge-recursive.c:1635 #, c-format msgid "object %s is not a blob" msgstr "objektet %s är inte en blob" -#: merge-recursive.c:1680 +#: merge-recursive.c:1704 msgid "modify" msgstr "ändra" -#: merge-recursive.c:1680 +#: merge-recursive.c:1704 msgid "modified" msgstr "ändrad" -#: merge-recursive.c:1690 +#: merge-recursive.c:1714 msgid "content" msgstr "innehåll" -#: merge-recursive.c:1697 +#: merge-recursive.c:1721 msgid "add/add" msgstr "tillägg/tillägg" -#: merge-recursive.c:1733 +#: merge-recursive.c:1757 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Hoppade över %s (sammanslagen samma som befintlig)" -#: merge-recursive.c:1747 +#: merge-recursive.c:1771 #, c-format msgid "Auto-merging %s" msgstr "Slår ihop %s automatiskt" -#: merge-recursive.c:1751 git-submodule.sh:945 +#: merge-recursive.c:1775 git-submodule.sh:944 msgid "submodule" msgstr "undermodul" -#: merge-recursive.c:1752 +#: merge-recursive.c:1776 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s" -#: merge-recursive.c:1846 +#: merge-recursive.c:1870 #, c-format msgid "Removing %s" msgstr "Tar bort %s" -#: merge-recursive.c:1872 +#: merge-recursive.c:1896 msgid "file/directory" msgstr "fil/katalog" -#: merge-recursive.c:1878 +#: merge-recursive.c:1902 msgid "directory/file" msgstr "katalog/fil" -#: merge-recursive.c:1884 +#: merge-recursive.c:1908 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "KONFLIKT (%s): Det finns en katalog med namnet %s i %s. Lägger till %s som %s" -#: merge-recursive.c:1893 +#: merge-recursive.c:1917 #, c-format msgid "Adding %s" msgstr "Lägger till %s" -#: merge-recursive.c:1930 -msgid "Already up-to-date!" +#: merge-recursive.c:1954 +msgid "Already up to date!" msgstr "Redan à jour!" -#: merge-recursive.c:1939 +#: merge-recursive.c:1963 #, c-format msgid "merging of trees %s and %s failed" msgstr "sammanslagning av träden %s och %s misslyckades" -#: merge-recursive.c:2022 +#: merge-recursive.c:2060 msgid "Merging:" msgstr "Slår ihop:" -#: merge-recursive.c:2035 +#: merge-recursive.c:2073 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "hittade %u gemensam förfader:" msgstr[1] "hittade %u gemensamma förfäder:" -#: merge-recursive.c:2074 +#: merge-recursive.c:2112 msgid "merge returned no commit" msgstr "sammanslagningen returnerade ingen incheckning" -#: merge-recursive.c:2137 +#: merge-recursive.c:2175 #, c-format msgid "Could not parse object '%s'" msgstr "Kunde inte tolka objektet \"%s\"" -#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793 +#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." -#: notes-merge.c:273 +#: notes-merge.c:272 #, c-format msgid "" "You have not concluded your previous notes merge (%s exists).\n" @@ -2266,7 +2336,7 @@ msgstr "" "att checka in eller avbryta föregående sammanslagning innan du påbörjar en " "ny antecknings-sammanslagning." -#: notes-merge.c:280 +#: notes-merge.c:279 #, c-format msgid "You have not concluded your notes merge (%s exists)." msgstr "Du har inte avslutat antecknings-sammanslagningen (%s finns)." @@ -2294,16 +2364,30 @@ msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)" msgid "Bad %s value: '%s'" msgstr "Felaktigt värde på %s: \"%s\"" -#: object.c:240 +#: object.c:239 #, c-format msgid "unable to parse object: %s" msgstr "kunde inte tolka objektet: %s" +#: packfile.c:556 +msgid "offset before end of packfile (broken .idx?)" +msgstr "offset före slutet av packfilen (trasig .idx?)" + +#: packfile.c:1683 +#, c-format +msgid "offset before start of pack index for %s (corrupt index?)" +msgstr "offset före slutet av packindex för %s (trasigt index?)" + +#: packfile.c:1687 +#, c-format +msgid "offset beyond end of pack index for %s (truncated index?)" +msgstr "offset borton slutet av packindex för %s (trunkerat index?)" + #: parse-options.c:573 msgid "..." msgstr "..." -#: parse-options.c:591 +#: parse-options.c:592 #, c-format msgid "usage: %s" msgstr "användning: %s" @@ -2311,17 +2395,17 @@ msgstr "användning: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:597 +#: parse-options.c:598 #, c-format msgid " or: %s" msgstr " eller: %s" -#: parse-options.c:600 +#: parse-options.c:601 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:634 +#: parse-options.c:640 msgid "-NUM" msgstr "-TAL" @@ -2330,7 +2414,7 @@ msgstr "-TAL" msgid "malformed object name '%s'" msgstr "felformat objektnamn \"%s\"" -#: path.c:890 +#: path.c:891 #, c-format msgid "Could not make %s writable by group" msgstr "Kunde inte göra %s skrivbar för gruppen" @@ -2404,7 +2488,7 @@ msgstr "\"%s\" (minnesstöd: \"%c\")" msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: sökvägsuttrycket hanteras inte av det här kommandot: %s" -#: pathspec.c:575 +#: pathspec.c:571 msgid "" "empty strings as pathspecs will be made invalid in upcoming releases. please " "use . instead if you meant to match all paths" @@ -2412,12 +2496,12 @@ msgstr "" "tomma strängar som sökvägsangivelser kommer bli ogiltiga i en kommande " "utgåva. använd istället . om du vill träffa alla sökvägar" -#: pathspec.c:599 +#: pathspec.c:595 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk" -#: pretty.c:963 +#: pretty.c:962 msgid "unable to parse --pretty format" msgstr "kunde inte tolka format för --pretty" @@ -2439,50 +2523,51 @@ msgstr "" "GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:2308 builtin/merge.c:1019 +#: read-cache.c:2316 builtin/merge.c:1046 #, c-format msgid "could not close '%s'" msgstr "kunde inte stänga \"%s\"" -#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054 +#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077 #, c-format msgid "could not stat '%s'" msgstr "kunde inte ta status på \"%s\"" -#: read-cache.c:2396 +#: read-cache.c:2407 #, c-format msgid "unable to open git dir: %s" msgstr "kunde inte öppna git-katalog: %s" -#: read-cache.c:2408 +#: read-cache.c:2419 #, c-format msgid "unable to unlink: %s" msgstr "misslyckades ta bort länken: %s" -#: refs.c:622 +#: refs.c:638 #, c-format msgid "Could not open '%s' for writing" msgstr "Kunde inte öppna \"%s\" för skrivning" -#: refs.c:1769 +#: refs.c:1779 msgid "ref updates forbidden inside quarantine environment" msgstr "referensuppdateringar förbjudna i karantänmiljö" -#: refs/files-backend.c:1664 +#: refs/files-backend.c:1136 +#, c-format +msgid "could not remove reference %s" +msgstr "kunde inte ta bort referensen %s" + +#: refs/files-backend.c:1150 refs/packed-backend.c:1430 +#: refs/packed-backend.c:1440 #, c-format msgid "could not delete reference %s: %s" msgstr "kunde inte ta bort referensen %s: %s" -#: refs/files-backend.c:1667 +#: refs/files-backend.c:1153 refs/packed-backend.c:1443 #, c-format msgid "could not delete references: %s" msgstr "kunde inte ta bort referenser: %s" -#: refs/files-backend.c:1676 -#, c-format -msgid "could not remove reference %s" -msgstr "kunde inte ta bort referensen %s" - #: ref-filter.c:35 wt-status.c:1811 msgid "gone" msgstr "försvunnen" @@ -2502,157 +2587,157 @@ msgstr "bakom %d" msgid "ahead %d, behind %d" msgstr "före %d, bakom %d" -#: ref-filter.c:105 +#: ref-filter.c:104 #, c-format msgid "expected format: %%(color:<color>)" msgstr "förväntat format: %%(color:<color>)" -#: ref-filter.c:107 +#: ref-filter.c:106 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "okänd färg: %%(color:%s)" -#: ref-filter.c:121 +#: ref-filter.c:126 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Heltalsvärde förväntades refname:lstrip=%s" -#: ref-filter.c:125 +#: ref-filter.c:130 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Heltalsvärde förväntades refname:rstrip=%s" -#: ref-filter.c:127 +#: ref-filter.c:132 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "okänt %%(%s)-argument: %s" -#: ref-filter.c:167 +#: ref-filter.c:172 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) tar inte argument" -#: ref-filter.c:174 +#: ref-filter.c:179 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) tar inte argument" -#: ref-filter.c:181 +#: ref-filter.c:186 #, c-format msgid "%%(trailers) does not take arguments" msgstr "%%(trailers) tar inte argument" -#: ref-filter.c:200 +#: ref-filter.c:205 #, c-format msgid "positive value expected contents:lines=%s" msgstr "positivt värde förväntat contents:lines=%s" -#: ref-filter.c:202 +#: ref-filter.c:207 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "okänt %%(contents)-argument: %s" -#: ref-filter.c:215 +#: ref-filter.c:220 #, c-format msgid "positive value expected objectname:short=%s" msgstr "positivt värde förväntat objectname:short=%s" -#: ref-filter.c:219 +#: ref-filter.c:224 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "okänt %%(objectname)-argument: %s" -#: ref-filter.c:246 +#: ref-filter.c:251 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "förväntat format: %%(align:<bredd>,<position>)" -#: ref-filter.c:258 +#: ref-filter.c:263 #, c-format msgid "unrecognized position:%s" msgstr "okänd position:%s" -#: ref-filter.c:262 +#: ref-filter.c:267 #, c-format msgid "unrecognized width:%s" msgstr "okänd bredd:%s" -#: ref-filter.c:268 +#: ref-filter.c:273 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "okänt %%(align)-argument: %s" -#: ref-filter.c:272 +#: ref-filter.c:277 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "positiv bredd förväntad med atomen %%(align)" -#: ref-filter.c:287 +#: ref-filter.c:292 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "okänt %%(if)-argument: %s" -#: ref-filter.c:378 +#: ref-filter.c:382 #, c-format msgid "malformed field name: %.*s" msgstr "felformat fältnamn: %.*s" -#: ref-filter.c:404 +#: ref-filter.c:408 #, c-format msgid "unknown field name: %.*s" msgstr "okänt fältnamn: %.*s" -#: ref-filter.c:508 +#: ref-filter.c:520 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "format: atomen %%(if) använd utan en %%(then)-atom" -#: ref-filter.c:568 +#: ref-filter.c:580 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "format: atomen %%(then) använd utan en %%(if)-atom" -#: ref-filter.c:570 +#: ref-filter.c:582 #, c-format msgid "format: %%(then) atom used more than once" msgstr "format: atomen %%(then) använd mer än en gång" -#: ref-filter.c:572 +#: ref-filter.c:584 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "format: atomen %%(then) använd efter %%(else)" -#: ref-filter.c:598 +#: ref-filter.c:610 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "format: atomen %%(else) använd utan en %%(if)-atom" -#: ref-filter.c:600 +#: ref-filter.c:612 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "format: atomen %%(else) använd utan en %%(then)-atom" -#: ref-filter.c:602 +#: ref-filter.c:614 #, c-format msgid "format: %%(else) atom used more than once" msgstr "format: atomen %%(else) använd mer än en gång" -#: ref-filter.c:615 +#: ref-filter.c:627 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "format: atomen %%(end) använd utan motsvarande atom" -#: ref-filter.c:670 +#: ref-filter.c:682 #, c-format msgid "malformed format string %s" msgstr "felformad formatsträng %s" -#: ref-filter.c:1254 +#: ref-filter.c:1268 #, c-format msgid "(no branch, rebasing %s)" msgstr "(ingen gren, ombaserar %s)" -#: ref-filter.c:1257 +#: ref-filter.c:1271 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(ingen gren, \"bisect\" startad på %s)" @@ -2660,7 +2745,7 @@ msgstr "(ingen gren, \"bisect\" startad på %s)" #. TRANSLATORS: make sure this matches "HEAD #. detached at " in wt-status.c #. -#: ref-filter.c:1265 +#: ref-filter.c:1279 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD frånkopplat vid %s)" @@ -2668,108 +2753,108 @@ msgstr "(HEAD frånkopplat vid %s)" #. TRANSLATORS: make sure this matches "HEAD #. detached from " in wt-status.c #. -#: ref-filter.c:1272 +#: ref-filter.c:1286 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD frånkopplat från %s)" -#: ref-filter.c:1276 +#: ref-filter.c:1290 msgid "(no branch)" msgstr "(ingen gren)" -#: ref-filter.c:1426 ref-filter.c:1457 +#: ref-filter.c:1439 ref-filter.c:1470 #, c-format msgid "missing object %s for %s" msgstr "objektet %s saknas för %s" -#: ref-filter.c:1429 ref-filter.c:1460 +#: ref-filter.c:1442 ref-filter.c:1473 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer misslyckades på %s för %s" -#: ref-filter.c:1760 +#: ref-filter.c:1773 #, c-format msgid "malformed object at '%s'" msgstr "felformat objekt vid \"%s\"" -#: ref-filter.c:1827 +#: ref-filter.c:1840 #, c-format msgid "ignoring ref with broken name %s" msgstr "ignorerar referens med trasigt namn %s" -#: ref-filter.c:1832 +#: ref-filter.c:1845 #, c-format msgid "ignoring broken ref %s" msgstr "ignorerar trasig referens %s" -#: ref-filter.c:2095 +#: ref-filter.c:2107 #, c-format msgid "format: %%(end) atom missing" msgstr "format: atomen %%(end) saknas" -#: ref-filter.c:2176 +#: ref-filter.c:2201 #, c-format msgid "malformed object name %s" msgstr "felformat objektnamn %s" -#: remote.c:747 +#: remote.c:750 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Kan inte hämta både %s och %s till %s" -#: remote.c:751 +#: remote.c:754 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s spårar vanligtvis %s, inte %s" -#: remote.c:755 +#: remote.c:758 #, c-format msgid "%s tracks both %s and %s" msgstr "%s spårar både %s och %s" -#: remote.c:763 +#: remote.c:766 msgid "Internal error" msgstr "Internt fel" -#: remote.c:1680 remote.c:1782 +#: remote.c:1681 remote.c:1783 msgid "HEAD does not point to a branch" msgstr "HEAD pekar inte på en gren" -#: remote.c:1689 +#: remote.c:1690 #, c-format msgid "no such branch: '%s'" msgstr "okänd gren: \"%s\"" -#: remote.c:1692 +#: remote.c:1693 #, c-format msgid "no upstream configured for branch '%s'" msgstr "ingen standarduppström angiven för grenen \"%s\"" -#: remote.c:1698 +#: remote.c:1699 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "uppströmsgrenen \"%s\" är inte lagrad som en fjärrspårande gren" -#: remote.c:1713 +#: remote.c:1714 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "push-målet \"%s\" på fjärren \"%s\" har ingen lokalt spårande gren" -#: remote.c:1725 +#: remote.c:1726 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "grenen \"%s\" har ingen fjärr för \"push\"" -#: remote.c:1736 +#: remote.c:1737 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\"" -#: remote.c:1749 +#: remote.c:1750 msgid "push has no destination (push.default is 'nothing')" msgstr "\"push\" har inget mål (push.default är \"ingenting\")" -#: remote.c:1771 +#: remote.c:1772 msgid "cannot resolve 'simple' push to a single destination" msgstr "\"enkel push\" motsvarar flera olika mål" @@ -2784,7 +2869,7 @@ msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n" #: remote.c:2083 #, c-format -msgid "Your branch is up-to-date with '%s'.\n" +msgid "Your branch is up to date with '%s'.\n" msgstr "Din gren är à jour med \"%s\".\n" #: remote.c:2087 @@ -2831,16 +2916,16 @@ msgstr[1] "" msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (använd \"git pull\" för att slå ihop fjärrgrenen med din egen)\n" -#: revision.c:2187 +#: revision.c:2256 msgid "your current branch appears to be broken" msgstr "din nuvarande gren verkar vara trasig" -#: revision.c:2190 +#: revision.c:2259 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "din nuvarande gren \"%s\" innehåller ännu inte några incheckningar" -#: revision.c:2384 +#: revision.c:2453 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent är inkompatibelt med --bisect" @@ -2882,24 +2967,24 @@ msgstr "mottagarsidan stöder inte push med --atomic" msgid "the receiving end does not support push options" msgstr "mottagarsidan stöder inte push-flaggor" -#: sequencer.c:216 +#: sequencer.c:218 msgid "revert" msgstr "revert" -#: sequencer.c:218 +#: sequencer.c:220 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:220 +#: sequencer.c:222 msgid "rebase -i" msgstr "rebase -i" -#: sequencer.c:222 +#: sequencer.c:224 #, c-format msgid "Unknown action: %d" msgstr "Okänd funktion: %d" -#: sequencer.c:279 +#: sequencer.c:281 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -2907,7 +2992,7 @@ msgstr "" "efter att ha löst konflikterna, markera de rättade sökvägarna\n" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"" -#: sequencer.c:282 +#: sequencer.c:284 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -2917,42 +3002,43 @@ msgstr "" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n" "och checka in resultatet med \"git commit\"" -#: sequencer.c:295 sequencer.c:1685 +#: sequencer.c:297 sequencer.c:1704 #, c-format msgid "could not lock '%s'" msgstr "kunde inte låsa \"%s\"" -#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704 +#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723 +#: sequencer.c:2733 sequencer.c:2749 #, c-format msgid "could not write to '%s'" msgstr "kunde inte skriva till \"%s\"" -#: sequencer.c:302 +#: sequencer.c:304 #, c-format msgid "could not write eol to '%s'" msgstr "kunde inte skriva radslut till \"%s\"" -#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692 +#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711 #, c-format msgid "failed to finalize '%s'." msgstr "misslyckades färdigställa \"%s\"." -#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258 -#: builtin/commit.c:750 builtin/merge.c:1017 +#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259 +#: builtin/commit.c:754 builtin/merge.c:1044 #, c-format msgid "could not read '%s'" msgstr "kunde inte läsa \"%s\"" -#: sequencer.c:356 +#: sequencer.c:358 #, c-format msgid "your local changes would be overwritten by %s." msgstr "dina lokala ändringar skulle skrivas över av %s." -#: sequencer.c:360 +#: sequencer.c:362 msgid "commit your changes or stash them to proceed." msgstr "checka in dina ändringar eller använd \"stash\" för att fortsätta." -#: sequencer.c:389 +#: sequencer.c:391 #, c-format msgid "%s: fast-forward" msgstr "%s: snabbspola" @@ -2960,20 +3046,20 @@ msgstr "%s: snabbspola" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:472 +#: sequencer.c:474 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Kunde inte skriva ny indexfil" -#: sequencer.c:491 +#: sequencer.c:493 msgid "could not resolve HEAD commit\n" msgstr "kunde inte bestämma HEAD:s incheckning\n" -#: sequencer.c:511 +#: sequencer.c:513 msgid "unable to update cache tree\n" msgstr "kan inte uppdatera cacheträd\n" -#: sequencer.c:595 +#: sequencer.c:597 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -3002,17 +3088,17 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:697 +#: sequencer.c:699 #, c-format msgid "could not parse commit %s\n" msgstr "kunde inte tolka incheckningen %s\n" -#: sequencer.c:702 +#: sequencer.c:704 #, c-format msgid "could not parse parent commit %s\n" msgstr "kunde inte tolka föräldraincheckningen %s\n" -#: sequencer.c:824 +#: sequencer.c:826 #, c-format msgid "" "unexpected 1st line of squash message:\n" @@ -3023,7 +3109,7 @@ msgstr "" "\n" "\t%.*s" -#: sequencer.c:830 +#: sequencer.c:832 #, c-format msgid "" "invalid 1st line of squash message:\n" @@ -3034,231 +3120,232 @@ msgstr "" "\n" "\t%.*s" -#: sequencer.c:836 sequencer.c:861 +#: sequencer.c:838 sequencer.c:863 #, c-format msgid "This is a combination of %d commits." msgstr "Det här är en kombination av %d incheckningar." -#: sequencer.c:845 +#: sequencer.c:847 sequencer.c:2681 msgid "need a HEAD to fixup" msgstr "behöver en HEAD-incheckning att rätta" -#: sequencer.c:847 +#: sequencer.c:849 msgid "could not read HEAD" msgstr "kunde inte läsa HEAD" -#: sequencer.c:849 +#: sequencer.c:851 msgid "could not read HEAD's commit message" msgstr "kunde inte läsa HEAD:s incheckningsmeddelande" -#: sequencer.c:855 +#: sequencer.c:857 #, c-format msgid "cannot write '%s'" msgstr "kan inte skriva \"%s\"" -#: sequencer.c:864 git-rebase--interactive.sh:445 +#: sequencer.c:866 git-rebase--interactive.sh:446 msgid "This is the 1st commit message:" msgstr "Det här är 1:a incheckningsmeddelandet:" -#: sequencer.c:872 +#: sequencer.c:874 #, c-format msgid "could not read commit message of %s" msgstr "kunde inte läsa incheckningsmeddelande för %s" -#: sequencer.c:879 +#: sequencer.c:881 #, c-format msgid "This is the commit message #%d:" msgstr "Det här är incheckningsmeddelande %d:" -#: sequencer.c:884 +#: sequencer.c:886 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Incheckningsmeddelande %d kommer hoppas över:" -#: sequencer.c:889 +#: sequencer.c:891 #, c-format msgid "unknown command: %d" msgstr "okänt kommando: %d" -#: sequencer.c:955 +#: sequencer.c:957 msgid "your index file is unmerged." msgstr "din indexfil har inte slagits ihop." -#: sequencer.c:973 +#: sequencer.c:975 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "incheckning %s är en sammanslagning, men flaggan -m angavs inte." -#: sequencer.c:981 +#: sequencer.c:983 #, c-format msgid "commit %s does not have parent %d" msgstr "incheckning %s har inte förälder %d" -#: sequencer.c:985 +#: sequencer.c:987 #, c-format msgid "mainline was specified but commit %s is not a merge." msgstr "huvudlinje angavs, men incheckningen %s är inte en sammanslagning." -#: sequencer.c:991 +#: sequencer.c:993 #, c-format msgid "cannot get commit message for %s" msgstr "kan inte hämta incheckningsmeddelande för %s" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1012 +#: sequencer.c:1014 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kan inte tolka föräldraincheckningen %s" -#: sequencer.c:1075 sequencer.c:1830 +#: sequencer.c:1077 sequencer.c:1853 #, c-format msgid "could not rename '%s' to '%s'" msgstr "kunde inte byta namn på \"%s\" till \"%s\"" -#: sequencer.c:1126 +#: sequencer.c:1128 #, c-format msgid "could not revert %s... %s" msgstr "kunde inte ångra %s... %s" -#: sequencer.c:1127 +#: sequencer.c:1129 #, c-format msgid "could not apply %s... %s" msgstr "kunde inte tillämpa %s... %s" -#: sequencer.c:1169 +#: sequencer.c:1171 msgid "empty commit set passed" msgstr "den angivna uppsättningen incheckningar är tom" -#: sequencer.c:1179 +#: sequencer.c:1181 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: misslyckades läsa indexet" -#: sequencer.c:1186 +#: sequencer.c:1188 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: misslyckades uppdatera indexet" -#: sequencer.c:1306 +#: sequencer.c:1308 #, c-format msgid "invalid line %d: %.*s" msgstr "ogiltig rad %d: %.*s" -#: sequencer.c:1314 +#: sequencer.c:1316 #, c-format msgid "cannot '%s' without a previous commit" msgstr "kan inte utföra \"%s\" utan en föregående incheckning" -#: sequencer.c:1347 +#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614 +#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951 #, c-format msgid "could not read '%s'." msgstr "kunde inte läsa \"%s\"." -#: sequencer.c:1359 +#: sequencer.c:1361 msgid "please fix this using 'git rebase --edit-todo'." msgstr "rätta det med \"git rebase --edit-todo\"." -#: sequencer.c:1361 +#: sequencer.c:1363 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "oanvändbart manus: ”%s”" -#: sequencer.c:1366 +#: sequencer.c:1368 msgid "no commits parsed." msgstr "inga incheckningar lästes." -#: sequencer.c:1377 +#: sequencer.c:1379 msgid "cannot cherry-pick during a revert." msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"." -#: sequencer.c:1379 +#: sequencer.c:1381 msgid "cannot revert during a cherry-pick." msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"." -#: sequencer.c:1442 +#: sequencer.c:1448 #, c-format msgid "invalid key: %s" msgstr "felaktig nyckel: %s" -#: sequencer.c:1445 +#: sequencer.c:1451 #, c-format msgid "invalid value for %s: %s" msgstr "felaktigt värde för %s: %s" -#: sequencer.c:1502 +#: sequencer.c:1517 #, c-format msgid "malformed options sheet: '%s'" msgstr "trasigt manus: ”%s”" -#: sequencer.c:1540 +#: sequencer.c:1555 msgid "a cherry-pick or revert is already in progress" msgstr "en \"cherry-pick\" eller \"revert\" pågår redan" -#: sequencer.c:1541 +#: sequencer.c:1556 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:1544 +#: sequencer.c:1559 #, c-format msgid "could not create sequencer directory '%s'" msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\"" -#: sequencer.c:1558 +#: sequencer.c:1574 msgid "could not lock HEAD" msgstr "kunde inte låsa HEAD" -#: sequencer.c:1614 sequencer.c:2188 +#: sequencer.c:1632 sequencer.c:2211 msgid "no cherry-pick or revert in progress" msgstr "ingen \"cherry-pick\" eller \"revert\" pågår" -#: sequencer.c:1616 +#: sequencer.c:1634 msgid "cannot resolve HEAD" msgstr "kan inte bestämma HEAD" -#: sequencer.c:1618 sequencer.c:1652 +#: sequencer.c:1636 sequencer.c:1671 msgid "cannot abort from a branch yet to be born" msgstr "kan inte avbryta från en gren som ännu inte är född" -#: sequencer.c:1638 builtin/grep.c:929 +#: sequencer.c:1657 builtin/grep.c:711 #, c-format msgid "cannot open '%s'" msgstr "kan inte öppna \"%s\"" -#: sequencer.c:1640 +#: sequencer.c:1659 #, c-format msgid "cannot read '%s': %s" msgstr "kan inte läsa \"%s\": %s" -#: sequencer.c:1641 +#: sequencer.c:1660 msgid "unexpected end of file" msgstr "oväntat filslut" -#: sequencer.c:1647 +#: sequencer.c:1666 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "sparad HEAD-fil från före \"cherry-pick\", \"%s\", är trasig" -#: sequencer.c:1658 +#: sequencer.c:1677 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" "Du verkar ha flyttat HEAD.\n" "Spolar inte tillbaka, kontrollera HEAD!" -#: sequencer.c:1795 sequencer.c:2086 +#: sequencer.c:1818 sequencer.c:2109 msgid "cannot read HEAD" msgstr "kan inte läsa HEAD" -#: sequencer.c:1835 builtin/difftool.c:633 +#: sequencer.c:1858 builtin/difftool.c:640 #, c-format msgid "could not copy '%s' to '%s'" msgstr "kunde inte kopiera in \"%s\" till \"%s\"" -#: sequencer.c:1851 +#: sequencer.c:1874 msgid "could not read index" msgstr "kunde inte läsa indexet" -#: sequencer.c:1856 +#: sequencer.c:1879 #, c-format msgid "" "execution failed: %s\n" @@ -3273,11 +3360,11 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:1862 +#: sequencer.c:1885 msgid "and made changes to the index and/or the working tree\n" msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen\n" -#: sequencer.c:1868 +#: sequencer.c:1891 #, c-format msgid "" "execution succeeded: %s\n" @@ -3294,17 +3381,17 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:1925 +#: sequencer.c:1948 #, c-format msgid "Applied autostash.\n" msgstr "Tillämpade autostash.\n" -#: sequencer.c:1937 +#: sequencer.c:1960 #, c-format msgid "cannot store %s" msgstr "kan inte spara %s" -#: sequencer.c:1940 git-rebase.sh:173 +#: sequencer.c:1963 git-rebase.sh:175 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -3315,57 +3402,57 @@ msgstr "" "Dina ändringar är säkra i stashen.\n" "Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n" -#: sequencer.c:2022 +#: sequencer.c:2045 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Stoppade på %s... %.*s\n" -#: sequencer.c:2064 +#: sequencer.c:2087 #, c-format msgid "unknown command %d" msgstr "okänt kommando %d" -#: sequencer.c:2094 +#: sequencer.c:2117 msgid "could not read orig-head" msgstr "kunde inte läsa orig-head" -#: sequencer.c:2099 +#: sequencer.c:2122 sequencer.c:2678 msgid "could not read 'onto'" msgstr "kunde inte läsa \"onto\"" -#: sequencer.c:2106 +#: sequencer.c:2129 #, c-format msgid "could not update %s" msgstr "kunde inte uppdatera %s" -#: sequencer.c:2113 +#: sequencer.c:2136 #, c-format msgid "could not update HEAD to %s" msgstr "kunde inte uppdatera HEAD till %s" -#: sequencer.c:2197 +#: sequencer.c:2220 msgid "cannot rebase: You have unstaged changes." msgstr "kan inte ombasera: Du har oköade ändringar." -#: sequencer.c:2202 +#: sequencer.c:2225 msgid "could not remove CHERRY_PICK_HEAD" msgstr "kunde inte ta bort CHERRY_PICK_HEAD" -#: sequencer.c:2211 +#: sequencer.c:2234 msgid "cannot amend non-existing commit" msgstr "kan inte lägga till incheckning som inte finns" -#: sequencer.c:2213 +#: sequencer.c:2236 #, c-format msgid "invalid file: '%s'" msgstr "ogiltig fil: \"%s\"" -#: sequencer.c:2215 +#: sequencer.c:2238 #, c-format msgid "invalid contents: '%s'" msgstr "ogiltigt innehåll: \"%s\"" -#: sequencer.c:2218 +#: sequencer.c:2241 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -3375,24 +3462,119 @@ msgstr "" "Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n" "först och kör sedan \"git rebase --continute\" igen." -#: sequencer.c:2228 +#: sequencer.c:2251 msgid "could not commit staged changes." msgstr "kunde inte checka in köade ändringar." -#: sequencer.c:2308 +#: sequencer.c:2331 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: kan inte göra \"cherry-pick\" på typen ”%s”" -#: sequencer.c:2312 +#: sequencer.c:2335 #, c-format msgid "%s: bad revision" msgstr "%s: felaktig revision" -#: sequencer.c:2345 +#: sequencer.c:2368 msgid "can't revert as initial commit" msgstr "kan inte ångra som första incheckning" +#: sequencer.c:2471 +msgid "make_script: unhandled options" +msgstr "make_script: flaggor som inte stöds" + +#: sequencer.c:2474 +msgid "make_script: error preparing revisions" +msgstr "make_script: fel när revisioner skulle förberedas" + +#: sequencer.c:2510 +#, c-format +msgid "unusable todo list: '%s'" +msgstr "oanvändbar todo-lista: %s" + +#: sequencer.c:2516 +#, c-format +msgid "unable to open '%s' for writing" +msgstr "kunde inte öppna \"%s\" för skrivning" + +#: sequencer.c:2561 +#, c-format +msgid "unrecognized setting %s for optionrebase.missingCommitsCheck. Ignoring." +msgstr "" +"okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar." + +#: sequencer.c:2561 +#, c-format +msgid "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." +msgstr "" +"okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar." + +#: sequencer.c:2641 +#, c-format +msgid "" +"Warning: some commits may have been dropped accidentally.\n" +"Dropped commits (newer to older):\n" +msgstr "" +"Varning: vissa incheckningar kan av misstag ha tappats.\n" +"Tappade incheckningar (nyaste först):\n" + +#: sequencer.c:2648 +#, c-format +msgid "" +"To avoid this message, use \"drop\" to explicitly remove a commit.\n" +"\n" +"Use 'git config rebase.missingCommitsCheck' to change the level of " +"warnings.\n" +"The possible behaviours are: ignore, warn, error.\n" +"\n" +msgstr "" +"För att undvika det här meddelandet kan du använda \"drop\" för att " +"explicit\n" +"kasta en incheckning.\n" +"\n" +"Använd \"git config rebase.missingCommitsCheck\" för att ändra " +"varningsnivån.\n" +"Möjliga bettenden är: \"ignore\" (ignorera), \"warn\" (varna), \"error" +"\" (fel).\n" +"\n" + +#: sequencer.c:2660 +#, c-format +msgid "" +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" +"continue'.\n" +"Or you can abort the rebase with 'git rebase --abort'.\n" +msgstr "" +"Du kan rätta detta med \"git rebase --edit-todo\" följt av \"git rebase --" +"continue\".\n" +"Avbryt ombaseringen med \"git rebase --abort\".\n" + +#: sequencer.c:2708 +#, c-format +msgid "could not parse commit '%s'" +msgstr "kunde inte tolka incheckningen\" %s\"" + +#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395 +#: builtin/am.c:775 +#, c-format +msgid "could not open '%s' for writing" +msgstr "kunde inte öppna \"%s\" för skrivning" + +#: sequencer.c:2756 +#, c-format +msgid "could not truncate '%s'" +msgstr "kunde inte trunkera \"%s\"" + +#: sequencer.c:2848 +msgid "the script was already rearranged." +msgstr "skriptet har redan omordnats." + +#: sequencer.c:2953 +#, c-format +msgid "could not finish '%s'" +msgstr "kunde inte avsluta \"%s\"" + #: setup.c:171 #, c-format msgid "" @@ -3426,34 +3608,34 @@ msgstr "" "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n" "\"git <kommando> [<revision>...] -- [<fil>...]\"" -#: setup.c:504 +#: setup.c:499 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Förväntade git-arkivversion <= %d, hittade %d" -#: setup.c:512 +#: setup.c:507 msgid "unknown repository extensions found:" msgstr "okända arkivutökningar hittades:" -#: setup.c:810 +#: setup.c:806 #, c-format msgid "Not a git repository (or any of the parent directories): %s" msgstr "Inte ett git-arkiv (eller någon av föräldrakatalogerna): %s" -#: setup.c:812 builtin/index-pack.c:1652 +#: setup.c:808 builtin/index-pack.c:1653 msgid "Cannot come back to cwd" msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)" -#: setup.c:1050 +#: setup.c:1046 msgid "Unable to read current working directory" msgstr "Kan inte läsa aktuell arbetskatalog" -#: setup.c:1062 setup.c:1068 +#: setup.c:1058 setup.c:1064 #, c-format msgid "Cannot change to '%s'" msgstr "Kan inte byta till \"%s\"" -#: setup.c:1081 +#: setup.c:1077 #, c-format msgid "" "Not a git repository (or any parent up to mount point %s)\n" @@ -3463,7 +3645,7 @@ msgstr "" "monteringspunkten %s)\n" "Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)." -#: setup.c:1173 +#: setup.c:1159 #, c-format msgid "" "Problem with core.sharedRepository filemode value (0%.3o).\n" @@ -3472,55 +3654,41 @@ msgstr "" "Problem med filläges-värdet i core.sharedRepository (0%.3o).\n" "Ägaren av filerna måste alltid ha läs- och skrivbehörighet." -#: sha1_file.c:560 +#: sha1_file.c:528 #, c-format msgid "path '%s' does not exist" msgstr "sökvägen \"%s\" finns inte" -#: sha1_file.c:586 +#: sha1_file.c:554 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "referensarkivet \"%s\" som en länkad utcheckning stöds inte ännu." -#: sha1_file.c:592 +#: sha1_file.c:560 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv." -#: sha1_file.c:598 +#: sha1_file.c:566 #, c-format msgid "reference repository '%s' is shallow" msgstr "referensarkivet \"%s\" är grunt" -#: sha1_file.c:606 +#: sha1_file.c:574 #, c-format msgid "reference repository '%s' is grafted" msgstr "referensarkivet \"%s\" är ympat" -#: sha1_file.c:1245 -msgid "offset before end of packfile (broken .idx?)" -msgstr "offset före slutet av packfilen (trasig .idx?)" - -#: sha1_file.c:2729 -#, c-format -msgid "offset before start of pack index for %s (corrupt index?)" -msgstr "offset före slutet av packindex för %s (trasigt index?)" - -#: sha1_file.c:2733 -#, c-format -msgid "offset beyond end of pack index for %s (truncated index?)" -msgstr "offset borton slutet av packindex för %s (trunkerat index?)" - -#: sha1_name.c:419 +#: sha1_name.c:420 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "kort SHA1 %s är tvetydig" -#: sha1_name.c:430 +#: sha1_name.c:431 msgid "The candidates are:" msgstr "Kandidaterna är:" -#: sha1_name.c:589 +#: sha1_name.c:590 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -3542,66 +3710,71 @@ msgstr "" "Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n" "genom att köra \"git config advice.objectNameWarning false\"" -#: submodule.c:70 submodule.c:104 +#: submodule.c:93 submodule.c:127 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" "Kan inte ändra .gitmodules-fil som inte slagits ihop, lös " "sammanslagningskonflikter först" -#: submodule.c:74 submodule.c:108 +#: submodule.c:97 submodule.c:131 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "Hittade inte någon sektion i .gitmodules där sökväg=%s" -#: submodule.c:82 +#: submodule.c:105 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Kunde inte uppdatera .gitmodules-posten %s" -#: submodule.c:115 +#: submodule.c:138 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "Kunde inte ta bort .gitmodules-posten för %s" -#: submodule.c:126 +#: submodule.c:149 msgid "staging updated .gitmodules failed" msgstr "misslyckades köa uppdaterad .gitmodules" -#: submodule.c:165 -msgid "negative values not allowed for submodule.fetchJobs" -msgstr "negativa värden är inte tillåtna för submodule.fetchJobs" - -#: submodule.c:376 +#: submodule.c:309 #, c-format msgid "in unpopulated submodule '%s'" msgstr "i ej utcheckad undermodul \"%s\"" -#: submodule.c:407 +#: submodule.c:340 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\"" -#: submodule.c:1337 +#: submodule.c:799 +#, c-format +msgid "submodule entry '%s' (%s) is a %s, not a commit" +msgstr "undermodulposten \"%s\" (%s) är en %s, inte en incheckning" + +#: submodule.c:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149 +msgid "Failed to resolve HEAD as a valid ref." +msgstr "Misslyckades slå upp HEAD som giltig referens." + +#: submodule.c:1304 #, c-format msgid "'%s' not recognized as a git repository" msgstr "\"%s\" känns inte igen som ett git-arkiv" -#: submodule.c:1475 +#: submodule.c:1442 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "kunde inte starta \"git status\" i undermodulen \"%s\"" -#: submodule.c:1488 +#: submodule.c:1455 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "kunde inte köra \"git status\" i undermodulen \"%s\"" -#: submodule.c:1581 +#: submodule.c:1548 #, c-format msgid "submodule '%s' has dirty index" msgstr "undermodulen \"%s\" har ett smutsigt index" -#: submodule.c:1845 +#: submodule.c:1809 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -3609,18 +3782,18 @@ msgstr "" "relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, " "stöds ej" -#: submodule.c:1857 submodule.c:1913 +#: submodule.c:1821 submodule.c:1877 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "kunde inte slå upp namnet för undermodulen \"%s\"" -#: submodule.c:1861 builtin/submodule--helper.c:678 -#: builtin/submodule--helper.c:688 +#: submodule.c:1825 builtin/submodule--helper.c:671 +#: builtin/submodule--helper.c:681 #, c-format msgid "could not create directory '%s'" msgstr "kunde inte skapa katalogen \"%s\"" -#: submodule.c:1864 +#: submodule.c:1828 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -3631,94 +3804,98 @@ msgstr "" "\"%s\" till\n" "\"%s\"\n" -#: submodule.c:1948 +#: submodule.c:1912 #, c-format msgid "could not recurse into submodule '%s'" msgstr "kunde inte rekursera in i undermodulen \"%s\"" -#: submodule.c:1992 +#: submodule.c:1956 msgid "could not start ls-files in .." msgstr "kunde inte starta ls-files i .." -#: submodule.c:2012 +#: submodule.c:1976 msgid "BUG: returned path string doesn't match cwd?" msgstr "BUG: returnerad sökvägssträng matchar inte cwd?" -#: submodule.c:2031 +#: submodule.c:1995 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree returnerade en oväntad returkod %d" -#: submodule-config.c:420 +#: submodule-config.c:263 +msgid "negative values not allowed for submodule.fetchjobs" +msgstr "negativa värden är inte tillåtna för submodule.fetchjobs" + +#: submodule-config.c:436 #, c-format msgid "invalid value for %s" msgstr "ogiltigt värde för %s" -#: trailer.c:241 +#: trailer.c:238 #, c-format msgid "running trailer command '%s' failed" msgstr "misslyckades utföra \"trailer\"-kommandot \"%s\"" -#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540 -#: trailer.c:544 +#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 +#: trailer.c:557 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "okänt värde \"%s\" för nyckeln \"%s\"" -#: trailer.c:526 trailer.c:531 builtin/remote.c:290 +#: trailer.c:539 trailer.c:544 builtin/remote.c:290 #, c-format msgid "more than one %s" msgstr "mer än en %s" -#: trailer.c:703 +#: trailer.c:730 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "tom släpradssymbol i släpraden \"%.*s\"" -#: trailer.c:723 +#: trailer.c:750 #, c-format msgid "could not read input file '%s'" msgstr "kunde inte läsa indatafilen \"%s\"" -#: trailer.c:726 +#: trailer.c:753 msgid "could not read from stdin" msgstr "kunde inte läsa från standard in" -#: trailer.c:950 builtin/am.c:45 +#: trailer.c:1008 builtin/am.c:46 #, c-format msgid "could not stat %s" msgstr "kunde inte ta status på %s" -#: trailer.c:952 +#: trailer.c:1010 #, c-format msgid "file %s is not a regular file" msgstr "filen %s är inte en normal fil" -#: trailer.c:954 +#: trailer.c:1012 #, c-format msgid "file %s is not writable by user" msgstr "filen %s är inte skrivbar av användaren" -#: trailer.c:966 +#: trailer.c:1024 msgid "could not open temporary file" msgstr "kunde inte öppna temporär file" -#: trailer.c:1002 +#: trailer.c:1064 #, c-format msgid "could not rename temporary file to %s" msgstr "kunde inte byta namn på temporär fil till %s" -#: transport.c:63 +#: transport.c:62 #, c-format msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "Skulle sätta uppströms för \"%s\" till \"%s\" från \"%s\"\n" -#: transport.c:152 +#: transport.c:151 #, c-format msgid "transport: invalid depth option '%s'" msgstr "transport: ogiltig flagga för depth: ”%s”" -#: transport.c:890 +#: transport.c:888 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -3727,7 +3904,7 @@ msgstr "" "Följande undermodulsökvägar innehåller ändringar som\n" "inte kan hittas av fjärrarna:\n" -#: transport.c:894 +#: transport.c:892 #, c-format msgid "" "\n" @@ -3754,7 +3931,7 @@ msgstr "" "för att sända dem till fjärren.\n" "\n" -#: transport.c:902 +#: transport.c:900 msgid "Aborting." msgstr "Avbryter." @@ -3775,11 +3952,11 @@ msgstr "felformat läge i trädpost" msgid "empty filename in tree entry" msgstr "tomt filnamn i trädpost" -#: tree-walk.c:113 +#: tree-walk.c:114 msgid "too-short tree file" msgstr "trädfil för kort" -#: unpack-trees.c:105 +#: unpack-trees.c:106 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3788,7 +3965,7 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n" "%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren." -#: unpack-trees.c:107 +#: unpack-trees.c:108 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3797,7 +3974,7 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n" "%%s" -#: unpack-trees.c:110 +#: unpack-trees.c:111 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3807,7 +3984,7 @@ msgstr "" "sammanslagning:\n" "%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren." -#: unpack-trees.c:112 +#: unpack-trees.c:113 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3817,7 +3994,7 @@ msgstr "" "sammanslagning:\n" "%%s" -#: unpack-trees.c:115 +#: unpack-trees.c:116 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -3826,7 +4003,7 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n" "%%sChecka in dina ändringar eller använd \"stash\" innan du \"%s\"." -#: unpack-trees.c:117 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -3835,7 +4012,7 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n" "%%s" -#: unpack-trees.c:122 +#: unpack-trees.c:123 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -3845,7 +4022,7 @@ msgstr "" "dem:\n" "%s" -#: unpack-trees.c:126 +#: unpack-trees.c:127 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -3854,7 +4031,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n" "%%sFlytta eller ta bort dem innan du byter gren." -#: unpack-trees.c:128 +#: unpack-trees.c:129 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -3863,7 +4040,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n" "%%s" -#: unpack-trees.c:131 +#: unpack-trees.c:132 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -3873,7 +4050,7 @@ msgstr "" "sammanslagningen:\n" "%%sFlytta eller ta bort dem innan du slår samman." -#: unpack-trees.c:133 +#: unpack-trees.c:134 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -3883,7 +4060,7 @@ msgstr "" "sammanslagningen:\n" "%%s" -#: unpack-trees.c:136 +#: unpack-trees.c:137 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -3892,7 +4069,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n" "%%sFlytta eller ta bort dem innan du \"%s\"." -#: unpack-trees.c:138 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -3901,7 +4078,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n" "%%s" -#: unpack-trees.c:143 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3912,7 +4089,7 @@ msgstr "" "utcheckningen:\n" "%%sFlytta eller ta bort dem innan du byter gren." -#: unpack-trees.c:145 +#: unpack-trees.c:146 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3923,7 +4100,7 @@ msgstr "" "utcheckningen:\n" "%%s" -#: unpack-trees.c:148 +#: unpack-trees.c:149 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -3933,7 +4110,7 @@ msgstr "" "sammanslagningen:\n" "%%sFlytta eller ta bort dem innan du byter gren." -#: unpack-trees.c:150 +#: unpack-trees.c:151 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -3943,7 +4120,7 @@ msgstr "" "sammanslagningen:\n" "%%s" -#: unpack-trees.c:153 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -3952,7 +4129,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n" "%%sFlytta eller ta bort dem innan du \"%s\"." -#: unpack-trees.c:155 +#: unpack-trees.c:156 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -3961,21 +4138,21 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n" "%%s" -#: unpack-trees.c:162 +#: unpack-trees.c:163 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "Posten \"%s\" överlappar \"%s\". Kan inte binda." -#: unpack-trees.c:165 +#: unpack-trees.c:166 #, c-format msgid "" -"Cannot update sparse checkout: the following entries are not up-to-date:\n" +"Cannot update sparse checkout: the following entries are not up to date:\n" "%s" msgstr "" -"Kan inte uppdatera gles utcheckning: följande poster är inte àjour:\n" +"Kan inte uppdatera gles utcheckning: följande poster är inte à jour:\n" "%s" -#: unpack-trees.c:167 +#: unpack-trees.c:168 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -3986,7 +4163,7 @@ msgstr "" "utcheckning:\n" "%s" -#: unpack-trees.c:169 +#: unpack-trees.c:170 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -3997,7 +4174,7 @@ msgstr "" "utcheckning:\n" "%s" -#: unpack-trees.c:171 +#: unpack-trees.c:172 #, c-format msgid "" "Cannot update submodule:\n" @@ -4006,17 +4183,12 @@ msgstr "" "Kan inte uppdatera undermodul:\n" "%s" -#: unpack-trees.c:248 +#: unpack-trees.c:249 #, c-format msgid "Aborting\n" msgstr "Avbryter\n" -#: unpack-trees.c:277 -#, c-format -msgid "submodule update strategy not supported for submodule '%s'" -msgstr "uppdateringsstrategi för undermodul stöds inte för undermodulen \"%s\"" - -#: unpack-trees.c:346 +#: unpack-trees.c:331 msgid "Checking out files" msgstr "Checkar ut filer" @@ -4059,13 +4231,8 @@ msgstr "misslyckades läsa \"%s\"" msgid "could not open '%s' for reading and writing" msgstr "kunde inte öppna \"%s\" för läsning och skrivning" -#: wrapper.c:225 wrapper.c:395 builtin/am.c:766 -#, c-format -msgid "could not open '%s' for writing" -msgstr "kunde inte öppna \"%s\" för skrivning" - -#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757 -#: builtin/am.c:849 builtin/merge.c:1014 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766 +#: builtin/am.c:858 builtin/merge.c:1041 #, c-format msgid "could not open '%s' for reading" msgstr "kunde inte öppna \"%s\" för läsning" @@ -4089,199 +4256,199 @@ msgstr "kunde inte skriva till %s" msgid "could not close %s" msgstr "kunde inte stänga %s" -#: wt-status.c:152 +#: wt-status.c:150 msgid "Unmerged paths:" msgstr "Ej sammanslagna sökvägar:" -#: wt-status.c:179 wt-status.c:206 +#: wt-status.c:177 wt-status.c:204 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (använd \"git reset %s <fil>...\" för att ta bort från kö)" -#: wt-status.c:181 wt-status.c:208 +#: wt-status.c:179 wt-status.c:206 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (använd \"git rm --cached <fil>...\" för att ta bort från kö)" -#: wt-status.c:185 +#: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (använd \"git add <fil>...\" för att ange lösning)" -#: wt-status.c:187 wt-status.c:191 +#: wt-status.c:185 wt-status.c:189 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning)" -#: wt-status.c:189 +#: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (använd \"git rm <fil>...\" för att ange lösning)" -#: wt-status.c:200 wt-status.c:981 +#: wt-status.c:198 wt-status.c:979 msgid "Changes to be committed:" msgstr "Ändringar att checka in:" -#: wt-status.c:218 wt-status.c:990 +#: wt-status.c:216 wt-status.c:988 msgid "Changes not staged for commit:" msgstr "Ändringar ej i incheckningskön:" -#: wt-status.c:222 +#: wt-status.c:220 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" " (använd \"git add <fil>...\" för att uppdatera vad som skall checkas in)" -#: wt-status.c:224 +#: wt-status.c:222 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" " (använd \"git add/rm <fil>...\" för att uppdatera vad som skall checkas in)" -#: wt-status.c:225 +#: wt-status.c:223 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (använd \"git checkout -- <fil>...\" för att förkasta ändringar i " "arbetskatalogen)" -#: wt-status.c:227 +#: wt-status.c:225 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)" -#: wt-status.c:239 +#: wt-status.c:237 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (använd \"git %s <fil>...\" för att ta med i det som skall checkas in)" -#: wt-status.c:254 +#: wt-status.c:252 msgid "both deleted:" msgstr "borttaget av bägge:" -#: wt-status.c:256 +#: wt-status.c:254 msgid "added by us:" msgstr "tillagt av oss:" -#: wt-status.c:258 +#: wt-status.c:256 msgid "deleted by them:" msgstr "borttaget av dem:" -#: wt-status.c:260 +#: wt-status.c:258 msgid "added by them:" msgstr "tillagt av dem:" -#: wt-status.c:262 +#: wt-status.c:260 msgid "deleted by us:" msgstr "borttaget av oss:" -#: wt-status.c:264 +#: wt-status.c:262 msgid "both added:" msgstr "tillagt av bägge:" -#: wt-status.c:266 +#: wt-status.c:264 msgid "both modified:" msgstr "ändrat av bägge:" -#: wt-status.c:276 +#: wt-status.c:274 msgid "new file:" msgstr "ny fil:" -#: wt-status.c:278 +#: wt-status.c:276 msgid "copied:" msgstr "kopierad:" -#: wt-status.c:280 +#: wt-status.c:278 msgid "deleted:" msgstr "borttagen:" -#: wt-status.c:282 +#: wt-status.c:280 msgid "modified:" msgstr "ändrad:" -#: wt-status.c:284 +#: wt-status.c:282 msgid "renamed:" msgstr "namnbytt:" -#: wt-status.c:286 +#: wt-status.c:284 msgid "typechange:" msgstr "typbyte:" -#: wt-status.c:288 +#: wt-status.c:286 msgid "unknown:" msgstr "okänd:" -#: wt-status.c:290 +#: wt-status.c:288 msgid "unmerged:" msgstr "osammanslagen:" -#: wt-status.c:372 +#: wt-status.c:370 msgid "new commits, " msgstr "nya incheckningar, " -#: wt-status.c:374 +#: wt-status.c:372 msgid "modified content, " msgstr "ändrat innehåll, " -#: wt-status.c:376 +#: wt-status.c:374 msgid "untracked content, " msgstr "ospårat innehåll, " -#: wt-status.c:821 +#: wt-status.c:819 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "Stashen innehåller just nu %d post" msgstr[1] "Stashen innehåller just nu %d poster" -#: wt-status.c:853 +#: wt-status.c:851 msgid "Submodules changed but not updated:" msgstr "Undermoduler ändrade men inte uppdaterade:" -#: wt-status.c:855 +#: wt-status.c:853 msgid "Submodule changes to be committed:" msgstr "Undermodulers ändringar att checka in:" -#: wt-status.c:937 +#: wt-status.c:935 msgid "" -"Do not touch the line above.\n" -"Everything below will be removed." +"Do not modify or remove the line above.\n" +"Everything below it will be ignored." msgstr "" -"Rör inte raden ovan.\n" -"Allt nedan kommer tas bort." +"Raden ovan får inte ändras eller tas bort.\n" +"Allt under den kommer tas bort." -#: wt-status.c:1049 +#: wt-status.c:1048 msgid "You have unmerged paths." msgstr "Du har ej sammanslagna sökvägar." -#: wt-status.c:1052 +#: wt-status.c:1051 msgid " (fix conflicts and run \"git commit\")" msgstr " (rätta konflikter och kör \"git commit\")" -#: wt-status.c:1054 +#: wt-status.c:1053 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (använd \"git merge --abort\" för att avbryta sammanslagningen)" -#: wt-status.c:1059 +#: wt-status.c:1058 msgid "All conflicts fixed but you are still merging." msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning." -#: wt-status.c:1062 +#: wt-status.c:1061 msgid " (use \"git commit\" to conclude merge)" msgstr " (använd \"git commit\" för att slutföra sammanslagningen)" -#: wt-status.c:1072 +#: wt-status.c:1071 msgid "You are in the middle of an am session." msgstr "Du är i mitten av en körning av \"git am\"." -#: wt-status.c:1075 +#: wt-status.c:1074 msgid "The current patch is empty." msgstr "Aktuell patch är tom." -#: wt-status.c:1079 +#: wt-status.c:1078 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (rätta konflikter och kör sedan \"git am --continue\")" -#: wt-status.c:1081 +#: wt-status.c:1080 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (använd \"git am --skip\" för att hoppa över patchen)" -#: wt-status.c:1083 +#: wt-status.c:1082 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)" @@ -4574,7 +4741,7 @@ msgstr "dessutom innehåller dit index ändringar som inte har checkats in." msgid "cannot %s: Your index contains uncommitted changes." msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in." -#: compat/precompose_utf8.c:58 builtin/clone.c:436 +#: compat/precompose_utf8.c:58 builtin/clone.c:437 #, c-format msgid "failed to unlink '%s'" msgstr "misslyckades ta bort länken \"%s\"" @@ -4588,7 +4755,7 @@ msgstr "git add [<flaggor>] [--] <sökväg>..." msgid "unexpected diff status %c" msgstr "diff-status %c förväntades inte" -#: builtin/add.c:87 builtin/commit.c:292 +#: builtin/add.c:87 builtin/commit.c:291 msgid "updating files failed" msgstr "misslyckades uppdatera filer" @@ -4597,108 +4764,108 @@ msgstr "misslyckades uppdatera filer" msgid "remove '%s'\n" msgstr "ta bort \"%s\"\n" -#: builtin/add.c:151 +#: builtin/add.c:153 msgid "Unstaged changes after refreshing the index:" msgstr "Oköade ändringar efter att ha uppdaterat indexet:" -#: builtin/add.c:211 builtin/rev-parse.c:873 +#: builtin/add.c:213 builtin/rev-parse.c:888 msgid "Could not read the index" msgstr "Kunde inte läsa indexet" -#: builtin/add.c:222 +#: builtin/add.c:224 #, c-format msgid "Could not open '%s' for writing." msgstr "Kunde inte öppna \"%s\" för skrivning." -#: builtin/add.c:226 +#: builtin/add.c:228 msgid "Could not write patch" msgstr "Kunde inte skriva patch" -#: builtin/add.c:229 +#: builtin/add.c:231 msgid "editing patch failed" msgstr "redigering av patch misslyckades" -#: builtin/add.c:232 +#: builtin/add.c:234 #, c-format msgid "Could not stat '%s'" msgstr "Kunde inte ta status på \"%s\"" -#: builtin/add.c:234 +#: builtin/add.c:236 msgid "Empty patch. Aborted." msgstr "Tom patch. Avbryter." -#: builtin/add.c:239 +#: builtin/add.c:241 #, c-format msgid "Could not apply '%s'" msgstr "Kunde inte tillämpa \"%s\"" -#: builtin/add.c:249 +#: builtin/add.c:251 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n" -#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124 +#: builtin/add.c:271 builtin/clean.c:910 builtin/fetch.c:132 builtin/mv.c:124 #: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529 -#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164 +#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164 msgid "dry run" msgstr "testkörning" -#: builtin/add.c:272 +#: builtin/add.c:274 msgid "interactive picking" msgstr "plocka interaktivt" -#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299 +#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310 msgid "select hunks interactively" msgstr "välj stycken interaktivt" -#: builtin/add.c:274 +#: builtin/add.c:276 msgid "edit current diff and apply" msgstr "redigera aktuell diff och applicera" -#: builtin/add.c:275 +#: builtin/add.c:277 msgid "allow adding otherwise ignored files" msgstr "tillåt lägga till annars ignorerade filer" -#: builtin/add.c:276 +#: builtin/add.c:278 msgid "update tracked files" msgstr "uppdatera spårade filer" -#: builtin/add.c:277 +#: builtin/add.c:279 msgid "record only the fact that the path will be added later" msgstr "registrera endast att sökvägen kommer läggas till senare" -#: builtin/add.c:278 +#: builtin/add.c:280 msgid "add changes from all tracked and untracked files" msgstr "lägg till ändringar från alla spårade och ospårade filer" -#: builtin/add.c:281 +#: builtin/add.c:283 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "ignorera sökvägar borttagna i arbetskatalogen (samma som --no-all)" -#: builtin/add.c:283 +#: builtin/add.c:285 msgid "don't add, only refresh the index" msgstr "lägg inte till, uppdatera endast indexet" -#: builtin/add.c:284 +#: builtin/add.c:286 msgid "just skip files which cannot be added because of errors" msgstr "hoppa bara över filer som inte kan läggas till på grund av fel" -#: builtin/add.c:285 +#: builtin/add.c:287 msgid "check if - even missing - files are ignored in dry run" msgstr "se om - även saknade - filer ignoreras i testkörning" -#: builtin/add.c:286 builtin/update-index.c:952 +#: builtin/add.c:288 builtin/update-index.c:954 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/add.c:286 builtin/update-index.c:953 +#: builtin/add.c:288 builtin/update-index.c:955 msgid "override the executable bit of the listed files" msgstr "överstyr exekveringsbiten för angivna filer" -#: builtin/add.c:288 +#: builtin/add.c:290 msgid "warn when adding an embedded repository" msgstr "varna när ett inbyggt arkiv läggs till" -#: builtin/add.c:303 +#: builtin/add.c:305 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -4729,152 +4896,152 @@ msgstr "" "\n" "Se ”git help submodule” för ytterligare information." -#: builtin/add.c:331 +#: builtin/add.c:333 #, c-format msgid "adding embedded git repository: %s" msgstr "lägger till inbäddat git-arkiv: %s" -#: builtin/add.c:349 +#: builtin/add.c:351 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Använd -f om du verkligen vill lägga till dem.\n" -#: builtin/add.c:357 +#: builtin/add.c:359 msgid "adding files failed" msgstr "misslyckades lägga till filer" -#: builtin/add.c:394 +#: builtin/add.c:396 msgid "-A and -u are mutually incompatible" msgstr "-A och -u är ömsesidigt inkompatibla" -#: builtin/add.c:401 +#: builtin/add.c:403 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run" -#: builtin/add.c:405 +#: builtin/add.c:407 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "--chmod-parametern \"%s\" måste antingen vara -x eller +x" -#: builtin/add.c:420 +#: builtin/add.c:422 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Inget angivet, inget tillagt.\n" -#: builtin/add.c:421 +#: builtin/add.c:423 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Kanske menade du att skriva \"git add .\"?\n" -#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282 -#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351 -#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272 -#: builtin/submodule--helper.c:244 +#: builtin/add.c:428 builtin/check-ignore.c:176 builtin/checkout.c:282 +#: builtin/checkout.c:479 builtin/clean.c:957 builtin/commit.c:350 +#: builtin/mv.c:143 builtin/reset.c:249 builtin/rm.c:271 +#: builtin/submodule--helper.c:243 msgid "index file corrupt" msgstr "indexfilen trasig" -#: builtin/am.c:413 +#: builtin/am.c:414 msgid "could not parse author script" msgstr "kunde inte tolka författarskript" -#: builtin/am.c:489 +#: builtin/am.c:498 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "\"%s\" togs bort av kroken applypatch-msg" -#: builtin/am.c:530 +#: builtin/am.c:539 #, c-format msgid "Malformed input line: '%s'." msgstr "Felaktig indatarad: \"%s\"." -#: builtin/am.c:567 +#: builtin/am.c:576 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\"" -#: builtin/am.c:593 +#: builtin/am.c:602 msgid "fseek failed" msgstr "\"fseek\" misslyckades" -#: builtin/am.c:777 +#: builtin/am.c:786 #, c-format msgid "could not parse patch '%s'" msgstr "kunde inte tolka patchen \"%s\"" -#: builtin/am.c:842 +#: builtin/am.c:851 msgid "Only one StGIT patch series can be applied at once" msgstr "Endast en StGIT-patchserie kan tillämpas åt gången" -#: builtin/am.c:889 +#: builtin/am.c:899 msgid "invalid timestamp" msgstr "ogiltig tidsstämpel" -#: builtin/am.c:892 builtin/am.c:900 +#: builtin/am.c:904 builtin/am.c:916 msgid "invalid Date line" msgstr "ogiltig \"Date\"-rad" -#: builtin/am.c:897 +#: builtin/am.c:911 msgid "invalid timezone offset" msgstr "ogiltig tidszons-offset" -#: builtin/am.c:986 +#: builtin/am.c:1004 msgid "Patch format detection failed." msgstr "Misslyckades detektera patchformat." -#: builtin/am.c:991 builtin/clone.c:401 +#: builtin/am.c:1009 builtin/clone.c:402 #, c-format msgid "failed to create directory '%s'" msgstr "misslyckades skapa katalogen \"%s\"" -#: builtin/am.c:995 +#: builtin/am.c:1013 msgid "Failed to split patches." msgstr "Misslyckades dela patchar." -#: builtin/am.c:1120 builtin/commit.c:377 +#: builtin/am.c:1142 builtin/commit.c:376 msgid "unable to write index file" msgstr "kan inte skriva indexfil" -#: builtin/am.c:1171 +#: builtin/am.c:1193 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "När du har löst problemet, kör \"%s --continue\"." -#: builtin/am.c:1172 +#: builtin/am.c:1194 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Om du hellre vill hoppa över patchen, kör \"%s --skip\" i stället." -#: builtin/am.c:1173 +#: builtin/am.c:1195 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "För att återgå till ursprunglig gren och sluta patcha, kör \"%s --abort\"." -#: builtin/am.c:1304 +#: builtin/am.c:1302 msgid "Patch is empty." msgstr "Patchen är tom." -#: builtin/am.c:1370 +#: builtin/am.c:1368 #, c-format msgid "invalid ident line: %.*s" msgstr "ogiltig ident-rad: %.*s" -#: builtin/am.c:1392 +#: builtin/am.c:1390 #, c-format msgid "unable to parse commit %s" msgstr "kunde inte tolka incheckningen %s" -#: builtin/am.c:1586 +#: builtin/am.c:1584 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Arkivet saknar objekt som behövs för att falla tillbaka på 3-" "vägssammanslagning." -#: builtin/am.c:1588 +#: builtin/am.c:1586 msgid "Using index info to reconstruct a base tree..." msgstr "Använder indexinfo för att återskapa ett basträd..." -#: builtin/am.c:1607 +#: builtin/am.c:1605 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -4882,39 +5049,39 @@ msgstr "" "Har du handredigerat din patch?\n" "Den kan inte tillämpas på blobbar som antecknats i dess index." -#: builtin/am.c:1613 +#: builtin/am.c:1611 msgid "Falling back to patching base and 3-way merge..." msgstr "" "Faller tillbaka på att patcha grundversionen och trevägssammanslagning..." -#: builtin/am.c:1638 +#: builtin/am.c:1636 msgid "Failed to merge in the changes." msgstr "Misslyckades slå ihop ändringarna." -#: builtin/am.c:1662 builtin/merge.c:632 +#: builtin/am.c:1660 builtin/merge.c:641 msgid "git write-tree failed to write a tree" msgstr "git write-tree misslyckades skriva ett träd" -#: builtin/am.c:1669 +#: builtin/am.c:1667 msgid "applying to an empty history" msgstr "tillämpar på en tom historik" -#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803 -#: builtin/merge.c:828 +#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824 +#: builtin/merge.c:849 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" -#: builtin/am.c:1715 builtin/am.c:1719 +#: builtin/am.c:1713 builtin/am.c:1717 #, c-format msgid "cannot resume: %s does not exist." msgstr "kan inte återuppta: %s finns inte." -#: builtin/am.c:1735 +#: builtin/am.c:1733 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "kan inte vara interaktiv om standard in inte är ansluten till en terminal." -#: builtin/am.c:1740 +#: builtin/am.c:1738 msgid "Commit Body is:" msgstr "Incheckningskroppen är:" @@ -4922,35 +5089,35 @@ msgstr "Incheckningskroppen är:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1750 +#: builtin/am.c:1748 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla: " -#: builtin/am.c:1800 +#: builtin/am.c:1798 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)" -#: builtin/am.c:1840 builtin/am.c:1912 +#: builtin/am.c:1838 builtin/am.c:1910 #, c-format msgid "Applying: %.*s" msgstr "Tillämpar: %.*s" -#: builtin/am.c:1856 +#: builtin/am.c:1854 msgid "No changes -- Patch already applied." msgstr "Inga ändringar -- Patchen har redan tillämpats." -#: builtin/am.c:1864 +#: builtin/am.c:1862 #, c-format msgid "Patch failed at %s %.*s" msgstr "Patch misslyckades på %s %.*s" -#: builtin/am.c:1870 +#: builtin/am.c:1868 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "En kopia av patchen som misslyckades finns i: %s" -#: builtin/am.c:1915 +#: builtin/am.c:1913 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -4960,7 +5127,7 @@ msgstr "" "Om det inte är något kvar att köa kan det hända att något annat redan\n" "introducerat samma ändringar; kanske du bör hoppa över patchen." -#: builtin/am.c:1922 +#: builtin/am.c:1920 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -4972,17 +5139,17 @@ msgstr "" "lösta.\n" "Du kan köra ”git rm” för att godta ”borttagen av dem” för den." -#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323 -#: builtin/reset.c:331 +#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332 +#: builtin/reset.c:340 #, c-format msgid "Could not parse object '%s'." msgstr "Kan inte tolka objektet ”%s”." -#: builtin/am.c:2083 +#: builtin/am.c:2081 msgid "failed to clean index" msgstr "misslyckades städa upp indexet" -#: builtin/am.c:2117 +#: builtin/am.c:2116 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -4990,134 +5157,133 @@ msgstr "" "Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n" "Återställer inte till ORIG_HEAD" -#: builtin/am.c:2180 +#: builtin/am.c:2179 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Felaktigt värde för --patch-format: %s" -#: builtin/am.c:2213 +#: builtin/am.c:2212 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2214 +#: builtin/am.c:2213 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<flaggor>] (--continue | --skip | --abort)" -#: builtin/am.c:2220 +#: builtin/am.c:2219 msgid "run interactively" msgstr "kör interaktivt" -#: builtin/am.c:2222 +#: builtin/am.c:2221 msgid "historical option -- no-op" msgstr "historisk flagga -- no-op" -#: builtin/am.c:2224 +#: builtin/am.c:2223 msgid "allow fall back on 3way merging if needed" msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt" -#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57 +#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57 #: builtin/repack.c:180 msgid "be quiet" msgstr "var tyst" -#: builtin/am.c:2227 +#: builtin/am.c:2226 msgid "add a Signed-off-by line to the commit message" msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet" -#: builtin/am.c:2230 +#: builtin/am.c:2229 msgid "recode into utf8 (default)" msgstr "koda om till utf8 (standard)" -#: builtin/am.c:2232 +#: builtin/am.c:2231 msgid "pass -k flag to git-mailinfo" msgstr "sänd flaggan -k till git-mailinfo" -#: builtin/am.c:2234 +#: builtin/am.c:2233 msgid "pass -b flag to git-mailinfo" msgstr "sänd flaggan -b till git-mailinfo" -#: builtin/am.c:2236 +#: builtin/am.c:2235 msgid "pass -m flag to git-mailinfo" msgstr "sänd flaggan -m till git-mailinfo" -#: builtin/am.c:2238 +#: builtin/am.c:2237 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "sänd flaggan --keep-cr till git-mailsplit för mbox-formatet" -#: builtin/am.c:2241 +#: builtin/am.c:2240 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "sänd inte flaggan --keep-cr till git-mailsplit oberoende av am.keepcr" -#: builtin/am.c:2244 +#: builtin/am.c:2243 msgid "strip everything before a scissors line" msgstr "ta bort allting före en saxlinje" -#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255 -#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 -#: builtin/am.c:2273 +#: builtin/am.c:2245 builtin/am.c:2248 builtin/am.c:2251 builtin/am.c:2254 +#: builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263 builtin/am.c:2266 +#: builtin/am.c:2272 msgid "pass it through git-apply" msgstr "sänd det genom git-apply" -#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 -#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142 -#: builtin/pull.c:197 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:399 parse-options.h:132 parse-options.h:134 -#: parse-options.h:245 +#: builtin/am.c:2262 builtin/fmt-merge-msg.c:664 builtin/fmt-merge-msg.c:667 +#: builtin/grep.c:843 builtin/merge.c:205 builtin/pull.c:142 builtin/pull.c:197 +#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195 +#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377 +#: parse-options.h:132 parse-options.h:134 parse-options.h:245 msgid "n" msgstr "n" -#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38 -#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39 +#: builtin/am.c:2268 builtin/branch.c:622 builtin/for-each-ref.c:38 +#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39 msgid "format" msgstr "format" -#: builtin/am.c:2270 +#: builtin/am.c:2269 msgid "format the patch(es) are in" msgstr "format för patch(ar)" -#: builtin/am.c:2276 +#: builtin/am.c:2275 msgid "override error message when patch failure occurs" msgstr "överstyr felmeddelanden när patchfel uppstår" -#: builtin/am.c:2278 +#: builtin/am.c:2277 msgid "continue applying patches after resolving a conflict" msgstr "fortsätt applicera patchar efter att ha löst en konflikt" -#: builtin/am.c:2281 +#: builtin/am.c:2280 msgid "synonyms for --continue" msgstr "synonymer till --continue" -#: builtin/am.c:2284 +#: builtin/am.c:2283 msgid "skip the current patch" msgstr "hoppa över den aktuella grenen" -#: builtin/am.c:2287 +#: builtin/am.c:2286 msgid "restore the original branch and abort the patching operation." msgstr "återställ originalgrenen och avbryt patchningen." -#: builtin/am.c:2291 +#: builtin/am.c:2290 msgid "lie about committer date" msgstr "ljug om incheckningsdatum" -#: builtin/am.c:2293 +#: builtin/am.c:2292 msgid "use current timestamp for author date" msgstr "använd nuvarande tidsstämpel för författardatum" -#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233 -#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414 +#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236 +#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392 msgid "key-id" msgstr "nyckel-id" -#: builtin/am.c:2296 +#: builtin/am.c:2295 msgid "GPG-sign commits" msgstr "GPG-signera incheckningar" -#: builtin/am.c:2299 +#: builtin/am.c:2298 msgid "(internal use for git-rebase)" msgstr "(används internt av git-rebase)" -#: builtin/am.c:2317 +#: builtin/am.c:2316 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." @@ -5125,16 +5291,16 @@ msgstr "" "Flaggan -b/--binary har varit utan funktion länge, och\n" "kommer tas bort. Vi ber dig att inte använda den längre." -#: builtin/am.c:2324 +#: builtin/am.c:2323 msgid "failed to read the index" msgstr "misslyckades läsa indexet" -#: builtin/am.c:2339 +#: builtin/am.c:2338 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "tidigare rebase-katalog %s finns fortfarande, men mbox angavs." -#: builtin/am.c:2363 +#: builtin/am.c:2362 #, c-format msgid "" "Stray %s directory found.\n" @@ -5143,7 +5309,7 @@ msgstr "" "Kvarbliven katalog %s hittades.\n" "Använd \"git am --abort\" för att ta bort den." -#: builtin/am.c:2369 +#: builtin/am.c:2368 msgid "Resolve operation not in progress, we are not resuming." msgstr "Lösningsoperation pågår inte, vi återupptar inte." @@ -5345,14 +5511,18 @@ msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [<flaggor>] (-m | -M) [<gammal_gren>] <ny_gren>" #: builtin/branch.c:31 +msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>" +msgstr "git branch [<flaggor>] (-c | -C) [<gammal_gren>] <ny_gren>" + +#: builtin/branch.c:32 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [<flaggor>] [-r | -a] [--points-at]" -#: builtin/branch.c:32 +#: builtin/branch.c:33 msgid "git branch [<options>] [-r | -a] [--format]" msgstr "git branch [<flaggor>] [-r | -a] [--format]" -#: builtin/branch.c:145 +#: builtin/branch.c:146 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -5361,7 +5531,7 @@ msgstr "" "tar bort grenen \"%s\" som har slagits ihop med\n" " \"%s\", men ännu inte slagits ihop med HEAD." -#: builtin/branch.c:149 +#: builtin/branch.c:150 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -5370,12 +5540,12 @@ msgstr "" "tar inte bort grenen \"%s\" som inte har slagits ihop med\n" " \"%s\", trots att den har slagits ihop med HEAD." -#: builtin/branch.c:163 +#: builtin/branch.c:164 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\"" -#: builtin/branch.c:167 +#: builtin/branch.c:168 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -5384,92 +5554,113 @@ msgstr "" "Grenen \"%s\" har inte slagits samman i sin helhet.\n" "Om du är säker på att du vill ta bort den, kör \"git branch -D %s\"." -#: builtin/branch.c:180 +#: builtin/branch.c:181 msgid "Update of config-file failed" msgstr "Misslyckades uppdatera konfigurationsfil" -#: builtin/branch.c:211 +#: builtin/branch.c:212 msgid "cannot use -a with -d" msgstr "kan inte ange -a med -d" -#: builtin/branch.c:217 +#: builtin/branch.c:218 msgid "Couldn't look up commit object for HEAD" msgstr "Kunde inte slå upp incheckningsobjekt för HEAD" -#: builtin/branch.c:231 +#: builtin/branch.c:232 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "Kan inte ta bort grenen \"%s\" som är utcheckad på \"%s\"" -#: builtin/branch.c:246 +#: builtin/branch.c:247 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "fjärrspårande grenen \"%s\" hittades inte." -#: builtin/branch.c:247 +#: builtin/branch.c:248 #, c-format msgid "branch '%s' not found." msgstr "grenen \"%s\" hittades inte." -#: builtin/branch.c:262 +#: builtin/branch.c:263 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "Fel vid borttagning av fjärrspårande grenen \"%s\"" -#: builtin/branch.c:263 +#: builtin/branch.c:264 #, c-format msgid "Error deleting branch '%s'" msgstr "Fel vid borttagning av grenen \"%s\"" -#: builtin/branch.c:270 +#: builtin/branch.c:271 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Tog bort fjärrspårande grenen %s (var %s).\n" -#: builtin/branch.c:271 +#: builtin/branch.c:272 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Tog bort grenen %s (var %s).\n" -#: builtin/branch.c:445 +#: builtin/branch.c:417 builtin/tag.c:58 +msgid "unable to parse format string" +msgstr "kan inte tolka formatsträng" + +#: builtin/branch.c:450 #, c-format msgid "Branch %s is being rebased at %s" msgstr "Grenen %s ombaseras på %s" -#: builtin/branch.c:449 +#: builtin/branch.c:454 #, c-format msgid "Branch %s is being bisected at %s" msgstr "Grenen %s är i en \"bisect\" på %s" -#: builtin/branch.c:464 +#: builtin/branch.c:470 +msgid "cannot copy the current branch while not on any." +msgstr "kunde inte kopiera aktuell gren när du inte befinner dig på någon." + +#: builtin/branch.c:472 msgid "cannot rename the current branch while not on any." msgstr "" "kunde inte byta namn på aktuell gren när du inte befinner dig på någon." -#: builtin/branch.c:474 +#: builtin/branch.c:483 #, c-format msgid "Invalid branch name: '%s'" msgstr "Felaktigt namn på gren: \"%s\"" -#: builtin/branch.c:491 +#: builtin/branch.c:504 msgid "Branch rename failed" msgstr "Misslyckades byta namn på gren" -#: builtin/branch.c:494 +#: builtin/branch.c:506 +msgid "Branch copy failed" +msgstr "Misslyckades kopiera gren" + +#: builtin/branch.c:510 +#, c-format +msgid "Copied a misnamed branch '%s' away" +msgstr "Kopierade bort en felaktigt namngiven gren \"%s\"" + +#: builtin/branch.c:513 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:497 +#: builtin/branch.c:519 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!" -#: builtin/branch.c:506 +#: builtin/branch.c:528 msgid "Branch is renamed, but update of config-file failed" msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:522 +#: builtin/branch.c:530 +msgid "Branch is copied, but update of config-file failed" +msgstr "Grenen kopierades, men misslyckades uppdatera konfigurationsfilen" + +#: builtin/branch.c:546 #, c-format msgid "" "Please edit the description for the branch\n" @@ -5480,235 +5671,231 @@ msgstr "" " %s\n" "Rader som inleds med \"%c\" ignoreras.\n" -#: builtin/branch.c:555 +#: builtin/branch.c:579 msgid "Generic options" msgstr "Allmänna flaggor" -#: builtin/branch.c:557 +#: builtin/branch.c:581 msgid "show hash and subject, give twice for upstream branch" msgstr "visa hash och ärenderad, ange två gånger för uppströmsgren" -#: builtin/branch.c:558 +#: builtin/branch.c:582 msgid "suppress informational messages" msgstr "undertryck informationsmeddelanden" -#: builtin/branch.c:559 +#: builtin/branch.c:583 msgid "set up tracking mode (see git-pull(1))" msgstr "ställ in spårningsläge (se git-pull(1))" -#: builtin/branch.c:561 -msgid "change upstream info" -msgstr "ändra uppströmsinformation" +#: builtin/branch.c:585 +msgid "do not use" +msgstr "använd ej" -#: builtin/branch.c:563 +#: builtin/branch.c:587 msgid "upstream" msgstr "uppströms" -#: builtin/branch.c:563 +#: builtin/branch.c:587 msgid "change the upstream info" msgstr "ändra uppströmsinformationen" -#: builtin/branch.c:564 +#: builtin/branch.c:588 msgid "Unset the upstream info" msgstr "Ta bort uppströmsinformationen" -#: builtin/branch.c:565 +#: builtin/branch.c:589 msgid "use colored output" msgstr "använd färgad utdata" -#: builtin/branch.c:566 +#: builtin/branch.c:590 msgid "act on remote-tracking branches" msgstr "arbeta på fjärrspårande grenar" -#: builtin/branch.c:568 builtin/branch.c:570 +#: builtin/branch.c:592 builtin/branch.c:594 msgid "print only branches that contain the commit" msgstr "visa endast grenar som innehåller incheckningen" -#: builtin/branch.c:569 builtin/branch.c:571 +#: builtin/branch.c:593 builtin/branch.c:595 msgid "print only branches that don't contain the commit" msgstr "visa endast grenar som inte innehåller incheckningen" -#: builtin/branch.c:574 +#: builtin/branch.c:598 msgid "Specific git-branch actions:" msgstr "Specifika git-branch-åtgärder:" -#: builtin/branch.c:575 +#: builtin/branch.c:599 msgid "list both remote-tracking and local branches" msgstr "visa både fjärrspårande och lokala grenar" -#: builtin/branch.c:577 +#: builtin/branch.c:601 msgid "delete fully merged branch" msgstr "ta bort helt sammanslagen gren" -#: builtin/branch.c:578 +#: builtin/branch.c:602 msgid "delete branch (even if not merged)" msgstr "ta bort gren (även om inte helt sammanslagen)" -#: builtin/branch.c:579 +#: builtin/branch.c:603 msgid "move/rename a branch and its reflog" msgstr "flytta/ta bort en gren och dess reflogg" -#: builtin/branch.c:580 +#: builtin/branch.c:604 msgid "move/rename a branch, even if target exists" msgstr "flytta/ta bort en gren, även om målet finns" -#: builtin/branch.c:581 +#: builtin/branch.c:605 +msgid "copy a branch and its reflog" +msgstr "kopiera en gren och dess reflogg" + +#: builtin/branch.c:606 +msgid "copy a branch, even if target exists" +msgstr "kopiera en gren, även om målet finns" + +#: builtin/branch.c:607 msgid "list branch names" msgstr "lista namn på grenar" -#: builtin/branch.c:582 +#: builtin/branch.c:608 msgid "create the branch's reflog" msgstr "skapa grenens reflogg" -#: builtin/branch.c:584 +#: builtin/branch.c:610 msgid "edit the description for the branch" msgstr "redigera beskrivning för grenen" -#: builtin/branch.c:585 +#: builtin/branch.c:611 msgid "force creation, move/rename, deletion" msgstr "tvinga skapande, flytt/namnändring, borttagande" -#: builtin/branch.c:586 +#: builtin/branch.c:612 msgid "print only branches that are merged" msgstr "visa endast sammanslagna grenar" -#: builtin/branch.c:587 +#: builtin/branch.c:613 msgid "print only branches that are not merged" msgstr "visa endast ej sammanslagna grenar" -#: builtin/branch.c:588 +#: builtin/branch.c:614 msgid "list branches in columns" msgstr "visa grenar i spalter" -#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427 +#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405 msgid "key" msgstr "nyckel" -#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428 +#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406 msgid "field name to sort on" msgstr "fältnamn att sortera på" -#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407 -#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573 -#: builtin/tag.c:430 +#: builtin/branch.c:618 builtin/for-each-ref.c:43 builtin/notes.c:408 +#: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574 +#: builtin/tag.c:408 msgid "object" msgstr "objekt" -#: builtin/branch.c:593 +#: builtin/branch.c:619 msgid "print only branches of the object" msgstr "visa endast grenar för objektet" -#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435 +#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415 msgid "sorting and filtering are case insensitive" msgstr "sortering och filtrering skiljer gemener och VERSALER" -#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434 +#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413 #: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "format att använda för utdata" -#: builtin/branch.c:615 -msgid "Failed to resolve HEAD as a valid ref." -msgstr "Misslyckades slå upp HEAD som giltig referens." - -#: builtin/branch.c:619 builtin/clone.c:728 +#: builtin/branch.c:645 builtin/clone.c:729 msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" -#: builtin/branch.c:642 +#: builtin/branch.c:668 msgid "--column and --verbose are incompatible" msgstr "--column och --verbose är inkompatibla" -#: builtin/branch.c:653 builtin/branch.c:705 +#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741 msgid "branch name required" msgstr "grennamn krävs" -#: builtin/branch.c:681 +#: builtin/branch.c:708 msgid "Cannot give description to detached HEAD" msgstr "Kan inte beskriva frånkopplad HEAD" -#: builtin/branch.c:686 +#: builtin/branch.c:713 msgid "cannot edit description of more than one branch" msgstr "kan inte redigera beskrivning för mer än en gren" -#: builtin/branch.c:693 +#: builtin/branch.c:720 #, c-format msgid "No commit on branch '%s' yet." msgstr "Inga incheckningar på grenen \"%s\" ännu." -#: builtin/branch.c:696 +#: builtin/branch.c:723 #, c-format msgid "No branch named '%s'." msgstr "Ingen gren vid namnet \"%s\"." -#: builtin/branch.c:711 -msgid "too many branches for a rename operation" -msgstr "för många grenar för namnbyte" +#: builtin/branch.c:738 +msgid "too many branches for a copy operation" +msgstr "för många grenar för kopiering" -#: builtin/branch.c:716 -msgid "too many branches to set new upstream" -msgstr "för många grenar för att byta uppström" +#: builtin/branch.c:747 +msgid "too many arguments for a rename operation" +msgstr "för många flaggor för namnbyte" -#: builtin/branch.c:720 +#: builtin/branch.c:752 +msgid "too many arguments to set new upstream" +msgstr "för många flaggor för att byta uppström" + +#: builtin/branch.c:756 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" "kunde inte sätta uppström för HEAD till %s när det inte pekar mot någon gren." -#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766 +#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800 #, c-format msgid "no such branch '%s'" msgstr "okänd gren \"%s\"" -#: builtin/branch.c:727 +#: builtin/branch.c:763 #, c-format msgid "branch '%s' does not exist" msgstr "grenen \"%s\" finns inte" -#: builtin/branch.c:739 -msgid "too many branches to unset upstream" -msgstr "för många grenar för att ta bort uppström" +#: builtin/branch.c:775 +msgid "too many arguments to unset upstream" +msgstr "för många flaggor för att ta bort uppström" -#: builtin/branch.c:743 +#: builtin/branch.c:779 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "kunde inte ta bort uppström för HEAD när det inte pekar mot någon gren." -#: builtin/branch.c:749 +#: builtin/branch.c:785 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Grenen \"%s\" har ingen uppströmsinformation" -#: builtin/branch.c:763 +#: builtin/branch.c:797 msgid "it does not make sense to create 'HEAD' manually" msgstr "kan inte skapa \"HEAD\" manuellt" -#: builtin/branch.c:769 +#: builtin/branch.c:803 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "flaggorna -a och -r på \"git branch\" kan inte anges tillsammans med ett " "grennamn" -#: builtin/branch.c:772 -#, c-format +#: builtin/branch.c:806 msgid "" -"The --set-upstream flag is deprecated and will be removed. Consider using --" -"track or --set-upstream-to\n" +"the '--set-upstream' option is no longer supported. Please use '--track' or " +"'--set-upstream-to' instead." msgstr "" "Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track " -"eller --set-upstream-to\n" - -#: builtin/branch.c:789 -#, c-format -msgid "" -"\n" -"If you wanted to make '%s' track '%s', do this:\n" -"\n" -msgstr "" -"\n" -"Om du vill göra så att \"%s\" spårar \"%s\" gör du så här:\n" -"\n" +"eller --set-upstream-to istället." #: builtin/bundle.c:45 #, c-format @@ -5723,7 +5910,7 @@ msgstr "Behöver ett arkiv för att skapa ett paket (bundle)." msgid "Need a repository to unbundle." msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)." -#: builtin/cat-file.c:519 +#: builtin/cat-file.c:521 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -5731,7 +5918,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <typ> | --textconv | --filters) [--path=<sökväg>] <objekt>" -#: builtin/cat-file.c:520 +#: builtin/cat-file.c:522 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" @@ -5739,64 +5926,64 @@ msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:557 +#: builtin/cat-file.c:559 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<typ> kan vara en av: blob, tree, commit, tag" -#: builtin/cat-file.c:558 +#: builtin/cat-file.c:560 msgid "show object type" msgstr "visa objekttyp" -#: builtin/cat-file.c:559 +#: builtin/cat-file.c:561 msgid "show object size" msgstr "visa objektstorlek" -#: builtin/cat-file.c:561 +#: builtin/cat-file.c:563 msgid "exit with zero when there's no error" msgstr "avsluta med noll när det inte uppstått något fel" -#: builtin/cat-file.c:562 +#: builtin/cat-file.c:564 msgid "pretty-print object's content" msgstr "visa objektets innehåll snyggt" -#: builtin/cat-file.c:564 +#: builtin/cat-file.c:566 msgid "for blob objects, run textconv on object's content" msgstr "för blob-objekt, kör filter på objektets innehåll" -#: builtin/cat-file.c:566 +#: builtin/cat-file.c:568 msgid "for blob objects, run filters on object's content" msgstr "för blob-objekt, kör filger på objektets innehåll" -#: builtin/cat-file.c:567 git-submodule.sh:944 +#: builtin/cat-file.c:569 git-submodule.sh:943 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:568 +#: builtin/cat-file.c:570 msgid "use a specific path for --textconv/--filters" msgstr "använd specifik sökväg för --textconv/--filters" -#: builtin/cat-file.c:570 +#: builtin/cat-file.c:572 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "låter -s och -t att fungera med trasiga/sönderskrivna objekt" -#: builtin/cat-file.c:571 +#: builtin/cat-file.c:573 msgid "buffer --batch output" msgstr "buffra utdata från --batch" -#: builtin/cat-file.c:573 +#: builtin/cat-file.c:575 msgid "show info and content of objects fed from the standard input" msgstr "visa information och innehåll för objekt som listas på standard in" -#: builtin/cat-file.c:576 +#: builtin/cat-file.c:578 msgid "show info about objects fed from the standard input" msgstr "visa information för objekt som listas på standard in" -#: builtin/cat-file.c:579 +#: builtin/cat-file.c:581 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "följ symboliska länkar i trädet (använd med --batch eller --batch-check)" -#: builtin/cat-file.c:581 +#: builtin/cat-file.c:583 msgid "show all objects with --batch or --batch-check" msgstr "visa alla objekt med --batch eller --batch-check" @@ -5824,7 +6011,7 @@ msgstr "läs filnamn från standard in" msgid "terminate input and output records by a NUL character" msgstr "avsluta in- och utdataposter med NUL-tecken" -#: builtin/check-ignore.c:20 builtin/checkout.c:1143 builtin/gc.c:357 +#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358 msgid "suppress progress reporting" msgstr "undertryck förloppsrapportering" @@ -5914,9 +6101,9 @@ msgid "write the content to temporary files" msgstr "skriv innehåll till temporära filer" #: builtin/checkout-index.c:175 builtin/column.c:31 -#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638 -#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980 -#: builtin/worktree.c:478 +#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631 +#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999 +#: builtin/worktree.c:498 msgid "string" msgstr "sträng" @@ -5987,54 +6174,54 @@ msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt." msgid "path '%s' is unmerged" msgstr "sökvägen \"%s\" har inte slagits ihop" -#: builtin/checkout.c:497 +#: builtin/checkout.c:501 msgid "you need to resolve your current index first" msgstr "du måste lösa ditt befintliga index först" -#: builtin/checkout.c:628 +#: builtin/checkout.c:632 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Kan inte skapa referenslogg för \"%s\": %s\n" -#: builtin/checkout.c:669 +#: builtin/checkout.c:673 msgid "HEAD is now at" msgstr "HEAD är nu på" -#: builtin/checkout.c:673 builtin/clone.c:682 +#: builtin/checkout.c:677 builtin/clone.c:683 msgid "unable to update HEAD" msgstr "kan inte uppdatera HEAD" -#: builtin/checkout.c:677 +#: builtin/checkout.c:681 #, c-format msgid "Reset branch '%s'\n" msgstr "Återställ gren \"%s\"\n" -#: builtin/checkout.c:680 +#: builtin/checkout.c:684 #, c-format msgid "Already on '%s'\n" msgstr "Redan på \"%s\"\n" -#: builtin/checkout.c:684 +#: builtin/checkout.c:688 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Växlade till och nollställde grenen \"%s\"\n" -#: builtin/checkout.c:686 builtin/checkout.c:1075 +#: builtin/checkout.c:690 builtin/checkout.c:1086 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Växlade till en ny gren \"%s\"\n" -#: builtin/checkout.c:688 +#: builtin/checkout.c:692 #, c-format msgid "Switched to branch '%s'\n" msgstr "Växlade till grenen \"%s\"\n" -#: builtin/checkout.c:739 +#: builtin/checkout.c:743 #, c-format msgid " ... and %d more.\n" msgstr " ... och %d till.\n" -#: builtin/checkout.c:745 +#: builtin/checkout.c:749 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -6057,7 +6244,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:764 +#: builtin/checkout.c:768 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -6084,161 +6271,161 @@ msgstr[1] "" " git branch <nytt_grennamn> %s\n" "\n" -#: builtin/checkout.c:800 +#: builtin/checkout.c:809 msgid "internal error in revision walk" msgstr "internt fel vid genomgång av revisioner (revision walk)" -#: builtin/checkout.c:804 +#: builtin/checkout.c:813 msgid "Previous HEAD position was" msgstr "Tidigare position för HEAD var" -#: builtin/checkout.c:832 builtin/checkout.c:1070 +#: builtin/checkout.c:843 builtin/checkout.c:1081 msgid "You are on a branch yet to be born" msgstr "Du är på en gren som ännu inte är född" -#: builtin/checkout.c:976 +#: builtin/checkout.c:987 #, c-format msgid "only one reference expected, %d given." msgstr "endast en referens förväntades, %d gavs." -#: builtin/checkout.c:1016 builtin/worktree.c:215 +#: builtin/checkout.c:1027 builtin/worktree.c:233 #, c-format msgid "invalid reference: %s" msgstr "felaktig referens: %s" -#: builtin/checkout.c:1045 +#: builtin/checkout.c:1056 #, c-format msgid "reference is not a tree: %s" msgstr "referensen är inte ett träd: %s" -#: builtin/checkout.c:1084 +#: builtin/checkout.c:1095 msgid "paths cannot be used with switching branches" msgstr "sökvägar kan inte användas vid byte av gren" -#: builtin/checkout.c:1087 builtin/checkout.c:1091 +#: builtin/checkout.c:1098 builtin/checkout.c:1102 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "\"%s\" kan inte användas vid byte av gren" -#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103 -#: builtin/checkout.c:1106 +#: builtin/checkout.c:1106 builtin/checkout.c:1109 builtin/checkout.c:1114 +#: builtin/checkout.c:1117 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "\"%s\" kan inte användas med \"%s\"" -#: builtin/checkout.c:1111 +#: builtin/checkout.c:1122 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kan inte växla gren till icke-incheckningen \"%s\"" -#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113 -#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328 -#: builtin/worktree.c:330 +#: builtin/checkout.c:1154 builtin/checkout.c:1156 builtin/clone.c:114 +#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:346 +#: builtin/worktree.c:348 msgid "branch" msgstr "gren" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1155 msgid "create and checkout a new branch" msgstr "skapa och checka ut en ny gren" -#: builtin/checkout.c:1147 +#: builtin/checkout.c:1157 msgid "create/reset and checkout a branch" msgstr "skapa/nollställ och checka ut en gren" -#: builtin/checkout.c:1148 +#: builtin/checkout.c:1158 msgid "create reflog for new branch" msgstr "skapa reflogg för ny gren" -#: builtin/checkout.c:1149 builtin/worktree.c:332 +#: builtin/checkout.c:1159 builtin/worktree.c:350 msgid "detach HEAD at named commit" msgstr "koppla från HEAD vid namngiven incheckning" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1160 msgid "set upstream info for new branch" msgstr "sätt uppströmsinformation för ny gren" -#: builtin/checkout.c:1152 +#: builtin/checkout.c:1162 msgid "new-branch" msgstr "ny-gren" -#: builtin/checkout.c:1152 +#: builtin/checkout.c:1162 msgid "new unparented branch" msgstr "ny gren utan förälder" -#: builtin/checkout.c:1153 +#: builtin/checkout.c:1163 msgid "checkout our version for unmerged files" msgstr "checka ut vår version för ej sammanslagna filer" -#: builtin/checkout.c:1155 +#: builtin/checkout.c:1165 msgid "checkout their version for unmerged files" msgstr "checka ut deras version för ej sammanslagna filer" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1167 msgid "force checkout (throw away local modifications)" msgstr "tvinga utcheckning (kasta bort lokala ändringar)" -#: builtin/checkout.c:1158 +#: builtin/checkout.c:1168 msgid "perform a 3-way merge with the new branch" msgstr "utför en 3-vägssammanslagning för den nya grenen" -#: builtin/checkout.c:1159 builtin/merge.c:235 +#: builtin/checkout.c:1169 builtin/merge.c:238 msgid "update ignored files (default)" msgstr "uppdatera ignorerade filer (standard)" -#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251 +#: builtin/checkout.c:1170 builtin/log.c:1489 parse-options.h:251 msgid "style" msgstr "stil" -#: builtin/checkout.c:1161 +#: builtin/checkout.c:1171 msgid "conflict style (merge or diff3)" msgstr "konfliktstil (merge eller diff3)" -#: builtin/checkout.c:1164 +#: builtin/checkout.c:1174 msgid "do not limit pathspecs to sparse entries only" msgstr "begränsa inte sökvägar till endast glesa poster" -#: builtin/checkout.c:1166 +#: builtin/checkout.c:1176 msgid "second guess 'git checkout <no-such-branch>'" msgstr "förutspå \"git checkout <gren-saknas>\"" -#: builtin/checkout.c:1168 +#: builtin/checkout.c:1178 msgid "do not check if another worktree is holding the given ref" msgstr "" "kontrollera inte om en annan arbetskatalog håller den angivna referensen" -#: builtin/checkout.c:1172 builtin/clone.c:80 builtin/fetch.c:114 -#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544 +#: builtin/checkout.c:1182 builtin/clone.c:81 builtin/fetch.c:136 +#: builtin/merge.c:235 builtin/pull.c:120 builtin/push.c:544 #: builtin/send-pack.c:173 msgid "force progress reporting" msgstr "tvinga förloppsrapportering" -#: builtin/checkout.c:1203 +#: builtin/checkout.c:1212 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B och --orphan är ömsesidigt uteslutande" -#: builtin/checkout.c:1220 +#: builtin/checkout.c:1229 msgid "--track needs a branch name" msgstr "--track behöver ett namn på en gren" -#: builtin/checkout.c:1225 +#: builtin/checkout.c:1234 msgid "Missing branch name; try -b" msgstr "Grennamn saknas; försök med -b" -#: builtin/checkout.c:1261 +#: builtin/checkout.c:1270 msgid "invalid path specification" msgstr "felaktig sökvägsangivelse" -#: builtin/checkout.c:1268 +#: builtin/checkout.c:1277 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "”%s” är inte en incheckning och grenen ”%s” kan inte skapas från den" -#: builtin/checkout.c:1272 +#: builtin/checkout.c:1281 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach tar inte en sökväg som argument \"%s\"" -#: builtin/checkout.c:1276 +#: builtin/checkout.c:1285 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -6278,7 +6465,7 @@ msgstr "Skulle hoppa över arkivet %s\n" msgid "failed to remove %s" msgstr "misslyckades ta bort %s" -#: builtin/clean.c:298 git-add--interactive.perl:572 +#: builtin/clean.c:301 git-add--interactive.perl:572 #, c-format msgid "" "Prompt help:\n" @@ -6291,7 +6478,7 @@ msgstr "" "foo - markera post baserad på unikt prefix\n" " - (tomt) markera ingenting\n" -#: builtin/clean.c:302 git-add--interactive.perl:581 +#: builtin/clean.c:305 git-add--interactive.perl:581 #, c-format msgid "" "Prompt help:\n" @@ -6312,38 +6499,38 @@ msgstr "" "* - välj alla poster\n" " - (tomt) avsluta markering\n" -#: builtin/clean.c:518 git-add--interactive.perl:547 +#: builtin/clean.c:521 git-add--interactive.perl:547 #: git-add--interactive.perl:552 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Vadå (%s)?\n" -#: builtin/clean.c:660 +#: builtin/clean.c:663 #, c-format msgid "Input ignore patterns>> " msgstr "Ange ignoreringsmönster>>" -#: builtin/clean.c:697 +#: builtin/clean.c:700 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "VARNING: Hittar inte poster som motsvarar: %s" -#: builtin/clean.c:718 +#: builtin/clean.c:721 msgid "Select items to delete" msgstr "Välj poster att ta bort" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:759 +#: builtin/clean.c:762 #, c-format msgid "Remove %s [y/N]? " msgstr "Ta bort %s [Y=ja / N=nej]? " -#: builtin/clean.c:784 git-add--interactive.perl:1616 +#: builtin/clean.c:787 git-add--interactive.perl:1616 #, c-format msgid "Bye.\n" msgstr "Hej då.\n" -#: builtin/clean.c:792 +#: builtin/clean.c:795 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -6361,63 +6548,63 @@ msgstr "" "help - denna skärm\n" "? - hjälp för kommandoval" -#: builtin/clean.c:819 git-add--interactive.perl:1692 +#: builtin/clean.c:822 git-add--interactive.perl:1692 msgid "*** Commands ***" msgstr "*** Kommandon ***" -#: builtin/clean.c:820 git-add--interactive.perl:1689 +#: builtin/clean.c:823 git-add--interactive.perl:1689 msgid "What now" msgstr "Vad nu" -#: builtin/clean.c:828 +#: builtin/clean.c:831 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Skulle ta bort följande post:" msgstr[1] "Skulle ta bort följande poster:" -#: builtin/clean.c:844 +#: builtin/clean.c:847 msgid "No more files to clean, exiting." msgstr "Inga fler filer att städa, avslutar." -#: builtin/clean.c:906 +#: builtin/clean.c:909 msgid "do not print names of files removed" msgstr "skriv inte ut namn på borttagna filer" -#: builtin/clean.c:908 +#: builtin/clean.c:911 msgid "force" msgstr "tvinga" -#: builtin/clean.c:909 +#: builtin/clean.c:912 msgid "interactive cleaning" msgstr "städa interaktivt" -#: builtin/clean.c:911 +#: builtin/clean.c:914 msgid "remove whole directories" msgstr "ta bort hela kataloger" -#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454 -#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397 +#: builtin/clean.c:915 builtin/describe.c:463 builtin/describe.c:465 +#: builtin/grep.c:861 builtin/ls-files.c:544 builtin/name-rev.c:397 #: builtin/name-rev.c:399 builtin/show-ref.c:176 msgid "pattern" msgstr "mönster" -#: builtin/clean.c:913 +#: builtin/clean.c:916 msgid "add <pattern> to ignore rules" msgstr "lägg till <mönster> till ignoreringsregler" -#: builtin/clean.c:914 +#: builtin/clean.c:917 msgid "remove ignored files, too" msgstr "ta även bort ignorerade filer" -#: builtin/clean.c:916 +#: builtin/clean.c:919 msgid "remove only ignored files" msgstr "ta endast bort ignorerade filer" -#: builtin/clean.c:934 +#: builtin/clean.c:937 msgid "-x and -X cannot be used together" msgstr "-x och -X kan inte användas samtidigt" -#: builtin/clean.c:938 +#: builtin/clean.c:941 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -6425,7 +6612,7 @@ msgstr "" "clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar " "städa" -#: builtin/clean.c:941 +#: builtin/clean.c:944 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -6433,142 +6620,142 @@ msgstr "" "clean.requireForce har standardvärdet true och varken -i, -n eller -f " "angavs; vägrar städa" -#: builtin/clone.c:38 +#: builtin/clone.c:39 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]" -#: builtin/clone.c:82 +#: builtin/clone.c:83 msgid "don't create a checkout" msgstr "skapa inte någon utcheckning" -#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479 +#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479 msgid "create a bare repository" msgstr "skapa ett naket (\"bare\") arkiv" -#: builtin/clone.c:87 +#: builtin/clone.c:88 msgid "create a mirror repository (implies bare)" msgstr "skapa ett spegelarkiv (implicerar \"bare\")" -#: builtin/clone.c:89 +#: builtin/clone.c:90 msgid "to clone from a local repository" msgstr "för att klona från ett lokalt arkiv" -#: builtin/clone.c:91 +#: builtin/clone.c:92 msgid "don't use local hardlinks, always copy" msgstr "skapa inte lokala hårda länkar, kopiera alltid" -#: builtin/clone.c:93 +#: builtin/clone.c:94 msgid "setup as shared repository" msgstr "skapa som ett delat arkiv" -#: builtin/clone.c:95 builtin/clone.c:99 +#: builtin/clone.c:96 builtin/clone.c:100 msgid "pathspec" msgstr "sökvägsangivelse" -#: builtin/clone.c:95 builtin/clone.c:99 +#: builtin/clone.c:96 builtin/clone.c:100 msgid "initialize submodules in the clone" msgstr "initiera undermoduler i klonen" -#: builtin/clone.c:102 +#: builtin/clone.c:103 msgid "number of submodules cloned in parallel" msgstr "antal undermoduler som klonas parallellt" -#: builtin/clone.c:103 builtin/init-db.c:476 +#: builtin/clone.c:104 builtin/init-db.c:476 msgid "template-directory" msgstr "mallkatalog" -#: builtin/clone.c:104 builtin/init-db.c:477 +#: builtin/clone.c:105 builtin/init-db.c:477 msgid "directory from which templates will be used" msgstr "katalog att använda mallar från" -#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642 -#: builtin/submodule--helper.c:983 +#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:635 +#: builtin/submodule--helper.c:1002 msgid "reference repository" msgstr "referensarkiv" -#: builtin/clone.c:110 +#: builtin/clone.c:111 msgid "use --reference only while cloning" msgstr "använd --reference endast under kloningen" -#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44 +#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44 msgid "name" msgstr "namn" -#: builtin/clone.c:112 +#: builtin/clone.c:113 msgid "use <name> instead of 'origin' to track upstream" msgstr "använd <namn> istället för \"origin\" för att spåra uppströms" -#: builtin/clone.c:114 +#: builtin/clone.c:115 msgid "checkout <branch> instead of the remote's HEAD" msgstr "checka ut <gren> istället för fjärrens HEAD" -#: builtin/clone.c:116 +#: builtin/clone.c:117 msgid "path to git-upload-pack on the remote" msgstr "sökväg till git-upload-pack på fjärren" -#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025 +#: builtin/clone.c:118 builtin/fetch.c:137 builtin/grep.c:804 #: builtin/pull.c:205 msgid "depth" msgstr "djup" -#: builtin/clone.c:118 +#: builtin/clone.c:119 msgid "create a shallow clone of that depth" msgstr "skapa en grund klon på detta djup" -#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932 +#: builtin/clone.c:120 builtin/fetch.c:139 builtin/pack-objects.c:2938 #: parse-options.h:142 msgid "time" msgstr "tid" -#: builtin/clone.c:120 +#: builtin/clone.c:121 msgid "create a shallow clone since a specific time" msgstr "skapa en grund klon från en angiven tidpunkt" -#: builtin/clone.c:121 builtin/fetch.c:119 +#: builtin/clone.c:122 builtin/fetch.c:141 msgid "revision" msgstr "revision" -#: builtin/clone.c:122 builtin/fetch.c:120 +#: builtin/clone.c:123 builtin/fetch.c:142 msgid "deepen history of shallow clone, excluding rev" msgstr "fördjupa historik för grund klon, exkludera revisionen" -#: builtin/clone.c:124 +#: builtin/clone.c:125 msgid "clone only one branch, HEAD or --branch" msgstr "klona endast en gren, HEAD eller --branch" -#: builtin/clone.c:126 +#: builtin/clone.c:127 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "klona inga taggar och gör att senare hämtningar inte följer dem" -#: builtin/clone.c:128 +#: builtin/clone.c:129 msgid "any cloned submodules will be shallow" msgstr "klonade undermoduler kommer vara grunda" -#: builtin/clone.c:129 builtin/init-db.c:485 +#: builtin/clone.c:130 builtin/init-db.c:485 msgid "gitdir" msgstr "gitkat" -#: builtin/clone.c:130 builtin/init-db.c:486 +#: builtin/clone.c:131 builtin/init-db.c:486 msgid "separate git dir from working tree" msgstr "separera gitkatalogen från arbetskatalogen" -#: builtin/clone.c:131 +#: builtin/clone.c:132 msgid "key=value" msgstr "nyckel=värde" -#: builtin/clone.c:132 +#: builtin/clone.c:133 msgid "set config inside the new repository" msgstr "ställ in konfiguration i det nya arkivet" -#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555 +#: builtin/clone.c:134 builtin/fetch.c:159 builtin/push.c:555 msgid "use IPv4 addresses only" msgstr "använd endast IPv4-adresser" -#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557 +#: builtin/clone.c:136 builtin/fetch.c:161 builtin/push.c:557 msgid "use IPv6 addresses only" msgstr "använd endast IPv6-adresser" -#: builtin/clone.c:272 +#: builtin/clone.c:273 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -6576,42 +6763,42 @@ msgstr "" "Kunde inte gissa katalognamn.\n" "Ange en katalog på kommandoraden" -#: builtin/clone.c:325 +#: builtin/clone.c:326 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: Kan inte skapa alternativ för \"%s\": %s\n" -#: builtin/clone.c:397 +#: builtin/clone.c:398 #, c-format msgid "failed to open '%s'" msgstr "misslyckades öppna \"%s\"" -#: builtin/clone.c:405 +#: builtin/clone.c:406 #, c-format msgid "%s exists and is not a directory" msgstr "%s finns och är ingen katalog" -#: builtin/clone.c:419 +#: builtin/clone.c:420 #, c-format msgid "failed to stat %s\n" msgstr "misslyckades ta status på %s\n" -#: builtin/clone.c:441 +#: builtin/clone.c:442 #, c-format msgid "failed to create link '%s'" msgstr "misslyckades skapa länken \"%s\"" -#: builtin/clone.c:445 +#: builtin/clone.c:446 #, c-format msgid "failed to copy file to '%s'" msgstr "misslyckades kopiera filen till \"%s\"" -#: builtin/clone.c:470 +#: builtin/clone.c:471 #, c-format msgid "done.\n" msgstr "klart.\n" -#: builtin/clone.c:482 +#: builtin/clone.c:483 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -6621,138 +6808,138 @@ msgstr "" "Du kan inspektera det som checkades ut med \"git status\"\n" "och försöka checka ut igen med \"git checkout -f HEAD\"\n" -#: builtin/clone.c:559 +#: builtin/clone.c:560 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Kunde inte hitta fjärrgrenen %s för att klona." -#: builtin/clone.c:654 +#: builtin/clone.c:655 msgid "remote did not send all necessary objects" msgstr "fjärren sände inte alla nödvändiga objekt" -#: builtin/clone.c:670 +#: builtin/clone.c:671 #, c-format msgid "unable to update %s" msgstr "kan inte uppdatera %s" -#: builtin/clone.c:719 +#: builtin/clone.c:720 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n" -#: builtin/clone.c:750 +#: builtin/clone.c:751 msgid "unable to checkout working tree" msgstr "kunde inte checka ut arbetskatalogen" -#: builtin/clone.c:792 +#: builtin/clone.c:796 msgid "unable to write parameters to config file" msgstr "kunde inte skriva parametrar till konfigurationsfilen" -#: builtin/clone.c:855 +#: builtin/clone.c:859 msgid "cannot repack to clean up" msgstr "kan inte packa om för att städa upp" -#: builtin/clone.c:857 +#: builtin/clone.c:861 msgid "cannot unlink temporary alternates file" msgstr "kunde inte ta bort temporär \"alternates\"-fil" -#: builtin/clone.c:890 builtin/receive-pack.c:1945 +#: builtin/clone.c:894 builtin/receive-pack.c:1944 msgid "Too many arguments." msgstr "För många argument." -#: builtin/clone.c:894 +#: builtin/clone.c:898 msgid "You must specify a repository to clone." msgstr "Du måste ange ett arkiv att klona." -#: builtin/clone.c:907 +#: builtin/clone.c:911 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "flaggorna --bare och --origin %s är inkompatibla." -#: builtin/clone.c:910 +#: builtin/clone.c:914 msgid "--bare and --separate-git-dir are incompatible." msgstr "flaggorna --bare och --separate-git-dir är inkompatibla." -#: builtin/clone.c:923 +#: builtin/clone.c:927 #, c-format msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:929 builtin/fetch.c:1337 +#: builtin/clone.c:933 builtin/fetch.c:1360 #, c-format msgid "depth %s is not a positive number" msgstr "djupet %s är inte ett positivt tal" -#: builtin/clone.c:939 +#: builtin/clone.c:943 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog." -#: builtin/clone.c:949 +#: builtin/clone.c:953 #, c-format msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." -#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260 -#: builtin/worktree.c:222 builtin/worktree.c:252 +#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270 +#: builtin/worktree.c:240 builtin/worktree.c:270 #, c-format msgid "could not create leading directories of '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" -#: builtin/clone.c:967 +#: builtin/clone.c:971 #, c-format msgid "could not create work tree dir '%s'" msgstr "kunde inte skapa arbetskatalogen \"%s\"" -#: builtin/clone.c:979 +#: builtin/clone.c:983 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klonar till ett naket arkiv \"%s\"...\n" -#: builtin/clone.c:981 +#: builtin/clone.c:985 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klonar till \"%s\"...\n" -#: builtin/clone.c:1005 +#: builtin/clone.c:1009 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "" "clone --recursive är inte kompatibel med --reference och --reference-if-able" -#: builtin/clone.c:1067 +#: builtin/clone.c:1071 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1069 +#: builtin/clone.c:1073 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "--shallow-since ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1071 +#: builtin/clone.c:1075 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" "--shallow-exclude ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1074 +#: builtin/clone.c:1078 msgid "source repository is shallow, ignoring --local" msgstr "källarkivet är grunt, ignorerar --local" -#: builtin/clone.c:1079 +#: builtin/clone.c:1083 msgid "--local is ignored" msgstr "--local ignoreras" -#: builtin/clone.c:1083 +#: builtin/clone.c:1087 #, c-format msgid "Don't know how to clone %s" msgstr "Vet inte hur man klonar %s" -#: builtin/clone.c:1138 builtin/clone.c:1146 +#: builtin/clone.c:1142 builtin/clone.c:1150 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" -#: builtin/clone.c:1149 +#: builtin/clone.c:1153 msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." @@ -6892,61 +7079,61 @@ msgstr "" "\"git cherry-pick --continue\" kommer därefter att återuppta\n" "cherry-pick för återstående incheckningar.\n" -#: builtin/commit.c:319 +#: builtin/commit.c:318 msgid "failed to unpack HEAD tree object" msgstr "misslyckades packa upp HEAD:s trädobjekt" -#: builtin/commit.c:360 +#: builtin/commit.c:359 msgid "unable to create temporary index" msgstr "kunde inte skapa temporär indexfil" -#: builtin/commit.c:366 +#: builtin/commit.c:365 msgid "interactive add failed" msgstr "interaktiv tilläggning misslyckades" -#: builtin/commit.c:379 +#: builtin/commit.c:378 msgid "unable to update temporary index" msgstr "kan inte uppdatera temporärt index" -#: builtin/commit.c:381 +#: builtin/commit.c:380 msgid "Failed to update main cache tree" msgstr "Misslyckades uppdatera huvud-cacheträdet" -#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477 +#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478 msgid "unable to write new_index file" msgstr "kunde inte skriva filen new_index" -#: builtin/commit.c:459 +#: builtin/commit.c:461 msgid "cannot do a partial commit during a merge." msgstr "kan inte utföra en delvis incheckning under en sammanslagning." -#: builtin/commit.c:461 +#: builtin/commit.c:463 msgid "cannot do a partial commit during a cherry-pick." msgstr "kan inte utföra en delvis incheckning under en cherry-pick." -#: builtin/commit.c:470 +#: builtin/commit.c:471 msgid "cannot read the index" msgstr "kan inte läsa indexet" -#: builtin/commit.c:489 +#: builtin/commit.c:490 msgid "unable to write temporary index file" msgstr "kunde inte skriva temporär indexfil" -#: builtin/commit.c:583 +#: builtin/commit.c:587 #, c-format msgid "commit '%s' lacks author header" msgstr "incheckningen \"%s\" saknar författarhuvud" -#: builtin/commit.c:585 +#: builtin/commit.c:589 #, c-format msgid "commit '%s' has malformed author line" msgstr "incheckningen \"%s\" har felformaterat författarhuvud" -#: builtin/commit.c:604 +#: builtin/commit.c:608 msgid "malformed --author parameter" msgstr "felformad \"--author\"-flagga" -#: builtin/commit.c:656 +#: builtin/commit.c:660 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -6954,38 +7141,38 @@ msgstr "" "kunde inte välja ett kommentarstecken som inte använts\n" "i det befintliga incheckningsmeddelandet" -#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093 +#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1100 #, c-format msgid "could not lookup commit %s" msgstr "kunde inte slå upp incheckningen %s" -#: builtin/commit.c:705 builtin/shortlog.c:295 +#: builtin/commit.c:709 builtin/shortlog.c:309 #, c-format msgid "(reading log message from standard input)\n" msgstr "(läser loggmeddelande från standard in)\n" -#: builtin/commit.c:707 +#: builtin/commit.c:711 msgid "could not read log from standard input" msgstr "kunde inte läsa logg från standard in" -#: builtin/commit.c:711 +#: builtin/commit.c:715 #, c-format msgid "could not read log file '%s'" msgstr "kunde inte läsa loggfilen \"%s\"" -#: builtin/commit.c:738 builtin/commit.c:746 +#: builtin/commit.c:742 builtin/commit.c:750 msgid "could not read SQUASH_MSG" msgstr "kunde inte läsa SQUASH_MSG" -#: builtin/commit.c:743 +#: builtin/commit.c:747 msgid "could not read MERGE_MSG" msgstr "kunde inte läsa MERGE_MSG" -#: builtin/commit.c:797 +#: builtin/commit.c:801 msgid "could not write commit template" msgstr "kunde inte skriva incheckningsmall" -#: builtin/commit.c:815 +#: builtin/commit.c:819 #, c-format msgid "" "\n" @@ -7000,7 +7187,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:820 +#: builtin/commit.c:824 #, c-format msgid "" "\n" @@ -7015,7 +7202,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:833 +#: builtin/commit.c:837 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -7025,7 +7212,7 @@ msgstr "" "med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter " "incheckningen.\n" -#: builtin/commit.c:840 +#: builtin/commit.c:844 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -7036,146 +7223,146 @@ msgstr "" "med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n" "Ett tomt meddelande avbryter incheckningen.\n" -#: builtin/commit.c:857 +#: builtin/commit.c:861 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sFörfattare: %.*s <%.*s>" -#: builtin/commit.c:865 +#: builtin/commit.c:869 #, c-format msgid "%sDate: %s" msgstr "%sDatum: %s" -#: builtin/commit.c:872 +#: builtin/commit.c:876 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sIncheckare: %.*s <%.*s>" -#: builtin/commit.c:889 +#: builtin/commit.c:893 msgid "Cannot read index" msgstr "Kan inte läsa indexet" -#: builtin/commit.c:951 +#: builtin/commit.c:958 msgid "Error building trees" msgstr "Fel vid byggande av träd" -#: builtin/commit.c:965 builtin/tag.c:274 +#: builtin/commit.c:972 builtin/tag.c:252 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Ange meddelandet en av flaggorna -m eller -F.\n" -#: builtin/commit.c:1068 +#: builtin/commit.c:1075 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' är inte 'Namn <epost>' och matchar ingen befintlig författare" -#: builtin/commit.c:1083 builtin/commit.c:1328 +#: builtin/commit.c:1090 builtin/commit.c:1335 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ogiltigt läge för ospårade filer: \"%s\"" -#: builtin/commit.c:1121 +#: builtin/commit.c:1128 msgid "--long and -z are incompatible" msgstr "--long och -z är inkompatibla" -#: builtin/commit.c:1151 +#: builtin/commit.c:1158 msgid "Using both --reset-author and --author does not make sense" msgstr "Kan inte använda både --reset-author och --author" -#: builtin/commit.c:1160 +#: builtin/commit.c:1167 msgid "You have nothing to amend." msgstr "Du har inget att utöka." -#: builtin/commit.c:1163 +#: builtin/commit.c:1170 msgid "You are in the middle of a merge -- cannot amend." msgstr "Du är i mitten av en sammanslagning -- kan inte utöka." -#: builtin/commit.c:1165 +#: builtin/commit.c:1172 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Du är i mitten av en cherry-pick -- kan inte utöka." -#: builtin/commit.c:1168 +#: builtin/commit.c:1175 msgid "Options --squash and --fixup cannot be used together" msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt" -#: builtin/commit.c:1178 +#: builtin/commit.c:1185 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Endast en av -c/-C/-F/--fixup kan användas." -#: builtin/commit.c:1180 +#: builtin/commit.c:1187 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "Flaggan -m kan inte kombineras med -c/-C/-F/--fixup." -#: builtin/commit.c:1188 +#: builtin/commit.c:1195 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author kan endast användas med -C, -c eller --amend." -#: builtin/commit.c:1205 +#: builtin/commit.c:1212 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Endast en av --include/--only/--all/--interactive/--patch kan användas." -#: builtin/commit.c:1207 +#: builtin/commit.c:1214 msgid "No paths with --include/--only does not make sense." msgstr "Du måste ange sökvägar tillsammans med --include/--only." -#: builtin/commit.c:1219 builtin/tag.c:552 +#: builtin/commit.c:1226 builtin/tag.c:535 #, c-format msgid "Invalid cleanup mode %s" msgstr "Felaktigt städningsläge %s" -#: builtin/commit.c:1224 +#: builtin/commit.c:1231 msgid "Paths with -a does not make sense." msgstr "Kan inte ange sökvägar med -a." -#: builtin/commit.c:1342 builtin/commit.c:1617 +#: builtin/commit.c:1349 builtin/commit.c:1626 msgid "show status concisely" msgstr "visa koncis status" -#: builtin/commit.c:1344 builtin/commit.c:1619 +#: builtin/commit.c:1351 builtin/commit.c:1628 msgid "show branch information" msgstr "visa information om gren" -#: builtin/commit.c:1346 +#: builtin/commit.c:1353 msgid "show stash information" msgstr "visa information om stash" -#: builtin/commit.c:1348 +#: builtin/commit.c:1355 msgid "version" msgstr "version" -#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530 -#: builtin/worktree.c:449 +#: builtin/commit.c:1355 builtin/commit.c:1630 builtin/push.c:530 +#: builtin/worktree.c:469 msgid "machine-readable output" msgstr "maskinläsbar utdata" -#: builtin/commit.c:1351 builtin/commit.c:1623 +#: builtin/commit.c:1358 builtin/commit.c:1632 msgid "show status in long format (default)" msgstr "visa status i långt format (standard)" -#: builtin/commit.c:1354 builtin/commit.c:1626 +#: builtin/commit.c:1361 builtin/commit.c:1635 msgid "terminate entries with NUL" msgstr "terminera poster med NUL" -#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983 -#: builtin/fast-export.c:986 builtin/tag.c:412 +#: builtin/commit.c:1363 builtin/commit.c:1638 builtin/fast-export.c:999 +#: builtin/fast-export.c:1002 builtin/tag.c:390 msgid "mode" msgstr "läge" -#: builtin/commit.c:1357 builtin/commit.c:1629 +#: builtin/commit.c:1364 builtin/commit.c:1638 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "visa ospårade filer, valfria lägen: alla, normal, no. (Standard: all)" -#: builtin/commit.c:1360 +#: builtin/commit.c:1367 msgid "show ignored files" msgstr "visa ignorerade filer" -#: builtin/commit.c:1361 parse-options.h:155 +#: builtin/commit.c:1368 parse-options.h:155 msgid "when" msgstr "när" -#: builtin/commit.c:1362 +#: builtin/commit.c:1369 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -7183,201 +7370,202 @@ msgstr "" "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. " "(Default: all)" -#: builtin/commit.c:1364 +#: builtin/commit.c:1371 msgid "list untracked files in columns" msgstr "visa ospårade filer i spalter" -#: builtin/commit.c:1440 +#: builtin/commit.c:1449 msgid "couldn't look up newly created commit" msgstr "kunde inte slå upp en precis skapad incheckning" -#: builtin/commit.c:1442 +#: builtin/commit.c:1451 msgid "could not parse newly created commit" msgstr "kunde inte tolka en precis skapad incheckning" -#: builtin/commit.c:1487 +#: builtin/commit.c:1496 msgid "detached HEAD" msgstr "frånkopplad HEAD" -#: builtin/commit.c:1490 +#: builtin/commit.c:1499 msgid " (root-commit)" msgstr " (rotincheckning)" -#: builtin/commit.c:1587 +#: builtin/commit.c:1596 msgid "suppress summary after successful commit" msgstr "undertryck sammanfattning efter framgångsrik incheckning" -#: builtin/commit.c:1588 +#: builtin/commit.c:1597 msgid "show diff in commit message template" msgstr "visa diff i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1590 +#: builtin/commit.c:1599 msgid "Commit message options" msgstr "Alternativ för incheckningsmeddelande" -#: builtin/commit.c:1591 builtin/tag.c:410 +#: builtin/commit.c:1600 builtin/tag.c:388 msgid "read message from file" msgstr "läs meddelande från fil" -#: builtin/commit.c:1592 +#: builtin/commit.c:1601 msgid "author" msgstr "författare" -#: builtin/commit.c:1592 +#: builtin/commit.c:1601 msgid "override author for commit" msgstr "överstyr författare för incheckningen" -#: builtin/commit.c:1593 builtin/gc.c:358 +#: builtin/commit.c:1602 builtin/gc.c:359 msgid "date" msgstr "datum" -#: builtin/commit.c:1593 +#: builtin/commit.c:1602 msgid "override date for commit" msgstr "överstyr datum för incheckningen" -#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401 -#: builtin/notes.c:564 builtin/tag.c:408 +#: builtin/commit.c:1603 builtin/merge.c:225 builtin/notes.c:402 +#: builtin/notes.c:565 builtin/tag.c:386 msgid "message" msgstr "meddelande" -#: builtin/commit.c:1594 +#: builtin/commit.c:1603 msgid "commit message" msgstr "incheckningsmeddelande" -#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597 -#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77 +#: builtin/commit.c:1604 builtin/commit.c:1605 builtin/commit.c:1606 +#: builtin/commit.c:1607 parse-options.h:257 ref-filter.h:92 msgid "commit" msgstr "incheckning" -#: builtin/commit.c:1595 +#: builtin/commit.c:1604 msgid "reuse and edit message from specified commit" msgstr "återanvänd och redigera meddelande från angiven incheckning" -#: builtin/commit.c:1596 +#: builtin/commit.c:1605 msgid "reuse message from specified commit" msgstr "återanvänd meddelande från angiven incheckning" -#: builtin/commit.c:1597 +#: builtin/commit.c:1606 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "använd autosquash-formaterat meddelande för att fixa angiven incheckning" -#: builtin/commit.c:1598 +#: builtin/commit.c:1607 msgid "use autosquash formatted message to squash specified commit" msgstr "" "använd autosquash-formaterat meddelande för att slå ihop med angiven " "incheckning" -#: builtin/commit.c:1599 +#: builtin/commit.c:1608 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)" -#: builtin/commit.c:1600 builtin/log.c:1430 builtin/revert.c:105 +#: builtin/commit.c:1609 builtin/log.c:1436 builtin/merge.c:239 +#: builtin/revert.c:105 msgid "add Signed-off-by:" msgstr "lägg till Signed-off-by:" -#: builtin/commit.c:1601 +#: builtin/commit.c:1610 msgid "use specified template file" msgstr "använd angiven mallfil" -#: builtin/commit.c:1602 +#: builtin/commit.c:1611 msgid "force edit of commit" msgstr "tvinga redigering av incheckning" -#: builtin/commit.c:1603 +#: builtin/commit.c:1612 msgid "default" msgstr "standard" -#: builtin/commit.c:1603 builtin/tag.c:413 +#: builtin/commit.c:1612 builtin/tag.c:391 msgid "how to strip spaces and #comments from message" msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande" -#: builtin/commit.c:1604 +#: builtin/commit.c:1613 msgid "include status in commit message template" msgstr "inkludera status i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173 +#: builtin/commit.c:1615 builtin/merge.c:237 builtin/pull.c:173 #: builtin/revert.c:113 msgid "GPG sign commit" msgstr "GPG-signera incheckning" -#: builtin/commit.c:1609 +#: builtin/commit.c:1618 msgid "Commit contents options" msgstr "Alternativ för incheckningens innehåll" -#: builtin/commit.c:1610 +#: builtin/commit.c:1619 msgid "commit all changed files" msgstr "checka in alla ändrade filer" -#: builtin/commit.c:1611 +#: builtin/commit.c:1620 msgid "add specified files to index for commit" msgstr "lägg till angivna filer till indexet för incheckning" -#: builtin/commit.c:1612 +#: builtin/commit.c:1621 msgid "interactively add files" msgstr "lägg till filer interaktivt" -#: builtin/commit.c:1613 +#: builtin/commit.c:1622 msgid "interactively add changes" msgstr "lägg till ändringar interaktivt" -#: builtin/commit.c:1614 +#: builtin/commit.c:1623 msgid "commit only specified files" msgstr "checka endast in angivna filer" -#: builtin/commit.c:1615 +#: builtin/commit.c:1624 msgid "bypass pre-commit and commit-msg hooks" msgstr "förbigå pre-commit- och commit-msg-krokar" -#: builtin/commit.c:1616 +#: builtin/commit.c:1625 msgid "show what would be committed" msgstr "visa vad som skulle checkas in" -#: builtin/commit.c:1627 +#: builtin/commit.c:1636 msgid "amend previous commit" msgstr "lägg till föregående incheckning" -#: builtin/commit.c:1628 +#: builtin/commit.c:1637 msgid "bypass post-rewrite hook" msgstr "förbigå post-rewrite-krok" -#: builtin/commit.c:1633 +#: builtin/commit.c:1642 msgid "ok to record an empty change" msgstr "ok att registrera en tom ändring" -#: builtin/commit.c:1635 +#: builtin/commit.c:1644 msgid "ok to record a change with an empty message" msgstr "ok att registrera en ändring med tomt meddelande" -#: builtin/commit.c:1665 +#: builtin/commit.c:1674 msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: builtin/commit.c:1710 +#: builtin/commit.c:1719 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Trasig MERGE_HEAD-fil (%s)" -#: builtin/commit.c:1717 +#: builtin/commit.c:1726 msgid "could not read MERGE_MODE" msgstr "kunde inte läsa MERGE_MODE" -#: builtin/commit.c:1736 +#: builtin/commit.c:1745 #, c-format msgid "could not read commit message: %s" msgstr "kunde inte läsa incheckningsmeddelande: %s" -#: builtin/commit.c:1747 -#, c-format -msgid "Aborting commit; you did not edit the message.\n" -msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" - -#: builtin/commit.c:1752 +#: builtin/commit.c:1756 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n" -#: builtin/commit.c:1800 +#: builtin/commit.c:1761 +#, c-format +msgid "Aborting commit; you did not edit the message.\n" +msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" + +#: builtin/commit.c:1809 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -7543,12 +7731,12 @@ msgstr "" msgid "--local can only be used inside a git repository" msgstr "--local kan bara användas inuti ett git-arkiv" -#: builtin/config.c:621 +#: builtin/config.c:624 #, c-format msgid "cannot create configuration file %s" msgstr "kan inte skapa konfigurationsfilen \"%s\"" -#: builtin/config.c:633 +#: builtin/config.c:637 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -7557,11 +7745,11 @@ msgstr "" "kan inte skriva över flera värden med ett ensamt värde\n" " Använd en regexp, --add eller --replace-all för att ändra %s." -#: builtin/count-objects.c:87 +#: builtin/count-objects.c:88 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "git count-objects [-v] [-H | --human-readable]" -#: builtin/count-objects.c:97 +#: builtin/count-objects.c:98 msgid "print sizes in human readable format" msgstr "skriv storlekar i människoläsbart format" @@ -7585,47 +7773,47 @@ msgstr "lättviktig" msgid "annotated" msgstr "annoterad" -#: builtin/describe.c:253 +#: builtin/describe.c:264 #, c-format msgid "annotated tag %s not available" msgstr "den annoterade taggen %s inte tillgänglig" -#: builtin/describe.c:257 +#: builtin/describe.c:268 #, c-format msgid "annotated tag %s has no embedded name" msgstr "den annoterade taggen %s har inget inbäddat namn" -#: builtin/describe.c:259 +#: builtin/describe.c:270 #, c-format msgid "tag '%s' is really '%s' here" msgstr "taggen \"%s\" är i verkligheten \"%s\" här" -#: builtin/describe.c:286 builtin/log.c:489 +#: builtin/describe.c:297 builtin/log.c:493 #, c-format msgid "Not a valid object name %s" msgstr "Objektnamnet är inte giltigt: %s" -#: builtin/describe.c:289 +#: builtin/describe.c:300 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s är inte ett giltigt \"%s\"-objekt" -#: builtin/describe.c:306 +#: builtin/describe.c:317 #, c-format msgid "no tag exactly matches '%s'" msgstr "ingen tagg motsvarar \"%s\" exakt" -#: builtin/describe.c:308 +#: builtin/describe.c:319 #, c-format msgid "searching to describe %s\n" msgstr "söker för att beskriva %s\n" -#: builtin/describe.c:355 +#: builtin/describe.c:366 #, c-format msgid "finished search at %s\n" msgstr "avslutade sökning på %s\n" -#: builtin/describe.c:382 +#: builtin/describe.c:393 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -7634,7 +7822,7 @@ msgstr "" "Inga annoterade taggar kan beskriva \"%s\".\n" "Det finns dock oannoterade taggar: testa --tags." -#: builtin/describe.c:386 +#: builtin/describe.c:397 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -7643,12 +7831,12 @@ msgstr "" "Inga taggar kan beskriva \"%s\".\n" "Testa --always, eller skapa några taggar." -#: builtin/describe.c:416 +#: builtin/describe.c:427 #, c-format msgid "traversed %lu commits\n" msgstr "traverserade %lu incheckningar\n" -#: builtin/describe.c:419 +#: builtin/describe.c:430 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -7657,75 +7845,75 @@ msgstr "" "mer än %i taggar hittades; listar de %i senaste\n" "gav upp sökningen vid %s\n" -#: builtin/describe.c:441 +#: builtin/describe.c:452 msgid "find the tag that comes after the commit" msgstr "hitta taggen som kommer efter incheckningen" -#: builtin/describe.c:442 +#: builtin/describe.c:453 msgid "debug search strategy on stderr" msgstr "felsök sökstrategin på standard fel" -#: builtin/describe.c:443 +#: builtin/describe.c:454 msgid "use any ref" msgstr "använd alla referenser" -#: builtin/describe.c:444 +#: builtin/describe.c:455 msgid "use any tag, even unannotated" msgstr "använd alla taggar, även oannoterade" -#: builtin/describe.c:445 +#: builtin/describe.c:456 msgid "always use long format" msgstr "använd alltid långt format" -#: builtin/describe.c:446 +#: builtin/describe.c:457 msgid "only follow first parent" msgstr "följ endast första föräldern" -#: builtin/describe.c:449 +#: builtin/describe.c:460 msgid "only output exact matches" msgstr "skriv endast ut exakta träffar" -#: builtin/describe.c:451 +#: builtin/describe.c:462 msgid "consider <n> most recent tags (default: 10)" msgstr "överväg de <n> nyaste taggarna (standard: 10)" -#: builtin/describe.c:453 +#: builtin/describe.c:464 msgid "only consider tags matching <pattern>" msgstr "överväg endast taggar som motsvarar <mönster>" -#: builtin/describe.c:455 +#: builtin/describe.c:466 msgid "do not consider tags matching <pattern>" msgstr "överväg inte taggar som motsvarar <mönster>" -#: builtin/describe.c:457 builtin/name-rev.c:406 +#: builtin/describe.c:468 builtin/name-rev.c:406 msgid "show abbreviated commit object as fallback" msgstr "visa förkortade incheckningsobjekt som standard" -#: builtin/describe.c:458 builtin/describe.c:461 +#: builtin/describe.c:469 builtin/describe.c:472 msgid "mark" msgstr "märke" -#: builtin/describe.c:459 +#: builtin/describe.c:470 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "lägg till <märke> på lortigt arbetsträd (standard: \"-dirty\")" -#: builtin/describe.c:462 +#: builtin/describe.c:473 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "lägg till <märke> på trasigt arbetsträd (standard: \"-broken\")" -#: builtin/describe.c:480 +#: builtin/describe.c:491 msgid "--long is incompatible with --abbrev=0" msgstr "--long är inkompatibel med --abbrev=0" -#: builtin/describe.c:509 +#: builtin/describe.c:520 msgid "No names found, cannot describe anything." msgstr "Inga namn hittades, kan inte beskriva något." -#: builtin/describe.c:552 +#: builtin/describe.c:563 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden" -#: builtin/describe.c:554 +#: builtin/describe.c:565 msgid "--broken is incompatible with commit-ishes" msgstr "--broken är inkompatibelt med \"commit-ish\"-värden" @@ -7739,21 +7927,21 @@ msgstr "\"%s\": inte en normal fil eller symbolisk länk" msgid "invalid option: %s" msgstr "ogiltig flagga: %s" -#: builtin/diff.c:359 +#: builtin/diff.c:357 msgid "Not a git repository" msgstr "Inte ett git-arkiv" -#: builtin/diff.c:402 +#: builtin/diff.c:400 #, c-format msgid "invalid object '%s' given." msgstr "objektet \"%s\" som angavs är felaktigt." -#: builtin/diff.c:411 +#: builtin/diff.c:409 #, c-format msgid "more than two blobs given: '%s'" msgstr "mer än två blobbar angavs: \"%s\"" -#: builtin/diff.c:416 +#: builtin/diff.c:414 #, c-format msgid "unhandled object '%s' given." msgstr "ej hanterat objekt \"%s\" angavs." @@ -7763,27 +7951,27 @@ msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "" "git difftool [<flaggor>] [<incheckning> [<incheckning>]] [--] [<sökväg>...]" -#: builtin/difftool.c:249 +#: builtin/difftool.c:259 #, c-format msgid "failed: %d" msgstr "misslyckades: %d" -#: builtin/difftool.c:291 +#: builtin/difftool.c:301 #, c-format msgid "could not read symlink %s" msgstr "kunde inte läsa symboliska länken %s" -#: builtin/difftool.c:293 +#: builtin/difftool.c:303 #, c-format msgid "could not read symlink file %s" msgstr "kunde inte läsa symbolisk länk-fil %s" -#: builtin/difftool.c:301 +#: builtin/difftool.c:311 #, c-format msgid "could not read object %s for symlink %s" msgstr "kunde inte läsa objektet %s för symboliska länken %s" -#: builtin/difftool.c:403 +#: builtin/difftool.c:412 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -7791,53 +7979,53 @@ msgstr "" "kombinerade diff-format (\"-c\" och \"--cc\") stöds inte i\n" "katalogdiffläge (\"-d\" och \"--dir-diff\")." -#: builtin/difftool.c:626 +#: builtin/difftool.c:633 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "bägge filerna ändrade: \"%s\" och \"%s\"." -#: builtin/difftool.c:628 +#: builtin/difftool.c:635 msgid "working tree file has been left." msgstr "filen i arbetskatalogen lämnades kvar." -#: builtin/difftool.c:639 +#: builtin/difftool.c:646 #, c-format msgid "temporary files exist in '%s'." msgstr "temporära filer finns i \"%s\"." -#: builtin/difftool.c:640 +#: builtin/difftool.c:647 msgid "you may want to cleanup or recover these." msgstr "du kanske vill städa eller rädda dem." -#: builtin/difftool.c:689 +#: builtin/difftool.c:696 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "använd \"diff.guitool\" istället för \"diff.tool\"" -#: builtin/difftool.c:691 +#: builtin/difftool.c:698 msgid "perform a full-directory diff" msgstr "utför diff för hela katalogen" -#: builtin/difftool.c:693 +#: builtin/difftool.c:700 msgid "do not prompt before launching a diff tool" msgstr "fråga inte vid start av diff-verktyg" -#: builtin/difftool.c:699 +#: builtin/difftool.c:706 msgid "use symlinks in dir-diff mode" msgstr "använd symboliska länkar i katalogdiffläge" -#: builtin/difftool.c:700 +#: builtin/difftool.c:707 msgid "<tool>" msgstr "<verktyg>" -#: builtin/difftool.c:701 +#: builtin/difftool.c:708 msgid "use the specified diff tool" msgstr "använd angivet diff-verktyg" -#: builtin/difftool.c:703 +#: builtin/difftool.c:710 msgid "print a list of diff tools that may be used with `--tool`" msgstr "visa en lista över diff-verktyg som kan användas med ”--tool”" -#: builtin/difftool.c:706 +#: builtin/difftool.c:713 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -7845,19 +8033,19 @@ msgstr "" "låt \"git-difftool\" avbryta när ett anropat diff-verktyg ger returvärde " "skilt från noll" -#: builtin/difftool.c:708 +#: builtin/difftool.c:715 msgid "<command>" msgstr "<kommando>" -#: builtin/difftool.c:709 +#: builtin/difftool.c:716 msgid "specify a custom command for viewing diffs" msgstr "ange eget kommando för att visa diffar" -#: builtin/difftool.c:733 +#: builtin/difftool.c:740 msgid "no <tool> given for --tool=<tool>" msgstr "inget <verktyg> angavs för --tool=<verktyg>" -#: builtin/difftool.c:740 +#: builtin/difftool.c:747 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "inget <kommando> angavs för --extcmd=<kommando>" @@ -7865,143 +8053,143 @@ msgstr "inget <kommando> angavs för --extcmd=<kommando>" msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-flaggor]" -#: builtin/fast-export.c:982 +#: builtin/fast-export.c:998 msgid "show progress after <n> objects" msgstr "visa förlopp efter <n> objekt" -#: builtin/fast-export.c:984 +#: builtin/fast-export.c:1000 msgid "select handling of signed tags" msgstr "välj hantering av signerade taggar" -#: builtin/fast-export.c:987 +#: builtin/fast-export.c:1003 msgid "select handling of tags that tag filtered objects" msgstr "välj hantering av taggar som har taggfiltrerade objekt" -#: builtin/fast-export.c:990 +#: builtin/fast-export.c:1006 msgid "Dump marks to this file" msgstr "Dump märken till filen" -#: builtin/fast-export.c:992 +#: builtin/fast-export.c:1008 msgid "Import marks from this file" msgstr "Importera märken från filen" -#: builtin/fast-export.c:994 +#: builtin/fast-export.c:1010 msgid "Fake a tagger when tags lack one" msgstr "Fejka taggare när taggen saknar en" -#: builtin/fast-export.c:996 +#: builtin/fast-export.c:1012 msgid "Output full tree for each commit" msgstr "Skriv ut hela trädet för varje incheckning" -#: builtin/fast-export.c:998 +#: builtin/fast-export.c:1014 msgid "Use the done feature to terminate the stream" msgstr "Använd done-funktionen för att avsluta strömmen" -#: builtin/fast-export.c:999 +#: builtin/fast-export.c:1015 msgid "Skip output of blob data" msgstr "Hoppa över skrivning av blob-data" -#: builtin/fast-export.c:1000 +#: builtin/fast-export.c:1016 msgid "refspec" msgstr "referensspecifikation" -#: builtin/fast-export.c:1001 +#: builtin/fast-export.c:1017 msgid "Apply refspec to exported refs" msgstr "Applicera referensspecifikation på exporterade referenser" -#: builtin/fast-export.c:1002 +#: builtin/fast-export.c:1018 msgid "anonymize output" msgstr "anonymisera utdata" -#: builtin/fetch.c:22 +#: builtin/fetch.c:23 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]" -#: builtin/fetch.c:23 +#: builtin/fetch.c:24 msgid "git fetch [<options>] <group>" msgstr "git fetch [<flaggor>] <grupp>" -#: builtin/fetch.c:24 +#: builtin/fetch.c:25 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]" -#: builtin/fetch.c:25 +#: builtin/fetch.c:26 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<flaggor>]" -#: builtin/fetch.c:90 builtin/pull.c:182 +#: builtin/fetch.c:112 builtin/pull.c:182 msgid "fetch from all remotes" msgstr "hämta från alla fjärrar" -#: builtin/fetch.c:92 builtin/pull.c:185 +#: builtin/fetch.c:114 builtin/pull.c:185 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över" -#: builtin/fetch.c:94 builtin/pull.c:188 +#: builtin/fetch.c:116 builtin/pull.c:188 msgid "path to upload pack on remote end" msgstr "sökväg till upload pack på fjärren" -#: builtin/fetch.c:95 builtin/pull.c:190 +#: builtin/fetch.c:117 builtin/pull.c:190 msgid "force overwrite of local branch" msgstr "tvinga överskrivning av lokal gren" -#: builtin/fetch.c:97 +#: builtin/fetch.c:119 msgid "fetch from multiple remotes" msgstr "hämta från flera fjärrar" -#: builtin/fetch.c:99 builtin/pull.c:192 +#: builtin/fetch.c:121 builtin/pull.c:192 msgid "fetch all tags and associated objects" msgstr "hämta alla taggar och associerade objekt" -#: builtin/fetch.c:101 +#: builtin/fetch.c:123 msgid "do not fetch all tags (--no-tags)" msgstr "hämta inte alla taggar (--no-tags)" -#: builtin/fetch.c:103 +#: builtin/fetch.c:125 msgid "number of submodules fetched in parallel" msgstr "antal undermoduler som hämtas parallellt" -#: builtin/fetch.c:105 builtin/pull.c:195 +#: builtin/fetch.c:127 builtin/pull.c:195 msgid "prune remote-tracking branches no longer on remote" msgstr "rensa fjärrspårande grenar ej längre på fjärren" -#: builtin/fetch.c:106 builtin/fetch.c:129 builtin/pull.c:123 +#: builtin/fetch.c:128 builtin/fetch.c:151 builtin/pull.c:123 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:107 +#: builtin/fetch.c:129 msgid "control recursive fetching of submodules" msgstr "styr rekursiv hämtning av undermoduler" -#: builtin/fetch.c:111 builtin/pull.c:203 +#: builtin/fetch.c:133 builtin/pull.c:203 msgid "keep downloaded pack" msgstr "behåll hämtade paket" -#: builtin/fetch.c:113 +#: builtin/fetch.c:135 msgid "allow updating of HEAD ref" msgstr "tillåt uppdatering av HEAD-referens" -#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206 +#: builtin/fetch.c:138 builtin/fetch.c:144 builtin/pull.c:206 msgid "deepen history of shallow clone" msgstr "fördjupa historik för grund klon" -#: builtin/fetch.c:118 +#: builtin/fetch.c:140 msgid "deepen history of shallow repository based on time" msgstr "fördjupa historik för grund klon baserad på tid" -#: builtin/fetch.c:124 builtin/pull.c:209 +#: builtin/fetch.c:146 builtin/pull.c:209 msgid "convert to a complete repository" msgstr "konvertera till komplett arkiv" -#: builtin/fetch.c:126 builtin/log.c:1450 +#: builtin/fetch.c:148 builtin/log.c:1456 msgid "dir" msgstr "kat" -#: builtin/fetch.c:127 +#: builtin/fetch.c:149 msgid "prepend this to submodule path output" msgstr "lägg till i början av undermodulens sökvägsutdata" -#: builtin/fetch.c:130 +#: builtin/fetch.c:152 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -8009,89 +8197,89 @@ msgstr "" "standard för rekursiv hämtning av undermoduler (lägre prioritet än " "konfigurationsfiler)" -#: builtin/fetch.c:134 builtin/pull.c:212 +#: builtin/fetch.c:156 builtin/pull.c:212 msgid "accept refs that update .git/shallow" msgstr "tar emot referenser som uppdaterar .git/shallow" -#: builtin/fetch.c:135 builtin/pull.c:214 +#: builtin/fetch.c:157 builtin/pull.c:214 msgid "refmap" msgstr "referenskarta" -#: builtin/fetch.c:136 builtin/pull.c:215 +#: builtin/fetch.c:158 builtin/pull.c:215 msgid "specify fetch refmap" msgstr "ange referenskarta för \"fetch\"" -#: builtin/fetch.c:394 +#: builtin/fetch.c:416 msgid "Couldn't find remote ref HEAD" msgstr "Kunde inte hitta fjärr-referensen HEAD" -#: builtin/fetch.c:512 +#: builtin/fetch.c:534 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "konfigurationen för fetch.output innehåller ogiltigt värde %s" -#: builtin/fetch.c:605 +#: builtin/fetch.c:627 #, c-format msgid "object %s not found" msgstr "objektet %s hittades inte" -#: builtin/fetch.c:609 +#: builtin/fetch.c:631 msgid "[up to date]" msgstr "[àjour]" -#: builtin/fetch.c:622 builtin/fetch.c:702 +#: builtin/fetch.c:644 builtin/fetch.c:724 msgid "[rejected]" msgstr "[refuserad]" -#: builtin/fetch.c:623 +#: builtin/fetch.c:645 msgid "can't fetch in current branch" msgstr "kan inte hämta i aktuell gren" -#: builtin/fetch.c:632 +#: builtin/fetch.c:654 msgid "[tag update]" msgstr "[uppdaterad tagg]" -#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682 -#: builtin/fetch.c:697 +#: builtin/fetch.c:655 builtin/fetch.c:688 builtin/fetch.c:704 +#: builtin/fetch.c:719 msgid "unable to update local ref" msgstr "kunde inte uppdatera lokal ref" -#: builtin/fetch.c:652 +#: builtin/fetch.c:674 msgid "[new tag]" msgstr "[ny tagg]" -#: builtin/fetch.c:655 +#: builtin/fetch.c:677 msgid "[new branch]" msgstr "[ny gren]" -#: builtin/fetch.c:658 +#: builtin/fetch.c:680 msgid "[new ref]" msgstr "[ny ref]" -#: builtin/fetch.c:697 +#: builtin/fetch.c:719 msgid "forced update" msgstr "tvingad uppdatering" -#: builtin/fetch.c:702 +#: builtin/fetch.c:724 msgid "non-fast-forward" msgstr "ej snabbspolad" -#: builtin/fetch.c:747 +#: builtin/fetch.c:769 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s sände inte alla nödvändiga objekt\n" -#: builtin/fetch.c:767 +#: builtin/fetch.c:789 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "avvisa %s då grunda rötter inte kan uppdateras" -#: builtin/fetch.c:855 builtin/fetch.c:951 +#: builtin/fetch.c:877 builtin/fetch.c:973 #, c-format msgid "From %.*s\n" msgstr "Från %.*s\n" -#: builtin/fetch.c:866 +#: builtin/fetch.c:888 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -8100,55 +8288,55 @@ msgstr "" "vissa lokala referenser kunde inte uppdateras; testa att köra\n" " \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt" -#: builtin/fetch.c:921 +#: builtin/fetch.c:943 #, c-format msgid " (%s will become dangling)" msgstr " (%s kommer bli dinglande)" -#: builtin/fetch.c:922 +#: builtin/fetch.c:944 #, c-format msgid " (%s has become dangling)" msgstr " (%s har blivit dinglande)" -#: builtin/fetch.c:954 +#: builtin/fetch.c:976 msgid "[deleted]" msgstr "[borttagen]" -#: builtin/fetch.c:955 builtin/remote.c:1023 +#: builtin/fetch.c:977 builtin/remote.c:1024 msgid "(none)" msgstr "(ingen)" -#: builtin/fetch.c:978 +#: builtin/fetch.c:1000 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv" -#: builtin/fetch.c:997 +#: builtin/fetch.c:1019 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s" -#: builtin/fetch.c:1000 +#: builtin/fetch.c:1022 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Flaggan \"%s\" ignoreras för %s\n" -#: builtin/fetch.c:1076 +#: builtin/fetch.c:1098 #, c-format msgid "Don't know how to fetch from %s" msgstr "Vet inte hur man hämtar från %s" -#: builtin/fetch.c:1236 +#: builtin/fetch.c:1258 #, c-format msgid "Fetching %s\n" msgstr "Hämtar %s\n" -#: builtin/fetch.c:1238 builtin/remote.c:97 +#: builtin/fetch.c:1260 builtin/remote.c:97 #, c-format msgid "Could not fetch %s" msgstr "Kunde inte hämta %s" -#: builtin/fetch.c:1256 +#: builtin/fetch.c:1278 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -8156,40 +8344,40 @@ msgstr "" "Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n" "fjärrarkiv som nya incheckningar skall hämtas från." -#: builtin/fetch.c:1279 +#: builtin/fetch.c:1301 msgid "You need to specify a tag name." msgstr "Du måste ange namnet på en tagg." -#: builtin/fetch.c:1321 +#: builtin/fetch.c:1344 msgid "Negative depth in --deepen is not supported" msgstr "Negativa djup stöds inte i --deepen" -#: builtin/fetch.c:1323 +#: builtin/fetch.c:1346 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen och --depth är ömsesidigt uteslutande" -#: builtin/fetch.c:1328 +#: builtin/fetch.c:1351 msgid "--depth and --unshallow cannot be used together" msgstr "--depth och --unshallow kan inte användas samtidigt" -#: builtin/fetch.c:1330 +#: builtin/fetch.c:1353 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow kan inte användas på ett komplett arkiv" -#: builtin/fetch.c:1349 +#: builtin/fetch.c:1366 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet på ett arkiv som argument" -#: builtin/fetch.c:1351 +#: builtin/fetch.c:1368 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kan inte anges med referensspecifikationer" -#: builtin/fetch.c:1362 +#: builtin/fetch.c:1379 #, c-format msgid "No such remote or remote group: %s" msgstr "Fjärren eller fjärrgruppen finns inte: %s" -#: builtin/fetch.c:1370 +#: builtin/fetch.c:1387 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Kan inte hämta från grupp och ange referensspecifikationer" @@ -8199,23 +8387,23 @@ msgid "" msgstr "" "git fmt-merge-msg [-m <meddelande>] [--log[=<n>] | --no-log] [--file <fil>]" -#: builtin/fmt-merge-msg.c:664 +#: builtin/fmt-merge-msg.c:665 msgid "populate log with at most <n> entries from shortlog" msgstr "fyll i loggen med som mest <n> poster från shortlog" -#: builtin/fmt-merge-msg.c:667 +#: builtin/fmt-merge-msg.c:668 msgid "alias for --log (deprecated)" msgstr "alias för --log (avråds)" -#: builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:671 msgid "text" msgstr "text" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:672 msgid "use <text> as start of message" msgstr "inled meddelande med <text>" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:673 msgid "file to read from" msgstr "fil att läsa från" @@ -8256,103 +8444,107 @@ msgstr "citera platshållare passande för Tcl" msgid "show only <n> matched refs" msgstr "visa endast <n> träffade refs" -#: builtin/for-each-ref.c:42 +#: builtin/for-each-ref.c:39 builtin/tag.c:414 +msgid "respect format colors" +msgstr "använd formatfärger" + +#: builtin/for-each-ref.c:43 msgid "print only refs which points at the given object" msgstr "visa endast referenser som pekar på objektet" -#: builtin/for-each-ref.c:44 +#: builtin/for-each-ref.c:45 msgid "print only refs that are merged" msgstr "visa endast referenser som slagits samman" -#: builtin/for-each-ref.c:45 +#: builtin/for-each-ref.c:46 msgid "print only refs that are not merged" msgstr "visa endast referenser som ej slagits samman" -#: builtin/for-each-ref.c:46 +#: builtin/for-each-ref.c:47 msgid "print only refs which contain the commit" msgstr "visa endast referenser som innehåller incheckningen" -#: builtin/for-each-ref.c:47 +#: builtin/for-each-ref.c:48 msgid "print only refs which don't contain the commit" msgstr "visa endast referenser som inte innehåller incheckningen" -#: builtin/fsck.c:554 +#: builtin/fsck.c:543 msgid "Checking object directories" msgstr "Kontrollerar objektkataloger" -#: builtin/fsck.c:646 +#: builtin/fsck.c:635 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<flaggor>] [<objekt>...]" -#: builtin/fsck.c:652 +#: builtin/fsck.c:641 msgid "show unreachable objects" msgstr "visa onåbara objekt" -#: builtin/fsck.c:653 +#: builtin/fsck.c:642 msgid "show dangling objects" msgstr "visa dinglande objekt" -#: builtin/fsck.c:654 +#: builtin/fsck.c:643 msgid "report tags" msgstr "rapportera taggar" -#: builtin/fsck.c:655 +#: builtin/fsck.c:644 msgid "report root nodes" msgstr "rapportera rotnoder" -#: builtin/fsck.c:656 +#: builtin/fsck.c:645 msgid "make index objects head nodes" msgstr "gör indexojekt till huvudnoder" -#: builtin/fsck.c:657 +#: builtin/fsck.c:646 msgid "make reflogs head nodes (default)" msgstr "gör refloggar till huvudnoder (standard)" -#: builtin/fsck.c:658 +#: builtin/fsck.c:647 msgid "also consider packs and alternate objects" msgstr "ta även hänsyn till paket och alternativa objekt" # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: builtin/fsck.c:659 +#: builtin/fsck.c:648 msgid "check only connectivity" msgstr "kontrollera endast konnektivitet" -#: builtin/fsck.c:660 +#: builtin/fsck.c:649 msgid "enable more strict checking" msgstr "aktivera striktare kontroll" -#: builtin/fsck.c:662 +#: builtin/fsck.c:651 msgid "write dangling objects in .git/lost-found" msgstr "skriv dinglande objekt i .git/lost-found" -#: builtin/fsck.c:663 builtin/prune.c:107 +#: builtin/fsck.c:652 builtin/prune.c:107 msgid "show progress" msgstr "visa förlopp" -#: builtin/fsck.c:664 +#: builtin/fsck.c:653 msgid "show verbose names for reachable objects" msgstr "visa ordrika namn för nåbara objekt" -#: builtin/fsck.c:725 +#: builtin/fsck.c:714 msgid "Checking objects" msgstr "Kontrollerar objekt" -#: builtin/gc.c:26 +#: builtin/gc.c:27 msgid "git gc [<options>]" msgstr "git gc [<flaggor>]" -#: builtin/gc.c:79 +#: builtin/gc.c:80 #, c-format msgid "Failed to fstat %s: %s" msgstr "Misslyckades ta status (fstat) på %s: %s" -#: builtin/gc.c:311 +#: builtin/gc.c:312 #, c-format msgid "Can't stat %s" msgstr "Kan inte ta status på %s" -#: builtin/gc.c:320 +#: builtin/gc.c:321 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -8367,43 +8559,43 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:359 +#: builtin/gc.c:360 msgid "prune unreferenced objects" msgstr "rensa ej refererade objekt" -#: builtin/gc.c:361 +#: builtin/gc.c:362 msgid "be more thorough (increased runtime)" msgstr "var mer grundlig (ökar körtiden)" -#: builtin/gc.c:362 +#: builtin/gc.c:363 msgid "enable auto-gc mode" msgstr "aktivera auto-gc-läge" -#: builtin/gc.c:363 +#: builtin/gc.c:364 msgid "force running gc even if there may be another gc running" msgstr "tvinga gc-körning även om en annan gc kanske körs" -#: builtin/gc.c:380 +#: builtin/gc.c:381 #, c-format msgid "Failed to parse gc.logexpiry value %s" msgstr "Kan inte tolka värdet %s för gc.logexpiry" -#: builtin/gc.c:408 +#: builtin/gc.c:409 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "Packar arkivet automatiskt i bakgrunden för optimal prestanda.\n" -#: builtin/gc.c:410 +#: builtin/gc.c:411 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Packar arkivet automatiskt för optimal prestanda.\n" -#: builtin/gc.c:411 +#: builtin/gc.c:412 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Se \"git help gc\" för manuell hushållning.\n" -#: builtin/gc.c:432 +#: builtin/gc.c:437 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -8411,7 +8603,7 @@ msgstr "" "gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte " "är fallet)" -#: builtin/gc.c:476 +#: builtin/gc.c:481 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -8422,12 +8614,12 @@ msgstr "" msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<flaggor>] [-e] <mönster> [<rev>...] [[--] <sökväg>...]" -#: builtin/grep.c:235 +#: builtin/grep.c:226 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep: misslyckades skapa tråd. %s" -#: builtin/grep.c:293 +#: builtin/grep.c:284 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "felaktigt antal trådar angivet (%d) för %s" @@ -8436,249 +8628,241 @@ msgstr "felaktigt antal trådar angivet (%d) för %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692 +#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1693 #, c-format msgid "no threads support, ignoring %s" msgstr "trådstöd saknas, ignorerar %s" -#: builtin/grep.c:788 builtin/grep.c:829 +#: builtin/grep.c:451 builtin/grep.c:571 builtin/grep.c:613 #, c-format msgid "unable to read tree (%s)" msgstr "kunde inte läsa träd (%s)" -#: builtin/grep.c:848 +#: builtin/grep.c:628 #, c-format msgid "unable to grep from object of type %s" msgstr "kunde inte \"grep\" från objekt av typen %s" -#: builtin/grep.c:912 +#: builtin/grep.c:694 #, c-format msgid "switch `%c' expects a numerical value" msgstr "flaggan \"%c\" antar ett numeriskt värde" -#: builtin/grep.c:999 +#: builtin/grep.c:781 msgid "search in index instead of in the work tree" msgstr "sök i indexet istället för i arbetskatalogen" -#: builtin/grep.c:1001 +#: builtin/grep.c:783 msgid "find in contents not managed by git" msgstr "sök i innehåll som inte hanteras av git" -#: builtin/grep.c:1003 +#: builtin/grep.c:785 msgid "search in both tracked and untracked files" msgstr "sök i både spårade och ospårade filer" -#: builtin/grep.c:1005 +#: builtin/grep.c:787 msgid "ignore files specified via '.gitignore'" msgstr "ignorera filer angivna i \".gitignore\"" -#: builtin/grep.c:1007 +#: builtin/grep.c:789 msgid "recursively search in each submodule" msgstr "sök varje undermodul rekursivt" -#: builtin/grep.c:1009 -msgid "basename" -msgstr "basnamn" - -#: builtin/grep.c:1010 -msgid "prepend parent project's basename to output" -msgstr "lägg till föräldraprojektets basnamn i utdata" - -#: builtin/grep.c:1013 +#: builtin/grep.c:792 msgid "show non-matching lines" msgstr "visa rader som inte träffas" -#: builtin/grep.c:1015 +#: builtin/grep.c:794 msgid "case insensitive matching" msgstr "skiftlägesokänslig sökning" -#: builtin/grep.c:1017 +#: builtin/grep.c:796 msgid "match patterns only at word boundaries" msgstr "matcha endast mönster vid ordgränser" -#: builtin/grep.c:1019 +#: builtin/grep.c:798 msgid "process binary files as text" msgstr "hantera binärfiler som text" -#: builtin/grep.c:1021 +#: builtin/grep.c:800 msgid "don't match patterns in binary files" msgstr "träffa inte mönster i binärfiler" -#: builtin/grep.c:1024 +#: builtin/grep.c:803 msgid "process binary files with textconv filters" msgstr "hantera binärfiler med textconv-filter" -#: builtin/grep.c:1026 +#: builtin/grep.c:805 msgid "descend at most <depth> levels" msgstr "gå som mest ned <djup> nivåer" -#: builtin/grep.c:1030 +#: builtin/grep.c:809 msgid "use extended POSIX regular expressions" msgstr "använd utökade POSIX-reguljära uttryck" -#: builtin/grep.c:1033 +#: builtin/grep.c:812 msgid "use basic POSIX regular expressions (default)" msgstr "använd grundläggande POSIX-reguljära uttryck (standard)" -#: builtin/grep.c:1036 +#: builtin/grep.c:815 msgid "interpret patterns as fixed strings" msgstr "tolka mönster som fixerade strängar" -#: builtin/grep.c:1039 +#: builtin/grep.c:818 msgid "use Perl-compatible regular expressions" msgstr "använd Perlkompatibla reguljära uttryck" -#: builtin/grep.c:1042 +#: builtin/grep.c:821 msgid "show line numbers" msgstr "visa radnummer" -#: builtin/grep.c:1043 +#: builtin/grep.c:822 msgid "don't show filenames" msgstr "visa inte filnamn" -#: builtin/grep.c:1044 +#: builtin/grep.c:823 msgid "show filenames" msgstr "visa filnamn" -#: builtin/grep.c:1046 +#: builtin/grep.c:825 msgid "show filenames relative to top directory" msgstr "visa filnamn relativa till toppkatalogen" -#: builtin/grep.c:1048 +#: builtin/grep.c:827 msgid "show only filenames instead of matching lines" msgstr "visa endast filnamn istället för träffade rader" -#: builtin/grep.c:1050 +#: builtin/grep.c:829 msgid "synonym for --files-with-matches" msgstr "synonym för --files-with-matches" -#: builtin/grep.c:1053 +#: builtin/grep.c:832 msgid "show only the names of files without match" msgstr "visa endast namn på filer utan träffar" -#: builtin/grep.c:1055 +#: builtin/grep.c:834 msgid "print NUL after filenames" msgstr "skriv NUL efter filnamn" -#: builtin/grep.c:1057 +#: builtin/grep.c:836 msgid "show the number of matches instead of matching lines" msgstr "visa antal träffar istället för träffade rader" -#: builtin/grep.c:1058 +#: builtin/grep.c:837 msgid "highlight matches" msgstr "ljusmarkera träffar" -#: builtin/grep.c:1060 +#: builtin/grep.c:839 msgid "print empty line between matches from different files" msgstr "skriv tomma rader mellan träffar från olika filer" -#: builtin/grep.c:1062 +#: builtin/grep.c:841 msgid "show filename only once above matches from same file" msgstr "visa filnamn endast en gång ovanför träffar från samma fil" -#: builtin/grep.c:1065 +#: builtin/grep.c:844 msgid "show <n> context lines before and after matches" msgstr "visa <n> rader sammanhang före och efter träffar" -#: builtin/grep.c:1068 +#: builtin/grep.c:847 msgid "show <n> context lines before matches" msgstr "visa <n> rader sammanhang före träffar" -#: builtin/grep.c:1070 +#: builtin/grep.c:849 msgid "show <n> context lines after matches" msgstr "visa <n> rader sammanhang efter träffar" -#: builtin/grep.c:1072 +#: builtin/grep.c:851 msgid "use <n> worker threads" msgstr "använd <n> jobbtrådar" -#: builtin/grep.c:1073 +#: builtin/grep.c:852 msgid "shortcut for -C NUM" msgstr "genväg för -C NUM" -#: builtin/grep.c:1076 +#: builtin/grep.c:855 msgid "show a line with the function name before matches" msgstr "visa en rad med funktionsnamnet före träffen" -#: builtin/grep.c:1078 +#: builtin/grep.c:857 msgid "show the surrounding function" msgstr "visa den omkringliggande funktionen" -#: builtin/grep.c:1081 +#: builtin/grep.c:860 msgid "read patterns from file" msgstr "läs mönster från fil" -#: builtin/grep.c:1083 +#: builtin/grep.c:862 msgid "match <pattern>" msgstr "träffa <mönster>" -#: builtin/grep.c:1085 +#: builtin/grep.c:864 msgid "combine patterns specified with -e" msgstr "kombinera mönster som anges med -e" -#: builtin/grep.c:1097 +#: builtin/grep.c:876 msgid "indicate hit with exit status without output" msgstr "ange träff med slutstatuskod utan utdata" -#: builtin/grep.c:1099 +#: builtin/grep.c:878 msgid "show only matches from files that match all patterns" msgstr "visa endast träffar från filer som träffar alla mönster" -#: builtin/grep.c:1101 +#: builtin/grep.c:880 msgid "show parse tree for grep expression" msgstr "visa analysträd för grep-uttryck" -#: builtin/grep.c:1105 +#: builtin/grep.c:884 msgid "pager" msgstr "bläddrare" -#: builtin/grep.c:1105 +#: builtin/grep.c:884 msgid "show matching files in the pager" msgstr "visa träffade filer i filbläddraren" -#: builtin/grep.c:1108 +#: builtin/grep.c:887 msgid "allow calling of grep(1) (ignored by this build)" msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)" -#: builtin/grep.c:1172 +#: builtin/grep.c:950 msgid "no pattern given." msgstr "inget mönster angavs." -#: builtin/grep.c:1204 +#: builtin/grep.c:982 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index och --untracked kan inte användas med revisioner" -#: builtin/grep.c:1211 +#: builtin/grep.c:989 #, c-format msgid "unable to resolve revision: %s" msgstr "kan inte slå upp revision: %s" -#: builtin/grep.c:1245 builtin/index-pack.c:1490 +#: builtin/grep.c:1023 builtin/index-pack.c:1491 #, c-format msgid "invalid number of threads specified (%d)" msgstr "felaktigt antal trådar angivet (%d)" -#: builtin/grep.c:1250 +#: builtin/grep.c:1028 msgid "no threads support, ignoring --threads" msgstr "trådstöd saknas, ignorerar --threads" -#: builtin/grep.c:1281 +#: builtin/grep.c:1052 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager fungerar endast i arbetskatalogen" -#: builtin/grep.c:1304 +#: builtin/grep.c:1075 msgid "option not supported with --recurse-submodules." msgstr "flaggan stöds inte med --recurse-submodules." -#: builtin/grep.c:1310 +#: builtin/grep.c:1081 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached och --untracked kan inte användas med --no-index." -#: builtin/grep.c:1316 +#: builtin/grep.c:1087 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll." -#: builtin/grep.c:1324 +#: builtin/grep.c:1095 msgid "both --cached and trees are given." msgstr "både --cached och träd angavs." @@ -8770,12 +8954,12 @@ msgstr "Kunde inte tolka emacsclient-version." msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient version \"%d\" för gammal (< 22)." -#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171 +#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173 #, c-format msgid "failed to exec '%s'" msgstr "exec misslyckades för \"%s\"" -#: builtin/help.c:208 +#: builtin/help.c:211 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -8784,7 +8968,7 @@ msgstr "" "\"%s\": sökväg för man-visare som ej stöds.\n" "Använd \"man.<verktyg>.cmd\" istället." -#: builtin/help.c:220 +#: builtin/help.c:223 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -8793,351 +8977,351 @@ msgstr "" "\"%s\": kommando för man-visare som stöds.\n" "Använd \"man.<verktyg>.path\" istället." -#: builtin/help.c:337 +#: builtin/help.c:340 #, c-format msgid "'%s': unknown man viewer." msgstr "\"%s\": okänd man-visare." -#: builtin/help.c:354 +#: builtin/help.c:357 msgid "no man viewer handled the request" msgstr "ingen man-visare hanterade förfrågan" -#: builtin/help.c:362 +#: builtin/help.c:365 msgid "no info viewer handled the request" msgstr "ingen info-visare hanterade förfrågan" -#: builtin/help.c:404 +#: builtin/help.c:407 msgid "Defining attributes per path" msgstr "Definierar attribut per sökväg" -#: builtin/help.c:405 +#: builtin/help.c:408 msgid "Everyday Git With 20 Commands Or So" msgstr "Git för dagligt bruk i ungefär 20 kommandon" -#: builtin/help.c:406 +#: builtin/help.c:409 msgid "A Git glossary" msgstr "En Git-ordlista" -#: builtin/help.c:407 +#: builtin/help.c:410 msgid "Specifies intentionally untracked files to ignore" msgstr "Ange avsiktligen ospårade filer att ignorera" -#: builtin/help.c:408 +#: builtin/help.c:411 msgid "Defining submodule properties" msgstr "Ange egenskaper för undermoduler" -#: builtin/help.c:409 +#: builtin/help.c:412 msgid "Specifying revisions and ranges for Git" msgstr "Ange versioner och intervall i Git" -#: builtin/help.c:410 +#: builtin/help.c:413 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "Introduktion till Git (för version 1.5.1 och senare)" -#: builtin/help.c:411 +#: builtin/help.c:414 msgid "An overview of recommended workflows with Git" msgstr "Översikt över rekommenderade arbetsflöden med Git" -#: builtin/help.c:423 +#: builtin/help.c:426 msgid "The common Git guides are:\n" msgstr "De vanliga Git-vägledningarna är:\n" -#: builtin/help.c:441 +#: builtin/help.c:444 #, c-format -msgid "`git %s' is aliased to `%s'" -msgstr "\"git %s\" är ett alias för \"%s\"" +msgid "'%s' is aliased to '%s'" +msgstr "\"%s\" är ett alias för \"%s\"" -#: builtin/help.c:463 builtin/help.c:480 +#: builtin/help.c:466 builtin/help.c:483 #, c-format msgid "usage: %s%s" msgstr "användning: %s%s" -#: builtin/index-pack.c:155 +#: builtin/index-pack.c:156 #, c-format msgid "unable to open %s" msgstr "kunde inte öppna %s" -#: builtin/index-pack.c:205 +#: builtin/index-pack.c:206 #, c-format msgid "object type mismatch at %s" msgstr "objekttyp stämmer inte överens vid %s" -#: builtin/index-pack.c:225 +#: builtin/index-pack.c:226 #, c-format msgid "did not receive expected object %s" msgstr "emottog inte det förväntade objektet %s" -#: builtin/index-pack.c:228 +#: builtin/index-pack.c:229 #, c-format msgid "object %s: expected type %s, found %s" msgstr "objektet %s: förväntad typ %s, såg %s" -#: builtin/index-pack.c:270 +#: builtin/index-pack.c:271 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "kan inte fylla %d byte" msgstr[1] "kan inte fylla %d byte" -#: builtin/index-pack.c:280 +#: builtin/index-pack.c:281 msgid "early EOF" msgstr "tidigt filslut" -#: builtin/index-pack.c:281 +#: builtin/index-pack.c:282 msgid "read error on input" msgstr "indataläsfel" -#: builtin/index-pack.c:293 +#: builtin/index-pack.c:294 msgid "used more bytes than were available" msgstr "använde fler byte än tillgängligt" -#: builtin/index-pack.c:300 +#: builtin/index-pack.c:301 msgid "pack too large for current definition of off_t" msgstr "paket för stort för nuvarande definition av off_t" -#: builtin/index-pack.c:303 builtin/unpack-objects.c:93 +#: builtin/index-pack.c:304 builtin/unpack-objects.c:93 msgid "pack exceeds maximum allowed size" msgstr "paket är större än tillåten maximal storlek" -#: builtin/index-pack.c:318 +#: builtin/index-pack.c:319 #, c-format msgid "unable to create '%s'" msgstr "kunde inte skapa \"%s\"" -#: builtin/index-pack.c:324 +#: builtin/index-pack.c:325 #, c-format msgid "cannot open packfile '%s'" msgstr "kan inte öppna paketfilen \"%s\"" -#: builtin/index-pack.c:338 +#: builtin/index-pack.c:339 msgid "pack signature mismatch" msgstr "paketsignatur stämmer inte överens" -#: builtin/index-pack.c:340 +#: builtin/index-pack.c:341 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "paketversion %<PRIu32> stöds ej" -#: builtin/index-pack.c:358 +#: builtin/index-pack.c:359 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "paketet har felaktigt objekt vid index %<PRIuMAX>: %s" -#: builtin/index-pack.c:479 +#: builtin/index-pack.c:480 #, c-format msgid "inflate returned %d" msgstr "inflate returnerade %d" -#: builtin/index-pack.c:528 +#: builtin/index-pack.c:529 msgid "offset value overflow for delta base object" msgstr "indexvärdespill för deltabasobjekt" -#: builtin/index-pack.c:536 +#: builtin/index-pack.c:537 msgid "delta base offset is out of bound" msgstr "deltabasindex utanför gränsen" -#: builtin/index-pack.c:544 +#: builtin/index-pack.c:545 #, c-format msgid "unknown object type %d" msgstr "okänd objekttyp %d" -#: builtin/index-pack.c:575 +#: builtin/index-pack.c:576 msgid "cannot pread pack file" msgstr "kan inte utföra \"pread\" på paketfil" -#: builtin/index-pack.c:577 +#: builtin/index-pack.c:578 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas" msgstr[1] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas" -#: builtin/index-pack.c:603 +#: builtin/index-pack.c:604 msgid "serious inflate inconsistency" msgstr "allvarlig inflate-inkonsekvens" -#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777 -#: builtin/index-pack.c:816 builtin/index-pack.c:825 +#: 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 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !" -#: builtin/index-pack.c:751 builtin/pack-objects.c:167 -#: builtin/pack-objects.c:261 +#: builtin/index-pack.c:752 builtin/pack-objects.c:168 +#: builtin/pack-objects.c:262 #, c-format msgid "unable to read %s" msgstr "kunde inte läsa %s" -#: builtin/index-pack.c:814 +#: builtin/index-pack.c:815 #, c-format msgid "cannot read existing object info %s" msgstr "kan inte läsa information om befintligt objekt %s" -#: builtin/index-pack.c:822 +#: builtin/index-pack.c:823 #, c-format msgid "cannot read existing object %s" msgstr "kan inte läsa befintligt objekt %s" -#: builtin/index-pack.c:836 +#: builtin/index-pack.c:837 #, c-format msgid "invalid blob object %s" msgstr "ogiltigt blob-objekt %s" -#: builtin/index-pack.c:851 +#: builtin/index-pack.c:852 #, c-format msgid "invalid %s" msgstr "ogiltigt %s" -#: builtin/index-pack.c:854 +#: builtin/index-pack.c:855 msgid "Error in object" msgstr "Fel i objekt" -#: builtin/index-pack.c:856 +#: builtin/index-pack.c:857 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Inte alla barnobjekt för %s kan nås" -#: builtin/index-pack.c:928 builtin/index-pack.c:959 +#: builtin/index-pack.c:929 builtin/index-pack.c:960 msgid "failed to apply delta" msgstr "misslyckades tillämpa delta" -#: builtin/index-pack.c:1130 +#: builtin/index-pack.c:1131 msgid "Receiving objects" msgstr "Tar emot objekt" -#: builtin/index-pack.c:1130 +#: builtin/index-pack.c:1131 msgid "Indexing objects" msgstr "Skapar index för objekt" -#: builtin/index-pack.c:1164 +#: builtin/index-pack.c:1165 msgid "pack is corrupted (SHA1 mismatch)" msgstr "paketet är trasigt (SHA1 stämmer inte)" -#: builtin/index-pack.c:1169 +#: builtin/index-pack.c:1170 msgid "cannot fstat packfile" msgstr "kan inte utföra \"fstat\" på paketfil" -#: builtin/index-pack.c:1172 +#: builtin/index-pack.c:1173 msgid "pack has junk at the end" msgstr "paket har skräp i slutet" -#: builtin/index-pack.c:1184 +#: builtin/index-pack.c:1185 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "förvirrad bortom vanvett i parse_pack_objects()" -#: builtin/index-pack.c:1207 +#: builtin/index-pack.c:1208 msgid "Resolving deltas" msgstr "Analyserar delta" -#: builtin/index-pack.c:1218 +#: builtin/index-pack.c:1219 #, c-format msgid "unable to create thread: %s" msgstr "kunde inte skapa tråd: %s" -#: builtin/index-pack.c:1260 +#: builtin/index-pack.c:1261 msgid "confusion beyond insanity" msgstr "förvirrad bortom vanvett" -#: builtin/index-pack.c:1266 +#: builtin/index-pack.c:1267 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "slutfördes med %d lokalt objekt" msgstr[1] "slutfördes med %d lokala objekt" -#: builtin/index-pack.c:1278 +#: builtin/index-pack.c:1279 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Oväntad svanschecksumma för %s (trasig disk?)" -#: builtin/index-pack.c:1282 +#: builtin/index-pack.c:1283 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "paketet har %d oanalyserat delta" msgstr[1] "paketet har %d oanalyserade delta" -#: builtin/index-pack.c:1306 +#: builtin/index-pack.c:1307 #, c-format msgid "unable to deflate appended object (%d)" msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)" -#: builtin/index-pack.c:1382 +#: builtin/index-pack.c:1383 #, c-format msgid "local object %s is corrupt" msgstr "lokalt objekt %s är trasigt" -#: builtin/index-pack.c:1408 +#: builtin/index-pack.c:1409 msgid "error while closing pack file" msgstr "fel vid stängning av paketfil" -#: builtin/index-pack.c:1420 +#: builtin/index-pack.c:1421 #, c-format msgid "cannot write keep file '%s'" msgstr "kan inte ta skriva \"keep\"-fil \"%s\"" -#: builtin/index-pack.c:1428 +#: builtin/index-pack.c:1429 #, c-format msgid "cannot close written keep file '%s'" msgstr "akn inte stänga skriven \"keep\"-fil \"%s\"" -#: builtin/index-pack.c:1438 +#: builtin/index-pack.c:1439 msgid "cannot store pack file" msgstr "kan inte spara paketfil" -#: builtin/index-pack.c:1446 +#: builtin/index-pack.c:1447 msgid "cannot store index file" msgstr "kan inte spara indexfil" -#: builtin/index-pack.c:1484 +#: builtin/index-pack.c:1485 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "felaktig pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1552 +#: builtin/index-pack.c:1553 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kan inte öppna befintlig paketfil \"%s\"" -#: builtin/index-pack.c:1554 +#: builtin/index-pack.c:1555 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Kan inte öppna befintlig paket-idx-fil för \"%s\"" -#: builtin/index-pack.c:1602 +#: builtin/index-pack.c:1603 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "icke-delta: %d objekt" msgstr[1] "icke-delta: %d objekt" -#: builtin/index-pack.c:1609 +#: builtin/index-pack.c:1610 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "kedjelängd = %d: %lu objekt" msgstr[1] "kedjelängd = %d: %lu objekt" -#: builtin/index-pack.c:1622 +#: builtin/index-pack.c:1623 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\"" -#: builtin/index-pack.c:1704 builtin/index-pack.c:1707 -#: builtin/index-pack.c:1723 builtin/index-pack.c:1727 +#: builtin/index-pack.c:1705 builtin/index-pack.c:1708 +#: builtin/index-pack.c:1724 builtin/index-pack.c:1728 #, c-format msgid "bad %s" msgstr "felaktig %s" -#: builtin/index-pack.c:1743 +#: builtin/index-pack.c:1744 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin kan inte användas med --stdin" -#: builtin/index-pack.c:1745 +#: builtin/index-pack.c:1746 msgid "--stdin requires a git repository" msgstr "--stdin kräver ett git-arkiv" -#: builtin/index-pack.c:1753 +#: builtin/index-pack.c:1754 msgid "--verify with no packfile name given" msgstr "--verify angavs utan paketfilnamn" @@ -9269,132 +9453,164 @@ msgstr "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " "<symbol>[(=|:)<värde>])...] [<fil>...]" -#: builtin/interpret-trailers.c:26 +#: builtin/interpret-trailers.c:92 msgid "edit files in place" msgstr "redigera filer på plats" -#: builtin/interpret-trailers.c:27 +#: builtin/interpret-trailers.c:93 msgid "trim empty trailers" msgstr "ta bort tomma släprader" -#: builtin/interpret-trailers.c:28 +#: builtin/interpret-trailers.c:96 +msgid "where to place the new trailer" +msgstr "var nya släprader skall placeras" + +#: builtin/interpret-trailers.c:98 +msgid "action if trailer already exists" +msgstr "att göra om släprader redan finns" + +#: builtin/interpret-trailers.c:100 +msgid "action if trailer is missing" +msgstr "att göra om släprader saknas" + +#: builtin/interpret-trailers.c:102 +msgid "output only the trailers" +msgstr "visa endast släprader" + +#: builtin/interpret-trailers.c:103 +msgid "do not apply config rules" +msgstr "använd inte regler från konfigurationen" + +#: builtin/interpret-trailers.c:104 +msgid "join whitespace-continued values" +msgstr "slå ihop värden avdelade med blanksteg" + +#: builtin/interpret-trailers.c:105 +msgid "set parsing options" +msgstr "välj tolkningsalternativ" + +#: builtin/interpret-trailers.c:107 msgid "trailer" msgstr "släprad" -#: builtin/interpret-trailers.c:29 +#: builtin/interpret-trailers.c:108 msgid "trailer(s) to add" msgstr "släprad(er) att lägga till" -#: builtin/interpret-trailers.c:42 +#: builtin/interpret-trailers.c:117 +msgid "--trailer with --only-input does not make sense" +msgstr "--trailer med --only-input ger ingen mening" + +#: builtin/interpret-trailers.c:127 msgid "no input file given for in-place editing" msgstr "ingen indatafil angiven för redigering på plats" -#: builtin/log.c:45 +#: builtin/log.c:46 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]" -#: builtin/log.c:46 +#: builtin/log.c:47 msgid "git show [<options>] <object>..." msgstr "git show [<flaggor>] <objekt>..." -#: builtin/log.c:90 +#: builtin/log.c:91 #, c-format msgid "invalid --decorate option: %s" msgstr "ogiltig flagga för --decorate: %s" -#: builtin/log.c:147 +#: builtin/log.c:148 msgid "suppress diff output" msgstr "undertryck diff-utdata" -#: builtin/log.c:148 +#: builtin/log.c:149 msgid "show source" msgstr "visa källkod" -#: builtin/log.c:149 +#: builtin/log.c:150 msgid "Use mail map file" msgstr "Använd e-postmappningsfil" -#: builtin/log.c:150 +#: builtin/log.c:151 msgid "decorate options" msgstr "dekoreringsflaggor" -#: builtin/log.c:153 +#: builtin/log.c:154 msgid "Process line range n,m in file, counting from 1" msgstr "Behandla radintervallet n,m i filen, med början på 1" -#: builtin/log.c:249 +#: builtin/log.c:250 #, c-format msgid "Final output: %d %s\n" msgstr "Slututdata: %d %s\n" -#: builtin/log.c:497 +#: builtin/log.c:501 #, c-format msgid "git show %s: bad file" msgstr "git show %s: felaktig fil" -#: builtin/log.c:512 builtin/log.c:606 +#: builtin/log.c:516 builtin/log.c:610 #, c-format msgid "Could not read object %s" msgstr "Kunde inte läsa objektet %s" -#: builtin/log.c:630 +#: builtin/log.c:634 #, c-format msgid "Unknown type: %d" msgstr "Okänd typ: %d" -#: builtin/log.c:751 +#: builtin/log.c:755 msgid "format.headers without value" msgstr "format.headers utan värde" -#: builtin/log.c:852 +#: builtin/log.c:856 msgid "name of output directory is too long" msgstr "namnet på utdatakatalogen är för långt" -#: builtin/log.c:868 +#: builtin/log.c:872 #, c-format msgid "Cannot open patch file %s" msgstr "Kan inte öppna patchfilen %s" -#: builtin/log.c:885 +#: builtin/log.c:889 msgid "Need exactly one range." msgstr "Behöver precis ett intervall." -#: builtin/log.c:895 +#: builtin/log.c:899 msgid "Not a range." msgstr "Inte ett intervall." -#: builtin/log.c:1001 +#: builtin/log.c:1005 msgid "Cover letter needs email format" msgstr "Omslagsbrevet behöver e-postformat" -#: builtin/log.c:1081 +#: builtin/log.c:1085 #, c-format msgid "insane in-reply-to: %s" msgstr "tokigt in-reply-to: %s" -#: builtin/log.c:1108 +#: builtin/log.c:1112 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]" -#: builtin/log.c:1158 +#: builtin/log.c:1162 msgid "Two output directories?" msgstr "Två utdatakataloger?" -#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922 +#: builtin/log.c:1269 builtin/log.c:1920 builtin/log.c:1922 builtin/log.c:1934 #, c-format msgid "Unknown commit %s" msgstr "Okänd incheckning %s" -#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533 +#: builtin/log.c:1279 builtin/notes.c:887 builtin/tag.c:516 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Kunde inte slå upp \"%s\" som en giltig referens." -#: builtin/log.c:1280 +#: builtin/log.c:1284 msgid "Could not find exact merge base." msgstr "Kunde inte hitta exakt sammanslagningsbas." -#: builtin/log.c:1284 +#: builtin/log.c:1288 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" @@ -9405,320 +9621,328 @@ msgstr "" "Eller så kan du ange basincheckning med --base=<bas-inchecknings-id> " "manuellt." -#: builtin/log.c:1304 +#: builtin/log.c:1308 msgid "Failed to find exact merge base" msgstr "Kunde inte hitta exakt sammanslagningsbas" -#: builtin/log.c:1315 +#: builtin/log.c:1319 msgid "base commit should be the ancestor of revision list" msgstr "basincheckningen bör vara förfader till revisionslistan" -#: builtin/log.c:1319 +#: builtin/log.c:1323 msgid "base commit shouldn't be in revision list" msgstr "basincheckningen bör inte vara i revisionslistan" -#: builtin/log.c:1368 +#: builtin/log.c:1372 msgid "cannot get patch id" msgstr "kan inte hämta patch-id" -#: builtin/log.c:1425 +#: builtin/log.c:1431 msgid "use [PATCH n/m] even with a single patch" msgstr "använd [PATCH n/m] även för en ensam patch" -#: builtin/log.c:1428 +#: builtin/log.c:1434 msgid "use [PATCH] even with multiple patches" msgstr "använd [PATCH] även för flera patchar" -#: builtin/log.c:1432 +#: builtin/log.c:1438 msgid "print patches to standard out" msgstr "skriv patcharna på standard ut" -#: builtin/log.c:1434 +#: builtin/log.c:1440 msgid "generate a cover letter" msgstr "generera ett följebrev" -#: builtin/log.c:1436 +#: builtin/log.c:1442 msgid "use simple number sequence for output file names" msgstr "använd enkel nummersekvens för utdatafilnamn" -#: builtin/log.c:1437 +#: builtin/log.c:1443 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1438 +#: builtin/log.c:1444 msgid "use <sfx> instead of '.patch'" msgstr "använd <sfx> istället för \".patch\"" -#: builtin/log.c:1440 +#: builtin/log.c:1446 msgid "start numbering patches at <n> instead of 1" msgstr "börja numrera patchar på <n> istället för 1" -#: builtin/log.c:1442 +#: builtin/log.c:1448 msgid "mark the series as Nth re-roll" msgstr "markera serien som N:te försök" -#: builtin/log.c:1444 +#: builtin/log.c:1450 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Använd [RFC PATCH] istället för [PATCH]" -#: builtin/log.c:1447 +#: builtin/log.c:1453 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Använd [<prefix>] istället för [PATCH]" -#: builtin/log.c:1450 +#: builtin/log.c:1456 msgid "store resulting files in <dir>" msgstr "spara filerna i <katalog>" -#: builtin/log.c:1453 +#: builtin/log.c:1459 msgid "don't strip/add [PATCH]" msgstr "ta inte bort eller lägg till [PATCH]" -#: builtin/log.c:1456 +#: builtin/log.c:1462 msgid "don't output binary diffs" msgstr "skriv inte binära diffar" -#: builtin/log.c:1458 +#: builtin/log.c:1464 msgid "output all-zero hash in From header" msgstr "använd hashvärde med nollor i From-huvud" -#: builtin/log.c:1460 +#: builtin/log.c:1466 msgid "don't include a patch matching a commit upstream" msgstr "ta inte med patchar som motsvarar en uppströmsincheckning" -#: builtin/log.c:1462 +#: builtin/log.c:1468 msgid "show patch format instead of default (patch + stat)" msgstr "visa patchformat istället för standard (patch + stat)" -#: builtin/log.c:1464 +#: builtin/log.c:1470 msgid "Messaging" msgstr "E-post" -#: builtin/log.c:1465 +#: builtin/log.c:1471 msgid "header" msgstr "huvud" -#: builtin/log.c:1466 +#: builtin/log.c:1472 msgid "add email header" msgstr "lägg till e-posthuvud" -#: builtin/log.c:1467 builtin/log.c:1469 +#: builtin/log.c:1473 builtin/log.c:1475 msgid "email" msgstr "epost" -#: builtin/log.c:1467 +#: builtin/log.c:1473 msgid "add To: header" msgstr "lägg till mottagarhuvud (\"To:\")" -#: builtin/log.c:1469 +#: builtin/log.c:1475 msgid "add Cc: header" msgstr "lägg till kopiehuvud (\"Cc:\")" -#: builtin/log.c:1471 +#: builtin/log.c:1477 msgid "ident" msgstr "ident" -#: builtin/log.c:1472 +#: builtin/log.c:1478 msgid "set From address to <ident> (or committer ident if absent)" msgstr "sätt Från-adress till <ident> (eller incheckare om ident saknas)" -#: builtin/log.c:1474 +#: builtin/log.c:1480 msgid "message-id" msgstr "meddelande-id" -#: builtin/log.c:1475 +#: builtin/log.c:1481 msgid "make first mail a reply to <message-id>" msgstr "gör det första brevet ett svar till <meddelande-id>" -#: builtin/log.c:1476 builtin/log.c:1479 +#: builtin/log.c:1482 builtin/log.c:1485 msgid "boundary" msgstr "gräns" -#: builtin/log.c:1477 +#: builtin/log.c:1483 msgid "attach the patch" msgstr "bifoga patchen" -#: builtin/log.c:1480 +#: builtin/log.c:1486 msgid "inline the patch" msgstr "gör patchen ett inline-objekt" -#: builtin/log.c:1484 +#: builtin/log.c:1490 msgid "enable message threading, styles: shallow, deep" msgstr "aktivera brevtrådning, typer: shallow, deep" -#: builtin/log.c:1486 +#: builtin/log.c:1492 msgid "signature" msgstr "signatur" -#: builtin/log.c:1487 +#: builtin/log.c:1493 msgid "add a signature" msgstr "lägg till signatur" -#: builtin/log.c:1488 +#: builtin/log.c:1494 msgid "base-commit" msgstr "basincheckning" -#: builtin/log.c:1489 +#: builtin/log.c:1495 msgid "add prerequisite tree info to the patch series" msgstr "lägg till förhandskrävd trädinfo i patchserien" -#: builtin/log.c:1491 +#: builtin/log.c:1497 msgid "add a signature from a file" msgstr "lägg till signatur från fil" -#: builtin/log.c:1492 +#: builtin/log.c:1498 msgid "don't print the patch filenames" msgstr "visa inte filnamn för patchar" -#: builtin/log.c:1567 +#: builtin/log.c:1500 +msgid "show progress while generating patches" +msgstr "visa förloppsindikator medan patchar skapas" + +#: builtin/log.c:1575 #, c-format msgid "invalid ident line: %s" msgstr "ogiltig ident-rad: %s" -#: builtin/log.c:1582 +#: builtin/log.c:1590 msgid "-n and -k are mutually exclusive." msgstr "-n och -k kan inte användas samtidigt." -#: builtin/log.c:1584 +#: builtin/log.c:1592 msgid "--subject-prefix/--rfc and -k are mutually exclusive." msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt." -#: builtin/log.c:1592 +#: builtin/log.c:1600 msgid "--name-only does not make sense" msgstr "kan inte använda --name-only" -#: builtin/log.c:1594 +#: builtin/log.c:1602 msgid "--name-status does not make sense" msgstr "kan inte använda --name-status" -#: builtin/log.c:1596 +#: builtin/log.c:1604 msgid "--check does not make sense" msgstr "kan inte använda --check" -#: builtin/log.c:1626 +#: builtin/log.c:1634 msgid "standard output, or directory, which one?" msgstr "standard ut, eller katalog, vilken skall det vara?" -#: builtin/log.c:1628 +#: builtin/log.c:1636 #, c-format msgid "Could not create directory '%s'" msgstr "Kunde inte skapa katalogen \"%s\"" -#: builtin/log.c:1722 +#: builtin/log.c:1729 #, c-format msgid "unable to read signature file '%s'" msgstr "kunde inte läsa signaturfil \"%s\"" -#: builtin/log.c:1794 +#: builtin/log.c:1761 +msgid "Generating patches" +msgstr "Skapar patchar" + +#: builtin/log.c:1805 msgid "Failed to create output files" msgstr "Misslyckades skapa utdatafiler" -#: builtin/log.c:1843 +#: builtin/log.c:1855 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]" -#: builtin/log.c:1897 +#: builtin/log.c:1909 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n" -#: builtin/ls-files.c:468 +#: builtin/ls-files.c:466 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<flaggor>] [<fil>...]" -#: builtin/ls-files.c:517 +#: builtin/ls-files.c:515 msgid "identify the file status with tags" msgstr "identifiera filstatus med taggar" -#: builtin/ls-files.c:519 +#: builtin/ls-files.c:517 msgid "use lowercase letters for 'assume unchanged' files" msgstr "använd små bokstäver för \"anta oförändrade\"-filer" -#: builtin/ls-files.c:521 +#: builtin/ls-files.c:519 msgid "show cached files in the output (default)" msgstr "visa cachade filer i utdata (standard)" -#: builtin/ls-files.c:523 +#: builtin/ls-files.c:521 msgid "show deleted files in the output" msgstr "visa borttagna filer i utdata" -#: builtin/ls-files.c:525 +#: builtin/ls-files.c:523 msgid "show modified files in the output" msgstr "visa modifierade filer i utdata" -#: builtin/ls-files.c:527 +#: builtin/ls-files.c:525 msgid "show other files in the output" msgstr "visa andra filer i utdata" -#: builtin/ls-files.c:529 +#: builtin/ls-files.c:527 msgid "show ignored files in the output" msgstr "visa ignorerade filer i utdata" -#: builtin/ls-files.c:532 +#: builtin/ls-files.c:530 msgid "show staged contents' object name in the output" msgstr "visa köat innehålls objektnamn i utdata" -#: builtin/ls-files.c:534 +#: builtin/ls-files.c:532 msgid "show files on the filesystem that need to be removed" msgstr "visa filer i filsystemet som behöver tas bort" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:534 msgid "show 'other' directories' names only" msgstr "visa endast namn för \"andra\" kataloger" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:536 msgid "show line endings of files" msgstr "visa radslut i filer" -#: builtin/ls-files.c:540 +#: builtin/ls-files.c:538 msgid "don't show empty directories" msgstr "visa inte tomma kataloger" -#: builtin/ls-files.c:543 +#: builtin/ls-files.c:541 msgid "show unmerged files in the output" msgstr "visa ej sammanslagna filer i utdata" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:543 msgid "show resolve-undo information" msgstr "visa \"resolve-undo\"-information" -#: builtin/ls-files.c:547 +#: builtin/ls-files.c:545 msgid "skip files matching pattern" msgstr "hoppa över filer som motsvarar mönster" -#: builtin/ls-files.c:550 +#: builtin/ls-files.c:548 msgid "exclude patterns are read from <file>" msgstr "exkludera mönster som läses från <fil>" -#: builtin/ls-files.c:553 +#: builtin/ls-files.c:551 msgid "read additional per-directory exclude patterns in <file>" msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>" -#: builtin/ls-files.c:555 +#: builtin/ls-files.c:553 msgid "add the standard git exclusions" msgstr "lägg till git:s standardexkluderingar" -#: builtin/ls-files.c:558 +#: builtin/ls-files.c:556 msgid "make the output relative to the project top directory" msgstr "gör utdata relativ till projektets toppkatalog" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:559 msgid "recurse through submodules" msgstr "rekursera ner i undermoduler" -#: builtin/ls-files.c:563 +#: builtin/ls-files.c:561 msgid "if any <file> is not in the index, treat this as an error" msgstr "om en <fil> inte är indexet, betrakta det som ett fel" -#: builtin/ls-files.c:564 +#: builtin/ls-files.c:562 msgid "tree-ish" msgstr "träd-igt" -#: builtin/ls-files.c:565 +#: builtin/ls-files.c:563 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "låtsas att sökvägar borttagna sedan <träd-igt> fortfarande finns" -#: builtin/ls-files.c:567 +#: builtin/ls-files.c:565 msgid "show debugging data" msgstr "visa felsökningsutdata" @@ -9809,179 +10033,183 @@ msgstr "visa hela trädet; inte bara aktuell katalog (implicerar --full-name)" msgid "empty mbox: '%s'" msgstr "tom mbox: ”%s”" -#: builtin/merge.c:47 +#: builtin/merge.c:48 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<flaggor>] [<incheckning>...]" -#: builtin/merge.c:48 +#: builtin/merge.c:49 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:49 +#: builtin/merge.c:50 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:104 +#: builtin/merge.c:107 msgid "switch `m' requires a value" msgstr "flaggan \"m\" behöver ett värde" -#: builtin/merge.c:141 +#: builtin/merge.c:144 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n" -#: builtin/merge.c:142 +#: builtin/merge.c:145 #, c-format msgid "Available strategies are:" msgstr "Tillgängliga strategier är:" -#: builtin/merge.c:147 +#: builtin/merge.c:150 #, c-format msgid "Available custom strategies are:" msgstr "Tillgängliga skräddarsydda strategier är:" -#: builtin/merge.c:197 builtin/pull.c:134 +#: builtin/merge.c:200 builtin/pull.c:134 msgid "do not show a diffstat at the end of the merge" msgstr "visa inte en diffstat när sammanslagningen är färdig" -#: builtin/merge.c:200 builtin/pull.c:137 +#: builtin/merge.c:203 builtin/pull.c:137 msgid "show a diffstat at the end of the merge" msgstr "visa en diffstat när sammanslagningen är färdig" -#: builtin/merge.c:201 builtin/pull.c:140 +#: builtin/merge.c:204 builtin/pull.c:140 msgid "(synonym to --stat)" msgstr "(synonym till --stat)" -#: builtin/merge.c:203 builtin/pull.c:143 +#: builtin/merge.c:206 builtin/pull.c:143 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "lägg till (som mest <n>) poster från shortlog till incheckningsmeddelandet" -#: builtin/merge.c:206 builtin/pull.c:146 +#: builtin/merge.c:209 builtin/pull.c:146 msgid "create a single commit instead of doing a merge" msgstr "skapa en ensam incheckning istället för en sammanslagning" -#: builtin/merge.c:208 builtin/pull.c:149 +#: builtin/merge.c:211 builtin/pull.c:149 msgid "perform a commit if the merge succeeds (default)" msgstr "utför en incheckning om sammanslagningen lyckades (standard)" -#: builtin/merge.c:210 builtin/pull.c:152 +#: builtin/merge.c:213 builtin/pull.c:152 msgid "edit message before committing" msgstr "redigera meddelande innan incheckning" -#: builtin/merge.c:211 +#: builtin/merge.c:214 msgid "allow fast-forward (default)" msgstr "tillåt snabbspolning (standard)" -#: builtin/merge.c:213 builtin/pull.c:158 +#: builtin/merge.c:216 builtin/pull.c:158 msgid "abort if fast-forward is not possible" msgstr "avbryt om snabbspolning inte är möjlig" -#: builtin/merge.c:217 builtin/pull.c:161 +#: builtin/merge.c:220 builtin/pull.c:161 msgid "verify that the named commit has a valid GPG signature" msgstr "bekräfta att den namngivna incheckningen har en giltig GPG-signatur" -#: builtin/merge.c:218 builtin/notes.c:776 builtin/pull.c:165 +#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:165 #: builtin/revert.c:109 msgid "strategy" msgstr "strategi" -#: builtin/merge.c:219 builtin/pull.c:166 +#: builtin/merge.c:222 builtin/pull.c:166 msgid "merge strategy to use" msgstr "sammanslagningsstrategi att använda" -#: builtin/merge.c:220 builtin/pull.c:169 +#: builtin/merge.c:223 builtin/pull.c:169 msgid "option=value" msgstr "alternativ=värde" -#: builtin/merge.c:221 builtin/pull.c:170 +#: builtin/merge.c:224 builtin/pull.c:170 msgid "option for selected merge strategy" msgstr "alternativ för vald sammanslagningsstrategi" -#: builtin/merge.c:223 +#: builtin/merge.c:226 msgid "merge commit message (for a non-fast-forward merge)" msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning" -#: builtin/merge.c:227 +#: builtin/merge.c:230 msgid "abort the current in-progress merge" msgstr "avbryt den pågående sammanslagningen" -#: builtin/merge.c:229 +#: builtin/merge.c:232 msgid "continue the current in-progress merge" msgstr "fortsätt den pågående sammanslagningen" -#: builtin/merge.c:231 builtin/pull.c:177 +#: builtin/merge.c:234 builtin/pull.c:177 msgid "allow merging unrelated histories" msgstr "tillåt sammanslagning av orelaterade historier" -#: builtin/merge.c:259 +#: builtin/merge.c:240 +msgid "verify commit-msg hook" +msgstr "bekräfta commit-msg-krok" + +#: builtin/merge.c:265 msgid "could not run stash." msgstr "kunde köra stash." -#: builtin/merge.c:264 +#: builtin/merge.c:270 msgid "stash failed" msgstr "stash misslyckades" -#: builtin/merge.c:269 +#: builtin/merge.c:275 #, c-format msgid "not a valid object: %s" msgstr "inte ett giltigt objekt: %s" -#: builtin/merge.c:288 builtin/merge.c:305 +#: builtin/merge.c:297 builtin/merge.c:314 msgid "read-tree failed" msgstr "read-tree misslyckades" -#: builtin/merge.c:335 +#: builtin/merge.c:344 msgid " (nothing to squash)" msgstr " (inget att platta till)" -#: builtin/merge.c:346 +#: builtin/merge.c:355 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n" -#: builtin/merge.c:396 +#: builtin/merge.c:405 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n" -#: builtin/merge.c:447 +#: builtin/merge.c:456 #, c-format msgid "'%s' does not point to a commit" msgstr "\"%s\" verkar inte peka på en incheckning" -#: builtin/merge.c:537 +#: builtin/merge.c:546 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Felaktig branch.%s.mergeoptions-sträng: %s" -#: builtin/merge.c:657 +#: builtin/merge.c:666 msgid "Not handling anything other than two heads merge." msgstr "Hanterar inte något annat än en sammanslagning av två huvuden." -#: builtin/merge.c:671 +#: builtin/merge.c:680 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Felaktig flagga för merge-recursive: -X%s" -#: builtin/merge.c:686 +#: builtin/merge.c:695 #, c-format msgid "unable to write %s" msgstr "kunde inte skriva %s" -#: builtin/merge.c:738 +#: builtin/merge.c:747 #, c-format msgid "Could not read from '%s'" msgstr "Kunde inte läsa från \"%s\"" -#: builtin/merge.c:747 +#: builtin/merge.c:756 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Checkar inte in sammanslagningen; använd \"git commit\" för att slutföra " "den.\n" -#: builtin/merge.c:753 +#: builtin/merge.c:762 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -9997,69 +10225,69 @@ msgstr "" "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n" "avbryter incheckningen.\n" -#: builtin/merge.c:777 +#: builtin/merge.c:798 msgid "Empty commit message." msgstr "Tomt incheckningsmeddelande." -#: builtin/merge.c:797 +#: builtin/merge.c:818 #, c-format msgid "Wonderful.\n" msgstr "Underbart.\n" -#: builtin/merge.c:850 +#: builtin/merge.c:871 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n" -#: builtin/merge.c:889 +#: builtin/merge.c:910 msgid "No current branch." msgstr "Inte på någon gren." -#: builtin/merge.c:891 +#: builtin/merge.c:912 msgid "No remote for the current branch." msgstr "Ingen fjärr för aktuell gren." -#: builtin/merge.c:893 +#: builtin/merge.c:914 msgid "No default upstream defined for the current branch." msgstr "Ingen standarduppström angiven för aktuell gren." -#: builtin/merge.c:898 +#: builtin/merge.c:919 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Ingen fjärrspårande gren för %s från %s" -#: builtin/merge.c:945 +#: builtin/merge.c:972 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\"" -#: builtin/merge.c:1046 +#: builtin/merge.c:1073 #, c-format msgid "not something we can merge in %s: %s" msgstr "inte något vi kan slå ihop med %s: %s" -#: builtin/merge.c:1080 +#: builtin/merge.c:1107 msgid "not something we can merge" msgstr "inte något vi kan slå ihop" -#: builtin/merge.c:1145 +#: builtin/merge.c:1172 msgid "--abort expects no arguments" msgstr "--abort tar inga argument" -#: builtin/merge.c:1149 +#: builtin/merge.c:1176 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)." -#: builtin/merge.c:1161 +#: builtin/merge.c:1188 msgid "--continue expects no arguments" msgstr "--continue tar inga argument" -#: builtin/merge.c:1165 +#: builtin/merge.c:1192 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)." -#: builtin/merge.c:1181 +#: builtin/merge.c:1208 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10067,7 +10295,7 @@ msgstr "" "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" "Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1188 +#: builtin/merge.c:1215 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10075,114 +10303,114 @@ msgstr "" "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n" "Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1191 +#: builtin/merge.c:1218 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)." -#: builtin/merge.c:1200 +#: builtin/merge.c:1227 msgid "You cannot combine --squash with --no-ff." msgstr "Du kan inte kombinera --squash med --no-ff." -#: builtin/merge.c:1208 +#: builtin/merge.c:1235 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt." -#: builtin/merge.c:1225 +#: builtin/merge.c:1252 msgid "Squash commit into empty head not supported yet" msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu" -#: builtin/merge.c:1227 +#: builtin/merge.c:1254 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud" -#: builtin/merge.c:1232 +#: builtin/merge.c:1259 #, c-format msgid "%s - not something we can merge" msgstr "%s - inte något vi kan slå ihop" -#: builtin/merge.c:1234 +#: builtin/merge.c:1261 msgid "Can merge only exactly one commit into empty head" msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud" -#: builtin/merge.c:1268 +#: builtin/merge.c:1295 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "Incheckningen %s har en obetrodd GPG-signatur som påstås vara gjord av %s." -#: builtin/merge.c:1271 +#: builtin/merge.c:1298 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" "Incheckningen %s har en felaktig GPG-signatur som påstås vara gjord av %s." -#: builtin/merge.c:1274 +#: builtin/merge.c:1301 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Incheckning %s har inte någon GPG-signatur." -#: builtin/merge.c:1277 +#: builtin/merge.c:1304 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n" -#: builtin/merge.c:1339 +#: builtin/merge.c:1366 msgid "refusing to merge unrelated histories" msgstr "vägrar slå samman orelaterad historik" -#: builtin/merge.c:1348 -msgid "Already up-to-date." +#: builtin/merge.c:1375 +msgid "Already up to date." msgstr "Redan à jour." -#: builtin/merge.c:1358 +#: builtin/merge.c:1385 #, c-format msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" -#: builtin/merge.c:1399 +#: builtin/merge.c:1426 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" -#: builtin/merge.c:1406 +#: builtin/merge.c:1433 #, c-format msgid "Nope.\n" msgstr "Nej.\n" -#: builtin/merge.c:1431 -msgid "Already up-to-date. Yeeah!" +#: builtin/merge.c:1458 +msgid "Already up to date. Yeeah!" msgstr "Redan à jour. Toppen!" -#: builtin/merge.c:1437 +#: builtin/merge.c:1464 msgid "Not possible to fast-forward, aborting." msgstr "Kan inte snabbspola, avbryter." -#: builtin/merge.c:1460 builtin/merge.c:1539 +#: builtin/merge.c:1487 builtin/merge.c:1566 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Återspolar trädet till orört...\n" -#: builtin/merge.c:1464 +#: builtin/merge.c:1491 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Försöker sammanslagningsstrategin %s...\n" -#: builtin/merge.c:1530 +#: builtin/merge.c:1557 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" -#: builtin/merge.c:1532 +#: builtin/merge.c:1559 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Sammanslagning med strategin %s misslyckades.\n" -#: builtin/merge.c:1541 +#: builtin/merge.c:1568 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Använder %s för att förbereda lösning för hand.\n" -#: builtin/merge.c:1553 +#: builtin/merge.c:1580 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -10324,7 +10552,7 @@ msgstr "git mv [<flaggor>] <källa>... <mål>" msgid "Directory %s is in index and no submodule?" msgstr "Katalogen %s är i indexet och inte en undermodul?" -#: builtin/mv.c:85 builtin/rm.c:290 +#: builtin/mv.c:85 builtin/rm.c:289 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" "Köa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta" @@ -10342,68 +10570,68 @@ msgstr "tvinga flytta/ändra namn även om målet finns" msgid "skip move/rename errors" msgstr "hoppa över fel vid flytt/namnändring" -#: builtin/mv.c:168 +#: builtin/mv.c:167 #, c-format msgid "destination '%s' is not a directory" msgstr "destinationen \"%s\" är ingen katalog" -#: builtin/mv.c:179 +#: builtin/mv.c:178 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Kontrollerar namnbyte av \"%s\" till \"%s\"\n" -#: builtin/mv.c:183 +#: builtin/mv.c:182 msgid "bad source" msgstr "felaktig källa" -#: builtin/mv.c:186 +#: builtin/mv.c:185 msgid "can not move directory into itself" msgstr "kan inte flytta katalog till sig själv" -#: builtin/mv.c:189 +#: builtin/mv.c:188 msgid "cannot move directory over file" msgstr "kan inte flytta katalog över fil" -#: builtin/mv.c:198 +#: builtin/mv.c:197 msgid "source directory is empty" msgstr "källkatalogen är tom" -#: builtin/mv.c:223 +#: builtin/mv.c:222 msgid "not under version control" msgstr "inte versionshanterad" -#: builtin/mv.c:226 +#: builtin/mv.c:225 msgid "destination exists" msgstr "destinationen finns" -#: builtin/mv.c:234 +#: builtin/mv.c:233 #, c-format msgid "overwriting '%s'" msgstr "skriver över \"%s\"" -#: builtin/mv.c:237 +#: builtin/mv.c:236 msgid "Cannot overwrite" msgstr "Kan inte skriva över" -#: builtin/mv.c:240 +#: builtin/mv.c:239 msgid "multiple sources for the same target" msgstr "flera källor för samma mål" -#: builtin/mv.c:242 +#: builtin/mv.c:241 msgid "destination directory does not exist" msgstr "destinationskatalogen finns inte" -#: builtin/mv.c:249 +#: builtin/mv.c:248 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, källa=%s, mål=%s" -#: builtin/mv.c:270 +#: builtin/mv.c:269 #, c-format msgid "Renaming %s to %s\n" msgstr "Byter namn på %s till %s\n" -#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390 +#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390 #, c-format msgid "renaming '%s' failed" msgstr "misslyckades byta namn på \"%s\"" @@ -10595,19 +10823,19 @@ msgstr "kunde inte skriva anteckningsobjekt" msgid "the note contents have been left in %s" msgstr "anteckningens innehåll har lämnats kvar i %s" -#: builtin/notes.c:234 builtin/tag.c:517 +#: builtin/notes.c:234 builtin/tag.c:500 #, c-format msgid "cannot read '%s'" msgstr "kunde inte läsa \"%s\"" -#: builtin/notes.c:236 builtin/tag.c:520 +#: builtin/notes.c:236 builtin/tag.c:503 #, c-format msgid "could not open or read '%s'" msgstr "kunde inte öppna eller läsa \"%s\"" #: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308 -#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516 -#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661 +#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517 +#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662 #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "kunde inte slå upp \"%s\" som en giltig referens." @@ -10635,47 +10863,47 @@ msgstr "misslyckades kopiera anteckningar från \"%s\" till \"%s\"" #. TRANSLATORS: the first %s will be replaced by a git #. notes command: 'add', 'merge', 'remove', etc. #. -#: builtin/notes.c:348 +#: builtin/notes.c:349 #, c-format msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "vägrar utföra \"%s\" på anteckningar i %s (utanför refs/notes/)" -#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499 -#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654 -#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972 +#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500 +#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655 +#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973 msgid "too many parameters" msgstr "för många parametrar" -#: builtin/notes.c:381 builtin/notes.c:667 +#: builtin/notes.c:382 builtin/notes.c:668 #, c-format msgid "no note found for object %s." msgstr "inga anteckningar hittades för objektet %s." -#: builtin/notes.c:402 builtin/notes.c:565 +#: builtin/notes.c:403 builtin/notes.c:566 msgid "note contents as a string" msgstr "anteckningsinnehåll som sträng" -#: builtin/notes.c:405 builtin/notes.c:568 +#: builtin/notes.c:406 builtin/notes.c:569 msgid "note contents in a file" msgstr "anteckningsinnehåll i en fil" -#: builtin/notes.c:408 builtin/notes.c:571 +#: builtin/notes.c:409 builtin/notes.c:572 msgid "reuse and edit specified note object" msgstr "återanvänd och redigera angivet anteckningsobjekt" -#: builtin/notes.c:411 builtin/notes.c:574 +#: builtin/notes.c:412 builtin/notes.c:575 msgid "reuse specified note object" msgstr "återanvänd angivet anteckningsobjekt" -#: builtin/notes.c:414 builtin/notes.c:577 +#: builtin/notes.c:415 builtin/notes.c:578 msgid "allow storing empty note" msgstr "tillåt lagra tom anteckning" -#: builtin/notes.c:415 builtin/notes.c:486 +#: builtin/notes.c:416 builtin/notes.c:487 msgid "replace existing notes" msgstr "ersätt befintliga anteckningar" -#: builtin/notes.c:440 +#: builtin/notes.c:441 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -10684,29 +10912,29 @@ msgstr "" "Kan inte lägga till anteckningar. Hittade befintliga anteckningar för " "objektet %s. Använd \"-f\" för att skriva över befintliga anteckningar" -#: builtin/notes.c:455 builtin/notes.c:534 +#: builtin/notes.c:456 builtin/notes.c:535 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Skriver över befintliga anteckningar för objektet %s\n" -#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891 +#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892 #, c-format msgid "Removing note for object %s\n" msgstr "Tar bort anteckning för objektet %s\n" -#: builtin/notes.c:487 +#: builtin/notes.c:488 msgid "read objects from stdin" msgstr "läs objekt från standard in" -#: builtin/notes.c:489 +#: builtin/notes.c:490 msgid "load rewriting config for <command> (implies --stdin)" msgstr "läs omskrivningsinställning för <kommando> (implicerar --stdin)" -#: builtin/notes.c:507 +#: builtin/notes.c:508 msgid "too few parameters" msgstr "för få parametrar" -#: builtin/notes.c:528 +#: builtin/notes.c:529 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -10715,12 +10943,12 @@ msgstr "" "Kan inte kopiera anteckningar. Hittade befintliga anteckningar för objektet " "%s. Använd \"-f\" för att skriva över befintliga anteckningar" -#: builtin/notes.c:540 +#: builtin/notes.c:541 #, c-format msgid "missing notes on source object %s. Cannot copy." msgstr "anteckningar på källobjektet %s saknas. Kan inte kopiera." -#: builtin/notes.c:592 +#: builtin/notes.c:593 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -10729,52 +10957,52 @@ msgstr "" "Flaggorna -m/-F/-c/-C rekommenderas inte för underkommandot \"edit\".\n" "Använd \"git notes add -f -m/-F/-c/-C\" istället.\n" -#: builtin/notes.c:687 +#: builtin/notes.c:688 msgid "failed to delete ref NOTES_MERGE_PARTIAL" msgstr "misslyckades ta bort referensen NOTES_MERGE_PARTIAL" -#: builtin/notes.c:689 +#: builtin/notes.c:690 msgid "failed to delete ref NOTES_MERGE_REF" msgstr "misslyckades ta bort referensen NOTES_MERGE_REF" -#: builtin/notes.c:691 +#: builtin/notes.c:692 msgid "failed to remove 'git notes merge' worktree" msgstr "misslyckades ta bort arbetskatalogen för \"git notes merge\"" -#: builtin/notes.c:711 +#: builtin/notes.c:712 msgid "failed to read ref NOTES_MERGE_PARTIAL" msgstr "misslyckades läsa references NOTES_MERGE_PARTIAL" -#: builtin/notes.c:713 +#: builtin/notes.c:714 msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "kunde inte hitta incheckning från NOTES_MERGE_PARTIAL." -#: builtin/notes.c:715 +#: builtin/notes.c:716 msgid "could not parse commit from NOTES_MERGE_PARTIAL." msgstr "kunde inte tolka incheckning från NOTES_MERGE_PARTIAL." -#: builtin/notes.c:728 +#: builtin/notes.c:729 msgid "failed to resolve NOTES_MERGE_REF" msgstr "misslyckades bestämma NOTES_MERGE_REF" -#: builtin/notes.c:731 +#: builtin/notes.c:732 msgid "failed to finalize notes merge" msgstr "misslyckades färdigställa sammanslagning av anteckningar" -#: builtin/notes.c:757 +#: builtin/notes.c:758 #, c-format msgid "unknown notes merge strategy %s" msgstr "okänd sammanslagningsstrategi för anteckningar: %s" -#: builtin/notes.c:773 +#: builtin/notes.c:774 msgid "General options" msgstr "Allmänna flaggor" -#: builtin/notes.c:775 +#: builtin/notes.c:776 msgid "Merge options" msgstr "Flaggor för sammanslagning" -#: builtin/notes.c:777 +#: builtin/notes.c:778 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -10782,48 +11010,48 @@ msgstr "" "läs konflikter i anteckningar med angiven strategi (manual/ours/theirs/union/" "cat_sort_uniq)" -#: builtin/notes.c:779 +#: builtin/notes.c:780 msgid "Committing unmerged notes" msgstr "Checkar in ej sammanslagna anteckningar" -#: builtin/notes.c:781 +#: builtin/notes.c:782 msgid "finalize notes merge by committing unmerged notes" msgstr "" "färdigställ sammanslagning av anteckningar genom att checka in ej " "sammanslagna anteckningar" -#: builtin/notes.c:783 +#: builtin/notes.c:784 msgid "Aborting notes merge resolution" msgstr "Avbryt lösning av sammanslagning av anteckningar" -#: builtin/notes.c:785 +#: builtin/notes.c:786 msgid "abort notes merge" msgstr "avbryt sammanslagning av anteckningar" -#: builtin/notes.c:796 +#: builtin/notes.c:797 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "kan inte blanda --commit, --abort eller -s/--strategy" -#: builtin/notes.c:801 +#: builtin/notes.c:802 msgid "must specify a notes ref to merge" msgstr "måste ange en antecknings-referens att slå ihop" -#: builtin/notes.c:825 +#: builtin/notes.c:826 #, c-format msgid "unknown -s/--strategy: %s" msgstr "okänd -s/--strategy: %s" -#: builtin/notes.c:862 +#: builtin/notes.c:863 #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "sammanslagning av anteckningar till %s är redan igångsatt på %s" -#: builtin/notes.c:865 +#: builtin/notes.c:866 #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "misslyckades lagra länk till aktuell anteckningsreferens (%s)" -#: builtin/notes.c:867 +#: builtin/notes.c:868 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " @@ -10834,221 +11062,221 @@ msgstr "" "%s och checka in resultatet med \"git notes merge --commit\", eller avbryt " "sammanslagningen med \"git notes merge --abort\".\n" -#: builtin/notes.c:889 +#: builtin/notes.c:890 #, c-format msgid "Object %s has no note\n" msgstr "Objektet %s har ingen anteckning\n" -#: builtin/notes.c:901 +#: builtin/notes.c:902 msgid "attempt to remove non-existent note is not an error" msgstr "försök att ta bort icke-existerande anteckningar är inte ett fel" -#: builtin/notes.c:904 +#: builtin/notes.c:905 msgid "read object names from the standard input" msgstr "läs objektnamn från standard in" -#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128 +#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:146 msgid "do not remove, show only" msgstr "ta inte bort, bara visa" -#: builtin/notes.c:943 +#: builtin/notes.c:944 msgid "report pruned notes" msgstr "rapportera borttagna anteckningar" -#: builtin/notes.c:985 +#: builtin/notes.c:986 msgid "notes-ref" msgstr "anteckningar-ref" -#: builtin/notes.c:986 +#: builtin/notes.c:987 msgid "use notes from <notes-ref>" msgstr "använd anteckningar från <anteckningsref>" -#: builtin/notes.c:1021 +#: builtin/notes.c:1022 #, c-format msgid "unknown subcommand: %s" msgstr "okänt underkommando: %s" -#: builtin/pack-objects.c:30 +#: builtin/pack-objects.c:31 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [<flaggor>...] [< <reflista> | < <objektlista>]" -#: builtin/pack-objects.c:31 +#: builtin/pack-objects.c:32 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [<flaggor>...] <basnamn> [< <reflista> | < <objektlista>]" -#: builtin/pack-objects.c:180 builtin/pack-objects.c:183 +#: builtin/pack-objects.c:181 builtin/pack-objects.c:184 #, c-format msgid "deflate error (%d)" msgstr "fel i deflate (%d)" -#: builtin/pack-objects.c:776 +#: builtin/pack-objects.c:777 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "inaktiverar skrivning av bitkarta, paket delas på grund av pack.packSizeLimit" -#: builtin/pack-objects.c:789 +#: builtin/pack-objects.c:790 msgid "Writing objects" msgstr "Skriver objekt" -#: builtin/pack-objects.c:1069 +#: builtin/pack-objects.c:1070 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "inaktiverar skrivning av bitkarta då några objekt inte packas" -#: builtin/pack-objects.c:2434 +#: builtin/pack-objects.c:2440 msgid "Compressing objects" msgstr "Komprimerar objekt" -#: builtin/pack-objects.c:2843 +#: builtin/pack-objects.c:2849 #, c-format msgid "unsupported index version %s" msgstr "indexversionen %s stöds ej" -#: builtin/pack-objects.c:2847 +#: builtin/pack-objects.c:2853 #, c-format msgid "bad index version '%s'" msgstr "felaktig indexversion \"%s\"" -#: builtin/pack-objects.c:2877 +#: builtin/pack-objects.c:2883 msgid "do not show progress meter" msgstr "visa inte förloppsindikator" -#: builtin/pack-objects.c:2879 +#: builtin/pack-objects.c:2885 msgid "show progress meter" msgstr "visa förloppsindikator" -#: builtin/pack-objects.c:2881 +#: builtin/pack-objects.c:2887 msgid "show progress meter during object writing phase" msgstr "visa förloppsindikator under objektskrivningsfasen" -#: builtin/pack-objects.c:2884 +#: builtin/pack-objects.c:2890 msgid "similar to --all-progress when progress meter is shown" msgstr "som --all-progress när förloppsindikatorn visas" -#: builtin/pack-objects.c:2885 +#: builtin/pack-objects.c:2891 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2886 +#: builtin/pack-objects.c:2892 msgid "write the pack index file in the specified idx format version" msgstr "skriv paketindexfilen i angiven indexformatversion" -#: builtin/pack-objects.c:2889 +#: builtin/pack-objects.c:2895 msgid "maximum size of each output pack file" msgstr "maximal storlek på varje utdatapaketfil" -#: builtin/pack-objects.c:2891 +#: builtin/pack-objects.c:2897 msgid "ignore borrowed objects from alternate object store" msgstr "ignorera lånade objekt från alternativa objektlager" -#: builtin/pack-objects.c:2893 +#: builtin/pack-objects.c:2899 msgid "ignore packed objects" msgstr "ignorera packade objekt" -#: builtin/pack-objects.c:2895 +#: builtin/pack-objects.c:2901 msgid "limit pack window by objects" msgstr "begränsa paketfönster efter objekt" -#: builtin/pack-objects.c:2897 +#: builtin/pack-objects.c:2903 msgid "limit pack window by memory in addition to object limit" msgstr "begränsa paketfönster efter minne förutom objektgräns" -#: builtin/pack-objects.c:2899 +#: builtin/pack-objects.c:2905 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "maximal längd på deltakedja tillåten i slutligt paket" -#: builtin/pack-objects.c:2901 +#: builtin/pack-objects.c:2907 msgid "reuse existing deltas" msgstr "återanvänd befintliga delta" -#: builtin/pack-objects.c:2903 +#: builtin/pack-objects.c:2909 msgid "reuse existing objects" msgstr "återanvänd befintliga objekt" -#: builtin/pack-objects.c:2905 +#: builtin/pack-objects.c:2911 msgid "use OFS_DELTA objects" msgstr "använd OFS_DELTA-objekt" -#: builtin/pack-objects.c:2907 +#: builtin/pack-objects.c:2913 msgid "use threads when searching for best delta matches" msgstr "använd trådar vid sökning efter bästa deltaträffar" -#: builtin/pack-objects.c:2909 +#: builtin/pack-objects.c:2915 msgid "do not create an empty pack output" msgstr "försök inte skapa tom paketutdata" -#: builtin/pack-objects.c:2911 +#: builtin/pack-objects.c:2917 msgid "read revision arguments from standard input" msgstr "läs revisionsargument från standard in" -#: builtin/pack-objects.c:2913 +#: builtin/pack-objects.c:2919 msgid "limit the objects to those that are not yet packed" msgstr "begränsa objekt till de som ännu inte packats" -#: builtin/pack-objects.c:2916 +#: builtin/pack-objects.c:2922 msgid "include objects reachable from any reference" msgstr "inkludera objekt som kan nås från någon referens" -#: builtin/pack-objects.c:2919 +#: builtin/pack-objects.c:2925 msgid "include objects referred by reflog entries" msgstr "inkludera objekt som refereras från referensloggposter" -#: builtin/pack-objects.c:2922 +#: builtin/pack-objects.c:2928 msgid "include objects referred to by the index" msgstr "inkludera objekt som refereras från indexet" -#: builtin/pack-objects.c:2925 +#: builtin/pack-objects.c:2931 msgid "output pack to stdout" msgstr "skriv paket på standard ut" -#: builtin/pack-objects.c:2927 +#: builtin/pack-objects.c:2933 msgid "include tag objects that refer to objects to be packed" msgstr "inkludera taggobjekt som refererar objekt som skall packas" -#: builtin/pack-objects.c:2929 +#: builtin/pack-objects.c:2935 msgid "keep unreachable objects" msgstr "behåll onåbara objekt" -#: builtin/pack-objects.c:2931 +#: builtin/pack-objects.c:2937 msgid "pack loose unreachable objects" msgstr "packa lösa onåbara objekt" -#: builtin/pack-objects.c:2933 +#: builtin/pack-objects.c:2939 msgid "unpack unreachable objects newer than <time>" msgstr "packa upp onåbara objekt nyare än <tid>" -#: builtin/pack-objects.c:2936 +#: builtin/pack-objects.c:2942 msgid "create thin packs" msgstr "skapa tunna paket" -#: builtin/pack-objects.c:2938 +#: builtin/pack-objects.c:2944 msgid "create packs suitable for shallow fetches" msgstr "skapa packfiler lämpade för grunda hämtningar" -#: builtin/pack-objects.c:2940 +#: builtin/pack-objects.c:2946 msgid "ignore packs that have companion .keep file" msgstr "ignorera paket som har tillhörande .keep-fil" -#: builtin/pack-objects.c:2942 +#: builtin/pack-objects.c:2948 msgid "pack compression level" msgstr "komprimeringsgrad för paket" -#: builtin/pack-objects.c:2944 +#: builtin/pack-objects.c:2950 msgid "do not hide commits by grafts" msgstr "göm inte incheckningar med ympningar (\"grafts\")" -#: builtin/pack-objects.c:2946 +#: builtin/pack-objects.c:2952 msgid "use a bitmap index if available to speed up counting objects" msgstr "använd bitkartindex om tillgängligt för att räkna objekt snabbare" -#: builtin/pack-objects.c:2948 +#: builtin/pack-objects.c:2954 msgid "write a bitmap index together with the pack index" msgstr "använd bitkartindex tillsammans med packindexet" -#: builtin/pack-objects.c:3075 +#: builtin/pack-objects.c:3081 msgid "Counting objects" msgstr "Räknar objekt" @@ -11064,11 +11292,11 @@ msgstr "packa allt" msgid "prune loose refs (default)" msgstr "ta bort lösa referenser (standard)" -#: builtin/prune-packed.c:7 +#: builtin/prune-packed.c:8 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" -#: builtin/prune-packed.c:40 +#: builtin/prune-packed.c:41 msgid "Removing duplicate objects" msgstr "Tar bort duplicerade objekt" @@ -11109,7 +11337,7 @@ msgstr "Alternativ gällande sammanslagning" msgid "incorporate changes by rebasing rather than merging" msgstr "inlemma ändringar genom ombasering i stället för sammanslagning" -#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121 +#: builtin/pull.c:155 builtin/rebase--helper.c:21 builtin/revert.c:121 msgid "allow fast-forward" msgstr "tillåt snabbspolning" @@ -11130,7 +11358,7 @@ msgstr "antal undermoduler som hämtas parallellt" msgid "Invalid value for pull.ff: %s" msgstr "Felaktigt värde för pull.ff: %s" -#: builtin/pull.c:399 +#: builtin/pull.c:403 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -11138,14 +11366,14 @@ msgstr "" "Det finns ingen kandidat för ombasering bland referenserna du precis har " "hämtat." -#: builtin/pull.c:401 +#: builtin/pull.c:405 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "Det finns ingen kandidat för sammanslagning bland referenserna du precis har " "hämtat." -#: builtin/pull.c:402 +#: builtin/pull.c:406 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -11153,7 +11381,7 @@ msgstr "" "Det betyder vanligtvis att du använt en jokertecken-refspec som inte\n" "motsvarade något i fjärränden." -#: builtin/pull.c:405 +#: builtin/pull.c:409 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -11164,42 +11392,42 @@ msgstr "" "gren. Eftersom det inte är den fjärr som är konfigurerad som\n" "standard för aktuell gren måste du ange en gren på kommandoraden." -#: builtin/pull.c:410 git-parse-remote.sh:73 +#: builtin/pull.c:414 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Du är inte på någon gren för närvarande." -#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79 +#: builtin/pull.c:416 builtin/pull.c:431 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Ange vilken gren du vill ombasera mot." -#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82 +#: builtin/pull.c:418 builtin/pull.c:433 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Ange vilken gren du vill slå samman med." -#: builtin/pull.c:415 builtin/pull.c:430 +#: builtin/pull.c:419 builtin/pull.c:434 msgid "See git-pull(1) for details." msgstr "Se git-pull(1) för detaljer." -#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432 +#: builtin/pull.c:421 builtin/pull.c:427 builtin/pull.c:436 #: git-parse-remote.sh:64 msgid "<remote>" msgstr "<fjärr>" -#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456 +#: builtin/pull.c:421 builtin/pull.c:436 builtin/pull.c:441 git-rebase.sh:466 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<gren>" -#: builtin/pull.c:425 git-parse-remote.sh:75 +#: builtin/pull.c:429 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "Det finns ingen spårningsinformation för aktuell gren." -#: builtin/pull.c:434 git-parse-remote.sh:95 +#: builtin/pull.c:438 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "Om du vill ange spårningsinformation för grenen kan du göra det med:" -#: builtin/pull.c:439 +#: builtin/pull.c:443 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -11208,27 +11436,27 @@ msgstr "" "Dina inställningar anger sammanslagning med referensen \"%s\"\n" "från fjärren, men någon sådan referens togs inte emot." -#: builtin/pull.c:792 +#: builtin/pull.c:796 msgid "ignoring --verify-signatures for rebase" msgstr "ignorera --verify-signatures för ombasering" -#: builtin/pull.c:840 +#: builtin/pull.c:844 msgid "--[no-]autostash option is only valid with --rebase." msgstr "--[no-]autostash är endast giltig med --rebase." -#: builtin/pull.c:848 +#: builtin/pull.c:852 msgid "Updating an unborn branch with changes added to the index." msgstr "Uppdaterar en ofödd gren med ändringar som lagts till i indexet." -#: builtin/pull.c:851 +#: builtin/pull.c:855 msgid "pull with rebase" msgstr "pull med ombasering" -#: builtin/pull.c:852 +#: builtin/pull.c:856 msgid "please commit or stash them." msgstr "checka in eller använd \"stash\" på dem." -#: builtin/pull.c:877 +#: builtin/pull.c:881 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -11239,7 +11467,7 @@ msgstr "" "snabbspolar din arbetskatalog från\n" "incheckningen %s." -#: builtin/pull.c:882 +#: builtin/pull.c:886 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -11256,15 +11484,15 @@ msgstr "" "$ git reset --hard\n" "för att återgå." -#: builtin/pull.c:897 +#: builtin/pull.c:901 msgid "Cannot merge multiple branches into empty head." msgstr "Kan inte slå ihop flera grenar i ett tomt huvud." -#: builtin/pull.c:901 +#: builtin/pull.c:905 msgid "Cannot rebase onto multiple branches." msgstr "Kan inte ombasera ovanpå flera grenar." -#: builtin/pull.c:908 +#: builtin/pull.c:912 msgid "cannot rebase with locally recorded submodule modifications" msgstr "kan inte ombasera med lokalt lagrade ändringar i undermoful" @@ -11643,19 +11871,47 @@ msgstr "felsök unpack-trees" msgid "git rebase--helper [<options>]" msgstr "git rebase--helper [<flaggor>]" -#: builtin/rebase--helper.c:20 +#: builtin/rebase--helper.c:22 +msgid "keep empty commits" +msgstr "behåll tomma incheckningar" + +#: builtin/rebase--helper.c:23 msgid "continue rebase" msgstr "fortsätt ombasering" -#: builtin/rebase--helper.c:22 +#: builtin/rebase--helper.c:25 msgid "abort rebase" msgstr "avbryt ombasering" -#: builtin/receive-pack.c:28 +#: builtin/rebase--helper.c:28 +msgid "make rebase script" +msgstr "skapa ombaseringsskript" + +#: builtin/rebase--helper.c:30 +msgid "shorten SHA-1s in the todo list" +msgstr "förkorta SHA-1 i todo-listan" + +#: builtin/rebase--helper.c:32 +msgid "expand SHA-1s in the todo list" +msgstr "utöka SHA-1 i todo-listan" + +#: builtin/rebase--helper.c:34 +msgid "check the todo list" +msgstr "kontrollera todo-listan" + +#: builtin/rebase--helper.c:36 +msgid "skip unnecessary picks" +msgstr "hoppa över onödiga \"pick\"-kommandon" + +#: builtin/rebase--helper.c:38 +msgid "rearrange fixup/squash lines" +msgstr "ordna om fixup-/squash-rader" + +#: builtin/receive-pack.c:29 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-katalog>" -#: builtin/receive-pack.c:838 +#: builtin/receive-pack.c:839 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" @@ -11685,7 +11941,7 @@ msgstr "" "För att undvika detta meddelande och fortfarande behålla det\n" "normala beteendet, sätt \"receive.denyCurrentBranch\" till \"refuse\"." -#: builtin/receive-pack.c:858 +#: builtin/receive-pack.c:859 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" @@ -11706,11 +11962,11 @@ msgstr "" "\n" "För att undvika detta meddelande kan du sätta det till \"refuse\"." -#: builtin/receive-pack.c:1933 +#: builtin/receive-pack.c:1932 msgid "quiet" msgstr "tyst" -#: builtin/receive-pack.c:1947 +#: builtin/receive-pack.c:1946 msgid "You must specify a directory." msgstr "Du måste ange en katalog." @@ -11860,12 +12116,12 @@ msgstr "att ange en master-gren ger ingen mening med --mirror" msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "att ange grenar att spåra ger mening bara med hämtningsspeglar" -#: builtin/remote.c:191 builtin/remote.c:630 +#: builtin/remote.c:191 builtin/remote.c:631 #, c-format msgid "remote %s already exists." msgstr "fjärrarkivet %s finns redan." -#: builtin/remote.c:195 builtin/remote.c:634 +#: builtin/remote.c:195 builtin/remote.c:635 #, c-format msgid "'%s' is not a valid remote name" msgstr "\"%s\" är inte ett giltigt namn på fjärrarkiv" @@ -11888,17 +12144,17 @@ msgstr "(matchande)" msgid "(delete)" msgstr "(ta bort)" -#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857 +#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858 #, c-format msgid "No such remote: %s" msgstr "Inget sådant fjärrarkiv: %s" -#: builtin/remote.c:640 +#: builtin/remote.c:641 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Kunde inte byta namn på konfigurationssektionen \"%s\" till \"%s\"" -#: builtin/remote.c:660 +#: builtin/remote.c:661 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -11909,17 +12165,17 @@ msgstr "" "\t%s\n" "\tUppdatera konfigurationen manuellt om nödvändigt." -#: builtin/remote.c:696 +#: builtin/remote.c:697 #, c-format msgid "deleting '%s' failed" msgstr "misslyckades ta bort \"%s\"" -#: builtin/remote.c:730 +#: builtin/remote.c:731 #, c-format msgid "creating '%s' failed" msgstr "misslyckades skapa \"%s\"" -#: builtin/remote.c:795 +#: builtin/remote.c:796 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -11933,113 +12189,113 @@ msgstr[1] "" "Observera: Några grenar utanför hierarkin refs/remotes/ togs inte bort;\n" "för att ta bort dem, använd:" -#: builtin/remote.c:809 +#: builtin/remote.c:810 #, c-format msgid "Could not remove config section '%s'" msgstr "Kunde inte ta bort konfigurationssektionen \"%s\"" -#: builtin/remote.c:910 +#: builtin/remote.c:911 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " ny (nästa hämtning sparar i remotes/%s)" -#: builtin/remote.c:913 +#: builtin/remote.c:914 msgid " tracked" msgstr " spårad" -#: builtin/remote.c:915 +#: builtin/remote.c:916 msgid " stale (use 'git remote prune' to remove)" msgstr " förlegad (använd \"git remote prune\" för att ta bort)" -#: builtin/remote.c:917 +#: builtin/remote.c:918 msgid " ???" msgstr " ???" -#: builtin/remote.c:958 +#: builtin/remote.c:959 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "ogiltig branch.%s.merge; kan inte ombasera över > 1 gren" -#: builtin/remote.c:966 +#: builtin/remote.c:967 #, c-format msgid "rebases interactively onto remote %s" msgstr "ombaseras interaktivt på fjärren %s" -#: builtin/remote.c:967 +#: builtin/remote.c:968 #, c-format msgid "rebases onto remote %s" msgstr "ombaseras på fjärren %s" -#: builtin/remote.c:970 +#: builtin/remote.c:971 #, c-format msgid " merges with remote %s" msgstr " sammanslås med fjärren %s" -#: builtin/remote.c:973 +#: builtin/remote.c:974 #, c-format msgid "merges with remote %s" msgstr "sammanslås med fjärren %s" -#: builtin/remote.c:976 +#: builtin/remote.c:977 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s och med fjärren %s\n" -#: builtin/remote.c:1019 +#: builtin/remote.c:1020 msgid "create" msgstr "skapa" -#: builtin/remote.c:1022 +#: builtin/remote.c:1023 msgid "delete" msgstr "ta bort" -#: builtin/remote.c:1026 +#: builtin/remote.c:1027 msgid "up to date" msgstr "àjour" -#: builtin/remote.c:1029 +#: builtin/remote.c:1030 msgid "fast-forwardable" msgstr "kan snabbspolas" -#: builtin/remote.c:1032 +#: builtin/remote.c:1033 msgid "local out of date" msgstr "lokal föråldrad" -#: builtin/remote.c:1039 +#: builtin/remote.c:1040 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s tvingar till %-*s (%s)" -#: builtin/remote.c:1042 +#: builtin/remote.c:1043 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s sänder till %-*s (%s)" -#: builtin/remote.c:1046 +#: builtin/remote.c:1047 #, c-format msgid " %-*s forces to %s" msgstr " %-*s tvingar till %s" -#: builtin/remote.c:1049 +#: builtin/remote.c:1050 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s sänder till %s" -#: builtin/remote.c:1117 +#: builtin/remote.c:1118 msgid "do not query remotes" msgstr "fråga inte fjärrar" -#: builtin/remote.c:1144 +#: builtin/remote.c:1145 #, c-format msgid "* remote %s" msgstr "* fjärr %s" -#: builtin/remote.c:1145 +#: builtin/remote.c:1146 #, c-format msgid " Fetch URL: %s" msgstr " Hämt-URL: %s" -#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301 +#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302 msgid "(no URL)" msgstr "(ingen URL)" @@ -12047,184 +12303,184 @@ msgstr "(ingen URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1160 builtin/remote.c:1162 +#: builtin/remote.c:1161 builtin/remote.c:1163 #, c-format msgid " Push URL: %s" msgstr " Sänd-URL: %s" -#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168 +#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169 #, c-format msgid " HEAD branch: %s" msgstr " HEAD-gren: %s" -#: builtin/remote.c:1164 +#: builtin/remote.c:1165 msgid "(not queried)" msgstr "(inte förfrågad)" -#: builtin/remote.c:1166 +#: builtin/remote.c:1167 msgid "(unknown)" msgstr "(okänd)" -#: builtin/remote.c:1170 +#: builtin/remote.c:1171 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " HEAD-gren (HEAD på fjärr är tvetydig, kan vara en av följande):\n" -#: builtin/remote.c:1182 +#: builtin/remote.c:1183 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Fjärrgren:%s" msgstr[1] " Fjärrgrenar:%s" -#: builtin/remote.c:1185 builtin/remote.c:1211 +#: builtin/remote.c:1186 builtin/remote.c:1212 msgid " (status not queried)" msgstr " (status inte förfrågad)" -#: builtin/remote.c:1194 +#: builtin/remote.c:1195 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Lokal gren konfigurerad för \"git pull\":" msgstr[1] " Lokala grenar konfigurerade för \"git pull\":" -#: builtin/remote.c:1202 +#: builtin/remote.c:1203 msgid " Local refs will be mirrored by 'git push'" msgstr " Lokala referenser speglas av \"git push\"" -#: builtin/remote.c:1208 +#: builtin/remote.c:1209 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Lokal referens konfigurerad för \"git push\"%s:" msgstr[1] " Lokala referenser konfigurerade för \"git push\"%s:" -#: builtin/remote.c:1229 +#: builtin/remote.c:1230 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren" -#: builtin/remote.c:1231 +#: builtin/remote.c:1232 msgid "delete refs/remotes/<name>/HEAD" msgstr "ta bort refs/remotes/<namn>/HEAD" -#: builtin/remote.c:1246 +#: builtin/remote.c:1247 msgid "Cannot determine remote HEAD" msgstr "Kan inte bestämma HEAD på fjärren" -#: builtin/remote.c:1248 +#: builtin/remote.c:1249 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "Flera HEAD-grenar på fjärren. Välj en explicit med:" -#: builtin/remote.c:1258 +#: builtin/remote.c:1259 #, c-format msgid "Could not delete %s" msgstr "Kunde inte ta bort %s" -#: builtin/remote.c:1266 +#: builtin/remote.c:1267 #, c-format msgid "Not a valid ref: %s" msgstr "Inte en giltig referens: %s" -#: builtin/remote.c:1268 +#: builtin/remote.c:1269 #, c-format msgid "Could not setup %s" msgstr "Kunde inte ställa in %s" -#: builtin/remote.c:1286 +#: builtin/remote.c:1287 #, c-format msgid " %s will become dangling!" msgstr " %s kommer bli dinglande!" -#: builtin/remote.c:1287 +#: builtin/remote.c:1288 #, c-format msgid " %s has become dangling!" msgstr " %s har blivit dinglande!" -#: builtin/remote.c:1297 +#: builtin/remote.c:1298 #, c-format msgid "Pruning %s" msgstr "Rensar %s" -#: builtin/remote.c:1298 +#: builtin/remote.c:1299 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1314 +#: builtin/remote.c:1315 #, c-format msgid " * [would prune] %s" msgstr " * [skulle rensa] %s" -#: builtin/remote.c:1317 +#: builtin/remote.c:1318 #, c-format msgid " * [pruned] %s" msgstr " * [rensad] %s" -#: builtin/remote.c:1362 +#: builtin/remote.c:1363 msgid "prune remotes after fetching" msgstr "rensa fjärrar efter hämtning" -#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547 +#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548 #, c-format msgid "No such remote '%s'" msgstr "Ingen sådan fjärr \"%s\"" -#: builtin/remote.c:1441 +#: builtin/remote.c:1442 msgid "add branch" msgstr "lägg till gren" -#: builtin/remote.c:1448 +#: builtin/remote.c:1449 msgid "no remote specified" msgstr "ingen fjärr angavs" -#: builtin/remote.c:1465 +#: builtin/remote.c:1466 msgid "query push URLs rather than fetch URLs" msgstr "fråga sänd-URL:er istället för hämta-URL:er" -#: builtin/remote.c:1467 +#: builtin/remote.c:1468 msgid "return all URLs" msgstr "returnera alla URL:er" -#: builtin/remote.c:1495 +#: builtin/remote.c:1496 #, c-format msgid "no URLs configured for remote '%s'" msgstr "ingen URL:er angivna för fjärren \"%s\"" -#: builtin/remote.c:1521 +#: builtin/remote.c:1522 msgid "manipulate push URLs" msgstr "manipulera URL:ar för sändning" -#: builtin/remote.c:1523 +#: builtin/remote.c:1524 msgid "add URL" msgstr "lägg till URL" -#: builtin/remote.c:1525 +#: builtin/remote.c:1526 msgid "delete URLs" msgstr "ta bort URL:ar" -#: builtin/remote.c:1532 +#: builtin/remote.c:1533 msgid "--add --delete doesn't make sense" msgstr "--add --delete ger ingen mening" -#: builtin/remote.c:1573 +#: builtin/remote.c:1572 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Felaktig gammalt URL-mönster: %s" -#: builtin/remote.c:1581 +#: builtin/remote.c:1580 #, c-format msgid "No such URL found: %s" msgstr "Ingen sådan URL hittades: %s" -#: builtin/remote.c:1583 +#: builtin/remote.c:1582 msgid "Will not delete all non-push URLs" msgstr "Kommer inte ta bort alla icke-sänd-URL:er" -#: builtin/remote.c:1597 +#: builtin/remote.c:1598 msgid "be verbose; must be placed before a subcommand" msgstr "var pratsam; måste skrivas före ett underkommando" -#: builtin/remote.c:1628 +#: builtin/remote.c:1629 #, c-format msgid "Unknown subcommand: %s" msgstr "Okänt underkommando: %s" @@ -12322,7 +12578,7 @@ msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv" msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable och -A kan inte användas samtidigt" -#: builtin/repack.c:406 builtin/worktree.c:116 +#: builtin/repack.c:406 builtin/worktree.c:134 #, c-format msgid "failed to remove '%s'" msgstr "misslyckades ta bort \"%s\"" @@ -12455,120 +12711,120 @@ msgstr "sammanslagning" msgid "keep" msgstr "behåll" -#: builtin/reset.c:77 +#: builtin/reset.c:78 msgid "You do not have a valid HEAD." msgstr "Du har inte en giltig HEAD." -#: builtin/reset.c:79 +#: builtin/reset.c:80 msgid "Failed to find tree of HEAD." msgstr "Kunde inte hitta träder för HEAD." -#: builtin/reset.c:85 +#: builtin/reset.c:86 #, c-format msgid "Failed to find tree of %s." msgstr "Kunde inte hitta träder för %s." -#: builtin/reset.c:103 +#: builtin/reset.c:113 #, c-format msgid "HEAD is now at %s" msgstr "HEAD är nu på %s" -#: builtin/reset.c:186 +#: builtin/reset.c:197 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "Kan inte utföra en %s återställning mitt i en sammanslagning." -#: builtin/reset.c:286 +#: builtin/reset.c:297 msgid "be quiet, only report errors" msgstr "var tyst, rapportera endast fel" -#: builtin/reset.c:288 +#: builtin/reset.c:299 msgid "reset HEAD and index" msgstr "återställ HEAD och index" -#: builtin/reset.c:289 +#: builtin/reset.c:300 msgid "reset only HEAD" msgstr "återställ endast HEAD" -#: builtin/reset.c:291 builtin/reset.c:293 +#: builtin/reset.c:302 builtin/reset.c:304 msgid "reset HEAD, index and working tree" msgstr "återställ HEAD, index och arbetskatalog" -#: builtin/reset.c:295 +#: builtin/reset.c:306 msgid "reset HEAD but keep local changes" msgstr "återställ HEAD men behåll lokala ändringar" -#: builtin/reset.c:301 +#: builtin/reset.c:312 msgid "record only the fact that removed paths will be added later" msgstr "registrera endast att borttagna sökvägar kommer läggas till senare" -#: builtin/reset.c:320 +#: builtin/reset.c:329 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Kunde inte slå upp \"%s\" som en giltig revision." -#: builtin/reset.c:328 +#: builtin/reset.c:337 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "Kunde inte slå upp \"%s\" som ett giltigt träd." -#: builtin/reset.c:337 +#: builtin/reset.c:346 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch är inkompatibel med --{hard,mixed,soft}" -#: builtin/reset.c:346 +#: builtin/reset.c:355 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "--mixed rekommenderas inte med sökvägar; använd \"git reset -- <sökvägar>\"." -#: builtin/reset.c:348 +#: builtin/reset.c:357 #, c-format msgid "Cannot do %s reset with paths." msgstr "Kan inte göra %s återställning med sökvägar." -#: builtin/reset.c:358 +#: builtin/reset.c:367 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "%s återställning tillåts inte i ett naket arkiv" -#: builtin/reset.c:362 +#: builtin/reset.c:371 msgid "-N can only be used with --mixed" msgstr "-N kan endast användas med --mixed" -#: builtin/reset.c:379 +#: builtin/reset.c:388 msgid "Unstaged changes after reset:" msgstr "Oköade ändringar efter återställning:" -#: builtin/reset.c:385 +#: builtin/reset.c:394 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Kunde inte återställa indexfilen till versionen \"%s\"." -#: builtin/reset.c:389 +#: builtin/reset.c:398 msgid "Could not write new index file." msgstr "Kunde inte skriva ny indexfil." -#: builtin/rev-list.c:358 +#: builtin/rev-list.c:361 msgid "rev-list does not support display of notes" msgstr "rev-list stöder inte visning av anteckningar" -#: builtin/rev-parse.c:394 +#: builtin/rev-parse.c:402 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<options>] -- [<argument>...]" -#: builtin/rev-parse.c:399 +#: builtin/rev-parse.c:407 msgid "keep the `--` passed as an arg" msgstr "behåll \"--\" sänt som argument" -#: builtin/rev-parse.c:401 +#: builtin/rev-parse.c:409 msgid "stop parsing after the first non-option argument" msgstr "sluta tolka efter första argument som inte är flagga" -#: builtin/rev-parse.c:404 +#: builtin/rev-parse.c:412 msgid "output in stuck long form" msgstr "utdata fast i lång form" -#: builtin/rev-parse.c:535 +#: builtin/rev-parse.c:545 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -12660,11 +12916,11 @@ msgstr "tillåt incheckningar med tomt meddelande" msgid "keep redundant, empty commits" msgstr "behåll redundanta, tomma incheckningar" -#: builtin/revert.c:212 +#: builtin/revert.c:214 msgid "revert failed" msgstr "\"revert\" misslyckades" -#: builtin/revert.c:225 +#: builtin/revert.c:227 msgid "cherry-pick failed" msgstr "\"cherry-pick\" misslyckades" @@ -12732,17 +12988,17 @@ msgstr "tillåt rekursiv borttagning" msgid "exit with a zero status even if nothing matched" msgstr "avsluta med nollstatus även om inget träffades" -#: builtin/rm.c:308 +#: builtin/rm.c:307 #, c-format msgid "not removing '%s' recursively without -r" msgstr "tar inte bort \"%s\" rekursivt utan -r" -#: builtin/rm.c:347 +#: builtin/rm.c:346 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: kan inte ta bort %s" -#: builtin/rm.c:370 +#: builtin/rm.c:369 #, c-format msgid "could not remove '%s'" msgstr "kunde inte ta bort \"%s\"" @@ -12779,27 +13035,27 @@ msgstr "visa status från fjärrhjälpare" msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" msgstr "git shortlog [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]" -#: builtin/shortlog.c:249 +#: builtin/shortlog.c:263 msgid "Group by committer rather than author" msgstr "Gruppera efter incheckare istället för författare" -#: builtin/shortlog.c:251 +#: builtin/shortlog.c:265 msgid "sort output according to the number of commits per author" msgstr "sortera utdata enligt antal incheckningar per författare" -#: builtin/shortlog.c:253 +#: builtin/shortlog.c:267 msgid "Suppress commit descriptions, only provides commit count" msgstr "Undertryck beskrivningar, visa bara antal incheckningar" -#: builtin/shortlog.c:255 +#: builtin/shortlog.c:269 msgid "Show the email address of each author" msgstr "Visa e-postadress för varje författare" -#: builtin/shortlog.c:256 +#: builtin/shortlog.c:270 msgid "w[,i1[,i2]]" msgstr "w[,i1[,i2]]" -#: builtin/shortlog.c:257 +#: builtin/shortlog.c:271 msgid "Linewrap output" msgstr "Radbryt utdata" @@ -12999,35 +13255,35 @@ msgstr "hoppa över och ta bort alla rader som inleds med kommentarstecken" msgid "prepend comment character and space to each line" msgstr "lägg in kommentarstecken och blanksteg först på varje rad" -#: builtin/submodule--helper.c:25 builtin/submodule--helper.c:1075 +#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1094 #, c-format msgid "No such ref: %s" msgstr "Ingen sådan referens: %s" -#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084 +#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1103 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Förväntade fullt referensnamn, fick %s" -#: builtin/submodule--helper.c:72 +#: builtin/submodule--helper.c:71 #, c-format msgid "cannot strip one component off url '%s'" msgstr "kan inte ta bort en komponent från url:en \"%s\"" -#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630 +#: builtin/submodule--helper.c:302 builtin/submodule--helper.c:623 msgid "alternative anchor for relative paths" msgstr "alternativa ankare för relativa sökvägar" -#: builtin/submodule--helper.c:310 +#: builtin/submodule--helper.c:307 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]" -#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380 +#: builtin/submodule--helper.c:350 builtin/submodule--helper.c:374 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "Hittade ingen url för undermodulsökvägen \"%s\" i .gitmodules" -#: builtin/submodule--helper.c:395 +#: builtin/submodule--helper.c:389 #, c-format msgid "" "could not lookup configuration '%s'. Assuming this repository is its own " @@ -13036,79 +13292,79 @@ msgstr "" "kunde inte slå upp konfigurationen \"%s\". Antar att arkivet är sn eget " "officiella uppström." -#: builtin/submodule--helper.c:406 +#: builtin/submodule--helper.c:400 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Misslyckades registrera url för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:410 +#: builtin/submodule--helper.c:404 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n" -#: builtin/submodule--helper.c:420 +#: builtin/submodule--helper.c:414 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "varning: kommandouppdateringsläge föreslogs för undermodulen \"%s\"\n" -#: builtin/submodule--helper.c:427 +#: builtin/submodule--helper.c:421 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "Misslyckades registrera uppdateringsläge för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:443 +#: builtin/submodule--helper.c:437 msgid "Suppress output for initializing a submodule" msgstr "Dölj utdata från initiering av undermodul" -#: builtin/submodule--helper.c:448 +#: builtin/submodule--helper.c:442 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper init [<sökväg>]" -#: builtin/submodule--helper.c:476 +#: builtin/submodule--helper.c:470 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <sökväg>" -#: builtin/submodule--helper.c:482 +#: builtin/submodule--helper.c:475 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "hittade ingen undermodulmappning i .gitmodules för sökvägen \"%s\"" -#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568 +#: builtin/submodule--helper.c:558 builtin/submodule--helper.c:561 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "undermodulen \"%s\" kan inte lägga till alternativ: %s" -#: builtin/submodule--helper.c:604 +#: builtin/submodule--helper.c:597 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Värdet \"%s\" i submodule.alternateErrorStrategy förstås inte" -#: builtin/submodule--helper.c:611 +#: builtin/submodule--helper.c:604 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Värdet \"%s\" i submodule.alternateLocation förstås inte" -#: builtin/submodule--helper.c:633 +#: builtin/submodule--helper.c:626 msgid "where the new submodule will be cloned to" msgstr "var den nya undermodulen skall klonas till" -#: builtin/submodule--helper.c:636 +#: builtin/submodule--helper.c:629 msgid "name of the new submodule" msgstr "namn på den nya undermodulen" -#: builtin/submodule--helper.c:639 +#: builtin/submodule--helper.c:632 msgid "url where to clone the submodule from" msgstr "URL att klona undermodulen från" -#: builtin/submodule--helper.c:645 +#: builtin/submodule--helper.c:638 msgid "depth for shallow clones" msgstr "djup för grunda kloner" -#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993 +#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:1012 msgid "force cloning progress" msgstr "tvinga kloningsförlopp" -#: builtin/submodule--helper.c:653 +#: builtin/submodule--helper.c:646 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -13116,82 +13372,82 @@ msgstr "" "git submodule--helper clone [--prefix=<sökväg>] [--quiet] [--reference " "<arkvi>] [--name <namn>] [--depth <djup>] --url <url> --path <sökväg>" -#: builtin/submodule--helper.c:684 +#: builtin/submodule--helper.c:677 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "misslyckades klona \"%s\" till undermodulsökvägen ”%s”" -#: builtin/submodule--helper.c:699 +#: builtin/submodule--helper.c:692 #, c-format msgid "could not get submodule directory for '%s'" msgstr "kunde inte få tag i undermodulkatalog för \"%s\"" -#: builtin/submodule--helper.c:764 +#: builtin/submodule--helper.c:757 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Undermodulsökvägen \"%s\" har inte initierats" -#: builtin/submodule--helper.c:768 +#: builtin/submodule--helper.c:761 msgid "Maybe you want to use 'update --init'?" msgstr "Kanske menade du att använda \"update --init\"?" -#: builtin/submodule--helper.c:793 +#: builtin/submodule--helper.c:790 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Hoppar över ej sammanslagen undermodul %s" -#: builtin/submodule--helper.c:814 +#: builtin/submodule--helper.c:819 #, c-format msgid "Skipping submodule '%s'" msgstr "Hoppar över undermodulen \"%s\"" -#: builtin/submodule--helper.c:942 +#: builtin/submodule--helper.c:952 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Misslyckades klona \"%s\". Nytt försök planlagt" -#: builtin/submodule--helper.c:953 +#: builtin/submodule--helper.c:963 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Misslyckades klona \"%s\" för andra gången, avbryter" -#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162 +#: builtin/submodule--helper.c:993 builtin/submodule--helper.c:1213 msgid "path into the working tree" msgstr "sökväg inuti arbetskatalogen" -#: builtin/submodule--helper.c:977 +#: builtin/submodule--helper.c:996 msgid "path into the working tree, across nested submodule boundaries" msgstr "sökväg inuti arbetskatalogen, genom nästlade undermodulgränser" -#: builtin/submodule--helper.c:981 +#: builtin/submodule--helper.c:1000 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout eller none" -#: builtin/submodule--helper.c:985 +#: builtin/submodule--helper.c:1004 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "Skapa en grund klon trunkerad till angivet antal revisioner" -#: builtin/submodule--helper.c:988 +#: builtin/submodule--helper.c:1007 msgid "parallel jobs" msgstr "parallella jobb" -#: builtin/submodule--helper.c:990 +#: builtin/submodule--helper.c:1009 msgid "whether the initial clone should follow the shallow recommendation" msgstr "om den första klonen skall följa rekommendation för grund kloning" -#: builtin/submodule--helper.c:991 +#: builtin/submodule--helper.c:1010 msgid "don't print cloning progress" msgstr "skriv inte klonförlopp" -#: builtin/submodule--helper.c:998 +#: builtin/submodule--helper.c:1017 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update_clone [--prefix=<sökväg>] [<sökväg>...]" -#: builtin/submodule--helper.c:1008 +#: builtin/submodule--helper.c:1030 msgid "bad value for update parameter" msgstr "felaktigt värde för parametern update" -#: builtin/submodule--helper.c:1079 +#: builtin/submodule--helper.c:1098 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -13200,20 +13456,20 @@ msgstr "" "Undermodulens (%s) gren inställd på att ärva gren från huvudprojektet, men " "huvudprojektet är inte på någon gren" -#: builtin/submodule--helper.c:1163 +#: builtin/submodule--helper.c:1214 msgid "recurse into submodules" msgstr "rekursera ner i undermoduler" -#: builtin/submodule--helper.c:1169 +#: builtin/submodule--helper.c:1220 msgid "git submodule--helper embed-git-dir [<path>...]" msgstr "git submodule--helper embed-git-dir [<sökväg>...]" -#: builtin/submodule--helper.c:1232 +#: builtin/submodule--helper.c:1278 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s stöder inte --super-prefix" -#: builtin/submodule--helper.c:1238 +#: builtin/submodule--helper.c:1284 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper" @@ -13226,24 +13482,24 @@ msgstr "git symbolic-ref [<flaggor>] <namn> [<ref>]" msgid "git symbolic-ref -d [-q] <name>" msgstr "git symbolic-ref -d [-q] <namn>" -#: builtin/symbolic-ref.c:41 +#: builtin/symbolic-ref.c:40 msgid "suppress error message for non-symbolic (detached) refs" msgstr "" "undertryck felmeddelanden för icke-symboliska (frånkopplade) referenser" -#: builtin/symbolic-ref.c:42 +#: builtin/symbolic-ref.c:41 msgid "delete symbolic ref" msgstr "ta bort symbolisk referens" -#: builtin/symbolic-ref.c:43 +#: builtin/symbolic-ref.c:42 msgid "shorten ref output" msgstr "förkorta ref-utdata" -#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason" msgstr "skäl" -#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason of the update" msgstr "skäl till uppdateringen" @@ -13273,17 +13529,17 @@ msgstr "" msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<format>] <taggnamn>..." -#: builtin/tag.c:84 +#: builtin/tag.c:86 #, c-format msgid "tag '%s' not found." msgstr "taggen \"%s\" hittades inte." -#: builtin/tag.c:100 +#: builtin/tag.c:102 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Tog bort tagg \"%s\" (var %s)\n" -#: builtin/tag.c:129 +#: builtin/tag.c:131 #, c-format msgid "" "\n" @@ -13296,7 +13552,7 @@ msgstr "" " %s\n" "Rader som inleds med \"%c\" ignoreras.\n" -#: builtin/tag.c:133 +#: builtin/tag.c:135 #, c-format msgid "" "\n" @@ -13311,142 +13567,142 @@ msgstr "" "Rader som inleds med \"%c\" kommer behållas; du kan själv ta bort dem om\n" "du vill.\n" -#: builtin/tag.c:211 +#: builtin/tag.c:189 msgid "unable to sign the tag" msgstr "kunde inte signera taggen" -#: builtin/tag.c:213 +#: builtin/tag.c:191 msgid "unable to write tag file" msgstr "kunde inte skriva tagg-filen" -#: builtin/tag.c:237 +#: builtin/tag.c:215 msgid "bad object type." msgstr "felaktig objekttyp." -#: builtin/tag.c:283 +#: builtin/tag.c:261 msgid "no tag message?" msgstr "inget taggmeddelande?" -#: builtin/tag.c:290 +#: builtin/tag.c:268 #, c-format msgid "The tag message has been left in %s\n" msgstr "Taggmeddelandet har lämnats i %s\n" -#: builtin/tag.c:398 +#: builtin/tag.c:376 msgid "list tag names" msgstr "lista taggnamn" -#: builtin/tag.c:400 +#: builtin/tag.c:378 msgid "print <n> lines of each tag message" msgstr "visa <n> rader från varje taggmeddelande" -#: builtin/tag.c:402 +#: builtin/tag.c:380 msgid "delete tags" msgstr "ta bort taggar" -#: builtin/tag.c:403 +#: builtin/tag.c:381 msgid "verify tags" msgstr "verifiera taggar" -#: builtin/tag.c:405 +#: builtin/tag.c:383 msgid "Tag creation options" msgstr "Alternativ för att skapa taggar" -#: builtin/tag.c:407 +#: builtin/tag.c:385 msgid "annotated tag, needs a message" msgstr "annoterad tagg, behöver meddelande" -#: builtin/tag.c:409 +#: builtin/tag.c:387 msgid "tag message" msgstr "taggmeddelande" -#: builtin/tag.c:411 +#: builtin/tag.c:389 msgid "annotated and GPG-signed tag" msgstr "annoterad och GPG-signerad tagg" -#: builtin/tag.c:415 +#: builtin/tag.c:393 msgid "use another key to sign the tag" msgstr "använd annan nyckel för att signera taggen" -#: builtin/tag.c:416 +#: builtin/tag.c:394 msgid "replace the tag if exists" msgstr "ersätt taggen om den finns" -#: builtin/tag.c:417 builtin/update-ref.c:369 +#: builtin/tag.c:395 builtin/update-ref.c:368 msgid "create a reflog" msgstr "skapa en reflog" -#: builtin/tag.c:419 +#: builtin/tag.c:397 msgid "Tag listing options" msgstr "Alternativ för listning av taggar" -#: builtin/tag.c:420 +#: builtin/tag.c:398 msgid "show tag list in columns" msgstr "lista taggar i spalter" -#: builtin/tag.c:421 builtin/tag.c:423 +#: builtin/tag.c:399 builtin/tag.c:401 msgid "print only tags that contain the commit" msgstr "visa endast taggar som innehåller incheckningen" -#: builtin/tag.c:422 builtin/tag.c:424 +#: builtin/tag.c:400 builtin/tag.c:402 msgid "print only tags that don't contain the commit" msgstr "visa endast taggar som inte innehåller incheckningen" -#: builtin/tag.c:425 +#: builtin/tag.c:403 msgid "print only tags that are merged" msgstr "visa endast taggar som slagits samman" -#: builtin/tag.c:426 +#: builtin/tag.c:404 msgid "print only tags that are not merged" msgstr "visa endast taggar som ej slagits samman" -#: builtin/tag.c:431 +#: builtin/tag.c:409 msgid "print only tags of the object" msgstr "visa endast taggar för objektet" -#: builtin/tag.c:470 +#: builtin/tag.c:453 msgid "--column and -n are incompatible" msgstr "--column och -n är inkompatibla" -#: builtin/tag.c:492 +#: builtin/tag.c:475 msgid "-n option is only allowed in list mode" msgstr "Flaggan -n är endast tillåten i listläge" -#: builtin/tag.c:494 +#: builtin/tag.c:477 msgid "--contains option is only allowed in list mode" msgstr "Flaggan --contains är endast tillåten i listläge" -#: builtin/tag.c:496 +#: builtin/tag.c:479 msgid "--no-contains option is only allowed in list mode" msgstr "Flaggan --no-contains är endast tillåten i listläge" -#: builtin/tag.c:498 +#: builtin/tag.c:481 msgid "--points-at option is only allowed in list mode" msgstr "Flaggan --points-at är endast tillåten i listläge" -#: builtin/tag.c:500 +#: builtin/tag.c:483 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "Flaggorna --merged och --no-merged är endast tillåtna i listläge" -#: builtin/tag.c:511 +#: builtin/tag.c:494 msgid "only one -F or -m option is allowed." msgstr "endast en av flaggorna -F eller -m tillåts." -#: builtin/tag.c:530 +#: builtin/tag.c:513 msgid "too many params" msgstr "för många parametrar" -#: builtin/tag.c:536 +#: builtin/tag.c:519 #, c-format msgid "'%s' is not a valid tag name." msgstr "\"%s\" är inte ett giltigt taggnamn." -#: builtin/tag.c:541 +#: builtin/tag.c:524 #, c-format msgid "tag '%s' already exists" msgstr "taggen \"%s\" finns redan" -#: builtin/tag.c:571 +#: builtin/tag.c:554 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Uppdaterad tagg \"%s\" (var %s)\n" @@ -13516,127 +13772,127 @@ msgstr "stat-informationen för en katalog ändras inte när en katalog tas bort msgid " OK" msgstr " OK" -#: builtin/update-index.c:569 +#: builtin/update-index.c:571 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<flaggor>] [--] [<fil>...]" -#: builtin/update-index.c:924 +#: builtin/update-index.c:926 msgid "continue refresh even when index needs update" msgstr "fortsätt uppdatera även när index inte är àjour" -#: builtin/update-index.c:927 +#: builtin/update-index.c:929 msgid "refresh: ignore submodules" msgstr "refresh: ignorera undermoduler" -#: builtin/update-index.c:930 +#: builtin/update-index.c:932 msgid "do not ignore new files" msgstr "ignorera inte nya filer" -#: builtin/update-index.c:932 +#: builtin/update-index.c:934 msgid "let files replace directories and vice-versa" msgstr "låt filer ersätta kataloger och omvänt" -#: builtin/update-index.c:934 +#: builtin/update-index.c:936 msgid "notice files missing from worktree" msgstr "lägg märke till filer som saknas i arbetskatalogen" -#: builtin/update-index.c:936 +#: builtin/update-index.c:938 msgid "refresh even if index contains unmerged entries" msgstr "uppdatera även om indexet innehåller ej sammanslagna poster" -#: builtin/update-index.c:939 +#: builtin/update-index.c:941 msgid "refresh stat information" msgstr "uppdatera statusinformation" -#: builtin/update-index.c:943 +#: builtin/update-index.c:945 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "som --refresh, men ignorera assume-unchanged-inställning" -#: builtin/update-index.c:947 +#: builtin/update-index.c:949 msgid "<mode>,<object>,<path>" msgstr "<läge>,<objekt>,<sökväg>" -#: builtin/update-index.c:948 +#: builtin/update-index.c:950 msgid "add the specified entry to the index" msgstr "lägg till angiven post i indexet" -#: builtin/update-index.c:957 +#: builtin/update-index.c:959 msgid "mark files as \"not changing\"" msgstr "markera filer som \"ändras inte\"" -#: builtin/update-index.c:960 +#: builtin/update-index.c:962 msgid "clear assumed-unchanged bit" msgstr "rensa \"assume-unchanged\"-biten" -#: builtin/update-index.c:963 +#: builtin/update-index.c:965 msgid "mark files as \"index-only\"" msgstr "markera filer som \"endast index\"" -#: builtin/update-index.c:966 +#: builtin/update-index.c:968 msgid "clear skip-worktree bit" msgstr "töm \"skip-worktree\"-biten" -#: builtin/update-index.c:969 +#: builtin/update-index.c:971 msgid "add to index only; do not add content to object database" msgstr "lägg endast till indexet; lägg inte till innehållet i objektdatabasen" -#: builtin/update-index.c:971 +#: builtin/update-index.c:973 msgid "remove named paths even if present in worktree" msgstr "ta bort namngivna sökvägar även om de finns i arbetskatalogen" -#: builtin/update-index.c:973 +#: builtin/update-index.c:975 msgid "with --stdin: input lines are terminated by null bytes" msgstr "med --stdin: indatarader termineras med null-byte" -#: builtin/update-index.c:975 +#: builtin/update-index.c:977 msgid "read list of paths to be updated from standard input" msgstr "läs lista över sökvägar att uppdatera från standard in" -#: builtin/update-index.c:979 +#: builtin/update-index.c:981 msgid "add entries from standard input to the index" msgstr "lägg poster från standard in till indexet" -#: builtin/update-index.c:983 +#: builtin/update-index.c:985 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "återfyll etapp 2 och 3 från angivna sökvägar" -#: builtin/update-index.c:987 +#: builtin/update-index.c:989 msgid "only update entries that differ from HEAD" msgstr "uppdatera endast poster som skiljer sig från HEAD" -#: builtin/update-index.c:991 +#: builtin/update-index.c:993 msgid "ignore files missing from worktree" msgstr "ignorera filer som saknas i arbetskatalogen" -#: builtin/update-index.c:994 +#: builtin/update-index.c:996 msgid "report actions to standard output" msgstr "rapportera åtgärder på standard ut" -#: builtin/update-index.c:996 +#: builtin/update-index.c:998 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(för porslin) glöm sparade olösta konflikter" -#: builtin/update-index.c:1000 +#: builtin/update-index.c:1002 msgid "write index in this format" msgstr "skriv index i detta format" -#: builtin/update-index.c:1002 +#: builtin/update-index.c:1004 msgid "enable or disable split index" msgstr "aktivera eller inaktivera delat index" -#: builtin/update-index.c:1004 +#: builtin/update-index.c:1006 msgid "enable/disable untracked cache" msgstr "aktivera/inaktivera ospårad cache" -#: builtin/update-index.c:1006 +#: builtin/update-index.c:1008 msgid "test if the filesystem supports untracked cache" msgstr "testa om filsystemet stöder ospårad cache" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1010 msgid "enable untracked cache without testing the filesystem" msgstr "aktivera ospårad cache utan att testa filsystemet" -#: builtin/update-index.c:1108 +#: builtin/update-index.c:1107 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -13644,7 +13900,7 @@ msgstr "" "core.splitIndex är satt till false; ta bort eller ändra det om du verkligen " "vill aktivera delat index" -#: builtin/update-index.c:1117 +#: builtin/update-index.c:1116 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -13652,7 +13908,7 @@ msgstr "" "core.splitIndex är satt till true; ta bort eller ändra det om du verkligen " "vill inaktivera delat index" -#: builtin/update-index.c:1128 +#: builtin/update-index.c:1127 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -13660,11 +13916,11 @@ msgstr "" "core.untrackedCache är satt till true; ta bort eller ändra det om du " "verkligen vill inaktivera den ospårade cachen" -#: builtin/update-index.c:1132 +#: builtin/update-index.c:1131 msgid "Untracked cache disabled" msgstr "Ospårad cache är inaktiverad" -#: builtin/update-index.c:1140 +#: builtin/update-index.c:1139 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -13672,7 +13928,7 @@ msgstr "" "core.untrackedCache är satt till false; ta bort eller ändra det om du " "verkligen vill aktivera den ospårade cachen" -#: builtin/update-index.c:1144 +#: builtin/update-index.c:1143 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Ospårad cache är aktiverad för \"%s\"" @@ -13689,19 +13945,19 @@ msgstr "git update-ref [<flaggor>] <refnamn> <gammaltvärde> [<nyttvärde>]" msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [<flaggor>] --stdin [-z]" -#: builtin/update-ref.c:364 +#: builtin/update-ref.c:363 msgid "delete the reference" msgstr "ta bort referensen" -#: builtin/update-ref.c:366 +#: builtin/update-ref.c:365 msgid "update <refname> not the one it points to" msgstr "uppdatera <refnamn> inte det den pekar på" -#: builtin/update-ref.c:367 +#: builtin/update-ref.c:366 msgid "stdin has NUL-terminated arguments" msgstr "standard in har NUL-terminerade argument" -#: builtin/update-ref.c:368 +#: builtin/update-ref.c:367 msgid "read updates from stdin" msgstr "läs uppdateringar från standard in" @@ -13765,103 +14021,112 @@ msgstr "git worktree prune [<flaggor>]" msgid "git worktree unlock <path>" msgstr "git worktree unlock <sökväg>" -#: builtin/worktree.c:44 +#: builtin/worktree.c:46 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Tar bort worktrees/%s: inte en giltig katalog" -#: builtin/worktree.c:50 +#: builtin/worktree.c:52 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Tar bort worktrees/%s: gitdir-filen existerar inte" -#: builtin/worktree.c:55 +#: builtin/worktree.c:57 builtin/worktree.c:66 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "Tar bort worktrees/%s: kan inte läsa gitdir-filen (%s)" -#: builtin/worktree.c:66 +#: builtin/worktree.c:76 +#, c-format +msgid "" +"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " +"%<PRIuMAX>)" +msgstr "" +"Tar bort worktrees/%s: kort läsning (förväntade %<PRIuMAX> byte, läste " +"%<PRIuMAX>)" + +#: builtin/worktree.c:84 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Tar bort worktrees/%s: felaktig gitdir-fil" -#: builtin/worktree.c:82 +#: builtin/worktree.c:100 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "Tar bort worktrees/%s: gitdir-filen pekar på en ickeexisterande plats" -#: builtin/worktree.c:129 +#: builtin/worktree.c:147 msgid "report pruned working trees" msgstr "rapportera borttagna arbetskataloger" -#: builtin/worktree.c:131 +#: builtin/worktree.c:149 msgid "expire working trees older than <time>" msgstr "låt tid gå ut för arbetskataloger äldre än <tid>" -#: builtin/worktree.c:205 +#: builtin/worktree.c:223 #, c-format msgid "'%s' already exists" msgstr "\"%s\" finns redan" -#: builtin/worktree.c:236 +#: builtin/worktree.c:254 #, c-format msgid "could not create directory of '%s'" msgstr "kunde inte skapa katalogen \"%s\"" -#: builtin/worktree.c:275 +#: builtin/worktree.c:293 #, c-format msgid "Preparing %s (identifier %s)" msgstr "Förbereder %s (identifieraren %s)" -#: builtin/worktree.c:327 +#: builtin/worktree.c:345 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "checka ut <gren> även om den redan är utcheckad i en annan arbetskatalog" -#: builtin/worktree.c:329 +#: builtin/worktree.c:347 msgid "create a new branch" msgstr "skapa en ny gren" -#: builtin/worktree.c:331 +#: builtin/worktree.c:349 msgid "create or reset a branch" msgstr "skapa eller återställ en gren" -#: builtin/worktree.c:333 +#: builtin/worktree.c:351 msgid "populate the new working tree" msgstr "befolka den nya arbetskatalogen" -#: builtin/worktree.c:334 +#: builtin/worktree.c:352 msgid "keep the new working tree locked" msgstr "låt arbetskatalogen förbli låst" -#: builtin/worktree.c:342 +#: builtin/worktree.c:360 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B och --detach är ömsesidigt uteslutande" -#: builtin/worktree.c:479 +#: builtin/worktree.c:499 msgid "reason for locking" msgstr "orsak till lås" -#: builtin/worktree.c:491 builtin/worktree.c:524 +#: builtin/worktree.c:511 builtin/worktree.c:544 #, c-format msgid "'%s' is not a working tree" msgstr "\"%s\" är inte en arbetskatalog" -#: builtin/worktree.c:493 builtin/worktree.c:526 +#: builtin/worktree.c:513 builtin/worktree.c:546 msgid "The main working tree cannot be locked or unlocked" msgstr "Huvudarbetskatalogen kan inte låsas eller låsas upp" -#: builtin/worktree.c:498 +#: builtin/worktree.c:518 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "\"%s\" är redan låst, orsak: %s" -#: builtin/worktree.c:500 +#: builtin/worktree.c:520 #, c-format msgid "'%s' is already locked" msgstr "\"%s\" är redan låst" -#: builtin/worktree.c:528 +#: builtin/worktree.c:548 #, c-format msgid "'%s' is not locked" msgstr "\"%s\" är inte låst" @@ -13886,23 +14151,23 @@ msgstr "endast användbart vid felsökning" msgid "git upload-pack [<options>] <dir>" msgstr "git upload-pack [<flaggor>] <katalog>" -#: upload-pack.c:1041 +#: upload-pack.c:1040 msgid "quit after a single request/response exchange" msgstr "avsluta omedelbart efter första anrop/svar-utväxling" -#: upload-pack.c:1043 +#: upload-pack.c:1042 msgid "exit immediately after initial ref advertisement" msgstr "avsluta omedelbart efter inledande kungörelse av referenser" -#: upload-pack.c:1045 +#: upload-pack.c:1044 msgid "do not try <directory>/.git/ if <directory> is no Git directory" msgstr "testa inte <katalog>/.git/ om <katalog> inte är en Git-katalog" -#: upload-pack.c:1047 +#: upload-pack.c:1046 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "avbryt överföringen efter <n> sekunders inaktivitet" -#: credential-cache--daemon.c:224 +#: credential-cache--daemon.c:222 #, c-format msgid "" "The permissions on your socket directory are too loose; other\n" @@ -13915,7 +14180,7 @@ msgstr "" "\n" "\tchmod 0700 %s" -#: credential-cache--daemon.c:272 +#: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "skriv felsökningsmeddelanden på standard fel" @@ -13929,20 +14194,20 @@ msgstr "" "några konceptvägledningar. Se \"git help <kommando>\" eller \"git help\n" "<koncept>\" för att läsa mer om specifika underkommandon och koncept." -#: http.c:337 +#: http.c:338 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "http.postbuffer har negativt värde; använder förvalet %d" -#: http.c:358 +#: http.c:359 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "Delegerad styrning stöds inte av cURL < 7.22.0" -#: http.c:367 +#: http.c:368 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "Fastnålning av öppen nyckel stöds inte av cURL < 7.44.0" -#: http.c:1764 +#: http.c:1768 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -14313,7 +14578,7 @@ msgstr "Kunde inte hitta gemensam incheckning med $pretty_name" #: git-merge-octopus.sh:77 #, sh-format -msgid "Already up-to-date with $pretty_name" +msgid "Already up to date with $pretty_name" msgstr "Redan à jour med $pretty_name" #: git-merge-octopus.sh:89 @@ -14332,50 +14597,53 @@ msgstr "Enkel sammanslagning misslyckades, försöker automatisk sammanslagning. #: git-rebase.sh:58 msgid "" -"When you have resolved this problem, run \"git rebase --continue\".\n" -"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" -"To check out the original branch and stop rebasing, run \"git rebase --abort" -"\"." +"Resolve all conflicts manually, mark them as resolved with\n" +"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" +"You can instead skip this commit: run \"git rebase --skip\".\n" +"To abort and get back to the state before \"git rebase\", run \"git rebase --" +"abort\"." msgstr "" -"När du har löst problemet kör du \"git rebase --continue\".\n" -"Om du vill hoppa över patchen kör du istället \"git rebase --skip\".\n" -"För att återställa originalgrenen och avbryta kör du \"git rebase --abort\"." +"Lös alla konflikter manuellt, märk dem som lösta med\n" +"\"git add/rm <filer_i_konflikt>\", kör sedan \"git rebase --continue\".\n" +"Du kan hoppa över incheckningen istället: kör \"git rebase --skip\".\n" +"För att avbryta och återgå till där du var före ombaseringen, kör \"git " +"rebase --abort\"." -#: git-rebase.sh:158 git-rebase.sh:397 +#: git-rebase.sh:160 git-rebase.sh:402 #, sh-format msgid "Could not move back to $head_name" msgstr "Kunde inte flytta tillbaka till $head_name" -#: git-rebase.sh:169 +#: git-rebase.sh:171 msgid "Applied autostash." msgstr "Tillämpade autostash." -#: git-rebase.sh:172 +#: git-rebase.sh:174 #, sh-format msgid "Cannot store $stash_sha1" msgstr "Kan inte spara $stash_sha1" -#: git-rebase.sh:212 +#: git-rebase.sh:214 msgid "The pre-rebase hook refused to rebase." msgstr "Kroken pre-rebase vägrade ombaseringen." -#: git-rebase.sh:217 +#: git-rebase.sh:219 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "Det verkar som en git-am körs. Kan inte ombasera." -#: git-rebase.sh:358 +#: git-rebase.sh:363 msgid "No rebase in progress?" msgstr "Ingen ombasering pågår?" -#: git-rebase.sh:369 +#: git-rebase.sh:374 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "Åtgärden --edit-todo kan endast användas under interaktiv ombasering." -#: git-rebase.sh:376 +#: git-rebase.sh:381 msgid "Cannot read HEAD" msgstr "Kan inte läsa HEAD" -#: git-rebase.sh:379 +#: git-rebase.sh:384 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -14383,7 +14651,7 @@ msgstr "" "Du måste redigera alla sammanslagningskonflikter och\n" "därefter markera dem som lösta med git add" -#: git-rebase.sh:419 +#: git-rebase.sh:424 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -14404,102 +14672,102 @@ msgstr "" "och kör programmet igen. Jag avslutar ifall du fortfarande har\n" "något av värde där." -#: git-rebase.sh:470 +#: git-rebase.sh:480 #, sh-format msgid "invalid upstream $upstream_name" msgstr "ogiltig uppström $upstream_name" -#: git-rebase.sh:494 +#: git-rebase.sh:504 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: mer än en sammanslagningsbas finns" -#: git-rebase.sh:497 git-rebase.sh:501 +#: git-rebase.sh:507 git-rebase.sh:511 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: ingen sammanslagningsbas finns" -#: git-rebase.sh:506 +#: git-rebase.sh:516 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "Peka på en giltig incheckning: $onto_name" -#: git-rebase.sh:529 +#: git-rebase.sh:539 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "ödesdigert: ingen sådan gren: $branch_name" -#: git-rebase.sh:562 +#: git-rebase.sh:572 msgid "Cannot autostash" msgstr "Kan inte utföra \"autostash\"" -#: git-rebase.sh:567 +#: git-rebase.sh:577 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Skapade autostash: $stash_abbrev" -#: git-rebase.sh:571 +#: git-rebase.sh:581 msgid "Please commit or stash them." msgstr "Checka in eller använd \"stash\" på dem." -#: git-rebase.sh:591 +#: git-rebase.sh:601 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "Aktuell gren $branch_name är à jour." -#: git-rebase.sh:595 +#: git-rebase.sh:605 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "Aktuell gren $branch_name är à jour, ombasering framtvingad." -#: git-rebase.sh:606 +#: git-rebase.sh:616 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Ändringar från $mb till $onto:" -#: git-rebase.sh:615 +#: git-rebase.sh:625 msgid "First, rewinding head to replay your work on top of it..." msgstr "" "Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det..." -#: git-rebase.sh:625 +#: git-rebase.sh:635 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "Snabbspolade $branch_name till $onto_name." -#: git-stash.sh:54 +#: git-stash.sh:61 msgid "git stash clear with parameters is unimplemented" msgstr "\"git stash clear\" med parametrar har inte implementerats" -#: git-stash.sh:95 +#: git-stash.sh:102 msgid "You do not have the initial commit yet" msgstr "Du har inte den första incheckningen ännu" -#: git-stash.sh:110 +#: git-stash.sh:117 msgid "Cannot save the current index state" msgstr "Kan inte spara aktuellt tillstånd för indexet" -#: git-stash.sh:125 +#: git-stash.sh:132 msgid "Cannot save the untracked files" msgstr "Kan inte spara ospårade filer" -#: git-stash.sh:145 git-stash.sh:158 +#: git-stash.sh:152 git-stash.sh:165 msgid "Cannot save the current worktree state" msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen" -#: git-stash.sh:162 +#: git-stash.sh:169 msgid "No changes selected" msgstr "Inga ändringar valda" -#: git-stash.sh:165 +#: git-stash.sh:172 msgid "Cannot remove temporary index (can't happen)" msgstr "Kan inte ta bort temporärt index (kan inte inträffa)" -#: git-stash.sh:178 +#: git-stash.sh:185 msgid "Cannot record working tree state" msgstr "Kan inte registrera tillstånd för arbetskatalog" -#: git-stash.sh:210 +#: git-stash.sh:217 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "Kan inte uppdatera $ref_stash med $w_commit" @@ -14514,7 +14782,7 @@ msgstr "Kan inte uppdatera $ref_stash med $w_commit" #. $ git stash save --blah-blah 2>&1 | head -n 2 #. error: unknown option for 'stash save': --blah-blah #. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:266 +#: git-stash.sh:273 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" @@ -14523,107 +14791,107 @@ msgstr "" "fel: felaktig flagga för \"stash save\": $option\n" " För att ange ett meddelande, använd git stash save -- \"$option\"" -#: git-stash.sh:281 +#: git-stash.sh:288 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "Kan inte använda --patch och --include-untracked eller --all samtidigt" -#: git-stash.sh:289 +#: git-stash.sh:296 msgid "No local changes to save" msgstr "Inga lokala ändringar att spara" -#: git-stash.sh:294 +#: git-stash.sh:301 msgid "Cannot initialize stash" msgstr "Kan inte initiera \"stash\"" -#: git-stash.sh:298 +#: git-stash.sh:305 msgid "Cannot save the current status" msgstr "Kan inte spara aktuell status" -#: git-stash.sh:299 +#: git-stash.sh:306 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "Sparade arbetskatalogen och indexstatus $stash_msg" -#: git-stash.sh:326 +#: git-stash.sh:334 msgid "Cannot remove worktree changes" msgstr "Kan inte ta bort ändringar i arbetskatalogen" -#: git-stash.sh:474 +#: git-stash.sh:482 #, sh-format msgid "unknown option: $opt" msgstr "okänd flagga: $opt" -#: git-stash.sh:487 +#: git-stash.sh:495 msgid "No stash entries found." msgstr "Inga \"stash”-poster hittades." -#: git-stash.sh:494 +#: git-stash.sh:502 #, sh-format msgid "Too many revisions specified: $REV" msgstr "För många revisioner angivna: $REV" -#: git-stash.sh:509 +#: git-stash.sh:517 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference är inte en giltig referens" -#: git-stash.sh:537 +#: git-stash.sh:545 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "\"$args\" är inte en \"stash\"-liknande incheckning" -#: git-stash.sh:548 +#: git-stash.sh:556 #, sh-format msgid "'$args' is not a stash reference" msgstr "\"$args\" är inte en \"stash\"-referens" -#: git-stash.sh:556 +#: git-stash.sh:564 msgid "unable to refresh index" msgstr "kan inte uppdatera indexet" -#: git-stash.sh:560 +#: git-stash.sh:568 msgid "Cannot apply a stash in the middle of a merge" msgstr "Kan inte tillämpa en \"stash\" mitt i en sammanslagning" -#: git-stash.sh:568 +#: git-stash.sh:576 msgid "Conflicts in index. Try without --index." msgstr "Konflikter i indexet. Testa utan --index." -#: git-stash.sh:570 +#: git-stash.sh:578 msgid "Could not save index tree" msgstr "Kunde inte spara indexträd" -#: git-stash.sh:579 +#: git-stash.sh:587 msgid "Could not restore untracked files from stash entry" msgstr "Kunde inte återställa ospårade filer från stash-post" -#: git-stash.sh:604 +#: git-stash.sh:612 msgid "Cannot unstage modified files" msgstr "Kan inte ta bort ändrade filer ur kön" -#: git-stash.sh:619 +#: git-stash.sh:627 msgid "Index was not unstashed." msgstr "Indexet har inte tagits ur kön." -#: git-stash.sh:633 +#: git-stash.sh:641 msgid "The stash entry is kept in case you need it again." msgstr "Stash-posten behålls ifall du behöver den igen." -#: git-stash.sh:642 +#: git-stash.sh:650 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Kastade ${REV} ($s)" -#: git-stash.sh:643 +#: git-stash.sh:651 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Kunde inte kasta \"stash\"-post" -#: git-stash.sh:651 +#: git-stash.sh:659 msgid "No branch name specified" msgstr "Inget grennamn angavs" -#: git-stash.sh:730 +#: git-stash.sh:738 msgid "(To restore them type \"git stash apply\")" msgstr "(För att återställa dem, skriv \"git stash apply\")" @@ -14770,17 +15038,17 @@ msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" "Undermodulen \"$name\" ($url) avregistrerad för sökvägen \"$displaypath\"" -#: git-submodule.sh:638 +#: git-submodule.sh:637 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "Kan inte hitta aktuell revision i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:648 +#: git-submodule.sh:647 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Kan inte hämta i undermodulsökväg \"$sm_path\"" -#: git-submodule.sh:653 +#: git-submodule.sh:652 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -14789,12 +15057,12 @@ msgstr "" "Kan inte hitta aktuell revision för ${remote_name}/${branch} i " "undermodulsökvägen \"$sm_path\"" -#: git-submodule.sh:671 +#: git-submodule.sh:670 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "Kan inte hämta i undermodulsökväg \"$displaypath\"" -#: git-submodule.sh:677 +#: git-submodule.sh:676 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -14803,84 +15071,84 @@ msgstr "" "Hämtade i undermodulssökvägen \"$displaypath\", men den innehöll inte $sha1. " "Direkt hämtning av incheckningen misslyckades." -#: git-submodule.sh:684 +#: git-submodule.sh:683 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:685 +#: git-submodule.sh:684 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\"" -#: git-submodule.sh:689 +#: git-submodule.sh:688 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "Kan inte ombasera \"$sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:690 +#: git-submodule.sh:689 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": ombaserade in i \"$sha1\"" -#: git-submodule.sh:695 +#: git-submodule.sh:694 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:696 +#: git-submodule.sh:695 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\"" -#: git-submodule.sh:701 +#: git-submodule.sh:700 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "Misslyckades köra \"$command $sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:702 +#: git-submodule.sh:701 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\"" -#: git-submodule.sh:733 +#: git-submodule.sh:732 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:841 +#: git-submodule.sh:840 msgid "The --cached option cannot be used with the --files option" msgstr "Flaggan --cached kan inte användas med flaggan --files" -#: git-submodule.sh:893 +#: git-submodule.sh:892 #, sh-format msgid "unexpected mode $mod_dst" msgstr "oväntat läge $mod_dst" -#: git-submodule.sh:913 +#: git-submodule.sh:912 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Varning: $display_name innehåller inte incheckningen $sha1_src" -#: git-submodule.sh:916 +#: git-submodule.sh:915 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Varning: $display_name innehåller inte incheckningen $sha1_dst" -#: git-submodule.sh:919 +#: git-submodule.sh:918 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" " Varning: $display_name innehåller inte incheckningarna $sha1_src och " "$sha1_dst" -#: git-submodule.sh:1065 +#: git-submodule.sh:1064 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\"" -#: git-submodule.sh:1137 +#: git-submodule.sh:1136 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Synkroniserar undermodul-url för \"$displaypath\"" @@ -14899,27 +15167,27 @@ msgstr "Ombaserar ($new_count/$total)" msgid "" "\n" "Commands:\n" -" p, pick = use commit\n" -" r, reword = use commit, but edit the commit message\n" -" e, edit = use commit, but stop for amending\n" -" s, squash = use commit, but meld into previous commit\n" -" f, fixup = like \"squash\", but discard this commit's log message\n" -" x, exec = run command (the rest of the line) using shell\n" -" d, drop = remove commit\n" +"p, pick = use commit\n" +"r, reword = use commit, but edit the commit message\n" +"e, edit = use commit, but stop for amending\n" +"s, squash = use commit, but meld into previous commit\n" +"f, fixup = like \"squash\", but discard this commit's log message\n" +"x, exec = run command (the rest of the line) using shell\n" +"d, drop = remove commit\n" "\n" "These lines can be re-ordered; they are executed from top to bottom.\n" msgstr "" "\n" "Kommandon:\n" -" p, pick = använd incheckning\n" -" r, reword = använd incheckning, men redigera incheckningsmeddelandet\n" -" e, edit = använd incheckning, men stanna för tillägg\n" -" s, squash = använd incheckning, men infoga i föregående incheckning\n" -" f, fixup = som \"squash\", men förkasta incheckningsmeddelandet\n" -" x, exec = kör kommando (resten av raden) i skalet\n" -" d, drop = ta bort incheckning\n" +"p, pick = använd incheckning\n" +"r, reword = använd incheckning, men redigera incheckningsmeddelandet\n" +"e, edit = använd incheckning, men stanna för tillägg\n" +"s, squash = använd incheckning, men infoga i föregående incheckning\n" +"f, fixup = som \"squash\", men förkasta incheckningsmeddelandet\n" +"x, exec = kör kommando (resten av raden) i skalet\n" +"d, drop = ta bort incheckning\n" "\n" -"Du kan byta ordning på raderna, de utförs uppifrån och ned.\n" +"Du kan byta ordning på raderna; de utförs uppifrån och ned.\n" #: git-rebase--interactive.sh:171 msgid "" @@ -14991,49 +15259,49 @@ msgstr "Kan inte flytta HEAD till $first_parent" msgid "Refusing to squash a merge: $sha1" msgstr "Vägrar utföra \"squash\" på en sammanslagning: $sha1" -#: git-rebase--interactive.sh:399 +#: git-rebase--interactive.sh:400 #, sh-format msgid "Error redoing merge $sha1" msgstr "Fel när sammanslagningen $sha1 skulle göras om" -#: git-rebase--interactive.sh:407 +#: git-rebase--interactive.sh:408 #, sh-format msgid "Could not pick $sha1" msgstr "Kunde inte välja $sha1" -#: git-rebase--interactive.sh:416 +#: git-rebase--interactive.sh:417 #, sh-format msgid "This is the commit message #${n}:" msgstr "Det här är incheckningsmeddelande ${n}:" -#: git-rebase--interactive.sh:421 +#: git-rebase--interactive.sh:422 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "Incheckningsmeddelande ${n} kommer hoppas över:" -#: git-rebase--interactive.sh:432 +#: git-rebase--interactive.sh:433 #, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." msgstr[0] "Det här är en kombination av $count incheckning." msgstr[1] "Det här är en kombination av $count incheckningar." -#: git-rebase--interactive.sh:441 +#: git-rebase--interactive.sh:442 #, sh-format msgid "Cannot write $fixup_msg" msgstr "Kan inte skriva $fixup_msg" -#: git-rebase--interactive.sh:444 +#: git-rebase--interactive.sh:445 msgid "This is a combination of 2 commits." msgstr "Det här är en kombination av 2 incheckningar." -#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528 -#: git-rebase--interactive.sh:531 +#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529 +#: git-rebase--interactive.sh:532 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "Kunde inte tillämpa $sha1... $rest" -#: git-rebase--interactive.sh:559 +#: git-rebase--interactive.sh:560 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -15047,31 +15315,31 @@ msgstr "" "pre-commit-kroken misslyckades. Om pre-commit-kroken misslyckades kanske\n" "du måste lösa problemet innan du kan skriva om incheckningsmeddelandet." -#: git-rebase--interactive.sh:574 +#: git-rebase--interactive.sh:575 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "Stoppade på $sha1_abbrev... $rest" -#: git-rebase--interactive.sh:589 +#: git-rebase--interactive.sh:590 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "Kan inte utföra \"$squash_style\" utan en föregående incheckning" -#: git-rebase--interactive.sh:631 +#: git-rebase--interactive.sh:632 #, sh-format msgid "Executing: $rest" msgstr "Kör: $rest" -#: git-rebase--interactive.sh:639 +#: git-rebase--interactive.sh:640 #, sh-format msgid "Execution failed: $rest" msgstr "Körning misslyckades: $rest" -#: git-rebase--interactive.sh:641 +#: git-rebase--interactive.sh:642 msgid "and made changes to the index and/or the working tree" msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen" -#: git-rebase--interactive.sh:643 +#: git-rebase--interactive.sh:644 msgid "" "You can fix the problem, and then run\n" "\n" @@ -15082,7 +15350,7 @@ msgstr "" "\tgit rebase --continue" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--interactive.sh:656 +#: git-rebase--interactive.sh:657 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -15097,96 +15365,29 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--interactive.sh:667 +#: git-rebase--interactive.sh:668 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "Okänt kommando: $command $sha1 $rest" -#: git-rebase--interactive.sh:668 +#: git-rebase--interactive.sh:669 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "Rätta det med \"git rebase --edit-todo\"." -#: git-rebase--interactive.sh:703 +#: git-rebase--interactive.sh:704 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "Lyckades ombasera och uppdatera $head_name." -#: git-rebase--interactive.sh:750 -msgid "Could not skip unnecessary pick commands" -msgstr "Kunde inte hoppa över onödiga \"pick\"-kommandon" - -#: git-rebase--interactive.sh:908 -#, sh-format -msgid "" -"Warning: the SHA-1 is missing or isn't a commit in the following line:\n" -" - $line" -msgstr "" -"Varning: SHA-1 saknas eller inte en incheckning på följande rad:\n" -" - $line" - -#: git-rebase--interactive.sh:941 -#, sh-format -msgid "" -"Warning: the command isn't recognized in the following line:\n" -" - $line" -msgstr "" -"Varning: kommandot kändes inte igen på följande rad:\n" -" - $line" - -#: git-rebase--interactive.sh:980 +#: git-rebase--interactive.sh:749 msgid "could not detach HEAD" msgstr "kunde inte koppla från HEAD" -#: git-rebase--interactive.sh:1018 -msgid "" -"Warning: some commits may have been dropped accidentally.\n" -"Dropped commits (newer to older):" -msgstr "" -"Varning: vissa incheckningar kan av misstag ha tappats.\n" -"Tappade incheckningar (nyaste först):" - -#: git-rebase--interactive.sh:1026 -msgid "" -"To avoid this message, use \"drop\" to explicitly remove a commit.\n" -"\n" -"Use 'git config rebase.missingCommitsCheck' to change the level of " -"warnings.\n" -"The possible behaviours are: ignore, warn, error." -msgstr "" -"För att undvika det här meddelandet kan du använda \"drop\" för att " -"explicit\n" -"kasta en incheckning.\n" -"\n" -"Använd \"git config rebase.missingCommitsCheck\" för att ändra " -"varningsnivån.\n" -"Möjliga bettenden är: \"ignore\" (ignorera), \"warn\" (varna), \"error" -"\" (fel)." - -#: git-rebase--interactive.sh:1037 -#, sh-format -msgid "" -"Unrecognized setting $check_level for option rebase.missingCommitsCheck. " -"Ignoring." -msgstr "" -"Okänt val $check_level för flaggan rebase.missingCommitsCheck. Ignorerar." - -#: git-rebase--interactive.sh:1054 -msgid "" -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" -"continue'." -msgstr "" -"Du kan rätta detta med \"git rebase --edit-todo\" följt av \"git rebase --" -"continue\"." - -#: git-rebase--interactive.sh:1055 -msgid "Or you can abort the rebase with 'git rebase --abort'." -msgstr "Eller så kan du avbryta ombaseringen med \"git rebase --abort\"." - -#: git-rebase--interactive.sh:1083 +#: git-rebase--interactive.sh:784 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "Kunde inte ta bort CHERRY_PICK_HEAD" -#: git-rebase--interactive.sh:1088 +#: git-rebase--interactive.sh:789 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -15217,11 +15418,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--interactive.sh:1105 +#: git-rebase--interactive.sh:806 msgid "Error trying to find the author identity to amend commit" msgstr "Fel vid försök att hitta författaridentitet för att utöka incheckning" -#: git-rebase--interactive.sh:1110 +#: git-rebase--interactive.sh:811 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -15229,11 +15430,11 @@ msgstr "" "Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n" "först och kör sedan \"git rebase --continute\" igen." -#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119 +#: git-rebase--interactive.sh:816 git-rebase--interactive.sh:820 msgid "Could not commit staged changes." msgstr "Kunde inte checka in köade ändringar." -#: git-rebase--interactive.sh:1147 +#: git-rebase--interactive.sh:848 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -15247,40 +15448,40 @@ msgstr "" " git rebase --continue\n" "\n" -#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313 +#: git-rebase--interactive.sh:856 git-rebase--interactive.sh:1015 msgid "Could not execute editor" msgstr "Kunde inte starta textredigerare" -#: git-rebase--interactive.sh:1168 +#: git-rebase--interactive.sh:869 #, sh-format msgid "Could not checkout $switch_to" msgstr "Kunde inte checka ut $switch_to" -#: git-rebase--interactive.sh:1173 +#: git-rebase--interactive.sh:874 msgid "No HEAD?" msgstr "Inget HEAD?" -#: git-rebase--interactive.sh:1174 +#: git-rebase--interactive.sh:875 #, sh-format msgid "Could not create temporary $state_dir" msgstr "Kunde inte skapa temporär $state_dir" -#: git-rebase--interactive.sh:1176 +#: git-rebase--interactive.sh:877 msgid "Could not mark as interactive" msgstr "Kunde inte markera som interaktiv" -#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191 +#: git-rebase--interactive.sh:887 git-rebase--interactive.sh:892 msgid "Could not init rewritten commits" msgstr "Kunde inte initiera omskrivna incheckningar" -#: git-rebase--interactive.sh:1291 +#: git-rebase--interactive.sh:993 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "Ombasera $shortrevisions på $shortonto ($todocount incheckning)" msgstr[1] "Ombasera $shortrevisions på $shortonto ($todocount incheckningar)" -#: git-rebase--interactive.sh:1296 +#: git-rebase--interactive.sh:998 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -15290,7 +15491,7 @@ msgstr "" "Ombaseringen kommer dock att avbrytas om du tar bort allting.\n" "\n" -#: git-rebase--interactive.sh:1303 +#: git-rebase--interactive.sh:1005 msgid "Note that empty commits are commented out" msgstr "Observera att tomma incheckningar är utkommenterade" @@ -15871,61 +16072,61 @@ msgstr "lokal zon skiljer sig från GMT med delar av minuter\n" msgid "local time offset greater than or equal to 24 hours\n" msgstr "lokal tidszonförskjutning större än eller lika med 24 timmar\n" -#: git-send-email.perl:208 git-send-email.perl:214 +#: git-send-email.perl:207 git-send-email.perl:213 msgid "the editor exited uncleanly, aborting everything" msgstr "textredigeringsprogrammet avslutades med fel, avbryter allting" -#: git-send-email.perl:291 +#: git-send-email.perl:290 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "" "\"%s\" innehåller en mellanliggande version av e-postbrevet du skrev.\n" -#: git-send-email.perl:296 +#: git-send-email.perl:295 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "\"%s.final\" innehåller det skrivna brevet.\n" -#: git-send-email.perl:314 +#: git-send-email.perl:313 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-alias är inkompatibelt med andra flaggor\n" -#: git-send-email.perl:379 git-send-email.perl:634 +#: git-send-email.perl:378 git-send-email.perl:629 msgid "Cannot run git format-patch from outside a repository\n" msgstr "Kan inte köra git format-patch från utanför arkivet\n" -#: git-send-email.perl:448 +#: git-send-email.perl:447 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "Okänt fält i --suppress-cc: \"%s\"\n" -#: git-send-email.perl:477 +#: git-send-email.perl:476 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "Okänd inställning i --confirm: \"%s\"\n" -#: git-send-email.perl:509 +#: git-send-email.perl:504 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "varning: sendmail-alias med citationstecken stöds inte. %s\n" -#: git-send-email.perl:511 +#: git-send-email.perl:506 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "varning: \":include:\" stöds inte: %s\n" -#: git-send-email.perl:513 +#: git-send-email.perl:508 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "varning: omdirigering til \"/fil\" eller \"|rör\" stöds inte: %s\n" -#: git-send-email.perl:518 +#: git-send-email.perl:513 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "varning: sendmail-raden känns inte igen: %s\n" -#: git-send-email.perl:600 +#: git-send-email.perl:595 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -15940,12 +16141,12 @@ msgstr "" " * Säga \"./%s\" om du menar en fil; eller\n" " * Ange flaggan --format-patch om du menar ett intervall.\n" -#: git-send-email.perl:621 +#: git-send-email.perl:616 #, perl-format msgid "Failed to opendir %s: %s" msgstr "Misslyckades utföra opendir %s: %s" -#: git-send-email.perl:645 +#: git-send-email.perl:640 #, perl-format msgid "" "fatal: %s: %s\n" @@ -15954,7 +16155,7 @@ msgstr "" "ödesdigert: %s: %s\n" "varning: inga patchar har sänts\n" -#: git-send-email.perl:656 +#: git-send-email.perl:651 msgid "" "\n" "No patch files specified!\n" @@ -15964,17 +16165,17 @@ msgstr "" "Inga patchfiler angavs!\n" "\n" -#: git-send-email.perl:669 +#: git-send-email.perl:664 #, perl-format msgid "No subject line in %s?" msgstr "Ingen ärenderad i %s?" -#: git-send-email.perl:679 +#: git-send-email.perl:674 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "Kunde inte öppna för skrivning %s: %s" -#: git-send-email.perl:689 +#: git-send-email.perl:684 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -15988,42 +16189,42 @@ msgstr "" "\n" "Rensa brevkroppen om du inte vill sända någon sammanfattning.\n" -#: git-send-email.perl:712 +#: git-send-email.perl:707 #, perl-format msgid "Failed to open %s.final: %s" msgstr "Misslyckades öppna %s.final: %s" -#: git-send-email.perl:715 +#: git-send-email.perl:710 #, perl-format msgid "Failed to open %s: %s" msgstr "Misslyckades öppna %s: %s" -#: git-send-email.perl:750 +#: git-send-email.perl:745 msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n" msgstr "Fälten To/Cc/Bcc tolkas inte ännu, de har ignorerats\n" -#: git-send-email.perl:759 +#: git-send-email.perl:754 msgid "Summary email is empty, skipping it\n" msgstr "Sammanfattande brev tomt, hoppar över\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:791 +#: git-send-email.perl:786 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "Är du säker på att du vill använda <%s> [Y=ja, N=nej]? " -#: git-send-email.perl:820 +#: git-send-email.perl:815 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" msgstr "" "Följande filer är åttabitars, men anger inte en Content-Transfer-Encoding.\n" -#: git-send-email.perl:825 +#: git-send-email.perl:820 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "Vilken åttabitarsteckenkodning skall jag ange [UTF-8]? " -#: git-send-email.perl:833 +#: git-send-email.perl:828 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -16036,21 +16237,21 @@ msgstr "" "har mallärendet \"*** SUBJECT HERE ***\". Använd --force om du verkligen " "vill sända.\n" -#: git-send-email.perl:852 +#: git-send-email.perl:847 msgid "To whom should the emails be sent (if anyone)?" msgstr "Till vem skall breven sändas (om någon)?" -#: git-send-email.perl:870 +#: git-send-email.perl:865 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "ödesdigert: aliaset \"%s\" expanderar till sig själv\n" -#: git-send-email.perl:882 +#: git-send-email.perl:877 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "" "Message-ID att använda som In-Reply-To för det första brevet (om något)? " -#: git-send-email.perl:932 git-send-email.perl:940 +#: git-send-email.perl:927 git-send-email.perl:935 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "fel: kunde inte få fram en giltig adress från: %s\n" @@ -16058,16 +16259,16 @@ msgstr "fel: kunde inte få fram en giltig adress från: %s\n" #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:944 +#: git-send-email.perl:939 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "Vad vill du göra med adressen? (q=avsluta, d=kasta, e=redigera): " -#: git-send-email.perl:1245 +#: git-send-email.perl:1260 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "CA-sökvägen \"%s\" finns inte" -#: git-send-email.perl:1320 +#: git-send-email.perl:1335 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -16094,124 +16295,124 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1335 +#: git-send-email.perl:1350 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): " msgstr "Sända brevet? (y=ja, n=nej, q=avsluta, a=alla): " -#: git-send-email.perl:1338 +#: git-send-email.perl:1353 msgid "Send this email reply required" msgstr "Svar krävs på frågan \"Sända brevet?\"" -#: git-send-email.perl:1364 +#: git-send-email.perl:1379 msgid "The required SMTP server is not properly defined." msgstr "Nödvändig SMTP-server har inte angivits korrekt." -#: git-send-email.perl:1411 +#: git-send-email.perl:1426 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Servern stöder inte SMARTTLS! %s" -#: git-send-email.perl:1416 git-send-email.perl:1420 +#: git-send-email.perl:1431 git-send-email.perl:1435 #, perl-format msgid "STARTTLS failed! %s" msgstr "STARTTLS misslyckades! %s" -#: git-send-email.perl:1430 +#: git-send-email.perl:1445 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" "Kan inte initiera SMTP korrekt. Kontrollera inställningarna och använd --" "smtp-debug." -#: git-send-email.perl:1448 +#: git-send-email.perl:1463 #, perl-format msgid "Failed to send %s\n" msgstr "Misslyckades sända %s\n" -#: git-send-email.perl:1451 +#: git-send-email.perl:1466 #, perl-format msgid "Dry-Sent %s\n" msgstr "Test-Sände %s\n" -#: git-send-email.perl:1451 +#: git-send-email.perl:1466 #, perl-format msgid "Sent %s\n" msgstr "Sände %s\n" -#: git-send-email.perl:1453 +#: git-send-email.perl:1468 msgid "Dry-OK. Log says:\n" msgstr "Test-OK. Loggen säger:\n" -#: git-send-email.perl:1453 +#: git-send-email.perl:1468 msgid "OK. Log says:\n" msgstr "OK. Loggen säger:\n" -#: git-send-email.perl:1465 +#: git-send-email.perl:1480 msgid "Result: " msgstr "Resultat: " -#: git-send-email.perl:1468 +#: git-send-email.perl:1483 msgid "Result: OK\n" msgstr "Resultat: OK\n" -#: git-send-email.perl:1481 +#: git-send-email.perl:1496 #, perl-format msgid "can't open file %s" msgstr "kan inte öppna filen %s" -#: git-send-email.perl:1528 git-send-email.perl:1548 +#: git-send-email.perl:1543 git-send-email.perl:1563 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Lägger till cc: %s från raden \"%s\"\n" -#: git-send-email.perl:1534 +#: git-send-email.perl:1549 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) Lägger till to: %s från raden \"%s\"\n" -#: git-send-email.perl:1582 +#: git-send-email.perl:1597 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(icke-mbox) Lägger till cc: %s från raden \"%s\"\n" -#: git-send-email.perl:1605 +#: git-send-email.perl:1622 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(kropp) Lägger till cc: %s från raden \"%s\"\n" -#: git-send-email.perl:1711 +#: git-send-email.perl:1728 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Kunde inte köra \"%s\"" -#: git-send-email.perl:1718 +#: git-send-email.perl:1735 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Lägger till %s: %s från: \"%s\"\n" -#: git-send-email.perl:1722 +#: git-send-email.perl:1739 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) misslyckades stänga röret till \"%s\"" -#: git-send-email.perl:1749 +#: git-send-email.perl:1766 msgid "cannot send message as 7bit" msgstr "kan inte sända brev som sjubitars" -#: git-send-email.perl:1757 +#: git-send-email.perl:1774 msgid "invalid transfer encoding" msgstr "ogiltig överföringskondning" -#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856 +#: git-send-email.perl:1812 git-send-email.perl:1863 git-send-email.perl:1873 #, perl-format msgid "unable to open %s: %s\n" msgstr "kunde inte öppna %s: %s\n" -#: git-send-email.perl:1798 +#: git-send-email.perl:1815 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "%s: patchen innehåller en rad längre än 998 tecken" -#: git-send-email.perl:1814 +#: git-send-email.perl:1831 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "" @@ -16219,59 +16420,63 @@ msgstr "" "säkerhetskopior.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1818 +#: git-send-email.perl:1835 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " +#~ msgid "%" +#~ msgid_plural "%" +#~ msgstr[0] "%" +#~ msgstr[1] "%" + +#~ msgid "%s, %" +#~ msgid_plural "%s, %" +#~ msgstr[0] "%s. %" +#~ msgstr[1] "%s. %" + +#~ msgid "submodule update strategy not supported for submodule '%s'" +#~ msgstr "" +#~ "uppdateringsstrategi för undermodul stöds inte för undermodulen \"%s\"" + +#~ msgid "change upstream info" +#~ msgstr "ändra uppströmsinformation" + +#~ msgid "" +#~ "\n" +#~ "If you wanted to make '%s' track '%s', do this:\n" +#~ "\n" +#~ msgstr "" +#~ "\n" +#~ "Om du vill göra så att \"%s\" spårar \"%s\" gör du så här:\n" +#~ "\n" + +#~ msgid "basename" +#~ msgstr "basnamn" + +#~ msgid "prepend parent project's basename to output" +#~ msgstr "lägg till föräldraprojektets basnamn i utdata" + +#~ msgid "" +#~ "Warning: the SHA-1 is missing or isn't a commit in the following line:\n" +#~ " - $line" +#~ msgstr "" +#~ "Varning: SHA-1 saknas eller inte en incheckning på följande rad:\n" +#~ " - $line" + +#~ msgid "" +#~ "Warning: the command isn't recognized in the following line:\n" +#~ " - $line" +#~ msgstr "" +#~ "Varning: kommandot kändes inte igen på följande rad:\n" +#~ " - $line" + +#~ msgid "Or you can abort the rebase with 'git rebase --abort'." +#~ msgstr "Eller så kan du avbryta ombaseringen med \"git rebase --abort\"." + #~ msgid "Could not open file '%s'" #~ msgstr "Kunde inte öppna filen \"%s\"" -#~ msgid "%lu second ago" -#~ msgid_plural "%lu seconds ago" -#~ msgstr[0] "%lu sekund sedan" -#~ msgstr[1] "%lu sekunder sedan" - -#~ msgid "%lu minute ago" -#~ msgid_plural "%lu minutes ago" -#~ msgstr[0] "%lu minut sedan" -#~ msgstr[1] "%lu minuter sedan" - -#~ msgid "%lu hour ago" -#~ msgid_plural "%lu hours ago" -#~ msgstr[0] "%lu timme sedan" -#~ msgstr[1] "%lu timmar sedan" - -#~ msgid "%lu day ago" -#~ msgid_plural "%lu days ago" -#~ msgstr[0] "%lu dag sedan" -#~ msgstr[1] "%lu dagar sedan" - -#~ msgid "%lu week ago" -#~ msgid_plural "%lu weeks ago" -#~ msgstr[0] "%lu vecka sedan" -#~ msgstr[1] "%lu veckor sedan" - -#~ msgid "%lu month ago" -#~ msgid_plural "%lu months ago" -#~ msgstr[0] "%lu månad sedan" -#~ msgstr[1] "%lu månader sedan" - -#~ msgid "%lu year" -#~ msgid_plural "%lu years" -#~ msgstr[0] "%lu år" -#~ msgstr[1] "%lu år" - -#~ msgid "%s, %lu month ago" -#~ msgid_plural "%s, %lu months ago" -#~ msgstr[0] "%s, %lu månad sedan" -#~ msgstr[1] "%s, %lu månader sedan" - -#~ msgid "%lu year ago" -#~ msgid_plural "%lu years ago" -#~ msgstr[0] "%lu år sedan" -#~ msgstr[1] "%lu år sedan" - #~ msgid "in %0.1f seconds automatically..." #~ msgstr "automatiskt om %0.1f sekunder..." @@ -16727,9 +16932,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "Forward-port local commits to the updated upstream head" #~ msgstr "Framåtanpassa lokala kommandon på uppdaterat uppströmshuvud" -#~ msgid "unable to parse format" -#~ msgstr "kan inte tolka formatet" - #~ msgid "improper format entered align:%s" #~ msgstr "felaktigt format angivet align:%s" @@ -16948,9 +17150,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "no files added" #~ msgstr "inga filer har lagts till" -#~ msgid "force creation (when already exists)" -#~ msgstr "tvinga skapande (när den redan finns)" - #~ msgid "slot" #~ msgstr "plats" @@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: git v2.14.0\n" +"Project-Id-Version: git v2.15.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2017-07-24 21:54+0800\n" -"PO-Revision-Date: 2017-07-25 07:06+0700\n" +"POT-Creation-Date: 2017-10-08 09:48+0800\n" +"PO-Revision-Date: 2017-10-09 15:10+0700\n" "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" "Language: vi\n" @@ -72,7 +72,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "Thoát ra bởi vì xung đột không thể giải quyết." -#: advice.c:117 builtin/merge.c:1184 +#: advice.c:117 builtin/merge.c:1211 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Bạn chưa kết thúc việc hòa trộn (MERGE_HEAD vẫn tồn tại)." @@ -123,85 +123,85 @@ msgstr "không nhận ra tùy chọn về khoảng trắng “%s”" msgid "unrecognized whitespace ignore option '%s'" msgstr "không nhận ra tùy chọn bỏ qua khoảng trắng “%s”" -#: apply.c:126 +#: apply.c:125 msgid "--reject and --3way cannot be used together." msgstr "--reject và --3way không thể dùng cùng nhau." -#: apply.c:128 +#: apply.c:127 msgid "--cached and --3way cannot be used together." msgstr "--cached và --3way không thể dùng cùng nhau." -#: apply.c:131 +#: apply.c:130 msgid "--3way outside a repository" msgstr "--3way ở ngoài một kho chứa" -#: apply.c:142 +#: apply.c:141 msgid "--index outside a repository" msgstr "--index ở ngoài một kho chứa" -#: apply.c:145 +#: apply.c:144 msgid "--cached outside a repository" msgstr "--cached ở ngoài một kho chứa" -#: apply.c:836 +#: apply.c:845 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "" "Không thể chuẩn bị biểu thức chính qui dấu vết thời gian (timestamp regexp) " "%s" -#: apply.c:845 +#: apply.c:854 #, c-format msgid "regexec returned %d for input: %s" msgstr "thi hành biểu thức chính quy trả về %d cho đầu vào: %s" -#: apply.c:929 +#: apply.c:928 #, c-format msgid "unable to find filename in patch at line %d" msgstr "không thể tìm thấy tên tập tin trong miếng vá tại dòng %d" -#: apply.c:967 +#: apply.c:966 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" "git apply: git-diff sai - cần /dev/null, nhưng lại nhận được %s trên dòng %d" -#: apply.c:973 +#: apply.c:972 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply: git-diff sai - tên tập tin mới không nhất quán trên dòng %d" -#: apply.c:974 +#: apply.c:973 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply: git-diff sai - tên tập tin cũ không nhất quán trên dòng %d" -#: apply.c:979 +#: apply.c:978 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: git-diff sai - cần “/dev/null” trên dòng %d" -#: apply.c:1008 +#: apply.c:1007 #, c-format msgid "invalid mode on line %d: %s" msgstr "chế độ không hợp lệ trên dòng %d: %s" -#: apply.c:1326 +#: apply.c:1325 #, c-format msgid "inconsistent header lines %d and %d" msgstr "phần đầu mâu thuẫn dòng %d và %d" -#: apply.c:1498 +#: apply.c:1497 #, c-format msgid "recount: unexpected line: %.*s" msgstr "chi tiết: dòng không cần: %.*s" -#: apply.c:1567 +#: apply.c:1566 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "miếng vá phân mảnh mà không có phần đầu tại dòng %d: %.*s" -#: apply.c:1587 +#: apply.c:1586 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -213,81 +213,81 @@ msgstr[0] "" "phần đầu diff cho git thiếu thông tin tên tập tin khi gỡ bỏ đi %d trong " "thành phần dẫn đầu tên của đường dẫn (dòng %d)" -#: apply.c:1600 +#: apply.c:1599 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "phần đầu diff cho git thiếu thông tin tên tập tin (dòng %d)" -#: apply.c:1770 +#: apply.c:1787 msgid "new file depends on old contents" msgstr "tập tin mới phụ thuộc vào nội dung cũ" -#: apply.c:1772 +#: apply.c:1789 msgid "deleted file still has contents" msgstr "tập tin đã xóa vẫn còn nội dung" -#: apply.c:1806 +#: apply.c:1823 #, c-format msgid "corrupt patch at line %d" msgstr "miếng vá hỏng tại dòng %d" -#: apply.c:1843 +#: apply.c:1860 #, c-format msgid "new file %s depends on old contents" msgstr "tập tin mới %s phụ thuộc vào nội dung cũ" -#: apply.c:1845 +#: apply.c:1862 #, c-format msgid "deleted file %s still has contents" msgstr "tập tin đã xóa %s vẫn còn nội dung" -#: apply.c:1848 +#: apply.c:1865 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** cảnh báo: tập tin %s trở nên trống rỗng nhưng không bị xóa" -#: apply.c:1995 +#: apply.c:2012 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "miếng vá định dạng nhị phân sai hỏng tại dòng %d: %.*s" -#: apply.c:2032 +#: apply.c:2049 #, c-format msgid "unrecognized binary patch at line %d" msgstr "miếng vá định dạng nhị phân không được nhận ra tại dòng %d" -#: apply.c:2193 +#: apply.c:2209 #, c-format msgid "patch with only garbage at line %d" msgstr "vá chỉ với “rác” tại dòng %d" -#: apply.c:2276 +#: apply.c:2295 #, c-format msgid "unable to read symlink %s" msgstr "không thể đọc liên kết mềm %s" -#: apply.c:2280 +#: apply.c:2299 #, c-format msgid "unable to open or read %s" msgstr "không thể mở hay đọc %s" -#: apply.c:2933 +#: apply.c:2958 #, c-format msgid "invalid start of line: '%c'" msgstr "sai khởi đầu dòng: “%c”" -#: apply.c:3052 +#: apply.c:3077 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "Khối dữ liệu #%d thành công tại %d (offset %d dòng)." -#: apply.c:3064 +#: apply.c:3089 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Nội dung bị giảm xuống còn (%ld/%ld) để áp dụng mảnh dữ liệu tại %d" -#: apply.c:3070 +#: apply.c:3095 #, c-format msgid "" "while searching for:\n" @@ -296,446 +296,447 @@ msgstr "" "trong khi đang tìm kiếm cho:\n" "%.*s" -#: apply.c:3092 +#: apply.c:3117 #, c-format msgid "missing binary patch data for '%s'" msgstr "thiếu dữ liệu của miếng vá định dạng nhị phân cho “%s”" -#: apply.c:3100 +#: apply.c:3125 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "không thể reverse-apply một miếng vá nhị phân mà không đảo ngược hunk thành " "“%s”" -#: apply.c:3146 +#: apply.c:3171 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" "không thể áp dụng miếng vá nhị phân thành “%s” mà không có dòng chỉ mục đầy " "đủ" -#: apply.c:3156 +#: apply.c:3181 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "" "miếng vá áp dụng cho “%s” (%s), cái mà không khớp với các nội dung hiện tại." -#: apply.c:3164 +#: apply.c:3189 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "miếng vá áp dụng cho một “%s” trống rỗng nhưng nó lại không trống" -#: apply.c:3182 +#: apply.c:3207 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "không thể đọc postimage %s cần thiết cho “%s”" -#: apply.c:3195 +#: apply.c:3220 #, c-format msgid "binary patch does not apply to '%s'" msgstr "miếng vá định dạng nhị phân không được áp dụng cho “%s”" -#: apply.c:3201 +#: apply.c:3226 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "vá nhị phân cho “%s” tạo ra kết quả không chính xác (mong chờ %s, lại nhận " "%s)" -#: apply.c:3222 +#: apply.c:3247 #, c-format msgid "patch failed: %s:%ld" msgstr "gặp lỗi khi vá: %s:%ld" -#: apply.c:3344 +#: apply.c:3369 #, c-format msgid "cannot checkout %s" msgstr "không thể lấy ra %s" -#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277 +#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277 #, c-format msgid "failed to read %s" msgstr "gặp lỗi khi đọc %s" -#: apply.c:3400 +#: apply.c:3426 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "đọc từ “%s” vượt ra ngoài liên kết mềm" -#: apply.c:3429 apply.c:3669 +#: apply.c:3455 apply.c:3695 #, c-format msgid "path %s has been renamed/deleted" msgstr "đường dẫn %s đã bị xóa hoặc đổi tên" -#: apply.c:3512 apply.c:3683 +#: apply.c:3538 apply.c:3709 #, c-format msgid "%s: does not exist in index" msgstr "%s: không tồn tại trong bảng mục lục" -#: apply.c:3521 apply.c:3691 +#: apply.c:3547 apply.c:3717 #, c-format msgid "%s: does not match index" msgstr "%s: không khớp trong mục lục" -#: apply.c:3556 +#: apply.c:3582 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "Kho thiếu đối tượng blob cần thiết để trở về trên “3-way merge”." -#: apply.c:3559 +#: apply.c:3585 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Đang trở lại hòa trộn “3-đường”…\n" -#: apply.c:3575 apply.c:3579 +#: apply.c:3601 apply.c:3605 #, c-format msgid "cannot read the current contents of '%s'" msgstr "không thể đọc nội dung hiện hành của “%s”" -#: apply.c:3591 +#: apply.c:3617 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Gặp lỗi khi quay trở lại để hòa trộn kiểu “three-way”…\n" -#: apply.c:3605 +#: apply.c:3631 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Đã áp dụng miếng vá %s với các xung đột.\n" -#: apply.c:3610 +#: apply.c:3636 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Đã áp dụng miếng vá %s một cách sạch sẽ.\n" -#: apply.c:3636 +#: apply.c:3662 msgid "removal patch leaves file contents" msgstr "loại bỏ miếng vá để lại nội dung tập tin" -#: apply.c:3708 +#: apply.c:3734 #, c-format msgid "%s: wrong type" msgstr "%s: sai kiểu" -#: apply.c:3710 +#: apply.c:3736 #, c-format msgid "%s has type %o, expected %o" msgstr "%s có kiểu %o, cần %o" -#: apply.c:3860 apply.c:3862 +#: apply.c:3886 apply.c:3888 #, c-format msgid "invalid path '%s'" msgstr "đường dẫn không hợp lệ “%s”" -#: apply.c:3918 +#: apply.c:3944 #, c-format msgid "%s: already exists in index" msgstr "%s: đã có từ trước trong bảng mục lục" -#: apply.c:3921 +#: apply.c:3947 #, c-format msgid "%s: already exists in working directory" msgstr "%s: đã sẵn có trong thư mục đang làm việc" -#: apply.c:3941 +#: apply.c:3967 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "chế độ mới (%o) của %s không khớp với chế độ cũ (%o)" -#: apply.c:3946 +#: apply.c:3972 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "chế độ mới (%o) của %s không khớp với chế độ cũ (%o) của %s" -#: apply.c:3966 +#: apply.c:3992 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "tập tin chịu tác động “%s” vượt ra ngoài liên kết mềm" -#: apply.c:3970 +#: apply.c:3996 #, c-format msgid "%s: patch does not apply" msgstr "%s: miếng vá không được áp dụng" -#: apply.c:3985 +#: apply.c:4011 #, c-format msgid "Checking patch %s..." msgstr "Đang kiểm tra miếng vá %s…" -#: apply.c:4076 +#: apply.c:4102 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "thông tin sha1 thiếu hoặc không dùng được cho mô-đun %s" -#: apply.c:4083 +#: apply.c:4109 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "thay đổi chế độ cho %s, cái mà không phải là HEAD hiện tại" -#: apply.c:4086 +#: apply.c:4112 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "thông tin sha1 còn thiếu hay không dùng được(%s)." -#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138 +#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry gặp lỗi đối với đường dẫn “%s”" -#: apply.c:4095 +#: apply.c:4121 #, c-format msgid "could not add %s to temporary index" msgstr "không thể thêm %s vào chỉ mục tạm thời" -#: apply.c:4105 +#: apply.c:4131 #, c-format msgid "could not write temporary index to %s" msgstr "không thểghi mục lục tạm vào %s" -#: apply.c:4243 +#: apply.c:4269 #, c-format msgid "unable to remove %s from index" msgstr "không thể gỡ bỏ %s từ mục lục" -#: apply.c:4278 +#: apply.c:4304 #, c-format msgid "corrupt patch for submodule %s" msgstr "miếng vá sai hỏng cho mô-đun-con %s" -#: apply.c:4284 +#: apply.c:4310 #, c-format msgid "unable to stat newly created file '%s'" msgstr "không thể lấy thống kề về tập tin %s mới hơn đã được tạo" -#: apply.c:4292 +#: apply.c:4318 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "không thể tạo “kho lưu đằng sau” cho tập tin được tạo mới hơn %s" -#: apply.c:4298 apply.c:4442 +#: apply.c:4324 apply.c:4468 #, c-format msgid "unable to add cache entry for %s" msgstr "không thể thêm mục nhớ đệm cho %s" -#: apply.c:4339 +#: apply.c:4365 #, c-format msgid "failed to write to '%s'" msgstr "gặp lỗi khi ghi vào “%s”" -#: apply.c:4343 +#: apply.c:4369 #, c-format msgid "closing file '%s'" msgstr "đang đóng tập tin “%s”" -#: apply.c:4413 +#: apply.c:4439 #, c-format msgid "unable to write file '%s' mode %o" msgstr "không thể ghi vào tập tin “%s” chế độ %o" -#: apply.c:4511 +#: apply.c:4537 #, c-format msgid "Applied patch %s cleanly." msgstr "Đã áp dụng miếng vá %s một cách sạch sẽ." -#: apply.c:4519 +#: apply.c:4545 msgid "internal error" msgstr "lỗi nội bộ" -#: apply.c:4522 +#: apply.c:4548 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Đang áp dụng miếng vá %%s với %d lần từ chối…" -#: apply.c:4533 +#: apply.c:4559 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "đang cắt ngắn tên tập tin .rej thành %.*s.rej" -#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988 +#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010 #, c-format msgid "cannot open %s" msgstr "không mở được “%s”" -#: apply.c:4555 +#: apply.c:4581 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Khối nhớ #%d được áp dụng gọn gàng." -#: apply.c:4559 +#: apply.c:4585 #, c-format msgid "Rejected hunk #%d." msgstr "đoạn dữ liệu #%d bị từ chối." -#: apply.c:4669 +#: apply.c:4695 #, c-format msgid "Skipped patch '%s'." msgstr "bỏ qua đường dẫn “%s”." -#: apply.c:4677 +#: apply.c:4703 msgid "unrecognized input" msgstr "không thừa nhận đầu vào" -#: apply.c:4696 +#: apply.c:4722 msgid "unable to read index file" msgstr "không thể đọc tập tin lưu bảng mục lục" -#: apply.c:4833 +#: apply.c:4859 #, c-format msgid "can't open patch '%s': %s" msgstr "không thể mở miếng vá “%s”: %s" -#: apply.c:4860 +#: apply.c:4886 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "đã chấm dứt %d lỗi khoảng trắng" -#: apply.c:4866 apply.c:4881 +#: apply.c:4892 apply.c:4907 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d dòng thêm khoảng trắng lỗi." -#: apply.c:4874 +#: apply.c:4900 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "%d dòng được áp dụng sau khi sửa các lỗi khoảng trắng." -#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391 +#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "Không thể ghi tập tin lưu bảng mục lục mới" -#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260 -#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187 -#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629 -#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973 -#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161 +#: apply.c:4947 apply.c:4950 builtin/am.c:2256 builtin/am.c:2259 +#: builtin/clone.c:116 builtin/fetch.c:115 builtin/pull.c:187 +#: builtin/submodule--helper.c:301 builtin/submodule--helper.c:622 +#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:992 +#: builtin/submodule--helper.c:995 builtin/submodule--helper.c:1212 #: git-add--interactive.perl:197 msgid "path" msgstr "đường-dẫn" -#: apply.c:4922 +#: apply.c:4948 msgid "don't apply changes matching the given path" msgstr "không áp dụng các thay đổi khớp với đường dẫn đã cho" -#: apply.c:4925 +#: apply.c:4951 msgid "apply changes matching the given path" msgstr "áp dụng các thay đổi khớp với đường dẫn đã cho" -#: apply.c:4927 builtin/am.c:2266 +#: apply.c:4953 builtin/am.c:2265 msgid "num" msgstr "số" -#: apply.c:4928 +#: apply.c:4954 msgid "remove <num> leading slashes from traditional diff paths" msgstr "gỡ bỏ <số> dấu gạch chéo dẫn đầu từ đường dẫn diff cổ điển" -#: apply.c:4931 +#: apply.c:4957 msgid "ignore additions made by the patch" msgstr "lờ đi phần bổ xung được tạo ra bởi miếng vá" -#: apply.c:4933 +#: apply.c:4959 msgid "instead of applying the patch, output diffstat for the input" msgstr "" "thay vì áp dụng một miếng vá, kết xuất kết quả từ lệnh diffstat cho đầu ra" -#: apply.c:4937 +#: apply.c:4963 msgid "show number of added and deleted lines in decimal notation" msgstr "" "hiển thị số lượng các dòng được thêm vào và xóa đi theo ký hiệu thập phân" -#: apply.c:4939 +#: apply.c:4965 msgid "instead of applying the patch, output a summary for the input" msgstr "thay vì áp dụng một miếng vá, kết xuất kết quả cho đầu vào" -#: apply.c:4941 +#: apply.c:4967 msgid "instead of applying the patch, see if the patch is applicable" msgstr "thay vì áp dụng miếng vá, hãy xem xem miếng vá có thích hợp không" -#: apply.c:4943 +#: apply.c:4969 msgid "make sure the patch is applicable to the current index" msgstr "hãy chắc chắn là miếng vá thích hợp với bảng mục lục hiện hành" -#: apply.c:4945 +#: apply.c:4971 msgid "apply a patch without touching the working tree" msgstr "áp dụng một miếng vá mà không động chạm đến cây làm việc" -#: apply.c:4947 +#: apply.c:4973 msgid "accept a patch that touches outside the working area" msgstr "chấp nhận một miếng vá mà không động chạm đến cây làm việc" -#: apply.c:4949 +#: apply.c:4975 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" "đồng thời áp dụng miếng vá (dùng với tùy chọn --stat/--summary/--check)" -#: apply.c:4951 +#: apply.c:4977 msgid "attempt three-way merge if a patch does not apply" msgstr "thử hòa trộn kiểu three-way nếu việc vá không thể thực hiện được" -#: apply.c:4953 +#: apply.c:4979 msgid "build a temporary index based on embedded index information" msgstr "" "xây dựng bảng mục lục tạm thời trên cơ sở thông tin bảng mục lục được nhúng" -#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515 +#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513 msgid "paths are separated with NUL character" msgstr "các đường dẫn bị ngăn cách bởi ký tự NULL" -#: apply.c:4958 +#: apply.c:4984 msgid "ensure at least <n> lines of context match" msgstr "đảm bảo rằng có ít nhất <n> dòng nội dung khớp" -#: apply.c:4959 builtin/am.c:2245 +#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95 +#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99 msgid "action" msgstr "hành động" -#: apply.c:4960 +#: apply.c:4986 msgid "detect new or modified lines that have whitespace errors" msgstr "tìm thấy một dòng mới hoặc bị sửa đổi mà nó có lỗi do khoảng trắng" -#: apply.c:4963 apply.c:4966 +#: apply.c:4989 apply.c:4992 msgid "ignore changes in whitespace when finding context" msgstr "lờ đi sự thay đổi do khoảng trắng gây ra khi quét nội dung" -#: apply.c:4969 +#: apply.c:4995 msgid "apply the patch in reverse" msgstr "áp dụng miếng vá theo chiều ngược" -#: apply.c:4971 +#: apply.c:4997 msgid "don't expect at least one line of context" msgstr "đừng hy vọng có ít nhất một dòng nội dung" -#: apply.c:4973 +#: apply.c:4999 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "để lại khối dữ liệu bị từ chối trong các tập tin *.rej tương ứng" -#: apply.c:4975 +#: apply.c:5001 msgid "allow overlapping hunks" msgstr "cho phép chồng khối nhớ" -#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21 -#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651 -#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125 +#: apply.c:5002 builtin/add.c:272 builtin/check-ignore.c:21 +#: builtin/commit.c:1347 builtin/count-objects.c:96 builtin/fsck.c:640 +#: builtin/log.c:1889 builtin/mv.c:123 builtin/read-tree.c:125 msgid "be verbose" msgstr "chi tiết" -#: apply.c:4978 +#: apply.c:5004 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" "đã dò tìm thấy dung sai không chính xác thiếu dòng mới tại cuối tập tin" -#: apply.c:4981 +#: apply.c:5007 msgid "do not trust the line counts in the hunk headers" msgstr "không tin số lượng dòng trong phần đầu khối dữ liệu" -#: apply.c:4983 builtin/am.c:2254 +#: apply.c:5009 builtin/am.c:2253 msgid "root" msgstr "gốc" -#: apply.c:4984 +#: apply.c:5010 msgid "prepend <root> to all filenames" msgstr "treo thêm <root> vào tất cả các tên tập tin" @@ -758,108 +759,108 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <kho> [--exec <lệnh>] --list" -#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300 +#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "đặc tả đường dẫn “%s” không khớp với bất kỳ tập tin nào" -#: archive.c:418 +#: archive.c:436 msgid "fmt" msgstr "định_dạng" -#: archive.c:418 +#: archive.c:436 msgid "archive format" msgstr "định dạng lưu trữ" -#: archive.c:419 builtin/log.c:1446 +#: archive.c:437 builtin/log.c:1452 msgid "prefix" msgstr "tiền_tố" -#: archive.c:420 +#: archive.c:438 msgid "prepend prefix to each pathname in the archive" msgstr "nối thêm tiền tố vào từng đường dẫn tập tin trong kho lưu" -#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61 -#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080 -#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552 -#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120 +#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61 +#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:859 +#: builtin/hash-object.c:102 builtin/ls-files.c:547 builtin/ls-files.c:550 +#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120 #: parse-options.h:153 msgid "file" msgstr "tập_tin" -#: archive.c:422 builtin/archive.c:89 +#: archive.c:440 builtin/archive.c:89 msgid "write the archive to this file" msgstr "ghi kho lưu vào tập tin này" -#: archive.c:424 +#: archive.c:442 msgid "read .gitattributes in working directory" msgstr "đọc .gitattributes trong thư mục làm việc" -#: archive.c:425 +#: archive.c:443 msgid "report archived files on stderr" msgstr "liệt kê các tập tin được lưu trữ vào stderr (đầu ra lỗi tiêu chuẩn)" -#: archive.c:426 +#: archive.c:444 msgid "store only" msgstr "chỉ lưu (không nén)" -#: archive.c:427 +#: archive.c:445 msgid "compress faster" msgstr "nén nhanh hơn" -#: archive.c:435 +#: archive.c:453 msgid "compress better" msgstr "nén nhỏ hơn" -#: archive.c:438 +#: archive.c:456 msgid "list supported archive formats" msgstr "liệt kê các kiểu nén được hỗ trợ" -#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108 -#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982 +#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109 +#: builtin/submodule--helper.c:634 builtin/submodule--helper.c:1001 msgid "repo" msgstr "kho" -#: archive.c:441 builtin/archive.c:91 +#: archive.c:459 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "nhận kho nén từ kho chứa <kho> trên máy chủ" -#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488 +#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489 msgid "command" msgstr "lệnh" -#: archive.c:443 builtin/archive.c:93 +#: archive.c:461 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "đường dẫn đến lệnh git-upload-pack trên máy chủ" -#: archive.c:450 +#: archive.c:468 msgid "Unexpected option --remote" msgstr "Gặp tùy chọn --remote không cần" -#: archive.c:452 +#: archive.c:470 msgid "Option --exec can only be used together with --remote" msgstr "Tùy chọn --exec chỉ có thể được dùng cùng với --remote" -#: archive.c:454 +#: archive.c:472 msgid "Unexpected option --output" msgstr "Gặp tùy chọn không cần --output" -#: archive.c:476 +#: archive.c:494 #, c-format msgid "Unknown archive format '%s'" msgstr "Không hiểu định dạng “%s”" -#: archive.c:483 +#: archive.c:501 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Tham số không được hỗ trợ cho định dạng “%s”: -%d" -#: attr.c:214 +#: attr.c:218 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s không phải tên thuộc tính hợp lệ" -#: attr.c:410 +#: attr.c:415 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -937,31 +938,31 @@ msgstr "" msgid "Bisecting: a merge base must be tested\n" msgstr "Bisecting: nền hòa trộn cần phải được kiểm tra\n" -#: bisect.c:849 +#: bisect.c:850 #, c-format msgid "a %s revision is needed" msgstr "cần một điểm xét duyệt %s" -#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256 +#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234 #, c-format msgid "could not create file '%s'" msgstr "không thể tạo tập tin “%s”" -#: bisect.c:917 +#: bisect.c:918 #, c-format msgid "could not read file '%s'" msgstr "không thể đọc tập tin “%s”" -#: bisect.c:947 +#: bisect.c:948 msgid "reading bisect refs failed" msgstr "việc đọc tham chiếu bisect gặp lỗi" -#: bisect.c:967 +#: bisect.c:968 #, c-format msgid "%s was both %s and %s\n" msgstr "%s là cả %s và %s\n" -#: bisect.c:975 +#: bisect.c:976 #, c-format msgid "" "No testable commit found.\n" @@ -970,7 +971,7 @@ msgstr "" "không tìm thấy lần chuyển giao kiểm tra được nào.\n" "Có lẽ bạn bắt đầu với các tham số đường dẫn sai?\n" -#: bisect.c:994 +#: bisect.c:995 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -979,7 +980,7 @@ msgstr[0] "(ước chừng %d bước)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1000 +#: bisect.c:1001 #, 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" @@ -998,10 +999,10 @@ msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse và --first-parent cùng nhau cần chỉ định lần chuyển giao cuối" -#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166 -#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907 -#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360 -#: builtin/shortlog.c:177 +#: blame.c:1797 bundle.c:169 ref-filter.c:1932 sequencer.c:1168 +#: sequencer.c:2351 builtin/commit.c:1065 builtin/log.c:357 builtin/log.c:911 +#: builtin/log.c:1361 builtin/log.c:1690 builtin/log.c:1938 builtin/merge.c:369 +#: builtin/shortlog.c:191 msgid "revision walk setup failed" msgstr "cài đặt việc di chuyển qua các điểm xét duyệt gặp lỗi" @@ -1042,44 +1043,46 @@ msgstr "Chưa cài đặt nhánh %s như là thượng nguồn của nó." #: branch.c:93 #, c-format -msgid "Branch %s set up to track remote branch %s from %s by rebasing." -msgstr "Nhánh %s cài đặt để theo dõi nhánh máy chủ %s từ %s bằng cách rebase." +msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." +msgstr "" +"Nhánh “%s” cài đặt để theo dõi nhánh máy chủ “%s” từ “%s” bằng cách rebase." #: branch.c:94 #, c-format -msgid "Branch %s set up to track remote branch %s from %s." -msgstr "Nhánh %s cài đặt để theo dõi nhánh máy chủ %s từ %s." +msgid "Branch '%s' set up to track remote branch '%s' from '%s'." +msgstr "Nhánh “%s” cài đặt để theo dõi nhánh máy chủ “%s” từ “%s”." #: branch.c:98 #, c-format -msgid "Branch %s set up to track local branch %s by rebasing." -msgstr "Nhánh %s cài đặt để theo dõi nhánh nội bộ %s bằng cách rebase." +msgid "Branch '%s' set up to track local branch '%s' by rebasing." +msgstr "Nhánh “%s” cài đặt để theo dõi nhánh nội bộ “%s” bằng cách rebase." #: branch.c:99 #, c-format -msgid "Branch %s set up to track local branch %s." -msgstr "Nhánh %s cài đặt để theo dõi nhánh nội bộ %s." +msgid "Branch '%s' set up to track local branch '%s'." +msgstr "Nhánh “%s” cài đặt để theo dõi nhánh nội bộ “%s”." #: branch.c:104 #, c-format -msgid "Branch %s set up to track remote ref %s by rebasing." -msgstr "Nhánh %s cài đặt để theo dõi nhánh máy chủ %s bằng cách rebase." +msgid "Branch '%s' set up to track remote ref '%s' by rebasing." +msgstr "" +"Nhánh “%s” cài đặt để theo dõi tham chiếu máy chủ “%s” bằng cách rebase." #: branch.c:105 #, c-format -msgid "Branch %s set up to track remote ref %s." -msgstr "Nhánh %s cài đặt để theo dõi tham chiếu máy chủ %s." +msgid "Branch '%s' set up to track remote ref '%s'." +msgstr "Nhánh “%s” cài đặt để theo dõi tham chiếu máy chủ “%s”." #: branch.c:109 #, c-format -msgid "Branch %s set up to track local ref %s by rebasing." +msgid "Branch '%s' set up to track local ref '%s' by rebasing." msgstr "" -"Nhánh %s cài đặt để theo dõi vết tham chiếu nội bộ %s bằng cách rebase." +"Nhánh “%s” cài đặt để theo dõi tham chiếu nội bộ “%s” bằng cách rebase." #: branch.c:110 #, c-format -msgid "Branch %s set up to track local ref %s." -msgstr "Nhánh %s cài đặt để theo dõi tham chiếu nội bộ %s." +msgid "Branch '%s' set up to track local ref '%s'." +msgstr "Nhánh “%s” cài đặt để theo dõi tham chiếu nội bộ “%s”." #: branch.c:119 msgid "Unable to write upstream branch configuration" @@ -1100,23 +1103,23 @@ msgstr "“%s” không phải là một tên nhánh hợp lệ." msgid "A branch named '%s' already exists." msgstr "Đã có nhánh mang tên “%s”." -#: branch.c:198 +#: branch.c:197 msgid "Cannot force update the current branch." msgstr "Không thể ép buộc cập nhật nhánh hiện hành." -#: branch.c:218 +#: branch.c:217 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "" "Không thể cài đặt thông tin theo dõi; điểm bắt đầu “%s” không phải là một " "nhánh." -#: branch.c:220 +#: branch.c:219 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "nhánh thượng nguồn đã yêu cầu “%s” không tồn tại" -#: branch.c:222 +#: branch.c:221 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -1136,22 +1139,22 @@ msgstr "" "sẽ theo dõi bản đối chiếu máy chủ của nó, bạn cần dùng lệnh\n" "\"git push -u\" để đặt cấu hình thượng nguồn bạn muốn push." -#: branch.c:265 +#: branch.c:264 #, c-format msgid "Not a valid object name: '%s'." msgstr "Không phải tên đối tượng hợp lệ: “%s”." -#: branch.c:285 +#: branch.c:284 #, c-format msgid "Ambiguous object name: '%s'." msgstr "Tên đối tượng chưa rõ ràng: “%s”." -#: branch.c:290 +#: branch.c:289 #, c-format msgid "Not a valid branch point: '%s'." msgstr "Nhánh không hợp lệ: “%s”." -#: branch.c:344 +#: branch.c:343 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "“%s” đã được lấy ra tại “%s” rồi" @@ -1171,7 +1174,9 @@ msgstr "“%s” không giống như tập tin v2 bundle (định dạng dump c msgid "unrecognized header: %s%s (%d)" msgstr "phần đầu không được thừa nhận: %s%s (%d)" -#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778 +#: bundle.c:88 sequencer.c:1346 sequencer.c:1793 sequencer.c:2500 +#: sequencer.c:2583 sequencer.c:2609 sequencer.c:2687 sequencer.c:2807 +#: sequencer.c:2949 builtin/commit.c:782 #, c-format msgid "could not open '%s'" msgstr "không thể mở “%s”" @@ -1180,54 +1185,54 @@ msgstr "không thể mở “%s”" msgid "Repository lacks these prerequisite commits:" msgstr "Kho chứa thiếu những lần chuyển giao tiên quyết này:" -#: bundle.c:186 +#: bundle.c:193 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "Bó dữ liệu chứa %d tham chiếu:" -#: bundle.c:193 +#: bundle.c:200 msgid "The bundle records a complete history." msgstr "Lệnh bundle ghi lại toàn bộ lịch sử." -#: bundle.c:195 +#: bundle.c:202 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "Lệnh bundle yêu cầu %d tham chiếu này:" -#: bundle.c:254 +#: bundle.c:261 msgid "Could not spawn pack-objects" msgstr "Không thể sản sinh đối tượng gói" -#: bundle.c:265 +#: bundle.c:272 msgid "pack-objects died" msgstr "đối tượng gói đã chết" -#: bundle.c:307 +#: bundle.c:314 msgid "rev-list died" msgstr "rev-list đã chết" -#: bundle.c:356 +#: bundle.c:363 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "th.chiếu “%s” bị loại trừ bởi các tùy chọn rev-list" -#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282 +#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296 #, c-format msgid "unrecognized argument: %s" msgstr "đối số không được thừa nhận: %s" -#: bundle.c:454 +#: bundle.c:461 msgid "Refusing to create empty bundle." msgstr "Từ chối tạo một bó dữ liệu trống rỗng." -#: bundle.c:466 +#: bundle.c:473 #, c-format msgid "cannot create '%s'" msgstr "không thể tạo “%s”" -#: bundle.c:494 +#: bundle.c:501 msgid "index-pack died" msgstr "mục lục gói đã chết" @@ -1236,8 +1241,8 @@ msgstr "mục lục gói đã chết" msgid "invalid color value: %.*s" msgstr "giá trị màu không hợp lệ: %.*s" -#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456 -#: builtin/am.c:1469 builtin/am.c:2107 +#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465 +#: builtin/am.c:1467 builtin/am.c:2105 #, c-format msgid "could not parse %s" msgstr "không thể phân tích cú pháp %s" @@ -1247,7 +1252,7 @@ msgstr "không thể phân tích cú pháp %s" msgid "%s %s is not a commit!" msgstr "%s %s không phải là một lần chuyển giao!" -#: commit.c:1511 +#: commit.c:1517 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" @@ -1261,155 +1266,155 @@ msgstr "" msgid "memory exhausted" msgstr "hết bộ nhớ" -#: config.c:186 +#: config.c:187 msgid "relative config include conditionals must come from files" msgstr "các điều kiện bao gồm cấu hình liên quan phải đến từ các tập tin" -#: config.c:720 +#: config.c:721 #, c-format msgid "bad config line %d in blob %s" msgstr "tập tin cấu hình sai tại dòng %d trong blob %s" -#: config.c:724 +#: config.c:725 #, c-format msgid "bad config line %d in file %s" msgstr "cấu hình sai tại dòng %d trong tập tin %s" -#: config.c:728 +#: config.c:729 #, c-format msgid "bad config line %d in standard input" msgstr "cấu hình sai tại dòng %d trong đầu vào tiêu chuẩn" -#: config.c:732 +#: config.c:733 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "cấu hình sai tại dòng %d trong blob-mô-đun-con %s" -#: config.c:736 +#: config.c:737 #, c-format msgid "bad config line %d in command line %s" msgstr "cấu hình sai tại dòng %d trong dòng lệnh %s" -#: config.c:740 +#: config.c:741 #, c-format msgid "bad config line %d in %s" msgstr "cấu hình sai tại dòng %d trong %s" -#: config.c:868 +#: config.c:869 msgid "out of range" msgstr "nằm ngoài phạm vi" -#: config.c:868 +#: config.c:869 msgid "invalid unit" msgstr "đơn vị không hợp lệ" -#: config.c:874 +#: config.c:875 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "sai giá trị bằng số của cấu hình “%s” cho “%s”: %s" -#: config.c:879 +#: config.c:880 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "sai giá trị bằng số của cấu hình “%s” cho “%s” trong blob %s: %s" -#: config.c:882 +#: config.c:883 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "sai giá trị bằng số của cấu hình “%s” cho “%s” trong tập tin %s: %s" -#: config.c:885 +#: config.c:886 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" "sai giá trị bằng số của cấu hình “%s” cho “%s” trong đầu vào tiêu chuẩn: %s" -#: config.c:888 +#: config.c:889 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" "sai giá trị bằng số của cấu hình “%s” cho “%s” trong submodule-blob %s: %s" -#: config.c:891 +#: config.c:892 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "sai giá trị bằng số của cấu hình “%s” cho “%s” trong dòng lệnh %s: %s" -#: config.c:894 +#: config.c:895 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "sai giá trị bằng số của cấu hình “%s” cho “%s” trong %s: %s" -#: config.c:989 +#: config.c:990 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "gặp lỗi mở rộng thư mục người dùng trong: “%s”" -#: config.c:1084 config.c:1095 +#: config.c:1085 config.c:1096 #, c-format msgid "bad zlib compression level %d" msgstr "mức nén zlib %d là sai" -#: config.c:1212 +#: config.c:1213 #, c-format msgid "invalid mode for object creation: %s" msgstr "chế độ không hợp lệ đối với việc tạo đối tượng: %s" -#: config.c:1368 +#: config.c:1372 #, c-format msgid "bad pack compression level %d" msgstr "mức nén gói %d không hợp lệ" -#: config.c:1564 +#: config.c:1568 msgid "unable to parse command-line config" msgstr "không thể phân tích cấu hình dòng lệnh" -#: config.c:1894 +#: config.c:1900 msgid "unknown error occurred while reading the configuration files" msgstr "đã có lỗi chưa biết xảy ra trong khi đọc các tập tin cấu hình" -#: config.c:2064 +#: config.c:2087 #, c-format msgid "Invalid %s: '%s'" msgstr "%s không hợp lệ: “%s”" -#: config.c:2085 +#: config.c:2130 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "" "không hiểu giá trị core.untrackedCache “%s”; dùng giá trị mặc định “keep”" -#: config.c:2111 +#: config.c:2156 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "giá trị splitIndex.maxPercentChange “%d” phải nằm giữa 0 và 100" -#: config.c:2122 +#: config.c:2167 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "không thể phân tích “%s” từ cấu hình dòng lệnh" -#: config.c:2124 +#: config.c:2169 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "sai biến cấu hình “%s” trong tập tin “%s” tại dòng %d" -#: config.c:2183 +#: config.c:2228 #, c-format msgid "%s has multiple values" msgstr "%s có đa giá trị" -#: config.c:2517 config.c:2745 +#: config.c:2571 config.c:2789 #, c-format msgid "fstat on %s failed" msgstr "fstat trên %s gặp lỗi" -#: config.c:2635 +#: config.c:2678 #, c-format msgid "could not set '%s' to '%s'" msgstr "không thể đặt “%s” thành “%s”" -#: config.c:2637 builtin/remote.c:775 +#: config.c:2680 builtin/remote.c:776 #, c-format msgid "could not unset '%s'" msgstr "không thể thôi đặt “%s”" @@ -1430,19 +1435,19 @@ msgstr "" "Vui lòng chắc chắn là bạn có đủ thẩm quyền truy cập\n" "và kho chứa đã sẵn có." -#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141 +#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141 msgid "Checking connectivity" msgstr "Đang kiểm tra kết nối" -#: connected.c:75 +#: connected.c:76 msgid "Could not run 'git rev-list'" msgstr "Không thể chạy “git rev-list”" -#: connected.c:95 +#: connected.c:96 msgid "failed write to rev-list" msgstr "gặp lỗi khi ghi vào rev-list" -#: connected.c:102 +#: connected.c:103 msgid "failed to close rev-list's stdin" msgstr "gặp lỗi khi đóng đầu vào chuẩn stdin của rev-list" @@ -1542,27 +1547,35 @@ msgstr "gặp lỗi khi đọc tập-tin-thứ-tự “%s”" msgid "Performing inexact rename detection" msgstr "Đang thực hiện dò tìm đổi tên không chính xác" -#: diff.c:63 +#: diff.c:74 #, c-format msgid "option '%s' requires a value" msgstr "tùy chọn “%s” yêu cầu một giá trị" -#: diff.c:125 +#: diff.c:152 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " Gặp lỗi khi phân tích dirstat cắt bỏ phần trăm “%s”\n" -#: diff.c:130 +#: diff.c:157 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Không hiểu đối số dirstat “%s”\n" -#: diff.c:282 +#: diff.c:281 +msgid "" +"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', " +"'plain'" +msgstr "" +"cài đặt màu đã di chuyển phải là một trong “no”, “default”, “zebra”, " +"“dimmed_zebra”, “plain”" + +#: diff.c:341 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Không hiểu giá trị cho biến cấu hình “diff.submodule”: “%s”" -#: diff.c:342 +#: diff.c:398 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -1571,20 +1584,20 @@ msgstr "" "Tìm thấy các lỗi trong biến cấu hình “diff.dirstat”:\n" "%s" -#: diff.c:3101 +#: diff.c:3861 #, c-format msgid "external diff died, stopping at %s" msgstr "phần mềm diff ở bên ngoài đã chết, dừng tại %s" -#: diff.c:3427 +#: diff.c:4189 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check và -s loại từ lẫn nhau" -#: diff.c:3517 +#: diff.c:4279 msgid "--follow requires exactly one pathspec" msgstr "--follow cần chính xác một đặc tả đường dẫn" -#: diff.c:3680 +#: diff.c:4445 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -1593,22 +1606,22 @@ msgstr "" "Gặp lỗi khi phân tích đối số tùy chọn --dirstat/-X:\n" "%s" -#: diff.c:3694 +#: diff.c:4459 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Gặp lỗi khi phân tích đối số tùy chọn --submodule: “%s”" -#: diff.c:4716 +#: diff.c:5505 msgid "inexact rename detection was skipped due to too many files." msgstr "" "nhận thấy đổi tên không chính xác đã bị bỏ qua bởi có quá nhiều tập tin." -#: diff.c:4719 +#: diff.c:5508 msgid "only found copies from modified paths due to too many files." msgstr "" "chỉ tìm thấy các bản sao từ đường dẫn đã sửa đổi bởi vì có quá nhiều tập tin." -#: diff.c:4722 +#: diff.c:5511 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -1616,207 +1629,211 @@ msgstr "" "bạn có lẽ muốn đặt biến %s của bạn thành ít nhất là %d và thử lại lệnh lần " "nữa." -#: dir.c:1948 +#: dir.c:1983 msgid "failed to get kernel name and information" msgstr "gặp lỗi khi lấy tên và thông tin của nhân" -#: dir.c:2067 +#: dir.c:2102 msgid "Untracked cache is disabled on this system or location." msgstr "Bộ nhớ tạm không theo vết bị tắt trên hệ thống hay vị trí này." -#: dir.c:2846 dir.c:2851 +#: dir.c:2885 dir.c:2890 #, c-format msgid "could not create directories for %s" msgstr "không thể tạo thư mục cho %s" -#: dir.c:2876 +#: dir.c:2915 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "không thể di cư thư mục git từ “%s” sang “%s”" -#: entry.c:281 +#: entry.c:176 +msgid "Filtering content" +msgstr "Nội dung lọc" + +#: entry.c:417 #, c-format msgid "could not stat file '%s'" msgstr "không thể lấy thống kê tập tin “%s”" -#: fetch-pack.c:251 +#: fetch-pack.c:252 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: cần danh sách shallow" -#: fetch-pack.c:263 +#: fetch-pack.c:264 msgid "git fetch-pack: expected ACK/NAK, got EOF" msgstr "git fetch-pack: cần ACK/NAK, nhưng lại nhận được EOF" -#: fetch-pack.c:282 builtin/archive.c:63 +#: fetch-pack.c:283 builtin/archive.c:63 #, c-format msgid "remote error: %s" msgstr "lỗi máy chủ: %s" -#: fetch-pack.c:283 +#: fetch-pack.c:284 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: cần ACK/NAK, nhưng lại nhận được “%s”" -#: fetch-pack.c:335 +#: fetch-pack.c:336 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc cần multi_ack_detailed" -#: fetch-pack.c:421 +#: fetch-pack.c:422 #, c-format msgid "invalid shallow line: %s" msgstr "dòng shallow không hợp lệ: %s" -#: fetch-pack.c:427 +#: fetch-pack.c:428 #, c-format msgid "invalid unshallow line: %s" msgstr "dòng unshallow không hợp lệ: %s" -#: fetch-pack.c:429 +#: fetch-pack.c:430 #, c-format msgid "object not found: %s" msgstr "Không tìm thấy đối tượng: %s" -#: fetch-pack.c:432 +#: fetch-pack.c:433 #, c-format msgid "error in object: %s" msgstr "lỗi trong đối tượng: %s" -#: fetch-pack.c:434 +#: fetch-pack.c:435 #, c-format msgid "no shallow found: %s" msgstr "không tìm shallow nào: %s" -#: fetch-pack.c:437 +#: fetch-pack.c:438 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "cần shallow/unshallow, nhưng lại nhận được %s" -#: fetch-pack.c:476 +#: fetch-pack.c:477 #, c-format msgid "got %s %d %s" msgstr "nhận %s %d - %s" -#: fetch-pack.c:490 +#: fetch-pack.c:491 #, c-format msgid "invalid commit %s" msgstr "lần chuyển giao %s không hợp lệ" -#: fetch-pack.c:523 +#: fetch-pack.c:524 msgid "giving up" msgstr "chịu thua" -#: fetch-pack.c:533 progress.c:237 +#: fetch-pack.c:534 progress.c:242 msgid "done" msgstr "xong" -#: fetch-pack.c:545 +#: fetch-pack.c:546 #, c-format msgid "got %s (%d) %s" msgstr "nhận %s (%d) %s" -#: fetch-pack.c:591 +#: fetch-pack.c:592 #, c-format msgid "Marking %s as complete" msgstr "Đánh dấu %s là đã hoàn thành" -#: fetch-pack.c:775 +#: fetch-pack.c:776 #, c-format msgid "already have %s (%s)" msgstr "đã sẵn có %s (%s)" -#: fetch-pack.c:813 +#: fetch-pack.c:814 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: không thể rẽ nhánh sideband demultiplexer" -#: fetch-pack.c:821 +#: fetch-pack.c:822 msgid "protocol error: bad pack header" msgstr "lỗi giao thức: phần đầu gói bị sai" -#: fetch-pack.c:877 +#: fetch-pack.c:878 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: không thể rẽ nhánh %s" -#: fetch-pack.c:893 +#: fetch-pack.c:894 #, c-format msgid "%s failed" msgstr "%s gặp lỗi" -#: fetch-pack.c:895 +#: fetch-pack.c:896 msgid "error in sideband demultiplexer" msgstr "có lỗi trong sideband demultiplexer" -#: fetch-pack.c:922 +#: fetch-pack.c:923 msgid "Server does not support shallow clients" msgstr "Máy chủ không hỗ trợ máy khách shallow" -#: fetch-pack.c:926 +#: fetch-pack.c:927 msgid "Server supports multi_ack_detailed" msgstr "Máy chủ hỗ trợ multi_ack_detailed" -#: fetch-pack.c:929 +#: fetch-pack.c:930 msgid "Server supports no-done" msgstr "Máy chủ hỗ trợ no-done" -#: fetch-pack.c:935 +#: fetch-pack.c:936 msgid "Server supports multi_ack" msgstr "Máy chủ hỗ trợ multi_ack" -#: fetch-pack.c:939 +#: fetch-pack.c:940 msgid "Server supports side-band-64k" msgstr "Máy chủ hỗ trợ side-band-64k" -#: fetch-pack.c:943 +#: fetch-pack.c:944 msgid "Server supports side-band" msgstr "Máy chủ hỗ trợ side-band" -#: fetch-pack.c:947 +#: fetch-pack.c:948 msgid "Server supports allow-tip-sha1-in-want" msgstr "Máy chủ hỗ trợ allow-tip-sha1-in-want" -#: fetch-pack.c:951 +#: fetch-pack.c:952 msgid "Server supports allow-reachable-sha1-in-want" msgstr "Máy chủ hỗ trợ allow-reachable-sha1-in-want" -#: fetch-pack.c:961 +#: fetch-pack.c:962 msgid "Server supports ofs-delta" msgstr "Máy chủ hỗ trợ ofs-delta" -#: fetch-pack.c:968 +#: fetch-pack.c:969 #, c-format msgid "Server version is %.*s" msgstr "Phiên bản máy chủ là %.*s" -#: fetch-pack.c:974 +#: fetch-pack.c:975 msgid "Server does not support --shallow-since" msgstr "Máy chủ không hỗ trợ --shallow-since" -#: fetch-pack.c:978 +#: fetch-pack.c:979 msgid "Server does not support --shallow-exclude" msgstr "Máy chủ không hỗ trợ --shallow-exclude" -#: fetch-pack.c:980 +#: fetch-pack.c:981 msgid "Server does not support --deepen" msgstr "Máy chủ không hỗ trợ --deepen" -#: fetch-pack.c:991 +#: fetch-pack.c:992 msgid "no common commits" msgstr "không có lần chuyển giao chung nào" -#: fetch-pack.c:1003 +#: fetch-pack.c:1004 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: fetch gặp lỗi." -#: fetch-pack.c:1165 +#: fetch-pack.c:1166 msgid "no matching remote head" msgstr "không khớp phần đầu máy chủ" -#: fetch-pack.c:1187 +#: fetch-pack.c:1188 #, c-format msgid "no such remote ref %s" msgstr "Không có máy chủ tham chiếu nào như %s" -#: fetch-pack.c:1190 +#: fetch-pack.c:1191 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "" @@ -1830,7 +1847,7 @@ msgstr "gpg gặp lỗi khi ký dữ liệu" msgid "could not create temporary file" msgstr "không thể tạo tập tin tạm thời" -#: gpg-interface.c:213 +#: gpg-interface.c:214 #, c-format msgid "failed writing detached signature to '%s'" msgstr "gặp lỗi khi ghi chữ ký đính kèm vào “%s”" @@ -1840,17 +1857,17 @@ msgstr "gặp lỗi khi ghi chữ ký đính kèm vào “%s”" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "bỏ qua màu không hợp lệ “%.*s” trong log.graphColors" -#: grep.c:1981 +#: grep.c:1970 #, c-format msgid "'%s': unable to read %s" msgstr "“%s”: không thể đọc %s" -#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134 +#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134 #, c-format msgid "failed to stat '%s'" msgstr "gặp lỗi khi lấy thống kê về “%s”" -#: grep.c:2009 +#: grep.c:1998 #, c-format msgid "'%s': short read" msgstr "“%s”: đọc ngắn" @@ -1986,12 +2003,12 @@ msgstr "không cho phép tên định danh là rỗng (cho <%s>)" msgid "name consists only of disallowed characters: %s" msgstr "tên chỉ được phép bao gồm các ký tự sau: %s" -#: ident.c:416 builtin/commit.c:612 +#: ident.c:416 builtin/commit.c:616 #, c-format msgid "invalid date format: %s" msgstr "ngày tháng không hợp lệ: %s" -#: lockfile.c:152 +#: lockfile.c:151 #, c-format msgid "" "Unable to create '%s.lock': %s.\n" @@ -2010,7 +2027,7 @@ msgstr "" "một tiến trình git có lẽ đã đổ vỡ khi thực hiện ở kho này trước đó:\n" "gõ bỏ tập tin một cách thủ công để tiếp tục." -#: lockfile.c:160 +#: lockfile.c:159 #, c-format msgid "Unable to create '%s.lock': %s" msgstr "Không thể tạo “%s.lock”: %s" @@ -2019,78 +2036,78 @@ msgstr "Không thể tạo “%s.lock”: %s" msgid "failed to read the cache" msgstr "gặp lỗi khi đọc bộ nhớ đệm" -#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377 -#: builtin/checkout.c:591 builtin/clone.c:753 +#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380 +#: builtin/checkout.c:595 builtin/clone.c:754 msgid "unable to write new index file" msgstr "không thể ghi tập tin lưu bảng mục lục mới" -#: merge-recursive.c:210 +#: merge-recursive.c:235 msgid "(bad commit)\n" msgstr "(commit sai)\n" -#: merge-recursive.c:232 merge-recursive.c:240 +#: merge-recursive.c:257 merge-recursive.c:265 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "addinfo_cache gặp lỗi đối với đường dẫn “%s”" -#: merge-recursive.c:304 +#: merge-recursive.c:329 msgid "error building trees" msgstr "gặp lỗi khi xây dựng cây" -#: merge-recursive.c:728 +#: merge-recursive.c:752 #, c-format msgid "failed to create path '%s'%s" msgstr "gặp lỗi khi tạo đường dẫn “%s”%s" -#: merge-recursive.c:739 +#: merge-recursive.c:763 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Gỡ bỏ %s để tạo chỗ (room) cho thư mục con\n" -#: merge-recursive.c:753 merge-recursive.c:772 +#: merge-recursive.c:777 merge-recursive.c:796 msgid ": perhaps a D/F conflict?" msgstr ": có lẽ là một xung đột D/F?" -#: merge-recursive.c:762 +#: merge-recursive.c:786 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "từ chối đóng tập tin không được theo dõi tại “%s”" -#: merge-recursive.c:804 builtin/cat-file.c:36 +#: merge-recursive.c:828 builtin/cat-file.c:37 #, c-format msgid "cannot read object %s '%s'" msgstr "không thể đọc đối tượng %s “%s”" -#: merge-recursive.c:806 +#: merge-recursive.c:830 #, c-format msgid "blob expected for %s '%s'" msgstr "đối tượng blob được mong đợi cho %s “%s”" -#: merge-recursive.c:830 +#: merge-recursive.c:854 #, c-format msgid "failed to open '%s': %s" msgstr "gặp lỗi khi mở “%s”: %s" -#: merge-recursive.c:841 +#: merge-recursive.c:865 #, c-format msgid "failed to symlink '%s': %s" msgstr "gặp lỗi khi tạo liên kết mềm (symlink) “%s”: %s" -#: merge-recursive.c:846 +#: merge-recursive.c:870 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "không hiểu phải làm gì với %06o %s “%s”" -#: merge-recursive.c:986 +#: merge-recursive.c:1010 msgid "Failed to execute internal merge" msgstr "Gặp lỗi khi thực hiện trộn nội bộ" -#: merge-recursive.c:990 +#: merge-recursive.c:1014 #, c-format msgid "Unable to add %s to database" msgstr "Không thể thêm %s vào cơ sở dữ liệu" -#: merge-recursive.c:1093 +#: merge-recursive.c:1117 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2099,7 +2116,7 @@ msgstr "" "XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s trong %s. Phiên bản %s của %s " "còn lại trong cây (tree)." -#: merge-recursive.c:1098 +#: merge-recursive.c:1122 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -2108,7 +2125,7 @@ msgstr "" "XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s đến %s trong %s. Phiên bản %s " "của %s còn lại trong cây (tree)." -#: merge-recursive.c:1105 +#: merge-recursive.c:1129 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2117,7 +2134,7 @@ msgstr "" "XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s trong %s. Phiên bản %s của %s " "còn lại trong cây (tree) tại %s." -#: merge-recursive.c:1110 +#: merge-recursive.c:1134 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -2126,20 +2143,20 @@ msgstr "" "XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s đến %s trong %s. Phiên bản %s " "của %s còn lại trong cây (tree) tại %s." -#: merge-recursive.c:1144 +#: merge-recursive.c:1168 msgid "rename" msgstr "đổi tên" -#: merge-recursive.c:1144 +#: merge-recursive.c:1168 msgid "renamed" msgstr "đã đổi tên" -#: merge-recursive.c:1201 +#: merge-recursive.c:1225 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s là một thư mục trong %s thay vào đó thêm vào như là %s" -#: merge-recursive.c:1226 +#: merge-recursive.c:1250 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -2148,140 +2165,140 @@ msgstr "" "XUNG ĐỘT (đổi-tên/đổi-tên): Đổi tên \"%s\"->\"%s\" trong nhánh \"%s\" đổi " "tên \"%s\"->\"%s\" trong \"%s\"%s" -#: merge-recursive.c:1231 +#: merge-recursive.c:1255 msgid " (left unresolved)" msgstr " (cần giải quyết)" -#: merge-recursive.c:1293 +#: merge-recursive.c:1317 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "XUNG ĐỘT (đổi-tên/đổi-tên): Đổi tên %s->%s trong %s. Đổi tên %s->%s trong %s" -#: merge-recursive.c:1326 +#: merge-recursive.c:1350 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "Đang đổi tên %s thành %s thay vì %s thành %s" -#: merge-recursive.c:1529 +#: merge-recursive.c:1553 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" "XUNG ĐỘT (đổi-tên/thêm): Đổi tên %s->%s trong %s. %s được thêm vào trong %s" -#: merge-recursive.c:1544 +#: merge-recursive.c:1568 #, c-format msgid "Adding merged %s" msgstr "Thêm hòa trộn %s" -#: merge-recursive.c:1551 merge-recursive.c:1781 +#: merge-recursive.c:1575 merge-recursive.c:1805 #, c-format msgid "Adding as %s instead" msgstr "Thay vào đó thêm vào %s" -#: merge-recursive.c:1608 +#: merge-recursive.c:1632 #, c-format msgid "cannot read object %s" msgstr "không thể đọc đối tượng %s" -#: merge-recursive.c:1611 +#: merge-recursive.c:1635 #, c-format msgid "object %s is not a blob" msgstr "đối tượng %s không phải là một blob" -#: merge-recursive.c:1680 +#: merge-recursive.c:1704 msgid "modify" msgstr "sửa đổi" -#: merge-recursive.c:1680 +#: merge-recursive.c:1704 msgid "modified" msgstr "đã sửa" -#: merge-recursive.c:1690 +#: merge-recursive.c:1714 msgid "content" msgstr "nội dung" -#: merge-recursive.c:1697 +#: merge-recursive.c:1721 msgid "add/add" msgstr "thêm/thêm" -#: merge-recursive.c:1733 +#: merge-recursive.c:1757 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Đã bỏ qua %s (đã có sẵn lần hòa trộn này)" -#: merge-recursive.c:1747 +#: merge-recursive.c:1771 #, c-format msgid "Auto-merging %s" msgstr "Tự-động-hòa-trộn %s" -#: merge-recursive.c:1751 git-submodule.sh:945 +#: merge-recursive.c:1775 git-submodule.sh:944 msgid "submodule" msgstr "mô-đun-con" -#: merge-recursive.c:1752 +#: merge-recursive.c:1776 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "XUNG ĐỘT (%s): Xung đột hòa trộn trong %s" -#: merge-recursive.c:1846 +#: merge-recursive.c:1870 #, c-format msgid "Removing %s" msgstr "Đang xóa %s" -#: merge-recursive.c:1872 +#: merge-recursive.c:1896 msgid "file/directory" msgstr "tập-tin/thư-mục" -#: merge-recursive.c:1878 +#: merge-recursive.c:1902 msgid "directory/file" msgstr "thư-mục/tập-tin" -#: merge-recursive.c:1884 +#: merge-recursive.c:1908 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "XUNG ĐỘT (%s): Ở đây không có thư mục nào có tên %s trong %s. Thêm %s như là " "%s" -#: merge-recursive.c:1893 +#: merge-recursive.c:1917 #, c-format msgid "Adding %s" msgstr "Thêm \"%s\"" -#: merge-recursive.c:1930 -msgid "Already up-to-date!" +#: merge-recursive.c:1954 +msgid "Already up to date!" msgstr "Đã cập nhật rồi!" -#: merge-recursive.c:1939 +#: merge-recursive.c:1963 #, c-format msgid "merging of trees %s and %s failed" msgstr "hòa trộn các cây %s và %s gặp lỗi" -#: merge-recursive.c:2022 +#: merge-recursive.c:2060 msgid "Merging:" msgstr "Đang trộn:" -#: merge-recursive.c:2035 +#: merge-recursive.c:2073 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "tìm thấy %u tổ tiên chung:" -#: merge-recursive.c:2074 +#: merge-recursive.c:2112 msgid "merge returned no commit" msgstr "hòa trộn không trả về lần chuyển giao nào" -#: merge-recursive.c:2137 +#: merge-recursive.c:2175 #, c-format msgid "Could not parse object '%s'" msgstr "Không thể phân tích đối tượng “%s”" -#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793 +#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814 msgid "Unable to write index." msgstr "Không thể ghi bảng mục lục" -#: notes-merge.c:273 +#: notes-merge.c:272 #, c-format msgid "" "You have not concluded your previous notes merge (%s exists).\n" @@ -2293,7 +2310,7 @@ msgstr "" "chuyển giao hay bãi bỏ lần hòa trộn trước đây và bắt đầu một hòa trộn ghi " "chú mới." -#: notes-merge.c:280 +#: notes-merge.c:279 #, c-format msgid "You have not concluded your notes merge (%s exists)." msgstr "Bạn chưa kết thúc việc hòa trộn ghi chú (%s vẫn tồn tại)." @@ -2323,16 +2340,31 @@ msgstr "Từ chối ghi đè ghi chú trong %s (nằm ngoài refs/notes/)" msgid "Bad %s value: '%s'" msgstr "Giá trị %s sai: “%s”" -#: object.c:240 +#: object.c:239 #, c-format msgid "unable to parse object: %s" msgstr "không thể phân tích đối tượng: “%s”" +#: packfile.c:556 +msgid "offset before end of packfile (broken .idx?)" +msgstr "vị trí tương đối trước điểm kết thúc của tập tin gói (.idx hỏng à?)" + +#: packfile.c:1683 +#, c-format +msgid "offset before start of pack index for %s (corrupt index?)" +msgstr "vị trí tương đối nằm trước chỉ mục gói cho %s (mục lục bị hỏng à?)" + +#: packfile.c:1687 +#, c-format +msgid "offset beyond end of pack index for %s (truncated index?)" +msgstr "" +"vị trí tương đối vượt quá cuối của chỉ mục gói cho %s (mục lục bị cắt cụt à?)" + #: parse-options.c:573 msgid "..." msgstr "…" -#: parse-options.c:591 +#: parse-options.c:592 #, c-format msgid "usage: %s" msgstr "cách dùng: %s" @@ -2340,17 +2372,17 @@ msgstr "cách dùng: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:597 +#: parse-options.c:598 #, c-format msgid " or: %s" msgstr " hoặc: %s" -#: parse-options.c:600 +#: parse-options.c:601 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:634 +#: parse-options.c:640 msgid "-NUM" msgstr "-SỐ" @@ -2359,7 +2391,7 @@ msgstr "-SỐ" msgid "malformed object name '%s'" msgstr "tên đối tượng dị hình “%s”" -#: path.c:890 +#: path.c:891 #, c-format msgid "Could not make %s writable by group" msgstr "Không thể làm %s được ghi bởi nhóm" @@ -2434,7 +2466,7 @@ msgstr "“%s” (mnemonic: “%c”)" msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: số mầu nhiệm đặc tả đường dẫn chưa được hỗ trợ bởi lệnh này: %s" -#: pathspec.c:575 +#: pathspec.c:571 msgid "" "empty strings as pathspecs will be made invalid in upcoming releases. please " "use . instead if you meant to match all paths" @@ -2442,12 +2474,12 @@ msgstr "" "chuỗi rỗng làm đặc tả đường dẫn không hợp lệ ở lần phát hành kế tiếp. Vui " "lòng dùng . để thay thế nếu ý bạn là khớp mọi đường dẫn" -#: pathspec.c:599 +#: pathspec.c:595 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "đặc tả đường dẫn “%s” vượt ra ngoài liên kết mềm" -#: pretty.c:963 +#: pretty.c:962 msgid "unable to parse --pretty format" msgstr "không thể phân tích định dạng --pretty" @@ -2469,50 +2501,51 @@ msgstr "" "GIT_INDEX_VERSION được đặt, nhưng giá trị của nó lại không hợp lệ.\n" "Dùng phiên bản %i" -#: read-cache.c:2308 builtin/merge.c:1019 +#: read-cache.c:2316 builtin/merge.c:1046 #, c-format msgid "could not close '%s'" msgstr "không thể đóng “%s”" -#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054 +#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077 #, c-format msgid "could not stat '%s'" msgstr "không thể lấy thông tin thống kê về “%s”" -#: read-cache.c:2396 +#: read-cache.c:2407 #, c-format msgid "unable to open git dir: %s" msgstr "không thể mở thư mục git: %s" -#: read-cache.c:2408 +#: read-cache.c:2419 #, c-format msgid "unable to unlink: %s" msgstr "không thể bỏ liên kết (unlink): “%s”" -#: refs.c:622 +#: refs.c:638 #, c-format msgid "Could not open '%s' for writing" msgstr "Không thể mở “%s” để ghi" -#: refs.c:1769 +#: refs.c:1779 msgid "ref updates forbidden inside quarantine environment" msgstr "cập nhật tham chiếu bị cấm trong môi trường kiểm tra" -#: refs/files-backend.c:1664 +#: refs/files-backend.c:1136 +#, c-format +msgid "could not remove reference %s" +msgstr "không thể gỡ bỏ tham chiếu: %s" + +#: refs/files-backend.c:1150 refs/packed-backend.c:1430 +#: refs/packed-backend.c:1440 #, c-format msgid "could not delete reference %s: %s" msgstr "không thể xóa bỏ tham chiếu %s: %s" -#: refs/files-backend.c:1667 +#: refs/files-backend.c:1153 refs/packed-backend.c:1443 #, c-format msgid "could not delete references: %s" msgstr "không thể xóa bỏ tham chiếu: %s" -#: refs/files-backend.c:1676 -#, c-format -msgid "could not remove reference %s" -msgstr "không thể gỡ bỏ tham chiếu: %s" - #: ref-filter.c:35 wt-status.c:1811 msgid "gone" msgstr "đã ra đi" @@ -2532,157 +2565,157 @@ msgstr "đằng sau %d" msgid "ahead %d, behind %d" msgstr "trước %d, sau %d" -#: ref-filter.c:105 +#: ref-filter.c:104 #, c-format msgid "expected format: %%(color:<color>)" msgstr "cần định dạng: %%(color:<color>)" -#: ref-filter.c:107 +#: ref-filter.c:106 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "không nhận ra màu: %%(màu:%s)" -#: ref-filter.c:121 +#: ref-filter.c:126 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Giá trị nguyên cần tên tham chiếu:lstrip=%s" -#: ref-filter.c:125 +#: ref-filter.c:130 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Giá trị nguyên cần tên tham chiếu:rstrip=%s" -#: ref-filter.c:127 +#: ref-filter.c:132 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "đối số không được thừa nhận %%(%s): %s" -#: ref-filter.c:167 +#: ref-filter.c:172 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) không nhận các đối số" -#: ref-filter.c:174 +#: ref-filter.c:179 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) không nhận các đối số" -#: ref-filter.c:181 +#: ref-filter.c:186 #, c-format msgid "%%(trailers) does not take arguments" msgstr "%%(trailers) không nhận các đối số" -#: ref-filter.c:200 +#: ref-filter.c:205 #, c-format msgid "positive value expected contents:lines=%s" msgstr "cần nội dung mang giá trị dương:lines=%s" -#: ref-filter.c:202 +#: ref-filter.c:207 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "đối số không được thừa nhận %%(contents): %s" -#: ref-filter.c:215 +#: ref-filter.c:220 #, c-format msgid "positive value expected objectname:short=%s" msgstr "cần nội dung mang giá trị dương:shot=%s" -#: ref-filter.c:219 +#: ref-filter.c:224 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "đối số không được thừa nhận %%(objectname): %s" -#: ref-filter.c:246 +#: ref-filter.c:251 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "cần định dạng: %%(align:<width>,<position>)" -#: ref-filter.c:258 +#: ref-filter.c:263 #, c-format msgid "unrecognized position:%s" msgstr "vị trí không được thừa nhận:%s" -#: ref-filter.c:262 +#: ref-filter.c:267 #, c-format msgid "unrecognized width:%s" msgstr "chiều rộng không được thừa nhận:%s" -#: ref-filter.c:268 +#: ref-filter.c:273 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "đối số không được thừa nhận %%(align): %s" -#: ref-filter.c:272 +#: ref-filter.c:277 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "cần giá trị độ rộng dương với nguyên tử %%(align)" -#: ref-filter.c:287 +#: ref-filter.c:292 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "đối số không được thừa nhận %%(if): %s" -#: ref-filter.c:378 +#: ref-filter.c:382 #, c-format msgid "malformed field name: %.*s" msgstr "tên trường dị hình: %.*s" -#: ref-filter.c:404 +#: ref-filter.c:408 #, c-format msgid "unknown field name: %.*s" msgstr "không hiểu tên trường: %.*s" -#: ref-filter.c:508 +#: ref-filter.c:520 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "định dạng: nguyên tử %%(if) được dùng mà không có nguyên tử %%(then)" -#: ref-filter.c:568 +#: ref-filter.c:580 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "định dạng: nguyên tử %%(then) được dùng mà không có nguyên tử %%(if)" -#: ref-filter.c:570 +#: ref-filter.c:582 #, c-format msgid "format: %%(then) atom used more than once" msgstr "định dạng: nguyên tử %%(then) được dùng nhiều hơn một lần" -#: ref-filter.c:572 +#: ref-filter.c:584 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "định dạng: nguyên tử %%(then) được dùng sau %%(else)" -#: ref-filter.c:598 +#: ref-filter.c:610 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "định dạng: nguyên tử %%(else) được dùng mà không có nguyên tử %%(if)" -#: ref-filter.c:600 +#: ref-filter.c:612 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "định dạng: nguyên tử %%(else) được dùng mà không có nguyên tử %%(then)" -#: ref-filter.c:602 +#: ref-filter.c:614 #, c-format msgid "format: %%(else) atom used more than once" msgstr "định dạng: nguyên tử %%(else) được dùng nhiều hơn một lần" -#: ref-filter.c:615 +#: ref-filter.c:627 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "định dạng: nguyên tử %%(end) được dùng mà không có nguyên tử tương ứng" -#: ref-filter.c:670 +#: ref-filter.c:682 #, c-format msgid "malformed format string %s" msgstr "chuỗi định dạng dị hình %s" -#: ref-filter.c:1254 +#: ref-filter.c:1268 #, c-format msgid "(no branch, rebasing %s)" msgstr "(không nhánh, đang cải tổ %s)" -#: ref-filter.c:1257 +#: ref-filter.c:1271 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(không nhánh, di chuyển nửa bước được bắt đầu tại %s)" @@ -2690,7 +2723,7 @@ msgstr "(không nhánh, di chuyển nửa bước được bắt đầu tại %s #. TRANSLATORS: make sure this matches "HEAD #. detached at " in wt-status.c #. -#: ref-filter.c:1265 +#: ref-filter.c:1279 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD được tách rời tại %s)" @@ -2698,109 +2731,109 @@ msgstr "(HEAD được tách rời tại %s)" #. TRANSLATORS: make sure this matches "HEAD #. detached from " in wt-status.c #. -#: ref-filter.c:1272 +#: ref-filter.c:1286 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD được tách rời từ %s)" -#: ref-filter.c:1276 +#: ref-filter.c:1290 msgid "(no branch)" msgstr "(không nhánh)" -#: ref-filter.c:1426 ref-filter.c:1457 +#: ref-filter.c:1439 ref-filter.c:1470 #, c-format msgid "missing object %s for %s" msgstr "thiếu đối tượng %s cho %s" -#: ref-filter.c:1429 ref-filter.c:1460 +#: ref-filter.c:1442 ref-filter.c:1473 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer gặp lỗi trên %s cho %s" -#: ref-filter.c:1760 +#: ref-filter.c:1773 #, c-format msgid "malformed object at '%s'" msgstr "đối tượng dị hình tại “%s”" -#: ref-filter.c:1827 +#: ref-filter.c:1840 #, c-format msgid "ignoring ref with broken name %s" msgstr "đang lờ đi tham chiếu với tên hỏng %s" -#: ref-filter.c:1832 +#: ref-filter.c:1845 #, c-format msgid "ignoring broken ref %s" msgstr "đang lờ đi tham chiếu hỏng %s" -#: ref-filter.c:2095 +#: ref-filter.c:2107 #, c-format msgid "format: %%(end) atom missing" msgstr "định dạng: thiếu nguyên tử %%(end)" -#: ref-filter.c:2176 +#: ref-filter.c:2201 #, c-format msgid "malformed object name %s" msgstr "tên đối tượng dị hình %s" -#: remote.c:747 +#: remote.c:750 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Không thể lấy về cả %s và %s cho %s" -#: remote.c:751 +#: remote.c:754 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s thường theo dõi %s, không phải %s" -#: remote.c:755 +#: remote.c:758 #, c-format msgid "%s tracks both %s and %s" msgstr "%s theo dõi cả %s và %s" -#: remote.c:763 +#: remote.c:766 msgid "Internal error" msgstr "Lỗi nội bộ" -#: remote.c:1680 remote.c:1782 +#: remote.c:1681 remote.c:1783 msgid "HEAD does not point to a branch" msgstr "HEAD không chỉ đến một nhánh nào cả" -#: remote.c:1689 +#: remote.c:1690 #, c-format msgid "no such branch: '%s'" msgstr "không có nhánh nào như thế: “%s”" -#: remote.c:1692 +#: remote.c:1693 #, c-format msgid "no upstream configured for branch '%s'" msgstr "không có thượng nguồn được cấu hình cho nhánh “%s”" -#: remote.c:1698 +#: remote.c:1699 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "" "nhánh thượng nguồn “%s” không được lưu lại như là một nhánh theo dõi máy chủ" -#: remote.c:1713 +#: remote.c:1714 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "đẩy lên đích “%s” trên máy chủ “%s” không có nhánh theo dõi nội bộ" -#: remote.c:1725 +#: remote.c:1726 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "nhánh “%s” không có máy chủ để đẩy lên" -#: remote.c:1736 +#: remote.c:1737 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "đẩy refspecs cho “%s” không bao gồm “%s”" -#: remote.c:1749 +#: remote.c:1750 msgid "push has no destination (push.default is 'nothing')" msgstr "đẩy lên mà không có đích (push.default là “nothing”)" -#: remote.c:1771 +#: remote.c:1772 msgid "cannot resolve 'simple' push to a single destination" msgstr "không thể phân giải đẩy “đơn giản” đến một đích đơn" @@ -2816,7 +2849,7 @@ msgstr " (dùng \" git branch --unset-upstream\" để sửa)\n" #: remote.c:2083 #, c-format -msgid "Your branch is up-to-date with '%s'.\n" +msgid "Your branch is up to date with '%s'.\n" msgstr "Nhánh của bạn đã cập nhật với “%s”.\n" #: remote.c:2087 @@ -2861,16 +2894,16 @@ msgstr "" " (dùng \"git pull\" để hòa trộn nhánh trên máy chủ vào trong nhánh của " "bạn)\n" -#: revision.c:2187 +#: revision.c:2256 msgid "your current branch appears to be broken" msgstr "nhánh hiện tại của bạn có vẻ như bị hỏng" -#: revision.c:2190 +#: revision.c:2259 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "nhánh hiện tại của bạn “%s” không có một lần chuyển giao nào cả" -#: revision.c:2384 +#: revision.c:2453 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent xung khắc với --bisect" @@ -2912,24 +2945,24 @@ msgstr "kết thúc nhận không hỗ trợ đẩy --atomic" msgid "the receiving end does not support push options" msgstr "kết thúc nhận không hỗ trợ các tùy chọn của lệnh push" -#: sequencer.c:216 +#: sequencer.c:218 msgid "revert" msgstr "hoàn nguyên" -#: sequencer.c:218 +#: sequencer.c:220 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:220 +#: sequencer.c:222 msgid "rebase -i" msgstr "rebase -i" -#: sequencer.c:222 +#: sequencer.c:224 #, c-format msgid "Unknown action: %d" msgstr "Không nhận ra thao tác: %d" -#: sequencer.c:279 +#: sequencer.c:281 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -2937,7 +2970,7 @@ msgstr "" "sau khi giải quyết các xung đột, đánh dấu đường dẫn đã sửa\n" "với lệnh “git add <đường_dẫn>” hoặc “git rm <đường_dẫn>”" -#: sequencer.c:282 +#: sequencer.c:284 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -2947,42 +2980,43 @@ msgstr "" "với lệnh “git add <đường_dẫn>” hoặc “git rm <đường_dẫn>”\n" "và chuyển giao kết quả bằng lệnh “git commit”" -#: sequencer.c:295 sequencer.c:1685 +#: sequencer.c:297 sequencer.c:1704 #, c-format msgid "could not lock '%s'" msgstr "không thể khóa “%s”" -#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704 +#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723 +#: sequencer.c:2733 sequencer.c:2749 #, c-format msgid "could not write to '%s'" msgstr "không thể ghi vào “%s”" -#: sequencer.c:302 +#: sequencer.c:304 #, c-format msgid "could not write eol to '%s'" msgstr "không thể ghi eol vào “%s”" -#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692 +#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711 #, c-format msgid "failed to finalize '%s'." msgstr "gặp lỗi khi finalize “%s”" -#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258 -#: builtin/commit.c:750 builtin/merge.c:1017 +#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259 +#: builtin/commit.c:754 builtin/merge.c:1044 #, c-format msgid "could not read '%s'" msgstr "Không thể đọc “%s”." -#: sequencer.c:356 +#: sequencer.c:358 #, c-format msgid "your local changes would be overwritten by %s." msgstr "các thay đổi nội bộ của bạn có thể bị ghi đè bởi lệnh %s." -#: sequencer.c:360 +#: sequencer.c:362 msgid "commit your changes or stash them to proceed." msgstr "chuyển giao các thay đổi của bạn hay tạm cất (stash) chúng để xử lý." -#: sequencer.c:389 +#: sequencer.c:391 #, c-format msgid "%s: fast-forward" msgstr "%s: chuyển-tiếp-nhanh" @@ -2990,20 +3024,20 @@ msgstr "%s: chuyển-tiếp-nhanh" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:472 +#: sequencer.c:474 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Không thể ghi tập tin lưu bảng mục lục mới" -#: sequencer.c:491 +#: sequencer.c:493 msgid "could not resolve HEAD commit\n" msgstr "không thể phân giải lần chuyển giao HEAD\n" -#: sequencer.c:511 +#: sequencer.c:513 msgid "unable to update cache tree\n" msgstr "không thể cập nhật cây bộ nhớ đệm\n" -#: sequencer.c:595 +#: sequencer.c:597 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -3032,17 +3066,17 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:697 +#: sequencer.c:699 #, c-format msgid "could not parse commit %s\n" msgstr "không thể phân tích lần chuyển giao %s\n" -#: sequencer.c:702 +#: sequencer.c:704 #, c-format msgid "could not parse parent commit %s\n" msgstr "không thể phân tích lần chuyển giao cha mẹ “%s”\n" -#: sequencer.c:824 +#: sequencer.c:826 #, c-format msgid "" "unexpected 1st line of squash message:\n" @@ -3053,7 +3087,7 @@ msgstr "" "\n" "\t%.*s" -#: sequencer.c:830 +#: sequencer.c:832 #, c-format msgid "" "invalid 1st line of squash message:\n" @@ -3064,233 +3098,234 @@ msgstr "" "\n" "\t%.*s" -#: sequencer.c:836 sequencer.c:861 +#: sequencer.c:838 sequencer.c:863 #, c-format msgid "This is a combination of %d commits." msgstr "Đây là tổ hợp của %d lần chuyển giao." -#: sequencer.c:845 +#: sequencer.c:847 sequencer.c:2681 msgid "need a HEAD to fixup" msgstr "cần một HEAD để sửa" -#: sequencer.c:847 +#: sequencer.c:849 msgid "could not read HEAD" msgstr "không thể đọc HEAD" -#: sequencer.c:849 +#: sequencer.c:851 msgid "could not read HEAD's commit message" msgstr "không thể đọc phần chú thích (message) của HEAD" -#: sequencer.c:855 +#: sequencer.c:857 #, c-format msgid "cannot write '%s'" msgstr "không thể ghi “%s”" -#: sequencer.c:864 git-rebase--interactive.sh:445 +#: sequencer.c:866 git-rebase--interactive.sh:446 msgid "This is the 1st commit message:" msgstr "Đây là chú thích cho lần chuyển giao thứ nhất:" -#: sequencer.c:872 +#: sequencer.c:874 #, c-format msgid "could not read commit message of %s" msgstr "không thể đọc phần chú thích (message) của %s" -#: sequencer.c:879 +#: sequencer.c:881 #, c-format msgid "This is the commit message #%d:" msgstr "Đây là chú thích cho lần chuyển giao thứ #%d:" -#: sequencer.c:884 +#: sequencer.c:886 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Chú thích cho lần chuyển giao thứ #%d sẽ bị bỏ qua:" -#: sequencer.c:889 +#: sequencer.c:891 #, c-format msgid "unknown command: %d" msgstr "không hiểu câu lệnh %d" -#: sequencer.c:955 +#: sequencer.c:957 msgid "your index file is unmerged." msgstr "tập tin lưu mục lục của bạn không được hòa trộn." -#: sequencer.c:973 +#: sequencer.c:975 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "lần chuyển giao %s là một lần hòa trộn nhưng không đưa ra tùy chọn -m." -#: sequencer.c:981 +#: sequencer.c:983 #, c-format msgid "commit %s does not have parent %d" msgstr "lần chuyển giao %s không có cha mẹ %d" -#: sequencer.c:985 +#: sequencer.c:987 #, c-format msgid "mainline was specified but commit %s is not a merge." msgstr "" "luồng chính đã được chỉ ra nhưng lần chuyển giao %s không phải là một lần " "hòa trộn." -#: sequencer.c:991 +#: sequencer.c:993 #, c-format msgid "cannot get commit message for %s" msgstr "không thể lấy ghi chú lần chuyển giao cho %s" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1012 +#: sequencer.c:1014 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: không thể phân tích lần chuyển giao mẹ của %s" -#: sequencer.c:1075 sequencer.c:1830 +#: sequencer.c:1077 sequencer.c:1853 #, c-format msgid "could not rename '%s' to '%s'" msgstr "không thể đổi tên “%s” thành “%s”" -#: sequencer.c:1126 +#: sequencer.c:1128 #, c-format msgid "could not revert %s... %s" msgstr "không thể hoàn nguyên %s… %s" -#: sequencer.c:1127 +#: sequencer.c:1129 #, c-format msgid "could not apply %s... %s" msgstr "không thể áp dụng miếng vá %s… %s" -#: sequencer.c:1169 +#: sequencer.c:1171 msgid "empty commit set passed" msgstr "lần chuyển giao trống rỗng đặt là hợp quy cách" -#: sequencer.c:1179 +#: sequencer.c:1181 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: gặp lỗi đọc bảng mục lục" -#: sequencer.c:1186 +#: sequencer.c:1188 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: gặp lỗi khi làm tươi mới bảng mục lục" -#: sequencer.c:1306 +#: sequencer.c:1308 #, c-format msgid "invalid line %d: %.*s" msgstr "dòng không hợp lệ %d: %.*s" -#: sequencer.c:1314 +#: sequencer.c:1316 #, c-format msgid "cannot '%s' without a previous commit" msgstr "không thể “%s” thể mà không có lần chuyển giao kế trước" -#: sequencer.c:1347 +#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614 +#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951 #, c-format msgid "could not read '%s'." msgstr "không thể đọc “%s”." -#: sequencer.c:1359 +#: sequencer.c:1361 msgid "please fix this using 'git rebase --edit-todo'." msgstr "vui lòng sửa lỗi này bằng cách dùng “git rebase --edit-todo”." -#: sequencer.c:1361 +#: sequencer.c:1363 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "bảng chỉ thị không thể dùng được: %s" -#: sequencer.c:1366 +#: sequencer.c:1368 msgid "no commits parsed." msgstr "không có lần chuyển giao nào được phân tích." -#: sequencer.c:1377 +#: sequencer.c:1379 msgid "cannot cherry-pick during a revert." msgstr "không thể cherry-pick trong khi hoàn nguyên." -#: sequencer.c:1379 +#: sequencer.c:1381 msgid "cannot revert during a cherry-pick." msgstr "không thể thực hiện việc hoàn nguyên trong khi đang cherry-pick." -#: sequencer.c:1442 +#: sequencer.c:1448 #, c-format msgid "invalid key: %s" msgstr "khóa không đúng: %s" -#: sequencer.c:1445 +#: sequencer.c:1451 #, c-format msgid "invalid value for %s: %s" msgstr "giá trị cho %s không hợp lệ: %s" -#: sequencer.c:1502 +#: sequencer.c:1517 #, c-format msgid "malformed options sheet: '%s'" msgstr "bảng tùy chọn dị hình: “%s”" -#: sequencer.c:1540 +#: sequencer.c:1555 msgid "a cherry-pick or revert is already in progress" msgstr "có một thao tác “cherry-pick” hoặc “revert” đang được thực hiện" -#: sequencer.c:1541 +#: sequencer.c:1556 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "hãy thử \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:1544 +#: sequencer.c:1559 #, c-format msgid "could not create sequencer directory '%s'" msgstr "không thể tạo thư mục xếp dãy “%s”" -#: sequencer.c:1558 +#: sequencer.c:1574 msgid "could not lock HEAD" msgstr "không thể khóa HEAD" -#: sequencer.c:1614 sequencer.c:2188 +#: sequencer.c:1632 sequencer.c:2211 msgid "no cherry-pick or revert in progress" msgstr "không cherry-pick hay hoàn nguyên trong tiến trình" -#: sequencer.c:1616 +#: sequencer.c:1634 msgid "cannot resolve HEAD" msgstr "không thể phân giải HEAD" -#: sequencer.c:1618 sequencer.c:1652 +#: sequencer.c:1636 sequencer.c:1671 msgid "cannot abort from a branch yet to be born" msgstr "không thể hủy bỏ từ một nhánh mà nó còn chưa được tạo ra" -#: sequencer.c:1638 builtin/grep.c:929 +#: sequencer.c:1657 builtin/grep.c:711 #, c-format msgid "cannot open '%s'" msgstr "không mở được “%s”" -#: sequencer.c:1640 +#: sequencer.c:1659 #, c-format msgid "cannot read '%s': %s" msgstr "không thể đọc “%s”: %s" -#: sequencer.c:1641 +#: sequencer.c:1660 msgid "unexpected end of file" msgstr "gặp kết thúc tập tin đột xuất" -#: sequencer.c:1647 +#: sequencer.c:1666 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "tập tin HEAD “pre-cherry-pick” đã lưu “%s” bị hỏng" -#: sequencer.c:1658 +#: sequencer.c:1677 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" "Bạn có lẽ đã có HEAD đã bị di chuyển đi, Không thể tua, kiểm tra HEAD của " "bạn!" -#: sequencer.c:1795 sequencer.c:2086 +#: sequencer.c:1818 sequencer.c:2109 msgid "cannot read HEAD" msgstr "không thể đọc HEAD" -#: sequencer.c:1835 builtin/difftool.c:633 +#: sequencer.c:1858 builtin/difftool.c:640 #, c-format msgid "could not copy '%s' to '%s'" msgstr "không thể chép “%s” sang “%s”" -#: sequencer.c:1851 +#: sequencer.c:1874 msgid "could not read index" msgstr "không thể đọc bảng mục lục" -#: sequencer.c:1856 +#: sequencer.c:1879 #, c-format msgid "" "execution failed: %s\n" @@ -3305,11 +3340,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:1862 +#: sequencer.c:1885 msgid "and made changes to the index and/or the working tree\n" msgstr "và tạo các thay đổi bảng mục lục và/hay cây làm việc\n" -#: sequencer.c:1868 +#: sequencer.c:1891 #, c-format msgid "" "execution succeeded: %s\n" @@ -3326,17 +3361,17 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:1925 +#: sequencer.c:1948 #, c-format msgid "Applied autostash.\n" msgstr "Đã áp dụng autostash.\n" -#: sequencer.c:1937 +#: sequencer.c:1960 #, c-format msgid "cannot store %s" msgstr "không thử lưu “%s”" -#: sequencer.c:1940 git-rebase.sh:173 +#: sequencer.c:1963 git-rebase.sh:175 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -3348,57 +3383,57 @@ msgstr "" "Bạn có thể chạy lệnh \"git stash pop\" hay \"git stash drop\" bất kỳ lúc " "nào.\n" -#: sequencer.c:2022 +#: sequencer.c:2045 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Dừng lại ở %s… %.*s\n" -#: sequencer.c:2064 +#: sequencer.c:2087 #, c-format msgid "unknown command %d" msgstr "không hiểu câu lệnh %d" -#: sequencer.c:2094 +#: sequencer.c:2117 msgid "could not read orig-head" msgstr "không thể đọc orig-head" -#: sequencer.c:2099 +#: sequencer.c:2122 sequencer.c:2678 msgid "could not read 'onto'" msgstr "không thể đọc “onto”." -#: sequencer.c:2106 +#: sequencer.c:2129 #, c-format msgid "could not update %s" msgstr "không thể cập nhật %s" -#: sequencer.c:2113 +#: sequencer.c:2136 #, c-format msgid "could not update HEAD to %s" msgstr "không thể cập nhật HEAD thành %s" -#: sequencer.c:2197 +#: sequencer.c:2220 msgid "cannot rebase: You have unstaged changes." msgstr "không thể cải tổ: Bạn có các thay đổi chưa được đưa lên bệ phóng." -#: sequencer.c:2202 +#: sequencer.c:2225 msgid "could not remove CHERRY_PICK_HEAD" msgstr "không thể xóa bỏ CHERRY_PICK_HEAD" -#: sequencer.c:2211 +#: sequencer.c:2234 msgid "cannot amend non-existing commit" msgstr "không thể tu bỏ một lần chuyển giao không tồn tại" -#: sequencer.c:2213 +#: sequencer.c:2236 #, c-format msgid "invalid file: '%s'" msgstr "tập tin không hợp lệ: “%s”" -#: sequencer.c:2215 +#: sequencer.c:2238 #, c-format msgid "invalid contents: '%s'" msgstr "nội dung không hợp lệ: “%s”" -#: sequencer.c:2218 +#: sequencer.c:2241 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -3408,24 +3443,111 @@ msgstr "" "Bạn có các thay đổi chưa chuyển giao trong thư mục làm việc. Vui lòng\n" "chuyển giao chúng trước và sau đó chạy lệnh “git rebase --continue” lần nữa." -#: sequencer.c:2228 +#: sequencer.c:2251 msgid "could not commit staged changes." msgstr "không thể chuyển giao các thay đổi đã đưa lên bệ phóng." -#: sequencer.c:2308 +#: sequencer.c:2331 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: không thể cherry-pick một %s" -#: sequencer.c:2312 +#: sequencer.c:2335 #, c-format msgid "%s: bad revision" msgstr "%s: điểm xét duyệt sai" -#: sequencer.c:2345 +#: sequencer.c:2368 msgid "can't revert as initial commit" msgstr "không thể hoàn nguyên một lần chuyển giao khởi tạo" +#: sequencer.c:2471 +msgid "make_script: unhandled options" +msgstr "make_script: các tùy chọn được không xử lý" + +#: sequencer.c:2474 +msgid "make_script: error preparing revisions" +msgstr "make_script: lỗi chuẩn bị điểm hiệu chỉnh" + +#: sequencer.c:2510 +#, c-format +msgid "unusable todo list: '%s'" +msgstr "danh sách cần làm không dùng được: “%s”" + +#: sequencer.c:2516 +#, c-format +msgid "unable to open '%s' for writing" +msgstr "không thể mở “%s” để ghi" + +#: sequencer.c:2561 +#, c-format +msgid "unrecognized setting %s for optionrebase.missingCommitsCheck. Ignoring." +msgstr "" +"không nhận ra cài đặt %s cho optionrebase.missingCommitsCheck. Nên bỏ qua." + +#: sequencer.c:2641 +#, c-format +msgid "" +"Warning: some commits may have been dropped accidentally.\n" +"Dropped commits (newer to older):\n" +msgstr "" +"Cảnh báo: một số lần chuyển giao có lẽ đã bị xóa một cách tình cờ.\n" +"Các lần chuyển giao bị xóa (từ mới đến cũ):\n" + +#: sequencer.c:2648 +#, c-format +msgid "" +"To avoid this message, use \"drop\" to explicitly remove a commit.\n" +"\n" +"Use 'git config rebase.missingCommitsCheck' to change the level of " +"warnings.\n" +"The possible behaviours are: ignore, warn, error.\n" +"\n" +msgstr "" +"Để tránh thông báo này, dùng \"drop\" một cách rõ ràng để xóa bỏ một lần " +"chuyển giao.\n" +"\n" +"Dùng “git config rebase.missingCommitsCheck” để thay đổi mức độ của cảnh " +"báo.\n" +"Cánh ứng xử có thể là: ignore, warn, error.\n" +"\n" + +#: sequencer.c:2660 +#, c-format +msgid "" +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" +"continue'.\n" +"Or you can abort the rebase with 'git rebase --abort'.\n" +msgstr "" +"Bạn có thể sửa nó bằng “git rebase --edit-todo” và sau đó chạy “git rebase --" +"continue”.\n" +"Hoặc là bạn có thể bãi bỏ việc cải tổ bằng “git rebase --abort”.\n" + +#: sequencer.c:2708 +#, c-format +msgid "could not parse commit '%s'" +msgstr "không thể phân tích lần chuyển giao “%s”" + +#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395 +#: builtin/am.c:775 +#, c-format +msgid "could not open '%s' for writing" +msgstr "không thể mở “%s” để ghi" + +#: sequencer.c:2756 +#, c-format +msgid "could not truncate '%s'" +msgstr "không thể cắt cụt “%s”" + +#: sequencer.c:2848 +msgid "the script was already rearranged." +msgstr "văn lệnh đã sẵn được sắp đặt rồi." + +#: sequencer.c:2953 +#, c-format +msgid "could not finish '%s'" +msgstr "không thể hoàn thành “%s”" + #: setup.c:171 #, c-format msgid "" @@ -3459,34 +3581,34 @@ msgstr "" "Dùng “--” để ngăn cách các đường dẫn khỏi điểm xem xét, như thế này:\n" "“git <lệnh> [<điểm xem xét>…] -- [<tập tin>…]”" -#: setup.c:504 +#: setup.c:499 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Cần phiên bản kho git <= %d, nhưng lại nhận được %d" -#: setup.c:512 +#: setup.c:507 msgid "unknown repository extensions found:" msgstr "tìm thấy phần mở rộng kho chưa biết:" -#: setup.c:810 +#: setup.c:806 #, c-format msgid "Not a git repository (or any of the parent directories): %s" msgstr "Không phải là kho git (hoặc bất kỳ thư mục cha mẹ nào): %s" -#: setup.c:812 builtin/index-pack.c:1652 +#: setup.c:808 builtin/index-pack.c:1653 msgid "Cannot come back to cwd" msgstr "Không thể quay lại cwd" -#: setup.c:1050 +#: setup.c:1046 msgid "Unable to read current working directory" msgstr "Không thể đọc thư mục làm việc hiện hành" -#: setup.c:1062 setup.c:1068 +#: setup.c:1058 setup.c:1064 #, c-format msgid "Cannot change to '%s'" msgstr "Không thể chuyển sang “%s”" -#: setup.c:1081 +#: setup.c:1077 #, c-format msgid "" "Not a git repository (or any parent up to mount point %s)\n" @@ -3496,7 +3618,7 @@ msgstr "" "Dừng tại biên của hệ thống tập tin (GIT_DISCOVERY_ACROSS_FILESYSTEM chưa " "đặt)." -#: setup.c:1173 +#: setup.c:1159 #, c-format msgid "" "Problem with core.sharedRepository filemode value (0%.3o).\n" @@ -3505,56 +3627,41 @@ msgstr "" "Gặp vấn đề với gía trị chế độ tập tin core.sharedRepository (0%.3o).\n" "người sở hữu tập tin phải luôn có quyền đọc và ghi." -#: sha1_file.c:560 +#: sha1_file.c:528 #, c-format msgid "path '%s' does not exist" msgstr "đường dẫn “%s” không tồn tại" -#: sha1_file.c:586 +#: sha1_file.c:554 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "kho tham chiếu “%s” như là lấy ra liên kết vẫn chưa được hỗ trợ." -#: sha1_file.c:592 +#: sha1_file.c:560 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "kho tham chiếu “%s” không phải là một kho nội bộ." -#: sha1_file.c:598 +#: sha1_file.c:566 #, c-format msgid "reference repository '%s' is shallow" msgstr "kho tham chiếu “%s” là nông" -#: sha1_file.c:606 +#: sha1_file.c:574 #, c-format msgid "reference repository '%s' is grafted" msgstr "kho tham chiếu “%s” bị cấy ghép" -#: sha1_file.c:1245 -msgid "offset before end of packfile (broken .idx?)" -msgstr "vị trí tương đối trước điểm kết thúc của tập tin gói (.idx hỏng à?)" - -#: sha1_file.c:2729 -#, c-format -msgid "offset before start of pack index for %s (corrupt index?)" -msgstr "vị trí tương đối nằm trước chỉ mục gói cho %s (mục lục bị hỏng à?)" - -#: sha1_file.c:2733 -#, c-format -msgid "offset beyond end of pack index for %s (truncated index?)" -msgstr "" -"vị trí tương đối vượt quá cuối của chỉ mục gói cho %s (mục lục bị cắt cụt à?)" - -#: sha1_name.c:419 +#: sha1_name.c:420 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "tóm lược SHA1 %s chưa rõ ràng" -#: sha1_name.c:430 +#: sha1_name.c:431 msgid "The candidates are:" msgstr "Các ứng cử là:" -#: sha1_name.c:589 +#: sha1_name.c:590 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -3578,66 +3685,72 @@ msgstr "" "này\n" "bằng cách chạy lệnh \"git config advice.objectNameWarning false\"" -#: submodule.c:70 submodule.c:104 +#: submodule.c:93 submodule.c:127 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" "Không thể thay đổi .gitmodules chưa hòa trộn, hãy giải quyết xung đột trộn " "trước" -#: submodule.c:74 submodule.c:108 +#: submodule.c:97 submodule.c:131 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "Không thể tìm thấy phần trong .gitmodules nơi mà đường_dẫn=%s" -#: submodule.c:82 +#: submodule.c:105 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Không thể cập nhật mục .gitmodules %s" -#: submodule.c:115 +#: submodule.c:138 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "Không thể gỡ bỏ mục .gitmodules dành cho %s" -#: submodule.c:126 +#: submodule.c:149 msgid "staging updated .gitmodules failed" msgstr "gặp lỗi khi tổ chức .gitmodules đã cập nhật" -#: submodule.c:165 -msgid "negative values not allowed for submodule.fetchJobs" -msgstr "không cho phép giá trị âm ở submodule.fetchJobs" - -#: submodule.c:376 +#: submodule.c:309 #, c-format msgid "in unpopulated submodule '%s'" msgstr "Trong mô-đun-con không có gì “%s”" -#: submodule.c:407 +#: submodule.c:340 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Đặc tả đường dẫn “%s” thì ở trong mô-đun-con “%.*s”" -#: submodule.c:1337 +#: submodule.c:799 +#, c-format +msgid "submodule entry '%s' (%s) is a %s, not a commit" +msgstr "" +"mục tin mô-đun-con “%s” (%s) là một %s, không phải là một lần chuyển giao" + +#: submodule.c:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149 +msgid "Failed to resolve HEAD as a valid ref." +msgstr "Gặp lỗi khi phân giải HEAD như là một tham chiếu hợp lệ." + +#: submodule.c:1304 #, c-format msgid "'%s' not recognized as a git repository" msgstr "không nhận ra “%s” là một kho git" -#: submodule.c:1475 +#: submodule.c:1442 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "không thể lấy thống kê “git status” trong mô-đun-con “%s”" -#: submodule.c:1488 +#: submodule.c:1455 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "không thể chạy “git status” trong mô-đun-con “%s”" -#: submodule.c:1581 +#: submodule.c:1548 #, c-format msgid "submodule '%s' has dirty index" msgstr "mô-đun-con “%s” có mục lục còn bẩn" -#: submodule.c:1845 +#: submodule.c:1809 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -3645,18 +3758,18 @@ msgstr "" "relocate_gitdir cho mô-đun-con “%s” với nhiều hơn một cây làm việc là chưa " "được hỗ trợ" -#: submodule.c:1857 submodule.c:1913 +#: submodule.c:1821 submodule.c:1877 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "không thể tìm kiếm tên cho mô-đun-con “%s”" -#: submodule.c:1861 builtin/submodule--helper.c:678 -#: builtin/submodule--helper.c:688 +#: submodule.c:1825 builtin/submodule--helper.c:671 +#: builtin/submodule--helper.c:681 #, c-format msgid "could not create directory '%s'" msgstr "không thể tạo thư mục “%s”" -#: submodule.c:1864 +#: submodule.c:1828 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -3667,94 +3780,98 @@ msgstr "" "“%s” sang\n" "“%s”\n" -#: submodule.c:1948 +#: submodule.c:1912 #, c-format msgid "could not recurse into submodule '%s'" msgstr "không thể đệ quy vào trong mô-đun-con “%s”" -#: submodule.c:1992 +#: submodule.c:1956 msgid "could not start ls-files in .." msgstr "không thể lấy thông tin thống kê về ls-files trong .." -#: submodule.c:2012 +#: submodule.c:1976 msgid "BUG: returned path string doesn't match cwd?" msgstr "LỖI: trả về chuỗi đường dẫn không khớp cwd?" -#: submodule.c:2031 +#: submodule.c:1995 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree trả về mã không như mong đợi %d" -#: submodule-config.c:420 +#: submodule-config.c:263 +msgid "negative values not allowed for submodule.fetchjobs" +msgstr "không cho phép giá trị âm ở submodule.fetchJobs" + +#: submodule-config.c:436 #, c-format msgid "invalid value for %s" msgstr "giá trị cho %s không hợp lệ" -#: trailer.c:241 +#: trailer.c:238 #, c-format msgid "running trailer command '%s' failed" msgstr "chạy lệnh kéo theo “%s” gặp lỗi" -#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540 -#: trailer.c:544 +#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 +#: trailer.c:557 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "không hiểu giá trị “%s” cho khóa “%s”" -#: trailer.c:526 trailer.c:531 builtin/remote.c:290 +#: trailer.c:539 trailer.c:544 builtin/remote.c:290 #, c-format msgid "more than one %s" msgstr "nhiều hơn một %s" -#: trailer.c:703 +#: trailer.c:730 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "thẻ thừa trống rỗng trong phần thừa “%.*s”" -#: trailer.c:723 +#: trailer.c:750 #, c-format msgid "could not read input file '%s'" msgstr "không đọc được tập tin đầu vào “%s”" -#: trailer.c:726 +#: trailer.c:753 msgid "could not read from stdin" msgstr "không thể đọc từ đầu vào tiêu chuẩn" -#: trailer.c:950 builtin/am.c:45 +#: trailer.c:1008 builtin/am.c:46 #, c-format msgid "could not stat %s" msgstr "không thể lấy thông tin thống kê về %s" -#: trailer.c:952 +#: trailer.c:1010 #, c-format msgid "file %s is not a regular file" msgstr "\"%s\" không phải là tập tin bình thường" -#: trailer.c:954 +#: trailer.c:1012 #, c-format msgid "file %s is not writable by user" msgstr "tập tin %s người dùng không thể ghi được" -#: trailer.c:966 +#: trailer.c:1024 msgid "could not open temporary file" msgstr "không thể tạo tập tin tạm thời" -#: trailer.c:1002 +#: trailer.c:1064 #, c-format msgid "could not rename temporary file to %s" msgstr "không thể đổi tên tập tin tạm thời thành %s" -#: transport.c:63 +#: transport.c:62 #, c-format msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "Không thể đặt thượng nguồn của “%s” thành “%s” của “%s”\n" -#: transport.c:152 +#: transport.c:151 #, c-format msgid "transport: invalid depth option '%s'" msgstr "vận chuyển: tùy chọn độ sâu “%s” không hợp lệ" -#: transport.c:890 +#: transport.c:888 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -3763,7 +3880,7 @@ msgstr "" "Các đường dẫn mô-đun-con sau đây có chứa các thay đổi cái mà\n" "có thể được tìm thấy trên mọi máy phục vụ:\n" -#: transport.c:894 +#: transport.c:892 #, c-format msgid "" "\n" @@ -3790,7 +3907,7 @@ msgstr "" "để đẩy chúng lên máy phục vụ.\n" "\n" -#: transport.c:902 +#: transport.c:900 msgid "Aborting." msgstr "Bãi bỏ." @@ -3811,11 +3928,11 @@ msgstr "chế độ dị hình trong đề mục cây" msgid "empty filename in tree entry" msgstr "tên tập tin trống rỗng trong mục tin cây" -#: tree-walk.c:113 +#: tree-walk.c:114 msgid "too-short tree file" msgstr "tập tin cây quá ngắn" -#: unpack-trees.c:105 +#: unpack-trees.c:106 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3826,7 +3943,7 @@ msgstr "" "%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn " "chuyển nhánh." -#: unpack-trees.c:107 +#: unpack-trees.c:108 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3836,7 +3953,7 @@ msgstr "" "checkout:\n" "%%s" -#: unpack-trees.c:110 +#: unpack-trees.c:111 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3847,7 +3964,7 @@ msgstr "" "%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn hòa " "trộn." -#: unpack-trees.c:112 +#: unpack-trees.c:113 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3857,7 +3974,7 @@ msgstr "" "hòa trộn:\n" "%%s" -#: unpack-trees.c:115 +#: unpack-trees.c:116 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -3867,7 +3984,7 @@ msgstr "" "%s:\n" "%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạ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" @@ -3877,7 +3994,7 @@ msgstr "" "%s:\n" "%%s" -#: unpack-trees.c:122 +#: unpack-trees.c:123 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -3887,7 +4004,7 @@ msgstr "" "trong nó:\n" "%s" -#: unpack-trees.c:126 +#: unpack-trees.c:127 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -3897,7 +4014,7 @@ msgstr "" "checkout:\n" "%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn chuyển nhánh." -#: unpack-trees.c:128 +#: unpack-trees.c:129 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -3907,7 +4024,7 @@ msgstr "" "checkout:\n" "%%s" -#: unpack-trees.c:131 +#: unpack-trees.c:132 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -3917,7 +4034,7 @@ msgstr "" "trộn:\n" "%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn hòa trộn." -#: unpack-trees.c:133 +#: unpack-trees.c:134 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -3927,7 +4044,7 @@ msgstr "" "trộn:\n" "%%s" -#: unpack-trees.c:136 +#: unpack-trees.c:137 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -3936,7 +4053,7 @@ msgstr "" "Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ bỏ bởi %s:\n" "%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạ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" @@ -3945,7 +4062,7 @@ msgstr "" "Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ bỏ bởi %s:\n" "%%s" -#: unpack-trees.c:143 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3956,7 +4073,7 @@ msgstr "" "checkout:\n" "%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn chuyển nhánh." -#: unpack-trees.c:145 +#: unpack-trees.c:146 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3967,7 +4084,7 @@ msgstr "" "checkout:\n" "%%s" -#: unpack-trees.c:148 +#: unpack-trees.c:149 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -3977,7 +4094,7 @@ msgstr "" "hòa trộn:\n" "%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn hòa trộn." -#: unpack-trees.c:150 +#: unpack-trees.c:151 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -3987,7 +4104,7 @@ msgstr "" "hòa trộn:\n" "%%s" -#: unpack-trees.c:153 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -3997,7 +4114,7 @@ msgstr "" "%s:\n" "%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạ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" @@ -4007,21 +4124,21 @@ msgstr "" "%s:\n" "%%s" -#: unpack-trees.c:162 +#: unpack-trees.c:163 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "Mục “%s” đè lên “%s”. Không thể buộc." -#: unpack-trees.c:165 +#: unpack-trees.c:166 #, c-format msgid "" -"Cannot update sparse checkout: the following entries are not up-to-date:\n" +"Cannot update sparse checkout: the following entries are not up to date:\n" "%s" msgstr "" "Không thể cập nhật checkout rải rác: các mục tin sau đây chưa cập nhật:\n" "%s" -#: unpack-trees.c:167 +#: unpack-trees.c:168 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -4032,7 +4149,7 @@ msgstr "" "nhật checkout rải rác:\n" "%s" -#: unpack-trees.c:169 +#: unpack-trees.c:170 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -4043,7 +4160,7 @@ msgstr "" "nhật checkout rải rác:\n" "%s" -#: unpack-trees.c:171 +#: unpack-trees.c:172 #, c-format msgid "" "Cannot update submodule:\n" @@ -4052,17 +4169,12 @@ msgstr "" "Không thể cập nhật mô-đun-con:\n" "%s" -#: unpack-trees.c:248 +#: unpack-trees.c:249 #, c-format msgid "Aborting\n" msgstr "Bãi bỏ\n" -#: unpack-trees.c:277 -#, c-format -msgid "submodule update strategy not supported for submodule '%s'" -msgstr "chiến lược cập nhật mô-đun-con không được hỗ trợ cho mô-đun-con “%s”" - -#: unpack-trees.c:346 +#: unpack-trees.c:331 msgid "Checking out files" msgstr "Đang lấy ra các tập tin" @@ -4105,13 +4217,8 @@ msgstr "gặp lỗi khi đọc “%s”" msgid "could not open '%s' for reading and writing" msgstr "không thể mở “%s” để đọc và ghi" -#: wrapper.c:225 wrapper.c:395 builtin/am.c:766 -#, c-format -msgid "could not open '%s' for writing" -msgstr "không thể mở “%s” để ghi" - -#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757 -#: builtin/am.c:849 builtin/merge.c:1014 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766 +#: builtin/am.c:858 builtin/merge.c:1041 #, c-format msgid "could not open '%s' for reading" msgstr "không thể mở “%s” để đọc" @@ -4135,200 +4242,200 @@ msgstr "không thể ghi vào %s" msgid "could not close %s" msgstr "không thể đóng %s" -#: wt-status.c:152 +#: wt-status.c:150 msgid "Unmerged paths:" msgstr "Những đường dẫn chưa được hòa trộn:" -#: wt-status.c:179 wt-status.c:206 +#: wt-status.c:177 wt-status.c:204 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (dùng \"git reset %s <tập-tin>…\" để bỏ ra khỏi bệ phóng)" -#: wt-status.c:181 wt-status.c:208 +#: wt-status.c:179 wt-status.c:206 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (dùng \"git rm --cached <tập-tin>…\" để bỏ ra khỏi bệ phóng)" -#: wt-status.c:185 +#: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (dùng \"git add <tập-tin>…\" để đánh dấu là cần giải quyết)" -#: wt-status.c:187 wt-status.c:191 +#: wt-status.c:185 wt-status.c:189 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" " (dùng \"git add/rm <tập-tin>…\" như là một cách thích hợp để đánh dấu là " "cần được giải quyết)" -#: wt-status.c:189 +#: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (dùng \"git rm <tập-tin>…\" để đánh dấu là cần giải quyết)" -#: wt-status.c:200 wt-status.c:981 +#: wt-status.c:198 wt-status.c:979 msgid "Changes to be committed:" msgstr "Những thay đổi sẽ được chuyển giao:" -#: wt-status.c:218 wt-status.c:990 +#: wt-status.c:216 wt-status.c:988 msgid "Changes not staged for commit:" msgstr "Các thay đổi chưa được đặt lên bệ phóng để chuyển giao:" -#: wt-status.c:222 +#: wt-status.c:220 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr " (dùng \"git add <tập-tin>…\" để cập nhật những gì sẽ chuyển giao)" -#: wt-status.c:224 +#: wt-status.c:222 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" " (dùng \"git add/rm <tập-tin>…\" để cập nhật những gì sẽ được chuyển giao)" -#: wt-status.c:225 +#: wt-status.c:223 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (dùng \"git checkout -- <tập-tin>…\" để loại bỏ các thay đổi trong thư mục " "làm việc)" -#: wt-status.c:227 +#: wt-status.c:225 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (chuyển giao hoặc là loại bỏ các nội dung chưa được theo dõi hay đã sửa " "chữa trong mô-đun-con)" -#: wt-status.c:239 +#: wt-status.c:237 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (dùng \"git %s <tập-tin>…\" để thêm vào những gì cần được chuyển giao)" -#: wt-status.c:254 +#: wt-status.c:252 msgid "both deleted:" msgstr "bị xóa bởi cả hai:" -#: wt-status.c:256 +#: wt-status.c:254 msgid "added by us:" msgstr "được thêm vào bởi chúng ta:" -#: wt-status.c:258 +#: wt-status.c:256 msgid "deleted by them:" msgstr "bị xóa đi bởi họ:" -#: wt-status.c:260 +#: wt-status.c:258 msgid "added by them:" msgstr "được thêm vào bởi họ:" -#: wt-status.c:262 +#: wt-status.c:260 msgid "deleted by us:" msgstr "bị xóa bởi chúng ta:" -#: wt-status.c:264 +#: wt-status.c:262 msgid "both added:" msgstr "được thêm vào bởi cả hai:" -#: wt-status.c:266 +#: wt-status.c:264 msgid "both modified:" msgstr "bị sửa bởi cả hai:" -#: wt-status.c:276 +#: wt-status.c:274 msgid "new file:" msgstr "tập tin mới:" -#: wt-status.c:278 +#: wt-status.c:276 msgid "copied:" msgstr "đã chép:" -#: wt-status.c:280 +#: wt-status.c:278 msgid "deleted:" msgstr "đã xóa:" -#: wt-status.c:282 +#: wt-status.c:280 msgid "modified:" msgstr "đã sửa:" -#: wt-status.c:284 +#: wt-status.c:282 msgid "renamed:" msgstr "đã đổi tên:" -#: wt-status.c:286 +#: wt-status.c:284 msgid "typechange:" msgstr "đổi-kiểu:" -#: wt-status.c:288 +#: wt-status.c:286 msgid "unknown:" msgstr "không hiểu:" -#: wt-status.c:290 +#: wt-status.c:288 msgid "unmerged:" msgstr "chưa hòa trộn:" -#: wt-status.c:372 +#: wt-status.c:370 msgid "new commits, " msgstr "lần chuyển giao mới, " -#: wt-status.c:374 +#: wt-status.c:372 msgid "modified content, " msgstr "nội dung bị sửa đổi, " -#: wt-status.c:376 +#: wt-status.c:374 msgid "untracked content, " msgstr "nội dung chưa được theo dõi, " -#: wt-status.c:821 +#: wt-status.c:819 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "Bạn hiện nay ở trong phần cất đi đang có %d mục" -#: wt-status.c:853 +#: wt-status.c:851 msgid "Submodules changed but not updated:" msgstr "Những mô-đun-con đã bị thay đổi nhưng chưa được cập nhật:" -#: wt-status.c:855 +#: wt-status.c:853 msgid "Submodule changes to be committed:" msgstr "Những mô-đun-con thay đổi đã được chuyển giao:" -#: wt-status.c:937 +#: wt-status.c:935 msgid "" -"Do not touch the line above.\n" -"Everything below will be removed." +"Do not modify or remove the line above.\n" +"Everything below it will be ignored." msgstr "" -"Không động đến đường ở trên.\n" +"Không sửa hay xóa bỏ đường ở trên.\n" "Mọi thứ phía dưới sẽ được xóa bỏ." -#: wt-status.c:1049 +#: wt-status.c:1048 msgid "You have unmerged paths." msgstr "Bạn có những đường dẫn chưa được hòa trộn." -#: wt-status.c:1052 +#: wt-status.c:1051 msgid " (fix conflicts and run \"git commit\")" msgstr " (sửa các xung đột rồi chạy \"git commit\")" -#: wt-status.c:1054 +#: wt-status.c:1053 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (dùng \"git merge --abort\" để bãi bỏ việc hòa trộn)" -#: wt-status.c:1059 +#: wt-status.c:1058 msgid "All conflicts fixed but you are still merging." msgstr "Tất cả các xung đột đã được giải quyết nhưng bạn vẫn đang hòa trộn." -#: wt-status.c:1062 +#: wt-status.c:1061 msgid " (use \"git commit\" to conclude merge)" msgstr " (dùng \"git commit\" để hoàn tất việc hòa trộn)" -#: wt-status.c:1072 +#: wt-status.c:1071 msgid "You are in the middle of an am session." msgstr "Bạn đang ở giữa của một phiên “am”." -#: wt-status.c:1075 +#: wt-status.c:1074 msgid "The current patch is empty." msgstr "Miếng vá hiện tại bị trống rỗng." -#: wt-status.c:1079 +#: wt-status.c:1078 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (sửa các xung đột và sau đó chạy lệnh \"git am --continue\")" -#: wt-status.c:1081 +#: wt-status.c:1080 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (dùng \"git am --skip\" để bỏ qua miếng vá này)" -#: wt-status.c:1083 +#: wt-status.c:1082 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (dùng \"git am --abort\" để phục hồi lại nhánh nguyên thủy)" @@ -4638,7 +4745,7 @@ msgid "cannot %s: Your index contains uncommitted changes." msgstr "" "không thể %s: Mục lục của bạn có chứa các thay đổi chưa được chuyển giao." -#: compat/precompose_utf8.c:58 builtin/clone.c:436 +#: compat/precompose_utf8.c:58 builtin/clone.c:437 #, c-format msgid "failed to unlink '%s'" msgstr "gặp lỗi khi bỏ liên kết (unlink) “%s”" @@ -4652,7 +4759,7 @@ msgstr "git add [<các-tùy-chọn>] [--] <pathspec>…" msgid "unexpected diff status %c" msgstr "trạng thái lệnh diff không như mong đợi %c" -#: builtin/add.c:87 builtin/commit.c:292 +#: builtin/add.c:87 builtin/commit.c:291 msgid "updating files failed" msgstr "Cập nhật tập tin gặp lỗi" @@ -4661,115 +4768,115 @@ msgstr "Cập nhật tập tin gặp lỗi" msgid "remove '%s'\n" msgstr "gỡ bỏ “%s”\n" -#: builtin/add.c:151 +#: builtin/add.c:153 msgid "Unstaged changes after refreshing the index:" msgstr "" "Đưa ra khỏi bệ phóng các thay đổi sau khi làm tươi mới lại bảng mục lục:" -#: builtin/add.c:211 builtin/rev-parse.c:873 +#: builtin/add.c:213 builtin/rev-parse.c:888 msgid "Could not read the index" msgstr "Không thể đọc bảng mục lục" -#: builtin/add.c:222 +#: builtin/add.c:224 #, c-format msgid "Could not open '%s' for writing." msgstr "Không thể mở “%s” để ghi." -#: builtin/add.c:226 +#: builtin/add.c:228 msgid "Could not write patch" msgstr "Không thể ghi ra miếng vá" -#: builtin/add.c:229 +#: builtin/add.c:231 msgid "editing patch failed" msgstr "gặp lỗi khi sửa miếng vá" -#: builtin/add.c:232 +#: builtin/add.c:234 #, c-format msgid "Could not stat '%s'" msgstr "Không thể lấy thông tin thống kê về “%s”" -#: builtin/add.c:234 +#: builtin/add.c:236 msgid "Empty patch. Aborted." msgstr "Miếng vá trống rỗng. Nên bỏ qua." -#: builtin/add.c:239 +#: builtin/add.c:241 #, c-format msgid "Could not apply '%s'" msgstr "Không thể áp dụng miếng vá “%s”" -#: builtin/add.c:249 +#: builtin/add.c:251 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Các đường dẫn theo sau đây sẽ bị lờ đi bởi một trong các tập tin .gitignore " "của bạn:\n" -#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124 +#: builtin/add.c:271 builtin/clean.c:910 builtin/fetch.c:132 builtin/mv.c:124 #: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529 -#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164 +#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164 msgid "dry run" msgstr "chạy thử" -#: builtin/add.c:272 +#: builtin/add.c:274 msgid "interactive picking" msgstr "sửa bằng cách tương tác" -#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299 +#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310 msgid "select hunks interactively" msgstr "chọn “hunks” theo kiểu tương tác" -#: builtin/add.c:274 +#: builtin/add.c:276 msgid "edit current diff and apply" msgstr "sửa diff hiện nay và áp dụng nó" -#: builtin/add.c:275 +#: builtin/add.c:277 msgid "allow adding otherwise ignored files" msgstr "cho phép thêm các tập tin bị bỏ qua khác" -#: builtin/add.c:276 +#: builtin/add.c:278 msgid "update tracked files" msgstr "cập nhật các tập tin được theo dõi" -#: builtin/add.c:277 +#: builtin/add.c:279 msgid "record only the fact that the path will be added later" msgstr "chỉ ghi lại sự việc mà đường dẫn sẽ được thêm vào sau" -#: builtin/add.c:278 +#: builtin/add.c:280 msgid "add changes from all tracked and untracked files" msgstr "" "thêm các thay đổi từ tất cả các tập tin có cũng như không được theo dõi dấu " "vết" -#: builtin/add.c:281 +#: builtin/add.c:283 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" "lờ đi các đường dẫn bị gỡ bỏ trong cây thư mục làm việc (giống với --no-all)" -#: builtin/add.c:283 +#: builtin/add.c:285 msgid "don't add, only refresh the index" msgstr "không thêm, chỉ làm tươi mới bảng mục lục" -#: builtin/add.c:284 +#: builtin/add.c:286 msgid "just skip files which cannot be added because of errors" msgstr "chie bỏ qua những tập tin mà nó không thể được thêm vào bởi vì gặp lỗi" -#: builtin/add.c:285 +#: builtin/add.c:287 msgid "check if - even missing - files are ignored in dry run" msgstr "" "kiểm tra xem - thậm chí thiếu - tập tin bị bỏ qua trong quá trình chạy thử" -#: builtin/add.c:286 builtin/update-index.c:952 +#: builtin/add.c:288 builtin/update-index.c:954 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/add.c:286 builtin/update-index.c:953 +#: builtin/add.c:288 builtin/update-index.c:955 msgid "override the executable bit of the listed files" msgstr "ghi đè lên bít thi hành của các tập tin được liệt kê" -#: builtin/add.c:288 +#: builtin/add.c:290 msgid "warn when adding an embedded repository" msgstr "cảnh báo khi thêm một kho nhúng" -#: builtin/add.c:303 +#: builtin/add.c:305 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -4800,151 +4907,151 @@ msgstr "" "\n" "Xem \"git help submodule\" để biết thêm chi tiết." -#: builtin/add.c:331 +#: builtin/add.c:333 #, c-format msgid "adding embedded git repository: %s" msgstr "thêm cần một kho git nhúng: %s" -#: builtin/add.c:349 +#: builtin/add.c:351 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Sử dụng tùy chọn -f nếu bạn thực sự muốn thêm chúng vào.\n" -#: builtin/add.c:357 +#: builtin/add.c:359 msgid "adding files failed" msgstr "thêm tập tin gặp lỗi" -#: builtin/add.c:394 +#: builtin/add.c:396 msgid "-A and -u are mutually incompatible" msgstr "-A và -u xung khắc nhau" -#: builtin/add.c:401 +#: builtin/add.c:403 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "Tùy chọn --ignore-missing chỉ có thể được dùng cùng với --dry-run" -#: builtin/add.c:405 +#: builtin/add.c:407 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "--chmod tham số “%s” phải hoặc là -x hay +x" -#: builtin/add.c:420 +#: builtin/add.c:422 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Không có gì được chỉ ra, không có gì được thêm vào.\n" -#: builtin/add.c:421 +#: builtin/add.c:423 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Có lẽ ý bạn là “git add .” phải không?\n" -#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282 -#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351 -#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272 -#: builtin/submodule--helper.c:244 +#: builtin/add.c:428 builtin/check-ignore.c:176 builtin/checkout.c:282 +#: builtin/checkout.c:479 builtin/clean.c:957 builtin/commit.c:350 +#: builtin/mv.c:143 builtin/reset.c:249 builtin/rm.c:271 +#: builtin/submodule--helper.c:243 msgid "index file corrupt" msgstr "tập tin ghi bảng mục lục bị hỏng" -#: builtin/am.c:413 +#: builtin/am.c:414 msgid "could not parse author script" msgstr "không thể phân tích cú pháp văn lệnh tác giả" -#: builtin/am.c:489 +#: builtin/am.c:498 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "“%s” bị xóa bởi móc applypatch-msg" -#: builtin/am.c:530 +#: builtin/am.c:539 #, c-format msgid "Malformed input line: '%s'." msgstr "Dòng đầu vào dị hình: “%s”." -#: builtin/am.c:567 +#: builtin/am.c:576 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Gặp lỗi khi sao chép ghi chú (note) từ “%s” tới “%s”" -#: builtin/am.c:593 +#: builtin/am.c:602 msgid "fseek failed" msgstr "fseek gặp lỗi" -#: builtin/am.c:777 +#: builtin/am.c:786 #, c-format msgid "could not parse patch '%s'" msgstr "không thể phân tích cú pháp “%s”" -#: builtin/am.c:842 +#: builtin/am.c:851 msgid "Only one StGIT patch series can be applied at once" msgstr "Chỉ có một sê-ri miếng vá StGIT được áp dụng một lúc" -#: builtin/am.c:889 +#: builtin/am.c:899 msgid "invalid timestamp" msgstr "dấu thời gian không hợp lệ" -#: builtin/am.c:892 builtin/am.c:900 +#: builtin/am.c:904 builtin/am.c:916 msgid "invalid Date line" msgstr "dòng Ngày tháng không hợp lệ" -#: builtin/am.c:897 +#: builtin/am.c:911 msgid "invalid timezone offset" msgstr "độ lệch múi giờ không hợp lệ" -#: builtin/am.c:986 +#: builtin/am.c:1004 msgid "Patch format detection failed." msgstr "Dò tìm định dạng miếng vá gặp lỗi." -#: builtin/am.c:991 builtin/clone.c:401 +#: builtin/am.c:1009 builtin/clone.c:402 #, c-format msgid "failed to create directory '%s'" msgstr "tạo thư mục \"%s\" gặp lỗi" -#: builtin/am.c:995 +#: builtin/am.c:1013 msgid "Failed to split patches." msgstr "Gặp lỗi khi chia nhỏ các miếng vá." -#: builtin/am.c:1120 builtin/commit.c:377 +#: builtin/am.c:1142 builtin/commit.c:376 msgid "unable to write index file" msgstr "không thể ghi tập tin lưu mục lục" -#: builtin/am.c:1171 +#: builtin/am.c:1193 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Khi bạn đã phân giải xong trục trặc này, hãy chạy \"%s --continue\"." -#: builtin/am.c:1172 +#: builtin/am.c:1194 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" "Nếu bạn muốn bỏ qua miếng vá này, hãy chạy lệnh \"%s --skip\" để thay thế." -#: builtin/am.c:1173 +#: builtin/am.c:1195 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "Để phục hồi lại nhánh gốc và dừng vá, hãy chạy \"%s --abort\"." -#: builtin/am.c:1304 +#: builtin/am.c:1302 msgid "Patch is empty." msgstr "Miếng vá trống rỗng." -#: builtin/am.c:1370 +#: builtin/am.c:1368 #, c-format msgid "invalid ident line: %.*s" msgstr "dòng thụt lề không hợp lệ: %.*s" -#: builtin/am.c:1392 +#: builtin/am.c:1390 #, c-format msgid "unable to parse commit %s" msgstr "không thể phân tích lần chuyển giao “%s”" -#: builtin/am.c:1586 +#: builtin/am.c:1584 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "Kho thiếu đối tượng blob cần thiết để trở về trên “3-way merge”." -#: builtin/am.c:1588 +#: builtin/am.c:1586 msgid "Using index info to reconstruct a base tree..." msgstr "" "Sử dụng thông tin trong bảng mục lục để cấu trúc lại một cây (tree) cơ sở…" -#: builtin/am.c:1607 +#: builtin/am.c:1605 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -4952,38 +5059,38 @@ msgstr "" "Bạn đã sửa miếng vá của mình bằng cách thủ công à?\n" "Nó không thể áp dụng các blob đã được ghi lại trong bảng mục lục của nó." -#: builtin/am.c:1613 +#: builtin/am.c:1611 msgid "Falling back to patching base and 3-way merge..." msgstr "Đang trở lại để vá cơ sở và “hòa trộn 3-đường”…" -#: builtin/am.c:1638 +#: builtin/am.c:1636 msgid "Failed to merge in the changes." msgstr "Gặp lỗi khi trộn vào các thay đổi." -#: builtin/am.c:1662 builtin/merge.c:632 +#: builtin/am.c:1660 builtin/merge.c:641 msgid "git write-tree failed to write a tree" msgstr "lệnh git write-tree gặp lỗi khi ghi một cây" -#: builtin/am.c:1669 +#: builtin/am.c:1667 msgid "applying to an empty history" msgstr "áp dụng vào một lịch sử trống rỗng" -#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803 -#: builtin/merge.c:828 +#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824 +#: builtin/merge.c:849 msgid "failed to write commit object" msgstr "gặp lỗi khi ghi đối tượng chuyển giao" -#: builtin/am.c:1715 builtin/am.c:1719 +#: builtin/am.c:1713 builtin/am.c:1717 #, c-format msgid "cannot resume: %s does not exist." msgstr "không thể phục hồi: %s không tồn tại." -#: builtin/am.c:1735 +#: builtin/am.c:1733 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "không thể được tương tác mà không có stdin kết nối với một thiết bị cuối" -#: builtin/am.c:1740 +#: builtin/am.c:1738 msgid "Commit Body is:" msgstr "Thân của lần chuyển giao là:" @@ -4991,37 +5098,37 @@ msgstr "Thân của lần chuyển giao là:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1750 +#: builtin/am.c:1748 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" "Áp dụng? đồng ý [y]/khô[n]g/chỉnh sửa [e]/hiển thị miếng [v]á/chấp nhận tất " "cả [a]: " -#: builtin/am.c:1800 +#: builtin/am.c:1798 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Bảng mục lục bẩn: không thể áp dụng các miếng vá (bẩn: %s)" -#: builtin/am.c:1840 builtin/am.c:1912 +#: builtin/am.c:1838 builtin/am.c:1910 #, c-format msgid "Applying: %.*s" msgstr "Áp dụng: %.*s" -#: builtin/am.c:1856 +#: builtin/am.c:1854 msgid "No changes -- Patch already applied." msgstr "Không thay đổi gì cả -- Miếng vá đã được áp dụng rồi." -#: builtin/am.c:1864 +#: builtin/am.c:1862 #, c-format msgid "Patch failed at %s %.*s" msgstr "Gặp lỗi khi vá tại %s %.*s" -#: builtin/am.c:1870 +#: builtin/am.c:1868 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "Bản sao chép của miếng vá mà nó gặp lỗi thì được tìm thấy trong: %s" -#: builtin/am.c:1915 +#: builtin/am.c:1913 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -5032,7 +5139,7 @@ msgstr "" "đã sẵn được đưa vào với cùng nội dung thay đổi; bạn có lẽ muốn bỏ qua miếng " "vá này." -#: builtin/am.c:1922 +#: builtin/am.c:1920 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -5045,17 +5152,17 @@ msgstr "" "Bạn có lẽ muốn chạy “git rm“ trên một tập tin để chấp nhận \"được xóa bởi họ" "\" cho nó." -#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323 -#: builtin/reset.c:331 +#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332 +#: builtin/reset.c:340 #, c-format msgid "Could not parse object '%s'." msgstr "không thể phân tích đối tượng “%s”." -#: builtin/am.c:2083 +#: builtin/am.c:2081 msgid "failed to clean index" msgstr "gặp lỗi khi dọn bảng mục lục" -#: builtin/am.c:2117 +#: builtin/am.c:2116 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -5063,135 +5170,134 @@ msgstr "" "Bạn có lẽ đã có HEAD đã bị di chuyển đi kể từ lần “am” thất bại cuối cùng.\n" "Không thể chuyển tới ORIG_HEAD" -#: builtin/am.c:2180 +#: builtin/am.c:2179 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Giá trị không hợp lệ cho --patch-format: %s" -#: builtin/am.c:2213 +#: builtin/am.c:2212 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<các-tùy-chọn>] [(<mbox>|<Maildir>)…]" -#: builtin/am.c:2214 +#: builtin/am.c:2213 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<các-tùy-chọn>] (--continue | --skip | --abort)" -#: builtin/am.c:2220 +#: builtin/am.c:2219 msgid "run interactively" msgstr "chạy kiểu tương tác" -#: builtin/am.c:2222 +#: builtin/am.c:2221 msgid "historical option -- no-op" msgstr "tùy chọn lịch sử -- không-toán-tử" -#: builtin/am.c:2224 +#: builtin/am.c:2223 msgid "allow fall back on 3way merging if needed" msgstr "cho phép quay trở lại để hòa trộn kiểu “3way” nếu cần" -#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57 +#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57 #: builtin/repack.c:180 msgid "be quiet" msgstr "im lặng" -#: builtin/am.c:2227 +#: builtin/am.c:2226 msgid "add a Signed-off-by line to the commit message" msgstr "Thêm dòng Signed-off-by cho ghi chú của lần chuyển giao" -#: builtin/am.c:2230 +#: builtin/am.c:2229 msgid "recode into utf8 (default)" msgstr "chuyển mã thành utf8 (mặc định)" -#: builtin/am.c:2232 +#: builtin/am.c:2231 msgid "pass -k flag to git-mailinfo" msgstr "chuyển cờ -k cho git-mailinfo" -#: builtin/am.c:2234 +#: builtin/am.c:2233 msgid "pass -b flag to git-mailinfo" msgstr "chuyển cờ -b cho git-mailinfo" -#: builtin/am.c:2236 +#: builtin/am.c:2235 msgid "pass -m flag to git-mailinfo" msgstr "chuyển cờ -m cho git-mailinfo" -#: builtin/am.c:2238 +#: builtin/am.c:2237 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "chuyển cờ --keep-cr cho git-mailsplit với định dạng mbox" -#: builtin/am.c:2241 +#: builtin/am.c:2240 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "đừng chuyển cờ --keep-cr cho git-mailsplit không phụ thuộc vào am.keepcr" -#: builtin/am.c:2244 +#: builtin/am.c:2243 msgid "strip everything before a scissors line" msgstr "cắt mọi thứ trước dòng scissors" -#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255 -#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 -#: builtin/am.c:2273 +#: builtin/am.c:2245 builtin/am.c:2248 builtin/am.c:2251 builtin/am.c:2254 +#: builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263 builtin/am.c:2266 +#: builtin/am.c:2272 msgid "pass it through git-apply" msgstr "chuyển nó qua git-apply" -#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 -#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142 -#: builtin/pull.c:197 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:399 parse-options.h:132 parse-options.h:134 -#: parse-options.h:245 +#: builtin/am.c:2262 builtin/fmt-merge-msg.c:664 builtin/fmt-merge-msg.c:667 +#: builtin/grep.c:843 builtin/merge.c:205 builtin/pull.c:142 builtin/pull.c:197 +#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195 +#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377 +#: parse-options.h:132 parse-options.h:134 parse-options.h:245 msgid "n" msgstr "n" -#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38 -#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39 +#: builtin/am.c:2268 builtin/branch.c:622 builtin/for-each-ref.c:38 +#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39 msgid "format" msgstr "định dạng" -#: builtin/am.c:2270 +#: builtin/am.c:2269 msgid "format the patch(es) are in" msgstr "định dạng (các) miếng vá theo" -#: builtin/am.c:2276 +#: builtin/am.c:2275 msgid "override error message when patch failure occurs" msgstr "đè lên các lời nhắn lỗi khi xảy ra lỗi vá nghiêm trọng" -#: builtin/am.c:2278 +#: builtin/am.c:2277 msgid "continue applying patches after resolving a conflict" msgstr "tiếp tục áp dụng các miếng vá sau khi giải quyết xung đột" -#: builtin/am.c:2281 +#: builtin/am.c:2280 msgid "synonyms for --continue" msgstr "đồng nghĩa với --continue" -#: builtin/am.c:2284 +#: builtin/am.c:2283 msgid "skip the current patch" msgstr "bỏ qua miếng vá hiện hành" -#: builtin/am.c:2287 +#: builtin/am.c:2286 msgid "restore the original branch and abort the patching operation." msgstr "phục hồi lại nhánh gốc và loại bỏ thao tác vá." -#: builtin/am.c:2291 +#: builtin/am.c:2290 msgid "lie about committer date" msgstr "nói dối về ngày chuyển giao" -#: builtin/am.c:2293 +#: builtin/am.c:2292 msgid "use current timestamp for author date" msgstr "dùng dấu thời gian hiện tại cho ngày tác giả" -#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233 -#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414 +#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236 +#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392 msgid "key-id" msgstr "mã-số-khóa" -#: builtin/am.c:2296 +#: builtin/am.c:2295 msgid "GPG-sign commits" msgstr "lần chuyển giao ký-GPG" -#: builtin/am.c:2299 +#: builtin/am.c:2298 msgid "(internal use for git-rebase)" msgstr "(dùng nội bộ cho git-rebase)" -#: builtin/am.c:2317 +#: builtin/am.c:2316 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." @@ -5199,16 +5305,16 @@ msgstr "" "Tùy chọn -b/--binary đã không dùng từ lâu rồi, và\n" "nó sẽ được bỏ đi. Xin đừng sử dụng nó thêm nữa." -#: builtin/am.c:2324 +#: builtin/am.c:2323 msgid "failed to read the index" msgstr "gặp lỗi đọc bảng mục lục" -#: builtin/am.c:2339 +#: builtin/am.c:2338 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "thư mục rebase trước %s không sẵn có nhưng mbox lại đưa ra." -#: builtin/am.c:2363 +#: builtin/am.c:2362 #, c-format msgid "" "Stray %s directory found.\n" @@ -5217,7 +5323,7 @@ msgstr "" "Tìm thấy thư mục lạc %s.\n" "Dùng \"git am --abort\" để loại bỏ nó đi." -#: builtin/am.c:2369 +#: builtin/am.c:2368 msgid "Resolve operation not in progress, we are not resuming." msgstr "Thao tác phân giải không được tiến hành, chúng ta không phục hồi lại." @@ -5422,14 +5528,18 @@ msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [<các-tùy-chọn>] (-m | -M) [<nhánh-cũ>] <nhánh-mới>" #: builtin/branch.c:31 +msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>" +msgstr "git branch [<các-tùy-chọn>] (-c | -C) [<nhánh-cũ>] <nhánh-mới>" + +#: builtin/branch.c:32 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [<các-tùy-chọn>] [-r | -a] [--points-at]" -#: builtin/branch.c:32 +#: builtin/branch.c:33 msgid "git branch [<options>] [-r | -a] [--format]" msgstr "git branch [<các-tùy-chọn>] [-r | -a] [--format]" -#: builtin/branch.c:145 +#: builtin/branch.c:146 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -5438,7 +5548,7 @@ msgstr "" "đang xóa nhánh “%s” mà nó lại đã được hòa trộn vào\n" " “%s”, nhưng vẫn chưa được hòa trộn vào HEAD." -#: builtin/branch.c:149 +#: builtin/branch.c:150 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -5447,12 +5557,12 @@ msgstr "" "không xóa nhánh “%s” cái mà chưa được hòa trộn vào\n" " “%s”, cho dù là nó đã được hòa trộn vào HEAD." -#: builtin/branch.c:163 +#: builtin/branch.c:164 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Không thể tìm kiếm đối tượng chuyển giao cho “%s”" -#: builtin/branch.c:167 +#: builtin/branch.c:168 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -5461,91 +5571,112 @@ msgstr "" "Nhánh “%s” không được trộn một cách đầy đủ.\n" "Nếu bạn thực sự muốn xóa nó, thì chạy lệnh “git branch -D %s”." -#: builtin/branch.c:180 +#: builtin/branch.c:181 msgid "Update of config-file failed" msgstr "Cập nhật tập tin cấu hình gặp lỗi" -#: builtin/branch.c:211 +#: builtin/branch.c:212 msgid "cannot use -a with -d" msgstr "không thể dùng tùy chọn -a với -d" -#: builtin/branch.c:217 +#: builtin/branch.c:218 msgid "Couldn't look up commit object for HEAD" msgstr "Không thể tìm kiếm đối tượng chuyển giao cho HEAD" -#: builtin/branch.c:231 +#: builtin/branch.c:232 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "Không thể xóa nhánh “%s” đã được lấy ra tại “%s”" -#: builtin/branch.c:246 +#: builtin/branch.c:247 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "không tìm thấy nhánh theo dõi máy chủ “%s”." -#: builtin/branch.c:247 +#: builtin/branch.c:248 #, c-format msgid "branch '%s' not found." msgstr "không tìm thấy nhánh “%s”." -#: builtin/branch.c:262 +#: builtin/branch.c:263 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "Gặp lỗi khi đang xóa nhánh theo dõi máy chủ “%s”" -#: builtin/branch.c:263 +#: builtin/branch.c:264 #, c-format msgid "Error deleting branch '%s'" msgstr "Gặp lỗi khi xóa bỏ nhánh “%s”" -#: builtin/branch.c:270 +#: builtin/branch.c:271 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Đã xóa nhánh theo dõi máy chủ \"%s\" (từng là %s).\n" -#: builtin/branch.c:271 +#: builtin/branch.c:272 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Nhánh “%s” đã bị xóa (từng là %s)\n" -#: builtin/branch.c:445 +#: builtin/branch.c:417 builtin/tag.c:58 +msgid "unable to parse format string" +msgstr "không thể phân tích chuỗi định dạng" + +#: builtin/branch.c:450 #, c-format msgid "Branch %s is being rebased at %s" msgstr "Nhánh %s đang được cải tổ lại tại %s" -#: builtin/branch.c:449 +#: builtin/branch.c:454 #, c-format msgid "Branch %s is being bisected at %s" msgstr "Nhánh %s đang được di chuyển phân đôi (bisect) tại %s" -#: builtin/branch.c:464 +#: builtin/branch.c:470 +msgid "cannot copy the current branch while not on any." +msgstr "không thể sao chép nhánh hiện hành trong khi nó chẳng ở đâu cả." + +#: builtin/branch.c:472 msgid "cannot rename the current branch while not on any." msgstr "không thể đổi tên nhánh hiện hành trong khi nó chẳng ở đâu cả." -#: builtin/branch.c:474 +#: builtin/branch.c:483 #, c-format msgid "Invalid branch name: '%s'" msgstr "Tên nhánh không hợp lệ: “%s”" -#: builtin/branch.c:491 +#: builtin/branch.c:504 msgid "Branch rename failed" msgstr "Gặp lỗi khi đổi tên nhánh" -#: builtin/branch.c:494 +#: builtin/branch.c:506 +msgid "Branch copy failed" +msgstr "Gặp lỗi khi sao chép nhánh" + +#: builtin/branch.c:510 +#, c-format +msgid "Copied a misnamed branch '%s' away" +msgstr "Đã chép nhánh khuyết danh “%s” đi" + +#: builtin/branch.c:513 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Đã đổi tên nhánh khuyết danh “%s” đi" -#: builtin/branch.c:497 +#: builtin/branch.c:519 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Nhánh bị đổi tên thành %s, nhưng HEAD lại không được cập nhật!" -#: builtin/branch.c:506 +#: builtin/branch.c:528 msgid "Branch is renamed, but update of config-file failed" msgstr "Nhánh bị đổi tên, nhưng cập nhật tập tin cấu hình gặp lỗi" -#: builtin/branch.c:522 +#: builtin/branch.c:530 +msgid "Branch is copied, but update of config-file failed" +msgstr "Nhánh đã được sao chép, nhưng cập nhật tập tin cấu hình gặp lỗi" + +#: builtin/branch.c:546 #, c-format msgid "" "Please edit the description for the branch\n" @@ -5556,176 +5687,184 @@ msgstr "" " %s\n" "Những dòng được bắt đầu bằng “%c” sẽ được cắt bỏ.\n" -#: builtin/branch.c:555 +#: builtin/branch.c:579 msgid "Generic options" msgstr "Tùy chọn chung" -#: builtin/branch.c:557 +#: builtin/branch.c:581 msgid "show hash and subject, give twice for upstream branch" msgstr "hiển thị mã băm và chủ đề, đưa ra hai lần cho nhánh thượng nguồn" -#: builtin/branch.c:558 +#: builtin/branch.c:582 msgid "suppress informational messages" msgstr "không xuất các thông tin" -#: builtin/branch.c:559 +#: builtin/branch.c:583 msgid "set up tracking mode (see git-pull(1))" msgstr "cài đặt chế độ theo dõi (xem git-pull(1))" -#: builtin/branch.c:561 -msgid "change upstream info" -msgstr "thay đổi thông tin thượng nguồn" +#: builtin/branch.c:585 +msgid "do not use" +msgstr "không dùng" -#: builtin/branch.c:563 +#: builtin/branch.c:587 msgid "upstream" msgstr "thượng nguồn" -#: builtin/branch.c:563 +#: builtin/branch.c:587 msgid "change the upstream info" msgstr "thay đổi thông tin thượng nguồn" -#: builtin/branch.c:564 +#: builtin/branch.c:588 msgid "Unset the upstream info" msgstr "Bỏ đặt thông tin thượng nguồn" -#: builtin/branch.c:565 +#: builtin/branch.c:589 msgid "use colored output" msgstr "tô màu kết xuất" -#: builtin/branch.c:566 +#: builtin/branch.c:590 msgid "act on remote-tracking branches" msgstr "thao tác trên nhánh “remote-tracking”" -#: builtin/branch.c:568 builtin/branch.c:570 +#: builtin/branch.c:592 builtin/branch.c:594 msgid "print only branches that contain the commit" msgstr "chỉ hiển thị những nhánh mà nó chứa lần chuyển giao" -#: builtin/branch.c:569 builtin/branch.c:571 +#: builtin/branch.c:593 builtin/branch.c:595 msgid "print only branches that don't contain the commit" msgstr "chỉ hiển thị những nhánh mà nó không chứa lần chuyển giao" -#: builtin/branch.c:574 +#: builtin/branch.c:598 msgid "Specific git-branch actions:" msgstr "Hành động git-branch:" -#: builtin/branch.c:575 +#: builtin/branch.c:599 msgid "list both remote-tracking and local branches" msgstr "liệt kê cả nhánh “remote-tracking” và nội bộ" -#: builtin/branch.c:577 +#: builtin/branch.c:601 msgid "delete fully merged branch" msgstr "xóa một toàn bộ nhánh đã hòa trộn" -#: builtin/branch.c:578 +#: builtin/branch.c:602 msgid "delete branch (even if not merged)" msgstr "xóa nhánh (cho dù là chưa được hòa trộn)" -#: builtin/branch.c:579 +#: builtin/branch.c:603 msgid "move/rename a branch and its reflog" msgstr "di chuyển hay đổi tên một nhánh và reflog của nó" -#: builtin/branch.c:580 +#: builtin/branch.c:604 msgid "move/rename a branch, even if target exists" msgstr "di chuyển hoặc đổi tên một nhánh ngay cả khi đích đã có sẵn" -#: builtin/branch.c:581 +#: builtin/branch.c:605 +msgid "copy a branch and its reflog" +msgstr "sao chép một nhánh và reflog của nó" + +#: builtin/branch.c:606 +msgid "copy a branch, even if target exists" +msgstr "sao chép một nhánh ngay cả khi đích đã có sẵn" + +#: builtin/branch.c:607 msgid "list branch names" msgstr "liệt kê các tên nhánh" -#: builtin/branch.c:582 +#: builtin/branch.c:608 msgid "create the branch's reflog" msgstr "tạo reflog của nhánh" -#: builtin/branch.c:584 +#: builtin/branch.c:610 msgid "edit the description for the branch" msgstr "sửa mô tả cho nhánh" -#: builtin/branch.c:585 +#: builtin/branch.c:611 msgid "force creation, move/rename, deletion" msgstr "buộc tạo, di chuyển/đổi tên, xóa" -#: builtin/branch.c:586 +#: builtin/branch.c:612 msgid "print only branches that are merged" msgstr "chỉ hiển thị những nhánh mà nó được hòa trộn" -#: builtin/branch.c:587 +#: builtin/branch.c:613 msgid "print only branches that are not merged" msgstr "chỉ hiển thị những nhánh mà nó không được hòa trộn" -#: builtin/branch.c:588 +#: builtin/branch.c:614 msgid "list branches in columns" msgstr "liệt kê các nhánh trong các cột" -#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427 +#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405 msgid "key" msgstr "khóa" -#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428 +#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406 msgid "field name to sort on" msgstr "tên trường cần sắp xếp" -#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407 -#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573 -#: builtin/tag.c:430 +#: builtin/branch.c:618 builtin/for-each-ref.c:43 builtin/notes.c:408 +#: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574 +#: builtin/tag.c:408 msgid "object" msgstr "đối tượng" -#: builtin/branch.c:593 +#: builtin/branch.c:619 msgid "print only branches of the object" msgstr "chỉ hiển thị các nhánh của đối tượng" -#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435 +#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415 msgid "sorting and filtering are case insensitive" msgstr "sắp xếp và lọc là phân biệt HOA thường" -#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434 +#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413 #: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "định dạng sẽ dùng cho đầu ra" -#: builtin/branch.c:615 -msgid "Failed to resolve HEAD as a valid ref." -msgstr "Gặp lỗi khi phân giải HEAD như là một tham chiếu hợp lệ." - -#: builtin/branch.c:619 builtin/clone.c:728 +#: builtin/branch.c:645 builtin/clone.c:729 msgid "HEAD not found below refs/heads!" msgstr "không tìm thấy HEAD ở dưới refs/heads!" -#: builtin/branch.c:642 +#: builtin/branch.c:668 msgid "--column and --verbose are incompatible" msgstr "tùy chọn --column và --verbose xung khắc nhau" -#: builtin/branch.c:653 builtin/branch.c:705 +#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741 msgid "branch name required" msgstr "cần chỉ ra tên nhánh" -#: builtin/branch.c:681 +#: builtin/branch.c:708 msgid "Cannot give description to detached HEAD" msgstr "Không thể đưa ra mô tả HEAD đã tách rời" -#: builtin/branch.c:686 +#: builtin/branch.c:713 msgid "cannot edit description of more than one branch" msgstr "không thể sửa mô tả cho nhiều hơn một nhánh" -#: builtin/branch.c:693 +#: builtin/branch.c:720 #, c-format msgid "No commit on branch '%s' yet." msgstr "Vẫn chưa chuyển giao trên nhánh “%s”." -#: builtin/branch.c:696 +#: builtin/branch.c:723 #, c-format msgid "No branch named '%s'." msgstr "Không có nhánh nào có tên “%s”." -#: builtin/branch.c:711 -msgid "too many branches for a rename operation" -msgstr "quá nhiều nhánh dành cho thao tác đổi tên" +#: builtin/branch.c:738 +msgid "too many branches for a copy operation" +msgstr "quá nhiều nhánh dành cho thao tác sao chép" -#: builtin/branch.c:716 -msgid "too many branches to set new upstream" -msgstr "quá nhiều nhánh được đặt cho thượng nguồn mới" +#: builtin/branch.c:747 +msgid "too many arguments for a rename operation" +msgstr "quá nhiều tham số cho thao tác đổi tên" -#: builtin/branch.c:720 +#: builtin/branch.c:752 +msgid "too many arguments to set new upstream" +msgstr "quá nhiều tham số để đặt thượng nguồn mới" + +#: builtin/branch.c:756 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -5733,58 +5872,46 @@ msgstr "" "không thể đặt thượng nguồn của HEAD thành %s khi mà nó chẳng chỉ đến nhánh " "nào cả." -#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766 +#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800 #, c-format msgid "no such branch '%s'" msgstr "không có nhánh nào như thế “%s”" -#: builtin/branch.c:727 +#: builtin/branch.c:763 #, c-format msgid "branch '%s' does not exist" msgstr "chưa có nhánh “%s”" -#: builtin/branch.c:739 -msgid "too many branches to unset upstream" -msgstr "quá nhiều nhánh để bỏ đặt thượng nguồn" +#: builtin/branch.c:775 +msgid "too many arguments to unset upstream" +msgstr "quá nhiều tham số để bỏ đặt thượng nguồn" -#: builtin/branch.c:743 +#: builtin/branch.c:779 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "không thể bỏ đặt thượng nguồn của HEAD không chỉ đến một nhánh nào cả." -#: builtin/branch.c:749 +#: builtin/branch.c:785 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Nhánh “%s” không có thông tin thượng nguồn" -#: builtin/branch.c:763 +#: builtin/branch.c:797 msgid "it does not make sense to create 'HEAD' manually" msgstr "không hợp lý khi tạo “HEAD” thủ công" -#: builtin/branch.c:769 +#: builtin/branch.c:803 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "hai tùy chọn -a và -r áp dụng cho lệnh “git branch” không hợp lý đối với tên " "nhánh" -#: builtin/branch.c:772 -#, c-format +#: builtin/branch.c:806 msgid "" -"The --set-upstream flag is deprecated and will be removed. Consider using --" -"track or --set-upstream-to\n" +"the '--set-upstream' option is no longer supported. Please use '--track' or " +"'--set-upstream-to' instead." msgstr "" -"Cờ --set-upstream đã lạc hậu và sẽ bị xóa bỏ. Nên dùng --track hoặc --set-" -"upstream-to\n" - -#: builtin/branch.c:789 -#, c-format -msgid "" -"\n" -"If you wanted to make '%s' track '%s', do this:\n" -"\n" -msgstr "" -"\n" -"Nếu bạn muốn “%s” theo dõi “%s”, thực hiện lệnh sau:\n" -"\n" +"tùy chọn --set-upstream đã không còn được hỗ trợ nữa. Vui lòng dùng “--" +"track” hoặc “--set-upstream-to” để thay thế." #: builtin/bundle.c:45 #, c-format @@ -5799,7 +5926,7 @@ msgstr "Cần một kho chứa để có thể tạo một bundle." msgid "Need a repository to unbundle." msgstr "Cần một kho chứa để có thể giải nén một bundle." -#: builtin/cat-file.c:519 +#: builtin/cat-file.c:521 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -5807,7 +5934,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <kiểu> | --textconv) | --filters) [--path=<đường/dẫn>] <đối_tượng>" -#: builtin/cat-file.c:520 +#: builtin/cat-file.c:522 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" @@ -5815,64 +5942,64 @@ msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:557 +#: builtin/cat-file.c:559 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<kiểu> là một trong số: blob, tree, commit hoặc tag" -#: builtin/cat-file.c:558 +#: builtin/cat-file.c:560 msgid "show object type" msgstr "hiển thị kiểu đối tượng" -#: builtin/cat-file.c:559 +#: builtin/cat-file.c:561 msgid "show object size" msgstr "hiển thị kích thước đối tượng" -#: builtin/cat-file.c:561 +#: builtin/cat-file.c:563 msgid "exit with zero when there's no error" msgstr "thoát với 0 khi không có lỗi" -#: builtin/cat-file.c:562 +#: builtin/cat-file.c:564 msgid "pretty-print object's content" msgstr "in nội dung đối tượng dạng dễ đọc" -#: builtin/cat-file.c:564 +#: builtin/cat-file.c:566 msgid "for blob objects, run textconv on object's content" msgstr "với đối tượng blob, chạy lệnh textconv trên nội dung của đối tượng" -#: builtin/cat-file.c:566 +#: builtin/cat-file.c:568 msgid "for blob objects, run filters on object's content" msgstr "với đối tượng blob, chạy lệnh filters trên nội dung của đối tượng" -#: builtin/cat-file.c:567 git-submodule.sh:944 +#: builtin/cat-file.c:569 git-submodule.sh:943 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:568 +#: builtin/cat-file.c:570 msgid "use a specific path for --textconv/--filters" msgstr "dùng một đường dẫn rõ ràng cho --textconv/--filters" -#: builtin/cat-file.c:570 +#: builtin/cat-file.c:572 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "cho phép -s và -t để làm việc với các đối tượng sai/hỏng" -#: builtin/cat-file.c:571 +#: builtin/cat-file.c:573 msgid "buffer --batch output" msgstr "đệm kết xuất --batch" -#: builtin/cat-file.c:573 +#: builtin/cat-file.c:575 msgid "show info and content of objects fed from the standard input" msgstr "" "hiển thị thông tin và nội dung của các đối tượng lấy từ đầu vào tiêu chuẩn" -#: builtin/cat-file.c:576 +#: builtin/cat-file.c:578 msgid "show info about objects fed from the standard input" msgstr "hiển thị các thông tin về đối tượng fed từ đầu vào tiêu chuẩn" -#: builtin/cat-file.c:579 +#: builtin/cat-file.c:581 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "theo liên kết mềm trong-cây (được dùng với --batch hay --batch-check)" -#: builtin/cat-file.c:581 +#: builtin/cat-file.c:583 msgid "show all objects with --batch or --batch-check" msgstr "hiển thị mọi đối tượng với --batch hay --batch-check" @@ -5900,7 +6027,7 @@ msgstr "đọc tên tập tin từ đầu vào tiêu chuẩn" msgid "terminate input and output records by a NUL character" msgstr "chấm dứt các bản ghi vào và ra bằng ký tự NULL" -#: builtin/check-ignore.c:20 builtin/checkout.c:1143 builtin/gc.c:357 +#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358 msgid "suppress progress reporting" msgstr "chặn các báo cáo tiến trình hoạt động" @@ -5991,9 +6118,9 @@ msgid "write the content to temporary files" msgstr "ghi nội dung vào tập tin tạm" #: builtin/checkout-index.c:175 builtin/column.c:31 -#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638 -#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980 -#: builtin/worktree.c:478 +#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631 +#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999 +#: builtin/worktree.c:498 msgid "string" msgstr "chuỗi" @@ -6065,54 +6192,54 @@ msgstr "" msgid "path '%s' is unmerged" msgstr "đường dẫn “%s” không được hòa trộn" -#: builtin/checkout.c:497 +#: builtin/checkout.c:501 msgid "you need to resolve your current index first" msgstr "bạn cần phải giải quyết bảng mục lục hiện tại của bạn trước đã" -#: builtin/checkout.c:628 +#: builtin/checkout.c:632 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Không thể thực hiện reflog cho “%s”: %s\n" -#: builtin/checkout.c:669 +#: builtin/checkout.c:673 msgid "HEAD is now at" msgstr "HEAD hiện giờ tại" -#: builtin/checkout.c:673 builtin/clone.c:682 +#: builtin/checkout.c:677 builtin/clone.c:683 msgid "unable to update HEAD" msgstr "không thể cập nhật HEAD" -#: builtin/checkout.c:677 +#: builtin/checkout.c:681 #, c-format msgid "Reset branch '%s'\n" msgstr "Đặt lại nhánh “%s”\n" -#: builtin/checkout.c:680 +#: builtin/checkout.c:684 #, c-format msgid "Already on '%s'\n" msgstr "Đã sẵn sàng trên “%s”\n" -#: builtin/checkout.c:684 +#: builtin/checkout.c:688 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Đã chuyển tới và đặt lại nhánh “%s”\n" -#: builtin/checkout.c:686 builtin/checkout.c:1075 +#: builtin/checkout.c:690 builtin/checkout.c:1086 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Đã chuyển đến nhánh mới “%s”\n" -#: builtin/checkout.c:688 +#: builtin/checkout.c:692 #, c-format msgid "Switched to branch '%s'\n" msgstr "Đã chuyển đến nhánh “%s”\n" -#: builtin/checkout.c:739 +#: builtin/checkout.c:743 #, c-format msgid " ... and %d more.\n" msgstr " … và nhiều hơn %d.\n" -#: builtin/checkout.c:745 +#: builtin/checkout.c:749 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -6131,7 +6258,7 @@ msgstr[0] "" "\n" "%s\n" -#: builtin/checkout.c:764 +#: builtin/checkout.c:768 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -6152,164 +6279,164 @@ msgstr[0] "" " git branch <tên_nhánh_mới> %s\n" "\n" -#: builtin/checkout.c:800 +#: builtin/checkout.c:809 msgid "internal error in revision walk" msgstr "lỗi nội bộ trong khi di chuyển qua các điểm xét duyệt" -#: builtin/checkout.c:804 +#: builtin/checkout.c:813 msgid "Previous HEAD position was" msgstr "Vị trí trước kia của HEAD là" -#: builtin/checkout.c:832 builtin/checkout.c:1070 +#: builtin/checkout.c:843 builtin/checkout.c:1081 msgid "You are on a branch yet to be born" msgstr "Bạn tại nhánh mà nó chưa hề được sinh ra" -#: builtin/checkout.c:976 +#: builtin/checkout.c:987 #, c-format msgid "only one reference expected, %d given." msgstr "chỉ cần một tham chiếu, nhưng lại đưa ra %d." -#: builtin/checkout.c:1016 builtin/worktree.c:215 +#: builtin/checkout.c:1027 builtin/worktree.c:233 #, c-format msgid "invalid reference: %s" msgstr "tham chiếu không hợp lệ: %s" -#: builtin/checkout.c:1045 +#: builtin/checkout.c:1056 #, c-format msgid "reference is not a tree: %s" msgstr "tham chiếu không phải là một cây:%s" -#: builtin/checkout.c:1084 +#: builtin/checkout.c:1095 msgid "paths cannot be used with switching branches" msgstr "các đường dẫn không thể dùng cùng với các nhánh chuyển" -#: builtin/checkout.c:1087 builtin/checkout.c:1091 +#: builtin/checkout.c:1098 builtin/checkout.c:1102 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "“%s” không thể được sử dụng với các nhánh chuyển" -#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103 -#: builtin/checkout.c:1106 +#: builtin/checkout.c:1106 builtin/checkout.c:1109 builtin/checkout.c:1114 +#: builtin/checkout.c:1117 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "“%s” không thể được dùng với “%s”" -#: builtin/checkout.c:1111 +#: builtin/checkout.c:1122 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Không thể chuyển nhánh đến một thứ không phải là lần chuyển giao “%s”" -#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113 -#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328 -#: builtin/worktree.c:330 +#: builtin/checkout.c:1154 builtin/checkout.c:1156 builtin/clone.c:114 +#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:346 +#: builtin/worktree.c:348 msgid "branch" msgstr "nhánh" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1155 msgid "create and checkout a new branch" msgstr "tạo và checkout một nhánh mới" -#: builtin/checkout.c:1147 +#: builtin/checkout.c:1157 msgid "create/reset and checkout a branch" msgstr "tạo/đặt_lại và checkout một nhánh" -#: builtin/checkout.c:1148 +#: builtin/checkout.c:1158 msgid "create reflog for new branch" msgstr "tạo reflog cho nhánh mới" -#: builtin/checkout.c:1149 builtin/worktree.c:332 +#: builtin/checkout.c:1159 builtin/worktree.c:350 msgid "detach HEAD at named commit" msgstr "rời bỏ HEAD tại lần chuyển giao theo tên" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1160 msgid "set upstream info for new branch" msgstr "đặt thông tin thượng nguồn cho nhánh mới" -#: builtin/checkout.c:1152 +#: builtin/checkout.c:1162 msgid "new-branch" msgstr "nhánh-mới" -#: builtin/checkout.c:1152 +#: builtin/checkout.c:1162 msgid "new unparented branch" msgstr "nhánh không cha mới" -#: builtin/checkout.c:1153 +#: builtin/checkout.c:1163 msgid "checkout our version for unmerged files" msgstr "" "lấy ra (checkout) phiên bản của chúng ta cho các tập tin chưa được hòa trộn" -#: builtin/checkout.c:1155 +#: builtin/checkout.c:1165 msgid "checkout their version for unmerged files" msgstr "" "lấy ra (checkout) phiên bản của chúng họ cho các tập tin chưa được hòa trộn" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1167 msgid "force checkout (throw away local modifications)" msgstr "ép buộc lấy ra (bỏ đi những thay đổi nội bộ)" -#: builtin/checkout.c:1158 +#: builtin/checkout.c:1168 msgid "perform a 3-way merge with the new branch" msgstr "thực hiện hòa trộn kiểu 3-way với nhánh mới" -#: builtin/checkout.c:1159 builtin/merge.c:235 +#: builtin/checkout.c:1169 builtin/merge.c:238 msgid "update ignored files (default)" msgstr "cập nhật các tập tin bị bỏ qua (mặc định)" -#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251 +#: builtin/checkout.c:1170 builtin/log.c:1489 parse-options.h:251 msgid "style" msgstr "kiểu" -#: builtin/checkout.c:1161 +#: builtin/checkout.c:1171 msgid "conflict style (merge or diff3)" msgstr "xung đột kiểu (hòa trộn hoặc diff3)" -#: builtin/checkout.c:1164 +#: builtin/checkout.c:1174 msgid "do not limit pathspecs to sparse entries only" msgstr "không giới hạn đặc tả đường dẫn thành chỉ các mục thưa thớt" -#: builtin/checkout.c:1166 +#: builtin/checkout.c:1176 msgid "second guess 'git checkout <no-such-branch>'" msgstr "gợi ý thứ hai \"git checkout <không-nhánh-nào-như-vậy>\"" -#: builtin/checkout.c:1168 +#: builtin/checkout.c:1178 msgid "do not check if another worktree is holding the given ref" msgstr "không kiểm tra nếu cây làm việc khác đang giữ tham chiếu đã cho" -#: builtin/checkout.c:1172 builtin/clone.c:80 builtin/fetch.c:114 -#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544 +#: builtin/checkout.c:1182 builtin/clone.c:81 builtin/fetch.c:136 +#: builtin/merge.c:235 builtin/pull.c:120 builtin/push.c:544 #: builtin/send-pack.c:173 msgid "force progress reporting" msgstr "ép buộc báo cáo tiến triển công việc" -#: builtin/checkout.c:1203 +#: builtin/checkout.c:1212 msgid "-b, -B and --orphan are mutually exclusive" msgstr "Các tùy chọn -b, -B và --orphan loại từ lẫn nhau" -#: builtin/checkout.c:1220 +#: builtin/checkout.c:1229 msgid "--track needs a branch name" msgstr "--track cần tên một nhánh" -#: builtin/checkout.c:1225 +#: builtin/checkout.c:1234 msgid "Missing branch name; try -b" msgstr "Thiếu tên nhánh; hãy thử -b" -#: builtin/checkout.c:1261 +#: builtin/checkout.c:1270 msgid "invalid path specification" msgstr "đường dẫn đã cho không hợp lệ" -#: builtin/checkout.c:1268 +#: builtin/checkout.c:1277 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" "“%s” không phải là một lần chuyển giao và một nhánh'%s” không thể được tạo " "từ đó" -#: builtin/checkout.c:1272 +#: builtin/checkout.c:1281 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach không nhận một đối số đường dẫn “%s”" -#: builtin/checkout.c:1276 +#: builtin/checkout.c:1285 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -6348,7 +6475,7 @@ msgstr "Nên bỏ qua kho chứa %s\n" msgid "failed to remove %s" msgstr "gặp lỗi khi gỡ bỏ %s" -#: builtin/clean.c:298 git-add--interactive.perl:572 +#: builtin/clean.c:301 git-add--interactive.perl:572 #, c-format msgid "" "Prompt help:\n" @@ -6361,7 +6488,7 @@ msgstr "" "foo - chọn mục trên cơ sở tiền tố duy nhất\n" " - (để trống) không chọn gì cả\n" -#: builtin/clean.c:302 git-add--interactive.perl:581 +#: builtin/clean.c:305 git-add--interactive.perl:581 #, c-format msgid "" "Prompt help:\n" @@ -6382,38 +6509,38 @@ msgstr "" "* - chọn tất\n" " - (để trống) kết thúc việc chọn\n" -#: builtin/clean.c:518 git-add--interactive.perl:547 +#: builtin/clean.c:521 git-add--interactive.perl:547 #: git-add--interactive.perl:552 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Hả (%s)?\n" -#: builtin/clean.c:660 +#: builtin/clean.c:663 #, c-format msgid "Input ignore patterns>> " msgstr "Mẫu để lọc các tập tin đầu vào cần lờ đi>> " -#: builtin/clean.c:697 +#: builtin/clean.c:700 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "CẢNH BÁO: Không tìm thấy các mục được khớp bởi: %s" -#: builtin/clean.c:718 +#: builtin/clean.c:721 msgid "Select items to delete" msgstr "Chọn mục muốn xóa" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:759 +#: builtin/clean.c:762 #, c-format msgid "Remove %s [y/N]? " msgstr "Xóa bỏ “%s” [y/N]? " -#: builtin/clean.c:784 git-add--interactive.perl:1616 +#: builtin/clean.c:787 git-add--interactive.perl:1616 #, c-format msgid "Bye.\n" msgstr "Tạm biệt.\n" -#: builtin/clean.c:792 +#: builtin/clean.c:795 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -6431,62 +6558,62 @@ msgstr "" "help - hiển thị chính trợ giúp này\n" "? - trợ giúp dành cho chọn bằng cách nhắc" -#: builtin/clean.c:819 git-add--interactive.perl:1692 +#: builtin/clean.c:822 git-add--interactive.perl:1692 msgid "*** Commands ***" msgstr "*** Lệnh ***" -#: builtin/clean.c:820 git-add--interactive.perl:1689 +#: builtin/clean.c:823 git-add--interactive.perl:1689 msgid "What now" msgstr "Giờ thì sao" -#: builtin/clean.c:828 +#: builtin/clean.c:831 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Có muốn gỡ bỏ (các) mục sau đây không:" -#: builtin/clean.c:844 +#: builtin/clean.c:847 msgid "No more files to clean, exiting." msgstr "Không còn tập-tin nào để dọn dẹp, đang thoát ra." -#: builtin/clean.c:906 +#: builtin/clean.c:909 msgid "do not print names of files removed" msgstr "không hiển thị tên của các tập tin đã gỡ bỏ" -#: builtin/clean.c:908 +#: builtin/clean.c:911 msgid "force" msgstr "ép buộc" -#: builtin/clean.c:909 +#: builtin/clean.c:912 msgid "interactive cleaning" msgstr "dọn bằng kiểu tương tác" -#: builtin/clean.c:911 +#: builtin/clean.c:914 msgid "remove whole directories" msgstr "gỡ bỏ toàn bộ thư mục" -#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454 -#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397 +#: builtin/clean.c:915 builtin/describe.c:463 builtin/describe.c:465 +#: builtin/grep.c:861 builtin/ls-files.c:544 builtin/name-rev.c:397 #: builtin/name-rev.c:399 builtin/show-ref.c:176 msgid "pattern" msgstr "mẫu" -#: builtin/clean.c:913 +#: builtin/clean.c:916 msgid "add <pattern> to ignore rules" msgstr "thêm <mẫu> vào trong qui tắc bỏ qua" -#: builtin/clean.c:914 +#: builtin/clean.c:917 msgid "remove ignored files, too" msgstr "đồng thời gỡ bỏ cả các tập tin bị bỏ qua" -#: builtin/clean.c:916 +#: builtin/clean.c:919 msgid "remove only ignored files" msgstr "chỉ gỡ bỏ những tập tin bị bỏ qua" -#: builtin/clean.c:934 +#: builtin/clean.c:937 msgid "-x and -X cannot be used together" msgstr "-x và -X không thể dùng cùng nhau" -#: builtin/clean.c:938 +#: builtin/clean.c:941 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -6494,7 +6621,7 @@ msgstr "" "clean.requireForce được đặt thành true và không đưa ra tùy chọn -i, -n mà " "cũng không -f; từ chối lệnh dọn dẹp (clean)" -#: builtin/clean.c:941 +#: builtin/clean.c:944 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -6502,144 +6629,144 @@ msgstr "" "clean.requireForce mặc định được đặt là true và không đưa ra tùy chọn -i, -n " "mà cũng không -f; từ chối lệnh dọn dẹp (clean)" -#: builtin/clone.c:38 +#: builtin/clone.c:39 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<các-tùy-chọn>] [--] <kho> [<t.mục>]" -#: builtin/clone.c:82 +#: builtin/clone.c:83 msgid "don't create a checkout" msgstr "không tạo một checkout" -#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479 +#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479 msgid "create a bare repository" msgstr "tạo kho thuần" -#: builtin/clone.c:87 +#: builtin/clone.c:88 msgid "create a mirror repository (implies bare)" msgstr "tạo kho bản sao (ý là kho thuần)" -#: builtin/clone.c:89 +#: builtin/clone.c:90 msgid "to clone from a local repository" msgstr "để nhân bản từ kho nội bộ" -#: builtin/clone.c:91 +#: builtin/clone.c:92 msgid "don't use local hardlinks, always copy" msgstr "không sử dụng liên kết cứng nội bộ, luôn sao chép" -#: builtin/clone.c:93 +#: builtin/clone.c:94 msgid "setup as shared repository" msgstr "cài đặt đây là kho chia sẻ" -#: builtin/clone.c:95 builtin/clone.c:99 +#: builtin/clone.c:96 builtin/clone.c:100 msgid "pathspec" msgstr "đặc-tả-đường-dẫn" -#: builtin/clone.c:95 builtin/clone.c:99 +#: builtin/clone.c:96 builtin/clone.c:100 msgid "initialize submodules in the clone" msgstr "khởi tạo mô-đun-con trong bản sao" -#: builtin/clone.c:102 +#: builtin/clone.c:103 msgid "number of submodules cloned in parallel" msgstr "số lượng mô-đun-con được nhân bản đồng thời" -#: builtin/clone.c:103 builtin/init-db.c:476 +#: builtin/clone.c:104 builtin/init-db.c:476 msgid "template-directory" msgstr "thư-mục-mẫu" -#: builtin/clone.c:104 builtin/init-db.c:477 +#: builtin/clone.c:105 builtin/init-db.c:477 msgid "directory from which templates will be used" msgstr "thư mục mà tại đó các mẫu sẽ được dùng" -#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642 -#: builtin/submodule--helper.c:983 +#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:635 +#: builtin/submodule--helper.c:1002 msgid "reference repository" msgstr "kho tham chiếu" -#: builtin/clone.c:110 +#: builtin/clone.c:111 msgid "use --reference only while cloning" msgstr "chỉ dùng --reference khi nhân bản" -#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44 +#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44 msgid "name" msgstr "tên" -#: builtin/clone.c:112 +#: builtin/clone.c:113 msgid "use <name> instead of 'origin' to track upstream" msgstr "dùng <tên> thay cho “origin” để theo dõi thượng nguồn" -#: builtin/clone.c:114 +#: builtin/clone.c:115 msgid "checkout <branch> instead of the remote's HEAD" msgstr "lấy ra <nhánh> thay cho HEAD của máy chủ" -#: builtin/clone.c:116 +#: builtin/clone.c:117 msgid "path to git-upload-pack on the remote" msgstr "đường dẫn đến git-upload-pack trên máy chủ" -#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025 +#: builtin/clone.c:118 builtin/fetch.c:137 builtin/grep.c:804 #: builtin/pull.c:205 msgid "depth" msgstr "độ-sâu" -#: builtin/clone.c:118 +#: builtin/clone.c:119 msgid "create a shallow clone of that depth" msgstr "tạo bản sao không đầy đủ cho mức sâu đã cho" -#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932 +#: builtin/clone.c:120 builtin/fetch.c:139 builtin/pack-objects.c:2938 #: parse-options.h:142 msgid "time" msgstr "thời-gian" -#: builtin/clone.c:120 +#: builtin/clone.c:121 msgid "create a shallow clone since a specific time" msgstr "tạo bản sao không đầy đủ từ thời điểm đã cho" -#: builtin/clone.c:121 builtin/fetch.c:119 +#: builtin/clone.c:122 builtin/fetch.c:141 msgid "revision" msgstr "điểm xét duyệt" -#: builtin/clone.c:122 builtin/fetch.c:120 +#: builtin/clone.c:123 builtin/fetch.c:142 msgid "deepen history of shallow clone, excluding rev" msgstr "làm sâu hơn lịch sử của bản sao shallow, bằng điểm xét duyệt loại trừ" -#: builtin/clone.c:124 +#: builtin/clone.c:125 msgid "clone only one branch, HEAD or --branch" msgstr "chỉ nhân bản một nhánh, HEAD hoặc --branch" -#: builtin/clone.c:126 +#: builtin/clone.c:127 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "" "đứng có nhân bản bất kỳ nhánh nào, và làm cho những lần lấy về sau không " "theo chúng nữa" -#: builtin/clone.c:128 +#: builtin/clone.c:129 msgid "any cloned submodules will be shallow" msgstr "mọi mô-đun-con nhân bản sẽ là shallow (nông)" -#: builtin/clone.c:129 builtin/init-db.c:485 +#: builtin/clone.c:130 builtin/init-db.c:485 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:130 builtin/init-db.c:486 +#: builtin/clone.c:131 builtin/init-db.c:486 msgid "separate git dir from working tree" msgstr "không dùng chung thư mục dành riêng cho git và thư mục làm việc" -#: builtin/clone.c:131 +#: builtin/clone.c:132 msgid "key=value" msgstr "khóa=giá_trị" -#: builtin/clone.c:132 +#: builtin/clone.c:133 msgid "set config inside the new repository" msgstr "đặt cấu hình bên trong một kho chứa mới" -#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555 +#: builtin/clone.c:134 builtin/fetch.c:159 builtin/push.c:555 msgid "use IPv4 addresses only" msgstr "chỉ dùng địa chỉ IPv4" -#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557 +#: builtin/clone.c:136 builtin/fetch.c:161 builtin/push.c:557 msgid "use IPv6 addresses only" msgstr "chỉ dùng địa chỉ IPv6" -#: builtin/clone.c:272 +#: builtin/clone.c:273 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -6647,42 +6774,42 @@ msgstr "" "Không đoán được thư mục tên là gì.\n" "Vui lòng chỉ định tên một thư mục trên dòng lệnh" -#: builtin/clone.c:325 +#: builtin/clone.c:326 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "thông tin: không thể thêm thay thế cho “%s”: %s\n" -#: builtin/clone.c:397 +#: builtin/clone.c:398 #, c-format msgid "failed to open '%s'" msgstr "gặp lỗi khi mở “%s”" -#: builtin/clone.c:405 +#: builtin/clone.c:406 #, c-format msgid "%s exists and is not a directory" msgstr "%s có tồn tại nhưng lại không phải là một thư mục" -#: builtin/clone.c:419 +#: builtin/clone.c:420 #, c-format msgid "failed to stat %s\n" msgstr "gặp lỗi khi lấy thông tin thống kê về %s\n" -#: builtin/clone.c:441 +#: builtin/clone.c:442 #, c-format msgid "failed to create link '%s'" msgstr "gặp lỗi khi tạo được liên kết mềm %s" -#: builtin/clone.c:445 +#: builtin/clone.c:446 #, c-format msgid "failed to copy file to '%s'" msgstr "gặp lỗi khi sao chép tập tin và “%s”" -#: builtin/clone.c:470 +#: builtin/clone.c:471 #, c-format msgid "done.\n" msgstr "hoàn tất.\n" -#: builtin/clone.c:482 +#: builtin/clone.c:483 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -6692,99 +6819,99 @@ msgstr "" "Bạn kiểm tra kỹ xem cái gì được lấy ra bằng lệnh “git status”\n" "và thử lấy ra với lệnh “git checkout -f HEAD”\n" -#: builtin/clone.c:559 +#: builtin/clone.c:560 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Không tìm thấy nhánh máy chủ %s để nhân bản (clone)." -#: builtin/clone.c:654 +#: builtin/clone.c:655 msgid "remote did not send all necessary objects" msgstr "máy chủ đã không gửi tất cả các đối tượng cần thiết" -#: builtin/clone.c:670 +#: builtin/clone.c:671 #, c-format msgid "unable to update %s" msgstr "không thể cập nhật %s" -#: builtin/clone.c:719 +#: builtin/clone.c:720 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "refers HEAD máy chủ chỉ đến ref không tồn tại, không thể lấy ra.\n" -#: builtin/clone.c:750 +#: builtin/clone.c:751 msgid "unable to checkout working tree" msgstr "không thể lấy ra (checkout) cây làm việc" -#: builtin/clone.c:792 +#: builtin/clone.c:796 msgid "unable to write parameters to config file" msgstr "không thể ghi các tham số vào tập tin cấu hình" -#: builtin/clone.c:855 +#: builtin/clone.c:859 msgid "cannot repack to clean up" msgstr "không thể đóng gói để dọn dẹp" -#: builtin/clone.c:857 +#: builtin/clone.c:861 msgid "cannot unlink temporary alternates file" msgstr "không thể bỏ liên kết tập tin thay thế tạm thời" -#: builtin/clone.c:890 builtin/receive-pack.c:1945 +#: builtin/clone.c:894 builtin/receive-pack.c:1944 msgid "Too many arguments." msgstr "Có quá nhiều đối số." -#: builtin/clone.c:894 +#: builtin/clone.c:898 msgid "You must specify a repository to clone." msgstr "Bạn phải chỉ định một kho để mà nhân bản (clone)." -#: builtin/clone.c:907 +#: builtin/clone.c:911 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "tùy chọn --bare và --origin %s xung khắc nhau." -#: builtin/clone.c:910 +#: builtin/clone.c:914 msgid "--bare and --separate-git-dir are incompatible." msgstr "tùy chọn --bare và --separate-git-dir xung khắc nhau." -#: builtin/clone.c:923 +#: builtin/clone.c:927 #, c-format msgid "repository '%s' does not exist" msgstr "kho chứa “%s” chưa tồn tại" -#: builtin/clone.c:929 builtin/fetch.c:1337 +#: builtin/clone.c:933 builtin/fetch.c:1360 #, c-format msgid "depth %s is not a positive number" msgstr "độ sâu %s không phải là một số nguyên dương" -#: builtin/clone.c:939 +#: builtin/clone.c:943 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "đường dẫn đích “%s” đã có từ trước và không phải là một thư mục rỗng." -#: builtin/clone.c:949 +#: builtin/clone.c:953 #, c-format msgid "working tree '%s' already exists." msgstr "cây làm việc “%s” đã sẵn tồn tại rồi." -#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260 -#: builtin/worktree.c:222 builtin/worktree.c:252 +#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270 +#: builtin/worktree.c:240 builtin/worktree.c:270 #, c-format msgid "could not create leading directories of '%s'" msgstr "không thể tạo các thư mục dẫn đầu của “%s”" -#: builtin/clone.c:967 +#: builtin/clone.c:971 #, c-format msgid "could not create work tree dir '%s'" msgstr "không thể tạo cây thư mục làm việc dir “%s”" -#: builtin/clone.c:979 +#: builtin/clone.c:983 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Đang nhân bản thành kho chứa bare “%s”…\n" -#: builtin/clone.c:981 +#: builtin/clone.c:985 #, c-format msgid "Cloning into '%s'...\n" msgstr "Đang nhân bản thành “%s”…\n" -#: builtin/clone.c:1005 +#: builtin/clone.c:1009 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -6792,41 +6919,41 @@ msgstr "" "nhân bản --recursive không tương thích với cả hai --reference và --reference-" "if-able" -#: builtin/clone.c:1067 +#: builtin/clone.c:1071 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth bị lờ đi khi nhân bản nội bộ; hãy sử dụng file:// để thay thế." -#: builtin/clone.c:1069 +#: builtin/clone.c:1073 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" "--shallow-since bị lờ đi khi nhân bản nội bộ; hãy sử dụng file:// để thay " "thế." -#: builtin/clone.c:1071 +#: builtin/clone.c:1075 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" "--shallow-exclude bị lờ đi khi nhân bản nội bộ; hãy sử dụng file:// để thay " "thế." -#: builtin/clone.c:1074 +#: builtin/clone.c:1078 msgid "source repository is shallow, ignoring --local" msgstr "kho nguồn là nông, nên bỏ qua --local" -#: builtin/clone.c:1079 +#: builtin/clone.c:1083 msgid "--local is ignored" msgstr "--local bị lờ đi" -#: builtin/clone.c:1083 +#: builtin/clone.c:1087 #, c-format msgid "Don't know how to clone %s" msgstr "Không biết làm cách nào để nhân bản (clone) %s" -#: builtin/clone.c:1138 builtin/clone.c:1146 +#: builtin/clone.c:1142 builtin/clone.c:1150 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Nhánh máy chủ %s không tìm thấy trong thượng nguồn %s" -#: builtin/clone.c:1149 +#: builtin/clone.c:1153 msgid "You appear to have cloned an empty repository." msgstr "Bạn hình như là đã nhân bản một kho trống rỗng." @@ -6977,63 +7104,63 @@ msgstr "" "Thế thì \"git cherry-pick --continue\" sẽ phục hồi lại việc cherry-pick\n" "những lần chuyển giao còn lại.\n" -#: builtin/commit.c:319 +#: builtin/commit.c:318 msgid "failed to unpack HEAD tree object" msgstr "gặp lỗi khi tháo dỡ HEAD đối tượng cây" -#: builtin/commit.c:360 +#: builtin/commit.c:359 msgid "unable to create temporary index" msgstr "không thể tạo bảng mục lục tạm thời" -#: builtin/commit.c:366 +#: builtin/commit.c:365 msgid "interactive add failed" msgstr "gặp lỗi khi thêm bằng cách tương" -#: builtin/commit.c:379 +#: builtin/commit.c:378 msgid "unable to update temporary index" msgstr "không thể cập nhật bảng mục lục tạm thời" -#: builtin/commit.c:381 +#: builtin/commit.c:380 msgid "Failed to update main cache tree" msgstr "Gặp lỗi khi cập nhật cây bộ nhớ đệm" -#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477 +#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478 msgid "unable to write new_index file" msgstr "không thể ghi tập tin lưu bảng mục lục mới (new_index)" -#: builtin/commit.c:459 +#: builtin/commit.c:461 msgid "cannot do a partial commit during a merge." msgstr "" "không thể thực hiện việc chuyển giao cục bộ trong khi đang được hòa trộn." -#: builtin/commit.c:461 +#: builtin/commit.c:463 msgid "cannot do a partial commit during a cherry-pick." msgstr "" "không thể thực hiện việc chuyển giao bộ phận trong khi đang cherry-pick." -#: builtin/commit.c:470 +#: builtin/commit.c:471 msgid "cannot read the index" msgstr "không đọc được bảng mục lục" -#: builtin/commit.c:489 +#: builtin/commit.c:490 msgid "unable to write temporary index file" msgstr "không thể ghi tập tin lưu bảng mục lục tạm thời" -#: builtin/commit.c:583 +#: builtin/commit.c:587 #, c-format msgid "commit '%s' lacks author header" msgstr "lần chuyển giao “%s” thiếu phần tác giả ở đầu" -#: builtin/commit.c:585 +#: builtin/commit.c:589 #, c-format msgid "commit '%s' has malformed author line" msgstr "lần chuyển giao “%s” có phần tác giả ở đầu dị dạng" -#: builtin/commit.c:604 +#: builtin/commit.c:608 msgid "malformed --author parameter" msgstr "đối số cho --author bị dị hình" -#: builtin/commit.c:656 +#: builtin/commit.c:660 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -7041,38 +7168,38 @@ msgstr "" "không thể chọn một ký tự ghi chú cái mà không được dùng\n" "trong phần ghi chú hiện tại" -#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093 +#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1100 #, c-format msgid "could not lookup commit %s" msgstr "không thể tìm kiếm commit (lần chuyển giao) %s" -#: builtin/commit.c:705 builtin/shortlog.c:295 +#: builtin/commit.c:709 builtin/shortlog.c:309 #, c-format msgid "(reading log message from standard input)\n" msgstr "(đang đọc thông điệp nhật ký từ đầu vào tiêu chuẩn)\n" -#: builtin/commit.c:707 +#: builtin/commit.c:711 msgid "could not read log from standard input" msgstr "không thể đọc nhật ký từ đầu vào tiêu chuẩn" -#: builtin/commit.c:711 +#: builtin/commit.c:715 #, c-format msgid "could not read log file '%s'" msgstr "không đọc được tệp nhật ký “%s”" -#: builtin/commit.c:738 builtin/commit.c:746 +#: builtin/commit.c:742 builtin/commit.c:750 msgid "could not read SQUASH_MSG" msgstr "không thể đọc SQUASH_MSG" -#: builtin/commit.c:743 +#: builtin/commit.c:747 msgid "could not read MERGE_MSG" msgstr "không thể đọc MERGE_MSG" -#: builtin/commit.c:797 +#: builtin/commit.c:801 msgid "could not write commit template" msgstr "không thể ghi mẫu chuyển giao" -#: builtin/commit.c:815 +#: builtin/commit.c:819 #, c-format msgid "" "\n" @@ -7087,7 +7214,7 @@ msgstr "" "\t%s\n" "và thử lại.\n" -#: builtin/commit.c:820 +#: builtin/commit.c:824 #, c-format msgid "" "\n" @@ -7102,7 +7229,7 @@ msgstr "" "\t%s\n" "và thử lại.\n" -#: builtin/commit.c:833 +#: builtin/commit.c:837 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -7113,7 +7240,7 @@ msgstr "" "bắt đầu bằng “%c” sẽ được bỏ qua, nếu phần chú thích rỗng sẽ hủy bỏ lần " "chuyển giao.\n" -#: builtin/commit.c:840 +#: builtin/commit.c:844 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -7125,155 +7252,155 @@ msgstr "" "bắt đầu bằng “%c” sẽ được bỏ qua; bạn có thể xóa chúng đi nếu muốn thế.\n" "Phần chú thích này nếu trống rỗng sẽ hủy bỏ lần chuyển giao.\n" -#: builtin/commit.c:857 +#: builtin/commit.c:861 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sTác giả: %.*s <%.*s>" -#: builtin/commit.c:865 +#: builtin/commit.c:869 #, c-format msgid "%sDate: %s" msgstr "%sNgày tháng: %s" -#: builtin/commit.c:872 +#: builtin/commit.c:876 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sNgười chuyển giao: %.*s <%.*s>" -#: builtin/commit.c:889 +#: builtin/commit.c:893 msgid "Cannot read index" msgstr "Không đọc được bảng mục lục" -#: builtin/commit.c:951 +#: builtin/commit.c:958 msgid "Error building trees" msgstr "Gặp lỗi khi xây dựng cây" -#: builtin/commit.c:965 builtin/tag.c:274 +#: builtin/commit.c:972 builtin/tag.c:252 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Xin hãy cung cấp lời chú giải hoặc là dùng tùy chọn -m hoặc là -F.\n" -#: builtin/commit.c:1068 +#: builtin/commit.c:1075 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author “%s” không phải là “Họ và tên <thư điện tửl>” và không khớp bất kỳ " "tác giả nào sẵn có" -#: builtin/commit.c:1083 builtin/commit.c:1328 +#: builtin/commit.c:1090 builtin/commit.c:1335 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Chế độ cho các tập tin chưa được theo dõi không hợp lệ “%s”" -#: builtin/commit.c:1121 +#: builtin/commit.c:1128 msgid "--long and -z are incompatible" msgstr "hai tùy chọn -long và -z không tương thích với nhau" -#: builtin/commit.c:1151 +#: builtin/commit.c:1158 msgid "Using both --reset-author and --author does not make sense" msgstr "Sử dụng cả hai tùy chọn --reset-author và --author không hợp lý" -#: builtin/commit.c:1160 +#: builtin/commit.c:1167 msgid "You have nothing to amend." msgstr "Không có gì để mà “tu bổ” cả." -#: builtin/commit.c:1163 +#: builtin/commit.c:1170 msgid "You are in the middle of a merge -- cannot amend." msgstr "" "Bạn đang ở giữa của quá trình hòa trộn -- không thể thực hiện việc “tu bổ”." -#: builtin/commit.c:1165 +#: builtin/commit.c:1172 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" "Bạn đang ở giữa của quá trình cherry-pick -- không thể thực hiện việc “tu " "bổ”." -#: builtin/commit.c:1168 +#: builtin/commit.c:1175 msgid "Options --squash and --fixup cannot be used together" msgstr "Các tùy chọn --squash và --fixup không thể sử dụng cùng với nhau" -#: builtin/commit.c:1178 +#: builtin/commit.c:1185 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" "Chỉ được dùng một trong số tùy chọn trong số các tùy chọn -c/-C/-F/--fixup" -#: builtin/commit.c:1180 +#: builtin/commit.c:1187 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "Tùy chọn -m không thể được tổ hợp cùng với -c/-C/-F/--fixup." -#: builtin/commit.c:1188 +#: builtin/commit.c:1195 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" "--reset-author chỉ có thể được sử dụng với tùy chọn -C, -c hay --amend." -#: builtin/commit.c:1205 +#: builtin/commit.c:1212 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Chỉ một trong các tùy chọn --include/--only/--all/--interactive/--patch được " "sử dụng." -#: builtin/commit.c:1207 +#: builtin/commit.c:1214 msgid "No paths with --include/--only does not make sense." msgstr "Không đường dẫn với các tùy chọn --include/--only không hợp lý." -#: builtin/commit.c:1219 builtin/tag.c:552 +#: builtin/commit.c:1226 builtin/tag.c:535 #, c-format msgid "Invalid cleanup mode %s" msgstr "Chế độ dọn dẹp không hợp lệ %s" -#: builtin/commit.c:1224 +#: builtin/commit.c:1231 msgid "Paths with -a does not make sense." msgstr "Các đường dẫn với tùy chọn -a không hợp lý." -#: builtin/commit.c:1342 builtin/commit.c:1617 +#: builtin/commit.c:1349 builtin/commit.c:1626 msgid "show status concisely" msgstr "hiển thị trạng thái ở dạng súc tích" -#: builtin/commit.c:1344 builtin/commit.c:1619 +#: builtin/commit.c:1351 builtin/commit.c:1628 msgid "show branch information" msgstr "hiển thị thông tin nhánh" -#: builtin/commit.c:1346 +#: builtin/commit.c:1353 msgid "show stash information" msgstr "hiển thị thông tin về tạm cất" -#: builtin/commit.c:1348 +#: builtin/commit.c:1355 msgid "version" msgstr "phiên bản" -#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530 -#: builtin/worktree.c:449 +#: builtin/commit.c:1355 builtin/commit.c:1630 builtin/push.c:530 +#: builtin/worktree.c:469 msgid "machine-readable output" msgstr "kết xuất dạng máy-có-thể-đọc" -#: builtin/commit.c:1351 builtin/commit.c:1623 +#: builtin/commit.c:1358 builtin/commit.c:1632 msgid "show status in long format (default)" msgstr "hiển thị trạng thái ở định dạng dài (mặc định)" -#: builtin/commit.c:1354 builtin/commit.c:1626 +#: builtin/commit.c:1361 builtin/commit.c:1635 msgid "terminate entries with NUL" msgstr "chấm dứt các mục bằng NUL" -#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983 -#: builtin/fast-export.c:986 builtin/tag.c:412 +#: builtin/commit.c:1363 builtin/commit.c:1638 builtin/fast-export.c:999 +#: builtin/fast-export.c:1002 builtin/tag.c:390 msgid "mode" msgstr "chế độ" -#: builtin/commit.c:1357 builtin/commit.c:1629 +#: builtin/commit.c:1364 builtin/commit.c:1638 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "hiển thị các tập tin chưa được theo dõi dấu vết, các chế độ tùy chọn: all, " "normal, no. (Mặc định: all)" -#: builtin/commit.c:1360 +#: builtin/commit.c:1367 msgid "show ignored files" msgstr "hiển thị các tập tin ẩn" -#: builtin/commit.c:1361 parse-options.h:155 +#: builtin/commit.c:1368 parse-options.h:155 msgid "when" msgstr "khi" -#: builtin/commit.c:1362 +#: builtin/commit.c:1369 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -7281,205 +7408,206 @@ msgstr "" "bỏ qua các thay đổi trong mô-đun-con, tùy chọn khi: all, dirty, untracked. " "(Mặc định: all)" -#: builtin/commit.c:1364 +#: builtin/commit.c:1371 msgid "list untracked files in columns" msgstr "hiển thị danh sách các tập-tin chưa được theo dõi trong các cột" -#: builtin/commit.c:1440 +#: builtin/commit.c:1449 msgid "couldn't look up newly created commit" msgstr "không thể tìm thấy lần chuyển giao mới hơn đã được tạo" -#: builtin/commit.c:1442 +#: builtin/commit.c:1451 msgid "could not parse newly created commit" msgstr "" "không thể phân tích cú pháp của đối tượng chuyển giao mới hơn đã được tạo" -#: builtin/commit.c:1487 +#: builtin/commit.c:1496 msgid "detached HEAD" msgstr "đã rời khỏi HEAD" -#: builtin/commit.c:1490 +#: builtin/commit.c:1499 msgid " (root-commit)" msgstr " (root-commit)" -#: builtin/commit.c:1587 +#: builtin/commit.c:1596 msgid "suppress summary after successful commit" msgstr "không hiển thị tổng kết sau khi chuyển giao thành công" -#: builtin/commit.c:1588 +#: builtin/commit.c:1597 msgid "show diff in commit message template" msgstr "hiển thị sự khác biệt trong mẫu tin nhắn chuyển giao" -#: builtin/commit.c:1590 +#: builtin/commit.c:1599 msgid "Commit message options" msgstr "Các tùy chọn ghi chú commit" -#: builtin/commit.c:1591 builtin/tag.c:410 +#: builtin/commit.c:1600 builtin/tag.c:388 msgid "read message from file" msgstr "đọc chú thích từ tập tin" -#: builtin/commit.c:1592 +#: builtin/commit.c:1601 msgid "author" msgstr "tác giả" -#: builtin/commit.c:1592 +#: builtin/commit.c:1601 msgid "override author for commit" msgstr "ghi đè tác giả cho commit" -#: builtin/commit.c:1593 builtin/gc.c:358 +#: builtin/commit.c:1602 builtin/gc.c:359 msgid "date" msgstr "ngày tháng" -#: builtin/commit.c:1593 +#: builtin/commit.c:1602 msgid "override date for commit" msgstr "ghi đè ngày tháng cho lần chuyển giao" -#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401 -#: builtin/notes.c:564 builtin/tag.c:408 +#: builtin/commit.c:1603 builtin/merge.c:225 builtin/notes.c:402 +#: builtin/notes.c:565 builtin/tag.c:386 msgid "message" msgstr "chú thích" -#: builtin/commit.c:1594 +#: builtin/commit.c:1603 msgid "commit message" msgstr "chú thích của lần chuyển giao" -#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597 -#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77 +#: builtin/commit.c:1604 builtin/commit.c:1605 builtin/commit.c:1606 +#: builtin/commit.c:1607 parse-options.h:257 ref-filter.h:92 msgid "commit" msgstr "lần_chuyển_giao" -#: builtin/commit.c:1595 +#: builtin/commit.c:1604 msgid "reuse and edit message from specified commit" msgstr "dùng lại các ghi chú từ lần chuyển giao đã cho nhưng có cho sửa chữa" -#: builtin/commit.c:1596 +#: builtin/commit.c:1605 msgid "reuse message from specified commit" msgstr "dùng lại các ghi chú từ lần chuyển giao đã cho" -#: builtin/commit.c:1597 +#: builtin/commit.c:1606 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "dùng ghi chú có định dạng autosquash để sửa chữa lần chuyển giao đã chỉ ra" -#: builtin/commit.c:1598 +#: builtin/commit.c:1607 msgid "use autosquash formatted message to squash specified commit" msgstr "" "dùng lời nhắn có định dạng tự động nén để nén lại các lần chuyển giao đã chỉ " "ra" -#: builtin/commit.c:1599 +#: builtin/commit.c:1608 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" "lần chuyển giao nhận tôi là tác giả (được dùng với tùy chọn -C/-c/--amend)" -#: builtin/commit.c:1600 builtin/log.c:1430 builtin/revert.c:105 +#: builtin/commit.c:1609 builtin/log.c:1436 builtin/merge.c:239 +#: builtin/revert.c:105 msgid "add Signed-off-by:" msgstr "(nên dùng) thêm dòng Signed-off-by:" -#: builtin/commit.c:1601 +#: builtin/commit.c:1610 msgid "use specified template file" msgstr "sử dụng tập tin mẫu đã cho" -#: builtin/commit.c:1602 +#: builtin/commit.c:1611 msgid "force edit of commit" msgstr "ép buộc sửa lần commit" -#: builtin/commit.c:1603 +#: builtin/commit.c:1612 msgid "default" msgstr "mặc định" -#: builtin/commit.c:1603 builtin/tag.c:413 +#: builtin/commit.c:1612 builtin/tag.c:391 msgid "how to strip spaces and #comments from message" msgstr "làm thế nào để cắt bỏ khoảng trắng và #ghichú từ mẩu tin nhắn" -#: builtin/commit.c:1604 +#: builtin/commit.c:1613 msgid "include status in commit message template" msgstr "bao gồm các trạng thái trong mẫu ghi chú chuyển giao" -#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173 +#: builtin/commit.c:1615 builtin/merge.c:237 builtin/pull.c:173 #: builtin/revert.c:113 msgid "GPG sign commit" msgstr "ký lần chuyển giao dùng GPG" -#: builtin/commit.c:1609 +#: builtin/commit.c:1618 msgid "Commit contents options" msgstr "Các tùy nội dung ghi chú commit" -#: builtin/commit.c:1610 +#: builtin/commit.c:1619 msgid "commit all changed files" msgstr "chuyển giao tất cả các tập tin có thay đổi" -#: builtin/commit.c:1611 +#: builtin/commit.c:1620 msgid "add specified files to index for commit" msgstr "thêm các tập tin đã chỉ ra vào bảng mục lục để chuyển giao" -#: builtin/commit.c:1612 +#: builtin/commit.c:1621 msgid "interactively add files" msgstr "thêm các tập-tin bằng tương tác" -#: builtin/commit.c:1613 +#: builtin/commit.c:1622 msgid "interactively add changes" msgstr "thêm các thay đổi bằng tương tác" -#: builtin/commit.c:1614 +#: builtin/commit.c:1623 msgid "commit only specified files" msgstr "chỉ chuyển giao các tập tin đã chỉ ra" -#: builtin/commit.c:1615 +#: builtin/commit.c:1624 msgid "bypass pre-commit and commit-msg hooks" msgstr "vòng qua móc (hook) pre-commit và commit-msg" -#: builtin/commit.c:1616 +#: builtin/commit.c:1625 msgid "show what would be committed" msgstr "hiển thị xem cái gì có thể được chuyển giao" -#: builtin/commit.c:1627 +#: builtin/commit.c:1636 msgid "amend previous commit" msgstr "“tu bổ” (amend) lần commit trước" -#: builtin/commit.c:1628 +#: builtin/commit.c:1637 msgid "bypass post-rewrite hook" msgstr "vòng qua móc (hook) post-rewrite" -#: builtin/commit.c:1633 +#: builtin/commit.c:1642 msgid "ok to record an empty change" msgstr "ok để ghi lại một thay đổi trống rỗng" -#: builtin/commit.c:1635 +#: builtin/commit.c:1644 msgid "ok to record a change with an empty message" msgstr "ok để ghi các thay đổi với lời nhắn trống rỗng" -#: builtin/commit.c:1665 +#: builtin/commit.c:1674 msgid "could not parse HEAD commit" msgstr "không thể phân tích commit (lần chuyển giao) HEAD" -#: builtin/commit.c:1710 +#: builtin/commit.c:1719 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Tập tin MERGE_HEAD sai hỏng (%s)" -#: builtin/commit.c:1717 +#: builtin/commit.c:1726 msgid "could not read MERGE_MODE" msgstr "không thể đọc MERGE_MODE" -#: builtin/commit.c:1736 +#: builtin/commit.c:1745 #, c-format msgid "could not read commit message: %s" msgstr "không thể đọc phần chú thích (message) của lần chuyển giao: %s" -#: builtin/commit.c:1747 +#: builtin/commit.c:1756 +#, c-format +msgid "Aborting commit due to empty commit message.\n" +msgstr "Bãi bỏ việc chuyển giao bởi vì phần chú thích của nó trống rỗng.\n" + +#: builtin/commit.c:1761 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" "Đang bỏ qua việc chuyển giao; bạn đã không biên soạn phần chú thích " "(message).\n" -#: builtin/commit.c:1752 -#, c-format -msgid "Aborting commit due to empty commit message.\n" -msgstr "Bãi bỏ việc chuyển giao bởi vì phần chú thích của nó trống rỗng.\n" - -#: builtin/commit.c:1800 +#: builtin/commit.c:1809 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -7647,12 +7775,12 @@ msgstr "" msgid "--local can only be used inside a git repository" msgstr "--local chỉ có thể được dùng bên trong một kho git" -#: builtin/config.c:621 +#: builtin/config.c:624 #, c-format msgid "cannot create configuration file %s" msgstr "không thể tạo tập tin cấu hình “%s”" -#: builtin/config.c:633 +#: builtin/config.c:637 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -7661,11 +7789,11 @@ msgstr "" "không thể ghi đè nhiều giá trị với một giá trị đơn\n" " Dùng một biểu thức chính quy, --add hay --replace-all để thay đổi %s." -#: builtin/count-objects.c:87 +#: builtin/count-objects.c:88 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "git count-objects [-v] [-H | --human-readable]" -#: builtin/count-objects.c:97 +#: builtin/count-objects.c:98 msgid "print sizes in human readable format" msgstr "hiển thị kích cỡ theo định dạng dành cho người đọc" @@ -7689,47 +7817,47 @@ msgstr "hạng nhẹ" msgid "annotated" msgstr "có diễn giải" -#: builtin/describe.c:253 +#: builtin/describe.c:264 #, c-format msgid "annotated tag %s not available" msgstr "thẻ đã được ghi chú %s không sẵn để dùng" -#: builtin/describe.c:257 +#: builtin/describe.c:268 #, c-format msgid "annotated tag %s has no embedded name" msgstr "thẻ được chú giải %s không có tên nhúng" -#: builtin/describe.c:259 +#: builtin/describe.c:270 #, c-format msgid "tag '%s' is really '%s' here" msgstr "thẻ “%s” đã thực sự ở đây “%s” rồi" -#: builtin/describe.c:286 builtin/log.c:489 +#: builtin/describe.c:297 builtin/log.c:493 #, c-format msgid "Not a valid object name %s" msgstr "Không phải tên đối tượng %s hợp lệ" -#: builtin/describe.c:289 +#: builtin/describe.c:300 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s không phải là một đối tượng “%s” hợp lệ" -#: builtin/describe.c:306 +#: builtin/describe.c:317 #, c-format msgid "no tag exactly matches '%s'" msgstr "không có thẻ nào khớp chính xác với “%s”" -#: builtin/describe.c:308 +#: builtin/describe.c:319 #, c-format msgid "searching to describe %s\n" msgstr "Đang tìm kiếm để mô tả %s\n" -#: builtin/describe.c:355 +#: builtin/describe.c:366 #, c-format msgid "finished search at %s\n" msgstr "việc tìm kiếm đã kết thúc tại %s\n" -#: builtin/describe.c:382 +#: builtin/describe.c:393 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -7738,7 +7866,7 @@ msgstr "" "Không có thẻ được chú giải nào được mô tả là “%s”.\n" "Tuy nhiên, ở đây có những thẻ không được chú giải: hãy thử --tags." -#: builtin/describe.c:386 +#: builtin/describe.c:397 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -7747,12 +7875,12 @@ msgstr "" "Không có thẻ có thể mô tả “%s”.\n" "Hãy thử --always, hoặc tạo một số thẻ." -#: builtin/describe.c:416 +#: builtin/describe.c:427 #, c-format msgid "traversed %lu commits\n" msgstr "đã xuyên %lu qua lần chuyển giao\n" -#: builtin/describe.c:419 +#: builtin/describe.c:430 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -7761,75 +7889,75 @@ msgstr "" "tìm thấy nhiều hơn %i thẻ; đã liệt kê %i cái gần\n" "đây nhất bỏ đi tìm kiếm tại %s\n" -#: builtin/describe.c:441 +#: builtin/describe.c:452 msgid "find the tag that comes after the commit" msgstr "tìm các thẻ mà nó đến trước lần chuyển giao" -#: builtin/describe.c:442 +#: builtin/describe.c:453 msgid "debug search strategy on stderr" msgstr "chiến lược tìm kiếm gỡ lỗi trên đầu ra lỗi chuẩn stderr" -#: builtin/describe.c:443 +#: builtin/describe.c:454 msgid "use any ref" msgstr "dùng ref bất kỳ" -#: builtin/describe.c:444 +#: builtin/describe.c:455 msgid "use any tag, even unannotated" msgstr "dùng thẻ bất kỳ, cả khi “unannotated”" -#: builtin/describe.c:445 +#: builtin/describe.c:456 msgid "always use long format" msgstr "luôn dùng định dạng dài" -#: builtin/describe.c:446 +#: builtin/describe.c:457 msgid "only follow first parent" msgstr "chỉ theo cha mẹ đầu tiên" -#: builtin/describe.c:449 +#: builtin/describe.c:460 msgid "only output exact matches" msgstr "chỉ xuất những gì khớp chính xác" -#: builtin/describe.c:451 +#: builtin/describe.c:462 msgid "consider <n> most recent tags (default: 10)" msgstr "coi như <n> thẻ gần đây nhất (mặc định: 10)" -#: builtin/describe.c:453 +#: builtin/describe.c:464 msgid "only consider tags matching <pattern>" msgstr "chỉ cân nhắc đến những thẻ khớp với <mẫu>" -#: builtin/describe.c:455 +#: builtin/describe.c:466 msgid "do not consider tags matching <pattern>" msgstr "không coi rằng các thẻ khớp với <mẫu>" -#: builtin/describe.c:457 builtin/name-rev.c:406 +#: builtin/describe.c:468 builtin/name-rev.c:406 msgid "show abbreviated commit object as fallback" msgstr "hiển thị đối tượng chuyển giao vắn tắt như là fallback" -#: builtin/describe.c:458 builtin/describe.c:461 +#: builtin/describe.c:469 builtin/describe.c:472 msgid "mark" msgstr "dấu" -#: builtin/describe.c:459 +#: builtin/describe.c:470 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "thêm <dấu> trên cây thư mục làm việc bẩn (mặc định \"-dirty\")" -#: builtin/describe.c:462 +#: builtin/describe.c:473 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "thêm <dấu> trên cây thư mục làm việc bị hỏng (mặc định \"-broken\")" -#: builtin/describe.c:480 +#: builtin/describe.c:491 msgid "--long is incompatible with --abbrev=0" msgstr "--long là xung khắc với tùy chọn --abbrev=0" -#: builtin/describe.c:509 +#: builtin/describe.c:520 msgid "No names found, cannot describe anything." msgstr "Không tìm thấy các tên, không thể mô tả gì cả." -#: builtin/describe.c:552 +#: builtin/describe.c:563 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty là xung khắc với các tùy chọn commit-ish" -#: builtin/describe.c:554 +#: builtin/describe.c:565 msgid "--broken is incompatible with commit-ishes" msgstr "--broken là xung khắc với commit-ishes" @@ -7843,21 +7971,21 @@ msgstr "“%s”: không phải tập tin bình thường hay liên kết mềm" msgid "invalid option: %s" msgstr "tùy chọn không hợp lệ: %s" -#: builtin/diff.c:359 +#: builtin/diff.c:357 msgid "Not a git repository" msgstr "Không phải là kho git" -#: builtin/diff.c:402 +#: builtin/diff.c:400 #, c-format msgid "invalid object '%s' given." msgstr "đối tượng đã cho “%s” không hợp lệ." -#: builtin/diff.c:411 +#: builtin/diff.c:409 #, c-format msgid "more than two blobs given: '%s'" msgstr "đã cho nhiều hơn hai đối tượng blob: “%s”" -#: builtin/diff.c:416 +#: builtin/diff.c:414 #, c-format msgid "unhandled object '%s' given." msgstr "đã cho đối tượng không thể nắm giữ “%s”." @@ -7868,27 +7996,27 @@ msgstr "" "git difftool [<các-tùy-chọn>] [<lần_chuyển_giao> [<lần_chuyển_giao>]] [--] " "<đường-dẫn>…]" -#: builtin/difftool.c:249 +#: builtin/difftool.c:259 #, c-format msgid "failed: %d" msgstr "gặp lỗi: %d" -#: builtin/difftool.c:291 +#: builtin/difftool.c:301 #, c-format msgid "could not read symlink %s" msgstr "không thể đọc liên kết mềm %s" -#: builtin/difftool.c:293 +#: builtin/difftool.c:303 #, c-format msgid "could not read symlink file %s" msgstr "không đọc được tập tin liên kết mềm %s" -#: builtin/difftool.c:301 +#: builtin/difftool.c:311 #, c-format msgid "could not read object %s for symlink %s" msgstr "Không thể đọc đối tượng %s cho liên kết mềm %s" -#: builtin/difftool.c:403 +#: builtin/difftool.c:412 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -7896,53 +8024,53 @@ msgstr "" "các định dạng diff tổ hợp(“-c” và “--cc”) chưa được hỗ trợ trong\n" "chế độ diff thư mục(“-d” và “--dir-diff”)." -#: builtin/difftool.c:626 +#: builtin/difftool.c:633 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "cả hai tập tin đã bị sửa: “%s” và “%s”." -#: builtin/difftool.c:628 +#: builtin/difftool.c:635 msgid "working tree file has been left." msgstr "cây làm việc ở bên trái." -#: builtin/difftool.c:639 +#: builtin/difftool.c:646 #, c-format msgid "temporary files exist in '%s'." msgstr "các tập tin tạm đã sẵn có trong “%s”." -#: builtin/difftool.c:640 +#: builtin/difftool.c:647 msgid "you may want to cleanup or recover these." msgstr "bạn có lẽ muốn dọn dẹp hay " -#: builtin/difftool.c:689 +#: builtin/difftool.c:696 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "dùng “diff.guitool“ thay vì dùng “diff.tool“" -#: builtin/difftool.c:691 +#: builtin/difftool.c:698 msgid "perform a full-directory diff" msgstr "thực hiện một diff toàn thư mục" -#: builtin/difftool.c:693 +#: builtin/difftool.c:700 msgid "do not prompt before launching a diff tool" msgstr "đừng nhắc khi khởi chạy công cụ diff" -#: builtin/difftool.c:699 +#: builtin/difftool.c:706 msgid "use symlinks in dir-diff mode" msgstr "dùng liên kết mềm trong diff-thư-mục" -#: builtin/difftool.c:700 +#: builtin/difftool.c:707 msgid "<tool>" msgstr "<công_cụ>" -#: builtin/difftool.c:701 +#: builtin/difftool.c:708 msgid "use the specified diff tool" msgstr "dùng công cụ diff đã cho" -#: builtin/difftool.c:703 +#: builtin/difftool.c:710 msgid "print a list of diff tools that may be used with `--tool`" msgstr "in ra danh sách các công cụ dif cái mà có thẻ dùng với “--tool“" -#: builtin/difftool.c:706 +#: builtin/difftool.c:713 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -7950,19 +8078,19 @@ msgstr "" "làm cho “git-difftool” thoát khi gọi công cụ diff trả về mã không phải số " "không" -#: builtin/difftool.c:708 +#: builtin/difftool.c:715 msgid "<command>" msgstr "<lệnh>" -#: builtin/difftool.c:709 +#: builtin/difftool.c:716 msgid "specify a custom command for viewing diffs" msgstr "chỉ định một lệnh tùy ý để xem diff" -#: builtin/difftool.c:733 +#: builtin/difftool.c:740 msgid "no <tool> given for --tool=<tool>" msgstr "chưa đưa ra <công_cụ> cho --tool=<công_cụ>" -#: builtin/difftool.c:740 +#: builtin/difftool.c:747 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "chưa đưa ra <lệnh> cho --extcmd=<lệnh>" @@ -7970,145 +8098,145 @@ msgstr "chưa đưa ra <lệnh> cho --extcmd=<lệnh>" msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-opts]" -#: builtin/fast-export.c:982 +#: builtin/fast-export.c:998 msgid "show progress after <n> objects" msgstr "hiển thị tiến triển sau <n> đối tượng" -#: builtin/fast-export.c:984 +#: builtin/fast-export.c:1000 msgid "select handling of signed tags" msgstr "chọn điều khiển của thẻ đã ký" -#: builtin/fast-export.c:987 +#: builtin/fast-export.c:1003 msgid "select handling of tags that tag filtered objects" msgstr "chọn sự xử lý của các thẻ, cái mà đánh thẻ các đối tượng được lọc ra" -#: builtin/fast-export.c:990 +#: builtin/fast-export.c:1006 msgid "Dump marks to this file" msgstr "Đổ các đánh dấu này vào tập-tin" -#: builtin/fast-export.c:992 +#: builtin/fast-export.c:1008 msgid "Import marks from this file" msgstr "nhập vào đánh dấu từ tập tin này" -#: builtin/fast-export.c:994 +#: builtin/fast-export.c:1010 msgid "Fake a tagger when tags lack one" msgstr "Làm giả một cái thẻ khi thẻ bị thiếu một cái" -#: builtin/fast-export.c:996 +#: builtin/fast-export.c:1012 msgid "Output full tree for each commit" msgstr "Xuất ra toàn bộ cây cho mỗi lần chuyển giao" -#: builtin/fast-export.c:998 +#: builtin/fast-export.c:1014 msgid "Use the done feature to terminate the stream" msgstr "Sử dụng tính năng done để chấm dứt luồng dữ liệu" -#: builtin/fast-export.c:999 +#: builtin/fast-export.c:1015 msgid "Skip output of blob data" msgstr "Bỏ qua kết xuất của dữ liệu blob" -#: builtin/fast-export.c:1000 +#: builtin/fast-export.c:1016 msgid "refspec" msgstr "refspec" -#: builtin/fast-export.c:1001 +#: builtin/fast-export.c:1017 msgid "Apply refspec to exported refs" msgstr "Áp dụng refspec cho refs đã xuất" -#: builtin/fast-export.c:1002 +#: builtin/fast-export.c:1018 msgid "anonymize output" msgstr "kết xuất anonymize" -#: builtin/fetch.c:22 +#: builtin/fetch.c:23 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<các-tùy-chọn>] [<kho-chứa> [<refspec>…]]" -#: builtin/fetch.c:23 +#: builtin/fetch.c:24 msgid "git fetch [<options>] <group>" msgstr "git fetch [<các-tùy-chọn>] [<nhóm>" -#: builtin/fetch.c:24 +#: builtin/fetch.c:25 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<các-tùy-chọn>] [(<kho> | <nhóm>)…]" -#: builtin/fetch.c:25 +#: builtin/fetch.c:26 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<các-tùy-chọn>]" -#: builtin/fetch.c:90 builtin/pull.c:182 +#: builtin/fetch.c:112 builtin/pull.c:182 msgid "fetch from all remotes" msgstr "lấy về từ tất cả các máy chủ" -#: builtin/fetch.c:92 builtin/pull.c:185 +#: builtin/fetch.c:114 builtin/pull.c:185 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "nối thêm vào .git/FETCH_HEAD thay vì ghi đè lên nó" -#: builtin/fetch.c:94 builtin/pull.c:188 +#: builtin/fetch.c:116 builtin/pull.c:188 msgid "path to upload pack on remote end" msgstr "đường dẫn đến gói tải lên trên máy chủ cuối" -#: builtin/fetch.c:95 builtin/pull.c:190 +#: builtin/fetch.c:117 builtin/pull.c:190 msgid "force overwrite of local branch" msgstr "ép buộc ghi đè lên nhánh nội bộ" -#: builtin/fetch.c:97 +#: builtin/fetch.c:119 msgid "fetch from multiple remotes" msgstr "lấy từ nhiều máy chủ cùng lúc" -#: builtin/fetch.c:99 builtin/pull.c:192 +#: builtin/fetch.c:121 builtin/pull.c:192 msgid "fetch all tags and associated objects" msgstr "lấy tất cả các thẻ cùng với các đối tượng liên quan đến nó" -#: builtin/fetch.c:101 +#: builtin/fetch.c:123 msgid "do not fetch all tags (--no-tags)" msgstr "không lấy tất cả các thẻ (--no-tags)" -#: builtin/fetch.c:103 +#: builtin/fetch.c:125 msgid "number of submodules fetched in parallel" msgstr "số lượng mô-đun-con được lấy đồng thời" -#: builtin/fetch.c:105 builtin/pull.c:195 +#: builtin/fetch.c:127 builtin/pull.c:195 msgid "prune remote-tracking branches no longer on remote" msgstr "" "cắt cụt (prune) các nhánh “remote-tracking” không còn tồn tại trên máy chủ " "nữa" -#: builtin/fetch.c:106 builtin/fetch.c:129 builtin/pull.c:123 +#: builtin/fetch.c:128 builtin/fetch.c:151 builtin/pull.c:123 msgid "on-demand" msgstr "khi-cần" -#: builtin/fetch.c:107 +#: builtin/fetch.c:129 msgid "control recursive fetching of submodules" msgstr "điều khiển việc lấy về đệ quy trong các mô-đun-con" -#: builtin/fetch.c:111 builtin/pull.c:203 +#: builtin/fetch.c:133 builtin/pull.c:203 msgid "keep downloaded pack" msgstr "giữ lại gói đã tải về" -#: builtin/fetch.c:113 +#: builtin/fetch.c:135 msgid "allow updating of HEAD ref" msgstr "cho phép cập nhật th.chiếu HEAD" -#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206 +#: builtin/fetch.c:138 builtin/fetch.c:144 builtin/pull.c:206 msgid "deepen history of shallow clone" msgstr "làm sâu hơn lịch sử của bản sao" -#: builtin/fetch.c:118 +#: builtin/fetch.c:140 msgid "deepen history of shallow repository based on time" msgstr "làm sâu hơn lịch sử của kho bản sao shallow dựa trên thời gian" -#: builtin/fetch.c:124 builtin/pull.c:209 +#: builtin/fetch.c:146 builtin/pull.c:209 msgid "convert to a complete repository" msgstr "chuyển đổi hoàn toàn sang kho git" -#: builtin/fetch.c:126 builtin/log.c:1450 +#: builtin/fetch.c:148 builtin/log.c:1456 msgid "dir" msgstr "tmục" -#: builtin/fetch.c:127 +#: builtin/fetch.c:149 msgid "prepend this to submodule path output" msgstr "soạn sẵn cái này cho kết xuất đường dẫn mô-đun-con" -#: builtin/fetch.c:130 +#: builtin/fetch.c:152 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -8116,89 +8244,89 @@ msgstr "" "mặc định cho việc lấy đệ quy các mô-đun-con (có mức ưu tiên thấp hơn các tập " "tin cấu hình config)" -#: builtin/fetch.c:134 builtin/pull.c:212 +#: builtin/fetch.c:156 builtin/pull.c:212 msgid "accept refs that update .git/shallow" msgstr "chấp nhận tham chiếu cập nhật .git/shallow" -#: builtin/fetch.c:135 builtin/pull.c:214 +#: builtin/fetch.c:157 builtin/pull.c:214 msgid "refmap" msgstr "refmap" -#: builtin/fetch.c:136 builtin/pull.c:215 +#: builtin/fetch.c:158 builtin/pull.c:215 msgid "specify fetch refmap" msgstr "chỉ ra refmap cần lấy về" -#: builtin/fetch.c:394 +#: builtin/fetch.c:416 msgid "Couldn't find remote ref HEAD" msgstr "Không thể tìm thấy máy chủ cho tham chiếu HEAD" -#: builtin/fetch.c:512 +#: builtin/fetch.c:534 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "phần cấu hình fetch.output có chứa giá-trị không hợp lệ %s" -#: builtin/fetch.c:605 +#: builtin/fetch.c:627 #, c-format msgid "object %s not found" msgstr "Không tìm thấy đối tượng %s" -#: builtin/fetch.c:609 +#: builtin/fetch.c:631 msgid "[up to date]" msgstr "[đã cập nhật]" -#: builtin/fetch.c:622 builtin/fetch.c:702 +#: builtin/fetch.c:644 builtin/fetch.c:724 msgid "[rejected]" msgstr "[Bị từ chối]" -#: builtin/fetch.c:623 +#: builtin/fetch.c:645 msgid "can't fetch in current branch" msgstr "không thể fetch (lấy) về nhánh hiện hành" -#: builtin/fetch.c:632 +#: builtin/fetch.c:654 msgid "[tag update]" msgstr "[cập nhật thẻ]" -#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682 -#: builtin/fetch.c:697 +#: builtin/fetch.c:655 builtin/fetch.c:688 builtin/fetch.c:704 +#: builtin/fetch.c:719 msgid "unable to update local ref" msgstr "không thể cập nhật tham chiếu nội bộ" -#: builtin/fetch.c:652 +#: builtin/fetch.c:674 msgid "[new tag]" msgstr "[thẻ mới]" -#: builtin/fetch.c:655 +#: builtin/fetch.c:677 msgid "[new branch]" msgstr "[nhánh mới]" -#: builtin/fetch.c:658 +#: builtin/fetch.c:680 msgid "[new ref]" msgstr "[ref (tham chiếu) mới]" -#: builtin/fetch.c:697 +#: builtin/fetch.c:719 msgid "forced update" msgstr "cưỡng bức cập nhật" -#: builtin/fetch.c:702 +#: builtin/fetch.c:724 msgid "non-fast-forward" msgstr "không-phải-chuyển-tiếp-nhanh" -#: builtin/fetch.c:747 +#: builtin/fetch.c:769 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s đã không gửi tất cả các đối tượng cần thiết\n" -#: builtin/fetch.c:767 +#: builtin/fetch.c:789 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "từ chối %s bởi vì các gốc nông thì không được phép cập nhật" -#: builtin/fetch.c:855 builtin/fetch.c:951 +#: builtin/fetch.c:877 builtin/fetch.c:973 #, c-format msgid "From %.*s\n" msgstr "Từ %.*s\n" -#: builtin/fetch.c:866 +#: builtin/fetch.c:888 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -8207,57 +8335,57 @@ msgstr "" "một số tham chiếu nội bộ không thể được cập nhật; hãy thử chạy\n" " “git remote prune %s” để bỏ đi những nhánh cũ, hay bị xung đột" -#: builtin/fetch.c:921 +#: builtin/fetch.c:943 #, c-format msgid " (%s will become dangling)" msgstr " (%s sẽ trở thành không đầu (không được quản lý))" -#: builtin/fetch.c:922 +#: builtin/fetch.c:944 #, c-format msgid " (%s has become dangling)" msgstr " (%s đã trở thành không đầu (không được quản lý))" -#: builtin/fetch.c:954 +#: builtin/fetch.c:976 msgid "[deleted]" msgstr "[đã xóa]" -#: builtin/fetch.c:955 builtin/remote.c:1023 +#: builtin/fetch.c:977 builtin/remote.c:1024 msgid "(none)" msgstr "(không)" -#: builtin/fetch.c:978 +#: builtin/fetch.c:1000 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" "Từ chối việc lấy vào trong nhánh hiện tại %s của một kho chứa không phải kho " "trần (bare)" -#: builtin/fetch.c:997 +#: builtin/fetch.c:1019 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Tùy chọn \"%s\" có giá trị \"%s\" là không hợp lệ cho %s" -#: builtin/fetch.c:1000 +#: builtin/fetch.c:1022 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Tùy chọn \"%s\" bị bỏ qua với %s\n" -#: builtin/fetch.c:1076 +#: builtin/fetch.c:1098 #, c-format msgid "Don't know how to fetch from %s" msgstr "Không biết làm cách nào để lấy về từ %s" -#: builtin/fetch.c:1236 +#: builtin/fetch.c:1258 #, c-format msgid "Fetching %s\n" msgstr "Đang lấy “%s” về\n" -#: builtin/fetch.c:1238 builtin/remote.c:97 +#: builtin/fetch.c:1260 builtin/remote.c:97 #, c-format msgid "Could not fetch %s" msgstr "không thể “%s” về" -#: builtin/fetch.c:1256 +#: builtin/fetch.c:1278 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -8265,40 +8393,40 @@ msgstr "" "Chưa chỉ ra kho chứa máy chủ. Xin hãy chỉ định hoặc là URL hoặc\n" "tên máy chủ từ cái mà những điểm xét duyệt mới có thể được fetch (lấy về)." -#: builtin/fetch.c:1279 +#: builtin/fetch.c:1301 msgid "You need to specify a tag name." msgstr "Bạn phải định rõ tên thẻ." -#: builtin/fetch.c:1321 +#: builtin/fetch.c:1344 msgid "Negative depth in --deepen is not supported" msgstr "Mức sâu là số âm trong --deepen là không được hỗ trợ" -#: builtin/fetch.c:1323 +#: builtin/fetch.c:1346 msgid "--deepen and --depth are mutually exclusive" msgstr "Các tùy chọn--deepen và --depth loại từ lẫn nhau" -#: builtin/fetch.c:1328 +#: builtin/fetch.c:1351 msgid "--depth and --unshallow cannot be used together" msgstr "tùy chọn --depth và --unshallow không thể sử dụng cùng với nhau" -#: builtin/fetch.c:1330 +#: builtin/fetch.c:1353 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow trên kho hoàn chỉnh là không hợp lý" -#: builtin/fetch.c:1349 +#: builtin/fetch.c:1366 msgid "fetch --all does not take a repository argument" msgstr "lệnh lấy về \"fetch --all\" không lấy đối số kho chứa" -#: builtin/fetch.c:1351 +#: builtin/fetch.c:1368 msgid "fetch --all does not make sense with refspecs" msgstr "lệnh lấy về \"fetch --all\" không hợp lý với refspecs" -#: builtin/fetch.c:1362 +#: builtin/fetch.c:1379 #, c-format msgid "No such remote or remote group: %s" msgstr "không có nhóm máy chủ hay máy chủ như thế: %s" -#: builtin/fetch.c:1370 +#: builtin/fetch.c:1387 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Việc lấy về cả một nhóm và chỉ định refspecs không hợp lý" @@ -8309,23 +8437,23 @@ msgstr "" "git fmt-merge-msg [-m <chú_thích>] [--log[=<n>] | --no-log] [--file <tập-" "tin>]" -#: builtin/fmt-merge-msg.c:664 +#: builtin/fmt-merge-msg.c:665 msgid "populate log with at most <n> entries from shortlog" msgstr "gắn nhật ký với ít nhất <n> mục từ lệnh “shortlog”" -#: builtin/fmt-merge-msg.c:667 +#: builtin/fmt-merge-msg.c:668 msgid "alias for --log (deprecated)" msgstr "bí danh cho --log (không được dùng)" -#: builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:671 msgid "text" msgstr "văn bản" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:672 msgid "use <text> as start of message" msgstr "dùng <văn bản thường> để bắt đầu ghi chú" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:673 msgid "file to read from" msgstr "tập tin để đọc dữ liệu từ đó" @@ -8367,101 +8495,105 @@ msgstr "trích dẫn để phù hợp cho Tcl" msgid "show only <n> matched refs" msgstr "hiển thị chỉ <n> tham chiếu khớp" -#: builtin/for-each-ref.c:42 +#: builtin/for-each-ref.c:39 builtin/tag.c:414 +msgid "respect format colors" +msgstr "các màu định dạng lưu tâm" + +#: builtin/for-each-ref.c:43 msgid "print only refs which points at the given object" msgstr "chỉ hiển thị các tham chiếu mà nó chỉ đến đối tượng đã cho" -#: builtin/for-each-ref.c:44 +#: builtin/for-each-ref.c:45 msgid "print only refs that are merged" msgstr "chỉ hiển thị những tham chiếu mà nó được hòa trộn" -#: builtin/for-each-ref.c:45 +#: builtin/for-each-ref.c:46 msgid "print only refs that are not merged" msgstr "chỉ hiển thị những tham chiếu mà nó không được hòa trộn" -#: builtin/for-each-ref.c:46 +#: builtin/for-each-ref.c:47 msgid "print only refs which contain the commit" msgstr "chỉ hiển thị những tham chiếu mà nó chứa lần chuyển giao" -#: builtin/for-each-ref.c:47 +#: builtin/for-each-ref.c:48 msgid "print only refs which don't contain the commit" msgstr "chỉ hiển thị những tham chiếu mà nó không chứa lần chuyển giao" -#: builtin/fsck.c:554 +#: builtin/fsck.c:543 msgid "Checking object directories" msgstr "Đang kiểm tra các thư mục đối tượng" -#: builtin/fsck.c:646 +#: builtin/fsck.c:635 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<các-tùy-chọn>] [<đối-tượng>…]" -#: builtin/fsck.c:652 +#: builtin/fsck.c:641 msgid "show unreachable objects" msgstr "hiển thị các đối tượng không thể đọc được" -#: builtin/fsck.c:653 +#: builtin/fsck.c:642 msgid "show dangling objects" msgstr "hiển thị các đối tượng không được quản lý" -#: builtin/fsck.c:654 +#: builtin/fsck.c:643 msgid "report tags" msgstr "báo cáo các thẻ" -#: builtin/fsck.c:655 +#: builtin/fsck.c:644 msgid "report root nodes" msgstr "báo cáo node gốc" -#: builtin/fsck.c:656 +#: builtin/fsck.c:645 msgid "make index objects head nodes" msgstr "tạo “index objects head nodes”" -#: builtin/fsck.c:657 +#: builtin/fsck.c:646 msgid "make reflogs head nodes (default)" msgstr "tạo “reflogs head nodes” (mặc định)" -#: builtin/fsck.c:658 +#: builtin/fsck.c:647 msgid "also consider packs and alternate objects" msgstr "cũng cân nhắc đến các đối tượng gói và thay thế" -#: builtin/fsck.c:659 +#: builtin/fsck.c:648 msgid "check only connectivity" msgstr "chỉ kiểm tra kết nối" -#: builtin/fsck.c:660 +#: builtin/fsck.c:649 msgid "enable more strict checking" msgstr "cho phép kiểm tra hạn chế hơn" -#: builtin/fsck.c:662 +#: builtin/fsck.c:651 msgid "write dangling objects in .git/lost-found" msgstr "ghi các đối tượng không được quản lý trong .git/lost-found" -#: builtin/fsck.c:663 builtin/prune.c:107 +#: builtin/fsck.c:652 builtin/prune.c:107 msgid "show progress" msgstr "hiển thị quá trình" -#: builtin/fsck.c:664 +#: builtin/fsck.c:653 msgid "show verbose names for reachable objects" msgstr "hiển thị tên chi tiết cho các đối tượng đọc được" -#: builtin/fsck.c:725 +#: builtin/fsck.c:714 msgid "Checking objects" msgstr "Đang kiểm tra các đối tượng" -#: builtin/gc.c:26 +#: builtin/gc.c:27 msgid "git gc [<options>]" msgstr "git gc [<các-tùy-chọn>]" -#: builtin/gc.c:79 +#: builtin/gc.c:80 #, c-format msgid "Failed to fstat %s: %s" msgstr "Gặp lỗi khi lấy thông tin thống kê về tập tin %s: %s" -#: builtin/gc.c:311 +#: builtin/gc.c:312 #, c-format msgid "Can't stat %s" msgstr "không thể lấy thông tin thống kê về “%s”" -#: builtin/gc.c:320 +#: builtin/gc.c:321 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -8476,45 +8608,45 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:359 +#: builtin/gc.c:360 msgid "prune unreferenced objects" msgstr "xóa bỏ các đối tượng không được tham chiếu" -#: builtin/gc.c:361 +#: builtin/gc.c:362 msgid "be more thorough (increased runtime)" msgstr "cẩn thận hơn nữa (tăng thời gian chạy)" -#: builtin/gc.c:362 +#: builtin/gc.c:363 msgid "enable auto-gc mode" msgstr "bật chế độ auto-gc" -#: builtin/gc.c:363 +#: builtin/gc.c:364 msgid "force running gc even if there may be another gc running" msgstr "buộc gc chạy ngay cả khi có tiến trình gc khác đang chạy" -#: builtin/gc.c:380 +#: builtin/gc.c:381 #, c-format msgid "Failed to parse gc.logexpiry value %s" msgstr "Gặp lỗi khi phân tích giá trị gc.logexpiry %s" -#: builtin/gc.c:408 +#: builtin/gc.c:409 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" "Tự động đóng gói kho chứa trên nền hệ thống để tối ưu hóa hiệu suất làm " "việc.\n" -#: builtin/gc.c:410 +#: builtin/gc.c:411 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Tự động đóng gói kho chứa để tối ưu hóa hiệu suất làm việc.\n" -#: builtin/gc.c:411 +#: builtin/gc.c:412 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Xem \"git help gc\" để có hướng dẫn cụ thể về cách dọn dẹp kho git.\n" -#: builtin/gc.c:436 +#: builtin/gc.c:437 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -8522,7 +8654,7 @@ msgstr "" "gc đang được thực hiện trên máy “%s” pid %<PRIuMAX> (dùng --force nếu không " "phải thế)" -#: builtin/gc.c:480 +#: builtin/gc.c:481 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -8533,12 +8665,12 @@ msgstr "" msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<các-tùy-chọn>] [-e] <mẫu> [<rev>…] [[--] <đường-dẫn>…]" -#: builtin/grep.c:235 +#: builtin/grep.c:226 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep: gặp lỗi tạo tuyến (thread): %s" -#: builtin/grep.c:293 +#: builtin/grep.c:284 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "số tuyến đã cho không hợp lệ (%d) cho %s" @@ -8547,250 +8679,242 @@ msgstr "số tuyến đã cho không hợp lệ (%d) cho %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692 +#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1693 #, c-format msgid "no threads support, ignoring %s" msgstr "không hỗ trợ đa tuyến, bỏ qua %s" -#: builtin/grep.c:788 builtin/grep.c:829 +#: builtin/grep.c:451 builtin/grep.c:571 builtin/grep.c:613 #, c-format msgid "unable to read tree (%s)" msgstr "không thể đọc cây (%s)" -#: builtin/grep.c:848 +#: builtin/grep.c:628 #, c-format msgid "unable to grep from object of type %s" msgstr "không thể thực hiện lệnh grep (lọc tìm) từ đối tượng thuộc kiểu %s" -#: builtin/grep.c:912 +#: builtin/grep.c:694 #, c-format msgid "switch `%c' expects a numerical value" msgstr "chuyển đến “%c” cần một giá trị bằng số" -#: builtin/grep.c:999 +#: builtin/grep.c:781 msgid "search in index instead of in the work tree" msgstr "tìm trong bảng mục lục thay vì trong cây làm việc" -#: builtin/grep.c:1001 +#: builtin/grep.c:783 msgid "find in contents not managed by git" msgstr "tìm trong nội dung không được quản lý bởi git" -#: builtin/grep.c:1003 +#: builtin/grep.c:785 msgid "search in both tracked and untracked files" msgstr "tìm kiếm các tập tin được và chưa được theo dõi dấu vết" -#: builtin/grep.c:1005 +#: builtin/grep.c:787 msgid "ignore files specified via '.gitignore'" msgstr "các tập tin bị bỏ qua được chỉ định thông qua “.gitignore”" -#: builtin/grep.c:1007 +#: builtin/grep.c:789 msgid "recursively search in each submodule" msgstr "tìm kiếm đệ quy trong từng mô-đun-con" -#: builtin/grep.c:1009 -msgid "basename" -msgstr "tên cơ sở" - -#: builtin/grep.c:1010 -msgid "prepend parent project's basename to output" -msgstr "treo vào trước tên cơ sở cha mẹ của đường dẫn vào kết xuất" - -#: builtin/grep.c:1013 +#: builtin/grep.c:792 msgid "show non-matching lines" msgstr "hiển thị những dòng không khớp với mẫu" -#: builtin/grep.c:1015 +#: builtin/grep.c:794 msgid "case insensitive matching" msgstr "phân biệt HOA/thường" -#: builtin/grep.c:1017 +#: builtin/grep.c:796 msgid "match patterns only at word boundaries" msgstr "chỉ khớp mẫu tại đường ranh giới từ" -#: builtin/grep.c:1019 +#: builtin/grep.c:798 msgid "process binary files as text" msgstr "xử lý tập tin nhị phân như là dạng văn bản thường" -#: builtin/grep.c:1021 +#: builtin/grep.c:800 msgid "don't match patterns in binary files" msgstr "không khớp mẫu trong các tập tin nhị phân" -#: builtin/grep.c:1024 +#: builtin/grep.c:803 msgid "process binary files with textconv filters" msgstr "xử lý tập tin nhị phân với các bộ lọc “textconv”" -#: builtin/grep.c:1026 +#: builtin/grep.c:805 msgid "descend at most <depth> levels" msgstr "hạ xuống ít nhất là mức <sâu>" -#: builtin/grep.c:1030 +#: builtin/grep.c:809 msgid "use extended POSIX regular expressions" msgstr "dùng biểu thức chính qui POSIX có mở rộng" -#: builtin/grep.c:1033 +#: builtin/grep.c:812 msgid "use basic POSIX regular expressions (default)" msgstr "sử dụng biểu thức chính quy kiểu POSIX (mặc định)" -#: builtin/grep.c:1036 +#: builtin/grep.c:815 msgid "interpret patterns as fixed strings" msgstr "diễn dịch các mẫu như là chuỗi cố định" -#: builtin/grep.c:1039 +#: builtin/grep.c:818 msgid "use Perl-compatible regular expressions" msgstr "sử dụng biểu thức chính quy tương thích Perl" -#: builtin/grep.c:1042 +#: builtin/grep.c:821 msgid "show line numbers" msgstr "hiển thị số của dòng" -#: builtin/grep.c:1043 +#: builtin/grep.c:822 msgid "don't show filenames" msgstr "không hiển thị tên tập tin" -#: builtin/grep.c:1044 +#: builtin/grep.c:823 msgid "show filenames" msgstr "hiển thị các tên tập tin" -#: builtin/grep.c:1046 +#: builtin/grep.c:825 msgid "show filenames relative to top directory" msgstr "hiển thị tên tập tin tương đối với thư mục đỉnh (top)" -#: builtin/grep.c:1048 +#: builtin/grep.c:827 msgid "show only filenames instead of matching lines" msgstr "chỉ hiển thị tên tập tin thay vì những dòng khớp với mẫu" -#: builtin/grep.c:1050 +#: builtin/grep.c:829 msgid "synonym for --files-with-matches" msgstr "đồng nghĩa với --files-with-matches" -#: builtin/grep.c:1053 +#: builtin/grep.c:832 msgid "show only the names of files without match" msgstr "chỉ hiển thị tên cho những tập tin không khớp với mẫu" -#: builtin/grep.c:1055 +#: builtin/grep.c:834 msgid "print NUL after filenames" msgstr "thêm NUL vào sau tên tập tin" -#: builtin/grep.c:1057 +#: builtin/grep.c:836 msgid "show the number of matches instead of matching lines" msgstr "hiển thị số lượng khớp thay vì những dòng khớp với mẫu" -#: builtin/grep.c:1058 +#: builtin/grep.c:837 msgid "highlight matches" msgstr "tô sáng phần khớp mẫu" -#: builtin/grep.c:1060 +#: builtin/grep.c:839 msgid "print empty line between matches from different files" msgstr "hiển thị dòng trống giữa các lần khớp từ các tập tin khác biệt" -#: builtin/grep.c:1062 +#: builtin/grep.c:841 msgid "show filename only once above matches from same file" msgstr "" "hiển thị tên tập tin một lần phía trên các lần khớp từ cùng một tập tin" -#: builtin/grep.c:1065 +#: builtin/grep.c:844 msgid "show <n> context lines before and after matches" msgstr "hiển thị <n> dòng nội dung phía trước và sau các lần khớp" -#: builtin/grep.c:1068 +#: builtin/grep.c:847 msgid "show <n> context lines before matches" msgstr "hiển thị <n> dòng nội dung trước khớp" -#: builtin/grep.c:1070 +#: builtin/grep.c:849 msgid "show <n> context lines after matches" msgstr "hiển thị <n> dòng nội dung sau khớp" -#: builtin/grep.c:1072 +#: builtin/grep.c:851 msgid "use <n> worker threads" msgstr "dùng <n> tuyến trình làm việc" -#: builtin/grep.c:1073 +#: builtin/grep.c:852 msgid "shortcut for -C NUM" msgstr "dạng viết tắt của -C SỐ" -#: builtin/grep.c:1076 +#: builtin/grep.c:855 msgid "show a line with the function name before matches" msgstr "hiển thị dòng vói tên hàm trước các lần khớp" -#: builtin/grep.c:1078 +#: builtin/grep.c:857 msgid "show the surrounding function" msgstr "hiển thị hàm bao quanh" -#: builtin/grep.c:1081 +#: builtin/grep.c:860 msgid "read patterns from file" msgstr "đọc mẫu từ tập-tin" -#: builtin/grep.c:1083 +#: builtin/grep.c:862 msgid "match <pattern>" msgstr "match <mẫu>" -#: builtin/grep.c:1085 +#: builtin/grep.c:864 msgid "combine patterns specified with -e" msgstr "tổ hợp mẫu được chỉ ra với tùy chọn -e" -#: builtin/grep.c:1097 +#: builtin/grep.c:876 msgid "indicate hit with exit status without output" msgstr "đưa ra gợi ý với trạng thái thoát mà không có kết xuất" -#: builtin/grep.c:1099 +#: builtin/grep.c:878 msgid "show only matches from files that match all patterns" msgstr "chỉ hiển thị những cái khớp từ tập tin mà nó khớp toàn bộ các mẫu" -#: builtin/grep.c:1101 +#: builtin/grep.c:880 msgid "show parse tree for grep expression" msgstr "hiển thị cây phân tích cú pháp cho biểu thức “grep” (tìm kiếm)" -#: builtin/grep.c:1105 +#: builtin/grep.c:884 msgid "pager" msgstr "dàn trang" -#: builtin/grep.c:1105 +#: builtin/grep.c:884 msgid "show matching files in the pager" msgstr "hiển thị các tập tin khớp trong trang giấy" -#: builtin/grep.c:1108 +#: builtin/grep.c:887 msgid "allow calling of grep(1) (ignored by this build)" msgstr "cho phép gọi grep(1) (bị bỏ qua bởi lần dịch này)" -#: builtin/grep.c:1172 +#: builtin/grep.c:950 msgid "no pattern given." msgstr "chưa chỉ ra mẫu." -#: builtin/grep.c:1204 +#: builtin/grep.c:982 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index hay --untracked không được sử dụng cùng với revs" -#: builtin/grep.c:1211 +#: builtin/grep.c:989 #, c-format msgid "unable to resolve revision: %s" msgstr "không thể phân giải điểm xét duyệt: %s" -#: builtin/grep.c:1245 builtin/index-pack.c:1490 +#: builtin/grep.c:1023 builtin/index-pack.c:1491 #, c-format msgid "invalid number of threads specified (%d)" msgstr "số tuyến chỉ ra không hợp lệ (%d)" -#: builtin/grep.c:1250 +#: builtin/grep.c:1028 msgid "no threads support, ignoring --threads" msgstr "không hỗ trợ đa tuyến, bỏ qua --threads" -#: builtin/grep.c:1281 +#: builtin/grep.c:1052 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager chỉ làm việc trên cây-làm-việc" -#: builtin/grep.c:1304 +#: builtin/grep.c:1075 msgid "option not supported with --recurse-submodules." msgstr "tùy chọn không được hỗ trợ với --recurse-submodules." -#: builtin/grep.c:1310 +#: builtin/grep.c:1081 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached hay --untracked không được sử dụng với --no-index." -#: builtin/grep.c:1316 +#: builtin/grep.c:1087 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard không thể sử dụng cho nội dung lưu dấu vết." -#: builtin/grep.c:1324 +#: builtin/grep.c:1095 msgid "both --cached and trees are given." msgstr "cả hai --cached và các cây phải được chỉ ra." @@ -8881,12 +9005,12 @@ msgstr "Gặp lỗi khi phân tích phiên bản emacsclient." msgid "emacsclient version '%d' too old (< 22)." msgstr "phiên bản của emacsclient “%d” quá cũ (< 22)." -#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171 +#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173 #, c-format msgid "failed to exec '%s'" msgstr "gặp lỗi khi thực thi “%s”" -#: builtin/help.c:208 +#: builtin/help.c:211 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -8895,7 +9019,7 @@ msgstr "" "“%s”: đường dẫn không hỗ trợ bộ trình chiếu man.\n" "Hãy cân nhắc đến việc sử dụng “man.<tool>.cmd” để thay thế." -#: builtin/help.c:220 +#: builtin/help.c:223 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -8904,345 +9028,345 @@ msgstr "" "“%s”: cmd (lệnh) hỗ trợ bộ trình chiếu man.\n" "Hãy cân nhắc đến việc sử dụng “man.<tool>.path” để thay thế." -#: builtin/help.c:337 +#: builtin/help.c:340 #, c-format msgid "'%s': unknown man viewer." msgstr "“%s”: không rõ chương trình xem man." -#: builtin/help.c:354 +#: builtin/help.c:357 msgid "no man viewer handled the request" msgstr "không có trình xem trợ giúp dạng manpage tiếp hợp với yêu cầu" -#: builtin/help.c:362 +#: builtin/help.c:365 msgid "no info viewer handled the request" msgstr "không có trình xem trợ giúp dạng info tiếp hợp với yêu cầu" -#: builtin/help.c:404 +#: builtin/help.c:407 msgid "Defining attributes per path" msgstr "Định nghĩa các thuộc tính cho mỗi đường dẫn" -#: builtin/help.c:405 +#: builtin/help.c:408 msgid "Everyday Git With 20 Commands Or So" msgstr "Mỗi ngày học 20 lệnh Git hay hơn" -#: builtin/help.c:406 +#: builtin/help.c:409 msgid "A Git glossary" msgstr "Thuật ngữ chuyên môn Git" -#: builtin/help.c:407 +#: builtin/help.c:410 msgid "Specifies intentionally untracked files to ignore" msgstr "Chỉ định các tập tin không cần theo dõi" -#: builtin/help.c:408 +#: builtin/help.c:411 msgid "Defining submodule properties" msgstr "Định nghĩa thuộc tính mô-đun-con" -#: builtin/help.c:409 +#: builtin/help.c:412 msgid "Specifying revisions and ranges for Git" msgstr "Chỉ định điểm xét duyệt và vùng cho Git" -#: builtin/help.c:410 +#: builtin/help.c:413 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "Hướng dẫn cách dùng Git ở mức cơ bản (bản 1.5.1 hay mới hơn)" -#: builtin/help.c:411 +#: builtin/help.c:414 msgid "An overview of recommended workflows with Git" msgstr "Tổng quan về luồng công việc khuyến nghị nên dùng với Git." -#: builtin/help.c:423 +#: builtin/help.c:426 msgid "The common Git guides are:\n" msgstr "Các chỉ dẫn chung về cách dùng Git là:\n" -#: builtin/help.c:441 +#: builtin/help.c:444 #, c-format -msgid "`git %s' is aliased to `%s'" -msgstr "“git %s” được đặt bí danh thành “%s”" +msgid "'%s' is aliased to '%s'" +msgstr "“%s” được đặt bí danh thành “%s”" -#: builtin/help.c:463 builtin/help.c:480 +#: builtin/help.c:466 builtin/help.c:483 #, c-format msgid "usage: %s%s" msgstr "cách dùng: %s%s" -#: builtin/index-pack.c:155 +#: builtin/index-pack.c:156 #, c-format msgid "unable to open %s" msgstr "không thể mở %s" -#: builtin/index-pack.c:205 +#: builtin/index-pack.c:206 #, c-format msgid "object type mismatch at %s" msgstr "kiểu đối tượng không khớp tại %s" -#: builtin/index-pack.c:225 +#: builtin/index-pack.c:226 #, c-format msgid "did not receive expected object %s" msgstr "Không thể lấy về đối tượng cần %s" -#: builtin/index-pack.c:228 +#: builtin/index-pack.c:229 #, c-format msgid "object %s: expected type %s, found %s" msgstr "đối tượng %s: cần kiểu %s nhưng lại nhận được %s" -#: builtin/index-pack.c:270 +#: builtin/index-pack.c:271 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "không thể điền thêm vào %d byte" -#: builtin/index-pack.c:280 +#: builtin/index-pack.c:281 msgid "early EOF" msgstr "gặp kết thúc tập tin EOF quá sớm" -#: builtin/index-pack.c:281 +#: builtin/index-pack.c:282 msgid "read error on input" msgstr "lỗi đọc ở đầu vào" -#: builtin/index-pack.c:293 +#: builtin/index-pack.c:294 msgid "used more bytes than were available" msgstr "sử dụng nhiều hơn số lượng byte mà nó sẵn có" -#: builtin/index-pack.c:300 +#: builtin/index-pack.c:301 msgid "pack too large for current definition of off_t" msgstr "gói quá lớn so với định nghĩa hiện tại của kiểu off_t" -#: builtin/index-pack.c:303 builtin/unpack-objects.c:93 +#: builtin/index-pack.c:304 builtin/unpack-objects.c:93 msgid "pack exceeds maximum allowed size" msgstr "gói đã vượt quá cỡ tối đa được phép" -#: builtin/index-pack.c:318 +#: builtin/index-pack.c:319 #, c-format msgid "unable to create '%s'" msgstr "không thể tạo “%s”" -#: builtin/index-pack.c:324 +#: builtin/index-pack.c:325 #, c-format msgid "cannot open packfile '%s'" msgstr "không thể mở packfile “%s”" -#: builtin/index-pack.c:338 +#: builtin/index-pack.c:339 msgid "pack signature mismatch" msgstr "chữ ký cho gói không khớp" -#: builtin/index-pack.c:340 +#: builtin/index-pack.c:341 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "không hỗ trợ phiên bản gói %<PRIu32>" -#: builtin/index-pack.c:358 +#: builtin/index-pack.c:359 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "gói có đối tượng sai tại khoảng bù %<PRIuMAX>: %s" -#: builtin/index-pack.c:479 +#: builtin/index-pack.c:480 #, c-format msgid "inflate returned %d" msgstr "xả nén trả về %d" -#: builtin/index-pack.c:528 +#: builtin/index-pack.c:529 msgid "offset value overflow for delta base object" msgstr "tràn giá trị khoảng bù cho đối tượng delta cơ sở" -#: builtin/index-pack.c:536 +#: builtin/index-pack.c:537 msgid "delta base offset is out of bound" msgstr "khoảng bù cơ sở cho delta nằm ngoài phạm vi" -#: builtin/index-pack.c:544 +#: builtin/index-pack.c:545 #, c-format msgid "unknown object type %d" msgstr "không hiểu kiểu đối tượng %d" -#: builtin/index-pack.c:575 +#: builtin/index-pack.c:576 msgid "cannot pread pack file" msgstr "không thể chạy hàm pread cho tập tin gói" -#: builtin/index-pack.c:577 +#: builtin/index-pack.c:578 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "tập tin gói bị kết thúc sớm, thiếu %<PRIuMAX> byte" -#: builtin/index-pack.c:603 +#: builtin/index-pack.c:604 msgid "serious inflate inconsistency" msgstr "sự mâu thuẫn xả nén nghiêm trọng" -#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777 -#: builtin/index-pack.c:816 builtin/index-pack.c:825 +#: 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 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SỰ VA CHẠM SHA1 ĐÃ XẢY RA VỚI %s!" -#: builtin/index-pack.c:751 builtin/pack-objects.c:167 -#: builtin/pack-objects.c:261 +#: builtin/index-pack.c:752 builtin/pack-objects.c:168 +#: builtin/pack-objects.c:262 #, c-format msgid "unable to read %s" msgstr "không thể đọc %s" -#: builtin/index-pack.c:814 +#: builtin/index-pack.c:815 #, c-format msgid "cannot read existing object info %s" msgstr "không thể đọc thông tin đối tượng sẵn có %s" -#: builtin/index-pack.c:822 +#: builtin/index-pack.c:823 #, c-format msgid "cannot read existing object %s" msgstr "không thể đọc đối tượng đã tồn tại %s" -#: builtin/index-pack.c:836 +#: builtin/index-pack.c:837 #, c-format msgid "invalid blob object %s" msgstr "đối tượng blob không hợp lệ %s" -#: builtin/index-pack.c:851 +#: builtin/index-pack.c:852 #, c-format msgid "invalid %s" msgstr "%s không hợp lệ" -#: builtin/index-pack.c:854 +#: builtin/index-pack.c:855 msgid "Error in object" msgstr "Lỗi trong đối tượng" -#: builtin/index-pack.c:856 +#: builtin/index-pack.c:857 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Không phải tất cả các đối tượng con của %s là có thể với tới được" -#: builtin/index-pack.c:928 builtin/index-pack.c:959 +#: builtin/index-pack.c:929 builtin/index-pack.c:960 msgid "failed to apply delta" msgstr "gặp lỗi khi áp dụng delta" -#: builtin/index-pack.c:1130 +#: builtin/index-pack.c:1131 msgid "Receiving objects" msgstr "Đang nhận về các đối tượng" -#: builtin/index-pack.c:1130 +#: builtin/index-pack.c:1131 msgid "Indexing objects" msgstr "Các đối tượng bảng mục lục" -#: builtin/index-pack.c:1164 +#: builtin/index-pack.c:1165 msgid "pack is corrupted (SHA1 mismatch)" msgstr "gói bị sai hỏng (SHA1 không khớp)" -#: builtin/index-pack.c:1169 +#: builtin/index-pack.c:1170 msgid "cannot fstat packfile" msgstr "không thể lấy thông tin thống kê packfile" -#: builtin/index-pack.c:1172 +#: builtin/index-pack.c:1173 msgid "pack has junk at the end" msgstr "pack có phần thừa ở cuối" -#: builtin/index-pack.c:1184 +#: builtin/index-pack.c:1185 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "lộn xộn hơn cả điên rồ khi chạy hàm parse_pack_objects()" -#: builtin/index-pack.c:1207 +#: builtin/index-pack.c:1208 msgid "Resolving deltas" msgstr "Đang phân giải các delta" -#: builtin/index-pack.c:1218 +#: builtin/index-pack.c:1219 #, c-format msgid "unable to create thread: %s" msgstr "không thể tạo tuyến: %s" -#: builtin/index-pack.c:1260 +#: builtin/index-pack.c:1261 msgid "confusion beyond insanity" msgstr "lộn xộn hơn cả điên rồ" -#: builtin/index-pack.c:1266 +#: builtin/index-pack.c:1267 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "đầy đủ với %d đối tượng nội bộ" -#: builtin/index-pack.c:1278 +#: builtin/index-pack.c:1279 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Gặp tổng kiểm tra tail không cần cho %s (đĩa hỏng?)" -#: builtin/index-pack.c:1282 +#: builtin/index-pack.c:1283 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "gói có %d delta chưa được giải quyết" -#: builtin/index-pack.c:1306 +#: builtin/index-pack.c:1307 #, c-format msgid "unable to deflate appended object (%d)" msgstr "không thể xả nén đối tượng nối thêm (%d)" -#: builtin/index-pack.c:1382 +#: builtin/index-pack.c:1383 #, c-format msgid "local object %s is corrupt" msgstr "đối tượng nội bộ %s bị hỏng" -#: builtin/index-pack.c:1408 +#: builtin/index-pack.c:1409 msgid "error while closing pack file" msgstr "gặp lỗi trong khi đóng tập tin gói" -#: builtin/index-pack.c:1420 +#: builtin/index-pack.c:1421 #, c-format msgid "cannot write keep file '%s'" msgstr "không thể ghi tập tin giữ lại “%s”" -#: builtin/index-pack.c:1428 +#: builtin/index-pack.c:1429 #, c-format msgid "cannot close written keep file '%s'" msgstr "không thể đóng tập tin giữ lại đã được ghi “%s”" -#: builtin/index-pack.c:1438 +#: builtin/index-pack.c:1439 msgid "cannot store pack file" msgstr "không thể lưu tập tin gói" -#: builtin/index-pack.c:1446 +#: builtin/index-pack.c:1447 msgid "cannot store index file" msgstr "không thể lưu trữ tập tin ghi mục lục" -#: builtin/index-pack.c:1484 +#: builtin/index-pack.c:1485 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "sai pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1552 +#: builtin/index-pack.c:1553 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Không thể mở tập tin gói đã sẵn có “%s”" -#: builtin/index-pack.c:1554 +#: builtin/index-pack.c:1555 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Không thể mở tập tin idx của gói cho “%s”" -#: builtin/index-pack.c:1602 +#: builtin/index-pack.c:1603 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "không delta: %d đối tượng" -#: builtin/index-pack.c:1609 +#: builtin/index-pack.c:1610 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "chiều dài xích = %d: %lu đối tượng" -#: builtin/index-pack.c:1622 +#: builtin/index-pack.c:1623 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "tên tập tin tập tin gói “%s” không được kết thúc bằng đuôi “.pack”" -#: builtin/index-pack.c:1704 builtin/index-pack.c:1707 -#: builtin/index-pack.c:1723 builtin/index-pack.c:1727 +#: builtin/index-pack.c:1705 builtin/index-pack.c:1708 +#: builtin/index-pack.c:1724 builtin/index-pack.c:1728 #, c-format msgid "bad %s" msgstr "%s sai" -#: builtin/index-pack.c:1743 +#: builtin/index-pack.c:1744 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin không thể được dùng mà không có --stdin" -#: builtin/index-pack.c:1745 +#: builtin/index-pack.c:1746 msgid "--stdin requires a git repository" msgstr "--stdin cần một kho git" -#: builtin/index-pack.c:1753 +#: builtin/index-pack.c:1754 msgid "--verify with no packfile name given" msgstr "dùng tùy chọn --verify mà không đưa ra tên packfile" @@ -9374,132 +9498,164 @@ msgstr "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " "<thẻ>[(=|:)<giá-trị>])…] [<tập-tin>…]" -#: builtin/interpret-trailers.c:26 +#: builtin/interpret-trailers.c:92 msgid "edit files in place" msgstr "sửa các tập tin tại chỗ" -#: builtin/interpret-trailers.c:27 +#: builtin/interpret-trailers.c:93 msgid "trim empty trailers" msgstr "bộ dò vết cắt bỏ phần trống rỗng" -#: builtin/interpret-trailers.c:28 +#: builtin/interpret-trailers.c:96 +msgid "where to place the new trailer" +msgstr "đặt phần đuôi mới ở đâu" + +#: builtin/interpret-trailers.c:98 +msgid "action if trailer already exists" +msgstr "thao tác khi đã có phần đuôi" + +#: builtin/interpret-trailers.c:100 +msgid "action if trailer is missing" +msgstr "thao tác khi thiếu phần đuôi" + +#: builtin/interpret-trailers.c:102 +msgid "output only the trailers" +msgstr "chỉ xuất phần đuôi" + +#: builtin/interpret-trailers.c:103 +msgid "do not apply config rules" +msgstr "đừng áp dụng các quy tắc cấu hình" + +#: builtin/interpret-trailers.c:104 +msgid "join whitespace-continued values" +msgstr "nối các giá trị khoảng-trắng-liên-tiếp" + +#: builtin/interpret-trailers.c:105 +msgid "set parsing options" +msgstr "đặt các tùy chọn phân tích cú pháp" + +#: builtin/interpret-trailers.c:107 msgid "trailer" msgstr "bộ dò vết" -#: builtin/interpret-trailers.c:29 +#: builtin/interpret-trailers.c:108 msgid "trailer(s) to add" msgstr "bộ dò vết cần thêm" -#: builtin/interpret-trailers.c:42 +#: builtin/interpret-trailers.c:117 +msgid "--trailer with --only-input does not make sense" +msgstr "--trailer cùng với --only-input không hợp lý" + +#: builtin/interpret-trailers.c:127 msgid "no input file given for in-place editing" msgstr "không đưa ra tập tin đầu vào để sửa tại-chỗ" -#: builtin/log.c:45 +#: builtin/log.c:46 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<các-tùy-chọn>] [<vùng-xem-xét>] [[--] <đường-dẫn>…]" -#: builtin/log.c:46 +#: builtin/log.c:47 msgid "git show [<options>] <object>..." msgstr "git show [<các-tùy-chọn>] <đối-tượng>…" -#: builtin/log.c:90 +#: builtin/log.c:91 #, c-format msgid "invalid --decorate option: %s" msgstr "tùy chọn--decorate không hợp lệ: %s" -#: builtin/log.c:147 +#: builtin/log.c:148 msgid "suppress diff output" msgstr "chặn mọi kết xuất từ diff" -#: builtin/log.c:148 +#: builtin/log.c:149 msgid "show source" msgstr "hiển thị mã nguồn" -#: builtin/log.c:149 +#: builtin/log.c:150 msgid "Use mail map file" msgstr "Sử dụng tập tin ánh xạ thư" -#: builtin/log.c:150 +#: builtin/log.c:151 msgid "decorate options" msgstr "các tùy chọn trang trí" -#: builtin/log.c:153 +#: builtin/log.c:154 msgid "Process line range n,m in file, counting from 1" msgstr "Xử lý chỉ dòng vùng n,m trong tập tin, tính từ 1" -#: builtin/log.c:249 +#: builtin/log.c:250 #, c-format msgid "Final output: %d %s\n" msgstr "Kết xuất cuối cùng: %d %s\n" -#: builtin/log.c:497 +#: builtin/log.c:501 #, c-format msgid "git show %s: bad file" msgstr "git show %s: sai tập tin" -#: builtin/log.c:512 builtin/log.c:606 +#: builtin/log.c:516 builtin/log.c:610 #, c-format msgid "Could not read object %s" msgstr "Không thể đọc đối tượng %s" -#: builtin/log.c:630 +#: builtin/log.c:634 #, c-format msgid "Unknown type: %d" msgstr "Không nhận ra kiểu: %d" -#: builtin/log.c:751 +#: builtin/log.c:755 msgid "format.headers without value" msgstr "format.headers không có giá trị cụ thể" -#: builtin/log.c:852 +#: builtin/log.c:856 msgid "name of output directory is too long" msgstr "tên của thư mục kết xuất quá dài" -#: builtin/log.c:868 +#: builtin/log.c:872 #, c-format msgid "Cannot open patch file %s" msgstr "Không thể mở tập tin miếng vá: %s" -#: builtin/log.c:885 +#: builtin/log.c:889 msgid "Need exactly one range." msgstr "Cần chính xác một vùng." -#: builtin/log.c:895 +#: builtin/log.c:899 msgid "Not a range." msgstr "Không phải là một vùng." -#: builtin/log.c:1001 +#: builtin/log.c:1005 msgid "Cover letter needs email format" msgstr "“Cover letter” cần cho định dạng thư" -#: builtin/log.c:1081 +#: builtin/log.c:1085 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to điên rồ: %s" -#: builtin/log.c:1108 +#: builtin/log.c:1112 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<các-tùy-chọn>] [<kể-từ> | <vùng-xem-xét>]" -#: builtin/log.c:1158 +#: builtin/log.c:1162 msgid "Two output directories?" msgstr "Hai thư mục kết xuất?" -#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922 +#: builtin/log.c:1269 builtin/log.c:1920 builtin/log.c:1922 builtin/log.c:1934 #, c-format msgid "Unknown commit %s" msgstr "Không hiểu lần chuyển giao %s" -#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533 +#: builtin/log.c:1279 builtin/notes.c:887 builtin/tag.c:516 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Gặp lỗi khi phân giải “%s” như là một tham chiếu hợp lệ." -#: builtin/log.c:1280 +#: builtin/log.c:1284 msgid "Could not find exact merge base." msgstr "Không tìm thấy nền hòa trộn chính xác." -#: builtin/log.c:1284 +#: builtin/log.c:1288 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" @@ -9510,219 +9666,227 @@ msgstr "" "nhánh máy chủ. Hoặc là bạn có thể chỉ định lần chuyển giao nền bằng\n" "\"--base=<base-commit-id>\" một cách thủ công." -#: builtin/log.c:1304 +#: builtin/log.c:1308 msgid "Failed to find exact merge base" msgstr "Gặp lỗi khi tìm nền hòa trộn chính xác." -#: builtin/log.c:1315 +#: builtin/log.c:1319 msgid "base commit should be the ancestor of revision list" msgstr "lần chuyển giao nền không là tổ tiên của danh sách điểm xét duyệt" -#: builtin/log.c:1319 +#: builtin/log.c:1323 msgid "base commit shouldn't be in revision list" msgstr "lần chuyển giao nền không được trong danh sách điểm xét duyệt" -#: builtin/log.c:1368 +#: builtin/log.c:1372 msgid "cannot get patch id" msgstr "không thể lấy mã miếng vá" -#: builtin/log.c:1425 +#: builtin/log.c:1431 msgid "use [PATCH n/m] even with a single patch" msgstr "dùng [PATCH n/m] ngay cả với miếng vá đơn" -#: builtin/log.c:1428 +#: builtin/log.c:1434 msgid "use [PATCH] even with multiple patches" msgstr "dùng [VÁ] ngay cả với các miếng vá phức tạp" -#: builtin/log.c:1432 +#: builtin/log.c:1438 msgid "print patches to standard out" msgstr "hiển thị miếng vá ra đầu ra chuẩn" -#: builtin/log.c:1434 +#: builtin/log.c:1440 msgid "generate a cover letter" msgstr "tạo bì thư" -#: builtin/log.c:1436 +#: builtin/log.c:1442 msgid "use simple number sequence for output file names" msgstr "sử dụng chỗi dãy số dạng đơn giản cho tên tập-tin xuất ra" -#: builtin/log.c:1437 +#: builtin/log.c:1443 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1438 +#: builtin/log.c:1444 msgid "use <sfx> instead of '.patch'" msgstr "sử dụng <sfx> thay cho “.patch”" -#: builtin/log.c:1440 +#: builtin/log.c:1446 msgid "start numbering patches at <n> instead of 1" msgstr "bắt đầu đánh số miếng vá từ <n> thay vì 1" -#: builtin/log.c:1442 +#: builtin/log.c:1448 msgid "mark the series as Nth re-roll" msgstr "đánh dấu chuỗi nối tiếp dạng thứ-N re-roll" -#: builtin/log.c:1444 +#: builtin/log.c:1450 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Dùng [RFC VÁ] thay cho [VÁ]" -#: builtin/log.c:1447 +#: builtin/log.c:1453 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Dùng [<tiền-tố>] thay cho [VÁ]" -#: builtin/log.c:1450 +#: builtin/log.c:1456 msgid "store resulting files in <dir>" msgstr "lưu các tập tin kết quả trong <t.mục>" -#: builtin/log.c:1453 +#: builtin/log.c:1459 msgid "don't strip/add [PATCH]" msgstr "không strip/add [VÁ]" -#: builtin/log.c:1456 +#: builtin/log.c:1462 msgid "don't output binary diffs" msgstr "không kết xuất diff (những khác biệt) nhị phân" -#: builtin/log.c:1458 +#: builtin/log.c:1464 msgid "output all-zero hash in From header" msgstr "xuất mọi mã băm all-zero trong phần đầu From" -#: builtin/log.c:1460 +#: builtin/log.c:1466 msgid "don't include a patch matching a commit upstream" msgstr "không bao gồm miếng vá khớp với một lần chuyển giao thượng nguồn" -#: builtin/log.c:1462 +#: builtin/log.c:1468 msgid "show patch format instead of default (patch + stat)" msgstr "hiển thị định dạng miếng vá thay vì mặc định (miếng vá + thống kê)" -#: builtin/log.c:1464 +#: builtin/log.c:1470 msgid "Messaging" msgstr "Lời nhắn" -#: builtin/log.c:1465 +#: builtin/log.c:1471 msgid "header" msgstr "đầu đề thư" -#: builtin/log.c:1466 +#: builtin/log.c:1472 msgid "add email header" msgstr "thêm đầu đề thư" -#: builtin/log.c:1467 builtin/log.c:1469 +#: builtin/log.c:1473 builtin/log.c:1475 msgid "email" msgstr "thư điện tử" -#: builtin/log.c:1467 +#: builtin/log.c:1473 msgid "add To: header" msgstr "thêm To: đầu đề thư" -#: builtin/log.c:1469 +#: builtin/log.c:1475 msgid "add Cc: header" msgstr "thêm Cc: đầu đề thư" -#: builtin/log.c:1471 +#: builtin/log.c:1477 msgid "ident" msgstr "thụt lề" -#: builtin/log.c:1472 +#: builtin/log.c:1478 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "đặt “Địa chỉ gửi” thành <thụ lề> (hoặc thụt lề người commit nếu bỏ quên)" -#: builtin/log.c:1474 +#: builtin/log.c:1480 msgid "message-id" msgstr "message-id" -#: builtin/log.c:1475 +#: builtin/log.c:1481 msgid "make first mail a reply to <message-id>" msgstr "dùng thư đầu tiên để trả lời <message-id>" -#: builtin/log.c:1476 builtin/log.c:1479 +#: builtin/log.c:1482 builtin/log.c:1485 msgid "boundary" msgstr "ranh giới" -#: builtin/log.c:1477 +#: builtin/log.c:1483 msgid "attach the patch" msgstr "đính kèm miếng vá" -#: builtin/log.c:1480 +#: builtin/log.c:1486 msgid "inline the patch" msgstr "dùng miếng vá làm nội dung" -#: builtin/log.c:1484 +#: builtin/log.c:1490 msgid "enable message threading, styles: shallow, deep" msgstr "cho phép luồng lời nhắn, kiểu: “shallow”, “deep”" -#: builtin/log.c:1486 +#: builtin/log.c:1492 msgid "signature" msgstr "chữ ký" -#: builtin/log.c:1487 +#: builtin/log.c:1493 msgid "add a signature" msgstr "thêm chữ ký" -#: builtin/log.c:1488 +#: builtin/log.c:1494 msgid "base-commit" msgstr "lần_chuyển_giao_nền" -#: builtin/log.c:1489 +#: builtin/log.c:1495 msgid "add prerequisite tree info to the patch series" msgstr "add trước hết đòi hỏi thông tin cây tới sê-ri miếng vá" -#: builtin/log.c:1491 +#: builtin/log.c:1497 msgid "add a signature from a file" msgstr "thêm chữ ký từ một tập tin" -#: builtin/log.c:1492 +#: builtin/log.c:1498 msgid "don't print the patch filenames" msgstr "không hiển thị các tên tập tin của miếng vá" -#: builtin/log.c:1567 +#: builtin/log.c:1500 +msgid "show progress while generating patches" +msgstr "hiển thị bộ đo tiến triển trong khi tạo các miếng vá" + +#: builtin/log.c:1575 #, c-format msgid "invalid ident line: %s" msgstr "dòng thụt lề không hợp lệ: %s" -#: builtin/log.c:1582 +#: builtin/log.c:1590 msgid "-n and -k are mutually exclusive." msgstr "-n và -k loại từ lẫn nhau." -#: builtin/log.c:1584 +#: builtin/log.c:1592 msgid "--subject-prefix/--rfc and -k are mutually exclusive." msgstr "--subject-prefix/--rfc và -k xung khắc nhau." -#: builtin/log.c:1592 +#: builtin/log.c:1600 msgid "--name-only does not make sense" msgstr "--name-only không hợp lý" -#: builtin/log.c:1594 +#: builtin/log.c:1602 msgid "--name-status does not make sense" msgstr "--name-status không hợp lý" -#: builtin/log.c:1596 +#: builtin/log.c:1604 msgid "--check does not make sense" msgstr "--check không hợp lý" -#: builtin/log.c:1626 +#: builtin/log.c:1634 msgid "standard output, or directory, which one?" msgstr "đầu ra chuẩn, hay thư mục, chọn cái nào?" -#: builtin/log.c:1628 +#: builtin/log.c:1636 #, c-format msgid "Could not create directory '%s'" msgstr "Không thể tạo thư mục “%s”" -#: builtin/log.c:1722 +#: builtin/log.c:1729 #, c-format msgid "unable to read signature file '%s'" msgstr "không thể đọc tập tin chữ ký “%s”" -#: builtin/log.c:1794 +#: builtin/log.c:1761 +msgid "Generating patches" +msgstr "Đang tạo các miếng vá" + +#: builtin/log.c:1805 msgid "Failed to create output files" msgstr "Gặp lỗi khi tạo các tập tin kết xuất" -#: builtin/log.c:1843 +#: builtin/log.c:1855 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<thượng-nguồn> [<đầu> [<giới-hạn>]]]" -#: builtin/log.c:1897 +#: builtin/log.c:1909 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -9730,106 +9894,106 @@ msgstr "" "Không tìm thấy nhánh mạng được theo dõi, hãy chỉ định <thượng-nguồn> một " "cách thủ công.\n" -#: builtin/ls-files.c:468 +#: builtin/ls-files.c:466 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<các-tùy-chọn>] [<tập-tin>…]" -#: builtin/ls-files.c:517 +#: builtin/ls-files.c:515 msgid "identify the file status with tags" msgstr "nhận dạng các trạng thái tập tin với thẻ" -#: builtin/ls-files.c:519 +#: builtin/ls-files.c:517 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" "dùng chữ cái viết thường cho các tập tin “assume unchanged” (giả định không " "thay đổi)" -#: builtin/ls-files.c:521 +#: builtin/ls-files.c:519 msgid "show cached files in the output (default)" msgstr "hiển thị các tập tin được nhớ tạm vào đầu ra (mặc định)" -#: builtin/ls-files.c:523 +#: builtin/ls-files.c:521 msgid "show deleted files in the output" msgstr "hiển thị các tập tin đã xóa trong kết xuất" -#: builtin/ls-files.c:525 +#: builtin/ls-files.c:523 msgid "show modified files in the output" msgstr "hiển thị các tập tin đã bị sửa đổi ra kết xuất" -#: builtin/ls-files.c:527 +#: builtin/ls-files.c:525 msgid "show other files in the output" msgstr "hiển thị các tập tin khác trong kết xuất" -#: builtin/ls-files.c:529 +#: builtin/ls-files.c:527 msgid "show ignored files in the output" msgstr "hiển thị các tập tin bị bỏ qua trong kết xuất" -#: builtin/ls-files.c:532 +#: builtin/ls-files.c:530 msgid "show staged contents' object name in the output" msgstr "hiển thị tên đối tượng của nội dung được đặt lên bệ phóng ra kết xuất" -#: builtin/ls-files.c:534 +#: builtin/ls-files.c:532 msgid "show files on the filesystem that need to be removed" msgstr "hiển thị các tập tin trên hệ thống tập tin mà nó cần được gỡ bỏ" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:534 msgid "show 'other' directories' names only" msgstr "chỉ hiển thị tên của các thư mục “khác”" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:536 msgid "show line endings of files" msgstr "hiển thị kết thúc dòng của các tập tin" -#: builtin/ls-files.c:540 +#: builtin/ls-files.c:538 msgid "don't show empty directories" msgstr "không hiển thị thư mục rỗng" -#: builtin/ls-files.c:543 +#: builtin/ls-files.c:541 msgid "show unmerged files in the output" msgstr "hiển thị các tập tin chưa hòa trộn trong kết xuất" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:543 msgid "show resolve-undo information" msgstr "hiển thị thông tin resolve-undo" -#: builtin/ls-files.c:547 +#: builtin/ls-files.c:545 msgid "skip files matching pattern" msgstr "bỏ qua những tập tin khớp với một mẫu" -#: builtin/ls-files.c:550 +#: builtin/ls-files.c:548 msgid "exclude patterns are read from <file>" msgstr "mẫu loại trừ được đọc từ <tập tin>" -#: builtin/ls-files.c:553 +#: builtin/ls-files.c:551 msgid "read additional per-directory exclude patterns in <file>" msgstr "đọc thêm các mẫu ngoại trừ mỗi thư mục trong <tập tin>" -#: builtin/ls-files.c:555 +#: builtin/ls-files.c:553 msgid "add the standard git exclusions" msgstr "thêm loại trừ tiêu chuẩn kiểu git" -#: builtin/ls-files.c:558 +#: builtin/ls-files.c:556 msgid "make the output relative to the project top directory" msgstr "làm cho kết xuất liên quan đến thư mục ở mức cao nhất (gốc) của dự án" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:559 msgid "recurse through submodules" msgstr "đệ quy xuyên qua mô-đun con" -#: builtin/ls-files.c:563 +#: builtin/ls-files.c:561 msgid "if any <file> is not in the index, treat this as an error" msgstr "nếu <tập tin> bất kỳ không ở trong bảng mục lục, xử lý nó như một lỗi" -#: builtin/ls-files.c:564 +#: builtin/ls-files.c:562 msgid "tree-ish" msgstr "tree-ish" -#: builtin/ls-files.c:565 +#: builtin/ls-files.c:563 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "giả định rằng các đường dẫn đã bị gỡ bỏ kể từ <tree-ish> nay vẫn hiện diện" -#: builtin/ls-files.c:567 +#: builtin/ls-files.c:565 msgid "show debugging data" msgstr "hiển thị dữ liệu gỡ lỗi" @@ -9920,180 +10084,184 @@ msgstr "liệt kê cây mục tin; không chỉ thư mục hiện hành (ngụ msgid "empty mbox: '%s'" msgstr "mbox trống rỗng: “%s”" -#: builtin/merge.c:47 +#: builtin/merge.c:48 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<các-tùy-chọn>] [<commit>…]" -#: builtin/merge.c:48 +#: builtin/merge.c:49 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:49 +#: builtin/merge.c:50 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:104 +#: builtin/merge.c:107 msgid "switch `m' requires a value" msgstr "switch “m” yêu cầu một giá trị" -#: builtin/merge.c:141 +#: builtin/merge.c:144 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Không tìm thấy chiến lược hòa trộn “%s”.\n" -#: builtin/merge.c:142 +#: builtin/merge.c:145 #, c-format msgid "Available strategies are:" msgstr "Các chiến lược sẵn sàng là:" -#: builtin/merge.c:147 +#: builtin/merge.c:150 #, c-format msgid "Available custom strategies are:" msgstr "Các chiến lược tùy chỉnh sẵn sàng là:" -#: builtin/merge.c:197 builtin/pull.c:134 +#: builtin/merge.c:200 builtin/pull.c:134 msgid "do not show a diffstat at the end of the merge" msgstr "không hiển thị thống kê khác biệt tại cuối của lần hòa trộn" -#: builtin/merge.c:200 builtin/pull.c:137 +#: builtin/merge.c:203 builtin/pull.c:137 msgid "show a diffstat at the end of the merge" msgstr "hiển thị thống kê khác biệt tại cuối của hòa trộn" -#: builtin/merge.c:201 builtin/pull.c:140 +#: builtin/merge.c:204 builtin/pull.c:140 msgid "(synonym to --stat)" msgstr "(đồng nghĩa với --stat)" -#: builtin/merge.c:203 builtin/pull.c:143 +#: builtin/merge.c:206 builtin/pull.c:143 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "thêm (ít nhất <n>) mục từ shortlog cho ghi chú chuyển giao hòa trộn" -#: builtin/merge.c:206 builtin/pull.c:146 +#: builtin/merge.c:209 builtin/pull.c:146 msgid "create a single commit instead of doing a merge" msgstr "tạo một lần chuyển giao đưon thay vì thực hiện việc hòa trộn" -#: builtin/merge.c:208 builtin/pull.c:149 +#: builtin/merge.c:211 builtin/pull.c:149 msgid "perform a commit if the merge succeeds (default)" msgstr "thực hiện chuyển giao nếu hòa trộn thành công (mặc định)" -#: builtin/merge.c:210 builtin/pull.c:152 +#: builtin/merge.c:213 builtin/pull.c:152 msgid "edit message before committing" msgstr "sửa chú thích trước khi chuyển giao" -#: builtin/merge.c:211 +#: builtin/merge.c:214 msgid "allow fast-forward (default)" msgstr "cho phép chuyển-tiếp-nhanh (mặc định)" -#: builtin/merge.c:213 builtin/pull.c:158 +#: builtin/merge.c:216 builtin/pull.c:158 msgid "abort if fast-forward is not possible" msgstr "bỏ qua nếu chuyển-tiếp-nhanh không thể được" -#: builtin/merge.c:217 builtin/pull.c:161 +#: builtin/merge.c:220 builtin/pull.c:161 msgid "verify that the named commit has a valid GPG signature" msgstr "thẩm tra xem lần chuyển giao có tên đó có chữ ký GPG hợp lệ hay không" -#: builtin/merge.c:218 builtin/notes.c:776 builtin/pull.c:165 +#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:165 #: builtin/revert.c:109 msgid "strategy" msgstr "chiến lược" -#: builtin/merge.c:219 builtin/pull.c:166 +#: builtin/merge.c:222 builtin/pull.c:166 msgid "merge strategy to use" msgstr "chiến lược hòa trộn sẽ dùng" -#: builtin/merge.c:220 builtin/pull.c:169 +#: builtin/merge.c:223 builtin/pull.c:169 msgid "option=value" msgstr "tùy_chọn=giá_trị" -#: builtin/merge.c:221 builtin/pull.c:170 +#: builtin/merge.c:224 builtin/pull.c:170 msgid "option for selected merge strategy" msgstr "tùy chọn cho chiến lược hòa trộn đã chọn" -#: builtin/merge.c:223 +#: builtin/merge.c:226 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" "hòa trộn ghi chú của lần chuyển giao (dành cho hòa trộn không-chuyển-tiếp-" "nhanh)" -#: builtin/merge.c:227 +#: builtin/merge.c:230 msgid "abort the current in-progress merge" msgstr "bãi bỏ quá trình hòa trộn hiện tại đang thực hiện" -#: builtin/merge.c:229 +#: builtin/merge.c:232 msgid "continue the current in-progress merge" msgstr "tiếp tục quá trình hòa trộn hiện tại đang thực hiện" -#: builtin/merge.c:231 builtin/pull.c:177 +#: builtin/merge.c:234 builtin/pull.c:177 msgid "allow merging unrelated histories" msgstr "cho phép hòa trộn lịch sử không liên quan" -#: builtin/merge.c:259 +#: builtin/merge.c:240 +msgid "verify commit-msg hook" +msgstr "thẩm tra móc (hook) commit-msg" + +#: builtin/merge.c:265 msgid "could not run stash." msgstr "không thể chạy stash." -#: builtin/merge.c:264 +#: builtin/merge.c:270 msgid "stash failed" msgstr "lệnh tạm cất gặp lỗi" -#: builtin/merge.c:269 +#: builtin/merge.c:275 #, c-format msgid "not a valid object: %s" msgstr "không phải là một đối tượng hợp lệ: %s" -#: builtin/merge.c:288 builtin/merge.c:305 +#: builtin/merge.c:297 builtin/merge.c:314 msgid "read-tree failed" msgstr "read-tree gặp lỗi" -#: builtin/merge.c:335 +#: builtin/merge.c:344 msgid " (nothing to squash)" msgstr " (không có gì để squash)" -#: builtin/merge.c:346 +#: builtin/merge.c:355 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Squash commit -- không cập nhật HEAD\n" -#: builtin/merge.c:396 +#: builtin/merge.c:405 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Không có lời chú thích hòa trộn -- nên không cập nhật HEAD\n" -#: builtin/merge.c:447 +#: builtin/merge.c:456 #, c-format msgid "'%s' does not point to a commit" msgstr "“%s” không chỉ đến một lần chuyển giao nào cả" -#: builtin/merge.c:537 +#: builtin/merge.c:546 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Chuỗi branch.%s.mergeoptions sai: %s" -#: builtin/merge.c:657 +#: builtin/merge.c:666 msgid "Not handling anything other than two heads merge." msgstr "Không cầm nắm gì ngoài hai head hòa trộn" -#: builtin/merge.c:671 +#: builtin/merge.c:680 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Không hiểu tùy chọn cho merge-recursive: -X%s" -#: builtin/merge.c:686 +#: builtin/merge.c:695 #, c-format msgid "unable to write %s" msgstr "không thể ghi %s" -#: builtin/merge.c:738 +#: builtin/merge.c:747 #, c-format msgid "Could not read from '%s'" msgstr "Không thể đọc từ “%s”" -#: builtin/merge.c:747 +#: builtin/merge.c:756 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Vẫn chưa hòa trộn các lần chuyển giao; sử dụng lệnh “git commit” để hoàn tất " "việc hòa trộn.\n" -#: builtin/merge.c:753 +#: builtin/merge.c:762 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -10111,71 +10279,71 @@ msgstr "" "rỗng\n" "sẽ hủy bỏ lần chuyển giao.\n" -#: builtin/merge.c:777 +#: builtin/merge.c:798 msgid "Empty commit message." msgstr "Chú thích của lần commit (chuyển giao) bị trống rỗng." -#: builtin/merge.c:797 +#: builtin/merge.c:818 #, c-format msgid "Wonderful.\n" msgstr "Tuyệt vời.\n" -#: builtin/merge.c:850 +#: builtin/merge.c:871 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Việc tự động hòa trộn gặp lỗi; hãy sửa các xung đột sau đó chuyển giao kết " "quả.\n" -#: builtin/merge.c:889 +#: builtin/merge.c:910 msgid "No current branch." msgstr "không phải nhánh hiện hành" -#: builtin/merge.c:891 +#: builtin/merge.c:912 msgid "No remote for the current branch." msgstr "Không có máy chủ cho nhánh hiện hành." -#: builtin/merge.c:893 +#: builtin/merge.c:914 msgid "No default upstream defined for the current branch." msgstr "Không có thượng nguồn mặc định được định nghĩa cho nhánh hiện hành." -#: builtin/merge.c:898 +#: builtin/merge.c:919 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Không nhánh mạng theo dõi cho %s từ %s" -#: builtin/merge.c:945 +#: builtin/merge.c:972 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Giá trị sai “%s” trong biến môi trường “%s”" -#: builtin/merge.c:1046 +#: builtin/merge.c:1073 #, c-format msgid "not something we can merge in %s: %s" msgstr "không phải là một thứ gì đó mà chúng tôi có thể hòa trộn trong %s: %s" -#: builtin/merge.c:1080 +#: builtin/merge.c:1107 msgid "not something we can merge" msgstr "không phải là thứ gì đó mà chúng tôi có thể hòa trộn" -#: builtin/merge.c:1145 +#: builtin/merge.c:1172 msgid "--abort expects no arguments" msgstr "--abort không nhận các đối số" -#: builtin/merge.c:1149 +#: builtin/merge.c:1176 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" "Ở đây không có lần hòa trộn nào được hủy bỏ giữa chừng cả (thiếu MERGE_HEAD)." -#: builtin/merge.c:1161 +#: builtin/merge.c:1188 msgid "--continue expects no arguments" msgstr "--continue không nhận đối số" -#: builtin/merge.c:1165 +#: builtin/merge.c:1192 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Ở đây không có lần hòa trộn nào đang được xử lý cả (thiếu MERGE_HEAD)." -#: builtin/merge.c:1181 +#: builtin/merge.c:1208 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10183,7 +10351,7 @@ msgstr "" "Bạn chưa kết thúc việc hòa trộn (MERGE_HEAD vẫn tồn tại).\n" "Hãy chuyển giao các thay đổi trước khi bạn có thể hòa trộn." -#: builtin/merge.c:1188 +#: builtin/merge.c:1215 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10191,115 +10359,115 @@ msgstr "" "Bạn chưa kết thúc việc cherry-pick (CHERRY_PICK_HEAD vẫn tồn tại).\n" "Hãy chuyển giao các thay đổi trước khi bạn có thể hòa trộn." -#: builtin/merge.c:1191 +#: builtin/merge.c:1218 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Bạn chưa kết thúc việc cherry-pick (CHERRY_PICK_HEAD vẫn tồn tại)." -#: builtin/merge.c:1200 +#: builtin/merge.c:1227 msgid "You cannot combine --squash with --no-ff." msgstr "Bạn không thể kết hợp --squash với --no-ff." -#: builtin/merge.c:1208 +#: builtin/merge.c:1235 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Không chỉ ra lần chuyển giao và merge.defaultToUpstream chưa được đặt." -#: builtin/merge.c:1225 +#: builtin/merge.c:1252 msgid "Squash commit into empty head not supported yet" msgstr "Squash commit vào một head trống rỗng vẫn chưa được hỗ trợ" -#: builtin/merge.c:1227 +#: builtin/merge.c:1254 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" "Chuyển giao không-chuyển-tiếp-nhanh không hợp lý ở trong một head trống rỗng" -#: builtin/merge.c:1232 +#: builtin/merge.c:1259 #, c-format msgid "%s - not something we can merge" msgstr "%s - không phải là thứ gì đó mà chúng tôi có thể hòa trộn" -#: builtin/merge.c:1234 +#: builtin/merge.c:1261 msgid "Can merge only exactly one commit into empty head" msgstr "" "Không thể hòa trộn một cách đúng đắn một lần chuyển giao vào một head rỗng" -#: builtin/merge.c:1268 +#: builtin/merge.c:1295 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "Lần chuyển giao %s có một chữ ký GPG không đáng tin, được cho là bởi %s." -#: builtin/merge.c:1271 +#: builtin/merge.c:1298 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "Lần chuyển giao %s có một chữ ký GPG sai, được cho là bởi %s." -#: builtin/merge.c:1274 +#: builtin/merge.c:1301 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Lần chuyển giao %s không có chữ ký GPG." -#: builtin/merge.c:1277 +#: builtin/merge.c:1304 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Lần chuyển giao %s có một chữ ký GPG tốt bởi %s\n" -#: builtin/merge.c:1339 +#: builtin/merge.c:1366 msgid "refusing to merge unrelated histories" msgstr "từ chối hòa trộn lịch sử không liên quan" -#: builtin/merge.c:1348 -msgid "Already up-to-date." +#: builtin/merge.c:1375 +msgid "Already up to date." msgstr "Đã cập nhật rồi." -#: builtin/merge.c:1358 +#: builtin/merge.c:1385 #, c-format msgid "Updating %s..%s\n" msgstr "Đang cập nhật %s..%s\n" -#: builtin/merge.c:1399 +#: builtin/merge.c:1426 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Đang thử hòa trộn kiểu “trivial in-index”…\n" -#: builtin/merge.c:1406 +#: builtin/merge.c:1433 #, c-format msgid "Nope.\n" msgstr "Không.\n" -#: builtin/merge.c:1431 -msgid "Already up-to-date. Yeeah!" +#: builtin/merge.c:1458 +msgid "Already up to date. Yeeah!" msgstr "Đã cập nhật rồi. Yeeah!" -#: builtin/merge.c:1437 +#: builtin/merge.c:1464 msgid "Not possible to fast-forward, aborting." msgstr "Thực hiện lệnh chuyển-tiếp-nhanh là không thể được, đang bỏ qua." -#: builtin/merge.c:1460 builtin/merge.c:1539 +#: builtin/merge.c:1487 builtin/merge.c:1566 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Đang tua lại cây thành thời xa xưa…\n" -#: builtin/merge.c:1464 +#: builtin/merge.c:1491 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Đang thử chiến lược hòa trộn %s…\n" -#: builtin/merge.c:1530 +#: builtin/merge.c:1557 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Không có chiến lược hòa trộn nào được nắm giữ (handle) sự hòa trộn.\n" -#: builtin/merge.c:1532 +#: builtin/merge.c:1559 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Hòa trộn với chiến lược %s gặp lỗi.\n" -#: builtin/merge.c:1541 +#: builtin/merge.c:1568 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Sử dụng %s để chuẩn bị giải quyết bằng tay.\n" -#: builtin/merge.c:1553 +#: builtin/merge.c:1580 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -10441,7 +10609,7 @@ msgstr "git mv [<các-tùy-chọn>] <nguồn>… <đích>" msgid "Directory %s is in index and no submodule?" msgstr "Thư mục “%s” có ở trong chỉ mục mà không có mô-đun con?" -#: builtin/mv.c:85 builtin/rm.c:290 +#: builtin/mv.c:85 builtin/rm.c:289 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" "Hãy đưa các thay đổi của bạn vào .gitmodules hay tạm cất chúng đi để xử lý" @@ -10459,68 +10627,68 @@ msgstr "ép buộc di chuyển hay đổi tên thậm chí cả khi đích đã msgid "skip move/rename errors" msgstr "bỏ qua các lỗi liên quan đến di chuyển, đổi tên" -#: builtin/mv.c:168 +#: builtin/mv.c:167 #, c-format msgid "destination '%s' is not a directory" msgstr "có đích “%s” nhưng đây không phải là một thư mục" -#: builtin/mv.c:179 +#: builtin/mv.c:178 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Đang kiểm tra việc đổi tên của “%s” thành “%s”\n" -#: builtin/mv.c:183 +#: builtin/mv.c:182 msgid "bad source" msgstr "nguồn sai" -#: builtin/mv.c:186 +#: builtin/mv.c:185 msgid "can not move directory into itself" msgstr "không thể di chuyển một thư mục vào trong chính nó được" -#: builtin/mv.c:189 +#: builtin/mv.c:188 msgid "cannot move directory over file" msgstr "không di chuyển được thư mục thông qua tập tin" -#: builtin/mv.c:198 +#: builtin/mv.c:197 msgid "source directory is empty" msgstr "thư mục nguồn là trống rỗng" -#: builtin/mv.c:223 +#: builtin/mv.c:222 msgid "not under version control" msgstr "không nằm dưới sự quản lý mã nguồn" -#: builtin/mv.c:226 +#: builtin/mv.c:225 msgid "destination exists" msgstr "đích đã tồn tại sẵn rồi" -#: builtin/mv.c:234 +#: builtin/mv.c:233 #, c-format msgid "overwriting '%s'" msgstr "đang ghi đè lên “%s”" -#: builtin/mv.c:237 +#: builtin/mv.c:236 msgid "Cannot overwrite" msgstr "Không thể ghi đè" -#: builtin/mv.c:240 +#: builtin/mv.c:239 msgid "multiple sources for the same target" msgstr "Nhiều nguồn cho cùng một đích" -#: builtin/mv.c:242 +#: builtin/mv.c:241 msgid "destination directory does not exist" msgstr "thư mục đích không tồn tại" -#: builtin/mv.c:249 +#: builtin/mv.c:248 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, nguồn=%s, đích=%s" -#: builtin/mv.c:270 +#: builtin/mv.c:269 #, c-format msgid "Renaming %s to %s\n" msgstr "Đổi tên %s thành %s\n" -#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390 +#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390 #, c-format msgid "renaming '%s' failed" msgstr "gặp lỗi khi đổi tên “%s”" @@ -10712,19 +10880,19 @@ msgstr "không thể ghi đối tượng ghi chú (note)" msgid "the note contents have been left in %s" msgstr "nội dung ghi chú còn lại %s" -#: builtin/notes.c:234 builtin/tag.c:517 +#: builtin/notes.c:234 builtin/tag.c:500 #, c-format msgid "cannot read '%s'" msgstr "không thể đọc “%s”" -#: builtin/notes.c:236 builtin/tag.c:520 +#: builtin/notes.c:236 builtin/tag.c:503 #, c-format msgid "could not open or read '%s'" msgstr "không thể mở hay đọc “%s”" #: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308 -#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516 -#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661 +#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517 +#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662 #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "gặp lỗi khi phân giải “%s” như là một tham chiếu hợp lệ." @@ -10752,47 +10920,47 @@ msgstr "gặp lỗi khi sao chép ghi chú (note) từ “%s” sang “%s”" #. TRANSLATORS: the first %s will be replaced by a git #. notes command: 'add', 'merge', 'remove', etc. #. -#: builtin/notes.c:348 +#: builtin/notes.c:349 #, c-format msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "từ chối %s ghi chú trong %s (nằm ngoài refs/notes/)" -#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499 -#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654 -#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972 +#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500 +#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655 +#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973 msgid "too many parameters" msgstr "quá nhiều đối số" -#: builtin/notes.c:381 builtin/notes.c:667 +#: builtin/notes.c:382 builtin/notes.c:668 #, c-format msgid "no note found for object %s." msgstr "không tìm thấy ghi chú cho đối tượng %s." -#: builtin/notes.c:402 builtin/notes.c:565 +#: builtin/notes.c:403 builtin/notes.c:566 msgid "note contents as a string" msgstr "nội dung ghi chú (note) nằm trong một chuỗi" -#: builtin/notes.c:405 builtin/notes.c:568 +#: builtin/notes.c:406 builtin/notes.c:569 msgid "note contents in a file" msgstr "nội dung ghi chú (note) nằm trong một tập tin" -#: builtin/notes.c:408 builtin/notes.c:571 +#: builtin/notes.c:409 builtin/notes.c:572 msgid "reuse and edit specified note object" msgstr "dùng lại nhưng có sửa chữa đối tượng note đã chỉ ra" -#: builtin/notes.c:411 builtin/notes.c:574 +#: builtin/notes.c:412 builtin/notes.c:575 msgid "reuse specified note object" msgstr "dùng lại đối tượng ghi chú (note) đã chỉ ra" -#: builtin/notes.c:414 builtin/notes.c:577 +#: builtin/notes.c:415 builtin/notes.c:578 msgid "allow storing empty note" msgstr "cho lưu trữ ghi chú trống rỗng" -#: builtin/notes.c:415 builtin/notes.c:486 +#: builtin/notes.c:416 builtin/notes.c:487 msgid "replace existing notes" msgstr "thay thế ghi chú trước" -#: builtin/notes.c:440 +#: builtin/notes.c:441 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -10801,29 +10969,29 @@ msgstr "" "Không thể thêm các ghi chú. Đã tìm thấy các ghi chú đã có sẵn cho đối tượng " "%s. Sử dụng tùy chọn “-f” để ghi đè lên các ghi chú cũ" -#: builtin/notes.c:455 builtin/notes.c:534 +#: builtin/notes.c:456 builtin/notes.c:535 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Đang ghi đè lên ghi chú cũ cho đối tượng %s\n" -#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891 +#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892 #, c-format msgid "Removing note for object %s\n" msgstr "Đang gỡ bỏ ghi chú (note) cho đối tượng %s\n" -#: builtin/notes.c:487 +#: builtin/notes.c:488 msgid "read objects from stdin" msgstr "đọc các đối tượng từ đầu vào tiêu chuẩn" -#: builtin/notes.c:489 +#: builtin/notes.c:490 msgid "load rewriting config for <command> (implies --stdin)" msgstr "tải cấu hình chép lại cho <lệnh> (ngầm định là --stdin)" -#: builtin/notes.c:507 +#: builtin/notes.c:508 msgid "too few parameters" msgstr "quá ít đối số" -#: builtin/notes.c:528 +#: builtin/notes.c:529 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -10832,12 +11000,12 @@ msgstr "" "Không thể sao chép các ghi chú. Đã tìm thấy các ghi chú đã có sẵn cho đối " "tượng %s. Sử dụng tùy chọn “-f” để ghi đè lên các ghi chú cũ" -#: builtin/notes.c:540 +#: builtin/notes.c:541 #, c-format msgid "missing notes on source object %s. Cannot copy." msgstr "thiếu ghi chú trên đối tượng nguồn %s. Không thể sao chép." -#: builtin/notes.c:592 +#: builtin/notes.c:593 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -10846,52 +11014,52 @@ msgstr "" "Các tùy chọn -m/-F/-c/-C đã cổ không còn dùng nữa cho lệnh con “edit”.\n" "Xin hãy sử dụng lệnh sau để thay thế: “git notes add -f -m/-F/-c/-C”.\n" -#: builtin/notes.c:687 +#: builtin/notes.c:688 msgid "failed to delete ref NOTES_MERGE_PARTIAL" msgstr "gặp lỗi khi xóa tham chiếu NOTES_MERGE_PARTIAL" -#: builtin/notes.c:689 +#: builtin/notes.c:690 msgid "failed to delete ref NOTES_MERGE_REF" msgstr "gặp lỗi khi xóa tham chiếu NOTES_MERGE_REF" -#: builtin/notes.c:691 +#: builtin/notes.c:692 msgid "failed to remove 'git notes merge' worktree" msgstr "gặp lỗi khi gỡ bỏ cây làm việc “git notes merge”" -#: builtin/notes.c:711 +#: builtin/notes.c:712 msgid "failed to read ref NOTES_MERGE_PARTIAL" msgstr "gặp lỗi khi đọc tham chiếu NOTES_MERGE_PARTIAL" -#: builtin/notes.c:713 +#: builtin/notes.c:714 msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "không thể tìm thấy lần chuyển giao từ NOTES_MERGE_PARTIAL." -#: builtin/notes.c:715 +#: builtin/notes.c:716 msgid "could not parse commit from NOTES_MERGE_PARTIAL." msgstr "không thể phân tích cú pháp lần chuyển giao từ NOTES_MERGE_PARTIAL." -#: builtin/notes.c:728 +#: builtin/notes.c:729 msgid "failed to resolve NOTES_MERGE_REF" msgstr "gặp lỗi khi phân giải NOTES_MERGE_REF" -#: builtin/notes.c:731 +#: builtin/notes.c:732 msgid "failed to finalize notes merge" msgstr "gặp lỗi khi hoàn thành hòa trộn ghi chú" -#: builtin/notes.c:757 +#: builtin/notes.c:758 #, c-format msgid "unknown notes merge strategy %s" msgstr "không hiểu chiến lược hòa trộn ghi chú %s" -#: builtin/notes.c:773 +#: builtin/notes.c:774 msgid "General options" msgstr "Tùy chọn chung" -#: builtin/notes.c:775 +#: builtin/notes.c:776 msgid "Merge options" msgstr "Tùy chọn về hòa trộn" -#: builtin/notes.c:777 +#: builtin/notes.c:778 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -10899,48 +11067,48 @@ msgstr "" "phân giải các xung đột “notes” sử dụng chiến lược đã đưa ra (manual/ours/" "theirs/union/cat_sort_uniq)" -#: builtin/notes.c:779 +#: builtin/notes.c:780 msgid "Committing unmerged notes" msgstr "Chuyển giao các note chưa được hòa trộn" -#: builtin/notes.c:781 +#: builtin/notes.c:782 msgid "finalize notes merge by committing unmerged notes" msgstr "" "các note cuối cùng được hòa trộn bởi các note chưa hòa trộn của lần chuyển " "giao" -#: builtin/notes.c:783 +#: builtin/notes.c:784 msgid "Aborting notes merge resolution" msgstr "Hủy bỏ phân giải ghi chú (note) hòa trộn" -#: builtin/notes.c:785 +#: builtin/notes.c:786 msgid "abort notes merge" msgstr "bỏ qua hòa trộn các ghi chú (note)" -#: builtin/notes.c:796 +#: builtin/notes.c:797 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "không thể trộn lẫn --commit, --abort hay -s/--strategy" -#: builtin/notes.c:801 +#: builtin/notes.c:802 msgid "must specify a notes ref to merge" msgstr "bạn phải chỉ định tham chiếu ghi chú để hòa trộn" -#: builtin/notes.c:825 +#: builtin/notes.c:826 #, c-format msgid "unknown -s/--strategy: %s" msgstr "không hiểu -s/--strategy: %s" -#: builtin/notes.c:862 +#: builtin/notes.c:863 #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "một ghi chú hòa trộn vào %s đã sẵn trong quá trình xử lý tại %s" -#: builtin/notes.c:865 +#: builtin/notes.c:866 #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "gặp lỗi khi lưu liên kết đến tham chiếu ghi chú hiện tại (%s)" -#: builtin/notes.c:867 +#: builtin/notes.c:868 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " @@ -10951,223 +11119,223 @@ msgstr "" "chuyển giao kết quả bằng “git notes merge --commit”, hoặc bãi bỏ việc hòa " "trộn bằng “git notes merge --abort”.\n" -#: builtin/notes.c:889 +#: builtin/notes.c:890 #, c-format msgid "Object %s has no note\n" msgstr "Đối tượng %s không có ghi chú (note)\n" -#: builtin/notes.c:901 +#: builtin/notes.c:902 msgid "attempt to remove non-existent note is not an error" msgstr "cố gắng gỡ bỏ một note chưa từng tồn tại không phải là một lỗi" -#: builtin/notes.c:904 +#: builtin/notes.c:905 msgid "read object names from the standard input" msgstr "đọc tên đối tượng từ thiết bị nhập chuẩn" -#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128 +#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:146 msgid "do not remove, show only" msgstr "không gỡ bỏ, chỉ hiển thị" -#: builtin/notes.c:943 +#: builtin/notes.c:944 msgid "report pruned notes" msgstr "báo cáo các đối tượng đã prune" -#: builtin/notes.c:985 +#: builtin/notes.c:986 msgid "notes-ref" msgstr "notes-ref" -#: builtin/notes.c:986 +#: builtin/notes.c:987 msgid "use notes from <notes-ref>" msgstr "dùng “notes” từ <notes-ref>" -#: builtin/notes.c:1021 +#: builtin/notes.c:1022 #, c-format msgid "unknown subcommand: %s" msgstr "không hiểu câu lệnh con: %s" -#: builtin/pack-objects.c:30 +#: builtin/pack-objects.c:31 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [các-tùy-chọn…] [< <danh-sách-tham-chiếu> | < " "<danh-sách-đối-tượng>]" -#: builtin/pack-objects.c:31 +#: builtin/pack-objects.c:32 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [các-tùy-chọn…] <base-name> [< <danh-sách-ref> | < <danh-" "sách-đối-tượng>]" -#: builtin/pack-objects.c:180 builtin/pack-objects.c:183 +#: builtin/pack-objects.c:181 builtin/pack-objects.c:184 #, c-format msgid "deflate error (%d)" msgstr "lỗi giải nén (%d)" -#: builtin/pack-objects.c:776 +#: builtin/pack-objects.c:777 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "tắt ghi bitmap, các gói bị chia nhỏ bởi vì pack.packSizeLimit" -#: builtin/pack-objects.c:789 +#: builtin/pack-objects.c:790 msgid "Writing objects" msgstr "Đang ghi lại các đối tượng" -#: builtin/pack-objects.c:1069 +#: builtin/pack-objects.c:1070 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "tắt ghi bitmap, như vậy một số đối tượng sẽ không được đóng gói" -#: builtin/pack-objects.c:2434 +#: builtin/pack-objects.c:2440 msgid "Compressing objects" msgstr "Đang nén các đối tượng" -#: builtin/pack-objects.c:2843 +#: builtin/pack-objects.c:2849 #, c-format msgid "unsupported index version %s" msgstr "phiên bản mục lục không được hỗ trợ %s" -#: builtin/pack-objects.c:2847 +#: builtin/pack-objects.c:2853 #, c-format msgid "bad index version '%s'" msgstr "phiên bản mục lục sai “%s”" -#: builtin/pack-objects.c:2877 +#: builtin/pack-objects.c:2883 msgid "do not show progress meter" msgstr "không hiển thị bộ đo tiến trình" -#: builtin/pack-objects.c:2879 +#: builtin/pack-objects.c:2885 msgid "show progress meter" msgstr "hiển thị bộ đo tiến trình" -#: builtin/pack-objects.c:2881 +#: builtin/pack-objects.c:2887 msgid "show progress meter during object writing phase" msgstr "hiển thị bộ đo tiến triển trong suốt pha ghi đối tượng" -#: builtin/pack-objects.c:2884 +#: builtin/pack-objects.c:2890 msgid "similar to --all-progress when progress meter is shown" msgstr "tương tự --all-progress khi bộ đo tiến trình được xuất hiện" -#: builtin/pack-objects.c:2885 +#: builtin/pack-objects.c:2891 msgid "version[,offset]" msgstr "phiên bản[,offset]" -#: builtin/pack-objects.c:2886 +#: builtin/pack-objects.c:2892 msgid "write the pack index file in the specified idx format version" msgstr "ghi tập tin bảng mục lục gói (pack) ở phiên bản định dạng idx đã cho" -#: builtin/pack-objects.c:2889 +#: builtin/pack-objects.c:2895 msgid "maximum size of each output pack file" msgstr "kcíh thước tối đa cho tập tin gói được tạo" -#: builtin/pack-objects.c:2891 +#: builtin/pack-objects.c:2897 msgid "ignore borrowed objects from alternate object store" msgstr "bỏ qua các đối tượng vay mượn từ kho đối tượng thay thế" -#: builtin/pack-objects.c:2893 +#: builtin/pack-objects.c:2899 msgid "ignore packed objects" msgstr "bỏ qua các đối tượng đóng gói" -#: builtin/pack-objects.c:2895 +#: builtin/pack-objects.c:2901 msgid "limit pack window by objects" msgstr "giới hạn cửa sổ đóng gói theo đối tượng" -#: builtin/pack-objects.c:2897 +#: builtin/pack-objects.c:2903 msgid "limit pack window by memory in addition to object limit" msgstr "giới hạn cửa sổ đóng gói theo bộ nhớ cộng thêm với giới hạn đối tượng" -#: builtin/pack-objects.c:2899 +#: builtin/pack-objects.c:2905 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "độ dài tối đa của chuỗi móc xích “delta” được phép trong gói kết quả" -#: builtin/pack-objects.c:2901 +#: builtin/pack-objects.c:2907 msgid "reuse existing deltas" msgstr "dùng lại các delta sẵn có" -#: builtin/pack-objects.c:2903 +#: builtin/pack-objects.c:2909 msgid "reuse existing objects" msgstr "dùng lại các đối tượng sẵn có" -#: builtin/pack-objects.c:2905 +#: builtin/pack-objects.c:2911 msgid "use OFS_DELTA objects" msgstr "dùng các đối tượng OFS_DELTA" -#: builtin/pack-objects.c:2907 +#: builtin/pack-objects.c:2913 msgid "use threads when searching for best delta matches" msgstr "sử dụng các tuyến trình khi tìm kiếm cho các mẫu khớp delta tốt nhất" -#: builtin/pack-objects.c:2909 +#: builtin/pack-objects.c:2915 msgid "do not create an empty pack output" msgstr "không thể tạo kết xuất gói trống rỗng" -#: builtin/pack-objects.c:2911 +#: builtin/pack-objects.c:2917 msgid "read revision arguments from standard input" msgstr " đọc tham số “revision” từ thiết bị nhập chuẩn" -#: builtin/pack-objects.c:2913 +#: builtin/pack-objects.c:2919 msgid "limit the objects to those that are not yet packed" msgstr "giới hạn các đối tượng thành những cái mà chúng vẫn chưa được đóng gói" -#: builtin/pack-objects.c:2916 +#: builtin/pack-objects.c:2922 msgid "include objects reachable from any reference" msgstr "bao gồm các đối tượng có thể đọc được từ bất kỳ tham chiếu nào" -#: builtin/pack-objects.c:2919 +#: builtin/pack-objects.c:2925 msgid "include objects referred by reflog entries" msgstr "bao gồm các đối tượng được tham chiếu bởi các mục reflog" -#: builtin/pack-objects.c:2922 +#: builtin/pack-objects.c:2928 msgid "include objects referred to by the index" msgstr "bao gồm các đối tượng được tham chiếu bởi mục lục" -#: builtin/pack-objects.c:2925 +#: builtin/pack-objects.c:2931 msgid "output pack to stdout" msgstr "xuất gói ra đầu ra tiêu chuẩn" -#: builtin/pack-objects.c:2927 +#: builtin/pack-objects.c:2933 msgid "include tag objects that refer to objects to be packed" msgstr "bao gồm các đối tượng tham chiếu đến các đối tượng được đóng gói" -#: builtin/pack-objects.c:2929 +#: builtin/pack-objects.c:2935 msgid "keep unreachable objects" msgstr "giữ lại các đối tượng không thể đọc được" -#: builtin/pack-objects.c:2931 +#: builtin/pack-objects.c:2937 msgid "pack loose unreachable objects" msgstr "pack mất các đối tượng không thể đọc được" -#: builtin/pack-objects.c:2933 +#: builtin/pack-objects.c:2939 msgid "unpack unreachable objects newer than <time>" msgstr "" "xả nén (gỡ khỏi gói) các đối tượng không thể đọc được mới hơn <thời-gian>" -#: builtin/pack-objects.c:2936 +#: builtin/pack-objects.c:2942 msgid "create thin packs" msgstr "tạo gói nhẹ" -#: builtin/pack-objects.c:2938 +#: builtin/pack-objects.c:2944 msgid "create packs suitable for shallow fetches" msgstr "tạo gói để phù hợp cho lấy về nông (shallow)" -#: builtin/pack-objects.c:2940 +#: builtin/pack-objects.c:2946 msgid "ignore packs that have companion .keep file" msgstr "bỏ qua các gói mà nó có tập tin .keep đi kèm" -#: builtin/pack-objects.c:2942 +#: builtin/pack-objects.c:2948 msgid "pack compression level" msgstr "mức nén gói" -#: builtin/pack-objects.c:2944 +#: builtin/pack-objects.c:2950 msgid "do not hide commits by grafts" msgstr "không ẩn các lần chuyển giao bởi “grafts”" -#: builtin/pack-objects.c:2946 +#: builtin/pack-objects.c:2952 msgid "use a bitmap index if available to speed up counting objects" msgstr "dùng mục lục ánh xạ nếu có thể được để nâng cao tốc độ đếm đối tượng" -#: builtin/pack-objects.c:2948 +#: builtin/pack-objects.c:2954 msgid "write a bitmap index together with the pack index" msgstr "ghi một mục lục ánh xạ cùng với mục lục gói" -#: builtin/pack-objects.c:3075 +#: builtin/pack-objects.c:3081 msgid "Counting objects" msgstr "Đang đếm các đối tượng" @@ -11183,11 +11351,11 @@ msgstr "đóng gói mọi thứ" msgid "prune loose refs (default)" msgstr "prune (cắt cụt) những tham chiếu bị mất (mặc định)" -#: builtin/prune-packed.c:7 +#: builtin/prune-packed.c:8 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" -#: builtin/prune-packed.c:40 +#: builtin/prune-packed.c:41 msgid "Removing duplicate objects" msgstr "Đang gỡ các đối tượng trùng lặp" @@ -11228,7 +11396,7 @@ msgstr "Các tùy chọn liên quan đến hòa trộn" msgid "incorporate changes by rebasing rather than merging" msgstr "các thay đổi hợp nhất bằng cải tổ thay vì hòa trộn" -#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121 +#: builtin/pull.c:155 builtin/rebase--helper.c:21 builtin/revert.c:121 msgid "allow fast-forward" msgstr "cho phép chuyển-tiếp-nhanh" @@ -11249,7 +11417,7 @@ msgstr "số lượng mô-đun-con được đẩy lên đồng thời" msgid "Invalid value for pull.ff: %s" msgstr "Giá trị không hợp lệ cho pull.ff: %s" -#: builtin/pull.c:399 +#: builtin/pull.c:403 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -11257,14 +11425,14 @@ msgstr "" "Ở đây không có ứng cử nào để cải tổ lại trong số các tham chiếu mà bạn vừa " "lấy về." -#: builtin/pull.c:401 +#: builtin/pull.c:405 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "Ở đây không có ứng cử nào để hòa trộn trong số các tham chiếu mà bạn vừa lấy " "về." -#: builtin/pull.c:402 +#: builtin/pull.c:406 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -11273,7 +11441,7 @@ msgstr "" "tự\n" "đại diện mà nó lại không khớp trên điểm cuối máy phục vụ." -#: builtin/pull.c:405 +#: builtin/pull.c:409 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -11285,43 +11453,43 @@ msgstr "" "theo mặc định cho nhánh hiện tại của bạn, bạn phải chỉ định\n" "một nhánh trên dòng lệnh." -#: builtin/pull.c:410 git-parse-remote.sh:73 +#: builtin/pull.c:414 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Hiện tại bạn chẳng ở nhánh nào cả." -#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79 +#: builtin/pull.c:416 builtin/pull.c:431 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Vui lòng chỉ định nhánh nào bạn muốn cải tổ lại." -#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82 +#: builtin/pull.c:418 builtin/pull.c:433 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Vui lòng chỉ định nhánh nào bạn muốn hòa trộn vào." -#: builtin/pull.c:415 builtin/pull.c:430 +#: builtin/pull.c:419 builtin/pull.c:434 msgid "See git-pull(1) for details." msgstr "Xem git-pull(1) để biết thêm chi tiết." -#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432 +#: builtin/pull.c:421 builtin/pull.c:427 builtin/pull.c:436 #: git-parse-remote.sh:64 msgid "<remote>" msgstr "<máy chủ>" -#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456 +#: builtin/pull.c:421 builtin/pull.c:436 builtin/pull.c:441 git-rebase.sh:466 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<nhánh>" -#: builtin/pull.c:425 git-parse-remote.sh:75 +#: builtin/pull.c:429 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "Ở đây không có thông tin theo dõi cho nhánh hiện hành." -#: builtin/pull.c:434 git-parse-remote.sh:95 +#: builtin/pull.c:438 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" "Nếu bạn muốn theo dõi thông tin cho nhánh này bạn có thể thực hiện bằng lệnh:" -#: builtin/pull.c:439 +#: builtin/pull.c:443 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -11330,29 +11498,29 @@ msgstr "" "Các đặc tả cấu hình của bạn để hòa trộn với tham chiếu “%s”\n" "từ máy dịch vụ, nhưng không có nhánh nào như thế được lấy về." -#: builtin/pull.c:792 +#: builtin/pull.c:796 msgid "ignoring --verify-signatures for rebase" msgstr "bỏ qua --verify-signatures khi rebase" -#: builtin/pull.c:840 +#: builtin/pull.c:844 msgid "--[no-]autostash option is only valid with --rebase." msgstr "tùy chọn --[no-]autostash chỉ hợp lệ khi dùng với --rebase." -#: builtin/pull.c:848 +#: builtin/pull.c:852 msgid "Updating an unborn branch with changes added to the index." msgstr "" "Đang cập nhật một nhánh chưa được sinh ra với các thay đổi được thêm vào " "bảng mục lục." -#: builtin/pull.c:851 +#: builtin/pull.c:855 msgid "pull with rebase" msgstr "pull với rebase" -#: builtin/pull.c:852 +#: builtin/pull.c:856 msgid "please commit or stash them." msgstr "xin hãy chuyển giao hoặc tạm cất (stash) chúng." -#: builtin/pull.c:877 +#: builtin/pull.c:881 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -11363,7 +11531,7 @@ msgstr "" "đang chuyển-tiếp-nhanh cây làm việc của bạn từ\n" "lần chuyển giaot %s." -#: builtin/pull.c:882 +#: builtin/pull.c:886 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -11381,15 +11549,15 @@ msgstr "" "$ git reset --hard\n" "để khôi phục lại." -#: builtin/pull.c:897 +#: builtin/pull.c:901 msgid "Cannot merge multiple branches into empty head." msgstr "Không thể hòa trộn nhiều nhánh vào trong một head trống rỗng." -#: builtin/pull.c:901 +#: builtin/pull.c:905 msgid "Cannot rebase onto multiple branches." msgstr "Không thể thực hiện lệnh rebase (cải tổ) trên nhiều nhánh." -#: builtin/pull.c:908 +#: builtin/pull.c:912 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "không thể cải tổ với các thay đổi mô-đun-con được ghi lại một cách cục bộ" @@ -11776,19 +11944,47 @@ msgstr "gỡ lỗi “unpack-trees”" msgid "git rebase--helper [<options>]" msgstr "git rebase--helper [<các-tùy-chọn>]" -#: builtin/rebase--helper.c:20 +#: builtin/rebase--helper.c:22 +msgid "keep empty commits" +msgstr "giữ lại các lần chuyển giao rỗng" + +#: builtin/rebase--helper.c:23 msgid "continue rebase" msgstr "tiếp tục cải tổ" -#: builtin/rebase--helper.c:22 +#: builtin/rebase--helper.c:25 msgid "abort rebase" msgstr "bãi bỏ việc cải tổ" -#: builtin/receive-pack.c:28 +#: builtin/rebase--helper.c:28 +msgid "make rebase script" +msgstr "tạo văn lệnh rebase" + +#: builtin/rebase--helper.c:30 +msgid "shorten SHA-1s in the todo list" +msgstr "Rút ngắn SHA-1 trong danh sách cần làm" + +#: builtin/rebase--helper.c:32 +msgid "expand SHA-1s in the todo list" +msgstr "Khai triển SHA-1 trong danh sách cần làm" + +#: builtin/rebase--helper.c:34 +msgid "check the todo list" +msgstr "kiểm tra danh sách cần làm" + +#: builtin/rebase--helper.c:36 +msgid "skip unnecessary picks" +msgstr "bỏ qua các lệnh cậy (pick) không cần thiết" + +#: builtin/rebase--helper.c:38 +msgid "rearrange fixup/squash lines" +msgstr "sắp xếp lại các dòng fixup/squash" + +#: builtin/receive-pack.c:29 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <thư-mục-git>" -#: builtin/receive-pack.c:838 +#: builtin/receive-pack.c:839 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" @@ -11818,7 +12014,7 @@ msgstr "" "Để chấm dứt lời nhắn này và vẫn giữ cách ứng xử mặc định, hãy đặt\n" "biến cấu hình “receive.denyCurrentBranch” thành “refuse”." -#: builtin/receive-pack.c:858 +#: builtin/receive-pack.c:859 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" @@ -11839,11 +12035,11 @@ msgstr "" "\n" "Để chấm dứt lời nhắn này, bạn hãy đặt nó thành “refuse”." -#: builtin/receive-pack.c:1933 +#: builtin/receive-pack.c:1932 msgid "quiet" msgstr "im lặng" -#: builtin/receive-pack.c:1947 +#: builtin/receive-pack.c:1946 msgid "You must specify a directory." msgstr "Bạn phải chỉ định thư mục." @@ -11993,12 +12189,12 @@ msgstr "đang chỉ định một nhánh master không hợp lý với tùy ch msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "chỉ định những nhánh để theo dõi chỉ hợp lý với các “fetch mirror”" -#: builtin/remote.c:191 builtin/remote.c:630 +#: builtin/remote.c:191 builtin/remote.c:631 #, c-format msgid "remote %s already exists." msgstr "máy chủ %s đã tồn tại rồi." -#: builtin/remote.c:195 builtin/remote.c:634 +#: builtin/remote.c:195 builtin/remote.c:635 #, c-format msgid "'%s' is not a valid remote name" msgstr "“%s” không phải tên máy chủ hợp lệ" @@ -12021,17 +12217,17 @@ msgstr "(khớp)" msgid "(delete)" msgstr "(xóa)" -#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857 +#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858 #, c-format msgid "No such remote: %s" msgstr "Không có máy chủ nào như thế: %s" -#: builtin/remote.c:640 +#: builtin/remote.c:641 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Không thể đổi tên phần của cấu hình từ “%s” thành “%s”" -#: builtin/remote.c:660 +#: builtin/remote.c:661 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -12042,17 +12238,17 @@ msgstr "" "\t%s\n" "\tXin hãy cập nhật phần cấu hình một cách thủ công nếu thấy cần thiết." -#: builtin/remote.c:696 +#: builtin/remote.c:697 #, c-format msgid "deleting '%s' failed" msgstr "gặp lỗi khi xóa “%s”" -#: builtin/remote.c:730 +#: builtin/remote.c:731 #, c-format msgid "creating '%s' failed" msgstr "gặp lỗi khi tạo “%s”" -#: builtin/remote.c:795 +#: builtin/remote.c:796 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -12064,113 +12260,113 @@ msgstr[0] "" "đi;\n" "để xóa đi, sử dụng:" -#: builtin/remote.c:809 +#: builtin/remote.c:810 #, c-format msgid "Could not remove config section '%s'" msgstr "Không thể gỡ bỏ phần cấu hình “%s”" -#: builtin/remote.c:910 +#: builtin/remote.c:911 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " mới (lần lấy về tiếp theo sẽ lưu trong remotes/%s)" -#: builtin/remote.c:913 +#: builtin/remote.c:914 msgid " tracked" msgstr " được theo dõi" -#: builtin/remote.c:915 +#: builtin/remote.c:916 msgid " stale (use 'git remote prune' to remove)" msgstr " cũ rích (dùng “git remote prune” để gỡ bỏ)" -#: builtin/remote.c:917 +#: builtin/remote.c:918 msgid " ???" msgstr " ???" -#: builtin/remote.c:958 +#: builtin/remote.c:959 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "branch.%s.merge không hợp lệ; không thể cải tổ về phía > 1 nhánh" -#: builtin/remote.c:966 +#: builtin/remote.c:967 #, c-format msgid "rebases interactively onto remote %s" msgstr "thực hiện rebase một cách tương tác trên máy chủ %s" -#: builtin/remote.c:967 +#: builtin/remote.c:968 #, c-format msgid "rebases onto remote %s" msgstr "thực hiện rebase trên máy chủ %s" -#: builtin/remote.c:970 +#: builtin/remote.c:971 #, c-format msgid " merges with remote %s" msgstr " hòa trộn với máy chủ %s" -#: builtin/remote.c:973 +#: builtin/remote.c:974 #, c-format msgid "merges with remote %s" msgstr "hòa trộn với máy chủ %s" -#: builtin/remote.c:976 +#: builtin/remote.c:977 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s và với máy chủ %s\n" -#: builtin/remote.c:1019 +#: builtin/remote.c:1020 msgid "create" msgstr "tạo" -#: builtin/remote.c:1022 +#: builtin/remote.c:1023 msgid "delete" msgstr "xóa" -#: builtin/remote.c:1026 +#: builtin/remote.c:1027 msgid "up to date" msgstr "đã cập nhật" -#: builtin/remote.c:1029 +#: builtin/remote.c:1030 msgid "fast-forwardable" msgstr "có-thể-chuyển-tiếp-nhanh" -#: builtin/remote.c:1032 +#: builtin/remote.c:1033 msgid "local out of date" msgstr "dữ liệu nội bộ đã cũ" -#: builtin/remote.c:1039 +#: builtin/remote.c:1040 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s ép buộc thành %-*s (%s)" -#: builtin/remote.c:1042 +#: builtin/remote.c:1043 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s đẩy lên thành %-*s (%s)" -#: builtin/remote.c:1046 +#: builtin/remote.c:1047 #, c-format msgid " %-*s forces to %s" msgstr " %-*s ép buộc thành %s" -#: builtin/remote.c:1049 +#: builtin/remote.c:1050 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s đẩy lên thành %s" -#: builtin/remote.c:1117 +#: builtin/remote.c:1118 msgid "do not query remotes" msgstr "không truy vấn các máy chủ" -#: builtin/remote.c:1144 +#: builtin/remote.c:1145 #, c-format msgid "* remote %s" msgstr "* máy chủ %s" -#: builtin/remote.c:1145 +#: builtin/remote.c:1146 #, c-format msgid " Fetch URL: %s" msgstr " URL để lấy về: %s" -#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301 +#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302 msgid "(no URL)" msgstr "(không có URL)" @@ -12178,181 +12374,181 @@ msgstr "(không có URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1160 builtin/remote.c:1162 +#: builtin/remote.c:1161 builtin/remote.c:1163 #, c-format msgid " Push URL: %s" msgstr " URL để đẩy lên: %s" -#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168 +#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169 #, c-format msgid " HEAD branch: %s" msgstr " Nhánh HEAD: %s" -#: builtin/remote.c:1164 +#: builtin/remote.c:1165 msgid "(not queried)" msgstr "(không yêu cầu)" -#: builtin/remote.c:1166 +#: builtin/remote.c:1167 msgid "(unknown)" msgstr "(không hiểu)" -#: builtin/remote.c:1170 +#: builtin/remote.c:1171 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " nhánh HEAD (HEAD máy chủ chưa rõ ràng, có lẽ là một trong số sau):\n" -#: builtin/remote.c:1182 +#: builtin/remote.c:1183 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Những nhánh trên máy chủ:%s" -#: builtin/remote.c:1185 builtin/remote.c:1211 +#: builtin/remote.c:1186 builtin/remote.c:1212 msgid " (status not queried)" msgstr " (trạng thái không được yêu cầu)" -#: builtin/remote.c:1194 +#: builtin/remote.c:1195 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Những nhánh nội bộ đã được cấu hình cho lệnh “git pull”:" -#: builtin/remote.c:1202 +#: builtin/remote.c:1203 msgid " Local refs will be mirrored by 'git push'" msgstr " refs nội bộ sẽ được phản chiếu bởi lệnh “git push”" -#: builtin/remote.c:1208 +#: builtin/remote.c:1209 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Những tham chiếu nội bộ được cấu hình cho lệnh “git push”%s:" -#: builtin/remote.c:1229 +#: builtin/remote.c:1230 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "đặt refs/remotes/<tên>/HEAD cho phù hợp với máy chủ" -#: builtin/remote.c:1231 +#: builtin/remote.c:1232 msgid "delete refs/remotes/<name>/HEAD" msgstr "xóa refs/remotes/<tên>/HEAD" -#: builtin/remote.c:1246 +#: builtin/remote.c:1247 msgid "Cannot determine remote HEAD" msgstr "Không thể xác định được HEAD máy chủ" -#: builtin/remote.c:1248 +#: builtin/remote.c:1249 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "Nhiều nhánh HEAD máy chủ. Hãy chọn rõ ràng một:" -#: builtin/remote.c:1258 +#: builtin/remote.c:1259 #, c-format msgid "Could not delete %s" msgstr "Không thể xóa bỏ %s" -#: builtin/remote.c:1266 +#: builtin/remote.c:1267 #, c-format msgid "Not a valid ref: %s" msgstr "Không phải là tham chiếu hợp lệ: %s" -#: builtin/remote.c:1268 +#: builtin/remote.c:1269 #, c-format msgid "Could not setup %s" msgstr "Không thể cài đặt %s" -#: builtin/remote.c:1286 +#: builtin/remote.c:1287 #, c-format msgid " %s will become dangling!" msgstr " %s sẽ trở thành không đầu (không được quản lý)!" -#: builtin/remote.c:1287 +#: builtin/remote.c:1288 #, c-format msgid " %s has become dangling!" msgstr " %s đã trở thành không đầu (không được quản lý)!" -#: builtin/remote.c:1297 +#: builtin/remote.c:1298 #, c-format msgid "Pruning %s" msgstr "Đang xén bớt %s" -#: builtin/remote.c:1298 +#: builtin/remote.c:1299 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1314 +#: builtin/remote.c:1315 #, c-format msgid " * [would prune] %s" msgstr " * [nên xén bớt] %s" -#: builtin/remote.c:1317 +#: builtin/remote.c:1318 #, c-format msgid " * [pruned] %s" msgstr " * [đã bị xén] %s" -#: builtin/remote.c:1362 +#: builtin/remote.c:1363 msgid "prune remotes after fetching" msgstr "cắt máy chủ sau khi lấy về" -#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547 +#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548 #, c-format msgid "No such remote '%s'" msgstr "Không có máy chủ nào có tên “%s”" -#: builtin/remote.c:1441 +#: builtin/remote.c:1442 msgid "add branch" msgstr "thêm nhánh" -#: builtin/remote.c:1448 +#: builtin/remote.c:1449 msgid "no remote specified" msgstr "chưa chỉ ra máy chủ nào" -#: builtin/remote.c:1465 +#: builtin/remote.c:1466 msgid "query push URLs rather than fetch URLs" msgstr "truy vấn đẩy URL thay vì lấy" -#: builtin/remote.c:1467 +#: builtin/remote.c:1468 msgid "return all URLs" msgstr "trả về mọi URL" -#: builtin/remote.c:1495 +#: builtin/remote.c:1496 #, c-format msgid "no URLs configured for remote '%s'" msgstr "không có URL nào được cấu hình cho nhánh “%s”" -#: builtin/remote.c:1521 +#: builtin/remote.c:1522 msgid "manipulate push URLs" msgstr "đẩy các “URL” bằng tay" -#: builtin/remote.c:1523 +#: builtin/remote.c:1524 msgid "add URL" msgstr "thêm URL" -#: builtin/remote.c:1525 +#: builtin/remote.c:1526 msgid "delete URLs" msgstr "xóa URLs" -#: builtin/remote.c:1532 +#: builtin/remote.c:1533 msgid "--add --delete doesn't make sense" msgstr "--add --delete không hợp lý" -#: builtin/remote.c:1573 +#: builtin/remote.c:1572 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Kiểu mẫu URL cũ không hợp lệ: %s" -#: builtin/remote.c:1581 +#: builtin/remote.c:1580 #, c-format msgid "No such URL found: %s" msgstr "Không tìm thấy URL như vậy: %s" -#: builtin/remote.c:1583 +#: builtin/remote.c:1582 msgid "Will not delete all non-push URLs" msgstr "Sẽ không xóa những địa chỉ URL không-push" -#: builtin/remote.c:1597 +#: builtin/remote.c:1598 msgid "be verbose; must be placed before a subcommand" msgstr "chi tiết; phải được đặt trước một lệnh-con" -#: builtin/remote.c:1628 +#: builtin/remote.c:1629 #, c-format msgid "Unknown subcommand: %s" msgstr "Không hiểu câu lệnh con: %s" @@ -12449,7 +12645,7 @@ msgstr "không thể xóa các gói trong một kho đối_tượng_vĩ_đại" msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable và -A xung khắc nhau" -#: builtin/repack.c:406 builtin/worktree.c:116 +#: builtin/repack.c:406 builtin/worktree.c:134 #, c-format msgid "failed to remove '%s'" msgstr "gặp lỗi khi gỡ bỏ “%s”" @@ -12583,121 +12779,121 @@ msgstr "hòa trộn" msgid "keep" msgstr "giữ lại" -#: builtin/reset.c:77 +#: builtin/reset.c:78 msgid "You do not have a valid HEAD." msgstr "Bạn không có HEAD nào hợp lệ." -#: builtin/reset.c:79 +#: builtin/reset.c:80 msgid "Failed to find tree of HEAD." msgstr "Gặp lỗi khi tìm cây của HEAD." -#: builtin/reset.c:85 +#: builtin/reset.c:86 #, c-format msgid "Failed to find tree of %s." msgstr "Gặp lỗi khi tìm cây của %s." -#: builtin/reset.c:103 +#: builtin/reset.c:113 #, c-format msgid "HEAD is now at %s" msgstr "HEAD hiện giờ tại %s" -#: builtin/reset.c:186 +#: builtin/reset.c:197 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "Không thể thực hiện một %s reset ở giữa của quá trình hòa trộn." -#: builtin/reset.c:286 +#: builtin/reset.c:297 msgid "be quiet, only report errors" msgstr "làm việc ở chế độ im lặng, chỉ hiển thị khi có lỗi" -#: builtin/reset.c:288 +#: builtin/reset.c:299 msgid "reset HEAD and index" msgstr "đặt lại (reset) HEAD và bảng mục lục" -#: builtin/reset.c:289 +#: builtin/reset.c:300 msgid "reset only HEAD" msgstr "chỉ đặt lại (reset) HEAD" -#: builtin/reset.c:291 builtin/reset.c:293 +#: builtin/reset.c:302 builtin/reset.c:304 msgid "reset HEAD, index and working tree" msgstr "đặt lại HEAD, bảng mục lục và cây làm việc" -#: builtin/reset.c:295 +#: builtin/reset.c:306 msgid "reset HEAD but keep local changes" msgstr "đặt lại HEAD nhưng giữ lại các thay đổi nội bộ" -#: builtin/reset.c:301 +#: builtin/reset.c:312 msgid "record only the fact that removed paths will be added later" msgstr "chỉ ghi lại những đường dẫn thực sự sẽ được thêm vào sau này" -#: builtin/reset.c:320 +#: builtin/reset.c:329 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Gặp lỗi khi phân giải “%s” như là điểm xét duyệt hợp lệ." -#: builtin/reset.c:328 +#: builtin/reset.c:337 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "Gặp lỗi khi phân giải “%s” như là một cây (tree) hợp lệ." -#: builtin/reset.c:337 +#: builtin/reset.c:346 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch xung khắc với --{hard,mixed,soft}" -#: builtin/reset.c:346 +#: builtin/reset.c:355 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "--mixed với các đường dẫn không còn dùng nữa; hãy thay thế bằng lệnh “git " "reset -- <đường_dẫn>”." -#: builtin/reset.c:348 +#: builtin/reset.c:357 #, c-format msgid "Cannot do %s reset with paths." msgstr "Không thể thực hiện lệnh %s reset với các đường dẫn." -#: builtin/reset.c:358 +#: builtin/reset.c:367 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "%s reset không được phép trên kho thuần" -#: builtin/reset.c:362 +#: builtin/reset.c:371 msgid "-N can only be used with --mixed" msgstr "-N chỉ được dùng khi có --mixed" -#: builtin/reset.c:379 +#: builtin/reset.c:388 msgid "Unstaged changes after reset:" msgstr "Những thay đổi được đưa ra khỏi bệ phóng sau khi reset:" -#: builtin/reset.c:385 +#: builtin/reset.c:394 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Không thể đặt lại (reset) bảng mục lục thành điểm xét duyệt “%s”." -#: builtin/reset.c:389 +#: builtin/reset.c:398 msgid "Could not write new index file." msgstr "Không thể ghi tập tin lưu bảng mục lục mới." -#: builtin/rev-list.c:358 +#: builtin/rev-list.c:361 msgid "rev-list does not support display of notes" msgstr "rev-list không hỗ trợ hiển thị các ghi chú" -#: builtin/rev-parse.c:394 +#: builtin/rev-parse.c:402 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<các-tùy-chọn>] -- [<các tham số>…]" -#: builtin/rev-parse.c:399 +#: builtin/rev-parse.c:407 msgid "keep the `--` passed as an arg" msgstr "giữ lại “--” chuyển sang làm tham số" -#: builtin/rev-parse.c:401 +#: builtin/rev-parse.c:409 msgid "stop parsing after the first non-option argument" msgstr "dừng phân tích sau đối số đầu tiên không có tùy chọn" -#: builtin/rev-parse.c:404 +#: builtin/rev-parse.c:412 msgid "output in stuck long form" msgstr "kết xuất trong định dạng gậy dài" -#: builtin/rev-parse.c:535 +#: builtin/rev-parse.c:545 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -12788,11 +12984,11 @@ msgstr "chấp nhận chuyển giao mà không ghi chú gì" msgid "keep redundant, empty commits" msgstr "giữ lại các lần chuyển giao dư thừa, rỗng" -#: builtin/revert.c:212 +#: builtin/revert.c:214 msgid "revert failed" msgstr "hoàn nguyên gặp lỗi" -#: builtin/revert.c:225 +#: builtin/revert.c:227 msgid "cherry-pick failed" msgstr "cherry-pick gặp lỗi" @@ -12857,17 +13053,17 @@ msgstr "cho phép gỡ bỏ đệ qui" msgid "exit with a zero status even if nothing matched" msgstr "thoát ra với trạng thái khác không thậm chí nếu không có gì khớp" -#: builtin/rm.c:308 +#: builtin/rm.c:307 #, c-format msgid "not removing '%s' recursively without -r" msgstr "không thể gỡ bỏ “%s” một cách đệ qui mà không có tùy chọn -r" -#: builtin/rm.c:347 +#: builtin/rm.c:346 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: không thể gỡ bỏ %s" -#: builtin/rm.c:370 +#: builtin/rm.c:369 #, c-format msgid "could not remove '%s'" msgstr "không thể gỡ bỏ “%s”" @@ -12904,27 +13100,27 @@ msgstr "in các trạng thái từ phần hướng dẫn trên máy dịch vụ" msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" msgstr "git shortlog [<các-tùy-chọn>] [<vùng-xét-duyệt>] [[--] [<đường-dẫn>…]]" -#: builtin/shortlog.c:249 +#: builtin/shortlog.c:263 msgid "Group by committer rather than author" msgstr "Nhóm theo người chuyển giao thay vì tác giả" -#: builtin/shortlog.c:251 +#: builtin/shortlog.c:265 msgid "sort output according to the number of commits per author" msgstr "sắp xếp kết xuất tuân theo số lượng chuyển giao trên mỗi tác giả" -#: builtin/shortlog.c:253 +#: builtin/shortlog.c:267 msgid "Suppress commit descriptions, only provides commit count" msgstr "Chặn mọi mô tả lần chuyển giao, chỉ đưa ra số lượng lần chuyển giao" -#: builtin/shortlog.c:255 +#: builtin/shortlog.c:269 msgid "Show the email address of each author" msgstr "Hiển thị thư điện tử cho từng tác giả" -#: builtin/shortlog.c:256 +#: builtin/shortlog.c:270 msgid "w[,i1[,i2]]" msgstr "w[,i1[,i2]]" -#: builtin/shortlog.c:257 +#: builtin/shortlog.c:271 msgid "Linewrap output" msgstr "Ngắt dòng khi quá dài" @@ -13125,35 +13321,35 @@ msgstr "giữ và xóa bỏ mọi dòng bắt đầu bằng ký tự ghi chú" msgid "prepend comment character and space to each line" msgstr "treo trước ký tự ghi chú và ký tự khoảng trắng cho từng dòng" -#: builtin/submodule--helper.c:25 builtin/submodule--helper.c:1075 +#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1094 #, c-format msgid "No such ref: %s" msgstr "Không có tham chiếu nào như thế: %s" -#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084 +#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1103 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Cần tên tham chiếu dạng đầy đủ, nhưng lại nhận được %s" -#: builtin/submodule--helper.c:72 +#: builtin/submodule--helper.c:71 #, c-format msgid "cannot strip one component off url '%s'" msgstr "không thể cắt bỏ một thành phần ra khỏi “%s” url" -#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630 +#: builtin/submodule--helper.c:302 builtin/submodule--helper.c:623 msgid "alternative anchor for relative paths" msgstr "điểm neo thay thế cho các đường dẫn tương đối" -#: builtin/submodule--helper.c:310 +#: builtin/submodule--helper.c:307 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=</đường/dẫn>] [</đường/dẫn>…]" -#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380 +#: builtin/submodule--helper.c:350 builtin/submodule--helper.c:374 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "Không tìm thấy url cho đường dẫn mô-đun-con “%s” trong .gitmodules" -#: builtin/submodule--helper.c:395 +#: builtin/submodule--helper.c:389 #, c-format msgid "" "could not lookup configuration '%s'. Assuming this repository is its own " @@ -13162,81 +13358,81 @@ msgstr "" "không thể tìm thấy cấu hình “%s”. Coi rằng kho này là thượng nguồn có quyền " "sở hữu chính nó." -#: builtin/submodule--helper.c:406 +#: builtin/submodule--helper.c:400 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Gặp lỗi khi đăng ký url cho đường dẫn mô-đun-con “%s”" -#: builtin/submodule--helper.c:410 +#: builtin/submodule--helper.c:404 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Mô-đun-con “%s” (%s) được đăng ký cho đường dẫn “%s”\n" -#: builtin/submodule--helper.c:420 +#: builtin/submodule--helper.c:414 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "cảnh báo: chế độ lệnh cập nhật được gợi ý cho mô-đun-con “%s”\n" -#: builtin/submodule--helper.c:427 +#: builtin/submodule--helper.c:421 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "Gặp lỗi khi đăng ký chế độ cập nhật cho đường dẫn mô-đun-con “%s”" -#: builtin/submodule--helper.c:443 +#: builtin/submodule--helper.c:437 msgid "Suppress output for initializing a submodule" msgstr "Chặn kết xuất cho khởi tạo một mô-đun-con" -#: builtin/submodule--helper.c:448 +#: builtin/submodule--helper.c:442 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper init [</đường/dẫn>]" -#: builtin/submodule--helper.c:476 +#: builtin/submodule--helper.c:470 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name </đường/dẫn>" -#: builtin/submodule--helper.c:482 +#: builtin/submodule--helper.c:475 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "" "Không tìm thấy ánh xạ (mapping) mô-đun-con trong .gitmodules cho đường dẫn " "“%s”" -#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568 +#: builtin/submodule--helper.c:558 builtin/submodule--helper.c:561 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "mô-đun-con “%s” không thể thêm thay thế: %s" -#: builtin/submodule--helper.c:604 +#: builtin/submodule--helper.c:597 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Giá trị “%s” cho submodule.alternateErrorStrategy không được thừa nhận" -#: builtin/submodule--helper.c:611 +#: builtin/submodule--helper.c:604 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Giá trị “%s” cho submodule.alternateLocation không được thừa nhận" -#: builtin/submodule--helper.c:633 +#: builtin/submodule--helper.c:626 msgid "where the new submodule will be cloned to" msgstr "nhân bản mô-đun-con mới vào chỗ nào" -#: builtin/submodule--helper.c:636 +#: builtin/submodule--helper.c:629 msgid "name of the new submodule" msgstr "tên của mô-đun-con mới" -#: builtin/submodule--helper.c:639 +#: builtin/submodule--helper.c:632 msgid "url where to clone the submodule from" msgstr "url nơi mà nhân bản mô-đun-con từ đó" -#: builtin/submodule--helper.c:645 +#: builtin/submodule--helper.c:638 msgid "depth for shallow clones" msgstr "chiều sâu lịch sử khi tạo bản sao" -#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993 +#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:1012 msgid "force cloning progress" msgstr "ép buộc tiến trình nhân bản" -#: builtin/submodule--helper.c:653 +#: builtin/submodule--helper.c:646 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -13244,84 +13440,84 @@ msgstr "" "git submodule--helper clone [--prefix=</đường/dẫn>] [--quiet] [--reference " "<kho>] [--name <tên>] [--depth <sâu>] [--url <url>] [</đường/dẫn>…]" -#: builtin/submodule--helper.c:684 +#: builtin/submodule--helper.c:677 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "Nhân bản “%s” vào đường dẫn mô-đun-con “%s” gặp lỗi" -#: builtin/submodule--helper.c:699 +#: builtin/submodule--helper.c:692 #, c-format msgid "could not get submodule directory for '%s'" msgstr "không thể lấy thư mục mô-đun-con cho “%s”" -#: builtin/submodule--helper.c:764 +#: builtin/submodule--helper.c:757 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Đường dẫn mô-đun-con “%s” chưa được khởi tạo" -#: builtin/submodule--helper.c:768 +#: builtin/submodule--helper.c:761 msgid "Maybe you want to use 'update --init'?" msgstr "Có lẽ bạn là bạn muốn dùng \"update --init\" phải không?" -#: builtin/submodule--helper.c:793 +#: builtin/submodule--helper.c:790 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Bỏ qua các mô-đun-con chưa được hòa trộn %s" -#: builtin/submodule--helper.c:814 +#: builtin/submodule--helper.c:819 #, c-format msgid "Skipping submodule '%s'" msgstr "Bỏ qua mô-đun-con “%s”" -#: builtin/submodule--helper.c:942 +#: builtin/submodule--helper.c:952 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Gặp lỗi khi nhân bản “%s”. Thử lại lịch trình" -#: builtin/submodule--helper.c:953 +#: builtin/submodule--helper.c:963 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Gặp lỗi khi nhân bản “%s” lần thứ hai nên bãi bỏ" -#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162 +#: builtin/submodule--helper.c:993 builtin/submodule--helper.c:1213 msgid "path into the working tree" msgstr "đường dẫn đến cây làm việc" -#: builtin/submodule--helper.c:977 +#: builtin/submodule--helper.c:996 msgid "path into the working tree, across nested submodule boundaries" msgstr "đường dẫn đến cây làm việc, chéo biên giới mô-đun-con lồng nhau" -#: builtin/submodule--helper.c:981 +#: builtin/submodule--helper.c:1000 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout hoặc không làm gì cả" -#: builtin/submodule--helper.c:985 +#: builtin/submodule--helper.c:1004 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "" "Tạo một bản sao nông được cắt ngắn thành số lượng điểm xét duyệt đã cho" -#: builtin/submodule--helper.c:988 +#: builtin/submodule--helper.c:1007 msgid "parallel jobs" msgstr "công việc đồng thời" -#: builtin/submodule--helper.c:990 +#: builtin/submodule--helper.c:1009 msgid "whether the initial clone should follow the shallow recommendation" msgstr "nhân bản lần đầu có nên theo khuyến nghị là nông hay không" -#: builtin/submodule--helper.c:991 +#: builtin/submodule--helper.c:1010 msgid "don't print cloning progress" msgstr "đừng in tiến trình nhân bản" -#: builtin/submodule--helper.c:998 +#: builtin/submodule--helper.c:1017 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "" "git submodule--helper update_clone [--prefix=</đường/dẫn>] [</đường/dẫn>…]" -#: builtin/submodule--helper.c:1008 +#: builtin/submodule--helper.c:1030 msgid "bad value for update parameter" msgstr "giá trị cho tham số cập nhật bị sai" -#: builtin/submodule--helper.c:1079 +#: builtin/submodule--helper.c:1098 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -13330,20 +13526,20 @@ msgstr "" "Nhánh mô-đun-con (%s) được cấu hình kế thừa nhánh từ siêu dự án, nhưng siêu " "dự án lại không trên bất kỳ nhánh nào" -#: builtin/submodule--helper.c:1163 +#: builtin/submodule--helper.c:1214 msgid "recurse into submodules" msgstr "đệ quy vào trong mô-đun-con" -#: builtin/submodule--helper.c:1169 +#: builtin/submodule--helper.c:1220 msgid "git submodule--helper embed-git-dir [<path>...]" msgstr "git submodule--helper embed-git-dir [</đường/dẫn>…]" -#: builtin/submodule--helper.c:1232 +#: builtin/submodule--helper.c:1278 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s không hỗ trợ --super-prefix" -#: builtin/submodule--helper.c:1238 +#: builtin/submodule--helper.c:1284 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "“%s” không phải là lệnh con submodule--helper hợp lệ" @@ -13356,23 +13552,23 @@ msgstr "git symbolic-ref [<các-tùy-chọn>] <tên> [<t.chiếu>]" msgid "git symbolic-ref -d [-q] <name>" msgstr "git symbolic-ref -d [-q] <tên>" -#: builtin/symbolic-ref.c:41 +#: builtin/symbolic-ref.c:40 msgid "suppress error message for non-symbolic (detached) refs" msgstr "chặn các thông tin lỗi cho các tham chiếu “không-mềm” (bị tách ra)" -#: builtin/symbolic-ref.c:42 +#: builtin/symbolic-ref.c:41 msgid "delete symbolic ref" msgstr "xóa tham chiếu mềm" -#: builtin/symbolic-ref.c:43 +#: builtin/symbolic-ref.c:42 msgid "shorten ref output" msgstr "làm ngắn kết xuất ref (tham chiếu)" -#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason" msgstr "lý do" -#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason of the update" msgstr "lý do cập nhật" @@ -13402,17 +13598,17 @@ msgstr "" msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<định_dạng>] <tên-thẻ>…" -#: builtin/tag.c:84 +#: builtin/tag.c:86 #, c-format msgid "tag '%s' not found." msgstr "không tìm thấy tìm thấy thẻ “%s”." -#: builtin/tag.c:100 +#: builtin/tag.c:102 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Thẻ đã bị xóa “%s” (từng là %s)\n" -#: builtin/tag.c:129 +#: builtin/tag.c:131 #, c-format msgid "" "\n" @@ -13425,7 +13621,7 @@ msgstr "" " %s\n" "Những dòng được bắt đầu bằng “%c” sẽ được bỏ qua.\n" -#: builtin/tag.c:133 +#: builtin/tag.c:135 #, c-format msgid "" "\n" @@ -13440,143 +13636,143 @@ msgstr "" "Những dòng được bắt đầu bằng “%c” sẽ được giữ lại; bạn có thể xóa chúng đi " "nếu muốn.\n" -#: builtin/tag.c:211 +#: builtin/tag.c:189 msgid "unable to sign the tag" msgstr "không thể ký thẻ" -#: builtin/tag.c:213 +#: builtin/tag.c:191 msgid "unable to write tag file" msgstr "không thể ghi vào tập tin lưu thẻ" -#: builtin/tag.c:237 +#: builtin/tag.c:215 msgid "bad object type." msgstr "kiểu đối tượng sai." -#: builtin/tag.c:283 +#: builtin/tag.c:261 msgid "no tag message?" msgstr "không có chú thích gì cho cho thẻ à?" -#: builtin/tag.c:290 +#: builtin/tag.c:268 #, c-format msgid "The tag message has been left in %s\n" msgstr "Nội dung ghi chú còn lại %s\n" -#: builtin/tag.c:398 +#: builtin/tag.c:376 msgid "list tag names" msgstr "chỉ liệt kê tên các thẻ" -#: builtin/tag.c:400 +#: builtin/tag.c:378 msgid "print <n> lines of each tag message" msgstr "hiển thị <n> dòng cho mỗi ghi chú" -#: builtin/tag.c:402 +#: builtin/tag.c:380 msgid "delete tags" msgstr "xóa thẻ" -#: builtin/tag.c:403 +#: builtin/tag.c:381 msgid "verify tags" msgstr "thẩm tra thẻ" -#: builtin/tag.c:405 +#: builtin/tag.c:383 msgid "Tag creation options" msgstr "Tùy chọn tạo thẻ" -#: builtin/tag.c:407 +#: builtin/tag.c:385 msgid "annotated tag, needs a message" msgstr "để chú giải cho thẻ, cần một lời ghi chú" -#: builtin/tag.c:409 +#: builtin/tag.c:387 msgid "tag message" msgstr "phần chú thích cho thẻ" -#: builtin/tag.c:411 +#: builtin/tag.c:389 msgid "annotated and GPG-signed tag" msgstr "thẻ chú giải và ký kiểu GPG" -#: builtin/tag.c:415 +#: builtin/tag.c:393 msgid "use another key to sign the tag" msgstr "dùng kháo khác để ký thẻ" -#: builtin/tag.c:416 +#: builtin/tag.c:394 msgid "replace the tag if exists" msgstr "thay thế nếu thẻ đó đã có trước" -#: builtin/tag.c:417 builtin/update-ref.c:369 +#: builtin/tag.c:395 builtin/update-ref.c:368 msgid "create a reflog" msgstr "tạo một reflog" -#: builtin/tag.c:419 +#: builtin/tag.c:397 msgid "Tag listing options" msgstr "Các tùy chọn liệt kê thẻ" -#: builtin/tag.c:420 +#: builtin/tag.c:398 msgid "show tag list in columns" msgstr "hiển thị danh sách thẻ trong các cột" -#: builtin/tag.c:421 builtin/tag.c:423 +#: builtin/tag.c:399 builtin/tag.c:401 msgid "print only tags that contain the commit" msgstr "chỉ hiển thị những nhánh mà nó chứa lần chuyển giao" -#: builtin/tag.c:422 builtin/tag.c:424 +#: builtin/tag.c:400 builtin/tag.c:402 msgid "print only tags that don't contain the commit" msgstr "chỉ hiển thị những thẻ mà nó không chứa lần chuyển giao" -#: builtin/tag.c:425 +#: builtin/tag.c:403 msgid "print only tags that are merged" msgstr "chỉ hiển thị những thẻ mà nó được hòa trộn" -#: builtin/tag.c:426 +#: builtin/tag.c:404 msgid "print only tags that are not merged" msgstr "chỉ hiển thị những thẻ mà nó không được hòa trộn" -#: builtin/tag.c:431 +#: builtin/tag.c:409 msgid "print only tags of the object" msgstr "chỉ hiển thị các thẻ của đối tượng" -#: builtin/tag.c:470 +#: builtin/tag.c:453 msgid "--column and -n are incompatible" msgstr "--column và -n xung khắc nhau" -#: builtin/tag.c:492 +#: builtin/tag.c:475 msgid "-n option is only allowed in list mode" msgstr "tùy chọn -n chỉ cho phép dùng trong chế độ liệt kê" -#: builtin/tag.c:494 +#: builtin/tag.c:477 msgid "--contains option is only allowed in list mode" msgstr "tùy chọn --contains chỉ cho phép dùng trong chế độ liệt kê" -#: builtin/tag.c:496 +#: builtin/tag.c:479 msgid "--no-contains option is only allowed in list mode" msgstr "tùy chọn --no-contains chỉ cho phép dùng trong chế độ liệt kê" -#: builtin/tag.c:498 +#: builtin/tag.c:481 msgid "--points-at option is only allowed in list mode" msgstr "tùy chọn --points-at chỉ cho phép dùng trong chế độ liệt kê" -#: builtin/tag.c:500 +#: builtin/tag.c:483 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "" "tùy chọn --merged và --no-merged chỉ cho phép dùng trong chế độ liệt kê" -#: builtin/tag.c:511 +#: builtin/tag.c:494 msgid "only one -F or -m option is allowed." msgstr "chỉ có một tùy chọn -F hoặc -m là được phép." -#: builtin/tag.c:530 +#: builtin/tag.c:513 msgid "too many params" msgstr "quá nhiều đối số" -#: builtin/tag.c:536 +#: builtin/tag.c:519 #, c-format msgid "'%s' is not a valid tag name." msgstr "“%s” không phải thẻ hợp lệ." -#: builtin/tag.c:541 +#: builtin/tag.c:524 #, c-format msgid "tag '%s' already exists" msgstr "Thẻ “%s” đã tồn tại rồi" -#: builtin/tag.c:571 +#: builtin/tag.c:554 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Đã cập nhật thẻ “%s” (trước là %s)\n" @@ -13645,131 +13841,131 @@ msgstr "thông tin thống kê thư mục không thay đổi sau khi xóa thư m msgid " OK" msgstr " Đồng ý" -#: builtin/update-index.c:569 +#: builtin/update-index.c:571 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<các-tùy-chọn>] [--] [<tập-tin>…]" -#: builtin/update-index.c:924 +#: builtin/update-index.c:926 msgid "continue refresh even when index needs update" msgstr "tiếp tục làm mới ngay cả khi bảng mục lục cần được cập nhật" -#: builtin/update-index.c:927 +#: builtin/update-index.c:929 msgid "refresh: ignore submodules" msgstr "refresh: lờ đi mô-đun-con" -#: builtin/update-index.c:930 +#: builtin/update-index.c:932 msgid "do not ignore new files" msgstr "không bỏ qua các tập tin mới tạo" -#: builtin/update-index.c:932 +#: builtin/update-index.c:934 msgid "let files replace directories and vice-versa" msgstr "để các tập tin thay thế các thư mục và “vice-versa”" -#: builtin/update-index.c:934 +#: builtin/update-index.c:936 msgid "notice files missing from worktree" msgstr "thông báo các tập-tin thiếu trong thư-mục làm việc" -#: builtin/update-index.c:936 +#: builtin/update-index.c:938 msgid "refresh even if index contains unmerged entries" msgstr "" "làm tươi mới thậm chí khi bảng mục lục chứa các mục tin chưa được hòa trộn" -#: builtin/update-index.c:939 +#: builtin/update-index.c:941 msgid "refresh stat information" msgstr "lấy lại thông tin thống kê" -#: builtin/update-index.c:943 +#: builtin/update-index.c:945 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "giống --refresh, nhưng bỏ qua các cài đặt “assume-unchanged”" -#: builtin/update-index.c:947 +#: builtin/update-index.c:949 msgid "<mode>,<object>,<path>" msgstr "<chế_độ>,<đối_tượng>,<đường_dẫn>" -#: builtin/update-index.c:948 +#: builtin/update-index.c:950 msgid "add the specified entry to the index" msgstr "thêm các tập tin đã chỉ ra vào bảng mục lục" -#: builtin/update-index.c:957 +#: builtin/update-index.c:959 msgid "mark files as \"not changing\"" msgstr "Đánh dấu các tập tin là \"không thay đổi\"" -#: builtin/update-index.c:960 +#: builtin/update-index.c:962 msgid "clear assumed-unchanged bit" msgstr "xóa bít assumed-unchanged (giả định là không thay đổi)" -#: builtin/update-index.c:963 +#: builtin/update-index.c:965 msgid "mark files as \"index-only\"" msgstr "đánh dấu các tập tin là “chỉ-đọc”" -#: builtin/update-index.c:966 +#: builtin/update-index.c:968 msgid "clear skip-worktree bit" msgstr "xóa bít skip-worktree" -#: builtin/update-index.c:969 +#: builtin/update-index.c:971 msgid "add to index only; do not add content to object database" msgstr "" "chỉ thêm vào bảng mục lục; không thêm nội dung vào cơ sở dữ liệu đối tượng" -#: builtin/update-index.c:971 +#: builtin/update-index.c:973 msgid "remove named paths even if present in worktree" msgstr "" "gỡ bỏ các đường dẫn được đặt tên thậm chí cả khi nó hiện diện trong thư mục " "làm việc" -#: builtin/update-index.c:973 +#: builtin/update-index.c:975 msgid "with --stdin: input lines are terminated by null bytes" msgstr "với tùy chọn --stdin: các dòng đầu vào được chấm dứt bởi ký tự null" -#: builtin/update-index.c:975 +#: builtin/update-index.c:977 msgid "read list of paths to be updated from standard input" msgstr "đọc danh sách đường dẫn cần cập nhật từ đầu vào tiêu chuẩn" -#: builtin/update-index.c:979 +#: builtin/update-index.c:981 msgid "add entries from standard input to the index" msgstr "không thể đọc các mục từ đầu vào tiêu chuẩn vào bảng mục lục" -#: builtin/update-index.c:983 +#: builtin/update-index.c:985 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "phục hồi các trạng thái #2 và #3 cho các đường dẫn được liệt kê" -#: builtin/update-index.c:987 +#: builtin/update-index.c:989 msgid "only update entries that differ from HEAD" msgstr "chỉ cập nhật các mục tin mà nó khác biệt so với HEAD" -#: builtin/update-index.c:991 +#: builtin/update-index.c:993 msgid "ignore files missing from worktree" msgstr "bỏ qua các tập-tin thiếu trong thư-mục làm việc" -#: builtin/update-index.c:994 +#: builtin/update-index.c:996 msgid "report actions to standard output" msgstr "báo cáo các thao tác ra thiết bị xuất chuẩn" -#: builtin/update-index.c:996 +#: builtin/update-index.c:998 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(cho “porcelains”) quên các xung đột chưa được giải quyết đã ghi" -#: builtin/update-index.c:1000 +#: builtin/update-index.c:1002 msgid "write index in this format" msgstr "ghi mục lục ở định dạng này" -#: builtin/update-index.c:1002 +#: builtin/update-index.c:1004 msgid "enable or disable split index" msgstr "bật/tắt chia cắt bảng mục lục" -#: builtin/update-index.c:1004 +#: builtin/update-index.c:1006 msgid "enable/disable untracked cache" msgstr "bật/tắt bộ đệm không theo vết" -#: builtin/update-index.c:1006 +#: builtin/update-index.c:1008 msgid "test if the filesystem supports untracked cache" msgstr "kiểm tra xem hệ thống tập tin có hỗ trợ đệm không theo dõi hay không" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1010 msgid "enable untracked cache without testing the filesystem" msgstr "bật bộ đệm không theo vết mà không kiểm tra hệ thống tập tin" -#: builtin/update-index.c:1108 +#: builtin/update-index.c:1107 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -13777,7 +13973,7 @@ msgstr "" "core.splitIndex được đặt là sai; xóa bỏ hay thay đổi nó, nếu bạn thực sự " "muốn bật chia tách mục lục" -#: builtin/update-index.c:1117 +#: builtin/update-index.c:1116 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -13785,7 +13981,7 @@ msgstr "" "core.splitIndex được đặt là đúng; xóa bỏ hay thay đổi nó, nếu bạn thực sự " "muốn tắt chia tách mục lục" -#: builtin/update-index.c:1128 +#: builtin/update-index.c:1127 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -13793,11 +13989,11 @@ msgstr "" "core.untrackedCache được đặt là đúng; xóa bỏ hay thay đổi nó, nếu bạn thực " "sự muốn tắt bộ đệm chưa theo dõi" -#: builtin/update-index.c:1132 +#: builtin/update-index.c:1131 msgid "Untracked cache disabled" msgstr "Nhớ đệm không theo vết bị tắt" -#: builtin/update-index.c:1140 +#: builtin/update-index.c:1139 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -13805,7 +14001,7 @@ msgstr "" "core.untrackedCache được đặt là sai; xóa bỏ hay thay đổi nó, nếu bạn thực sự " "muốn bật bộ đệm chưa theo dõi" -#: builtin/update-index.c:1144 +#: builtin/update-index.c:1143 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Nhớ đệm không theo vết được bật cho “%s”" @@ -13822,19 +14018,19 @@ msgstr "git update-ref [<các-tùy-chọn>] <refname> <biến-mới> [<biến msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [<các-tùy-chọn>] --stdin [-z]" -#: builtin/update-ref.c:364 +#: builtin/update-ref.c:363 msgid "delete the reference" msgstr "xóa tham chiếu" -#: builtin/update-ref.c:366 +#: builtin/update-ref.c:365 msgid "update <refname> not the one it points to" msgstr "cập nhật <tên-tham-chiếu> không phải cái nó chỉ tới" -#: builtin/update-ref.c:367 +#: builtin/update-ref.c:366 msgid "stdin has NUL-terminated arguments" msgstr "đầu vào tiêu chuẩn có các đối số được chấm dứt bởi NUL" -#: builtin/update-ref.c:368 +#: builtin/update-ref.c:367 msgid "read updates from stdin" msgstr "đọc cập nhật từ đầu vào tiêu chuẩn" @@ -13898,102 +14094,109 @@ msgstr "git worktree prune [<các-tùy-chọn>]" msgid "git worktree unlock <path>" msgstr "git worktree unlock </đường/dẫn>" -#: builtin/worktree.c:44 +#: builtin/worktree.c:46 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Gỡ bỏ cây làm việc/%s: không phải là thư mục hợp lệ" -#: builtin/worktree.c:50 +#: builtin/worktree.c:52 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Gỡ bỏ cây làm việc/%s: không có tập tin gitdir" -#: builtin/worktree.c:55 +#: builtin/worktree.c:57 builtin/worktree.c:66 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "Gỡ bỏ cây làm việc/%s: không thể đọc tập tin gitdir (%s)" -#: builtin/worktree.c:66 +#: builtin/worktree.c:76 +#, c-format +msgid "" +"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " +"%<PRIuMAX>)" +msgstr "Gỡ bỏ cây làm việc/%s: đọc ngắn (cần %<PRIuMAX> byte, đọc %<PRIuMAX>)" + +#: builtin/worktree.c:84 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Gỡ bỏ cây làm việc/%s: tập tin gitdir không hợp lệ" -#: builtin/worktree.c:82 +#: builtin/worktree.c:100 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "Gỡ bỏ cây làm việc/%s: tập tin gitdir chỉ đến vị trí không tồn tại" -#: builtin/worktree.c:129 +#: builtin/worktree.c:147 msgid "report pruned working trees" msgstr "báo cáo các cây làm việc đã prune" -#: builtin/worktree.c:131 +#: builtin/worktree.c:149 msgid "expire working trees older than <time>" msgstr "các cây làm việc hết hạn cũ hơn khoảng <thời gian>" -#: builtin/worktree.c:205 +#: builtin/worktree.c:223 #, c-format msgid "'%s' already exists" msgstr "“%s” đã có từ trước rồi" -#: builtin/worktree.c:236 +#: builtin/worktree.c:254 #, c-format msgid "could not create directory of '%s'" msgstr "không thể tạo thư mục của “%s”" -#: builtin/worktree.c:275 +#: builtin/worktree.c:293 #, c-format msgid "Preparing %s (identifier %s)" msgstr "Đang chuẩn bị %s (định danh %s)" -#: builtin/worktree.c:327 +#: builtin/worktree.c:345 msgid "checkout <branch> even if already checked out in other worktree" msgstr "lấy ra <nhánh> ngay cả khi nó đã được lấy ra ở cây làm việc khác" -#: builtin/worktree.c:329 +#: builtin/worktree.c:347 msgid "create a new branch" msgstr "tạo nhánh mới" -#: builtin/worktree.c:331 +#: builtin/worktree.c:349 msgid "create or reset a branch" msgstr "tạo hay đặt lại một nhánh" -#: builtin/worktree.c:333 +#: builtin/worktree.c:351 msgid "populate the new working tree" msgstr "di chuyển cây làm việc mới" -#: builtin/worktree.c:334 +#: builtin/worktree.c:352 msgid "keep the new working tree locked" msgstr "giữ cây làm việc mới bị khóa" -#: builtin/worktree.c:342 +#: builtin/worktree.c:360 msgid "-b, -B, and --detach are mutually exclusive" msgstr "Các tùy chọn -b, -B, và --detach loại từ lẫn nhau" -#: builtin/worktree.c:479 +#: builtin/worktree.c:499 msgid "reason for locking" msgstr "lý do khóa" -#: builtin/worktree.c:491 builtin/worktree.c:524 +#: builtin/worktree.c:511 builtin/worktree.c:544 #, c-format msgid "'%s' is not a working tree" msgstr "%s không phải là cây làm việc" -#: builtin/worktree.c:493 builtin/worktree.c:526 +#: builtin/worktree.c:513 builtin/worktree.c:546 msgid "The main working tree cannot be locked or unlocked" msgstr "Cây thư mục làm việc chính không thể khóa hay bỏ khóa được" -#: builtin/worktree.c:498 +#: builtin/worktree.c:518 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "“%s” đã được khóa rồi, lý do: %s" -#: builtin/worktree.c:500 +#: builtin/worktree.c:520 #, c-format msgid "'%s' is already locked" msgstr "“%s” đã được khóa rồi" -#: builtin/worktree.c:528 +#: builtin/worktree.c:548 #, c-format msgid "'%s' is not locked" msgstr "“%s” chưa bị khóa" @@ -14018,23 +14221,23 @@ msgstr "chỉ hữu ích khi cần gỡ lỗi" msgid "git upload-pack [<options>] <dir>" msgstr "git upload-pack [<các-tùy-chọn>] </đường/dẫn>" -#: upload-pack.c:1041 +#: upload-pack.c:1040 msgid "quit after a single request/response exchange" msgstr "thoát sau khi một trao đổi yêu cầu hay trả lời đơn" -#: upload-pack.c:1043 +#: upload-pack.c:1042 msgid "exit immediately after initial ref advertisement" msgstr "thoát ngay sau khi khởi tạo quảng cáo tham chiếu" -#: upload-pack.c:1045 +#: upload-pack.c:1044 msgid "do not try <directory>/.git/ if <directory> is no Git directory" msgstr "đừng thử <thư_mục>/.git/ nếu <thư_mục> không phải là thư mục Git" -#: upload-pack.c:1047 +#: upload-pack.c:1046 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "ngắt truyền thông sau <n> giây không hoạt động" -#: credential-cache--daemon.c:224 +#: credential-cache--daemon.c:222 #, c-format msgid "" "The permissions on your socket directory are too loose; other\n" @@ -14047,7 +14250,7 @@ msgstr "" "\n" "\tchmod 0700 %s" -#: credential-cache--daemon.c:272 +#: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "in thông tin gỡ lỗi ra đầu ra lỗi tiêu chuẩn" @@ -14061,20 +14264,20 @@ msgstr "" "hướng dẫn về khái niệm. Xem “git help <lệnh>” hay “git help <khái-niệm>”\n" "để xem các đặc tả cho lệnh hay khái niệm cụ thể." -#: http.c:337 +#: http.c:338 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "giá trị âm cho http.postbuffer; mặc định là %d" -#: http.c:358 +#: http.c:359 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "Điều khiển giao quyền không được hỗ trợ với cURL < 7.22.0" -#: http.c:367 +#: http.c:368 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "Chốt khóa công không được hỗ trợ với cURL < 7.44.0" -#: http.c:1764 +#: http.c:1768 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -14443,7 +14646,7 @@ msgstr "Không thể tìm thấy lần chuyển giao chung với $pretty_name" #: git-merge-octopus.sh:77 #, sh-format -msgid "Already up-to-date with $pretty_name" +msgid "Already up to date with $pretty_name" msgstr "Đã cập nhật với $pretty_name rồi" #: git-merge-octopus.sh:89 @@ -14462,56 +14665,58 @@ msgstr "Hòa trộn đơn giản không làm việc, thử hòa trộn tự đ #: git-rebase.sh:58 msgid "" -"When you have resolved this problem, run \"git rebase --continue\".\n" -"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" -"To check out the original branch and stop rebasing, run \"git rebase --abort" -"\"." +"Resolve all conflicts manually, mark them as resolved with\n" +"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" +"You can instead skip this commit: run \"git rebase --skip\".\n" +"To abort and get back to the state before \"git rebase\", run \"git rebase --" +"abort\"." msgstr "" -"Khi bạn cần giải quyết vấn đề này hãy chạy lệnh \"git rebase --continue\".\n" -"Nếu bạn có ý định bỏ qua miếng vá, thay vào đó bạn chạy \"git rebase --skip" -"\".\n" -"Để phục hồi lại thành nhánh nguyên thủy và dừng việc vá lại thì chạy \"git " -"rebase --abort\"." +"Giải quyết vấn đề này thủ công, hãy đanh dấu chúng đã được giải quyết bằng\n" +"hãy chạy lệnh \"git add/rm <các_tập_tin_xung_đột>\", sau đó chạy \"git " +"rebase --continue\".\n" +"Bạn có thể bỏ qua miếng vá, chạy \"git rebase --skip\".\n" +"Để bãi bỏ và quay trở lại trạng thái trước \"git rebase\", chạy \"git rebase " +"--abort\"." -#: git-rebase.sh:158 git-rebase.sh:397 +#: git-rebase.sh:160 git-rebase.sh:402 #, sh-format msgid "Could not move back to $head_name" msgstr "Không thể quay trở lại $head_name" -#: git-rebase.sh:169 +#: git-rebase.sh:171 msgid "Applied autostash." msgstr "Đã áp dụng autostash." -#: git-rebase.sh:172 +#: git-rebase.sh:174 #, sh-format msgid "Cannot store $stash_sha1" msgstr "Không thể lưu $stash_sha1" -#: git-rebase.sh:212 +#: git-rebase.sh:214 msgid "The pre-rebase hook refused to rebase." msgstr "Móc (hook) pre-rebase từ chối rebase." -#: git-rebase.sh:217 +#: git-rebase.sh:219 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "" "Hình như đang trong quá trình thực hiện lệnh git-am. Không thể chạy lệnh " "rebase." -#: git-rebase.sh:358 +#: git-rebase.sh:363 msgid "No rebase in progress?" msgstr "Không có tiến trình rebase nào phải không?" -#: git-rebase.sh:369 +#: git-rebase.sh:374 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "Hành động “--edit-todo” chỉ có thể dùng trong quá trình “rebase” (sửa lịch " "sử) tương tác." -#: git-rebase.sh:376 +#: git-rebase.sh:381 msgid "Cannot read HEAD" msgstr "Không thể đọc HEAD" -#: git-rebase.sh:379 +#: git-rebase.sh:384 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -14519,7 +14724,7 @@ msgstr "" "Bạn phải sửa tất cả các lần hòa trộn xung đột và sau\n" "đó đánh dấu chúng là cần xử lý sử dụng lệnh git add" -#: git-rebase.sh:419 +#: git-rebase.sh:424 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -14540,102 +14745,102 @@ msgstr "" "và chạy TÔI lần nữa. TÔI dừng lại trong trường hợp bạn vẫn\n" "có một số thứ quý giá ở đây." -#: git-rebase.sh:470 +#: git-rebase.sh:480 #, sh-format msgid "invalid upstream $upstream_name" msgstr "thượng nguồn không hợp lệ $upstream_name" -#: git-rebase.sh:494 +#: git-rebase.sh:504 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: ở đây có nhiều hơn một nền móng hòa trộn" -#: git-rebase.sh:497 git-rebase.sh:501 +#: git-rebase.sh:507 git-rebase.sh:511 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: ở đây không có nền móng hòa trộn nào" -#: git-rebase.sh:506 +#: git-rebase.sh:516 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "Không chỉ đến một lần chuyển giao không hợp lệ: $onto_name" -#: git-rebase.sh:529 +#: git-rebase.sh:539 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "nghiêm trọng: không có nhánh như thế: $branch_name" -#: git-rebase.sh:562 +#: git-rebase.sh:572 msgid "Cannot autostash" msgstr "Không thể autostash" -#: git-rebase.sh:567 +#: git-rebase.sh:577 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Đã tạo autostash: $stash_abbrev" -#: git-rebase.sh:571 +#: git-rebase.sh:581 msgid "Please commit or stash them." msgstr "Xin hãy chuyển giao hoặc tạm cất (stash) chúng." -#: git-rebase.sh:591 +#: git-rebase.sh:601 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "Nhánh hiện tại $branch_name đã được cập nhật rồi." -#: git-rebase.sh:595 +#: git-rebase.sh:605 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "Nhánh hiện tại $branch_name đã được cập nhật rồi, lệnh rebase ép buộc." -#: git-rebase.sh:606 +#: git-rebase.sh:616 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Thay đổi từ $mb thành $onto:" -#: git-rebase.sh:615 +#: git-rebase.sh:625 msgid "First, rewinding head to replay your work on top of it..." msgstr "Trước tiên, di chuyển head để xem lại các công việc trên đỉnh của nó…" -#: git-rebase.sh:625 +#: git-rebase.sh:635 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "Chuyển-tiếp-nhanh $branch_name thành $onto_name." -#: git-stash.sh:54 +#: git-stash.sh:61 msgid "git stash clear with parameters is unimplemented" msgstr "" "git stash clear với các tham số là chưa được thực hiện (không nhận đối số)" -#: git-stash.sh:95 +#: git-stash.sh:102 msgid "You do not have the initial commit yet" msgstr "Bạn chưa còn có lần chuyển giao khởi tạo" -#: git-stash.sh:110 +#: git-stash.sh:117 msgid "Cannot save the current index state" msgstr "Không thể ghi lại trạng thái bảng mục lục hiện hành" -#: git-stash.sh:125 +#: git-stash.sh:132 msgid "Cannot save the untracked files" msgstr "Không thể ghi lại các tập tin chưa theo dõi" -#: git-stash.sh:145 git-stash.sh:158 +#: git-stash.sh:152 git-stash.sh:165 msgid "Cannot save the current worktree state" msgstr "Không thể ghi lại trạng thái cây-làm-việc hiện hành" -#: git-stash.sh:162 +#: git-stash.sh:169 msgid "No changes selected" msgstr "Chưa có thay đổi nào được chọn" -#: git-stash.sh:165 +#: git-stash.sh:172 msgid "Cannot remove temporary index (can't happen)" msgstr "Không thể gỡ bỏ bảng mục lục tạm thời (không thể xảy ra)" -#: git-stash.sh:178 +#: git-stash.sh:185 msgid "Cannot record working tree state" msgstr "Không thể ghi lại trạng thái cây làm việc hiện hành" -#: git-stash.sh:210 +#: git-stash.sh:217 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "Không thể cập nhật $ref_stash với $w_commit" @@ -14650,7 +14855,7 @@ msgstr "Không thể cập nhật $ref_stash với $w_commit" #. $ git stash save --blah-blah 2>&1 | head -n 2 #. error: unknown option for 'stash save': --blah-blah #. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:266 +#: git-stash.sh:273 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" @@ -14660,107 +14865,107 @@ msgstr "" " Để có thể dùng lời chú thích có chứa -- ở đầu,\n" " dùng git stash save -- \"$option\"" -#: git-stash.sh:281 +#: git-stash.sh:288 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "Không thể dùng --patch và --include-untracked hay --all cùng một lúc." -#: git-stash.sh:289 +#: git-stash.sh:296 msgid "No local changes to save" msgstr "Không có thay đổi nội bộ nào được ghi lại" -#: git-stash.sh:294 +#: git-stash.sh:301 msgid "Cannot initialize stash" msgstr "Không thể khởi tạo stash" -#: git-stash.sh:298 +#: git-stash.sh:305 msgid "Cannot save the current status" msgstr "Không thể ghi lại trạng thái hiện hành" -#: git-stash.sh:299 +#: git-stash.sh:306 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "Đã ghi lại thư mục làm việc và trạng thái mục lục $stash_msg" -#: git-stash.sh:326 +#: git-stash.sh:334 msgid "Cannot remove worktree changes" msgstr "Không thể gỡ bỏ các thay đổi cây-làm-việc" -#: git-stash.sh:474 +#: git-stash.sh:482 #, sh-format msgid "unknown option: $opt" msgstr "không hiểu tùy chọn: $opt" -#: git-stash.sh:487 +#: git-stash.sh:495 msgid "No stash entries found." msgstr "Không tìm thấy các mục tạm cất (stash) nào." -#: git-stash.sh:494 +#: git-stash.sh:502 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Chỉ ra quá nhiều điểm xét duyệt: $REV" -#: git-stash.sh:509 +#: git-stash.sh:517 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference không phải là tham chiếu hợp lệ" -#: git-stash.sh:537 +#: git-stash.sh:545 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "“$args” không phải là lần chuyển giao kiểu-stash (cất đi)" -#: git-stash.sh:548 +#: git-stash.sh:556 #, sh-format msgid "'$args' is not a stash reference" msgstr "”$args” không phải tham chiếu đến stash" -#: git-stash.sh:556 +#: git-stash.sh:564 msgid "unable to refresh index" msgstr "không thể làm tươi mới bảng mục lục" -#: git-stash.sh:560 +#: git-stash.sh:568 msgid "Cannot apply a stash in the middle of a merge" msgstr "Không thể áp dụng một stash ở giữa của quá trình hòa trộn" -#: git-stash.sh:568 +#: git-stash.sh:576 msgid "Conflicts in index. Try without --index." msgstr "Xung đột trong bảng mục lục. Hãy thử mà không dùng tùy chọn --index." -#: git-stash.sh:570 +#: git-stash.sh:578 msgid "Could not save index tree" msgstr "Không thể ghi lại cây chỉ mục" -#: git-stash.sh:579 +#: git-stash.sh:587 msgid "Could not restore untracked files from stash entry" msgstr "Không thể phục hồi các tập tin chưa theo dõi từ mục cất đi (stash)" -#: git-stash.sh:604 +#: git-stash.sh:612 msgid "Cannot unstage modified files" msgstr "Không thể bỏ ra khỏi bệ phóng các tập tin đã được sửa chữa" -#: git-stash.sh:619 +#: git-stash.sh:627 msgid "Index was not unstashed." msgstr "Bảng mục lục đã không được bỏ stash." -#: git-stash.sh:633 +#: git-stash.sh:641 msgid "The stash entry is kept in case you need it again." msgstr "Các mục tạm cất (stash) được giữ trong trường hợp bạn lại cần nó." -#: git-stash.sh:642 +#: git-stash.sh:650 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Đã xóa ${REV} ($s)" -#: git-stash.sh:643 +#: git-stash.sh:651 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Không thể xóa bỏ mục stash" -#: git-stash.sh:651 +#: git-stash.sh:659 msgid "No branch name specified" msgstr "Chưa chỉ ra tên của nhánh" -#: git-stash.sh:730 +#: git-stash.sh:738 msgid "(To restore them type \"git stash apply\")" msgstr "(Để phục hồi lại chúng hãy gõ \"git stash apply\")" @@ -14912,19 +15117,19 @@ msgstr "Không thể tạo thư mục mô-đun-con rỗng “$displaypath”" msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "Mô-đun-con “$name” ($url) được bỏ đăng ký cho đường dẫn “$displaypath”" -#: git-submodule.sh:638 +#: git-submodule.sh:637 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" "Không tìm thấy điểm xét duyệt hiện hành trong đường dẫn mô-đun-con " "“$displaypath”" -#: git-submodule.sh:648 +#: git-submodule.sh:647 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Không thể lấy về trong đường dẫn mô-đun-con “$sm_path”" -#: git-submodule.sh:653 +#: git-submodule.sh:652 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -14933,12 +15138,12 @@ msgstr "" "Không thể tìm thấy điểm xét duyệt hiện hành ${remote_name}/${branch} trong " "đường dẫn mô-đun-con “$sm_path”" -#: git-submodule.sh:671 +#: git-submodule.sh:670 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "Không thể lấy về trong đường dẫn mô-đun-con “$displaypath”" -#: git-submodule.sh:677 +#: git-submodule.sh:676 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -14947,86 +15152,86 @@ msgstr "" "Đã lấy về từ đường dẫn mô-đun con “$displaypath”, nhưng nó không chứa $sha1. " "Lấy về theo định hướng của lần chuyển giao đó gặp lỗi." -#: git-submodule.sh:684 +#: git-submodule.sh:683 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "Không thể lấy ra “$sha1” trong đường dẫn mô-đun-con “$displaypath”" -#: git-submodule.sh:685 +#: git-submodule.sh:684 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Đường dẫn mô-đun-con “$displaypath”: đã checkout “$sha1”" -#: git-submodule.sh:689 +#: git-submodule.sh:688 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "Không thể cải tổ “$sha1” trong đường dẫn mô-đun-con “$displaypath”" -#: git-submodule.sh:690 +#: git-submodule.sh:689 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Đường dẫn mô-đun-con “$displaypath”: được rebase vào trong “$sha1”" -#: git-submodule.sh:695 +#: git-submodule.sh:694 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" "Không thể hòa trộn (merge) “$sha1” trong đường dẫn mô-đun-con “$displaypath”" -#: git-submodule.sh:696 +#: git-submodule.sh:695 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Đường dẫn mô-đun-con “$displaypath”: được hòa trộn vào “$sha1”" -#: git-submodule.sh:701 +#: git-submodule.sh:700 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "Thực hiện không thành công lệnh “$command $sha1” trong đường dẫn mô-đun-con " "“$displaypath”" -#: git-submodule.sh:702 +#: git-submodule.sh:701 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Đường dẫn mô-đun-con “$displaypath”: “$command $sha1”" -#: git-submodule.sh:733 +#: git-submodule.sh:732 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Gặp lỗi khi đệ quy vào trong đường dẫn mô-đun-con “$displaypath”" -#: git-submodule.sh:841 +#: git-submodule.sh:840 msgid "The --cached option cannot be used with the --files option" msgstr "Tùy chọn --cached không thể dùng cùng với tùy chọn --files" -#: git-submodule.sh:893 +#: git-submodule.sh:892 #, sh-format msgid "unexpected mode $mod_dst" msgstr "chế độ không như mong chờ $mod_dst" -#: git-submodule.sh:913 +#: git-submodule.sh:912 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Cảnh báo: $display_name không chứa lần chuyển giao $sha1_src" -#: git-submodule.sh:916 +#: git-submodule.sh:915 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Cảnh báo: $display_name không chứa lần chuyển giao $sha1_dst" -#: git-submodule.sh:919 +#: git-submodule.sh:918 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" " Cảnh báo: $display_name không chứa những lần chuyển giao $sha1_src và " "$sha1_dst" -#: git-submodule.sh:1065 +#: git-submodule.sh:1064 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "Gặp lỗi khi đệ quy vào trong đường dẫn mô-đun-con “$sm_path”" -#: git-submodule.sh:1137 +#: git-submodule.sh:1136 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Url Mô-đun-con đồng bộ hóa cho “$displaypath”" @@ -15045,13 +15250,13 @@ msgstr "Đang rebase ($new_count/$total)" msgid "" "\n" "Commands:\n" -" p, pick = use commit\n" -" r, reword = use commit, but edit the commit message\n" -" e, edit = use commit, but stop for amending\n" -" s, squash = use commit, but meld into previous commit\n" -" f, fixup = like \"squash\", but discard this commit's log message\n" -" x, exec = run command (the rest of the line) using shell\n" -" d, drop = remove commit\n" +"p, pick = use commit\n" +"r, reword = use commit, but edit the commit message\n" +"e, edit = use commit, but stop for amending\n" +"s, squash = use commit, but meld into previous commit\n" +"f, fixup = like \"squash\", but discard this commit's log message\n" +"x, exec = run command (the rest of the line) using shell\n" +"d, drop = remove commit\n" "\n" "These lines can be re-ordered; they are executed from top to bottom.\n" msgstr "" @@ -15139,48 +15344,48 @@ msgstr "Không thể di chuyển HEAD đến $first_parent" msgid "Refusing to squash a merge: $sha1" msgstr "Từ chối squash lần hòa trộn: $sha1" -#: git-rebase--interactive.sh:399 +#: git-rebase--interactive.sh:400 #, sh-format msgid "Error redoing merge $sha1" msgstr "Gặp lỗi khi hoàn lại bước hòa trộn $sha1" -#: git-rebase--interactive.sh:407 +#: git-rebase--interactive.sh:408 #, sh-format msgid "Could not pick $sha1" msgstr "Không thể lấy ra $sha1" -#: git-rebase--interactive.sh:416 +#: git-rebase--interactive.sh:417 #, sh-format msgid "This is the commit message #${n}:" msgstr "Đây là chú thích cho lần chuyển giao thứ #${n}:" -#: git-rebase--interactive.sh:421 +#: git-rebase--interactive.sh:422 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "Chú thích cho lần chuyển giao thứ #${n} sẽ bị bỏ qua:" -#: git-rebase--interactive.sh:432 +#: git-rebase--interactive.sh:433 #, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." msgstr[0] "Đây là tổ hợp của $count lần chuyển giao." -#: git-rebase--interactive.sh:441 +#: git-rebase--interactive.sh:442 #, sh-format msgid "Cannot write $fixup_msg" msgstr "Không thể $fixup_msg" -#: git-rebase--interactive.sh:444 +#: git-rebase--interactive.sh:445 msgid "This is a combination of 2 commits." msgstr "Đây là tổ hợp của 2 lần chuyển giao." -#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528 -#: git-rebase--interactive.sh:531 +#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529 +#: git-rebase--interactive.sh:532 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "Không thể áp dụng $sha1… $rest" -#: git-rebase--interactive.sh:559 +#: git-rebase--interactive.sh:560 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -15196,31 +15401,31 @@ msgstr "" "này\n" "trước khi bạn có thể làm việc lại với lần chuyển giao." -#: git-rebase--interactive.sh:574 +#: git-rebase--interactive.sh:575 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "Bị dừng tại $sha1_abbrev… $rest" -#: git-rebase--interactive.sh:589 +#: git-rebase--interactive.sh:590 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "Không “$squash_style” thể mà không có lần chuyển giao kế trước" -#: git-rebase--interactive.sh:631 +#: git-rebase--interactive.sh:632 #, sh-format msgid "Executing: $rest" msgstr "Thực thi: $rest" -#: git-rebase--interactive.sh:639 +#: git-rebase--interactive.sh:640 #, sh-format msgid "Execution failed: $rest" msgstr "Thực thi gặp lỗi: $rest" -#: git-rebase--interactive.sh:641 +#: git-rebase--interactive.sh:642 msgid "and made changes to the index and/or the working tree" msgstr "và tạo các thay đổi bảng mục lục và/hay cây làm việc" -#: git-rebase--interactive.sh:643 +#: git-rebase--interactive.sh:644 msgid "" "You can fix the problem, and then run\n" "\n" @@ -15231,7 +15436,7 @@ msgstr "" "\tgit rebase --continue" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--interactive.sh:656 +#: git-rebase--interactive.sh:657 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -15246,96 +15451,29 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--interactive.sh:667 +#: git-rebase--interactive.sh:668 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "Lệnh chưa biết: $command $sha1 $rest" -#: git-rebase--interactive.sh:668 +#: git-rebase--interactive.sh:669 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "Vui lòng sửa lỗi này bằng cách dùng “git rebase --edit-todo”." -#: git-rebase--interactive.sh:703 +#: git-rebase--interactive.sh:704 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "Cài tổ và cập nhật $head_name một cách thành công." -#: git-rebase--interactive.sh:750 -msgid "Could not skip unnecessary pick commands" -msgstr "Không thể bỏ qua các lệnh cậy (pick) không cần thiết" - -#: git-rebase--interactive.sh:908 -#, sh-format -msgid "" -"Warning: the SHA-1 is missing or isn't a commit in the following line:\n" -" - $line" -msgstr "" -"Cảnh báo: SHA-1 bị thiếu hoặc không phải là một lần chuyển giao trong dòng " -"sau đây:\n" -" - $line" - -#: git-rebase--interactive.sh:941 -#, sh-format -msgid "" -"Warning: the command isn't recognized in the following line:\n" -" - $line" -msgstr "" -"Cảnh báo: lệnh không nhận ra trong dòng sau đây:\n" -" - $line" - -#: git-rebase--interactive.sh:980 +#: git-rebase--interactive.sh:749 msgid "could not detach HEAD" msgstr "không thể tách rời HEAD" -#: git-rebase--interactive.sh:1018 -msgid "" -"Warning: some commits may have been dropped accidentally.\n" -"Dropped commits (newer to older):" -msgstr "" -"Cảnh báo: một số lần chuyển giao có lẽ đã bị xóa một cách tình cờ.\n" -"Các lần chuyển giao bị xóa (từ mới đến cũ):" - -#: git-rebase--interactive.sh:1026 -msgid "" -"To avoid this message, use \"drop\" to explicitly remove a commit.\n" -"\n" -"Use 'git config rebase.missingCommitsCheck' to change the level of " -"warnings.\n" -"The possible behaviours are: ignore, warn, error." -msgstr "" -"Để tránh thông báo này, dùng \"drop\" một cách rõ ràng để xóa bỏ một lần " -"chuyển giao.\n" -"\n" -"Dùng “git config rebase.missingCommitsCheck” để thay đổi mức độ của cảnh " -"báo.\n" -"Cánh ứng xử có thể là: ignore, warn, error." - -#: git-rebase--interactive.sh:1037 -#, sh-format -msgid "" -"Unrecognized setting $check_level for option rebase.missingCommitsCheck. " -"Ignoring." -msgstr "" -"Không thừa nhận cài đặt $check_level for option rebase.missingCommitsCheck. " -"Nên bỏ qua." - -#: git-rebase--interactive.sh:1054 -msgid "" -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" -"continue'." -msgstr "" -"Bạn có thể sửa nó bằng “git rebase --edit-todo” và sau đó chạy “git rebase --" -"continue”." - -#: git-rebase--interactive.sh:1055 -msgid "Or you can abort the rebase with 'git rebase --abort'." -msgstr "Hoặc là bạn có thể bãi bỏ lần cải tổ với lệnh “git rebase --abort”." - -#: git-rebase--interactive.sh:1083 +#: git-rebase--interactive.sh:784 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "Không thể xóa bỏ CHERRY_PICK_HEAD" -#: git-rebase--interactive.sh:1088 +#: git-rebase--interactive.sh:789 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -15366,11 +15504,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--interactive.sh:1105 +#: git-rebase--interactive.sh:806 msgid "Error trying to find the author identity to amend commit" msgstr "Lỗi khi cố tìm định danh của tác giả để tu bổ lần chuyển giao" -#: git-rebase--interactive.sh:1110 +#: git-rebase--interactive.sh:811 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -15379,11 +15517,11 @@ msgstr "" "Vui lòng chuyển giao chúng và sau đó chạy lệnh “git rebase --continue” lần " "nữa." -#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119 +#: git-rebase--interactive.sh:816 git-rebase--interactive.sh:820 msgid "Could not commit staged changes." msgstr "Không thể chuyển giao các thay đổi đã đưa lên bệ phóng." -#: git-rebase--interactive.sh:1147 +#: git-rebase--interactive.sh:848 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -15397,39 +15535,39 @@ msgstr "" " git rebase --continue\n" "\n" -#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313 +#: git-rebase--interactive.sh:856 git-rebase--interactive.sh:1015 msgid "Could not execute editor" msgstr "Không thể thực thi trình biên soạn" -#: git-rebase--interactive.sh:1168 +#: git-rebase--interactive.sh:869 #, sh-format msgid "Could not checkout $switch_to" msgstr "Không thể checkout $switch_to" -#: git-rebase--interactive.sh:1173 +#: git-rebase--interactive.sh:874 msgid "No HEAD?" msgstr "Không HEAD?" -#: git-rebase--interactive.sh:1174 +#: git-rebase--interactive.sh:875 #, sh-format msgid "Could not create temporary $state_dir" msgstr "Không thể tạo thư mục tạm thời $state_dir" -#: git-rebase--interactive.sh:1176 +#: git-rebase--interactive.sh:877 msgid "Could not mark as interactive" msgstr "Không thể đánh dấu là tương tác" -#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191 +#: git-rebase--interactive.sh:887 git-rebase--interactive.sh:892 msgid "Could not init rewritten commits" msgstr "Không thể khởi tạo các lần chuyển giao ghi lại" -#: git-rebase--interactive.sh:1291 +#: git-rebase--interactive.sh:993 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "Cải tổ $shortrevisions vào $shortonto (các lệnh $todocount)" -#: git-rebase--interactive.sh:1296 +#: git-rebase--interactive.sh:998 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -15438,7 +15576,7 @@ msgstr "" "\n" "Tuy nhiên, nếu bạn xóa bỏ mọi thứ, việc cải tổ sẽ bị bãi bỏ.\n" -#: git-rebase--interactive.sh:1303 +#: git-rebase--interactive.sh:1005 msgid "Note that empty commits are commented out" msgstr "Chú ý rằng lần chuyển giao trống rỗng là ghi chú" @@ -16024,60 +16162,60 @@ msgstr "múi giờ nội bộ khác biệt với GMT bởi khoảng thời gian msgid "local time offset greater than or equal to 24 hours\n" msgstr "khoảng bù thời gian nội bộ lớn hơn hoặc bằng 24 giờ\n" -#: git-send-email.perl:208 git-send-email.perl:214 +#: git-send-email.perl:207 git-send-email.perl:213 msgid "the editor exited uncleanly, aborting everything" msgstr "trình soạn thảo thoát không sạch sẽ, bãi bỏ mọi thứ" -#: git-send-email.perl:291 +#: git-send-email.perl:290 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "“%s” có chưa một phiên bản trung gian của thư bạn đã soạn.\n" -#: git-send-email.perl:296 +#: git-send-email.perl:295 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "“%s.final” chứa thư điện tử đã soạn thảo.\n" -#: git-send-email.perl:314 +#: git-send-email.perl:313 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases xung khắc với các tùy chọn khác\n" -#: git-send-email.perl:379 git-send-email.perl:634 +#: git-send-email.perl:378 git-send-email.perl:629 msgid "Cannot run git format-patch from outside a repository\n" msgstr "Không thể chạy git format-patch ở ngoài một kho chứa\n" -#: git-send-email.perl:448 +#: git-send-email.perl:447 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "Không hiểu trường --suppress-cc: “%s”\n" -#: git-send-email.perl:477 +#: git-send-email.perl:476 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "Không hiểu cài đặt --confirm: “%s”\n" -#: git-send-email.perl:509 +#: git-send-email.perl:504 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "cảnh báo: bí danh sendmail với dấu trích dẫn không được hỗ trợ: %s\n" -#: git-send-email.perl:511 +#: git-send-email.perl:506 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "cảnh báo: “:include:“ không được hỗ trợ: %s\n" -#: git-send-email.perl:513 +#: git-send-email.perl:508 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "cảnh báo: chuyển hướng “/file“ hay “|pipe“ không được hỗ trợ: %s\n" -#: git-send-email.perl:518 +#: git-send-email.perl:513 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "cảnh báo: dòng sendmail không nhận ra được: %s\n" -#: git-send-email.perl:600 +#: git-send-email.perl:595 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -16092,12 +16230,12 @@ msgstr "" " * Nói \"./%s\" nếu ý bạn là một tập tin; hoặc\n" " * Đưa ra tùy chọn --format-patch nếu ý bạn là chuẩn bị.\n" -#: git-send-email.perl:621 +#: git-send-email.perl:616 #, perl-format msgid "Failed to opendir %s: %s" msgstr "Gặp lỗi khi mở thư mục “%s”: %s" -#: git-send-email.perl:645 +#: git-send-email.perl:640 #, perl-format msgid "" "fatal: %s: %s\n" @@ -16106,7 +16244,7 @@ msgstr "" "nghiêm trọng: %s: %s\n" "cảnh báo: không có miếng vá nào được gửi đi\n" -#: git-send-email.perl:656 +#: git-send-email.perl:651 msgid "" "\n" "No patch files specified!\n" @@ -16116,17 +16254,17 @@ msgstr "" "Chưa chỉ định các tập tin miếng vá!\n" "\n" -#: git-send-email.perl:669 +#: git-send-email.perl:664 #, perl-format msgid "No subject line in %s?" msgstr "Không có dòng chủ đề trong %s?" -#: git-send-email.perl:679 +#: git-send-email.perl:674 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "Gặp lỗi khi mở “%s” để ghi: %s" -#: git-send-email.perl:689 +#: git-send-email.perl:684 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -16140,31 +16278,31 @@ msgstr "" "\n" "Xóa nội dung phần thân nếu bạn không muốn gửi tóm tắt.\n" -#: git-send-email.perl:712 +#: git-send-email.perl:707 #, perl-format msgid "Failed to open %s.final: %s" msgstr "Gặp lỗi khi mở %s.final: %s" -#: git-send-email.perl:715 +#: git-send-email.perl:710 #, perl-format msgid "Failed to open %s: %s" msgstr "Gặp lỗi khi mở “%s”: %s" -#: git-send-email.perl:750 +#: git-send-email.perl:745 msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n" msgstr "Các trường To/Cc/Bcc không được phiên dịch, chúng bị bỏ qua\n" -#: git-send-email.perl:759 +#: git-send-email.perl:754 msgid "Summary email is empty, skipping it\n" msgstr "Thư tổng thể là trống rỗng, nên bỏ qua nó\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:791 +#: git-send-email.perl:786 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "Bạn có chắc muốn dùng <%s> [y/N]? " -#: git-send-email.perl:820 +#: git-send-email.perl:815 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" @@ -16172,11 +16310,11 @@ msgstr "" "Các trường sau đây là 8bit, nhưng không khai báo một Content-Transfer-" "Encoding.\n" -#: git-send-email.perl:825 +#: git-send-email.perl:820 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "Bảng mã 8bit nào tôi nên khai báo [UTF-8]? " -#: git-send-email.perl:833 +#: git-send-email.perl:828 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -16189,20 +16327,20 @@ msgstr "" "có chủ đề ở dạng mẫu “*** SUBJECT HERE ***”. Dùng --force nếu bạn thực sự " "muốn gửi.\n" -#: git-send-email.perl:852 +#: git-send-email.perl:847 msgid "To whom should the emails be sent (if anyone)?" msgstr "Tới người mà thư được gửi (nếu có)?" -#: git-send-email.perl:870 +#: git-send-email.perl:865 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "nghiêm trọng: bí danh “%s” được khai triển thành chính nó\n" -#: git-send-email.perl:882 +#: git-send-email.perl:877 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "Message-ID được dùng như là In-Reply-To cho thư đầu tiên (nếu có)? " -#: git-send-email.perl:932 git-send-email.perl:940 +#: git-send-email.perl:927 git-send-email.perl:935 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "lỗi: không thể rút trích một địa chỉ hợp lệ từ: %s\n" @@ -16210,16 +16348,16 @@ msgstr "lỗi: không thể rút trích một địa chỉ hợp lệ từ: %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:944 +#: git-send-email.perl:939 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "Làm gì với địa chỉ này? (thoát[q]|xóa[d]|sửa[e]): " -#: git-send-email.perl:1245 +#: git-send-email.perl:1260 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "đường dẫn CA “%s” không tồn tại" -#: git-send-email.perl:1320 +#: git-send-email.perl:1335 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -16246,134 +16384,187 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1335 +#: git-send-email.perl:1350 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): " msgstr "Gửi thư này chứ? ([y]có|[n]không|[q]thoát|[a]tất): " -#: git-send-email.perl:1338 +#: git-send-email.perl:1353 msgid "Send this email reply required" msgstr "Gửi thư này trả lời yêu cầu" -#: git-send-email.perl:1364 +#: git-send-email.perl:1379 msgid "The required SMTP server is not properly defined." msgstr "Máy phục vụ SMTP chưa được định nghĩa một cách thích hợp." -#: git-send-email.perl:1411 +#: git-send-email.perl:1426 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Máy chủ không hỗ trợ STARTTLS! %s" -#: git-send-email.perl:1416 git-send-email.perl:1420 +#: git-send-email.perl:1431 git-send-email.perl:1435 #, perl-format msgid "STARTTLS failed! %s" msgstr "STARTTLS gặp lỗi! %s" -#: git-send-email.perl:1430 +#: git-send-email.perl:1445 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" "Không thể khởi tạo SMTP một cách đúng đắn. Kiểm tra cấu hình và dùng --smtp-" "debug." -#: git-send-email.perl:1448 +#: git-send-email.perl:1463 #, perl-format msgid "Failed to send %s\n" msgstr "Gặp lỗi khi gửi %s\n" -#: git-send-email.perl:1451 +#: git-send-email.perl:1466 #, perl-format msgid "Dry-Sent %s\n" msgstr "Thử gửi %s\n" -#: git-send-email.perl:1451 +#: git-send-email.perl:1466 #, perl-format msgid "Sent %s\n" msgstr "Gửi %s\n" -#: git-send-email.perl:1453 +#: git-send-email.perl:1468 msgid "Dry-OK. Log says:\n" msgstr "Dry-OK. Nhật ký nói rằng:\n" -#: git-send-email.perl:1453 +#: git-send-email.perl:1468 msgid "OK. Log says:\n" msgstr "OK. Nhật ký nói rằng:\n" -#: git-send-email.perl:1465 +#: git-send-email.perl:1480 msgid "Result: " msgstr "Kết quả: " -#: git-send-email.perl:1468 +#: git-send-email.perl:1483 msgid "Result: OK\n" msgstr "Kết quả: Tốt\n" -#: git-send-email.perl:1481 +#: git-send-email.perl:1496 #, perl-format msgid "can't open file %s" msgstr "không thể mở tập tin “%s”" -#: git-send-email.perl:1528 git-send-email.perl:1548 +#: git-send-email.perl:1543 git-send-email.perl:1563 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Thêm cc: %s từ dòng “%s”\n" -#: git-send-email.perl:1534 +#: git-send-email.perl:1549 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) Đang thêm to: %s từ dòng “%s”\n" -#: git-send-email.perl:1582 +#: git-send-email.perl:1597 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) Thêm cc: %s từ dòng “%s”\n" -#: git-send-email.perl:1605 +#: git-send-email.perl:1622 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(body) Thêm cc: %s từ dòng “%s”\n" -#: git-send-email.perl:1711 +#: git-send-email.perl:1728 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Không thể thực thi “%s”" -#: git-send-email.perl:1718 +#: git-send-email.perl:1735 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Đang thêm %s: %s từ: “%s”\n" -#: git-send-email.perl:1722 +#: git-send-email.perl:1739 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) gặp lỗi khi đóng đường ống đến “%s”" -#: git-send-email.perl:1749 +#: git-send-email.perl:1766 msgid "cannot send message as 7bit" msgstr "không thể lấy gửi thư dạng 7 bít" -#: git-send-email.perl:1757 +#: git-send-email.perl:1774 msgid "invalid transfer encoding" msgstr "bảng mã truyền không hợp lệ" -#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856 +#: git-send-email.perl:1812 git-send-email.perl:1863 git-send-email.perl:1873 #, perl-format msgid "unable to open %s: %s\n" msgstr "không thể mở %s: %s\n" -#: git-send-email.perl:1798 +#: git-send-email.perl:1815 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "%s: miếng vá có chứa dòng dài hơn 998 ký tự" -#: git-send-email.perl:1814 +#: git-send-email.perl:1831 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "Bỏ qua %s với hậu tố sao lưu dự phòng “%s”.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1818 +#: git-send-email.perl:1835 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Bạn có thực sự muốn gửi %s? [y|N]: " +#~ msgid "submodule update strategy not supported for submodule '%s'" +#~ msgstr "" +#~ "chiến lược cập nhật mô-đun-con không được hỗ trợ cho mô-đun-con “%s”" + +#~ msgid "change upstream info" +#~ msgstr "thay đổi thông tin thượng nguồn" + +#~ msgid "" +#~ "\n" +#~ "If you wanted to make '%s' track '%s', do this:\n" +#~ "\n" +#~ msgstr "" +#~ "\n" +#~ "Nếu bạn muốn “%s” theo dõi “%s”, thực hiện lệnh sau:\n" +#~ "\n" + +#~ msgid "basename" +#~ msgstr "tên cơ sở" + +#~ msgid "prepend parent project's basename to output" +#~ msgstr "treo vào trước tên cơ sở cha mẹ của đường dẫn vào kết xuất" + +#~ msgid "" +#~ "When you have resolved this problem, run \"git rebase --continue\".\n" +#~ "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" +#~ "To check out the original branch and stop rebasing, run \"git rebase --" +#~ "abort\"." +#~ msgstr "" +#~ "Khi bạn cần giải quyết vấn đề này hãy chạy lệnh \"git rebase --continue" +#~ "\".\n" +#~ "Nếu bạn có ý định bỏ qua miếng vá, thay vào đó bạn chạy \"git rebase --" +#~ "skip\".\n" +#~ "Để phục hồi lại thành nhánh nguyên thủy và dừng việc vá lại thì chạy " +#~ "\"git rebase --abort\"." + +#~ msgid "" +#~ "Warning: the SHA-1 is missing or isn't a commit in the following line:\n" +#~ " - $line" +#~ msgstr "" +#~ "Cảnh báo: SHA-1 bị thiếu hoặc không phải là một lần chuyển giao trong " +#~ "dòng sau đây:\n" +#~ " - $line" + +#~ msgid "" +#~ "Warning: the command isn't recognized in the following line:\n" +#~ " - $line" +#~ msgstr "" +#~ "Cảnh báo: lệnh không nhận ra trong dòng sau đây:\n" +#~ " - $line" + +#~ msgid "Or you can abort the rebase with 'git rebase --abort'." +#~ msgstr "Hoặc là bạn có thể bãi bỏ lần cải tổ với lệnh “git rebase --abort”." + #~ msgid "%" #~ msgid_plural "%" #~ msgstr[0] "%" @@ -16834,9 +17025,6 @@ msgstr "Bạn có thực sự muốn gửi %s? [y|N]: " #~ msgstr "" #~ "Chuyển tiếp những lần chuyển giao nội bộ tới head thượng nguồn đã cập nhật" -#~ msgid "unable to parse format" -#~ msgstr "không thể phân tích định dạng" - #~ msgid "improper format entered align:%s" #~ msgstr "định dạng không đúng chỗ căn chỉnh:%s" @@ -16971,18 +17159,6 @@ msgstr "Bạn có thực sự muốn gửi %s? [y|N]: " #~ msgid "-b and -B are mutually exclusive" #~ msgstr "-b và -B loại từ lẫn nhau." -#~ msgid "" -#~ "When you have resolved this problem, run \"$cmdline --continue\".\n" -#~ "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n" -#~ "To restore the original branch and stop patching, run \"$cmdline --abort" -#~ "\"." -#~ msgstr "" -#~ "Khi bạn cần giải quyết vấn đề này hãy chạy lệnh \"$cmdline --continue\".\n" -#~ "Nếu bạn có ý định bỏ qua miếng vá, thay vào đó bạn chạy \"$cmdline --skip" -#~ "\".\n" -#~ "Để phục hồi lại thành nhánh nguyên thủy và dừng việc vá lại thì chạy " -#~ "\"$cmdline --abort\"." - #~ msgid "Patch format $patch_format is not supported." #~ msgstr "Định dạng miếng vá $patch_format không được hỗ trợ." @@ -17056,9 +17232,6 @@ msgstr "Bạn có thực sự muốn gửi %s? [y|N]: " #~ msgid "no files added" #~ msgstr "chưa có tập tin nào được thêm vào" -#~ msgid "force creation (when already exists)" -#~ msgstr "ép buộc tạo (khi đã có nhánh cùng tên)" - #~ msgid "slot" #~ msgstr "khe" |