diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2017-02-18 00:59:51 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2017-02-18 00:59:51 +0800 |
| commit | 53f74734037ac5050429448b5b6de46fa857b671 (patch) | |
| tree | 5ac20e01d56be9c50dfbb4e2ab4c4c98178e5c21 | |
| parent | 076c05393a047247ea723896289b48d6549ed7d0 (diff) | |
| parent | 84b3ceb1fb5a3e77211de8febfae5ceaefa9db2c (diff) | |
| download | git-53f74734037ac5050429448b5b6de46fa857b671.tar.gz git-53f74734037ac5050429448b5b6de46fa857b671.tar.xz | |
Merge branch 'master' of git://github.com/git-l10n/git-po
* 'master' of git://github.com/git-l10n/git-po:
l10n: vi.po: Updated Vietnamese translation (3137t)
l10n: update Catalan translation
l10n: sv.po: Update Swedish translation (3137t0f0u)
l10n: fr.po: v2.11-rc0 first round
l10n: ko.po: Update Korean translation
l10n: fr.po: Fix a typo in the French translation
l10n: fr.po: Remove gender specific adjectives
l10n: fr.po: Fix typos
l10n: git.pot: v2.12.0 round 1 (239 new, 15 removed)
l10n: bg: Updated Bulgarian translation (2913t+0f+0u)
l10n: fixes to Catalan translation
l10n: zh_CN: review for git v2.11.0 l10n
l10n: New Catalan translation maintainer
| -rw-r--r-- | po/TEAMS | 5 | ||||
| -rw-r--r-- | po/bg.po | 7444 | ||||
| -rw-r--r-- | po/ca.po | 4522 | ||||
| -rw-r--r-- | po/fr.po | 3999 | ||||
| -rw-r--r-- | po/git.pot | 3727 | ||||
| -rw-r--r-- | po/ko.po | 3937 | ||||
| -rw-r--r-- | po/sv.po | 4007 | ||||
| -rw-r--r-- | po/vi.po | 4007 | ||||
| -rw-r--r-- | po/zh_CN.po | 63 |
9 files changed, 20680 insertions, 11031 deletions
@@ -6,8 +6,9 @@ Repository: https://github.com/git-l10n/git-po Leader: Alexander Shopov <ash@kambanaria.org> Language: ca (Catalan) -Repository: https://github.com/alexhenrie/git-po -Leader: Alex Henrie <alexhenrie24@gmail.com> +Repository: https://github.com/Softcatala/git-po +Leader: Jordi Mas <jmas@softcatala.org> +Members: Alex Henrie <alexhenrie24@gmail.com> Language: de (German) Repository: https://github.com/ralfth/git-po-de @@ -1,12 +1,12 @@ # Bulgarian translation of git po-file. -# Copyright (C) 2014, 2015 Alexander Shopov <ash@kambanaria.org>. +# Copyright (C) 2014, 2015, 2016, 2017 Alexander Shopov <ash@kambanaria.org>. # This file is distributed under the same license as the git package. -# Alexander Shopov <ash@kambanaria.org>, 2014, 2015. +# Alexander Shopov <ash@kambanaria.org>, 2014, 2015, 2016, 2017. # # ======================== # DICTIONARY TO MERGE IN GIT GUI # ------------------------ -# range интервал +# range диапазон # unreachable object недостижим обект # dangling objects обект извън клон # fast-forward тривиално сливане @@ -46,7 +46,7 @@ # tree-ish указател към дърво # three-way merge тройно сливане # dirty нечист, мръсен (файл, индекс) -# fallback резервен вариант +# fallback резервен вариант # pathspec magic опция за магически пътища # bitmap index индекс на база битови маски # mark маркер @@ -68,8 +68,16 @@ # peeled tag - проследен етикет - когато етикет сочи към друг етикет, а не подаване и проследяваме подобно на символна връзка # strip - премахвам (за компонент при филтриране) # unrelated histories - независими истории +# inexact rename detection търсене на преименувания на обекти съчетани с промени +# hunk парче +# binary patch двоична кръпка +# reverse-apply прилагам в обратна посока +# todo file команден файл +# octopus merge множествено сливане +# alternate алтернативен източник +# superproject обхващащ проект # ---- -# „$var“ - може да не сработва за shell има gettext и eval_gettext - проверка - намират се лесно по „$ +# „$var“ - може да не сработва за shell има gettext и eval_gettext - проверка - намират се лесно по „$ # ======================== # „“…— ●≫ѝ→ # @@ -86,34 +94,24 @@ # ======================== # GENERATE STATS # ------------------------ -# grep ^#: bg.po | cut -c4- |tr ' ' '\n'| sed -e 's/:[0-9][0-9]*//' -e 's%.*/%%' -e 's/[.][^.]*$//' > OUT +# grep ^#: bg.po | cut -c4- |tr ' ' '\n'| sed -e 's/:[0-9][0-9]*//' -e 's%.*/%%' -e 's/[.][^.]*$//' > OUT # sort -u OUT > UNIQUE -# for i in `cat UNIQUE`; do echo `grep "^$i$" OUT | wc -l` $i ; done | sort -nr > STATS +# for i in `cat UNIQUE`; do echo `grep "^$i$" OUT | wc -l` $i ; done | sort -nr > STATS # # ======================== # FIND NON FULLY TRANSLATED # ------------------------ -# msgattrib --untranslated bg.po > untranslated.po -# msgattrib --only-fuzzy bg.po > fuzzy.po +# msgattrib --untranslated bg.po > untranslated.po +# msgattrib --only-fuzzy bg.po > fuzzy.po # msgcat.exe untranslated.po fuzzy.po > new.po -# grep ^#: new.po | cut -c4- |tr ' ' '\n'| sed -e 's/:[0-9][0-9]*//' -e 's%.*/%%' -e 's/[.][^.]*$//' | sort -u -# -# ======================== -# MOST IMPORTANT name asc ordering -# ------------------------ -# add, blame, branch, checkout, clone, commit, common-cmds, config, diff, fetch, fsck, gc, git-rebase, git-stash, grep, log, mv, parse-options, push, reflog, remote, reset, revert, rm, wt-status -# -# ======================== -# IMPORTANT strings, name asc ordering -# ------------------------ -# apply, archive, check-ignore, clean, date, describe, git-am, git-bisect, git-submodule, hash-object, init-db, ls-tree, merge, merge-base, merge-file, merge-recursive, name-rev, pathspec, show-ref, tag +# grep ^#: new.po | cut -c4- |tr ' ' '\n'| sed -e 's/:[0-9][0-9]*//' -e 's%.*/%%' -e 's/[.][^.]*$//' | sort -u # msgid "" msgstr "" "Project-Id-Version: git master\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2016-05-24 23:42+0800\n" -"PO-Revision-Date: 2016-05-29 15:23+0300\n" +"POT-Creation-Date: 2016-11-25 22:50+0800\n" +"PO-Revision-Date: 2017-01-28 19:34+0200\n" "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" "Language: bg\n" @@ -127,27 +125,723 @@ msgstr "" msgid "hint: %.*s\n" msgstr "Подсказка: %.*s\n" +#: advice.c:83 +msgid "Cherry-picking is not possible because you have unmerged files." +msgstr "Отбирането на подавания е блокирано от неслети файлове." + +#: advice.c:85 +msgid "Committing is not possible because you have unmerged files." +msgstr "Подаването е блокирано от неслети файлове." + +#: advice.c:87 +msgid "Merging is not possible because you have unmerged files." +msgstr "Сливането е блокирано от неслети файлове." + +#: advice.c:89 +msgid "Pulling is not possible because you have unmerged files." +msgstr "Издърпването е блокирано от неслети файлове." + +#: advice.c:91 +msgid "Reverting is not possible because you have unmerged files." +msgstr "Отмяната е блокирана от неслети файлове." + +#: advice.c:93 +#, c-format +msgid "It is not possible to %s because you have unmerged files." +msgstr "Действието „%s“ е блокирано от неслети файлове." + # TRANSFER -#: advice.c:88 +#: advice.c:101 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" -"за да отбележите коригирането им. След това извършете подаването." +"за да отбележите коригирането им. След това извършете подаването." + +#: advice.c:109 +msgid "Exiting because of an unresolved conflict." +msgstr "Изход от програмата заради некоригиран конфликт." -#: advice.c:101 builtin/merge.c:1238 +#: advice.c:114 builtin/merge.c:1181 msgid "You have not concluded your merge (MERGE_HEAD exists)." -msgstr "Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува)." +msgstr "Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува)." -#: advice.c:103 +#: advice.c:116 msgid "Please, commit your changes before merging." msgstr "Промените трябва да се подадат преди сливане." -#: advice.c:104 +#: advice.c:117 msgid "Exiting because of unfinished merge." msgstr "Изход от програмата заради незавършено сливане." +#: advice.c:123 +#, 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 "" +"Бележка: изтегляне на „%s“.\n" +"\n" +"Указателят „HEAD“ не е свързан. Може да разглеждате, да правите произволни\n" +"промени и да ги подавате. Ако изтеглите нещо друго, всички промени ще " +"бъдат\n" +"забравени и никой клон няма да се промени.\n" +"\n" +"Ако искате да създадете нов клон, за да запазите подаванията си, можете да\n" +"направите това като зададете име на клон към опцията „-b“ на командата\n" +"„commit“. Например:\n" +"\n" +" git checkout -b ИМЕ_НА_НОВ_КЛОН\n" +"\n" + +#: apply.c:57 +#, c-format +msgid "unrecognized whitespace option '%s'" +msgstr "непозната опция за знаците за интервали „%s“" + +#: apply.c:73 +#, c-format +msgid "unrecognized whitespace ignore option '%s'" +msgstr "непозната опция за игнориране на знаците за интервали „%s“" + +#: apply.c:125 +msgid "--reject and --3way cannot be used together." +msgstr "опциите „--reject“ и „--3way“ са несъвместими" + +#: apply.c:127 +msgid "--cached and --3way cannot be used together." +msgstr "опциите „--cached“ и „--3way“ са несъвместими" + +#: apply.c:130 +msgid "--3way outside a repository" +msgstr "като „--3way“, но извън хранилище" + +#: apply.c:141 +msgid "--index outside a repository" +msgstr "като „--index“, но извън хранилище" + +#: apply.c:144 +msgid "--cached outside a repository" +msgstr "като „--cached“, но извън хранилище" + +#: apply.c:845 +#, c-format +msgid "Cannot prepare timestamp regexp %s" +msgstr "Регулярният израз за времето „%s“ не може за бъде компилиран" + +#: apply.c:854 +#, c-format +msgid "regexec returned %d for input: %s" +msgstr "Регулярният израз върна %d при подадена последователност „%s“ на входа" + +#: apply.c:938 +#, c-format +msgid "unable to find filename in patch at line %d" +msgstr "Липсва име на файл на ред %d от кръпката" + +#: apply.c:977 +#, 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:983 +#, c-format +msgid "git apply: bad git-diff - inconsistent new filename on line %d" +msgstr "" +"git apply: лош изход от командата „git-diff“ — на ред %d бе получено " +"неправилно име на нов файл" + +#: apply.c:984 +#, c-format +msgid "git apply: bad git-diff - inconsistent old filename on line %d" +msgstr "" +"git apply: лош изход от командата „git-diff“ — на ред %d бе получено " +"неправилно име на стар файл" + +#: apply.c:990 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null on line %d" +msgstr "" +"git apply: лош изход от командата „git-diff“ — на ред %d се очакваше „/dev/" +"null“" + +#: apply.c:1488 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "при повторното преброяване бе получен неочакван ред: „%.*s“" + +#: apply.c:1557 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "част от кръпка без заглавна част на ред %d: %.*s" + +#: apply.c:1577 +#, 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] "" +"След съкращаването на %d-та част от компонентите на пътя, в заглавната част " +"на „git diff“ липсва информация за име на файл (ред: %d)" +msgstr[1] "" +"След съкращаването на първите %d части от компонентите на пътя, в заглавната " +"част на „git diff“ липсва информация за име на файл (ред: %d)" + +#: apply.c:1589 +#, c-format +msgid "git diff header lacks filename information (line %d)" +msgstr "" +"в заглавната част на „git diff“ липсва информация за име на файл (ред: %d)" + +#: apply.c:1759 +msgid "new file depends on old contents" +msgstr "новият файл зависи от старото съдържание на файла" + +#: apply.c:1761 +msgid "deleted file still has contents" +msgstr "изтритият файл не е празен" + +#: apply.c:1795 +#, c-format +msgid "corrupt patch at line %d" +msgstr "грешка в кръпката на ред %d" + +#: apply.c:1832 +#, c-format +msgid "new file %s depends on old contents" +msgstr "новият файл „%s“ зависи от старото съдържание на файла" + +#: apply.c:1834 +#, c-format +msgid "deleted file %s still has contents" +msgstr "изтритият файл „%s“ не е празен" + +#: apply.c:1837 +#, c-format +msgid "** warning: file %s becomes empty but is not deleted" +msgstr "● предупреждение: файлът „%s“ вече е празен, но не е изтрит" + +#: apply.c:1984 +#, c-format +msgid "corrupt binary patch at line %d: %.*s" +msgstr "грешка в двоичната кръпка на ред %d: %.*s" + +#: apply.c:2021 +#, c-format +msgid "unrecognized binary patch at line %d" +msgstr "неразпозната двоичната кръпка на ред %d" + +#: apply.c:2182 +#, c-format +msgid "patch with only garbage at line %d" +msgstr "кръпката е с изцяло повредени данни на ред %d" + +#: apply.c:2274 +#, c-format +msgid "unable to read symlink %s" +msgstr "символната връзка „%s“ не може да бъде прочетена" + +#: apply.c:2278 +#, c-format +msgid "unable to open or read %s" +msgstr "файлът „%s“ не може да бъде отворен или прочетен" + +#: apply.c:2931 +#, c-format +msgid "invalid start of line: '%c'" +msgstr "неправилно начало на ред: „%c“" + +#: apply.c:3050 +#, c-format +msgid "Hunk #%d succeeded at %d (offset %d line)." +msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." +msgstr[0] "" +"%d-то парче код бе успешно приложено на ред %d (отместване от %d ред)." +msgstr[1] "" +"%d-то парче код бе успешно приложено на ред %d (отместване от %d реда)." + +#: apply.c:3062 +#, c-format +msgid "Context reduced to (%ld/%ld) to apply fragment at %d" +msgstr "" +"Контекстът е намален на (%ld/%ld) за прилагането на парчето код на ред %d" + +#: apply.c:3068 +#, c-format +msgid "" +"while searching for:\n" +"%.*s" +msgstr "" +"при търсене за:\n" +"%.*s" + +#: apply.c:3090 +#, c-format +msgid "missing binary patch data for '%s'" +msgstr "липсват данните за двоичната кръпка за „%s“" + +#: apply.c:3098 +#, c-format +msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" +msgstr "" +"двоичната кръпка не може да се приложи в обратна посока, когато обратното " +"парче за „%s“ липсва" + +#: apply.c:3144 +#, c-format +msgid "cannot apply binary patch to '%s' without full index line" +msgstr "към „%s“ не може да се приложи двоична кръпка без пълен индекс" + +#: apply.c:3154 +#, c-format +msgid "" +"the patch applies to '%s' (%s), which does not match the current contents." +msgstr "кръпката съответства на „%s“ (%s), който не съвпада по съдържание." + +#: apply.c:3162 +#, c-format +msgid "the patch applies to an empty '%s' but it is not empty" +msgstr "кръпката съответства на „%s“, който трябва да е празен, но не е" + +#: apply.c:3180 +#, c-format +msgid "the necessary postimage %s for '%s' cannot be read" +msgstr "" +"необходимият резултат след операцията — „%s“ за „%s“ не може да бъде " +"прочетен" + +#: apply.c:3193 +#, c-format +msgid "binary patch does not apply to '%s'" +msgstr "двоичната кръпка не може да бъде приложена върху „%s“" + +#: apply.c:3199 +#, c-format +msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" +msgstr "" +"двоичната кръпка за „%s“ води до неправилни резултати (очакваше се: „%s“, а " +"бе получено: „%s“)" + +#: apply.c:3220 +#, c-format +msgid "patch failed: %s:%ld" +msgstr "неуспешно прилагане на кръпка: „%s:%ld“" + +#: apply.c:3342 +#, c-format +msgid "cannot checkout %s" +msgstr "„%s“ не може да се изтегли" + +#: apply.c:3390 apply.c:3401 apply.c:3447 setup.c:248 +#, c-format +msgid "failed to read %s" +msgstr "файлът „%s“ не може да бъде прочетен" + +#: apply.c:3398 +#, c-format +msgid "reading from '%s' beyond a symbolic link" +msgstr "изчитане на „%s“ след проследяване на символна връзка" + +#: apply.c:3427 apply.c:3667 +#, c-format +msgid "path %s has been renamed/deleted" +msgstr "обектът с път „%s“ е преименуван или изтрит" + +#: apply.c:3510 apply.c:3681 +#, c-format +msgid "%s: does not exist in index" +msgstr "„%s“ не съществува в индекса" + +#: apply.c:3519 apply.c:3689 +#, c-format +msgid "%s: does not match index" +msgstr "„%s“ не съответства на индекса" + +#: apply.c:3554 +msgid "repository lacks the necessary blob to fall back on 3-way merge." +msgstr "" +"в хранилището липсват необходимите обекти BLOB, за да се премине към тройно " +"сливане." + +#: apply.c:3557 +#, c-format +msgid "Falling back to three-way merge...\n" +msgstr "Преминаване към тройно сливане…\n" + +#: apply.c:3573 apply.c:3577 +#, c-format +msgid "cannot read the current contents of '%s'" +msgstr "текущото съдържание на „%s“ не може да бъде прочетено" + +#: apply.c:3589 +#, c-format +msgid "Failed to fall back on three-way merge...\n" +msgstr "Неуспешно преминаване към тройно сливане…\n" + +#: apply.c:3603 +#, c-format +msgid "Applied patch to '%s' with conflicts.\n" +msgstr "Конфликти при прилагането на кръпката към „%s“.\n" + +#: apply.c:3608 +#, c-format +msgid "Applied patch to '%s' cleanly.\n" +msgstr "Кръпката бе приложена чисто към „%s“.\n" + +#: apply.c:3634 +msgid "removal patch leaves file contents" +msgstr "изтриващата кръпка оставя файла непразен" + +#: apply.c:3706 +#, c-format +msgid "%s: wrong type" +msgstr "„%s“: неправилен вид" + +#: apply.c:3708 +#, c-format +msgid "%s has type %o, expected %o" +msgstr "„%s“ е от вид „%o“, а се очакваше „%o“" + +#: apply.c:3859 apply.c:3861 +#, c-format +msgid "invalid path '%s'" +msgstr "неправилен път: „%s“" + +#: apply.c:3917 +#, c-format +msgid "%s: already exists in index" +msgstr "„%s“: вече съществува в индекса" + +#: apply.c:3920 +#, c-format +msgid "%s: already exists in working directory" +msgstr "„%s“: вече съществува в работното дърво" + +#: apply.c:3940 +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o)" +msgstr "новите права за достъп (%o) на „%s“ не съвпадат със старите (%o)" + +#: apply.c:3945 +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o) of %s" +msgstr "" +"новите права за достъп (%o) на „%s“ не съвпадат със старите (%o) на „%s“" + +#: apply.c:3965 +#, c-format +msgid "affected file '%s' is beyond a symbolic link" +msgstr "засегнатият файл „%s“ е след символна връзка" + +#: apply.c:3969 +#, c-format +msgid "%s: patch does not apply" +msgstr "Кръпката „%s“ не може да бъде приложена" + +#: apply.c:3984 +#, c-format +msgid "Checking patch %s..." +msgstr "Проверяване на кръпката „%s“…" + +#: apply.c:4075 +#, c-format +msgid "sha1 information is lacking or useless for submodule %s" +msgstr "" +"информацията за сумата по SHA1 за подмодула липсва или не е достатъчна (%s)." + +#: apply.c:4082 +#, c-format +msgid "mode change for %s, which is not in current HEAD" +msgstr "смяна на режима на достъпа на „%s“, който не е в текущия връх „HEAD“" + +#: apply.c:4085 +#, c-format +msgid "sha1 information is lacking or useless (%s)." +msgstr "информацията за сумата по SHA1 липсва или не е достатъчна (%s)." + +#: apply.c:4090 builtin/checkout.c:233 builtin/reset.c:135 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "неуспешно създаване на запис в кеша чрез „make_cache_entry“ за „%s“" + +#: apply.c:4094 +#, c-format +msgid "could not add %s to temporary index" +msgstr "„%s“ не може да се добави към временния индекс" + +#: apply.c:4104 +#, c-format +msgid "could not write temporary index to %s" +msgstr "временният индекс не може да се запази в „%s“" + +#: apply.c:4242 +#, c-format +msgid "unable to remove %s from index" +msgstr "„%s“ не може да се извади от индекса" + +#: apply.c:4277 +#, c-format +msgid "corrupt patch for submodule %s" +msgstr "повредена кръпка за модула „%s“" + +#: apply.c:4283 +#, c-format +msgid "unable to stat newly created file '%s'" +msgstr "" +"не може да се получи информация чрез „stat“ за новосъздадения файл „%s“" + +#: apply.c:4291 +#, c-format +msgid "unable to create backing store for newly created file %s" +msgstr "" +"не може да се за създаде мястото за съхранение на новосъздадения файл „%s“" + +#: apply.c:4297 apply.c:4441 +#, c-format +msgid "unable to add cache entry for %s" +msgstr "не може да се добави запис в кеша за „%s“" + +#: apply.c:4338 +#, c-format +msgid "failed to write to '%s'" +msgstr "в „%s“ не може да се пише" + +#: apply.c:4342 +#, c-format +msgid "closing file '%s'" +msgstr "затваряне на файла „%s“" + +#: apply.c:4412 +#, c-format +msgid "unable to write file '%s' mode %o" +msgstr "файлът „%s“ не може да се запише с режим на достъп „%o“" + +#: apply.c:4510 +#, c-format +msgid "Applied patch %s cleanly." +msgstr "Кръпката „%s“ бе приложена чисто." + +#: apply.c:4518 +msgid "internal error" +msgstr "вътрешна грешка" + +#: apply.c:4521 +#, 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:4532 +#, c-format +msgid "truncating .rej filename to %.*s.rej" +msgstr "съкращаване на името на файла с отхвърлените парчета на „ %.*s.rej“" + +#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989 +#, c-format +msgid "cannot open %s" +msgstr "„%s“ не може да бъде отворен" + +#: apply.c:4554 +#, c-format +msgid "Hunk #%d applied cleanly." +msgstr "%d-то парче бе успешно приложено." + +#: apply.c:4558 +#, c-format +msgid "Rejected hunk #%d." +msgstr "%d-то парче бе отхвърлено." + +#: apply.c:4668 +#, c-format +msgid "Skipped patch '%s'." +msgstr "Пропусната кръпка: „%s“" + +#: apply.c:4676 +msgid "unrecognized input" +msgstr "непознат вход" + +#: apply.c:4695 +msgid "unable to read index file" +msgstr "индексът не може да бъде записан" + +#: apply.c:4833 +#, c-format +msgid "can't open patch '%s': %s" +msgstr "кръпката „%s“ не може да бъде отворена: %s" + +#: apply.c:4858 +#, c-format +msgid "squelched %d whitespace error" +msgid_plural "squelched %d whitespace errors" +msgstr[0] "пренебрегната е %d грешка в знаците за интервали" +msgstr[1] "пренебрегнати са %d грешки в знаците за интервали" + +#: apply.c:4864 apply.c:4879 +#, c-format +msgid "%d line adds whitespace errors." +msgid_plural "%d lines add whitespace errors." +msgstr[0] "%d ред добавя грешки в знаците за интервали." +msgstr[1] "%d реда добавят грешки в знаците за интервали." + +#: apply.c:4872 +#, c-format +msgid "%d line applied after fixing whitespace errors." +msgid_plural "%d lines applied after fixing whitespace errors." +msgstr[0] "" +"Добавен е %d ред след корекцията на грешките в знаците за интервали." +msgstr[1] "" +"Добавени са %d реда след корекцията на грешките в знаците за интервали." + +#: apply.c:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431 +msgid "Unable to write new index file" +msgstr "Новият индекс не може да бъде записан" + +#: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280 +#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180 +#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:407 +#: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592 +#: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947 +msgid "path" +msgstr "път" + +#: apply.c:4920 +msgid "don't apply changes matching the given path" +msgstr "без прилагане на промените напасващи на дадения път" + +#: apply.c:4923 +msgid "apply changes matching the given path" +msgstr "прилагане на промените напасващи на дадения път" + +#: apply.c:4925 builtin/am.c:2286 +msgid "num" +msgstr "БРОЙ" + +#: apply.c:4926 +msgid "remove <num> leading slashes from traditional diff paths" +msgstr "премахване на този БРОЙ водещи елементи от пътищата в разликата" + +#: apply.c:4929 +msgid "ignore additions made by the patch" +msgstr "игнориране на редовете добавени от тази кръпка" + +#: apply.c:4931 +msgid "instead of applying the patch, output diffstat for the input" +msgstr "извеждане на статистика на промените без прилагане на кръпката" + +#: apply.c:4935 +msgid "show number of added and deleted lines in decimal notation" +msgstr "извеждане на броя на добавените и изтритите редове" + +#: apply.c:4937 +msgid "instead of applying the patch, output a summary for the input" +msgstr "извеждане на статистика на входните данни без прилагане на кръпката" + +#: apply.c:4939 +msgid "instead of applying the patch, see if the patch is applicable" +msgstr "проверка дали кръпката може да се приложи, без действително прилагане" + +#: apply.c:4941 +msgid "make sure the patch is applicable to the current index" +msgstr "проверка дали кръпката може да бъде приложена към текущия индекс" + +#: apply.c:4943 +msgid "apply a patch without touching the working tree" +msgstr "прилагане на кръпката без промяна на работното дърво" + +#: apply.c:4945 +msgid "accept a patch that touches outside the working area" +msgstr "прилагане на кръпка, която променя и файлове извън работното дърво" + +#: apply.c:4947 +msgid "also apply the patch (use with --stat/--summary/--check)" +msgstr "" +"кръпката да бъде приложена. Опцията се комбинира с „--check“/„--stat“/„--" +"summary“" + +#: apply.c:4949 +msgid "attempt three-way merge if a patch does not apply" +msgstr "пробване с тройно сливане, ако кръпката не може да се приложи директно" + +#: apply.c:4951 +msgid "build a temporary index based on embedded index information" +msgstr "" +"създаване на временен индекс на база на включената информация за индекса" + +#: apply.c:4954 builtin/checkout-index.c:169 builtin/ls-files.c:505 +msgid "paths are separated with NUL character" +msgstr "разделяне на пътищата с нулевия знак „NUL“" + +#: apply.c:4956 +msgid "ensure at least <n> lines of context match" +msgstr "да се осигури контекст от поне такъв БРОЙ съвпадащи редове" + +#: apply.c:4957 builtin/am.c:2265 +msgid "action" +msgstr "действие" + +#: apply.c:4958 +msgid "detect new or modified lines that have whitespace errors" +msgstr "засичане на нови или променени редове с грешки в знаците за интервали" + +#: apply.c:4961 apply.c:4964 +msgid "ignore changes in whitespace when finding context" +msgstr "" +"игнориране на промените в знаците за интервали при откриване на контекста" + +#: apply.c:4967 +msgid "apply the patch in reverse" +msgstr "прилагане на кръпката в обратна посока" + +#: apply.c:4969 +msgid "don't expect at least one line of context" +msgstr "без изискване на дори и един ред контекст" + +#: apply.c:4971 +msgid "leave the rejected hunks in corresponding *.rej files" +msgstr "оставяне на отхвърлените парчета във файлове с разширение „.rej“" + +#: apply.c:4973 +msgid "allow overlapping hunks" +msgstr "позволяване на застъпващи се парчета" + +#: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19 +#: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593 +#: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114 +msgid "be verbose" +msgstr "повече подробности" + +#: apply.c:4976 +msgid "tolerate incorrectly detected missing new-line at the end of file" +msgstr "пренебрегване на неправилно липсващ знак за нов ред в края на файл" + +#: apply.c:4979 +msgid "do not trust the line counts in the hunk headers" +msgstr "без доверяване на номерата на редовете в заглавните части на парчетата" + +#: apply.c:4981 builtin/am.c:2274 +msgid "root" +msgstr "НАЧАЛНА_ДИРЕКТОРИЯ" + +#: apply.c:4982 +msgid "prepend <root> to all filenames" +msgstr "добавяне на тази НАЧАЛНА_ДИРЕКТОРИЯ към имената на всички файлове" + #: archive.c:12 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "git archive [ОПЦИЯ…] УКАЗАТЕЛ_КЪМ_ДЪРВО [ПЪТ…]" @@ -167,7 +861,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote ХРАНИЛИЩЕ [--exec КОМАНДА] --list" -#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327 +#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327 #, c-format msgid "pathspec '%s' did not match any files" msgstr "пътят „%s“ не съвпада с никой файл" @@ -180,7 +874,7 @@ msgstr "ФОРМАТ" msgid "archive format" msgstr "ФОРМАТ на архива" -#: archive.c:430 builtin/log.c:1395 +#: archive.c:430 builtin/log.c:1429 msgid "prefix" msgstr "ПРЕФИКС" @@ -188,11 +882,11 @@ msgstr "ПРЕФИКС" msgid "prepend prefix to each pathname in the archive" msgstr "добавяне на този ПРЕФИКС към всеки път в архива" -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548 builtin/blame.c:2549 -#: builtin/config.c:60 builtin/fast-export.c:987 builtin/fast-export.c:989 -#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:459 -#: builtin/ls-files.c:462 builtin/notes.c:398 builtin/notes.c:561 -#: builtin/read-tree.c:109 parse-options.h:153 +#: archive.c:432 builtin/blame.c:2603 builtin/blame.c:2604 builtin/config.c:59 +#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:723 +#: builtin/hash-object.c:101 builtin/ls-files.c:539 builtin/ls-files.c:542 +#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109 +#: parse-options.h:153 msgid "file" msgstr "ФАЙЛ" @@ -224,8 +918,8 @@ msgstr "добро компресиране" msgid "list supported archive formats" msgstr "извеждане на списъка с поддържаните формати" -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82 -#: builtin/submodule--helper.c:776 +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88 +#: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953 msgid "repo" msgstr "хранилище" @@ -233,7 +927,7 @@ msgstr "хранилище" msgid "retrieve the archive from remote repository <repo>" msgstr "изтегляне на архива от отдалеченото ХРАНИЛИЩЕ" -#: archive.c:453 builtin/archive.c:92 builtin/notes.c:482 +#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485 msgid "command" msgstr "команда" @@ -241,6 +935,28 @@ msgstr "команда" msgid "path to the remote git-upload-archive command" msgstr "път към отдалечената команда „git-upload-archive“" +#: archive.c:461 +msgid "Unexpected option --remote" +msgstr "Неочаквана опция „--remote“" + +#: archive.c:463 +msgid "Option --exec can only be used together with --remote" +msgstr "Опцията „--exec“ изисква „--remote“" + +#: archive.c:465 +msgid "Unexpected option --output" +msgstr "Неочаквана опция „--output“" + +#: archive.c:487 +#, c-format +msgid "Unknown archive format '%s'" +msgstr "Непознат формат на архив: „%s“" + +#: archive.c:494 +#, c-format +msgid "Argument not supported for format '%s': -%d" +msgstr "Аргументът не се поддържа за форма̀та „%s“: -%d" + #: attr.c:263 msgid "" "Negative patterns are ignored in git attributes\n" @@ -249,6 +965,129 @@ msgstr "" "Отрицателните шаблони се игнорират в атрибутите на git.\n" "Ако ви трябва начална удивителна, ползвайте „\\!“." +#: bisect.c:441 +#, c-format +msgid "Could not open file '%s'" +msgstr "Файлът „%s“ не може да се отвори" + +#: bisect.c:446 +#, c-format +msgid "Badly quoted content in file '%s': %s" +msgstr "Неправилно цитирано съдържание във файла „%s“: %s" + +#: bisect.c:655 +#, c-format +msgid "We cannot bisect more!\n" +msgstr "Повече не може да се търси двоично!\n" + +#: bisect.c:708 +#, c-format +msgid "Not a valid commit name %s" +msgstr "Неправилно име на подаване „%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 "" +"Неправилна база за сливане: %s.\n" +"Следователно грешката е коригирана между „%s“ и [%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 "" +"Нова база за сливане: %s.\n" +"Свойството е променено между „%s“ и [%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 "" +"Базата за сливане „%s“ е %s.\n" +"Следователно първото %s подаване е между „%s“ и [%s].\n" + +#: bisect.c:750 +#, c-format +msgid "" +"Some %s revs are not ancestor of the %s rev.\n" +"git bisect cannot work properly in this case.\n" +"Maybe you mistook %s and %s revs?\n" +msgstr "" +"Някои от указателите от „%s“ не са предшественици на указателя „%s“.\n" +"Двоичното търсене с git bisect няма да работи правилно.\n" +"Дали не сте объркали указателите „%s“ и „%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 "" +"базата за сливане между „%s“ и [%s] трябва да бъде прескочена.\n" +"Не може да сме сигурни, че първото %s подаване е между „%s“ и „%s“.\n" +"Двоичното търсене продължава." + +#: bisect.c:798 +#, c-format +msgid "Bisecting: a merge base must be tested\n" +msgstr "Двоично търсене: трябва да се провери база за сливане\n" + +#: bisect.c:849 +#, c-format +msgid "a %s revision is needed" +msgstr "необходима е версия „%s“" + +#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248 +#, c-format +msgid "could not create file '%s'" +msgstr "файлът „%s“ не може да бъде създаден" + +#: bisect.c:917 +#, c-format +msgid "could not read file '%s'" +msgstr "файлът „%s“ не може да бъде прочетен" + +#: bisect.c:947 +msgid "reading bisect refs failed" +msgstr "неуспешно прочитане на указателите за двоично търсене" + +#: bisect.c:967 +#, c-format +msgid "%s was both %s and %s\n" +msgstr "„%s“ e както „%s“, така и „%s“\n" + +#: bisect.c:975 +#, c-format +msgid "" +"No testable commit found.\n" +"Maybe you started with bad path parameters?\n" +msgstr "" +"Липсва подходящо за тестване подаване.\n" +"Проверете параметрите за пътищата.\n" + +#: bisect.c:994 +#, c-format +msgid "(roughly %d step)" +msgid_plural "(roughly %d steps)" +msgstr[0] "(приблизително %d стъпка)" +msgstr[1] "(приблизително %d стъпки)" + +#. TRANSLATORS: the last %s will be replaced with +#. "(roughly %d steps)" translation +#: bisect.c:998 +#, c-format +msgid "Bisecting: %d revision left to test after this %s\n" +msgid_plural "Bisecting: %d revisions left to test after this %s\n" +msgstr[0] "Двоично търсене: остава %d версия след тази %s\n" +msgstr[1] "Двоично търсене: остават %d версии след тази %s\n" + #: branch.c:53 #, c-format msgid "" @@ -318,7 +1157,7 @@ msgstr "Настройките за следения клон не могат д #: branch.c:156 #, c-format msgid "Not tracking: ambiguous information for ref %s" -msgstr "Няма следене: двусмислена информация за указателя „%s“" +msgstr "Няма следене: информацията за указателя „%s“ не е еднозначна" #: branch.c:185 #, c-format @@ -363,27 +1202,27 @@ msgstr "" "може да използвате „git push -u“, за да настроите към кой клон да се " "изтласква." -#: branch.c:266 +#: branch.c:265 #, c-format msgid "Not a valid object name: '%s'." msgstr "Неправилно име на обект: „%s“" -#: branch.c:286 +#: branch.c:285 #, c-format msgid "Ambiguous object name: '%s'." -msgstr "Двусмислено име на обект: „%s“" +msgstr "Името на обект не е еднозначно: „%s“" -#: branch.c:291 +#: branch.c:290 #, c-format msgid "Not a valid branch point: '%s'." msgstr "Неправилно място за начало на клон: „%s“" -#: branch.c:345 +#: branch.c:344 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "„%s“ вече е изтеглен в „%s“" -#: branch.c:364 +#: branch.c:363 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "Указателят „HEAD“ на работното дърво „%s“ не е обновен" @@ -398,7 +1237,7 @@ msgstr "Файлът „%s“ не изглежда да е пратка на gi msgid "unrecognized header: %s%s (%d)" msgstr "непозната заглавна част: %s%s (%d)" -#: bundle.c:87 builtin/commit.c:777 +#: bundle.c:87 sequencer.c:963 builtin/commit.c:777 #, c-format msgid "could not open '%s'" msgstr "„%s“ не може да се отвори" @@ -407,10 +1246,10 @@ msgstr "„%s“ не може да се отвори" msgid "Repository lacks these prerequisite commits:" msgstr "В хранилището липсват следните необходими подавания:" -#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073 -#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340 -#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875 -#: builtin/merge.c:361 builtin/shortlog.c:170 +#: bundle.c:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374 +#: builtin/blame.c:2814 builtin/commit.c:1061 builtin/log.c:348 +#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909 +#: builtin/merge.c:356 builtin/shortlog.c:170 msgid "revision walk setup failed" msgstr "неуспешно настройване на обхождането на версиите" @@ -450,7 +1289,7 @@ msgid "ref '%s' is excluded by the rev-list options" msgstr "" "указателят „%s“ не е бил включен поради опциите зададени на „git rev-list“" -#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273 +#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273 #, c-format msgid "unrecognized argument: %s" msgstr "непознат аргумент: %s" @@ -468,13 +1307,13 @@ msgstr "Файлът „%s“ не може да бъде създаден" msgid "index-pack died" msgstr "Командата „git index-pack“ не завърши успешно" -#: color.c:275 +#: color.c:290 #, c-format msgid "invalid color value: %.*s" msgstr "неправилна стойност за цвят: %.*s" -#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504 -#: builtin/am.c:2134 +#: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493 +#: builtin/am.c:2127 #, c-format msgid "could not parse %s" msgstr "„%s“ не може да се анализира" @@ -484,132 +1323,252 @@ msgstr "„%s“ не може да се анализира" msgid "%s %s is not a commit!" msgstr "%s %s не е подаване!" +#: commit.c:1514 +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 "" +"ПРЕДУПРЕЖДЕНИЕ: съобщението при подаване не е кодирано с UTF-8.\n" +"Може да поправите подаването заедно със съобщението или може да\n" +"зададете ползваното кодиране в настройката „i18n.commitencoding“.\n" + #: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" msgstr "паметта свърши" -#: config.c:475 config.c:477 +#: config.c:516 +#, c-format +msgid "bad config line %d in blob %s" +msgstr "неправилен ред за настройки %d в BLOB „%s“" + +#: config.c:520 #, c-format -msgid "bad config line %d in %s %s" -msgstr "неправилен ред %d в настройката %s „%s“" +msgid "bad config line %d in file %s" +msgstr "неправилен ред за настройки %d във файла „%s“" -#: config.c:593 +#: config.c:524 #, c-format -msgid "bad numeric config value '%s' for '%s' in %s %s: %s" -msgstr "неправилна числова стойност „%s“ за настройката „%s“ в %s „%s“: %s" +msgid "bad config line %d in standard input" +msgstr "неправилен ред за настройки %d на стандартния вход" -#: config.c:595 +#: config.c:528 +#, c-format +msgid "bad config line %d in submodule-blob %s" +msgstr "неправилен ред за настройки %d в BLOB за подмодул „%s“" + +#: config.c:532 +#, c-format +msgid "bad config line %d in command line %s" +msgstr "неправилен ред за настройки %d на командния ред „%s“" + +#: config.c:536 +#, c-format +msgid "bad config line %d in %s" +msgstr "неправилен ред за настройки %d в „%s“" + +#: config.c:655 +msgid "out of range" +msgstr "извън диапазона" + +#: config.c:655 +msgid "invalid unit" +msgstr "неправилна мерна единица" + +#: config.c:661 #, c-format msgid "bad numeric config value '%s' for '%s': %s" -msgstr "неправилна числова стойност „%s“ за настройката „%s“: %s" +msgstr "неправилна числова стойност „%s“ за „%s“: %s" + +#: config.c:666 +#, c-format +msgid "bad numeric config value '%s' for '%s' in blob %s: %s" +msgstr "неправилна числова стойност „%s“ за „%s“ в BLOB „%s“: %s" + +#: config.c:669 +#, c-format +msgid "bad numeric config value '%s' for '%s' in file %s: %s" +msgstr "неправилна числова стойност „%s“ за „%s“ във файла „%s“: %s" + +#: config.c:672 +#, c-format +msgid "bad numeric config value '%s' for '%s' in standard input: %s" +msgstr "неправилна числова стойност „%s“ за „%s“ на стандартния вход: %s" + +#: config.c:675 +#, c-format +msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" +msgstr "неправилна числова стойност „%s“ за „%s“ в BLOB от подмодул „%s“: %s" + +#: config.c:678 +#, c-format +msgid "bad numeric config value '%s' for '%s' in command line %s: %s" +msgstr "неправилна числова стойност „%s“ за „%s“ на командния ред „%s“: %s" + +#: config.c:681 +#, c-format +msgid "bad numeric config value '%s' for '%s' in %s: %s" +msgstr "неправилна числова стойност „%s“ за „%s“ в %s: %s" -#: config.c:680 +#: config.c:768 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "домашната папка на потребителя не може да бъде открита: „%s“" -#: config.c:761 config.c:772 +#: config.c:852 config.c:863 #, c-format msgid "bad zlib compression level %d" msgstr "неправилно ниво на компресиране: %d" -#: config.c:890 +#: config.c:978 #, c-format msgid "invalid mode for object creation: %s" msgstr "неправилен режим за създаването на обекти: %s" -#: config.c:1228 +#: config.c:1312 msgid "unable to parse command-line config" msgstr "неправилни настройки от командния ред" -#: config.c:1284 -msgid "unknown error occured while reading the configuration files" +#: config.c:1362 +msgid "unknown error occurred while reading the configuration files" msgstr "неочаквана грешка при изчитането на конфигурационните файлове" -#: config.c:1629 +#: config.c:1716 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "неразпозната стойност „%s“ от командния ред" -#: config.c:1631 +#: config.c:1718 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "неправилна настройка „%s“ във файла „%s“ на ред №%d" -#: config.c:1690 +#: config.c:1777 #, c-format msgid "%s has multiple values" msgstr "зададени са няколко стойности за „%s“" -#: config.c:2224 +#: config.c:2311 #, c-format msgid "could not set '%s' to '%s'" msgstr "„%s“ не може да се зададе да е „%s“" -#: config.c:2226 +#: config.c:2313 #, c-format msgid "could not unset '%s'" msgstr "„%s“ не може да се премахне" -#: connected.c:69 +#: connect.c:49 +msgid "The remote end hung up upon initial contact" +msgstr "Отдалеченото хранилище прекъсна връзката веднага след отварянето ѝ" + +#: connect.c:51 +msgid "" +"Could not read from remote repository.\n" +"\n" +"Please make sure you have the correct access rights\n" +"and the repository exists." +msgstr "" +"Не може да се чете от отдалеченото хранилище.\n" +"\n" +"Проверете дали то съществува и дали имате права\n" +"за достъп." + +#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140 +msgid "Checking connectivity" +msgstr "Проверка на връзката" + +#: connected.c:75 msgid "Could not run 'git rev-list'" msgstr "Командата „git rev-list“ не може да бъде изпълнена." -#: connected.c:89 +#: connected.c:95 msgid "failed write to rev-list" msgstr "неуспешен запис на списъка с версиите" -#: connected.c:96 +#: connected.c:102 msgid "failed to close rev-list's stdin" msgstr "стандартният вход на списъка с версиите не може да бъде затворен" -#: date.c:95 +#: convert.c:201 +#, 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“ ще бъдe заменена с „LF“ в „%s“.\n" +"Файлът ще остане с първоначалните знаци за край на ред в работната ви " +"директория." + +#: convert.c:205 +#, c-format +msgid "CRLF would be replaced by LF in %s." +msgstr "Всяка последователност от знаци „CRLF“ ще бъдe заменена с „LF“ в „%s“." + +#: convert.c:211 +#, 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“ ще бъдe заменен с последователността от знаци „CRLF“ в " +"„%s“.\n" +"Файлът ще остане с първоначалните знаци за край на ред в работната ви " +"директория." + +#: convert.c:215 +#, c-format +msgid "LF would be replaced by CRLF in %s" +msgstr "" +"Всеки знак „LF“ ще бъдe заменен с последователността от знаци „CRLF“ в „%s“." + +#: date.c:97 msgid "in the future" msgstr "в бъдещето" -#: date.c:101 +#: date.c:103 #, c-format msgid "%lu second ago" msgid_plural "%lu seconds ago" msgstr[0] "преди %lu секунда" msgstr[1] "преди %lu секунди" -#: date.c:108 +#: date.c:110 #, c-format msgid "%lu minute ago" msgid_plural "%lu minutes ago" msgstr[0] "преди %lu минута" msgstr[1] "преди %lu минути" -#: date.c:115 +#: date.c:117 #, c-format msgid "%lu hour ago" msgid_plural "%lu hours ago" msgstr[0] "преди %lu час" msgstr[1] "преди %lu часа" -#: date.c:122 +#: date.c:124 #, c-format msgid "%lu day ago" msgid_plural "%lu days ago" msgstr[0] "преди %lu ден" msgstr[1] "преди %lu дена" -#: date.c:128 +#: date.c:130 #, c-format msgid "%lu week ago" msgid_plural "%lu weeks ago" msgstr[0] "преди %lu седмица" msgstr[1] "преди %lu седмици" -#: date.c:135 +#: date.c:137 #, c-format msgid "%lu month ago" msgid_plural "%lu months ago" msgstr[0] "преди %lu месец" msgstr[1] "преди %lu месеца" -#: date.c:146 +#: date.c:148 #, c-format msgid "%lu year" msgid_plural "%lu years" @@ -617,14 +1576,14 @@ msgstr[0] "%lu година" msgstr[1] "%lu години" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:149 +#: date.c:151 #, c-format msgid "%s, %lu month ago" msgid_plural "%s, %lu months ago" msgstr[0] "преди %s и %lu месец" msgstr[1] "преди %s и %lu месеца" -#: date.c:154 date.c:159 +#: date.c:156 date.c:161 #, c-format msgid "%lu year ago" msgid_plural "%lu years ago" @@ -636,28 +1595,33 @@ msgstr[1] "преди %lu години" msgid "failed to read orderfile '%s'" msgstr "файлът с подредбата на съответствията „%s“ не може да бъде прочетен" -#: diffcore-rename.c:538 +#: diffcore-rename.c:536 msgid "Performing inexact rename detection" msgstr "Търсене на преименувания на обекти съчетани с промени" -#: diff.c:116 +#: diff.c:62 +#, c-format +msgid "option '%s' requires a value" +msgstr "опцията „%s“ изисква стойност" + +#: diff.c:124 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" " Неуспешно разпознаване на „%s“ като процент-праг за статистиката по " "директории\n" -#: diff.c:121 +#: diff.c:129 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Непознат параметър „%s“ за статистиката по директории'\n" -#: diff.c:225 +#: diff.c:283 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Непозната стойност „%s“ за настройката „diff.submodule“" -#: diff.c:277 +#: diff.c:346 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -666,17 +1630,23 @@ msgstr "" "Грешки в настройката „diff.dirstat“:\n" "%s" -#: diff.c:3007 +#: diff.c:3087 #, c-format msgid "external diff died, stopping at %s" msgstr "" -"външната програма за разлики завърши неуспешно. Спиране на работата при „%s“" +"външната програма за разлики завърши неуспешно. Спиране на работата при „%s“" + +#: diff.c:3412 +msgid "--name-only, --name-status, --check and -s are mutually exclusive" +msgstr "" +"Опциите „--name-only“, „--name-status“, „--check“ и „-s“ са несъвместими " +"една с друга" -#: diff.c:3405 +#: diff.c:3502 msgid "--follow requires exactly one pathspec" msgstr "Опцията „--follow“ изисква точно един път" -#: diff.c:3568 +#: diff.c:3665 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -685,84 +1655,259 @@ msgstr "" "Неразпознат параметър към опцията „--dirstat/-X“:\n" "%s" -#: diff.c:3582 +#: diff.c:3679 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Неразпознат параметър към опцията „--submodule“: „%s“" -#: dir.c:1823 +#: diff.c:4700 +msgid "inexact rename detection was skipped due to too many files." +msgstr "" +"търсенето на преименувания на обекти съчетани с промени се прескача поради " +"многото файлове." + +#: diff.c:4703 +msgid "only found copies from modified paths due to too many files." +msgstr "" +"установени са точните копия на променените пътища поради многото файлове." + +#: diff.c:4706 +#, c-format +msgid "" +"you may want to set your %s variable to at least %d and retry the command." +msgstr "задайте променливата „%s“ да е поне %d и отново изпълнете командата." + +#: dir.c:1866 msgid "failed to get kernel name and information" msgstr "името и версията на ядрото не бяха получени" -#: dir.c:1942 +#: dir.c:1985 msgid "Untracked cache is disabled on this system or location." msgstr "" "Кеша за неследените файлове е изключен на тази система или местоположение." -#: gpg-interface.c:166 gpg-interface.c:235 -msgid "could not run gpg." -msgstr "Програмата „gpg“ не може да бъде стартирана." +#: fetch-pack.c:213 +msgid "git fetch-pack: expected shallow list" +msgstr "git fetch-pack: очаква се плитък списък" + +#: fetch-pack.c:225 +msgid "git fetch-pack: expected ACK/NAK, got EOF" +msgstr "git fetch-pack: очакваше се „ACK“/„NAK“, а бе получен „EOF“" + +#: fetch-pack.c:243 +#, c-format +msgid "git fetch-pack: expected ACK/NAK, got '%s'" +msgstr "git fetch-pack: очакваше се „ACK“/„NAK“, а бе получен „%s“" + +#: fetch-pack.c:295 +msgid "--stateless-rpc requires multi_ack_detailed" +msgstr "опцията „--stateless-rpc“ изисква „multi_ack_detailed“" + +#: fetch-pack.c:381 +#, c-format +msgid "invalid shallow line: %s" +msgstr "неправилен плитък ред: „%s“" + +#: fetch-pack.c:387 +#, c-format +msgid "invalid unshallow line: %s" +msgstr "неправилен неплитък ред: „%s“" + +#: fetch-pack.c:389 +#, c-format +msgid "object not found: %s" +msgstr "обектът „%s“ липсва" + +#: fetch-pack.c:392 +#, c-format +msgid "error in object: %s" +msgstr "грешка в обекта: „%s“" + +#: fetch-pack.c:394 +#, c-format +msgid "no shallow found: %s" +msgstr "не е открит плитък обект: %s" + +#: fetch-pack.c:397 +#, c-format +msgid "expected shallow/unshallow, got %s" +msgstr "очаква се плитък или не обект, а бе получено: %s" + +#: fetch-pack.c:436 +#, c-format +msgid "got %s %d %s" +msgstr "получено бе %s %d %s" + +#: fetch-pack.c:450 +#, c-format +msgid "invalid commit %s" +msgstr "неправилно подаване: „%s“" + +#: fetch-pack.c:483 +msgid "giving up" +msgstr "преустановяване" + +#: fetch-pack.c:493 progress.c:235 +msgid "done" +msgstr "действието завърши" + +#: fetch-pack.c:505 +#, c-format +msgid "got %s (%d) %s" +msgstr "получено бе %s (%d) %s" + +#: fetch-pack.c:551 +#, c-format +msgid "Marking %s as complete" +msgstr "Отбелязване на „%s“ като пълно" + +#: fetch-pack.c:697 +#, c-format +msgid "already have %s (%s)" +msgstr "вече има „%s“ (%s)" + +#: fetch-pack.c:735 +msgid "fetch-pack: unable to fork off sideband demultiplexer" +msgstr "fetch-pack: не може да се създаде процес за демултиплексора" + +#: fetch-pack.c:743 +msgid "protocol error: bad pack header" +msgstr "протоколна грешка: неправилна заглавна част на пакет" + +#: fetch-pack.c:799 +#, c-format +msgid "fetch-pack: unable to fork off %s" +msgstr "fetch-pack: не може да се създаде процес за „%s“" + +#: fetch-pack.c:815 +#, c-format +msgid "%s failed" +msgstr "неуспешно изпълнение на „%s“" + +#: fetch-pack.c:817 +msgid "error in sideband demultiplexer" +msgstr "грешка в демултиплексора" + +#: fetch-pack.c:844 +msgid "Server does not support shallow clients" +msgstr "Сървърът не поддържа плитки клиенти" + +#: fetch-pack.c:848 +msgid "Server supports multi_ack_detailed" +msgstr "Сървърът поддържа „multi_ack_detailed“" + +#: fetch-pack.c:851 +msgid "Server supports no-done" +msgstr "Сървърът поддържа „no-done“" + +#: fetch-pack.c:857 +msgid "Server supports multi_ack" +msgstr "Сървърът поддържа „multi_ack“" + +#: fetch-pack.c:861 +msgid "Server supports side-band-64k" +msgstr "Сървърът поддържа „side-band-64k“" + +#: fetch-pack.c:865 +msgid "Server supports side-band" +msgstr "Сървърът поддържа „side-band“" + +#: fetch-pack.c:869 +msgid "Server supports allow-tip-sha1-in-want" +msgstr "Сървърът поддържа „allow-tip-sha1-in-want“" + +#: fetch-pack.c:873 +msgid "Server supports allow-reachable-sha1-in-want" +msgstr "Сървърът поддържа „allow-reachable-sha1-in-want“" + +#: fetch-pack.c:883 +msgid "Server supports ofs-delta" +msgstr "Сървърът поддържа „ofs-delta“" -#: gpg-interface.c:178 -msgid "gpg did not accept the data" -msgstr "Програмата „gpg“ не прие подадените данни." +#: fetch-pack.c:890 +#, c-format +msgid "Server version is %.*s" +msgstr "Версията на сървъра е: %.*s" + +#: fetch-pack.c:896 +msgid "Server does not support --shallow-since" +msgstr "Сървърът не поддържа опцията „--shallow-since“" + +#: fetch-pack.c:900 +msgid "Server does not support --shallow-exclude" +msgstr "Сървърът не поддържа опцията „--shallow-exclude“" + +#: fetch-pack.c:902 +msgid "Server does not support --deepen" +msgstr "Сървърът не поддържа опцията „--deepen“" + +#: fetch-pack.c:913 +msgid "no common commits" +msgstr "няма общи подавания" -#: gpg-interface.c:189 +#: fetch-pack.c:925 +msgid "git fetch-pack: fetch failed." +msgstr "git fetch-pack: неуспешно доставяне." + +#: fetch-pack.c:1087 +msgid "no matching remote head" +msgstr "не може да бъде открит подходящ връх от отдалеченото хранилище" + +#: gpg-interface.c:185 msgid "gpg failed to sign the data" msgstr "Програмата „gpg“ не подписа данните." -#: gpg-interface.c:222 -#, c-format -msgid "could not create temporary file '%s'" -msgstr "Програмата не успя да създаде временния файл „%s“" +#: gpg-interface.c:215 +msgid "could not create temporary file" +msgstr "не може да се създаде временен файл" -#: gpg-interface.c:224 +#: gpg-interface.c:217 #, c-format msgid "failed writing detached signature to '%s'" msgstr "Програмата не успя да запише самостоятелния подпис в „%s“" -#: grep.c:1718 +#: grep.c:1782 #, c-format msgid "'%s': unable to read %s" msgstr "„%s“: файлът сочен от „%s“ не може да бъде прочетен" -#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155 +#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155 #, c-format msgid "failed to stat '%s'" msgstr "не може да бъде получена информация чрез „stat“ за „%s“" -#: grep.c:1746 +#: grep.c:1810 #, c-format msgid "'%s': short read" msgstr "„%s“: изчитането върна по-малко байтове от заявените" -#: help.c:205 +#: help.c:203 #, c-format msgid "available git commands in '%s'" msgstr "налични команди на git от „%s“" -#: help.c:212 +#: help.c:210 msgid "git commands available from elsewhere on your $PATH" msgstr "команди на git от други директории от „$PATH“" -#: help.c:244 +#: help.c:241 msgid "These are common Git commands used in various situations:" msgstr "Това са най-често използваните команди на Git:" -#: help.c:309 +#: help.c:306 #, 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“ е команда на git, но тя не може да\n" -"бъде изпълнена. Вероятно пакетът „git-%s“ е повреден." +"бъде изпълнена. Вероятно пакетът „git-%s“ е повреден." -#: help.c:366 +#: help.c:361 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Странно, изглежда, че на системата ви няма нито една команда на git." -#: help.c:388 +#: help.c:383 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" @@ -770,20 +1915,20 @@ msgid "" msgstr "" "ПРЕДУПРЕЖДЕНИЕ: Пробвахте да изпълните команда на Git на име „%s“, а такава " "не\n" -"съществува. Изпълнението автоматично продължава, като се счита, че имате " +"съществува. Изпълнението автоматично продължава, като се счита, че имате " "предвид „%s“" -#: help.c:393 +#: help.c:388 #, c-format msgid "in %0.1f seconds automatically..." msgstr "след %0.1f секунди…" -#: help.c:400 +#: help.c:395 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." -msgstr "git: „%s“ не е команда на git. Погледнете изхода от „git --help“." +msgstr "git: „%s“ не е команда на git. Погледнете изхода от „git --help“." -#: help.c:404 help.c:464 +#: help.c:399 help.c:465 msgid "" "\n" "Did you mean this?" @@ -797,11 +1942,38 @@ msgstr[1] "" "\n" "Команди с подобно име са:" -#: help.c:460 +#: help.c:461 #, c-format msgid "%s: %s - %s" msgstr "%s: %s — %s" +#: ident.c:334 +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" +"●●● Въведете самоличност.\n" +"\n" +"Изпълнете:\n" +"\n" +" git config --global user.email \"ИМЕ@example.com\"\n" +" git config --global user.name \"ВАШЕТО ИМЕ\"\n" +"\n" +"и въведете данни за себе си.\n" +"Ако пропуснете опцията „--global“, самоличността е само за текущото " +"хранилище.\n" +"\n" + #: lockfile.c:152 #, c-format msgid "" @@ -816,9 +1988,9 @@ msgstr "" "Файлът-ключалка „%s.lock“ не може да бъде създаден: %s\n" "\n" "Изглежда, че и друг процес на git е пуснат в това хранилище, напр.\n" -"редактор, стартиран с „git commit“. Уверете се, че всички подобни\n" -"процеси са спрени и опитайте отново. Ако това не помогне, вероятната\n" -"причина е, че някой процес на git в това хранилище е забил. За да\n" +"редактор, стартиран с „git commit“. Уверете се, че всички подобни\n" +"процеси са спрени и опитайте отново. Ако това не помогне, вероятната\n" +"причина е, че някой процес на git в това хранилище е забил. За да\n" "продължите работа, ще трябва ръчно да изтриете файла:" #: lockfile.c:160 @@ -830,116 +2002,111 @@ msgstr "Файлът-ключалка „%s.lock“ не може да бъде msgid "failed to read the cache" msgstr "кешът не може да бъде прочетен" -#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375 -#: builtin/checkout.c:586 builtin/clone.c:732 +#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374 +#: builtin/checkout.c:588 builtin/clone.c:731 msgid "unable to write new index file" msgstr "неуспешно записване на новия индекс" -#: merge-recursive.c:189 -#, c-format +#: merge-recursive.c:209 msgid "(bad commit)\n" msgstr "(лошо подаване)\n" -#: merge-recursive.c:209 +#: merge-recursive.c:231 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "неуспешно изпълнение на „addinfo_cache“ за пътя „%s“" -#: merge-recursive.c:270 +#: merge-recursive.c:301 msgid "error building trees" msgstr "грешка при изграждане на дърветата" -#: merge-recursive.c:689 +#: merge-recursive.c:720 #, c-format msgid "failed to create path '%s'%s" msgstr "грешка при създаването на пътя „%s“%s" -#: merge-recursive.c:700 +#: merge-recursive.c:731 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Изтриване на „%s“, за да се освободи място за поддиректория\n" -#: merge-recursive.c:714 merge-recursive.c:735 +#: merge-recursive.c:745 merge-recursive.c:764 msgid ": perhaps a D/F conflict?" msgstr ": възможно е да има конфликт директория/файл." -#: merge-recursive.c:725 +#: merge-recursive.c:754 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" "преустановяване на действието, за да не се изтрие неследеният файл „%s“" -#: merge-recursive.c:765 +#: merge-recursive.c:796 builtin/cat-file.c:34 #, c-format msgid "cannot read object %s '%s'" msgstr "обектът „%s“ (%s) не може да бъде прочетен" -#: merge-recursive.c:767 +#: merge-recursive.c:798 #, c-format msgid "blob expected for %s '%s'" msgstr "обектът „%s“ (%s) се очакваше да е BLOB, а не е" -#: merge-recursive.c:790 builtin/clone.c:376 +#: merge-recursive.c:822 #, c-format -msgid "failed to open '%s'" -msgstr "директорията „%s“ не може да бъде отворена" +msgid "failed to open '%s': %s" +msgstr "„%s“ не може да се отвори: %s" -#: merge-recursive.c:798 +#: merge-recursive.c:833 #, c-format -msgid "failed to symlink '%s'" -msgstr "неуспешно създаване на символната връзка „%s“" +msgid "failed to symlink '%s': %s" +msgstr "неуспешно създаване на символната връзка „%s“: %s" -#: merge-recursive.c:801 +#: merge-recursive.c:838 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" "не е ясно какво да се прави с обекта „%2$s“ (%3$s) с права за достъп „%1$06o“" -#: merge-recursive.c:939 +#: merge-recursive.c:978 msgid "Failed to execute internal merge" msgstr "Неуспешно вътрешно сливане" -#: merge-recursive.c:943 +#: merge-recursive.c:982 #, c-format msgid "Unable to add %s to database" msgstr "„%s“ не може да се добави в базата с данни" -#: merge-recursive.c:959 -msgid "unsupported object type in the tree" -msgstr "в дървото има неподдържан вид обект" - -#: merge-recursive.c:1034 merge-recursive.c:1048 +#: merge-recursive.c:1081 merge-recursive.c:1095 #, 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“ " +"КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s. Версия %s на „%s“ " "е оставена в дървото." -#: merge-recursive.c:1040 merge-recursive.c:1053 +#: merge-recursive.c:1087 merge-recursive.c:1100 #, 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/изтриване): „%s“ е изтрит в %s, а „%s“ в %s. Версия %s на „%s“ " "е оставена в дървото: %s." -#: merge-recursive.c:1094 +#: merge-recursive.c:1143 msgid "rename" msgstr "преименуване" -#: merge-recursive.c:1094 +#: merge-recursive.c:1143 msgid "renamed" msgstr "преименуван" -#: merge-recursive.c:1150 +#: merge-recursive.c:1200 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "„%s“ е директория в „%s“, затова се добавя като „%s“" -#: merge-recursive.c:1172 +#: merge-recursive.c:1225 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -948,153 +2115,165 @@ msgstr "" "КОНФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон " "„%s“, а „%s“ е преименуван на „%s“ в „%s“/%s." -#: merge-recursive.c:1177 +#: merge-recursive.c:1230 msgid " (left unresolved)" msgstr " (некоригиран конфликт)" -#: merge-recursive.c:1231 +#: merge-recursive.c:1292 #, 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:1261 +#: merge-recursive.c:1325 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "Преименуване на „%s“ на „%s“, а „%s“ на „%s“" -#: merge-recursive.c:1460 +#: merge-recursive.c:1531 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" "КОНФЛИКТ (преименуване/добавяне): „%s“ е преименуван на „%s“ в клон „%s“, а " "„%s“ е добавен в „%s“" -#: merge-recursive.c:1470 +#: merge-recursive.c:1546 #, c-format msgid "Adding merged %s" msgstr "Добавяне на слетия „%s“" -#: merge-recursive.c:1475 merge-recursive.c:1677 +#: merge-recursive.c:1553 merge-recursive.c:1766 #, c-format msgid "Adding as %s instead" msgstr "Добавяне като „%s“" -#: merge-recursive.c:1526 +#: merge-recursive.c:1610 #, c-format msgid "cannot read object %s" msgstr "обектът „%s“ не може да се прочете" -#: merge-recursive.c:1529 +#: merge-recursive.c:1613 #, c-format msgid "object %s is not a blob" msgstr "обектът „%s“ не е BLOB" -#: merge-recursive.c:1581 +#: merge-recursive.c:1666 msgid "modify" msgstr "промяна" -#: merge-recursive.c:1581 +#: merge-recursive.c:1666 msgid "modified" msgstr "променен" -#: merge-recursive.c:1591 +#: merge-recursive.c:1676 msgid "content" msgstr "съдържание" -#: merge-recursive.c:1598 +#: merge-recursive.c:1683 msgid "add/add" msgstr "добавяне/добавяне" -#: merge-recursive.c:1632 +#: merge-recursive.c:1718 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Прескачане на „%s“ (слетият резултат е идентичен със сегашния)" -#: merge-recursive.c:1646 +#: merge-recursive.c:1732 #, c-format msgid "Auto-merging %s" msgstr "Автоматично сливане на „%s“" -#: merge-recursive.c:1650 git-submodule.sh:941 +#: merge-recursive.c:1736 git-submodule.sh:924 msgid "submodule" msgstr "ПОДМОДУЛ" -#: merge-recursive.c:1651 +#: merge-recursive.c:1737 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "КОНФЛИКТ (%s): Конфликт при сливане на „%s“" -#: merge-recursive.c:1737 +#: merge-recursive.c:1831 #, c-format msgid "Removing %s" msgstr "Изтриване на „%s“" -#: merge-recursive.c:1762 +#: merge-recursive.c:1857 msgid "file/directory" msgstr "файл/директория" -#: merge-recursive.c:1768 +#: merge-recursive.c:1863 msgid "directory/file" msgstr "директория/файл" -#: merge-recursive.c:1773 +#: merge-recursive.c:1868 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -"КОНФЛИКТ (%s): Съществува директория на име „%s“ в „%s“. Добавяне на „%s“ " +"КОНФЛИКТ (%s): Съществува директория на име „%s“ в „%s“. Добавяне на „%s“ " "като „%s“" -#: merge-recursive.c:1781 +#: merge-recursive.c:1877 #, c-format msgid "Adding %s" msgstr "Добавяне на „%s“" -#: merge-recursive.c:1798 -msgid "Fatal merge failure, shouldn't happen." -msgstr "Фатална грешка при сливане, а такава не трябва да възниква!" - -#: merge-recursive.c:1817 +#: merge-recursive.c:1914 msgid "Already up-to-date!" msgstr "Вече е обновено!" -#: merge-recursive.c:1826 +#: merge-recursive.c:1923 #, c-format msgid "merging of trees %s and %s failed" msgstr "неуспешно сливане на дърветата „%s“ и „%s“" -#: merge-recursive.c:1856 -#, c-format -msgid "Unprocessed path??? %s" -msgstr "" -"Пътят „%s“ не е обработен, това е грешка в Git, докладвайте я на " -"разработчиците, като пратите е-писмо на адрес: „git@vger.kernel.org“." - -#: merge-recursive.c:1904 +#: merge-recursive.c:2006 msgid "Merging:" msgstr "Сливане:" -#: merge-recursive.c:1917 +#: merge-recursive.c:2019 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "открит е %u общ предшественик:" msgstr[1] "открити са %u общи предшественици:" -#: merge-recursive.c:1954 +#: merge-recursive.c:2058 msgid "merge returned no commit" msgstr "сливането не върна подаване" -#: merge-recursive.c:2011 +#: merge-recursive.c:2121 #, c-format msgid "Could not parse object '%s'" msgstr "Неуспешен анализ на обекта „%s“" -#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831 +#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788 msgid "Unable to write index." msgstr "Индексът не може да бъде прочетен" +#: notes-merge.c:273 +#, 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" +"За да завършите предишното сливане, изпълнете:\n" +"\n" +" git notes merge --commit\n" +"\n" +"За да отмените предишното сливане, изпълнете:\n" +"\n" +" git notes merge --abort" + +#: notes-merge.c:280 +#, c-format +msgid "You have not concluded your notes merge (%s exists)." +msgstr "" +"Не сте завършили сливането на бележките. (Указателят „%s“ съществува)." + #: notes-utils.c:41 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "" @@ -1153,7 +2332,7 @@ msgstr "-ЧИСЛО" msgid "malformed object name '%s'" msgstr "неправилно име на обект „%s“" -#: path.c:796 +#: path.c:826 #, c-format msgid "Could not make %s writable by group" msgstr "Не могат да се дадат права за запис в директорията „%s“ на групата" @@ -1209,12 +2388,21 @@ msgstr "Пътят „%s“ е в подмодула „%.*s“" msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: магическите пътища не се поддържат от командата „%s“" -#: pathspec.c:433 +#: pathspec.c:408 +msgid "" +"empty strings as pathspecs will be made invalid in upcoming releases. please " +"use . instead if you meant to match all paths" +msgstr "" +"възможно е празните низове да се окажат неправилни шаблони за пътища в " +"следващи версии на Git. Ако искате съвпадение с всички пътища, използвайте: " +"„.“" + +#: pathspec.c:440 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "пътят „%s“ е след символна връзка" -#: pathspec.c:442 +#: pathspec.c:449 msgid "" "There is nothing to exclude from by :(exclude) patterns.\n" "Perhaps you forgot to add either ':/' or '.' ?" @@ -1226,11 +2414,7 @@ msgstr "" msgid "unable to parse --pretty format" msgstr "аргументът към опцията „--pretty“ не може да се анализира" -#: progress.c:235 -msgid "done" -msgstr "действието завърши" - -#: read-cache.c:1281 +#: read-cache.c:1315 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -1239,7 +2423,7 @@ msgstr "" "Зададена е неправилна стойност на настройката „index.version“.\n" "Ще се ползва версия %i" -#: read-cache.c:1291 +#: read-cache.c:1325 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -1249,23 +2433,22 @@ msgstr "" "„GIT_INDEX_VERSION“.\n" "Ще се ползва версия %i" -#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985 -#: builtin/merge.c:995 +#: refs.c:576 builtin/merge.c:840 #, c-format msgid "Could not open '%s' for writing" msgstr "„%s“ не може да бъде отворен за запис" -#: refs/files-backend.c:2243 +#: refs/files-backend.c:2481 #, c-format msgid "could not delete reference %s: %s" msgstr "Указателят „%s“ не може да бъде изтрит: %s" -#: refs/files-backend.c:2246 +#: refs/files-backend.c:2484 #, c-format msgid "could not delete references: %s" msgstr "Указателите не може да бъдат изтрити: %s" -#: refs/files-backend.c:2255 +#: refs/files-backend.c:2493 #, c-format msgid "could not remove reference %s" msgstr "Указателят „%s“ не може да бъде изтрит" @@ -1394,12 +2577,12 @@ msgstr "игнориране на указателя с грешно име „% msgid "ignoring broken ref %s" msgstr "игнориране на повредения указател „%s“" -#: ref-filter.c:1651 +#: ref-filter.c:1633 #, c-format msgid "format: %%(end) atom missing" msgstr "грешка във форма̀та: липсва лексемата %%(end)" -#: ref-filter.c:1705 +#: ref-filter.c:1687 #, c-format msgid "malformed object name %s" msgstr "неправилно име на обект „%s“" @@ -1423,76 +2606,76 @@ msgstr "„%s“ следи както „%s“, така и „%s“" msgid "Internal error" msgstr "Вътрешна грешка" -#: remote.c:1678 remote.c:1721 +#: remote.c:1677 remote.c:1720 msgid "HEAD does not point to a branch" msgstr "Указателят „HEAD“ не сочи към клон" -#: remote.c:1687 +#: remote.c:1686 #, c-format msgid "no such branch: '%s'" msgstr "няма клон на име „%s“" -#: remote.c:1690 +#: remote.c:1689 #, c-format msgid "no upstream configured for branch '%s'" msgstr "не е зададен клон-източник за клона „%s“" -#: remote.c:1696 +#: remote.c:1695 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "клонът-източник „%s“ не е съхранен като следящ клон" -#: remote.c:1711 +#: remote.c:1710 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "липсва локален следящ клон за местоположението за изтласкване „%s“ в " "хранилището „%s“" -#: remote.c:1726 +#: remote.c:1725 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "няма информация клонът „%s“ да следи някой друг" -#: remote.c:1737 +#: remote.c:1736 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "указателят за изтласкване на „%s“ не включва „%s“" -#: remote.c:1750 +#: remote.c:1749 msgid "push has no destination (push.default is 'nothing')" msgstr "указателят за изтласкване не включва цел („push.default“ е „nothing“)" -#: remote.c:1772 +#: remote.c:1771 msgid "cannot resolve 'simple' push to a single destination" msgstr "простото (simple) изтласкване не съответства на една цел" -#: remote.c:2074 +#: remote.c:2073 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Този клон следи „%s“, но следеният клон е изтрит.\n" -#: remote.c:2078 +#: remote.c:2077 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (за да коригирате това, използвайте „git branch --unset-upstream“)\n" -#: remote.c:2081 +#: remote.c:2080 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "Клонът е актуализиран към „%s“.\n" -#: remote.c:2085 +#: remote.c:2084 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Клонът ви е с %2$d подаване пред „%1$s“.\n" msgstr[1] "Клонът ви е с %2$d подавания пред „%1$s“.\n" -#: remote.c:2091 +#: remote.c:2090 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (публикувайте локалните си промени чрез „git push“)\n" -#: remote.c:2094 +#: remote.c:2093 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1502,11 +2685,11 @@ msgstr[0] "" msgstr[1] "" "Клонът ви е с %2$d подавания зад „%1$s“ и може да бъде тривиално слят.\n" -#: remote.c:2102 +#: remote.c:2101 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (обновете локалния си клон чрез „git pull“)\n" -#: remote.c:2105 +#: remote.c:2104 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1521,41 +2704,41 @@ msgstr[1] "" "Текущият клон се е отделил от „%s“,\n" "двата имат съответно по %d и %d несъвпадащи подавания.\n" -#: remote.c:2115 +#: remote.c:2114 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (слейте отдалечения клон в локалния чрез „git pull“)\n" -#: revision.c:2142 +#: revision.c:2158 msgid "your current branch appears to be broken" msgstr "Текущият клон е повреден" -#: revision.c:2145 +#: revision.c:2161 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "Текущият клон „%s“ е без подавания " -#: revision.c:2339 +#: revision.c:2355 msgid "--first-parent is incompatible with --bisect" msgstr "опциите „--first-parent“ и „--bisect“ са несъвместими" -#: run-command.c:92 +#: run-command.c:106 msgid "open /dev/null failed" msgstr "неуспешно отваряне на „/dev/null“" -#: run-command.c:94 +#: run-command.c:108 #, c-format msgid "dup2(%d,%d) failed" msgstr "неуспешно изпълнение на dup2(%d,%d)" -#: send-pack.c:295 +#: send-pack.c:297 msgid "failed to sign the push certificate" msgstr "сертификатът за изтласкване не може да бъде подписан" -#: send-pack.c:404 +#: send-pack.c:410 msgid "the receiving end does not support --signed push" msgstr "отсрещната страна не поддържа изтласкване с опцията „--signed“" -#: send-pack.c:406 +#: send-pack.c:412 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -1563,12 +2746,23 @@ msgstr "" "отсрещната страна не поддържа изтласкване с опцията „--signed“, затова не се " "използва сертификат" -#: send-pack.c:418 +#: send-pack.c:424 msgid "the receiving end does not support --atomic push" msgstr "получаващата страна не поддържа изтласкване с опцията „--atomic“" -# FIXME git add <path…> for consistence -#: sequencer.c:174 +#: send-pack.c:429 +msgid "the receiving end does not support push options" +msgstr "отсрещната страна не поддържа опции при изтласкване" + +#: sequencer.c:171 +msgid "revert" +msgstr "отмяна" + +#: sequencer.c:171 +msgid "cherry-pick" +msgstr "отбиране" + +#: sequencer.c:228 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -1576,7 +2770,7 @@ msgstr "" "след коригирането на конфликтите, отбележете съответните\n" "пътища с „git add ПЪТ…“ или „git rm ПЪТ…“." -#: sequencer.c:177 +#: sequencer.c:231 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -1586,235 +2780,300 @@ msgstr "" "пътища с „git add ПЪТ…“ или „git rm ПЪТ…“, след което\n" "подайте резултата с командата „git commit'“." +#: sequencer.c:244 sequencer.c:1209 +#, c-format +msgid "could not lock '%s'" +msgstr "„%s“ не може да се заключи" + +#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214 +#, c-format +msgid "could not write to '%s'" +msgstr "в „%s“ не може да се пише" + # FIXME - must be the same as Could not write to '%s' above -#: sequencer.c:190 sequencer.c:833 sequencer.c:912 +#: sequencer.c:251 #, c-format -msgid "Could not write to %s" -msgstr "„%s“ не може да бъде записан" +msgid "could not write eol to '%s'" +msgstr "краят на ред не може да се запише в „%s“" + +#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216 +#, c-format +msgid "failed to finalize '%s'." +msgstr "„%s“ не може да се завърши." -#: sequencer.c:193 +#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032 #, c-format -msgid "Error wrapping up %s" -msgstr "Обработката на „%s“ не завърши успешно." +msgid "could not read '%s'" +msgstr "файлът „%s“ не може да бъде прочетен" -#: sequencer.c:208 -msgid "Your local changes would be overwritten by cherry-pick." -msgstr "Локалните ви промени ще бъдат презаписани при отбирането на подавания." +#: sequencer.c:305 +#, c-format +msgid "your local changes would be overwritten by %s." +msgstr "локалните ви промени ще бъдат презаписани при %s." -#: sequencer.c:210 -msgid "Your local changes would be overwritten by revert." -msgstr "Локалните ви промени ще бъдат презаписани при отмяната на подавания." +#: sequencer.c:309 +msgid "commit your changes or stash them to proceed." +msgstr "подайте или скатайте промените, за да продължите" -#: sequencer.c:213 -msgid "Commit your changes or stash them to proceed." -msgstr "Подайте или скатайте промените, за да продължите" +#: sequencer.c:324 +#, c-format +msgid "%s: fast-forward" +msgstr "%s: тривиално сливане" #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:300 +#: sequencer.c:399 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: новият индекс не може да бъде запазен" -#: sequencer.c:318 -msgid "Could not resolve HEAD commit\n" -msgstr "Подаването сочено от указателя „HEAD“ не може да бъде открито\n" +#: sequencer.c:418 +msgid "could not resolve HEAD commit\n" +msgstr "подаването сочено от указателя „HEAD“ не може да бъде открито\n" + +#: sequencer.c:438 +msgid "unable to update cache tree\n" +msgstr "дървото на кеша не може да бъде обновено\n" -#: sequencer.c:338 -msgid "Unable to update cache tree\n" -msgstr "Дървото на кеша не може да бъде обновено\n" +#: sequencer.c:483 +#, 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 "" +"в това работно дърво има скатани промени.\n" +"Ако искате да ги слеете с предишното подаване, изпълнете:\n" +"\n" +" git commit --amend %s\n" +"\n" +"Ако искате да създадете ново подаване, изпълнете:\n" +"\n" +" git commit %s\n" +"\n" +"И в двата случая продължавате след това с командата:\n" +"\n" +" git rebase --continue\n" -#: sequencer.c:390 +#: sequencer.c:567 #, c-format -msgid "Could not parse commit %s\n" -msgstr "Подаването „%s“ не може да бъде анализирано\n" +msgid "could not parse commit %s\n" +msgstr "подаването „%s“ не може да бъде анализирано\n" -#: sequencer.c:395 +#: sequencer.c:572 #, c-format -msgid "Could not parse parent commit %s\n" -msgstr "Родителското подаване „%s“ не може да бъде анализирано\n" +msgid "could not parse parent commit %s\n" +msgstr "родителското подаване „%s“ не може да бъде анализирано\n" -#: sequencer.c:460 -msgid "Your index file is unmerged." -msgstr "Индексът не е слят." +#: sequencer.c:656 +msgid "your index file is unmerged." +msgstr "индексът не е слят." -#: sequencer.c:479 +#: sequencer.c:675 #, c-format -msgid "Commit %s is a merge but no -m option was given." -msgstr "Подаването „%s“ е сливане, но не е дадена опцията „-m“" +msgid "commit %s is a merge but no -m option was given." +msgstr "подаването „%s“ е сливане, но не е дадена опцията „-m“" -#: sequencer.c:487 +#: sequencer.c:683 #, c-format -msgid "Commit %s does not have parent %d" -msgstr "Подаването „%s“ няма родител %d" +msgid "commit %s does not have parent %d" +msgstr "подаването „%s“ няма родител %d" -#: sequencer.c:491 +#: sequencer.c:687 #, c-format -msgid "Mainline was specified but commit %s is not a merge." -msgstr "Указано е базово подаване, но подаването „%s“ не е сливане." +msgid "mainline was specified but commit %s is not a merge." +msgstr "указано е базово подаване, но подаването „%s“ не е сливане." -#. TRANSLATORS: The first %s will be "revert" or -#. "cherry-pick", the second %s a SHA1 -#: sequencer.c:504 +#. TRANSLATORS: The first %s will be a "todo" command like +#. "revert" or "pick", the second %s a SHA1. +#: sequencer.c:700 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: неразпозната стойност за родителското подаване „%s“" -#: sequencer.c:508 +#: sequencer.c:705 #, c-format -msgid "Cannot get commit message for %s" -msgstr "Неуспешно извличане на съобщението за подаване на „%s“" +msgid "cannot get commit message for %s" +msgstr "неуспешно извличане на съобщението за подаване на „%s“" -#: sequencer.c:594 +#: sequencer.c:797 #, c-format msgid "could not revert %s... %s" msgstr "подаването „%s“… не може да бъде отменено: „%s“" -#: sequencer.c:595 +#: sequencer.c:798 #, c-format msgid "could not apply %s... %s" msgstr "подаването „%s“… не може да бъде приложено: „%s“" -#: sequencer.c:630 +#: sequencer.c:833 msgid "empty commit set passed" msgstr "зададено е празно множество от подавания" -#: sequencer.c:638 +#: sequencer.c:843 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: неуспешно изчитане на индекса" -#: sequencer.c:642 +#: sequencer.c:850 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: неуспешно обновяване на индекса" -#: sequencer.c:702 +#: sequencer.c:944 #, c-format -msgid "Cannot %s during a %s" -msgstr "По време на „%1$s“ не може да се извърши „%2$s“" +msgid "invalid line %d: %.*s" +msgstr "неправилен ред %d: %.*s" -#: sequencer.c:724 -#, c-format -msgid "Could not parse line %d." -msgstr "%d-ят ред не може да се анализира." - -#: sequencer.c:729 -msgid "No commits parsed." -msgstr "Никое от подаванията не може да се разпознае." +#: sequencer.c:950 +msgid "no commits parsed." +msgstr "никое от подаванията не може да се разпознае." -# FIXME Could not open %s. - full stop for consistence with next message -#: sequencer.c:741 +#: sequencer.c:966 #, c-format -msgid "Could not open %s" -msgstr "„%s“ не може да се прочете." +msgid "could not read '%s'." +msgstr "от „%s“ не може да се чете." -#: sequencer.c:745 +#: sequencer.c:972 #, c-format -msgid "Could not read %s." -msgstr "„%s“ не може да се отвори." +msgid "unusable instruction sheet: '%s'" +msgstr "неизползваем файл с описание на предстоящите действия: „%s“" -#: sequencer.c:752 -#, c-format -msgid "Unusable instruction sheet: %s" -msgstr "Файлът с описание на предстоящите действия — „%s“ не може да се ползва" +#: sequencer.c:983 +msgid "cannot cherry-pick during a revert." +msgstr "" +"по време на отмяна на подаване не може да се извърши отбиране на подаване." + +#: sequencer.c:985 +msgid "cannot revert during a cherry-pick." +msgstr "по време на отбиране не може да се извърши отмяна на подаване." -#: sequencer.c:782 +#: sequencer.c:1028 #, c-format -msgid "Invalid key: %s" -msgstr "Неправилен ключ: „%s“" +msgid "invalid key: %s" +msgstr "неправилен ключ: „%s“" -#: sequencer.c:785 builtin/pull.c:50 builtin/pull.c:52 +#: sequencer.c:1031 #, c-format -msgid "Invalid value for %s: %s" -msgstr "Неправилна стойност за „%s“: „%s“" +msgid "invalid value for %s: %s" +msgstr "неправилна стойност за „%s“: „%s“" -#: sequencer.c:795 +#: sequencer.c:1063 #, c-format -msgid "Malformed options sheet: %s" -msgstr "Неправилно съдържание на файла с опции: „%s“" +msgid "malformed options sheet: '%s'" +msgstr "неправилен файл с опции: „%s“" -#: sequencer.c:814 +#: sequencer.c:1101 msgid "a cherry-pick or revert is already in progress" msgstr "" "в момента вече се извършва отбиране на подавания или пребазиране на клона" -#: sequencer.c:815 +#: sequencer.c:1102 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "използвайте „git cherry-pick (--continue | --quit | --abort)“" -#: sequencer.c:819 +#: sequencer.c:1106 #, c-format -msgid "Could not create sequencer directory %s" -msgstr "Директорията за секвенсора „%s“ не може да бъде създадена" +msgid "could not create sequencer directory '%s'" +msgstr "директорията за секвенсора „%s“ не може да бъде създадена" -#: sequencer.c:835 sequencer.c:916 -#, c-format -msgid "Error wrapping up %s." -msgstr "Обработката на „%s“ не завърши успешно." +#: sequencer.c:1120 +msgid "could not lock HEAD" +msgstr "указателят „HEAD“ не може да се заключи" -#: sequencer.c:854 sequencer.c:986 +#: sequencer.c:1151 sequencer.c:1289 msgid "no cherry-pick or revert in progress" msgstr "" "в момента не се извършва отбиране на подавания или пребазиране на клона" -#: sequencer.c:856 +#: sequencer.c:1153 msgid "cannot resolve HEAD" msgstr "Подаването сочено от указателя „HEAD“ не може да бъде открито" -#: sequencer.c:858 +#: sequencer.c:1155 sequencer.c:1189 msgid "cannot abort from a branch yet to be born" msgstr "" "действието не може да бъде преустановено, когато сте на клон, който тепърва " "предстои да бъде създаден" -#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851 +#: sequencer.c:1175 builtin/grep.c:578 #, c-format -msgid "cannot open %s" +msgid "cannot open '%s'" msgstr "„%s“ не може да бъде отворен" -#: sequencer.c:880 +#: sequencer.c:1177 #, c-format -msgid "cannot read %s: %s" -msgstr "файлът „%s“ не може да бъде прочетен: %s" +msgid "cannot read '%s': %s" +msgstr "„%s“ не може да бъде прочетен: %s" -#: sequencer.c:881 +#: sequencer.c:1178 msgid "unexpected end of file" msgstr "неочакван край на файл" -#: sequencer.c:887 +#: sequencer.c:1184 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" "запазеният преди започването на отбирането файл за указателя „HEAD“ — „%s“ е " "повреден" -#: sequencer.c:909 -#, c-format -msgid "Could not format %s." -msgstr "Файлът „%s“ не може да се форматира по подходящия начин." - -#: sequencer.c:1054 +#: sequencer.c:1354 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: не може да се отбере „%s“" -#: sequencer.c:1057 +#: sequencer.c:1358 #, c-format msgid "%s: bad revision" msgstr "%s: неправилна версия" -#: sequencer.c:1091 -msgid "Can't revert as initial commit" -msgstr "Първоначалното подаване не може да бъде отменено" +#: sequencer.c:1391 +msgid "can't revert as initial commit" +msgstr "първоначалното подаване не може да бъде отменено" -#: sequencer.c:1092 -msgid "Can't cherry-pick into empty head" -msgstr "При празен връх не могат да се отбират подавания" +#: setup.c:160 +#, 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: в това работно дърво няма такъв път.\n" +"За да указвате пътища, които локално не съществуват, използвайте:\n" +"\n" +" git КОМАНДА -- ПЪТ…" -#: setup.c:248 +#: setup.c:173 #, c-format -msgid "failed to read %s" -msgstr "файлът „%s“ не може да бъде прочетен" +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 "" +"нееднозначен аргумент „%s: непозната версия или пътят не е част от работното " +"дърво.\n" +"Разделяйте пътищата от версиите с „--“, ето така:\n" +"\n" +" git КОМАНДА [ВЕРСИЯ…] -- [ФАЙЛ…]" + +#: setup.c:223 +#, 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 "" +"нееднозначен аргумент „%s: както версия, така и път.\n" +"Разделяйте пътищата от версиите с „--“, ето така:\n" +"\n" +" git КОМАНДА [ВЕРСИЯ…] -- [ФАЙЛ…]" #: setup.c:468 #, c-format @@ -1825,26 +3084,101 @@ msgstr "Очаква се версия на хранилището на git <= % msgid "unknown repository extensions found:" msgstr "открити са непознати разширения в хранилището:" -#: sha1_file.c:1080 +#: setup.c:762 +#, c-format +msgid "Not a git repository (or any of the parent directories): %s" +msgstr "" +"Нито тази, нито която и да е от по-горните директории, не е хранилище на " +"git: %s" + +#: setup.c:764 setup.c:915 builtin/index-pack.c:1641 +msgid "Cannot come back to cwd" +msgstr "Процесът не може да се върне към предишната работна директория" + +#: setup.c:845 +msgid "Unable to read current working directory" +msgstr "Текущата работна директория не може да бъде прочетена" + +#: setup.c:920 +#, 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 "" +"Нито тази, нито която и да е от по-горните директории (до точката на " +"монтиране „%s“), не е хранилище на git.\n" +"Git работи в рамките на една файлова система, защото променливата на средата " +"„GIT_DISCOVERY_ACROSS_FILESYSTEM“ не е зададена." + +#: setup.c:927 +#, c-format +msgid "Cannot change to '%s/..'" +msgstr "Не може да се влезе в директорията „%s“" + +#: setup.c:989 +#, 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:473 +#, c-format +msgid "path '%s' does not exist" +msgstr "пътят „%s“ не съществува." + +#: sha1_file.c:499 +#, c-format +msgid "reference repository '%s' as a linked checkout is not supported yet." +msgstr "все още не се поддържа еталонно хранилище „%s“ като свързано." + +#: sha1_file.c:505 +#, c-format +msgid "reference repository '%s' is not a local repository." +msgstr "еталонното хранилище „%s“ не е локално" + +#: sha1_file.c:511 +#, c-format +msgid "reference repository '%s' is shallow" +msgstr "еталонното хранилище „%s“ е плитко" + +#: sha1_file.c:519 +#, c-format +msgid "reference repository '%s' is grafted" +msgstr "еталонното хранилище „%s“ е с присаждане" + +#: sha1_file.c:1159 msgid "offset before end of packfile (broken .idx?)" msgstr "" "отместване преди края на пакетния файл (възможно е индексът да е повреден)" -#: sha1_file.c:2458 +#: sha1_file.c:2592 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" "отместване преди началото на индекса на пакетния файл „%s“ (възможно е " "индексът да е повреден)" -#: sha1_file.c:2462 +#: sha1_file.c:2596 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" "отместване преди края на индекса на пакетния файл „%s“ (възможно е индексът " "да е отрязан)" -#: sha1_name.c:462 +#: sha1_name.c:407 +#, c-format +msgid "short SHA1 %s is ambiguous" +msgstr "късият SHA1 „%s“ не е еднозначен" + +#: sha1_name.c:418 +msgid "The candidates are:" +msgstr "Възможностите са:" + +#: sha1_name.c:578 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" @@ -1858,12 +3192,12 @@ msgid "" msgstr "" "При нормална работа Git никога не създава указатели, които завършват с 40\n" "шестнадесетични знака, защото стандартно те ще бъдат прескачани.\n" -"Възможно е такива указатели да са създадени случайно. Например:\n" +"Възможно е такива указатели да са създадени случайно. Например:\n" "\n" " git checkout -b $BRANCH $(git rev-parse…)\n" "\n" "където стойността на променливата на средата BRANCH е празна, при което се\n" -"създава подобен указател. Прегледайте тези указатели и ги изтрийте. Можете " +"създава подобен указател. Прегледайте тези указатели и ги изтрийте. Можете " "да\n" "спрете това съобщение като изпълните командата:\n" "„git config advice.objectNameWarning false“" @@ -1871,7 +3205,7 @@ msgstr "" #: submodule.c:64 submodule.c:98 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" -"Неслетите файлове „.gitmodules“ не могат да бъдат променяни. Първо " +"Неслетите файлове „.gitmodules“ не могат да бъдат променяни. Първо " "коригирайте конфликтите" #: submodule.c:68 submodule.c:102 @@ -1893,79 +3227,143 @@ msgstr "Записът „%s“ във файла „.gitmodules“ не мож msgid "staging updated .gitmodules failed" msgstr "неуспешно добавяне на променения файл „.gitmodules“ в индекса" -#: submodule.c:177 +#: submodule.c:158 msgid "negative values not allowed for submodule.fetchJobs" msgstr "Настройката „submodule.fetchJobs“ не приема отрицателни стойности" -#: submodule-config.c:355 +#: submodule-config.c:358 #, c-format msgid "invalid value for %s" msgstr "Неправилна стойност за „%s“" -#: trailer.c:237 +#: trailer.c:238 #, c-format msgid "running trailer command '%s' failed" msgstr "неуспешно изпълнение на завършващата команда „%s“" -#: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558 -#: trailer.c:562 +#: trailer.c:471 trailer.c:475 trailer.c:479 trailer.c:533 trailer.c:537 +#: trailer.c:541 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "неправилна стойност „%s“ за настройката „%s“" -#: trailer.c:544 trailer.c:549 builtin/remote.c:289 +#: trailer.c:523 trailer.c:528 builtin/remote.c:289 #, c-format msgid "more than one %s" msgstr "стойността „%s“ се повтаря в настройките" -#: trailer.c:582 +#: trailer.c:672 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "празна завършваща лексема в епилога „%.*s“" -#: trailer.c:702 +#: trailer.c:695 #, c-format msgid "could not read input file '%s'" msgstr "входният файл „%s“ не може да бъде прочетен" -#: trailer.c:705 +#: trailer.c:698 msgid "could not read from stdin" msgstr "от стандартния вход не може да се чете" -#: trailer.c:857 builtin/am.c:42 +#: trailer.c:929 builtin/am.c:44 #, c-format msgid "could not stat %s" msgstr "Не може да се получи информация чрез „stat“ за „%s“" -#: trailer.c:859 +#: trailer.c:931 #, c-format msgid "file %s is not a regular file" msgstr "„%s“ не е обикновен файл" -#: trailer.c:861 +#: trailer.c:933 #, c-format msgid "file %s is not writable by user" msgstr "„%s“: няма права за записване на файла" -#: trailer.c:873 +#: trailer.c:945 msgid "could not open temporary file" msgstr "временният файл не може да се отвори" -#: trailer.c:912 +#: trailer.c:983 #, c-format msgid "could not rename temporary file to %s" msgstr "временният файл не може да се преименува на „%s“" -#: transport-helper.c:1041 +#: transport.c:62 +#, c-format +msgid "Would set upstream of '%s' to '%s' of '%s'\n" +msgstr "Клонът „%s“ ще следи „%s“ от „%s“\n" + +#: transport.c:151 +#, c-format +msgid "transport: invalid depth option '%s'" +msgstr "transport: неправилна опция за дълбочина: %s" + +#: transport.c:817 +#, c-format +msgid "" +"The following submodule paths contain changes that can\n" +"not be found on any remote:\n" +msgstr "" +"Следните пътища за подмодули съдържат промени,\n" +"които липсват от всички отдалечени хранилища:\n" + +#: transport.c:821 +#, 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" +"Пробвайте да ги изтласкате чрез командата:\n" +"\n" +" git push --recurse-submodules=on-demand\n" +"\n" +"или отидете в съответната директория и изпълнете:\n" +"\n" +" git push\n" +"\n" + +#: transport.c:829 +msgid "Aborting." +msgstr "Преустановяване на действието." + +#: transport-helper.c:1075 #, c-format msgid "Could not read ref %s" msgstr "Указателят „%s“ не може да се прочете." +#: tree-walk.c:31 +msgid "too-short tree object" +msgstr "прекалено кратък обект-дърво" + +#: tree-walk.c:37 +msgid "malformed mode in tree entry" +msgstr "неправилни права за достъп в запис в дърво" + +#: tree-walk.c:41 +msgid "empty filename in tree entry" +msgstr "празно име на файл в запис в дърво" + +#: tree-walk.c:113 +msgid "too-short tree file" +msgstr "прекалено кратък файл-дърво" + #: unpack-trees.c:64 #, 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 can switch branches." +"%%sPlease commit your changes or stash them before you switch branches." msgstr "" "Изтеглянето ще презапише локалните промени на тези файлове:\n" "%%sПодайте или скатайте промените, за да преминете към нов клон." @@ -1983,7 +3381,7 @@ msgstr "" #, 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 can merge." +"%%sPlease commit your changes or stash them before you merge." msgstr "" "Сливането ще презапише локалните промени на тези файлове:\n" "%%sПодайте или скатайте промените, за да слеете." @@ -2001,7 +3399,7 @@ msgstr "" #, 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 can %s." +"%%sPlease commit your changes or stash them before you %s." msgstr "" "„%s“ ще презапише локалните промени на тези файлове:\n" "%%sПодайте или скатайте промените, за да извършите „%s“." @@ -2028,7 +3426,7 @@ msgstr "" #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" -"%%sPlease move or remove them before you can switch branches." +"%%sPlease move or remove them before you switch branches." msgstr "" "Изтеглянето ще изтрие тези неследени файлове в работното дърво:\n" "%%sПреместете ги или ги изтрийте, за да преминете на друг клон." @@ -2046,7 +3444,7 @@ msgstr "" #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" -"%%sPlease move or remove them before you can merge." +"%%sPlease move or remove them before you merge." msgstr "" "Сливането ще изтрие тези неследени файлове в работното дърво:\n" "%%sПреместете ги или ги изтрийте, за да слеете." @@ -2064,7 +3462,7 @@ msgstr "" #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" -"%%sPlease move or remove them before you can %s." +"%%sPlease move or remove them before you %s." msgstr "" "„%s“ ще изтрие тези неследени файлове в работното дърво:\n" "%%sПреместете ги или ги изтрийте, за да извършите „%s“." @@ -2083,7 +3481,7 @@ msgstr "" msgid "" "The following untracked working tree files would be overwritten by " "checkout:\n" -"%%sPlease move or remove them before you can switch branches." +"%%sPlease move or remove them before you switch branches." msgstr "" "Изтеглянето ще презапише тези неследени файлове в работното дърво:\n" "%%sПреместете ги или ги изтрийте, за да смените клон." @@ -2102,7 +3500,7 @@ msgstr "" #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" -"%%sPlease move or remove them before you can merge." +"%%sPlease move or remove them before you merge." msgstr "" "Сливането ще презапише тези неследени файлове в работното дърво:\n" "%%sПреместете ги или ги изтрийте, за да слеете." @@ -2120,7 +3518,7 @@ msgstr "" #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" -"%%sPlease move or remove them before you can %s." +"%%sPlease move or remove them before you %s." msgstr "" "„%s“ ще презапише тези неследени файлове в работното дърво:\n" "%%sПреместете ги или ги изтрийте, за да извършите „%s“." @@ -2137,7 +3535,7 @@ msgstr "" #: unpack-trees.c:121 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." -msgstr "Записът за „%s“ съвпада с този за „%s“. Не може да се присвои." +msgstr "Записът за „%s“ съвпада с този за „%s“. Не може да се присвои." #: unpack-trees.c:124 #, c-format @@ -2152,7 +3550,7 @@ msgstr "" #: unpack-trees.c:126 #, c-format msgid "" -"The following Working tree files would be overwritten by sparse checkout " +"The following working tree files would be overwritten by sparse checkout " "update:\n" "%s" msgstr "" @@ -2163,7 +3561,7 @@ msgstr "" #: unpack-trees.c:128 #, c-format msgid "" -"The following Working tree files would be removed by sparse checkout " +"The following working tree files would be removed by sparse checkout " "update:\n" "%s" msgstr "" @@ -2209,206 +3607,196 @@ msgstr "неправилен номер на порт" msgid "invalid '..' path segment" msgstr "неправилна част от пътя „..“" -#: wrapper.c:222 wrapper.c:381 +#: worktree.c:282 +#, c-format +msgid "failed to read '%s'" +msgstr "„%s“ не може да бъде прочетен" + +#: wrapper.c:222 wrapper.c:392 #, c-format msgid "could not open '%s' for reading and writing" msgstr "„%s“ не може да бъде отворен и за четене, и за запис" -#: wrapper.c:224 wrapper.c:383 builtin/am.c:779 +#: wrapper.c:224 wrapper.c:394 builtin/am.c:766 #, c-format msgid "could not open '%s' for writing" msgstr "„%s“ не може да бъде отворен за запис" -#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772 -#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086 -#: builtin/pull.c:407 +#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759 +#: builtin/am.c:847 builtin/commit.c:1705 builtin/merge.c:1029 +#: builtin/pull.c:341 #, c-format msgid "could not open '%s' for reading" msgstr "файлът не може да бъде прочетен: „%s“" -#: wrapper.c:594 wrapper.c:615 +#: wrapper.c:605 wrapper.c:626 #, c-format msgid "unable to access '%s'" msgstr "няма достъп до „%s“" -#: wrapper.c:623 +#: wrapper.c:634 msgid "unable to get current working directory" msgstr "текущата работна директория е недостъпна" -#: wrapper.c:650 -#, c-format -msgid "could not open %s for writing" -msgstr "„%s“ не може да бъде отворен за запис" - # FIXME - must be the same as Could not write to '%s' above -#: wrapper.c:661 builtin/am.c:410 +#: wrapper.c:658 #, c-format msgid "could not write to %s" msgstr "„%s“ не може да бъде записан" -#: wrapper.c:667 +#: wrapper.c:660 #, c-format msgid "could not close %s" msgstr "„%s“ не може да се затвори" -#: wt-status.c:150 +#: wt-status.c:151 msgid "Unmerged paths:" msgstr "Неслети пътища:" -#: wt-status.c:177 wt-status.c:204 +#: wt-status.c:178 wt-status.c:205 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (използвайте „git reset %s ФАЙЛ…“, за да извадите ФАЙЛа от индекса)" -#: wt-status.c:179 wt-status.c:206 +#: wt-status.c:180 wt-status.c:207 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr "" " (използвайте „git rm --cached %s ФАЙЛ…“, за да извадите ФАЙЛа от индекса)" -#: wt-status.c:183 +#: wt-status.c:184 msgid " (use \"git add <file>...\" to mark resolution)" msgstr "" " (използвайте „git add ФАЙЛ…“, за да укажете разрешаването на конфликта)" -#: wt-status.c:185 wt-status.c:189 +#: wt-status.c:186 wt-status.c:190 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" " (използвайте „git add/rm ФАЙЛ…“, според решението, което избирате за " "конфликта)" -#: wt-status.c:187 +#: wt-status.c:188 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" " (използвайте „git rm ФАЙЛ…“, за да укажете разрешаването на конфликта)" -#: wt-status.c:198 wt-status.c:881 +#: wt-status.c:199 wt-status.c:945 msgid "Changes to be committed:" msgstr "Промени, които ще бъдат подадени:" -#: wt-status.c:216 wt-status.c:890 +#: wt-status.c:217 wt-status.c:954 msgid "Changes not staged for commit:" msgstr "Промени, които не са в индекса за подаване:" -#: wt-status.c:220 +#: wt-status.c:221 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" " (използвайте „git add ФАЙЛ…“, за да обновите съдържанието за подаване)" -#: wt-status.c:222 +#: wt-status.c:223 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" " (използвайте „git add/rm ФАЙЛ…“, за да обновите съдържанието за подаване)" -#: wt-status.c:223 +#: wt-status.c:224 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (използвайте „git checkout -- ФАЙЛ…“, за да отхвърлите промените в " "работното дърво)" -#: wt-status.c:225 +#: wt-status.c:226 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (подайте или отхвърлете неследеното или промененото съдържание в " "подмодулите)" -#: wt-status.c:237 +#: wt-status.c:238 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (използвайте „git %s ФАЙЛ…“, за да определите какво включвате в подаването)" -#: wt-status.c:252 +#: wt-status.c:253 msgid "both deleted:" msgstr "изтрити в двата случая:" -#: wt-status.c:254 +#: wt-status.c:255 msgid "added by us:" msgstr "добавени от вас:" -#: wt-status.c:256 +#: wt-status.c:257 msgid "deleted by them:" msgstr "изтрити от тях:" -#: wt-status.c:258 +#: wt-status.c:259 msgid "added by them:" msgstr "добавени от тях:" -#: wt-status.c:260 +#: wt-status.c:261 msgid "deleted by us:" msgstr "изтрити от вас:" -#: wt-status.c:262 +#: wt-status.c:263 msgid "both added:" msgstr "добавени и в двата случая:" -#: wt-status.c:264 +#: wt-status.c:265 msgid "both modified:" msgstr "променени и в двата случая:" -#: wt-status.c:266 -#, c-format -msgid "bug: unhandled unmerged status %x" -msgstr "грешка: състоянието на промяната „%x“ не може да бъде обработено" - -#: wt-status.c:274 +#: wt-status.c:275 msgid "new file:" msgstr "нов файл:" -#: wt-status.c:276 +#: wt-status.c:277 msgid "copied:" msgstr "копиран:" -#: wt-status.c:278 +#: wt-status.c:279 msgid "deleted:" msgstr "изтрит:" -#: wt-status.c:280 +#: wt-status.c:281 msgid "modified:" msgstr "променен:" -#: wt-status.c:282 +#: wt-status.c:283 msgid "renamed:" msgstr "преименуван:" -#: wt-status.c:284 +#: wt-status.c:285 msgid "typechange:" msgstr "смяна на вида:" -#: wt-status.c:286 +#: wt-status.c:287 msgid "unknown:" msgstr "непозната промяна:" -#: wt-status.c:288 +#: wt-status.c:289 msgid "unmerged:" msgstr "неслят:" -#: wt-status.c:370 +#: wt-status.c:371 msgid "new commits, " msgstr "нови подавания, " -#: wt-status.c:372 +#: wt-status.c:373 msgid "modified content, " msgstr "променено съдържание, " -#: wt-status.c:374 +#: wt-status.c:375 msgid "untracked content, " msgstr "неследено съдържание, " -#: wt-status.c:391 -#, c-format -msgid "bug: unhandled diff status %c" -msgstr "грешка: състоянието на промяната „%c“ не може да бъде обработено" - -#: wt-status.c:755 +#: wt-status.c:818 msgid "Submodules changed but not updated:" msgstr "Подмодулите са променени, но не са обновени:" -#: wt-status.c:757 +#: wt-status.c:820 msgid "Submodule changes to be committed:" msgstr "Промени в подмодулите за подаване:" -#: wt-status.c:838 +#: wt-status.c:901 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -2416,229 +3804,233 @@ msgstr "" "Не променяйте горния ред.\n" "Всичко отдолу ще бъде изтрито." -#: wt-status.c:949 +#: wt-status.c:1013 msgid "You have unmerged paths." msgstr "Някои пътища не са слети." -#: wt-status.c:952 +#: wt-status.c:1016 msgid " (fix conflicts and run \"git commit\")" msgstr " (коригирайте конфликтите и изпълнете „git commit“)" -#: wt-status.c:956 +#: wt-status.c:1018 +msgid " (use \"git merge --abort\" to abort the merge)" +msgstr " (използвайте „git merge --abort“, за да преустановите сливането)" + +#: wt-status.c:1023 msgid "All conflicts fixed but you are still merging." msgstr "Всички конфликти са решени, но продължавате сливането." -#: wt-status.c:959 +#: wt-status.c:1026 msgid " (use \"git commit\" to conclude merge)" msgstr " (използвайте „git commit“, за да завършите сливането)" -#: wt-status.c:969 +#: wt-status.c:1036 msgid "You are in the middle of an am session." msgstr "В момента прилагате поредица от кръпки чрез „git am“." -#: wt-status.c:972 +#: wt-status.c:1039 msgid "The current patch is empty." msgstr "Текущата кръпка е празна." -#: wt-status.c:976 +#: wt-status.c:1043 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (коригирайте конфликтите и изпълнете „git am --continue“)" -#: wt-status.c:978 +#: wt-status.c:1045 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (използвайте „git am --skip“, за да пропуснете тази кръпка)" -#: wt-status.c:980 +#: wt-status.c:1047 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" " (използвайте „git am --abort“, за да възстановите първоначалния клон)" -#: wt-status.c:1105 +#: wt-status.c:1172 msgid "No commands done." msgstr "Не са изпълнени команди." -#: wt-status.c:1108 +#: wt-status.c:1175 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Последна изпълнена команда (изпълнена е общо %d команда):" msgstr[1] "Последна изпълнена команда (изпълнени са общо %d команди):" -#: wt-status.c:1119 +#: wt-status.c:1186 #, c-format msgid " (see more in file %s)" msgstr " повече информация има във файла „%s“)" -#: wt-status.c:1124 +#: wt-status.c:1191 msgid "No commands remaining." msgstr "Не остават повече команди." -#: wt-status.c:1127 +#: wt-status.c:1194 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Следваща команда за изпълнение (остава още %d команда):" msgstr[1] "Следваща команда за изпълнение (остават още %d команди):" -#: wt-status.c:1135 +#: wt-status.c:1202 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr "" " (използвайте „git rebase --edit-todo“, за да разгледате и редактирате)" -#: wt-status.c:1148 +#: wt-status.c:1215 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "В момента пребазирате клона „%s“ върху „%s“." -#: wt-status.c:1153 +#: wt-status.c:1220 msgid "You are currently rebasing." msgstr "В момента пребазирате." -#: wt-status.c:1167 +#: wt-status.c:1234 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (коригирайте конфликтите и използвайте „git rebase --continue“)" -#: wt-status.c:1169 +#: wt-status.c:1236 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (използвайте „git rebase --skip“, за да пропуснете тази кръпка)" -#: wt-status.c:1171 +#: wt-status.c:1238 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" " (използвайте „git rebase --abort“, за да възстановите първоначалния клон)" -#: wt-status.c:1177 +#: wt-status.c:1244 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (всички конфликти са коригирани: изпълнете „git rebase --continue“)" -#: wt-status.c:1181 +#: wt-status.c:1248 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "В момента разделяте подаване докато пребазирате клона „%s“ върху „%s“." -#: wt-status.c:1186 +#: wt-status.c:1253 msgid "You are currently splitting a commit during a rebase." msgstr "В момента разделяте подаване докато пребазирате." -#: wt-status.c:1189 +#: wt-status.c:1256 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (След като работното ви дърво стане чисто, използвайте „git rebase --" "continue“)" -#: wt-status.c:1193 +#: wt-status.c:1260 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "В момента редактирате подаване докато пребазирате клона „%s“ върху „%s“." -#: wt-status.c:1198 +#: wt-status.c:1265 msgid "You are currently editing a commit during a rebase." msgstr "В момента редактирате подаване докато пребазирате." -#: wt-status.c:1201 +#: wt-status.c:1268 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" " (използвайте „git commit --amend“, за да редактирате текущото подаване)" -#: wt-status.c:1203 +#: wt-status.c:1270 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (използвайте „git rebase --continue“, след като завършите промените си)" -#: wt-status.c:1213 +#: wt-status.c:1280 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "В момента отбирате подаването „%s“." -#: wt-status.c:1218 +#: wt-status.c:1285 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (коригирайте конфликтите и изпълнете „git cherry-pick --continue“)" -#: wt-status.c:1221 +#: wt-status.c:1288 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (всички конфликти са коригирани, изпълнете „git cherry-pick --continue“)" -#: wt-status.c:1223 +#: wt-status.c:1290 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (използвайте „git cherry-pick --abort“, за да отмените всички действия с " "отбиране)" -#: wt-status.c:1232 +#: wt-status.c:1299 #, c-format msgid "You are currently reverting commit %s." msgstr "В момента отменяте подаване „%s“." -#: wt-status.c:1237 +#: wt-status.c:1304 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (коригирайте конфликтите и изпълнете „git revert --continue“)" -#: wt-status.c:1240 +#: wt-status.c:1307 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (всички конфликти са коригирани, изпълнете „git revert --continue“)" -#: wt-status.c:1242 +#: wt-status.c:1309 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" " (използвайте „git revert --abort“, за да преустановите отмяната на " "подаване)" -#: wt-status.c:1253 +#: wt-status.c:1320 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "В момента търсите двоично, като сте стартирали от клон „%s“." -#: wt-status.c:1257 +#: wt-status.c:1324 msgid "You are currently bisecting." msgstr "В момента търсите двоично." -#: wt-status.c:1260 +#: wt-status.c:1327 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" " (използвайте „git bisect reset“, за да се върнете към първоначалното " "състояние и клон)" -#: wt-status.c:1460 +#: wt-status.c:1524 msgid "On branch " msgstr "На клон " -#: wt-status.c:1466 +#: wt-status.c:1530 msgid "interactive rebase in progress; onto " msgstr "извършвате интерактивно пребазиране върху " -#: wt-status.c:1468 +#: wt-status.c:1532 msgid "rebase in progress; onto " msgstr "извършвате пребазиране върху " -#: wt-status.c:1473 +#: wt-status.c:1537 msgid "HEAD detached at " msgstr "Указателят „HEAD“ не е свързан и е при " -#: wt-status.c:1475 +#: wt-status.c:1539 msgid "HEAD detached from " msgstr "Указателят „HEAD“ не е свързан и е отделѐн от " -#: wt-status.c:1478 +#: wt-status.c:1542 msgid "Not currently on any branch." msgstr "Извън всички клони." -#: wt-status.c:1496 +#: wt-status.c:1560 msgid "Initial commit" msgstr "Първоначално подаване" -#: wt-status.c:1510 +#: wt-status.c:1574 msgid "Untracked files" msgstr "Неследени файлове" -#: wt-status.c:1512 +#: wt-status.c:1576 msgid "Ignored files" msgstr "Игнорирани файлове" -#: wt-status.c:1516 +#: wt-status.c:1580 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -2650,32 +4042,32 @@ msgstr "" "изпълнението, но не трябва да забравяте ръчно да добавяте новите файлове.\n" "За повече подробности погледнете „git status help“." -#: wt-status.c:1522 +#: wt-status.c:1586 #, c-format msgid "Untracked files not listed%s" msgstr "Неследените файлове не са изведени%s" -#: wt-status.c:1524 +#: wt-status.c:1588 msgid " (use -u option to show untracked files)" msgstr " (използвайте опцията „-u“, за да изведете неследените файлове)" -#: wt-status.c:1530 +#: wt-status.c:1594 msgid "No changes" msgstr "Няма промени" -#: wt-status.c:1535 +#: wt-status.c:1599 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "към индекса за подаване не са добавени промени (използвайте „git add“ и/или " "„git commit -a“)\n" -#: wt-status.c:1538 +#: wt-status.c:1602 #, c-format msgid "no changes added to commit\n" msgstr "към индекса за подаване не са добавени промени\n" -#: wt-status.c:1541 +#: wt-status.c:1605 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -2684,56 +4076,71 @@ msgstr "" "към индекса за подаване не са добавени промени, но има нови файлове " "(използвайте „git add“, за да започне тяхното следене)\n" -#: wt-status.c:1544 +#: wt-status.c:1608 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "към индекса за подаване не са добавени промени, но има нови файлове\n" -#: wt-status.c:1547 +#: wt-status.c:1611 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "липсват каквито и да е промени (създайте или копирайте файлове и използвайте " "„git add“, за да започне тяхното следене)\n" -#: wt-status.c:1550 wt-status.c:1555 +#: wt-status.c:1614 wt-status.c:1619 #, c-format msgid "nothing to commit\n" msgstr "липсват каквито и да е промени\n" -#: wt-status.c:1553 +#: wt-status.c:1617 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "липсват каквито и да е промени (използвайте опцията „-u“, за да се изведат и " "неследените файлове)\n" -#: wt-status.c:1557 +#: wt-status.c:1621 #, c-format -msgid "nothing to commit, working directory clean\n" +msgid "nothing to commit, working tree clean\n" msgstr "липсват каквито и да е промени, работното дърво е чисто\n" -#: wt-status.c:1664 +#: wt-status.c:1728 msgid "Initial commit on " msgstr "Първоначално подаване на клон" -#: wt-status.c:1668 +#: wt-status.c:1732 msgid "HEAD (no branch)" msgstr "HEAD (извън клон)" -#: wt-status.c:1697 +#: wt-status.c:1761 msgid "gone" msgstr "изтрит" -#: wt-status.c:1699 wt-status.c:1707 +#: wt-status.c:1763 wt-status.c:1771 msgid "behind " msgstr "назад с " -#: wt-status.c:1702 wt-status.c:1705 +#: wt-status.c:1766 wt-status.c:1769 msgid "ahead " msgstr "напред с " -#: compat/precompose_utf8.c:57 builtin/clone.c:415 +#. TRANSLATORS: the action is e.g. "pull with rebase" +#: wt-status.c:2270 +#, c-format +msgid "cannot %s: You have unstaged changes." +msgstr "не може да извършите „%s“, защото има промени, които не са в индекса." + +#: wt-status.c:2276 +msgid "additionally, your index contains uncommitted changes." +msgstr "освен това в индекса има неподадени промени." + +#: wt-status.c:2278 +#, c-format +msgid "cannot %s: Your index contains uncommitted changes." +msgstr "не може да извършите „%s“, защото в индекса има неподадени промени." + +#: compat/precompose_utf8.c:57 builtin/clone.c:414 #, c-format msgid "failed to unlink '%s'" msgstr "неуспешно изтриване на „%s“" @@ -2742,265 +4149,264 @@ msgstr "неуспешно изтриване на „%s“" msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [ОПЦИЯ…] [--] ПЪТ…" -#: builtin/add.c:65 +#: builtin/add.c:80 #, c-format msgid "unexpected diff status %c" msgstr "неочакван изходен код при генериране на разлика: %c" -#: builtin/add.c:70 builtin/commit.c:280 +#: builtin/add.c:85 builtin/commit.c:291 msgid "updating files failed" msgstr "неуспешно обновяване на файловете" -#: builtin/add.c:80 +#: builtin/add.c:95 #, c-format msgid "remove '%s'\n" msgstr "изтриване на „%s“\n" -#: builtin/add.c:134 +#: builtin/add.c:149 msgid "Unstaged changes after refreshing the index:" msgstr "Промени, които и след обновяването на индекса не са добавени към него:" -#: builtin/add.c:194 builtin/rev-parse.c:811 +#: builtin/add.c:209 builtin/rev-parse.c:840 msgid "Could not read the index" msgstr "Индексът не може да бъде прочетен" -#: builtin/add.c:205 +#: builtin/add.c:220 #, c-format msgid "Could not open '%s' for writing." msgstr "Файлът „%s“ не може да бъде отворен за запис." -#: builtin/add.c:209 +#: builtin/add.c:224 msgid "Could not write patch" msgstr "Кръпката не може да бъде записана" -#: builtin/add.c:212 +#: builtin/add.c:227 msgid "editing patch failed" msgstr "неуспешно редактиране на кръпка" -#: builtin/add.c:215 +#: builtin/add.c:230 #, c-format msgid "Could not stat '%s'" msgstr "Не може да се получи информация чрез „stat“ за файла „%s“" -#: builtin/add.c:217 +#: builtin/add.c:232 msgid "Empty patch. Aborted." msgstr "Празна кръпка, преустановяване на действието." -#: builtin/add.c:222 +#: builtin/add.c:237 #, c-format msgid "Could not apply '%s'" msgstr "Кръпката „%s“ не може да бъде приложена" -#: builtin/add.c:232 +#: builtin/add.c:247 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Следните пътища ще бъдат игнорирани според някой от файловете „.gitignore“:\n" -#: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111 -#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511 -#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162 +#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:111 +#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:521 +#: builtin/remote.c:1326 builtin/rm.c:268 builtin/send-pack.c:162 msgid "dry run" -msgstr "пробно изпълнeние" +msgstr "пробно изпълнение" -#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19 -#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557 -#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114 -msgid "be verbose" -msgstr "повече подробности" - -#: builtin/add.c:252 +#: builtin/add.c:269 msgid "interactive picking" msgstr "интерактивно отбиране на промени" -#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286 +#: builtin/add.c:270 builtin/checkout.c:1156 builtin/reset.c:286 msgid "select hunks interactively" msgstr "интерактивен избор на парчета код" -#: builtin/add.c:254 +#: builtin/add.c:271 msgid "edit current diff and apply" msgstr "редактиране на текущата разлика и прилагане" -#: builtin/add.c:255 +#: builtin/add.c:272 msgid "allow adding otherwise ignored files" msgstr "добавяне и на иначе игнорираните файлове" -#: builtin/add.c:256 +#: builtin/add.c:273 msgid "update tracked files" msgstr "обновяване на следените файлове" -#: builtin/add.c:257 +#: builtin/add.c:274 msgid "record only the fact that the path will be added later" msgstr "отбелязване само на факта, че пътят ще бъде добавен по-късно" -#: builtin/add.c:258 +#: builtin/add.c:275 msgid "add changes from all tracked and untracked files" msgstr "добавяне на всички промени в следените и неследените файлове" -#: builtin/add.c:261 +#: builtin/add.c:278 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" "игнориране на пътищата, които са изтрити от работното дърво (същото като „--" "no-all“)" -#: builtin/add.c:263 +#: builtin/add.c:280 msgid "don't add, only refresh the index" msgstr "без добавяне на нови файлове, само обновяване на индекса" -#: builtin/add.c:264 +#: builtin/add.c:281 msgid "just skip files which cannot be added because of errors" msgstr "" "прескачане на файловете, които не могат да бъдат добавени поради грешки" -#: builtin/add.c:265 +#: builtin/add.c:282 msgid "check if - even missing - files are ignored in dry run" msgstr "" "проверка, че при пробно изпълнение всички файлове, дори и изтритите, се " "игнорират" -#: builtin/add.c:287 +#: builtin/add.c:283 builtin/update-index.c:947 +msgid "(+/-)x" +msgstr "(+/-)x" + +#: builtin/add.c:283 builtin/update-index.c:948 +msgid "override the executable bit of the listed files" +msgstr "изрично задаване на стойността на флага дали файлът е изпълним" + +#: builtin/add.c:305 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Използвайте опцията „-f“, за да ги добавите наистина.\n" -#: builtin/add.c:294 +#: builtin/add.c:312 msgid "adding files failed" msgstr "неуспешно добавяне на файлове" -#: builtin/add.c:330 +#: builtin/add.c:348 msgid "-A and -u are mutually incompatible" msgstr "опциите „-A“ и „-u“ са несъвместими" -#: builtin/add.c:337 +#: builtin/add.c:355 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "Опцията „--ignore-missing“ е съвместима само с „--dry-run“" -#: builtin/add.c:352 +#: builtin/add.c:359 +#, c-format +msgid "--chmod param '%s' must be either -x or +x" +msgstr "параметърът към „--chmod“ — „%s“ може да е или „-x“, или „+x“" + +#: builtin/add.c:374 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Нищо не е зададено и нищо не е добавено.\n" -#: builtin/add.c:353 +#: builtin/add.c:375 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Вероятно искахте да използвате „git add .“?\n" -#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914 -#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 -#: builtin/submodule--helper.c:240 +#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279 +#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350 +#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/submodule--helper.c:244 msgid "index file corrupt" msgstr "файлът с индекса е повреден" -#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430 -msgid "Unable to write new index file" -msgstr "Новият индекс не може да бъде записан" - -#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089 -#, c-format -msgid "could not read '%s'" -msgstr "файлът „%s“ не може да бъде прочетен" - -#: builtin/am.c:430 +#: builtin/am.c:414 msgid "could not parse author script" msgstr "скриптът за автор не може да се анализира" -#: builtin/am.c:507 +#: builtin/am.c:491 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "„%s“ бе изтрит от куката „applypatch-msg“" -#: builtin/am.c:548 builtin/notes.c:300 +#: builtin/am.c:532 #, c-format msgid "Malformed input line: '%s'." msgstr "Даденият входен ред е с неправилен формат: „%s“." -#: builtin/am.c:585 builtin/notes.c:315 +#: builtin/am.c:569 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Бележката не може да се копира от „%s“ към „%s“" -#: builtin/am.c:611 +#: builtin/am.c:595 msgid "fseek failed" msgstr "неуспешно изпълнение на „fseek“" -#: builtin/am.c:788 +#: builtin/am.c:775 #, c-format msgid "could not parse patch '%s'" msgstr "кръпката „%s“ не може да се анализира" -#: builtin/am.c:853 +#: builtin/am.c:840 msgid "Only one StGIT patch series can be applied at once" msgstr "" "Само една серия кръпки от „StGIT“ може да бъде прилагана в даден момент" -#: builtin/am.c:900 +#: builtin/am.c:887 msgid "invalid timestamp" msgstr "неправилна стойност за време" -#: builtin/am.c:903 builtin/am.c:911 +#: builtin/am.c:890 builtin/am.c:898 msgid "invalid Date line" msgstr "неправилен ред за дата „Date“" -#: builtin/am.c:908 +#: builtin/am.c:895 msgid "invalid timezone offset" msgstr "неправилно отместване на часовия пояс" -#: builtin/am.c:995 +#: builtin/am.c:984 msgid "Patch format detection failed." msgstr "Форматът на кръпката не може да бъде определен." -#: builtin/am.c:1000 builtin/clone.c:380 +#: builtin/am.c:989 builtin/clone.c:379 #, c-format msgid "failed to create directory '%s'" msgstr "директорията „%s“ не може да бъде създадена" -#: builtin/am.c:1004 +#: builtin/am.c:993 msgid "Failed to split patches." msgstr "Кръпките не могат да бъдат разделени." -#: builtin/am.c:1136 builtin/commit.c:365 +#: builtin/am.c:1125 builtin/commit.c:376 msgid "unable to write index file" msgstr "индексът не може да бъде записан" -#: builtin/am.c:1187 +#: builtin/am.c:1176 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "След коригирането на този проблем изпълнете „%s --continue“." -#: builtin/am.c:1188 +#: builtin/am.c:1177 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Ако предпочитате да прескочите тази кръпка, изпълнете „%s --skip“." -#: builtin/am.c:1189 +#: builtin/am.c:1178 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "За да се върнете към първоначалното състояние, изпълнете „%s --abort“." -#: builtin/am.c:1327 +#: builtin/am.c:1316 msgid "Patch is empty. Was it split wrong?" -msgstr "Празна кръпка. Дали не е разделена погрешно?" +msgstr "Празна кръпка. Дали не е разделена погрешно?" -#: builtin/am.c:1401 builtin/log.c:1516 +#: builtin/am.c:1390 builtin/log.c:1550 #, c-format msgid "invalid ident line: %s" msgstr "грешна идентичност: %s" -#: builtin/am.c:1428 +#: builtin/am.c:1417 #, c-format msgid "unable to parse commit %s" msgstr "подаването не може да бъде анализирано: %s" -#: builtin/am.c:1630 +#: builtin/am.c:1610 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "В хранилището липсват необходимите обекти BLOB, за да се премине към тройно " "сливане." -#: builtin/am.c:1632 +#: builtin/am.c:1612 msgid "Using index info to reconstruct a base tree..." msgstr "Базовото дърво се реконструира от информацията в индекса…" -#: builtin/am.c:1651 +#: builtin/am.c:1631 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -3008,39 +4414,39 @@ msgstr "" "Кръпката не може да се приложи към обектите BLOB в индекса.\n" "Да не би да сте я редактирали на ръка?" -#: builtin/am.c:1657 +#: builtin/am.c:1637 msgid "Falling back to patching base and 3-way merge..." msgstr "Преминаване към прилагане на кръпка към базата и тройно сливане…" -#: builtin/am.c:1672 +#: builtin/am.c:1662 msgid "Failed to merge in the changes." msgstr "Неуспешно сливане на промените." -#: builtin/am.c:1696 builtin/merge.c:636 +#: builtin/am.c:1686 builtin/merge.c:628 msgid "git write-tree failed to write a tree" msgstr "Командата „git write-tree“ не успя да запише обект-дърво" -#: builtin/am.c:1703 +#: builtin/am.c:1693 msgid "applying to an empty history" msgstr "прилагане върху празна история" -#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841 -#: builtin/merge.c:866 +#: builtin/am.c:1706 builtin/commit.c:1769 builtin/merge.c:798 +#: builtin/merge.c:823 msgid "failed to write commit object" msgstr "обектът за подаването не може да бъде записан" -#: builtin/am.c:1748 builtin/am.c:1752 +#: builtin/am.c:1739 builtin/am.c:1743 #, c-format msgid "cannot resume: %s does not exist." msgstr "не може да се продължи — „%s“ не съществува." -#: builtin/am.c:1768 +#: builtin/am.c:1759 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "За интерактивно изпълнение е необходимо стандартният\n" "изход да е свързан с терминал, а в момента не е." -#: builtin/am.c:1773 +#: builtin/am.c:1764 msgid "Commit Body is:" msgstr "Тялото на кръпката за прилагане е:" @@ -3048,38 +4454,38 @@ msgstr "Тялото на кръпката за прилагане е:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1783 +#: builtin/am.c:1774 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" "Прилагане? „y“ — да/„n“ — не/„e“ — редактиране/„v“ — преглед/„a“ — приемане " "на всичко:" -#: builtin/am.c:1833 +#: builtin/am.c:1824 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "" "Индексът не е чист: кръпките не могат да бъдат приложени (замърсени са: %s)" -#: builtin/am.c:1868 builtin/am.c:1940 +#: builtin/am.c:1861 builtin/am.c:1933 #, c-format msgid "Applying: %.*s" msgstr "Прилагане: %.*s" -#: builtin/am.c:1884 +#: builtin/am.c:1877 msgid "No changes -- Patch already applied." msgstr "Без промени — кръпката вече е приложена." -#: builtin/am.c:1892 +#: builtin/am.c:1885 #, c-format msgid "Patch failed at %s %.*s" msgstr "Неуспешно прилагане на кръпка при %s %.*s“" -#: builtin/am.c:1898 +#: builtin/am.c:1891 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "Дубликат на проблемната кръпка се намира в: %s" -#: builtin/am.c:1943 +#: builtin/am.c:1936 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -3089,7 +4495,7 @@ msgstr "" "Ако няма друга промяна за включване в индекса, най-вероятно някоя друга\n" "кръпка е довела до същите промени и в такъв случай просто пропуснете тази." -#: builtin/am.c:1950 +#: builtin/am.c:1943 msgid "" "You still have unmerged paths in your index.\n" "Did you forget to use 'git add'?" @@ -3097,199 +4503,178 @@ msgstr "" "Индексът все още съдържа неслети промени.\n" "Възможно е да не сте изпълнили „git add“." -#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308 +#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308 #: builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "„%s“ не е разпознат като обект." -#: builtin/am.c:2110 +#: builtin/am.c:2103 msgid "failed to clean index" msgstr "индексът не може да бъде изчистен" -#: builtin/am.c:2144 +#: builtin/am.c:2137 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "" "Изглежда указателят „HEAD“ е променен и не сочи към същия обект както по " "времето\n" -"на последното неуспешно изпълнение на „git am“. Указателят се задава да сочи " -"към\n" +"на последното неуспешно изпълнение на „git am“. Указателят се задава да " +"сочи към\n" "„ORIG_HEAD“" -#: builtin/am.c:2205 +#: builtin/am.c:2200 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Неправилна стойност за „--patch-format“: „%s“" -#: builtin/am.c:2238 -msgid "git am [<options>] [(<mbox>|<Maildir>)...]" -msgstr "git am [ОПЦИЯ…] [ФАЙЛ_С_ПОЩА|ДИРЕКТОРИЯ_С_ПОЩА]…" +#: builtin/am.c:2233 +msgid "git am [<options>] [(<mbox> | <Maildir>)...]" +msgstr "git am [ОПЦИЯ…] [(ФАЙЛ_С_ПОЩА|ДИРЕКТОРИЯ_С_ПОЩА)…]" -#: builtin/am.c:2239 +#: builtin/am.c:2234 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [ОПЦИЯ…] (--continue | --quit | --abort)" -#: builtin/am.c:2245 +#: builtin/am.c:2240 msgid "run interactively" msgstr "интерактивна работа" -#: builtin/am.c:2247 +#: builtin/am.c:2242 msgid "historical option -- no-op" msgstr "изоставена опция, съществува по исторически причини, нищо не прави" -#: builtin/am.c:2249 +#: builtin/am.c:2244 msgid "allow fall back on 3way merging if needed" msgstr "да се преминава към тройно сливане при нужда." -#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57 -#: builtin/repack.c:171 +#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57 +#: builtin/repack.c:172 msgid "be quiet" msgstr "без извеждане на информация" -#: builtin/am.c:2252 +#: builtin/am.c:2247 msgid "add a Signed-off-by line to the commit message" msgstr "добавяне на ред за подпис „Signed-off-by“ в съобщението за подаване" -#: builtin/am.c:2255 +#: builtin/am.c:2250 msgid "recode into utf8 (default)" msgstr "прекодиране в UTF-8 (стандартно)" -#: builtin/am.c:2257 +#: builtin/am.c:2252 msgid "pass -k flag to git-mailinfo" msgstr "подаване на опцията „-k“ на командата „git-mailinfo“" -#: builtin/am.c:2259 +#: builtin/am.c:2254 msgid "pass -b flag to git-mailinfo" msgstr "подаване на опцията „-b“ на командата „git-mailinfo“" -#: builtin/am.c:2261 +#: builtin/am.c:2256 msgid "pass -m flag to git-mailinfo" msgstr "подаване на опцията „-m“ на командата „git-mailinfo“" -#: builtin/am.c:2263 +#: builtin/am.c:2258 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "" "подаване на опцията „--keep-cr“ на командата „git-mailsplit“ за формат „mbox“" -#: builtin/am.c:2266 +#: builtin/am.c:2261 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "без подаване на опцията „--keep-cr“ на командата „git-mailsplit“ независимо " "от „am.keepcr“" -#: builtin/am.c:2269 +#: builtin/am.c:2264 msgid "strip everything before a scissors line" msgstr "пропускане на всичко преди реда за отрязване" -#: builtin/am.c:2270 builtin/apply.c:4546 -msgid "action" -msgstr "действие" - -#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280 -#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 -#: builtin/am.c:2298 +#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275 +#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287 +#: builtin/am.c:2293 msgid "pass it through git-apply" msgstr "прекарване през „git-apply“" -#: builtin/am.c:2279 builtin/apply.c:4570 -msgid "root" -msgstr "НАЧАЛНА_ДИРЕКТОРИЯ" - -#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508 -#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95 -#: builtin/pull.c:179 builtin/submodule--helper.c:277 -#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485 -#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767 -#: builtin/submodule--helper.c:770 -msgid "path" -msgstr "път" - -#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 -#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134 builtin/pull.c:193 -#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645 +#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 +#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135 builtin/pull.c:194 +#: builtin/repack.c:181 builtin/repack.c:185 builtin/show-branch.c:644 #: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132 -#: parse-options.h:134 parse-options.h:244 +#: parse-options.h:134 parse-options.h:245 msgid "n" msgstr "БРОЙ" -#: builtin/am.c:2291 builtin/apply.c:4514 -msgid "num" -msgstr "БРОЙ" - -#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438 +#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438 #: builtin/tag.c:372 msgid "format" msgstr "ФОРМАТ" -#: builtin/am.c:2295 +#: builtin/am.c:2290 msgid "format the patch(es) are in" msgstr "формат на кръпките" -#: builtin/am.c:2301 +#: builtin/am.c:2296 msgid "override error message when patch failure occurs" msgstr "избрано от вас съобщение за грешка при прилагане на кръпки" -#: builtin/am.c:2303 +#: builtin/am.c:2298 msgid "continue applying patches after resolving a conflict" msgstr "продължаване на прилагането на кръпки след коригирането на конфликт" -#: builtin/am.c:2306 +#: builtin/am.c:2301 msgid "synonyms for --continue" msgstr "синоними на „--continue“" -#: builtin/am.c:2309 +#: builtin/am.c:2304 msgid "skip the current patch" msgstr "прескачане на текущата кръпка" -#: builtin/am.c:2312 +#: builtin/am.c:2307 msgid "restore the original branch and abort the patching operation." msgstr "" "възстановяване на първоначалното състояние на клона и преустановяване на " "прилагането на кръпката." -#: builtin/am.c:2316 +#: builtin/am.c:2311 msgid "lie about committer date" msgstr "дата за подаване различна от първоначалната" -#: builtin/am.c:2318 +#: builtin/am.c:2313 msgid "use current timestamp for author date" msgstr "използване на текущото време като това за автор" -#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228 -#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355 +#: builtin/am.c:2315 builtin/commit.c:1605 builtin/merge.c:229 +#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:355 msgid "key-id" msgstr "ИДЕНТИФИКАТОР_НА_КЛЮЧ" -#: builtin/am.c:2321 +#: builtin/am.c:2316 msgid "GPG-sign commits" msgstr "подписване на подаванията с GPG" -#: builtin/am.c:2324 +#: builtin/am.c:2319 msgid "(internal use for git-rebase)" msgstr "(ползва се вътрешно за „git-rebase“)" -#: builtin/am.c:2339 +#: builtin/am.c:2334 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“ отдавна не правят нищо и\n" -"ще бъдат премахнати в бъдеще. Не ги ползвайте." +"ще бъдат премахнати в бъдеще. Не ги ползвайте." -#: builtin/am.c:2346 +#: builtin/am.c:2341 msgid "failed to read the index" msgstr "неуспешно изчитане на индекса" -#: builtin/am.c:2361 +#: builtin/am.c:2356 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" "предишната директория за пребазиране „%s“ все още съществува, а е зададен " "файл „mbox“." -#: builtin/am.c:2385 +#: builtin/am.c:2380 #, c-format msgid "" "Stray %s directory found.\n" @@ -3298,512 +4683,14 @@ msgstr "" "Открита е излишна директория „%s“.\n" "Можете да я изтриете с командата „git am --abort“." -#: builtin/am.c:2391 +#: builtin/am.c:2386 msgid "Resolve operation not in progress, we are not resuming." msgstr "В момента не тече операция по коригиране и няма как да се продължи." -#: builtin/apply.c:59 +#: builtin/apply.c:8 msgid "git apply [<options>] [<patch>...]" msgstr "git apply [ОПЦИЯ…] [КРЪПКА…]" -#: builtin/apply.c:111 -#, c-format -msgid "unrecognized whitespace option '%s'" -msgstr "непозната опция за знаците за интервали „%s“" - -#: builtin/apply.c:126 -#, c-format -msgid "unrecognized whitespace ignore option '%s'" -msgstr "непозната опция за игнориране на знаците за интервали „%s“" - -#: builtin/apply.c:818 -#, c-format -msgid "Cannot prepare timestamp regexp %s" -msgstr "Регулярният израз за времето „%s“ не може за бъде компилиран" - -#: builtin/apply.c:827 -#, c-format -msgid "regexec returned %d for input: %s" -msgstr "Регулярният израз върна %d при подадена последователност „%s“ на входа" - -#: builtin/apply.c:908 -#, c-format -msgid "unable to find filename in patch at line %d" -msgstr "Липсва име на файл на ред %d от кръпката" - -#: builtin/apply.c:937 -#, 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“" - -#: builtin/apply.c:942 -#, c-format -msgid "git apply: bad git-diff - inconsistent new filename on line %d" -msgstr "" -"git apply: лош изход от командата „git-diff“ — на ред %d бе получено " -"неправилно име на нов файл" - -#: builtin/apply.c:943 -#, c-format -msgid "git apply: bad git-diff - inconsistent old filename on line %d" -msgstr "" -"git apply: лош изход от командата „git-diff“ — на ред %d бе получено " -"неправилно име на стар файл" - -#: builtin/apply.c:949 -#, c-format -msgid "git apply: bad git-diff - expected /dev/null on line %d" -msgstr "" -"git apply: лош изход от командата „git-diff“ — на ред %d се очакваше „/dev/" -"null“" - -#: builtin/apply.c:1406 -#, c-format -msgid "recount: unexpected line: %.*s" -msgstr "при повторното преброяване бе получен неочакван ред: „%.*s“" - -#: builtin/apply.c:1463 -#, c-format -msgid "patch fragment without header at line %d: %.*s" -msgstr "част от кръпка без заглавна част на ред %d: %.*s" - -#: builtin/apply.c:1480 -#, 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] "" -"След съкращаването на %d-та част от компонентите на пътя, в заглавната част " -"на „git diff“ липсва информация за име на файл (ред: %d)" -msgstr[1] "" -"След съкращаването на първите %d части от компонентите на пътя, в заглавната " -"част на „git diff“ липсва информация за име на файл (ред: %d)" - -#: builtin/apply.c:1646 -msgid "new file depends on old contents" -msgstr "новият файл зависи от старото съдържание на файла" - -#: builtin/apply.c:1648 -msgid "deleted file still has contents" -msgstr "изтритият файл не е празен" - -#: builtin/apply.c:1674 -#, c-format -msgid "corrupt patch at line %d" -msgstr "грешка в кръпката на ред %d" - -#: builtin/apply.c:1710 -#, c-format -msgid "new file %s depends on old contents" -msgstr "новият файл „%s“ зависи от старото съдържание на файла" - -#: builtin/apply.c:1712 -#, c-format -msgid "deleted file %s still has contents" -msgstr "изтритият файл „%s“ не е празен" - -#: builtin/apply.c:1715 -#, c-format -msgid "** warning: file %s becomes empty but is not deleted" -msgstr "● предупреждение: файлът „%s“ вече е празен, но не е изтрит" - -#: builtin/apply.c:1861 -#, c-format -msgid "corrupt binary patch at line %d: %.*s" -msgstr "грешка в двоичната кръпка на ред %d: %.*s" - -#: builtin/apply.c:1895 -#, c-format -msgid "unrecognized binary patch at line %d" -msgstr "неразпозната двоичната кръпка на ред %d" - -#: builtin/apply.c:2048 -#, c-format -msgid "patch with only garbage at line %d" -msgstr "кръпката е с изцяло повредени данни на ред %d" - -#: builtin/apply.c:2138 -#, c-format -msgid "unable to read symlink %s" -msgstr "символната връзка „%s“ не може да бъде прочетена" - -#: builtin/apply.c:2142 -#, c-format -msgid "unable to open or read %s" -msgstr "файлът „%s“ не може да бъде отворен или прочетен" - -#: builtin/apply.c:2775 -#, c-format -msgid "invalid start of line: '%c'" -msgstr "неправилно начало на ред: „%c“" - -#: builtin/apply.c:2894 -#, c-format -msgid "Hunk #%d succeeded at %d (offset %d line)." -msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." -msgstr[0] "" -"%d-то парче код бе успешно приложено на ред %d (отместване от %d ред)." -msgstr[1] "" -"%d-то парче код бе успешно приложено на ред %d (отместване от %d реда)." - -#: builtin/apply.c:2906 -#, c-format -msgid "Context reduced to (%ld/%ld) to apply fragment at %d" -msgstr "" -"Контекстът е намален на (%ld/%ld) за прилагането на парчето код на ред %d" - -#: builtin/apply.c:2912 -#, c-format -msgid "" -"while searching for:\n" -"%.*s" -msgstr "" -"при търсене за:\n" -"%.*s" - -#: builtin/apply.c:2932 -#, c-format -msgid "missing binary patch data for '%s'" -msgstr "липсват данните за двоичната кръпка за „%s“" - -#: builtin/apply.c:3033 -#, c-format -msgid "binary patch does not apply to '%s'" -msgstr "двоичната кръпка не може да бъде приложена върху „%s“" - -#: builtin/apply.c:3039 -#, c-format -msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" -msgstr "" -"двоичната кръпка за „%s“ води до неправилни резултати (очакваше се SHA1: " -"„%s“, а бе получено: „%s“)" - -#: builtin/apply.c:3060 -#, c-format -msgid "patch failed: %s:%ld" -msgstr "неуспешно прилагане на кръпка: „%s:%ld“" - -#: builtin/apply.c:3184 -#, c-format -msgid "cannot checkout %s" -msgstr "„%s“ не може да се изтегли" - -#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285 -#, c-format -msgid "read of %s failed" -msgstr "неуспешно прочитане на „%s“" - -#: builtin/apply.c:3237 -#, c-format -msgid "reading from '%s' beyond a symbolic link" -msgstr "изчитане на „%s“ след проследяване на символна връзка" - -#: builtin/apply.c:3265 builtin/apply.c:3487 -#, c-format -msgid "path %s has been renamed/deleted" -msgstr "обектът с път „%s“ е преименуван или изтрит" - -#: builtin/apply.c:3346 builtin/apply.c:3501 -#, c-format -msgid "%s: does not exist in index" -msgstr "„%s“ не съществува в индекса" - -#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515 -#, c-format -msgid "%s: %s" -msgstr "„%s“: %s" - -#: builtin/apply.c:3355 builtin/apply.c:3509 -#, c-format -msgid "%s: does not match index" -msgstr "„%s“ не съответства на индекса" - -#: builtin/apply.c:3457 -msgid "removal patch leaves file contents" -msgstr "изтриващата кръпка оставя файла непразен" - -#: builtin/apply.c:3526 -#, c-format -msgid "%s: wrong type" -msgstr "„%s“: неправилен вид" - -#: builtin/apply.c:3528 -#, c-format -msgid "%s has type %o, expected %o" -msgstr "„%s“ е от вид „%o“, а се очакваше „%o“" - -#: builtin/apply.c:3687 builtin/apply.c:3689 -#, c-format -msgid "invalid path '%s'" -msgstr "неправилен път: „%s“" - -#: builtin/apply.c:3744 -#, c-format -msgid "%s: already exists in index" -msgstr "„%s“: вече съществува в индекса" - -#: builtin/apply.c:3747 -#, c-format -msgid "%s: already exists in working directory" -msgstr "„%s“: вече съществува в работното дърво" - -#: builtin/apply.c:3767 -#, c-format -msgid "new mode (%o) of %s does not match old mode (%o)" -msgstr "новите права за достъп (%o) на „%s“ не съвпадат със старите (%o)" - -#: builtin/apply.c:3772 -#, c-format -msgid "new mode (%o) of %s does not match old mode (%o) of %s" -msgstr "" -"новите права за достъп (%o) на „%s“ не съвпадат със старите (%o) на „%s“" - -#: builtin/apply.c:3792 -#, c-format -msgid "affected file '%s' is beyond a symbolic link" -msgstr "засегнатият файл „%s“ е след символна връзка" - -#: builtin/apply.c:3796 -#, c-format -msgid "%s: patch does not apply" -msgstr "Кръпката „%s“ не може да бъде приложена" - -#: builtin/apply.c:3810 -#, c-format -msgid "Checking patch %s..." -msgstr "Проверяване на кръпката „%s“…" - -#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135 -#, c-format -msgid "make_cache_entry failed for path '%s'" -msgstr "неуспешно създаване на запис в кеша чрез „make_cache_entry“ за „%s“" - -#: builtin/apply.c:4046 -#, c-format -msgid "unable to remove %s from index" -msgstr "„%s“ не може да се извади от индекса" - -#: builtin/apply.c:4075 -#, c-format -msgid "corrupt patch for submodule %s" -msgstr "повредена кръпка за модула „%s“" - -#: builtin/apply.c:4079 -#, c-format -msgid "unable to stat newly created file '%s'" -msgstr "" -"не може да се получи информация чрез „stat“ за новосъздадения файл „%s“" - -#: builtin/apply.c:4084 -#, c-format -msgid "unable to create backing store for newly created file %s" -msgstr "" -"не може да се за създаде мястото за съхранение на новосъздадения файл „%s“" - -#: builtin/apply.c:4087 builtin/apply.c:4195 -#, c-format -msgid "unable to add cache entry for %s" -msgstr "не може да се добави запис в кеша за „%s“" - -#: builtin/apply.c:4120 -#, c-format -msgid "closing file '%s'" -msgstr "затваряне на файла „%s“" - -#: builtin/apply.c:4169 -#, c-format -msgid "unable to write file '%s' mode %o" -msgstr "файлът „%s“ не може да се запише с режим на достъп „%o“" - -#: builtin/apply.c:4256 -#, c-format -msgid "Applied patch %s cleanly." -msgstr "Кръпката „%s“ бе приложена чисто." - -#: builtin/apply.c:4264 -msgid "internal error" -msgstr "вътрешна грешка" - -#: builtin/apply.c:4267 -#, 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 отхвърлени парчета…" - -#: builtin/apply.c:4277 -#, c-format -msgid "truncating .rej filename to %.*s.rej" -msgstr "съкращаване на името на файла с отхвърлените парчета на „ %.*s.rej“" - -#: builtin/apply.c:4285 -#, c-format -msgid "cannot open %s: %s" -msgstr "файлът „%s“ не може да бъде отворен: %s" - -#: builtin/apply.c:4298 -#, c-format -msgid "Hunk #%d applied cleanly." -msgstr "%d-то парче бе успешно приложено." - -#: builtin/apply.c:4301 -#, c-format -msgid "Rejected hunk #%d." -msgstr "%d-то парче бе отхвърлено." - -#: builtin/apply.c:4387 -#, c-format -msgid "Skipped patch '%s'." -msgstr "Пропусната кръпка: „%s“" - -#: builtin/apply.c:4395 -msgid "unrecognized input" -msgstr "непознат вход" - -#: builtin/apply.c:4406 -msgid "unable to read index file" -msgstr "индексът не може да бъде записан" - -#: builtin/apply.c:4509 -msgid "don't apply changes matching the given path" -msgstr "без прилагане на промените напасващи на дадения път" - -#: builtin/apply.c:4512 -msgid "apply changes matching the given path" -msgstr "прилагане на промените напасващи на дадения път" - -#: builtin/apply.c:4515 -msgid "remove <num> leading slashes from traditional diff paths" -msgstr "премахване на този БРОЙ водещи елементи от пътищата в разликата" - -#: builtin/apply.c:4518 -msgid "ignore additions made by the patch" -msgstr "игнориране на редовете добавени от тази кръпка" - -#: builtin/apply.c:4520 -msgid "instead of applying the patch, output diffstat for the input" -msgstr "извеждане на статистика на промените без прилагане на кръпката" - -#: builtin/apply.c:4524 -msgid "show number of added and deleted lines in decimal notation" -msgstr "извеждане на броя на добавените и изтритите редове" - -#: builtin/apply.c:4526 -msgid "instead of applying the patch, output a summary for the input" -msgstr "извеждане на статистика на входните данни без прилагане на кръпката" - -#: builtin/apply.c:4528 -msgid "instead of applying the patch, see if the patch is applicable" -msgstr "проверка дали кръпката може да се приложи, без действително прилагане" - -#: builtin/apply.c:4530 -msgid "make sure the patch is applicable to the current index" -msgstr "проверка дали кръпката може да бъде приложена към текущия индекс" - -#: builtin/apply.c:4532 -msgid "apply a patch without touching the working tree" -msgstr "прилагане на кръпката без промяна на работното дърво" - -#: builtin/apply.c:4534 -msgid "accept a patch that touches outside the working area" -msgstr "прилагане на кръпка, която променя и файлове извън работното дърво" - -#: builtin/apply.c:4536 -msgid "also apply the patch (use with --stat/--summary/--check)" -msgstr "" -"кръпката да бъде приложена. Опцията се комбинира с „--check“/„--stat“/„--" -"summary“" - -#: builtin/apply.c:4538 -msgid "attempt three-way merge if a patch does not apply" -msgstr "пробване с тройно сливане, ако кръпката не може да се приложи директно" - -#: builtin/apply.c:4540 -msgid "build a temporary index based on embedded index information" -msgstr "" -"създаване на временен индекс на база на включената информация за индекса" - -#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425 -msgid "paths are separated with NUL character" -msgstr "разделяне на пътищата с нулевия знак „NUL“" - -#: builtin/apply.c:4545 -msgid "ensure at least <n> lines of context match" -msgstr "да се осигури контекст от поне такъв БРОЙ съвпадащи редове" - -#: builtin/apply.c:4547 -msgid "detect new or modified lines that have whitespace errors" -msgstr "засичане на нови или променени редове с грешки в знаците за интервали" - -#: builtin/apply.c:4550 builtin/apply.c:4553 -msgid "ignore changes in whitespace when finding context" -msgstr "" -"игнориране на промените в знаците за интервали при откриване на контекста" - -#: builtin/apply.c:4556 -msgid "apply the patch in reverse" -msgstr "прилагане на кръпката в обратна посока" - -#: builtin/apply.c:4558 -msgid "don't expect at least one line of context" -msgstr "без изискване на дори и един ред контекст" - -#: builtin/apply.c:4560 -msgid "leave the rejected hunks in corresponding *.rej files" -msgstr "оставяне на отхвърлените парчета във файлове с разширение „.rej“" - -#: builtin/apply.c:4562 -msgid "allow overlapping hunks" -msgstr "позволяване на застъпващи се парчета" - -#: builtin/apply.c:4565 -msgid "tolerate incorrectly detected missing new-line at the end of file" -msgstr "пренебрегване на неправилно липсващ знак за нов ред в края на файл" - -#: builtin/apply.c:4568 -msgid "do not trust the line counts in the hunk headers" -msgstr "без доверяване на номерата на редовете в заглавните части на парчетата" - -#: builtin/apply.c:4571 -msgid "prepend <root> to all filenames" -msgstr "добавяне на тази НАЧАЛНА_ДИРЕКТОРИЯ към имената на всички файлове" - -#: builtin/apply.c:4593 -msgid "--3way outside a repository" -msgstr "като „--3way“, но извън хранилище" - -#: builtin/apply.c:4601 -msgid "--index outside a repository" -msgstr "като „--index“, но извън хранилище" - -#: builtin/apply.c:4604 -msgid "--cached outside a repository" -msgstr "като „--cached“, но извън хранилище" - -#: builtin/apply.c:4623 -#, c-format -msgid "can't open patch '%s'" -msgstr "кръпката „%s“ не може да бъде отворена" - -#: builtin/apply.c:4637 -#, c-format -msgid "squelched %d whitespace error" -msgid_plural "squelched %d whitespace errors" -msgstr[0] "пренебрегната е %d грешка в знаците за интервали" -msgstr[1] "пренебрегнати са %d грешки в знаците за интервали" - -#: builtin/apply.c:4643 builtin/apply.c:4653 -#, c-format -msgid "%d line adds whitespace errors." -msgid_plural "%d lines add whitespace errors." -msgstr[0] "%d ред добавя грешки в знаците за интервали." -msgstr[1] "%d реда добавят грешки в знаците за интервали." - #: builtin/archive.c:17 #, c-format msgid "could not create archive file '%s'" @@ -3860,135 +4747,188 @@ msgstr "git blame [ОПЦИЯ…] [ОПЦИЯ_ЗА_ВЕРСИЯТА…] [ВЕР msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "ОПЦИИте_ЗА_ВЕРСИЯТА са документирани в ръководството git-rev-list(1)" -#: builtin/blame.c:1782 +#: builtin/blame.c:1781 msgid "Blaming lines" msgstr "Анотирани редове" -#: builtin/blame.c:2531 +#: builtin/blame.c:2577 msgid "Show blame entries as we find them, incrementally" msgstr "Извеждане на анотациите с намирането им, последователно" -# FIXME SHA-1 -> SHA1 -#: builtin/blame.c:2532 +#: builtin/blame.c:2578 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" "Извеждане на празни суми по SHA1 за граничните подавания (стандартно опцията " "е изключена)" -#: builtin/blame.c:2533 +#: builtin/blame.c:2579 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" "Началните подавания да не се считат за гранични (стандартно опцията е " "изключена)" -#: builtin/blame.c:2534 +#: builtin/blame.c:2580 msgid "Show work cost statistics" msgstr "Извеждане на статистика за извършените действия" -#: builtin/blame.c:2535 +#: builtin/blame.c:2581 msgid "Force progress reporting" msgstr "Принудително извеждане на напредъка" -#: builtin/blame.c:2536 +#: builtin/blame.c:2582 msgid "Show output score for blame entries" msgstr "Извеждане на допълнителна информация за определянето на анотациите" -#: builtin/blame.c:2537 +#: builtin/blame.c:2583 msgid "Show original filename (Default: auto)" msgstr "" "Извеждане на първоначалното име на файл (стандартно това е автоматично)" -#: builtin/blame.c:2538 +#: builtin/blame.c:2584 msgid "Show original linenumber (Default: off)" msgstr "" "Извеждане на първоначалният номер на ред (стандартно опцията е изключена)" -#: builtin/blame.c:2539 +#: builtin/blame.c:2585 msgid "Show in a format designed for machine consumption" msgstr "Извеждане във формат за по-нататъшна обработка" -#: builtin/blame.c:2540 +#: builtin/blame.c:2586 msgid "Show porcelain format with per-line commit information" msgstr "" "Извеждане във формат за команди от потребителско ниво с информация на всеки " "ред" -#: builtin/blame.c:2541 +#: builtin/blame.c:2587 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" "Използване на същия формат като „git-annotate“ (стандартно опцията е " "изключена)" -#: builtin/blame.c:2542 +#: builtin/blame.c:2588 msgid "Show raw timestamp (Default: off)" msgstr "Извеждане на неформатирани времена (стандартно опцията е изключена)" -#: builtin/blame.c:2543 +#: builtin/blame.c:2589 msgid "Show long commit SHA1 (Default: off)" msgstr "Извеждане на пълните суми по SHA1 (стандартно опцията е изключена)" -#: builtin/blame.c:2544 +#: builtin/blame.c:2590 msgid "Suppress author name and timestamp (Default: off)" msgstr "Без име на автор и време на промяна (стандартно опцията е изключена)" -#: builtin/blame.c:2545 +#: builtin/blame.c:2591 msgid "Show author email instead of name (Default: off)" msgstr "" "Извеждане на е-пощата на автора, а не името му (стандартно опцията е " "изключена)" -#: builtin/blame.c:2546 +#: builtin/blame.c:2592 msgid "Ignore whitespace differences" msgstr "Без разлики в знаците за интервали" -#: builtin/blame.c:2547 +#: builtin/blame.c:2599 +msgid "Use an experimental indent-based heuristic to improve diffs" +msgstr "Подобряване на разликите чрез експериментална евристика според отстъпа" + +#: builtin/blame.c:2600 +msgid "Use an experimental blank-line-based heuristic to improve diffs" +msgstr "" +"Подобряване на разликите чрез експериментална евристика според празните " +"редове" + +#: builtin/blame.c:2602 msgid "Spend extra cycles to find better match" msgstr "Допълнителни изчисления за по-добри резултати" -#: builtin/blame.c:2548 +#: builtin/blame.c:2603 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Изчитане на версиите от ФАЙЛ, а не чрез изпълнение на „git-rev-list“" -#: builtin/blame.c:2549 +#: builtin/blame.c:2604 msgid "Use <file>'s contents as the final image" msgstr "Използване на съдържанието на ФАЙЛа като крайно положение" -#: builtin/blame.c:2550 builtin/blame.c:2551 +#: builtin/blame.c:2605 builtin/blame.c:2606 msgid "score" msgstr "напасване на редовете" -#: builtin/blame.c:2550 +#: builtin/blame.c:2605 msgid "Find line copies within and across files" msgstr "" "Търсене на копирани редове както в рамките на един файл, така и от един файл " "към друг" -#: builtin/blame.c:2551 +#: builtin/blame.c:2606 msgid "Find line movements within and across files" msgstr "" "Търсене на преместени редове както в рамките на един файл, така и от един " "файл към друг" -#: builtin/blame.c:2552 +#: builtin/blame.c:2607 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2552 +#: builtin/blame.c:2607 msgid "Process only line range n,m, counting from 1" msgstr "" -"Информация само за редовете в интервала от n до m включително. Броенето " +"Информация само за редовете в диапазона от n до m включително. Броенето " "започва от 1" +#: builtin/blame.c:2654 +msgid "--progress can't be used with --incremental or porcelain formats" +msgstr "" +"опцията „--progress“ е несъвместима с „--incremental“ и форма̀та на командите " +"от потребителско ниво" + #. 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:2641 +#: builtin/blame.c:2700 msgid "4 years, 11 months ago" msgstr "преди 4 години и 11 месеца" +#: builtin/blame.c:2780 +msgid "--contents and --reverse do not blend well." +msgstr "Опциите „--contents“ и „--reverse“ са несъвместими" + +#: builtin/blame.c:2800 +msgid "cannot use --contents with final commit object name" +msgstr "Опцията „--contents“ е несъвместима с име на обект от крайно подаване" + +#: builtin/blame.c:2805 +msgid "--reverse and --first-parent together require specified latest commit" +msgstr "" +"Едновременното задаване на опциите „--reverse“ и „--first-parent“ изисква " +"указването на крайно подаване" + +#: builtin/blame.c:2832 +msgid "" +"--reverse --first-parent together require range along first-parent chain" +msgstr "" +"Едновременното задаване на опциите „--reverse“ и „--first-parent“ изисква " +"указването на диапазон по веригата на първите наследници" + +#: builtin/blame.c:2843 +#, c-format +msgid "no such path %s in %s" +msgstr "няма път на име „%s“ в „%s“" + +#: builtin/blame.c:2854 +#, c-format +msgid "cannot read blob %s for path %s" +msgstr "обектът BLOB „%s“ в пътя %s не може да бъде прочетен" + +#: builtin/blame.c:2873 +#, c-format +msgid "file %s has only %lu line" +msgid_plural "file %s has only %lu lines" +msgstr[0] "има само %2$lu ред във файла „%1$s“" +msgstr[1] "има само %2$lu реда във файла „%1$s“" + #: builtin/branch.c:26 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [ОПЦИЯ…] [-r | -a] [--merged | --no-merged]" @@ -4038,7 +4978,7 @@ 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" +"Клонът „%s“ не е слят напълно. Ако сте сигурни, че искате\n" "да го изтриете, изпълнете „git branch -D %s“." #: builtin/branch.c:178 @@ -4088,119 +5028,126 @@ msgstr "Изтрит следящ клон „%s“ (той сочеше към msgid "Deleted branch %s (was %s).\n" msgstr "Изтрит клон „%s“ (той сочеше към „%s“).\n" -#: builtin/branch.c:309 +#: builtin/branch.c:312 #, c-format msgid "[%s: gone]" msgstr "[%s: изтрит]" -#: builtin/branch.c:314 +#: builtin/branch.c:317 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:319 +#: builtin/branch.c:322 #, c-format msgid "[%s: behind %d]" msgstr "[%s: назад с %d]" -#: builtin/branch.c:321 +#: builtin/branch.c:324 #, c-format msgid "[behind %d]" msgstr "[назад с %d]" -#: builtin/branch.c:325 +#: builtin/branch.c:328 #, c-format msgid "[%s: ahead %d]" msgstr "[%s: напред с %d]" -#: builtin/branch.c:327 +#: builtin/branch.c:330 #, c-format msgid "[ahead %d]" msgstr "[напред с %d]" -#: builtin/branch.c:330 +#: builtin/branch.c:333 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s: напред с %d, назад с %d]" -#: builtin/branch.c:333 +#: builtin/branch.c:336 #, c-format msgid "[ahead %d, behind %d]" msgstr "[напред с %d, назад с %d]" -#: builtin/branch.c:346 +#: builtin/branch.c:349 msgid " **** invalid ref ****" msgstr " ●●● неправилен указател ●●●" -#: builtin/branch.c:372 +#: builtin/branch.c:375 #, c-format msgid "(no branch, rebasing %s)" msgstr "(извън клон, пребазиране на „%s“)" -#: builtin/branch.c:375 +#: builtin/branch.c:378 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(извън клон, двоично търсене от „%s“)" #. TRANSLATORS: make sure this matches #. "HEAD detached at " in wt-status.c -#: builtin/branch.c:381 +#: builtin/branch.c:384 #, c-format msgid "(HEAD detached at %s)" msgstr "(Указателят „HEAD“ не е свързан и е при „%s“)" #. TRANSLATORS: make sure this matches #. "HEAD detached from " in wt-status.c -#: builtin/branch.c:386 +#: builtin/branch.c:389 #, c-format msgid "(HEAD detached from %s)" msgstr "Указателят „HEAD“ не е свързан и е отделѐн от „%s“" -#: builtin/branch.c:390 +#: builtin/branch.c:393 msgid "(no branch)" msgstr "(извън клон)" -#: builtin/branch.c:541 +#: builtin/branch.c:544 #, c-format msgid "Branch %s is being rebased at %s" msgstr "Клонът „%s“ се пребазира върху „%s“" -#: builtin/branch.c:545 +#: builtin/branch.c:548 #, c-format msgid "Branch %s is being bisected at %s" msgstr "Търси се двоично в клона „%s“ при „%s“" -#: builtin/branch.c:560 +#: builtin/branch.c:563 msgid "cannot rename the current branch while not on any." msgstr "" "не можете да преименувате текущия клон, защото сте извън който и да е клон" -#: builtin/branch.c:570 +#: builtin/branch.c:573 #, c-format msgid "Invalid branch name: '%s'" msgstr "Неправилно име на клон: „%s“" -#: builtin/branch.c:587 +#: builtin/branch.c:590 msgid "Branch rename failed" msgstr "Неуспешно преименуване на клон" -#: builtin/branch.c:591 +#: builtin/branch.c:594 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "На клона с неправилно име „%s“ е дадено служебно име" -#: builtin/branch.c:594 +#: builtin/branch.c:597 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Клонът е преименуван на „%s“, но указателят „HEAD“ не е обновен" -#: builtin/branch.c:601 +#: builtin/branch.c:604 msgid "Branch is renamed, but update of config-file failed" msgstr "Клонът е преименуван, но конфигурационният файл не е обновен" -#: builtin/branch.c:623 -msgid "could not write branch description template" -msgstr "шаблонът за описание на клон не бе записан" +#: builtin/branch.c:620 +#, c-format +msgid "" +"Please edit the description for the branch\n" +" %s\n" +"Lines starting with '%c' will be stripped.\n" +msgstr "" +"Въведете описание на клона.\n" +" %s\n" +"Редовете, които започват с „%c“, ще бъдат пропуснати.\n" #: builtin/branch.c:651 msgid "Generic options" @@ -4209,7 +5156,8 @@ msgstr "Общи настройки" #: builtin/branch.c:653 msgid "show hash and subject, give twice for upstream branch" msgstr "" -"извеждане на хеша и темата. Повтарянето на опцията прибавя отдалечените клони" +"извеждане на хеша и темата. Повтарянето на опцията прибавя отдалечените " +"клони" #: builtin/branch.c:654 msgid "suppress informational messages" @@ -4231,6 +5179,10 @@ msgstr "клон-източник" msgid "change the upstream info" msgstr "смяна на клона-източник" +#: builtin/branch.c:660 +msgid "Unset the upstream info" +msgstr "без клон-източник" + #: builtin/branch.c:661 msgid "use colored output" msgstr "цветен изход" @@ -4304,8 +5256,8 @@ msgstr "КЛЮЧ" msgid "field name to sort on" msgstr "име на полето, по което да е подредбата" -#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401 -#: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567 +#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:404 +#: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570 #: builtin/tag.c:369 msgid "object" msgstr "ОБЕКТ" @@ -4318,7 +5270,7 @@ msgstr "извеждане само на клоните на ОБЕКТА" msgid "Failed to resolve HEAD as a valid ref." msgstr "Не може да се открие към какво сочи указателят „HEAD“" -#: builtin/branch.c:709 builtin/clone.c:707 +#: builtin/branch.c:709 builtin/clone.c:706 msgid "HEAD not found below refs/heads!" msgstr "В директорията „refs/heads“ липсва файл „HEAD“" @@ -4332,7 +5284,7 @@ msgstr "Необходимо е име на клон" #: builtin/branch.c:758 msgid "Cannot give description to detached HEAD" -msgstr "Не може да зададете описание на „HEAD“ извън клон" +msgstr "Не може да зададете описание на несвързан „HEAD“" #: builtin/branch.c:763 msgid "cannot edit description of more than one branch" @@ -4402,7 +5354,7 @@ msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" "track or --set-upstream-to\n" msgstr "" -"Опцията „--set-upstream“ вече е остаряла и предстои да бъде махната. " +"Опцията „--set-upstream“ вече е остаряла и предстои да бъде махната. " "Използвайте „--track“ или „--set-upstream-to“\n" #: builtin/branch.c:866 @@ -4429,70 +5381,87 @@ msgstr "За създаването на пратка е необходимо х msgid "Need a repository to unbundle." msgstr "За приемането на пратка е необходимо хранилище." -#: builtin/cat-file.c:428 +#: builtin/cat-file.c:513 msgid "" -"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|" -"<type>|--textconv) <object>" +"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) ОБЕКТ" +"p | ВИД | --textconv --filters) [--path=ПЪТ] ОБЕКТ" -#: builtin/cat-file.c:429 -msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]" -msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]" +#: builtin/cat-file.c:514 +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:466 +#: builtin/cat-file.c:551 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "" "ВИДът може да е: „blob“ (обект BLOB), „tree“ (дърво), „commit“ (подаване), " "„tag“ (етикет)" -#: builtin/cat-file.c:467 +#: builtin/cat-file.c:552 msgid "show object type" msgstr "извеждане на вида на обект" -#: builtin/cat-file.c:468 +#: builtin/cat-file.c:553 msgid "show object size" msgstr "извеждане на размера на обект" -#: builtin/cat-file.c:470 +#: builtin/cat-file.c:555 msgid "exit with zero when there's no error" msgstr "изход с 0, когато няма грешка" -#: builtin/cat-file.c:471 +#: builtin/cat-file.c:556 msgid "pretty-print object's content" msgstr "форматирано извеждане на съдържанието на обекта" -#: builtin/cat-file.c:473 +#: builtin/cat-file.c:558 msgid "for blob objects, run textconv on object's content" msgstr "" "да се стартира програмата зададена в настройката „textconv“ за преобразуване " "на съдържанието на обекта BLOB" -#: builtin/cat-file.c:475 +#: builtin/cat-file.c:560 +msgid "for blob objects, run filters on object's content" +msgstr "" +"да се стартират програмите за преобразуване на съдържанието на обектите BLOB" + +#: builtin/cat-file.c:561 git-submodule.sh:923 +msgid "blob" +msgstr "обект BLOB" + +#: builtin/cat-file.c:562 +msgid "use a specific path for --textconv/--filters" +msgstr "опциите „--textconv“/„--filters“ изискват път" + +#: builtin/cat-file.c:564 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "позволяване на опциите „-s“ и „-t“ да работят с повредени обекти" -#: builtin/cat-file.c:476 +#: builtin/cat-file.c:565 msgid "buffer --batch output" msgstr "буфериране на изхода от „--batch“" -#: builtin/cat-file.c:478 +#: builtin/cat-file.c:567 msgid "show info and content of objects fed from the standard input" msgstr "" "извеждане на информация и съдържание на обектите подадени на стандартния вход" -#: builtin/cat-file.c:481 +#: builtin/cat-file.c:570 msgid "show info about objects fed from the standard input" msgstr "извеждане на информация за обектите подадени на стандартния вход" -#: builtin/cat-file.c:484 +#: builtin/cat-file.c:573 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "следване на символните връзки сочещи в дървото (ползва се с „--batch“ или „--" "batch-check“)" -#: builtin/cat-file.c:486 +#: builtin/cat-file.c:575 msgid "show all objects with --batch or --batch-check" msgstr "извеждане на всички обекти с „--batch“ или „--batch-check“" @@ -4512,7 +5481,7 @@ msgstr "извеждане на всички атрибути, зададени msgid "use .gitattributes only from the index" msgstr "използване на файла „.gitattributes“ само от индекса" -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98 msgid "read file names from stdin" msgstr "изчитане на имената на файловете от стандартния вход" @@ -4520,7 +5489,7 @@ msgstr "изчитане на имената на файловете от ста msgid "terminate input and output records by a NUL character" msgstr "разделяне на входните и изходните записи с нулевия знак „NUL“" -#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325 +#: builtin/check-ignore.c:18 builtin/checkout.c:1137 builtin/gc.c:325 msgid "suppress progress reporting" msgstr "без показване на напредъка" @@ -4610,9 +5579,9 @@ msgid "write the content to temporary files" msgstr "записване на съдържанието във временни файлове" #: builtin/checkout-index.c:174 builtin/column.c:30 -#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494 -#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500 -#: builtin/submodule--helper.c:774 +#: builtin/submodule--helper.c:595 builtin/submodule--helper.c:598 +#: builtin/submodule--helper.c:604 builtin/submodule--helper.c:951 +#: builtin/worktree.c:469 msgid "string" msgstr "НИЗ" @@ -4679,63 +5648,59 @@ msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Невъзможно е едновременно да обновявате пътища и да преминете към клона „%s“." -#: builtin/checkout.c:279 builtin/checkout.c:473 -msgid "corrupt index file" -msgstr "повреден файл на индекса" - #: builtin/checkout.c:339 builtin/checkout.c:346 #, c-format msgid "path '%s' is unmerged" msgstr "пътят „%s“ не е слят" -#: builtin/checkout.c:495 +#: builtin/checkout.c:494 msgid "you need to resolve your current index first" msgstr "първо трябва да коригирате индекса си" -#: builtin/checkout.c:622 +#: builtin/checkout.c:624 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Журналът на указателите за „%s“ не може да се проследи: %s\n" -#: builtin/checkout.c:660 +#: builtin/checkout.c:663 msgid "HEAD is now at" msgstr "Указателят „HEAD“ в момента сочи към" -#: builtin/checkout.c:664 builtin/clone.c:661 +#: builtin/checkout.c:667 builtin/clone.c:660 msgid "unable to update HEAD" msgstr "Указателят „HEAD“ не може да бъде обновен" -#: builtin/checkout.c:668 +#: builtin/checkout.c:671 #, c-format msgid "Reset branch '%s'\n" msgstr "Зануляване на клона „%s“\n" -#: builtin/checkout.c:671 +#: builtin/checkout.c:674 #, c-format msgid "Already on '%s'\n" msgstr "Вече сте на „%s“\n" -#: builtin/checkout.c:675 +#: builtin/checkout.c:678 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Преминаване към клона „%s“ и зануляване на промените\n" -#: builtin/checkout.c:677 builtin/checkout.c:1067 +#: builtin/checkout.c:680 builtin/checkout.c:1069 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Преминахте към новия клон „%s“\n" -#: builtin/checkout.c:679 +#: builtin/checkout.c:682 #, c-format msgid "Switched to branch '%s'\n" msgstr "Преминахте към клона „%s“\n" -#: builtin/checkout.c:731 +#: builtin/checkout.c:733 #, c-format msgid " ... and %d more.\n" msgstr "… и още %d.\n" -#: builtin/checkout.c:737 +#: builtin/checkout.c:739 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -4757,7 +5722,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:756 +#: builtin/checkout.c:758 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -4784,154 +5749,154 @@ msgstr[1] "" " git branch ИМЕ_НА_НОВИЯ_КЛОН %s\n" "\n" -#: builtin/checkout.c:792 +#: builtin/checkout.c:794 msgid "internal error in revision walk" msgstr "вътрешна грешка при обхождането на версиите" -#: builtin/checkout.c:796 +#: builtin/checkout.c:798 msgid "Previous HEAD position was" msgstr "Преди това „HEAD“ сочеше към" -#: builtin/checkout.c:823 builtin/checkout.c:1062 +#: builtin/checkout.c:825 builtin/checkout.c:1064 msgid "You are on a branch yet to be born" msgstr "В момента сте на клон, който предстои да бъде създаден" -#: builtin/checkout.c:968 +#: builtin/checkout.c:970 #, c-format msgid "only one reference expected, %d given." msgstr "очакваше се един указател, а сте подали %d." -#: builtin/checkout.c:1008 builtin/worktree.c:212 +#: builtin/checkout.c:1010 builtin/worktree.c:214 #, c-format msgid "invalid reference: %s" msgstr "неправилен указател: %s" -#: builtin/checkout.c:1037 +#: builtin/checkout.c:1039 #, c-format msgid "reference is not a tree: %s" msgstr "указателят не сочи към обект-дърво: %s" -#: builtin/checkout.c:1076 +#: builtin/checkout.c:1078 msgid "paths cannot be used with switching branches" msgstr "задаването на път е несъвместимо с преминаването от един клон към друг" -#: builtin/checkout.c:1079 builtin/checkout.c:1083 +#: builtin/checkout.c:1081 builtin/checkout.c:1085 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "опцията „%s“ е несъвместима с преминаването от един клон към друг" -#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095 -#: builtin/checkout.c:1098 +#: builtin/checkout.c:1089 builtin/checkout.c:1092 builtin/checkout.c:1097 +#: builtin/checkout.c:1100 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "опцията „%s“ е несъвместима с „%s“" -#: builtin/checkout.c:1103 +#: builtin/checkout.c:1105 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" -"За да преминете към клон, подайте указател, който сочи към подаване. „%s“ не " -"е такъв" +"За да преминете към клон, подайте указател, който сочи към подаване. „%s“ " +"не е такъв" -#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323 -#: builtin/worktree.c:325 +#: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:93 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324 +#: builtin/worktree.c:326 msgid "branch" msgstr "клон" -#: builtin/checkout.c:1137 +#: builtin/checkout.c:1139 msgid "create and checkout a new branch" msgstr "създаване и преминаване към нов клон" -#: builtin/checkout.c:1139 +#: builtin/checkout.c:1141 msgid "create/reset and checkout a branch" msgstr "създаване/зануляване на клон и преминаване към него" -#: builtin/checkout.c:1140 +#: builtin/checkout.c:1142 msgid "create reflog for new branch" msgstr "създаване на журнал на указателите за нов клон" -#: builtin/checkout.c:1141 -msgid "detach the HEAD at named commit" +#: builtin/checkout.c:1143 builtin/worktree.c:328 +msgid "detach HEAD at named commit" msgstr "отделяне на указателя „HEAD“ към указаното подаване" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1144 msgid "set upstream info for new branch" msgstr "задаване на кой клон бива следен при създаването на новия клон" -#: builtin/checkout.c:1144 +#: builtin/checkout.c:1146 msgid "new-branch" msgstr "НОВ_КЛОН" -#: builtin/checkout.c:1144 +#: builtin/checkout.c:1146 msgid "new unparented branch" msgstr "нов клон без родител" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1147 msgid "checkout our version for unmerged files" msgstr "изтегляне на вашата версия на неслетите файлове" -#: builtin/checkout.c:1147 +#: builtin/checkout.c:1149 msgid "checkout their version for unmerged files" msgstr "изтегляне на чуждата версия на неслетите файлове" -#: builtin/checkout.c:1149 +#: builtin/checkout.c:1151 msgid "force checkout (throw away local modifications)" msgstr "принудително изтегляне (вашите промени ще бъдат занулени)" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1152 msgid "perform a 3-way merge with the new branch" msgstr "извършване на тройно сливане с новия клон" -#: builtin/checkout.c:1151 builtin/merge.c:230 +#: builtin/checkout.c:1153 builtin/merge.c:231 msgid "update ignored files (default)" msgstr "обновяване на игнорираните файлове (стандартно)" -#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250 +#: builtin/checkout.c:1154 builtin/log.c:1466 parse-options.h:251 msgid "style" msgstr "СТИЛ" -#: builtin/checkout.c:1153 +#: builtin/checkout.c:1155 msgid "conflict style (merge or diff3)" msgstr "действие при конфликт (сливане или тройна разлика)" -#: builtin/checkout.c:1156 +#: builtin/checkout.c:1158 msgid "do not limit pathspecs to sparse entries only" msgstr "без ограничаване на изброените пътища само до частично изтеглените" -#: builtin/checkout.c:1158 +#: builtin/checkout.c:1160 msgid "second guess 'git checkout <no-such-branch>'" msgstr "" "опит за отгатване на име на клон след неуспешен опит с „git checkout " "НЕСЪЩЕСТВУВАЩ_КЛОН“" -#: builtin/checkout.c:1160 +#: builtin/checkout.c:1162 msgid "do not check if another worktree is holding the given ref" msgstr "без проверка дали друго работно дърво държи указателя" -#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116 -#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526 +#: builtin/checkout.c:1163 builtin/clone.c:63 builtin/fetch.c:119 +#: builtin/merge.c:228 builtin/pull.c:117 builtin/push.c:536 #: builtin/send-pack.c:168 msgid "force progress reporting" msgstr "извеждане на напредъка" -#: builtin/checkout.c:1192 +#: builtin/checkout.c:1194 msgid "-b, -B and --orphan are mutually exclusive" msgstr "Опциите „-b“, „-B“ и „--orphan“ са несъвместими една с друга" -#: builtin/checkout.c:1209 +#: builtin/checkout.c:1211 msgid "--track needs a branch name" msgstr "опцията „--track“ изисква име на клон" -#: builtin/checkout.c:1214 +#: builtin/checkout.c:1216 msgid "Missing branch name; try -b" msgstr "Липсва име на клон, използвайте опцията „-b“" -#: builtin/checkout.c:1250 +#: builtin/checkout.c:1252 msgid "invalid path specification" msgstr "указан е неправилен път" -#: builtin/checkout.c:1257 +#: builtin/checkout.c:1259 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -4940,12 +5905,12 @@ msgstr "" "Не можете едновременно да обновявате пътища и да преминете към клона „%s“.\n" "Дали не искате да изтеглите „%s“, който не сочи към подаване?" -#: builtin/checkout.c:1262 +#: builtin/checkout.c:1264 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: опцията „--detach“ не приема аргумент-път „%s“" -#: builtin/checkout.c:1266 +#: builtin/checkout.c:1268 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -5008,8 +5973,8 @@ msgid "" msgstr "" "Подсказка:\n" "1 — избор на един обект\n" -"3-5 — интервал за избор на обекти\n" -"2-3,6-9 — множество интервали за избор на обекти\n" +"3-5 — диапазон за избор на обекти\n" +"2-3,6-9 — множество диапазон за избор на обекти\n" "ПРЕФИКС — избор на единствен обект по този уникален префикс\n" "-… — отмяна на избора на обекти\n" "* — избиране на всички обекти\n" @@ -5018,9 +5983,8 @@ msgstr "" #: builtin/clean.c:511 #, c-format msgid "Huh (%s)?" -msgstr "Неправилен избор (%s). Изберете отново." +msgstr "Неправилен избор (%s). Изберете отново." -# FIXME - should we use >> or sth else #: builtin/clean.c:653 #, c-format msgid "Input ignore patterns>> " @@ -5041,7 +6005,7 @@ msgstr "Избиране на обекти за изтриване" msgid "Remove %s [y/N]? " msgstr "Да се изтрие ли „%s“? „y“ — да, „N“ — НЕ" -# FIXME improve message +# #: builtin/clean.c:777 msgid "Bye." msgstr "Изход." @@ -5068,7 +6032,6 @@ msgstr "" msgid "*** Commands ***" msgstr "●●● Команди ●●●" -# FIXME improve message #: builtin/clean.c:813 msgid "What now" msgstr "Избор на следващо действие" @@ -5081,7 +6044,7 @@ msgstr[1] "Следните обекти ще бъдат изтрити:" #: builtin/clean.c:838 msgid "No more files to clean, exiting." -msgstr "Файловете за изчистване свършиха. Изход от програмата." +msgstr "Файловете за изчистване свършиха. Изход от програмата." #: builtin/clean.c:869 msgid "do not print names of files removed" @@ -5099,8 +6062,8 @@ msgstr "интерактивно изтриване" msgid "remove whole directories" msgstr "изтриване на цели директории" -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724 -#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182 +#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:725 +#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:182 msgid "pattern" msgstr "ШАБЛОН" @@ -5126,7 +6089,7 @@ msgid "" "clean" msgstr "" "Настройката „clean.requireForce“ е зададена като истина, което изисква някоя " -"от опциите „-i“, „-n“ или „-f“. Няма да се извърши изчистване" +"от опциите „-i“, „-n“ или „-f“. Няма да се извърши изчистване" #: builtin/clean.c:904 msgid "" @@ -5134,122 +6097,139 @@ msgid "" "refusing to clean" msgstr "" "Настройката „clean.requireForce“ не е зададена, но стандартно е истина, " -"което изисква някоя от опциите „-i“, „-n“ или „-f“. Няма да се извърши " +"което изисква някоя от опциите „-i“, „-n“ или „-f“. Няма да се извърши " "изчистване" #: builtin/clone.c:37 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [ОПЦИЯ…] [--] ХРАНИЛИЩЕ [ДИРЕКТОРИЯ]" -#: builtin/clone.c:62 +#: builtin/clone.c:65 msgid "don't create a checkout" msgstr "без създаване на работно дърво" -#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473 +#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478 msgid "create a bare repository" msgstr "създаване на голо хранилище" -#: builtin/clone.c:67 +#: builtin/clone.c:70 msgid "create a mirror repository (implies bare)" msgstr "" "създаване на хранилище-огледало (включва опцията „--bare“ за голо хранилище)" -#: builtin/clone.c:69 +#: builtin/clone.c:72 msgid "to clone from a local repository" msgstr "клониране от локално хранилище" -#: builtin/clone.c:71 +#: builtin/clone.c:74 msgid "don't use local hardlinks, always copy" msgstr "без твърди връзки, файловете винаги да се копират" -#: builtin/clone.c:73 +#: builtin/clone.c:76 msgid "setup as shared repository" msgstr "настройване за споделено хранилище" -#: builtin/clone.c:75 builtin/clone.c:77 +#: builtin/clone.c:78 builtin/clone.c:80 msgid "initialize submodules in the clone" msgstr "инициализиране на подмодулите при това клониране" -#: builtin/clone.c:79 +#: builtin/clone.c:82 msgid "number of submodules cloned in parallel" msgstr "брой подмодули, клонирани паралелно" -#: builtin/clone.c:80 builtin/init-db.c:470 +#: builtin/clone.c:83 builtin/init-db.c:475 msgid "template-directory" msgstr "директория с шаблони" -#: builtin/clone.c:81 builtin/init-db.c:471 +#: builtin/clone.c:84 builtin/init-db.c:476 msgid "directory from which templates will be used" msgstr "директория, която съдържа шаблоните, които да се ползват" -#: builtin/clone.c:83 builtin/submodule--helper.c:498 -#: builtin/submodule--helper.c:777 +#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:602 +#: builtin/submodule--helper.c:954 msgid "reference repository" msgstr "еталонно хранилище" -#: builtin/clone.c:85 +#: builtin/clone.c:90 msgid "use --reference only while cloning" msgstr "опцията „--reference“ може да се използва само при клониране" -#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "ИМЕ" -#: builtin/clone.c:87 +#: builtin/clone.c:92 msgid "use <name> instead of 'origin' to track upstream" msgstr "използване на това ИМЕ вместо „origin“ при проследяване на клони" -#: builtin/clone.c:89 +#: builtin/clone.c:94 msgid "checkout <branch> instead of the remote's HEAD" msgstr "изтегляне на този КЛОН, а не соченият от отдалечения указател „HEAD“" -#: builtin/clone.c:91 +#: builtin/clone.c:96 msgid "path to git-upload-pack on the remote" msgstr "път към командата „git-upload-pack“ на отдалеченото хранилище" -#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 builtin/pull.c:201 +#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668 builtin/pull.c:202 msgid "depth" msgstr "ДЪЛБОЧИНА" -#: builtin/clone.c:93 +#: builtin/clone.c:98 msgid "create a shallow clone of that depth" msgstr "плитко клониране до тази ДЪЛБОЧИНА" -#: builtin/clone.c:95 +#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848 +#: parse-options.h:142 +msgid "time" +msgstr "ВРЕМЕ" + +#: builtin/clone.c:100 +msgid "create a shallow clone since a specific time" +msgstr "плитко клониране до момент във времето" + +#: builtin/clone.c:101 builtin/fetch.c:124 +msgid "revision" +msgstr "версия" + +#: builtin/clone.c:102 builtin/fetch.c:125 +msgid "deepen history of shallow clone by excluding rev" +msgstr "задълбочаване на историята на плитко хранилище до изключващ указател" + +#: builtin/clone.c:104 msgid "clone only one branch, HEAD or --branch" msgstr "" "клониране само на един клон — или сочения от отдалечения „HEAD“, или изрично " "зададения с „--branch“" -#: builtin/clone.c:97 +#: builtin/clone.c:106 msgid "any cloned submodules will be shallow" msgstr "всички клонирани подмодули ще са плитки" -#: builtin/clone.c:98 builtin/init-db.c:479 +#: builtin/clone.c:107 builtin/init-db.c:484 msgid "gitdir" msgstr "СЛУЖЕБНА_ДИРЕКТОРИЯ" -#: builtin/clone.c:99 builtin/init-db.c:480 +#: builtin/clone.c:108 builtin/init-db.c:485 msgid "separate git dir from working tree" msgstr "отделна СЛУЖЕБНА_ДИРЕКТОРИЯ за git извън работното дърво" -#: builtin/clone.c:100 +#: builtin/clone.c:109 msgid "key=value" msgstr "КЛЮЧ=СТОЙНОСТ" -#: builtin/clone.c:101 +#: builtin/clone.c:110 msgid "set config inside the new repository" msgstr "задаване на настройките на новото хранилище" -#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536 +#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:547 msgid "use IPv4 addresses only" msgstr "само адреси IPv4" -#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538 +#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:549 msgid "use IPv6 addresses only" msgstr "само адреси IPv6" -#: builtin/clone.c:241 +#: builtin/clone.c:250 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -5257,190 +6237,195 @@ msgstr "" "Името на директорията не може да бъде отгатнато.\n" "Задайте директорията изрично на командния ред" -#: builtin/clone.c:307 -#, c-format -msgid "reference repository '%s' as a linked checkout is not supported yet." -msgstr "все още не се поддържа еталонно хранилище „%s“ като свързано." - -#: builtin/clone.c:309 -#, c-format -msgid "reference repository '%s' is not a local repository." -msgstr "еталонното хранилище „%s“ не е локално" - -#: builtin/clone.c:314 +#: builtin/clone.c:303 #, c-format -msgid "reference repository '%s' is shallow" -msgstr "еталонното хранилище „%s“ е плитко" +msgid "info: Could not add alternate for '%s': %s\n" +msgstr "" +"ПРЕДУПРЕЖДЕНИЕ: не може да се добави алтернативен източник на „%s“: %s\n" -#: builtin/clone.c:317 +#: builtin/clone.c:375 #, c-format -msgid "reference repository '%s' is grafted" -msgstr "еталонното хранилище „%s“ е с присаждане" +msgid "failed to open '%s'" +msgstr "директорията „%s“ не може да бъде отворена" -#: builtin/clone.c:384 +#: builtin/clone.c:383 #, c-format msgid "%s exists and is not a directory" msgstr "„%s“ съществува и не е директория" -#: builtin/clone.c:398 +#: builtin/clone.c:397 #, c-format msgid "failed to stat %s\n" msgstr "не може да бъде получена информация чрез „stat“ за „%s“\n" -#: builtin/clone.c:420 +#: builtin/clone.c:419 #, c-format msgid "failed to create link '%s'" msgstr "връзката „%s“ не може да бъде създадена" -#: builtin/clone.c:424 +#: builtin/clone.c:423 #, c-format msgid "failed to copy file to '%s'" msgstr "файлът не може да бъде копиран като „%s“" -#: builtin/clone.c:449 builtin/clone.c:633 +#: builtin/clone.c:448 #, c-format msgid "done.\n" msgstr "действието завърши.\n" -#: builtin/clone.c:461 +#: builtin/clone.c:460 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" -"за определен клон. Все пак можете да проверите кои файлове и от кой\n" -"клон в момента са изтеглени с командата „git status“. Можете да\n" +"за определен клон. Все пак можете да проверите кои файлове и от кой\n" +"клон в момента са изтеглени с командата „git status“. Можете да\n" "завършите изтеглянето на клона с командата „git checkout -f HEAD“.\n" -#: builtin/clone.c:538 +#: builtin/clone.c:537 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" "Клонът „%s“ от отдалеченото хранилище, което клонирате,\n" "и който следва да бъде изтеглен, не съществува." -# FIXME translator note that the space at end is necesssary -#: builtin/clone.c:628 -#, c-format -msgid "Checking connectivity... " -msgstr "Проверка на връзката… " - -#: builtin/clone.c:631 +#: builtin/clone.c:632 msgid "remote did not send all necessary objects" msgstr "отдалеченото хранилище не изпрати всички необходими обекти." # FIXME merge with next? -#: builtin/clone.c:649 +#: builtin/clone.c:648 #, c-format msgid "unable to update %s" msgstr "обектът „%s“ не може да бъде обновен" -#: builtin/clone.c:698 +#: builtin/clone.c:697 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "указателят „HEAD“ от отдалеченото хранилище сочи към нещо,\n" -"което не съществува. Не може да се изтегли определен клон.\n" +"което не съществува. Не може да се изтегли определен клон.\n" -#: builtin/clone.c:729 +#: builtin/clone.c:728 msgid "unable to checkout working tree" msgstr "работното дърво не може да бъде подготвено" -#: builtin/clone.c:767 +#: builtin/clone.c:768 msgid "unable to write parameters to config file" msgstr "настройките не могат да бъдат записани в конфигурационния файл" -#: builtin/clone.c:830 +#: builtin/clone.c:831 msgid "cannot repack to clean up" msgstr "не може да се извърши пакетиране за изчистване на файловете" -#: builtin/clone.c:832 +#: builtin/clone.c:833 msgid "cannot unlink temporary alternates file" msgstr "временният файл за алтернативни обекти не може да бъде изтрит" -#: builtin/clone.c:864 builtin/receive-pack.c:1731 +#: builtin/clone.c:866 builtin/receive-pack.c:1895 msgid "Too many arguments." msgstr "Прекалено много аргументи." -#: builtin/clone.c:868 +#: builtin/clone.c:870 msgid "You must specify a repository to clone." msgstr "Трябва да укажете кое хранилище искате да клонирате." -#: builtin/clone.c:879 +#: builtin/clone.c:883 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "опциите „--bare“ и „--origin %s“ са несъвместими." -#: builtin/clone.c:882 +#: builtin/clone.c:886 msgid "--bare and --separate-git-dir are incompatible." msgstr "опциите „--bare“ и „--separate-git-dir“ са несъвместими." -#: builtin/clone.c:895 +#: builtin/clone.c:899 #, c-format msgid "repository '%s' does not exist" msgstr "не съществува хранилище „%s“" -#: builtin/clone.c:901 builtin/fetch.c:1174 +#: builtin/clone.c:905 builtin/fetch.c:1338 #, c-format msgid "depth %s is not a positive number" msgstr "дълбочината трябва да е положително цяло число, а не „%s“" -#: builtin/clone.c:911 +#: builtin/clone.c:915 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "целевият път „%s“ съществува и не е празна директория." -#: builtin/clone.c:921 +#: builtin/clone.c:925 #, c-format msgid "working tree '%s' already exists." msgstr "в „%s“ вече съществува работно дърво." -#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547 -#: builtin/worktree.c:220 builtin/worktree.c:247 +#: builtin/clone.c:940 builtin/clone.c:951 builtin/submodule--helper.c:657 +#: builtin/worktree.c:222 builtin/worktree.c:249 #, c-format msgid "could not create leading directories of '%s'" msgstr "родителските директории на „%s“ не могат да бъдат създадени" -#: builtin/clone.c:939 +#: builtin/clone.c:943 #, c-format msgid "could not create work tree dir '%s'" msgstr "работното дърво в „%s“ не може да бъде създадено." -#: builtin/clone.c:957 +#: builtin/clone.c:955 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Клониране и създаване на голо хранилище в „%s“…\n" -#: builtin/clone.c:959 +#: builtin/clone.c:957 #, c-format msgid "Cloning into '%s'...\n" msgstr "Клониране и създаване на хранилище в „%s“…\n" -#: builtin/clone.c:998 +#: builtin/clone.c:963 +msgid "" +"clone --recursive is not compatible with both --reference and --reference-if-" +"able" +msgstr "" +"Опцията „--recursive“ е несъвместима с опциите „--reference“ и „--reference-" +"if-able“" + +#: builtin/clone.c:1019 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -"При локално клониране опцията „--depth“ се игнорира. Ползвайте схемата " +"При локално клониране опцията „--depth“ се прескача. Ползвайте схемата " "„file://“." -#: builtin/clone.c:1001 +#: builtin/clone.c:1021 +msgid "--shallow-since is ignored in local clones; use file:// instead." +msgstr "" +"При локално клониране опцията „--shallow-since“ се прескача. Ползвайте " +"схемата „file://“." + +#: builtin/clone.c:1023 +msgid "--shallow-exclude is ignored in local clones; use file:// instead." +msgstr "" +"При локално клониране опцията „--shallow-exclude“ се прескача. Ползвайте " +"схемата „file://“." + +#: builtin/clone.c:1026 msgid "source repository is shallow, ignoring --local" -msgstr "клонираното хранилище е плитко, затова опцията „--local“ се игнорира" +msgstr "клонираното хранилище е плитко, затова опцията „--local“ се прескача" -#: builtin/clone.c:1006 +#: builtin/clone.c:1031 msgid "--local is ignored" -msgstr "опцията „--local“ се игнорира" +msgstr "опцията „--local“ се прескача" -#: builtin/clone.c:1010 +#: builtin/clone.c:1035 #, c-format msgid "Don't know how to clone %s" msgstr "Не се поддържа клониране на връзки от вида „%s“ " -#: builtin/clone.c:1059 builtin/clone.c:1067 +#: builtin/clone.c:1090 builtin/clone.c:1098 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Отдалеченият клон „%s“ липсва в клонираното хранилище „%s“" -#: builtin/clone.c:1070 +#: builtin/clone.c:1101 msgid "You appear to have cloned an empty repository." msgstr "Изглежда клонирахте празно хранилище." @@ -5499,8 +6484,8 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" "Името и адресът за е-поща са настроени автоматично на базата на името на\n" -"потребителя и името на машината. Проверете дали са верни. Можете да спрете\n" -"това съобщение като изрично зададете стойностите. Изпълнете следната " +"потребителя и името на машината. Проверете дали са верни. Можете да спрете\n" +"това съобщение като изрично зададете стойностите. Изпълнете следната " "команда\n" "и следвайте инструкциите в текстовия ви редактор, за да редактирате\n" "конфигурационния файл:\n" @@ -5526,7 +6511,7 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" "Името и адресът за е-поща са настроени автоматично на базата на името на\n" -"потребителя и името на машината. Проверете дали са верни. Можете да спрете\n" +"потребителя и името на машината. Проверете дали са верни. Можете да спрете\n" "това съобщение като изрично зададете стойностите:\n" "\n" " git config --global user.name \"Вашето Име\"\n" @@ -5543,8 +6528,8 @@ msgid "" "it empty. You can repeat your command with --allow-empty, or you can\n" "remove the commit entirely with \"git reset HEAD^\".\n" msgstr "" -"Поискахте да поправите последното си подаване. Това действие ще превърне\n" -"подаването в празно. Можете или да го повторите като разрешите такива " +"Поискахте да поправите последното си подаване. Това действие ще превърне\n" +"подаването в празно. Можете или да го повторите като разрешите такива " "подавания\n" "с опцията „--allow-empty“, или да го изтриете от историята с командата:\n" "„git reset HEAD^“.\n" @@ -5558,7 +6543,7 @@ msgid "" "\n" msgstr "" "Предишното отбрано подаване вече е празно, като най-вероятната причина е\n" -"корекция на конфликт. Ако все пак искате да го ползвате, използвайте " +"корекция на конфликт. Ако все пак искате да го ползвате, използвайте " "командата:\n" "\n" " git commit --allow-empty\n" @@ -5584,43 +6569,43 @@ msgstr "" "Чрез командата „git cherry-pick --continue“ ще продължите отбирането на\n" "останалите подавания.\n" -#: builtin/commit.c:307 +#: builtin/commit.c:318 msgid "failed to unpack HEAD tree object" msgstr "върховото дърво (HEAD tree object) не може да бъде извадено от пакет" -#: builtin/commit.c:348 +#: builtin/commit.c:359 msgid "unable to create temporary index" msgstr "временният индекс не може да бъде създаден" -#: builtin/commit.c:354 +#: builtin/commit.c:365 msgid "interactive add failed" msgstr "неуспешно интерактивно добавяне" -#: builtin/commit.c:367 +#: builtin/commit.c:378 msgid "unable to update temporary index" msgstr "временният индекс не може да бъде обновен" -#: builtin/commit.c:369 +#: builtin/commit.c:380 msgid "Failed to update main cache tree" msgstr "Дървото на основния кеш не може да бъде обновено" -#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465 +#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476 msgid "unable to write new_index file" msgstr "новият индекс не може да бъде записан" -#: builtin/commit.c:447 +#: builtin/commit.c:458 msgid "cannot do a partial commit during a merge." msgstr "по време на сливане не може да се извърши частично подаване." -#: builtin/commit.c:449 +#: builtin/commit.c:460 msgid "cannot do a partial commit during a cherry-pick." msgstr "по време на отбиране не може да се извърши частично подаване." -#: builtin/commit.c:458 +#: builtin/commit.c:469 msgid "cannot read the index" msgstr "индексът не може да бъде прочетен" -#: builtin/commit.c:477 +#: builtin/commit.c:488 msgid "unable to write temporary index file" msgstr "временният индекс не може да бъде записан" @@ -5651,12 +6636,12 @@ msgstr "" "не може да се избере знак за коментар — в текущото съобщение за подаване са " "използвани всички подобни знаци" -#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091 +#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096 #, c-format msgid "could not lookup commit %s" msgstr "следното подаване не може да бъде открито: %s" -#: builtin/commit.c:704 builtin/shortlog.c:285 +#: builtin/commit.c:704 builtin/shortlog.c:286 #, c-format msgid "(reading log message from standard input)\n" msgstr "(изчитане на съобщението за подаване от стандартния вход)\n" @@ -5682,7 +6667,6 @@ msgstr "съобщението за сливане MERGE_MSG не може да msgid "could not write commit template" msgstr "шаблонът за подаване не може да бъде запазен" -# FIXME #: builtin/commit.c:814 #, c-format msgid "" @@ -5693,12 +6677,11 @@ msgid "" "and try again.\n" msgstr "" "\n" -"Изглежда, че подавате сливане. Ако това не е така, изтрийте файла:\n" +"Изглежда, че подавате сливане. Ако това не е така, изтрийте файла:\n" "\n" " %s\n" "и опитайте отново.\n" -# FIXME #: builtin/commit.c:819 #, c-format msgid "" @@ -5709,7 +6692,7 @@ msgid "" "and try again.\n" msgstr "" "\n" -"Изглежда, че извършвате отбрано подаване. Ако това не е така, изтрийте " +"Изглежда, че извършвате отбрано подаване. Ако това не е така, изтрийте " "файла:\n" "\n" " %s\n" @@ -5721,7 +6704,7 @@ msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" -"Въведете съобщението за подаване на промените. Редовете, които започват\n" +"Въведете съобщението за подаване на промените. Редовете, които започват\n" "с „%c“, ще бъдат пропуснати, а празно съобщение преустановява подаването.\n" #: builtin/commit.c:839 @@ -5731,8 +6714,8 @@ msgid "" "with '%c' will be kept; you may remove them yourself if you want to.\n" "An empty message aborts the commit.\n" msgstr "" -"Въведете съобщението за подаване на промените. Редовете, които започват\n" -"с „%c“, също ще бъдат включени — може да ги изтриете вие. Празно \n" +"Въведете съобщението за подаване на промените. Редовете, които започват\n" +"с „%c“, също ще бъдат включени — може да ги изтриете вие. Празно \n" "съобщение преустановява подаването.\n" #: builtin/commit.c:859 @@ -5754,501 +6737,505 @@ msgstr "%sПодаващ: %.*s <%.*s>" msgid "Cannot read index" msgstr "Индексът не може да бъде прочетен" -#: builtin/commit.c:949 +#: builtin/commit.c:954 msgid "Error building trees" msgstr "Грешка при изграждане на дърветата" -#: builtin/commit.c:964 builtin/tag.c:266 +#: builtin/commit.c:969 builtin/tag.c:266 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Подайте съобщението с някоя от опциите „-m“ или „-F“.\n" -#: builtin/commit.c:1066 +#: builtin/commit.c:1071 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "Опцията „--author '%s'“ не отговаря на форма̀та „Име <е-поща>“ и не съвпада с " "никой автор" -#: builtin/commit.c:1081 builtin/commit.c:1321 +#: builtin/commit.c:1086 builtin/commit.c:1327 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Неправилна стойност за неследените файлове: „%s“" -#: builtin/commit.c:1118 +#: builtin/commit.c:1124 msgid "--long and -z are incompatible" msgstr "Опциите „--long“ и „-z“ са несъвместими." -#: builtin/commit.c:1148 +#: builtin/commit.c:1154 msgid "Using both --reset-author and --author does not make sense" msgstr "Опциите „--reset-author“ и „--author“ са несъвместими." -#: builtin/commit.c:1157 +#: builtin/commit.c:1163 msgid "You have nothing to amend." msgstr "Няма какво да бъде поправено." -#: builtin/commit.c:1160 +#: builtin/commit.c:1166 msgid "You are in the middle of a merge -- cannot amend." msgstr "В момента се извършва сливане, не можете да поправяте." -#: builtin/commit.c:1162 +#: builtin/commit.c:1168 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "В момента се извършва отбиране на подаване, не можете да поправяте." -#: builtin/commit.c:1165 +#: builtin/commit.c:1171 msgid "Options --squash and --fixup cannot be used together" msgstr "Опциите „--squash“ и „--fixup“ са несъвместими." -#: builtin/commit.c:1175 +#: builtin/commit.c:1181 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Опциите „-c“, „-C“, „-F“ и „--fixup““ са несъвместими." -#: builtin/commit.c:1177 +#: builtin/commit.c:1183 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "Опцията „-m“ е несъвместима с „-c“, „-C“, „-F“ и „--fixup“." -#: builtin/commit.c:1185 +#: builtin/commit.c:1191 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" "Опцията „--reset-author“ може да се използва само заедно с „-C“, „-c“ или\n" "„--amend“." -#: builtin/commit.c:1202 +#: builtin/commit.c:1208 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Опциите „--include“, „--only“, „--all“, „--interactive“ и „--patch“ са\n" "несъвместими." -#: builtin/commit.c:1204 +#: builtin/commit.c:1210 msgid "No paths with --include/--only does not make sense." msgstr "Опциите „--include“ и „--only“ изискват аргументи." -# FIXME bad message -#: builtin/commit.c:1206 +#: builtin/commit.c:1212 msgid "Clever... amending the last one with dirty index." msgstr "" "Чудесно сте се сетили как да поправите съобщението на последното подаване " "при\n" -"променен индекс. Споделете и с друг потребител трика с „git commit --amend -" +"променен индекс. Споделете и с друг потребител трика с „git commit --amend -" "o“." -#: builtin/commit.c:1208 +#: builtin/commit.c:1214 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" -"Зададени са изрични пътища без опциите „-i“ или „-o“. Приема се, че все едно " -"сте\n" +"Зададени са изрични пътища без опциите „-i“ или „-o“. Приема се, че все " +"едно сте\n" "ползвали опцията „--only“ с ПЪТища…" -#: builtin/commit.c:1220 builtin/tag.c:474 +#: builtin/commit.c:1226 builtin/tag.c:474 #, c-format msgid "Invalid cleanup mode %s" msgstr "Несъществуващ режим на изчистване „%s“" -#: builtin/commit.c:1225 +#: builtin/commit.c:1231 msgid "Paths with -a does not make sense." msgstr "Опцията „-a“ е несъвместима със задаването на пътища." -#: builtin/commit.c:1335 builtin/commit.c:1621 +#: builtin/commit.c:1341 builtin/commit.c:1617 msgid "show status concisely" msgstr "кратка информация за състоянието" -#: builtin/commit.c:1337 builtin/commit.c:1623 +#: builtin/commit.c:1343 builtin/commit.c:1619 msgid "show branch information" msgstr "информация за клоните" -#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512 -#: builtin/worktree.c:437 +#: builtin/commit.c:1345 +msgid "version" +msgstr "версия" + +#: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522 +#: builtin/worktree.c:440 msgid "machine-readable output" msgstr "формат на изхода за четене от програма" -#: builtin/commit.c:1342 builtin/commit.c:1627 +#: builtin/commit.c:1348 builtin/commit.c:1623 msgid "show status in long format (default)" msgstr "подробна информация за състоянието (стандартно)" -#: builtin/commit.c:1345 builtin/commit.c:1630 +#: builtin/commit.c:1351 builtin/commit.c:1626 msgid "terminate entries with NUL" msgstr "разделяне на елементите с нулевия знак „NUL“" -#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981 +#: builtin/commit.c:1353 builtin/commit.c:1629 builtin/fast-export.c:981 #: builtin/fast-export.c:984 builtin/tag.c:353 msgid "mode" msgstr "РЕЖИМ" -#: builtin/commit.c:1348 builtin/commit.c:1633 +#: builtin/commit.c:1354 builtin/commit.c:1629 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -"извеждане на неследените файлове. Възможните РЕЖИМи са „all“ (подробна " -"информация), „normal“ (кратка информация), „no“ (без неследените файлове). " +"извеждане на неследените файлове. Възможните РЕЖИМи са „all“ (подробна " +"информация), „normal“ (кратка информация), „no“ (без неследените файлове). " "Стандартният РЕЖИМ е: „all“." -#: builtin/commit.c:1351 +#: builtin/commit.c:1357 msgid "show ignored files" msgstr "извеждане на игнорираните файлове" -#: builtin/commit.c:1352 parse-options.h:155 +#: builtin/commit.c:1358 parse-options.h:155 msgid "when" msgstr "КОГА" -#: builtin/commit.c:1353 +#: builtin/commit.c:1359 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" -"игнориране на промените в подмодулите. Опция с незадължителна стойност — " +"игнориране на промените в подмодулите. Опция с незадължителна стойност — " "една от „all“ (всички), „dirty“ (тези с неподадени промени), " "„untracked“ (неследени)" -#: builtin/commit.c:1355 +#: builtin/commit.c:1361 msgid "list untracked files in columns" msgstr "извеждане на неследените файлове в колони" -#: builtin/commit.c:1441 +#: builtin/commit.c:1437 msgid "couldn't look up newly created commit" msgstr "току що създаденото подаване не може да бъде открито" -#: builtin/commit.c:1443 +#: builtin/commit.c:1439 msgid "could not parse newly created commit" msgstr "току що създаденото подаване не може да бъде анализирано" -#: builtin/commit.c:1488 +#: builtin/commit.c:1484 msgid "detached HEAD" msgstr "несвързан връх „HEAD“" -#: builtin/commit.c:1491 +#: builtin/commit.c:1487 msgid " (root-commit)" msgstr " (начално подаване)" -#: builtin/commit.c:1591 +#: builtin/commit.c:1587 msgid "suppress summary after successful commit" msgstr "без информация след успешно подаване" -#: builtin/commit.c:1592 +#: builtin/commit.c:1588 msgid "show diff in commit message template" msgstr "добавяне на разликата към шаблона за съобщението при подаване" -#: builtin/commit.c:1594 +#: builtin/commit.c:1590 msgid "Commit message options" msgstr "Опции за съобщението при подаване" -#: builtin/commit.c:1595 builtin/tag.c:351 +#: builtin/commit.c:1591 builtin/tag.c:351 msgid "read message from file" msgstr "взимане на съобщението от ФАЙЛ" -#: builtin/commit.c:1596 +#: builtin/commit.c:1592 msgid "author" msgstr "АВТОР" -#: builtin/commit.c:1596 +#: builtin/commit.c:1592 msgid "override author for commit" msgstr "задаване на АВТОР за подаването" -#: builtin/commit.c:1597 builtin/gc.c:326 +#: builtin/commit.c:1593 builtin/gc.c:326 msgid "date" msgstr "ДАТА" -#: builtin/commit.c:1597 +#: builtin/commit.c:1593 msgid "override date for commit" msgstr "задаване на ДАТА за подаването" -#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395 -#: builtin/notes.c:558 builtin/tag.c:349 +#: builtin/commit.c:1594 builtin/merge.c:220 builtin/notes.c:398 +#: builtin/notes.c:561 builtin/tag.c:349 msgid "message" msgstr "СЪОБЩЕНИЕ" -#: builtin/commit.c:1598 +#: builtin/commit.c:1594 msgid "commit message" msgstr "СЪОБЩЕНИЕ при подаване" -#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601 -#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79 +#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597 +#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:79 msgid "commit" msgstr "ПОДАВАНЕ" -#: builtin/commit.c:1599 +#: builtin/commit.c:1595 msgid "reuse and edit message from specified commit" msgstr "преизползване и редактиране на съобщението от указаното ПОДАВАНЕ" -#: builtin/commit.c:1600 +#: builtin/commit.c:1596 msgid "reuse message from specified commit" msgstr "преизползване на съобщението от указаното ПОДАВАНЕ" -#: builtin/commit.c:1601 +#: builtin/commit.c:1597 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "използване на автоматичното съобщение при смачкване за вкарване на указаното " "ПОДАВАНЕ в предното без следа" -#: builtin/commit.c:1602 +#: builtin/commit.c:1598 msgid "use autosquash formatted message to squash specified commit" msgstr "" "използване на автоматичното съобщение при смачкване за смачкване на " "указаното ПОДАВАНЕ в предното" -#: builtin/commit.c:1603 +#: builtin/commit.c:1599 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" "смяна на автора да съвпада с подаващия (използва се с „-C“/„-c“/„--amend“)" -#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86 +#: builtin/commit.c:1600 builtin/log.c:1413 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "добавяне на поле за подпис — „Signed-off-by:“" -#: builtin/commit.c:1605 +#: builtin/commit.c:1601 msgid "use specified template file" msgstr "използване на указания шаблонен ФАЙЛ" -#: builtin/commit.c:1606 +#: builtin/commit.c:1602 msgid "force edit of commit" msgstr "редактиране на подаване" -#: builtin/commit.c:1607 +#: builtin/commit.c:1603 msgid "default" msgstr "стандартно" -#: builtin/commit.c:1607 builtin/tag.c:354 +#: builtin/commit.c:1603 builtin/tag.c:354 msgid "how to strip spaces and #comments from message" msgstr "кои празни знаци и #коментари да се махат от съобщенията" -#: builtin/commit.c:1608 +#: builtin/commit.c:1604 msgid "include status in commit message template" msgstr "вмъкване на състоянието в шаблона за съобщението при подаване" -#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165 +#: builtin/commit.c:1606 builtin/merge.c:230 builtin/pull.c:166 #: builtin/revert.c:93 msgid "GPG sign commit" msgstr "подписване на подаването с GPG" -#: builtin/commit.c:1613 +#: builtin/commit.c:1609 msgid "Commit contents options" msgstr "Опции за избор на файлове при подаване" -#: builtin/commit.c:1614 +#: builtin/commit.c:1610 msgid "commit all changed files" msgstr "подаване на всички променени файлове" -#: builtin/commit.c:1615 +#: builtin/commit.c:1611 msgid "add specified files to index for commit" msgstr "добавяне на указаните файлове към индекса за подаване" -#: builtin/commit.c:1616 +#: builtin/commit.c:1612 msgid "interactively add files" msgstr "интерактивно добавяне на файлове" -#: builtin/commit.c:1617 +#: builtin/commit.c:1613 msgid "interactively add changes" msgstr "интерактивно добавяне на промени" -#: builtin/commit.c:1618 +#: builtin/commit.c:1614 msgid "commit only specified files" msgstr "подаване само на указаните файлове" -#: builtin/commit.c:1619 -msgid "bypass pre-commit hook" -msgstr "без изпълнение на куката преди подаване (pre-commit)" +#: builtin/commit.c:1615 +msgid "bypass pre-commit and commit-msg hooks" +msgstr "" +"без изпълнение на куките преди подаване и при промяна на съобщението за " +"подаване (pre-commit и commit-msg)" -#: builtin/commit.c:1620 +#: builtin/commit.c:1616 msgid "show what would be committed" msgstr "отпечатване на това, което би било подадено" -#: builtin/commit.c:1631 +#: builtin/commit.c:1627 msgid "amend previous commit" msgstr "поправяне на предишното подаване" -#: builtin/commit.c:1632 +#: builtin/commit.c:1628 msgid "bypass post-rewrite hook" msgstr "без изпълнение на куката след презаписване (post-rewrite)" -#: builtin/commit.c:1637 +#: builtin/commit.c:1633 msgid "ok to record an empty change" msgstr "позволяване на празни подавания" -#: builtin/commit.c:1639 +#: builtin/commit.c:1635 msgid "ok to record a change with an empty message" msgstr "позволяване на подавания с празни съобщения" -#: builtin/commit.c:1668 +#: builtin/commit.c:1664 msgid "could not parse HEAD commit" msgstr "върховото подаване „HEAD“ не може да бъде прочетено" -#: builtin/commit.c:1718 +#: builtin/commit.c:1712 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Повреден файл за върха за сливането „MERGE_HEAD“ (%s)" -#: builtin/commit.c:1725 +#: builtin/commit.c:1719 msgid "could not read MERGE_MODE" msgstr "режимът на сливане „MERGE_MODE“ не може да бъде прочетен" -#: builtin/commit.c:1744 +#: builtin/commit.c:1738 #, c-format msgid "could not read commit message: %s" msgstr "съобщението за подаване не може да бъде прочетено: %s" -#: builtin/commit.c:1755 +#: builtin/commit.c:1749 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Неизвършване на подаване поради нередактирано съобщение.\n" -#: builtin/commit.c:1760 +#: builtin/commit.c:1754 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Неизвършване на подаване поради празно съобщение.\n" -#: builtin/commit.c:1808 +#: builtin/commit.c:1802 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 "" "Хранилището е обновено, но новият файл за индекс „new_index“\n" -"не е записан. Проверете дали дискът не е препълнен или не сте\n" -"превишили дисковата си квота. След това изпълнете „git reset HEAD“." +"не е записан. Проверете дали дискът не е препълнен или не сте\n" +"превишили дисковата си квота. След това изпълнете „git reset HEAD“." #: builtin/config.c:9 msgid "git config [<options>]" msgstr "git config [ОПЦИЯ…]" -#: builtin/config.c:56 +#: builtin/config.c:55 msgid "Config file location" msgstr "Местоположение на конфигурационния файл" -#: builtin/config.c:57 +#: builtin/config.c:56 msgid "use global config file" msgstr "използване на глобалния конфигурационен файл" -#: builtin/config.c:58 +#: builtin/config.c:57 msgid "use system config file" msgstr "използване на системния конфигурационен файл" -#: builtin/config.c:59 +#: builtin/config.c:58 msgid "use repository config file" msgstr "използване на конфигурационния файл на хранилището" -#: builtin/config.c:60 +#: builtin/config.c:59 msgid "use given config file" msgstr "използване на зададения конфигурационен ФАЙЛ" -#: builtin/config.c:61 +#: builtin/config.c:60 msgid "blob-id" msgstr "ИДЕНТИФИКАТОР" -#: builtin/config.c:61 +#: builtin/config.c:60 msgid "read config from given blob object" msgstr "" "изчитане на конфигурацията от BLOB с този ИДЕНТИФИКАТОР на съдържанието" -#: builtin/config.c:62 +#: builtin/config.c:61 msgid "Action" msgstr "Действие" -#: builtin/config.c:63 +#: builtin/config.c:62 msgid "get value: name [value-regex]" msgstr "извеждане на стойност: ИМЕ [РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]" -#: builtin/config.c:64 +#: builtin/config.c:63 msgid "get all values: key [value-regex]" msgstr "извеждане на всички стойности: ключ [РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]" -#: builtin/config.c:65 +#: builtin/config.c:64 msgid "get values for regexp: name-regex [value-regex]" msgstr "" "извеждане на стойностите за РЕГУЛЯРНия_ИЗРАЗ: РЕГУЛЯРЕН_ИЗРАЗ_ЗА_ИМЕТО " "[РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]" -#: builtin/config.c:66 +#: builtin/config.c:65 msgid "get value specific for the URL: section[.var] URL" msgstr "извеждане на стойността за указания адрес: РАЗДЕЛ[.ПРОМЕНЛИВА] АДРЕС" -#: builtin/config.c:67 +#: builtin/config.c:66 msgid "replace all matching variables: name value [value_regex]" msgstr "" "замяна на всички съвпадащи променливи: ИМЕ СТОЙНОСТ " "[РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]" -#: builtin/config.c:68 +#: builtin/config.c:67 msgid "add a new variable: name value" msgstr "добавяне на нова променлива: ИМЕ СТОЙНОСТ" -#: builtin/config.c:69 +#: builtin/config.c:68 msgid "remove a variable: name [value-regex]" msgstr "изтриване на променлива: ИМЕ [РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]" -#: builtin/config.c:70 +#: builtin/config.c:69 msgid "remove all matches: name [value-regex]" msgstr "изтриване на всички съвпадащи: ИМЕ [РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]" -#: builtin/config.c:71 +#: builtin/config.c:70 msgid "rename section: old-name new-name" msgstr "преименуване на раздел: СТАРО_ИМЕ НОВО_ИМЕ" -#: builtin/config.c:72 +#: builtin/config.c:71 msgid "remove a section: name" msgstr "изтриване на раздел: ИМЕ" -#: builtin/config.c:73 +#: builtin/config.c:72 msgid "list all" msgstr "изброяване на всички" -#: builtin/config.c:74 +#: builtin/config.c:73 msgid "open an editor" msgstr "отваряне на редактор" -#: builtin/config.c:75 +#: builtin/config.c:74 msgid "find the color configured: slot [default]" msgstr "извеждане на зададения цвят: номер [стандартно]" -#: builtin/config.c:76 +#: builtin/config.c:75 msgid "find the color setting: slot [stdout-is-tty]" msgstr "извеждане на зададения цвят: номер [стандартният изход е терминал]" -#: builtin/config.c:77 +#: builtin/config.c:76 msgid "Type" msgstr "Вид" -#: builtin/config.c:78 +#: builtin/config.c:77 msgid "value is \"true\" or \"false\"" msgstr "СТОЙНОСТТА е „true“ (истина) или „false“ (лъжа)" -#: builtin/config.c:79 +#: builtin/config.c:78 msgid "value is decimal number" msgstr "СТОЙНОСТТА е цяло, десетично число" -#: builtin/config.c:80 +#: builtin/config.c:79 msgid "value is --bool or --int" msgstr "СТОЙНОСТТА е „--bool“ (булева) или „--int“ (десетично цяло число)" -#: builtin/config.c:81 +#: builtin/config.c:80 msgid "value is a path (file or directory name)" msgstr "СТОЙНОСТТА е път (до файл или директория)" -#: builtin/config.c:82 +#: builtin/config.c:81 msgid "Other" msgstr "Други" -# FIXME NUL byte to null char, terminate -> razdelitel - da stane ednakvo -#: builtin/config.c:83 +#: builtin/config.c:82 msgid "terminate values with NUL byte" msgstr "разделяне на стойностите с нулевия знак „NUL“" -#: builtin/config.c:84 +#: builtin/config.c:83 msgid "show variable names only" msgstr "извеждане на имената на променливите" -#: builtin/config.c:85 +#: builtin/config.c:84 msgid "respect include directives on lookup" msgstr "при търсене да се уважат и директивите за включване" -#: builtin/config.c:86 +#: builtin/config.c:85 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" "извеждане на мястото на задаване на настройката (файл, стандартен вход, " "обект BLOB, команден ред)" -#: builtin/config.c:328 +#: builtin/config.c:327 msgid "unable to parse default color value" msgstr "неразпозната стойност на стандартния цвят" -#: builtin/config.c:472 +#: builtin/config.c:471 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -6263,20 +7250,29 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:614 +#: builtin/config.c:613 #, c-format msgid "cannot create configuration file %s" msgstr "конфигурационният файл „%s“ не може да бъде създаден" -#: builtin/count-objects.c:77 +#: builtin/config.c:625 +#, c-format +msgid "" +"cannot overwrite multiple values with a single value\n" +" Use a regexp, --add or --replace-all to change %s." +msgstr "" +"множество стойности не могат да се заменят с една.\n" +"За да промените „%s“, ползвайте регулярен израз или оциите „--add“ и „--" +"replace-all“." + +#: builtin/count-objects.c:86 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "git count-objects [-v] [-H | --human-readable]" -#: builtin/count-objects.c:87 +#: builtin/count-objects.c:96 msgid "print sizes in human readable format" msgstr "извеждане на размерите на обектите във формат лесно четим от хора" -# FIXME ... instead of *??? #: builtin/describe.c:17 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [ОПЦИЯ…] УКАЗАТЕЛ_КЪМ_ПОДАВАНЕ…" @@ -6300,7 +7296,7 @@ msgstr "в анотирания етикет „%s“ липсва вграде msgid "tag '%s' is really '%s' here" msgstr "етикетът „%s“ тук е всъщност „%s“" -#: builtin/describe.c:250 builtin/log.c:465 +#: builtin/describe.c:250 builtin/log.c:480 #, c-format msgid "Not a valid object name %s" msgstr "Неправилно име на обект „%s“" @@ -6332,7 +7328,7 @@ msgid "" "However, there were unannotated tags: try --tags." msgstr "" "Никой анотиран етикет не описва „%s“.\n" -"Съществуват и неанотирани етикети. Пробвайте с опцията „--tags“." +"Съществуват и неанотирани етикети. Пробвайте с опцията „--tags“." #: builtin/describe.c:350 #, c-format @@ -6396,7 +7392,7 @@ msgstr "да се търси само в този БРОЙ последни ет msgid "only consider tags matching <pattern>" msgstr "да се търси само измежду етикетите напасващи този ШАБЛОН" -#: builtin/describe.c:410 builtin/name-rev.c:321 +#: builtin/describe.c:410 builtin/name-rev.c:320 msgid "show abbreviated commit object as fallback" msgstr "извеждане на съкратено име на обект като резервен вариант" @@ -6430,21 +7426,21 @@ msgstr "„%s“: не е нито обикновен файл, нито сим msgid "invalid option: %s" msgstr "неправилна опция: %s" -#: builtin/diff.c:360 +#: builtin/diff.c:361 msgid "Not a git repository" msgstr "Не е хранилище на Git" -#: builtin/diff.c:403 +#: builtin/diff.c:404 #, c-format msgid "invalid object '%s' given." msgstr "зададен е неправилен обект „%s“." -#: builtin/diff.c:412 +#: builtin/diff.c:413 #, c-format msgid "more than two blobs given: '%s'" msgstr "зададени са повече от 2 обекта BLOB: „%s“" -#: builtin/diff.c:419 +#: builtin/diff.c:420 #, c-format msgid "unhandled object '%s' given." msgstr "зададен е неподдържан обект „%s“." @@ -6501,271 +7497,283 @@ msgstr "Прилагане на УКАЗАТЕЛя_НА_ВЕРСИЯ към из msgid "anonymize output" msgstr "анонимизиране на извежданата информация" -#: builtin/fetch.c:20 +#: builtin/fetch.c:21 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [ОПЦИЯ…] [ХРАНИЛИЩЕ [УКАЗАТЕЛ…]]" -#: builtin/fetch.c:21 +#: builtin/fetch.c:22 msgid "git fetch [<options>] <group>" msgstr "git fetch [ОПЦИЯ…] ГРУПА" -#: builtin/fetch.c:22 +#: builtin/fetch.c:23 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [ОПЦИЯ…] [(ХРАНИЛИЩЕ | ГРУПА)…]" -#: builtin/fetch.c:23 +#: builtin/fetch.c:24 msgid "git fetch --all [<options>]" msgstr "git fetch --all [ОПЦИЯ…]" -#: builtin/fetch.c:92 builtin/pull.c:174 +#: builtin/fetch.c:95 builtin/pull.c:175 msgid "fetch from all remotes" msgstr "доставяне от всички отдалечени хранилища" -#: builtin/fetch.c:94 builtin/pull.c:177 +#: builtin/fetch.c:97 builtin/pull.c:178 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "добавяне към „.git/FETCH_HEAD“ вместо замяна" -#: builtin/fetch.c:96 builtin/pull.c:180 +#: builtin/fetch.c:99 builtin/pull.c:181 msgid "path to upload pack on remote end" msgstr "отдалечен път, където да се качи пакетът" -#: builtin/fetch.c:97 builtin/pull.c:182 +#: builtin/fetch.c:100 builtin/pull.c:183 msgid "force overwrite of local branch" msgstr "принудително презаписване на локалния клон" -#: builtin/fetch.c:99 +#: builtin/fetch.c:102 msgid "fetch from multiple remotes" msgstr "доставяне от множество отдалечени хранилища" -#: builtin/fetch.c:101 builtin/pull.c:184 +#: builtin/fetch.c:104 builtin/pull.c:185 msgid "fetch all tags and associated objects" msgstr "доставяне на всички етикети и принадлежащи обекти" -#: builtin/fetch.c:103 +#: builtin/fetch.c:106 msgid "do not fetch all tags (--no-tags)" msgstr "без доставянето на всички етикети „--no-tags“" -#: builtin/fetch.c:105 +#: builtin/fetch.c:108 msgid "number of submodules fetched in parallel" msgstr "брой подмодули доставени паралелно" -#: builtin/fetch.c:107 builtin/pull.c:187 +#: builtin/fetch.c:110 builtin/pull.c:188 msgid "prune remote-tracking branches no longer on remote" msgstr "окастряне на клоните следящи вече несъществуващи отдалечени клони" -#: builtin/fetch.c:108 builtin/pull.c:190 +#: builtin/fetch.c:111 builtin/pull.c:191 msgid "on-demand" msgstr "ПРИ НУЖДА" -#: builtin/fetch.c:109 builtin/pull.c:191 +#: builtin/fetch.c:112 builtin/pull.c:192 msgid "control recursive fetching of submodules" msgstr "управление на рекурсивното доставяне на подмодулите" -#: builtin/fetch.c:113 builtin/pull.c:199 +#: builtin/fetch.c:116 builtin/pull.c:200 msgid "keep downloaded pack" msgstr "запазване на изтеглените пакети с обекти" -#: builtin/fetch.c:115 +#: builtin/fetch.c:118 msgid "allow updating of HEAD ref" msgstr "позволяване на обновяването на указателя „HEAD“" -#: builtin/fetch.c:118 builtin/pull.c:202 +#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203 msgid "deepen history of shallow clone" msgstr "задълбочаване на историята на плитко хранилище" -#: builtin/fetch.c:120 builtin/pull.c:205 +#: builtin/fetch.c:123 +msgid "deepen history of shallow repository based on time" +msgstr "задълбочаване на историята на плитко хранилище до определено време" + +#: builtin/fetch.c:129 builtin/pull.c:206 msgid "convert to a complete repository" msgstr "превръщане в пълно хранилище" -#: builtin/fetch.c:122 builtin/log.c:1399 +#: builtin/fetch.c:131 builtin/log.c:1433 msgid "dir" msgstr "директория" -#: builtin/fetch.c:123 +#: builtin/fetch.c:132 msgid "prepend this to submodule path output" msgstr "добавяне на това пред пътя на подмодула" -#: builtin/fetch.c:126 +#: builtin/fetch.c:135 msgid "default mode for recursion" msgstr "стандартен режим на рекурсия" -#: builtin/fetch.c:128 builtin/pull.c:208 +#: builtin/fetch.c:137 builtin/pull.c:209 msgid "accept refs that update .git/shallow" msgstr "приемане на указатели, които обновяват „.git/shallow“" -#: builtin/fetch.c:129 builtin/pull.c:210 +#: builtin/fetch.c:138 builtin/pull.c:211 msgid "refmap" msgstr "КАРТА_С_УКАЗАТЕЛИ" -#: builtin/fetch.c:130 builtin/pull.c:211 +#: builtin/fetch.c:139 builtin/pull.c:212 msgid "specify fetch refmap" msgstr "указване на КАРТАта_С_УКАЗАТЕЛИ за доставяне" -#: builtin/fetch.c:386 +#: builtin/fetch.c:398 msgid "Couldn't find remote ref HEAD" msgstr "Указателят „HEAD“ в отдалеченото хранилище не може да бъде открит" -#: builtin/fetch.c:466 +#: builtin/fetch.c:514 +#, c-format +msgid "configuration fetch.output contains invalid value %s" +msgstr "настройката „fetch.output“ е с неправилна стойност „%s“" + +#: builtin/fetch.c:607 #, c-format msgid "object %s not found" msgstr "обектът „%s“ липсва" -#: builtin/fetch.c:471 +#: builtin/fetch.c:611 msgid "[up to date]" msgstr "[актуализиран]" -#: builtin/fetch.c:485 -#, c-format -msgid "! %-*s %-*s -> %s (can't fetch in current branch)" -msgstr "! %-*s %-*s → %s (в текущия клон не може да се доставя)" - -#: builtin/fetch.c:486 builtin/fetch.c:574 +#: builtin/fetch.c:624 builtin/fetch.c:704 msgid "[rejected]" msgstr "[отхвърлен]" -#: builtin/fetch.c:497 +#: builtin/fetch.c:625 +msgid "can't fetch in current branch" +msgstr "в текущия клон не може да се доставя" + +#: builtin/fetch.c:634 msgid "[tag update]" msgstr "[обновяване на етикетите]" -#: builtin/fetch.c:499 builtin/fetch.c:534 builtin/fetch.c:552 -msgid " (unable to update local ref)" -msgstr " (локалните указатели не могат да бъдат обновени)" +#: builtin/fetch.c:635 builtin/fetch.c:668 builtin/fetch.c:684 +#: builtin/fetch.c:699 +msgid "unable to update local ref" +msgstr "локален указател не може да бъде обновен" -#: builtin/fetch.c:517 +#: builtin/fetch.c:654 msgid "[new tag]" msgstr "[нов етикет]" -#: builtin/fetch.c:520 +#: builtin/fetch.c:657 msgid "[new branch]" msgstr "[нов клон]" -#: builtin/fetch.c:523 +#: builtin/fetch.c:660 msgid "[new ref]" msgstr "[нов указател]" -#: builtin/fetch.c:569 -msgid "unable to update local ref" -msgstr "локален указател не може да бъде обновен" - -#: builtin/fetch.c:569 +#: builtin/fetch.c:699 msgid "forced update" msgstr "принудително обновяване" -#: builtin/fetch.c:576 -msgid "(non-fast-forward)" -msgstr "(сливането не е тривиално)" +#: builtin/fetch.c:704 +msgid "non-fast-forward" +msgstr "сливането не е тривиално" -#: builtin/fetch.c:619 +#: builtin/fetch.c:749 #, c-format msgid "%s did not send all necessary objects\n" msgstr "хранилището „%s“ не изпрати всички необходими обекти\n" -#: builtin/fetch.c:637 +#: builtin/fetch.c:769 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" "отхвърляне на върха „%s“, защото плитките хранилища не могат да бъдат " "обновявани" -#: builtin/fetch.c:724 builtin/fetch.c:816 +#: builtin/fetch.c:856 builtin/fetch.c:952 #, c-format msgid "From %.*s\n" msgstr "От %.*s\n" -# FIXME - is the space necessary -#: builtin/fetch.c:735 +#: builtin/fetch.c:867 #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" -"някои локални указатели не могат да бъдат обновени. Изпълнете командата\n" +"някои локални указатели не могат да бъдат обновени. Изпълнете командата\n" "„git remote prune %s“, за да премахнете остарелите клони, които\n" "предизвикват конфликта" -#: builtin/fetch.c:787 +#: builtin/fetch.c:922 #, c-format msgid " (%s will become dangling)" msgstr " (обектът „%s“ ще се окаже извън клон)" -#: builtin/fetch.c:788 +#: builtin/fetch.c:923 #, c-format msgid " (%s has become dangling)" msgstr " (обектът „%s“ вече е извън клон)" -#: builtin/fetch.c:820 +#: builtin/fetch.c:955 msgid "[deleted]" msgstr "[изтрит]" -#: builtin/fetch.c:821 builtin/remote.c:1025 +#: builtin/fetch.c:956 builtin/remote.c:1020 msgid "(none)" msgstr "(нищо)" -#: builtin/fetch.c:841 +#: builtin/fetch.c:979 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Не може да доставите в текущия клон „%s“ на хранилище, което не е голо" -#: builtin/fetch.c:860 +#: builtin/fetch.c:998 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Стойността „%2$s“ за опцията „%1$s“ не е съвместима с „%3$s“" -#: builtin/fetch.c:863 +#: builtin/fetch.c:1001 #, c-format msgid "Option \"%s\" is ignored for %s\n" -msgstr "Опцията „%s“ се игнорира при „%s“\n" +msgstr "Опцията „%s“ се прескача при „%s“\n" -#: builtin/fetch.c:920 +#: builtin/fetch.c:1077 #, c-format msgid "Don't know how to fetch from %s" msgstr "Не се поддържа доставяне от „%s“" -#: builtin/fetch.c:1080 +#: builtin/fetch.c:1237 #, c-format msgid "Fetching %s\n" msgstr "Доставяне на „%s“\n" -#: builtin/fetch.c:1082 builtin/remote.c:96 +#: builtin/fetch.c:1239 builtin/remote.c:96 #, c-format msgid "Could not fetch %s" msgstr "„%s“ не може да се достави" -#: builtin/fetch.c:1100 +#: builtin/fetch.c:1257 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "" -"Не сте указали отдалечено хранилище. Задайте или адрес, или име\n" +"Не сте указали отдалечено хранилище. Задайте или адрес, или име\n" "на отдалечено хранилище, откъдето да се доставят новите версии." -#: builtin/fetch.c:1123 +#: builtin/fetch.c:1280 msgid "You need to specify a tag name." msgstr "Трябва да укажете име на етикет." -#: builtin/fetch.c:1165 +#: builtin/fetch.c:1322 +msgid "Negative depth in --deepen is not supported" +msgstr "Отрицателна дълбочина като аргумент на „--deepen“ не се поддържа" + +#: builtin/fetch.c:1324 +msgid "--deepen and --depth are mutually exclusive" +msgstr "Опциите „--deepen“ и „--depth“ са несъвместими една с друга" + +#: builtin/fetch.c:1329 msgid "--depth and --unshallow cannot be used together" msgstr "опциите „--depth“ и „--unshallow“ са несъвместими" -#: builtin/fetch.c:1167 +#: builtin/fetch.c:1331 msgid "--unshallow on a complete repository does not make sense" msgstr "не можете да използвате опцията „--unshallow“ върху пълно хранилище" -#: builtin/fetch.c:1187 +#: builtin/fetch.c:1353 msgid "fetch --all does not take a repository argument" msgstr "към „git fetch --all“ не можете да добавите аргумент — хранилище" -#: builtin/fetch.c:1189 +#: builtin/fetch.c:1355 msgid "fetch --all does not make sense with refspecs" msgstr "" "към „git fetch --all“ не можете да добавите аргумент — указател на версия" -#: builtin/fetch.c:1200 +#: builtin/fetch.c:1366 #, c-format msgid "No such remote or remote group: %s" msgstr "Няма нито отдалечено хранилище, нито група от хранилища на име „%s“" -#: builtin/fetch.c:1208 +#: builtin/fetch.c:1374 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Указването на група и указването на версия са несъвместими" @@ -6775,25 +7783,25 @@ msgid "" msgstr "" "git fmt-merge-msg [-m СЪОБЩЕНИЕ] [--log[=БРОЙ] | --no-log] [--file ФАЙЛ]" -#: builtin/fmt-merge-msg.c:667 +#: builtin/fmt-merge-msg.c:663 msgid "populate log with at most <n> entries from shortlog" msgstr "" "вмъкване на журнал състоящ се от не повече от БРОЙ записа от съкратения " "журнал" -#: builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:666 msgid "alias for --log (deprecated)" msgstr "синоним на „--log“ (остаряло)" -#: builtin/fmt-merge-msg.c:673 +#: builtin/fmt-merge-msg.c:669 msgid "text" msgstr "ТЕКСТ" -#: builtin/fmt-merge-msg.c:674 +#: builtin/fmt-merge-msg.c:670 msgid "use <text> as start of message" msgstr "за начало на съобщението да се ползва ТЕКСТ" -#: builtin/fmt-merge-msg.c:675 +#: builtin/fmt-merge-msg.c:671 msgid "file to read from" msgstr "файл, от който да се чете" @@ -6853,68 +7861,67 @@ msgstr "извеждане само на неслетите указатели" msgid "print only refs which contain the commit" msgstr "извеждане само на указателите, които съдържат това ПОДАВАНЕ" -#: builtin/fsck.c:156 builtin/prune.c:140 -msgid "Checking connectivity" -msgstr "Проверка на връзката" - -#: builtin/fsck.c:486 +#: builtin/fsck.c:519 msgid "Checking object directories" msgstr "Проверка на директориите с обекти" -#: builtin/fsck.c:552 +#: builtin/fsck.c:588 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [ОПЦИЯ…] [ОБЕКТ…]" -#: builtin/fsck.c:558 +#: builtin/fsck.c:594 msgid "show unreachable objects" msgstr "показване на недостижимите обекти" -#: builtin/fsck.c:559 +#: builtin/fsck.c:595 msgid "show dangling objects" msgstr "показване на обектите извън клоните" -#: builtin/fsck.c:560 +#: builtin/fsck.c:596 msgid "report tags" msgstr "показване на етикетите" -#: builtin/fsck.c:561 +#: builtin/fsck.c:597 msgid "report root nodes" msgstr "показване на кореновите възли" -#: builtin/fsck.c:562 +#: builtin/fsck.c:598 msgid "make index objects head nodes" msgstr "задаване на обекти от индекса да са коренови" # FIXME bad message -#: builtin/fsck.c:563 +#: builtin/fsck.c:599 msgid "make reflogs head nodes (default)" msgstr "проследяване на указателите от журнала като глави (стандартно)" -#: builtin/fsck.c:564 +#: builtin/fsck.c:600 msgid "also consider packs and alternate objects" msgstr "допълнително да се проверяват пакетите и алтернативните обекти" -#: builtin/fsck.c:565 +#: builtin/fsck.c:601 msgid "check only connectivity" msgstr "проверка само на връзката" -#: builtin/fsck.c:566 +#: builtin/fsck.c:602 msgid "enable more strict checking" msgstr "по-строги проверки" -#: builtin/fsck.c:568 +#: builtin/fsck.c:604 msgid "write dangling objects in .git/lost-found" msgstr "запазване на обектите извън клоните в директорията „.git/lost-found“" -#: builtin/fsck.c:569 builtin/prune.c:107 +#: builtin/fsck.c:605 builtin/prune.c:107 msgid "show progress" msgstr "показване на напредъка" -#: builtin/fsck.c:630 +#: builtin/fsck.c:606 +msgid "show verbose names for reachable objects" +msgstr "показване на подробни имена на достижимите обекти" + +#: builtin/fsck.c:665 msgid "Checking objects" msgstr "Проверка на обектите" -# FIXME plural with ... #: builtin/gc.c:25 msgid "git gc [<options>]" msgstr "git gc [ОПЦИЯ…]" @@ -6938,7 +7945,7 @@ msgid "" "\n" "%s" msgstr "" -"При последното изпълнение на „git gc“ бе докладвана грешка. Коригирайте " +"При последното изпълнение на „git gc“ бе докладвана грешка. Коригирайте " "причината за\n" "нея и изтрийте „%s“.\n" "Автоматичното изчистване на боклука няма да работи, преди да изтриете " @@ -6999,7 +8006,6 @@ msgstr "" "Има прекалено много недостижими, непакетирани обекти.\n" "Използвайте „git prune“, за да ги окастрите." -# FIXME plural ... options #: builtin/grep.c:23 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [ОПЦИЯ…] [-e] ШАБЛОН [ВЕРСИЯ…] [[--] ПЪТ…]" @@ -7014,239 +8020,234 @@ msgstr "grep: неуспешно създаване на нишка: %s" msgid "invalid number of threads specified (%d) for %s" msgstr "зададен е неправилен брой нишки (%d) за %s" -#: builtin/grep.c:452 builtin/grep.c:487 +#: builtin/grep.c:453 builtin/grep.c:488 #, c-format msgid "unable to read tree (%s)" msgstr "дървото не може да бъде прочетено (%s)" -#: builtin/grep.c:502 +#: builtin/grep.c:503 #, c-format msgid "unable to grep from object of type %s" msgstr "не може да се изпълни „grep“ от обект от вида %s" -#: builtin/grep.c:560 +#: builtin/grep.c:561 #, c-format msgid "switch `%c' expects a numerical value" msgstr "опцията „%c“ очаква число за аргумент" -#: builtin/grep.c:577 -#, c-format -msgid "cannot open '%s'" -msgstr "„%s“ не може да бъде отворен" - -#: builtin/grep.c:646 +#: builtin/grep.c:647 msgid "search in index instead of in the work tree" msgstr "търсене в индекса, а не в работното дърво" -#: builtin/grep.c:648 +#: builtin/grep.c:649 msgid "find in contents not managed by git" msgstr "търсене и във файловете, които не са под управлението на git" -#: builtin/grep.c:650 +#: builtin/grep.c:651 msgid "search in both tracked and untracked files" msgstr "търсене и в следените, и в неследените файлове" -#: builtin/grep.c:652 +#: builtin/grep.c:653 msgid "ignore files specified via '.gitignore'" msgstr "игнориране на файловете указани в „.gitignore“" -#: builtin/grep.c:655 +#: builtin/grep.c:656 msgid "show non-matching lines" msgstr "извеждане на редовете, които не съвпадат" -#: builtin/grep.c:657 +#: builtin/grep.c:658 msgid "case insensitive matching" msgstr "без значение на регистъра на буквите (главни/малки)" -#: builtin/grep.c:659 +#: builtin/grep.c:660 msgid "match patterns only at word boundaries" msgstr "напасване на шаблоните само по границите на думите" -#: builtin/grep.c:661 +#: builtin/grep.c:662 msgid "process binary files as text" msgstr "обработване на двоичните файлове като текстови" -#: builtin/grep.c:663 +#: builtin/grep.c:664 msgid "don't match patterns in binary files" msgstr "прескачане на двоичните файлове" -#: builtin/grep.c:666 +#: builtin/grep.c:667 msgid "process binary files with textconv filters" msgstr "" "обработване на двоичните файлове чрез филтри за преобразуване към текст" -#: builtin/grep.c:668 +#: builtin/grep.c:669 msgid "descend at most <depth> levels" msgstr "навлизане максимално на тази ДЪЛБОЧИНА в дървото" -#: builtin/grep.c:672 +#: builtin/grep.c:673 msgid "use extended POSIX regular expressions" msgstr "разширени регулярни изрази по POSIX" -#: builtin/grep.c:675 +#: builtin/grep.c:676 msgid "use basic POSIX regular expressions (default)" msgstr "основни регулярни изрази по POSIX (стандартно)" -#: builtin/grep.c:678 +#: builtin/grep.c:679 msgid "interpret patterns as fixed strings" msgstr "шаблоните са дословни низове" -#: builtin/grep.c:681 +#: builtin/grep.c:682 msgid "use Perl-compatible regular expressions" msgstr "регулярни изрази на Perl" -#: builtin/grep.c:684 +#: builtin/grep.c:685 msgid "show line numbers" msgstr "извеждане на номерата на редовете" -#: builtin/grep.c:685 +#: builtin/grep.c:686 msgid "don't show filenames" msgstr "без извеждане на имената на файловете" -#: builtin/grep.c:686 +#: builtin/grep.c:687 msgid "show filenames" msgstr "извеждане на имената на файловете" -#: builtin/grep.c:688 +#: builtin/grep.c:689 msgid "show filenames relative to top directory" msgstr "" "извеждане на относителните имена на файловете спрямо основната директория на " "хранилището" -#: builtin/grep.c:690 +#: builtin/grep.c:691 msgid "show only filenames instead of matching lines" msgstr "извеждане само на имената на файловете без напасващите редове" -#: builtin/grep.c:692 +#: builtin/grep.c:693 msgid "synonym for --files-with-matches" msgstr "синоним на „--files-with-matches“" -#: builtin/grep.c:695 +#: builtin/grep.c:696 msgid "show only the names of files without match" msgstr "" "извеждане само на имената на файловете, които не съдържат ред, напасващ на " "шаблона" -#: builtin/grep.c:697 +#: builtin/grep.c:698 msgid "print NUL after filenames" msgstr "извеждане на нулевия знак „NUL“ след всяко име на файл" -#: builtin/grep.c:699 +#: builtin/grep.c:700 msgid "show the number of matches instead of matching lines" msgstr "извеждане на броя на съвпаденията вместо напасващите редове" -#: builtin/grep.c:700 +#: builtin/grep.c:701 msgid "highlight matches" msgstr "оцветяване на напасванията" -#: builtin/grep.c:702 +#: builtin/grep.c:703 msgid "print empty line between matches from different files" msgstr "извеждане на празен ред между напасванията от различни файлове" -#: builtin/grep.c:704 +#: builtin/grep.c:705 msgid "show filename only once above matches from same file" msgstr "" "извеждане на името на файла само веднъж за всички напасвания от този файл" -#: builtin/grep.c:707 +#: builtin/grep.c:708 msgid "show <n> context lines before and after matches" msgstr "извеждане на такъв БРОЙ редове преди и след напасванията" -#: builtin/grep.c:710 +#: builtin/grep.c:711 msgid "show <n> context lines before matches" msgstr "извеждане на такъв БРОЙ редове преди напасванията" -#: builtin/grep.c:712 +#: builtin/grep.c:713 msgid "show <n> context lines after matches" msgstr "извеждане на такъв БРОЙ редове след напасванията" -#: builtin/grep.c:714 +#: builtin/grep.c:715 msgid "use <n> worker threads" msgstr "използване на такъв БРОЙ работещи нишки" -#: builtin/grep.c:715 +#: builtin/grep.c:716 msgid "shortcut for -C NUM" msgstr "синоним на „-C БРОЙ“" -#: builtin/grep.c:718 +#: builtin/grep.c:719 msgid "show a line with the function name before matches" msgstr "извеждане на ред с името на функцията, в която е напаснат шаблона" -#: builtin/grep.c:720 +#: builtin/grep.c:721 msgid "show the surrounding function" msgstr "извеждане на обхващащата функция" -#: builtin/grep.c:723 +#: builtin/grep.c:724 msgid "read patterns from file" msgstr "изчитане на шаблоните от ФАЙЛ" -#: builtin/grep.c:725 +#: builtin/grep.c:726 msgid "match <pattern>" msgstr "напасване на ШАБЛОН" -#: builtin/grep.c:727 +#: builtin/grep.c:728 msgid "combine patterns specified with -e" msgstr "комбиниране на шаблоните указани с опцията „-e“" -#: builtin/grep.c:739 +#: builtin/grep.c:740 msgid "indicate hit with exit status without output" msgstr "" -"без извеждане на стандартния изход. Изходният код указва наличието на " +"без извеждане на стандартния изход. Изходният код указва наличието на " "напасване" -#: builtin/grep.c:741 +#: builtin/grep.c:742 msgid "show only matches from files that match all patterns" msgstr "" "извеждане на редове само от файловете, които напасват на всички шаблони" -#: builtin/grep.c:743 +#: builtin/grep.c:744 msgid "show parse tree for grep expression" msgstr "извеждане на дървото за анализ на регулярния израз" -#: builtin/grep.c:747 +#: builtin/grep.c:748 msgid "pager" msgstr "програма за преглед по страници" -#: builtin/grep.c:747 +#: builtin/grep.c:748 msgid "show matching files in the pager" msgstr "извеждане на съвпадащите файлове в програма за преглед по страници" -#: builtin/grep.c:750 +#: builtin/grep.c:751 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" "позволяване на стартирането на grep(1) (текущият компилат пренебрегва тази " "опция)" -#: builtin/grep.c:813 +#: builtin/grep.c:814 msgid "no pattern given." msgstr "липсва шаблон." -#: builtin/grep.c:845 builtin/index-pack.c:1477 +#: builtin/grep.c:846 builtin/index-pack.c:1480 #, c-format msgid "invalid number of threads specified (%d)" msgstr "зададен е неправилен брой нишки: %d" -#: builtin/grep.c:875 +#: builtin/grep.c:876 msgid "--open-files-in-pager only works on the worktree" msgstr "" "опцията „--open-files-in-pager“ е съвместима само с търсене в работното дърво" -#: builtin/grep.c:901 +#: builtin/grep.c:902 msgid "--cached or --untracked cannot be used with --no-index." msgstr "опциите „--cached“ и „--untracked“ са несъвместими с „--no-index“." -#: builtin/grep.c:906 +#: builtin/grep.c:907 msgid "--no-index or --untracked cannot be used with revs." msgstr "" "опциите „--cached“ и „--untracked“ са несъвместими с търсене във версии." -#: builtin/grep.c:909 +#: builtin/grep.c:910 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" "опциите „--(no-)exclude-standard“ са несъвместими с търсене по следени " "файлове." -#: builtin/grep.c:917 +#: builtin/grep.c:918 msgid "both --cached and trees are given." msgstr "опцията „--cached“ е несъвместима със задаване на дърво." @@ -7262,547 +8263,549 @@ msgstr "" msgid "git hash-object --stdin-paths" msgstr "git hash-object --stdin-paths" -#: builtin/hash-object.c:93 +#: builtin/hash-object.c:94 msgid "type" msgstr "ВИД" -#: builtin/hash-object.c:93 +#: builtin/hash-object.c:94 msgid "object type" msgstr "ВИД на обекта" -#: builtin/hash-object.c:94 +#: builtin/hash-object.c:95 msgid "write the object into the object database" msgstr "записване на обекта в базата от данни за обектите" -#: builtin/hash-object.c:96 +#: builtin/hash-object.c:97 msgid "read the object from stdin" msgstr "изчитане на обекта от стандартния вход" -#: builtin/hash-object.c:98 +#: builtin/hash-object.c:99 msgid "store file as is without filters" msgstr "запазване на файла както е — без филтри" -#: builtin/hash-object.c:99 +#: builtin/hash-object.c:100 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "" "създаване и хеширане на произволни данни за повредени обекти за трасиране на " "Git" -#: builtin/hash-object.c:100 +#: builtin/hash-object.c:101 msgid "process file as it were from this path" msgstr "обработване на ФАЙЛа все едно е с този път" -#: builtin/help.c:41 +#: builtin/help.c:42 msgid "print all available commands" msgstr "показване на всички налични команди" -#: builtin/help.c:42 +#: builtin/help.c:43 +msgid "exclude guides" +msgstr "без пътеводетели" + +#: builtin/help.c:44 msgid "print list of useful guides" msgstr "показване на списък с пътеводители" -#: builtin/help.c:43 +#: builtin/help.c:45 msgid "show man page" msgstr "показване на страница от ръководството" -#: builtin/help.c:44 +#: builtin/help.c:46 msgid "show manual in web browser" msgstr "показване на страница от ръководството в уеб браузър" -#: builtin/help.c:46 +#: builtin/help.c:48 msgid "show info page" msgstr "показване на информационна страница" -#: builtin/help.c:52 +#: builtin/help.c:54 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "git help [--all] [--guides] [--man | --web | --info] [КОМАНДА]" -#: builtin/help.c:64 +#: builtin/help.c:66 #, c-format msgid "unrecognized help format '%s'" msgstr "непознат формат на помощта „%s“" -#: builtin/help.c:91 +#: builtin/help.c:93 msgid "Failed to start emacsclient." msgstr "Неуспешно стартиране на „emacsclient“." -#: builtin/help.c:104 +#: builtin/help.c:106 msgid "Failed to parse emacsclient version." msgstr "Версията на „emacsclient“ не може да се анализира." -#: builtin/help.c:112 +#: builtin/help.c:114 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "Прекалено стара версия на „emacsclient“ — %d (< 22)." -#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168 +#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170 #, c-format msgid "failed to exec '%s'" msgstr "неуспешно изпълнение на „%s“" -#: builtin/help.c:205 +#: builtin/help.c:207 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man.<tool>.cmd' instead." msgstr "" "„%s“: път към неподдържана програма за преглед на\n" -" ръководството. Вместо нея пробвайте „man.<tool>.cmd“." +" ръководството. Вместо нея пробвайте „man.<tool>.cmd“." -#: builtin/help.c:217 +#: builtin/help.c:219 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man.<tool>.path' instead." msgstr "" "„%s“: команда за поддържана програма за преглед на\n" -" ръководството. Вместо нея пробвайте „man.<tool>.path“." +" ръководството. Вместо нея пробвайте „man.<tool>.path“." -#: builtin/help.c:334 +#: builtin/help.c:336 #, c-format msgid "'%s': unknown man viewer." msgstr "„%s“: непозната програма за преглед на ръководството." -#: builtin/help.c:351 +#: builtin/help.c:353 msgid "no man viewer handled the request" msgstr "никоя програма за преглед на ръководство не успя да обработи заявката" -#: builtin/help.c:359 +#: builtin/help.c:361 msgid "no info viewer handled the request" msgstr "" "никоя програма за преглед на информационните страници не успя да обработи " "заявката" -#: builtin/help.c:408 +#: builtin/help.c:403 msgid "Defining attributes per path" msgstr "Указване на атрибути към път" -#: builtin/help.c:409 +#: builtin/help.c:404 msgid "Everyday Git With 20 Commands Or So" msgstr "Ежедневието в Git в рамките на 20-ина команди" -#: builtin/help.c:410 +#: builtin/help.c:405 msgid "A Git glossary" msgstr "Речник с термините на Git" -#: builtin/help.c:411 +#: builtin/help.c:406 msgid "Specifies intentionally untracked files to ignore" msgstr "Указване на неследени файлове, които да бъдат нарочно пренебрегвани" -#: builtin/help.c:412 +#: builtin/help.c:407 msgid "Defining submodule properties" msgstr "Дефиниране на свойствата на подмодулите" -#: builtin/help.c:413 +#: builtin/help.c:408 msgid "Specifying revisions and ranges for Git" -msgstr "Указване на версии и интервали в Git" +msgstr "Указване на версии и диапазони в Git" -#: builtin/help.c:414 +#: builtin/help.c:409 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "Въвеждащ урок за Git (версии поне 1.5.1)" -#: builtin/help.c:415 +#: builtin/help.c:410 msgid "An overview of recommended workflows with Git" msgstr "Общ преглед на препоръчваните начини за работа с Git" -#: builtin/help.c:427 +#: builtin/help.c:422 msgid "The common Git guides are:\n" msgstr "Популярните пътеводители в Git са:\n" -#: builtin/help.c:448 builtin/help.c:465 -#, c-format -msgid "usage: %s%s" -msgstr "употреба: %s%s" - -#: builtin/help.c:481 +#: builtin/help.c:440 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "„git %s“ е синоним на „%s“" +#: builtin/help.c:462 builtin/help.c:479 +#, c-format +msgid "usage: %s%s" +msgstr "употреба: %s%s" + # FIXME merge with next? -#: builtin/index-pack.c:152 +#: builtin/index-pack.c:154 #, c-format msgid "unable to open %s" msgstr "обектът „%s“ не може да бъде отворен" -#: builtin/index-pack.c:202 +#: builtin/index-pack.c:204 #, c-format msgid "object type mismatch at %s" msgstr "неправилен вид на обекта „%s“" -#: builtin/index-pack.c:222 +#: builtin/index-pack.c:224 #, c-format msgid "did not receive expected object %s" msgstr "очакваният обект „%s“ не бе получен" -#: builtin/index-pack.c:225 +#: builtin/index-pack.c:227 #, c-format msgid "object %s: expected type %s, found %s" msgstr "неправилен вид на обекта „%s“: очакваше се „%s“, а бе получен „%s“" -#: builtin/index-pack.c:267 +#: builtin/index-pack.c:269 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "не може да се запълни %d байт" msgstr[1] "не може да се запълнят %d байта" -#: builtin/index-pack.c:277 +#: builtin/index-pack.c:279 msgid "early EOF" msgstr "неочакван край на файл" -#: builtin/index-pack.c:278 +#: builtin/index-pack.c:280 msgid "read error on input" msgstr "грешка при четене на входните данни" -#: builtin/index-pack.c:290 +#: builtin/index-pack.c:292 msgid "used more bytes than were available" msgstr "използвани са повече от наличните байтове" -#: builtin/index-pack.c:297 +#: builtin/index-pack.c:299 msgid "pack too large for current definition of off_t" msgstr "пакетният файл е прекалено голям за текущата стойност на типа „off_t“" -#: builtin/index-pack.c:313 +#: builtin/index-pack.c:302 builtin/unpack-objects.c:92 +msgid "pack exceeds maximum allowed size" +msgstr "пакетният файл надвишава максималния възможен размер" + +#: builtin/index-pack.c:317 #, c-format msgid "unable to create '%s'" msgstr "пакетният файл „%s“ не може да бъде създаден" -#: builtin/index-pack.c:318 +#: builtin/index-pack.c:322 #, c-format msgid "cannot open packfile '%s'" msgstr "пакетният файл „%s“ не може да бъде отворен" -#: builtin/index-pack.c:332 +#: builtin/index-pack.c:336 msgid "pack signature mismatch" msgstr "несъответствие в подписа към пакетния файл" -#: builtin/index-pack.c:334 +#: builtin/index-pack.c:338 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "не се поддържа пакетиране вeрсия „%<PRIu32>“" -#: builtin/index-pack.c:352 +#: builtin/index-pack.c:356 #, c-format -msgid "pack has bad object at offset %lu: %s" -msgstr "повреден обект в пакетния файл при отместване %lu: %s" +msgid "pack has bad object at offset %<PRIuMAX>: %s" +msgstr "повреден обект в пакетния файл при отместване %<PRIuMAX>: %s" -#: builtin/index-pack.c:473 +#: builtin/index-pack.c:478 #, c-format msgid "inflate returned %d" msgstr "декомпресирането с „inflate“ върна %d" -#: builtin/index-pack.c:522 +#: builtin/index-pack.c:527 msgid "offset value overflow for delta base object" msgstr "стойността на отместването за обекта-разлика води до препълване" -#: builtin/index-pack.c:530 +#: builtin/index-pack.c:535 msgid "delta base offset is out of bound" msgstr "стойността на отместването за обекта-разлика е извън диапазона" -#: builtin/index-pack.c:538 +#: builtin/index-pack.c:543 #, c-format msgid "unknown object type %d" msgstr "непознат вид обект %d" -#: builtin/index-pack.c:569 +#: builtin/index-pack.c:574 msgid "cannot pread pack file" msgstr "пакетният файл не може да бъде прочетен" -#: builtin/index-pack.c:571 +#: builtin/index-pack.c:576 #, c-format -msgid "premature end of pack file, %lu byte missing" -msgid_plural "premature end of pack file, %lu bytes missing" -msgstr[0] "неочакван край на файл, липсва %lu байт" -msgstr[1] "неочакван край на файл, липсват %lu байта" +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:597 +#: builtin/index-pack.c:602 msgid "serious inflate inconsistency" msgstr "сериозна грешка при декомпресиране с „inflate“" -#: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772 -#: builtin/index-pack.c:806 builtin/index-pack.c:815 +#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777 +#: builtin/index-pack.c:811 builtin/index-pack.c:820 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" "СЪВПАДЕНИЕ НА СТОЙНОСТИТЕ ЗА СУМИТЕ ЗА SHA1: „%s“ НА ДВА РАЗЛИЧНИ ОБЕКТА!" # FIXME merge with next? -#: builtin/index-pack.c:746 builtin/pack-objects.c:162 -#: builtin/pack-objects.c:254 +#: builtin/index-pack.c:751 builtin/pack-objects.c:166 +#: builtin/pack-objects.c:258 #, c-format msgid "unable to read %s" msgstr "обектът „%s“ не може да бъде прочетен" -#: builtin/index-pack.c:812 +#: builtin/index-pack.c:817 #, c-format msgid "cannot read existing object %s" msgstr "съществуващият обект „%s“ не може да бъде прочетен" -#: builtin/index-pack.c:826 +#: builtin/index-pack.c:831 #, c-format msgid "invalid blob object %s" msgstr "неправилен обект BLOB „%s“" # FIXME perhaps invalid object -#: builtin/index-pack.c:840 +#: builtin/index-pack.c:845 #, c-format msgid "invalid %s" msgstr "неправилен обект „%s“" -#: builtin/index-pack.c:843 +#: builtin/index-pack.c:848 msgid "Error in object" msgstr "Грешка в обекта" -#: builtin/index-pack.c:845 +#: builtin/index-pack.c:850 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Някои обекти, наследници на „%s“, не могат да бъдат достигнати" -#: builtin/index-pack.c:917 builtin/index-pack.c:948 +#: builtin/index-pack.c:922 builtin/index-pack.c:953 msgid "failed to apply delta" msgstr "разликата не може да бъде приложена" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1123 msgid "Receiving objects" msgstr "Получаване на обекти" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1123 msgid "Indexing objects" msgstr "Индексиране на обекти" -#: builtin/index-pack.c:1150 +#: builtin/index-pack.c:1155 msgid "pack is corrupted (SHA1 mismatch)" msgstr "пакетният файл е повреден (нееднакви суми по SHA1)" -#: builtin/index-pack.c:1155 +#: builtin/index-pack.c:1160 msgid "cannot fstat packfile" msgstr "не може да се получи информация за пакетния файл с „fstat“" -#: builtin/index-pack.c:1158 +#: builtin/index-pack.c:1163 msgid "pack has junk at the end" msgstr "в края на пакетния файл има повредени данни" -# FIXME WTF message -#: builtin/index-pack.c:1169 +#: builtin/index-pack.c:1174 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "" -"фатална грешка във функцията „parse_pack_objects“. Това е грешка в Git, " +"фатална грешка във функцията „parse_pack_objects“. Това е грешка в Git, " "докладвайте я на разработчиците, като пратите е-писмо на адрес: „git@vger." "kernel.org“." -#: builtin/index-pack.c:1194 +#: builtin/index-pack.c:1197 msgid "Resolving deltas" msgstr "Откриване на съответните разлики" -#: builtin/index-pack.c:1205 +#: builtin/index-pack.c:1208 #, c-format msgid "unable to create thread: %s" msgstr "не може да се създаде нишка: %s" -# FIXME WTF message -#: builtin/index-pack.c:1247 +#: builtin/index-pack.c:1250 msgid "confusion beyond insanity" msgstr "" -"фатална грешка във функцията „conclude_pack“. Това е грешка в Git, " +"фатална грешка във функцията „conclude_pack“. Това е грешка в Git, " "докладвайте я на разработчиците, като пратите е-писмо на адрес: „git@vger." "kernel.org“." -#: builtin/index-pack.c:1253 +#: builtin/index-pack.c:1256 #, 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:1265 +#: builtin/index-pack.c:1268 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" "Неочаквана последваща сума за грешки за „%s“ (причината може да е грешка в " "диска)" -#: builtin/index-pack.c:1269 +#: builtin/index-pack.c:1272 #, 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:1293 +#: builtin/index-pack.c:1296 #, c-format msgid "unable to deflate appended object (%d)" msgstr "добавеният обект не може да се компресира с „deflate“: %d" -#: builtin/index-pack.c:1369 +#: builtin/index-pack.c:1372 #, c-format msgid "local object %s is corrupt" msgstr "локалният обект „%s“ е повреден" -#: builtin/index-pack.c:1393 +#: builtin/index-pack.c:1396 msgid "error while closing pack file" msgstr "грешка при затварянето на пакетния файл" -#: builtin/index-pack.c:1406 +#: builtin/index-pack.c:1409 #, c-format msgid "cannot write keep file '%s'" msgstr "" "грешка при записването на файла „%s“, осигуряващ запазване на директория" -#: builtin/index-pack.c:1414 +#: builtin/index-pack.c:1417 #, c-format msgid "cannot close written keep file '%s'" msgstr "" "грешка при затварянето на записания файл „%s“, осигуряващ запазване на " "директория" -#: builtin/index-pack.c:1427 +#: builtin/index-pack.c:1430 msgid "cannot store pack file" msgstr "пакетният файл не може да бъде запазен" -#: builtin/index-pack.c:1438 +#: builtin/index-pack.c:1441 msgid "cannot store index file" msgstr "файлът за индекса не може да бъде съхранен" -#: builtin/index-pack.c:1471 +#: builtin/index-pack.c:1474 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "зададена е неправилна версия пакетиране: „pack.indexversion=%<PRIu32>“" -#: builtin/index-pack.c:1481 builtin/index-pack.c:1678 +#: builtin/index-pack.c:1484 builtin/index-pack.c:1681 #, c-format msgid "no threads support, ignoring %s" -msgstr "липсва поддръжка за нишки. „%s“ ще се пренебрегне" +msgstr "липсва поддръжка за нишки. „%s“ ще се пренебрегне" -#: builtin/index-pack.c:1540 +#: builtin/index-pack.c:1542 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Съществуващият пакетен файл „%s“ не може да бъде отворен" -#: builtin/index-pack.c:1542 +#: builtin/index-pack.c:1544 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Съществуващият индекс за пакетния файл „%s“ не може да бъде отворен" -#: builtin/index-pack.c:1589 +#: builtin/index-pack.c:1591 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "%d обект не е разлика" msgstr[1] "%d обекта не са разлика" -#: builtin/index-pack.c:1596 +#: builtin/index-pack.c:1598 #, 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:1609 +#: builtin/index-pack.c:1611 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "името на пакетния файл „%s“ не завършва на „.pack“" -# FIXME it is not the cwd it is the previous cwd -#: builtin/index-pack.c:1638 -msgid "Cannot come back to cwd" -msgstr "Процесът не може да се върне към предишната работна директория" - -#: builtin/index-pack.c:1690 builtin/index-pack.c:1693 -#: builtin/index-pack.c:1705 builtin/index-pack.c:1709 +#: builtin/index-pack.c:1693 builtin/index-pack.c:1696 +#: builtin/index-pack.c:1712 builtin/index-pack.c:1716 #, c-format msgid "bad %s" msgstr "неправилна стойност „%s“" -#: builtin/index-pack.c:1723 +#: builtin/index-pack.c:1732 msgid "--fix-thin cannot be used without --stdin" msgstr "опцията „--fix-thin“ изисква „--stdin“" -#: builtin/index-pack.c:1731 +#: builtin/index-pack.c:1740 msgid "--verify with no packfile name given" msgstr "опцията „--verify“ изисква име на пакетен файл" -#: builtin/init-db.c:55 +#: builtin/init-db.c:54 #, c-format msgid "cannot stat '%s'" msgstr "не може да се получи информация чрез „stat“ за директорията „%s“" -#: builtin/init-db.c:61 +#: builtin/init-db.c:60 #, c-format msgid "cannot stat template '%s'" msgstr "не може да се получи информация чрез „stat“ за шаблона „%s“" -#: builtin/init-db.c:66 +#: builtin/init-db.c:65 #, c-format msgid "cannot opendir '%s'" msgstr "директорията „%s“ не може да бъде отворена" -#: builtin/init-db.c:77 +#: builtin/init-db.c:76 #, c-format msgid "cannot readlink '%s'" msgstr "връзката „%s“ не може да бъде прочетена" -#: builtin/init-db.c:79 +#: builtin/init-db.c:78 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "не може да се създаде символна връзка „%s“ в „%s“" -#: builtin/init-db.c:85 +#: builtin/init-db.c:84 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "„%s“ не може да се копира в „%s“" -#: builtin/init-db.c:89 +#: builtin/init-db.c:88 #, c-format msgid "ignoring template %s" msgstr "игнориране на шаблона „%s“" -#: builtin/init-db.c:120 +#: builtin/init-db.c:119 #, c-format msgid "templates not found %s" msgstr "директорията с шаблоните не е открита: „%s“" -#: builtin/init-db.c:135 +#: builtin/init-db.c:134 #, c-format msgid "not copying templates from '%s': %s" msgstr "шаблоните няма да бъдат копирани от „%s“: „%s“" -#: builtin/init-db.c:312 builtin/init-db.c:315 -#, c-format -msgid "%s already exists" -msgstr "Директорията „%s“ вече съществува" - -#: builtin/init-db.c:344 +#: builtin/init-db.c:327 #, c-format msgid "unable to handle file type %d" msgstr "файлове от вид %d не се поддържат" -#: builtin/init-db.c:347 +#: builtin/init-db.c:330 #, c-format msgid "unable to move %s to %s" msgstr "„%s“ не може да се премести в „%s“" -#. TRANSLATORS: The first '%s' is either "Reinitialized -#. existing" or "Initialized empty", the second " shared" or -#. "", and the last '%s%s' is the verbatim directory name. +#: builtin/init-db.c:347 builtin/init-db.c:350 +#, c-format +msgid "%s already exists" +msgstr "Директорията „%s“ вече съществува" + #: builtin/init-db.c:403 #, c-format -msgid "%s%s Git repository in %s%s\n" -msgstr "%s%s хранилище на Git в „%s%s“\n" +msgid "Reinitialized existing shared Git repository in %s%s\n" +msgstr "" +"Инициализиране наново на съществуващо, споделено хранилище на Git в „%s%s“\n" #: builtin/init-db.c:404 -msgid "Reinitialized existing" -msgstr "Наново инициализирано, съществуващо" +#, c-format +msgid "Reinitialized existing Git repository in %s%s\n" +msgstr "Инициализиране наново на съществуващо хранилище на Git в „%s%s“\n" -#: builtin/init-db.c:404 -msgid "Initialized empty" -msgstr "Инициализирано празно" +#: builtin/init-db.c:408 +#, c-format +msgid "Initialized empty shared Git repository in %s%s\n" +msgstr "Инициализиране на празно, споделено хранилище на Git в „%s%s“\n" -#: builtin/init-db.c:405 -msgid " shared" -msgstr ", споделено" +#: builtin/init-db.c:409 +#, c-format +msgid "Initialized empty Git repository in %s%s\n" +msgstr "Инициализиране на празно хранилище на Git в „%s%s“\n" -#: builtin/init-db.c:452 +#: builtin/init-db.c:457 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -7810,27 +8813,27 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=ДИРЕКТОРИЯ_С_ШАБЛОНИ] [--" "shared[=ПРАВА]] [ДИРЕКТОРИЯ]" -#: builtin/init-db.c:475 +#: builtin/init-db.c:480 msgid "permissions" msgstr "права" -#: builtin/init-db.c:476 +#: builtin/init-db.c:481 msgid "specify that the git repository is to be shared amongst several users" msgstr "" "указване, че хранилището на Git ще бъде споделено от повече от един " "потребител" -#: builtin/init-db.c:510 builtin/init-db.c:515 +#: builtin/init-db.c:515 builtin/init-db.c:520 #, c-format msgid "cannot mkdir %s" msgstr "директорията „%s“ не може да бъде създадена" -#: builtin/init-db.c:519 +#: builtin/init-db.c:524 #, c-format msgid "cannot chdir to %s" msgstr "не може да се влезе в директорията „%s“" -#: builtin/init-db.c:540 +#: builtin/init-db.c:545 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -7839,7 +8842,7 @@ msgstr "" "%s (или --work-tree=ДИРЕКТОРИЯ) изисква указването на %s (или --git-" "dir=ДИРЕКТОРИЯ)" -#: builtin/init-db.c:568 +#: builtin/init-db.c:573 #, c-format msgid "Cannot access work tree '%s'" msgstr "Работното дърво в „%s“ е недостъпно" @@ -7872,340 +8875,340 @@ msgstr "епилог(зи) за добавяне" msgid "no input file given for in-place editing" msgstr "не е зададен входен файл за редактиране на място" -#: builtin/log.c:43 +#: builtin/log.c:44 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [ОПЦИЯ…] [ДИАПАЗОН_НА_ВЕРСИИТЕ] [[--] ПЪТ…]" -#: builtin/log.c:44 +#: builtin/log.c:45 msgid "git show [<options>] <object>..." msgstr "git show [ОПЦИЯ…] ОБЕКТ…" -#: builtin/log.c:83 +#: builtin/log.c:84 #, c-format msgid "invalid --decorate option: %s" msgstr "неправилна опция „--decorate“: %s" -#: builtin/log.c:137 +#: builtin/log.c:139 msgid "suppress diff output" msgstr "без извеждане на разликите" -#: builtin/log.c:138 +#: builtin/log.c:140 msgid "show source" msgstr "извеждане на изходния код" -#: builtin/log.c:139 +#: builtin/log.c:141 msgid "Use mail map file" msgstr "" "Използване на файл за съответствията на имената и адресите на е-поща („." "mailmap“)" -#: builtin/log.c:140 +#: builtin/log.c:142 msgid "decorate options" msgstr "настройки на форма̀та на извежданата информация" -#: builtin/log.c:143 +#: builtin/log.c:145 msgid "Process line range n,m in file, counting from 1" msgstr "" -"Обработване само на редовете във файла в интервала от n до m включително. " +"Обработване само на редовете във файла в диапазона от n до m включително. " "Броенето започва от 1" -#: builtin/log.c:239 +#: builtin/log.c:241 #, c-format msgid "Final output: %d %s\n" msgstr "Резултат: %d %s\n" -#: builtin/log.c:471 +#: builtin/log.c:486 #, c-format msgid "git show %s: bad file" msgstr "git show %s: повреден файл" -#: builtin/log.c:485 builtin/log.c:578 +#: builtin/log.c:500 builtin/log.c:594 #, c-format msgid "Could not read object %s" msgstr "Обектът не може да бъде прочетен: %s" -#: builtin/log.c:602 +#: builtin/log.c:618 #, c-format msgid "Unknown type: %d" msgstr "Неизвестен вид: %d" -#: builtin/log.c:722 +#: builtin/log.c:739 msgid "format.headers without value" msgstr "не е зададена стойност на „format.headers“" -#: builtin/log.c:812 +#: builtin/log.c:839 msgid "name of output directory is too long" msgstr "прекалено дълго име на директорията за изходната информация" -#: builtin/log.c:827 +#: builtin/log.c:854 #, c-format msgid "Cannot open patch file %s" msgstr "Файлът-кръпка „%s“ не може да бъде отворен" -#: builtin/log.c:841 +#: builtin/log.c:868 msgid "Need exactly one range." msgstr "Трябва да зададете точно един диапазон." -#: builtin/log.c:851 +#: builtin/log.c:878 msgid "Not a range." msgstr "Не е диапазон." -#: builtin/log.c:957 +#: builtin/log.c:984 msgid "Cover letter needs email format" msgstr "Придружаващото писмо трябва да е форматирано като е-писмо" -# FIXME bad wording insanely -#: builtin/log.c:1036 +#: builtin/log.c:1063 #, c-format msgid "insane in-reply-to: %s" msgstr "неправилен формат на заглавната част за отговор „in-reply-to“: %s" -#: builtin/log.c:1064 +#: builtin/log.c:1091 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [ОПЦИЯ…] [ОТ | ДИАПАЗОН_НА_ВЕРСИИТЕ]" -#: builtin/log.c:1109 +#: builtin/log.c:1141 msgid "Two output directories?" msgstr "Можете да укажете максимум една директория за изход." -#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871 +#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905 #, c-format msgid "Unknown commit %s" msgstr "Непознато подаване „%s“" -#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304 -#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424 -#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593 -#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455 +#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:455 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Не може да се открие към какво сочи „%s“." -#: builtin/log.c:1231 +#: builtin/log.c:1263 msgid "Could not find exact merge base." msgstr "Точната база за сливане не може да се открие." -#: builtin/log.c:1235 +#: builtin/log.c:1267 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 "" -"Следеният клон не може да бъде установен. Ако искате ръчно да го\n" +"Следеният клон не може да бъде установен. Ако искате ръчно да го\n" "зададете, използвайте „git branch --set-upstream-to“.\n" "Можете ръчно да зададете базово подаване чрез „--base=<base-commit-id>“." -#: builtin/log.c:1255 +#: builtin/log.c:1287 msgid "Failed to find exact merge base" msgstr "Точната база при сливане не може да бъде открита" -#: builtin/log.c:1266 +#: builtin/log.c:1298 msgid "base commit should be the ancestor of revision list" msgstr "базовото подаване трябва да е предшественикът на списъка с версиите" -#: builtin/log.c:1270 +#: builtin/log.c:1302 msgid "base commit shouldn't be in revision list" msgstr "базовото подаване не може да е в списъка с версиите" -#: builtin/log.c:1319 +#: builtin/log.c:1351 msgid "cannot get patch id" msgstr "идентификаторът на кръпката не може да бъде получен" -#: builtin/log.c:1377 +#: builtin/log.c:1408 msgid "use [PATCH n/m] even with a single patch" msgstr "номерация „[PATCH n/m]“ дори и при единствена кръпка" -#: builtin/log.c:1380 +#: builtin/log.c:1411 msgid "use [PATCH] even with multiple patches" msgstr "номерация „[PATCH]“ дори и при множество кръпки" -#: builtin/log.c:1384 +#: builtin/log.c:1415 msgid "print patches to standard out" msgstr "извеждане на кръпките на стандартния изход" -#: builtin/log.c:1386 +#: builtin/log.c:1417 msgid "generate a cover letter" msgstr "създаване на придружаващо писмо" -#: builtin/log.c:1388 +#: builtin/log.c:1419 msgid "use simple number sequence for output file names" msgstr "проста числова последователност за имената на файловете-кръпки" -#: builtin/log.c:1389 +#: builtin/log.c:1420 msgid "sfx" msgstr "ЗНАЦИ" -#: builtin/log.c:1390 +#: builtin/log.c:1421 msgid "use <sfx> instead of '.patch'" msgstr "използване на тези ЗНАЦИ за суфикс вместо „.patch“" -#: builtin/log.c:1392 +#: builtin/log.c:1423 msgid "start numbering patches at <n> instead of 1" msgstr "номерирането на кръпките да започва от този БРОЙ, а не с 1" -#: builtin/log.c:1394 +#: builtin/log.c:1425 msgid "mark the series as Nth re-roll" msgstr "отбелязване, че това е N-тата поредна редакция на поредицата от кръпки" -#: builtin/log.c:1396 +#: builtin/log.c:1427 +msgid "Use [RFC PATCH] instead of [PATCH]" +msgstr "Използване на „[RFC PATCH]“ вместо „[PATCH]“" + +#: builtin/log.c:1430 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Използване на този „[ПРЕФИКС]“ вместо „[PATCH]“" -#: builtin/log.c:1399 +#: builtin/log.c:1433 msgid "store resulting files in <dir>" msgstr "запазване на изходните файлове в тази ДИРЕКТОРИЯ" -#: builtin/log.c:1402 +#: builtin/log.c:1436 msgid "don't strip/add [PATCH]" msgstr "без добавяне/махане на префикса „[PATCH]“" -#: builtin/log.c:1405 +#: builtin/log.c:1439 msgid "don't output binary diffs" msgstr "без извеждане на разлики между двоични файлове" -#: builtin/log.c:1407 +#: builtin/log.c:1441 msgid "output all-zero hash in From header" msgstr "в заглавната част „From:“ (от) хешът да е само от нули" -#: builtin/log.c:1409 +#: builtin/log.c:1443 msgid "don't include a patch matching a commit upstream" msgstr "да не се включват кръпки, които присъстват в следения клон" -#: builtin/log.c:1411 +#: builtin/log.c:1445 msgid "show patch format instead of default (patch + stat)" msgstr "" "извеждане във формат за кръпки, а на в стандартния (кръпка и статистика)" -#: builtin/log.c:1413 +#: builtin/log.c:1447 msgid "Messaging" msgstr "Опции при изпращане" -#: builtin/log.c:1414 +#: builtin/log.c:1448 msgid "header" msgstr "ЗАГЛАВНА_ЧАСТ" -#: builtin/log.c:1415 +#: builtin/log.c:1449 msgid "add email header" msgstr "добавяне на тази ЗАГЛАВНА_ЧАСТ" -#: builtin/log.c:1416 builtin/log.c:1418 +#: builtin/log.c:1450 builtin/log.c:1452 msgid "email" msgstr "Е-ПОЩА" -#: builtin/log.c:1416 +#: builtin/log.c:1450 msgid "add To: header" msgstr "добавяне на заглавна част „To:“ (до)" -#: builtin/log.c:1418 +#: builtin/log.c:1452 msgid "add Cc: header" msgstr "добавяне на заглавна част „Cc:“ (и до)" -#: builtin/log.c:1420 +#: builtin/log.c:1454 msgid "ident" msgstr "ИДЕНТИЧНОСТ" -#: builtin/log.c:1421 +#: builtin/log.c:1455 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" -"задаване на адреса в заглавната част „From“ (от) да е тази ИДЕНТИЧНОСТ. Ако " +"задаване на адреса в заглавната част „From“ (от) да е тази ИДЕНТИЧНОСТ. Ако " "не е зададена такава, се взима адреса на подаващия" -#: builtin/log.c:1423 +#: builtin/log.c:1457 msgid "message-id" msgstr "ИДЕНТИФИКАТОР_НА_СЪОБЩЕНИЕ" -#: builtin/log.c:1424 +#: builtin/log.c:1458 msgid "make first mail a reply to <message-id>" msgstr "" "първото съобщение да е в отговор на е-писмото с този " "ИДЕНТИФИКАТОР_НА_СЪОБЩЕНИЕ" -#: builtin/log.c:1425 builtin/log.c:1428 +#: builtin/log.c:1459 builtin/log.c:1462 msgid "boundary" msgstr "граница" -#: builtin/log.c:1426 +#: builtin/log.c:1460 msgid "attach the patch" msgstr "прикрепяне на кръпката" -#: builtin/log.c:1429 +#: builtin/log.c:1463 msgid "inline the patch" msgstr "включване на кръпката в текста на писмата" -#: builtin/log.c:1433 +#: builtin/log.c:1467 msgid "enable message threading, styles: shallow, deep" msgstr "" -"използване на нишки за съобщенията. СТИЛът е „shallow“ (плитък) или " +"използване на нишки за съобщенията. СТИЛът е „shallow“ (плитък) или " "„deep“ (дълбок)" -#: builtin/log.c:1435 +#: builtin/log.c:1469 msgid "signature" msgstr "подпис" -#: builtin/log.c:1436 +#: builtin/log.c:1470 msgid "add a signature" msgstr "добавяне на поле за подпис" -#: builtin/log.c:1437 +#: builtin/log.c:1471 msgid "base-commit" msgstr "БАЗОВО_ПОДАВАНЕ" -#: builtin/log.c:1438 +#: builtin/log.c:1472 msgid "add prerequisite tree info to the patch series" msgstr "добавяне на необходимото БАЗово дърво към серията кръпки" -#: builtin/log.c:1440 +#: builtin/log.c:1474 msgid "add a signature from a file" msgstr "добавяне на подпис от файл" -#: builtin/log.c:1441 +#: builtin/log.c:1475 msgid "don't print the patch filenames" msgstr "без извеждане на имената на кръпките" -#: builtin/log.c:1531 +#: builtin/log.c:1565 msgid "-n and -k are mutually exclusive." msgstr "опциите „-n“ и „-k“ са несъвместими." -#: builtin/log.c:1533 -msgid "--subject-prefix and -k are mutually exclusive." -msgstr "опциите „--subject-prefix“ и „-k“ са несъвместими." +#: builtin/log.c:1567 +msgid "--subject-prefix/--rfc and -k are mutually exclusive." +msgstr "опциите „--subject-prefix“/„-rfc“ и „-k“ са несъвместими." -#: builtin/log.c:1541 +#: builtin/log.c:1575 msgid "--name-only does not make sense" msgstr "опцията „--name-only“ е несъвместима с генерирането на кръпки" -#: builtin/log.c:1543 +#: builtin/log.c:1577 msgid "--name-status does not make sense" msgstr "опцията „--name-status“ е несъвместима с генерирането на кръпки" -#: builtin/log.c:1545 +#: builtin/log.c:1579 msgid "--check does not make sense" msgstr "опцията „--check“ е несъвместима с генерирането на кръпки" -#: builtin/log.c:1573 +#: builtin/log.c:1609 msgid "standard output, or directory, which one?" msgstr "" "изходът може да или стандартният, или да е в директория, но не и двете." -#: builtin/log.c:1575 +#: builtin/log.c:1611 #, c-format msgid "Could not create directory '%s'" msgstr "Директорията „%s“ не може да бъде създадена" -#: builtin/log.c:1672 +#: builtin/log.c:1705 #, c-format msgid "unable to read signature file '%s'" msgstr "файлът „%s“ с подпис не може да бъде прочетен" -#: builtin/log.c:1743 +#: builtin/log.c:1777 msgid "Failed to create output files" msgstr "Изходните файлове не могат да бъдат създадени" -#: builtin/log.c:1792 +#: builtin/log.c:1826 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [ОТДАЛЕЧЕН_КЛОН [ВРЪХ [ПРЕДЕЛ]]]" -#: builtin/log.c:1846 +#: builtin/log.c:1880 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -8213,102 +9216,106 @@ msgstr "" "Следеният отдалечен клон не бе открит, затова изрично задайте " "ОТДАЛЕЧЕН_КЛОН.\n" -#: builtin/ls-files.c:378 +#: builtin/ls-files.c:458 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [ОПЦИЯ…] [ФАЙЛ…]" -#: builtin/ls-files.c:427 +#: builtin/ls-files.c:507 msgid "identify the file status with tags" msgstr "извеждане на състоянието на файловете с еднобуквени флагове" -#: builtin/ls-files.c:429 +#: builtin/ls-files.c:509 msgid "use lowercase letters for 'assume unchanged' files" msgstr "малки букви за файловете, които да се счетат за непроменени" -#: builtin/ls-files.c:431 +#: builtin/ls-files.c:511 msgid "show cached files in the output (default)" msgstr "извеждане на кешираните файлове (стандартно)" -#: builtin/ls-files.c:433 +#: builtin/ls-files.c:513 msgid "show deleted files in the output" msgstr "извеждане на изтритите файлове" -#: builtin/ls-files.c:435 +#: builtin/ls-files.c:515 msgid "show modified files in the output" msgstr "извеждане на променените файлове" -#: builtin/ls-files.c:437 +#: builtin/ls-files.c:517 msgid "show other files in the output" msgstr "извеждане на другите файлове" -#: builtin/ls-files.c:439 +#: builtin/ls-files.c:519 msgid "show ignored files in the output" msgstr "извеждане на игнорираните файлове" -#: builtin/ls-files.c:442 +#: builtin/ls-files.c:522 msgid "show staged contents' object name in the output" msgstr "извеждане на името на обекта за съдържанието на индекса" -#: builtin/ls-files.c:444 +#: builtin/ls-files.c:524 msgid "show files on the filesystem that need to be removed" msgstr "извеждане на файловете, които трябва да бъдат изтрити" -#: builtin/ls-files.c:446 +#: builtin/ls-files.c:526 msgid "show 'other' directories' names only" msgstr "извеждане само на името на другите (неследените) директории" -#: builtin/ls-files.c:448 +#: builtin/ls-files.c:528 msgid "show line endings of files" msgstr "извеждане на знаците за край на ред във файловете" -#: builtin/ls-files.c:450 +#: builtin/ls-files.c:530 msgid "don't show empty directories" msgstr "без извеждане на празните директории" -#: builtin/ls-files.c:453 +#: builtin/ls-files.c:533 msgid "show unmerged files in the output" msgstr "извеждане на неслетите файлове" # FIXME not clear about what this option does -#: builtin/ls-files.c:455 +#: builtin/ls-files.c:535 msgid "show resolve-undo information" msgstr "извеждане на информацията за отмяна на разрешените подавания" -#: builtin/ls-files.c:457 +#: builtin/ls-files.c:537 msgid "skip files matching pattern" msgstr "прескачане на файловете напасващи ШАБЛОНа" -#: builtin/ls-files.c:460 +#: builtin/ls-files.c:540 msgid "exclude patterns are read from <file>" msgstr "шаблоните за игнориране да се прочетат от този ФАЙЛ" -#: builtin/ls-files.c:463 +#: builtin/ls-files.c:543 msgid "read additional per-directory exclude patterns in <file>" msgstr "" "изчитане на допълнителните шаблони за игнориране по директория от този ФАЙЛ" -#: builtin/ls-files.c:465 +#: builtin/ls-files.c:545 msgid "add the standard git exclusions" msgstr "добавяне на стандартно игнорираните от Git файлове" -#: builtin/ls-files.c:468 +#: builtin/ls-files.c:548 msgid "make the output relative to the project top directory" msgstr "пътищата да са относителни спрямо основната директория на проекта" -#: builtin/ls-files.c:471 +#: builtin/ls-files.c:551 +msgid "recurse through submodules" +msgstr "рекурсивно обхождане подмодулите" + +#: builtin/ls-files.c:553 msgid "if any <file> is not in the index, treat this as an error" msgstr "грешка, ако някой от тези ФАЙЛове не е в индекса" -#: builtin/ls-files.c:472 +#: builtin/ls-files.c:554 msgid "tree-ish" msgstr "УКАЗАТЕЛ_КЪМ_ДЪРВО" -#: builtin/ls-files.c:473 +#: builtin/ls-files.c:555 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "считане, че пътищата изтрити след УКАЗАТЕЛя_КЪМ_ДЪРВО все още съществуват" -#: builtin/ls-files.c:475 +#: builtin/ls-files.c:557 msgid "show debugging data" msgstr "извеждане на информацията за изчистване на грешки" @@ -8396,192 +9403,177 @@ msgstr "" "извеждане на цялото дърво, не само на текущата директория (включва опцията " "„--full-name“)" -#: builtin/merge.c:45 +#: builtin/merge.c:46 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [ОПЦИЯ…] [ПОДАВАНЕ…]" -#: builtin/merge.c:46 +#: builtin/merge.c:47 msgid "git merge [<options>] <msg> HEAD <commit>" msgstr "git merge [ОПЦИЯ…] СЪОБЩЕНИЕ HEAD ПОДАВАНЕ" -#: builtin/merge.c:47 +#: builtin/merge.c:48 msgid "git merge --abort" msgstr "git merge --abort" -# FIXME -m rather than just m -#: builtin/merge.c:101 +#: builtin/merge.c:102 msgid "switch `m' requires a value" msgstr "опцията „-m“ изисква стойност" -#: builtin/merge.c:138 +#: builtin/merge.c:139 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Няма такава стратегия за сливане: „%s“.\n" -#: builtin/merge.c:139 +#: builtin/merge.c:140 #, c-format msgid "Available strategies are:" msgstr "Наличните стратегии са:" -#: builtin/merge.c:144 +#: builtin/merge.c:145 #, c-format msgid "Available custom strategies are:" msgstr "Допълнителните стратегии са:" -#: builtin/merge.c:194 builtin/pull.c:126 +#: builtin/merge.c:195 builtin/pull.c:127 msgid "do not show a diffstat at the end of the merge" msgstr "без извеждане на статистиката след завършване на сливане" -#: builtin/merge.c:197 builtin/pull.c:129 +#: builtin/merge.c:198 builtin/pull.c:130 msgid "show a diffstat at the end of the merge" msgstr "извеждане на статистиката след завършване на сливане" -#: builtin/merge.c:198 builtin/pull.c:132 +#: builtin/merge.c:199 builtin/pull.c:133 msgid "(synonym to --stat)" msgstr "(синоним на „--stat“)" -#: builtin/merge.c:200 builtin/pull.c:135 +#: builtin/merge.c:201 builtin/pull.c:136 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "добавяне (на максимум такъв БРОЙ) записи от съкратения журнал в съобщението " "за подаване" -#: builtin/merge.c:203 builtin/pull.c:138 +#: builtin/merge.c:204 builtin/pull.c:139 msgid "create a single commit instead of doing a merge" msgstr "създаване на едно подаване вместо извършване на сливане" -#: builtin/merge.c:205 builtin/pull.c:141 +#: builtin/merge.c:206 builtin/pull.c:142 msgid "perform a commit if the merge succeeds (default)" msgstr "извършване на подаване при успешно сливане (стандартно действие)" -#: builtin/merge.c:207 builtin/pull.c:144 +#: builtin/merge.c:208 builtin/pull.c:145 msgid "edit message before committing" msgstr "редактиране на съобщението преди подаване" -#: builtin/merge.c:208 +#: builtin/merge.c:209 msgid "allow fast-forward (default)" msgstr "позволяване на тривиално сливане (стандартно действие)" -#: builtin/merge.c:210 builtin/pull.c:150 +#: builtin/merge.c:211 builtin/pull.c:151 msgid "abort if fast-forward is not possible" msgstr "преустановяване, ако сливането не е тривиално" -#: builtin/merge.c:214 -msgid "Verify that the named commit has a valid GPG signature" -msgstr "Проверка, че именуваното подаване е с правилен подпис на GPG" +#: builtin/merge.c:215 builtin/pull.c:154 +msgid "verify that the named commit has a valid GPG signature" +msgstr "Проверка, че указаното подаване е с правилен подпис на GPG" -#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157 +#: builtin/merge.c:216 builtin/notes.c:774 builtin/pull.c:158 #: builtin/revert.c:89 msgid "strategy" msgstr "СТРАТЕГИЯ" -#: builtin/merge.c:216 builtin/pull.c:158 +#: builtin/merge.c:217 builtin/pull.c:159 msgid "merge strategy to use" msgstr "СТРАТЕГИЯ за сливане, която да се ползва" -#: builtin/merge.c:217 builtin/pull.c:161 +#: builtin/merge.c:218 builtin/pull.c:162 msgid "option=value" msgstr "ОПЦИЯ=СТОЙНОСТ" -#: builtin/merge.c:218 builtin/pull.c:162 +#: builtin/merge.c:219 builtin/pull.c:163 msgid "option for selected merge strategy" msgstr "ОПЦИЯ за избраната стратегия за сливане" -#: builtin/merge.c:220 +#: builtin/merge.c:221 msgid "merge commit message (for a non-fast-forward merge)" msgstr "СЪОБЩЕНИЕ при подаването със сливане (при нетривиални сливания)" -#: builtin/merge.c:224 +#: builtin/merge.c:225 msgid "abort the current in-progress merge" msgstr "преустановяване на текущото сливане" -#: builtin/merge.c:226 builtin/pull.c:169 +#: builtin/merge.c:227 builtin/pull.c:170 msgid "allow merging unrelated histories" msgstr "позволяване на сливане на независими истории" -#: builtin/merge.c:254 +#: builtin/merge.c:255 msgid "could not run stash." msgstr "не може да се извърши скатаване" -#: builtin/merge.c:259 +#: builtin/merge.c:260 msgid "stash failed" msgstr "неуспешно скатаване" -#: builtin/merge.c:264 +#: builtin/merge.c:265 #, c-format msgid "not a valid object: %s" msgstr "неправилен обект: „%s“" -#: builtin/merge.c:283 builtin/merge.c:300 +#: builtin/merge.c:284 builtin/merge.c:301 msgid "read-tree failed" msgstr "неуспешно прочитане на обект-дърво" -#: builtin/merge.c:330 +#: builtin/merge.c:331 msgid " (nothing to squash)" msgstr " (няма какво да се смачка)" -#: builtin/merge.c:343 +#: builtin/merge.c:342 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Подаване със смачкване — указателят „HEAD“ няма да бъде обновен\n" -#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987 -#: builtin/merge.c:1000 -#, c-format -msgid "Could not write to '%s'" -msgstr "„%s“ не може да бъде записан" - -#: builtin/merge.c:375 -msgid "Writing SQUASH_MSG" -msgstr "Записване на съобщението за смачкване SQUASH_MSG" - -#: builtin/merge.c:377 -msgid "Finishing SQUASH_MSG" -msgstr "Завършване на съобщението за смачкване SQUASH_MSG" - -#: builtin/merge.c:400 +#: builtin/merge.c:392 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" "Липсва съобщение при подаване — указателят „HEAD“ няма да бъде обновен\n" -#: builtin/merge.c:451 +#: builtin/merge.c:443 #, c-format msgid "'%s' does not point to a commit" msgstr "„%s“ не сочи към подаване" -#: builtin/merge.c:541 +#: builtin/merge.c:533 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Неправилен низ за настройката „branch.%s.mergeoptions“: „%s“" -#: builtin/merge.c:660 +#: builtin/merge.c:652 msgid "Not handling anything other than two heads merge." msgstr "Поддържа се само сливане на точно две истории." -#: builtin/merge.c:674 +#: builtin/merge.c:666 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Непозната опция за рекурсивното сливане „merge-recursive“: „-X%s“" -#: builtin/merge.c:687 +#: builtin/merge.c:681 #, c-format msgid "unable to write %s" msgstr "„%s“ не може да бъде записан" -#: builtin/merge.c:776 +#: builtin/merge.c:733 #, c-format msgid "Could not read from '%s'" msgstr "От „%s“ не може да се чете" -#: builtin/merge.c:785 +#: builtin/merge.c:742 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -"Сливането няма да бъде подадено. За завършването му и подаването му " +"Сливането няма да бъде подадено. За завършването му и подаването му " "използвайте командата „git commit“.\n" -#: builtin/merge.c:791 +#: builtin/merge.c:748 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -8596,183 +9588,203 @@ msgstr "" "Редовете, които започват с „%c“ ще бъдат пропуснати, а празно съобщение\n" "преустановява подаването.\n" -#: builtin/merge.c:815 +#: builtin/merge.c:772 msgid "Empty commit message." msgstr "Празно съобщение при подаване." -# FIXME - WTF is wonderful. -#: builtin/merge.c:835 +#: builtin/merge.c:792 #, c-format msgid "Wonderful.\n" msgstr "Първият етап на тривиалното сливане завърши.\n" -#: builtin/merge.c:890 +#: builtin/merge.c:847 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "Неуспешно сливане — коригирайте конфликтите и подайте резултата.\n" -#: builtin/merge.c:906 +#: builtin/merge.c:863 #, c-format msgid "'%s' is not a commit" msgstr "„%s“ не е подаване" -#: builtin/merge.c:947 +#: builtin/merge.c:904 msgid "No current branch." msgstr "Няма текущ клон." -#: builtin/merge.c:949 +#: builtin/merge.c:906 msgid "No remote for the current branch." msgstr "Текущият клон не следи никой." -#: builtin/merge.c:951 +#: builtin/merge.c:908 msgid "No default upstream defined for the current branch." msgstr "Текущият клон не следи никой клон." -#: builtin/merge.c:956 +#: builtin/merge.c:913 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Никой клон не следи клона „%s“ от хранилището „%s“" -#: builtin/merge.c:1091 +#: builtin/merge.c:960 +#, c-format +msgid "Bad value '%s' in environment '%s'" +msgstr "Неправилна стойност „%s“ в средата „%s“" + +#: builtin/merge.c:1034 #, c-format msgid "could not close '%s'" msgstr "„%s“ не може да се затвори" -#: builtin/merge.c:1219 +#: builtin/merge.c:1061 +#, c-format +msgid "not something we can merge in %s: %s" +msgstr "не може да се слее в „%s“: %s" + +#: builtin/merge.c:1095 +msgid "not something we can merge" +msgstr "не може да се слее" + +#: builtin/merge.c:1162 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" "Не може да преустановите сливане, защото в момента не се извършва такова " "(липсва указател „MERGE_HEAD“)." -#: builtin/merge.c:1235 +#: builtin/merge.c:1178 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -"Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува).\n" +"Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува).\n" "Подайте промените си, преди да започнете ново сливане." -#: builtin/merge.c:1242 +#: builtin/merge.c:1185 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:1245 +#: builtin/merge.c:1188 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" "Не сте завършили отбиране на подаване (указателят „CHERRY_PICK_HEAD“\n" "съществува)." -#: builtin/merge.c:1254 +#: builtin/merge.c:1197 msgid "You cannot combine --squash with --no-ff." msgstr "Опцията „--squash“ е несъвместима с „--no-ff“." -#: builtin/merge.c:1262 +#: builtin/merge.c:1205 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "Не е указано подаване и настройката „merge.defaultToUpstream“ не е зададена." -#: builtin/merge.c:1279 +#: builtin/merge.c:1222 msgid "Squash commit into empty head not supported yet" msgstr "Подаване със смачкване във връх без история все още не се поддържа" -#: builtin/merge.c:1281 +#: builtin/merge.c:1224 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" "Понеже върхът е без история, всички сливания са тривиални, не може да се " "извърши нетривиално сливане изисквано от опцията „--no-ff“" -#: builtin/merge.c:1286 +#: builtin/merge.c:1229 #, c-format msgid "%s - not something we can merge" msgstr "„%s“ — не е нещо, което може да се слее" -#: builtin/merge.c:1288 +#: builtin/merge.c:1231 msgid "Can merge only exactly one commit into empty head" msgstr "Можете да слеете точно едно подаване във връх без история" -#: builtin/merge.c:1344 +#: builtin/merge.c:1287 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "Подаването „%s“ е с недоверен подпис от GPG, който твърди, че е на „%s“." -#: builtin/merge.c:1347 +#: builtin/merge.c:1290 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" "Подаването „%s“ е с неправилен подпис от GPG, който твърди, че е на „%s“." -#: builtin/merge.c:1350 +#: builtin/merge.c:1293 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Подаването „%s“ е без подпис от GPG." -#: builtin/merge.c:1353 +#: builtin/merge.c:1296 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Подаването „%s“ е с коректен подпис от GPG на „%s“.\n" -#: builtin/merge.c:1415 +#: builtin/merge.c:1358 msgid "refusing to merge unrelated histories" msgstr "независими истории не може да се слеят" -#: builtin/merge.c:1439 +#: builtin/merge.c:1367 +msgid "Already up-to-date." +msgstr "Вече е обновено." + +#: builtin/merge.c:1377 #, c-format msgid "Updating %s..%s\n" msgstr "Обновяване „%s..%s“\n" -#: builtin/merge.c:1476 +#: builtin/merge.c:1418 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Проба с най-тривиалното сливане в рамките на индекса…\n" -# FIXME WTF message -#: builtin/merge.c:1483 +#: builtin/merge.c:1425 #, c-format msgid "Nope.\n" msgstr "Неуспешно сливане.\n" -#: builtin/merge.c:1515 +#: builtin/merge.c:1450 +msgid "Already up-to-date. Yeeah!" +msgstr "Вече е обновено!" + +#: builtin/merge.c:1456 msgid "Not possible to fast-forward, aborting." msgstr "" "Не може да се извърши тривиално сливане, преустановяване на действието." -#: builtin/merge.c:1538 builtin/merge.c:1617 +#: builtin/merge.c:1479 builtin/merge.c:1558 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Привеждане на дървото към първоначалното…\n" -#: builtin/merge.c:1542 +#: builtin/merge.c:1483 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Пробване със стратегията за сливане „%s“…\n" -#: builtin/merge.c:1608 +#: builtin/merge.c:1549 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Никоя стратегия за сливане не може да извърши сливането.\n" -#: builtin/merge.c:1610 +#: builtin/merge.c:1551 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Неуспешно сливане със стратегия „%s“.\n" -#: builtin/merge.c:1619 +#: builtin/merge.c:1560 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" "Ползва се стратегията „%s“, която ще подготви дървото за коригиране на " "ръка.\n" -#: builtin/merge.c:1631 +#: builtin/merge.c:1572 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" -"Автоматичното сливане завърши успешно. Самото подаване не е извършено, " +"Автоматичното сливане завърши успешно. Самото подаване не е извършено, " "защото бе зададена опцията „--no-commit“.\n" #: builtin/merge-base.c:29 @@ -8795,24 +9807,24 @@ msgstr "git merge-base --is-ancestor ПОДАВАНЕ_1 ПОДАВАНЕ_2" msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point УКАЗАТЕЛ [ПОДАВАНЕ]" -#: builtin/merge-base.c:214 +#: builtin/merge-base.c:217 msgid "output all common ancestors" msgstr "извеждане на всички общи предшественици" -#: builtin/merge-base.c:216 +#: builtin/merge-base.c:219 msgid "find ancestors for a single n-way merge" msgstr "" "откриване на предшествениците за еднократно сливане на множество истории" -#: builtin/merge-base.c:218 +#: builtin/merge-base.c:221 msgid "list revs not reachable from others" msgstr "извеждане на недостижимите от другите указатели" -#: builtin/merge-base.c:220 +#: builtin/merge-base.c:223 msgid "is the first one ancestor of the other?" msgstr "ПОДАВАНЕ_1 предшественик ли е на ПОДАВАНЕ_2?" -#: builtin/merge-base.c:222 +#: builtin/merge-base.c:225 msgid "find where <commit> forked from reflog of <ref>" msgstr "откриване къде ПОДАВАНЕто се е отклонило от историята на УКАЗАТЕЛя" @@ -8856,6 +9868,37 @@ msgstr "без предупреждения при конфликти" msgid "set labels for file1/orig-file/file2" msgstr "задаване на етикети за ФАЙЛ_1/ОРИГИНАЛ/ФАЙЛ_2" +#: builtin/merge-recursive.c:45 +#, c-format +msgid "unknown option %s" +msgstr "непозната опция: „%s“" + +#: builtin/merge-recursive.c:51 +#, c-format +msgid "could not parse object '%s'" +msgstr "неуспешен анализ на обекта „%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] "не се поддържа повече от %d база. „%s“ се прескача." +msgstr[1] "не се поддържат повече от %d бази. „%s“ се прескача." + +#: builtin/merge-recursive.c:63 +msgid "not handling anything other than two heads merge." +msgstr "поддържа се само сливане на точно две истории." + +#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71 +#, c-format +msgid "could not resolve ref '%s'" +msgstr "указателят „%s“ не може да бъде изтрит" + +#: builtin/merge-recursive.c:77 +#, c-format +msgid "Merging %s with %s\n" +msgstr "Сливане на „%s“ с „%s“\n" + #: builtin/mktree.c:65 msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" @@ -8900,112 +9943,111 @@ msgstr "принудително преместване/преименуване msgid "skip move/rename errors" msgstr "прескачане на грешките при преместване/преименуване" -#: builtin/mv.c:152 +#: builtin/mv.c:155 #, c-format msgid "destination '%s' is not a directory" msgstr "целта „%s“ съществува и не е директория" -#: builtin/mv.c:163 +#: builtin/mv.c:166 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Проверка на преименуването на обект от „%s“ на „%s“\n" -#: builtin/mv.c:167 +#: builtin/mv.c:170 msgid "bad source" msgstr "неправилен обект" -#: builtin/mv.c:170 +#: builtin/mv.c:173 msgid "can not move directory into itself" msgstr "директория не може да се премести в себе си" -#: builtin/mv.c:173 +#: builtin/mv.c:176 msgid "cannot move directory over file" msgstr "директория не може да се премести върху файл" -#: builtin/mv.c:182 +#: builtin/mv.c:185 msgid "source directory is empty" msgstr "първоначалната директория е празна" -#: builtin/mv.c:207 +#: builtin/mv.c:210 msgid "not under version control" msgstr "не е под контрола на Git" -#: builtin/mv.c:210 +#: builtin/mv.c:213 msgid "destination exists" msgstr "целта съществува" -#: builtin/mv.c:218 +#: builtin/mv.c:221 #, c-format msgid "overwriting '%s'" msgstr "презаписване на „%s“" -#: builtin/mv.c:221 +#: builtin/mv.c:224 msgid "Cannot overwrite" msgstr "Презаписването е невъзможно" -#: builtin/mv.c:224 +#: builtin/mv.c:227 msgid "multiple sources for the same target" msgstr "множество източници за една цел" -#: builtin/mv.c:226 +#: builtin/mv.c:229 msgid "destination directory does not exist" msgstr "целевата директория не съществува" -#: builtin/mv.c:233 +#: builtin/mv.c:236 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, обект: „%s“, цел: „%s“" -#: builtin/mv.c:254 +#: builtin/mv.c:257 #, c-format msgid "Renaming %s to %s\n" msgstr "Преименуване на „%s“ на „%s“\n" -#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365 +#: builtin/mv.c:263 builtin/remote.c:710 builtin/repack.c:375 #, c-format msgid "renaming '%s' failed" msgstr "неуспешно преименуване на „%s“" -#: builtin/name-rev.c:258 +#: builtin/name-rev.c:257 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [ОПЦИЯ…] ПОДАВАНЕ…" -#: builtin/name-rev.c:259 +#: builtin/name-rev.c:258 msgid "git name-rev [<options>] --all" msgstr "git name-rev [ОПЦИЯ…] --all" -#: builtin/name-rev.c:260 +#: builtin/name-rev.c:259 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [ОПЦИЯ…] --stdin" -# FIXME sha -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:311 msgid "print only names (no SHA-1)" msgstr "извеждане само на имената (без сумите по SHA1)" -#: builtin/name-rev.c:313 +#: builtin/name-rev.c:312 msgid "only use tags to name the commits" msgstr "използване само на етикетите за именуване на подаванията" -#: builtin/name-rev.c:315 +#: builtin/name-rev.c:314 msgid "only use refs matching <pattern>" msgstr "използване само на указателите напасващи на ШАБЛОНа" -#: builtin/name-rev.c:317 +#: builtin/name-rev.c:316 msgid "list all commits reachable from all refs" msgstr "" "извеждане на всички подавания, които могат да бъдат достигнати от всички " "указатели" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:317 msgid "read from stdin" msgstr "четене от стандартния вход" -#: builtin/name-rev.c:319 +#: builtin/name-rev.c:318 msgid "allow to print `undefined` names (default)" msgstr "да се извеждат и недефинираните имена (стандартна стойност на опцията)" -#: builtin/name-rev.c:325 +#: builtin/name-rev.c:324 msgid "dereference tags in the input (internal use)" msgstr "извеждане на идентификаторите на обекти-етикети (за вътрешни нужди)" @@ -9083,7 +10125,7 @@ msgstr "git notes copy [ОПЦИЯ…] ОБЕКТ_ИЗТОЧНИК ОБЕКТ_Ц #: builtin/notes.c:52 msgid "git notes copy --stdin [<from-object> <to-object>]..." -msgstr "git notes copy --stdin [ОБЕКТ_ИЗТОЧНИК ОБЕКТ_ЦЕЛ]…" +msgstr "git notes copy --stdin [ОБЕКТ_ИЗТОЧНИК ОБЕКТ_ЦЕЛ…]" #: builtin/notes.c:57 msgid "git notes append [<options>] [<object>]" @@ -9121,6 +10163,10 @@ msgstr "git notes prune [ОПЦИЯ…]" msgid "git notes get-ref" msgstr "git notes get-ref" +#: builtin/notes.c:94 +msgid "Write/edit the notes for the following object:" +msgstr "Записване/редактиране на бележките за следния обект:" + #: builtin/notes.c:147 #, c-format msgid "unable to start 'show' for object '%s'" @@ -9135,131 +10181,149 @@ msgstr "изведената информация от действието „s msgid "failed to finish 'show' for object '%s'" msgstr "действието „show“ не може да се завърши за обект „%s“" -#: builtin/notes.c:174 builtin/tag.c:248 -#, c-format -msgid "could not create file '%s'" -msgstr "файлът „%s“ не може да бъде създаден" - -#: builtin/notes.c:193 -msgid "Please supply the note contents using either -m or -F option" -msgstr "Задайте съдържанието на бележката с някоя от опциите „-m“ или „-F“" +#: builtin/notes.c:194 +msgid "please supply the note contents using either -m or -F option" +msgstr "задайте съдържанието на бележката с някоя от опциите „-m“ или „-F“" -#: builtin/notes.c:202 +#: builtin/notes.c:203 msgid "unable to write note object" msgstr "обектът-бележка не може да бъде записан" -#: builtin/notes.c:204 +#: builtin/notes.c:205 #, c-format -msgid "The note contents have been left in %s" -msgstr "Съдържанието на бележката е във файла „%s“" +msgid "the note contents have been left in %s" +msgstr "съдържанието на бележката е във файла „%s“" -#: builtin/notes.c:232 builtin/tag.c:439 +#: builtin/notes.c:233 builtin/tag.c:439 #, c-format msgid "cannot read '%s'" msgstr "файлът „%s“ не може да бъде прочетен" -#: builtin/notes.c:234 builtin/tag.c:442 +#: builtin/notes.c:235 builtin/tag.c:442 #, c-format msgid "could not open or read '%s'" msgstr "файлът „%s“ не може да бъде отворен или прочетен" -#: builtin/notes.c:256 +#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307 +#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513 +#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:659 #, c-format -msgid "Failed to read object '%s'." -msgstr "Обектът „%s“ не може да бъде прочетен." +msgid "failed to resolve '%s' as a valid ref." +msgstr "не може да се открие към какво сочи „%s“." -#: builtin/notes.c:260 +#: builtin/notes.c:257 #, c-format -msgid "Cannot read note data from non-blob object '%s'." +msgid "failed to read object '%s'." +msgstr "обектът „%s“ не може да бъде прочетен." + +#: builtin/notes.c:261 +#, c-format +msgid "cannot read note data from non-blob object '%s'." msgstr "" -"Съдържанието на бележка не може да се вземе от обект, който не е BLOB: „%s“." +"съдържанието на бележка не може да се вземе от обект, който не е BLOB: „%s“." + +#: builtin/notes.c:301 +#, c-format +msgid "malformed input line: '%s'." +msgstr "входен ред с неправилен формат: „%s“." -#: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493 -#: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649 -#: builtin/notes.c:946 +#: builtin/notes.c:316 +#, c-format +msgid "failed to copy notes from '%s' to '%s'" +msgstr "бележката не може да се копира от „%s“ към „%s“" + +#. TRANSLATORS: the first %s will be replaced by a +#. git notes command: 'add', 'merge', 'remove', etc. +#: builtin/notes.c:345 +#, c-format +msgid "refusing to %s notes in %s (outside of refs/notes/)" +msgstr "" +"няма да се извърши „%s“ върху бележките в „%s“, защото са извън „refs/" +"notes/“." + +#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496 +#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:652 +#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970 msgid "too many parameters" msgstr "прекалено много параметри" -#: builtin/notes.c:375 builtin/notes.c:662 +#: builtin/notes.c:378 builtin/notes.c:665 #, c-format -msgid "No note found for object %s." -msgstr "Няма бележки за обекта „%s“." +msgid "no note found for object %s." +msgstr "няма бележки за обекта „%s“." -#: builtin/notes.c:396 builtin/notes.c:559 +#: builtin/notes.c:399 builtin/notes.c:562 msgid "note contents as a string" msgstr "низ, който е съдържанието на бележката" -#: builtin/notes.c:399 builtin/notes.c:562 +#: builtin/notes.c:402 builtin/notes.c:565 msgid "note contents in a file" msgstr "ФАЙЛ със съдържанието на бележката" -#: builtin/notes.c:402 builtin/notes.c:565 +#: builtin/notes.c:405 builtin/notes.c:568 msgid "reuse and edit specified note object" msgstr "преизползване и редактиране на указания ОБЕКТ-бележка" -#: builtin/notes.c:405 builtin/notes.c:568 +#: builtin/notes.c:408 builtin/notes.c:571 msgid "reuse specified note object" msgstr "преизползване на указания ОБЕКТ-бележка" -#: builtin/notes.c:408 builtin/notes.c:571 +#: builtin/notes.c:411 builtin/notes.c:574 msgid "allow storing empty note" msgstr "приемане и на празни бележки" -#: builtin/notes.c:409 builtin/notes.c:480 +#: builtin/notes.c:412 builtin/notes.c:483 msgid "replace existing notes" msgstr "замяна на съществуващите бележки" -#: builtin/notes.c:434 +#: builtin/notes.c:437 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -"Не може да се добави бележка, защото такава вече съществува за обекта „%s“. " +"Не може да се добави бележка, защото такава вече съществува за обекта „%s“. " "Използвайте опцията „-f“, за да презапишете съществуващи бележки." -#: builtin/notes.c:449 builtin/notes.c:528 +#: builtin/notes.c:452 builtin/notes.c:531 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Презаписване на съществуващите бележки за обекта „%s“\n" -#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886 +#: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889 #, c-format msgid "Removing note for object %s\n" msgstr "Изтриване на бележката за обекта „%s“\n" -#: builtin/notes.c:481 +#: builtin/notes.c:484 msgid "read objects from stdin" msgstr "изчитане на обектите от стандартния вход" -# FIXME imporve message -#: builtin/notes.c:483 +#: builtin/notes.c:486 msgid "load rewriting config for <command> (implies --stdin)" msgstr "" "зареждане на настройките за КОМАНДАта, която презаписва подавания (включва " "опцията „--stdin“)" -#: builtin/notes.c:501 +#: builtin/notes.c:504 msgid "too few parameters" msgstr "прекалено малко параметри" -#: builtin/notes.c:522 +#: builtin/notes.c:525 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -"Не може да се копира бележка, защото такава вече съществува за обекта „%s“. " +"Не може да се копира бележка, защото такава вече съществува за обекта „%s“. " "Използвайте опцията „-f“, за да презапишете съществуващи бележки." -#: builtin/notes.c:534 +#: builtin/notes.c:537 #, c-format -msgid "Missing notes on source object %s. Cannot copy." -msgstr "" -"Не може да се копира бележка, която не съществува — няма бележки за обекта-" -"източник „%s“." +msgid "missing notes on source object %s. Cannot copy." +msgstr "няма бележки за обекта-източник „%s“. Не може да се копира." -#: builtin/notes.c:586 +#: builtin/notes.c:589 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -9270,15 +10334,52 @@ msgstr "" "Вместо това ги използвайте с подкомандата „add“: „git notes add -f -m/-F/-c/-" "C“.\n" -#: builtin/notes.c:768 +#: builtin/notes.c:685 +msgid "failed to delete ref NOTES_MERGE_PARTIAL" +msgstr "указателят „NOTES_MERGE_PARTIAL“ не може да бъде изтрит" + +#: builtin/notes.c:687 +msgid "failed to delete ref NOTES_MERGE_REF" +msgstr "указателят „NOTES_MERGE_REF“ не може да бъде изтрит" + +#: builtin/notes.c:689 +msgid "failed to remove 'git notes merge' worktree" +msgstr "работната директория на „git notes merge“ не може да бъде изтрита" + +#: builtin/notes.c:709 +msgid "failed to read ref NOTES_MERGE_PARTIAL" +msgstr "указателят „NOTES_MERGE_PARTIAL“ не може да бъде прочетен" + +#: builtin/notes.c:711 +msgid "could not find commit from NOTES_MERGE_PARTIAL." +msgstr "подаването от „NOTES_MERGE_PARTIAL“ не може да се открие." + +#: builtin/notes.c:713 +msgid "could not parse commit from NOTES_MERGE_PARTIAL." +msgstr "подаването от „NOTES_MERGE_PARTIAL“ не може да се анализира." + +#: builtin/notes.c:726 +msgid "failed to resolve NOTES_MERGE_REF" +msgstr "не може да се открие към какво сочи „NOTES_MERGE_REF“" + +#: builtin/notes.c:729 +msgid "failed to finalize notes merge" +msgstr "неуспешно сливане на бележките" + +#: builtin/notes.c:755 +#, c-format +msgid "unknown notes merge strategy %s" +msgstr "непозната стратегия за сливане на бележки „%s“" + +#: builtin/notes.c:771 msgid "General options" msgstr "Общи опции" -#: builtin/notes.c:770 +#: builtin/notes.c:773 msgid "Merge options" msgstr "Опции при сливане" -#: builtin/notes.c:772 +#: builtin/notes.c:775 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -9288,253 +10389,289 @@ msgstr "" "„union“ (обединяване), „cat_sort_uniq“ (обединяване, подреждане, уникални " "резултати)" -#: builtin/notes.c:774 +#: builtin/notes.c:777 msgid "Committing unmerged notes" msgstr "Подаване на неслети бележки" -#: builtin/notes.c:776 +#: builtin/notes.c:779 msgid "finalize notes merge by committing unmerged notes" msgstr "завършване на сливането чрез подаване на неслети бележки" -#: builtin/notes.c:778 +#: builtin/notes.c:781 msgid "Aborting notes merge resolution" msgstr "Преустановяване на корекцията при сливането на бележки" -#: builtin/notes.c:780 +#: builtin/notes.c:783 msgid "abort notes merge" msgstr "преустановяване на сливането на бележки" -#: builtin/notes.c:857 +#: builtin/notes.c:794 +msgid "cannot mix --commit, --abort or -s/--strategy" +msgstr "опциите „--commit“, „--abort“ и „-s“/„--strategy“ са несъвместими" + +#: builtin/notes.c:799 +msgid "must specify a notes ref to merge" +msgstr "трябва да укажете указател към бележка за сливане." + +#: builtin/notes.c:823 +#, c-format +msgid "unknown -s/--strategy: %s" +msgstr "неизвестна стратегия към опцията „-s“/„--strategy“: „%s“" + +#: builtin/notes.c:860 +#, c-format +msgid "a notes merge into %s is already in-progress at %s" +msgstr "в момента се извършва сливане на бележките в „%s“ при „%s“" + +#: builtin/notes.c:863 #, c-format -msgid "A notes merge into %s is already in-progress at %s" -msgstr "В момента се извършва сливане на бележките в „%s“ при „%s“" +msgid "failed to store link to current notes ref (%s)" +msgstr "не може да се запази връзка към указателя на текущата бележка („%s“)." + +#: builtin/notes.c:865 +#, 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 "" +"Неуспешно сливане на бележките. Разрешете конфликтите в „%s“ и подайте " +"резултата с „git notes merge --commit“ или преустановете сливането с " +"командата „git notes merge --abort“.\n" -#: builtin/notes.c:884 +#: builtin/notes.c:887 #, c-format msgid "Object %s has no note\n" msgstr "Няма бележки за обекта „%s“\n" -#: builtin/notes.c:896 +#: builtin/notes.c:899 msgid "attempt to remove non-existent note is not an error" msgstr "опитът за изтриването на несъществуваща бележка не се счита за грешка" -#: builtin/notes.c:899 +#: builtin/notes.c:902 msgid "read object names from the standard input" msgstr "изчитане на имената на обектите от стандартния вход" -#: builtin/notes.c:980 +#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127 +msgid "do not remove, show only" +msgstr "само извеждане без действително окастряне" + +#: builtin/notes.c:941 +msgid "report pruned notes" +msgstr "докладване на окастрените обекти" + +#: builtin/notes.c:983 msgid "notes-ref" msgstr "УКАЗАТЕЛ_ЗА_БЕЛЕЖКА" -#: builtin/notes.c:981 +#: builtin/notes.c:984 msgid "use notes from <notes-ref>" msgstr "да се използва бележката сочена от този УКАЗАТЕЛ_ЗА_БЕЛЕЖКА" -#: builtin/notes.c:1016 builtin/remote.c:1628 +#: builtin/notes.c:1019 #, c-format -msgid "Unknown subcommand: %s" -msgstr "Непозната подкоманда: %s" +msgid "unknown subcommand: %s" +msgstr "непозната подкоманда: %s" -#: builtin/pack-objects.c:28 +#: builtin/pack-objects.c:29 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [ОПЦИЯ…] [< СПИСЪК_С_УКАЗАТЕЛИ | < СПИСЪК_С_ОБЕКТИ]" -# FIXME [options] vs [options...] -#: builtin/pack-objects.c:29 +#: builtin/pack-objects.c:30 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [ОПЦИЯ…] ПРЕФИКС_НА_ИМЕТО [< СПИСЪК_С_УКАЗАТЕЛИ | < " "СПИСЪК_С_ОБЕКТИ]" -#: builtin/pack-objects.c:175 builtin/pack-objects.c:178 +#: builtin/pack-objects.c:179 builtin/pack-objects.c:182 #, c-format msgid "deflate error (%d)" msgstr "грешка при декомпресиране с „deflate“ (%d)" -#: builtin/pack-objects.c:763 +#: builtin/pack-objects.c:768 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "изключване на записването на битовата маска, пакетите са разделени поради " "стойността на „pack.packSizeLimit“" -#: builtin/pack-objects.c:776 +#: builtin/pack-objects.c:781 msgid "Writing objects" msgstr "Записване на обектите" -#: builtin/pack-objects.c:1017 +#: builtin/pack-objects.c:1070 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "изключване на записването на битовата маска, защото някои обекти няма да се " "пакетират" -#: builtin/pack-objects.c:2177 +#: builtin/pack-objects.c:2346 msgid "Compressing objects" msgstr "Компресиране на обектите" -#: builtin/pack-objects.c:2563 +#: builtin/pack-objects.c:2759 #, c-format msgid "unsupported index version %s" msgstr "неподдържана версия на индекса „%s“" -#: builtin/pack-objects.c:2567 +#: builtin/pack-objects.c:2763 #, c-format msgid "bad index version '%s'" msgstr "неправилна версия на индекса „%s“" -#: builtin/pack-objects.c:2597 +#: builtin/pack-objects.c:2793 msgid "do not show progress meter" msgstr "без извеждане на напредъка" -#: builtin/pack-objects.c:2599 +#: builtin/pack-objects.c:2795 msgid "show progress meter" msgstr "извеждане на напредъка" -#: builtin/pack-objects.c:2601 +#: builtin/pack-objects.c:2797 msgid "show progress meter during object writing phase" msgstr "извеждане на напредъка във фазата на запазване на обектите" -#: builtin/pack-objects.c:2604 +#: builtin/pack-objects.c:2800 msgid "similar to --all-progress when progress meter is shown" msgstr "" "същото действие като опцията „--all-progress“ при извеждането на напредъка" -#: builtin/pack-objects.c:2605 +#: builtin/pack-objects.c:2801 msgid "version[,offset]" msgstr "ВЕРСИЯ[,ОТМЕСТВАНЕ]" -#: builtin/pack-objects.c:2606 +#: builtin/pack-objects.c:2802 msgid "write the pack index file in the specified idx format version" msgstr "" "запазване на индекса на пакетните файлове във форма̀та с указаната версия" -#: builtin/pack-objects.c:2609 +#: builtin/pack-objects.c:2805 msgid "maximum size of each output pack file" msgstr "максимален размер на всеки пакетен файл" -#: builtin/pack-objects.c:2611 +#: builtin/pack-objects.c:2807 msgid "ignore borrowed objects from alternate object store" msgstr "игнориране на обектите заети от други хранилища на обекти" -#: builtin/pack-objects.c:2613 +#: builtin/pack-objects.c:2809 msgid "ignore packed objects" msgstr "игнориране на пакетираните обекти" -#: builtin/pack-objects.c:2615 +#: builtin/pack-objects.c:2811 msgid "limit pack window by objects" msgstr "ограничаване на прозореца за пакетиране по брой обекти" -#: builtin/pack-objects.c:2617 +#: builtin/pack-objects.c:2813 msgid "limit pack window by memory in addition to object limit" msgstr "" "ограничаване на прозореца за пакетиране и по памет освен по брой обекти" -#: builtin/pack-objects.c:2619 +#: builtin/pack-objects.c:2815 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" "максимална дължина на веригата от разлики, която е позволена в пакетния файл" -#: builtin/pack-objects.c:2621 +#: builtin/pack-objects.c:2817 msgid "reuse existing deltas" msgstr "преизползване на съществуващите разлики" -#: builtin/pack-objects.c:2623 +#: builtin/pack-objects.c:2819 msgid "reuse existing objects" msgstr "преизползване на съществуващите обекти" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2821 msgid "use OFS_DELTA objects" msgstr "използване на обекти „OFS_DELTA“" -#: builtin/pack-objects.c:2627 +#: builtin/pack-objects.c:2823 msgid "use threads when searching for best delta matches" msgstr "" "стартиране на нишки за претърсване на най-добрите съвпадения на разликите" -#: builtin/pack-objects.c:2629 +#: builtin/pack-objects.c:2825 msgid "do not create an empty pack output" msgstr "без създаване на празен пакетен файл" -#: builtin/pack-objects.c:2631 +#: builtin/pack-objects.c:2827 msgid "read revision arguments from standard input" msgstr "изчитане на версиите от стандартния вход" -#: builtin/pack-objects.c:2633 +#: builtin/pack-objects.c:2829 msgid "limit the objects to those that are not yet packed" msgstr "ограничаване до все още непакетираните обекти" -#: builtin/pack-objects.c:2636 +#: builtin/pack-objects.c:2832 msgid "include objects reachable from any reference" msgstr "" "включване на всички обекти, които могат да се достигнат от произволен " "указател" -#: builtin/pack-objects.c:2639 +#: builtin/pack-objects.c:2835 msgid "include objects referred by reflog entries" msgstr "включване и на обектите сочени от записите в журнала на указателите" -#: builtin/pack-objects.c:2642 +#: builtin/pack-objects.c:2838 msgid "include objects referred to by the index" msgstr "включване и на обектите сочени от индекса" -#: builtin/pack-objects.c:2645 +#: builtin/pack-objects.c:2841 msgid "output pack to stdout" msgstr "извеждане на пакета на стандартния изход" -#: builtin/pack-objects.c:2647 +#: builtin/pack-objects.c:2843 msgid "include tag objects that refer to objects to be packed" msgstr "" "включване и на обектите-етикети, които сочат към обектите, които ще бъдат " "пакетирани" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2845 msgid "keep unreachable objects" msgstr "запазване на недостижимите обекти" -#: builtin/pack-objects.c:2650 parse-options.h:142 -msgid "time" -msgstr "ВРЕМЕ" +#: builtin/pack-objects.c:2847 +msgid "pack loose unreachable objects" +msgstr "пакетиране и на недостижимите обекти" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2849 msgid "unpack unreachable objects newer than <time>" msgstr "разпакетиране на недостижимите обекти, които са по-нови от това ВРЕМЕ" -#: builtin/pack-objects.c:2654 +#: builtin/pack-objects.c:2852 msgid "create thin packs" msgstr "създаване на съкратени пакети" -#: builtin/pack-objects.c:2656 +#: builtin/pack-objects.c:2854 msgid "create packs suitable for shallow fetches" msgstr "пакетиране подходящо за плитко доставяне" -#: builtin/pack-objects.c:2658 +#: builtin/pack-objects.c:2856 msgid "ignore packs that have companion .keep file" msgstr "игнориране на пакетите, които са придружени от файл „.keep“" -#: builtin/pack-objects.c:2660 +#: builtin/pack-objects.c:2858 msgid "pack compression level" msgstr "ниво на компресиране при пакетиране" -#: builtin/pack-objects.c:2662 +#: builtin/pack-objects.c:2860 msgid "do not hide commits by grafts" msgstr "" "извеждане на всички родители — дори и тези, които нормално са скрити при " "присажданията" -#: builtin/pack-objects.c:2664 +#: builtin/pack-objects.c:2862 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "използване на съществуващи индекси на база битови маски за ускоряване на " "преброяването на обектите" -#: builtin/pack-objects.c:2666 +#: builtin/pack-objects.c:2864 msgid "write a bitmap index together with the pack index" msgstr "" "запазване и на индекс на база побитова маска, заедно с индекса за пакета" -#: builtin/pack-objects.c:2757 +#: builtin/pack-objects.c:2993 msgid "Counting objects" msgstr "Преброяване на обектите" @@ -9562,15 +10699,11 @@ msgstr "Изтриване на повтарящите се обекти" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire ВРЕМЕ] [--] [ВРЪХ…]" -#: builtin/prune.c:105 builtin/worktree.c:125 -msgid "do not remove, show only" -msgstr "само извеждане без действително окастряне" - -#: builtin/prune.c:106 builtin/worktree.c:126 +#: builtin/prune.c:106 builtin/worktree.c:128 msgid "report pruned objects" msgstr "информация за окастрените обекти" -#: builtin/prune.c:109 builtin/worktree.c:128 +#: builtin/prune.c:109 builtin/worktree.c:130 msgid "expire objects older than <time>" msgstr "окастряне на обектите по-стари от това ВРЕМЕ" @@ -9578,60 +10711,45 @@ msgstr "окастряне на обектите по-стари от това msgid "cannot prune in a precious-objects repo" msgstr "хранилище с важни обекти не може да се окастря" -#: builtin/pull.c:72 +#: builtin/pull.c:51 builtin/pull.c:53 +#, c-format +msgid "Invalid value for %s: %s" +msgstr "Неправилна стойност за „%s“: „%s“" + +#: builtin/pull.c:73 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git push [ОПЦИЯ…] [ХРАНИЛИЩЕ [УКАЗАТЕЛ_НА_ВЕРСИЯ…]]" -#: builtin/pull.c:120 +#: builtin/pull.c:121 msgid "Options related to merging" msgstr "Опции при сливане" -#: builtin/pull.c:123 +#: builtin/pull.c:124 msgid "incorporate changes by rebasing rather than merging" msgstr "внасяне на промените чрез пребазиране, а не чрез сливане" -#: builtin/pull.c:147 builtin/revert.c:105 +#: builtin/pull.c:148 builtin/revert.c:101 msgid "allow fast-forward" msgstr "позволяване на тривиални сливания" -#: builtin/pull.c:153 -msgid "verify that the named commit has a valid GPG signature" -msgstr "Проверка, че указаното подаване е с правилен подпис на GPG" - -#: builtin/pull.c:156 +#: builtin/pull.c:157 msgid "automatically stash/stash pop before and after rebase" msgstr "автоматично скатаване/прилагане на скатаното преди и след пребазиране" -#: builtin/pull.c:172 +#: builtin/pull.c:173 msgid "Options related to fetching" msgstr "Опции при доставяне" -#: builtin/pull.c:194 +#: builtin/pull.c:195 msgid "number of submodules pulled in parallel" msgstr "брой подмодули издърпани паралелно" -#: builtin/pull.c:283 +#: builtin/pull.c:284 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Неправилна стойност за „pull.ff“: „%s“" -#: builtin/pull.c:379 -msgid "Cannot pull with rebase: You have unstaged changes." -msgstr "" -"Не можете да издърпвате при това пребазиране, защото има промени, които не " -"са в индекса" - -#: builtin/pull.c:385 -msgid "Additionally, your index contains uncommitted changes." -msgstr "Освен това в индекса има неподадени промени." - -#: builtin/pull.c:387 -msgid "Cannot pull with rebase: Your index contains uncommitted changes." -msgstr "" -"Не можете да издърпвате при това пребазиране, защото в индекса има " -"неподадени промени." - -#: builtin/pull.c:463 +#: builtin/pull.c:397 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -9639,14 +10757,14 @@ msgstr "" "Между указателите, които току що доставихте, няма подходящ кандидат, върху " "който да пребазирате." -#: builtin/pull.c:465 +#: builtin/pull.c:399 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "Между указателите, които току що доставихте, няма подходящ кандидат, който " "да слеете." -#: builtin/pull.c:466 +#: builtin/pull.c:400 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -9654,7 +10772,7 @@ msgstr "" "Най вероятно сте подали шаблон за указатели, който не е напаснал с нищо в " "отдалеченото хранилище." -#: builtin/pull.c:469 +#: builtin/pull.c:403 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -9665,44 +10783,44 @@ msgstr "" "Понеже това не е хранилището по подразбиране на текущия клон, трябва\n" "да укажете отдалечения клон на командния ред." -#: builtin/pull.c:474 git-parse-remote.sh:73 +#: builtin/pull.c:408 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Извън всички клони." -#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79 +#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Укажете върху кой клон искате да пребазирате." -#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82 +#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Укажете кой клон искате да слеете." -#: builtin/pull.c:479 builtin/pull.c:494 +#: builtin/pull.c:413 builtin/pull.c:428 msgid "See git-pull(1) for details." msgstr "За повече информация погледнете ръководството „git-pull(1)“" -#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496 +#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430 #: git-parse-remote.sh:64 msgid "<remote>" msgstr "ОТДАЛЕЧЕНО_ХРАНИЛИЩЕ" -#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 +#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:451 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "КЛОН" -#: builtin/pull.c:489 git-parse-remote.sh:75 +#: builtin/pull.c:423 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "Текущият клон не следи никой." -#: builtin/pull.c:498 git-parse-remote.sh:95 +#: builtin/pull.c:432 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:503 +#: builtin/pull.c:437 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -9711,25 +10829,37 @@ msgstr "" "За сливане е указан отдалеченият указател „%s“,\n" "но такъв не е доставен." -#: builtin/pull.c:864 +#: builtin/pull.c:754 +msgid "ignoring --verify-signatures for rebase" +msgstr "без „--verify-signatures“ при пребазиране" + +#: builtin/pull.c:801 msgid "--[no-]autostash option is only valid with --rebase." msgstr "опцията „--[no-]autostash“ изисква „--rebase“" -#: builtin/pull.c:872 +#: builtin/pull.c:809 msgid "Updating an unborn branch with changes added to the index." msgstr "Обновяване на все още несъздаден клон с промените от индекса" -#: builtin/pull.c:900 +#: builtin/pull.c:812 +msgid "pull with rebase" +msgstr "издърпване с пребазиране" + +#: builtin/pull.c:813 +msgid "please commit or stash them." +msgstr "трябва да подадете или скатаете промените." + +#: builtin/pull.c:838 #, c-format msgid "" "fetch updated the current branch head.\n" "fast-forwarding your working tree from\n" "commit %s." msgstr "" -"доставянето обнови върха на текущия клон. Работното\n" +"доставянето обнови върха на текущия клон. Работното\n" "ви копие бе тривиално слято от подаване „%s“." -#: builtin/pull.c:905 +#: builtin/pull.c:843 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -9746,11 +10876,11 @@ msgstr "" " $ git reset --hard\n" "за връщане към нормално състояние." -#: builtin/pull.c:920 +#: builtin/pull.c:858 msgid "Cannot merge multiple branches into empty head." msgstr "Не може да сливате множество клони в празен върхов указател." -#: builtin/pull.c:924 +#: builtin/pull.c:862 msgid "Cannot rebase onto multiple branches." msgstr "Не може да пребазирате върху повече от един клон." @@ -9809,7 +10939,7 @@ msgid "" "\n" " git push %s HEAD:<name-of-remote-branch>\n" msgstr "" -"В момента не сте на никой клон. За да изтласкате историята до състоянието,\n" +"В момента не сте на никой клон. За да изтласкате историята до състоянието,\n" "сочено в момента от указателя „HEAD“, използвайте командата:\n" "\n" " git push %s HEAD:ИМЕ_НА_ОТДАЛЕЧЕНИЯ_КЛОН\n" @@ -9865,7 +10995,7 @@ msgstr "" "на\n" "отдалечения клон. Внесете отдалечените промени (напр. с командата „git " "pull…“),\n" -"преди отново да изтласкате промените. За повече информация вижте раздела\n" +"преди отново да изтласкате промените. За повече информация вижте раздела\n" "„Note about fast-forwards“ в страницата от ръководството „git push --help“." #: builtin/push.c:255 @@ -9876,8 +11006,8 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "Обновяването е отхвърлено, защото върхът на изтласквания клон е преди върха\n" -"на отдалечения клон. Проверете клона и внесете отдалечените промени (напр.\n" -"с командата „git pull…“), преди отново да изтласкате промените. За повече\n" +"на отдалечения клон. Проверете клона и внесете отдалечените промени (напр.\n" +"с командата „git pull…“), преди отново да изтласкате промените. За повече\n" "информация погледнете раздела „Note about fast-forwards“ в страницата от\n" "ръководството „git push --help“." @@ -9891,9 +11021,9 @@ msgid "" msgstr "" "Обновяването е отхвърлено, защото хранилището, към което изтласквате, " "съдържа\n" -"промени, които липсват в локалното хранилище. Най-честата причина за това " +"промени, които липсват в локалното хранилище. Най-честата причина за това " "е,\n" -"че някой друг е изтласквал към същия клон. Първо внесете отдалечените " +"че някой друг е изтласквал към същия клон. Първо внесете отдалечените " "промени\n" "(напр. с командата „git pull…“), преди отново да изтласкате промените.\n" "За повече информация погледнете раздела „Note about fast-forwards“ в " @@ -9927,12 +11057,12 @@ msgstr "Изтласкване към „%s“\n" msgid "failed to push some refs to '%s'" msgstr "част от указателите не бяха изтласкани към „%s“" -#: builtin/push.c:365 +#: builtin/push.c:366 #, c-format msgid "bad repository '%s'" msgstr "неправилно указано хранилище „%s“" -#: builtin/push.c:366 +#: builtin/push.c:367 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -9954,107 +11084,119 @@ msgstr "" "\n" " git push ИМЕ\n" -#: builtin/push.c:381 +#: builtin/push.c:385 msgid "--all and --tags are incompatible" msgstr "опциите „--all“ и „--tags“ са несъвместими" -#: builtin/push.c:382 +#: builtin/push.c:386 msgid "--all can't be combined with refspecs" msgstr "опцията „--all“ е несъвместима с указването на версия" -#: builtin/push.c:387 +#: builtin/push.c:391 msgid "--mirror and --tags are incompatible" msgstr "опциите „--mirror“ и „--tags“ са несъвместими" -#: builtin/push.c:388 +#: builtin/push.c:392 msgid "--mirror can't be combined with refspecs" msgstr "опцията „--mirror“ е несъвместима с указването на версия" -#: builtin/push.c:393 +#: builtin/push.c:397 msgid "--all and --mirror are incompatible" msgstr "опциите „--all“ и „--mirror“ са несъвместими" -#: builtin/push.c:505 +#: builtin/push.c:515 msgid "repository" msgstr "хранилище" -#: builtin/push.c:506 builtin/send-pack.c:161 +#: builtin/push.c:516 builtin/send-pack.c:161 msgid "push all refs" msgstr "изтласкване на всички указатели" -#: builtin/push.c:507 builtin/send-pack.c:163 +#: builtin/push.c:517 builtin/send-pack.c:163 msgid "mirror all refs" msgstr "огледално копие на всички указатели" -#: builtin/push.c:509 +#: builtin/push.c:519 msgid "delete refs" msgstr "изтриване на указателите" -#: builtin/push.c:510 +#: builtin/push.c:520 msgid "push tags (can't be used with --all or --mirror)" msgstr "изтласкване на етикетите (несъвместимо с опциите „--all“ и „--mirror“)" -#: builtin/push.c:513 builtin/send-pack.c:164 +#: builtin/push.c:523 builtin/send-pack.c:164 msgid "force updates" msgstr "принудително обновяване" # FIXME double check this -#: builtin/push.c:515 builtin/send-pack.c:175 +#: builtin/push.c:525 builtin/send-pack.c:175 msgid "refname>:<expect" msgstr "УКАЗАТЕЛ>:<ОЧАКВАНА_СТОЙНОСТ" -#: builtin/push.c:516 builtin/send-pack.c:176 +#: builtin/push.c:526 builtin/send-pack.c:176 msgid "require old value of ref to be at this value" msgstr "УКАЗАТЕЛят трябва първоначално да е с тази ОЧАКВАНА_СТОЙНОСТ" -#: builtin/push.c:519 +#: builtin/push.c:529 msgid "control recursive pushing of submodules" msgstr "управление на рекурсивното изтласкване на подмодулите" -#: builtin/push.c:521 builtin/send-pack.c:169 +#: builtin/push.c:531 builtin/send-pack.c:169 msgid "use thin pack" msgstr "използване на съкратени пакети" -#: builtin/push.c:522 builtin/push.c:523 builtin/send-pack.c:158 +#: builtin/push.c:532 builtin/push.c:533 builtin/send-pack.c:158 #: builtin/send-pack.c:159 msgid "receive pack program" msgstr "програма за получаването на пакети" -#: builtin/push.c:524 +#: builtin/push.c:534 msgid "set upstream for git pull/status" msgstr "задаване на отдалеченото хранилище за командите „git pull/status“" -#: builtin/push.c:527 +#: builtin/push.c:537 msgid "prune locally removed refs" msgstr "окастряне на указателите, които са премахнати от локалното хранилище" -#: builtin/push.c:529 +#: builtin/push.c:539 msgid "bypass pre-push hook" msgstr "без изпълнение на куката преди изтласкване (pre-push)" -#: builtin/push.c:530 +#: builtin/push.c:540 msgid "push missing but relevant tags" msgstr "" "изтласкване на липсващите в отдалеченото хранилище, но свързани с текущото " "изтласкване, етикети" -#: builtin/push.c:533 builtin/send-pack.c:166 +#: builtin/push.c:543 builtin/send-pack.c:166 msgid "GPG sign the push" msgstr "подписване на изтласкването с GPG" -#: builtin/push.c:535 builtin/send-pack.c:170 +#: builtin/push.c:545 builtin/send-pack.c:170 msgid "request atomic transaction on remote side" msgstr "изискване на атомарни операции от отсрещната страна" -#: builtin/push.c:549 +#: builtin/push.c:546 +msgid "server-specific" +msgstr "специфични за сървъра" + +#: builtin/push.c:546 +msgid "option to transmit" +msgstr "опция за пренос" + +#: builtin/push.c:560 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" "опцията „--delete“ е несъвместима с опциите „--all“, „--mirror“ и „--tags“" -#: builtin/push.c:551 +#: builtin/push.c:562 msgid "--delete doesn't make sense without any refs" msgstr "опцията „--delete“ изисква поне един указател на версия" +#: builtin/push.c:579 +msgid "push options must not have new line characters" +msgstr "опциите за изтласкване не трябва да съдържат знок за нов ред" + #: builtin/read-tree.c:37 msgid "" "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " @@ -10130,15 +11272,69 @@ msgstr "без прилагане на филтъра за частично из msgid "debug unpack-trees" msgstr "изчистване на грешки в командата „unpack-trees“" -#: builtin/receive-pack.c:25 +#: builtin/receive-pack.c:26 msgid "git receive-pack <git-dir>" msgstr "git receive-pack ДИРЕКТОРИЯ_НА_GIT" -#: builtin/receive-pack.c:1719 +#: builtin/receive-pack.c:793 +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 'receive.denyCurrentBranch' configuration variable to\n" +"'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 "" +"Стандартно не може да обновите текущия клон в хранилище, което не е голо,\n" +"защото това ще доведе до несъответствия на индекса и работното дърво с\n" +"това, което сте изтласкали и за да приведете дървото към „HEAD“ ще трябва\n" +"да изпълните:\n" +"\n" +" git reset --hard\n" +"\n" +"\n" +"За да позволите подобно изтласкване, в отдалеченото хранилище следва да\n" +"зададете настройката „receive.denyCurrentBranch“ да е „ignore“\n" +"(пренебрегване) или „warn“ (само предупреждение). Не се препоръчва да\n" +"правите това, освен ако по друг начин не синхронизирате работното дърво с\n" +"това, което изтласквате.\n" +"\n" +"За да заглушите това съобщение, като запазите стандартното поведение,\n" +"задайте настройката „receive.denyCurrentBranch“ да е „refuse“ (отказ)." + +#: builtin/receive-pack.c:813 +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 "" +"Стандартно не може да изтриете текущия клон, защото следващото клониране\n" +"на текущото хранилище ще е без никакви файлове, а това е объркващо.\n" +"\n" +"За да може да изтривате текущия клон, в отдалеченото хранилище следва да\n" +"зададете настройката „receive.denyDeleteCurrent“ да е „ignore“\n" +"(пренебрегване) или „warn“ (само предупреждение).\n" +"\n" +"За да заглушите това съобщение, задайте настройката\n" +"„receive.denyDeleteCurrent“ да е „refuse“ (отказ)." + +#: builtin/receive-pack.c:1883 msgid "quiet" msgstr "без извеждане на информация" -#: builtin/receive-pack.c:1733 +#: builtin/receive-pack.c:1897 msgid "You must specify a directory." msgstr "Трябва да укажете директория." @@ -10233,7 +11429,7 @@ msgstr "git remote prune [ОПЦИЯ…] ИМЕ" #: builtin/remote.c:65 msgid "git remote update [<options>] [<group> | <remote>]..." -msgstr "git remote update [ОПЦИЯ…] [ГРУПА | ОТДАЛЕЧЕНО_ХРАНИЛИЩЕ]…" +msgstr "git remote update [ОПЦИЯ…] [ГРУПА | ОТДАЛЕЧЕНО_ХРАНИЛИЩЕ…]" #: builtin/remote.c:94 #, c-format @@ -10246,7 +11442,7 @@ msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" msgstr "" -"Използването само на „--mirror“ е опасно. Вместо това\n" +"Използването само на „--mirror“ е опасно. Вместо това\n" "ползвайте „--mirror=fetch“ или „--mirror=push“" #: builtin/remote.c:143 @@ -10294,12 +11490,12 @@ msgstr "" "указването на следени клони е смислено само за отдалечени хранилища, от " "които се доставя" -#: builtin/remote.c:190 builtin/remote.c:633 +#: builtin/remote.c:190 builtin/remote.c:629 #, c-format msgid "remote %s already exists." msgstr "вече съществува отдалечено хранилище с име „%s“." -#: builtin/remote.c:194 builtin/remote.c:637 +#: builtin/remote.c:194 builtin/remote.c:633 #, c-format msgid "'%s' is not a valid remote name" msgstr "„%s“ е неправилно име за отдалечено хранилище" @@ -10322,18 +11518,18 @@ msgstr "(съвпадащи)" msgid "(delete)" msgstr "(за изтриване)" -#: builtin/remote.c:626 builtin/remote.c:761 builtin/remote.c:858 +#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854 #, c-format msgid "No such remote: %s" msgstr "Такова отдалечено хранилище няма: %s" -#: builtin/remote.c:643 +#: builtin/remote.c:639 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Разделът „%s“ в настройките не може да бъде преименуван на „%s“" # FIXME tabulator -#: builtin/remote.c:663 +#: builtin/remote.c:659 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -10344,17 +11540,17 @@ msgstr "" " %s\n" " Променете настройките ръчно, ако е необходимо." -#: builtin/remote.c:699 +#: builtin/remote.c:695 #, c-format msgid "deleting '%s' failed" msgstr "неуспешно изтриване на „%s“" -#: builtin/remote.c:733 +#: builtin/remote.c:729 #, c-format msgid "creating '%s' failed" msgstr "неуспешно създаване на „%s“" -#: builtin/remote.c:796 +#: builtin/remote.c:792 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -10368,381 +11564,402 @@ msgstr[1] "" "Бележка: Няколко клона извън йерархията „refs/remotes/“ не бяха изтрити.\n" "Изтрийте ги чрез командата:" -#: builtin/remote.c:810 +#: builtin/remote.c:806 #, c-format msgid "Could not remove config section '%s'" msgstr "Разделът „%s“ в настройките не може да бъде изтрит" -#: builtin/remote.c:911 +#: builtin/remote.c:907 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " нов (следващото доставяне ще го разположи в „remotes/%s“)" -#: builtin/remote.c:914 +#: builtin/remote.c:910 msgid " tracked" msgstr " следен" -#: builtin/remote.c:916 +#: builtin/remote.c:912 msgid " stale (use 'git remote prune' to remove)" msgstr " стар (изтрийте чрез „git remote prune“)" -# FIXME -#: builtin/remote.c:918 +#: builtin/remote.c:914 msgid " ???" msgstr " неясно състояние" # CHECK -#: builtin/remote.c:959 +#: builtin/remote.c:955 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "" -"неправилен клон за сливане „%s“. Невъзможно е да пребазирате върху повече от " -"1 клон" +"неправилен клон за сливане „%s“. Невъзможно е да пребазирате върху повече " +"от 1 клон" -#: builtin/remote.c:967 +#: builtin/remote.c:963 #, c-format msgid "rebases interactively onto remote %s" msgstr "интерактивно пребазиране върху отдалечения клон „%s“" -#: builtin/remote.c:971 +#: builtin/remote.c:964 +#, c-format +msgid "rebases onto remote %s" +msgstr "пребазиране върху отдалечения клон „%s“" + +#: builtin/remote.c:967 #, c-format msgid " merges with remote %s" msgstr " сливане с отдалечения клон „%s“" -#: builtin/remote.c:972 -msgid " and with remote" -msgstr " и с отдалечения клон" - -#: builtin/remote.c:974 +#: builtin/remote.c:970 #, c-format msgid "merges with remote %s" msgstr "сливане с отдалечения клон „%s“" -#: builtin/remote.c:975 -msgid " and with remote" -msgstr " и с отдалечения клон" +#: builtin/remote.c:973 +#, c-format +msgid "%-*s and with remote %s\n" +msgstr "%-*s и с отдалечения клон „%s“\n" -#: builtin/remote.c:1021 +#: builtin/remote.c:1016 msgid "create" msgstr "създаден" -#: builtin/remote.c:1024 +#: builtin/remote.c:1019 msgid "delete" msgstr "изтрит" -#: builtin/remote.c:1028 +#: builtin/remote.c:1023 msgid "up to date" msgstr "актуален" -#: builtin/remote.c:1031 +#: builtin/remote.c:1026 msgid "fast-forwardable" msgstr "може да се слее тривиално" -#: builtin/remote.c:1034 +#: builtin/remote.c:1029 msgid "local out of date" msgstr "локалният е изостанал" -#: builtin/remote.c:1041 +#: builtin/remote.c:1036 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s принудително изтласква към %-*s (%s)" -#: builtin/remote.c:1044 +#: builtin/remote.c:1039 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s изтласква към %-*s (%s)" -#: builtin/remote.c:1048 +#: builtin/remote.c:1043 #, c-format msgid " %-*s forces to %s" msgstr " %-*s принудително изтласква към %s" -#: builtin/remote.c:1051 +#: builtin/remote.c:1046 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s изтласква към %s" -#: builtin/remote.c:1119 +#: builtin/remote.c:1114 msgid "do not query remotes" msgstr "без заявки към отдалечените хранилища" -#: builtin/remote.c:1146 +#: builtin/remote.c:1141 #, c-format msgid "* remote %s" msgstr "● отдалечено хранилище „%s“" -#: builtin/remote.c:1147 +#: builtin/remote.c:1142 #, c-format msgid " Fetch URL: %s" msgstr " Адрес за доставяне: %s" -#: builtin/remote.c:1148 builtin/remote.c:1301 +#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295 msgid "(no URL)" msgstr "(без адрес)" # FIXME spaces betwen Push and URL #. TRANSLATORS: the colon ':' should align with #. the one in " Fetch URL: %s" translation -#: builtin/remote.c:1159 builtin/remote.c:1161 +#: builtin/remote.c:1154 builtin/remote.c:1156 #, c-format msgid " Push URL: %s" msgstr " Адрес за изтласкване: %s" -#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167 +#: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162 #, c-format msgid " HEAD branch: %s" msgstr " клон сочен от HEAD: %s" -#: builtin/remote.c:1169 +#: builtin/remote.c:1158 +msgid "(not queried)" +msgstr "(без проверка)" + +#: builtin/remote.c:1160 +msgid "(unknown)" +msgstr "(непознат)" + +#: builtin/remote.c:1164 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr "" " клонът сочен от HEAD (клонът указан във файла HEAD от отдалеченото " -"хранилище е\n" -" нееднозначен и е някой от следните):\n" +"хранилище\n" +" не е еднозначен и е някой от следните):\n" -#: builtin/remote.c:1181 +#: builtin/remote.c:1176 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Отдалечен клон:%s" msgstr[1] " Отдалечени клони:%s" -#: builtin/remote.c:1184 builtin/remote.c:1211 +#: builtin/remote.c:1179 builtin/remote.c:1205 msgid " (status not queried)" msgstr " (състоянието не бе проверено)" -#: builtin/remote.c:1193 +#: builtin/remote.c:1188 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:1201 +#: builtin/remote.c:1196 msgid " Local refs will be mirrored by 'git push'" msgstr " Локалните указатели ще бъдат пренесени чрез „ push“" -#: builtin/remote.c:1208 +#: builtin/remote.c:1202 #, 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:1223 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "задаване на refs/remotes/ИМЕ/HEAD според отдалеченото хранилище" -#: builtin/remote.c:1231 +#: builtin/remote.c:1225 msgid "delete refs/remotes/<name>/HEAD" msgstr "изтриване на refs/remotes/ИМЕ/HEAD" -#: builtin/remote.c:1246 +#: builtin/remote.c:1240 msgid "Cannot determine remote HEAD" msgstr "Не може да се установи отдалеченият връх" -#: builtin/remote.c:1248 +#: builtin/remote.c:1242 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" -"Множество клони с върхове. Изберете изрично някой от тях чрез командата:" +"Множество клони с върхове. Изберете изрично някой от тях чрез командата:" -#: builtin/remote.c:1258 +#: builtin/remote.c:1252 #, c-format msgid "Could not delete %s" msgstr "„%s“ не може да бъде изтрит" -#: builtin/remote.c:1266 +#: builtin/remote.c:1260 #, c-format msgid "Not a valid ref: %s" msgstr "Неправилен указател: %s" -#: builtin/remote.c:1268 +#: builtin/remote.c:1262 #, c-format msgid "Could not setup %s" msgstr "„%s“ не може да се настрои" -#: builtin/remote.c:1286 +#: builtin/remote.c:1280 #, c-format msgid " %s will become dangling!" msgstr "„%s“ ще се превърне в обект извън клоните!" -#: builtin/remote.c:1287 +#: builtin/remote.c:1281 #, c-format msgid " %s has become dangling!" msgstr "„%s“ се превърна в обект извън клоните!" -#: builtin/remote.c:1297 +#: builtin/remote.c:1291 #, c-format msgid "Pruning %s" msgstr "Окастряне на „%s“" -#: builtin/remote.c:1298 +#: builtin/remote.c:1292 #, c-format msgid "URL: %s" msgstr "адрес: %s" -#: builtin/remote.c:1314 +#: builtin/remote.c:1308 #, c-format msgid " * [would prune] %s" msgstr " ● [ще бъде окастрено] %s" -#: builtin/remote.c:1317 +#: builtin/remote.c:1311 #, c-format msgid " * [pruned] %s" msgstr " ● [окастрено] %s" -#: builtin/remote.c:1362 +#: builtin/remote.c:1356 msgid "prune remotes after fetching" msgstr "окастряне на огледалата на отдалечените хранилища след доставяне" -#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547 +#: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541 #, c-format msgid "No such remote '%s'" msgstr "Няма отдалечено хранилище на име „%s“" -#: builtin/remote.c:1441 +#: builtin/remote.c:1435 msgid "add branch" msgstr "добавяне на клон" -#: builtin/remote.c:1448 +#: builtin/remote.c:1442 msgid "no remote specified" msgstr "не е указано отдалечено хранилище" -#: builtin/remote.c:1465 +#: builtin/remote.c:1459 msgid "query push URLs rather than fetch URLs" msgstr "запитване към адресите за изтласкване, а не за доставяне" -#: builtin/remote.c:1467 +#: builtin/remote.c:1461 msgid "return all URLs" msgstr "извеждане на всички адреси" -#: builtin/remote.c:1495 +#: builtin/remote.c:1489 #, c-format msgid "no URLs configured for remote '%s'" msgstr "не е зададен адрес за отдалеченото хранилище „%s“" -#: builtin/remote.c:1521 +#: builtin/remote.c:1515 msgid "manipulate push URLs" msgstr "промяна на адресите за изтласкване" -#: builtin/remote.c:1523 +#: builtin/remote.c:1517 msgid "add URL" msgstr "добавяне на адреси" -#: builtin/remote.c:1525 +#: builtin/remote.c:1519 msgid "delete URLs" msgstr "изтриване на адреси" -# FIXME message - incompatible -#: builtin/remote.c:1532 +#: builtin/remote.c:1526 msgid "--add --delete doesn't make sense" msgstr "опциите „--add“ и „--delete“ са несъвместими" -#: builtin/remote.c:1573 +#: builtin/remote.c:1567 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Неправилен (стар) формат за адрес: %s" -#: builtin/remote.c:1581 +#: builtin/remote.c:1575 #, c-format msgid "No such URL found: %s" msgstr "Такъв адрес не е открит: %s" # FIXME CHECK MEANING -#: builtin/remote.c:1583 +#: builtin/remote.c:1577 msgid "Will not delete all non-push URLs" msgstr "Никой от адресите, които не са за изтласкване, няма да се изтрие" -#: builtin/remote.c:1597 +#: builtin/remote.c:1591 msgid "be verbose; must be placed before a subcommand" -msgstr "повече подробности. Поставя се пред подкоманда" +msgstr "повече подробности. Поставя се пред подкоманда" + +#: builtin/remote.c:1622 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "Непозната подкоманда: %s" #: builtin/repack.c:17 msgid "git repack [<options>]" msgstr "git repack [ОПЦИЯ…]" -#: builtin/repack.c:159 +#: builtin/repack.c:160 msgid "pack everything in a single pack" msgstr "пакетиране на всичко в пакет" -#: builtin/repack.c:161 +#: builtin/repack.c:162 msgid "same as -a, and turn unreachable objects loose" msgstr "" -"същото като опцията „-a“. Допълнително — недостижимите обекти да станат " +"същото като опцията „-a“. Допълнително — недостижимите обекти да станат " "непакетирани" -#: builtin/repack.c:164 +#: builtin/repack.c:165 msgid "remove redundant packs, and run git-prune-packed" msgstr "" "премахване на ненужните пакетирани файлове и изпълнение на командата „git-" "prune-packed“" -#: builtin/repack.c:166 +#: builtin/repack.c:167 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "подаване на опцията „--no-reuse-delta“ на командата „git-pack-objects“" -#: builtin/repack.c:168 +#: builtin/repack.c:169 msgid "pass --no-reuse-object to git-pack-objects" msgstr "" "подаване на опцията „--no-reuse-object“ на командата „git-pack-objects“" -#: builtin/repack.c:170 +#: builtin/repack.c:171 msgid "do not run git-update-server-info" msgstr "без изпълнение на командата „git-update-server-info“" -#: builtin/repack.c:173 +#: builtin/repack.c:174 msgid "pass --local to git-pack-objects" msgstr "подаване на опцията „--local“ на командата „git-pack-objects“" -#: builtin/repack.c:175 +#: builtin/repack.c:176 msgid "write bitmap index" msgstr "създаване и записване на индекси на база битови маски" -#: builtin/repack.c:176 +#: builtin/repack.c:177 msgid "approxidate" msgstr "евристична дата" -#: builtin/repack.c:177 +#: builtin/repack.c:178 msgid "with -A, do not loosen objects older than this" msgstr "" "при комбинирането с опцията „-A“ — без разпакетиране на обектите по стари от " "това" -#: builtin/repack.c:179 +#: builtin/repack.c:180 +msgid "with -a, repack unreachable objects" +msgstr "с „-a“ — препакетиране на недостижимите обекти" + +#: builtin/repack.c:182 msgid "size of the window used for delta compression" msgstr "размер на прозореца за делта компресията" -#: builtin/repack.c:180 builtin/repack.c:184 +#: builtin/repack.c:183 builtin/repack.c:187 msgid "bytes" msgstr "байтове" -#: builtin/repack.c:181 +#: builtin/repack.c:184 msgid "same as the above, but limit memory size instead of entries count" msgstr "" "същото като горната опция, но ограничението да е по размер на паметта, а не " "по броя на обектите" -#: builtin/repack.c:183 +#: builtin/repack.c:186 msgid "limits the maximum delta depth" msgstr "ограничаване на максималната дълбочина на делтата" -#: builtin/repack.c:185 +#: builtin/repack.c:188 msgid "maximum size of each packfile" msgstr "максимален размер на всеки пакет" -#: builtin/repack.c:187 +#: builtin/repack.c:190 msgid "repack objects in packs marked with .keep" msgstr "препакетиране на обектите в пакети белязани с „.keep“" -#: builtin/repack.c:197 +#: builtin/repack.c:200 msgid "cannot delete packs in a precious-objects repo" msgstr "пакетите в хранилище с важни обекти не може да се трият" -#: builtin/repack.c:381 +#: builtin/repack.c:204 +msgid "--keep-unreachable and -A are incompatible" +msgstr "Опциите „--keep-unreachable“ и „-A“ са несъвместими" + +#: builtin/repack.c:391 builtin/worktree.c:115 #, c-format -msgid "removing '%s' failed" -msgstr "неуспешно изтриване на „%s“" +msgid "failed to remove '%s'" +msgstr "директорията „%s“ не може да бъде изтрита" #: builtin/replace.c:19 msgid "git replace [-f] <object> <replacement>" @@ -10845,7 +12062,7 @@ msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [ПОДАВАНЕ]" #: builtin/reset.c:27 -msgid "git reset [-q] <tree-ish> [--] <paths>..." +msgid "git reset [-q] [<tree-ish>] [--] <paths>..." msgstr "git reset [-q] УКАЗАТЕЛ_КЪМ_ДЪРВО [--] ПЪТИЩА…" #: builtin/reset.c:28 @@ -10940,7 +12157,7 @@ msgstr "" #: builtin/reset.c:331 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" -"опцията „--mixed“ не бива да се използва заедно с пътища. Вместо това " +"опцията „--mixed“ не бива да се използва заедно с пътища. Вместо това " "изпълнете „git reset -- ПЪТ…“." #: builtin/reset.c:333 @@ -10970,27 +12187,27 @@ msgstr "Индексът не може да бъде занулен към ве msgid "Could not write new index file." msgstr "Новият индекс не може да бъде записан." -#: builtin/rev-list.c:350 +#: builtin/rev-list.c:354 msgid "rev-list does not support display of notes" msgstr "командата „rev-list“ не поддържа извеждането на бележки" -#: builtin/rev-parse.c:358 +#: builtin/rev-parse.c:386 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [ОПЦИЯ…] -- [АРГУМЕНТ…]" -#: builtin/rev-parse.c:363 +#: builtin/rev-parse.c:391 msgid "keep the `--` passed as an arg" msgstr "зададеният низ „--“ да се тълкува като аргумент" -#: builtin/rev-parse.c:365 +#: builtin/rev-parse.c:393 msgid "stop parsing after the first non-option argument" msgstr "спиране на анализа след първия аргумент, който не е опция" -#: builtin/rev-parse.c:368 +#: builtin/rev-parse.c:396 msgid "output in stuck long form" msgstr "изход в дългия формат" -#: builtin/rev-parse.c:499 +#: builtin/rev-parse.c:527 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -11062,31 +12279,27 @@ msgstr "опция" msgid "option for merge strategy" msgstr "опция за стратегията на сливане" -#: builtin/revert.c:104 +#: builtin/revert.c:100 msgid "append commit name" msgstr "добавяне на името на подаването" -#: builtin/revert.c:106 +#: builtin/revert.c:102 msgid "preserve initially empty commits" msgstr "запазване на първоначално празните подавания" -#: builtin/revert.c:107 +#: builtin/revert.c:103 msgid "allow commits with empty messages" msgstr "позволяване на празни съобщения при подаване" -#: builtin/revert.c:108 +#: builtin/revert.c:104 msgid "keep redundant, empty commits" msgstr "запазване на излишните, празни подавания" -#: builtin/revert.c:112 -msgid "program error" -msgstr "грешка в програмата" - -#: builtin/revert.c:197 +#: builtin/revert.c:192 msgid "revert failed" msgstr "неуспешна отмяна" -#: builtin/revert.c:212 +#: builtin/revert.c:205 msgid "cherry-pick failed" msgstr "неуспешно отбиране" @@ -11238,7 +12451,6 @@ msgstr "Без описания на подаванията — да се пок msgid "Show the email address of each author" msgstr "Извеждане на адреса на е-поща за всеки автор" -# FIXME why is this so short #: builtin/shortlog.c:247 msgid "w[,i1[,i2]]" msgstr "ШИРОЧИНА[,ОТСТЪП_1[,ОТСТЪП_2]]" @@ -11265,73 +12477,128 @@ msgstr "" msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=БРОЙ[,БАЗА]] [--list] [УКАЗАТЕЛ]" -#: builtin/show-branch.c:640 +#: builtin/show-branch.c:375 +#, c-format +msgid "ignoring %s; cannot handle more than %d ref" +msgid_plural "ignoring %s; cannot handle more than %d refs" +msgstr[0] "„%s“ се прескача — не може да се обработят повече от %d указател" +msgstr[1] "„%s“ се прескача — не може да се обработят повече от %d указатели" + +#: builtin/show-branch.c:541 +#, c-format +msgid "no matching refs with %s" +msgstr "никой указател не съвпада с „%s“" + +#: builtin/show-branch.c:639 msgid "show remote-tracking and local branches" msgstr "извеждане на следящите и локалните клони" -#: builtin/show-branch.c:642 +#: builtin/show-branch.c:641 msgid "show remote-tracking branches" msgstr "извеждане на следящите клони" -#: builtin/show-branch.c:644 +#: builtin/show-branch.c:643 msgid "color '*!+-' corresponding to the branch" msgstr "оцветяване на „*!+-“ според клоните" -#: builtin/show-branch.c:646 +#: builtin/show-branch.c:645 msgid "show <n> more commits after the common ancestor" msgstr "извеждане на такъв БРОЙ подавания от общия предшественик" -#: builtin/show-branch.c:648 +#: builtin/show-branch.c:647 msgid "synonym to more=-1" msgstr "синоним на „more=-1“" -#: builtin/show-branch.c:649 +#: builtin/show-branch.c:648 msgid "suppress naming strings" msgstr "без низове за имената на клоните" -#: builtin/show-branch.c:651 +#: builtin/show-branch.c:650 msgid "include the current branch" msgstr "включване и на текущия клон" -#: builtin/show-branch.c:653 +#: builtin/show-branch.c:652 msgid "name commits with their object names" msgstr "именуване на подаванията с имената им на обекти" -#: builtin/show-branch.c:655 +#: builtin/show-branch.c:654 msgid "show possible merge bases" msgstr "извеждане на възможните бази за сливания" -#: builtin/show-branch.c:657 +#: builtin/show-branch.c:656 msgid "show refs unreachable from any other ref" msgstr "извеждане на недостижимите указатели" -#: builtin/show-branch.c:659 +#: builtin/show-branch.c:658 msgid "show commits in topological order" msgstr "извеждане на подаванията в топологическа подредба" -#: builtin/show-branch.c:662 +#: builtin/show-branch.c:661 msgid "show only commits not on the first branch" msgstr "извеждане само на подаванията, които не са от първия клон" -#: builtin/show-branch.c:664 +#: builtin/show-branch.c:663 msgid "show merges reachable from only one tip" msgstr "извеждане на сливанията, които могат да се достигнат само от един връх" -#: builtin/show-branch.c:666 +#: builtin/show-branch.c:665 msgid "topologically sort, maintaining date order where possible" msgstr "" "топологическа подредба, при запазване на подредбата по дата, доколкото е\n" "възможно" -#: builtin/show-branch.c:669 +#: builtin/show-branch.c:668 msgid "<n>[,<base>]" msgstr "БРОЙ[,БАЗА]" -#: builtin/show-branch.c:670 +#: builtin/show-branch.c:669 msgid "show <n> most recent ref-log entries starting at base" msgstr "показване на най-много БРОЙ журнални записа с начало съответната БАЗА" -# FIXME * -> ... +#: builtin/show-branch.c:703 +msgid "" +"--reflog is incompatible with --all, --remotes, --independent or --merge-base" +msgstr "" +"опцията „--reflog“ е несъвместима с опциите „--all“, „--remotes“, „--" +"independent“ и „--merge-base“" + +#: builtin/show-branch.c:727 +msgid "no branches given, and HEAD is not valid" +msgstr "не е зададен клон, а указателят „HEAD“ е неправилен" + +#: builtin/show-branch.c:730 +msgid "--reflog option needs one branch name" +msgstr "опцията „--track“ изисква точно едно име на клон" + +#: builtin/show-branch.c:733 +#, 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] "само %d запис може да бъде показан наведнъж." +msgstr[1] "само %d записа може да бъде показани наведнъж." + +#: builtin/show-branch.c:737 +#, c-format +msgid "no such ref %s" +msgstr "такъв указател няма: %s" + +#: builtin/show-branch.c:829 +#, c-format +msgid "cannot handle more than %d rev." +msgid_plural "cannot handle more than %d revs." +msgstr[0] "не може да се обработи повече от %d указател." +msgstr[1] "не може да се обработят повече от %d указатели." + +#: builtin/show-branch.c:833 +#, c-format +msgid "'%s' is not a valid ref." +msgstr "„%s“ е неправилен указател." + +#: builtin/show-branch.c:836 +#, c-format +msgid "cannot find commit %s (%s)" +msgstr "подаването „%s“ (%s) липсва" + #: builtin/show-ref.c:10 msgid "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" @@ -11396,12 +12663,12 @@ msgstr "пропускане на всички редове, които запо msgid "prepend comment character and space to each line" msgstr "добавяне на „# “ в началото на всеки ред" -#: builtin/submodule--helper.c:24 +#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1046 #, c-format msgid "No such ref: %s" msgstr "Такъв указател няма: %s" -#: builtin/submodule--helper.c:31 +#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1055 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Очаква се пълно име на указател, а не „%s“" @@ -11411,75 +12678,95 @@ msgstr "Очаква се пълно име на указател, а не „%s msgid "cannot strip one component off url '%s'" msgstr "не може да се махне компонент от адреса „%s“" -#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405 -#: builtin/submodule--helper.c:486 +#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:408 +#: builtin/submodule--helper.c:590 msgid "alternative anchor for relative paths" msgstr "директория за определянето на относителните пътища" -#: builtin/submodule--helper.c:283 +#: builtin/submodule--helper.c:287 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=ПЪТ] [ПЪТ…]" -#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340 +#: builtin/submodule--helper.c:329 builtin/submodule--helper.c:343 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "Във файла „.gitmodules“ не е открит адрес за пътя към подмодул „%s“" -#: builtin/submodule--helper.c:366 +#: builtin/submodule--helper.c:369 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Неуспешно регистриране на адрес за пътя към подмодул „%s“" -#: builtin/submodule--helper.c:370 +#: builtin/submodule--helper.c:373 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Регистриран е подмодул „%s“ (%s) за пътя към подмодул „%s“\n" -#: builtin/submodule--helper.c:380 +#: builtin/submodule--helper.c:383 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "ПРЕДУПРЕЖДЕНИЕ: препоръчва се режим на обновяване за подмодула „%s“\n" -#: builtin/submodule--helper.c:387 +#: builtin/submodule--helper.c:390 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" "Неуспешно регистриране на режима на обновяване за пътя към подмодул „%s“" -#: builtin/submodule--helper.c:406 +#: builtin/submodule--helper.c:409 msgid "Suppress output for initializing a submodule" msgstr "Без извеждане на информация при инициализирането на подмодул" -#: builtin/submodule--helper.c:411 +#: builtin/submodule--helper.c:414 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper name [ПЪТ]" -#: builtin/submodule--helper.c:432 +#: builtin/submodule--helper.c:435 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name ПЪТ" -#: builtin/submodule--helper.c:438 +#: builtin/submodule--helper.c:441 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "Във файла „.gitmodules“ липсва информация за пътя „%s“" -#: builtin/submodule--helper.c:489 +#: builtin/submodule--helper.c:524 builtin/submodule--helper.c:527 +#, c-format +msgid "submodule '%s' cannot add alternate: %s" +msgstr "към подмодула „%s“ не може да се добави алтернативен източник: %s" + +#: builtin/submodule--helper.c:563 +#, c-format +msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" +msgstr "" +"Непозната стойност „%s“ за настройката „submodule.alternateErrorStrategy“" + +#: builtin/submodule--helper.c:570 +#, c-format +msgid "Value '%s' for submodule.alternateLocation is not recognized" +msgstr "Непозната стойност „%s“ за настройката „submodule.alternateLocation“" + +#: builtin/submodule--helper.c:593 msgid "where the new submodule will be cloned to" msgstr "къде да се клонира новият подмодул" -#: builtin/submodule--helper.c:492 +#: builtin/submodule--helper.c:596 msgid "name of the new submodule" msgstr "име на новия подмодул" -#: builtin/submodule--helper.c:495 +#: builtin/submodule--helper.c:599 msgid "url where to clone the submodule from" msgstr "адрес, от който да се клонира новият подмодул" -#: builtin/submodule--helper.c:501 +#: builtin/submodule--helper.c:605 msgid "depth for shallow clones" msgstr "дълбочина на плитките хранилища" -#: builtin/submodule--helper.c:507 +#: builtin/submodule--helper.c:608 builtin/submodule--helper.c:964 +msgid "force cloning progress" +msgstr "извеждане на напредъка на клонирането" + +#: builtin/submodule--helper.c:613 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -11487,89 +12774,112 @@ msgstr "" "git submodule--helper clone [--prefix=ПЪТ] [--quiet] [--reference ХРАНИЛИЩЕ] " "[--name ИМЕ] [--depth ДЪЛБОЧИНА] --url АДРЕС --path ПЪТ…" -#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538 +#: builtin/submodule--helper.c:638 builtin/submodule--helper.c:648 #, c-format msgid "could not create directory '%s'" msgstr "Директорията „%s“ не може да бъде създадена" -#: builtin/submodule--helper.c:534 +#: builtin/submodule--helper.c:644 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "Неуспешно клониране на адреса „%s“ в пътя „%s“ като подмодул" -#: builtin/submodule--helper.c:550 +#: builtin/submodule--helper.c:660 #, c-format msgid "cannot open file '%s'" msgstr "файлът „%s“ не може да бъде отворен" -#: builtin/submodule--helper.c:555 +#: builtin/submodule--helper.c:665 #, c-format msgid "could not close file %s" msgstr "файлът „%s“ не може да се затвори" -#: builtin/submodule--helper.c:562 +#: builtin/submodule--helper.c:672 #, c-format msgid "could not get submodule directory for '%s'" msgstr "директорията на подмодула „%s“ не може да бъде получена" -#: builtin/submodule--helper.c:609 +#: builtin/submodule--helper.c:726 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Пътят на подмодула „%s“ не е инициализиран" -#: builtin/submodule--helper.c:613 +#: builtin/submodule--helper.c:730 msgid "Maybe you want to use 'update --init'?" msgstr "Вероятно искахте да използвате „update --init“?" -#: builtin/submodule--helper.c:639 +#: builtin/submodule--helper.c:756 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Прескачане на неслетия подмодул „%s“" -#: builtin/submodule--helper.c:660 +#: builtin/submodule--helper.c:777 #, c-format msgid "Skipping submodule '%s'" msgstr "Прескачане на подмодула „%s“" -#: builtin/submodule--helper.c:768 +#: builtin/submodule--helper.c:913 +#, c-format +msgid "Failed to clone '%s'. Retry scheduled" +msgstr "Неуспешен опит за клониране на „%s“. Насрочен е втори опит" + +#: builtin/submodule--helper.c:924 +#, c-format +msgid "Failed to clone '%s' a second time, aborting" +msgstr "Втори неуспешен опит за клониране на „%s“. Действието се отказва" + +#: builtin/submodule--helper.c:945 msgid "path into the working tree" msgstr "път към работното дърво" -#: builtin/submodule--helper.c:771 +#: builtin/submodule--helper.c:948 msgid "path into the working tree, across nested submodule boundaries" msgstr "път към работното дърво, през границите на вложените подмодули" -#: builtin/submodule--helper.c:775 +#: builtin/submodule--helper.c:952 msgid "rebase, merge, checkout or none" msgstr "" "„rebase“ (пребазиране), „merge“ (сливане), „checkout“ (изтегляне) или " "„none“ (нищо да не се прави)" -#: builtin/submodule--helper.c:779 +#: builtin/submodule--helper.c:956 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "Плитко клониране, ограничено до указания брой версии" -#: builtin/submodule--helper.c:782 +#: builtin/submodule--helper.c:959 msgid "parallel jobs" msgstr "брой паралелни процеси" -#: builtin/submodule--helper.c:783 +#: builtin/submodule--helper.c:961 +msgid "whether the initial clone should follow the shallow recommendation" +msgstr "дали първоначалното клониране да е плитко, както се препоръчва" + +#: builtin/submodule--helper.c:962 msgid "don't print cloning progress" msgstr "без извеждане на напредъка на клонирането" -#: builtin/submodule--helper.c:788 +#: builtin/submodule--helper.c:969 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update_clone [--prefix=ПЪТ] [ПЪТ…]" -#: builtin/submodule--helper.c:798 +#: builtin/submodule--helper.c:979 msgid "bad value for update parameter" msgstr "неправилен параметър към опцията „--update“" -#: builtin/submodule--helper.c:855 +#: builtin/submodule--helper.c:1050 +#, 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:1100 msgid "submodule--helper subcommand must be called with a subcommand" msgstr "„submodule--helper“ трябва да се стартира с подкоманда" -#: builtin/submodule--helper.c:862 +#: builtin/submodule--helper.c:1107 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "„%s“ не е подкоманда на „submodule--helper“" @@ -11686,7 +12996,6 @@ msgstr "неправилен вид обект." msgid "tag header too big." msgstr "заглавната част на етикета е прекалено дълга." -# FIXME - why the ? - either we need to specify or not or it is good to specify #: builtin/tag.c:275 msgid "no tag message?" msgstr "липсва съобщение за етикета" @@ -11784,7 +13093,6 @@ msgstr "Опцията „-points-at“ изисква опцията „-l“." msgid "--merged and --no-merged option are only allowed with -l" msgstr "Опциите „--merged“ и „--no-merged“ изискват опцията „-l“." -# FIXME message pattern #: builtin/tag.c:433 msgid "only one -F or -m option is allowed." msgstr "Опциите „-F“ и „-m“ са несъвместими." @@ -11808,7 +13116,7 @@ msgstr "етикетът „%s“ вече съществува" msgid "Updated tag '%s' (was %s)\n" msgstr "Обновен етикет „%s“ (бе „%s“)\n" -#: builtin/unpack-objects.c:490 +#: builtin/unpack-objects.c:493 msgid "Unpacking objects" msgstr "Разпакетиране на обектите" @@ -11882,158 +13190,165 @@ msgstr "" msgid " OK" msgstr " Добре" -#: builtin/update-index.c:575 +#: builtin/update-index.c:564 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [ОПЦИЯ…] [--] [ФАЙЛ…]" -#: builtin/update-index.c:930 +#: builtin/update-index.c:919 msgid "continue refresh even when index needs update" msgstr "" "продължаване с обновяването, дори когато индексът трябва да бъде обновен" -#: builtin/update-index.c:933 +#: builtin/update-index.c:922 msgid "refresh: ignore submodules" msgstr "подмодулите да се игнорират при обновяването" -#: builtin/update-index.c:936 +#: builtin/update-index.c:925 msgid "do not ignore new files" msgstr "новите файлове да не се игнорират" -#: builtin/update-index.c:938 +#: builtin/update-index.c:927 msgid "let files replace directories and vice-versa" msgstr "файлове да могат да заменят директории и обратно" -#: builtin/update-index.c:940 +#: builtin/update-index.c:929 msgid "notice files missing from worktree" msgstr "предупреждаване при липсващи в работното дърво файлове" -#: builtin/update-index.c:942 +#: builtin/update-index.c:931 msgid "refresh even if index contains unmerged entries" msgstr "обновяване дори и индексът да съдържа неслети обекти" -#: builtin/update-index.c:945 +#: builtin/update-index.c:934 msgid "refresh stat information" msgstr "обновяване на информацията от функцията „stat“" -#: builtin/update-index.c:949 +#: builtin/update-index.c:938 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "" "като опцията „--refresh“, но да се проверят и обектите, които са били приети " "за непроменени" -#: builtin/update-index.c:953 +#: builtin/update-index.c:942 msgid "<mode>,<object>,<path>" msgstr "РЕЖИМ,ОБЕКТ,ПЪТ" -#: builtin/update-index.c:954 +#: builtin/update-index.c:943 msgid "add the specified entry to the index" msgstr "добавяне на изброените обекти към индекса" -#: builtin/update-index.c:958 -msgid "(+/-)x" -msgstr "(+/-)x" - -#: builtin/update-index.c:959 -msgid "override the executable bit of the listed files" -msgstr "изрично задаване на стойността на флага дали файлът е изпълним" - -#: builtin/update-index.c:963 +#: builtin/update-index.c:952 msgid "mark files as \"not changing\"" msgstr "задаване на флаг, че файлът не се променя" -#: builtin/update-index.c:966 +#: builtin/update-index.c:955 msgid "clear assumed-unchanged bit" msgstr "изчистване на флага, че файлът не се променя" -#: builtin/update-index.c:969 +#: builtin/update-index.c:958 msgid "mark files as \"index-only\"" msgstr "задаване на флаг, че файловете са само за индекса" -#: builtin/update-index.c:972 +#: builtin/update-index.c:961 msgid "clear skip-worktree bit" msgstr "изчистване на флага, че файловете са само за индекса" -#: builtin/update-index.c:975 +#: builtin/update-index.c:964 msgid "add to index only; do not add content to object database" msgstr "добавяне само към индекса без добавяне към базата от данни за обектите" -#: builtin/update-index.c:977 +#: builtin/update-index.c:966 msgid "remove named paths even if present in worktree" msgstr "изтриване на указаните пътища, дори и да съществуват в работното дърво" -#: builtin/update-index.c:979 +#: builtin/update-index.c:968 msgid "with --stdin: input lines are terminated by null bytes" msgstr "" "при комбиниране с опцията „--stdin“ — входните редове са разделени с нулевия " "байт" -#: builtin/update-index.c:981 +#: builtin/update-index.c:970 msgid "read list of paths to be updated from standard input" msgstr "изчитане на списъка с пътища за обновяване от стандартния вход" -#: builtin/update-index.c:985 +#: builtin/update-index.c:974 msgid "add entries from standard input to the index" msgstr "добавяне на елементите от стандартния вход към индекса" -#: builtin/update-index.c:989 +#: builtin/update-index.c:978 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" "възстановяване на състоянието преди сливане или нужда от обновяване за " "изброените пътища" -#: builtin/update-index.c:993 +#: builtin/update-index.c:982 msgid "only update entries that differ from HEAD" msgstr "добавяне само на съдържанието, което се различава от това в „HEAD“" -#: builtin/update-index.c:997 +#: builtin/update-index.c:986 msgid "ignore files missing from worktree" msgstr "игнориране на файловете, които липсват в работното дърво" -#: builtin/update-index.c:1000 +#: builtin/update-index.c:989 msgid "report actions to standard output" msgstr "извеждане на действията на стандартния изход" -#: builtin/update-index.c:1002 +#: builtin/update-index.c:991 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" "забравяне на записаната информация за неразрешени конфликти — за командите " "от потребителско ниво" -#: builtin/update-index.c:1006 +#: builtin/update-index.c:995 msgid "write index in this format" msgstr "записване на индекса в този формат" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:997 msgid "enable or disable split index" msgstr "включване или изключване на разделянето на индекса" -#: builtin/update-index.c:1010 +#: builtin/update-index.c:999 msgid "enable/disable untracked cache" msgstr "включване/изключване на кеша за неследените файлове" -#: builtin/update-index.c:1012 +#: builtin/update-index.c:1001 msgid "test if the filesystem supports untracked cache" msgstr "проверка дали файловата система поддържа кеш за неследени файлове" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1003 msgid "enable untracked cache without testing the filesystem" msgstr "" "включване на кеша за неследените файлове без проверка на файловата система" -#: builtin/update-index.c:1134 +#: builtin/update-index.c:1119 +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:1123 msgid "Untracked cache disabled" msgstr "Кешът за неследените файлове е изключен" -#: builtin/update-index.c:1146 +#: builtin/update-index.c:1131 +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:1135 #, c-format msgid "Untracked cache enabled for '%s'" -msgstr "Кешът за неследените файлове е изключен за „%s“" +msgstr "Кешът за неследените файлове е включен за „%s“" #: builtin/update-ref.c:9 msgid "git update-ref [<options>] -d <refname> [<old-val>]" msgstr "git update-ref [ОПЦИЯ…] -d ИМЕ_НА_УКАЗАТЕЛ [СТАРА_СТОЙНОСТ]" -# FIXME spaces - not needed in original #: builtin/update-ref.c:10 msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" msgstr "git update-ref [ОПЦИЯ…] ИМЕ_НА_УКАЗАТЕЛ НОВА_СТОЙНОСТ [СТАРА_СТОЙНОСТ]" @@ -12105,85 +13420,112 @@ msgid "git worktree add [<options>] <path> [<branch>]" msgstr "git worktree add [ОПЦИЯ…] ПЪТ [КЛОН]" #: builtin/worktree.c:16 +msgid "git worktree list [<options>]" +msgstr "git worktree list [ОПЦИЯ…]" + +#: builtin/worktree.c:17 +msgid "git worktree lock [<options>] <path>" +msgstr "git worktree lock [ОПЦИЯ…] [ПЪТ]" + +#: builtin/worktree.c:18 msgid "git worktree prune [<options>]" msgstr "git worktree prune [ОПЦИЯ…]" -#: builtin/worktree.c:17 -msgid "git worktree list [<options>]" -msgstr "git worktree list [ОПЦИЯ…]" +#: builtin/worktree.c:19 +msgid "git worktree unlock <path>" +msgstr "git worktree unlock [ПЪТ]" -#: builtin/worktree.c:40 +#: builtin/worktree.c:42 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Изтриване на „worktrees/%s“: не е правилна поддиректория" -#: builtin/worktree.c:46 +#: builtin/worktree.c:48 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Изтриване на „worktrees/%s“: файлът „gitdir“ не съществува" -#: builtin/worktree.c:51 +#: builtin/worktree.c:53 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "" "Изтриване на „worktrees/%s“: файлът „gitdir“ (%s) не може да бъде прочетен" -#: builtin/worktree.c:62 +#: builtin/worktree.c:64 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Изтриване на „worktrees/%s“: неправилен файл „gitdir“" -#: builtin/worktree.c:78 +#: builtin/worktree.c:80 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "" "Изтриване на „worktrees/%s“: файлът „gitdir“ сочи несъществуващо " "местоположение" -#: builtin/worktree.c:113 -#, c-format -msgid "failed to remove '%s'" -msgstr "директорията „%s“ не може да бъде изтрита" - -#: builtin/worktree.c:202 +#: builtin/worktree.c:204 #, c-format msgid "'%s' already exists" msgstr "„%s“ вече съществува" -#: builtin/worktree.c:234 +#: builtin/worktree.c:236 #, c-format msgid "could not create directory of '%s'" msgstr "директорията „%s“ не може да бъде създадена" -#: builtin/worktree.c:270 +#: builtin/worktree.c:272 #, c-format msgid "Preparing %s (identifier %s)" msgstr "Подготвяне на %s (идентификатор %s)" -#: builtin/worktree.c:322 +#: builtin/worktree.c:323 msgid "checkout <branch> even if already checked out in other worktree" msgstr "Изтегляне КЛОНа, дори и да е изтеглен в друго работно дърво" -#: builtin/worktree.c:324 +#: builtin/worktree.c:325 msgid "create a new branch" msgstr "създаване на нов клон" -#: builtin/worktree.c:326 +#: builtin/worktree.c:327 msgid "create or reset a branch" msgstr "създаване или зануляване на клони" -#: builtin/worktree.c:327 -msgid "detach HEAD at named commit" -msgstr "отделяне на указателя „HEAD“ към указаното подаване" - -#: builtin/worktree.c:328 +#: builtin/worktree.c:329 msgid "populate the new working tree" msgstr "подготвяне на новото работно дърво" -#: builtin/worktree.c:336 +#: builtin/worktree.c:337 msgid "-b, -B, and --detach are mutually exclusive" msgstr "Опциите „-b“, „-B“ и „--detach“ са несъвместими една с друга" +#: builtin/worktree.c:470 +msgid "reason for locking" +msgstr "причина за заключване" + +#: builtin/worktree.c:482 builtin/worktree.c:515 +#, c-format +msgid "'%s' is not a working tree" +msgstr "„%s“ не е работно дърво" + +#: builtin/worktree.c:484 builtin/worktree.c:517 +msgid "The main working tree cannot be locked or unlocked" +msgstr "Основното дърво не може да се отключи или заключи" + +#: builtin/worktree.c:489 +#, c-format +msgid "'%s' is already locked, reason: %s" +msgstr "„%s“ вече е заключено, защото „%s“" + +#: builtin/worktree.c:491 +#, c-format +msgid "'%s' is already locked" +msgstr "„%s“ вече е заключено" + +#: builtin/worktree.c:519 +#, c-format +msgid "'%s' is not locked" +msgstr "„%s“ не е заключено" + #: builtin/write-tree.c:13 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "git write-tree [--missing-ok] [--prefix=ПРЕФИКС/]" @@ -12200,6 +13542,42 @@ msgstr "запис на обект-дърво за поддиректорият msgid "only useful for debugging" msgstr "само за изчистване на грешки" +#: upload-pack.c:22 +msgid "git upload-pack [<options>] <dir>" +msgstr "git upload-repack [ОПЦИЯ…] ДИРЕКТОРИЯ" + +#: upload-pack.c:1028 +msgid "quit after a single request/response exchange" +msgstr "изход след първоначалната размяна на заявка и отговор" + +#: upload-pack.c:1030 +msgid "exit immediately after initial ref advertisement" +msgstr "изход след първоначалната обява на указатели" + +#: upload-pack.c:1032 +msgid "do not try <directory>/.git/ if <directory> is no Git directory" +msgstr "" +"да не се търси „ДИРЕКТОРИЯ/.git/“, ако ДИРЕКТОРИЯта не е под контрола на Git" + +#: upload-pack.c:1034 +msgid "interrupt transfer after <n> seconds of inactivity" +msgstr "трансферът да се преустанови след този БРОЙ секунди" + +#: credential-cache--daemon.c:223 +#, 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 "" +"Правата за достъп до директорията за програмните гнезда са прекалено " +"свободни —\n" +"другите потребители могат да получат достъп до кешираните ви пароли. За да\n" +"коригирате това, изпълнете:\n" +"\n" +" chmod 0700 %s" + #: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "извеждане на съобщенията за трасиране на стандартната грешка" @@ -12212,11 +13590,15 @@ msgid "" msgstr "" "„git help -a“ извежда наличните подкоманди, а „git help -g“ извежда " "наличните\n" -"ръководства. За помощ за специфична КОМАНДА ползвайте „git help КОМАНДА“, а " +"ръководства. За помощ за специфична КОМАНДА ползвайте „git help КОМАНДА“, а " "за\n" "някое определено ПОНЯТИЕ използвайте „git help ПОНЯТИЕ“." -#: http.c:322 +#: http.c:342 +msgid "Delegation control is not supported with cURL < 7.22.0" +msgstr "Управлението на делегирането не се поддържа от cURL < 7.22.0" + +#: http.c:351 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "Задаването на постоянен публичен ключ не се поддържа от cURL < 7.44.0" @@ -12248,7 +13630,6 @@ msgstr "Добавяне на съдържанието на файла към и msgid "Use binary search to find the commit that introduced a bug" msgstr "Двоично търсене на промяната, която е причинила грешка" -# FIXME - should be similar to tag #: common-cmds.h:19 msgid "List, create, or delete branches" msgstr "Извеждане, създаване, изтриване на клони" @@ -12322,7 +13703,6 @@ msgstr "Извеждане на различните видове обекти msgid "Show the working tree status" msgstr "Извеждане на състоянието на работното дърво" -# FIXME - should be similar to branch #: common-cmds.h:37 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "Извеждане, създаване, изтриване, проверка на етикети подписани с GPG" @@ -12335,16 +13715,15 @@ msgstr "период на валидност/запазване" msgid "no-op (backward compatibility)" msgstr "нулева операция (за съвместимост с предишни версии)" -#: parse-options.h:237 +#: parse-options.h:238 msgid "be more verbose" msgstr "повече подробности" -#: parse-options.h:239 +#: parse-options.h:240 msgid "be more quiet" msgstr "по-малко подробности" -# FIXME SHA-1 -> SHA1 -#: parse-options.h:245 +#: parse-options.h:246 msgid "use <n> digits to display SHA-1s" msgstr "да се показват такъв БРОЙ цифри от сумите по SHA1" @@ -12354,63 +13733,63 @@ msgstr "" "при възможност преизползване на решението на конфликта за обновяване на " "индекса" -#: git-bisect.sh:55 +#: git-bisect.sh:54 msgid "You need to start by \"git bisect start\"" msgstr "Започнете като изпълните командата „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:61 +#: git-bisect.sh:60 msgid "Do you want me to do it for you [Y/n]? " msgstr "Да се извърши ли автоматично? „Y“ — ДА, „n“ — не" -#: git-bisect.sh:122 +#: git-bisect.sh:121 #, sh-format msgid "unrecognised option: '$arg'" msgstr "непозната опция „${arg}“" -#: git-bisect.sh:126 +#: git-bisect.sh:125 #, sh-format msgid "'$arg' does not appear to be a valid revision" msgstr "„$arg“ не изглежда като указател към версия" -# FIXME - I ??? the message does not convey what is actually wrong - that the "HEAD" points to sth that is unparsable -#: git-bisect.sh:155 +#: git-bisect.sh:154 msgid "Bad HEAD - I need a HEAD" msgstr "Текущият указател „HEAD“ е неправилен." -#: git-bisect.sh:168 +#: git-bisect.sh:167 #, sh-format msgid "" "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." msgstr "" -"Неуспешно преминаване към „${start_head}“. Изпълнете командата „git bisect " +"Неуспешно преминаване към „${start_head}“. Изпълнете командата „git bisect " "reset СЪЩЕСТВУВАЩ_КЛОН“." -#: git-bisect.sh:178 +#: git-bisect.sh:177 msgid "won't bisect on cg-seek'ed tree" msgstr "" "не може да се търси двоично, когато е изпълнена командата „cg-seek“ от " "„cogito“" -#: git-bisect.sh:182 +#: git-bisect.sh:181 msgid "Bad HEAD - strange symbolic ref" msgstr "Неправилен указател „HEAD“" -#: git-bisect.sh:234 +#: git-bisect.sh:233 #, sh-format msgid "Bad bisect_write argument: $state" msgstr "Неправилен аргумент на функцията „bisect_write“: „${state}“" -#: git-bisect.sh:263 +#: git-bisect.sh:262 #, sh-format msgid "Bad rev input: $arg" msgstr "Неправилна версия: „${arg}“" -#: git-bisect.sh:278 -msgid "Please call 'bisect_state' with at least one argument." -msgstr "Функцията „bisect_state“ изисква поне един аргумент." +#: git-bisect.sh:281 +#, sh-format +msgid "Bad rev input: $bisected_head" +msgstr "Неправилна версия: „$bisected_head“" #: git-bisect.sh:290 #, sh-format @@ -12440,7 +13819,7 @@ 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 "" -"Трябва да зададете поне една ${bad_syn} и една ${good_syn} версия. (Това " +"Трябва да зададете поне една ${bad_syn} и една ${good_syn} версия. (Това " "може да се\n" "направи съответно и чрез командите „git bisect ${bad_syn}“ и „git bisect " "${good_syn}“.)" @@ -12453,7 +13832,7 @@ msgid "" "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" msgstr "" "Трябва да започнете двоичното търсене чрез командата „git bisect start“.\n" -"трябва да зададете поне една добра и една лоша версия. (Това може да се\n" +"трябва да зададете поне една добра и една лоша версия. (Това може да се\n" "направи съответно и чрез командите „git bisect ${bad_syn}“ и „git bisect " "${good_syn}“.)" @@ -12473,7 +13852,7 @@ msgid "" "Try 'git bisect reset <commit>'." msgstr "" "Първоначално указаният клон „${branch}“ в указателя „HEAD“ не може да бъде\n" -"изтеглен. Пробвайте да изпълните командата „git bisect reset ПОДАВАНЕ“." +"изтеглен. Пробвайте да изпълните командата „git bisect reset ПОДАВАНЕ“." #: git-bisect.sh:458 msgid "No logfile given" @@ -12486,11 +13865,10 @@ msgstr "" "Журналният файл „${file}“ не може да бъде прочетен, за да се изпълнят " "командите от него наново" -# FIXME WTF #: git-bisect.sh:480 msgid "?? what are you talking about?" msgstr "" -"Непозната команда. Възможните варианти са: „start“, „good“, „bad“, „skip“" +"Непозната команда. Възможните варианти са: „start“, „good“, „bad“, „skip“" #: git-bisect.sh:492 #, sh-format @@ -12564,7 +13942,45 @@ msgstr "" "на „git bisect terms“ е подаден неправилен аргумент „${arg}“\n" "Поддържат се опциите „--term-good|--term-old“ и „--term-bad|--term-new“." -#: git-rebase.sh:57 +#: git-merge-octopus.sh:46 +msgid "" +"Error: Your local changes to the following files would be overwritten by " +"merge" +msgstr "Грешка: Сливането ще презапише локалните промени на тези файлове:" + +#: git-merge-octopus.sh:61 +msgid "Automated merge did not work." +msgstr "Автоматичното сливане не сработи." + +#: git-merge-octopus.sh:62 +msgid "Should not be doing an octopus." +msgstr "Не трябва да се прави множествено сливане." + +#: git-merge-octopus.sh:73 +#, sh-format +msgid "Unable to find common commit with $pretty_name" +msgstr "Не може да се открие общо подаване с „$pretty_name“" + +#: git-merge-octopus.sh:77 +#, sh-format +msgid "Already up-to-date with $pretty_name" +msgstr "Вече е обновено до „$pretty_name“" + +#: git-merge-octopus.sh:89 +#, sh-format +msgid "Fast-forwarding to: $pretty_name" +msgstr "Тривиално сливане до „$pretty_name“" + +#: git-merge-octopus.sh:97 +#, sh-format +msgid "Trying simple merge with $pretty_name" +msgstr "Опит за просто сливане с „$pretty_name“" + +#: git-merge-octopus.sh:102 +msgid "Simple merge did not work, trying automatic merge." +msgstr "Простото сливане не сработи, пробва се автоматично сливане." + +#: git-rebase.sh:56 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" @@ -12576,62 +13992,62 @@ msgstr "" "За да откажете пребазирането и да се върнете към първоначалното състояние,\n" "изпълнете „git rebase --abort“." -#: git-rebase.sh:168 +#: git-rebase.sh:156 git-rebase.sh:395 +#, sh-format +msgid "Could not move back to $head_name" +msgstr "Връщането към „${head_name}“ е невъзможно" + +#: git-rebase.sh:167 msgid "Applied autostash." msgstr "Автоматично скатаното е приложено." -#: git-rebase.sh:171 +#: git-rebase.sh:170 #, sh-format msgid "Cannot store $stash_sha1" msgstr "„${stash_sha1}“ не може да бъде запазен" -#: git-rebase.sh:172 +#: git-rebase.sh:171 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 "" -"Прилагането на автоматично скатаното доведе до конфликти. Промените ви са\n" -"надеждно скатани. Можете да пробвате да ги приложите чрез „git stash pop“\n" +"Прилагането на автоматично скатаното доведе до конфликти. Промените ви са\n" +"надеждно скатани. Можете да пробвате да ги приложите чрез „git stash pop“\n" "или да ги изхвърлите чрез „git stash drop“, когато поискате.\n" -#: git-rebase.sh:211 +#: git-rebase.sh:210 msgid "The pre-rebase hook refused to rebase." msgstr "Куката за изпълнение преди пребазиране отхвърли пребазирането." -#: git-rebase.sh:216 +#: git-rebase.sh:215 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "" -"Изглежда, че сега се прилагат кръпки чрез командата „git-am“. Не може да " +"Изглежда, че сега се прилагат кръпки чрез командата „git-am“. Не може да " "пребазирате в момента." -#: git-rebase.sh:357 +#: git-rebase.sh:356 msgid "No rebase in progress?" msgstr "Изглежда в момента не тече пребазиране" -#: git-rebase.sh:368 +#: git-rebase.sh:367 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "Опцията „--edit-todo“ е достъпна само по време на интерактивно пребазиране." -#: git-rebase.sh:375 +#: git-rebase.sh:374 msgid "Cannot read HEAD" msgstr "Указателят „HEAD“ не може да бъде прочетен" -#: git-rebase.sh:378 +#: git-rebase.sh:377 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:396 -#, sh-format -msgid "Could not move back to $head_name" -msgstr "Връщането към „${head_name}“ е невъзможно" - -#: git-rebase.sh:415 +#: git-rebase.sh:414 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -12643,110 +14059,115 @@ msgid "" "and run me again. I am stopping in case you still have something\n" "valuable there." msgstr "" -"Вече съществува директория „${state_dir_base}“. Възможно ли е да сте\n" +"Вече съществува директория „${state_dir_base}“. Възможно ли е да сте\n" "в процес на друго пребазиране? Ако това е така, изпълнете:\n" " ${cmd_live_rebase}\n" "Ако не сте в процес на друго пребазиране, изпълнете:\n" " ${cmd_clear_stale_rebase}\n" -"и отново започнете пребазирането. Текущото пребазиране се преустановява, за\n" +"и отново започнете пребазирането. Текущото пребазиране се преустановява, " +"за\n" "да не загубите случайно промени." -#: git-rebase.sh:466 +#: git-rebase.sh:465 #, sh-format msgid "invalid upstream $upstream_name" msgstr "неправилна основа за сравнение „${upstream_name}“" -#: git-rebase.sh:490 +#: git-rebase.sh:489 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "" "указателят „${onto_name}“ може да сочи към повече от една основа за " "пребазирането" -#: git-rebase.sh:493 git-rebase.sh:497 +#: git-rebase.sh:492 git-rebase.sh:496 #, sh-format msgid "$onto_name: there is no merge base" msgstr "указателят „${onto_name}“ не сочи към никаква основа за пребазирането" -#: git-rebase.sh:502 +#: git-rebase.sh:501 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "Указателят „${onto_name}“ не сочи към подаване" -#: git-rebase.sh:525 +#: git-rebase.sh:524 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "ФАТАЛНА ГРЕШКА: не съществува клон „${branch_name}“" -#: git-rebase.sh:558 +#: git-rebase.sh:557 msgid "Cannot autostash" msgstr "Не може да се скатае автоматично" -#: git-rebase.sh:563 +#: git-rebase.sh:562 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Автоматично скатано: „${stash_abbrev}“" -#: git-rebase.sh:567 +#: git-rebase.sh:566 msgid "Please commit or stash them." msgstr "Промените трябва или да се подадат, или да се скатаят." -#: git-rebase.sh:587 +#: git-rebase.sh:586 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "Текущият клон „${branch_name}“ е напълно актуален." -#: git-rebase.sh:591 +#: git-rebase.sh:590 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "" -"Текущият клон „${branch_name}“ е напълно актуален. Пребазирането е " +"Текущият клон „${branch_name}“ е напълно актуален. Пребазирането е " "принудително." -#: git-rebase.sh:602 +#: git-rebase.sh:601 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Промените от „${mb}“ към „${onto}“:" -#: git-rebase.sh:611 +#: git-rebase.sh:610 msgid "First, rewinding head to replay your work on top of it..." msgstr "" "Първо, указателят „HEAD“ започва да сочи към базата, върху която пребазирате…" -#: git-rebase.sh:621 +#: git-rebase.sh:620 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "Тривиално сливане на „${branch_name}“ върху „${onto_name}“." -#: git-stash.sh:51 +#: git-stash.sh:50 msgid "git stash clear with parameters is unimplemented" msgstr "Командата „git stash clear“ не поддържа аргументи" -#: git-stash.sh:74 +#: git-stash.sh:73 msgid "You do not have the initial commit yet" msgstr "Все още липсва първоначално подаване" -#: git-stash.sh:89 +#: git-stash.sh:88 msgid "Cannot save the current index state" msgstr "Състоянието на текущия индекс не може да бъде запазено" -#: git-stash.sh:124 git-stash.sh:137 +#: git-stash.sh:103 +msgid "Cannot save the untracked files" +msgstr "Неследените файлове не могат да се запазят" + +#: git-stash.sh:123 git-stash.sh:136 msgid "Cannot save the current worktree state" msgstr "Състоянието на работното дърво не може да бъде запазено" -#: git-stash.sh:141 +#: git-stash.sh:140 msgid "No changes selected" msgstr "Не са избрани никакви промени" -#: git-stash.sh:144 +#: git-stash.sh:143 msgid "Cannot remove temporary index (can't happen)" msgstr "Временният индекс не може да бъде изтрит" -#: git-stash.sh:157 +#: git-stash.sh:156 msgid "Cannot record working tree state" msgstr "Състоянието на работното дърво не може да бъде запазено" -#: git-stash.sh:189 +#: git-stash.sh:188 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "" @@ -12762,7 +14183,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:239 +#: git-stash.sh:238 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" @@ -12771,115 +14192,132 @@ msgstr "" "грешка: командата „git stash save“ не поддържа опция „${option}“\n" " За да зададете съобщение, изпълнете „git stash save -- '${option}'“" -#: git-stash.sh:260 +#: git-stash.sh:251 +msgid "Can't use --patch and --include-untracked or --all at the same time" +msgstr "Опциията „--patch“ е несъвместима с „--include-untracked“ и „--all“" + +#: git-stash.sh:259 msgid "No local changes to save" msgstr "Няма никакви локални промени за скатаване" -#: git-stash.sh:264 +#: git-stash.sh:263 msgid "Cannot initialize stash" msgstr "Скатаването не може да стартира" -#: git-stash.sh:268 +#: git-stash.sh:267 msgid "Cannot save the current status" msgstr "Текущото състояние не може да бъде запазено" -#: git-stash.sh:286 +#: git-stash.sh:268 +#, sh-format +msgid "Saved working directory and index state $stash_msg" +msgstr "" +"Състоянието на работната директория и индекса са запазени: „$stash_msg“" + +#: git-stash.sh:285 msgid "Cannot remove worktree changes" msgstr "Промените в работното дърво не могат да бъдат занулени" -#: git-stash.sh:405 +#: git-stash.sh:403 #, sh-format msgid "unknown option: $opt" msgstr "непозната опция: ${opt}" -#: git-stash.sh:415 +#: git-stash.sh:416 msgid "No stash found." msgstr "Не е открито нищо скатано." -#: git-stash.sh:422 +#: git-stash.sh:423 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Указани са прекалено много версии: „${REV}“" -#: git-stash.sh:428 +#: git-stash.sh:438 #, sh-format msgid "$reference is not a valid reference" msgstr "Указателят „${reference}“ е грешен" -#: git-stash.sh:456 +#: git-stash.sh:466 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "„${args}“ не е подаване, приличащо на нещо скатано" -#: git-stash.sh:467 +#: git-stash.sh:477 #, sh-format msgid "'$args' is not a stash reference" msgstr "„${args}“ не е указател към нещо скатано" -#: git-stash.sh:475 +#: git-stash.sh:485 msgid "unable to refresh index" msgstr "индексът не може да бъде обновен" -#: git-stash.sh:479 +#: git-stash.sh:489 msgid "Cannot apply a stash in the middle of a merge" msgstr "По време на сливане не може да приложите нещо скатано" -#: git-stash.sh:487 +#: git-stash.sh:497 msgid "Conflicts in index. Try without --index." msgstr "" -"В индекса има конфликти. Пробвайте да изпълните командата без опцията „--" +"В индекса има конфликти. Пробвайте да изпълните командата без опцията „--" "index“." -#: git-stash.sh:489 +#: git-stash.sh:499 msgid "Could not save index tree" msgstr "Дървото сочено от индекса не може да бъде запазено" -#: git-stash.sh:523 +#: git-stash.sh:508 +msgid "Could not restore untracked files from stash" +msgstr "Неследени файлове не могат да се възстановят от индекса" + +#: git-stash.sh:533 msgid "Cannot unstage modified files" msgstr "Променените файлове не могат да бъдат извадени от индекса" -#: git-stash.sh:538 +#: git-stash.sh:548 msgid "Index was not unstashed." msgstr "Индексът не е скатан." -#: git-stash.sh:561 +#: git-stash.sh:562 +msgid "The stash is kept in case you need it again." +msgstr "Скатаното е запазено в случай, че ви потрябва отново" + +#: git-stash.sh:571 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Изтрито е скатаното „${REV}“ ($s)" -#: git-stash.sh:562 +#: git-stash.sh:572 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "Скатаното „${REV}“ не може да бъде изтрито" -#: git-stash.sh:570 +#: git-stash.sh:580 msgid "No branch name specified" msgstr "Не е указано име на клон" -#: git-stash.sh:642 +#: git-stash.sh:652 msgid "(To restore them type \"git stash apply\")" msgstr "(За да ги възстановите, изпълнете командата „git stash apply“)" -#: git-submodule.sh:219 +#: git-submodule.sh:184 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" "Относителен път може да се ползва само от основната директория на работното " "дърво" -# FIXME - what is this regex? -#: git-submodule.sh:229 +#: git-submodule.sh:194 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "" "адрес на хранилище: „${repo}“ трябва или да е абсолютен, или да започва с " "„./“ или „../“" -#: git-submodule.sh:246 +#: git-submodule.sh:211 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "„${sm_path}“ вече съществува в индекса" -#: git-submodule.sh:250 +#: git-submodule.sh:215 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -12890,245 +14328,244 @@ msgstr "" "${sm_path}\n" "Използвайте опцията „-f“, ако за да го добавите наистина." -#: git-submodule.sh:268 +#: git-submodule.sh:233 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "Добавяне на съществуващото хранилище в „${sm_path}“ към индекса" -#: git-submodule.sh:270 +#: git-submodule.sh:235 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "„${sm_path}“ съществува, а не е хранилище на Git" -#: git-submodule.sh:278 +#: git-submodule.sh:243 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" "Открита е локална директория на Git — „${sm_name}“, която сочи към " "отдалечените хранилища:" -#: git-submodule.sh:280 -#, sh-format -msgid "" -"If you want to reuse this local git directory instead of cloning again from" -msgstr "" -"Ако искате да преизползвате тази локална директория на Git вместо да отново " -"да клонирате:" - -#: git-submodule.sh:282 -#, sh-format -msgid "" -"use the '--force' option. If the local git directory is not the correct repo" -msgstr "" -"използвайте опцията „--force“. Ако локалната директория не сочи към " -"правилното отдалечено хранилище" - -#: git-submodule.sh:283 +#: git-submodule.sh:245 #, 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 "" -"или не сте сигурни какво означава всичко това, просто задайте друго име като " -"аргумент на опцията „--name“." +"Ако искате да преизползвате тази директория на git, вместо да клонирате " +"отново\n" +" $realrepo\n" +"използвайте опцията „--force“. Ако локалната директория на git не е за\n" +"правилното хранилище или ако не знаете какво означава това, използвайте\n" +"друго име като аргумент към опцията „--name“." -# FIXME активиране - какво всъщност става -#: git-submodule.sh:285 +#: git-submodule.sh:251 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "Активиране на локалното хранилище за подмодула „${sm_name}“ наново." -#: git-submodule.sh:297 +#: git-submodule.sh:263 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Подмодулът „${sm_path}“ не може да бъде изтеглен" -#: git-submodule.sh:302 +#: git-submodule.sh:268 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Неуспешно добавяне на подмодула „${sm_path}“" -#: git-submodule.sh:311 +#: git-submodule.sh:277 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Неуспешно регистриране на подмодула „${sm_path}“" -#: git-submodule.sh:355 +#: git-submodule.sh:324 #, sh-format msgid "Entering '$displaypath'" msgstr "Влизане в „${displaypath}“" -#: git-submodule.sh:375 +#: git-submodule.sh:344 #, sh-format msgid "Stopping at '$displaypath'; script returned non-zero status." msgstr "" "Спиране при „${displaypath}“ — изходният код от скрипта бе различен от 0." -#: git-submodule.sh:448 +#: git-submodule.sh:415 #, sh-format msgid "pathspec and --all are incompatible" msgstr "указването на път е несъвместимо с опцията „--all“" -#: git-submodule.sh:453 +#: git-submodule.sh:420 #, sh-format msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "Използвайте „--all“, за да премахнете всички подмодули" -#: git-submodule.sh:470 -#, sh-format -msgid "Submodule work tree '$displaypath' contains a .git directory" -msgstr "" -"Пътят към подмодул „${displaypath}“ в работното дърво съдържа директория „." -"git“" - -#: git-submodule.sh:471 +#: git-submodule.sh:440 #, 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 "" -"(използвайте командата „rm -rf“, за да го изтриете заедно с цялата му " -"история)" +"Работното дърво на подмодул „${displaypath}“ съдържа директория „.git“.\n" +"(ако искате да ги изтриете заедно с цялата им история, използвайте „rm -rf“)" -#: git-submodule.sh:477 +#: git-submodule.sh:448 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " "discard them" msgstr "" -"Пътят към подмодул „${displaypath}“ в работното дърво съдържа локални " -"промени. Можете да ги пренебрегнете и отмените с опцията „-f“" +"Работното дърво на подмодул „${displaypath}“ съдържа локални промени. " +"Можете да ги пренебрегнете и отмените с опцията „-f“" -#: git-submodule.sh:480 +#: git-submodule.sh:451 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "Директорията „${displaypath}“ е изчистена" -#: git-submodule.sh:481 +#: git-submodule.sh:452 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "" "Директорията към работното дърво на подмодула „${displaypath}“ не може да " "бъде изтрита" -#: git-submodule.sh:484 +#: git-submodule.sh:455 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "" "Празната директория за подмодула „${displaypath}“ не може да бъде създадена" -#: git-submodule.sh:493 +#: git-submodule.sh:464 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" "Премахната е регистрацията на подмодул „${name}“, сочещ към адрес „${url}“, " "за пътя „${displaypath}“" -#: git-submodule.sh:635 +#: git-submodule.sh:617 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "Текущата версия за подмодула в „${displaypath}“ липсва" -#: git-submodule.sh:644 +#: git-submodule.sh:627 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Неуспешно доставяне в пътя към подмодул „${sm_path}“" -#: git-submodule.sh:667 +#: git-submodule.sh:632 +#, 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:650 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "Неуспешно доставяне в пътя към подмодул „${displaypath}“" -#: git-submodule.sh:680 +#: git-submodule.sh:656 +#, sh-format +msgid "" +"Fetched in submodule path '$displaypath', but it did not contain $sha1. " +"Direct fetching of that commit failed." +msgstr "" +"Подмодулът в пътя „$displaypath“ е достанен, но не съдържа обекта със сума\n" +"„$sha1“. Директното доставяне на това подаване е неуспешно." + +#: git-submodule.sh:663 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" "Неуспешно изтегляне на версия „${sha1}“ в пътя към подмодул „${displaypath}“'" -#: git-submodule.sh:681 +#: git-submodule.sh:664 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Път към подмодул „${displaypath}“: изтеглена е версия „${sha1}“" -#: git-submodule.sh:685 +#: git-submodule.sh:668 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" "Неуспешно пребазиране на версия „${sha1}“ в пътя към подмодул " "„${displaypath}“" -#: git-submodule.sh:686 +#: git-submodule.sh:669 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Път към подмодул „${displaypath}“: пребазиране върху версия „${sha1}“" -#: git-submodule.sh:691 +#: git-submodule.sh:674 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" "Неуспешно сливане на версия „${sha1}“ в пътя към подмодул „${displaypath}“" -#: git-submodule.sh:692 +#: git-submodule.sh:675 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Път към подмодул „${displaypath}“: сливане с версия „${sha1}“" -#: git-submodule.sh:697 +#: git-submodule.sh:680 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "Неуспешно изпълнение на командата „${command} ${sha1}“ в пътя към подмодул " "„${displaypath}“" -#: git-submodule.sh:698 +#: git-submodule.sh:681 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Път към подмодул „${displaypath}“: „${command} ${sha1}“" -#: git-submodule.sh:729 +#: git-submodule.sh:712 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "" "Неуспешна обработка на поддиректориите в пътя към подмодул „${displaypath}“" -#: git-submodule.sh:837 +#: git-submodule.sh:820 msgid "The --cached option cannot be used with the --files option" msgstr "Опциите „--cached“ и „--files“ са несъвместими" -#: git-submodule.sh:889 +#: git-submodule.sh:872 #, sh-format msgid "unexpected mode $mod_dst" msgstr "неочакван режим „${mod_dst}“" -#: git-submodule.sh:909 +#: git-submodule.sh:892 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr "" " ПРЕДУПРЕЖДЕНИЕ: „${display_name}“ не съдържа подаването „${sha1_src}“" -#: git-submodule.sh:912 +#: git-submodule.sh:895 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr "" " ПРЕДУПРЕЖДЕНИЕ: „${display_name}“ не съдържа подаването „${sha1_dst}“" -#: git-submodule.sh:915 +#: git-submodule.sh:898 #, 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:940 -msgid "blob" -msgstr "обект BLOB" - -#: git-submodule.sh:1059 +#: git-submodule.sh:1045 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "" "Неуспешна обработка на поддиректориите в пътя към подмодул „${sm_path}“" -#: git-submodule.sh:1123 +#: git-submodule.sh:1112 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Синхронизиране на адреса за пътя към подмодул „${displaypath}“" @@ -13137,3 +14574,488 @@ msgstr "Синхронизиране на адреса за пътя към по #, sh-format msgid "See git-${cmd}(1) for details." msgstr "За повече информация погледнете ръководството на „git-${cmd}(1)“" + +#: git-rebase--interactive.sh:140 +#, sh-format +msgid "Rebasing ($new_count/$total)" +msgstr "Пребазиране ($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" +"Команди:\n" +" p, pick — прилагане на подаването\n" +" r, reword — прилагане на подаването, но смяна на съобщението му\n" +" e, edit — прилагане на подаването и спиране при него за още промени\n" +" s, squash — сливане на подаването към предходното му\n" +" f, fixup — сливане на подаването към предходното му, без смяна на " +"съобщението\n" +" x, exec — изпълнение на команда към обвивката: останалата част на реда\n" +" d, drop — прескачане на подаването\n" +"\n" +"Може да променяте последователността на редовете — те се изпълняват\n" +"последователно отгоре-надолу.\n" + +#: git-rebase--interactive.sh:171 +msgid "" +"\n" +"Do not remove any line. Use 'drop' explicitly to remove a commit.\n" +msgstr "" +"\n" +"Не изтривайте редове. Подаванията могат да се прескачат с командата " +"„drop“.\n" + +#: git-rebase--interactive.sh:175 +msgid "" +"\n" +"If you remove a line here THAT COMMIT WILL BE LOST.\n" +msgstr "" +"\n" +"Ако изтриете ред, съответстващото му подаване ще бъде ИЗТРИТО.\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 "" +"Може да промените подаването с командата:\n" +"\n" +" git commit --amend $gpg_sign_opt_quoted\n" +"\n" +"След като привършите, продължете с командата:\n" +"\n" +" git rebase --continue" + +#: git-rebase--interactive.sh:236 +#, sh-format +msgid "$sha1: not a commit that can be picked" +msgstr "$sha1: това не е подаване, което може да бъде отбрано" + +#: git-rebase--interactive.sh:275 +#, sh-format +msgid "Invalid commit name: $sha1" +msgstr "Неправилно име на подаване: „$sha1“" + +#: git-rebase--interactive.sh:317 +msgid "Cannot write current commit's replacement sha1" +msgstr "" +"Заместващата сума по SHA1 за текущото подаване не може да бъде запазена" + +#: git-rebase--interactive.sh:369 +#, sh-format +msgid "Fast-forward to $sha1" +msgstr "Тривиално сливане до „$sha1“" + +#: git-rebase--interactive.sh:371 +#, sh-format +msgid "Cannot fast-forward to $sha1" +msgstr "Не може да се слее тривиално до „$sha1“" + +#: git-rebase--interactive.sh:380 +#, sh-format +msgid "Cannot move HEAD to $first_parent" +msgstr "Указателят „HEAD“ не може да се насочи към „$first_parent“" + +#: git-rebase--interactive.sh:385 +#, sh-format +msgid "Refusing to squash a merge: $sha1" +msgstr "Подаването не може да се смачка: „$sha1“" + +#: git-rebase--interactive.sh:399 +#, sh-format +msgid "Error redoing merge $sha1" +msgstr "Грешка при повтарянето на сливането на „$sha1“" + +# FIXME Could not open %s. - full stop for consistence with next message +#: git-rebase--interactive.sh:407 +#, sh-format +msgid "Could not pick $sha1" +msgstr "„$sha1“ не може да се отбере." + +#: git-rebase--interactive.sh:416 +#, sh-format +msgid "This is the commit message #${n}:" +msgstr "Това е съобщение при подаване №${n}:" + +#: git-rebase--interactive.sh:421 +#, sh-format +msgid "The commit message #${n} will be skipped:" +msgstr "Съобщение при подаване №${n} ще бъде прескочено." + +#: git-rebase--interactive.sh:432 +#, 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:440 +#, sh-format +msgid "Cannot write $fixup_msg" +msgstr "Новото съобщение при подаване „$fixup_msg“ не може да бъде запазено" + +#: git-rebase--interactive.sh:443 +msgid "This is a combination of 2 commits." +msgstr "Това е обединение от 2 подавания" + +#: git-rebase--interactive.sh:444 +msgid "This is the 1st commit message:" +msgstr "Това е 1-то съобщение при подаване:" + +#: git-rebase--interactive.sh:484 git-rebase--interactive.sh:527 +#: git-rebase--interactive.sh:530 +#, sh-format +msgid "Could not apply $sha1... $rest" +msgstr "Не може да се подаде $sha1… $rest" + +#: git-rebase--interactive.sh:558 +#, 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 "" +"Подаването не може за де промени след успешното отбиране на „$sha1…“ $rest.\n" +"Най-вероятните причини са празно съобщение при подаване или неуспешно " +"изпълнение\n" +"на куката преди подаване. Ако имате проблем с куката, ще трябва да го " +"коригирате,\n" +"преди да можете да промените подаването." + +#: git-rebase--interactive.sh:573 +#, sh-format +msgid "Stopped at $sha1_abbrev... $rest" +msgstr "Спиране при „$sha1_abbrev…“ $rest" + +#: git-rebase--interactive.sh:588 +#, sh-format +msgid "Cannot '$squash_style' without a previous commit" +msgstr "Без предишно подаване не може да се изпълни „$squash_style“" + +#: git-rebase--interactive.sh:630 +#, sh-format +msgid "Executing: $rest" +msgstr "В момента се изпълнява: $rest" + +#: git-rebase--interactive.sh:638 +#, sh-format +msgid "Execution failed: $rest" +msgstr "Неуспешно изпълнение: $rest" + +#: git-rebase--interactive.sh:640 +msgid "and made changes to the index and/or the working tree" +msgstr "и промени индекса и/или работното дърво" + +#: git-rebase--interactive.sh:642 +msgid "" +"You can fix the problem, and then run\n" +"\n" +"\tgit rebase --continue" +msgstr "" +"Може да коригирате проблема, след което изпълнете:\n" +"\n" +" git rebase --continue" + +#. TRANSLATORS: after these lines is a command to be issued by the user +#: git-rebase--interactive.sh:655 +#, 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 "" +"Успешно изпълнение: $rest\n" +"Остават още промени в индекса или работното дърво.\n" +"Трябва да ги подадете или скатаете и след това изпълнете:\n" +"\n" +"\tgit rebase --continue" + +#: git-rebase--interactive.sh:666 +#, sh-format +msgid "Unknown command: $command $sha1 $rest" +msgstr "Непозната команда: $command $sha1 $rest" + +#: git-rebase--interactive.sh:667 +msgid "Please fix this using 'git rebase --edit-todo'." +msgstr "Коригирайте това чрез „git rebase --edit-todo“." + +#: git-rebase--interactive.sh:702 +#, sh-format +msgid "Successfully rebased and updated $head_name." +msgstr "Успешно пребазиране и обновяване на „$head_name“." + +#: git-rebase--interactive.sh:749 +msgid "Could not skip unnecessary pick commands" +msgstr "Излишните команди да отбиране не могат да бъдат прескочени" + +#: git-rebase--interactive.sh:907 +#, 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:940 +#, sh-format +msgid "" +"Warning: the command isn't recognized in the following line:\n" +" - $line" +msgstr "" +"Предупреждение: непозната команда на ред:\n" +" - $line" + +#: git-rebase--interactive.sh:979 +msgid "could not detach HEAD" +msgstr "указателят „HEAD“ не може да се отдели" + +#: git-rebase--interactive.sh:1017 +msgid "" +"Warning: some commits may have been dropped accidentally.\n" +"Dropped commits (newer to older):" +msgstr "" +"Предупреждение: някои подавания може да са пропуснати.\n" +"\n" +"Пропуснати подавания (новите са най-отгоре):" + +#: git-rebase--interactive.sh:1025 +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:1036 +#, sh-format +msgid "" +"Unrecognized setting $check_level for option rebase.missingCommitsCheck. " +"Ignoring." +msgstr "" +"Непозната стойност „$check_level“ за настройката „rebase." +"missingCommitsCheck“.\n" +"Настройката се прескача." + +#: git-rebase--interactive.sh:1053 +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:1054 +msgid "Or you can abort the rebase with 'git rebase --abort'." +msgstr "" +"Може и да преустановите пребазирането с командата „git rebase --abort“." + +#: git-rebase--interactive.sh:1078 +msgid "Could not remove CHERRY_PICK_HEAD" +msgstr "Указателят „CHERRY_PICK_HEAD“ не може да бъде изтрит" + +#: git-rebase--interactive.sh:1083 +#, 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 "" +"В индекса има промени. Ако искате да ги прибавите към\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:1100 +msgid "Error trying to find the author identity to amend commit" +msgstr "Не може да бъде открит автор за поправянето на подаването" + +#: git-rebase--interactive.sh:1105 +msgid "" +"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“." + +#: git-rebase--interactive.sh:1110 git-rebase--interactive.sh:1114 +msgid "Could not commit staged changes." +msgstr "Промените в индекса не могат да бъдат подадени." + +#: git-rebase--interactive.sh:1138 +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" +"В момента редактирате командния файл на текущото интерактивно пребазиране.\n" +"За да продължите пребазирането след това, изпълнете:\n" +" git rebase --continue\n" +"\n" + +#: git-rebase--interactive.sh:1146 git-rebase--interactive.sh:1304 +msgid "Could not execute editor" +msgstr "Текстовият редактор не може да бъде стартиран" + +#: git-rebase--interactive.sh:1159 +#, sh-format +msgid "Could not checkout $switch_to" +msgstr "„$switch_to“ не може да се изтегли" + +#: git-rebase--interactive.sh:1164 +msgid "No HEAD?" +msgstr "Липсва указател „HEAD“" + +#: git-rebase--interactive.sh:1165 +#, sh-format +msgid "Could not create temporary $state_dir" +msgstr "Временната директория „$state_dir“ не може да бъде създадена" + +#: git-rebase--interactive.sh:1167 +msgid "Could not mark as interactive" +msgstr "Пребазирането не е интерактивно" + +#: git-rebase--interactive.sh:1177 git-rebase--interactive.sh:1182 +msgid "Could not init rewritten commits" +msgstr "Списъкът с презаписаните подавания не може да бъде създаден" + +#: git-rebase--interactive.sh:1282 +#, sh-format +msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" +msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" +msgstr[0] "" +"Пребазиране на $shortrevisions върху $shortonto ($todocount команда)" +msgstr[1] "" +"Пребазиране на $shortrevisions върху $shortonto ($todocount команди)" + +#: git-rebase--interactive.sh:1287 +msgid "" +"\n" +"However, if you remove everything, the rebase will be aborted.\n" +"\n" +msgstr "" +"\n" +"Ако изтриете всичко, пребазирането ще бъде преустановено.\n" +"\n" + +#: git-rebase--interactive.sh:1294 +msgid "Note that empty commits are commented out" +msgstr "Празните подавания са коментирани" + +#: git-sh-setup.sh:89 git-sh-setup.sh:94 +#, sh-format +msgid "usage: $dashless $USAGE" +msgstr "Употреба: $dashless $USAGE" + +#: git-sh-setup.sh:190 +#, sh-format +msgid "Cannot chdir to $cdup, the toplevel of the working tree" +msgstr "" +"Не може да се премине към „$cdup“ — основната директория на работното дърво." + +#: git-sh-setup.sh:199 git-sh-setup.sh:206 +#, sh-format +msgid "fatal: $program_name cannot be used without a working tree." +msgstr "" +"ФАТАЛНА ГРЕШКА: „$program_name“ не може да се ползва без работно дърво." + +#: git-sh-setup.sh:220 +msgid "Cannot rebase: You have unstaged changes." +msgstr "Не може да пребазирате, защото има промени, които не са в индекса." + +#: git-sh-setup.sh:223 +msgid "Cannot rewrite branches: You have unstaged changes." +msgstr "" +"Не може да презапишете клоните, защото има промени, които не са в индекса." + +#: git-sh-setup.sh:226 +msgid "Cannot pull with rebase: You have unstaged changes." +msgstr "" +"Не можете да издърпвате при това пребазиране, защото има промени, които не " +"са в индекса." + +#: git-sh-setup.sh:229 +#, sh-format +msgid "Cannot $action: You have unstaged changes." +msgstr "" +"Не можете да изпълните „$action“, защото има промени, които не са в индекса." + +#: git-sh-setup.sh:242 +msgid "Cannot rebase: Your index contains uncommitted changes." +msgstr "Не може да пребазирате, защото в индекса има неподадени промени." + +#: git-sh-setup.sh:245 +msgid "Cannot pull with rebase: Your index contains uncommitted changes." +msgstr "" +"Не можете да издърпвате при това пребазиране, защото в индекса има " +"неподадени промени." + +#: git-sh-setup.sh:248 +#, sh-format +msgid "Cannot $action: Your index contains uncommitted changes." +msgstr "" +"Не можете да изпълните „$action“, защото в индекса има неподадени промени." + +#: git-sh-setup.sh:252 +msgid "Additionally, your index contains uncommitted changes." +msgstr "Освен това в индекса има неподадени промени." + +#: git-sh-setup.sh:372 +msgid "You need to run this command from the toplevel of the working tree." +msgstr "" +"Тази команда трябва да се изпълни от основната директория на работното дърво" + +#: git-sh-setup.sh:377 +msgid "Unable to determine absolute path of git directory" +msgstr "Абсолютният път на работното дърво не може да се определи" @@ -1,22 +1,44 @@ # Catalan translations for Git. # Copyright (C) 2014 Alex Henrie <alexhenrie24@gmail.com> # This file is distributed under the same license as the Git package. -# Alex Henrie <alexhenrie24@gmail.com>, 2014. +# Alex Henrie <alexhenrie24@gmail.com>, 2014-2016. +# Jordi Mas i Hernàndez <jmas@softcatala.org>, 2016-2017 +# +# Terminologia +# +# broken -> malmès +# deprecated -> en desús +# hunk -> tros +# skip -> ometre +# token -> testimoni +# +# Alguns termes que són comandes específiques del git i d'àmbit molt tècnic +# hem decidit no traduir-los per facilitar-ne la compressió a l'usuari i perquè +# no tenen una transcendència al gran públic. Es tracta de casos similars +# a «ping» en l'àmbit de xarxes. +# +# Termes que mantenim en anglès: +# +# blame -> «blame» +# cherry pick -> «cherry pick» +# rebase -> «rebase» +# stage -> «stage» +# unstage -> «unstage» # msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2016-11-25 22:50+0800\n" -"PO-Revision-Date: 2016-11-28 20:03-0700\n" -"Last-Translator: Alex Henrie <alexhenrie24@gmail.com>\n" +"POT-Creation-Date: 2017-02-04 13:02+0800\n" +"PO-Revision-Date: 2017-02-16 19:55+0100\n" +"Last-Translator: Jordi Mas <jmas@softcatala.org>\n" "Language-Team: Catalan\n" "Language: ca\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.11\n" +"X-Generator: Poedit 1.8.9\n" #: advice.c:55 #, c-format @@ -25,7 +47,7 @@ msgstr "pista: %.*s\n" #: advice.c:83 msgid "Cherry-picking is not possible because you have unmerged files." -msgstr "Recollir cireres no és possible perquè teniu fitxers no fusionats." +msgstr "Fer «cherry pick» no és possible perquè teniu fitxers no fusionats." #: advice.c:85 msgid "Committing is not possible because you have unmerged files." @@ -37,7 +59,7 @@ msgstr "Fusionar no és possible perquè teniu fitxers no fusionats." #: advice.c:89 msgid "Pulling is not possible because you have unmerged files." -msgstr "Baixar no es possible perquè teniu fitxers no fusionats." +msgstr "Baixar no és possible perquè teniu fitxers no fusionats." #: advice.c:91 msgid "Reverting is not possible because you have unmerged files." @@ -46,7 +68,7 @@ msgstr "Revertir no és possible perquè teniu fitxers no fusionats." #: advice.c:93 #, c-format msgid "It is not possible to %s because you have unmerged files." -msgstr "No es possible %s perquè teniu fitxers no fusionats." +msgstr "No és possible %s perquè teniu fitxers no fusionats." #: advice.c:101 msgid "" @@ -61,7 +83,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "S'està sortint a causa d'un conflicte no resolt." -#: advice.c:114 builtin/merge.c:1181 +#: advice.c:114 builtin/merge.c:1206 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "No heu conclòs la vostra fusió (MERGE_HEAD existeix)." @@ -91,7 +113,7 @@ msgstr "" "Avís: s'està agafant '%s'.\n" "\n" "Esteu en un estat de 'HEAD separat'. Podeu mirar al voltant, fer canvis\n" -"experimentals i cometre-los i podeu descartar qualsevulla comissió que feu\n" +"experimentals i cometre-los i podeu descartar qualsevol comissió que feu\n" "en aquest estat sense impactar cap branca realitzant un altre agafament.\n" "\n" "Si voleu crear una branca nova per a conservar les comissions que creeu,\n" @@ -108,7 +130,7 @@ msgstr "opció d'espai en blanc '%s' no reconeguda" #: apply.c:73 #, c-format msgid "unrecognized whitespace ignore option '%s'" -msgstr "opció d'ignoral d'espai en blanc '%s' no reconeguda" +msgstr "opció d'ignora l'espai en blanc '%s' no reconeguda" #: apply.c:125 msgid "--reject and --3way cannot be used together." @@ -310,7 +332,7 @@ msgstr "el pedaç s'aplica a un '%s' buit però no és buit" #: apply.c:3180 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" -msgstr "no es pot llegir la postimatge necessari %s per a '%s'" +msgstr "no es pot llegir la postimatge %s necessària per a '%s'" #: apply.c:3193 #, c-format @@ -336,7 +358,7 @@ msgstr "no es pot agafar %s" #: apply.c:3390 apply.c:3401 apply.c:3447 setup.c:248 #, c-format msgid "failed to read %s" -msgstr "s'ha fallat en llegir %s" +msgstr "s'ha produït un error en llegir %s" #: apply.c:3398 #, c-format @@ -376,7 +398,7 @@ msgstr "no es poden llegir els continguts actuals de '%s'" #: apply.c:3589 #, c-format msgid "Failed to fall back on three-way merge...\n" -msgstr "S'ha fallat en retrocedir a una fusió de 3 vies...\n" +msgstr "S'ha produït un error en retrocedir a una fusió de 3 vies...\n" #: apply.c:3603 #, c-format @@ -465,7 +487,7 @@ msgstr "make_cache_entry ha fallat per al camí '%s'" #: apply.c:4094 #, c-format msgid "could not add %s to temporary index" -msgstr "no s'ha pogut afegir %s a l'index temporal" +msgstr "no s'ha pogut afegir %s a l'índex temporal" #: apply.c:4104 #, c-format @@ -502,7 +524,7 @@ msgstr "no s'ha pogut afegir una entrada de cau per a %s" #: apply.c:4338 #, c-format msgid "failed to write to '%s'" -msgstr "s'ha fallat en escriure a '%s'" +msgstr "no s'ha pogut escriure a '%s'" #: apply.c:4342 #, c-format @@ -528,14 +550,14 @@ msgstr "error intern" msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "S'està aplicant el pedaç %%s amb %d rebuig..." -msgstr[1] "S'està aplicant el pedaç %%s amb %d rebuitjos..." +msgstr[1] "S'està aplicant el pedaç %%s amb %d rebutjos..." #: apply.c:4532 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "s'està truncant el nom del fitxer .rej a %.*s.rej" -#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989 +#: apply.c:4540 builtin/fetch.c:737 builtin/fetch.c:986 #, c-format msgid "cannot open %s" msgstr "no es pot obrir %s" @@ -553,7 +575,7 @@ msgstr "S'ha rebutjat el tros #%d." #: apply.c:4668 #, c-format msgid "Skipped patch '%s'." -msgstr "S'ha saltat el pedaç '%s'." +msgstr "S'ha omès el pedaç '%s'." #: apply.c:4676 msgid "unrecognized input" @@ -587,19 +609,20 @@ msgstr[1] "%d línies afegeixen errors d'espai en blanc." msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "" -"S'ha aplicat %d línia desprès d'arreglar els errors d'espai en blanc." +"S'ha aplicat %d línia després d'arreglar els errors d'espai en blanc." msgstr[1] "" -"S'han aplicat %d línies desprès d'arreglar els errors d'espai en blanc." +"S'han aplicat %d línies després d'arreglar els errors d'espai en blanc." -#: apply.c:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431 +#: apply.c:4888 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391 msgid "Unable to write new index file" msgstr "no s'ha pogut escriure un fitxer d'índex nou" #: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280 #: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180 -#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:407 -#: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592 -#: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947 +#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:591 +#: builtin/submodule--helper.c:594 builtin/submodule--helper.c:960 +#: builtin/submodule--helper.c:963 builtin/submodule--helper.c:1104 +#: git-add--interactive.perl:239 msgid "path" msgstr "camí" @@ -697,15 +720,15 @@ msgstr "no esperis almenys una línia de context" #: apply.c:4971 msgid "leave the rejected hunks in corresponding *.rej files" -msgstr "deixa els trossos rebutjats en fitxers *.reg corresponents" +msgstr "deixa els trossos rebutjats en fitxers *.rej corresponents" #: apply.c:4973 msgid "allow overlapping hunks" msgstr "permet trossos encavalcants" #: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19 -#: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593 -#: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114 +#: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651 +#: builtin/log.c:1860 builtin/mv.c:122 builtin/read-tree.c:114 msgid "be verbose" msgstr "sigues detallat" @@ -744,7 +767,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <dipòsit> [--exec <ordre>] --list" -#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327 +#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300 #, c-format msgid "pathspec '%s' did not match any files" msgstr "l'especificació de camí '%s' no ha coincidit amb cap fitxer" @@ -765,8 +788,8 @@ msgstr "prefix" msgid "prepend prefix to each pathname in the archive" msgstr "anteposa el prefix a cada nom de camí en l'arxiu" -#: archive.c:432 builtin/blame.c:2603 builtin/blame.c:2604 builtin/config.c:59 -#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:723 +#: archive.c:432 builtin/blame.c:2607 builtin/blame.c:2608 builtin/config.c:59 +#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1054 #: builtin/hash-object.c:101 builtin/ls-files.c:539 builtin/ls-files.c:542 #: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109 #: parse-options.h:153 @@ -799,10 +822,10 @@ msgstr "comprimeix millor" #: archive.c:449 msgid "list supported archive formats" -msgstr "allista els formats d'arxiu admesos" +msgstr "llista els formats d'arxiu admesos" #: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88 -#: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953 +#: builtin/submodule--helper.c:603 builtin/submodule--helper.c:969 msgid "repo" msgstr "dipòsit" @@ -856,7 +879,7 @@ msgstr "No s'ha pogut obrir el fitxer '%s'" #: bisect.c:446 #, c-format msgid "Badly quoted content in file '%s': %s" -msgstr "Comentari amb cometes dolentes en el fitxer '%s': %s" +msgstr "Comentari amb cometes errònies en el fitxer '%s': %s" #: bisect.c:655 #, c-format @@ -874,7 +897,7 @@ msgid "" "The merge base %s is bad.\n" "This means the bug has been fixed between %s and [%s].\n" msgstr "" -"La base de fusió %s és dolenta.\n" +"La base de fusió %s és errònia.\n" "Això vol dir que el defecte s'ha arreglat entre %s i [%s].\n" #: bisect.c:737 @@ -898,11 +921,11 @@ msgstr "" #: bisect.c:750 #, c-format msgid "" -"Some %s revs are not ancestor of the %s rev.\n" +"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 "" -"Unes revisions %s no són els avantpassats de la revisió %s.\n" +"Algunes revisions %s no són els avantpassats de la revisió %s.\n" "git bisect no pot funcionar correctament en aquest cas.\n" "Potser heu confós les revisions %s i %s?\n" @@ -913,7 +936,7 @@ msgid "" "So we cannot be sure the first %s commit is between %s and %s.\n" "We continue anyway." msgstr "" -"s'ha de saltar la base de fusió entre %s i [%s].\n" +"s'ha d'ometre la base de fusió entre %s i [%s].\n" "Llavors, no podem estar segurs de que la primera comissió %s sigui entre %s " "i %s.\n" "Continuem de totes maneres." @@ -928,7 +951,7 @@ msgstr "Bisecant: s'ha de provar una base de fusió\n" msgid "a %s revision is needed" msgstr "es necessita una revisió %s" -#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248 +#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:262 #, c-format msgid "could not create file '%s'" msgstr "no s'ha pogut crear el fitxer '%s'" @@ -953,7 +976,7 @@ msgid "" "No testable commit found.\n" "Maybe you started with bad path parameters?\n" msgstr "" -"No s'ha trobat cap comissió provable.\n" +"No s'ha trobat cap comissió probable.\n" "Potser heu començat amb paràmetres de camí dolents?\n" #: bisect.c:994 @@ -1128,7 +1151,7 @@ msgstr "'%s' no sembla un fitxer de farcell v2" msgid "unrecognized header: %s%s (%d)" msgstr "capçalera no reconeguda: %s%s (%d)" -#: bundle.c:87 sequencer.c:963 builtin/commit.c:777 +#: bundle.c:87 sequencer.c:1331 sequencer.c:1752 builtin/commit.c:777 #, c-format msgid "could not open '%s'" msgstr "no s'ha pogut obrir '%s'" @@ -1137,10 +1160,10 @@ msgstr "no s'ha pogut obrir '%s'" msgid "Repository lacks these prerequisite commits:" msgstr "Al dipòsit li manquen aquestes comissions prerequisits:" -#: bundle.c:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374 -#: builtin/blame.c:2814 builtin/commit.c:1061 builtin/log.c:348 +#: bundle.c:163 ref-filter.c:1499 sequencer.c:1154 sequencer.c:2290 +#: builtin/blame.c:2820 builtin/commit.c:1061 builtin/log.c:348 #: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909 -#: builtin/merge.c:356 builtin/shortlog.c:170 +#: builtin/merge.c:360 builtin/shortlog.c:177 msgid "revision walk setup failed" msgstr "la configuració del passeig per revisions ha fallat" @@ -1179,7 +1202,7 @@ msgstr "El rev-list s'ha mort" msgid "ref '%s' is excluded by the rev-list options" msgstr "les opcions de la llista de revisions exclouen la referència '%s'" -#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273 +#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:282 #, c-format msgid "unrecognized argument: %s" msgstr "paràmetre no reconegut: %s" @@ -1197,13 +1220,13 @@ msgstr "no es pot crear '%s'" msgid "index-pack died" msgstr "L'index-pack s'ha mort" -#: color.c:290 +#: color.c:300 #, c-format msgid "invalid color value: %.*s" msgstr "valor de color no vàlid: %.*s" -#: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493 -#: builtin/am.c:2127 +#: commit.c:40 sequencer.c:1564 builtin/am.c:421 builtin/am.c:457 +#: builtin/am.c:1493 builtin/am.c:2127 #, c-format msgid "could not parse %s" msgstr "no s'ha pogut analitzar %s" @@ -1219,8 +1242,8 @@ msgid "" "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 "" -"Advertència: el missatge de comissió no conformava a UTF-8.\n" -"Potser voleu esemenar-lo després de corregir el missatge, o establir\n" +"Advertència: el missatge de comissió no és compatible amb UTF-8.\n" +"Potser voleu esmenar-lo després de corregir el missatge, o establir\n" "la variable de configuració i18n.commitencoding a la codificació que\n" "usi el vostre projecte.\n" @@ -1228,128 +1251,138 @@ msgstr "" msgid "memory exhausted" msgstr "memòria esgotada" -#: config.c:516 +#: config.c:518 #, c-format msgid "bad config line %d in blob %s" -msgstr "línia de configuració dolenta %d en el blob %s" +msgstr "línia de configuració %d errònia en el blob %s" -#: config.c:520 +#: config.c:522 #, c-format msgid "bad config line %d in file %s" -msgstr "línia de configuració dolenta %d en el fitxer %s" +msgstr "línia de configuració %d errònia en el fitxer %s" -#: config.c:524 +#: config.c:526 #, c-format msgid "bad config line %d in standard input" -msgstr "línia de configuració dolenta %d en l'entrada estàndard" +msgstr "línia de configuració %d errònia en l'entrada estàndard" -#: config.c:528 +#: config.c:530 #, c-format msgid "bad config line %d in submodule-blob %s" -msgstr "línia de configuració dolenta %d en el blob de submòdul %s" +msgstr "línia de configuració %d errònia en el blob de submòdul %s" -#: config.c:532 +#: config.c:534 #, c-format msgid "bad config line %d in command line %s" -msgstr "línia de configuració dolenta %d en la línia d'ordres %s" +msgstr "línia de configuració %d errònia en la línia d'ordres %s" -#: config.c:536 +#: config.c:538 #, c-format msgid "bad config line %d in %s" -msgstr "línia de configuració dolenta %d en %s" +msgstr "línia de configuració %d errònia en %s" -#: config.c:655 +#: config.c:657 msgid "out of range" msgstr "fora de rang" -#: config.c:655 +#: config.c:657 msgid "invalid unit" msgstr "unitat no vàlida" -#: config.c:661 +#: config.c:663 #, c-format msgid "bad numeric config value '%s' for '%s': %s" -msgstr "valor de configuració numèric dolent '%s' per '%s': %s" +msgstr "valor de configuració numèric erroni '%s' per '%s': %s" -#: config.c:666 +#: config.c:668 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" -msgstr "valor de configuració numèric dolent '%s' per '%s' en el blob %s: %s" +msgstr "valor de configuració numèric erroni '%s' per '%s' en el blob %s: %s" -#: config.c:669 +#: config.c:671 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" -msgstr "valor de configuració numèric dolent '%s' per '%s' en el fitxer %s: %s" +msgstr "valor de configuració numèric '%s' erroni per '%s' en el fitxer %s: %s" -#: config.c:672 +#: config.c:674 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" -"valor de configuració numèric dolent '%s' per '%s' en l'entrada estàndard: %s" +"valor de configuració numèric '%s' erroni per '%s' en l'entrada estàndard: %s" -#: config.c:675 +#: config.c:677 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" -"valor de configuració numèric dolent '%s' per '%s' en el blob de submòdul " +"valor de configuració numèric '%s' erroni' per '%s' en el blob de submòdul " "%s: %s" -#: config.c:678 +#: config.c:680 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" -"valor de configuració numèric dolent '%s' per '%s' en la línia d'ordres %s: " +"valor de configuració numèric '%s' erroni per '%s' en la línia d'ordres %s: " "%s" -#: config.c:681 +#: config.c:683 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "valor de configuració numèric dolent '%s' per '%s' en %s: %s" -#: config.c:768 +#: config.c:770 #, c-format msgid "failed to expand user dir in: '%s'" -msgstr "s'ha fallat en expandir el directori d'usuari en: '%s'" +msgstr "s'ha produït un error en expandir el directori d'usuari en: '%s'" -#: config.c:852 config.c:863 +#: config.c:865 config.c:876 #, c-format msgid "bad zlib compression level %d" msgstr "nivell de compressió de zlib dolent %d" -#: config.c:978 +#: config.c:993 #, c-format msgid "invalid mode for object creation: %s" msgstr "mode de creació d'objecte no vàlid: %s" -#: config.c:1312 +#: config.c:1149 +#, c-format +msgid "bad pack compression level %d" +msgstr "nivell de compressió de paquet %d Erroni" + +#: config.c:1339 msgid "unable to parse command-line config" msgstr "no s'ha pogut analitzar la configuració de la línia d'ordres" -#: config.c:1362 +#: config.c:1389 msgid "unknown error occurred while reading the configuration files" msgstr "un error desconegut ha ocorregut en llegir els fitxers de configuració" -#: config.c:1716 +#: config.c:1743 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "no s'ha pogut analitzar '%s' de la configuració de la línia d'ordres" -#: config.c:1718 +#: config.c:1745 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" -msgstr "variable de configuració dolenta '%s' en el fitxer '%s' a la línia %d" +msgstr "variable de configuració '%s' errònia en el fitxer '%s' a la línia %d" -#: config.c:1777 +#: config.c:1804 #, c-format msgid "%s has multiple values" msgstr "%s té múltiples valors" -#: config.c:2311 +#: config.c:2225 config.c:2450 +#, c-format +msgid "fstat on %s failed" +msgstr "ha fallat fstat a %s" + +#: config.c:2343 #, c-format msgid "could not set '%s' to '%s'" msgstr "no s'ha pogut establir '%s' a '%s'" -#: config.c:2313 +#: config.c:2345 #, c-format msgid "could not unset '%s'" msgstr "no s'ha pogut desestablir '%s'" @@ -1367,10 +1400,10 @@ msgid "" msgstr "" "No s'ha pogut llegir del dipòsit remot.\n" "\n" -"Si us plau, assegureu-vos que tingueu els drets\n" +"Si us plau, assegureu-vos que tingueu els permissos\n" "d'accés correctes i que el dipòsit existeixi." -#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140 +#: connected.c:63 builtin/fsck.c:190 builtin/prune.c:140 msgid "Checking connectivity" msgstr "S'està comprovant la connectivitat" @@ -1384,7 +1417,7 @@ msgstr "escriptura fallada al rev-list" #: connected.c:102 msgid "failed to close rev-list's stdin" -msgstr "s'ha fallat en tancar l'stdin del rev-list" +msgstr "s'ha produït un error en tancar l'stdin del rev-list" #: convert.c:201 #, c-format @@ -1487,7 +1520,7 @@ msgstr[1] "fa %lu anys" #: diffcore-order.c:24 #, c-format msgid "failed to read orderfile '%s'" -msgstr "s'ha fallat en llegir el fitxer d'ordres '%s'" +msgstr "s'ha produït un error en llegir el fitxer d'ordres '%s'" #: diffcore-rename.c:536 msgid "Performing inexact rename detection" @@ -1501,20 +1534,22 @@ msgstr "l'opció '%s' requereix un valor" #: diff.c:124 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" -msgstr " S'ha fallat en analitzar el percentatge limitant de dirstat '%s'\n" +msgstr "" +" S'ha produït un error en analitzar el percentatge limitant de dirstat " +"'%s'\n" #: diff.c:129 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Paràmetre de dirstat desconegut '%s'\n" -#: diff.c:283 +#: diff.c:281 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" "Valor desconegut de la variable de configuració de 'diff.submodule': '%s'" -#: diff.c:346 +#: diff.c:344 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -1523,43 +1558,44 @@ msgstr "" "S'han trobat errors en la variable de configuració 'diff.dirstat':\n" "%s" -#: diff.c:3087 +#: diff.c:3085 #, c-format msgid "external diff died, stopping at %s" msgstr "el diff external s'ha mort, s'està aturant a %s" -#: diff.c:3412 +#: diff.c:3411 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check i -s són mutualment exclusius" -#: diff.c:3502 +#: diff.c:3501 msgid "--follow requires exactly one pathspec" msgstr "--follow requereix exactament una especificació de camí" -#: diff.c:3665 +#: diff.c:3664 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -"S'ha fallat en analitzar el paràmetre d'opció de --dirstat/-X:\n" +"S'ha produït un error en analitzar el paràmetre d'opció de --dirstat/-X:\n" "%s" -#: diff.c:3679 +#: diff.c:3678 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" -msgstr "S'ha fallat en analitzar el paràmetre d'opció de --submodule: '%s'" +msgstr "" +"S'ha produït un error en analitzar el paràmetre d'opció de --submodule: '%s'" -#: diff.c:4700 +#: diff.c:4695 msgid "inexact rename detection was skipped due to too many files." -msgstr "s'ha saltat la detecció de canvi de nom a causa de massa fitxers." +msgstr "s'ha omès la detecció de canvi de nom a causa de massa fitxers." -#: diff.c:4703 +#: diff.c:4698 msgid "only found copies from modified paths due to too many files." msgstr "" "només s'han trobat còpies des de camins modificats a causa de massa fitxers." -#: diff.c:4706 +#: diff.c:4701 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -1567,15 +1603,20 @@ msgstr "" "potser voleu establir la vostra variable %s a almenys %d i tornar a intentar " "l'ordre." -#: dir.c:1866 +#: dir.c:1863 msgid "failed to get kernel name and information" -msgstr "s'ha fallat en obtenir el nombre i la informació del nucli" +msgstr "s'ha produït un error en obtenir el nombre i la informació del nucli" -#: dir.c:1985 +#: dir.c:1982 msgid "Untracked cache is disabled on this system or location." msgstr "" "La memòria cau no seguida està inhabilitada en aquest sistema o ubicació." +#: dir.c:2760 +#, c-format +msgid "could not migrate git directory from '%s' to '%s'" +msgstr "no s'ha pogut migrar el directori de '%s' a '%s'" + #: fetch-pack.c:213 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: llista superficial esperada" @@ -1616,7 +1657,7 @@ msgstr "error en objecte: %s" #: fetch-pack.c:394 #, c-format msgid "no shallow found: %s" -msgstr "no s'ha trobat cap superficial: %s" +msgstr "no s'ha trobat cap shallow: %s" #: fetch-pack.c:397 #, c-format @@ -1662,7 +1703,7 @@ msgstr "fetch-pack: no s'ha pogut bifurcar del demultiplexor de banda lateral" #: fetch-pack.c:743 msgid "protocol error: bad pack header" -msgstr "error de protocol: capçalera de paquet dolent" +msgstr "error de protocol: capçalera de paquet errònia" #: fetch-pack.c:799 #, c-format @@ -1754,50 +1795,55 @@ msgstr "no s'ha pogut crear el fitxer temporal" #: gpg-interface.c:217 #, c-format msgid "failed writing detached signature to '%s'" -msgstr "s'ha fallat en escriure la signatura separada a '%s'" +msgstr "s'ha produït un error en escriure la signatura separada a '%s'" -#: grep.c:1782 +#: graph.c:96 +#, c-format +msgid "ignore invalid color '%.*s' in log.graphColors" +msgstr "ignora el color invàlid '%.*s' en log.graphColors" + +#: grep.c:1794 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': no s'ha pogut llegir %s" -#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155 +#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:133 #, c-format msgid "failed to stat '%s'" -msgstr "s'ha fallat en fer stat a '%s'" +msgstr "s'ha produït un error en fer stat a '%s'" -#: grep.c:1810 +#: grep.c:1822 #, c-format msgid "'%s': short read" msgstr "'%s': lectura curta" -#: help.c:203 +#: help.c:218 #, c-format msgid "available git commands in '%s'" msgstr "ordres de git disponibles en '%s'" -#: help.c:210 +#: help.c:225 msgid "git commands available from elsewhere on your $PATH" msgstr "ordres de git disponibles d'altres llocs en el vostre $PATH" -#: help.c:241 +#: help.c:256 msgid "These are common Git commands used in various situations:" msgstr "Aquestes són ordres del Git comunament usades en diverses situacions:" -#: help.c:306 +#: help.c:321 #, 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' sembla una ordre de git, però no hem pogut\n" -"executar-la. Pot ser que git-%s estigui estropejat?" +"executar-la. Pot ser que git-%s estigui malmès?" -#: help.c:361 +#: help.c:376 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Ai. El vostre sistema no informa de cap ordre de Git." -#: help.c:383 +#: help.c:398 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" @@ -1807,17 +1853,17 @@ msgstr "" "existeix.\n" "S'està continuant sota l'assumpció que volíeu dir '%s'" -#: help.c:388 +#: help.c:403 #, c-format msgid "in %0.1f seconds automatically..." msgstr "en %0.1f segons automàticament..." -#: help.c:395 +#: help.c:410 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: '%s' no és una ordre de git. Vegeu 'git --help'." -#: help.c:399 help.c:465 +#: help.c:414 help.c:480 msgid "" "\n" "Did you mean this?" @@ -1831,7 +1877,7 @@ msgstr[1] "" "\n" "Volíeu dir un d'aquests?" -#: help.c:461 +#: help.c:476 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" @@ -1855,10 +1901,10 @@ msgstr "" "\n" "Executeu\n" "\n" -" git config --global user.email \"vós@example.com\"\n" -" git config --global user.name \"El Vostre Nom\"\n" +" git config --global user.email \"usuari@domini.com\"\n" +" git config --global user.name \"El vostre nom\"\n" "\n" -"per a establir la identitat predeterminat del vostre compte.\n" +"per a establir la identitat predeterminada del vostre compte.\n" "Ometeu --global per a establir la identitat només en aquest dipòsit.\n" #: lockfile.c:152 @@ -1877,7 +1923,7 @@ msgstr "" "Sembla que un altre procés de git s'està executant en aquest\n" "dipòsit, per exemple, un editor obert per 'git commit'. Si us\n" "plau, assegureu-vos que tots els processos s'hagin terminat i\n" -"llavors trobeu de nou. Si encara falla, potser que un procés de\n" +"llavors proveu de nou. Si encara falla, pot ser que un procés de\n" "git ha tingut una pana:\n" "elimineu el fitxer manualment per a continuar." @@ -1888,7 +1934,7 @@ msgstr "No s'ha pogut crear '%s.lock': %s" #: merge.c:41 msgid "failed to read the cache" -msgstr "s'ha fallat en llegir la memòria cau" +msgstr "s'ha produït un error en llegir la memòria cau" #: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374 #: builtin/checkout.c:588 builtin/clone.c:731 @@ -1897,71 +1943,71 @@ msgstr "no s'ha pogut escriure un fitxer d'índex nou" #: merge-recursive.c:209 msgid "(bad commit)\n" -msgstr "(comissió dolenta)\n" +msgstr "(comissió errònia)\n" -#: merge-recursive.c:231 +#: merge-recursive.c:231 merge-recursive.c:239 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "addinfo_cache ha fallat per al camí '%s'" -#: merge-recursive.c:301 +#: merge-recursive.c:303 msgid "error building trees" msgstr "error en construir arbres" -#: merge-recursive.c:720 +#: merge-recursive.c:727 #, c-format msgid "failed to create path '%s'%s" -msgstr "s'ha fallat en crear el camí '%s'%s" +msgstr "s'ha produït un error en crear el camí '%s'%s" -#: merge-recursive.c:731 +#: merge-recursive.c:738 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "S'està eliminant %s per a fer espai per al subdirectori\n" -#: merge-recursive.c:745 merge-recursive.c:764 +#: merge-recursive.c:752 merge-recursive.c:771 msgid ": perhaps a D/F conflict?" msgstr ": potser un conflicte D/F?" -#: merge-recursive.c:754 +#: merge-recursive.c:761 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "s'està refusant perdre el fitxer no seguit a '%s'" -#: merge-recursive.c:796 builtin/cat-file.c:34 +#: merge-recursive.c:803 builtin/cat-file.c:34 #, c-format msgid "cannot read object %s '%s'" msgstr "no es pot llegir l'objecte %s '%s'" -#: merge-recursive.c:798 +#: merge-recursive.c:805 #, c-format msgid "blob expected for %s '%s'" msgstr "blob esperat per a %s '%s'" -#: merge-recursive.c:822 +#: merge-recursive.c:829 #, c-format msgid "failed to open '%s': %s" -msgstr "s'ha fallat en obrir '%s': %s" +msgstr "s'ha produït un error en obrir '%s': %s" -#: merge-recursive.c:833 +#: merge-recursive.c:840 #, c-format msgid "failed to symlink '%s': %s" -msgstr "s'ha fallat en fer l'enllaç simbòlic '%s': %s" +msgstr "s'ha produït un error en fer l'enllaç simbòlic '%s': %s" -#: merge-recursive.c:838 +#: merge-recursive.c:845 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "no se sap què fer amb %06o %s '%s'" -#: merge-recursive.c:978 +#: merge-recursive.c:985 msgid "Failed to execute internal merge" -msgstr "S'ha fallat en executar la fusió interna" +msgstr "S'ha produït un error en executar la fusió interna" -#: merge-recursive.c:982 +#: merge-recursive.c:989 #, c-format msgid "Unable to add %s to database" msgstr "no s'ha pogut afegir %s a la base de dades" -#: merge-recursive.c:1081 merge-recursive.c:1095 +#: merge-recursive.c:1088 merge-recursive.c:1102 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -1970,7 +2016,7 @@ msgstr "" "CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s " "s'ha deixat en l'arbre." -#: merge-recursive.c:1087 merge-recursive.c:1100 +#: merge-recursive.c:1094 merge-recursive.c:1107 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -1979,20 +2025,20 @@ msgstr "" "CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s " "s'ha deixat en l'arbre a %s." -#: merge-recursive.c:1143 +#: merge-recursive.c:1150 msgid "rename" msgstr "canvi de nom" -#: merge-recursive.c:1143 +#: merge-recursive.c:1150 msgid "renamed" msgstr "canviat de nom" -#: merge-recursive.c:1200 +#: merge-recursive.c:1207 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s és un directori en %s; s'està afegint com a %s en lloc d'això" -#: merge-recursive.c:1225 +#: merge-recursive.c:1232 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -2001,139 +2047,139 @@ msgstr "" "CONFLICTE (canvi de nom/canvi de nom): Canvi de nom \"%s\"->\"%s\" en la " "branca \"%s\" canvi de nom \"%s\"->\"%s\" en \"%s\"%s" -#: merge-recursive.c:1230 +#: merge-recursive.c:1237 msgid " (left unresolved)" msgstr " (deixat sense resolució)" -#: merge-recursive.c:1292 +#: merge-recursive.c:1299 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "CONFLICTE (canvi de nom/canvi de nom): Canvi de nom %s->%s en %s. Canvi de " "nom %s->%s en %s" -#: merge-recursive.c:1325 +#: merge-recursive.c:1332 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "S'està canviant el nom de %s a %s i %s a %s en lloc d'això" -#: merge-recursive.c:1531 +#: merge-recursive.c:1538 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" "CONFLICTE (canvi de nom/afegiment): Canvi de nom %s->%s en %s. %s afegit en " "%s" -#: merge-recursive.c:1546 +#: merge-recursive.c:1553 #, c-format msgid "Adding merged %s" msgstr "S'està afegint %s fusionat" -#: merge-recursive.c:1553 merge-recursive.c:1766 +#: merge-recursive.c:1560 merge-recursive.c:1774 #, c-format msgid "Adding as %s instead" msgstr "S'està afegint com a %s en lloc d'això" -#: merge-recursive.c:1610 +#: merge-recursive.c:1617 #, c-format msgid "cannot read object %s" msgstr "no es pot llegir l'objecte %s" -#: merge-recursive.c:1613 +#: merge-recursive.c:1620 #, c-format msgid "object %s is not a blob" msgstr "l'objecte %s no és un blob" -#: merge-recursive.c:1666 +#: merge-recursive.c:1673 msgid "modify" msgstr "modificació" -#: merge-recursive.c:1666 +#: merge-recursive.c:1673 msgid "modified" msgstr "modificat" -#: merge-recursive.c:1676 +#: merge-recursive.c:1683 msgid "content" msgstr "contingut" -#: merge-recursive.c:1683 +#: merge-recursive.c:1690 msgid "add/add" msgstr "afegiment/afegiment" -#: merge-recursive.c:1718 +#: merge-recursive.c:1726 #, c-format msgid "Skipped %s (merged same as existing)" -msgstr "S'ha saltat %s (el fusionat és igual a l'existent)" +msgstr "S'ha omès %s (el fusionat és igual a l'existent)" -#: merge-recursive.c:1732 +#: merge-recursive.c:1740 #, c-format msgid "Auto-merging %s" msgstr "S'està autofusionant %s" -#: merge-recursive.c:1736 git-submodule.sh:924 +#: merge-recursive.c:1744 git-submodule.sh:930 msgid "submodule" msgstr "submòdul" -#: merge-recursive.c:1737 +#: merge-recursive.c:1745 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLICTE (%s): Conflicte de fusió en %s" -#: merge-recursive.c:1831 +#: merge-recursive.c:1839 #, c-format msgid "Removing %s" msgstr "S'està eliminant %s" -#: merge-recursive.c:1857 +#: merge-recursive.c:1865 msgid "file/directory" msgstr "fitxer/directori" -#: merge-recursive.c:1863 +#: merge-recursive.c:1871 msgid "directory/file" msgstr "directori/fitxer" -#: merge-recursive.c:1868 +#: merge-recursive.c:1877 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "CONFLICTE (%s): Hi ha un directori amb nom %s en %s. S'està afegint %s com a " "%s" -#: merge-recursive.c:1877 +#: merge-recursive.c:1886 #, c-format msgid "Adding %s" msgstr "S'està afegint %s" -#: merge-recursive.c:1914 +#: merge-recursive.c:1923 msgid "Already up-to-date!" msgstr "Ja està al dia!" -#: merge-recursive.c:1923 +#: merge-recursive.c:1932 #, c-format msgid "merging of trees %s and %s failed" msgstr "la fusió dels arbres %s i %s ha fallat" -#: merge-recursive.c:2006 +#: merge-recursive.c:2015 msgid "Merging:" msgstr "Fusionant:" -#: merge-recursive.c:2019 +#: merge-recursive.c:2028 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "s'ha trobat %u avantpassat en comú:" msgstr[1] "s'han trobat %u avantpassats en comú:" -#: merge-recursive.c:2058 +#: merge-recursive.c:2067 msgid "merge returned no commit" msgstr "la fusió no ha retornat cap comissió" -#: merge-recursive.c:2121 +#: merge-recursive.c:2130 #, c-format msgid "Could not parse object '%s'" msgstr "No s'ha pogut analitzar l'objecte '%s'" -#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788 +#: merge-recursive.c:2144 builtin/merge.c:645 builtin/merge.c:792 msgid "Unable to write index." msgstr "No s'ha pogut escriure l'índex." @@ -2144,7 +2190,7 @@ msgid "" "Please, use 'git notes merge --commit' or 'git notes merge --abort' to " "commit/abort the previous merge before you start a new notes merge." msgstr "" -"No heu conclòs la vostra fusió de notes prèvia (%s existeix).\n" +"No heu acabat la vostra fusió de notes prèvia (%s existeix).\n" "Si us plau, useu 'git notes merge --commit' o 'git notes merge --abort' per " "a cometre/avortar la fusió prèvia abans de començar una fusió de notes nova." @@ -2160,7 +2206,7 @@ msgstr "No es pot cometre un arbre de notes no inicialitzat / no referenciat" #: notes-utils.c:100 #, c-format msgid "Bad notes.rewriteMode value: '%s'" -msgstr "Valor de notes.rewriteMode dolent: '%s'" +msgstr "Valor de notes.rewriteMode erroni: '%s'" #: notes-utils.c:110 #, c-format @@ -2172,7 +2218,7 @@ msgstr "S'està refusant reescriure les notes en %s (fora de refs/notes/)" #: notes-utils.c:137 #, c-format msgid "Bad %s value: '%s'" -msgstr "Valor dolent de %s: '%s'" +msgstr "Valor erroni de %s: '%s'" #: object.c:242 #, c-format @@ -2214,13 +2260,13 @@ msgstr "nom d'objecte mal format '%s'" msgid "Could not make %s writable by group" msgstr "No s'ha pogut fer %s escrivible pel grup" -#: pathspec.c:133 +#: pathspec.c:142 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" "els ajusts d'especificació de camí 'glob' i 'noglob' globals són " "incompatibles" -#: pathspec.c:143 +#: pathspec.c:149 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -2228,61 +2274,66 @@ msgstr "" "l'ajust d'especificació de camí 'literal' global és incompatible amb tots " "els altres ajusts d'especificació de camí globals" -#: pathspec.c:177 +#: pathspec.c:188 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "paràmetre no vàlid per a la màgia d'especificació de camí 'prefix'" -#: pathspec.c:183 +#: pathspec.c:201 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "Màgia d'especificació de camí no vàlida '%.*s' en '%s'" -#: pathspec.c:187 +#: pathspec.c:206 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "')' mancant al final de la màgia d'especificació de camí en '%s'" -#: pathspec.c:205 +#: pathspec.c:238 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Màgia d'especificació de camí no implementada '%c' en '%s'" -#: pathspec.c:230 +#: pathspec.c:293 pathspec.c:315 +#, c-format +msgid "Pathspec '%s' is in submodule '%.*s'" +msgstr "L'especificació '%s' és en el submòdul '%.*s'" + +#: pathspec.c:350 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: 'literal' i 'glob' són incompatibles" -#: pathspec.c:241 +#: pathspec.c:363 #, c-format msgid "%s: '%s' is outside repository" msgstr "%s: '%s' és fora del dipòsit" -#: pathspec.c:291 +#: pathspec.c:451 #, c-format -msgid "Pathspec '%s' is in submodule '%.*s'" -msgstr "L'especificació '%s' és en el submòdul '%.*s'" +msgid "'%s' (mnemonic: '%c')" +msgstr "'%s' (mnemònic: '%c')" -#: pathspec.c:353 +#: pathspec.c:461 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "" "%s: aquesta ordre no és compatible amb la màgia d'especificació de camí: %s" -#: pathspec.c:408 +#: pathspec.c:511 msgid "" "empty strings as pathspecs will be made invalid in upcoming releases. please " "use . instead if you meant to match all paths" msgstr "" "es faran no vàlides les cadenes buides com especificacions de camí en " -"versions futures. si us plau, useu . en lloc d'això si volíeu coincidir amb " +"versions futures. Si us plau, useu . en lloc d'això si volíeu coincidir amb " "tots els camins" -#: pathspec.c:440 +#: pathspec.c:535 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "l'especificació de camí '%s' és més enllà d'un enllaç simbòlic" -#: pathspec.c:449 +#: pathspec.c:544 msgid "" "There is nothing to exclude from by :(exclude) patterns.\n" "Perhaps you forgot to add either ':/' or '.' ?" @@ -2290,11 +2341,11 @@ msgstr "" "No hi ha res a excloure per patrons :(exclusió).\n" "Potser heu oblidat afegir o ':/' o '.' ?" -#: pretty.c:971 +#: pretty.c:982 msgid "unable to parse --pretty format" msgstr "no s'ha pogut analitzar el format --pretty" -#: read-cache.c:1315 +#: read-cache.c:1307 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -2303,7 +2354,7 @@ msgstr "" "index.version està establerta, però el valor no és vàlid.\n" "S'està usant la versió %i" -#: read-cache.c:1325 +#: read-cache.c:1317 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -2312,7 +2363,7 @@ msgstr "" "GIT_INDEX_VERSION està establerta, però el valor no és vàlid.\n" "S'està usant la versió %i" -#: refs.c:576 builtin/merge.c:840 +#: refs.c:576 builtin/merge.c:844 #, c-format msgid "Could not open '%s' for writing" msgstr "No s'ha pogut obrir '%s' per a escriptura" @@ -2332,228 +2383,232 @@ msgstr "no s'ha pogut suprimir les referències: %s" msgid "could not remove reference %s" msgstr "no s'ha pogut eliminar la referència %s" -#: ref-filter.c:55 +#: ref-filter.c:56 #, c-format msgid "expected format: %%(color:<color>)" msgstr "format esperat: %%(color:<color>)" -#: ref-filter.c:57 +#: ref-filter.c:58 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "color no reconegut: %%(color:%s)" -#: ref-filter.c:71 +#: ref-filter.c:72 #, c-format msgid "unrecognized format: %%(%s)" msgstr "format no reconegut: %%(%s)" -#: ref-filter.c:77 +#: ref-filter.c:78 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) no accepta paràmetres" -#: ref-filter.c:84 +#: ref-filter.c:85 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) no accepta paràmetres" -#: ref-filter.c:101 +#: ref-filter.c:92 +msgid "%%(trailers) does not take arguments" +msgstr "%%(trailers) no accepta paràmetres" + +#: ref-filter.c:111 #, c-format msgid "positive value expected contents:lines=%s" -msgstr "valor positiu esperat contents:lines=%s" +msgstr "valor positiu esperat conté:lines=%s" -#: ref-filter.c:103 +#: ref-filter.c:113 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "paràmetre %%(contents) no reconegut: %s" -#: ref-filter.c:113 +#: ref-filter.c:123 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "paràmetre %%(objectname) no reconegut: %s" -#: ref-filter.c:135 +#: ref-filter.c:145 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "format esperat: %%(align:<amplada>,<posició>)" -#: ref-filter.c:147 +#: ref-filter.c:157 #, c-format msgid "unrecognized position:%s" msgstr "posició no reconeguda:%s" -#: ref-filter.c:151 +#: ref-filter.c:161 #, c-format msgid "unrecognized width:%s" msgstr "amplada no reconeguda:%s" -#: ref-filter.c:157 +#: ref-filter.c:167 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "paràmetre %%(align) no reconegut: %s" -#: ref-filter.c:161 +#: ref-filter.c:171 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "amplada positiva esperada amb l'àtom %%(align)" -#: ref-filter.c:244 +#: ref-filter.c:255 #, c-format msgid "malformed field name: %.*s" msgstr "nom de camp mal format: %.*s" -#: ref-filter.c:270 +#: ref-filter.c:281 #, c-format msgid "unknown field name: %.*s" msgstr "nom de camp desconegut: %.*s" -#: ref-filter.c:372 +#: ref-filter.c:383 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "format: s'ha usat l'àtom %%(end) sense l'àtom corresponent" -#: ref-filter.c:424 +#: ref-filter.c:435 #, c-format msgid "malformed format string %s" msgstr "cadena de format mal format %s" -#: ref-filter.c:878 +#: ref-filter.c:898 msgid ":strip= requires a positive integer argument" msgstr ":strip= requereix un paràmetre enter positiu" -#: ref-filter.c:883 +#: ref-filter.c:903 #, c-format msgid "ref '%s' does not have %ld components to :strip" msgstr "la referència '%s' no té %ld components per a :strip" -#: ref-filter.c:1046 +#: ref-filter.c:1066 #, c-format msgid "unknown %.*s format %s" msgstr "format de %.*s desconegut %s" -#: ref-filter.c:1066 ref-filter.c:1097 +#: ref-filter.c:1086 ref-filter.c:1117 #, c-format msgid "missing object %s for %s" msgstr "manca l'objecte %s per a %s" -#: ref-filter.c:1069 ref-filter.c:1100 +#: ref-filter.c:1089 ref-filter.c:1120 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer ha fallat en %s per a %s" -#: ref-filter.c:1311 +#: ref-filter.c:1343 #, c-format msgid "malformed object at '%s'" msgstr "objecte mal format a '%s'" -#: ref-filter.c:1373 +#: ref-filter.c:1410 #, c-format msgid "ignoring ref with broken name %s" -msgstr "s'està ignorant la referència amb nom trencat %s" +msgstr "s'està ignorant la referència amb nom malmès %s" -#: ref-filter.c:1378 +#: ref-filter.c:1415 #, c-format msgid "ignoring broken ref %s" msgstr "s'està ignorant la referència trencada %s" -#: ref-filter.c:1633 +#: ref-filter.c:1670 #, c-format msgid "format: %%(end) atom missing" msgstr "format: manca l'àtom %%(end)" -#: ref-filter.c:1687 +#: ref-filter.c:1734 #, c-format msgid "malformed object name %s" msgstr "nom d'objecte %s mal format" -#: remote.c:746 +#: remote.c:754 #, c-format msgid "Cannot fetch both %s and %s to %s" -msgstr "No es pot obtenir ambdós %s i %s a %s" +msgstr "No es poden obtenir ambdós %s i %s a %s" -#: remote.c:750 +#: remote.c:758 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s generalment segueix %s, no %s" -#: remote.c:754 +#: remote.c:762 #, c-format msgid "%s tracks both %s and %s" msgstr "%s segueix ambdós %s i %s" -#: remote.c:762 +#: remote.c:770 msgid "Internal error" msgstr "Error intern" -#: remote.c:1677 remote.c:1720 +#: remote.c:1685 remote.c:1787 msgid "HEAD does not point to a branch" msgstr "HEAD no assenyala cap branca" -#: remote.c:1686 +#: remote.c:1694 #, c-format msgid "no such branch: '%s'" msgstr "no hi ha tal branca: '%s'" -#: remote.c:1689 +#: remote.c:1697 #, c-format msgid "no upstream configured for branch '%s'" msgstr "cap font configurada per a la branca '%s'" -#: remote.c:1695 +#: remote.c:1703 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "la branca font '%s' no s'emmagatzema com a branca amb seguiment remot" -#: remote.c:1710 +#: remote.c:1718 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "el destí de pujada '%s' en el remot '%s' no té cap branca seguidora local" -#: remote.c:1725 +#: remote.c:1730 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "la branca '%s' no té cap remot al qual pujar" -#: remote.c:1736 +#: remote.c:1741 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "les especificacions de referència de '%s' no inclouen '%s'" -#: remote.c:1749 +#: remote.c:1754 msgid "push has no destination (push.default is 'nothing')" msgstr "push no té destí (push.default és 'nothing')" -#: remote.c:1771 +#: remote.c:1776 msgid "cannot resolve 'simple' push to a single destination" msgstr "no es pot resoldre una pujada 'simple' a un sol destí" -#: remote.c:2073 +#: remote.c:2081 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "La vostra branca està basada en '%s', però la font no hi és.\n" -#: remote.c:2077 +#: remote.c:2085 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (useu \"git branch --unset-upstream\" per a arreglar)\n" -#: remote.c:2080 +#: remote.c:2088 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "La vostra branca està al dia amb '%s'.\n" -#: remote.c:2084 +#: remote.c:2092 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "La vostra branca està davant de '%s' per %d comissió.\n" msgstr[1] "La vostra branca està davant de '%s' per %d comissions.\n" -#: remote.c:2090 +#: remote.c:2098 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (useu \"git push\" per a publicar les vostres comissions locals)\n" -#: remote.c:2093 +#: remote.c:2101 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -2565,11 +2620,11 @@ msgstr[1] "" "La vostra branca està darrere de '%s' per %d comissions, i pot avançar-se " "ràpidament.\n" -#: remote.c:2101 +#: remote.c:2109 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (useu \"git pull\" per a actualitzar la vostra branca local)\n" -#: remote.c:2104 +#: remote.c:2112 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -2584,13 +2639,13 @@ msgstr[1] "" "La vostra branca i '%s' s'han divergit,\n" "i tenen %d i %d comissions distintes cada una, respectivament.\n" -#: remote.c:2114 +#: remote.c:2122 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (useu \"git pull\" per a fusionar la branca remota a la vostra)\n" #: revision.c:2158 msgid "your current branch appears to be broken" -msgstr "la vostra branca actual sembla trencada" +msgstr "la vostra branca actual sembla malmesa" #: revision.c:2161 #, c-format @@ -2601,18 +2656,18 @@ msgstr "la vostra branca actual '%s' encara no té cap comissió" msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent és incompatible amb --bisect" -#: run-command.c:106 +#: run-command.c:125 msgid "open /dev/null failed" -msgstr "s'ha fallat en obrir /dev/null" +msgstr "s'ha produït un error en obrir /dev/null" -#: run-command.c:108 +#: run-command.c:127 #, c-format msgid "dup2(%d,%d) failed" msgstr "dup2(%d,%d) ha fallat" #: send-pack.c:297 msgid "failed to sign the push certificate" -msgstr "s'ha fallat en signar el certificat de pujada" +msgstr "s'ha produït un error en signar el certificat de pujada" #: send-pack.c:410 msgid "the receiving end does not support --signed push" @@ -2634,15 +2689,24 @@ msgstr "el destí receptor no admet pujar --atomic" msgid "the receiving end does not support push options" msgstr "el destí receptor no admet opcions de pujada" -#: sequencer.c:171 +#: sequencer.c:215 msgid "revert" msgstr "revertir" -#: sequencer.c:171 +#: sequencer.c:217 msgid "cherry-pick" -msgstr "recollir cireres" +msgstr "cherry-pick" -#: sequencer.c:228 +#: sequencer.c:219 +msgid "rebase -i" +msgstr "rebase -i" + +#: sequencer.c:221 +#, c-format +msgid "Unknown action: %d" +msgstr "Acció desconeguda: %d" + +#: sequencer.c:278 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -2650,7 +2714,7 @@ msgstr "" "després de resoldre els conflictes, marqueu els camins\n" "corregits amb 'git add <camins>' o 'git rm <camins>'" -#: sequencer.c:231 +#: sequencer.c:281 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -2660,60 +2724,63 @@ msgstr "" "corregits amb 'git add <camins>' o 'git rm <camins>'\n" "i cometeu el resultat amb 'git commit'" -#: sequencer.c:244 sequencer.c:1209 +#: sequencer.c:294 sequencer.c:1667 #, c-format msgid "could not lock '%s'" msgstr "no s'ha pogut bloquejar '%s'" -#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214 +#: sequencer.c:297 sequencer.c:1545 sequencer.c:1672 sequencer.c:1686 #, c-format msgid "could not write to '%s'" msgstr "no s'ha pogut escriure a '%s'" -#: sequencer.c:251 +#: sequencer.c:301 #, c-format msgid "could not write eol to '%s'" msgstr "no s'ha pogut escriure el terminador de línia a '%s'" -#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216 +#: sequencer.c:305 sequencer.c:1550 sequencer.c:1674 #, c-format msgid "failed to finalize '%s'." -msgstr "s'ha fallat en finalitzar '%s'." +msgstr "s'ha produït un error en finalitzar '%s'." -#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032 +#: sequencer.c:329 sequencer.c:808 sequencer.c:1571 builtin/am.c:259 +#: builtin/commit.c:749 builtin/merge.c:1036 #, c-format msgid "could not read '%s'" msgstr "no s'ha pogut llegir '%s'" -#: sequencer.c:305 +#: sequencer.c:355 #, c-format msgid "your local changes would be overwritten by %s." msgstr "els vostres canvis locals se sobreescriurien per %s." -#: sequencer.c:309 +#: sequencer.c:359 msgid "commit your changes or stash them to proceed." msgstr "cometeu els vostres canvis o emmagatzemeu-los per a procedir." -#: sequencer.c:324 +#: sequencer.c:388 #, c-format msgid "%s: fast-forward" msgstr "%s: avanç ràpid" -#. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:399 +#. TRANSLATORS: %s will be "revert", "cherry-pick" or +#. * "rebase -i". +#. +#: sequencer.c:470 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: No s'ha pogut escriure un fitxer d'índex nou" -#: sequencer.c:418 +#: sequencer.c:489 msgid "could not resolve HEAD commit\n" msgstr "no s'ha pogut resoldre la comissió HEAD\n" -#: sequencer.c:438 +#: sequencer.c:509 msgid "unable to update cache tree\n" msgstr "no s'ha pogut actualitzar l'arbre cau\n" -#: sequencer.c:483 +#: sequencer.c:592 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -2729,7 +2796,7 @@ msgid "" "\n" " git rebase --continue\n" msgstr "" -"teniu canvis allistats en el vostre arbre de treball\n" +"teniu canvis «staged» en el vostre arbre de treball\n" "Si aquests canvis són per a aixafar-se a la comissió prèvia, executeu:\n" "\n" " git commit --amend %s\n" @@ -2738,177 +2805,391 @@ msgstr "" "\n" " git commit %s\n" "\n" -"En ambdós cassos, quan hàgiu terminat, continueu amb:\n" +"En ambdós casos, quan hàgiu terminat, continueu amb:\n" "\n" " git rebase --continue\n" -#: sequencer.c:567 +#: sequencer.c:688 #, c-format msgid "could not parse commit %s\n" msgstr "no s'ha pogut analitzar la comissió %s\n" -#: sequencer.c:572 +#: sequencer.c:693 #, c-format msgid "could not parse parent commit %s\n" msgstr "no s'ha pogut analitzar la comissió mare %s\n" -#: sequencer.c:656 +#: sequencer.c:815 +#, c-format +msgid "" +"unexpected 1st line of squash message:\n" +"\n" +"\t%.*s" +msgstr "" + +#: sequencer.c:821 +#, c-format +msgid "" +"invalid 1st line of squash message:\n" +"\n" +"\t%.*s" +msgstr "" + +#: sequencer.c:827 sequencer.c:852 +#, c-format +msgid "This is a combination of %d commits." +msgstr "Això és una combinació de %d comissions." + +#: sequencer.c:836 +msgid "need a HEAD to fixup" +msgstr "cal un HEAD per reparar-ho" + +#: sequencer.c:838 +msgid "could not read HEAD" +msgstr "no s'ha pogut llegir HEAD" + +#: sequencer.c:840 +msgid "could not read HEAD's commit message" +msgstr "no s'ha pogut llegir el missatge de comissió de HEAD" + +#: sequencer.c:846 +#, c-format +msgid "cannot write '%s'" +msgstr "no es pot escriure '%s'" + +#: sequencer.c:855 git-rebase--interactive.sh:445 +msgid "This is the 1st commit message:" +msgstr "Aquest és el 1r missatge de comissió:" + +#: sequencer.c:863 +#, c-format +msgid "could not read commit message of %s" +msgstr "no s'ha pogut llegir el missatge de comissió: %s" + +#: sequencer.c:870 +#, c-format +msgid "This is the commit message #%d:" +msgstr "Aquest és el missatge de comissió #%d:" + +#: sequencer.c:875 +#, c-format +msgid "The commit message #%d will be skipped:" +msgstr "El missatge de comissió núm. #%d s'ometrà:" + +#: sequencer.c:880 +#, c-format +msgid "unknown command: %d" +msgstr "ordre desconeguda: %d" + +#: sequencer.c:946 msgid "your index file is unmerged." msgstr "el vostre fitxer d'índex està sense fusionar." -#: sequencer.c:675 +#: sequencer.c:964 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "la comissió %s és una fusió però no s'ha donat cap opció -m." -#: sequencer.c:683 +#: sequencer.c:972 #, c-format msgid "commit %s does not have parent %d" msgstr "la comissió %s no té mare %d" -#: sequencer.c:687 +#: sequencer.c:976 #, c-format msgid "mainline was specified but commit %s is not a merge." msgstr "" "s'ha especificat la línia principal però la comissió %s no és una fusió." +#: sequencer.c:982 +#, c-format +msgid "cannot get commit message for %s" +msgstr "no es pot obtenir el missatge de comissió de %s" + #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:700 +#: sequencer.c:1001 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: no es pot analitzar la comissió mare %s" -#: sequencer.c:705 +#: sequencer.c:1063 sequencer.c:1812 #, c-format -msgid "cannot get commit message for %s" -msgstr "no es pot obtenir el missatge de comissió de %s" +msgid "could not rename '%s' to '%s'" +msgstr "no s'ha pogut canviar el nom '%s' a '%s'" -#: sequencer.c:797 +#: sequencer.c:1114 #, c-format msgid "could not revert %s... %s" msgstr "no s'ha pogut revertir %s... %s" -#: sequencer.c:798 +#: sequencer.c:1115 #, c-format msgid "could not apply %s... %s" msgstr "no s'ha pogut aplicar %s... %s" -#: sequencer.c:833 +#: sequencer.c:1157 msgid "empty commit set passed" msgstr "conjunt de comissions buit passat" -#: sequencer.c:843 +#: sequencer.c:1167 #, c-format msgid "git %s: failed to read the index" -msgstr "git %s: s'ha fallat en llegir l'índex" +msgstr "git %s: s'ha produït un error en llegir l'índex" -#: sequencer.c:850 +#: sequencer.c:1174 #, c-format msgid "git %s: failed to refresh the index" -msgstr "git %s: s'ha fallat en actualitzar l'índex" +msgstr "git %s: s'ha produït un error en actualitzar l'índex" -#: sequencer.c:944 +#: sequencer.c:1294 #, c-format msgid "invalid line %d: %.*s" msgstr "línia no vàlida %d: %.*s" -#: sequencer.c:950 -msgid "no commits parsed." -msgstr "no s'ha analitzat cap comissió." +#: sequencer.c:1302 +#, c-format +msgid "cannot '%s' without a previous commit" +msgstr "No es pot '%s' sense una comissió prèvia" -#: sequencer.c:966 +#: sequencer.c:1334 #, c-format msgid "could not read '%s'." msgstr "no s'ha pogut llegir '%s'." -#: sequencer.c:972 +#: sequencer.c:1341 +msgid "please fix this using 'git rebase --edit-todo'." +msgstr "si us plau, corregiu-ho això usant 'git rebase --edit-todo'." + +#: sequencer.c:1343 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "full d'instruccions inusable: '%s'" -#: sequencer.c:983 +#: sequencer.c:1348 +msgid "no commits parsed." +msgstr "no s'ha analitzat cap comissió." + +#: sequencer.c:1359 msgid "cannot cherry-pick during a revert." -msgstr "no es pot recollir cireres durant una reversió." +msgstr "no es pot fer «cherry pick» durant una reversió." -#: sequencer.c:985 +#: sequencer.c:1361 msgid "cannot revert during a cherry-pick." -msgstr "no es pot revertir durant un recull de cireres." +msgstr "no es pot revertir durant un «cherry pick»." -#: sequencer.c:1028 +#: sequencer.c:1424 #, c-format msgid "invalid key: %s" msgstr "clau no vàlida: %s" -#: sequencer.c:1031 +#: sequencer.c:1427 #, c-format msgid "invalid value for %s: %s" msgstr "valor no vàlid per a %s: %s" -#: sequencer.c:1063 +#: sequencer.c:1484 #, c-format msgid "malformed options sheet: '%s'" msgstr "full d'opcions mal format: '%s'" -#: sequencer.c:1101 +#: sequencer.c:1522 msgid "a cherry-pick or revert is already in progress" -msgstr "un recull de cireres o una reversió ja està en curs" +msgstr "un «cherry pick» o una reversió ja està en curs" -#: sequencer.c:1102 +#: sequencer.c:1523 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "intenteu \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:1106 +#: sequencer.c:1526 #, c-format msgid "could not create sequencer directory '%s'" msgstr "no s'ha pogut crear el directori de seqüenciador '%s'" -#: sequencer.c:1120 +#: sequencer.c:1540 msgid "could not lock HEAD" msgstr "no s'ha pogut bloquejar HEAD" -#: sequencer.c:1151 sequencer.c:1289 +#: sequencer.c:1596 sequencer.c:2150 msgid "no cherry-pick or revert in progress" -msgstr "ni hi ha cap recull de cireres ni cap reversió en curs" +msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs" -#: sequencer.c:1153 +#: sequencer.c:1598 msgid "cannot resolve HEAD" msgstr "no es pot resoldre HEAD" -#: sequencer.c:1155 sequencer.c:1189 +#: sequencer.c:1600 sequencer.c:1634 msgid "cannot abort from a branch yet to be born" msgstr "no es pot avortar des d'una branca que encara ha de nàixer" -#: sequencer.c:1175 builtin/grep.c:578 +#: sequencer.c:1620 builtin/grep.c:904 #, c-format msgid "cannot open '%s'" msgstr "no es pot obrir '%s'" -#: sequencer.c:1177 +#: sequencer.c:1622 #, c-format msgid "cannot read '%s': %s" msgstr "no es pot llegir '%s': %s" -#: sequencer.c:1178 +#: sequencer.c:1623 msgid "unexpected end of file" msgstr "final de fitxer inesperat" -#: sequencer.c:1184 +#: sequencer.c:1629 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" -msgstr "el fitxer HEAD emmagatzemat abans del recull de cireres '%s' és malmès" +msgstr "el fitxer HEAD emmagatzemat abans de fer «cherry pick» '%s' és malmès" + +#: sequencer.c:1640 +msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" +msgstr "Sembla que heu mogut HEAD sense rebobinar, comproveu-ho HEAD" + +#: sequencer.c:1777 sequencer.c:2049 +msgid "cannot read HEAD" +msgstr "No es pot llegir HEAD" + +#: sequencer.c:1817 builtin/difftool.c:574 +#, c-format +msgid "could not copy '%s' to '%s'" +msgstr "no s'ha pogut copiar '%s' a '%s'" + +#: sequencer.c:1833 +msgid "could not read index" +msgstr "no s'ha pogut llegir l'índex" + +#: sequencer.c:1838 +#, c-format +msgid "" +"execution failed: %s\n" +"%sYou can fix the problem, and then run\n" +"\n" +" git rebase --continue\n" +"\n" +msgstr "" +"ha fallat: %s\n" +"%sPodeu solucionar el problema, i llavors executar\n" +"\n" +" git rebase --continue\n" +"\n" + +#: sequencer.c:1844 +msgid "and made changes to the index and/or the working tree\n" +msgstr "i ha fet canvis a l'índex i/o l'arbre de treball\n" -#: sequencer.c:1354 +#: sequencer.c:1850 +#, 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 "" +"L'execució ha tingut èxit: %s\n" +"però ha deixat canvis a l'índex i/o l'arbre de treball\n" +"Cometeu o emmagatzemeu els vostres canvis, i llavors executeu\n" +"\n" +" git rebase --continue\n" + +#: sequencer.c:1905 git-rebase.sh:168 +#, c-format +msgid "Applied autostash." +msgstr "S'ha aplicat el magatzem automàtic." + +#: sequencer.c:1917 +#, c-format +msgid "cannot store %s" +msgstr "no es pot emmagatzemar %s" + +#: sequencer.c:1919 git-rebase.sh:172 +#, 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 "" +"L'aplicació del magatzem automàtic ha resultat en conflictes.\n" +"Els vostres canvis estan segurs en el magatzem.\n" +"Podeu executar \"git stash pop\" o \"git stash drop\" en qualsevol moment.\n" + +#: sequencer.c:2000 +#, c-format +msgid "stopped at %s... %.*s" +msgstr "aturat a %s... %.*s" + +#: sequencer.c:2027 +#, c-format +msgid "unknown command %d" +msgstr "ordre %d desconeguda" + +#: sequencer.c:2057 +msgid "could not read orig-head" +msgstr "No s'ha pogut llegir orig-head" + +#: sequencer.c:2061 +msgid "could not read 'onto'" +msgstr "no s'ha pogut llegir 'onto'" + +#: sequencer.c:2068 +#, c-format +msgid "could not update %s" +msgstr "no s'ha pogut analitzar %s" + +#: sequencer.c:2075 +#, c-format +msgid "could not update HEAD to %s" +msgstr "no s'ha pogut actualitzar HEAD a %s" + +#: sequencer.c:2159 +msgid "cannot rebase: You have unstaged changes." +msgstr "No es pot rebasar: Teniu canvis «unstaged»." + +#: sequencer.c:2164 +msgid "could not remove CHERRY_PICK_HEAD" +msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD" + +#: sequencer.c:2173 +#, fuzzy +msgid "cannot amend non-existing commit" +msgstr "no es pot llegir l'objecte existent %s" + +#: sequencer.c:2175 +#, c-format +msgid "invalid file: '%s'" +msgstr "fitxer no vàlid: '%s'" + +#: sequencer.c:2177 +#, c-format +msgid "invalid contents: '%s'" +msgstr "contingut no vàlid: '%s'" + +#: sequencer.c:2180 +#, fuzzy +msgid "" +"\n" +"You have uncommitted changes in your working tree. Please, commit them\n" +"first and then run 'git rebase --continue' again." +msgstr "" +"Teniu canvis no comessos en el vostre arbre de treball. Si us plau,\n" +"primer cometeu-los i després executeu 'git rebase --continue' de nou." + +#: sequencer.c:2190 +msgid "could not commit staged changes." +msgstr "No s'ha pogut cometre els canvis «staged»." + +#: sequencer.c:2270 #, c-format msgid "%s: can't cherry-pick a %s" -msgstr "%s: no es pot recollir com a cirera un %s" +msgstr "%s: no es pot fer «cherry pick» a %s" -#: sequencer.c:1358 +#: sequencer.c:2274 #, c-format msgid "%s: bad revision" msgstr "%s: revisió dolenta" -#: sequencer.c:1391 +#: sequencer.c:2307 msgid "can't revert as initial commit" msgstr "no es pot revertir com a comissió inicial" @@ -2944,29 +3225,29 @@ msgstr "" "Useu '--' per a separar els camins de les revisions, com això:\n" "'git <ordre> [<revisió>...] -- [<fitxer>...]'" -#: setup.c:468 +#: setup.c:470 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "S'esperava una versió de dipòsit de git <= %d, s'ha trobat %d" -#: setup.c:476 +#: setup.c:478 msgid "unknown repository extensions found:" msgstr "s'han trobat extensions de dipòsit desconegudes:" -#: setup.c:762 +#: setup.c:768 #, c-format msgid "Not a git repository (or any of the parent directories): %s" msgstr "No és un dipòsit de git (ni cap dels directoris pares): %s" -#: setup.c:764 setup.c:915 builtin/index-pack.c:1641 +#: setup.c:770 setup.c:922 builtin/index-pack.c:1643 msgid "Cannot come back to cwd" msgstr "No es pot tornar al directori de treball actual" -#: setup.c:845 +#: setup.c:852 msgid "Unable to read current working directory" msgstr "No s'ha pogut llegir el directori de treball actual" -#: setup.c:920 +#: setup.c:927 #, c-format msgid "" "Not a git repository (or any parent up to mount point %s)\n" @@ -2976,12 +3257,12 @@ msgstr "" "S'atura a la frontera de sistema de fitxers (GIT_DISCOVERY_ACROSS_FILESYSTEM " "no està establert)." -#: setup.c:927 +#: setup.c:934 #, c-format msgid "Cannot change to '%s/..'" msgstr "No es pot canviar a '%s/..'" -#: setup.c:989 +#: setup.c:996 #, c-format msgid "" "Problem with core.sharedRepository filemode value (0%.3o).\n" @@ -2989,46 +3270,46 @@ msgid "" msgstr "" "Hi ha un problema amb el valor de mode de fitxer core.sharedRepository " "(0%.3o).\n" -"El propietari dels fitxers sempre ha de tenir permissions de lectura i " +"El propietari dels fitxers sempre ha de tenir permisos de lectura i " "escriptura." -#: sha1_file.c:473 +#: sha1_file.c:490 #, c-format msgid "path '%s' does not exist" msgstr "el camí '%s' no existeix" -#: sha1_file.c:499 +#: sha1_file.c:516 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" "Encara no se suporta el dipòsit de referència '%s' com a agafament enllaçat." -#: sha1_file.c:505 +#: sha1_file.c:522 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "el dipòsit de referència '%s' no és un dipòsit local." -#: sha1_file.c:511 +#: sha1_file.c:528 #, c-format msgid "reference repository '%s' is shallow" msgstr "el dipòsit de referència '%s' és superficial" -#: sha1_file.c:519 +#: sha1_file.c:536 #, c-format msgid "reference repository '%s' is grafted" msgstr "el dipòsit de referència '%s' és empeltat" -#: sha1_file.c:1159 +#: sha1_file.c:1176 msgid "offset before end of packfile (broken .idx?)" msgstr "desplaçament abans de la fi del fitxer de paquet (.idx trencat?)" -#: sha1_file.c:2592 +#: sha1_file.c:2637 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" "desplaçament abans d'inici d'índex de paquet per a %s (índex corromput?)" -#: sha1_file.c:2596 +#: sha1_file.c:2641 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" @@ -3067,90 +3348,122 @@ msgstr "" "suprimiu-les. Desactiveu aquest missatge executant\n" "\"git config advice.objectNameWarning false\"" -#: submodule.c:64 submodule.c:98 +#: submodule.c:65 submodule.c:99 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" -"No es pot canviar un .gitmodules no fusionat, primer resoldreu els " -"conflictes de fusió" +"No es pot canviar un .gitmodules no fusionat, primer resoleu els conflictes " +"de fusió" -#: submodule.c:68 submodule.c:102 +#: submodule.c:69 submodule.c:103 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "No s'ha pogut trobar la secció en .gitmodules on path=%s" -#: submodule.c:76 +#: submodule.c:77 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "No s'ha pogut actualitzar l'entrada de .gitmodules %s" -#: submodule.c:109 +#: submodule.c:110 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "No s'ha pogut eliminar l'entrada de .gitmodules per a %s" -#: submodule.c:120 +#: submodule.c:121 msgid "staging updated .gitmodules failed" msgstr "l'allistament del .gitmodules actualitzat ha fallat" -#: submodule.c:158 +#: submodule.c:159 msgid "negative values not allowed for submodule.fetchJobs" msgstr "no es permeten els valors negatius a submodule.fetchJobs" -#: submodule-config.c:358 +#: submodule.c:1184 +#, c-format +msgid "could not start 'git status in submodule '%s'" +msgstr "no s'ha pogut iniciar 'git status in submodule '%s'" + +#: submodule.c:1197 +#, c-format +msgid "could not run 'git status in submodule '%s'" +msgstr "no s'ha pogut executar 'git status in submodule '%s'" + +#: submodule.c:1398 +#, c-format +msgid "" +"relocate_gitdir for submodule '%s' with more than one worktree not supported" +msgstr "" + +#: submodule.c:1410 submodule.c:1471 +#, c-format +msgid "could not lookup name for submodule '%s'" +msgstr "no s'ha trobar el nom pel submòdul '%s'" + +#: submodule.c:1414 submodule.c:1474 builtin/submodule--helper.c:640 +#: builtin/submodule--helper.c:650 +#, c-format +msgid "could not create directory '%s'" +msgstr "no s'ha pogut crear el directori '%s'" + +#: submodule.c:1420 submodule.c:1512 +#, c-format +msgid "could not recurse into submodule '%s'" +msgstr "S'ha produït un error en cercar recursivament al camí de submòdul '%s'" + +#: submodule-config.c:360 #, c-format msgid "invalid value for %s" msgstr "valor no vàlid per a %s" -#: trailer.c:238 +#: trailer.c:240 #, c-format msgid "running trailer command '%s' failed" msgstr "l'execució de l'ordre de remolc '%s' ha fallat" -#: trailer.c:471 trailer.c:475 trailer.c:479 trailer.c:533 trailer.c:537 -#: trailer.c:541 +#: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539 +#: trailer.c:543 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "valor desconegut '%s' per a la clau '%s'" -#: trailer.c:523 trailer.c:528 builtin/remote.c:289 +#: trailer.c:525 trailer.c:530 builtin/remote.c:289 #, c-format msgid "more than one %s" msgstr "més d'un %s" -#: trailer.c:672 +#: trailer.c:702 #, c-format msgid "empty trailer token in trailer '%.*s'" -msgstr "fitxa de remolc buida en el remolc '%.*s'" +msgstr "testimoni de remolc buit en el remolc '%.*s'" -#: trailer.c:695 +#: trailer.c:722 #, c-format msgid "could not read input file '%s'" msgstr "no s'ha pogut llegir el fitxer d'entrada '%s'" -#: trailer.c:698 +#: trailer.c:725 msgid "could not read from stdin" msgstr "no s'ha pogut llegir des d'stdin" -#: trailer.c:929 builtin/am.c:44 +#: trailer.c:949 builtin/am.c:44 #, c-format msgid "could not stat %s" msgstr "no s'ha pogut fer stat a %s" -#: trailer.c:931 +#: trailer.c:951 #, c-format msgid "file %s is not a regular file" msgstr "el fitxer %s no és un fitxer regular" -#: trailer.c:933 +#: trailer.c:953 #, c-format msgid "file %s is not writable by user" msgstr "el fitxer %s no és gravable per l'usuari" -#: trailer.c:945 +#: trailer.c:965 msgid "could not open temporary file" msgstr "no s'ha pogut obrir el fitxer temporal" -#: trailer.c:983 +#: trailer.c:1001 #, c-format msgid "could not rename temporary file to %s" msgstr "no s'ha pogut canviar el nom del fitxer temporal a %s" @@ -3165,7 +3478,7 @@ msgstr "Canviaria la font de '%s' a '%s' de '%s'\n" msgid "transport: invalid depth option '%s'" msgstr "transport: opció de profunditat no vàlida '%s'" -#: transport.c:817 +#: transport.c:885 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -3174,7 +3487,7 @@ msgstr "" "Els camins de submòdul següents contenen canvis que no\n" "es poden trobar en cap remot:\n" -#: transport.c:821 +#: transport.c:889 #, c-format msgid "" "\n" @@ -3200,7 +3513,7 @@ msgstr "" "\n" "per a pujar-los a un remot.\n" -#: transport.c:829 +#: transport.c:897 msgid "Aborting." msgstr "S'està avortant." @@ -3219,13 +3532,13 @@ msgstr "mode mal format en entrada d'arbre" #: tree-walk.c:41 msgid "empty filename in tree entry" -msgstr "nom de fitxer buit en entrada de arbre" +msgstr "nom de fitxer buit en una entrada d'arbre" #: tree-walk.c:113 msgid "too-short tree file" msgstr "fitxer d'arbre massa curt" -#: unpack-trees.c:64 +#: unpack-trees.c:99 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3236,7 +3549,7 @@ msgstr "" "%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de " "canviar de branca." -#: unpack-trees.c:66 +#: unpack-trees.c:101 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3246,7 +3559,7 @@ msgstr "" "agafar:\n" "%%s" -#: unpack-trees.c:69 +#: unpack-trees.c:104 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3257,7 +3570,7 @@ msgstr "" "%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de " "fusionar." -#: unpack-trees.c:71 +#: unpack-trees.c:106 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3267,7 +3580,7 @@ msgstr "" "fusionar:\n" "%%s" -#: unpack-trees.c:74 +#: unpack-trees.c:109 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -3276,7 +3589,7 @@ msgstr "" "Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n" "%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de %s." -#: unpack-trees.c:76 +#: unpack-trees.c:111 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -3285,16 +3598,16 @@ msgstr "" "Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n" "%%s" -#: unpack-trees.c:81 -#, c-format +#: unpack-trees.c:116 +#, fuzzy, c-format msgid "" -"Updating the following directories would lose untracked files in it:\n" +"Updating the following directories would lose untracked files in them:\n" "%s" msgstr "" "Actualitzar els directoris següents perdria fitxers no seguits en el:\n" "%s" -#: unpack-trees.c:85 +#: unpack-trees.c:120 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -3304,7 +3617,7 @@ msgstr "" "agafar:\n" "%%sSi us plau, moveu-los o elimineu-los abans de canviar de branca." -#: unpack-trees.c:87 +#: unpack-trees.c:122 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -3314,7 +3627,7 @@ msgstr "" "agafar:\n" "%%s" -#: unpack-trees.c:90 +#: unpack-trees.c:125 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -3324,7 +3637,7 @@ msgstr "" "fusionar:\n" "%%sSi us plau, moveu-los o elimineu-los abans de fusionar." -#: unpack-trees.c:92 +#: unpack-trees.c:127 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -3334,7 +3647,7 @@ msgstr "" "fusionar:\n" "%%s" -#: unpack-trees.c:95 +#: unpack-trees.c:130 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -3343,7 +3656,7 @@ msgstr "" "Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n" "%%sSi us plau, moveu-los o elimineu-los abans de %s." -#: unpack-trees.c:97 +#: unpack-trees.c:132 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -3352,7 +3665,7 @@ msgstr "" "Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n" "%%s" -#: unpack-trees.c:102 +#: unpack-trees.c:137 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3363,7 +3676,7 @@ msgstr "" "agafar:\n" "%%sSi us plau, moveu-los o elimineu-los abans de canviar de branca." -#: unpack-trees.c:104 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3374,7 +3687,7 @@ msgstr "" "agafar:\n" "%%s" -#: unpack-trees.c:107 +#: unpack-trees.c:142 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -3384,7 +3697,7 @@ msgstr "" "fusionar:\n" "%%sSi us plau, moveu-los o elimineu-los abans de fusionar." -#: unpack-trees.c:109 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -3394,7 +3707,7 @@ msgstr "" "fusionar:\n" "%%s" -#: unpack-trees.c:112 +#: unpack-trees.c:147 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -3404,7 +3717,7 @@ msgstr "" "%s:\n" "%%sSi us plau, moveu-los o elimineu-los abans de %s." -#: unpack-trees.c:114 +#: unpack-trees.c:149 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -3414,12 +3727,12 @@ msgstr "" "%s:\n" "%%s" -#: unpack-trees.c:121 +#: unpack-trees.c:156 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "L'entrada '%s' encavalca amb '%s'. No es pot vincular." -#: unpack-trees.c:124 +#: unpack-trees.c:159 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up-to-date:\n" @@ -3429,7 +3742,7 @@ msgstr "" "dia:\n" "%s" -#: unpack-trees.c:126 +#: unpack-trees.c:161 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -3440,7 +3753,7 @@ msgstr "" "actualitzar l'agafament parcial:\n" "%s" -#: unpack-trees.c:128 +#: unpack-trees.c:163 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -3451,14 +3764,14 @@ msgstr "" "l'agafament parcial:\n" "%s" -#: unpack-trees.c:205 +#: unpack-trees.c:240 #, c-format msgid "Aborting\n" msgstr "S'està avortant\n" -#: unpack-trees.c:237 +#: unpack-trees.c:270 msgid "Checking out files" -msgstr "S'està agafant fitxers" +msgstr "S'estan agafant fitxers" #: urlmatch.c:120 msgid "invalid URL scheme name or missing '://' suffix" @@ -3492,7 +3805,7 @@ msgstr "segment de camí '..' no vàlid" #: worktree.c:282 #, c-format msgid "failed to read '%s'" -msgstr "s'ha fallat en llegir '%s'" +msgstr "s'ha produït un error en llegir '%s'" #: wrapper.c:222 wrapper.c:392 #, c-format @@ -3505,7 +3818,7 @@ msgid "could not open '%s' for writing" msgstr "no s'ha pogut obrir '%s' per a escriptura" #: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759 -#: builtin/am.c:847 builtin/commit.c:1705 builtin/merge.c:1029 +#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1033 #: builtin/pull.c:341 #, c-format msgid "could not open '%s' for reading" @@ -3537,11 +3850,11 @@ msgstr "Camins sense fusionar:" #: wt-status.c:178 wt-status.c:205 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" -msgstr " (useu \"git reset %s <fitxer>...\" per a desallistar)" +msgstr " (useu \"git reset %s <fitxer>...\" per a fer «unstage»)" #: wt-status.c:180 wt-status.c:207 msgid " (use \"git rm --cached <file>...\" to unstage)" -msgstr " (useu \"git rm --cached <fitxer>...\" per a desallistar)" +msgstr " (useu \"git rm --cached <fitxer>...\" per a fer «unstage»)" #: wt-status.c:184 msgid " (use \"git add <file>...\" to mark resolution)" @@ -3563,7 +3876,7 @@ msgstr "Canvis a cometre:" #: wt-status.c:217 wt-status.c:954 msgid "Changes not staged for commit:" -msgstr "Canvis no allistats per a cometre:" +msgstr "Canvis no «stage» per a cometre:" #: wt-status.c:221 msgid " (use \"git add <file>...\" to update what will be committed)" @@ -3718,192 +4031,197 @@ msgstr " (useu \"git am --skip\" per a ometre aquest pedaç)" msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (useu \"git am --abort\" per a restaurar la branca original)" -#: wt-status.c:1172 +#: wt-status.c:1176 +msgid "git-rebase-todo is missing." +msgstr "Manca git-rebase-todo." + +#: wt-status.c:1178 msgid "No commands done." msgstr "No s'ha fet cap ordre." -#: wt-status.c:1175 +#: wt-status.c:1181 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Última ordre feta (%d ordre feta):" msgstr[1] "Últimes ordres fetes (%d ordres fetes):" -#: wt-status.c:1186 +#: wt-status.c:1192 #, c-format msgid " (see more in file %s)" msgstr " (vegeu més en el fitxer %s)" -#: wt-status.c:1191 +#: wt-status.c:1197 msgid "No commands remaining." msgstr "No manca cap ordre." -#: wt-status.c:1194 +#: wt-status.c:1200 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Ordre següent a fer (manca %d ordre):" msgstr[1] "Ordres següents a fer (manquen %d ordres):" -#: wt-status.c:1202 +#: wt-status.c:1208 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (useu \"git rebase --edit-todo\" per a veure i editar)" -#: wt-status.c:1215 +#: wt-status.c:1221 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Actualment esteu rebasant la branca '%s' en '%s'." -#: wt-status.c:1220 +#: wt-status.c:1226 msgid "You are currently rebasing." msgstr "Actualment esteu rebasant." -#: wt-status.c:1234 +#: wt-status.c:1240 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" " (arregleu els conflictes i després executeu \"git rebase --continue\")" -#: wt-status.c:1236 +#: wt-status.c:1242 msgid " (use \"git rebase --skip\" to skip this patch)" -msgstr " (useu \"git rebase --skip\" per a saltar aquest pedaç)" +msgstr " (useu \"git rebase --skip\" per a ometre aquest pedaç)" -#: wt-status.c:1238 +#: wt-status.c:1244 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (useu \"git rebase --abort\" per a agafar la branca original)" -#: wt-status.c:1244 +#: wt-status.c:1250 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" " (tots els conflictes estan arreglats: executeu \"git rebase --continue\")" -#: wt-status.c:1248 +#: wt-status.c:1254 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" "Actualment esteu dividint una comissió mentre rebaseu la branca '%s' en '%s'." -#: wt-status.c:1253 +#: wt-status.c:1259 msgid "You are currently splitting a commit during a rebase." msgstr "Actualment esteu dividint una comissió durant un rebasament." -#: wt-status.c:1256 +#: wt-status.c:1262 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Una vegada que el vostre directori de treball sigui net, executeu \"git " "rebase --continue\")" -#: wt-status.c:1260 +#: wt-status.c:1266 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" -"Actualment esteu editant una comissió mentre rebaseu la branca '%s' en '%s'." +"Actualment esteu editant una comissió mentre es fa «rebase» de la branca " +"'%s' en '%s'." -#: wt-status.c:1265 +#: wt-status.c:1271 msgid "You are currently editing a commit during a rebase." -msgstr "Actualment esteu editant una comissió durant un rebasament." +msgstr "Actualment esteu editant una comissió durant un «rebase»." -#: wt-status.c:1268 +#: wt-status.c:1274 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (useu \"git commit --amend\" per a esmenar la comissió actual)" -#: wt-status.c:1270 +#: wt-status.c:1276 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (useu \"git rebase --continue\" una vegada que estigueu satisfet amb els " "vostres canvis)" -#: wt-status.c:1280 +#: wt-status.c:1286 #, c-format msgid "You are currently cherry-picking commit %s." -msgstr "Actualment esteu recollint com a cirera la comissió %s." +msgstr "Actualment esteu fent «cherry pick» a la comissió %s." -#: wt-status.c:1285 +#: wt-status.c:1291 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (arregleu els conflictes i executeu \"git cherry-pick --continue\")" -#: wt-status.c:1288 +#: wt-status.c:1294 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (tots els conflictes estan arreglats: executeu \"git cherry-pick --continue" "\")" -#: wt-status.c:1290 +#: wt-status.c:1296 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" -" (useu \"git cherry-pick --abort\" per a cancel·lar l'operació de recull de " -"cireres)" +" (useu \"git cherry-pick --abort\" per a cancel·lar l'operació de «cherry " +"pick»)" -#: wt-status.c:1299 +#: wt-status.c:1305 #, c-format msgid "You are currently reverting commit %s." msgstr "Actualment esteu revertint la comissió %s." -#: wt-status.c:1304 +#: wt-status.c:1310 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (arregleu els conflictes i executeu \"git revert --continue\")" -#: wt-status.c:1307 +#: wt-status.c:1313 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" " (tots els conflictes estan arreglats: executeu \"git revert --continue\")" -#: wt-status.c:1309 +#: wt-status.c:1315 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" " (useu \"git revert --abort\" per a cancel·lar l'operació de reversió)" -#: wt-status.c:1320 +#: wt-status.c:1326 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Actualment esteu bisecant, heu començat des de la branca '%s'." -#: wt-status.c:1324 +#: wt-status.c:1330 msgid "You are currently bisecting." msgstr "Actualment esteu bisecant." -#: wt-status.c:1327 +#: wt-status.c:1333 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (useu \"git bisect reset\" per a tornar a la branca original)" -#: wt-status.c:1524 +#: wt-status.c:1530 msgid "On branch " msgstr "En la branca " -#: wt-status.c:1530 +#: wt-status.c:1536 msgid "interactive rebase in progress; onto " -msgstr "rebasament interactiu en progrés; sobre " +msgstr "«rebase» interactiu en progrés; sobre " -#: wt-status.c:1532 +#: wt-status.c:1538 msgid "rebase in progress; onto " -msgstr "rebasament en progrés; sobre " +msgstr "«rebase» en progrés; sobre " -#: wt-status.c:1537 +#: wt-status.c:1543 msgid "HEAD detached at " msgstr "HEAD separat a " -#: wt-status.c:1539 +#: wt-status.c:1545 msgid "HEAD detached from " msgstr "HEAD separat de " -#: wt-status.c:1542 +#: wt-status.c:1548 msgid "Not currently on any branch." msgstr "Actualment no s'és en cap branca." -#: wt-status.c:1560 +#: wt-status.c:1566 msgid "Initial commit" msgstr "Comissió inicial" -#: wt-status.c:1574 +#: wt-status.c:1580 msgid "Untracked files" msgstr "Fitxers no seguits" -#: wt-status.c:1576 +#: wt-status.c:1582 msgid "Ignored files" msgstr "Fitxers ignorats" -#: wt-status.c:1580 +#: wt-status.c:1586 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -3912,34 +4230,34 @@ msgid "" msgstr "" "Ha trigat %.2f segons enumerar els fitxers no seguits.\n" "'status -uno' pot accelerar-ho, però heu d'anar amb compte de no\n" -"oblidar-vos d'afegir fitxers nous per vós mateix (vegeu\n" +"oblidar-vos d'afegir fitxers nous vosaltres mateixos (vegeu\n" "'git help status')." -#: wt-status.c:1586 +#: wt-status.c:1592 #, c-format msgid "Untracked files not listed%s" msgstr "Els fitxers no seguits no estan llistats%s" -#: wt-status.c:1588 +#: wt-status.c:1594 msgid " (use -u option to show untracked files)" msgstr " (useu l'opció -u per a mostrar els fitxers no seguits)" -#: wt-status.c:1594 +#: wt-status.c:1600 msgid "No changes" msgstr "Sense canvis" -#: wt-status.c:1599 +#: wt-status.c:1605 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "no hi ha canvis afegits a cometre (useu \"git add\" o \"git commit -a\")\n" -#: wt-status.c:1602 +#: wt-status.c:1608 #, c-format msgid "no changes added to commit\n" msgstr "no hi ha canvis afegits a cometre\n" -#: wt-status.c:1605 +#: wt-status.c:1611 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -3948,65 +4266,65 @@ msgstr "" "no hi ha res afegit a cometre però fitxers no seguits estan presents (useu " "\"git add\" per a seguir-los)\n" -#: wt-status.c:1608 +#: wt-status.c:1614 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "no hi ha res afegit a cometre però fitxers no seguits estan presents\n" -#: wt-status.c:1611 +#: wt-status.c:1617 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "no hi ha res a cometre (creeu/copieu fitxers i useu \"git add\" per a seguir-" "los)\n" -#: wt-status.c:1614 wt-status.c:1619 +#: wt-status.c:1620 wt-status.c:1625 #, c-format msgid "nothing to commit\n" msgstr "no hi ha res a cometre\n" -#: wt-status.c:1617 +#: wt-status.c:1623 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "no hi ha res a cometre (useu -u per a mostrar els fitxers no seguits)\n" -#: wt-status.c:1621 +#: wt-status.c:1627 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "no hi ha res a cometre, l'arbre de treball està net\n" -#: wt-status.c:1728 +#: wt-status.c:1734 msgid "Initial commit on " msgstr "Comissió inicial en " -#: wt-status.c:1732 +#: wt-status.c:1738 msgid "HEAD (no branch)" msgstr "HEAD (sense branca)" -#: wt-status.c:1761 +#: wt-status.c:1767 msgid "gone" msgstr "no hi és" -#: wt-status.c:1763 wt-status.c:1771 +#: wt-status.c:1769 wt-status.c:1777 msgid "behind " msgstr "darrere " -#: wt-status.c:1766 wt-status.c:1769 +#: wt-status.c:1772 wt-status.c:1775 msgid "ahead " msgstr "davant per " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2270 +#: wt-status.c:2277 #, c-format msgid "cannot %s: You have unstaged changes." -msgstr "no es pot %s: Teniu canvis no allistats." +msgstr "no es pot %s: Teniu canvis «unstaged»." -#: wt-status.c:2276 +#: wt-status.c:2283 msgid "additionally, your index contains uncommitted changes." msgstr "addicionalment, el vostre índex conté canvis sense cometre." -#: wt-status.c:2278 +#: wt-status.c:2285 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "no es pot %s: El vostre índex conté canvis sense cometre." @@ -4014,7 +4332,7 @@ msgstr "no es pot %s: El vostre índex conté canvis sense cometre." #: compat/precompose_utf8.c:57 builtin/clone.c:414 #, c-format msgid "failed to unlink '%s'" -msgstr "s'ha fallat en desenllaçar '%s'" +msgstr "s'ha produït un error en desenllaçar '%s'" #: builtin/add.c:22 msgid "git add [<options>] [--] <pathspec>..." @@ -4027,7 +4345,7 @@ msgstr "estat de diff inesperat %c" #: builtin/add.c:85 builtin/commit.c:291 msgid "updating files failed" -msgstr "s'ha fallat en actualitzar els fitxers" +msgstr "s'ha produït un error en actualitzar els fitxers" #: builtin/add.c:95 #, c-format @@ -4036,9 +4354,9 @@ msgstr "elimina '%s'\n" #: builtin/add.c:149 msgid "Unstaged changes after refreshing the index:" -msgstr "Canvis no allistats després d'actualitzar l'índex:" +msgstr "Canvis «unstaged» després d'actualitzar l'índex:" -#: builtin/add.c:209 builtin/rev-parse.c:840 +#: builtin/add.c:209 builtin/rev-parse.c:845 msgid "Could not read the index" msgstr "No s'ha pogut llegir l'índex" @@ -4074,9 +4392,9 @@ msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n" -#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:111 -#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:521 -#: builtin/remote.c:1326 builtin/rm.c:268 builtin/send-pack.c:162 +#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:123 +#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524 +#: builtin/remote.c:1326 builtin/rm.c:241 builtin/send-pack.c:162 msgid "dry run" msgstr "marxa en sec" @@ -4084,7 +4402,7 @@ msgstr "marxa en sec" msgid "interactive picking" msgstr "recull interactiu" -#: builtin/add.c:270 builtin/checkout.c:1156 builtin/reset.c:286 +#: builtin/add.c:270 builtin/checkout.c:1159 builtin/reset.c:286 msgid "select hunks interactively" msgstr "selecciona els trossos interactivament" @@ -4145,7 +4463,7 @@ msgstr "l'afegiment de fitxers ha fallat" #: builtin/add.c:348 msgid "-A and -u are mutually incompatible" -msgstr "-A i -u són mutualment incompatibles" +msgstr "-A i -u són mútuament incompatibles" #: builtin/add.c:355 msgid "Option --ignore-missing can only be used together with --dry-run" @@ -4168,7 +4486,7 @@ msgstr "Potser volíeu dir 'git add .'?\n" #: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279 #: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350 -#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271 #: builtin/submodule--helper.c:244 msgid "index file corrupt" msgstr "fitxer d'índex malmès" @@ -4190,7 +4508,7 @@ msgstr "Línia d'entrada mal formada: '%s'." #: builtin/am.c:569 #, c-format msgid "Failed to copy notes from '%s' to '%s'" -msgstr "S'ha fallat en copiar les notes de '%s' a '%s'" +msgstr "S'ha produït un error en copiar les notes de '%s' a '%s'" #: builtin/am.c:595 msgid "fseek failed" @@ -4224,11 +4542,11 @@ msgstr "La detecció de format de pedaç ha fallat." #: builtin/am.c:989 builtin/clone.c:379 #, c-format msgid "failed to create directory '%s'" -msgstr "s'ha fallat en crear el directori '%s'" +msgstr "s'ha produït un error en crear el directori '%s'" #: builtin/am.c:993 msgid "Failed to split patches." -msgstr "S'ha fallat en dividir els pedaços." +msgstr "S'ha produït un error en dividir els pedaços." #: builtin/am.c:1125 builtin/commit.c:376 msgid "unable to write index file" @@ -4243,7 +4561,7 @@ msgstr "Quan hàgiu resolt aquest problema, executeu \"%s --continue\"." #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" -"Si preferiu saltar aquest pedaç, executeu \"%s --skip\" en lloc d'això." +"Si preferiu ometre aquest pedaç, executeu \"%s --skip\" en lloc d'això." #: builtin/am.c:1178 #, c-format @@ -4286,13 +4604,13 @@ msgstr "" #: builtin/am.c:1637 msgid "Falling back to patching base and 3-way merge..." -msgstr "S'està retrocedint a apedaçar la base i fusionar de 3 vies..." +msgstr "S'està retrocedint a apedaçar la base i una fusió de 3 vies..." #: builtin/am.c:1662 msgid "Failed to merge in the changes." -msgstr "S'ha fallat en fusionar els canvis." +msgstr "S'ha produït un error en fusionar els canvis." -#: builtin/am.c:1686 builtin/merge.c:628 +#: builtin/am.c:1686 builtin/merge.c:632 msgid "git write-tree failed to write a tree" msgstr "git write-tree ha fallat en escriure un arbre" @@ -4300,10 +4618,10 @@ msgstr "git write-tree ha fallat en escriure un arbre" msgid "applying to an empty history" msgstr "s'està aplicant a una història buida" -#: builtin/am.c:1706 builtin/commit.c:1769 builtin/merge.c:798 -#: builtin/merge.c:823 +#: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802 +#: builtin/merge.c:827 msgid "failed to write commit object" -msgstr "s'ha fallat en escriure l'objecte de comissió" +msgstr "s'ha produït un error en escriure l'objecte de comissió" #: builtin/am.c:1739 builtin/am.c:1743 #, c-format @@ -4332,7 +4650,7 @@ msgstr "" #: builtin/am.c:1824 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" -msgstr "Índex brut: no es pot aplicar pedaços (bruts: %s)" +msgstr "Índex brut: no es poden aplicar pedaços (bruts: %s)" #: builtin/am.c:1861 builtin/am.c:1933 #, c-format @@ -4360,7 +4678,7 @@ msgid "" "already introduced the same changes; you might want to skip this patch." msgstr "" "Cap canvi - heu oblidat d'usar 'git add'?\n" -"Si no hi ha res a allistar, probablement alguna altra cosa ja ha\n" +"Si no hi ha res per fer «stage», probablement alguna altra cosa ja ha\n" "introduït els mateixos canvis; potser voleu ometre aquest pedaç." #: builtin/am.c:1943 @@ -4379,7 +4697,7 @@ msgstr "No s'ha pogut analitzar l'objecte '%s'." #: builtin/am.c:2103 msgid "failed to clean index" -msgstr "s'ha fallat en netejar l'índex" +msgstr "s'ha produït un error en netejar l'índex" #: builtin/am.c:2137 msgid "" @@ -4415,9 +4733,9 @@ msgid "allow fall back on 3way merging if needed" msgstr "permet retrocedir a una fusió de 3 vies si és necessari" #: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57 -#: builtin/repack.c:172 +#: builtin/repack.c:178 msgid "be quiet" -msgstr "calla" +msgstr "silenciós" #: builtin/am.c:2247 msgid "add a Signed-off-by line to the commit message" @@ -4450,7 +4768,7 @@ msgstr "" #: builtin/am.c:2264 msgid "strip everything before a scissors line" -msgstr "despulla tot abans d'una línia de tissores" +msgstr "elimina tot abans d'una línia de tisores" #: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275 #: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287 @@ -4459,15 +4777,15 @@ msgid "pass it through git-apply" msgstr "passa-ho a través del git-apply" #: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 -#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135 builtin/pull.c:194 -#: builtin/repack.c:181 builtin/repack.c:185 builtin/show-branch.c:644 -#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132 -#: parse-options.h:134 parse-options.h:245 +#: builtin/grep.c:1038 builtin/merge.c:202 builtin/pull.c:135 +#: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191 +#: builtin/show-branch.c:644 builtin/show-ref.c:169 builtin/tag.c:355 +#: parse-options.h:132 parse-options.h:134 parse-options.h:245 msgid "n" msgstr "n" #: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438 -#: builtin/tag.c:372 +#: builtin/tag.c:387 builtin/verify-tag.c:38 msgid "format" msgstr "format" @@ -4490,7 +4808,7 @@ msgstr "sinònims de --continue" #: builtin/am.c:2304 msgid "skip the current patch" -msgstr "salta el pedaç actual" +msgstr "omet el pedaç actual" #: builtin/am.c:2307 msgid "restore the original branch and abort the patching operation." @@ -4504,8 +4822,8 @@ msgstr "menteix sobre la data del comitent" msgid "use current timestamp for author date" msgstr "usa el marc de temps actual per la data d'autor" -#: builtin/am.c:2315 builtin/commit.c:1605 builtin/merge.c:229 -#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:355 +#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:233 +#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:370 msgid "key-id" msgstr "ID de clau" @@ -4527,7 +4845,7 @@ msgstr "" #: builtin/am.c:2341 msgid "failed to read the index" -msgstr "s'ha fallat en llegir l'índex" +msgstr "S'ha produït un error en llegir l'índex" #: builtin/am.c:2356 #, c-format @@ -4586,7 +4904,7 @@ msgstr "git archive: error de protocol" #: builtin/archive.c:68 msgid "git archive: expected a flush" -msgstr "git archive: rentada esperada" +msgstr "git archive: s'esperava una neteja" #: builtin/bisect--helper.c:7 msgid "git bisect--helper --next-all [--no-checkout]" @@ -4608,124 +4926,117 @@ msgstr "git blame [<opcions>] [<opcions-de-revisió>] [<revisió>] [--] fitxer" msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "es documenten les <opcions-de-revisió> en git-rev-list(1)" -#: builtin/blame.c:1781 +#: builtin/blame.c:1786 msgid "Blaming lines" -msgstr "S'estan culpant les línies" +msgstr "S'està fent un «blame»" -#: builtin/blame.c:2577 +#: builtin/blame.c:2582 msgid "Show blame entries as we find them, incrementally" -msgstr "Mostra les entrades de culpa mentre les trobem, incrementalment" +msgstr "Mostra les entrades «blame» mentre les trobem, incrementalment" -#: builtin/blame.c:2578 +#: builtin/blame.c:2583 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" "Mostra un SHA-1 en blanc per les comissions de frontera (Per defecte: " "desactivat)" -#: builtin/blame.c:2579 +#: builtin/blame.c:2584 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" "No tractis les comissions d'arrel com a límits (Per defecte: desactivat)" -#: builtin/blame.c:2580 +#: builtin/blame.c:2585 msgid "Show work cost statistics" msgstr "Mostra les estadístiques de preu de treball" -#: builtin/blame.c:2581 +#: builtin/blame.c:2586 msgid "Force progress reporting" msgstr "Força l'informe de progrés" -#: builtin/blame.c:2582 +#: builtin/blame.c:2587 msgid "Show output score for blame entries" -msgstr "Mostra la puntuació de sortida de les entrades de culpa" +msgstr "Mostra la puntuació de sortida de les entrades «blame»" -#: builtin/blame.c:2583 +#: builtin/blame.c:2588 msgid "Show original filename (Default: auto)" msgstr "Mostra el nom de fitxer original (Per defecte: automàtic)" -#: builtin/blame.c:2584 +#: builtin/blame.c:2589 msgid "Show original linenumber (Default: off)" msgstr "Mostra el número de línia original (Per defecte: desactivat)" -#: builtin/blame.c:2585 +#: builtin/blame.c:2590 msgid "Show in a format designed for machine consumption" msgstr "Presenta en un format dissenyat per consumpció per màquina" -#: builtin/blame.c:2586 +#: builtin/blame.c:2591 msgid "Show porcelain format with per-line commit information" msgstr "Mostra el format de porcellana amb informació de comissió per línia" -#: builtin/blame.c:2587 +#: builtin/blame.c:2592 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" "Usa el mateix mode de sortida que git-annotate (Per defecte: desactivat)" -#: builtin/blame.c:2588 +#: builtin/blame.c:2593 msgid "Show raw timestamp (Default: off)" msgstr "Mostra la marca de temps crua (Per defecte: desactivat)" -#: builtin/blame.c:2589 +#: builtin/blame.c:2594 msgid "Show long commit SHA1 (Default: off)" msgstr "Mostra l'SHA1 de comissió llarg (Per defecte: desactivat)" -#: builtin/blame.c:2590 +#: builtin/blame.c:2595 msgid "Suppress author name and timestamp (Default: off)" msgstr "Omet el nom d'autor i la marca de temps (Per defecte: desactivat)" -#: builtin/blame.c:2591 +#: builtin/blame.c:2596 msgid "Show author email instead of name (Default: off)" msgstr "" "Mostra l'adreça de correu electrònic de l'autor en lloc del nom (Per " "defecte: desactivat)" -#: builtin/blame.c:2592 +#: builtin/blame.c:2597 msgid "Ignore whitespace differences" msgstr "Ignora les diferències d'espai en blanc" -#: builtin/blame.c:2599 -msgid "Use an experimental indent-based heuristic to improve diffs" -msgstr "" -"Usa un heurístic experimental basat en sagnat per a millorar les diferències" - -#: builtin/blame.c:2600 -msgid "Use an experimental blank-line-based heuristic to improve diffs" -msgstr "" -"Usa un heurístic experimental basat en línies en blanc per a millorar les " -"diferències" +#: builtin/blame.c:2604 +msgid "Use an experimental heuristic to improve diffs" +msgstr "Usa un heurístic experimental per a millorar les diferències" -#: builtin/blame.c:2602 +#: builtin/blame.c:2606 msgid "Spend extra cycles to find better match" msgstr "Gasta cicles extres per a trobar una coincidència millor" -#: builtin/blame.c:2603 +#: builtin/blame.c:2607 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Usa les revisions de <fitxer> en lloc d'invocar git-rev-list" -#: builtin/blame.c:2604 +#: builtin/blame.c:2608 msgid "Use <file>'s contents as the final image" msgstr "Usa els continguts de <fitxer> com a la imatge final" -#: builtin/blame.c:2605 builtin/blame.c:2606 +#: builtin/blame.c:2609 builtin/blame.c:2610 msgid "score" msgstr "puntuació" -#: builtin/blame.c:2605 +#: builtin/blame.c:2609 msgid "Find line copies within and across files" msgstr "Troba còpies de línia dins i a través dels fitxers" -#: builtin/blame.c:2606 +#: builtin/blame.c:2610 msgid "Find line movements within and across files" msgstr "Troba moviments de línia dins i a través dels fitxers" -#: builtin/blame.c:2607 +#: builtin/blame.c:2611 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2607 +#: builtin/blame.c:2611 msgid "Process only line range n,m, counting from 1" msgstr "Processa només el rang de línies n,m, comptant des d'1" -#: builtin/blame.c:2654 +#: builtin/blame.c:2658 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "no es pot usar --progress amb els formats --incremental o de porcellana" @@ -4736,42 +5047,42 @@ msgstr "" #. 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:2700 +#: builtin/blame.c:2706 msgid "4 years, 11 months ago" msgstr "fa 4 anys i 11 mesos" -#: builtin/blame.c:2780 +#: builtin/blame.c:2786 msgid "--contents and --reverse do not blend well." -msgstr "--contents i --reverse no es jutgen bé." +msgstr "--contents i --reverse no funcionen bé juntes." -#: builtin/blame.c:2800 +#: builtin/blame.c:2806 msgid "cannot use --contents with final commit object name" msgstr "no es pot usar --contents amb el nom d'objecte de la comissió final" -#: builtin/blame.c:2805 +#: builtin/blame.c:2811 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse i --first-parent-together requereixen una última comissió " "especificada" -#: builtin/blame.c:2832 +#: builtin/blame.c:2838 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "--reverse --first-parent junts requereixen un rang de la cadena de mares " "primeres" -#: builtin/blame.c:2843 +#: builtin/blame.c:2849 #, c-format msgid "no such path %s in %s" msgstr "no hi ha tal camí %s en %s" -#: builtin/blame.c:2854 +#: builtin/blame.c:2860 #, c-format msgid "cannot read blob %s for path %s" msgstr "no es pot llegir el blob %s per al camí %s" -#: builtin/blame.c:2873 +#: builtin/blame.c:2879 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" @@ -4951,46 +5262,46 @@ msgstr "(HEAD separat de %s)" msgid "(no branch)" msgstr "(cap branca)" -#: builtin/branch.c:544 +#: builtin/branch.c:535 #, c-format msgid "Branch %s is being rebased at %s" -msgstr "La branca %s s'està rebasant a %s" +msgstr "S'està fent «rebase» en la branca %s a %s" -#: builtin/branch.c:548 +#: builtin/branch.c:539 #, c-format msgid "Branch %s is being bisected at %s" msgstr "La branca %s s'està bisecant a %s" -#: builtin/branch.c:563 +#: builtin/branch.c:554 msgid "cannot rename the current branch while not on any." msgstr "no es pot canviar el nom de la branca actual mentre no s'és a cap." -#: builtin/branch.c:573 +#: builtin/branch.c:564 #, c-format msgid "Invalid branch name: '%s'" msgstr "Nom de branca no vàlid: '%s'" -#: builtin/branch.c:590 +#: builtin/branch.c:581 msgid "Branch rename failed" msgstr "El canvi de nom de branca ha fallat" -#: builtin/branch.c:594 +#: builtin/branch.c:585 #, c-format msgid "Renamed a misnamed branch '%s' away" -msgstr "S'ha canviat el nom de la branca malanomenada '%s'" +msgstr "S'ha canviat el nom de la branca mal anomenada '%s'" -#: builtin/branch.c:597 +#: builtin/branch.c:588 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "S'ha canviat el nom de la branca a %s, però HEAD no està actualitzat!" -#: builtin/branch.c:604 +#: builtin/branch.c:595 msgid "Branch is renamed, but update of config-file failed" msgstr "" "La branca està canviada de nom, però l'actualització del fitxer de " "configuració ha fallat" -#: builtin/branch.c:620 +#: builtin/branch.c:611 #, c-format msgid "" "Please edit the description for the branch\n" @@ -4999,214 +5310,218 @@ msgid "" msgstr "" "Si us plau, editeu la descripció de la branca\n" " %s\n" -"Es despullaran les línies que comencin amb '%c'.\n" +"S'eliminaran les línies que comencin amb '%c'.\n" -#: builtin/branch.c:651 +#: builtin/branch.c:643 msgid "Generic options" msgstr "Opcions genèriques" -#: builtin/branch.c:653 +#: builtin/branch.c:645 msgid "show hash and subject, give twice for upstream branch" msgstr "mostra el hash i l'assumpte, doneu dues vegades per la branca font" -#: builtin/branch.c:654 +#: builtin/branch.c:646 msgid "suppress informational messages" msgstr "omet els missatges informatius" -#: builtin/branch.c:655 +#: builtin/branch.c:647 msgid "set up tracking mode (see git-pull(1))" msgstr "configura el mode de seguiment (vegeu git-pull(1))" -#: builtin/branch.c:657 +#: builtin/branch.c:649 msgid "change upstream info" msgstr "canvia la informació de font" -#: builtin/branch.c:659 +#: builtin/branch.c:651 msgid "upstream" msgstr "font" -#: builtin/branch.c:659 +#: builtin/branch.c:651 msgid "change the upstream info" msgstr "canvia la informació de font" -#: builtin/branch.c:660 +#: builtin/branch.c:652 msgid "Unset the upstream info" msgstr "Desestableix la informació de font" -#: builtin/branch.c:661 +#: builtin/branch.c:653 msgid "use colored output" msgstr "usa sortida colorada" -#: builtin/branch.c:662 +#: builtin/branch.c:654 msgid "act on remote-tracking branches" msgstr "actua en branques amb seguiment remot" -#: builtin/branch.c:664 builtin/branch.c:665 +#: builtin/branch.c:656 builtin/branch.c:657 msgid "print only branches that contain the commit" msgstr "imprimeix només les branques que continguin la comissió" -#: builtin/branch.c:668 +#: builtin/branch.c:660 msgid "Specific git-branch actions:" msgstr "Accions de git-branch específiques:" -#: builtin/branch.c:669 +#: builtin/branch.c:661 msgid "list both remote-tracking and local branches" msgstr "llista les branques amb seguiment remot i les locals" -#: builtin/branch.c:671 +#: builtin/branch.c:663 msgid "delete fully merged branch" msgstr "suprimeix la branca si està completament fusionada" -#: builtin/branch.c:672 +#: builtin/branch.c:664 msgid "delete branch (even if not merged)" msgstr "suprimeix la branca (encara que no estigui fusionada)" -#: builtin/branch.c:673 +#: builtin/branch.c:665 msgid "move/rename a branch and its reflog" msgstr "mou/canvia de nom una branca i el seu registre de referència" -#: builtin/branch.c:674 +#: builtin/branch.c:666 msgid "move/rename a branch, even if target exists" msgstr "mou/canvia de nom una branca, encara que el destí existeixi" -#: builtin/branch.c:675 +#: builtin/branch.c:667 msgid "list branch names" msgstr "llista els noms de branca" -#: builtin/branch.c:676 +#: builtin/branch.c:668 msgid "create the branch's reflog" msgstr "crea el registre de referència de la branca" -#: builtin/branch.c:678 +#: builtin/branch.c:670 msgid "edit the description for the branch" msgstr "edita la descripció de la branca" -#: builtin/branch.c:679 +#: builtin/branch.c:671 msgid "force creation, move/rename, deletion" msgstr "força creació, moviment/canvi de nom, supressió" -#: builtin/branch.c:680 +#: builtin/branch.c:672 msgid "print only branches that are merged" msgstr "imprimeix només les branques que s'han fusionat" -#: builtin/branch.c:681 +#: builtin/branch.c:673 msgid "print only branches that are not merged" msgstr "imprimeix només les branques que no s'han fusionat" -#: builtin/branch.c:682 +#: builtin/branch.c:674 msgid "list branches in columns" msgstr "llista les branques en columnes" -#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366 +#: builtin/branch.c:675 builtin/for-each-ref.c:38 builtin/tag.c:381 msgid "key" msgstr "clau" -#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367 +#: builtin/branch.c:676 builtin/for-each-ref.c:39 builtin/tag.c:382 msgid "field name to sort on" msgstr "nom del camp en el qual ordenar" -#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:404 +#: builtin/branch.c:678 builtin/for-each-ref.c:41 builtin/notes.c:404 #: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570 -#: builtin/tag.c:369 +#: builtin/tag.c:384 msgid "object" msgstr "objecte" -#: builtin/branch.c:687 +#: builtin/branch.c:679 msgid "print only branches of the object" msgstr "imprimeix només les branques de l'objecte" -#: builtin/branch.c:705 +#: builtin/branch.c:681 builtin/for-each-ref.c:46 builtin/tag.c:388 +msgid "sorting and filtering are case insensitive" +msgstr "l'ordenació i el filtratge distingeixen entre majúscules i minúscules" + +#: builtin/branch.c:698 msgid "Failed to resolve HEAD as a valid ref." -msgstr "S'ha fallat en resoldre HEAD com a referència vàlida." +msgstr "S'ha produït un error en resoldre HEAD com a referència vàlida." -#: builtin/branch.c:709 builtin/clone.c:706 +#: builtin/branch.c:702 builtin/clone.c:706 msgid "HEAD not found below refs/heads!" msgstr "HEAD no trobat sota refs/heads!" -#: builtin/branch.c:729 +#: builtin/branch.c:724 msgid "--column and --verbose are incompatible" msgstr "--column i --verbose són incompatibles" -#: builtin/branch.c:740 builtin/branch.c:782 +#: builtin/branch.c:735 builtin/branch.c:787 msgid "branch name required" msgstr "cal el nom de branca" -#: builtin/branch.c:758 +#: builtin/branch.c:763 msgid "Cannot give description to detached HEAD" msgstr "No es pot donar descripció a un HEAD separat" -#: builtin/branch.c:763 +#: builtin/branch.c:768 msgid "cannot edit description of more than one branch" msgstr "no es pot editar la descripció de més d'una branca" -#: builtin/branch.c:770 +#: builtin/branch.c:775 #, c-format msgid "No commit on branch '%s' yet." msgstr "Encara no hi ha cap comissió en la branca '%s'." -#: builtin/branch.c:773 +#: builtin/branch.c:778 #, c-format msgid "No branch named '%s'." msgstr "No hi ha branca amb nom '%s'." -#: builtin/branch.c:788 +#: builtin/branch.c:793 msgid "too many branches for a rename operation" msgstr "hi ha massa branques per a una operació de canvi de nom" -#: builtin/branch.c:793 +#: builtin/branch.c:798 msgid "too many branches to set new upstream" msgstr "hi ha massa branques per a establir una nova font" -#: builtin/branch.c:797 +#: builtin/branch.c:802 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" "no s'ha pogut establir la font de HEAD com a %s quan no assenyala cap branca." -#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843 +#: builtin/branch.c:805 builtin/branch.c:827 builtin/branch.c:848 #, c-format msgid "no such branch '%s'" msgstr "no hi ha tal branca '%s'" -#: builtin/branch.c:804 +#: builtin/branch.c:809 #, c-format msgid "branch '%s' does not exist" msgstr "la branca '%s' no existeix" -#: builtin/branch.c:816 +#: builtin/branch.c:821 msgid "too many branches to unset upstream" msgstr "hi ha massa branques per a desestablir la font" -#: builtin/branch.c:820 +#: builtin/branch.c:825 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "no s'ha pogut desestablir la font de HEAD perquè no assenyala cap branca." -#: builtin/branch.c:826 +#: builtin/branch.c:831 #, c-format msgid "Branch '%s' has no upstream information" msgstr "La branca '%s' no té informació de font" -#: builtin/branch.c:840 +#: builtin/branch.c:845 msgid "it does not make sense to create 'HEAD' manually" msgstr "no té sentit crear 'HEAD' manualment" -#: builtin/branch.c:846 +#: builtin/branch.c:851 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "les opcions -a i -r a 'git branch' no tenen sentit amb un nom de branca" -#: builtin/branch.c:849 +#: builtin/branch.c:854 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" "track or --set-upstream-to\n" msgstr "" -"La bandera --set-upstream està desaprovada i s'eliminarà. Considereu usar --" +"La bandera --set-upstream està en desús i s'eliminarà. Considereu usar --" "track o --set-upstream-to\n" -#: builtin/branch.c:866 +#: builtin/branch.c:871 #, c-format msgid "" "\n" @@ -5275,13 +5590,13 @@ msgid "for blob objects, run filters on object's content" msgstr "" "en els objectes de blob, executa els filtres en el contingut de l'objecte" -#: builtin/cat-file.c:561 git-submodule.sh:923 +#: builtin/cat-file.c:561 git-submodule.sh:929 msgid "blob" msgstr "blob" #: builtin/cat-file.c:562 msgid "use a specific path for --textconv/--filters" -msgstr "usa un camí especìfic per a --textconv/--filters" +msgstr "usa un camí específic per a --textconv/--filters" #: builtin/cat-file.c:564 msgid "allow -s and -t to work with broken/corrupt objects" @@ -5333,9 +5648,9 @@ msgstr "llegeix els noms de fitxer d'stdin" msgid "terminate input and output records by a NUL character" msgstr "acaba els registres d'entrada i de sortida amb un caràcter NUL" -#: builtin/check-ignore.c:18 builtin/checkout.c:1137 builtin/gc.c:325 +#: builtin/check-ignore.c:18 builtin/checkout.c:1140 builtin/gc.c:332 msgid "suppress progress reporting" -msgstr "omet el reportatge de progrés" +msgstr "omet els informes de progrés" #: builtin/check-ignore.c:26 msgid "show non-matching input paths" @@ -5392,7 +5707,7 @@ msgstr "git checkout-index [<opcions>] [--] [<fitxer>...]" #: builtin/checkout-index.c:144 msgid "stage should be between 1 and 3 or all" -msgstr "l'etapa ha de ser entre 1 i 3 o all" +msgstr "«stage» ha de ser entre 1 i 3 o all" #: builtin/checkout-index.c:160 msgid "check out all files in the index" @@ -5404,7 +5719,8 @@ msgstr "força la sobreescriptura de fitxers existents" #: builtin/checkout-index.c:163 msgid "no warning for existing files and files not in index" -msgstr "cap advertència per a fitxers existents i fitxers no en l'índex" +msgstr "" +"cap advertència per a fitxers existents i fitxers que no siguin a l'índex" #: builtin/checkout-index.c:165 msgid "don't checkout new files" @@ -5423,9 +5739,9 @@ msgid "write the content to temporary files" msgstr "escriu el contingut a fitxers temporals" #: builtin/checkout-index.c:174 builtin/column.c:30 -#: builtin/submodule--helper.c:595 builtin/submodule--helper.c:598 -#: builtin/submodule--helper.c:604 builtin/submodule--helper.c:951 -#: builtin/worktree.c:469 +#: builtin/submodule--helper.c:597 builtin/submodule--helper.c:600 +#: builtin/submodule--helper.c:606 builtin/submodule--helper.c:967 +#: builtin/worktree.c:471 msgid "string" msgstr "cadena" @@ -5435,7 +5751,7 @@ msgstr "en crear fitxers, anteposa <cadena>" #: builtin/checkout-index.c:177 msgid "copy out the files from named stage" -msgstr "copia els fitxers des de l'etapa anomenada" +msgstr "copia els fitxers des de «stage» amb nom" #: builtin/checkout.c:25 msgid "git checkout [<options>] <branch>" @@ -5448,12 +5764,12 @@ msgstr "git checkout [<opcions>] [<branca>] -- <fitxer>..." #: builtin/checkout.c:134 builtin/checkout.c:167 #, c-format msgid "path '%s' does not have our version" -msgstr "el camí '%s' no té la versió nostra" +msgstr "el camí '%s' no té la nostra versió" #: builtin/checkout.c:136 builtin/checkout.c:169 #, c-format msgid "path '%s' does not have their version" -msgstr "el camí '%s' no té la versió seva" +msgstr "el camí '%s' no té la seva versió" #: builtin/checkout.c:152 #, c-format @@ -5490,7 +5806,7 @@ msgstr "'%s' no es pot usar amb %s" #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" -"No es pot actualitzar els camins i canviar a la branca '%s' a la vegada." +"No es poden actualitzar els camins i canviar a la branca '%s' a la vegada." #: builtin/checkout.c:339 builtin/checkout.c:346 #, c-format @@ -5501,50 +5817,50 @@ msgstr "el camí '%s' està sense fusionar" msgid "you need to resolve your current index first" msgstr "heu de primer resoldre el vostre índex actual" -#: builtin/checkout.c:624 +#: builtin/checkout.c:625 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "No es pot fer reflog per a '%s': %s\n" -#: builtin/checkout.c:663 +#: builtin/checkout.c:666 msgid "HEAD is now at" msgstr "HEAD ara és a" -#: builtin/checkout.c:667 builtin/clone.c:660 +#: builtin/checkout.c:670 builtin/clone.c:660 msgid "unable to update HEAD" msgstr "no s'ha pogut actualitzar HEAD" -#: builtin/checkout.c:671 +#: builtin/checkout.c:674 #, c-format msgid "Reset branch '%s'\n" msgstr "Restableix la branca '%s'\n" -#: builtin/checkout.c:674 +#: builtin/checkout.c:677 #, c-format msgid "Already on '%s'\n" msgstr "Ja en '%s'\n" -#: builtin/checkout.c:678 +#: builtin/checkout.c:681 #, c-format msgid "Switched to and reset branch '%s'\n" -msgstr "S'ha agafat i restablert la branca '%s'\n" +msgstr "S'ha canviat i restablert a la branca '%s'\n" -#: builtin/checkout.c:680 builtin/checkout.c:1069 +#: builtin/checkout.c:683 builtin/checkout.c:1072 #, c-format msgid "Switched to a new branch '%s'\n" -msgstr "S'ha agafat la branca nova '%s'\n" +msgstr "S'ha canviat a la branca nova '%s'\n" -#: builtin/checkout.c:682 +#: builtin/checkout.c:685 #, c-format msgid "Switched to branch '%s'\n" -msgstr "S'ha agafat la branca '%s'\n" +msgstr "S'ha canviat a la branca '%s'\n" -#: builtin/checkout.c:733 +#: builtin/checkout.c:736 #, c-format msgid " ... and %d more.\n" msgstr " ... i %d més.\n" -#: builtin/checkout.c:739 +#: builtin/checkout.c:742 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -5567,7 +5883,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:758 +#: builtin/checkout.c:761 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -5594,150 +5910,150 @@ msgstr[1] "" " git branch <nom-de-branca-nova> %s\n" "\n" -#: builtin/checkout.c:794 +#: builtin/checkout.c:797 msgid "internal error in revision walk" msgstr "error intern en el passeig per revisions" -#: builtin/checkout.c:798 +#: builtin/checkout.c:801 msgid "Previous HEAD position was" msgstr "La posició de HEAD anterior era" -#: builtin/checkout.c:825 builtin/checkout.c:1064 +#: builtin/checkout.c:828 builtin/checkout.c:1067 msgid "You are on a branch yet to be born" -msgstr "Sou en una branca que encara ha de nàixer" +msgstr "Sou en una branca que encara ha de néixer" -#: builtin/checkout.c:970 +#: builtin/checkout.c:973 #, c-format msgid "only one reference expected, %d given." msgstr "s'esperava només una referència, s'han donat %d." -#: builtin/checkout.c:1010 builtin/worktree.c:214 +#: builtin/checkout.c:1013 builtin/worktree.c:214 #, c-format msgid "invalid reference: %s" msgstr "referència no vàlida: %s" -#: builtin/checkout.c:1039 +#: builtin/checkout.c:1042 #, c-format msgid "reference is not a tree: %s" msgstr "la referència no és un arbre: %s" -#: builtin/checkout.c:1078 +#: builtin/checkout.c:1081 msgid "paths cannot be used with switching branches" msgstr "els camins no es poden usar amb canvi de branca" -#: builtin/checkout.c:1081 builtin/checkout.c:1085 +#: builtin/checkout.c:1084 builtin/checkout.c:1088 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' no es pot usar amb canvi de branca" -#: builtin/checkout.c:1089 builtin/checkout.c:1092 builtin/checkout.c:1097 -#: builtin/checkout.c:1100 +#: builtin/checkout.c:1092 builtin/checkout.c:1095 builtin/checkout.c:1100 +#: builtin/checkout.c:1103 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' no es pot usar amb '%s'" -#: builtin/checkout.c:1105 +#: builtin/checkout.c:1108 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "No es pot canviar la branca a la no comissió '%s'" -#: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:93 +#: builtin/checkout.c:1141 builtin/checkout.c:1143 builtin/clone.c:93 #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324 #: builtin/worktree.c:326 msgid "branch" msgstr "branca" -#: builtin/checkout.c:1139 +#: builtin/checkout.c:1142 msgid "create and checkout a new branch" msgstr "crea i agafa una branca nova" -#: builtin/checkout.c:1141 +#: builtin/checkout.c:1144 msgid "create/reset and checkout a branch" msgstr "crea/restableix i agafa una branca" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1145 msgid "create reflog for new branch" msgstr "crea un registre de referència per a la branca nova" -#: builtin/checkout.c:1143 builtin/worktree.c:328 +#: builtin/checkout.c:1146 builtin/worktree.c:328 msgid "detach HEAD at named commit" msgstr "separa HEAD a la comissió anomenada" -#: builtin/checkout.c:1144 +#: builtin/checkout.c:1147 msgid "set upstream info for new branch" msgstr "estableix la informació de font de la branca nova" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1149 msgid "new-branch" msgstr "branca-nova" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1149 msgid "new unparented branch" msgstr "branca òrfena nova" -#: builtin/checkout.c:1147 +#: builtin/checkout.c:1150 msgid "checkout our version for unmerged files" msgstr "agafa la versió nostra dels fitxers sense fusionar" -#: builtin/checkout.c:1149 +#: builtin/checkout.c:1152 msgid "checkout their version for unmerged files" msgstr "agafa la versió seva dels fitxers sense fusionar" -#: builtin/checkout.c:1151 +#: builtin/checkout.c:1154 msgid "force checkout (throw away local modifications)" msgstr "agafa a la força (descarta qualsevulla modificació local)" -#: builtin/checkout.c:1152 +#: builtin/checkout.c:1155 msgid "perform a 3-way merge with the new branch" msgstr "realitza una fusió de 3 vies amb la branca nova" -#: builtin/checkout.c:1153 builtin/merge.c:231 +#: builtin/checkout.c:1156 builtin/merge.c:235 msgid "update ignored files (default)" msgstr "actualitza els fitxers ignorats (per defecte)" -#: builtin/checkout.c:1154 builtin/log.c:1466 parse-options.h:251 +#: builtin/checkout.c:1157 builtin/log.c:1466 parse-options.h:251 msgid "style" msgstr "estil" -#: builtin/checkout.c:1155 +#: builtin/checkout.c:1158 msgid "conflict style (merge or diff3)" msgstr "estil de conflicte (fusió o diff3)" -#: builtin/checkout.c:1158 +#: builtin/checkout.c:1161 msgid "do not limit pathspecs to sparse entries only" msgstr "no limitis les especificacions de camí només a entrades disperses" -#: builtin/checkout.c:1160 +#: builtin/checkout.c:1163 msgid "second guess 'git checkout <no-such-branch>'" msgstr "dubta 'git checkout <cap-branca-així>'" -#: builtin/checkout.c:1162 +#: builtin/checkout.c:1165 msgid "do not check if another worktree is holding the given ref" msgstr "no comprovis si altre arbre de treball té la referència donada" -#: builtin/checkout.c:1163 builtin/clone.c:63 builtin/fetch.c:119 -#: builtin/merge.c:228 builtin/pull.c:117 builtin/push.c:536 +#: builtin/checkout.c:1166 builtin/clone.c:63 builtin/fetch.c:119 +#: builtin/merge.c:232 builtin/pull.c:117 builtin/push.c:539 #: builtin/send-pack.c:168 msgid "force progress reporting" msgstr "força l'informe de progrés" -#: builtin/checkout.c:1194 +#: builtin/checkout.c:1197 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B i --orphan són mutualment exclusius" -#: builtin/checkout.c:1211 +#: builtin/checkout.c:1214 msgid "--track needs a branch name" msgstr "--track necessita un nom de branca" -#: builtin/checkout.c:1216 +#: builtin/checkout.c:1219 msgid "Missing branch name; try -b" msgstr "Manca el nom de branca; proveu -b" -#: builtin/checkout.c:1252 +#: builtin/checkout.c:1255 msgid "invalid path specification" msgstr "especificació de camí no vàlida" -#: builtin/checkout.c:1259 +#: builtin/checkout.c:1262 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -5746,12 +6062,12 @@ msgstr "" "No es poden actualitzar els camins i canviar a la branca '%s' a la vegada.\n" "Volíeu agafar '%s', la qual no es pot resoldre com a comissió?" -#: builtin/checkout.c:1264 +#: builtin/checkout.c:1267 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach no accepta un paràmetre de camí '%s'" -#: builtin/checkout.c:1268 +#: builtin/checkout.c:1271 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -5778,31 +6094,33 @@ msgstr "Eliminaria %s\n" #: builtin/clean.c:31 #, c-format msgid "Skipping repository %s\n" -msgstr "S'està saltant el dipòsit %s\n" +msgstr "S'està ometent el dipòsit %s\n" #: builtin/clean.c:32 #, c-format msgid "Would skip repository %s\n" -msgstr "Saltaria el dipòsit %s\n" +msgstr "Ometria el dipòsit %s\n" #: builtin/clean.c:33 #, c-format msgid "failed to remove %s" -msgstr "s'ha fallat en eliminar %s" +msgstr "s'ha produït un error en eliminar %s" -#: builtin/clean.c:291 +#: builtin/clean.c:291 git-add--interactive.perl:623 +#, c-format msgid "" "Prompt help:\n" "1 - select a numbered item\n" "foo - select item based on unique prefix\n" -" - (empty) select nothing" +" - (empty) select nothing\n" msgstr "" -"Ajuda d'avís:\n" +"Ajuda:\n" "1 - selecciona un ítem numerat\n" "foo - selecciona un ítem basat en un prefix únic\n" -" - (buit) no seleccionis res" +" - (buit) no seleccionis res\n" -#: builtin/clean.c:295 +#: builtin/clean.c:295 git-add--interactive.perl:632 +#, fuzzy, c-format msgid "" "Prompt help:\n" "1 - select a single item\n" @@ -5811,20 +6129,21 @@ msgid "" "foo - select item based on unique prefix\n" "-... - unselect specified items\n" "* - choose all items\n" -" - (empty) finish selecting" +" - (empty) finish selecting\n" msgstr "" -"Ajuda d'avís:\n" +"Ajuda:\n" "1 - selecciona un sol ítem\n" "3-5 - selecciona un rang d'ítems\n" "2-3,6-9 - selecciona múltiples rangs\n" "foo - selecciona un ítem basat en un prefix únic\n" "-... - desselecciona els ítems seleccionats\n" "* - tria tots els ítems\n" -" - (buit) finalitza la selecció" +" - (buit) finalitza la selecció\n" -#: builtin/clean.c:511 -#, c-format -msgid "Huh (%s)?" +#: builtin/clean.c:511 git-add--interactive.perl:598 +#: git-add--interactive.perl:603 +#, fuzzy, c-format, perl-format +msgid "Huh (%s)?\n" msgstr "Perdó (%s)?" #: builtin/clean.c:653 @@ -5835,7 +6154,7 @@ msgstr "Introduïu els patrons a ignorar>> " #: builtin/clean.c:690 #, c-format msgid "WARNING: Cannot find items matched by: %s" -msgstr "ADVERTÈNCIA: No es pot trobar ítems que coincideixin amb: %s" +msgstr "ADVERTÈNCIA: No es poden trobar ítems que coincideixin amb: %s" #: builtin/clean.c:711 msgid "Select items to delete" @@ -5847,8 +6166,9 @@ msgstr "Selecciona els ítems a suprimir" msgid "Remove %s [y/N]? " msgstr "Voleu eliminar %s [y/N]? " -#: builtin/clean.c:777 -msgid "Bye." +#: builtin/clean.c:777 git-add--interactive.perl:1669 +#, fuzzy, c-format +msgid "Bye.\n" msgstr "Adéu." #: builtin/clean.c:785 @@ -5869,11 +6189,11 @@ msgstr "" "help - aquesta pantalla\n" "? - ajuda de selecció de l'avís" -#: builtin/clean.c:812 +#: builtin/clean.c:812 git-add--interactive.perl:1745 msgid "*** Commands ***" msgstr "*** Ordres ***" -#: builtin/clean.c:813 +#: builtin/clean.c:813 git-add--interactive.perl:1742 msgid "What now" msgstr "I ara què" @@ -5903,8 +6223,8 @@ msgstr "neteja interactiva" msgid "remove whole directories" msgstr "elimina directoris sencers" -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:725 -#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:182 +#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:1056 +#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:176 msgid "pattern" msgstr "patró" @@ -5929,15 +6249,15 @@ msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" -"clean.requireForce està establerta a veritat i ni -i, -n ni -f s'ha donat; " -"refusant netejar" +"clean.requireForce està establerta a veritat i ni -i, -n ni -f s'han " +"indicat; refusant netejar" #: builtin/clean.c:904 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "" -"clean.requireForce és per defecte veritat i ni -i, -n ni -f s'ha donat; " +"clean.requireForce és per defecte veritat i ni -i, -n ni -f s'han indicat; " "refusant netejar" #: builtin/clone.c:37 @@ -5954,7 +6274,7 @@ msgstr "crea un dipòsit nu" #: builtin/clone.c:70 msgid "create a mirror repository (implies bare)" -msgstr "crea un dipòsit reflectit (implica bare)" +msgstr "crea un dipòsit mirall (implica bare)" #: builtin/clone.c:72 msgid "to clone from a local repository" @@ -5982,10 +6302,10 @@ msgstr "directori-de-plantilla" #: builtin/clone.c:84 builtin/init-db.c:476 msgid "directory from which templates will be used" -msgstr "directori del qual les plantilles s'usaran" +msgstr "directori des del qual s'usaran les plantilles" -#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:602 -#: builtin/submodule--helper.c:954 +#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:604 +#: builtin/submodule--helper.c:970 msgid "reference repository" msgstr "dipòsit de referència" @@ -6009,7 +6329,7 @@ msgstr "agafa <branca> en lloc del HEAD del remot" msgid "path to git-upload-pack on the remote" msgstr "camí a git-upload-pack en el remot" -#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668 builtin/pull.c:202 +#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:999 builtin/pull.c:202 msgid "depth" msgstr "profunditat" @@ -6017,7 +6337,7 @@ msgstr "profunditat" msgid "create a shallow clone of that depth" msgstr "crea un clon superficial de tal profunditat" -#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848 +#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2836 #: parse-options.h:142 msgid "time" msgstr "hora" @@ -6031,7 +6351,8 @@ msgid "revision" msgstr "revisió" #: builtin/clone.c:102 builtin/fetch.c:125 -msgid "deepen history of shallow clone by excluding rev" +#, fuzzy +msgid "deepen history of shallow clone, excluding rev" msgstr "aprofundeix la història d'un clon superficial excloent una revisió" #: builtin/clone.c:104 @@ -6058,13 +6379,13 @@ msgstr "clau=valor" msgid "set config inside the new repository" msgstr "estableix la configuració dins del dipòsit nou" -#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:547 +#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:550 msgid "use IPv4 addresses only" -msgstr "usa només les adreces IPv4" +msgstr "usa només adreces IPv4" -#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:549 +#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:552 msgid "use IPv6 addresses only" -msgstr "usa només les adreces IPv6" +msgstr "usa només adreces IPv6" #: builtin/clone.c:250 msgid "" @@ -6082,7 +6403,7 @@ msgstr "info: No s'ha pogut afegir un alternatiu per a '%s': %s\n" #: builtin/clone.c:375 #, c-format msgid "failed to open '%s'" -msgstr "s'ha fallat en obrir '%s'" +msgstr "s'ha produït un error en obrir '%s'" #: builtin/clone.c:383 #, c-format @@ -6092,17 +6413,17 @@ msgstr "%s existeix i no és directori" #: builtin/clone.c:397 #, c-format msgid "failed to stat %s\n" -msgstr "s'ha fallat en fer stat a '%s'\n" +msgstr "s'ha produït un error en fer stat a '%s'\n" #: builtin/clone.c:419 #, c-format msgid "failed to create link '%s'" -msgstr "s'ha fallat en crear l'enllaç '%s'" +msgstr "s'ha produït un error en crear l'enllaç '%s'" #: builtin/clone.c:423 #, c-format msgid "failed to copy file to '%s'" -msgstr "s'ha fallat en copiar el fitxer a '%s'" +msgstr "s'ha produït un error en copiar el fitxer a '%s'" #: builtin/clone.c:448 #, c-format @@ -6178,7 +6499,7 @@ msgstr "--bare i --separate-git-dir són incompatibles." msgid "repository '%s' does not exist" msgstr "el dipòsit '%s' no existeix" -#: builtin/clone.c:905 builtin/fetch.c:1338 +#: builtin/clone.c:905 builtin/fetch.c:1335 #, c-format msgid "depth %s is not a positive number" msgstr "la profunditat %s no és nombre positiu" @@ -6193,11 +6514,12 @@ msgstr "el camí destí '%s' ja existeix i no és un directori buit." msgid "working tree '%s' already exists." msgstr "l'arbre de treball '%s' ja existeix." -#: builtin/clone.c:940 builtin/clone.c:951 builtin/submodule--helper.c:657 -#: builtin/worktree.c:222 builtin/worktree.c:249 +#: builtin/clone.c:940 builtin/clone.c:951 builtin/difftool.c:252 +#: builtin/submodule--helper.c:659 builtin/worktree.c:222 +#: builtin/worktree.c:249 #, c-format msgid "could not create leading directories of '%s'" -msgstr "no s'ha pogut crear els directoris inicials de '%s'" +msgstr "no s'han pogut crear els directoris inicials de '%s'" #: builtin/clone.c:943 #, c-format @@ -6219,7 +6541,7 @@ msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "" -"clone --recursive no és compatible amb ambdòs --reference i --reference-if-" +"clone --recursive no és compatible amb ambdós --reference i --reference-if-" "able" #: builtin/clone.c:1019 @@ -6369,8 +6691,8 @@ msgid "" " git commit --allow-empty\n" "\n" msgstr "" -"El recull de cireres previ ja està buit, possiblement a causa de resolució " -"de conflicte.\n" +"El «cherry pick» previ ja està buit, possiblement a causa de resolució de " +"conflicte.\n" "Si el voleu cometre de totes maneres, useu:\n" "\n" " git commit --allow-empty\n" @@ -6393,12 +6715,12 @@ msgstr "" "\n" " git reset\n" "\n" -"Llavors \"git cherry-pick --continue\" reprendrà recollint\n" -"com a cireres les comissions restants.\n" +"Llavors \"git cherry-pick --continue\" reprendrà\n" +"com a «cherry pick» les comissions restants.\n" #: builtin/commit.c:318 msgid "failed to unpack HEAD tree object" -msgstr "s'ha fallat en desempaquetar l'objecte d'arbre HEAD" +msgstr "s'ha produït un error en desempaquetar l'objecte d'arbre HEAD" #: builtin/commit.c:359 msgid "unable to create temporary index" @@ -6414,7 +6736,7 @@ msgstr "no s'ha pogut actualitzar l'índex temporal" #: builtin/commit.c:380 msgid "Failed to update main cache tree" -msgstr "S'ha fallat en actualitzar l'arbre principal de memòria cau" +msgstr "s'ha produït un error en actualitzar l'arbre principal de memòria cau" #: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476 msgid "unable to write new_index file" @@ -6426,7 +6748,7 @@ msgstr "no es pot fer una comissió parcial durant una fusió." #: builtin/commit.c:460 msgid "cannot do a partial commit during a cherry-pick." -msgstr "no es pot fer una comissió parcial durant un recull de cireres." +msgstr "no es pot fer una comissió parcial durant un «cherry pick»." #: builtin/commit.c:469 msgid "cannot read the index" @@ -6468,7 +6790,7 @@ msgstr "" msgid "could not lookup commit %s" msgstr "no s'ha pogut trobar la comissió %s" -#: builtin/commit.c:704 builtin/shortlog.c:286 +#: builtin/commit.c:704 builtin/shortlog.c:295 #, c-format msgid "(reading log message from standard input)\n" msgstr "(s'està llegint el missatge de registre des de l'entrada estàndard)\n" @@ -6519,7 +6841,7 @@ msgid "" "and try again.\n" msgstr "" "\n" -"Sembla que podeu estar cometent un recull de cireres.\n" +"Sembla que podeu estar cometent un «cherry pick».\n" "Si això no és correcte, si us plau, elimineu el fitxer\n" "\t%s\n" "i intenteu-ho de nou.\n" @@ -6542,8 +6864,8 @@ msgid "" "An empty message aborts the commit.\n" msgstr "" "Si us plau, introduïu el missatge de comissió dels vostres canvis.\n" -"Es retindran les línies començants amb '%c'; podeu eliminar-les per vós\n" -"mateix si voleu. Un missatge buit avorta la comissió.\n" +"Es retindran les línies començants amb '%c'; podeu eliminar-les vosaltres\n" +"mateixos si voleu. Un missatge buit avorta la comissió.\n" #: builtin/commit.c:859 #, c-format @@ -6568,10 +6890,10 @@ msgstr "No es pot llegir l'índex" msgid "Error building trees" msgstr "Error en construir arbres" -#: builtin/commit.c:969 builtin/tag.c:266 +#: builtin/commit.c:968 builtin/tag.c:280 #, c-format msgid "Please supply the message using either -m or -F option.\n" -msgstr "Si us plau, proveïu el missatge per usar o l'opció -m o l'opció -F.\n" +msgstr "Si us plau, proveïu el missatge usant l'opció -m o l'opció -F.\n" #: builtin/commit.c:1071 #, c-format @@ -6580,7 +6902,7 @@ msgstr "" "--author '%s' no és 'Nom <adreça-de-correu-electrònic>' i no coincideix amb\n" "cap autor existent" -#: builtin/commit.c:1086 builtin/commit.c:1327 +#: builtin/commit.c:1086 builtin/commit.c:1325 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Mode de fitxers no seguits no vàlid '%s'" @@ -6603,7 +6925,7 @@ msgstr "Esteu enmig d'una fusió -- no es pot esmenar." #: builtin/commit.c:1168 msgid "You are in the middle of a cherry-pick -- cannot amend." -msgstr "Esteu enmig d'un recull de cireres -- no es pot esmenar." +msgstr "Esteu enmig d'un «cherry pick» -- no es pot esmenar." #: builtin/commit.c:1171 msgid "Options --squash and --fixup cannot be used together" @@ -6630,69 +6952,65 @@ msgid "No paths with --include/--only does not make sense." msgstr "--include/--only no té sentit sense camí." #: builtin/commit.c:1212 -msgid "Clever... amending the last one with dirty index." -msgstr "Intel·ligent... s'està esmenant l'últim amb índex brut." - -#: builtin/commit.c:1214 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" -"S'han especificat camins explícits sense -i o -o; s'està presumint camins --" -"only..." +"S'han especificat camins explícits sense -i o -o; s'està presumint --only " +"camins..." -#: builtin/commit.c:1226 builtin/tag.c:474 +#: builtin/commit.c:1224 builtin/tag.c:495 #, c-format msgid "Invalid cleanup mode %s" msgstr "Mode de neteja no vàlid %s" -#: builtin/commit.c:1231 +#: builtin/commit.c:1229 msgid "Paths with -a does not make sense." msgstr "-a no té sentit amb camins." -#: builtin/commit.c:1341 builtin/commit.c:1617 +#: builtin/commit.c:1339 builtin/commit.c:1612 msgid "show status concisely" msgstr "mostra l'estat concisament" -#: builtin/commit.c:1343 builtin/commit.c:1619 +#: builtin/commit.c:1341 builtin/commit.c:1614 msgid "show branch information" msgstr "mostra la informació de branca" -#: builtin/commit.c:1345 +#: builtin/commit.c:1343 msgid "version" msgstr "versió" -#: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522 -#: builtin/worktree.c:440 +#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525 +#: builtin/worktree.c:442 msgid "machine-readable output" msgstr "sortida llegible per màquina" -#: builtin/commit.c:1348 builtin/commit.c:1623 +#: builtin/commit.c:1346 builtin/commit.c:1618 msgid "show status in long format (default)" msgstr "mostra l'estat en format llarg (per defecte)" -#: builtin/commit.c:1351 builtin/commit.c:1626 +#: builtin/commit.c:1349 builtin/commit.c:1621 msgid "terminate entries with NUL" msgstr "acaba les entrades amb NUL" -#: builtin/commit.c:1353 builtin/commit.c:1629 builtin/fast-export.c:981 -#: builtin/fast-export.c:984 builtin/tag.c:353 +#: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981 +#: builtin/fast-export.c:984 builtin/tag.c:368 msgid "mode" msgstr "mode" -#: builtin/commit.c:1354 builtin/commit.c:1629 +#: builtin/commit.c:1352 builtin/commit.c:1624 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "mostra els fitxers no seguits, modes opcionals: all, normal, no. (Per " "defecte: all)" -#: builtin/commit.c:1357 +#: builtin/commit.c:1355 msgid "show ignored files" msgstr "mostra els fitxers ignorats" -#: builtin/commit.c:1358 parse-options.h:155 +#: builtin/commit.c:1356 parse-options.h:155 msgid "when" msgstr "quan" -#: builtin/commit.c:1359 +#: builtin/commit.c:1357 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -6700,202 +7018,202 @@ msgstr "" "ignora els canvis als submòduls, opcional quan: all, dirty, untracked. (Per " "defecte: all)" -#: builtin/commit.c:1361 +#: builtin/commit.c:1359 msgid "list untracked files in columns" msgstr "mostra els fitxers no seguits en columnes" -#: builtin/commit.c:1437 +#: builtin/commit.c:1435 msgid "couldn't look up newly created commit" msgstr "no s'ha pogut trobar la comissió novament creada" -#: builtin/commit.c:1439 +#: builtin/commit.c:1437 msgid "could not parse newly created commit" msgstr "no s'ha pogut analitzar la comissió novament creada" -#: builtin/commit.c:1484 +#: builtin/commit.c:1482 msgid "detached HEAD" msgstr "HEAD separat" -#: builtin/commit.c:1487 +#: builtin/commit.c:1485 msgid " (root-commit)" msgstr " (comissió d'arrel)" -#: builtin/commit.c:1587 +#: builtin/commit.c:1582 msgid "suppress summary after successful commit" msgstr "omet el resum després d'una comissió reeixida" -#: builtin/commit.c:1588 +#: builtin/commit.c:1583 msgid "show diff in commit message template" msgstr "mostra la diferència en la plantilla de missatge de comissió" -#: builtin/commit.c:1590 +#: builtin/commit.c:1585 msgid "Commit message options" msgstr "Opcions de missatge de comissió" -#: builtin/commit.c:1591 builtin/tag.c:351 +#: builtin/commit.c:1586 builtin/tag.c:366 msgid "read message from file" msgstr "llegiu el missatge des d'un fitxer" -#: builtin/commit.c:1592 +#: builtin/commit.c:1587 msgid "author" msgstr "autor" -#: builtin/commit.c:1592 +#: builtin/commit.c:1587 msgid "override author for commit" msgstr "autor corregit de la comissió" -#: builtin/commit.c:1593 builtin/gc.c:326 +#: builtin/commit.c:1588 builtin/gc.c:333 msgid "date" msgstr "data" -#: builtin/commit.c:1593 +#: builtin/commit.c:1588 msgid "override date for commit" msgstr "data corregida de la comissió" -#: builtin/commit.c:1594 builtin/merge.c:220 builtin/notes.c:398 -#: builtin/notes.c:561 builtin/tag.c:349 +#: builtin/commit.c:1589 builtin/merge.c:222 builtin/notes.c:398 +#: builtin/notes.c:561 builtin/tag.c:364 msgid "message" msgstr "missatge" -#: builtin/commit.c:1594 +#: builtin/commit.c:1589 msgid "commit message" msgstr "missatge de comissió" -#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597 -#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:79 +#: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592 +#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:81 msgid "commit" msgstr "comissió" -#: builtin/commit.c:1595 +#: builtin/commit.c:1590 msgid "reuse and edit message from specified commit" msgstr "reusa i edita el missatge de la comissió especificada" -#: builtin/commit.c:1596 +#: builtin/commit.c:1591 msgid "reuse message from specified commit" msgstr "reusa el missatge de la comissió especificada" -#: builtin/commit.c:1597 +#: builtin/commit.c:1592 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "usa el missatge formatat d'aixafada automàtica per a arreglar la comissió " "especificada" -#: builtin/commit.c:1598 +#: builtin/commit.c:1593 msgid "use autosquash formatted message to squash specified commit" msgstr "" "usa el missatge formatat d'aixafada automàtica per a aixafar la comissió " "especificada" -#: builtin/commit.c:1599 +#: builtin/commit.c:1594 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "l'autor de la comissió ja sóc jo (s'usa amb -C/-c/--amend)" -#: builtin/commit.c:1600 builtin/log.c:1413 builtin/revert.c:86 +#: builtin/commit.c:1595 builtin/log.c:1413 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "afegeix Signed-off-by:" -#: builtin/commit.c:1601 +#: builtin/commit.c:1596 msgid "use specified template file" msgstr "usa el fitxer de plantilla especificat" -#: builtin/commit.c:1602 +#: builtin/commit.c:1597 msgid "force edit of commit" msgstr "força l'edició de la comissió" -#: builtin/commit.c:1603 +#: builtin/commit.c:1598 msgid "default" msgstr "per defecte" -#: builtin/commit.c:1603 builtin/tag.c:354 +#: builtin/commit.c:1598 builtin/tag.c:369 msgid "how to strip spaces and #comments from message" -msgstr "com despullar els espais i #comentaris del missatge" +msgstr "com suprimir els espais i #comentaris del missatge" -#: builtin/commit.c:1604 +#: builtin/commit.c:1599 msgid "include status in commit message template" msgstr "inclou l'estat en la plantilla de missatge de comissió" -#: builtin/commit.c:1606 builtin/merge.c:230 builtin/pull.c:166 +#: builtin/commit.c:1601 builtin/merge.c:234 builtin/pull.c:166 #: builtin/revert.c:93 msgid "GPG sign commit" msgstr "signa la comissió amb GPG" -#: builtin/commit.c:1609 +#: builtin/commit.c:1604 msgid "Commit contents options" msgstr "Opcions dels continguts de les comissions" -#: builtin/commit.c:1610 +#: builtin/commit.c:1605 msgid "commit all changed files" msgstr "comet tots els fitxers canviats" -#: builtin/commit.c:1611 +#: builtin/commit.c:1606 msgid "add specified files to index for commit" msgstr "afegeix els fitxers especificats a l'índex per a cometre" -#: builtin/commit.c:1612 +#: builtin/commit.c:1607 msgid "interactively add files" msgstr "afegeix els fitxers interactivament" -#: builtin/commit.c:1613 +#: builtin/commit.c:1608 msgid "interactively add changes" msgstr "afegeix els canvis interactivament" -#: builtin/commit.c:1614 +#: builtin/commit.c:1609 msgid "commit only specified files" msgstr "comet només els fitxers especificats" -#: builtin/commit.c:1615 +#: builtin/commit.c:1610 msgid "bypass pre-commit and commit-msg hooks" msgstr "evita els ganxos de precomissió i missatge de comissió" -#: builtin/commit.c:1616 +#: builtin/commit.c:1611 msgid "show what would be committed" msgstr "mostra què es cometria" -#: builtin/commit.c:1627 +#: builtin/commit.c:1622 msgid "amend previous commit" msgstr "esmena la comissió anterior" -#: builtin/commit.c:1628 +#: builtin/commit.c:1623 msgid "bypass post-rewrite hook" -msgstr "evita el ganxo de postreescriure" +msgstr "evita el ganxo de post escriptura" -#: builtin/commit.c:1633 +#: builtin/commit.c:1628 msgid "ok to record an empty change" msgstr "està bé registrar un canvi buit" -#: builtin/commit.c:1635 +#: builtin/commit.c:1630 msgid "ok to record a change with an empty message" msgstr "està bé registrar un canvi amb missatge buit" -#: builtin/commit.c:1664 +#: builtin/commit.c:1659 msgid "could not parse HEAD commit" msgstr "no s'ha pogut analitzar la comissió HEAD" -#: builtin/commit.c:1712 +#: builtin/commit.c:1707 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Fitxer MERGE_HEAD malmès (%s)" -#: builtin/commit.c:1719 +#: builtin/commit.c:1714 msgid "could not read MERGE_MODE" msgstr "no s'ha pogut llegir MERGE_MODE" -#: builtin/commit.c:1738 +#: builtin/commit.c:1733 #, c-format msgid "could not read commit message: %s" msgstr "no s'ha pogut llegir el missatge de comissió: %s" -#: builtin/commit.c:1749 +#: builtin/commit.c:1744 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "S'està avortant la comissió; no heu editat el missatge.\n" -#: builtin/commit.c:1754 +#: builtin/commit.c:1749 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "S'està avortant la comissió a causa d'un missatge de comissió buit.\n" -#: builtin/commit.c:1802 +#: builtin/commit.c:1797 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -7038,7 +7356,7 @@ msgstr "respecta les directives d'inclusió en cercar" #: builtin/config.c:85 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" -"mostra l'origen de la configuració (fitxer, entrada estàndar, blob, línia " +"mostra l'origen de la configuració (fitxer, entrada estàndard, blob, línia " "d'ordres)" #: builtin/config.c:327 @@ -7072,7 +7390,7 @@ msgid "" " Use a regexp, --add or --replace-all to change %s." msgstr "" "no es pot sobreescriure múltiples valors amb un sol valor\n" -" Useu una expresió regular, --add o --replace-all per a canviar %s." +" Useu una expressió regular, --add o --replace-all per a canviar %s." #: builtin/count-objects.c:86 msgid "git count-objects [-v] [-H | --human-readable]" @@ -7172,11 +7490,11 @@ msgstr "estratègia de cerca de depuració en stderr" #: builtin/describe.c:398 msgid "use any ref" -msgstr "usa qualsevulla referència" +msgstr "usa qualsevol referència" #: builtin/describe.c:399 msgid "use any tag, even unannotated" -msgstr "usa qualsevulla etiqueta, fins i tot aquelles sense anotar" +msgstr "usa qualsevol etiqueta, fins i tot aquelles sense anotar" #: builtin/describe.c:400 msgid "always use long format" @@ -7251,6 +7569,90 @@ msgstr "s'ha donat més de dos blobs: '%s" msgid "unhandled object '%s' given." msgstr "s'ha donat l'objecte no gestionat '%s'." +#: builtin/difftool.c:28 +#, fuzzy +msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" +msgstr "git log [<opcions>] [<rang-de-revisions>] [[--] <camí>...]" + +#: builtin/difftool.c:241 +#, fuzzy, c-format +msgid "failed: %d" +msgstr "el pedaç ha fallat: %s:%ld" + +#: builtin/difftool.c:342 +msgid "" +"combined diff formats('-c' and '--cc') are not supported in\n" +"directory diff mode('-d' and '--dir-diff')." +msgstr "" + +#: builtin/difftool.c:567 +#, c-format +msgid "both files modified: '%s' and '%s'." +msgstr "s'han modificat ambdós fitxers: '%s' i '%s'." + +#: builtin/difftool.c:569 +msgid "working tree file has been left." +msgstr "s'ha deixat un fitxer de l'arbre de treball." + +#: builtin/difftool.c:580 +#, c-format +msgid "temporary files exist in '%s'." +msgstr "existeix un fitxer temporal a %s'." + +#: builtin/difftool.c:581 +msgid "you may want to cleanup or recover these." +msgstr "podeu voleu netejar o recuperar-los." + +#: builtin/difftool.c:626 +msgid "use `diff.guitool` instead of `diff.tool`" +msgstr "utilitza `diff.guitool` en comptes de `diff.tool`" + +#: builtin/difftool.c:628 +msgid "perform a full-directory diff" +msgstr "fes un diff de tot el directori" + +#: builtin/difftool.c:630 +msgid "do not prompt before launching a diff tool" +msgstr "no preguntis abans d'executar l'eina diff" + +#: builtin/difftool.c:636 +msgid "use symlinks in dir-diff mode" +msgstr "utilitza enllaços simbòlics en mode dir-diff" + +#: builtin/difftool.c:637 +msgid "<tool>" +msgstr "<tool>" + +#: builtin/difftool.c:638 +msgid "use the specified diff tool" +msgstr "utilitza l'eina de diff especificada" + +#: builtin/difftool.c:640 +msgid "print a list of diff tools that may be used with `--tool`" +msgstr "imprimeix una llista de totes les eines diff que es podeu usar amb `--tool`" + +#: builtin/difftool.c:643 +msgid "" +"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " +"code" +msgstr "" + +#: builtin/difftool.c:645 +msgid "<command>" +msgstr "<command>" + +#: builtin/difftool.c:646 +msgid "specify a custom command for viewing diffs" +msgstr "especifiqueu una ordre personalitzada per veure diffs" + +#: builtin/difftool.c:670 +msgid "no <tool> given for --tool=<tool>" +msgstr "no s'ha proporcionat <tool> per --tool=<tool>" + +#: builtin/difftool.c:677 +msgid "no <cmd> given for --extcmd=<cmd>" +msgstr "no s'ha proporcionat <cmd> per --extcmd=<cmd>" + #: builtin/fast-export.c:25 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [opcions-de-llista-de-revisions]" @@ -7289,7 +7691,7 @@ msgstr "Usa la característica done per a acabar el corrent" #: builtin/fast-export.c:997 msgid "Skip output of blob data" -msgstr "Salta l'emissió de dades de blob" +msgstr "Omet l'emissió de dades de blob" #: builtin/fast-export.c:998 msgid "refspec" @@ -7407,78 +7809,78 @@ msgstr "mapa de referències" msgid "specify fetch refmap" msgstr "mostra el mapa de referències d'obtenció" -#: builtin/fetch.c:398 +#: builtin/fetch.c:395 msgid "Couldn't find remote ref HEAD" msgstr "No s'ha pogut trobar la referència HEAD remota" -#: builtin/fetch.c:514 +#: builtin/fetch.c:511 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "la configuració fetch.output conté un valor no vàlid %s" -#: builtin/fetch.c:607 +#: builtin/fetch.c:604 #, c-format msgid "object %s not found" msgstr "objecte %s no trobat" -#: builtin/fetch.c:611 +#: builtin/fetch.c:608 msgid "[up to date]" msgstr "[al dia]" -#: builtin/fetch.c:624 builtin/fetch.c:704 +#: builtin/fetch.c:621 builtin/fetch.c:701 msgid "[rejected]" msgstr "[rebutjat]" -#: builtin/fetch.c:625 +#: builtin/fetch.c:622 msgid "can't fetch in current branch" msgstr "no es pot obtenir en la branca actual" -#: builtin/fetch.c:634 +#: builtin/fetch.c:631 msgid "[tag update]" msgstr "[actualització d'etiqueta]" -#: builtin/fetch.c:635 builtin/fetch.c:668 builtin/fetch.c:684 -#: builtin/fetch.c:699 +#: builtin/fetch.c:632 builtin/fetch.c:665 builtin/fetch.c:681 +#: builtin/fetch.c:696 msgid "unable to update local ref" msgstr "no s'ha pogut actualitzar la referència local" -#: builtin/fetch.c:654 +#: builtin/fetch.c:651 msgid "[new tag]" msgstr "[etiqueta nova]" -#: builtin/fetch.c:657 +#: builtin/fetch.c:654 msgid "[new branch]" msgstr "[branca nova]" -#: builtin/fetch.c:660 +#: builtin/fetch.c:657 msgid "[new ref]" msgstr "[referència nova]" -#: builtin/fetch.c:699 +#: builtin/fetch.c:696 msgid "forced update" msgstr "actualització forçada" -#: builtin/fetch.c:704 +#: builtin/fetch.c:701 msgid "non-fast-forward" msgstr "sense avanç ràpid" -#: builtin/fetch.c:749 +#: builtin/fetch.c:746 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s no ha enviat tots els objectes necessaris\n" -#: builtin/fetch.c:769 +#: builtin/fetch.c:766 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" "rebutja %s perquè no es permet que les arrels superficials s'actualitzin" -#: builtin/fetch.c:856 builtin/fetch.c:952 +#: builtin/fetch.c:853 builtin/fetch.c:949 #, c-format msgid "From %.*s\n" msgstr "De %.*s\n" -#: builtin/fetch.c:867 +#: builtin/fetch.c:864 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -7486,98 +7888,98 @@ msgid "" msgstr "" "algunes referències locals no s'han pogut actualitzar;\n" " intenteu executar 'git remote prune %s' per a eliminar\n" -" qualsevulla branca antiga o conflictiva" +" qualsevol branca antiga o conflictiva" -#: builtin/fetch.c:922 +#: builtin/fetch.c:919 #, c-format msgid " (%s will become dangling)" msgstr " (%s es tornarà penjant)" -#: builtin/fetch.c:923 +#: builtin/fetch.c:920 #, c-format msgid " (%s has become dangling)" msgstr " (%s s'ha tornat penjant)" -#: builtin/fetch.c:955 +#: builtin/fetch.c:952 msgid "[deleted]" msgstr "[suprimit]" -#: builtin/fetch.c:956 builtin/remote.c:1020 +#: builtin/fetch.c:953 builtin/remote.c:1020 msgid "(none)" msgstr "(cap)" -#: builtin/fetch.c:979 +#: builtin/fetch.c:976 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "S'està refusant obtenir en la branca actual %s d'un dipòsit no nu" -#: builtin/fetch.c:998 +#: builtin/fetch.c:995 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "L'opció \"%s\" amb valor \"%s\" no és vàlida per a %s" -#: builtin/fetch.c:1001 +#: builtin/fetch.c:998 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "S'ignora l'opció \"%s\" per a %s\n" -#: builtin/fetch.c:1077 +#: builtin/fetch.c:1074 #, c-format msgid "Don't know how to fetch from %s" msgstr "No se sap com obtenir de %s" -#: builtin/fetch.c:1237 +#: builtin/fetch.c:1234 #, c-format msgid "Fetching %s\n" msgstr "S'està obtenint %s\n" -#: builtin/fetch.c:1239 builtin/remote.c:96 +#: builtin/fetch.c:1236 builtin/remote.c:96 #, c-format msgid "Could not fetch %s" msgstr "No s'ha pogut obtenir %s" -#: builtin/fetch.c:1257 +#: builtin/fetch.c:1254 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "" -"Cap dipòsit remot especificat. Si us plau, especifiqueu o un URL o\n" +"Cap dipòsit remot especificat. Si us plau, especifiqueu un URL o\n" "un nom remot del qual es deuen obtenir les revisions noves." -#: builtin/fetch.c:1280 +#: builtin/fetch.c:1277 msgid "You need to specify a tag name." msgstr "Necessiteu especificar un nom d'etiqueta." -#: builtin/fetch.c:1322 +#: builtin/fetch.c:1319 msgid "Negative depth in --deepen is not supported" msgstr "No s'admet una profunditat negativa en --deepen" -#: builtin/fetch.c:1324 +#: builtin/fetch.c:1321 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen i --depth són mutualment exclusius" -#: builtin/fetch.c:1329 +#: builtin/fetch.c:1326 msgid "--depth and --unshallow cannot be used together" msgstr "--depth i --unshallow no es poden usar junts" -#: builtin/fetch.c:1331 +#: builtin/fetch.c:1328 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow en un dipòsit complet no té sentit" -#: builtin/fetch.c:1353 +#: builtin/fetch.c:1350 msgid "fetch --all does not take a repository argument" msgstr "fetch --all no accepta un paràmetre de dipòsit" -#: builtin/fetch.c:1355 +#: builtin/fetch.c:1352 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all no té sentit amb especificacions de referència" -#: builtin/fetch.c:1366 +#: builtin/fetch.c:1363 #, c-format msgid "No such remote or remote group: %s" msgstr "No hi ha tal remot ni tal grup remot: %s" -#: builtin/fetch.c:1374 +#: builtin/fetch.c:1371 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Obtenir un grup i especificar referències no té sentit" @@ -7593,7 +7995,7 @@ msgstr "emplena el registre amb <n> entrades del registre curt com a màxim" #: builtin/fmt-merge-msg.c:666 msgid "alias for --log (deprecated)" -msgstr "àlies per --log (desaprovat)" +msgstr "àlies per --log (en desús)" #: builtin/fmt-merge-msg.c:669 msgid "text" @@ -7645,7 +8047,7 @@ msgstr "posa els marcadors de posició entre cometes adequades per al Tcl" msgid "show only <n> matched refs" msgstr "mostra només <n> referències coincidents" -#: builtin/for-each-ref.c:37 builtin/tag.c:372 +#: builtin/for-each-ref.c:37 builtin/tag.c:387 builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "format a usar en la sortida" @@ -7665,63 +8067,63 @@ msgstr "imprimeix només les referències que no s'han fusionat" msgid "print only refs which contain the commit" msgstr "imprimeix només les referències que continguin la comissió" -#: builtin/fsck.c:519 +#: builtin/fsck.c:554 msgid "Checking object directories" msgstr "S'estan comprovant els directoris d'objecte" -#: builtin/fsck.c:588 +#: builtin/fsck.c:646 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<opcions>] [<objecte>...]" -#: builtin/fsck.c:594 +#: builtin/fsck.c:652 msgid "show unreachable objects" msgstr "mostra els objectes inabastables" -#: builtin/fsck.c:595 +#: builtin/fsck.c:653 msgid "show dangling objects" msgstr "mostra els objectes penjants" -#: builtin/fsck.c:596 +#: builtin/fsck.c:654 msgid "report tags" msgstr "informa de les etiquetes" -#: builtin/fsck.c:597 +#: builtin/fsck.c:655 msgid "report root nodes" msgstr "informa dels nodes d'arrel" -#: builtin/fsck.c:598 +#: builtin/fsck.c:656 msgid "make index objects head nodes" msgstr "fes els objectes d'índex nodes de cap" -#: builtin/fsck.c:599 +#: builtin/fsck.c:657 msgid "make reflogs head nodes (default)" msgstr "fes que els registres de referències siguin nodes de cap (per defecte)" -#: builtin/fsck.c:600 +#: builtin/fsck.c:658 msgid "also consider packs and alternate objects" msgstr "també considera els paquets i els objectes alternatius" -#: builtin/fsck.c:601 +#: builtin/fsck.c:659 msgid "check only connectivity" msgstr "comprova només la connectivitat" -#: builtin/fsck.c:602 +#: builtin/fsck.c:660 msgid "enable more strict checking" msgstr "habilita la comprovació més estricta" -#: builtin/fsck.c:604 +#: builtin/fsck.c:662 msgid "write dangling objects in .git/lost-found" msgstr "escriu objectes penjants a .git/lost-found" -#: builtin/fsck.c:605 builtin/prune.c:107 +#: builtin/fsck.c:663 builtin/prune.c:107 msgid "show progress" msgstr "mostra el progrés" -#: builtin/fsck.c:606 +#: builtin/fsck.c:664 msgid "show verbose names for reachable objects" msgstr "mostra els noms detallats dels objectes abastables" -#: builtin/fsck.c:665 +#: builtin/fsck.c:725 msgid "Checking objects" msgstr "S'estan comprovant els objectes" @@ -7739,7 +8141,7 @@ msgstr "%s no vàlid: %s" msgid "insanely long object directory %.*s" msgstr "directori d'objectes increïblement llarg %.*s" -#: builtin/gc.c:290 +#: builtin/gc.c:297 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -7748,290 +8150,308 @@ msgid "" "\n" "%s" msgstr "" -"L'última execució de gc ha informat d'ho següent. Si us plau, corregiu\n" +"L'última execució de gc ha informat el següent. Si us plau, corregiu\n" "la causa primordial i elimineu %s.\n" "No es realitzarà la neteja automàtica fins que s'elimini el fitxer.\n" "\n" "%s" -#: builtin/gc.c:327 +#: builtin/gc.c:334 msgid "prune unreferenced objects" msgstr "poda objectes sense referència" -#: builtin/gc.c:329 +#: builtin/gc.c:336 msgid "be more thorough (increased runtime)" msgstr "sigues més exhaustiu (el temps d'execució augmenta)" -#: builtin/gc.c:330 +#: builtin/gc.c:337 msgid "enable auto-gc mode" msgstr "habilita el mode de recollida d'escombraries automàtica" -#: builtin/gc.c:331 +#: builtin/gc.c:338 msgid "force running gc even if there may be another gc running" msgstr "força l'execució de gc encara que hi pugui haver un altre gc executant" -#: builtin/gc.c:373 +#: builtin/gc.c:380 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" "S'està empaquetant el dipòsit automàticament en el fons per rendiment " "òptim.\n" -#: builtin/gc.c:375 +#: builtin/gc.c:382 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "S'està empaquetant automàticament el dipòsit per rendiment òptim.\n" -#: builtin/gc.c:376 +#: builtin/gc.c:383 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Vegeu \"git help gc\" per neteja manual.\n" -#: builtin/gc.c:397 +#: builtin/gc.c:404 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "" "gc ja s'està executant en la màquina '%s' pid %<PRIuMAX> (useu --force si no)" -#: builtin/gc.c:441 +#: builtin/gc.c:448 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" "Hi ha massa objectes solts inabastables; executeu 'git prune' per a eliminar-" "los." -#: builtin/grep.c:23 +#: builtin/grep.c:25 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<opcions>] [-e] <patró> [<revisió>...] [[--] <camí>...]" -#: builtin/grep.c:219 +#: builtin/grep.c:232 #, c-format msgid "grep: failed to create thread: %s" -msgstr "grep: s'ha fallat en crear fil: %s" +msgstr "grep: s'ha produït un error en crear fil: %s" -#: builtin/grep.c:277 +#: builtin/grep.c:290 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "s'ha especificat un nombre de fils no vàlid (%d) per a %s" -#: builtin/grep.c:453 builtin/grep.c:488 +#: builtin/grep.c:763 builtin/grep.c:804 #, c-format msgid "unable to read tree (%s)" msgstr "no s'ha pogut llegir l'arbre (%s)" -#: builtin/grep.c:503 +#: builtin/grep.c:823 #, c-format msgid "unable to grep from object of type %s" msgstr "no es pot fer grep des d'un objecte de tipus %s" -#: builtin/grep.c:561 +#: builtin/grep.c:887 #, c-format msgid "switch `%c' expects a numerical value" msgstr "l'opció `%c' espera un valor numèric" -#: builtin/grep.c:647 +#: builtin/grep.c:973 msgid "search in index instead of in the work tree" msgstr "cerca en l'índex en lloc de l'arbre de treball" -#: builtin/grep.c:649 +#: builtin/grep.c:975 msgid "find in contents not managed by git" msgstr "cerca en continguts no gestionats per git" -#: builtin/grep.c:651 +#: builtin/grep.c:977 msgid "search in both tracked and untracked files" msgstr "cerca tant en fitxers seguits com en no seguits" -#: builtin/grep.c:653 +#: builtin/grep.c:979 msgid "ignore files specified via '.gitignore'" msgstr "ignora els fitxers especificats mitjançant '.gitignore'" -#: builtin/grep.c:656 +#: builtin/grep.c:981 +msgid "recursivley search in each submodule" +msgstr "cerca recursivament a cada submòduls" + +#: builtin/grep.c:983 +#, fuzzy +msgid "basename" +msgstr "canvi de nom" + +#: builtin/grep.c:984 +#, fuzzy +msgid "prepend parent project's basename to output" +msgstr "anteposa això a la sortida de camí del submòdul" + +#: builtin/grep.c:987 msgid "show non-matching lines" msgstr "mostra les línies no coincidents" -#: builtin/grep.c:658 +#: builtin/grep.c:989 msgid "case insensitive matching" msgstr "coincidència insensible a majúscula i minúscula" -#: builtin/grep.c:660 +#: builtin/grep.c:991 msgid "match patterns only at word boundaries" msgstr "coincideix amb els patrons només als límits de paraula" -#: builtin/grep.c:662 +#: builtin/grep.c:993 msgid "process binary files as text" msgstr "processa els fitxers binaris com a text" -#: builtin/grep.c:664 +#: builtin/grep.c:995 msgid "don't match patterns in binary files" msgstr "no coincideixis amb els patrons en els fitxers binaris" -#: builtin/grep.c:667 +#: builtin/grep.c:998 msgid "process binary files with textconv filters" msgstr "processa els fitxers binaris amb filtres de textconv" -#: builtin/grep.c:669 +#: builtin/grep.c:1000 msgid "descend at most <depth> levels" msgstr "descendeix com a màxim <profunditat> nivells" -#: builtin/grep.c:673 +#: builtin/grep.c:1004 msgid "use extended POSIX regular expressions" msgstr "usa les expressions regulars POSIX esteses" -#: builtin/grep.c:676 +#: builtin/grep.c:1007 msgid "use basic POSIX regular expressions (default)" msgstr "usa les expressions regulars POSIX bàsiques (per defecte)" -#: builtin/grep.c:679 +#: builtin/grep.c:1010 msgid "interpret patterns as fixed strings" msgstr "interpreta els patrons com a cadenes fixes" -#: builtin/grep.c:682 +#: builtin/grep.c:1013 msgid "use Perl-compatible regular expressions" msgstr "usa les expressions regulars compatibles amb Perl" -#: builtin/grep.c:685 +#: builtin/grep.c:1016 msgid "show line numbers" msgstr "mostra els números de línia" -#: builtin/grep.c:686 +#: builtin/grep.c:1017 msgid "don't show filenames" msgstr "no mostris els noms de fitxer" -#: builtin/grep.c:687 +#: builtin/grep.c:1018 msgid "show filenames" msgstr "mostra els noms de fitxer" -#: builtin/grep.c:689 +#: builtin/grep.c:1020 msgid "show filenames relative to top directory" msgstr "mostra els noms de fitxer relatius al directori superior" -#: builtin/grep.c:691 +#: builtin/grep.c:1022 msgid "show only filenames instead of matching lines" msgstr "mostra només els noms de fitxer en lloc de les línies coincidents" -#: builtin/grep.c:693 +#: builtin/grep.c:1024 msgid "synonym for --files-with-matches" msgstr "sinònim de --files-with-matches" -#: builtin/grep.c:696 +#: builtin/grep.c:1027 msgid "show only the names of files without match" msgstr "mostra només els noms dels fitxers sense coincidència" -#: builtin/grep.c:698 +#: builtin/grep.c:1029 msgid "print NUL after filenames" msgstr "imprimeix NUL després dels noms de fitxer" -#: builtin/grep.c:700 +#: builtin/grep.c:1031 msgid "show the number of matches instead of matching lines" msgstr "mostra el nombre de coincidències en lloc de les línies coincidents" -#: builtin/grep.c:701 +#: builtin/grep.c:1032 msgid "highlight matches" msgstr "ressalta les coincidències" -#: builtin/grep.c:703 +#: builtin/grep.c:1034 msgid "print empty line between matches from different files" msgstr "imprimeix una línia buida entre coincidències de fitxers distints" -#: builtin/grep.c:705 +#: builtin/grep.c:1036 msgid "show filename only once above matches from same file" msgstr "" "mostra el nom de fitxer només una vegada a dalt de les coincidències del " "mateix fitxer" -#: builtin/grep.c:708 +#: builtin/grep.c:1039 msgid "show <n> context lines before and after matches" msgstr "mostra <n> línies de context abans i després d'una coincidència" -#: builtin/grep.c:711 +#: builtin/grep.c:1042 msgid "show <n> context lines before matches" msgstr "mostra <n> línies de context abans d'una coincidència" -#: builtin/grep.c:713 +#: builtin/grep.c:1044 msgid "show <n> context lines after matches" msgstr "mostra <n> línies de context després d'una coincidència" -#: builtin/grep.c:715 +#: builtin/grep.c:1046 msgid "use <n> worker threads" -msgstr "usa <n> fils obrers" +msgstr "usa <n> fils de treball" -#: builtin/grep.c:716 +#: builtin/grep.c:1047 msgid "shortcut for -C NUM" msgstr "drecera per -C NUM" -#: builtin/grep.c:719 +#: builtin/grep.c:1050 msgid "show a line with the function name before matches" msgstr "mostra una línia amb el nom de funció abans de les coincidències" -#: builtin/grep.c:721 +#: builtin/grep.c:1052 msgid "show the surrounding function" msgstr "mostra la funció circumdant" -#: builtin/grep.c:724 +#: builtin/grep.c:1055 msgid "read patterns from file" msgstr "llegeix els patrons des d'un fitxer" -#: builtin/grep.c:726 +#: builtin/grep.c:1057 msgid "match <pattern>" msgstr "coincideix amb <patró>" -#: builtin/grep.c:728 +#: builtin/grep.c:1059 msgid "combine patterns specified with -e" msgstr "combina els patrons especificats amb -e" -#: builtin/grep.c:740 +#: builtin/grep.c:1071 msgid "indicate hit with exit status without output" msgstr "indica coincidència amb estat de sortida sense sortida textual" -#: builtin/grep.c:742 +#: builtin/grep.c:1073 msgid "show only matches from files that match all patterns" msgstr "" "mostra només les coincidències dels fitxers que coincideixin amb tots els " "patrons" -#: builtin/grep.c:744 +#: builtin/grep.c:1075 msgid "show parse tree for grep expression" msgstr "mostra l'arbre d'anàlisis de l'expressió de grep" -#: builtin/grep.c:748 +#: builtin/grep.c:1079 msgid "pager" msgstr "paginador" -#: builtin/grep.c:748 +#: builtin/grep.c:1079 msgid "show matching files in the pager" msgstr "mostra els fitxers coincidents en el paginador" -#: builtin/grep.c:751 +#: builtin/grep.c:1082 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permet la invocació de grep(1) (ignorat per aquesta compilació)" -#: builtin/grep.c:814 +#: builtin/grep.c:1146 msgid "no pattern given." msgstr "cap patró donat." -#: builtin/grep.c:846 builtin/index-pack.c:1480 +#: builtin/grep.c:1178 builtin/index-pack.c:1482 #, c-format msgid "invalid number of threads specified (%d)" msgstr "s'ha especificat un nombre de fils no vàlid (%d)" -#: builtin/grep.c:876 +#: builtin/grep.c:1215 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager només funciona en l'arbre de treball" -#: builtin/grep.c:902 +#: builtin/grep.c:1238 +msgid "option not supported with --recurse-submodules." +msgstr "" + +#: builtin/grep.c:1244 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached o --untracked no es pot usar amb --no-index." -#: builtin/grep.c:907 +#: builtin/grep.c:1249 msgid "--no-index or --untracked cannot be used with revs." msgstr "--no-index o --untracked no es pot usar amb revisions." -#: builtin/grep.c:910 +#: builtin/grep.c:1252 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard no es pot usar per als continguts seguits." -#: builtin/grep.c:918 +#: builtin/grep.c:1260 msgid "both --cached and trees are given." msgstr "s'han donat ambdós --caches i arbres." @@ -8071,7 +8491,7 @@ msgstr "emmagatzema el fitxer tal com és sense filtres" msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "" -"només suma qualsevulla brossa aleatòria per a crear objectes malmesos per a " +"només suma qualsevol brossa aleatòria per a crear objectes malmesos per a " "depurar al Git" #: builtin/hash-object.c:101 @@ -8084,7 +8504,7 @@ msgstr "imprimeix totes les ordres disponibles" #: builtin/help.c:43 msgid "exclude guides" -msgstr "exclou guíes" +msgstr "exclou guies" #: builtin/help.c:44 msgid "print list of useful guides" @@ -8113,11 +8533,11 @@ msgstr "format d'ajuda no reconegut '%s'" #: builtin/help.c:93 msgid "Failed to start emacsclient." -msgstr "S'ha fallat en iniciar emacsclient." +msgstr "S'ha produït un error'ha produït un error en iniciar emacsclient." #: builtin/help.c:106 msgid "Failed to parse emacsclient version." -msgstr "S'ha fallat en analitzar la versió d'emacsclient." +msgstr "S'ha produït un error en analitzar la versió d'emacsclient." #: builtin/help.c:114 #, c-format @@ -8127,7 +8547,7 @@ msgstr "la versió d'emacsclient '%d' és massa vella (< 22)." #: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170 #, c-format msgid "failed to exec '%s'" -msgstr "s'ha fallat en executar '%s'" +msgstr "s'ha produït un error en executar '%s'" #: builtin/help.c:207 #, c-format @@ -8186,7 +8606,7 @@ msgstr "L'especificació de revisions i rangs per al Git" #: builtin/help.c:409 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" -msgstr "Una introducció tutorial al Git (per a la versió 1.5.1 o més nou)" +msgstr "Una introducció tutorial al Git (per a la versió 1.5.1 o més nova)" #: builtin/help.c:410 msgid "An overview of recommended workflows with Git" @@ -8312,183 +8732,187 @@ msgid "serious inflate inconsistency" msgstr "hi ha una inconsistència seriosa d'inflació" #: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777 -#: builtin/index-pack.c:811 builtin/index-pack.c:820 +#: builtin/index-pack.c:813 builtin/index-pack.c:822 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "S'HA TROBAT UNA COL·LISIÓ SHA1 AMB %s !" -#: builtin/index-pack.c:751 builtin/pack-objects.c:166 -#: builtin/pack-objects.c:258 +#: builtin/index-pack.c:751 builtin/pack-objects.c:164 +#: builtin/pack-objects.c:256 #, c-format msgid "unable to read %s" msgstr "no s'ha pogut llegir %s" -#: builtin/index-pack.c:817 +#: builtin/index-pack.c:819 #, c-format msgid "cannot read existing object %s" msgstr "no es pot llegir l'objecte existent %s" -#: builtin/index-pack.c:831 +#: builtin/index-pack.c:833 #, c-format msgid "invalid blob object %s" msgstr "objecte de blob no vàlid %s" -#: builtin/index-pack.c:845 +#: builtin/index-pack.c:847 #, c-format msgid "invalid %s" msgstr "%s no vàlid" -#: builtin/index-pack.c:848 +#: builtin/index-pack.c:850 msgid "Error in object" msgstr "Error en objecte" -#: builtin/index-pack.c:850 +#: builtin/index-pack.c:852 #, c-format msgid "Not all child objects of %s are reachable" msgstr "No tots els objectes fills de %s són abastables" -#: builtin/index-pack.c:922 builtin/index-pack.c:953 +#: builtin/index-pack.c:924 builtin/index-pack.c:955 msgid "failed to apply delta" -msgstr "s'ha fallat en aplicar la delta" +msgstr "s'ha produït un error en aplicar la delta" -#: builtin/index-pack.c:1123 +#: builtin/index-pack.c:1125 msgid "Receiving objects" msgstr "S'estan rebent objectes" -#: builtin/index-pack.c:1123 +#: builtin/index-pack.c:1125 msgid "Indexing objects" msgstr "S'estan indexant objectes" -#: builtin/index-pack.c:1155 +#: builtin/index-pack.c:1157 msgid "pack is corrupted (SHA1 mismatch)" msgstr "el paquet és malmès (discordança SHA1)" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1162 msgid "cannot fstat packfile" msgstr "no es pot fer fstat en el fitxer de paquet" -#: builtin/index-pack.c:1163 +#: builtin/index-pack.c:1165 msgid "pack has junk at the end" msgstr "el paquet té brossa al seu final" -#: builtin/index-pack.c:1174 +#: builtin/index-pack.c:1176 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "confusió més enllà de la bogeria en parse_pack_objects()" -#: builtin/index-pack.c:1197 +#: builtin/index-pack.c:1199 msgid "Resolving deltas" msgstr "S'estan resolent les deltes" -#: builtin/index-pack.c:1208 +#: builtin/index-pack.c:1210 #, c-format msgid "unable to create thread: %s" msgstr "no s'ha pogut crear fil: %s" -#: builtin/index-pack.c:1250 +#: builtin/index-pack.c:1252 msgid "confusion beyond insanity" msgstr "confusió més enllà de la bogeria" -#: builtin/index-pack.c:1256 +#: builtin/index-pack.c:1258 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "s'ha completat amb %d objecte local" msgstr[1] "s'ha completat amb %d objectes locals" -#: builtin/index-pack.c:1268 +#: builtin/index-pack.c:1270 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Suma de verificació final no esperada per a %s (corrupció de disc?)" -#: builtin/index-pack.c:1272 +#: builtin/index-pack.c:1274 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "El paquet té %d delta no resolta" msgstr[1] "El paquet té %d deltes no resoltes" -#: builtin/index-pack.c:1296 +#: builtin/index-pack.c:1298 #, c-format msgid "unable to deflate appended object (%d)" msgstr "no s'ha pogut desinflar l'objecte annexat (%d)" -#: builtin/index-pack.c:1372 +#: builtin/index-pack.c:1374 #, c-format msgid "local object %s is corrupt" msgstr "l'objecte local %s és malmès" -#: builtin/index-pack.c:1396 +#: builtin/index-pack.c:1398 msgid "error while closing pack file" msgstr "error en tancar el fitxer de paquet" -#: builtin/index-pack.c:1409 +#: builtin/index-pack.c:1411 #, c-format msgid "cannot write keep file '%s'" msgstr "no es pot escriure el fitxer a retenir '%s'" -#: builtin/index-pack.c:1417 +#: builtin/index-pack.c:1419 #, c-format msgid "cannot close written keep file '%s'" msgstr "no es pot tancar el fitxer escrit a retenir '%s'" -#: builtin/index-pack.c:1430 +#: builtin/index-pack.c:1432 msgid "cannot store pack file" msgstr "no es pot emmagatzemar el fitxer de paquet" -#: builtin/index-pack.c:1441 +#: builtin/index-pack.c:1443 msgid "cannot store index file" msgstr "no es pot emmagatzemar el fitxer d'índex" -#: builtin/index-pack.c:1474 +#: builtin/index-pack.c:1476 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "pack.indexversion=%<PRIu32> dolent" -#: builtin/index-pack.c:1484 builtin/index-pack.c:1681 +#: builtin/index-pack.c:1486 builtin/index-pack.c:1683 #, c-format msgid "no threads support, ignoring %s" msgstr "no hi ha suport de fils, s'està ignorant %s" -#: builtin/index-pack.c:1542 +#: builtin/index-pack.c:1544 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "No es pot obrir el fitxer de paquet existent '%s'" -#: builtin/index-pack.c:1544 +#: builtin/index-pack.c:1546 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "No es pot obrir el fitxer d'índex de paquets existent de '%s'" -#: builtin/index-pack.c:1591 +#: builtin/index-pack.c:1593 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "sense delta: %d objecte" msgstr[1] "sense delta: %d objectes" -#: builtin/index-pack.c:1598 +#: builtin/index-pack.c:1600 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "longitud de cadena = %d: %lu objecte" msgstr[1] "longitud de cadena = %d: %lu objectes" -#: builtin/index-pack.c:1611 +#: builtin/index-pack.c:1613 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "el nom del fitxer de paquet '%s' no acaba amb '.pack'" -#: builtin/index-pack.c:1693 builtin/index-pack.c:1696 -#: builtin/index-pack.c:1712 builtin/index-pack.c:1716 +#: builtin/index-pack.c:1695 builtin/index-pack.c:1698 +#: builtin/index-pack.c:1714 builtin/index-pack.c:1718 #, c-format msgid "bad %s" msgstr "%s dolent" -#: builtin/index-pack.c:1732 +#: builtin/index-pack.c:1734 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin no es pot usar sense --stdin" -#: builtin/index-pack.c:1740 +#: builtin/index-pack.c:1736 +msgid "--stdin requires a git repository" +msgstr "--stdin requereix d'un dipòsit git" + +#: builtin/index-pack.c:1744 msgid "--verify with no packfile name given" msgstr "s'ha donat --verify sense nom de fitxer de paquet" @@ -8618,7 +9042,7 @@ msgid "" "<token>[(=|:)<value>])...] [<file>...]" msgstr "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " -"<fitxa>[(=|:)<valor>])...] [<fitxer>...]" +"<testimoni>[(=|:)<valor>])...] [<fitxer>...]" #: builtin/interpret-trailers.c:26 msgid "edit files in place" @@ -8736,10 +9160,10 @@ msgstr "Hi ha dos directoris de sortida?" msgid "Unknown commit %s" msgstr "Comissió desconeguda %s" -#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:455 +#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:476 #, c-format msgid "Failed to resolve '%s' as a valid ref." -msgstr "S'ha fallat en resoldre '%s' com a referència vàlida." +msgstr "S'ha produït un error en resoldre '%s' com a referència vàlida." #: builtin/log.c:1263 msgid "Could not find exact merge base." @@ -8751,14 +9175,15 @@ msgid "" "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 "" -"S'ha fallat en obtenir la font. Si voleu registrar la comissió base\n" +"S'ha produït un error en obtenir la font. Si voleu registrar la comissió " +"base\n" "automàticament, si us plau, useu git branch --set-upstream-to per a\n" "seguir una branca remot. O podeu especificar la comissió base manualment\n" "amb --base=<id-de-comissió-base>." #: builtin/log.c:1287 msgid "Failed to find exact merge base" -msgstr "S'ha fallat en trobar la base exacta de fusió." +msgstr "S'ha produït un error en trobar la base exacta de fusió." #: builtin/log.c:1298 msgid "base commit should be the ancestor of revision list" @@ -8958,7 +9383,7 @@ msgstr "no s'ha pogut llegir el fitxer de signatura '%s'" #: builtin/log.c:1777 msgid "Failed to create output files" -msgstr "S'ha fallat en crear els fitxers de sortida" +msgstr "S'ha produït un error en crear els fitxers de sortida" #: builtin/log.c:1826 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" @@ -9007,7 +9432,7 @@ msgstr "mostra en la sortida els fitxers ignorats" #: builtin/ls-files.c:522 msgid "show staged contents' object name in the output" -msgstr "mostra en la sortida el nom d'objecte dels continguts allistats" +msgstr "mostra en la sortida el nom d'objecte dels continguts «stage»" #: builtin/ls-files.c:524 msgid "show files on the filesystem that need to be removed" @@ -9035,7 +9460,7 @@ msgstr "mostra la informació de resolució de desfet" #: builtin/ls-files.c:537 msgid "skip files matching pattern" -msgstr "salta els fitxers coincidents amb el patró" +msgstr "omet els fitxers coincidents amb el patró" #: builtin/ls-files.c:540 msgid "exclude patterns are read from <file>" @@ -9055,11 +9480,11 @@ msgstr "fes que la sortida sigui relativa al directori superior del projecte" #: builtin/ls-files.c:551 msgid "recurse through submodules" -msgstr "recursa als submòduls" +msgstr "inclou recursivament als submòduls" #: builtin/ls-files.c:553 msgid "if any <file> is not in the index, treat this as an error" -msgstr "si qualsevol <fitxer> no és en l'índex, tracta això com a error" +msgstr "si qualsevol <fitxer> no és en l'índex, tracta-ho com a error" #: builtin/ls-files.c:554 msgid "tree-ish" @@ -9125,35 +9550,35 @@ msgstr "mostra la referència subjacent a més de l'objecte que senyali" msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "git ls-tree [<opcions>] <arbre> [<camí>...]" -#: builtin/ls-tree.c:128 +#: builtin/ls-tree.c:126 msgid "only show trees" msgstr "mostra només els arbres" -#: builtin/ls-tree.c:130 +#: builtin/ls-tree.c:128 msgid "recurse into subtrees" -msgstr "recursa als subarbres" +msgstr "inclou recursivament als subarbres" -#: builtin/ls-tree.c:132 +#: builtin/ls-tree.c:130 msgid "show trees when recursing" msgstr "mostra els arbres en recursar" -#: builtin/ls-tree.c:135 +#: builtin/ls-tree.c:133 msgid "terminate entries with NUL byte" msgstr "acaba les entrades amb un octet NUL" -#: builtin/ls-tree.c:136 +#: builtin/ls-tree.c:134 msgid "include object size" msgstr "mida de l'objecte d'inclusió" -#: builtin/ls-tree.c:138 builtin/ls-tree.c:140 +#: builtin/ls-tree.c:136 builtin/ls-tree.c:138 msgid "list only filenames" msgstr "llista només els noms de fitxer" -#: builtin/ls-tree.c:143 +#: builtin/ls-tree.c:141 msgid "use full path names" msgstr "usa els noms de camí complets" -#: builtin/ls-tree.c:145 +#: builtin/ls-tree.c:143 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "" "llista l'arbre sencer; no només el directori actual (implica --full-name)" @@ -9170,163 +9595,171 @@ msgstr "git merge [<opcions>] <missatge> HEAD <comissió>" msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:102 +#: builtin/merge.c:49 +msgid "git merge --continue" +msgstr "git merge --continue" + +#: builtin/merge.c:104 msgid "switch `m' requires a value" msgstr "l'opció `m' requereix un valor" -#: builtin/merge.c:139 +#: builtin/merge.c:141 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "No s'ha pogut trobar l'estratègia de fusió '%s'.\n" -#: builtin/merge.c:140 +#: builtin/merge.c:142 #, c-format msgid "Available strategies are:" msgstr "Les estratègies disponibles són:" -#: builtin/merge.c:145 +#: builtin/merge.c:147 #, c-format msgid "Available custom strategies are:" msgstr "Les estratègies personalitzades disponibles són:" -#: builtin/merge.c:195 builtin/pull.c:127 +#: builtin/merge.c:197 builtin/pull.c:127 msgid "do not show a diffstat at the end of the merge" msgstr "no mostris les estadístiques de diferència al final de la fusió" -#: builtin/merge.c:198 builtin/pull.c:130 +#: builtin/merge.c:200 builtin/pull.c:130 msgid "show a diffstat at the end of the merge" msgstr "mostra les estadístiques de diferència al final de la fusió" -#: builtin/merge.c:199 builtin/pull.c:133 +#: builtin/merge.c:201 builtin/pull.c:133 msgid "(synonym to --stat)" msgstr "(sinònim de --stat)" -#: builtin/merge.c:201 builtin/pull.c:136 +#: builtin/merge.c:203 builtin/pull.c:136 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "afegeix (com a màxim <n>) entrades del registre curt al missatge de comissió " "de fusió" -#: builtin/merge.c:204 builtin/pull.c:139 +#: builtin/merge.c:206 builtin/pull.c:139 msgid "create a single commit instead of doing a merge" msgstr "crea una única comissió en lloc de fusionar" -#: builtin/merge.c:206 builtin/pull.c:142 +#: builtin/merge.c:208 builtin/pull.c:142 msgid "perform a commit if the merge succeeds (default)" msgstr "realitza una comissió si la fusió té èxit (per defecte)" -#: builtin/merge.c:208 builtin/pull.c:145 +#: builtin/merge.c:210 builtin/pull.c:145 msgid "edit message before committing" msgstr "edita el missatge abans de cometre" -#: builtin/merge.c:209 +#: builtin/merge.c:211 msgid "allow fast-forward (default)" msgstr "permet l'avanç ràpid (per defecte)" -#: builtin/merge.c:211 builtin/pull.c:151 +#: builtin/merge.c:213 builtin/pull.c:151 msgid "abort if fast-forward is not possible" msgstr "avorta si l'avanç ràpid no és possible" -#: builtin/merge.c:215 builtin/pull.c:154 +#: builtin/merge.c:217 builtin/pull.c:154 msgid "verify that the named commit has a valid GPG signature" msgstr "verifica que la comissió anomenada tingui una signatura GPG vàlida" -#: builtin/merge.c:216 builtin/notes.c:774 builtin/pull.c:158 +#: builtin/merge.c:218 builtin/notes.c:774 builtin/pull.c:158 #: builtin/revert.c:89 msgid "strategy" msgstr "estratègia" -#: builtin/merge.c:217 builtin/pull.c:159 +#: builtin/merge.c:219 builtin/pull.c:159 msgid "merge strategy to use" msgstr "estratègia de fusió a usar" -#: builtin/merge.c:218 builtin/pull.c:162 +#: builtin/merge.c:220 builtin/pull.c:162 msgid "option=value" msgstr "opció=valor" -#: builtin/merge.c:219 builtin/pull.c:163 +#: builtin/merge.c:221 builtin/pull.c:163 msgid "option for selected merge strategy" msgstr "opció per a l'estratègia de fusió seleccionada" -#: builtin/merge.c:221 +#: builtin/merge.c:223 msgid "merge commit message (for a non-fast-forward merge)" msgstr "missatge de comissió de fusió (per a una fusió no d'avanç ràpid)" -#: builtin/merge.c:225 +#: builtin/merge.c:227 msgid "abort the current in-progress merge" msgstr "avorta la fusió en curs actual" -#: builtin/merge.c:227 builtin/pull.c:170 +#: builtin/merge.c:229 +msgid "continue the current in-progress merge" +msgstr "continua la fusió en curs actual" + +#: builtin/merge.c:231 builtin/pull.c:170 msgid "allow merging unrelated histories" msgstr "permet fusionar històries no relacionades" -#: builtin/merge.c:255 +#: builtin/merge.c:259 msgid "could not run stash." msgstr "no s'ha pogut executar stash." -#: builtin/merge.c:260 +#: builtin/merge.c:264 msgid "stash failed" msgstr "l'emmagatzemament ha fallat" -#: builtin/merge.c:265 +#: builtin/merge.c:269 #, c-format msgid "not a valid object: %s" msgstr "no és un objecte vàlid: %s" -#: builtin/merge.c:284 builtin/merge.c:301 +#: builtin/merge.c:288 builtin/merge.c:305 msgid "read-tree failed" msgstr "read-tree ha fallat" -#: builtin/merge.c:331 +#: builtin/merge.c:335 msgid " (nothing to squash)" msgstr " (res a aixafar)" -#: builtin/merge.c:342 +#: builtin/merge.c:346 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Comissió d'aixafada -- no s'està actualitzant HEAD\n" -#: builtin/merge.c:392 +#: builtin/merge.c:396 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Cap missatge de fusió -- no s'està actualitzant HEAD\n" -#: builtin/merge.c:443 +#: builtin/merge.c:447 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' no assenyala una comissió" -#: builtin/merge.c:533 +#: builtin/merge.c:537 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Cadena branch.%s.mergeoptions dolenta: %s" -#: builtin/merge.c:652 +#: builtin/merge.c:656 msgid "Not handling anything other than two heads merge." msgstr "No s'està gestionant res a part de la fusió de dos caps." -#: builtin/merge.c:666 +#: builtin/merge.c:670 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Opció desconeguda de merge-recursive: -X%s" -#: builtin/merge.c:681 +#: builtin/merge.c:685 #, c-format msgid "unable to write %s" msgstr "no s'ha pogut escriure %s" -#: builtin/merge.c:733 +#: builtin/merge.c:737 #, c-format msgid "Could not read from '%s'" msgstr "No s'ha pogut llegir de '%s'" -#: builtin/merge.c:742 +#: builtin/merge.c:746 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "No s'està cometent la fusió; useu 'git commit' per a completar la fusió.\n" -#: builtin/merge.c:748 +#: builtin/merge.c:752 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -9342,68 +9775,80 @@ msgstr "" "S'ignoraran les línies que comencin amb '%c', i un missatge buit\n" "avorta la comissió.\n" -#: builtin/merge.c:772 +#: builtin/merge.c:776 msgid "Empty commit message." msgstr "El missatge de comissió és buit." -#: builtin/merge.c:792 +#: builtin/merge.c:796 #, c-format msgid "Wonderful.\n" msgstr "Meravellós.\n" -#: builtin/merge.c:847 +#: builtin/merge.c:851 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "La fusió automàtica ha fallat; arregleu els conflictes i després cometeu el " "resultat.\n" -#: builtin/merge.c:863 +#: builtin/merge.c:867 #, c-format msgid "'%s' is not a commit" msgstr "'%s' no és una comissió" -#: builtin/merge.c:904 +#: builtin/merge.c:908 msgid "No current branch." msgstr "No hi ha cap branca actual." -#: builtin/merge.c:906 +#: builtin/merge.c:910 msgid "No remote for the current branch." msgstr "No hi ha cap remot per a la branca actual." -#: builtin/merge.c:908 +#: builtin/merge.c:912 msgid "No default upstream defined for the current branch." msgstr "No hi ha cap font per defecte definida per a la branca actual." -#: builtin/merge.c:913 +#: builtin/merge.c:917 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "No hi ha cap branca amb seguiment remot per a %s de %s" -#: builtin/merge.c:960 +#: builtin/merge.c:964 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Valor dolent '%s' en l'entorn '%s'" -#: builtin/merge.c:1034 +#: builtin/merge.c:1038 #, c-format msgid "could not close '%s'" msgstr "no s'ha pogut tancar '%s'" -#: builtin/merge.c:1061 +#: builtin/merge.c:1065 #, c-format msgid "not something we can merge in %s: %s" msgstr "no és cosa que puguem fusionar en %s: %s" -#: builtin/merge.c:1095 +#: builtin/merge.c:1099 msgid "not something we can merge" msgstr "no és cosa que puguem fusionar" -#: builtin/merge.c:1162 +#: builtin/merge.c:1167 +msgid "--abort expects no arguments" +msgstr "--abort no accepta paràmetres" + +#: builtin/merge.c:1171 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "No hi ha fusió a avortar (manca MERGE_HEAD)." -#: builtin/merge.c:1178 +#: builtin/merge.c:1183 +msgid "--continue expects no arguments" +msgstr "--continue no accepta paràmetres" + +#: builtin/merge.c:1187 +msgid "There is no merge in progress (MERGE_HEAD missing)." +msgstr "No hi ha fusió en progrés (manca MERGE_HEAD)." + +#: builtin/merge.c:1203 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -9411,123 +9856,122 @@ msgstr "" "No heu conclòs la vostra fusió (MERGE_HEAD existeix).\n" "Si us plau, cometeu els vostres canvis abans de fusionar." -#: builtin/merge.c:1185 +#: builtin/merge.c:1210 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -"No heu conclòs el vostre recull de cireres (CHERRY_PICK_HEAD existeix).\n" +"No heu conclòs el vostre «cherry pick» (CHERRY_PICK_HEAD existeix).\n" "Si us plau, cometeu els vostres canvis abans de fusionar." -#: builtin/merge.c:1188 +#: builtin/merge.c:1213 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." -msgstr "" -"No heu conclòs el vostre recull de cireres (CHERRY_PICK_HEAD existeix)." +msgstr "No heu conclòs el vostre «cherry pick» (CHERRY_PICK_HEAD existeix)." -#: builtin/merge.c:1197 +#: builtin/merge.c:1222 msgid "You cannot combine --squash with --no-ff." msgstr "No podeu combinar --squash amb --no-ff." -#: builtin/merge.c:1205 +#: builtin/merge.c:1230 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "No hi ha una comissió especificada i merge.defaultToUpstream no està " "establert." -#: builtin/merge.c:1222 +#: builtin/merge.c:1247 msgid "Squash commit into empty head not supported yet" msgstr "Aixafar una comissió a un cap buit encara no es permet" -#: builtin/merge.c:1224 +#: builtin/merge.c:1249 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Una comissió no d'avanç ràpid no té sentit a un cap buit" -#: builtin/merge.c:1229 +#: builtin/merge.c:1254 #, c-format msgid "%s - not something we can merge" msgstr "%s - no és una cosa que puguem fusionar" -#: builtin/merge.c:1231 +#: builtin/merge.c:1256 msgid "Can merge only exactly one commit into empty head" msgstr "Es pot fusionar no més d'exactament una comissió a un cap buit" -#: builtin/merge.c:1287 +#: builtin/merge.c:1312 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "La comissió %s té una signatura GPG no fiable, suposadament de %s." -#: builtin/merge.c:1290 +#: builtin/merge.c:1315 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "La comissió %s té una signatura GPG dolenta suposadament de %s." -#: builtin/merge.c:1293 +#: builtin/merge.c:1318 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "La comissió %s no té signatura GPG." -#: builtin/merge.c:1296 +#: builtin/merge.c:1321 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "La comissió %s té una signatura GPG bona de %s\n" -#: builtin/merge.c:1358 +#: builtin/merge.c:1383 msgid "refusing to merge unrelated histories" msgstr "s'està refusant fusionar històries no relacionades" -#: builtin/merge.c:1367 +#: builtin/merge.c:1392 msgid "Already up-to-date." msgstr "Ja està al dia." -#: builtin/merge.c:1377 +#: builtin/merge.c:1402 #, c-format msgid "Updating %s..%s\n" msgstr "S'estan actualitzant %s..%s\n" -#: builtin/merge.c:1418 +#: builtin/merge.c:1443 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "S'està intentant una fusió molt trivial en l'índex...\n" -#: builtin/merge.c:1425 +#: builtin/merge.c:1450 #, c-format msgid "Nope.\n" msgstr "No.\n" -#: builtin/merge.c:1450 +#: builtin/merge.c:1475 msgid "Already up-to-date. Yeeah!" msgstr "Ja està al dia. Estupend!" -#: builtin/merge.c:1456 +#: builtin/merge.c:1481 msgid "Not possible to fast-forward, aborting." msgstr "No és possible avançar ràpidament, s'està avortant." -#: builtin/merge.c:1479 builtin/merge.c:1558 +#: builtin/merge.c:1504 builtin/merge.c:1583 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "S'està rebobinant l'arbre a la pristina...\n" -#: builtin/merge.c:1483 +#: builtin/merge.c:1508 #, c-format msgid "Trying merge strategy %s...\n" msgstr "S'està intentant l'estratègia de fusió %s...\n" -#: builtin/merge.c:1549 +#: builtin/merge.c:1574 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Cap estratègia de fusió ha gestionat la fusió.\n" -#: builtin/merge.c:1551 +#: builtin/merge.c:1576 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "L'estratègia de fusió %s ha fallat.\n" -#: builtin/merge.c:1560 +#: builtin/merge.c:1585 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "S'està usant el %s per a preparar la resolució a mà.\n" -#: builtin/merge.c:1572 +#: builtin/merge.c:1597 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -9593,11 +10037,11 @@ msgstr "usa una fusió basada en diff3" #: builtin/merge-file.c:35 msgid "for conflicts, use our version" -msgstr "en conflictes, usa la versió nostra" +msgstr "en conflictes, usa la nostra versió" #: builtin/merge-file.c:37 msgid "for conflicts, use their version" -msgstr "en conflictes, usa la versió seva" +msgstr "en conflictes, usa la seva versió" #: builtin/merge-file.c:39 msgid "for conflicts, use a union version" @@ -9662,96 +10106,96 @@ msgstr "permet els objectes absents" msgid "allow creation of more than one tree" msgstr "permet la creació de més d'un arbre" -#: builtin/mv.c:15 +#: builtin/mv.c:16 msgid "git mv [<options>] <source>... <destination>" msgstr "git mv [<opcions>] <font>... <destí>" -#: builtin/mv.c:70 +#: builtin/mv.c:82 #, c-format msgid "Directory %s is in index and no submodule?" msgstr "El directori %s és en l'índex i no hi ha cap submòdul?" -#: builtin/mv.c:72 builtin/rm.c:317 +#: builtin/mv.c:84 builtin/rm.c:290 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" -"Si us plau, allisteu els vostres canvis a .gitmodules o emmagatzemeu-los per " +"Si us plau, «stage» els vostres canvis a .gitmodules o feu «stage» dels mateixos per " "a procedir" -#: builtin/mv.c:90 +#: builtin/mv.c:102 #, c-format msgid "%.*s is in index" msgstr "%.*s és en l'índex" -#: builtin/mv.c:112 +#: builtin/mv.c:124 msgid "force move/rename even if target exists" msgstr "força el moviment / canvi de nom encara que el destí existeixi" -#: builtin/mv.c:113 +#: builtin/mv.c:125 msgid "skip move/rename errors" msgstr "omet els errors de moviment / canvi de nom" -#: builtin/mv.c:155 +#: builtin/mv.c:167 #, c-format msgid "destination '%s' is not a directory" msgstr "el destí '%s' no és un directori" -#: builtin/mv.c:166 +#: builtin/mv.c:178 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "S'està comprovant el canvi de nom de '%s' a '%s'\n" -#: builtin/mv.c:170 +#: builtin/mv.c:182 msgid "bad source" msgstr "font dolenta" -#: builtin/mv.c:173 +#: builtin/mv.c:185 msgid "can not move directory into itself" msgstr "no es pot moure un directori a dins d'ell mateix" -#: builtin/mv.c:176 +#: builtin/mv.c:188 msgid "cannot move directory over file" msgstr "no es pot moure un directori sobre un fitxer" -#: builtin/mv.c:185 +#: builtin/mv.c:197 msgid "source directory is empty" msgstr "el directori font està buit" -#: builtin/mv.c:210 +#: builtin/mv.c:222 msgid "not under version control" msgstr "no està sota control de versions" -#: builtin/mv.c:213 +#: builtin/mv.c:225 msgid "destination exists" msgstr "el destí existeix" -#: builtin/mv.c:221 +#: builtin/mv.c:233 #, c-format msgid "overwriting '%s'" msgstr "s'està sobreescrivint '%s'" -#: builtin/mv.c:224 +#: builtin/mv.c:236 msgid "Cannot overwrite" msgstr "No es pot sobreescriure" -#: builtin/mv.c:227 +#: builtin/mv.c:239 msgid "multiple sources for the same target" msgstr "múltiples fonts per al mateix destí" -#: builtin/mv.c:229 +#: builtin/mv.c:241 msgid "destination directory does not exist" msgstr "el directori destí no existeix" -#: builtin/mv.c:236 +#: builtin/mv.c:248 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, origen=%s, destí=%s" -#: builtin/mv.c:257 +#: builtin/mv.c:269 #, c-format msgid "Renaming %s to %s\n" msgstr "S'està canviant el nom de %s a %s\n" -#: builtin/mv.c:263 builtin/remote.c:710 builtin/repack.c:375 +#: builtin/mv.c:275 builtin/remote.c:710 builtin/repack.c:384 #, c-format msgid "renaming '%s' failed" msgstr "el canvi del nom de '%s' ha fallat" @@ -9911,7 +10355,7 @@ msgstr "git notes get-ref" #: builtin/notes.c:94 msgid "Write/edit the notes for the following object:" -msgstr "Escriviu/editeu les notes de l'objecte següent:" +msgstr "Escriviu/editeu les notes per l'objecte següent:" #: builtin/notes.c:147 #, c-format @@ -9925,7 +10369,7 @@ msgstr "no s'ha pogut llegir la sortida de 'show'" #: builtin/notes.c:159 #, c-format msgid "failed to finish 'show' for object '%s'" -msgstr "s'ha fallat en finalitzar 'show' per a l'objecte '%s'" +msgstr "S'ha produït un error en finalitzar 'show' per a l'objecte '%s'" #: builtin/notes.c:194 msgid "please supply the note contents using either -m or -F option" @@ -9942,12 +10386,12 @@ msgstr "no s'ha pogut escriure l'objecte de nota" msgid "the note contents have been left in %s" msgstr "s'han deixat els continguts de la nota en %s" -#: builtin/notes.c:233 builtin/tag.c:439 +#: builtin/notes.c:233 builtin/tag.c:460 #, c-format msgid "cannot read '%s'" msgstr "no es pot llegir '%s'" -#: builtin/notes.c:235 builtin/tag.c:442 +#: builtin/notes.c:235 builtin/tag.c:463 #, c-format msgid "could not open or read '%s'" msgstr "no s'ha pogut obrir o llegir '%s'" @@ -9957,12 +10401,12 @@ msgstr "no s'ha pogut obrir o llegir '%s'" #: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:659 #, c-format msgid "failed to resolve '%s' as a valid ref." -msgstr "s'ha fallat en resoldre '%s' com a referència vàlida." +msgstr "s'ha produït un error en resoldre '%s' com a referència vàlida." #: builtin/notes.c:257 #, c-format msgid "failed to read object '%s'." -msgstr "s'ha fallat en llegir l'objecte '%s'." +msgstr "s'ha produït un error en llegir l'objecte '%s'." #: builtin/notes.c:261 #, c-format @@ -9977,7 +10421,7 @@ msgstr "línia d'entrada mal formada: '%s'." #: builtin/notes.c:316 #, c-format msgid "failed to copy notes from '%s' to '%s'" -msgstr "s'ha fallat en copiar les notes de '%s' a '%s'" +msgstr "s'ha produït un error en copiar les notes de '%s' a '%s'" #. TRANSLATORS: the first %s will be replaced by a #. git notes command: 'add', 'merge', 'remove', etc. @@ -10027,7 +10471,7 @@ msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -"No es pot afegir les notes. S'han trobat notes existents de l'objecte %s. " +"No es poden afegir les notes. S'han trobat notes existents de l'objecte %s. " "Useu '-f' per a sobreescriure les notes existents." #: builtin/notes.c:452 builtin/notes.c:531 @@ -10059,7 +10503,7 @@ msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -"No es pot copiar les notes. S'han trobat notes existents de l'objecte %s. " +"No es poden copiar les notes. S'han trobat notes existents de l'objecte %s. " "Useu '-f' per a sobreescriure les notes existents." #: builtin/notes.c:537 @@ -10073,24 +10517,25 @@ 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 "" -"S'han desaprovat les opcions -m/-F/-c/-C en favor de la subordre 'edit'.\n" +"Es desaconsellen les opcions -m/-F/-c/-C en favor de la subordre 'edit'.\n" "Si us plau, useu 'git notes add -f -m/-F/-c/-C' en lloc d'això.\n" #: builtin/notes.c:685 msgid "failed to delete ref NOTES_MERGE_PARTIAL" -msgstr "s'ha fallat en suprimir la referència NOTES_MERGE_PARTIAL" +msgstr "s'ha produït un error en suprimir la referència NOTES_MERGE_PARTIAL" #: builtin/notes.c:687 msgid "failed to delete ref NOTES_MERGE_REF" -msgstr "s'ha fallat en suprimir la referència NOTES_MERGE_REF" +msgstr "s'ha produït un error en suprimir la referència NOTES_MERGE_REF" #: builtin/notes.c:689 msgid "failed to remove 'git notes merge' worktree" -msgstr "s'ha fallat en eliminar l'arbre de treball de 'git notes merge'" +msgstr "" +"s'ha produït un error en eliminar l'arbre de treball de 'git notes merge'" #: builtin/notes.c:709 msgid "failed to read ref NOTES_MERGE_PARTIAL" -msgstr "s'ha fallat en llegir la referència NOTES_MERGE_PARTIAL" +msgstr "s'ha produït un error en llegir la referència NOTES_MERGE_PARTIAL" #: builtin/notes.c:711 msgid "could not find commit from NOTES_MERGE_PARTIAL." @@ -10102,11 +10547,11 @@ msgstr "no s'ha pogut analitzar la comissió de NOTES_MERGE_PARTIAL." #: builtin/notes.c:726 msgid "failed to resolve NOTES_MERGE_REF" -msgstr "s'ha fallat en resoldre NOTES_MERGE_REF" +msgstr "s'ha produït un error en resoldre NOTES_MERGE_REF" #: builtin/notes.c:729 msgid "failed to finalize notes merge" -msgstr "s'ha fallat en finalitzar la fusió de notes" +msgstr "s'ha produït un error en finalitzar la fusió de notes" #: builtin/notes.c:755 #, c-format @@ -10167,7 +10612,8 @@ msgstr "una fusió de notes a %s ja està en curs a %s" #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "" -"s'ha fallat en emmagatzemar l'enllaç a la referència de notes actual (%s)" +"s'ha produït un error en emmagatzemar l'enllaç a la referència de notes " +"actual (%s)" #: builtin/notes.c:865 #, c-format @@ -10228,187 +10674,187 @@ msgstr "" "git pack-objects [<opcions>...] <nom-base> [< <llista-de-referències> | < " "<llista-de-objectes>]" -#: builtin/pack-objects.c:179 builtin/pack-objects.c:182 +#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 #, c-format msgid "deflate error (%d)" msgstr "error de deflació (%d)" -#: builtin/pack-objects.c:768 +#: builtin/pack-objects.c:766 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "s'està inhabilitant l'escriptura de mapes de bits, es divideixen els paquets " "a causa de pack.packSizeLimit" -#: builtin/pack-objects.c:781 +#: builtin/pack-objects.c:779 msgid "Writing objects" msgstr "S'estan escrivint els objectes" -#: builtin/pack-objects.c:1070 +#: builtin/pack-objects.c:1068 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "s'està inhabilitant l'escriptura de mapes de bits, perquè alguns objectes no " "s'empaqueten" -#: builtin/pack-objects.c:2346 +#: builtin/pack-objects.c:2344 msgid "Compressing objects" msgstr "S'estan comprimint objectes" -#: builtin/pack-objects.c:2759 +#: builtin/pack-objects.c:2747 #, c-format msgid "unsupported index version %s" msgstr "versió d'índex no compatible %s" -#: builtin/pack-objects.c:2763 +#: builtin/pack-objects.c:2751 #, c-format msgid "bad index version '%s'" msgstr "versió d'índex dolenta '%s'" -#: builtin/pack-objects.c:2793 +#: builtin/pack-objects.c:2781 msgid "do not show progress meter" msgstr "no mostris l'indicador de progrés" -#: builtin/pack-objects.c:2795 +#: builtin/pack-objects.c:2783 msgid "show progress meter" msgstr "mostra l'indicador de progrés" -#: builtin/pack-objects.c:2797 +#: builtin/pack-objects.c:2785 msgid "show progress meter during object writing phase" msgstr "mostra l'indicador de progrés durant la fase d'escriptura d'objectes" -#: builtin/pack-objects.c:2800 +#: builtin/pack-objects.c:2788 msgid "similar to --all-progress when progress meter is shown" msgstr "similar a --all-progress quan l'indicador de progrés es mostra" -#: builtin/pack-objects.c:2801 +#: builtin/pack-objects.c:2789 msgid "version[,offset]" msgstr "versió[,desplaçament]" -#: builtin/pack-objects.c:2802 +#: builtin/pack-objects.c:2790 msgid "write the pack index file in the specified idx format version" msgstr "" "escriu el fitxer d'índex de paquet en la versió de format d'índex " "especificada" -#: builtin/pack-objects.c:2805 +#: builtin/pack-objects.c:2793 msgid "maximum size of each output pack file" msgstr "mida màxima de cada fitxer de paquet de sortida" -#: builtin/pack-objects.c:2807 +#: builtin/pack-objects.c:2795 msgid "ignore borrowed objects from alternate object store" msgstr "" "ignora els objectes prestats d'un emmagatzemament d'objectes alternatiu" -#: builtin/pack-objects.c:2809 +#: builtin/pack-objects.c:2797 msgid "ignore packed objects" msgstr "ignora els objectes empaquetats" -#: builtin/pack-objects.c:2811 +#: builtin/pack-objects.c:2799 msgid "limit pack window by objects" msgstr "limita la finestra d'empaquetament per objectes" -#: builtin/pack-objects.c:2813 +#: builtin/pack-objects.c:2801 msgid "limit pack window by memory in addition to object limit" msgstr "" "limita la finestra d'empaquetament per memòria a més del límit d'objectes" -#: builtin/pack-objects.c:2815 +#: builtin/pack-objects.c:2803 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "longitud màxima de la cadena de deltes permesa en el paquet resultant" -#: builtin/pack-objects.c:2817 +#: builtin/pack-objects.c:2805 msgid "reuse existing deltas" msgstr "reusa les deltes existents" -#: builtin/pack-objects.c:2819 +#: builtin/pack-objects.c:2807 msgid "reuse existing objects" msgstr "reusa els objectes existents" -#: builtin/pack-objects.c:2821 +#: builtin/pack-objects.c:2809 msgid "use OFS_DELTA objects" msgstr "usa objectes OFS_DELTA" -#: builtin/pack-objects.c:2823 +#: builtin/pack-objects.c:2811 msgid "use threads when searching for best delta matches" msgstr "usa fils en cercar les millores coincidències de delta" -#: builtin/pack-objects.c:2825 +#: builtin/pack-objects.c:2813 msgid "do not create an empty pack output" msgstr "no creïs una emissió de paquet buida" -#: builtin/pack-objects.c:2827 +#: builtin/pack-objects.c:2815 msgid "read revision arguments from standard input" msgstr "llegeix els paràmetres de revisió des de l'entrada estàndard" -#: builtin/pack-objects.c:2829 +#: builtin/pack-objects.c:2817 msgid "limit the objects to those that are not yet packed" msgstr "limita els objectes als quals encara no s'hagin empaquetat" -#: builtin/pack-objects.c:2832 +#: builtin/pack-objects.c:2820 msgid "include objects reachable from any reference" msgstr "inclou els objectes abastables de qualsevulla referència" -#: builtin/pack-objects.c:2835 +#: builtin/pack-objects.c:2823 msgid "include objects referred by reflog entries" msgstr "" "inclou els objectes als quals facin referència les entrades del registre de " "referències" -#: builtin/pack-objects.c:2838 +#: builtin/pack-objects.c:2826 msgid "include objects referred to by the index" msgstr "inclou els objectes als quals faci referència l'índex" -#: builtin/pack-objects.c:2841 +#: builtin/pack-objects.c:2829 msgid "output pack to stdout" msgstr "emet el paquet a stdout" -#: builtin/pack-objects.c:2843 +#: builtin/pack-objects.c:2831 msgid "include tag objects that refer to objects to be packed" msgstr "" "inclou els objectes d'etiqueta que facin referència als objectes a empaquetar" -#: builtin/pack-objects.c:2845 +#: builtin/pack-objects.c:2833 msgid "keep unreachable objects" msgstr "retén els objectes inabastables" -#: builtin/pack-objects.c:2847 +#: builtin/pack-objects.c:2835 msgid "pack loose unreachable objects" msgstr "empaqueta els objectes inabastables solts" -#: builtin/pack-objects.c:2849 +#: builtin/pack-objects.c:2837 msgid "unpack unreachable objects newer than <time>" msgstr "desempaqueta els objectes inabastables més nous que <hora>" -#: builtin/pack-objects.c:2852 +#: builtin/pack-objects.c:2840 msgid "create thin packs" msgstr "crea paquets prims" -#: builtin/pack-objects.c:2854 +#: builtin/pack-objects.c:2842 msgid "create packs suitable for shallow fetches" msgstr "crea paquets adequats per a les obtencions superficials" -#: builtin/pack-objects.c:2856 +#: builtin/pack-objects.c:2844 msgid "ignore packs that have companion .keep file" msgstr "ignora els paquets que tinguin un fitxer .keep corresponent" -#: builtin/pack-objects.c:2858 +#: builtin/pack-objects.c:2846 msgid "pack compression level" msgstr "nivell de compressió de paquet" -#: builtin/pack-objects.c:2860 +#: builtin/pack-objects.c:2848 msgid "do not hide commits by grafts" msgstr "no amaguis les comissions per empelt" -#: builtin/pack-objects.c:2862 +#: builtin/pack-objects.c:2850 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "usa un índex de mapa de bits, si està disponible, per a accelerar el " "recompte d'objectes" -#: builtin/pack-objects.c:2864 +#: builtin/pack-objects.c:2852 msgid "write a bitmap index together with the pack index" msgstr "escriu un índex de mapa de bits junt amb l'índex de paquet" -#: builtin/pack-objects.c:2993 +#: builtin/pack-objects.c:2979 msgid "Counting objects" msgstr "S'estan comptant els objectes" @@ -10471,7 +10917,7 @@ msgstr "permet l'avanç ràpid" #: builtin/pull.c:157 msgid "automatically stash/stash pop before and after rebase" -msgstr "automàticament emmagatzema/desempila abans i després de rebasament" +msgstr "automàticament emmagatzema/desempila abans i després de fer «rebase»" #: builtin/pull.c:173 msgid "Options related to fetching" @@ -10525,7 +10971,7 @@ msgstr "Actualment no sou en cap branca." #: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." -msgstr "Si us plau, especifiqueu sobre què branca voleu rebasar." +msgstr "Si us plau, especifiqueu sobre què branca voleu fer «rebase»." #: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." @@ -10540,7 +10986,7 @@ msgstr "Vegeu git-pull(1) per detalls." msgid "<remote>" msgstr "<remot>" -#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:451 +#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:455 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<branca>" @@ -10567,7 +11013,7 @@ msgstr "" #: builtin/pull.c:754 msgid "ignoring --verify-signatures for rebase" -msgstr "s'està ignorant --verify-signatures per a rebasar" +msgstr "s'està ignorant --verify-signatures en fer «rebase»" #: builtin/pull.c:801 msgid "--[no-]autostash option is only valid with --rebase." @@ -10580,7 +11026,7 @@ msgstr "" #: builtin/pull.c:812 msgid "pull with rebase" -msgstr "baixar amb rebasament" +msgstr "baixar amb fent «rebase»" #: builtin/pull.c:813 msgid "please commit or stash them." @@ -10617,11 +11063,11 @@ msgstr "" #: builtin/pull.c:858 msgid "Cannot merge multiple branches into empty head." -msgstr "No es pot fusionar múltiples branques a un cap buit." +msgstr "No es poden fusionar múltiples branques a un cap buit." #: builtin/pull.c:862 msgid "Cannot rebase onto multiple branches." -msgstr "No es pot rebasar sobre múltiples branques." +msgstr "No es pot fer «rebase» sobre múltiples branques." #: builtin/push.c:16 msgid "git push [<options>] [<repository> [<refspec>...]]" @@ -10641,7 +11087,7 @@ msgid "" "To choose either option permanently, see push.default in 'git help config'." msgstr "" "\n" -"Per a triar qualsevulla opció permanentment, vegeu push.default a 'git help " +"Per a triar qualsevol opció permanentment, vegeu push.default a 'git help " "config'." #: builtin/push.c:146 @@ -10714,14 +11160,14 @@ msgstr "" "branca actual '%s', sense dir-me què pujar per a actualitzar\n" "quina branca remota." -#: builtin/push.c:242 +#: builtin/push.c:245 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "No heu especificat cap especificació de referència a pujar, i push.default " "és \"nothing\"." -#: builtin/push.c:249 +#: builtin/push.c:252 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -10733,7 +11179,7 @@ msgstr "" "els canvis remots (per exemple, 'git pull ...') abans de pujar de nou.\n" "Vegeu la 'Nota sobre avanços ràpids' a 'git push --help' per detalls." -#: builtin/push.c:255 +#: builtin/push.c:258 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" @@ -10746,7 +11192,7 @@ msgstr "" "abans de pujar de nou.\n" "Vegeu la 'Nota sobre avanços ràpids' a 'git push --help' per detalls." -#: builtin/push.c:261 +#: builtin/push.c:264 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" @@ -10761,12 +11207,12 @@ msgstr "" "pujar de nou.\n" "Vegeu la 'Nota sobre avanços ràpids' a 'git push --help' per detalls." -#: builtin/push.c:268 +#: builtin/push.c:271 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" "S'han rebutjat les actualitzacions perquè l'etiqueta ja existeix en el remot." -#: builtin/push.c:271 +#: builtin/push.c:274 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" @@ -10777,22 +11223,22 @@ msgstr "" "fer que assenyali un objecte no de comissió, sense usar l'opció\n" "'--force'.\n" -#: builtin/push.c:331 +#: builtin/push.c:334 #, c-format msgid "Pushing to %s\n" msgstr "S'està pujant a %s\n" -#: builtin/push.c:335 +#: builtin/push.c:338 #, c-format msgid "failed to push some refs to '%s'" -msgstr "s'ha fallat en pujar algunes referències a '%s'" +msgstr "s'ha produït un error en pujar algunes referències a '%s'" -#: builtin/push.c:366 +#: builtin/push.c:369 #, c-format msgid "bad repository '%s'" msgstr "dipòsit dolent '%s'" -#: builtin/push.c:367 +#: builtin/push.c:370 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -10814,112 +11260,112 @@ msgstr "" "\n" " git push <nom>\n" -#: builtin/push.c:385 +#: builtin/push.c:388 msgid "--all and --tags are incompatible" msgstr "--all i --tags són incompatibles" -#: builtin/push.c:386 +#: builtin/push.c:389 msgid "--all can't be combined with refspecs" msgstr "--all no es pot combinar amb especificacions de referència" -#: builtin/push.c:391 +#: builtin/push.c:394 msgid "--mirror and --tags are incompatible" msgstr "--mirror i --tags són incompatibles" -#: builtin/push.c:392 +#: builtin/push.c:395 msgid "--mirror can't be combined with refspecs" msgstr "--mirror no es pot combinar amb especificacions de referència" -#: builtin/push.c:397 +#: builtin/push.c:400 msgid "--all and --mirror are incompatible" msgstr "--all i --mirror són incompatibles" -#: builtin/push.c:515 +#: builtin/push.c:518 msgid "repository" msgstr "dipòsit" -#: builtin/push.c:516 builtin/send-pack.c:161 +#: builtin/push.c:519 builtin/send-pack.c:161 msgid "push all refs" msgstr "puja totes les referències" -#: builtin/push.c:517 builtin/send-pack.c:163 +#: builtin/push.c:520 builtin/send-pack.c:163 msgid "mirror all refs" msgstr "reflecteix totes les referències" -#: builtin/push.c:519 +#: builtin/push.c:522 msgid "delete refs" msgstr "suprimeix les referències" -#: builtin/push.c:520 +#: builtin/push.c:523 msgid "push tags (can't be used with --all or --mirror)" msgstr "puja les etiquetes (no es pot usar amb --all o --mirror)" -#: builtin/push.c:523 builtin/send-pack.c:164 +#: builtin/push.c:526 builtin/send-pack.c:164 msgid "force updates" msgstr "força les actualitzacions" -#: builtin/push.c:525 builtin/send-pack.c:175 +#: builtin/push.c:528 builtin/send-pack.c:175 msgid "refname>:<expect" msgstr "nom-de-referència>:<esperat" -#: builtin/push.c:526 builtin/send-pack.c:176 +#: builtin/push.c:529 builtin/send-pack.c:176 msgid "require old value of ref to be at this value" msgstr "requereix que el valor antic de la referència sigui d'aquest valor" -#: builtin/push.c:529 +#: builtin/push.c:532 msgid "control recursive pushing of submodules" msgstr "controla la pujada recursiva dels submòduls" -#: builtin/push.c:531 builtin/send-pack.c:169 +#: builtin/push.c:534 builtin/send-pack.c:169 msgid "use thin pack" msgstr "usa el paquet prim" -#: builtin/push.c:532 builtin/push.c:533 builtin/send-pack.c:158 +#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:158 #: builtin/send-pack.c:159 msgid "receive pack program" msgstr "programa que rep els paquets" -#: builtin/push.c:534 +#: builtin/push.c:537 msgid "set upstream for git pull/status" msgstr "estableix la font per a git pull/status" -#: builtin/push.c:537 +#: builtin/push.c:540 msgid "prune locally removed refs" msgstr "poda les referències eliminades localment" -#: builtin/push.c:539 +#: builtin/push.c:542 msgid "bypass pre-push hook" msgstr "evita el ganxo de prepujada" -#: builtin/push.c:540 +#: builtin/push.c:543 msgid "push missing but relevant tags" msgstr "puja les etiquetes absents però rellevants" -#: builtin/push.c:543 builtin/send-pack.c:166 +#: builtin/push.c:546 builtin/send-pack.c:166 msgid "GPG sign the push" msgstr "signa la pujada amb GPG" -#: builtin/push.c:545 builtin/send-pack.c:170 +#: builtin/push.c:548 builtin/send-pack.c:170 msgid "request atomic transaction on remote side" msgstr "demana una transacció atòmica al costat remot" -#: builtin/push.c:546 +#: builtin/push.c:549 msgid "server-specific" msgstr "específic al servidor" -#: builtin/push.c:546 +#: builtin/push.c:549 msgid "option to transmit" msgstr "opció a transmetre" -#: builtin/push.c:560 +#: builtin/push.c:563 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete és incompatible amb --all, --mirror i --tags" -#: builtin/push.c:562 +#: builtin/push.c:565 msgid "--delete doesn't make sense without any refs" msgstr "--delete no té sentit sense referències" -#: builtin/push.c:579 +#: builtin/push.c:584 msgid "push options must not have new line characters" msgstr "les opcions de pujada no han de tenir caràcters de línia nova" @@ -10943,7 +11389,7 @@ msgstr "només buida l'índex" #: builtin/read-tree.c:115 msgid "Merging" -msgstr "Fusión" +msgstr "S'està fusionant" #: builtin/read-tree.c:117 msgid "perform a merge in addition to a read" @@ -10975,7 +11421,7 @@ msgstr "actualitza l'arbre de treball amb el resultat de fusió" #: builtin/read-tree.c:130 msgid "gitignore" -msgstr "ignoral de git" +msgstr "gitignore" #: builtin/read-tree.c:131 msgid "allow explicitly ignored files to be overwritten" @@ -10991,7 +11437,7 @@ msgstr "no actualitzis l'índex ni l'arbre de treball" #: builtin/read-tree.c:137 msgid "skip applying sparse checkout filter" -msgstr "salta l'aplicació del filtre d'agafament parcial" +msgstr "omet l'aplicació del filtre d'agafament parcial" #: builtin/read-tree.c:139 msgid "debug unpack-trees" @@ -11002,14 +11448,15 @@ msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-dir>" #: builtin/receive-pack.c:793 +#, fuzzy 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 'receive.denyCurrentBranch' configuration variable to\n" -"'ignore' or 'warn' in the remote repository to allow pushing into\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" @@ -11017,16 +11464,16 @@ msgid "" "To squelch this message and still keep the default behaviour, set\n" "'receive.denyCurrentBranch' configuration variable to 'refuse'." msgstr "" -"Per defecte, es denega actualizar la branca actual en un dipòsit no\n" -"nu, perquè feria l'índex i l'arbre de treball inconsistents amb el\n" -"que hàgiu pujat, i requerria 'git reset --hard' per a fer que\n" +"Per defecte, es denega actualitzar la branca actual en un dipòsit no\n" +"nu, perquè faria l'índex i l'arbre de treball inconsistents amb el\n" +"que hàgiu pujat, i requeriria 'git reset --hard' per a fer que\n" "l'arbre de treball coincideixi amb HEAD.\n" "\n" "Podeu establir la variable de configuració\n" "'receive.denyCurrentBranch' a 'ignore' o 'warn' en el dipòsit remot\n" "per a permetre pujar a la seva branca actual; no obstant, no es\n" "recomana això a menys que hàgiu decidit actualitzar el seu arbre en\n" -"alguna altra manera per a coincidar amb el que hàgiu pujat.\n" +"alguna altra manera per a coincidir amb el que hàgiu pujat.\n" "\n" "Per a silenciar aquest missatge i encara retenir el comportament\n" "predeterminat, establiu la variable de configuració\n" @@ -11049,14 +11496,14 @@ msgstr "" "\n" "Podeu establir la variable de configuració\n" "'receive.denyDeleteCurrent' a 'warn' o 'ignore' en el dipòsit remot\n" -"per a permetre suprimir la branca actual, amb o sense un missatge\n" -"d'advertència.\n" +"per a permetre suprimir la branca actual, amb un missatge\n" +"d'advertència o sense.\n" "\n" "Per a silenciar aquest missatge, podeu establir-la a 'refuse'." #: builtin/receive-pack.c:1883 msgid "quiet" -msgstr "callat" +msgstr "silenciós" #: builtin/receive-pack.c:1897 msgid "You must specify a directory." @@ -11164,7 +11611,7 @@ msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" msgstr "" -"--mirror és perillós i desaprovat; si us\n" +"--mirror és perillós i està en desús; si us\n" "\t plau, useu --mirror=fetch o\n" "\t --mirror=push en lloc d'això" @@ -11311,17 +11758,17 @@ msgstr " ???" #: builtin/remote.c:955 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" -msgstr "branch.%s.merge no vàlid; no es pot rebasar sobre > 1 branca" +msgstr "branch.%s.merge no vàlid; no es pot fer «rebase» sobre > 1 branca" #: builtin/remote.c:963 #, c-format msgid "rebases interactively onto remote %s" -msgstr "es rebasa interactivament sobre el remot %s" +msgstr "es fa «rebase» interactivament sobre el remot %s" #: builtin/remote.c:964 #, c-format msgid "rebases onto remote %s" -msgstr "es rebasa sobre el remot %s" +msgstr "es fa «rebase» sobre el remot %s" #: builtin/remote.c:967 #, c-format @@ -11587,88 +12034,94 @@ msgstr "Subordre desconeguda: %s" msgid "git repack [<options>]" msgstr "git repack [<opcions>]" -#: builtin/repack.c:160 +#: builtin/repack.c:22 +msgid "" +"Incremental repacks are incompatible with bitmap indexes. Use\n" +"--no-write-bitmap-index or disable the pack.writebitmaps configuration." +msgstr "" + +#: builtin/repack.c:166 msgid "pack everything in a single pack" msgstr "empaqueta-ho tot en un únic paquet" -#: builtin/repack.c:162 +#: builtin/repack.c:168 msgid "same as -a, and turn unreachable objects loose" msgstr "el mateix que -a, i solta els objectes inabastables" -#: builtin/repack.c:165 +#: builtin/repack.c:171 msgid "remove redundant packs, and run git-prune-packed" msgstr "elimina els paquets redundants, i executeu git-prune-packed" -#: builtin/repack.c:167 +#: builtin/repack.c:173 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "passa --no-reuse-delta a git-pack-objects" -#: builtin/repack.c:169 +#: builtin/repack.c:175 msgid "pass --no-reuse-object to git-pack-objects" msgstr "passa --no-reuse-object a git-pack-objects" -#: builtin/repack.c:171 +#: builtin/repack.c:177 msgid "do not run git-update-server-info" msgstr "no executis git-update-server-info" -#: builtin/repack.c:174 +#: builtin/repack.c:180 msgid "pass --local to git-pack-objects" msgstr "passa --local a git-pack-objects" -#: builtin/repack.c:176 +#: builtin/repack.c:182 msgid "write bitmap index" msgstr "escriu índex de mapa de bits" -#: builtin/repack.c:177 +#: builtin/repack.c:183 msgid "approxidate" msgstr "data aproximada" -#: builtin/repack.c:178 +#: builtin/repack.c:184 msgid "with -A, do not loosen objects older than this" msgstr "amb -A, no soltis els objectes més vells que aquest" -#: builtin/repack.c:180 +#: builtin/repack.c:186 msgid "with -a, repack unreachable objects" msgstr "amb -a, reempaqueta els objectes inabastables" -#: builtin/repack.c:182 +#: builtin/repack.c:188 msgid "size of the window used for delta compression" msgstr "mida de la finestra que s'usa per a compressió de deltes" -#: builtin/repack.c:183 builtin/repack.c:187 +#: builtin/repack.c:189 builtin/repack.c:193 msgid "bytes" msgstr "octets" -#: builtin/repack.c:184 +#: builtin/repack.c:190 msgid "same as the above, but limit memory size instead of entries count" msgstr "" "el mateix que l'anterior, però limita la mida de memòria en lloc del nombre " "d'entrades" -#: builtin/repack.c:186 +#: builtin/repack.c:192 msgid "limits the maximum delta depth" msgstr "limita la profunditat màxima de les deltes" -#: builtin/repack.c:188 +#: builtin/repack.c:194 msgid "maximum size of each packfile" msgstr "mida màxima de cada fitxer de paquet" -#: builtin/repack.c:190 +#: builtin/repack.c:196 msgid "repack objects in packs marked with .keep" msgstr "reempaqueta els objectes en paquets marcats amb .keep" -#: builtin/repack.c:200 +#: builtin/repack.c:206 msgid "cannot delete packs in a precious-objects repo" msgstr "no es pot suprimir paquets en un dipòsit d'objectes preciosos" -#: builtin/repack.c:204 +#: builtin/repack.c:210 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable i -A són incompatibles" -#: builtin/repack.c:391 builtin/worktree.c:115 +#: builtin/repack.c:400 builtin/worktree.c:115 #, c-format msgid "failed to remove '%s'" -msgstr "s'ha fallat en eliminar '%s'" +msgstr "s'ha produït un error en eliminar '%s'" #: builtin/replace.c:19 msgid "git replace [-f] <object> <replacement>" @@ -11804,12 +12257,12 @@ msgstr "No teniu un HEAD vàlid." #: builtin/reset.c:76 msgid "Failed to find tree of HEAD." -msgstr "S'ha fallat en trobar l'arbre de HEAD." +msgstr "S'ha produït un error en trobar l'arbre de HEAD." #: builtin/reset.c:82 #, c-format msgid "Failed to find tree of %s." -msgstr "S'ha fallat en trobar l'arbre de %s." +msgstr "S'ha produït un error en cercar l'arbre de %s." #: builtin/reset.c:100 #, c-format @@ -11823,7 +12276,7 @@ msgstr "No es pot fer un restabliment de %s enmig d'una fusió." #: builtin/reset.c:276 msgid "be quiet, only report errors" -msgstr "calla, només informa d'errors" +msgstr "sigues silenciós, només informa d'errors" #: builtin/reset.c:278 msgid "reset HEAD and index" @@ -11848,12 +12301,12 @@ msgstr "registra només el fet de que els camins eliminats s'afegiran després" #: builtin/reset.c:305 #, c-format msgid "Failed to resolve '%s' as a valid revision." -msgstr "S'ha fallat en resoldre '%s' com a revisió vàlida." +msgstr "S'ha produït un error en resoldre '%s' com a revisió vàlida." #: builtin/reset.c:313 #, c-format msgid "Failed to resolve '%s' as a valid tree." -msgstr "S'ha fallat en resoldre '%s' com a arbre vàlid." +msgstr "S'ha produït un error en resoldre '%s' com a arbre vàlid." #: builtin/reset.c:322 msgid "--patch is incompatible with --{hard,mixed,soft}" @@ -11862,7 +12315,7 @@ msgstr "--patch és incompatible amb --{hard,mixed,soft}" #: builtin/reset.c:331 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" -"--mixed amb camins està desaprovat; useu 'git reset -- <camins>' en lloc " +"--mixed amb camins està en desús; useu 'git reset -- <camins>' en lloc " "d'això." #: builtin/reset.c:333 @@ -11881,7 +12334,7 @@ msgstr "-N només es pot usar amb --mixed" #: builtin/reset.c:364 msgid "Unstaged changes after reset:" -msgstr "Canvis no allistats després de restabliment:" +msgstr "Canvis «unstaged» després del restabliment:" #: builtin/reset.c:370 #, c-format @@ -11896,23 +12349,23 @@ msgstr "No s'ha pogut escriure el fitxer d'índex nou." msgid "rev-list does not support display of notes" msgstr "el rev-list no permet mostrar notes" -#: builtin/rev-parse.c:386 +#: builtin/rev-parse.c:391 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<opcions>] -- [<paràmetres>...]" -#: builtin/rev-parse.c:391 +#: builtin/rev-parse.c:396 msgid "keep the `--` passed as an arg" msgstr "retén el `--` passat com a paràmetre" -#: builtin/rev-parse.c:393 +#: builtin/rev-parse.c:398 msgid "stop parsing after the first non-option argument" msgstr "deixa d'analitzar després del primer paràmetre no d'opció" -#: builtin/rev-parse.c:396 +#: builtin/rev-parse.c:401 msgid "output in stuck long form" msgstr "emet en forma llarga enganxada" -#: builtin/rev-parse.c:527 +#: builtin/rev-parse.c:532 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -11950,15 +12403,15 @@ msgstr "%s: %s no es pot usar amb %s" #: builtin/revert.c:80 msgid "end revert or cherry-pick sequence" -msgstr "acaba la seqüència de reversió o el recull de cireres" +msgstr "acaba la seqüència de reversió o el «cherry pick»" #: builtin/revert.c:81 msgid "resume revert or cherry-pick sequence" -msgstr "reprèn la seqüència de reversió o el recull de cireres" +msgstr "reprèn la seqüència de reversió o el «cherry pick»" #: builtin/revert.c:82 msgid "cancel revert or cherry-pick sequence" -msgstr "cancel·la la seqüència de reversió o el recull de cireres" +msgstr "cancel·la la seqüència de reversió o el «cherry pick»" #: builtin/revert.c:83 msgid "don't automatically commit" @@ -12006,35 +12459,13 @@ msgstr "la reversió ha fallat" #: builtin/revert.c:205 msgid "cherry-pick failed" -msgstr "el recull de cireres ha fallat" +msgstr "el «cherry pick» ha fallat" #: builtin/rm.c:17 msgid "git rm [<options>] [--] <file>..." msgstr "git rm [<opcions>] [--] <fitxer>..." -#: builtin/rm.c:65 -msgid "" -"the following submodule (or one of its nested submodules)\n" -"uses a .git directory:" -msgid_plural "" -"the following submodules (or one of their nested submodules)\n" -"use a .git directory:" -msgstr[0] "" -"el submòdul següent (o un dels seus submòduls niats)\n" -"usa un directori .git:" -msgstr[1] "" -"els submòduls següents (o un dels seus submòduls niats)\n" -"usa un directori .git:" - -#: builtin/rm.c:71 -msgid "" -"\n" -"(use 'rm -rf' if you really want to remove it including all of its history)" -msgstr "" -"\n" -"(useu 'rm -rf' si realment voleu eliminar-lo, incloent tota la seva història)" - -#: builtin/rm.c:230 +#: builtin/rm.c:205 msgid "" "the following file has staged content different from both the\n" "file and the HEAD:" @@ -12042,13 +12473,13 @@ msgid_plural "" "the following files have staged content different from both the\n" "file and the HEAD:" msgstr[0] "" -"el fitxer següent té contingut allistat diferent d'ambdós el\n" +"el fitxer següent té contingut «stage» diferent d'ambdós el\n" "fitxer i el HEAD:" msgstr[1] "" -"els fitxers següents tenen contingut allistat diferent d'ambdós\n" +"els fitxers següents tenen contingut «stage» diferent d'ambdós\n" "el fitxer i el HEAD:" -#: builtin/rm.c:235 +#: builtin/rm.c:210 msgid "" "\n" "(use -f to force removal)" @@ -12056,13 +12487,13 @@ msgstr "" "\n" "(useu -f per a forçar l'eliminació)" -#: builtin/rm.c:239 +#: builtin/rm.c:214 msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" -msgstr[0] "el fitxer següent té canvis allistats en l'índex:" -msgstr[1] "els fitxers següents tenen canvis allistats en l'índex:" +msgstr[0] "el fitxer següent té canvis «staged» en l'índex:" +msgstr[1] "els fitxers següents tenen canvis «staged» en l'índex:" -#: builtin/rm.c:243 builtin/rm.c:254 +#: builtin/rm.c:218 builtin/rm.c:227 msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" @@ -12070,42 +12501,47 @@ msgstr "" "\n" "(useu --cached per a retenir el fitxer, o -f per a forçar l'eliminació)" -#: builtin/rm.c:251 +#: builtin/rm.c:224 msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" msgstr[0] "el fitxer següent té modificacions locals:" msgstr[1] "els fitxers següents tenen modificacions locals:" -#: builtin/rm.c:269 +#: builtin/rm.c:242 msgid "do not list removed files" msgstr "no llistis els fitxers eliminats" -#: builtin/rm.c:270 +#: builtin/rm.c:243 msgid "only remove from the index" msgstr "només elimina de l'índex" -#: builtin/rm.c:271 +#: builtin/rm.c:244 msgid "override the up-to-date check" msgstr "passa per alt la comprovació d'actualitat" -#: builtin/rm.c:272 +#: builtin/rm.c:245 msgid "allow recursive removal" msgstr "permet l'eliminació recursiva" -#: builtin/rm.c:274 +#: builtin/rm.c:247 msgid "exit with a zero status even if nothing matched" msgstr "surt amb estat zero encara que res hagi coincidit" -#: builtin/rm.c:335 +#: builtin/rm.c:308 #, c-format msgid "not removing '%s' recursively without -r" msgstr "no s'està eliminant '%s' recursivament sense -r" -#: builtin/rm.c:374 +#: builtin/rm.c:347 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: no s'ha pogut eliminar %s" +#: builtin/rm.c:370 +#, c-format +msgid "could not remove '%s'" +msgstr "no s'ha pogut suprimir '%s'" + #: builtin/send-pack.c:18 msgid "" "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" @@ -12138,24 +12574,28 @@ msgstr "imprimeix l'estat des de l'ajudant remot" msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" msgstr "git shortlog [<opcions>] [<rang-de-revisions>] [[--] [<camí>...]]" -#: builtin/shortlog.c:242 +#: builtin/shortlog.c:249 +msgid "Group by committer rather than author" +msgstr "" + +#: builtin/shortlog.c:251 msgid "sort output according to the number of commits per author" msgstr "ordena la sortida segons el nombre de comissions per autor" -#: builtin/shortlog.c:244 +#: builtin/shortlog.c:253 msgid "Suppress commit descriptions, only provides commit count" msgstr "" "Omet les descripcions de comissió, només proveeix el recompte de comissions" -#: builtin/shortlog.c:246 +#: builtin/shortlog.c:255 msgid "Show the email address of each author" msgstr "Mostra l'adreça de correu electrònic de cada autor" -#: builtin/shortlog.c:247 +#: builtin/shortlog.c:256 msgid "w[,i1[,i2]]" msgstr "w[,i1[,i2]]" -#: builtin/shortlog.c:248 +#: builtin/shortlog.c:257 msgid "Linewrap output" msgstr "Ajusta les línies de la sortida" @@ -12306,37 +12746,37 @@ msgstr "" msgid "git show-ref --exclude-existing[=<pattern>]" msgstr "git show-ref --exclude-existing[=<patró>]" -#: builtin/show-ref.c:165 +#: builtin/show-ref.c:159 msgid "only show tags (can be combined with heads)" msgstr "mostra només les etiquetes (es pot combinar amb heads)" -#: builtin/show-ref.c:166 +#: builtin/show-ref.c:160 msgid "only show heads (can be combined with tags)" msgstr "mostra només els caps (es pot combinar amb tags)" -#: builtin/show-ref.c:167 +#: builtin/show-ref.c:161 msgid "stricter reference checking, requires exact ref path" msgstr "" "comprovació de referència més estricta, requereix el camí de referència " "exacte" -#: builtin/show-ref.c:170 builtin/show-ref.c:172 +#: builtin/show-ref.c:164 builtin/show-ref.c:166 msgid "show the HEAD reference, even if it would be filtered out" msgstr "mostra la referència HEAD, encara que es filtrés" -#: builtin/show-ref.c:174 +#: builtin/show-ref.c:168 msgid "dereference tags into object IDs" -msgstr "dereferencia les etiquetes a IDs d'objecte" +msgstr "desreferencia les etiquetes a IDs d'objecte" -#: builtin/show-ref.c:176 +#: builtin/show-ref.c:170 msgid "only show SHA1 hash using <n> digits" msgstr "mostra el hash SHA1 usant només <n> xifres" -#: builtin/show-ref.c:180 +#: builtin/show-ref.c:174 msgid "do not print results to stdout (useful with --verify)" msgstr "no imprimeixis els resultats a stdout (útil amb --verify)" -#: builtin/show-ref.c:182 +#: builtin/show-ref.c:176 msgid "show refs from stdin that aren't in local repository" msgstr "mostra les referències d'stdin que no siguin en el dipòsit local" @@ -12351,18 +12791,18 @@ msgstr "git stripspace [-c | --comment-lines]" #: builtin/stripspace.c:35 msgid "skip and remove all lines starting with comment character" msgstr "" -"salta i elimina totes les línies començant amb el caràcter de comentari" +"omet i elimina totes les línies que comencin amb el caràcter de comentari" #: builtin/stripspace.c:38 msgid "prepend comment character and space to each line" msgstr "anteposa el caràcter de comentari i un espai a cada línia" -#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1046 +#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1062 #, c-format msgid "No such ref: %s" msgstr "No hi ha tal referència: %s" -#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1055 +#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1071 #, c-format msgid "Expecting a full ref name, got %s" msgstr "S'espera un nom de referència ple, s'ha rebut %s" @@ -12372,8 +12812,7 @@ msgstr "S'espera un nom de referència ple, s'ha rebut %s" msgid "cannot strip one component off url '%s'" msgstr "no es pot despullar un component de l'url '%s'" -#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:408 -#: builtin/submodule--helper.c:590 +#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:592 msgid "alternative anchor for relative paths" msgstr "àncora alternativa per als camins relatius" @@ -12381,87 +12820,88 @@ msgstr "àncora alternativa per als camins relatius" msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<camí>] [<camí>...]" -#: builtin/submodule--helper.c:329 builtin/submodule--helper.c:343 +#: builtin/submodule--helper.c:333 builtin/submodule--helper.c:347 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "No s'ha trobat cap url per al camí de submòdul '%s' a .gitmodules" -#: builtin/submodule--helper.c:369 +#: builtin/submodule--helper.c:373 #, c-format msgid "Failed to register url for submodule path '%s'" -msgstr "S'ha fallat en registrar l'url per al camí de submòdul '%s'" +msgstr "S'ha produït un error en registrar l'url per al camí de submòdul '%s'" -#: builtin/submodule--helper.c:373 +#: builtin/submodule--helper.c:377 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "S'ha registrat el submòdul '%s' (%s) per al camí '%s'\n" -#: builtin/submodule--helper.c:383 +#: builtin/submodule--helper.c:387 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "" "advertència: se suggereix el mode d'actualització per ordre per al submòdul " "'%s'\n" -#: builtin/submodule--helper.c:390 +#: builtin/submodule--helper.c:394 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" -"S'ha fallat en registrar el mode d'actualització per al camí de submòdul '%s'" +"S'ha produït un error en registrar el mode d'actualització per al camí de " +"submòdul '%s'" -#: builtin/submodule--helper.c:409 +#: builtin/submodule--helper.c:410 msgid "Suppress output for initializing a submodule" msgstr "Omet la sortida d'inicialitzar un submòdul" -#: builtin/submodule--helper.c:414 +#: builtin/submodule--helper.c:415 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper init [<camí>]" -#: builtin/submodule--helper.c:435 +#: builtin/submodule--helper.c:436 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <camí>" -#: builtin/submodule--helper.c:441 +#: builtin/submodule--helper.c:442 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "No s'ha trobat cap mapatge de submòdul a .gitmodules per al camí '%s'" -#: builtin/submodule--helper.c:524 builtin/submodule--helper.c:527 +#: builtin/submodule--helper.c:525 builtin/submodule--helper.c:528 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "el submòdul '%s' no pot afegir un alternatiu: %s" -#: builtin/submodule--helper.c:563 +#: builtin/submodule--helper.c:564 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "No es reconeix el valor '%s' per a submodule.alternateErrorStrategy" -#: builtin/submodule--helper.c:570 +#: builtin/submodule--helper.c:571 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "No es reconeix el valor '%s' per a submodule.alternateLocation" -#: builtin/submodule--helper.c:593 +#: builtin/submodule--helper.c:595 msgid "where the new submodule will be cloned to" msgstr "a on es clonarà el submòdul nou" -#: builtin/submodule--helper.c:596 +#: builtin/submodule--helper.c:598 msgid "name of the new submodule" msgstr "nom del submòdul nou" -#: builtin/submodule--helper.c:599 +#: builtin/submodule--helper.c:601 msgid "url where to clone the submodule from" msgstr "url del qual clonar el submòdul" -#: builtin/submodule--helper.c:605 +#: builtin/submodule--helper.c:607 msgid "depth for shallow clones" msgstr "profunditat dels clons superficials" -#: builtin/submodule--helper.c:608 builtin/submodule--helper.c:964 +#: builtin/submodule--helper.c:610 builtin/submodule--helper.c:980 msgid "force cloning progress" msgstr "força el progrés del clonatge" -#: builtin/submodule--helper.c:613 +#: builtin/submodule--helper.c:615 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -12469,97 +12909,92 @@ msgstr "" "git submodule--helper clone [--prefix=<camí>] [--quiet] [--reference " "<dipòsit>] [--name <nom>] [--depth <profunditat>] --url <url> --path <camí>" -#: builtin/submodule--helper.c:638 builtin/submodule--helper.c:648 -#, c-format -msgid "could not create directory '%s'" -msgstr "no s'ha pogut crear el directori '%s'" - -#: builtin/submodule--helper.c:644 +#: builtin/submodule--helper.c:646 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "el clonatge de '%s' al camí de submòdul '%s' ha fallat" -#: builtin/submodule--helper.c:660 +#: builtin/submodule--helper.c:662 #, c-format msgid "cannot open file '%s'" msgstr "no es pot obrir el fitxer '%s'" -#: builtin/submodule--helper.c:665 +#: builtin/submodule--helper.c:667 #, c-format msgid "could not close file %s" msgstr "no s'ha pogut tancar el fitxer %s" -#: builtin/submodule--helper.c:672 +#: builtin/submodule--helper.c:674 #, c-format msgid "could not get submodule directory for '%s'" msgstr "no s'ha pogut obtenir el directori de submòdul per a '%s'" -#: builtin/submodule--helper.c:726 +#: builtin/submodule--helper.c:742 #, c-format msgid "Submodule path '%s' not initialized" msgstr "El camí de submòdul '%s' no està inicialitzat" -#: builtin/submodule--helper.c:730 +#: builtin/submodule--helper.c:746 msgid "Maybe you want to use 'update --init'?" msgstr "Potser voleu usar 'update --init'?" -#: builtin/submodule--helper.c:756 +#: builtin/submodule--helper.c:772 #, c-format msgid "Skipping unmerged submodule %s" -msgstr "S'està saltant el submòdul no fusionat %s" +msgstr "S'està ometent el submòdul no fusionat %s" -#: builtin/submodule--helper.c:777 +#: builtin/submodule--helper.c:793 #, c-format msgid "Skipping submodule '%s'" -msgstr "S'està saltant el submòdul '%s'" +msgstr "S'està ometent el submòdul '%s'" -#: builtin/submodule--helper.c:913 +#: builtin/submodule--helper.c:929 #, c-format msgid "Failed to clone '%s'. Retry scheduled" -msgstr "S'ha fallat en clonar '%s'. S'ha programat un reintent" +msgstr "S'ha produït un error en clonar '%s'. S'ha programat un reintent" -#: builtin/submodule--helper.c:924 +#: builtin/submodule--helper.c:940 #, c-format msgid "Failed to clone '%s' a second time, aborting" -msgstr "S'ha fallat una segona vegada en clonar '%s', s'està avortant" +msgstr "S'ha produït un error per segon cop en clonar '%s', s'està avortant" -#: builtin/submodule--helper.c:945 +#: builtin/submodule--helper.c:961 builtin/submodule--helper.c:1105 msgid "path into the working tree" msgstr "camí a l'arbre de treball" -#: builtin/submodule--helper.c:948 +#: builtin/submodule--helper.c:964 msgid "path into the working tree, across nested submodule boundaries" msgstr "camí a l'arbre de treball, a través de fronteres de submòduls niats" -#: builtin/submodule--helper.c:952 +#: builtin/submodule--helper.c:968 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout o none" -#: builtin/submodule--helper.c:956 +#: builtin/submodule--helper.c:972 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "Crea un clon superficial truncat al nombre de revisions especificat" -#: builtin/submodule--helper.c:959 +#: builtin/submodule--helper.c:975 msgid "parallel jobs" msgstr "tasques paral·leles" -#: builtin/submodule--helper.c:961 +#: builtin/submodule--helper.c:977 msgid "whether the initial clone should follow the shallow recommendation" msgstr "si el clonatge inicial ha de seguir la recomanació de superficialitat" -#: builtin/submodule--helper.c:962 +#: builtin/submodule--helper.c:978 msgid "don't print cloning progress" msgstr "no imprimeixis el progrés del clonatge" -#: builtin/submodule--helper.c:969 +#: builtin/submodule--helper.c:985 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update_clone [--prefix=<camí>] [<camí>...]" -#: builtin/submodule--helper.c:979 +#: builtin/submodule--helper.c:995 msgid "bad value for update parameter" msgstr "valor dolent per al paràmetre update" -#: builtin/submodule--helper.c:1050 +#: builtin/submodule--helper.c:1066 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -12568,11 +13003,24 @@ msgstr "" "La branca de submòdul (%s) està configurada per a heretar la branca del " "superprojecte, però el superprojecte no és en cap branca" -#: builtin/submodule--helper.c:1100 +#: builtin/submodule--helper.c:1106 +msgid "recurse into submodules" +msgstr "inclou recursivament als submòduls" + +#: builtin/submodule--helper.c:1112 +msgid "git submodule--helper embed-git-dir [<path>...]" +msgstr "git submodule--helper embed-git-dir [<camí>]" + +#: builtin/submodule--helper.c:1157 msgid "submodule--helper subcommand must be called with a subcommand" msgstr "s'ha d'executar la subordre submodule--helper amb una subordre" -#: builtin/submodule--helper.c:1107 +#: builtin/submodule--helper.c:1164 +#, c-format +msgid "%s doesn't support --super-prefix" +msgstr "%s no admet --super-prefix" + +#: builtin/submodule--helper.c:1170 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' no és una subordre vàlida de submodule--helper" @@ -12627,25 +13075,25 @@ msgstr "" "\t\t[--[no-]merged [<comissió>]] [<patró>...]" #: builtin/tag.c:27 -msgid "git tag -v <tagname>..." -msgstr "git tag -v <nom-d'etiqueta>..." +msgid "git tag -v [--format=<format>] <tagname>..." +msgstr "git tag -v [--format=<format>] <nom-d'etiqueta>..." -#: builtin/tag.c:81 +#: builtin/tag.c:82 #, c-format msgid "tag name too long: %.*s..." msgstr "nom d'etiqueta massa llarg: %.*s..." -#: builtin/tag.c:86 +#: builtin/tag.c:87 #, c-format msgid "tag '%s' not found." msgstr "no s'ha trobat l'etiqueta '%s'." -#: builtin/tag.c:101 +#: builtin/tag.c:102 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "S'ha suprimit l'etiqueta '%s' (era %s)\n" -#: builtin/tag.c:117 +#: builtin/tag.c:131 #, c-format msgid "" "\n" @@ -12658,7 +13106,7 @@ msgstr "" " %s\n" "Les línies que comencin amb '%c' s'ignoraran.\n" -#: builtin/tag.c:121 +#: builtin/tag.c:135 #, c-format msgid "" "\n" @@ -12673,138 +13121,138 @@ msgstr "" "Les línies que comencin amb '%c' es retindran; podeu eliminar-les per vós " "mateix si voleu.\n" -#: builtin/tag.c:199 +#: builtin/tag.c:213 msgid "unable to sign the tag" msgstr "no s'ha pogut signar l'etiqueta" -#: builtin/tag.c:201 +#: builtin/tag.c:215 msgid "unable to write tag file" msgstr "no s'ha pogut escriure el fitxer d'etiqueta" -#: builtin/tag.c:226 +#: builtin/tag.c:240 msgid "bad object type." msgstr "el tipus d'objecte és dolent." -#: builtin/tag.c:239 +#: builtin/tag.c:253 msgid "tag header too big." msgstr "la capçalera d'etiqueta és massa gran." -#: builtin/tag.c:275 +#: builtin/tag.c:289 msgid "no tag message?" msgstr "no hi ha cap missatge d'etiqueta?" -#: builtin/tag.c:281 +#: builtin/tag.c:295 #, c-format msgid "The tag message has been left in %s\n" msgstr "S'ha deixat el missatge de l'etiqueta en %s\n" -#: builtin/tag.c:339 +#: builtin/tag.c:354 msgid "list tag names" msgstr "llista els noms d'etiqueta" -#: builtin/tag.c:341 +#: builtin/tag.c:356 msgid "print <n> lines of each tag message" msgstr "imprimeix <n> línies de cada missatge d'etiqueta" -#: builtin/tag.c:343 +#: builtin/tag.c:358 msgid "delete tags" msgstr "suprimeix les etiquetes" -#: builtin/tag.c:344 +#: builtin/tag.c:359 msgid "verify tags" msgstr "verifica les etiquetes" -#: builtin/tag.c:346 +#: builtin/tag.c:361 msgid "Tag creation options" msgstr "Opcions de creació d'etiquetes" -#: builtin/tag.c:348 +#: builtin/tag.c:363 msgid "annotated tag, needs a message" msgstr "etiqueta anotada, necessita un missatge" -#: builtin/tag.c:350 +#: builtin/tag.c:365 msgid "tag message" msgstr "missatge d'etiqueta" -#: builtin/tag.c:352 +#: builtin/tag.c:367 msgid "annotated and GPG-signed tag" msgstr "etiqueta anotada i signada per GPG" -#: builtin/tag.c:356 +#: builtin/tag.c:371 msgid "use another key to sign the tag" msgstr "usa una altra clau per a signar l'etiqueta" -#: builtin/tag.c:357 +#: builtin/tag.c:372 msgid "replace the tag if exists" msgstr "reemplaça l'etiqueta si existeix" -#: builtin/tag.c:358 builtin/update-ref.c:368 +#: builtin/tag.c:373 builtin/update-ref.c:368 msgid "create a reflog" msgstr "crea un registre de referències" -#: builtin/tag.c:360 +#: builtin/tag.c:375 msgid "Tag listing options" msgstr "Opcions de llistat d'etiquetes" -#: builtin/tag.c:361 +#: builtin/tag.c:376 msgid "show tag list in columns" msgstr "mostra la llista d'etiquetes en columnes" -#: builtin/tag.c:362 builtin/tag.c:363 +#: builtin/tag.c:377 builtin/tag.c:378 msgid "print only tags that contain the commit" msgstr "imprimeix només les etiquetes que continguin la comissió" -#: builtin/tag.c:364 +#: builtin/tag.c:379 msgid "print only tags that are merged" msgstr "imprimeix només les etiquetes que s'han fusionat" -#: builtin/tag.c:365 +#: builtin/tag.c:380 msgid "print only tags that are not merged" msgstr "imprimeix només les etiquetes que no s'han fusionat" -#: builtin/tag.c:370 +#: builtin/tag.c:385 msgid "print only tags of the object" msgstr "imprimeix només les etiquetes de l'objecte" -#: builtin/tag.c:399 +#: builtin/tag.c:415 msgid "--column and -n are incompatible" msgstr "--column i -n són incompatibles" -#: builtin/tag.c:419 +#: builtin/tag.c:437 msgid "-n option is only allowed with -l." msgstr "es permet l'opció -n només amb -l." -#: builtin/tag.c:421 +#: builtin/tag.c:439 msgid "--contains option is only allowed with -l." msgstr "es permet l'opció --contains només amb -l." -#: builtin/tag.c:423 +#: builtin/tag.c:441 msgid "--points-at option is only allowed with -l." msgstr "es permet --points-at option només amb -l." -#: builtin/tag.c:425 +#: builtin/tag.c:443 msgid "--merged and --no-merged option are only allowed with -l" msgstr "es permeten les opcions --merged i --no-merged només amb -l" -#: builtin/tag.c:433 +#: builtin/tag.c:454 msgid "only one -F or -m option is allowed." msgstr "només es permet una opció -F o -m." -#: builtin/tag.c:452 +#: builtin/tag.c:473 msgid "too many params" msgstr "massa paràmetres" -#: builtin/tag.c:458 +#: builtin/tag.c:479 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' no és un nom d'etiqueta vàlid." -#: builtin/tag.c:463 +#: builtin/tag.c:484 #, c-format msgid "tag '%s' already exists" msgstr "l'etiqueta '%s' ja existeix" -#: builtin/tag.c:491 +#: builtin/tag.c:512 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Etiqueta '%s' actualitzada (era %s)\n" @@ -12816,27 +13264,27 @@ msgstr "S'estan desempaquetant els objectes" #: builtin/update-index.c:79 #, c-format msgid "failed to create directory %s" -msgstr "s'ha fallat en crear el directori %s" +msgstr "s'ha produït un error en crear el directori %s" #: builtin/update-index.c:85 #, c-format msgid "failed to stat %s" -msgstr "s'ha fallat en fer stat a %s" +msgstr "s'ha produït un error en fer stat a %s" #: builtin/update-index.c:95 #, c-format msgid "failed to create file %s" -msgstr "s'ha fallat en crear el fitxer %s" +msgstr "s'ha produït un error en crear el fitxer %s" #: builtin/update-index.c:103 #, c-format msgid "failed to delete file %s" -msgstr "s'ha fallat en suprimir el fitxer %s" +msgstr "s'ha produït un error en suprimir el fitxer %s" #: builtin/update-index.c:110 builtin/update-index.c:212 #, c-format msgid "failed to delete directory %s" -msgstr "s'ha fallat en suprimir el directori %s" +msgstr "s'ha produït un error en suprimir el directori %s" #: builtin/update-index.c:133 #, c-format @@ -12965,7 +13413,7 @@ msgstr "afegeix les entrades de l'entrada estàndard a l'índex" #: builtin/update-index.c:978 msgid "repopulate stages #2 and #3 for the listed paths" -msgstr "reemplena les etapes #2 i #3 per als camins llistats" +msgstr "reemplena les «stage» #2 i #3 per als camins llistats" #: builtin/update-index.c:982 msgid "only update entries that differ from HEAD" @@ -13003,7 +13451,7 @@ msgstr "prova si el sistema de fitxers admet la memòria cau no seguida" msgid "enable untracked cache without testing the filesystem" msgstr "habilita la memòria cau no seguida sense provar el sistema de fitxers" -#: builtin/update-index.c:1119 +#: builtin/update-index.c:1120 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -13011,11 +13459,11 @@ msgstr "" "core.untrackedCache està establert a veritable; elimineu-lo o canvieu-lo, si " "realment voleu inhabilitar el cau no seguit" -#: builtin/update-index.c:1123 +#: builtin/update-index.c:1124 msgid "Untracked cache disabled" msgstr "La memòria cau no seguida està inhabilitada" -#: builtin/update-index.c:1131 +#: builtin/update-index.c:1132 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -13023,7 +13471,7 @@ msgstr "" "core.untrackedCache està establert a fals; elimineu-lo o canviar-lo, si " "realment voleu habilitar el cau no seguit" -#: builtin/update-index.c:1135 +#: builtin/update-index.c:1136 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "La memòria cau no seguida està habilitada per a '%s'" @@ -13073,7 +13521,7 @@ msgstr "git verify-commit [-v | --verbose] <comissió>..." msgid "print commit contents" msgstr "imprimeix els continguts de la comissió" -#: builtin/verify-commit.c:73 builtin/verify-tag.c:35 +#: builtin/verify-commit.c:73 builtin/verify-tag.c:37 msgid "print raw gpg status output" msgstr "imprimeix la sortida crua de l'estat gpg" @@ -13089,11 +13537,11 @@ msgstr "detallat" msgid "show statistics only" msgstr "mostra només estadístiques" -#: builtin/verify-tag.c:17 -msgid "git verify-tag [-v | --verbose] <tag>..." -msgstr "git verify-tag [-v | --verbose] <etiqueta>..." +#: builtin/verify-tag.c:18 +msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." +msgstr "git verify-tag [-v | --verbose] [--format=<format>] <etiqueta>..." -#: builtin/verify-tag.c:34 +#: builtin/verify-tag.c:36 msgid "print tag contents" msgstr "imprimeix els continguts de l'etiqueta" @@ -13179,30 +13627,30 @@ msgstr "emplena l'arbre de treball nou" msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B i --detach són mutualment exclusius" -#: builtin/worktree.c:470 +#: builtin/worktree.c:472 msgid "reason for locking" msgstr "raó per bloquejar" -#: builtin/worktree.c:482 builtin/worktree.c:515 +#: builtin/worktree.c:484 builtin/worktree.c:517 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' no és un arbre de treball" -#: builtin/worktree.c:484 builtin/worktree.c:517 +#: builtin/worktree.c:486 builtin/worktree.c:519 msgid "The main working tree cannot be locked or unlocked" msgstr "No es pot bloquejar ni desbloquejar l'arbre de treball principal" -#: builtin/worktree.c:489 +#: builtin/worktree.c:491 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' ja està bloquejat, raó: '%s'" -#: builtin/worktree.c:491 +#: builtin/worktree.c:493 #, c-format msgid "'%s' is already locked" msgstr "'%s' ja està bloquejat" -#: builtin/worktree.c:519 +#: builtin/worktree.c:521 #, c-format msgid "'%s' is not locked" msgstr "'%s' no està bloquejat" @@ -13227,20 +13675,20 @@ msgstr "només útil per a la depuració" msgid "git upload-pack [<options>] <dir>" msgstr "git upload-pack [<opcions>] <directori>" -#: upload-pack.c:1028 +#: upload-pack.c:1036 msgid "quit after a single request/response exchange" msgstr "surt després d'un sol intercanvi de sol·licitud/resposta" -#: upload-pack.c:1030 +#: upload-pack.c:1038 msgid "exit immediately after initial ref advertisement" -msgstr "surt immediatament després del anunci inicial de referència" +msgstr "surt immediatament després de l'anunci inicial de referència" -#: upload-pack.c:1032 +#: upload-pack.c:1040 msgid "do not try <directory>/.git/ if <directory> is no Git directory" msgstr "" "no intentis <directori>/.git/ si <directori> no és cap directori del Git" -#: upload-pack.c:1034 +#: upload-pack.c:1042 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "interromp la transferència després de <n> segons d'inactivitat" @@ -13253,7 +13701,7 @@ msgid "" "\tchmod 0700 %s" msgstr "" "Els permisos en el vostre directori de sòcol són massa liberals;\n" -"potser que altres usuaris poden llegir els vostres credencials.\n" +"pot ser que altres usuaris poden llegir les vostres credencials.\n" "Considereu executar:\n" "\n" "\tchmod 0700 %s" @@ -13270,17 +13718,32 @@ msgid "" msgstr "" "'git help -a' i 'git help -g' llisten subordres disponibles i\n" "algunes guies de concepte. Vegeu 'git help <ordre>' o\n" -"'git help <concepte>' per a llegir sobre una subordre o concepte\n" -"específic." +"'git help <concepte>' per a llegir sobre una subordre o concepte específic." -#: http.c:342 +#: http.c:344 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "No s'admet el control de delegació amb el cURL < 7.22.0" -#: http.c:351 +#: http.c:353 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "No s'admet l'enganx de clau pública amb cURL < 7.44.0" +#: http.c:1713 +#, c-format +msgid "" +"unable to update url base from redirection:\n" +" asked for: %s\n" +" redirect: %s" +msgstr "" +"no s'ha pogut actualitzar la URL base des de la redirecció:\n" +" petició: %s\n" +" redirecció: %s" + +#: remote-curl.c:319 +#, c-format +msgid "redirecting to %s" +msgstr "s'està redirigint a %s" + #: common-cmds.h:9 msgid "start a working area (see also: git help tutorial)" msgstr "començar una àrea de treball (vegeu també: git help tutorial)" @@ -13356,7 +13819,7 @@ msgstr "Mou o canvia de nom a un fitxer, directori o enllaç simbòlic" #: common-cmds.h:30 msgid "Fetch from and integrate with another repository or a local branch" -msgstr "Obtén de i integra amb un altre dipòsit o una branca local" +msgstr "Obtén i integra amb un altre dipòsit o una branca local" #: common-cmds.h:31 msgid "Update remote refs along with associated objects" @@ -13422,7 +13885,7 @@ msgstr "Cal començar per \"git bisect start\"" #. at this point. #: git-bisect.sh:60 msgid "Do you want me to do it for you [Y/n]? " -msgstr "Voleu que ho faci per vós [Y/n]? " +msgstr "Voleu que ho faci per vosté [Y/n]? " #: git-bisect.sh:121 #, sh-format @@ -13462,17 +13925,17 @@ msgstr "Paràmetre bisect_write dolent: $state" #: git-bisect.sh:262 #, sh-format msgid "Bad rev input: $arg" -msgstr "Introducció de revisió dolenta: $arg" +msgstr "Introducció de revisió errònia: $arg" #: git-bisect.sh:281 #, sh-format msgid "Bad rev input: $bisected_head" -msgstr "Entrada de revisió dolenta: $bisected_head" +msgstr "Entrada de revisió errònia: $bisected_head" #: git-bisect.sh:290 #, sh-format msgid "Bad rev input: $rev" -msgstr "Introducció de revisió dolenta: $rev" +msgstr "Introducció de revisió errònia: $rev" #: git-bisect.sh:299 #, sh-format @@ -13567,7 +14030,7 @@ msgid "" "'bisect_state $state' exited with error code $res" msgstr "" "el pas de bisecció ha fallat:\n" -"'bisect_state $state' ha surt amb el codi d'error $res" +"'bisect_state $state' ha surtit amb el codi d'error $res" #: git-bisect.sh:538 msgid "bisect run success" @@ -13652,7 +14115,7 @@ msgid "Simple merge did not work, trying automatic merge." msgstr "" "La fusió simple no ha funcionat, s'està intentant una fusió automàtica." -#: git-rebase.sh:56 +#: git-rebase.sh:57 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" @@ -13660,57 +14123,42 @@ msgid "" "\"." msgstr "" "Quan hàgiu resolt aquest problema, executeu \"git rebase --continue\".\n" -"Si preferiu saltar aquest pedaç, executeu \"git rebase --skip\" en lloc " +"Si preferiu ometre aquest pedaç, executeu \"git rebase --skip\" en lloc " "d'això.\n" -"Per a agafar la branca original i deixar de rebasar, executeu \"git rebase --" -"abort\"." +"Per a agafar la branca original i deixar de fer «rebase», executeu \"git " +"rebase --abort\"." -#: git-rebase.sh:156 git-rebase.sh:395 +#: git-rebase.sh:157 git-rebase.sh:396 #, sh-format msgid "Could not move back to $head_name" msgstr "No s'ha pogut tornar a $head_name" -#: git-rebase.sh:167 -msgid "Applied autostash." -msgstr "S'ha aplicat el magatzem automàtic." - -#: git-rebase.sh:170 +#: git-rebase.sh:171 #, sh-format msgid "Cannot store $stash_sha1" msgstr "No es pot emmagatzemar $stash_sha1" -#: git-rebase.sh:171 -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 "" -"L'aplicació del magatzem automàtic ha resultat en conflictes.\n" -"Els vostres canvis estan segurs en el magatzem.\n" -"Podeu executar \"git stash pop\" o \"git stash drop\" en qualsevol moment.\n" - -#: git-rebase.sh:210 +#: git-rebase.sh:211 msgid "The pre-rebase hook refused to rebase." -msgstr "El ganxo de prerebasament ha refusat rebasar." +msgstr "El ganxo pre-«rebase» ha refusat a fer «rebase»." -#: git-rebase.sh:215 +#: git-rebase.sh:216 msgid "It looks like git-am is in progress. Cannot rebase." -msgstr "Sembla que git-am està en curs. No es pot rebasar." +msgstr "Sembla que git-am està en curs. No es pot fer «rebase»." -#: git-rebase.sh:356 +#: git-rebase.sh:357 msgid "No rebase in progress?" msgstr "No hi ha rebasament en curs?" -#: git-rebase.sh:367 +#: git-rebase.sh:368 msgid "The --edit-todo action can only be used during interactive rebase." -msgstr "" -"L'acció --edit-todo només es pot usar durant un rebasament interactiva." +msgstr "L'acció --edit-todo només es pot usar durant un «rebase» interactiu." -#: git-rebase.sh:374 +#: git-rebase.sh:375 msgid "Cannot read HEAD" msgstr "No es pot llegir HEAD" -#: git-rebase.sh:377 +#: git-rebase.sh:378 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -13718,7 +14166,7 @@ msgstr "" "Heu d'editar tots els conflictes de fusió i després\n" "marcar-los com a resolts fent servir git add" -#: git-rebase.sh:414 +#: git-rebase.sh:418 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -13739,66 +14187,66 @@ msgstr "" "i executeu-me de nou. M'aturo per si encara hi teniu alguna cosa\n" "de valor." -#: git-rebase.sh:465 +#: git-rebase.sh:469 #, sh-format msgid "invalid upstream $upstream_name" msgstr "font no vàlida $upstream_name" -#: git-rebase.sh:489 +#: git-rebase.sh:493 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: ja hi ha més d'una base de fusió" -#: git-rebase.sh:492 git-rebase.sh:496 +#: git-rebase.sh:496 git-rebase.sh:500 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: no hi ha cap base de fusió" -#: git-rebase.sh:501 +#: git-rebase.sh:505 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "No assenyala una comissió vàlida: $onto_name" -#: git-rebase.sh:524 +#: git-rebase.sh:528 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "fatal: no hi ha tal branca: $branch_name" -#: git-rebase.sh:557 +#: git-rebase.sh:561 msgid "Cannot autostash" msgstr "No es pot emmagatzemar automàticament" -#: git-rebase.sh:562 +#: git-rebase.sh:566 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "S'ha creat un magatzem automàtic: $stash_abbrev" -#: git-rebase.sh:566 +#: git-rebase.sh:570 msgid "Please commit or stash them." msgstr "Si us plau, cometeu-los o emmagatzemeu-los." -#: git-rebase.sh:586 +#: git-rebase.sh:590 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "La branca actual $branch_name està al dia." -#: git-rebase.sh:590 +#: git-rebase.sh:594 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." -msgstr "La branca actual $branch_name està al dia; rebasament forçada." +msgstr "La branca actual $branch_name està al dia; «rebase» forçat." -#: git-rebase.sh:601 +#: git-rebase.sh:605 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Canvis de $mb a $onto:" -#: git-rebase.sh:610 +#: git-rebase.sh:614 msgid "First, rewinding head to replay your work on top of it..." msgstr "" "Primer, s'està rebobinant el cap per a reproduir el vostre treball al " "damunt..." -#: git-rebase.sh:620 +#: git-rebase.sh:624 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "S'ha avançat $branch_name ràpidament a $onto_name." @@ -13878,11 +14326,11 @@ msgstr "No es pot desar l'estat actual" #: git-stash.sh:268 #, sh-format msgid "Saved working directory and index state $stash_msg" -msgstr "S'han desat el directori de treball i l'estat d'ìndex $stash_msg" +msgstr "S'han desat el directori de treball i l'estat d'índex $stash_msg" #: git-stash.sh:285 msgid "Cannot remove worktree changes" -msgstr "No es pot eliminar els canvis de l'arbre de treball" +msgstr "No es poden eliminar els canvis de l'arbre de treball" #: git-stash.sh:403 #, sh-format @@ -13935,7 +14383,7 @@ msgstr "No s'ha pogut restaurar els fitxers no seguits des d'emmagatzematge" #: git-stash.sh:533 msgid "Cannot unstage modified files" -msgstr "No es pot desallistar fitxers modificats" +msgstr "No es pot fer «unstage» dels fitxers modificats" #: git-stash.sh:548 msgid "Index was not unstashed." @@ -13963,23 +14411,28 @@ msgstr "Cap nom de branca especificat" msgid "(To restore them type \"git stash apply\")" msgstr "(Per restaurar-les teclegeu \"git stash apply\")" -#: git-submodule.sh:184 +#: git-submodule.sh:181 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" "El camí relatiu només es pot usar des del nivell superior de l'arbre de " "treball" -#: git-submodule.sh:194 +#: git-submodule.sh:191 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "URL de dipòsit: '$repo' ha de ser absolut o començar amb ./|../" -#: git-submodule.sh:211 +#: git-submodule.sh:210 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' ja existeix en l'índex" -#: git-submodule.sh:215 +#: git-submodule.sh:213 +#, sh-format +msgid "'$sm_path' already exists in the index and is not a submodule" +msgstr "'$sm_path' ja existeix en l'índex i no és submòdul" + +#: git-submodule.sh:218 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -13990,23 +14443,23 @@ msgstr "" "$sm_path\n" "Useu -f si realment voleu afegir-lo." -#: git-submodule.sh:233 +#: git-submodule.sh:236 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "S'està afegint el dipòsit existent a '$sm_path' a l'índex" -#: git-submodule.sh:235 +#: git-submodule.sh:238 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' ja existeix i no és un dipòsit de git vàlid" -#: git-submodule.sh:243 +#: git-submodule.sh:246 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" "Es troba un directori de git per a '$sm_name' localment amb els remots:" -#: git-submodule.sh:245 +#: git-submodule.sh:248 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -14023,49 +14476,49 @@ msgstr "" "o no esteu segur de què vol dir això, trieu un altre nom amb l'opció '--" "name'." -#: git-submodule.sh:251 +#: git-submodule.sh:254 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "" "S'està reactivant el directori de git local per al submòdul '$sm_name'." -#: git-submodule.sh:263 +#: git-submodule.sh:266 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "no s'ha pogut agafar el submòdul '$sm_path'" -#: git-submodule.sh:268 +#: git-submodule.sh:271 #, sh-format msgid "Failed to add submodule '$sm_path'" -msgstr "S'ha fallat en afegir el submòdul '$sm_path'" +msgstr "S'ha produït un error en afegir el submòdul '$sm_path'" -#: git-submodule.sh:277 +#: git-submodule.sh:280 #, sh-format msgid "Failed to register submodule '$sm_path'" -msgstr "S'ha fallat en registrar el submòdul '$sm_path'" +msgstr "s'ha produït un error en registrar el submòdul '$sm_path'" -#: git-submodule.sh:324 +#: git-submodule.sh:327 #, sh-format msgid "Entering '$displaypath'" msgstr "S'està entrant '$displaypath'" -#: git-submodule.sh:344 +#: git-submodule.sh:347 #, sh-format msgid "Stopping at '$displaypath'; script returned non-zero status." msgstr "" "S'està aturant a '$displaypath'; l'script ha retornat un estat no zero." -#: git-submodule.sh:415 +#: git-submodule.sh:418 #, sh-format msgid "pathspec and --all are incompatible" msgstr "--pathspec i --all són incompatibles" -#: git-submodule.sh:420 +#: git-submodule.sh:423 #, sh-format msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "Useu '--all' si realment voleu desinicialitzar tots els submòduls" -#: git-submodule.sh:440 +#: git-submodule.sh:443 #, sh-format msgid "" "Submodule work tree '$displaypath' contains a .git directory\n" @@ -14074,7 +14527,7 @@ msgstr "" "L'arbre de treball de submòdul '$displaypath' conté un directori .git\n" "(useu 'rm -rf' si realment voleu eliminar-lo, incloent tota la seva història)" -#: git-submodule.sh:448 +#: git-submodule.sh:451 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " @@ -14083,38 +14536,38 @@ msgstr "" "L'arbre de treball de submòdul '$displaypath' conté modificacions locals; " "useu '-f' per a descartar-les" -#: git-submodule.sh:451 +#: git-submodule.sh:454 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "S'ha netejat el directori '$displaypath'" -#: git-submodule.sh:452 +#: git-submodule.sh:455 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "No s'ha pogut eliminar l'arbre de treball de submòdul '$displaypath'" -#: git-submodule.sh:455 +#: git-submodule.sh:458 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "No s'ha pogut crear el directori de submòdul buit '$displaypath'" -#: git-submodule.sh:464 +#: git-submodule.sh:467 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "Submòdul '$name' ($url) no registrat per al camí '$displaypath'" -#: git-submodule.sh:617 +#: git-submodule.sh:623 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" "No s'ha pogut trobar la revisió actual en el camí de submòdul '$displaypath'" -#: git-submodule.sh:627 +#: git-submodule.sh:633 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "No s'ha pogut obtenir en el camí de submòdul '$sm_path'" -#: git-submodule.sh:632 +#: git-submodule.sh:638 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -14123,12 +14576,12 @@ msgstr "" "No s'ha pogut trobar la revisió actual de ${remote_name}/${branch} en el " "camí de submòdul '$sm_path'" -#: git-submodule.sh:650 +#: git-submodule.sh:656 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "No s'ha pogut obtenir en el camí de submòdul '$displaypath'" -#: git-submodule.sh:656 +#: git-submodule.sh:662 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -14137,83 +14590,86 @@ msgstr "" "S'ha obtingut en el camí de submòdul '$displaypath', però no contenia $sha1. " "L'obtenció directa d'aquella comissió ha fallat." -#: git-submodule.sh:663 +#: git-submodule.sh:669 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "No s'ha pogut agafar '$sha1' en el camí de submòdul '$displaypath'" -#: git-submodule.sh:664 +#: git-submodule.sh:670 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Camí de submòdul '$displaypath': s'ha agafat '$sha1'" -#: git-submodule.sh:668 +#: git-submodule.sh:674 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" -msgstr "no s'ha pogut rebasar '$sha1' en el camí de submòdul '$displaypath'" +msgstr "" +"no s'ha pogut fer «rebase» '$sha1' en el camí de submòdul '$displaypath'" -#: git-submodule.sh:669 +#: git-submodule.sh:675 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" -msgstr "Camí de submòdul '$displaypath': s'ha rebasat en '$sha1'" +msgstr "Camí de submòdul '$displaypath': s'ha fet «rebase» en '$sha1'" -#: git-submodule.sh:674 +#: git-submodule.sh:680 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "No s'ha pogut fusionar '$sha1' en el camí de submòdul '$displaypath'" -#: git-submodule.sh:675 +#: git-submodule.sh:681 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Camí de submòdul '$displaypath': s'ha fusionat en '$sha1'" -#: git-submodule.sh:680 +#: git-submodule.sh:686 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "L'execució de '$command $sha1' ha fallat en el camí de submòdul " "'$displaypath'" -#: git-submodule.sh:681 +#: git-submodule.sh:687 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Camí de submòdul '$displaypath': '$command $sha1'" -#: git-submodule.sh:712 +#: git-submodule.sh:718 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" -msgstr "S'ha fallat en recursar al camí de submòdul '$displaypath'" +msgstr "" +"s'ha produït un error en recorre recursivament dins del camí de submòdul " +"'$displaypath'" -#: git-submodule.sh:820 +#: git-submodule.sh:826 msgid "The --cached option cannot be used with the --files option" msgstr "L'opció --cached no es pot usar amb l'opció --files" -#: git-submodule.sh:872 +#: git-submodule.sh:878 #, sh-format msgid "unexpected mode $mod_dst" msgstr "mode inesperat $mod_dst" -#: git-submodule.sh:892 +#: git-submodule.sh:898 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Avís: $display_name no conté la comissió $sha1_src" -#: git-submodule.sh:895 +#: git-submodule.sh:901 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Avís: $display_name no conté la comissió $sha1_dst" -#: git-submodule.sh:898 +#: git-submodule.sh:904 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr " Avís: $display_name no conté les comissions $sha1_src i $sha1_dst" -#: git-submodule.sh:1045 +#: git-submodule.sh:1051 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" -msgstr "S'ha fallat en recursar al camí de submòdul '$sm_path'" +msgstr "S'ha produït un error en cercar recursivament al camí de submòdul '$sm_path'" -#: git-submodule.sh:1112 +#: git-submodule.sh:1118 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "S'està sincronitzant l'url de submòdul per a '$displaypath'" @@ -14226,7 +14682,7 @@ msgstr "Vegeu git-${cmd}(1) per detalls." #: git-rebase--interactive.sh:140 #, sh-format msgid "Rebasing ($new_count/$total)" -msgstr "S'està rebasant ($new_count/$total)" +msgstr "S'està fent «rebase» ($new_count/$total)" #: git-rebase--interactive.sh:156 msgid "" @@ -14246,7 +14702,7 @@ msgstr "" "Ordres:\n" " p, pick = usa la comissió\n" " r, reword = usa la comissió, però edita el missatge de comissió\n" -" e, edit = usa la commissió, però atura't per a esmenar\n" +" e, edit = usa la comissió, però atura't per a esmenar\n" " s, squash = usa la comissió, però fusiona'l a la comissió prèvia\n" " f, fixup = com \"squash\", però descarta el missatge de registre d'aquesta " "comissió\n" @@ -14295,7 +14751,7 @@ msgstr "" #: git-rebase--interactive.sh:236 #, sh-format msgid "$sha1: not a commit that can be picked" -msgstr "$sha1: no és una comissió que es pugi escollir" +msgstr "$sha1: no és una comissió que es pugui escollir" #: git-rebase--interactive.sh:275 #, sh-format @@ -14344,7 +14800,7 @@ msgstr "Aquest és el missatge de comissió núm. ${n}:" #: git-rebase--interactive.sh:421 #, sh-format msgid "The commit message #${n} will be skipped:" -msgstr "El missatge de comissió núm. ${n} se saltarà:" +msgstr "El missatge de comissió núm. ${n} s'ometrà:" #: git-rebase--interactive.sh:432 #, sh-format @@ -14353,26 +14809,22 @@ msgid_plural "This is a combination of $count commits." msgstr[0] "Això és una combinació de $count comissió." msgstr[1] "Això és una combinació de $count comissions." -#: git-rebase--interactive.sh:440 +#: git-rebase--interactive.sh:441 #, sh-format msgid "Cannot write $fixup_msg" msgstr "No es pot escriure $fixup_msg" -#: git-rebase--interactive.sh:443 +#: git-rebase--interactive.sh:444 msgid "This is a combination of 2 commits." msgstr "Això és una combinació de 2 comissions." -#: git-rebase--interactive.sh:444 -msgid "This is the 1st commit message:" -msgstr "Aquest és el 1er missatge de comissió:" - -#: git-rebase--interactive.sh:484 git-rebase--interactive.sh:527 -#: git-rebase--interactive.sh:530 +#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528 +#: git-rebase--interactive.sh:531 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "No s'ha pogut aplicar $sha1... $rest" -#: git-rebase--interactive.sh:558 +#: git-rebase--interactive.sh:559 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -14384,35 +14836,35 @@ msgstr "" "No s'ha pogut esmenar la comissió després d'escollir amb èxit $sha1... " "$rest\n" "Això és probablement a causa d'un missatge de comissió buit, o el ganxo de\n" -"precomissió ha fallat. Si el ganxo de precomissió ha fallat, potser que\n" +"precomissió ha fallat. Si el ganxo de precomissió ha fallat, pot ser que\n" "necessiteu resoldre el problema abans que pugueu canviar el missatge de\n" "comissió." -#: git-rebase--interactive.sh:573 +#: git-rebase--interactive.sh:574 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "S'ha aturat a $sha1_abbrev... $rest" -#: git-rebase--interactive.sh:588 +#: git-rebase--interactive.sh:589 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "No es pot '$squash_style' sense una comissió prèvia" -#: git-rebase--interactive.sh:630 +#: git-rebase--interactive.sh:631 #, sh-format msgid "Executing: $rest" msgstr "S'està executant: $rest" -#: git-rebase--interactive.sh:638 +#: git-rebase--interactive.sh:639 #, sh-format msgid "Execution failed: $rest" msgstr "L'execució ha fallat: $rest" -#: git-rebase--interactive.sh:640 +#: git-rebase--interactive.sh:641 msgid "and made changes to the index and/or the working tree" msgstr "i ha fet canvis a l'índex o l'arbre de treball" -#: git-rebase--interactive.sh:642 +#: git-rebase--interactive.sh:643 msgid "" "You can fix the problem, and then run\n" "\n" @@ -14423,7 +14875,7 @@ msgstr "" "\tgit rebase --continue" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--interactive.sh:655 +#: git-rebase--interactive.sh:656 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -14438,25 +14890,25 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--interactive.sh:666 +#: git-rebase--interactive.sh:667 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "Ordre desconeguda: $command $sha1 $rest" -#: git-rebase--interactive.sh:667 +#: git-rebase--interactive.sh:668 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "Si us plau, arregleu això usant 'git rebase --edit-todo'." -#: git-rebase--interactive.sh:702 +#: git-rebase--interactive.sh:703 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "S'ha rebasat i actualitzat $head_name amb èxit." -#: git-rebase--interactive.sh:749 +#: git-rebase--interactive.sh:750 msgid "Could not skip unnecessary pick commands" -msgstr "No s'ha pogut saltar ordres innecessaris d'elecció" +msgstr "No s'ha pogut ometre ordres innecessaris d'elecció" -#: git-rebase--interactive.sh:907 +#: git-rebase--interactive.sh:908 #, sh-format msgid "" "Warning: the SHA-1 is missing or isn't a commit in the following line:\n" @@ -14465,7 +14917,7 @@ msgstr "" "Advertència: manca el SHA-1 o no és una comissió en la línia següent:\n" " - $line" -#: git-rebase--interactive.sh:940 +#: git-rebase--interactive.sh:941 #, sh-format msgid "" "Warning: the command isn't recognized in the following line:\n" @@ -14474,11 +14926,11 @@ msgstr "" "Advertència: no es reconeix l'ordre en la línia següent:\n" " - $line" -#: git-rebase--interactive.sh:979 +#: git-rebase--interactive.sh:980 msgid "could not detach HEAD" msgstr "no s'ha pogut separar HEAD" -#: git-rebase--interactive.sh:1017 +#: git-rebase--interactive.sh:1018 msgid "" "Warning: some commits may have been dropped accidentally.\n" "Dropped commits (newer to older):" @@ -14487,7 +14939,7 @@ msgstr "" "accidentalment.\n" "Les comissions descartades (més nova a més vella):" -#: git-rebase--interactive.sh:1025 +#: git-rebase--interactive.sh:1026 msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" "\n" @@ -14502,7 +14954,7 @@ msgstr "" "d'advertències.\n" "Els comportaments possibles són: ignore, warn, error." -#: git-rebase--interactive.sh:1036 +#: git-rebase--interactive.sh:1037 #, sh-format msgid "" "Unrecognized setting $check_level for option rebase.missingCommitsCheck. " @@ -14511,23 +14963,23 @@ msgstr "" "No s'ha reconegut l'ajust $check_level per a l'opció rebase." "missingCommitsCheck. S'està ignorant." -#: git-rebase--interactive.sh:1053 +#: git-rebase--interactive.sh:1054 msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" "continue'." msgstr "" -"Podeu arreglar això amb 'git rebase --edit-todo' i desprès 'git rebase --" +"Podeu arreglar això amb 'git rebase --edit-todo' i després 'git rebase --" "continue'." -#: git-rebase--interactive.sh:1054 +#: git-rebase--interactive.sh:1055 msgid "Or you can abort the rebase with 'git rebase --abort'." msgstr "O podeu avortar el rebasament amb 'git rebase --abort'." -#: git-rebase--interactive.sh:1078 +#: git-rebase--interactive.sh:1079 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD" -#: git-rebase--interactive.sh:1083 +#: git-rebase--interactive.sh:1084 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -14544,7 +14996,7 @@ msgid "" "\n" " git rebase --continue\n" msgstr "" -"Teniu canvis emmagatzemats en el vostre arbre de treball.\n" +"Teniu canvis «stage» en el vostre arbre de treball.\n" "Si aquests canvis són per a aixafar-se\n" "a la comissió prèvia, executeu:\n" "\n" @@ -14554,29 +15006,29 @@ msgstr "" "\n" " git commit $gpg_sign_opt_quoted\n" "\n" -"En ambdós cassos, quan hàgiu terminat, continueu amb:\n" +"En ambdós casos, quan hàgiu terminat, continueu amb:\n" "\n" " git rebase --continue\n" -#: git-rebase--interactive.sh:1100 +#: git-rebase--interactive.sh:1101 msgid "Error trying to find the author identity to amend commit" msgstr "" -"Ha hagut un error en intentar trobar la identitat d'autor per a esmenar la " -"comissió" +"Hi ha hagut un error en intentar trobar la identitat d'autor per a esmenar " +"la comissió" -#: git-rebase--interactive.sh:1105 +#: git-rebase--interactive.sh:1106 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." msgstr "" -"Teniu canvis no comessos en el vostre arbre de treball. Si us plau,\n" +"Teniu canvis no comesos en el vostre arbre de treball. Si us plau,\n" "primer cometeu-los i després executeu 'git rebase --continue' de nou." -#: git-rebase--interactive.sh:1110 git-rebase--interactive.sh:1114 +#: git-rebase--interactive.sh:1111 git-rebase--interactive.sh:1115 msgid "Could not commit staged changes." -msgstr "No s'ha pogut cometre els canvis emmagatzemats." +msgstr "No s'ha pogut cometre els canvis «stage»." -#: git-rebase--interactive.sh:1138 +#: git-rebase--interactive.sh:1139 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -14590,40 +15042,40 @@ msgstr "" " git rebase --continue\n" "\n" -#: git-rebase--interactive.sh:1146 git-rebase--interactive.sh:1304 +#: git-rebase--interactive.sh:1147 git-rebase--interactive.sh:1305 msgid "Could not execute editor" msgstr "No s'ha pogut executar l'editor" -#: git-rebase--interactive.sh:1159 +#: git-rebase--interactive.sh:1160 #, sh-format msgid "Could not checkout $switch_to" msgstr "No s'ha pogut agafar $switch_to" -#: git-rebase--interactive.sh:1164 +#: git-rebase--interactive.sh:1165 msgid "No HEAD?" msgstr "No hi ha cap HEAD?" -#: git-rebase--interactive.sh:1165 +#: git-rebase--interactive.sh:1166 #, sh-format msgid "Could not create temporary $state_dir" msgstr "No s'ha pogut crear el $state_dir temporal" -#: git-rebase--interactive.sh:1167 +#: git-rebase--interactive.sh:1168 msgid "Could not mark as interactive" msgstr "No s'ha pogut marcar com a interactiu" -#: git-rebase--interactive.sh:1177 git-rebase--interactive.sh:1182 +#: git-rebase--interactive.sh:1178 git-rebase--interactive.sh:1183 msgid "Could not init rewritten commits" msgstr "No s'ha pogut iniciar les comissions reescrites" -#: git-rebase--interactive.sh:1282 +#: git-rebase--interactive.sh:1283 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "Rebasa $shortrevisions sobre $shortonto ($todocount ordre)" msgstr[1] "Rebasa $shortrevisions sobre $shortonto ($todocount ordres)" -#: git-rebase--interactive.sh:1287 +#: git-rebase--interactive.sh:1288 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -14633,7 +15085,7 @@ msgstr "" "No obstant, si elimineu tot, s'avortarà el rebasament.\n" "\n" -#: git-rebase--interactive.sh:1294 +#: git-rebase--interactive.sh:1295 msgid "Note that empty commits are commented out" msgstr "Nota que les comissions buides estan comentades" @@ -14656,29 +15108,30 @@ msgstr "fatal: no es pot usar $program_name sense un arbre de treball." #: git-sh-setup.sh:220 msgid "Cannot rebase: You have unstaged changes." -msgstr "No es pot rebasar: Teniu canvis no allistats." +msgstr "No es pot rebasar: Teniu canvis «unstaged»." #: git-sh-setup.sh:223 msgid "Cannot rewrite branches: You have unstaged changes." -msgstr "No es pot reescriure branques: Teniu canvis no allistats." +msgstr "No es pot reescriure branques: Teniu canvis «unstaged»." #: git-sh-setup.sh:226 msgid "Cannot pull with rebase: You have unstaged changes." -msgstr "No es pot baixar amb rebasament: Teniu canvis no allistats." +msgstr "No es pot baixar amb fent «rebase»: Teniu canvis «unstaged»." #: git-sh-setup.sh:229 #, sh-format msgid "Cannot $action: You have unstaged changes." -msgstr "No es pot $action: Teniu canvis no allistats." +msgstr "No es pot $action: Teniu canvis «unstaged»." #: git-sh-setup.sh:242 msgid "Cannot rebase: Your index contains uncommitted changes." -msgstr "No es pot rebasar: El vostre índex conté canvis sense cometre." +msgstr "No es pot fer «rebase»: El vostre índex conté canvis sense cometre." #: git-sh-setup.sh:245 msgid "Cannot pull with rebase: Your index contains uncommitted changes." msgstr "" -"No es pot baixar amb rebasament: El vostre índex conté canvis sense cometre." +"No es pot baixar amb fent «rebase»: El vostre índex conté canvis sense " +"cometre." #: git-sh-setup.sh:248 #, sh-format @@ -14697,3 +15150,824 @@ msgstr "" #: git-sh-setup.sh:377 msgid "Unable to determine absolute path of git directory" msgstr "No s'ha pogut determinar el camí absolut del directori de git" + +#. TRANSLATORS: you can adjust this to align "git add -i" status menu +#: git-add--interactive.perl:238 +#, perl-format +msgid "%12s %12s %s" +msgstr "" + +#: git-add--interactive.perl:239 +msgid "staged" +msgstr "staged" + +#: git-add--interactive.perl:239 +msgid "unstaged" +msgstr "unstaged" + +#: git-add--interactive.perl:297 git-add--interactive.perl:322 +msgid "binary" +msgstr "binari" + +#: git-add--interactive.perl:306 git-add--interactive.perl:360 +msgid "nothing" +msgstr "res" + +#: git-add--interactive.perl:342 git-add--interactive.perl:357 +msgid "unchanged" +msgstr "sense canvis" + +#: git-add--interactive.perl:653 +#, perl-format +msgid "added %d path\n" +msgid_plural "added %d paths\n" +msgstr[0] "afegit %d camí\n" +msgstr[1] "afegits %d camins\n" + +#: git-add--interactive.perl:656 +#, perl-format +msgid "updated %d path\n" +msgid_plural "updated %d paths\n" +msgstr[0] "actualitzat %d camí\n" +msgstr[1] "actualitzats %d camins\n" + +#: git-add--interactive.perl:659 +#, perl-format +msgid "reverted %d path\n" +msgid_plural "reverted %d paths\n" +msgstr[0] "revertit %d camí\n" +msgstr[1] "revertits %d camins\n" + +#: git-add--interactive.perl:662 +#, perl-format +msgid "touched %d path\n" +msgid_plural "touched %d paths\n" +msgstr[0] "modificat %d camí\n" +msgstr[1] "modificat %d camins\n" + +#: git-add--interactive.perl:671 +msgid "Update" +msgstr "Actualitza" + +#: git-add--interactive.perl:683 +msgid "Revert" +msgstr "Reverteix" + +#: git-add--interactive.perl:706 +#, perl-format +msgid "note: %s is untracked now.\n" +msgstr "nota: %s està ara sense seguiment.\n" + +#: git-add--interactive.perl:717 +msgid "Add untracked" +msgstr "Afegeix sense seguiment" + +#: git-add--interactive.perl:723 +msgid "No untracked files.\n" +msgstr "Sense fitxers no seguits.\n" + +#: git-add--interactive.perl:1039 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for staging." +msgstr "" +"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n" +"per «staging»." + +#: git-add--interactive.perl:1042 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for stashing." +msgstr "" +"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n" +"per «stashing»." + +#: git-add--interactive.perl:1045 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for unstaging." +msgstr "" +"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n" +"per «unstaging»." + +#: git-add--interactive.perl:1048 git-add--interactive.perl:1057 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for applying." +msgstr "" +"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n" +"per aplicar-se." + +#: git-add--interactive.perl:1051 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for discarding" +msgstr "" +"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n" +"per descartar-se." + +#: git-add--interactive.perl:1054 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for discarding." +msgstr "" +"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n" +"per descartar-se." + +#: git-add--interactive.perl:1067 +#, perl-format +msgid "failed to open hunk edit file for writing: %s" +msgstr "s'ha produït un error en escriure al fitxer d'edició del tros: %s" + +#: git-add--interactive.perl:1068 +msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" +msgstr "Mode d'edició de trossos manual - vegeu més avall per una guia ràpida.\n" + +#: git-add--interactive.perl:1074 +#, 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" +"Per suprimir '%s' línies, feu-les línies ' ' (context).\n" +"Per suprimir '%s' línies, suprimiu-les.\n" +"Les línies que comencin per %s seran suprimides.\n" + +#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. +#: git-add--interactive.perl:1082 +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 no s'aplica correctament, tindreu una oportunitat per editar-lo\n" +"de nou. Si totes les línies del tros se suprimeixen, llavors l'edició s'avorta\n" +"i el tros es deixa sense cap canvi.\n" + +#: git-add--interactive.perl:1096 +#, perl-format +msgid "failed to open hunk edit file for reading: %s" +msgstr "s'ha produït un error en llegir al fitxer d'edició del tros: %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:1187 +msgid "" +"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +msgstr "" +"El tros editat no s'ha aplica. Editeu-lo de nou (si responeu \"no\" es descartarà) [y/n]? " + +#: git-add--interactive.perl:1196 +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 "" + +#: git-add--interactive.perl:1202 +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 "" + +#: git-add--interactive.perl:1208 +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 "" + +#: git-add--interactive.perl:1214 +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 "" + +#: git-add--interactive.perl:1220 +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 "" + +#: git-add--interactive.perl:1226 +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 "" + +#: git-add--interactive.perl:1232 +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 "" + +#: git-add--interactive.perl:1241 +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 "" + +#: git-add--interactive.perl:1272 +msgid "The selected hunks do not apply to the index!\n" +msgstr "Els trossos seleccionats no apliquen a l'índex\n" + +#: git-add--interactive.perl:1273 +msgid "Apply them to the worktree anyway? " +msgstr "Voleu aplicar-los igualment a l'arbre de treball" + +#: git-add--interactive.perl:1276 +msgid "Nothing was applied.\n" +msgstr "No s'ha aplicat res.\n" + +#: git-add--interactive.perl:1287 +#, perl-format +msgid "ignoring unmerged: %s\n" +msgstr "s'està ignorant %s no fusionat\n" + +#: git-add--interactive.perl:1296 +msgid "Only binary files changed.\n" +msgstr "Només s'han canviat els fitxers binaris.\n" + +#: git-add--interactive.perl:1298 +msgid "No changes.\n" +msgstr "Sense canvis.\n" + +#: git-add--interactive.perl:1306 +msgid "Patch update" +msgstr "Actualització del pedaç" + +#: git-add--interactive.perl:1358 +#, perl-format +msgid "Stage mode change [y,n,q,a,d,/%s,?]? " +msgstr "Canvia el mode de «stage» [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1359 +#, perl-format +msgid "Stage deletion [y,n,q,a,d,/%s,?]? " +msgstr "Suprimeix «stage» [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1360 +#, perl-format +msgid "Stage this hunk [y,n,q,a,d,/%s,?]? " +msgstr "Fer un «stage» d'aquest tros [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1363 +#, perl-format +msgid "Stash mode change [y,n,q,a,d,/%s,?]? " +msgstr "Canvia el mode de «stash» [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1364 +#, perl-format +msgid "Stash deletion [y,n,q,a,d,/%s,?]? " +msgstr "Suprimeix «stage» [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1365 +#, perl-format +msgid "Stash this hunk [y,n,q,a,d,/%s,?]? " +msgstr "Fer un «stash» d'aquest tros [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1368 +#, perl-format +msgid "Unstage mode change [y,n,q,a,d,/%s,?]? " +msgstr "Canvia el mode de «unstage» [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1369 +#, perl-format +msgid "Unstage deletion [y,n,q,a,d,/%s,?]? " +msgstr "Suprimeix «Unstage» [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1370 +#, perl-format +msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? " +msgstr "Fer un «unstage» d'aquest tros [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1373 +#, perl-format +msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? " +msgstr "Aplica el canvi de mode a l'índex [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1374 +#, perl-format +msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? " +msgstr "Aplica l'esborrat a l'índex [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1375 +#, perl-format +msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? " +msgstr "Aplica aquest tros a l'índex [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1378 +#, perl-format +msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? " +msgstr "" +"Descarta el canvi de mode des de l'arbre de treball [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1379 +#, perl-format +msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? " +msgstr "Descarta l'esborrat des de l'arbre de treball [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1380 +#, perl-format +msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? " +msgstr "Descarta aquest tros des de l'arbre de treball [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1383 +#, perl-format +msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "Descarta el canvi de mode des de l'índex i l'arbre de treball [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1384 +#, perl-format +msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "Descarta la supressió des de l'índex i l'arbre de treball [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1385 +#, perl-format +msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "Descarta aquest tros des de l'índex i l'arbre de treball [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1388 +#, perl-format +msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "Aplica el canvi de mode a l'índex i l'arbre de treball [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1389 +#, perl-format +msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "Aplica la supressió a l'índex i l'arbre de treball [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1390 +#, perl-format +msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "Aplica aquest tros a l'índex i l'arbre de treball [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1493 +msgid "go to which hunk (<ret> to see more)? " +msgstr "vés a quin tros (<ret> per veure'n més)? " + +#: git-add--interactive.perl:1495 +msgid "go to which hunk? " +msgstr "vés a quin tros? " + +#: git-add--interactive.perl:1504 +#, perl-format +msgid "Invalid number: '%s'\n" +msgstr "Número no vàlid: '%s'\n" + +#: git-add--interactive.perl:1509 +#, perl-format +msgid "Sorry, only %d hunk available.\n" +msgid_plural "Sorry, only %d hunks available.\n" +msgstr[0] "Només %d tros disponible.\n" +msgstr[1] "Només %d trossos disponibles.\n" + +#: git-add--interactive.perl:1535 +msgid "search for regex? " +msgstr "Cerca per expressió regular? " + +#: git-add--interactive.perl:1548 +#, perl-format +msgid "Malformed search regexp %s: %s\n" +msgstr "Expressió regular de cerca mal formada %s: %s\n" + +#: git-add--interactive.perl:1558 +msgid "No hunk matches the given pattern\n" +msgstr "No hi ha trossos que coincideixin amb el patró donat\n" + +#: git-add--interactive.perl:1570 git-add--interactive.perl:1592 +msgid "No previous hunk\n" +msgstr "Sense tros previ\n" + +#: git-add--interactive.perl:1579 git-add--interactive.perl:1598 +msgid "No next hunk\n" +msgstr "No hi ha tros següent\n" + +#: git-add--interactive.perl:1606 +#, perl-format +msgid "Split into %d hunk.\n" +msgid_plural "Split into %d hunks.\n" +msgstr[0] "Divideix en %d tros.\n" +msgstr[1] "Divideix en %d trossos.\n" + +#: git-add--interactive.perl:1658 +msgid "Review diff" +msgstr "Reviseu les diferències" + +#. TRANSLATORS: please do not translate the command names +#. 'status', 'update', 'revert', etc. +#: git-add--interactive.perl:1677 +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\t - view diff between HEAD and index\n" +"add untracked - add contents of untracked files to the staged set of " +"changes\n" +msgstr "" + +#: git-add--interactive.perl:1694 git-add--interactive.perl:1699 +#: git-add--interactive.perl:1702 git-add--interactive.perl:1709 +#: git-add--interactive.perl:1713 git-add--interactive.perl:1719 +msgid "missing --" +msgstr "manca --" + +#: git-add--interactive.perl:1715 +#, perl-format +msgid "unknown --patch mode: %s" +msgstr "desconegut --patch mode: %s" + +#: git-add--interactive.perl:1721 git-add--interactive.perl:1727 +#, perl-format +msgid "invalid argument %s, expecting --" +msgstr "argument %s no vàlid, s'esperava --" + +#: git-send-email.perl:121 +msgid "local zone differs from GMT by a non-minute interval\n" +msgstr "la zona local difereix de GMT per un interval que no és de minuts\n" + +#: git-send-email.perl:128 git-send-email.perl:134 +msgid "local time offset greater than or equal to 24 hours\n" +msgstr "el desplaçament de la zona local és més gran o igual a 24 hores\n" + +#: git-send-email.perl:202 git-send-email.perl:208 +msgid "the editor exited uncleanly, aborting everything" +msgstr "l'editor no ha sortit correctament, avortant-ho tot" + +#: git-send-email.perl:282 +#, perl-format +msgid "" +"'%s' contains an intermediate version of the email you were composing.\n" +msgstr "" + +#: git-send-email.perl:287 +#, perl-format +msgid "'%s.final' contains the composed email.\n" +msgstr "" + +#: git-send-email.perl:305 +msgid "--dump-aliases incompatible with other options\n" +msgstr "--dump-aliases és incompatible amb altres opcions\n" + +#: git-send-email.perl:368 git-send-email.perl:623 +#, fuzzy +msgid "Cannot run git format-patch from outside a repository\n" +msgstr "--cached fora d'un dipòsit" + +#: git-send-email.perl:437 +#, perl-format +msgid "Unknown --suppress-cc field: '%s'\n" +msgstr "" + +#: git-send-email.perl:466 +#, fuzzy, perl-format +msgid "Unknown --confirm setting: '%s'\n" +msgstr "Comissió desconeguda %s" + +#: git-send-email.perl:498 +#, perl-format +msgid "warning: sendmail alias with quotes is not supported: %s\n" +msgstr "" + +#: git-send-email.perl:500 +#, perl-format +msgid "warning: `:include:` not supported: %s\n" +msgstr "" + +#: git-send-email.perl:502 +#, perl-format +msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" +msgstr "" + +#: git-send-email.perl:507 +#, perl-format +msgid "warning: sendmail line is not recognized: %s\n" +msgstr "" + +#: git-send-email.perl:589 +#, 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 "" + +#: git-send-email.perl:610 +#, perl-format +msgid "Failed to opendir %s: %s" +msgstr "s'ha produït un error a l'obrir el directori %s: %s" + +#: git-send-email.perl:634 +#, perl-format +msgid "" +"fatal: %s: %s\n" +"warning: no patches were sent\n" +msgstr "" +"greu: %s: %s\n" +"avís: no s'han enviat pedaços\n" + +#: git-send-email.perl:645 +msgid "" +"\n" +"No patch files specified!\n" +"\n" +msgstr "" +"\n" +"No s'han especificat fitxers de pedaç\n" +"\n" + +#: git-send-email.perl:658 +#, perl-format +msgid "No subject line in %s?" +msgstr "Sense assumpte a: %s" + +#: git-send-email.perl:668 +#, perl-format +msgid "Failed to open for writing %s: %s" +msgstr "S'ha produït un error en obrir per escriptura %s: %s" + +#: git-send-email.perl:678 +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 "" + +#: git-send-email.perl:701 +#, perl-format +msgid "Failed to open %s.final: %s" +msgstr "s'ha produït un error en obrir %s.final: %s" + +#: git-send-email.perl:704 +#, perl-format +msgid "Failed to open %s: %s" +msgstr "S'ha produït un error en obrir %s: %s" + +#: git-send-email.perl:739 +msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n" +msgstr "Els camps A/Cc/Bcc no s'interpreten encara, s'ignoraran\n" + +#: git-send-email.perl:748 +msgid "Summary email is empty, skipping it\n" +msgstr "El correu electrònic de resum està buit, s'omet\n" + +#. TRANSLATORS: please keep [y/N] as is. +#: git-send-email.perl:780 +#, perl-format +msgid "Are you sure you want to use <%s> [y/N]? " +msgstr "Esteu segur que voleu usar <%s> [y/N]? " + +#: git-send-email.perl:809 +msgid "" +"The following files are 8bit, but do not declare a Content-Transfer-" +"Encoding.\n" +msgstr "" + +#: git-send-email.perl:814 +msgid "Which 8bit encoding should I declare [UTF-8]? " +msgstr "Quina codificació de 8 bits hauria de declarar [UTF-8]? " + +#: git-send-email.perl:822 +#, 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 "" + +#: git-send-email.perl:841 +msgid "To whom should the emails be sent (if anyone)?" +msgstr "A quin s'haurien d'enviar els correus electrònics (si s'han d'enviar a algú)?" + +#: git-send-email.perl:859 +#, perl-format +msgid "fatal: alias '%s' expands to itself\n" +msgstr "" + +#: git-send-email.perl:871 +msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " +msgstr "" + +#: git-send-email.perl:921 git-send-email.perl:929 +#, perl-format +msgid "error: unable to extract a valid address from: %s\n" +msgstr "error: no s'ha pogut extreure una adreça vàlida 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:933 +msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " +msgstr "Què fer amb aquesta adreça? ([q]surt|[d]escarta|[e]dita): " + +#: git-send-email.perl:1234 +#, fuzzy, perl-format +msgid "CA path \"%s\" does not exist" +msgstr "el camí '%s' no existeix" + +#: git-send-email.perl:1309 +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 "" + +#. 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:1324 +msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): " +msgstr "Voleu enviar aquest correu electrònic? ([y]sí|[n]o|[q]surt|[a]tot): " + +#: git-send-email.perl:1327 +msgid "Send this email reply required" +msgstr "" + +#: git-send-email.perl:1353 +msgid "The required SMTP server is not properly defined." +msgstr "" + +#: git-send-email.perl:1397 +#, perl-format +msgid "Server does not support STARTTLS! %s" +msgstr "El servidor no admet STARTTLS! %s" + +#: git-send-email.perl:1403 +msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." +msgstr "" + +#: git-send-email.perl:1421 +#, perl-format +msgid "Failed to send %s\n" +msgstr "s'ha produït un error en enviar %s\n" + +#: git-send-email.perl:1424 +#, perl-format +msgid "Dry-Sent %s\n" +msgstr "" + +#: git-send-email.perl:1424 +#, perl-format +msgid "Sent %s\n" +msgstr "Enviat %s\n" + +#: git-send-email.perl:1426 +msgid "Dry-OK. Log says:\n" +msgstr "" + +#: git-send-email.perl:1426 +msgid "OK. Log says:\n" +msgstr "Correcte. El registre diu: \n" + +#: git-send-email.perl:1438 +msgid "Result: " +msgstr "Resultat: " + +#: git-send-email.perl:1441 +msgid "Result: OK\n" +msgstr "Resultat: correcte\n" + +#: git-send-email.perl:1454 +#, fuzzy, perl-format +msgid "can't open file %s" +msgstr "no es pot obrir el fitxer '%s'" + +#: git-send-email.perl:1501 git-send-email.perl:1521 +#, perl-format +msgid "(mbox) Adding cc: %s from line '%s'\n" +msgstr "" + +#: git-send-email.perl:1507 +#, perl-format +msgid "(mbox) Adding to: %s from line '%s'\n" +msgstr "" + +#: git-send-email.perl:1555 +#, perl-format +msgid "(non-mbox) Adding cc: %s from line '%s'\n" +msgstr "" + +#: git-send-email.perl:1578 +#, perl-format +msgid "(body) Adding cc: %s from line '%s'\n" +msgstr "" + +#: git-send-email.perl:1676 +#, perl-format +msgid "(%s) Could not execute '%s'" +msgstr "(%s) no s'ha pogut executar '%s'" + +#: git-send-email.perl:1683 +#, perl-format +msgid "(%s) Adding %s: %s from: '%s'\n" +msgstr "" + +#: git-send-email.perl:1687 +#, fuzzy, perl-format +msgid "(%s) failed to close pipe to '%s'" +msgstr "s'ha produït un error en copiar el fitxer a '%s'" + +#: git-send-email.perl:1714 +msgid "cannot send message as 7bit" +msgstr "no es pot enviar el missatge en 7 bits" + +#: git-send-email.perl:1722 +msgid "invalid transfer encoding" +msgstr "codificació de transferència invàlida" + +#: git-send-email.perl:1741 git-send-email.perl:1792 git-send-email.perl:1802 +#, perl-format +msgid "unable to open %s: %s\n" +msgstr "no s'ha pogut obrir %s: %s\n" + +#: git-send-email.perl:1744 +#, perl-format +msgid "%s: patch contains a line longer than 998 characters" +msgstr "%s: el pedaç conté una línia més gran de 998 caràcters" + +#: git-send-email.perl:1760 +#, perl-format +msgid "Skipping %s with backup suffix '%s'.\n" +msgstr "S'està ometent %s amb el sufix de còpia de seguretat '%s'.\n" + +#. TRANSLATORS: please keep "[y|N]" as is. +#: git-send-email.perl:1764 +#, perl-format +msgid "Do you really want to send %s? [y|N]: " +msgstr "" + +#~ msgid "Use an experimental blank-line-based heuristic to improve diffs" +#~ msgstr "" +#~ "Usa un heurístic experimental basat en línies en blanc per a millorar les " +#~ "diferències" + +#~ msgid "Clever... amending the last one with dirty index." +#~ msgstr "Intel·ligent... s'està esmenant l'últim amb índex brut." + +#~ msgid "" +#~ "the following submodule (or one of its nested submodules)\n" +#~ "uses a .git directory:" +#~ msgid_plural "" +#~ "the following submodules (or one of their nested submodules)\n" +#~ "use a .git directory:" +#~ msgstr[0] "" +#~ "el submòdul següent (o un dels seus submòduls niats)\n" +#~ "usa un directori .git:" +#~ msgstr[1] "" +#~ "els submòduls següents (o un dels seus submòduls niats)\n" +#~ "usa un directori .git:" + +#~ msgid "" +#~ "\n" +#~ "(use 'rm -rf' if you really want to remove it including all of its " +#~ "history)" +#~ msgstr "" +#~ "\n" +#~ "(useu 'rm -rf' si realment voleu eliminar-lo, incloent tota la seva " +#~ "història)" @@ -73,8 +73,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2016-11-25 22:50+0800\n" -"PO-Revision-Date: 2016-11-25 22:55+0800\n" +"POT-Creation-Date: 2017-02-04 13:02+0800\n" +"PO-Revision-Date: 2017-02-11 14:53+0100\n" "Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n" "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n" "Language: fr\n" @@ -125,7 +125,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "Abandon à cause de conflit non résolu." -#: advice.c:114 builtin/merge.c:1181 +#: advice.c:114 builtin/merge.c:1206 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)." @@ -613,7 +613,7 @@ msgstr[1] "Application du patch %%s avec %d rejets..." msgid "truncating .rej filename to %.*s.rej" msgstr "troncature du nom de fichier .rej en %.*s.rej" -#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989 +#: apply.c:4540 builtin/fetch.c:737 builtin/fetch.c:986 #, c-format msgid "cannot open %s" msgstr "impossible d'ouvrir %s" @@ -667,15 +667,16 @@ msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "%d ligne ajoutée après correction des erreurs d'espace." msgstr[1] "%d lignes ajoutées après correction des erreurs d'espace." -#: apply.c:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431 +#: apply.c:4888 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391 msgid "Unable to write new index file" msgstr "Impossible d'écrire le nouveau fichier d'index" #: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280 #: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180 -#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:407 -#: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592 -#: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947 +#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:591 +#: builtin/submodule--helper.c:594 builtin/submodule--helper.c:960 +#: builtin/submodule--helper.c:963 builtin/submodule--helper.c:1104 +#: git-add--interactive.perl:239 msgid "path" msgstr "chemin" @@ -780,8 +781,8 @@ msgid "allow overlapping hunks" msgstr "accepter les recouvrements de sections" #: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19 -#: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593 -#: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114 +#: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651 +#: builtin/log.c:1860 builtin/mv.c:122 builtin/read-tree.c:114 msgid "be verbose" msgstr "mode verbeux" @@ -822,7 +823,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <dépôt> [--exec <commande>] --list" -#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327 +#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300 #, c-format msgid "pathspec '%s' did not match any files" msgstr "le chemin '%s' ne correspond à aucun fichier" @@ -843,11 +844,11 @@ msgstr "préfixe" msgid "prepend prefix to each pathname in the archive" msgstr "préfixer chaque chemin de fichier dans l'archive" -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2603 -#: builtin/blame.c:2604 builtin/config.c:59 builtin/fast-export.c:987 -#: builtin/fast-export.c:989 builtin/grep.c:723 builtin/hash-object.c:101 -#: builtin/ls-files.c:539 builtin/ls-files.c:542 builtin/notes.c:401 -#: builtin/notes.c:564 builtin/read-tree.c:109 parse-options.h:153 +#: archive.c:432 builtin/blame.c:2607 builtin/blame.c:2608 builtin/config.c:59 +#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1054 +#: builtin/hash-object.c:101 builtin/ls-files.c:539 builtin/ls-files.c:542 +#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109 +#: parse-options.h:153 msgid "file" msgstr "fichier" @@ -880,7 +881,7 @@ msgid "list supported archive formats" msgstr "afficher les formats d'archive supportés" #: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88 -#: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953 +#: builtin/submodule--helper.c:603 builtin/submodule--helper.c:969 msgid "repo" msgstr "dépôt" @@ -976,13 +977,13 @@ msgstr "" #: bisect.c:750 #, c-format msgid "" -"Some %s revs are not ancestor of the %s rev.\n" +"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 "" "Certaines révision %s ne sont pas ancêtres de la révision %s.\n" "git bisect ne peut pas fonctionner correctement dans ce cas.\n" -"Peut-être avez-vous inversé les révisions %s et %s ?\n" +"Peut-être les révisions %s et %s ne sont-elles pas les bonnes ?\n" #: bisect.c:763 #, c-format @@ -1006,7 +1007,7 @@ msgstr "Bissection : une base de fusion doit être testée\n" msgid "a %s revision is needed" msgstr "une révision %s est nécessaire" -#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248 +#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:262 #, c-format msgid "could not create file '%s'" msgstr "impossible de créer le fichier '%s'" @@ -1205,7 +1206,7 @@ msgstr "'%s' ne semble pas être un fichier bundle v2" msgid "unrecognized header: %s%s (%d)" msgstr "en-tête non reconnu : %s%s (%d)" -#: bundle.c:87 sequencer.c:963 builtin/commit.c:777 +#: bundle.c:87 sequencer.c:1331 sequencer.c:1752 builtin/commit.c:777 #, c-format msgid "could not open '%s'" msgstr "impossible d'ouvrir '%s'" @@ -1214,10 +1215,10 @@ msgstr "impossible d'ouvrir '%s'" msgid "Repository lacks these prerequisite commits:" msgstr "Le dépôt ne dispose pas des commits prérequis suivants :" -#: bundle.c:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374 -#: builtin/blame.c:2814 builtin/commit.c:1061 builtin/log.c:348 +#: bundle.c:163 ref-filter.c:1499 sequencer.c:1154 sequencer.c:2290 +#: builtin/blame.c:2820 builtin/commit.c:1061 builtin/log.c:348 #: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909 -#: builtin/merge.c:356 builtin/shortlog.c:170 +#: builtin/merge.c:360 builtin/shortlog.c:177 msgid "revision walk setup failed" msgstr "échec de la préparation du parcours des révisions" @@ -1256,7 +1257,7 @@ msgstr "rev-list a disparu" msgid "ref '%s' is excluded by the rev-list options" msgstr "la référence '%s' est exclue par les options de rev-list" -#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273 +#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:282 #, c-format msgid "unrecognized argument: %s" msgstr "argument non reconnu : %s" @@ -1274,13 +1275,13 @@ msgstr "impossible de créer '%s'" msgid "index-pack died" msgstr "l'index de groupe a disparu" -#: color.c:290 +#: color.c:300 #, c-format msgid "invalid color value: %.*s" msgstr "Valeur invalide de couleur : %.*s" -#: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493 -#: builtin/am.c:2127 +#: commit.c:40 sequencer.c:1564 builtin/am.c:421 builtin/am.c:457 +#: builtin/am.c:1493 builtin/am.c:2127 #, c-format msgid "could not parse %s" msgstr "impossible d'analyser %s" @@ -1306,136 +1307,146 @@ msgstr "" msgid "memory exhausted" msgstr "plus de mémoire" -#: config.c:516 +#: config.c:518 #, c-format msgid "bad config line %d in blob %s" msgstr "ligne %d de config incorrecte dans le blob %s" -#: config.c:520 +#: config.c:522 #, c-format msgid "bad config line %d in file %s" msgstr "ligne %d de config incorrecte dans le fichier %s" -#: config.c:524 +#: config.c:526 #, c-format msgid "bad config line %d in standard input" msgstr "ligne %d de config incorrecte dans l'entrée standard" -#: config.c:528 +#: config.c:530 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "ligne %d de config incorrecte dans le blob de sous-module %s" -#: config.c:532 +#: config.c:534 #, c-format msgid "bad config line %d in command line %s" msgstr "ligne %d de config incorrecte dans la ligne de commande %s" -#: config.c:536 +#: config.c:538 #, c-format msgid "bad config line %d in %s" msgstr "ligne %d de config incorrecte dans %s" -#: config.c:655 +#: config.c:657 msgid "out of range" msgstr "hors plage" -#: config.c:655 +#: config.c:657 msgid "invalid unit" msgstr "unité invalide" -#: config.c:661 +#: config.c:663 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s" -#: config.c:666 +#: config.c:668 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob " "%s : %s" -#: config.c:669 +#: config.c:671 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans le fichier " "%s : %s" -#: config.c:672 +#: config.c:674 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans l'entrée " "standard : %s" -#: config.c:675 +#: config.c:677 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob de " "sous-module %s : %s" -#: config.c:678 +#: config.c:680 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans la ligne de " "commande %s : %s" -#: config.c:681 +#: config.c:683 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans %s : %s" -#: config.c:768 +#: config.c:770 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "impossible d'étendre le répertoire utilisateur dans : '%s'" -#: config.c:852 config.c:863 +#: config.c:865 config.c:876 #, c-format msgid "bad zlib compression level %d" msgstr "niveau de compression zlib incorrect %d" -#: config.c:978 +#: config.c:993 #, c-format msgid "invalid mode for object creation: %s" msgstr "mode invalide pour la création d'objet : %s" -#: config.c:1312 +#: config.c:1149 +#, c-format +msgid "bad pack compression level %d" +msgstr "niveau de compression du paquet %d" + +#: config.c:1339 msgid "unable to parse command-line config" msgstr "lecture de la configuration de ligne de commande impossible" -#: config.c:1362 +#: config.c:1389 msgid "unknown error occurred while reading the configuration files" msgstr "erreur inconnue pendant la lecture des fichiers de configuration" -#: config.c:1716 +#: config.c:1743 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" "impossible d'analyser '%s' depuis le configuration en ligne de commande" -#: config.c:1718 +#: config.c:1745 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" "variable de configuration '%s' incorrecte dans le fichier '%s' à la ligne %d" -#: config.c:1777 +#: config.c:1804 #, c-format msgid "%s has multiple values" msgstr "%s a des valeurs multiples" -#: config.c:2311 +#: config.c:2225 config.c:2450 +#, c-format +msgid "fstat on %s failed" +msgstr "échec de fstat sur %s" + +#: config.c:2343 #, c-format msgid "could not set '%s' to '%s'" msgstr "impossible de régler '%s' à '%s'" -#: config.c:2313 +#: config.c:2345 #, c-format msgid "could not unset '%s'" msgstr "impossible de désinitialiser '%s'" @@ -1451,12 +1462,12 @@ msgid "" "Please make sure you have the correct access rights\n" "and the repository exists." msgstr "" -"Impossilble de lire le dépôt distant.\n" +"Impossible de lire le dépôt distant.\n" "\n" "Veuillez vérifier que vous avez les droits d'accès\n" "et que le dépôt existe." -#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140 +#: connected.c:63 builtin/fsck.c:190 builtin/prune.c:140 msgid "Checking connectivity" msgstr "Vérification de la connectivité" @@ -1595,13 +1606,13 @@ msgstr "" msgid " Unknown dirstat parameter '%s'\n" msgstr " Paramètre dirstat inconnu '%s'\n" -#: diff.c:283 +#: diff.c:281 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" "Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'" -#: diff.c:346 +#: diff.c:344 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -1610,20 +1621,20 @@ msgstr "" "Erreurs dans la variable de configuration 'diff.dirstat' :\n" "%s" -#: diff.c:3087 +#: diff.c:3085 #, c-format msgid "external diff died, stopping at %s" msgstr "l'application de diff externe a disparu, arrêt à %s" -#: diff.c:3412 +#: diff.c:3411 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check et -s sont mutuellement exclusifs" -#: diff.c:3502 +#: diff.c:3501 msgid "--follow requires exactly one pathspec" msgstr "--follow a besoin d'une spécification de chemin unique" -#: diff.c:3665 +#: diff.c:3664 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -1632,24 +1643,24 @@ msgstr "" "Impossible d'analyser le paramètre de l'option --dirstat/-X :\n" "%s" -#: diff.c:3679 +#: diff.c:3678 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Impossible d'analyser le paramètre de l'option --submodule : '%s'" -#: diff.c:4700 +#: diff.c:4695 msgid "inexact rename detection was skipped due to too many files." msgstr "" "détection de renommage inexact annulée à cause d'un trop grand nombre de " "fichiers." -#: diff.c:4703 +#: diff.c:4698 msgid "only found copies from modified paths due to too many files." msgstr "" "recherche uniquement des copies par modification de chemin à cause d'un trop " "grand nombre de fichiers." -#: diff.c:4706 +#: diff.c:4701 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -1657,14 +1668,19 @@ msgstr "" "vous souhaitez peut-être régler la variable %s à au moins %d et réessayer le " "commande." -#: dir.c:1866 +#: dir.c:1863 msgid "failed to get kernel name and information" msgstr "echec de l'obtention d'information de kernel" -#: dir.c:1985 +#: dir.c:1982 msgid "Untracked cache is disabled on this system or location." msgstr "Le cache non suivi est désactivé sur ce système ou sur cet endroit." +#: dir.c:2760 +#, c-format +msgid "could not migrate git directory from '%s' to '%s'" +msgstr "impossible de migrer le répertoire git de '%s' vers '%s'" + #: fetch-pack.c:213 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack : list courte attendue" @@ -1845,35 +1861,40 @@ msgstr "impossible de créer un fichier temporaire" msgid "failed writing detached signature to '%s'" msgstr "impossible d'écrire la signature détachée dans '%s'" -#: grep.c:1782 +#: graph.c:96 +#, c-format +msgid "ignore invalid color '%.*s' in log.graphColors" +msgstr "couleur invalide '%.*s' ignorée dans log.graphColors" + +#: grep.c:1794 #, c-format msgid "'%s': unable to read %s" msgstr "'%s' : lecture de %s impossible" -#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155 +#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:133 #, c-format msgid "failed to stat '%s'" msgstr "échec du stat de '%s'" -#: grep.c:1810 +#: grep.c:1822 #, c-format msgid "'%s': short read" msgstr "'%s' : lecture tronquée" -#: help.c:203 +#: help.c:218 #, c-format msgid "available git commands in '%s'" msgstr "commandes git disponibles dans '%s'" -#: help.c:210 +#: help.c:225 msgid "git commands available from elsewhere on your $PATH" msgstr "commandes git disponibles depuis un autre endroit de votre $PATH" -#: help.c:241 +#: help.c:256 msgid "These are common Git commands used in various situations:" msgstr "Ci-dessous les commandes Git habituelles dans diverses situations :" -#: help.c:306 +#: help.c:321 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -1882,11 +1903,11 @@ msgstr "" "'%s' semble être une commande git, mais elle n'a pas pu\n" "être exécutée. Peut-être git-%s est-elle cassée ?" -#: help.c:361 +#: help.c:376 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Ahem. Votre système n'indique aucune commande Git." -#: help.c:383 +#: help.c:398 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" @@ -1896,17 +1917,17 @@ msgstr "" "pas.\n" "Continuons en supposant que vous avez voulu dire '%s'" -#: help.c:388 +#: help.c:403 #, c-format msgid "in %0.1f seconds automatically..." msgstr "dans %0.1f secondes automatiquement..." -#: help.c:395 +#: help.c:410 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git : '%s' n'est pas une commande git. Voir 'git --help'." -#: help.c:399 help.c:465 +#: help.c:414 help.c:480 msgid "" "\n" "Did you mean this?" @@ -1920,7 +1941,7 @@ msgstr[1] "" "\n" "Vouliez-vous dire un de ceux-là ?" -#: help.c:461 +#: help.c:476 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" @@ -1988,69 +2009,69 @@ msgstr "impossible d'écrire le nouveau fichier d'index" msgid "(bad commit)\n" msgstr "(mauvais commit)\n" -#: merge-recursive.c:231 +#: merge-recursive.c:231 merge-recursive.c:239 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "échec de addinfo_cache pour le chemin '%s'" -#: merge-recursive.c:301 +#: merge-recursive.c:303 msgid "error building trees" msgstr "erreur de construction des arbres" -#: merge-recursive.c:720 +#: merge-recursive.c:727 #, c-format msgid "failed to create path '%s'%s" msgstr "impossible de créer le chemin '%s' %s" -#: merge-recursive.c:731 +#: merge-recursive.c:738 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Suppression de %s pour faire de la place pour le sous-répertoire\n" -#: merge-recursive.c:745 merge-recursive.c:764 +#: merge-recursive.c:752 merge-recursive.c:771 msgid ": perhaps a D/F conflict?" msgstr ": peut-être un conflit D/F ?" -#: merge-recursive.c:754 +#: merge-recursive.c:761 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "refus de perdre le fichier non suivi '%s'" -#: merge-recursive.c:796 builtin/cat-file.c:34 +#: merge-recursive.c:803 builtin/cat-file.c:34 #, c-format msgid "cannot read object %s '%s'" msgstr "impossible de lire l'objet %s '%s'" -#: merge-recursive.c:798 +#: merge-recursive.c:805 #, c-format msgid "blob expected for %s '%s'" msgstr "blob attendu pour %s '%s'" -#: merge-recursive.c:822 +#: merge-recursive.c:829 #, c-format msgid "failed to open '%s': %s" msgstr "échec à l'ouverture de '%s' : %s" -#: merge-recursive.c:833 +#: merge-recursive.c:840 #, c-format msgid "failed to symlink '%s': %s" msgstr "échec à la création du lien symbolique '%s' : %s" -#: merge-recursive.c:838 +#: merge-recursive.c:845 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "ne sait pas traiter %06o %s '%s'" -#: merge-recursive.c:978 +#: merge-recursive.c:985 msgid "Failed to execute internal merge" msgstr "Échec à l'exécution de la fusion interne" -#: merge-recursive.c:982 +#: merge-recursive.c:989 #, c-format msgid "Unable to add %s to database" msgstr "Impossible d'ajouter %s à la base de données" -#: merge-recursive.c:1081 merge-recursive.c:1095 +#: merge-recursive.c:1088 merge-recursive.c:1102 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2059,7 +2080,7 @@ msgstr "" "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de " "%s laissée dans l'arbre." -#: merge-recursive.c:1087 merge-recursive.c:1100 +#: merge-recursive.c:1094 merge-recursive.c:1107 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2068,20 +2089,20 @@ msgstr "" "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de " "%s laissée dans l'arbre dans le fichier %s." -#: merge-recursive.c:1143 +#: merge-recursive.c:1150 msgid "rename" msgstr "renommage" -#: merge-recursive.c:1143 +#: merge-recursive.c:1150 msgid "renamed" msgstr "renommé" -#: merge-recursive.c:1200 +#: merge-recursive.c:1207 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s est un répertoire dans %s ajouté plutôt comme %s" -#: merge-recursive.c:1225 +#: merge-recursive.c:1232 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -2090,137 +2111,137 @@ msgstr "" "CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche " "\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s" -#: merge-recursive.c:1230 +#: merge-recursive.c:1237 msgid " (left unresolved)" msgstr " (laissé non résolu)" -#: merge-recursive.c:1292 +#: merge-recursive.c:1299 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "CONFLIT (renommage/renommage) : renommage '%s'->'%s' dans %s. Renommage '%s'-" ">'%s' dans %s" -#: merge-recursive.c:1325 +#: merge-recursive.c:1332 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "Renommage de %s en %s et de %s en %s à la place" -#: merge-recursive.c:1531 +#: merge-recursive.c:1538 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" "CONFLIT (renommage/ajout) : Renommage de %s->%s dans %s. %s ajouté dans %s" -#: merge-recursive.c:1546 +#: merge-recursive.c:1553 #, c-format msgid "Adding merged %s" msgstr "Ajout de %s fusionné" -#: merge-recursive.c:1553 merge-recursive.c:1766 +#: merge-recursive.c:1560 merge-recursive.c:1774 #, c-format msgid "Adding as %s instead" msgstr "Ajout plutôt comme %s" -#: merge-recursive.c:1610 +#: merge-recursive.c:1617 #, c-format msgid "cannot read object %s" msgstr "impossible de lire l'objet %s" -#: merge-recursive.c:1613 +#: merge-recursive.c:1620 #, c-format msgid "object %s is not a blob" msgstr "l'objet %s n'est pas un blob" -#: merge-recursive.c:1666 +#: merge-recursive.c:1673 msgid "modify" msgstr "modification" -#: merge-recursive.c:1666 +#: merge-recursive.c:1673 msgid "modified" msgstr "modifié" -#: merge-recursive.c:1676 +#: merge-recursive.c:1683 msgid "content" msgstr "contenu" -#: merge-recursive.c:1683 +#: merge-recursive.c:1690 msgid "add/add" msgstr "ajout/ajout" -#: merge-recursive.c:1718 +#: merge-recursive.c:1726 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "%s sauté (fusion identique à l'existant)" -#: merge-recursive.c:1732 +#: merge-recursive.c:1740 #, c-format msgid "Auto-merging %s" msgstr "Fusion automatique de %s" -#: merge-recursive.c:1736 git-submodule.sh:924 +#: merge-recursive.c:1744 git-submodule.sh:930 msgid "submodule" msgstr "sous-module" -#: merge-recursive.c:1737 +#: merge-recursive.c:1745 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLIT (%s) : Conflit de fusion dans %s" -#: merge-recursive.c:1831 +#: merge-recursive.c:1839 #, c-format msgid "Removing %s" msgstr "Suppression de %s" -#: merge-recursive.c:1857 +#: merge-recursive.c:1865 msgid "file/directory" msgstr "fichier/répertoire" -#: merge-recursive.c:1863 +#: merge-recursive.c:1871 msgid "directory/file" msgstr "répertoire/fichier" -#: merge-recursive.c:1868 +#: merge-recursive.c:1877 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "CONFLIT (%s) : Il y a un répertoire nommé %s dans %s. Ajout de %s comme %s" -#: merge-recursive.c:1877 +#: merge-recursive.c:1886 #, c-format msgid "Adding %s" msgstr "Ajout de %s" -#: merge-recursive.c:1914 +#: merge-recursive.c:1923 msgid "Already up-to-date!" msgstr "Déjà à jour !" -#: merge-recursive.c:1923 +#: merge-recursive.c:1932 #, c-format msgid "merging of trees %s and %s failed" msgstr "échec de fusion des arbres %s et %s" -#: merge-recursive.c:2006 +#: merge-recursive.c:2015 msgid "Merging:" msgstr "Fusion :" -#: merge-recursive.c:2019 +#: merge-recursive.c:2028 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "%u ancêtre commun trouvé :" msgstr[1] "%u ancêtres communs trouvés :" -#: merge-recursive.c:2058 +#: merge-recursive.c:2067 msgid "merge returned no commit" msgstr "la fusion n'a pas retourné de commit" -#: merge-recursive.c:2121 +#: merge-recursive.c:2130 #, c-format msgid "Could not parse object '%s'" msgstr "Impossible d'analyser l'objet '%s'" -#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788 +#: merge-recursive.c:2144 builtin/merge.c:645 builtin/merge.c:792 msgid "Unable to write index." msgstr "Impossible d'écrire l'index." @@ -2301,13 +2322,13 @@ msgstr "nom d'objet malformé '%s'" msgid "Could not make %s writable by group" msgstr "Impossible de rendre %s inscriptible pour le groupe" -#: pathspec.c:133 +#: pathspec.c:142 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" "les réglages de spécificateurs de chemin généraux 'glob' et 'noglob' sont " "incompatibles" -#: pathspec.c:143 +#: pathspec.c:149 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -2315,48 +2336,53 @@ msgstr "" "le réglage global de spécificateur de chemin 'literal' est incompatible avec " "tous les autres réglages globaux de spécificateur de chemin" -#: pathspec.c:177 +#: pathspec.c:188 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "paramètre invalide pour le spécificateur magique de chemin 'prefix'" -#: pathspec.c:183 +#: pathspec.c:201 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "La spécification magique de chemin '%.*s' est invalide dans '%s'" -#: pathspec.c:187 +#: pathspec.c:206 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "')' manquante à la fin du spécificateur magique de chemin dans '%s'" -#: pathspec.c:205 +#: pathspec.c:238 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Spécificateur magique '%c' non implémenté dans '%s'" -#: pathspec.c:230 +#: pathspec.c:293 pathspec.c:315 +#, c-format +msgid "Pathspec '%s' is in submodule '%.*s'" +msgstr "Le chemin '%s' est dans le sous-module '%.*s'" + +#: pathspec.c:350 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s : 'literal' et 'glob' sont incompatibles" -#: pathspec.c:241 +#: pathspec.c:363 #, c-format msgid "%s: '%s' is outside repository" msgstr "%s : '%s' est hors du dépôt" -#: pathspec.c:291 +#: pathspec.c:451 #, c-format -msgid "Pathspec '%s' is in submodule '%.*s'" -msgstr "Le chemin '%s' est dans le sous-module '%.*s'" +msgid "'%s' (mnemonic: '%c')" +msgstr "'%s' (mnémonique : '%c')" -#: pathspec.c:353 +#: pathspec.c:461 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "" "%s : le spécificateur magique de chemin n'est pas supporté par cette " "commande : %s" -#: pathspec.c:408 +#: pathspec.c:511 msgid "" "empty strings as pathspecs will be made invalid in upcoming releases. please " "use . instead if you meant to match all paths" @@ -2365,12 +2391,12 @@ msgstr "" "invalides dans les prochaines versions. Veuillez utiliser . à la place pour " "correspondre à tous le chemins" -#: pathspec.c:440 +#: pathspec.c:535 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "le chemin '%s' est au-delà d'un lien symbolique" -#: pathspec.c:449 +#: pathspec.c:544 msgid "" "There is nothing to exclude from by :(exclude) patterns.\n" "Perhaps you forgot to add either ':/' or '.' ?" @@ -2378,11 +2404,11 @@ msgstr "" "Il n'y a rien dont il faut exclure par des motifs :(exclure).\n" "Peut-être avez-vous oublié d'ajouter ':/' ou '.' ?" -#: pretty.c:971 +#: pretty.c:982 msgid "unable to parse --pretty format" msgstr "impossible d'analyser le format --pretty" -#: read-cache.c:1315 +#: read-cache.c:1307 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -2391,7 +2417,7 @@ msgstr "" "version d'index renseignée, mais la valeur est invalide.\n" "Utilisation de la version %i" -#: read-cache.c:1325 +#: read-cache.c:1317 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -2400,7 +2426,7 @@ msgstr "" "GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n" "Utilisation de la version %i" -#: refs.c:576 builtin/merge.c:840 +#: refs.c:576 builtin/merge.c:844 #, c-format msgid "Could not open '%s' for writing" msgstr "Impossible d'ouvrir '%s' en écriture" @@ -2420,230 +2446,235 @@ msgstr "impossible de supprimer les références : %s" msgid "could not remove reference %s" msgstr "impossible de supprimer la référence %s" -#: ref-filter.c:55 +#: ref-filter.c:56 #, c-format msgid "expected format: %%(color:<color>)" msgstr "format attendu : %%(color:<couleur>)" -#: ref-filter.c:57 +#: ref-filter.c:58 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "couleur non reconnue : %%(color:%s)" -#: ref-filter.c:71 +#: ref-filter.c:72 #, c-format msgid "unrecognized format: %%(%s)" msgstr "format non reconnu %%(%s)" -#: ref-filter.c:77 +#: ref-filter.c:78 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) n'accepte pas d'argument" -#: ref-filter.c:84 +#: ref-filter.c:85 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) n'accepte pas d'argument" -#: ref-filter.c:101 +#: ref-filter.c:92 +#, c-format +msgid "%%(trailers) does not take arguments" +msgstr "%%(trailers) n'accepte pas d'argument" + +#: ref-filter.c:111 #, c-format msgid "positive value expected contents:lines=%s" msgstr "valeur positive attendue contents:lines=%s" -#: ref-filter.c:103 +#: ref-filter.c:113 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "argument %%(contents) non reconnu : %s" -#: ref-filter.c:113 +#: ref-filter.c:123 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "argument %%(objectname) non reconnu : %s" -#: ref-filter.c:135 +#: ref-filter.c:145 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "format attendu : %%(align:<largeur>,<position>)" -#: ref-filter.c:147 +#: ref-filter.c:157 #, c-format msgid "unrecognized position:%s" msgstr "position non reconnue : %s" -#: ref-filter.c:151 +#: ref-filter.c:161 #, c-format msgid "unrecognized width:%s" msgstr "largeur non reconnue : %s" -#: ref-filter.c:157 +#: ref-filter.c:167 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "argument %%(align) non reconnu : %s" -#: ref-filter.c:161 +#: ref-filter.c:171 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "valeur positive attendue avec l'atome %%(align)" -#: ref-filter.c:244 +#: ref-filter.c:255 #, c-format msgid "malformed field name: %.*s" msgstr "nom de champ malformé %.*s" -#: ref-filter.c:270 +#: ref-filter.c:281 #, c-format msgid "unknown field name: %.*s" msgstr "nom de champ inconnu : %.*s" -#: ref-filter.c:372 +#: ref-filter.c:383 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "format : atome %%(end) utilisé sans atome correspondant" -#: ref-filter.c:424 +#: ref-filter.c:435 #, c-format msgid "malformed format string %s" msgstr "Chaîne de formatage mal formée %s" -#: ref-filter.c:878 +#: ref-filter.c:898 msgid ":strip= requires a positive integer argument" msgstr ":strip= requiert un argument entier positif" -#: ref-filter.c:883 +#: ref-filter.c:903 #, c-format msgid "ref '%s' does not have %ld components to :strip" msgstr "la réf '%s' n'a pas %ld composants à :strip" -#: ref-filter.c:1046 +#: ref-filter.c:1066 #, c-format msgid "unknown %.*s format %s" msgstr "format de %.*s inconnu %s" -#: ref-filter.c:1066 ref-filter.c:1097 +#: ref-filter.c:1086 ref-filter.c:1117 #, c-format msgid "missing object %s for %s" msgstr "objet manquant %s pour %s" -#: ref-filter.c:1069 ref-filter.c:1100 +#: ref-filter.c:1089 ref-filter.c:1120 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "echec de parse_object_buffer sur %s pour %s" -#: ref-filter.c:1311 +#: ref-filter.c:1343 #, c-format msgid "malformed object at '%s'" msgstr "objet malformé à '%s'" -#: ref-filter.c:1373 +#: ref-filter.c:1410 #, c-format msgid "ignoring ref with broken name %s" msgstr "réf avec un nom cassé %s ignoré" -#: ref-filter.c:1378 +#: ref-filter.c:1415 #, c-format msgid "ignoring broken ref %s" msgstr "réf cassé %s ignoré" -#: ref-filter.c:1633 +#: ref-filter.c:1670 #, c-format msgid "format: %%(end) atom missing" msgstr "format: atome %%(end) manquant" -#: ref-filter.c:1687 +#: ref-filter.c:1734 #, c-format msgid "malformed object name %s" msgstr "nom d'objet malformé %s" -#: remote.c:746 +#: remote.c:754 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Impossible de récupérer à la fois %s et %s pour %s" -#: remote.c:750 +#: remote.c:758 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s suit habituellement %s, pas %s" -#: remote.c:754 +#: remote.c:762 #, c-format msgid "%s tracks both %s and %s" msgstr "%s suit à la fois %s et %s" -#: remote.c:762 +#: remote.c:770 msgid "Internal error" msgstr "Erreur interne" -#: remote.c:1677 remote.c:1720 +#: remote.c:1685 remote.c:1787 msgid "HEAD does not point to a branch" msgstr "HEAD ne pointe pas sur une branche" -#: remote.c:1686 +#: remote.c:1694 #, c-format msgid "no such branch: '%s'" msgstr "pas de branche '%s'" -#: remote.c:1689 +#: remote.c:1697 #, c-format msgid "no upstream configured for branch '%s'" msgstr "aucune branche amont configurée pour la branche '%s'" -#: remote.c:1695 +#: remote.c:1703 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "la branche amont '%s' n'est pas stockée comme branche de suivi" -#: remote.c:1710 +#: remote.c:1718 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "la destination de poussée '%s' sur le serveur distant '%s' n'a pas de " "branche locale de suivi" -#: remote.c:1725 +#: remote.c:1730 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "la branche '%s' n'a aucune branche distante de poussée" -#: remote.c:1736 +#: remote.c:1741 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "les références de spec pour '%s' n'incluent pas '%s'" -#: remote.c:1749 +#: remote.c:1754 msgid "push has no destination (push.default is 'nothing')" msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')" -#: remote.c:1771 +#: remote.c:1776 msgid "cannot resolve 'simple' push to a single destination" msgstr "" "impossible de résoudre une poussée 'simple' pour une destination unique" -#: remote.c:2073 +#: remote.c:2081 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Votre branche est basée sur '%s', mais la branche amont a disparu.\n" -#: remote.c:2077 +#: remote.c:2085 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n" -#: remote.c:2080 +#: remote.c:2088 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "Votre branche est à jour avec '%s'.\n" -#: remote.c:2084 +#: remote.c:2092 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Votre branche est en avance sur '%s' de %d commit.\n" msgstr[1] "Votre branche est en avance sur '%s' de %d commits.\n" -#: remote.c:2090 +#: remote.c:2098 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n" -#: remote.c:2093 +#: remote.c:2101 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -2655,11 +2686,11 @@ msgstr[1] "" "Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour " "en avance rapide.\n" -#: remote.c:2101 +#: remote.c:2109 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (utilisez \"git pull\" pour mettre à jour votre branche locale)\n" -#: remote.c:2104 +#: remote.c:2112 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -2674,7 +2705,7 @@ msgstr[1] "" "Votre branche et '%s' ont divergé,\n" "et ont %d et %d commits différents chacune respectivement.\n" -#: remote.c:2114 +#: remote.c:2122 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" " (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n" @@ -2692,11 +2723,11 @@ msgstr "votre branche actuelle '%s' ne contient encore aucun commit" msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent est incompatible avec --bisect" -#: run-command.c:106 +#: run-command.c:125 msgid "open /dev/null failed" msgstr "échec de l'ouverture de /dev/null" -#: run-command.c:108 +#: run-command.c:127 #, c-format msgid "dup2(%d,%d) failed" msgstr "échec de dup2(%d,%d)" @@ -2725,15 +2756,24 @@ msgstr "Le receveur ne gère pas les poussées avec --atomic" msgid "the receiving end does not support push options" msgstr "Le receveur ne gère pas les options de poussées" -#: sequencer.c:171 +#: sequencer.c:215 msgid "revert" msgstr "revert" -#: sequencer.c:171 +#: sequencer.c:217 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:228 +#: sequencer.c:219 +msgid "rebase -i" +msgstr "rebase -i" + +#: sequencer.c:221 +#, c-format +msgid "Unknown action: %d" +msgstr "Action inconnue : %d" + +#: sequencer.c:278 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -2741,7 +2781,7 @@ msgstr "" "après résolution des conflits, marquez les chemins corrigés\n" "avec 'git add <chemins>' ou 'git rm <chemins>'" -#: sequencer.c:231 +#: sequencer.c:281 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -2751,60 +2791,63 @@ msgstr "" "avec 'git add <chemins>' ou 'git rm <chemins>'\n" "puis validez le résultat avec 'git commit'" -#: sequencer.c:244 sequencer.c:1209 +#: sequencer.c:294 sequencer.c:1667 #, c-format msgid "could not lock '%s'" msgstr "impossible de verrouiller '%s'" -#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214 +#: sequencer.c:297 sequencer.c:1545 sequencer.c:1672 sequencer.c:1686 #, c-format msgid "could not write to '%s'" msgstr "impossible d'écrire dans '%s'" -#: sequencer.c:251 +#: sequencer.c:301 #, c-format msgid "could not write eol to '%s'" msgstr "impossible d'écrire la fin de ligne dans '%s'" -#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216 +#: sequencer.c:305 sequencer.c:1550 sequencer.c:1674 #, c-format msgid "failed to finalize '%s'." msgstr "échec lors de la finalisation de '%s'." -#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032 +#: sequencer.c:329 sequencer.c:808 sequencer.c:1571 builtin/am.c:259 +#: builtin/commit.c:749 builtin/merge.c:1036 #, c-format msgid "could not read '%s'" msgstr "impossible de lire '%s'" -#: sequencer.c:305 +#: sequencer.c:355 #, c-format msgid "your local changes would be overwritten by %s." msgstr "vos modifications locales seraient écrasées par %s." -#: sequencer.c:309 +#: sequencer.c:359 msgid "commit your changes or stash them to proceed." msgstr "validez vos modifications ou les remiser pour continuer." -#: sequencer.c:324 +#: sequencer.c:388 #, c-format msgid "%s: fast-forward" msgstr "%s : avance rapide" -#. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:399 +#. TRANSLATORS: %s will be "revert", "cherry-pick" or +#. * "rebase -i". +#. +#: sequencer.c:470 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Impossible d'écrire le nouveau fichier index" -#: sequencer.c:418 +#: sequencer.c:489 msgid "could not resolve HEAD commit\n" msgstr "impossible de résoudre le commit HEAD\n" -#: sequencer.c:438 +#: sequencer.c:509 msgid "unable to update cache tree\n" msgstr "impossible de mettre à jour l'arbre de cache\n" -#: sequencer.c:483 +#: sequencer.c:592 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -2833,174 +2876,394 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:567 +#: sequencer.c:688 #, c-format msgid "could not parse commit %s\n" msgstr "impossible d'analyser le commit %s\n" -#: sequencer.c:572 +#: sequencer.c:693 #, c-format msgid "could not parse parent commit %s\n" msgstr "impossible d'analyser le commit parent %s\n" -#: sequencer.c:656 +#: sequencer.c:815 +#, c-format +msgid "" +"unexpected 1st line of squash message:\n" +"\n" +"\t%.*s" +msgstr "" +"première ligne de message de compression inattendue :\n" +"\n" +"\t%.*s" + +#: sequencer.c:821 +#, c-format +msgid "" +"invalid 1st line of squash message:\n" +"\n" +"\t%.*s" +msgstr "" +"première ligne de message de compression invalide :\n" +"\n" +"\t%.*s" + +#: sequencer.c:827 sequencer.c:852 +#, c-format +msgid "This is a combination of %d commits." +msgstr "Ceci est la combinaison de %d commits." + +#: sequencer.c:836 +msgid "need a HEAD to fixup" +msgstr "une HEAD est nécessaire à la correction" + +#: sequencer.c:838 +msgid "could not read HEAD" +msgstr "Impossible de lire HEAD" + +#: sequencer.c:840 +msgid "could not read HEAD's commit message" +msgstr "impossible de lire le message de validation de HEAD" + +#: sequencer.c:846 +#, c-format +msgid "cannot write '%s'" +msgstr "impossible d'écrire '%s'" + +#: sequencer.c:855 git-rebase--interactive.sh:445 +msgid "This is the 1st commit message:" +msgstr "Ceci est le premier message de validation :" + +#: sequencer.c:863 +#, c-format +msgid "could not read commit message of %s" +msgstr "impossible de lire le message de validation de %s" + +#: sequencer.c:870 +#, c-format +msgid "This is the commit message #%d:" +msgstr "Ceci est le message de validation numéro %d :" + +#: sequencer.c:875 +#, c-format +msgid "The commit message #%d will be skipped:" +msgstr "Le message de validation %d sera ignoré :" + +#: sequencer.c:880 +#, c-format +msgid "unknown command: %d" +msgstr "commande inconnue : %d" + +#: sequencer.c:946 msgid "your index file is unmerged." msgstr "votre fichier d'index n'est pas fusionné." -#: sequencer.c:675 +#: sequencer.c:964 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "le commit %s est une fusion mais l'option -m n'a pas été spécifiée." -#: sequencer.c:683 +#: sequencer.c:972 #, c-format msgid "commit %s does not have parent %d" msgstr "le commit %s n'a pas de parent %d" -#: sequencer.c:687 +#: sequencer.c:976 #, c-format msgid "mainline was specified but commit %s is not a merge." msgstr "" "une branche principale a été spécifiée mais le commit %s n'est pas une " "fusion." +#: sequencer.c:982 +#, c-format +msgid "cannot get commit message for %s" +msgstr "impossible d'obtenir un message de validation pour %s" + #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:700 +#: sequencer.c:1001 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s : impossible d'analyser le commit parent %s" -#: sequencer.c:705 +#: sequencer.c:1063 sequencer.c:1812 #, c-format -msgid "cannot get commit message for %s" -msgstr "impossible d'obtenir un message de validation pour %s" +msgid "could not rename '%s' to '%s'" +msgstr "impossible de renommer '%s' en '%s'" -#: sequencer.c:797 +#: sequencer.c:1114 #, c-format msgid "could not revert %s... %s" msgstr "impossible d'annuler %s... %s" -#: sequencer.c:798 +#: sequencer.c:1115 #, c-format msgid "could not apply %s... %s" msgstr "impossible d'appliquer %s... %s" -#: sequencer.c:833 +#: sequencer.c:1157 msgid "empty commit set passed" msgstr "l'ensemble de commits spécifié est vide" -#: sequencer.c:843 +#: sequencer.c:1167 #, c-format msgid "git %s: failed to read the index" msgstr "git %s : échec à la lecture de l'index" -#: sequencer.c:850 +#: sequencer.c:1174 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s : échec du rafraîchissement de l'index" -#: sequencer.c:944 +#: sequencer.c:1294 #, c-format msgid "invalid line %d: %.*s" msgstr "ligne %d invalide : %.*s" -#: sequencer.c:950 -msgid "no commits parsed." -msgstr "aucun commit analysé." +#: sequencer.c:1302 +#, c-format +msgid "cannot '%s' without a previous commit" +msgstr "'%s' impossible avec le commit précédent" -#: sequencer.c:966 +#: sequencer.c:1334 #, c-format msgid "could not read '%s'." msgstr "impossible de lire '%s'." -#: sequencer.c:972 +#: sequencer.c:1341 +msgid "please fix this using 'git rebase --edit-todo'." +msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'." + +#: sequencer.c:1343 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "feuille d'instruction inutilisable : '%s'" -#: sequencer.c:983 +#: sequencer.c:1348 +msgid "no commits parsed." +msgstr "aucun commit analysé." + +#: sequencer.c:1359 msgid "cannot cherry-pick during a revert." msgstr "impossible de picorer pendant l'annulation d'un commit." -#: sequencer.c:985 +#: sequencer.c:1361 msgid "cannot revert during a cherry-pick." msgstr "impossible d'annuler un commit pendant un picorage." -#: sequencer.c:1028 +#: sequencer.c:1424 #, c-format msgid "invalid key: %s" msgstr "clé invalide : %s" -#: sequencer.c:1031 +#: sequencer.c:1427 #, c-format msgid "invalid value for %s: %s" msgstr "valeur invalide pour %s : %s" -#: sequencer.c:1063 +#: sequencer.c:1484 #, c-format msgid "malformed options sheet: '%s'" msgstr "feuille d'options malformée : %s" -#: sequencer.c:1101 +#: sequencer.c:1522 msgid "a cherry-pick or revert is already in progress" msgstr "un picorage ou un retour est déjà en cours" -#: sequencer.c:1102 +#: sequencer.c:1523 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\"" -#: sequencer.c:1106 +#: sequencer.c:1526 #, c-format msgid "could not create sequencer directory '%s'" msgstr "impossible de créer le répertoire de séquenceur '%s'" -#: sequencer.c:1120 +#: sequencer.c:1540 msgid "could not lock HEAD" msgstr "impossible de verrouiller HEAD" -#: sequencer.c:1151 sequencer.c:1289 +#: sequencer.c:1596 sequencer.c:2150 msgid "no cherry-pick or revert in progress" msgstr "aucun picorage ou retour en cours" -#: sequencer.c:1153 +#: sequencer.c:1598 msgid "cannot resolve HEAD" msgstr "impossible de résoudre HEAD" -#: sequencer.c:1155 sequencer.c:1189 +#: sequencer.c:1600 sequencer.c:1634 msgid "cannot abort from a branch yet to be born" msgstr "impossible d'abandonner depuis une branche non encore créée" -#: sequencer.c:1175 builtin/grep.c:578 +#: sequencer.c:1620 builtin/grep.c:904 #, c-format msgid "cannot open '%s'" msgstr "impossible d'ouvrir '%s'" -#: sequencer.c:1177 +#: sequencer.c:1622 #, c-format msgid "cannot read '%s': %s" msgstr "impossible de lire '%s' : %s" -#: sequencer.c:1178 +#: sequencer.c:1623 msgid "unexpected end of file" msgstr "fin de fichier inattendue" -#: sequencer.c:1184 +#: sequencer.c:1629 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "le fichier HEAD de préparation de picorage '%s' est corrompu" -#: sequencer.c:1354 +#: sequencer.c:1640 +msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" +msgstr "Vous semblez avoir déplacé la HEAD. Pas de rembobinage, vérifiez votre HEAD !" + +#: sequencer.c:1777 sequencer.c:2049 +msgid "cannot read HEAD" +msgstr "impossible de lire HEAD" + +#: sequencer.c:1817 builtin/difftool.c:574 +#, c-format +msgid "could not copy '%s' to '%s'" +msgstr "impossible de copier '%s' vers '%s'" + +#: sequencer.c:1833 +msgid "could not read index" +msgstr "impossible de lire l'index" + +#: sequencer.c:1838 +#, c-format +msgid "" +"execution failed: %s\n" +"%sYou can fix the problem, and then run\n" +"\n" +" git rebase --continue\n" +"\n" +msgstr "" +"échec d'exécution : %s\n" +"%sVous pouvez corriger le problème, puis lancer\n" +"\n" +"git rebase --continue\n" +"\n" + +#: sequencer.c:1844 +msgid "and made changes to the index and/or the working tree\n" +msgstr "et a mis à jour l'index ou l'arbre de travail\n" + +#: sequencer.c:1850 +#, 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 "" +"L'exécution a réussi : %s\n" +"mais a laissé des modifications dans l'index ou la copie de travail\n" +"Validez ou remisez vos modification, puis lancez\n" +"\n" +" git rebase --continue\n" +"\n" + +#: sequencer.c:1905 git-rebase.sh:168 +#, c-format +msgid "Applied autostash." +msgstr "Autoremisage appliqué." + +#: sequencer.c:1917 +#, c-format +msgid "cannot store %s" +msgstr "impossible de stocker %s" + +#: sequencer.c:1919 git-rebase.sh:172 +#, 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 "" +"L'application de l'autoremisage a provoqué des conflits\n" +"Vos modifications sont à l'abri dans la remise.\n" +"Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n" + +#: sequencer.c:2000 +#, c-format +msgid "stopped at %s... %.*s" +msgstr "arrêt à %s... %.*s" + +#: sequencer.c:2027 +#, c-format +msgid "unknown command %d" +msgstr "commande inconnue %d" + +#: sequencer.c:2057 +msgid "could not read orig-head" +msgstr "impossible de lire orig-head" + +#: sequencer.c:2061 +msgid "could not read 'onto'" +msgstr "impossible de lire 'onto'" + +#: sequencer.c:2068 +#, c-format +msgid "could not update %s" +msgstr "impossible de mettre à jour %s" + +#: sequencer.c:2075 +#, c-format +msgid "could not update HEAD to %s" +msgstr "impossible de mettre à jour HEAD sur %s" + +#: sequencer.c:2159 +msgid "cannot rebase: You have unstaged changes." +msgstr "impossible de rebaser : vous avez des modifications non indexées." + +#: sequencer.c:2164 +msgid "could not remove CHERRY_PICK_HEAD" +msgstr "impossible de supprimer CHERRY_PICK_HEAD" + +#: sequencer.c:2173 +msgid "cannot amend non-existing commit" +msgstr "impossible de corriger un commit non-existant" + +#: sequencer.c:2175 +#, c-format +msgid "invalid file: '%s'" +msgstr "fichier invalide : '%s'" + +#: sequencer.c:2177 +#, c-format +msgid "invalid contents: '%s'" +msgstr "contenu invalide : '%s'" + +#: sequencer.c:2180 +msgid "" +"\n" +"You have uncommitted changes in your working tree. Please, commit them\n" +"first and then run 'git rebase --continue' again." +msgstr "" +"\n" +"Vous avez des modifications non validées dans votre copie de travail.\n" +"Veuillez les valider d'abord, puis relancer 'git rebase --continue'." + +#: sequencer.c:2190 +msgid "could not commit staged changes." +msgstr "impossible de valider les modifications indexées." + +#: sequencer.c:2270 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s : impossible de picorer un %s" -#: sequencer.c:1358 +#: sequencer.c:2274 #, c-format msgid "%s: bad revision" msgstr "%s : mauvaise révision" -#: sequencer.c:1391 +#: sequencer.c:2307 msgid "can't revert as initial commit" msgstr "impossible d'annuler en tant que commit initial" @@ -3036,29 +3299,29 @@ msgstr "" "Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n" "'git <commande> [<révision>...] -- [<chemin>...]'" -#: setup.c:468 +#: setup.c:470 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Version attendue du dépôt git <= %d, %d trouvée" -#: setup.c:476 +#: setup.c:478 msgid "unknown repository extensions found:" msgstr "extensions de dépôt inconnues trouvées :" -#: setup.c:762 +#: setup.c:768 #, c-format msgid "Not a git repository (or any of the parent directories): %s" msgstr "Ni ceci ni aucun de ses répertoires parents n'est un dépôt git : %s" -#: setup.c:764 setup.c:915 builtin/index-pack.c:1641 +#: setup.c:770 setup.c:922 builtin/index-pack.c:1643 msgid "Cannot come back to cwd" msgstr "Impossible de revenir au répertoire de travail courant" -#: setup.c:845 +#: setup.c:852 msgid "Unable to read current working directory" msgstr "Impossible d'accéder au répertoire de travail courant" -#: setup.c:920 +#: setup.c:927 #, c-format msgid "" "Not a git repository (or any parent up to mount point %s)\n" @@ -3069,12 +3332,12 @@ msgstr "" "Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM " "n'est pas activé)." -#: setup.c:927 +#: setup.c:934 #, c-format msgid "Cannot change to '%s/..'" msgstr "Impossible de se déplacer vers le répertoire '%s/..'" -#: setup.c:989 +#: setup.c:996 #, c-format msgid "" "Problem with core.sharedRepository filemode value (0%.3o).\n" @@ -3084,43 +3347,43 @@ msgstr "" "Le propriétaire des fichiers doit toujours avoir les droits en lecture et " "écriture." -#: sha1_file.c:473 +#: sha1_file.c:490 #, c-format msgid "path '%s' does not exist" msgstr "le chemin '%s' n'existe pas" -#: sha1_file.c:499 +#: sha1_file.c:516 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" "extraire le dépôt de référence '%s' comme une extraction liée n'est pas " "encore supporté." -#: sha1_file.c:505 +#: sha1_file.c:522 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "le dépôt de référence '%s' n'est pas un dépôt local." -#: sha1_file.c:511 +#: sha1_file.c:528 #, c-format msgid "reference repository '%s' is shallow" msgstr "le dépôt de référence '%s' est superficiel" -#: sha1_file.c:519 +#: sha1_file.c:536 #, c-format msgid "reference repository '%s' is grafted" msgstr "le dépôt de référence '%s' est greffé" -#: sha1_file.c:1159 +#: sha1_file.c:1176 msgid "offset before end of packfile (broken .idx?)" msgstr "offset avant la fin du fichier paquet (.idx cassé ?)" -#: sha1_file.c:2592 +#: sha1_file.c:2637 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "offset avant le début de l'index de paquet pour %s (index corrompu ?)" -#: sha1_file.c:2596 +#: sha1_file.c:2641 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" @@ -3160,91 +3423,134 @@ msgstr "" "message\n" "en lançant \"git config advice.objectNameWarning false\"" -#: submodule.c:64 submodule.c:98 +#: submodule.c:65 submodule.c:99 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" "Modification impossible de .gitmodules non fusionné, résolvez les conflits " "d'abord" -#: submodule.c:68 submodule.c:102 +#: submodule.c:69 submodule.c:103 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "Impossible de trouver une section où path=%s dans .gitmodules" -#: submodule.c:76 +#: submodule.c:77 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Impossible de mettre à jour l'élément %s de .gitmodules" # ici %s est un chemin -#: submodule.c:109 +#: submodule.c:110 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "Impossible de supprimer l'élément de .gitmodules pour %s" -#: submodule.c:120 +#: submodule.c:121 msgid "staging updated .gitmodules failed" msgstr "échec de la mise en index du .gitmodules mis à jour" -#: submodule.c:158 +#: submodule.c:159 msgid "negative values not allowed for submodule.fetchJobs" msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs" -#: submodule-config.c:358 +#: submodule.c:1184 +#, c-format +msgid "could not start 'git status in submodule '%s'" +msgstr "impossible de démarrer 'git status' dans le sous-module '%s'" + +#: submodule.c:1197 +#, c-format +msgid "could not run 'git status in submodule '%s'" +msgstr "impossible de lancer 'git status' dans le sous-module '%s'" + +#: submodule.c:1398 +#, c-format +msgid "" +"relocate_gitdir for submodule '%s' with more than one worktree not supported" +msgstr "relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail n'est pas supporté" + +#: submodule.c:1410 submodule.c:1471 +#, c-format +msgid "could not lookup name for submodule '%s'" +msgstr "impossible de trouve le nom pour le sous-module '%s'" + +#: submodule.c:1414 submodule.c:1474 builtin/submodule--helper.c:640 +#: builtin/submodule--helper.c:650 +#, c-format +msgid "could not create directory '%s'" +msgstr "impossible de créer le répertoire '%s'" + +#: submodule.c:1420 +#, c-format +msgid "" +"Migrating git directory of '%s%s' from\n" +"'%s' to\n" +"'%s'\n" +msgstr "" +"Migration du répertoire git de '%s%s' depuis\n" +"'%s' sur\n" +"'%s'\n" + +#: submodule.c:1512 +#, c-format +msgid "could not recurse into submodule '%s'" +msgstr "récursion impossible dans le sous-module '%s'" + +#: submodule-config.c:360 #, c-format msgid "invalid value for %s" msgstr "Valeur invalide pour %s" -#: trailer.c:238 +#: trailer.c:240 #, c-format msgid "running trailer command '%s' failed" msgstr "échec de la commande trailer '%s'" -#: trailer.c:471 trailer.c:475 trailer.c:479 trailer.c:533 trailer.c:537 -#: trailer.c:541 +#: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539 +#: trailer.c:543 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "valeur inconnue '%s' pour la clé '%s'" -#: trailer.c:523 trailer.c:528 builtin/remote.c:289 +#: trailer.c:525 trailer.c:530 builtin/remote.c:289 #, c-format msgid "more than one %s" msgstr "plus d'un %s" -#: trailer.c:672 +#: trailer.c:702 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "symbole vide dans la ligne de fin '%.*s'" -#: trailer.c:695 +#: trailer.c:722 #, c-format msgid "could not read input file '%s'" msgstr "impossible de lire le fichier d'entrée '%s'" -#: trailer.c:698 +#: trailer.c:725 msgid "could not read from stdin" msgstr "Impossible de lire depuis l'entrée standard" -#: trailer.c:929 builtin/am.c:44 +#: trailer.c:949 builtin/am.c:44 #, c-format msgid "could not stat %s" msgstr "stat impossible de %s" -#: trailer.c:931 +#: trailer.c:951 #, c-format msgid "file %s is not a regular file" msgstr "%s n'est pas un fichier régulier" -#: trailer.c:933 +#: trailer.c:953 #, c-format msgid "file %s is not writable by user" msgstr "le fichier %s n'est pas inscriptible par l'utilisateur" -#: trailer.c:945 +#: trailer.c:965 msgid "could not open temporary file" msgstr "impossible de créer un fichier temporaire" -#: trailer.c:983 +#: trailer.c:1001 #, c-format msgid "could not rename temporary file to %s" msgstr "impossible de renommer un fichier temporaire en %s" @@ -3259,7 +3565,7 @@ msgstr "Positionnerait la branche amont de '%s' sur '%s' de '%s'\n" msgid "transport: invalid depth option '%s'" msgstr "transport : option de profondeur invalide '%s'" -#: transport.c:817 +#: transport.c:885 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -3268,7 +3574,7 @@ msgstr "" "Les chemins suivant de sous-module contiennent des modifications\n" "qui ne peuvent être trouvées sur aucun distant :\n" -#: transport.c:821 +#: transport.c:889 #, c-format msgid "" "\n" @@ -3295,7 +3601,7 @@ msgstr "" "pour les pousser vers un serveur distant.\n" "\n" -#: transport.c:829 +#: transport.c:897 msgid "Aborting." msgstr "Abandon." @@ -3320,7 +3626,7 @@ msgstr "nom de fichier vide dans une entrée de l'arbre" msgid "too-short tree file" msgstr "fichier arbre trop court" -#: unpack-trees.c:64 +#: unpack-trees.c:99 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3331,7 +3637,7 @@ msgstr "" "%%sVeuillez valider ou remiser vos modifications avant de basculer de " "branche." -#: unpack-trees.c:66 +#: unpack-trees.c:101 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3341,7 +3647,7 @@ msgstr "" "l'extraction :\n" "%%s" -#: unpack-trees.c:69 +#: unpack-trees.c:104 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3351,7 +3657,7 @@ msgstr "" "fusion :\n" "%%sVeuillez valider ou remiser vos modifications avant la fusion." -#: unpack-trees.c:71 +#: unpack-trees.c:106 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3361,7 +3667,7 @@ msgstr "" "fusion :\n" "%%s" -#: unpack-trees.c:74 +#: unpack-trees.c:109 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -3370,7 +3676,7 @@ msgstr "" "Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n" "%%sVeuillez valider ou remiser vos modifications avant %s." -#: unpack-trees.c:76 +#: unpack-trees.c:111 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -3379,17 +3685,16 @@ msgstr "" "Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n" "%%s" -#: unpack-trees.c:81 +#: unpack-trees.c:116 #, c-format msgid "" -"Updating the following directories would lose untracked files in it:\n" +"Updating the following directories would lose untracked files in them:\n" "%s" msgstr "" -"La mise à jour des répertoires suivants effacerait les fichiers non suivis " -"contenus :\n" +"La mise à jour des répertoires suivants effacerait les fichiers non suivis contenus :\n" "%s" -#: unpack-trees.c:85 +#: unpack-trees.c:120 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -3399,7 +3704,7 @@ msgstr "" "l'extraction :\n" "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche." -#: unpack-trees.c:87 +#: unpack-trees.c:122 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -3408,7 +3713,7 @@ msgstr "" "Les fichiers suivants non suivis seraient effacés par l'extraction :\n" "%%s" -#: unpack-trees.c:90 +#: unpack-trees.c:125 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -3418,7 +3723,7 @@ msgstr "" "la fusion :\n" "%%sVeuillez renommer ou effacer ces fichiers avant la fusion." -#: unpack-trees.c:92 +#: unpack-trees.c:127 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -3427,7 +3732,7 @@ msgstr "" "Les fichiers suivants non suivis seraient effacés par la fusion :\n" "%%s" -#: unpack-trees.c:95 +#: unpack-trees.c:130 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -3437,7 +3742,7 @@ msgstr "" "%s :\n" "%%sVeuillez renommer ou effacer ces fichiers avant %s." -#: unpack-trees.c:97 +#: unpack-trees.c:132 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -3446,7 +3751,7 @@ msgstr "" "Les fichiers suivants non suivis seraient effacés par %s :\n" "%%s" -#: unpack-trees.c:102 +#: unpack-trees.c:137 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3457,7 +3762,7 @@ msgstr "" "l'extraction :\n" "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche." -#: unpack-trees.c:104 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3467,7 +3772,7 @@ msgstr "" "Les fichiers suivants non suivis seraient écrasés par l'extraction :\n" "%%s" -#: unpack-trees.c:107 +#: unpack-trees.c:142 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -3477,7 +3782,7 @@ msgstr "" "la fusion :\n" "%%sVeuillez renommer ou effacer ces fichiers avant la fusion." -#: unpack-trees.c:109 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -3486,7 +3791,7 @@ msgstr "" "Les fichiers suivants non suivis seraient écrasés par la fusion :\n" "%%s" -#: unpack-trees.c:112 +#: unpack-trees.c:147 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -3496,7 +3801,7 @@ msgstr "" "%s :\n" "%%sVeuillez renommer ou effacer ces fichiers avant %s." -#: unpack-trees.c:114 +#: unpack-trees.c:149 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -3505,12 +3810,12 @@ msgstr "" "Les fichiers suivants non suivis seraient écrasés par %s :\n" "%%s" -#: unpack-trees.c:121 +#: unpack-trees.c:156 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "L'entrée '%s' surcharge avec '%s'. Affectation impossible." -#: unpack-trees.c:124 +#: unpack-trees.c:159 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up-to-date:\n" @@ -3520,7 +3825,7 @@ msgstr "" "pas à jour :\n" "%s" -#: unpack-trees.c:126 +#: unpack-trees.c:161 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -3531,7 +3836,7 @@ msgstr "" "jour par l'extraction creuse :\n" "%s" -#: unpack-trees.c:128 +#: unpack-trees.c:163 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -3542,12 +3847,12 @@ msgstr "" "à jour par extraction creuse :\n" "%s" -#: unpack-trees.c:205 +#: unpack-trees.c:240 #, c-format msgid "Aborting\n" msgstr "Abandon\n" -#: unpack-trees.c:237 +#: unpack-trees.c:270 msgid "Checking out files" msgstr "Extraction des fichiers" @@ -3596,7 +3901,7 @@ msgid "could not open '%s' for writing" msgstr "impossible d'ouvrir '%s' en écriture" #: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759 -#: builtin/am.c:847 builtin/commit.c:1705 builtin/merge.c:1029 +#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1033 #: builtin/pull.c:341 #, c-format msgid "could not open '%s' for reading" @@ -3813,63 +4118,67 @@ msgstr " (utilisez \"git am --skip\" pour sauter ce patch)" msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)" -#: wt-status.c:1172 +#: wt-status.c:1176 +msgid "git-rebase-todo is missing." +msgstr "git-rebase-todo est manquant." + +#: wt-status.c:1178 msgid "No commands done." msgstr "Aucune commande réalisée." -#: wt-status.c:1175 +#: wt-status.c:1181 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Dernière commande effectuée (%d commande effectuée) :" msgstr[1] "Dernières commandes effectuées (%d commandes effectuées) :" -#: wt-status.c:1186 +#: wt-status.c:1192 #, c-format msgid " (see more in file %s)" msgstr " (voir plus dans le fichier %s)" -#: wt-status.c:1191 +#: wt-status.c:1197 msgid "No commands remaining." msgstr "Aucune commande restante." -#: wt-status.c:1194 +#: wt-status.c:1200 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Prochaine commande à effectuer (%d commande restante) :" msgstr[1] "Prochaines commandes à effectuer (%d commandes restantes) :" -#: wt-status.c:1202 +#: wt-status.c:1208 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (utilisez \"git rebase --edit-todo\" pour voir et éditer)" -#: wt-status.c:1215 +#: wt-status.c:1221 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Vous êtes en train de rebaser la branche '%s' sur '%s'." -#: wt-status.c:1220 +#: wt-status.c:1226 msgid "You are currently rebasing." msgstr "Vous êtes en train de rebaser." -#: wt-status.c:1234 +#: wt-status.c:1240 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (réglez les conflits puis lancez \"git rebase --continue\")" -#: wt-status.c:1236 +#: wt-status.c:1242 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (utilisez \"git rebase --skip\" pour sauter ce patch)" -#: wt-status.c:1238 +#: wt-status.c:1244 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (utilisez \"git rebase --abort\" pour extraire la branche d'origine)" -#: wt-status.c:1244 +#: wt-status.c:1250 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (tous les conflits sont réglés : lancez \"git rebase --continue\")" -#: wt-status.c:1248 +#: wt-status.c:1254 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -3877,124 +4186,124 @@ msgstr "" "Vous êtes actuellement en train de fractionner un commit pendant un rebasage " "de la branche '%s' sur '%s'." -#: wt-status.c:1253 +#: wt-status.c:1259 msgid "You are currently splitting a commit during a rebase." msgstr "" "Vous êtes actuellement en train de fractionner un commit pendant un rebasage." -#: wt-status.c:1256 +#: wt-status.c:1262 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Une fois la copie de travail nettoyée, lancez \"git rebase --continue\")" -#: wt-status.c:1260 +#: wt-status.c:1266 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Vous êtes actuellement en train d'éditer un commit pendant un rebasage de la " "branche '%s' sur '%s'." -#: wt-status.c:1265 +#: wt-status.c:1271 msgid "You are currently editing a commit during a rebase." msgstr "" "Vous êtes actuellement en train d'éditer un commit pendant un rebasage." -#: wt-status.c:1268 +#: wt-status.c:1274 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)" -#: wt-status.c:1270 +#: wt-status.c:1276 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -" (utilisez \"git rebase --continue\" quand vous êtes satisfait de vos " +" (utilisez \"git rebase --continue\" quand vous avez effectué toutes vos " "modifications)" -#: wt-status.c:1280 +#: wt-status.c:1286 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Vous êtes actuellement en train de picorer le commit %s." -#: wt-status.c:1285 +#: wt-status.c:1291 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (réglez les conflits puis lancez \"git cherry-pick --continue\")" -#: wt-status.c:1288 +#: wt-status.c:1294 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (tous les conflits sont réglés : lancez \"git cherry-pick --continue\")" -#: wt-status.c:1290 +#: wt-status.c:1296 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " (utilisez \"git cherry-pick --abort\" pour annuler le picorage)" -#: wt-status.c:1299 +#: wt-status.c:1305 #, c-format msgid "You are currently reverting commit %s." msgstr "Vous êtes actuellement en train de rétablir le commit %s." -#: wt-status.c:1304 +#: wt-status.c:1310 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (réglez les conflits puis lancez \"git revert --continue\")" -#: wt-status.c:1307 +#: wt-status.c:1313 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")" -#: wt-status.c:1309 +#: wt-status.c:1315 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)" -#: wt-status.c:1320 +#: wt-status.c:1326 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Vous êtes en cours de bissection, depuis la branche '%s'." -#: wt-status.c:1324 +#: wt-status.c:1330 msgid "You are currently bisecting." msgstr "Vous êtes en cours de bissection." -#: wt-status.c:1327 +#: wt-status.c:1333 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (utilisez \"git bisect reset\" pour revenir à la branche d'origine)" -#: wt-status.c:1524 +#: wt-status.c:1530 msgid "On branch " msgstr "Sur la branche " -#: wt-status.c:1530 +#: wt-status.c:1536 msgid "interactive rebase in progress; onto " msgstr "rebasage interactif en cours ; sur " -#: wt-status.c:1532 +#: wt-status.c:1538 msgid "rebase in progress; onto " msgstr "rebasage en cours ; sur " -#: wt-status.c:1537 +#: wt-status.c:1543 msgid "HEAD detached at " msgstr "HEAD détachée sur " -#: wt-status.c:1539 +#: wt-status.c:1545 msgid "HEAD detached from " msgstr "HEAD détachée depuis " -#: wt-status.c:1542 +#: wt-status.c:1548 msgid "Not currently on any branch." msgstr "Actuellement sur aucun branche." -#: wt-status.c:1560 +#: wt-status.c:1566 msgid "Initial commit" msgstr "Validation initiale" -#: wt-status.c:1574 +#: wt-status.c:1580 msgid "Untracked files" msgstr "Fichiers non suivis" -#: wt-status.c:1576 +#: wt-status.c:1582 msgid "Ignored files" msgstr "Fichiers ignorés" -#: wt-status.c:1580 +#: wt-status.c:1586 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -4006,32 +4315,32 @@ msgstr "" "oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help " "status')." -#: wt-status.c:1586 +#: wt-status.c:1592 #, c-format msgid "Untracked files not listed%s" msgstr "Fichiers non suivis non affichés%s" -#: wt-status.c:1588 +#: wt-status.c:1594 msgid " (use -u option to show untracked files)" msgstr " (utilisez -u pour afficher les fichiers non suivis)" -#: wt-status.c:1594 +#: wt-status.c:1600 msgid "No changes" msgstr "Aucune modification" -#: wt-status.c:1599 +#: wt-status.c:1605 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou " "\"git commit -a\")\n" -#: wt-status.c:1602 +#: wt-status.c:1608 #, c-format msgid "no changes added to commit\n" msgstr "aucune modification ajoutée à la validation\n" -#: wt-status.c:1605 +#: wt-status.c:1611 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -4040,67 +4349,67 @@ msgstr "" "aucune modification ajoutée à la validation mais des fichiers non suivis " "sont présents (utilisez \"git add\" pour les suivre)\n" -#: wt-status.c:1608 +#: wt-status.c:1614 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" "aucune modification ajoutée à la validation mais des fichiers non suivis " "sont présents\n" -#: wt-status.c:1611 +#: wt-status.c:1617 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les " "suivre)\n" -#: wt-status.c:1614 wt-status.c:1619 +#: wt-status.c:1620 wt-status.c:1625 #, c-format msgid "nothing to commit\n" msgstr "rien à valider\n" -#: wt-status.c:1617 +#: wt-status.c:1623 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "rien à valider (utilisez -u pour afficher les fichiers non suivis)\n" -#: wt-status.c:1621 +#: wt-status.c:1627 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "rien à valider, la copie de travail est propre\n" -#: wt-status.c:1728 +#: wt-status.c:1734 msgid "Initial commit on " msgstr "Validation initiale sur " -#: wt-status.c:1732 +#: wt-status.c:1738 msgid "HEAD (no branch)" msgstr "HEAD (aucune branche)" # à priori on parle d'une branche ici -#: wt-status.c:1761 +#: wt-status.c:1767 msgid "gone" msgstr "disparue" -#: wt-status.c:1763 wt-status.c:1771 +#: wt-status.c:1769 wt-status.c:1777 msgid "behind " msgstr "derrière " -#: wt-status.c:1766 wt-status.c:1769 +#: wt-status.c:1772 wt-status.c:1775 msgid "ahead " msgstr "devant " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2270 +#: wt-status.c:2277 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "Impossible de %s : vous avez des modifications non indexées." -#: wt-status.c:2276 +#: wt-status.c:2283 msgid "additionally, your index contains uncommitted changes." msgstr "de plus, votre index contient des modifications non validées." -#: wt-status.c:2278 +#: wt-status.c:2285 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "%s impossible : votre index contient des modifications non validées." @@ -4132,7 +4441,7 @@ msgstr "suppression de '%s'\n" msgid "Unstaged changes after refreshing the index:" msgstr "Modifications non indexées après rafraîchissement de l'index :" -#: builtin/add.c:209 builtin/rev-parse.c:840 +#: builtin/add.c:209 builtin/rev-parse.c:845 msgid "Could not read the index" msgstr "Impossible de lire l'index" @@ -4168,9 +4477,9 @@ msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n" -#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:111 -#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:521 -#: builtin/remote.c:1326 builtin/rm.c:268 builtin/send-pack.c:162 +#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:123 +#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524 +#: builtin/remote.c:1326 builtin/rm.c:241 builtin/send-pack.c:162 msgid "dry run" msgstr "simuler l'action" @@ -4178,7 +4487,7 @@ msgstr "simuler l'action" msgid "interactive picking" msgstr "sélection interactive" -#: builtin/add.c:270 builtin/checkout.c:1156 builtin/reset.c:286 +#: builtin/add.c:270 builtin/checkout.c:1159 builtin/reset.c:286 msgid "select hunks interactively" msgstr "sélection interactive des sections" @@ -4264,7 +4573,7 @@ msgstr "Vous vouliez sûrement dire 'git add .' ?\n" #: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279 #: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350 -#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271 #: builtin/submodule--helper.c:244 msgid "index file corrupt" msgstr "fichier d'index corrompu" @@ -4388,7 +4697,7 @@ msgstr "Retour à un patch de la base et fusion à 3 points..." msgid "Failed to merge in the changes." msgstr "Échec d'intégration des modifications." -#: builtin/am.c:1686 builtin/merge.c:628 +#: builtin/am.c:1686 builtin/merge.c:632 msgid "git write-tree failed to write a tree" msgstr "git write-tree a échoué à écrire un arbre" @@ -4396,8 +4705,8 @@ msgstr "git write-tree a échoué à écrire un arbre" msgid "applying to an empty history" msgstr "application à un historique vide" -#: builtin/am.c:1706 builtin/commit.c:1769 builtin/merge.c:798 -#: builtin/merge.c:823 +#: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802 +#: builtin/merge.c:827 msgid "failed to write commit object" msgstr "échec de l'écriture de l'objet commit" @@ -4510,7 +4819,7 @@ msgid "allow fall back on 3way merging if needed" msgstr "permettre de revenir à une fusion à 3 points si nécessaire" #: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57 -#: builtin/repack.c:172 +#: builtin/repack.c:178 msgid "be quiet" msgstr "être silencieux" @@ -4554,15 +4863,15 @@ msgid "pass it through git-apply" msgstr "le passer jusqu'à git-apply" #: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 -#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135 -#: builtin/pull.c:194 builtin/repack.c:181 builtin/repack.c:185 -#: builtin/show-branch.c:644 builtin/show-ref.c:175 builtin/tag.c:340 +#: builtin/grep.c:1038 builtin/merge.c:202 builtin/pull.c:135 +#: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191 +#: builtin/show-branch.c:644 builtin/show-ref.c:169 builtin/tag.c:355 #: parse-options.h:132 parse-options.h:134 parse-options.h:245 msgid "n" msgstr "n" #: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438 -#: builtin/tag.c:372 +#: builtin/tag.c:387 builtin/verify-tag.c:38 msgid "format" msgstr "format" @@ -4599,8 +4908,8 @@ msgstr "mentir sur la date de validation" msgid "use current timestamp for author date" msgstr "utiliser l'horodatage actuel pour la date d'auteur" -#: builtin/am.c:2315 builtin/commit.c:1605 builtin/merge.c:229 -#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:355 +#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:233 +#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:370 msgid "key-id" msgstr "id-clé" @@ -4704,125 +5013,117 @@ msgstr "git blame [<options>] [<options-de-révision>] [<rev>] [--] <fichier>" msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<options-de-révision> sont documentés dans git-rev-list(1)" -#: builtin/blame.c:1781 +#: builtin/blame.c:1786 msgid "Blaming lines" msgstr "Assignation de blâme au lignes" -#: builtin/blame.c:2577 +#: builtin/blame.c:2582 msgid "Show blame entries as we find them, incrementally" msgstr "" "Montrer les éléments de blâme au fur et à mesure de leur découverte, de " "manière incrémentale" -#: builtin/blame.c:2578 +#: builtin/blame.c:2583 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Montrer un SHA-1 blanc pour les commits de limite (Défaut : désactivé)" -#: builtin/blame.c:2579 +#: builtin/blame.c:2584 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" "Ne pas traiter les commits racine comme des limites (Défaut : désactivé)" -#: builtin/blame.c:2580 +#: builtin/blame.c:2585 msgid "Show work cost statistics" msgstr "Montrer les statistiques de coût d'activité" -#: builtin/blame.c:2581 +#: builtin/blame.c:2586 msgid "Force progress reporting" msgstr "Forcer l'affichage de l'état d'avancement" -#: builtin/blame.c:2582 +#: builtin/blame.c:2587 msgid "Show output score for blame entries" msgstr "Montrer le score de sortie pour les éléments de blâme" -#: builtin/blame.c:2583 +#: builtin/blame.c:2588 msgid "Show original filename (Default: auto)" msgstr "Montrer les noms de fichier originaux (Défaut : auto)" -#: builtin/blame.c:2584 +#: builtin/blame.c:2589 msgid "Show original linenumber (Default: off)" msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)" -#: builtin/blame.c:2585 +#: builtin/blame.c:2590 msgid "Show in a format designed for machine consumption" msgstr "Afficher dans un format propice à la consommation par machine" -#: builtin/blame.c:2586 +#: builtin/blame.c:2591 msgid "Show porcelain format with per-line commit information" msgstr "Afficher en format porcelaine avec l'information de commit par ligne" -#: builtin/blame.c:2587 +#: builtin/blame.c:2592 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "Utiliser le même mode de sortie que git-annotate (Défaut : désactivé)" -#: builtin/blame.c:2588 +#: builtin/blame.c:2593 msgid "Show raw timestamp (Default: off)" msgstr "Afficher les horodatages bruts (Défaut : désactivé)" -#: builtin/blame.c:2589 +#: builtin/blame.c:2594 msgid "Show long commit SHA1 (Default: off)" msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)" -#: builtin/blame.c:2590 +#: builtin/blame.c:2595 msgid "Suppress author name and timestamp (Default: off)" msgstr "Supprimer le nom de l'auteur et l'horodatage (Défaut : désactivé)" -#: builtin/blame.c:2591 +#: builtin/blame.c:2596 msgid "Show author email instead of name (Default: off)" msgstr "Afficher l'e-mail de l'auteur au lieu du nom (Défaut : désactivé)" -#: builtin/blame.c:2592 +#: builtin/blame.c:2597 msgid "Ignore whitespace differences" msgstr "Ignorer les différences d'espace" -#: builtin/blame.c:2599 -msgid "Use an experimental indent-based heuristic to improve diffs" -msgstr "" -"Utiliser une heuristique expérimentale reposant sur l'indentation pour " -"améliorer les diffs" - -#: builtin/blame.c:2600 -msgid "Use an experimental blank-line-based heuristic to improve diffs" -msgstr "" -"Utiliser une heuristique expérimentale reposant sur les lignes vides pour " -"améliorer le diffs" +#: builtin/blame.c:2604 +msgid "Use an experimental heuristic to improve diffs" +msgstr "Utiliser une heuristique expérimentale pour améliorer les diffs" -#: builtin/blame.c:2602 +#: builtin/blame.c:2606 msgid "Spend extra cycles to find better match" msgstr "" "Dépenser des cycles supplémentaires pour trouver une meilleure correspondance" -#: builtin/blame.c:2603 +#: builtin/blame.c:2607 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" "Utiliser les révisions du fichier <fichier> au lieu d'appeler git-rev-list" -#: builtin/blame.c:2604 +#: builtin/blame.c:2608 msgid "Use <file>'s contents as the final image" msgstr "Utiliser le contenu de <fichier> comme image finale" -#: builtin/blame.c:2605 builtin/blame.c:2606 +#: builtin/blame.c:2609 builtin/blame.c:2610 msgid "score" msgstr "score" -#: builtin/blame.c:2605 +#: builtin/blame.c:2609 msgid "Find line copies within and across files" msgstr "Trouver les copies de ligne dans et entre les fichiers" -#: builtin/blame.c:2606 +#: builtin/blame.c:2610 msgid "Find line movements within and across files" msgstr "Trouver les mouvements de ligne dans et entre les fichiers" -#: builtin/blame.c:2607 +#: builtin/blame.c:2611 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2607 +#: builtin/blame.c:2611 msgid "Process only line range n,m, counting from 1" msgstr "" "Traiter seulement l'intervalle de ligne n,m en commençant le compte à 1" -#: builtin/blame.c:2654 +#: builtin/blame.c:2658 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "--progress ne peut pas être utilisé avec --incremental ou les formats " @@ -4834,42 +5135,42 @@ msgstr "" #. 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:2700 +#: builtin/blame.c:2706 msgid "4 years, 11 months ago" msgstr "il y a 10 ans et 11 mois" -#: builtin/blame.c:2780 +#: builtin/blame.c:2786 msgid "--contents and --reverse do not blend well." msgstr "--contents et --reverse ne font pas bon ménage." -#: builtin/blame.c:2800 +#: builtin/blame.c:2806 msgid "cannot use --contents with final commit object name" msgstr "on ne peut pas utiliser --contents avec un nom d'objet commit final" -#: builtin/blame.c:2805 +#: builtin/blame.c:2811 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse et --first-parent ensemble nécessitent la spécification d'un " "dernier commit" -#: builtin/blame.c:2832 +#: builtin/blame.c:2838 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "--reverse --first-parent ensemble nécessitent une portée avec la chaîne de " "premier parent" -#: builtin/blame.c:2843 +#: builtin/blame.c:2849 #, c-format msgid "no such path %s in %s" msgstr "pas de chemin %s dans %s" -#: builtin/blame.c:2854 +#: builtin/blame.c:2860 #, c-format msgid "cannot read blob %s for path %s" msgstr "impossible de lire le blob %s pour le chemin %s" -#: builtin/blame.c:2873 +#: builtin/blame.c:2879 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" @@ -4927,7 +5228,7 @@ msgid "" "If you are sure you want to delete it, run 'git branch -D %s'." msgstr "" "La branche '%s' n'est pas totalement fusionnée.\n" -"Si vous êtes sur que vous voulez la supprimer, lancez 'git branch -D %s'." +"Si vous souhaitez réellement la supprimer, lancez 'git branch -D %s'." #: builtin/branch.c:178 msgid "Update of config-file failed" @@ -5049,46 +5350,46 @@ msgstr "(HEAD détachée depuis %s)" msgid "(no branch)" msgstr "(aucune branche)" -#: builtin/branch.c:544 +#: builtin/branch.c:535 #, c-format msgid "Branch %s is being rebased at %s" msgstr "La branche %s est en cours de rebasage sur %s" -#: builtin/branch.c:548 +#: builtin/branch.c:539 #, c-format msgid "Branch %s is being bisected at %s" msgstr "La branche %s est en cours de bissection sur %s" -#: builtin/branch.c:563 +#: builtin/branch.c:554 msgid "cannot rename the current branch while not on any." msgstr "impossible de renommer la branche actuelle, il n'y en a pas." -#: builtin/branch.c:573 +#: builtin/branch.c:564 #, c-format msgid "Invalid branch name: '%s'" msgstr "Nom de branche invalide : '%s'" -#: builtin/branch.c:590 +#: builtin/branch.c:581 msgid "Branch rename failed" msgstr "Échec de renommage de la branche" -#: builtin/branch.c:594 +#: builtin/branch.c:585 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Renommage d'un branche mal nommée '%s'" -#: builtin/branch.c:597 +#: builtin/branch.c:588 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "La branche a été renommée en %s, mais HEAD n'est pas mise à jour !" -#: builtin/branch.c:604 +#: builtin/branch.c:595 msgid "Branch is renamed, but update of config-file failed" msgstr "" "La branche est renommée, mais la mise à jour du fichier de configuration a " "échoué" -#: builtin/branch.c:620 +#: builtin/branch.c:611 #, c-format msgid "" "Please edit the description for the branch\n" @@ -5099,163 +5400,167 @@ msgstr "" " %s\n" "Les lignes commençant par '%c' seront ignorées.\n" -#: builtin/branch.c:651 +#: builtin/branch.c:643 msgid "Generic options" msgstr "Options génériques" -#: builtin/branch.c:653 +#: builtin/branch.c:645 msgid "show hash and subject, give twice for upstream branch" msgstr "afficher le hachage et le sujet, doublé pour la branche amont" -#: builtin/branch.c:654 +#: builtin/branch.c:646 msgid "suppress informational messages" msgstr "supprimer les messages d'information" -#: builtin/branch.c:655 +#: builtin/branch.c:647 msgid "set up tracking mode (see git-pull(1))" msgstr "régler le mode de suivi (voir git-pull(1))" -#: builtin/branch.c:657 +#: builtin/branch.c:649 msgid "change upstream info" msgstr "modifier l'information amont" -#: builtin/branch.c:659 +#: builtin/branch.c:651 msgid "upstream" msgstr "amont" -#: builtin/branch.c:659 +#: builtin/branch.c:651 msgid "change the upstream info" msgstr "modifier l'information amont" -#: builtin/branch.c:660 +#: builtin/branch.c:652 msgid "Unset the upstream info" msgstr "Désactiver l'information amont" -#: builtin/branch.c:661 +#: builtin/branch.c:653 msgid "use colored output" msgstr "utiliser la coloration dans la sortie" -#: builtin/branch.c:662 +#: builtin/branch.c:654 msgid "act on remote-tracking branches" msgstr "agir sur les branches de suivi distantes" -#: builtin/branch.c:664 builtin/branch.c:665 +#: builtin/branch.c:656 builtin/branch.c:657 msgid "print only branches that contain the commit" msgstr "afficher seulement les branches qui contiennent le commit" -#: builtin/branch.c:668 +#: builtin/branch.c:660 msgid "Specific git-branch actions:" msgstr "Actions spécifiques à git-branch :" -#: builtin/branch.c:669 +#: builtin/branch.c:661 msgid "list both remote-tracking and local branches" msgstr "afficher à la fois les branches de suivi et les branches locales" -#: builtin/branch.c:671 +#: builtin/branch.c:663 msgid "delete fully merged branch" msgstr "supprimer une branche totalement fusionnée" -#: builtin/branch.c:672 +#: builtin/branch.c:664 msgid "delete branch (even if not merged)" msgstr "supprimer une branche (même non fusionnée)" -#: builtin/branch.c:673 +#: builtin/branch.c:665 msgid "move/rename a branch and its reflog" msgstr "déplacer/renommer une branche et son reflog" -#: builtin/branch.c:674 +#: builtin/branch.c:666 msgid "move/rename a branch, even if target exists" msgstr "déplacer/renommer une branche, même si la cible existe" -#: builtin/branch.c:675 +#: builtin/branch.c:667 msgid "list branch names" msgstr "afficher les noms des branches" -#: builtin/branch.c:676 +#: builtin/branch.c:668 msgid "create the branch's reflog" msgstr "créer le reflog de la branche" -#: builtin/branch.c:678 +#: builtin/branch.c:670 msgid "edit the description for the branch" msgstr "éditer la description de la branche" -#: builtin/branch.c:679 +#: builtin/branch.c:671 msgid "force creation, move/rename, deletion" msgstr "forcer la création, le déplacement/renommage, ou la suppression" -#: builtin/branch.c:680 +#: builtin/branch.c:672 msgid "print only branches that are merged" msgstr "afficher seulement les branches qui sont fusionnées" -#: builtin/branch.c:681 +#: builtin/branch.c:673 msgid "print only branches that are not merged" msgstr "afficher seulement les branches qui ne sont pas fusionnées" -#: builtin/branch.c:682 +#: builtin/branch.c:674 msgid "list branches in columns" msgstr "afficher les branches en colonnes" -#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366 +#: builtin/branch.c:675 builtin/for-each-ref.c:38 builtin/tag.c:381 msgid "key" msgstr "clé" -#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367 +#: builtin/branch.c:676 builtin/for-each-ref.c:39 builtin/tag.c:382 msgid "field name to sort on" msgstr "nom du champ servant à trier" -#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:404 +#: builtin/branch.c:678 builtin/for-each-ref.c:41 builtin/notes.c:404 #: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570 -#: builtin/tag.c:369 +#: builtin/tag.c:384 msgid "object" msgstr "objet" -#: builtin/branch.c:687 +#: builtin/branch.c:679 msgid "print only branches of the object" msgstr "afficher seulement les branches de l'objet" -#: builtin/branch.c:705 +#: builtin/branch.c:681 builtin/for-each-ref.c:46 builtin/tag.c:388 +msgid "sorting and filtering are case insensitive" +msgstr "le tri et le filtrage sont non-sensibles à la casse" + +#: builtin/branch.c:698 msgid "Failed to resolve HEAD as a valid ref." msgstr "Échec de résolution de HEAD comme référence valide." -#: builtin/branch.c:709 builtin/clone.c:706 +#: builtin/branch.c:702 builtin/clone.c:706 msgid "HEAD not found below refs/heads!" msgstr "HEAD non trouvée sous refs/heads !" -#: builtin/branch.c:729 +#: builtin/branch.c:724 msgid "--column and --verbose are incompatible" msgstr "--column et --verbose sont incompatibles" -#: builtin/branch.c:740 builtin/branch.c:782 +#: builtin/branch.c:735 builtin/branch.c:787 msgid "branch name required" msgstr "le nom de branche est requis" -#: builtin/branch.c:758 +#: builtin/branch.c:763 msgid "Cannot give description to detached HEAD" msgstr "Impossible de décrire une HEAD détachée" -#: builtin/branch.c:763 +#: builtin/branch.c:768 msgid "cannot edit description of more than one branch" msgstr "impossible d'éditer la description de plus d'une branche" -#: builtin/branch.c:770 +#: builtin/branch.c:775 #, c-format msgid "No commit on branch '%s' yet." msgstr "Aucun commit sur la branche '%s'." -#: builtin/branch.c:773 +#: builtin/branch.c:778 #, c-format msgid "No branch named '%s'." msgstr "Aucune branche nommée '%s'." -#: builtin/branch.c:788 +#: builtin/branch.c:793 msgid "too many branches for a rename operation" msgstr "trop de branches pour une opération de renommage" -#: builtin/branch.c:793 +#: builtin/branch.c:798 msgid "too many branches to set new upstream" msgstr "trop de branches pour spécifier une branche amont" -#: builtin/branch.c:797 +#: builtin/branch.c:802 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -5263,41 +5568,41 @@ msgstr "" "impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur " "aucune branche." -#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843 +#: builtin/branch.c:805 builtin/branch.c:827 builtin/branch.c:848 #, c-format msgid "no such branch '%s'" msgstr "pas de branche '%s'" -#: builtin/branch.c:804 +#: builtin/branch.c:809 #, c-format msgid "branch '%s' does not exist" msgstr "la branche '%s' n'existe pas" -#: builtin/branch.c:816 +#: builtin/branch.c:821 msgid "too many branches to unset upstream" msgstr "trop de branches pour désactiver un amont" -#: builtin/branch.c:820 +#: builtin/branch.c:825 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "impossible de désactiver une branche amont de HEAD quand elle ne pointe sur " "aucune branche." -#: builtin/branch.c:826 +#: builtin/branch.c:831 #, c-format msgid "Branch '%s' has no upstream information" msgstr "La branche '%s' n'a aucune information de branche amont" -#: builtin/branch.c:840 +#: builtin/branch.c:845 msgid "it does not make sense to create 'HEAD' manually" msgstr "créer manuellement 'HEAD' n'a pas de sens" -#: builtin/branch.c:846 +#: builtin/branch.c:851 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "les options -a et -r de 'git branch' n'ont pas de sens avec un nom de branche" -#: builtin/branch.c:849 +#: builtin/branch.c:854 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -5306,7 +5611,7 @@ msgstr "" "l'option --set-upstream est obsolète et va disparaître. Utilisez plutôt --" "track ou --set-upstream-to\n" -#: builtin/branch.c:866 +#: builtin/branch.c:871 #, c-format msgid "" "\n" @@ -5314,7 +5619,7 @@ msgid "" "\n" msgstr "" "\n" -"Si vous vouliez que '%s' suive '%s', faîtes ceci :\n" +"Si vous vouliez que '%s' suive '%s', faites ceci :\n" "\n" #: builtin/bundle.c:51 @@ -5374,7 +5679,7 @@ msgstr "pour les objets blob, lancer textconv sur le contenu de l'objet" msgid "for blob objects, run filters on object's content" msgstr "pour les objets blob, lancer les filtres sur le contenu de l'objet" -#: builtin/cat-file.c:561 git-submodule.sh:923 +#: builtin/cat-file.c:561 git-submodule.sh:929 msgid "blob" msgstr "blob" @@ -5434,7 +5739,7 @@ msgid "terminate input and output records by a NUL character" msgstr "" "terminer les enregistrements en entrée et en sortie par un caractère NUL" -#: builtin/check-ignore.c:18 builtin/checkout.c:1137 builtin/gc.c:325 +#: builtin/check-ignore.c:18 builtin/checkout.c:1140 builtin/gc.c:332 msgid "suppress progress reporting" msgstr "supprimer l'état d'avancement" @@ -5526,9 +5831,9 @@ msgid "write the content to temporary files" msgstr "écrire le contenu dans des fichiers temporaires" #: builtin/checkout-index.c:174 builtin/column.c:30 -#: builtin/submodule--helper.c:595 builtin/submodule--helper.c:598 -#: builtin/submodule--helper.c:604 builtin/submodule--helper.c:951 -#: builtin/worktree.c:469 +#: builtin/submodule--helper.c:597 builtin/submodule--helper.c:600 +#: builtin/submodule--helper.c:606 builtin/submodule--helper.c:967 +#: builtin/worktree.c:471 msgid "string" msgstr "chaîne" @@ -5605,50 +5910,50 @@ msgstr "le chemin '%s' n'est pas fusionné" msgid "you need to resolve your current index first" msgstr "vous devez d'abord résoudre votre index courant" -#: builtin/checkout.c:624 +#: builtin/checkout.c:625 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Impossible de faire un reflog pour '%s' : %s\n" -#: builtin/checkout.c:663 +#: builtin/checkout.c:666 msgid "HEAD is now at" msgstr "HEAD est maintenant sur" -#: builtin/checkout.c:667 builtin/clone.c:660 +#: builtin/checkout.c:670 builtin/clone.c:660 msgid "unable to update HEAD" msgstr "impossible de mettre à jour HEAD" -#: builtin/checkout.c:671 +#: builtin/checkout.c:674 #, c-format msgid "Reset branch '%s'\n" msgstr "Remise à zéro de la branche '%s'\n" -#: builtin/checkout.c:674 +#: builtin/checkout.c:677 #, c-format msgid "Already on '%s'\n" msgstr "Déjà sur '%s'\n" -#: builtin/checkout.c:678 +#: builtin/checkout.c:681 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Basculement et remise à zéro de la branche '%s'\n" -#: builtin/checkout.c:680 builtin/checkout.c:1069 +#: builtin/checkout.c:683 builtin/checkout.c:1072 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Basculement sur la nouvelle branche '%s'\n" -#: builtin/checkout.c:682 +#: builtin/checkout.c:685 #, c-format msgid "Switched to branch '%s'\n" msgstr "Basculement sur la branche '%s'\n" -#: builtin/checkout.c:733 +#: builtin/checkout.c:736 #, c-format msgid " ... and %d more.\n" msgstr " ... et %d en plus.\n" -#: builtin/checkout.c:739 +#: builtin/checkout.c:742 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -5671,7 +5976,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:758 +#: builtin/checkout.c:761 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -5700,151 +6005,151 @@ msgstr[1] "" "git branch <nouvelle-branche> %s\n" "\n" -#: builtin/checkout.c:794 +#: builtin/checkout.c:797 msgid "internal error in revision walk" msgstr "erreur interne lors du parcours des révisions" -#: builtin/checkout.c:798 +#: builtin/checkout.c:801 msgid "Previous HEAD position was" msgstr "La position précédente de HEAD était sur" -#: builtin/checkout.c:825 builtin/checkout.c:1064 +#: builtin/checkout.c:828 builtin/checkout.c:1067 msgid "You are on a branch yet to be born" msgstr "Vous êtes sur une branche qui doit encore naître" -#: builtin/checkout.c:970 +#: builtin/checkout.c:973 #, c-format msgid "only one reference expected, %d given." msgstr "une seule référence attendue, %d fournies." -#: builtin/checkout.c:1010 builtin/worktree.c:214 +#: builtin/checkout.c:1013 builtin/worktree.c:214 #, c-format msgid "invalid reference: %s" msgstr "référence invalide : %s" -#: builtin/checkout.c:1039 +#: builtin/checkout.c:1042 #, c-format msgid "reference is not a tree: %s" msgstr "la référence n'est pas un arbre : %s" -#: builtin/checkout.c:1078 +#: builtin/checkout.c:1081 msgid "paths cannot be used with switching branches" msgstr "impossible d'utiliser des chemins avec un basculement de branches" -#: builtin/checkout.c:1081 builtin/checkout.c:1085 +#: builtin/checkout.c:1084 builtin/checkout.c:1088 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' ne peut pas être utilisé avec un basculement de branches" -#: builtin/checkout.c:1089 builtin/checkout.c:1092 builtin/checkout.c:1097 -#: builtin/checkout.c:1100 +#: builtin/checkout.c:1092 builtin/checkout.c:1095 builtin/checkout.c:1100 +#: builtin/checkout.c:1103 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' ne peut pas être utilisé avec '%s'" -#: builtin/checkout.c:1105 +#: builtin/checkout.c:1108 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Impossible de basculer de branche vers '%s' qui n'est pas un commit" -#: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:93 +#: builtin/checkout.c:1141 builtin/checkout.c:1143 builtin/clone.c:93 #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324 #: builtin/worktree.c:326 msgid "branch" msgstr "branche" -#: builtin/checkout.c:1139 +#: builtin/checkout.c:1142 msgid "create and checkout a new branch" msgstr "créer et extraire une nouvelle branche" -#: builtin/checkout.c:1141 +#: builtin/checkout.c:1144 msgid "create/reset and checkout a branch" msgstr "créer/réinitialiser et extraire une branche" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1145 msgid "create reflog for new branch" msgstr "créer un reflog pour une nouvelle branche" -#: builtin/checkout.c:1143 builtin/worktree.c:328 +#: builtin/checkout.c:1146 builtin/worktree.c:328 msgid "detach HEAD at named commit" msgstr "détacher la HEAD au commit nommé" -#: builtin/checkout.c:1144 +#: builtin/checkout.c:1147 msgid "set upstream info for new branch" msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1149 msgid "new-branch" msgstr "nouvelle branche" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1149 msgid "new unparented branch" msgstr "nouvelle branche sans parent" -#: builtin/checkout.c:1147 +#: builtin/checkout.c:1150 msgid "checkout our version for unmerged files" msgstr "extraire notre version pour les fichiers non fusionnés" -#: builtin/checkout.c:1149 +#: builtin/checkout.c:1152 msgid "checkout their version for unmerged files" msgstr "extraire leur version pour les fichiers non fusionnés" -#: builtin/checkout.c:1151 +#: builtin/checkout.c:1154 msgid "force checkout (throw away local modifications)" msgstr "forcer l'extraction (laisser tomber les modifications locales)" -#: builtin/checkout.c:1152 +#: builtin/checkout.c:1155 msgid "perform a 3-way merge with the new branch" msgstr "effectuer une fusion à 3 points avec la nouvelle branche" -#: builtin/checkout.c:1153 builtin/merge.c:231 +#: builtin/checkout.c:1156 builtin/merge.c:235 msgid "update ignored files (default)" msgstr "mettre à jour les fichiers ignorés (par défaut)" -#: builtin/checkout.c:1154 builtin/log.c:1466 parse-options.h:251 +#: builtin/checkout.c:1157 builtin/log.c:1466 parse-options.h:251 msgid "style" msgstr "style" -#: builtin/checkout.c:1155 +#: builtin/checkout.c:1158 msgid "conflict style (merge or diff3)" msgstr "style de conflit (merge (fusion) ou diff3)" -#: builtin/checkout.c:1158 +#: builtin/checkout.c:1161 msgid "do not limit pathspecs to sparse entries only" msgstr "ne pas limiter les spécificateurs de chemins aux seuls éléments creux" -#: builtin/checkout.c:1160 +#: builtin/checkout.c:1163 msgid "second guess 'git checkout <no-such-branch>'" msgstr "réessayer d'interpréter 'git checkout <branche-inexistante>'" -#: builtin/checkout.c:1162 +#: builtin/checkout.c:1165 msgid "do not check if another worktree is holding the given ref" msgstr "" "ne pas vérifier si une autre copie de travail contient le référence fournie" -#: builtin/checkout.c:1163 builtin/clone.c:63 builtin/fetch.c:119 -#: builtin/merge.c:228 builtin/pull.c:117 builtin/push.c:536 +#: builtin/checkout.c:1166 builtin/clone.c:63 builtin/fetch.c:119 +#: builtin/merge.c:232 builtin/pull.c:117 builtin/push.c:539 #: builtin/send-pack.c:168 msgid "force progress reporting" msgstr "forcer l'affichage de l'état d'avancement" -#: builtin/checkout.c:1194 +#: builtin/checkout.c:1197 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B et --orphan sont mutuellement exclusifs" -#: builtin/checkout.c:1211 +#: builtin/checkout.c:1214 msgid "--track needs a branch name" msgstr "--track requiert un nom de branche" -#: builtin/checkout.c:1216 +#: builtin/checkout.c:1219 msgid "Missing branch name; try -b" msgstr "Nom de branche manquant ; essayez -b" -#: builtin/checkout.c:1252 +#: builtin/checkout.c:1255 msgid "invalid path specification" msgstr "spécification de chemin invalide" -#: builtin/checkout.c:1259 +#: builtin/checkout.c:1262 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -5854,12 +6159,12 @@ msgstr "" "en même temps.\n" "Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?" -#: builtin/checkout.c:1264 +#: builtin/checkout.c:1267 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'" -#: builtin/checkout.c:1268 +#: builtin/checkout.c:1271 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -5898,19 +6203,21 @@ msgstr "Ignorerait le dépôt %s\n" msgid "failed to remove %s" msgstr "échec de la suppression de %s" -#: builtin/clean.c:291 +#: builtin/clean.c:291 git-add--interactive.perl:623 +#, c-format msgid "" "Prompt help:\n" "1 - select a numbered item\n" "foo - select item based on unique prefix\n" -" - (empty) select nothing" +" - (empty) select nothing\n" msgstr "" "Aide en ligne :\n" "1 - sélectionner un élément numéroté\n" "foo - sélectionner un élément par un préfixe unique\n" -" - (vide) ne rien sélectionner" +" - (vide) ne rien sélectionner\n" -#: builtin/clean.c:295 +#: builtin/clean.c:295 git-add--interactive.perl:632 +#, c-format msgid "" "Prompt help:\n" "1 - select a single item\n" @@ -5919,7 +6226,7 @@ msgid "" "foo - select item based on unique prefix\n" "-... - unselect specified items\n" "* - choose all items\n" -" - (empty) finish selecting" +" - (empty) finish selecting\n" msgstr "" "Aide en ligne :\n" "1 - sélectionner un seul élément\n" @@ -5928,12 +6235,13 @@ msgstr "" "foo - sélectionner un élément par un préfixe unique\n" "-... - désélectionner les éléments spécifiés\n" "* - choisir tous les éléments\n" -" - (vide) terminer la sélection" +" - (vide) terminer la sélection\n" -#: builtin/clean.c:511 -#, c-format -msgid "Huh (%s)?" -msgstr "Hein (%s) ?" +#: builtin/clean.c:511 git-add--interactive.perl:598 +#: git-add--interactive.perl:603 +#, c-format, perl-format +msgid "Huh (%s)?\n" +msgstr "Hein (%s) ?\n" #: builtin/clean.c:653 #, c-format @@ -5955,9 +6263,10 @@ msgstr "Sélectionner les éléments à supprimer" msgid "Remove %s [y/N]? " msgstr "Supprimer %s [y/N] ? " -#: builtin/clean.c:777 -msgid "Bye." -msgstr "Au revoir." +#: builtin/clean.c:777 git-add--interactive.perl:1669 +#, c-format +msgid "Bye.\n" +msgstr "Au revoir.\n" #: builtin/clean.c:785 msgid "" @@ -5977,11 +6286,11 @@ msgstr "" "help - cet écran\n" "? - aide pour la sélection en ligne" -#: builtin/clean.c:812 +#: builtin/clean.c:812 git-add--interactive.perl:1745 msgid "*** Commands ***" msgstr "*** Commandes ***" -#: builtin/clean.c:813 +#: builtin/clean.c:813 git-add--interactive.perl:1742 msgid "What now" msgstr "Et maintenant ?" @@ -6011,8 +6320,8 @@ msgstr "nettoyage interactif" msgid "remove whole directories" msgstr "supprimer les répertoires entiers" -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:725 -#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:182 +#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:1056 +#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:176 msgid "pattern" msgstr "motif" @@ -6092,8 +6401,8 @@ msgstr "répertoire-modèle" msgid "directory from which templates will be used" msgstr "répertoire depuis lequel les modèles vont être utilisés" -#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:602 -#: builtin/submodule--helper.c:954 +#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:604 +#: builtin/submodule--helper.c:970 msgid "reference repository" msgstr "dépôt de référence" @@ -6117,8 +6426,7 @@ msgstr "extraire <branche> au lieu de la HEAD du répertoire distant" msgid "path to git-upload-pack on the remote" msgstr "chemin vers git-upload-pack sur le serveur distant" -#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668 -#: builtin/pull.c:202 +#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:999 builtin/pull.c:202 msgid "depth" msgstr "profondeur" @@ -6126,7 +6434,7 @@ msgstr "profondeur" msgid "create a shallow clone of that depth" msgstr "créer un clone superficiel de cette profondeur" -#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848 +#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2836 #: parse-options.h:142 msgid "time" msgstr "heure" @@ -6140,9 +6448,8 @@ msgid "revision" msgstr "révision" #: builtin/clone.c:102 builtin/fetch.c:125 -msgid "deepen history of shallow clone by excluding rev" -msgstr "" -"approfondir l'historique d'un clone superficiel en excluant une révision" +msgid "deepen history of shallow clone, excluding rev" +msgstr "approfondir l'historique d'un clone superficiel en excluant une révision" #: builtin/clone.c:104 msgid "clone only one branch, HEAD or --branch" @@ -6168,11 +6475,11 @@ msgstr "clé=valeur" msgid "set config inside the new repository" msgstr "régler la configuration dans le nouveau dépôt" -#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:547 +#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:550 msgid "use IPv4 addresses only" msgstr "n'utiliser que des adresses IPv4" -#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:549 +#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:552 msgid "use IPv6 addresses only" msgstr "n'utiliser que des adresses IPv6" @@ -6287,7 +6594,7 @@ msgstr "--bare et --separate-git-dir sont incompatibles." msgid "repository '%s' does not exist" msgstr "le dépôt '%s' n'existe pas" -#: builtin/clone.c:905 builtin/fetch.c:1338 +#: builtin/clone.c:905 builtin/fetch.c:1335 #, c-format msgid "depth %s is not a positive number" msgstr "la profondeur %s n'est pas un entier positif" @@ -6303,8 +6610,9 @@ msgstr "" msgid "working tree '%s' already exists." msgstr "la copie de travail '%s' existe déjà." -#: builtin/clone.c:940 builtin/clone.c:951 builtin/submodule--helper.c:657 -#: builtin/worktree.c:222 builtin/worktree.c:249 +#: builtin/clone.c:940 builtin/clone.c:951 builtin/difftool.c:252 +#: builtin/submodule--helper.c:659 builtin/worktree.c:222 +#: builtin/worktree.c:249 #, c-format msgid "could not create leading directories of '%s'" msgstr "impossible de créer les répertoires de premier niveau dans '%s'" @@ -6582,7 +6890,7 @@ msgstr "" msgid "could not lookup commit %s" msgstr "impossible de rechercher le commit %s" -#: builtin/commit.c:704 builtin/shortlog.c:286 +#: builtin/commit.c:704 builtin/shortlog.c:295 #, c-format msgid "(reading log message from standard input)\n" msgstr "(lecture du message de journal depuis l'entrée standard)\n" @@ -6682,7 +6990,7 @@ msgstr "Impossible de lire l'index" msgid "Error building trees" msgstr "Erreur lors de la construction des arbres" -#: builtin/commit.c:969 builtin/tag.c:266 +#: builtin/commit.c:968 builtin/tag.c:280 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n" @@ -6694,7 +7002,7 @@ msgstr "" "--author '%s' n'est pas de la forme 'Nom <email>' ni ne correspond à aucun " "auteur existant" -#: builtin/commit.c:1086 builtin/commit.c:1327 +#: builtin/commit.c:1086 builtin/commit.c:1325 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Mode de fichier non suivi invalide '%s'" @@ -6746,67 +7054,63 @@ msgid "No paths with --include/--only does not make sense." msgstr "Aucun chemin avec les options --include/--only n'a pas de sens." #: builtin/commit.c:1212 -msgid "Clever... amending the last one with dirty index." -msgstr "Malin... correction du dernier avec un index sale." - -#: builtin/commit.c:1214 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "Chemins explicites spécifiés sans -i ni -o ; --only supposé..." -#: builtin/commit.c:1226 builtin/tag.c:474 +#: builtin/commit.c:1224 builtin/tag.c:495 #, c-format msgid "Invalid cleanup mode %s" msgstr "Mode de nettoyage invalide %s" -#: builtin/commit.c:1231 +#: builtin/commit.c:1229 msgid "Paths with -a does not make sense." msgstr "Spécifier des chemins avec l'option -a n'a pas de sens." -#: builtin/commit.c:1341 builtin/commit.c:1617 +#: builtin/commit.c:1339 builtin/commit.c:1612 msgid "show status concisely" msgstr "afficher le statut avec concision" -#: builtin/commit.c:1343 builtin/commit.c:1619 +#: builtin/commit.c:1341 builtin/commit.c:1614 msgid "show branch information" msgstr "afficher l'information de branche" -#: builtin/commit.c:1345 +#: builtin/commit.c:1343 msgid "version" msgstr "version" -#: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522 -#: builtin/worktree.c:440 +#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525 +#: builtin/worktree.c:442 msgid "machine-readable output" msgstr "sortie pour traitement automatique" -#: builtin/commit.c:1348 builtin/commit.c:1623 +#: builtin/commit.c:1346 builtin/commit.c:1618 msgid "show status in long format (default)" msgstr "afficher le statut en format long (par défaut)" -#: builtin/commit.c:1351 builtin/commit.c:1626 +#: builtin/commit.c:1349 builtin/commit.c:1621 msgid "terminate entries with NUL" msgstr "terminer les éléments par NUL" -#: builtin/commit.c:1353 builtin/commit.c:1629 builtin/fast-export.c:981 -#: builtin/fast-export.c:984 builtin/tag.c:353 +#: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981 +#: builtin/fast-export.c:984 builtin/tag.c:368 msgid "mode" msgstr "mode" -#: builtin/commit.c:1354 builtin/commit.c:1629 +#: builtin/commit.c:1352 builtin/commit.c:1624 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, " "no. (Défaut : all)" -#: builtin/commit.c:1357 +#: builtin/commit.c:1355 msgid "show ignored files" msgstr "afficher les fichiers ignorés" -#: builtin/commit.c:1358 parse-options.h:155 +#: builtin/commit.c:1356 parse-options.h:155 msgid "when" msgstr "quand" -#: builtin/commit.c:1359 +#: builtin/commit.c:1357 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -6814,201 +7118,201 @@ msgstr "" "ignorer les modifications dans les sous-modules, \"quand\" facultatif : all " "(tous), dirty (sale), untracked (non suivi). (Défaut : all)" -#: builtin/commit.c:1361 +#: builtin/commit.c:1359 msgid "list untracked files in columns" msgstr "afficher les fichiers non suivis en colonnes" -#: builtin/commit.c:1437 +#: builtin/commit.c:1435 msgid "couldn't look up newly created commit" msgstr "impossible de retrouver le commit nouvellement créé" -#: builtin/commit.c:1439 +#: builtin/commit.c:1437 msgid "could not parse newly created commit" msgstr "impossible d'analyser le commit nouvellement créé" -#: builtin/commit.c:1484 +#: builtin/commit.c:1482 msgid "detached HEAD" msgstr "HEAD détachée" -#: builtin/commit.c:1487 +#: builtin/commit.c:1485 msgid " (root-commit)" msgstr " (commit racine)" -#: builtin/commit.c:1587 +#: builtin/commit.c:1582 msgid "suppress summary after successful commit" msgstr "supprimer le résumé après une validation réussie" -#: builtin/commit.c:1588 +#: builtin/commit.c:1583 msgid "show diff in commit message template" msgstr "afficher les diff dans le modèle de message de validation" -#: builtin/commit.c:1590 +#: builtin/commit.c:1585 msgid "Commit message options" msgstr "Options du message de validation" -#: builtin/commit.c:1591 builtin/tag.c:351 +#: builtin/commit.c:1586 builtin/tag.c:366 msgid "read message from file" msgstr "lire le message depuis un fichier" -#: builtin/commit.c:1592 +#: builtin/commit.c:1587 msgid "author" msgstr "auteur" -#: builtin/commit.c:1592 +#: builtin/commit.c:1587 msgid "override author for commit" msgstr "remplacer l'auteur pour la validation" -#: builtin/commit.c:1593 builtin/gc.c:326 +#: builtin/commit.c:1588 builtin/gc.c:333 msgid "date" msgstr "date" -#: builtin/commit.c:1593 +#: builtin/commit.c:1588 msgid "override date for commit" msgstr "remplacer la date pour la validation" -#: builtin/commit.c:1594 builtin/merge.c:220 builtin/notes.c:398 -#: builtin/notes.c:561 builtin/tag.c:349 +#: builtin/commit.c:1589 builtin/merge.c:222 builtin/notes.c:398 +#: builtin/notes.c:561 builtin/tag.c:364 msgid "message" msgstr "message" -#: builtin/commit.c:1594 +#: builtin/commit.c:1589 msgid "commit message" msgstr "message de validation" -#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597 -#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:79 +#: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592 +#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:81 msgid "commit" msgstr "commit" -#: builtin/commit.c:1595 +#: builtin/commit.c:1590 msgid "reuse and edit message from specified commit" msgstr "réutiliser et éditer le message du commit spécifié" -#: builtin/commit.c:1596 +#: builtin/commit.c:1591 msgid "reuse message from specified commit" msgstr "réutiliser le message du commit spécifié" -#: builtin/commit.c:1597 +#: builtin/commit.c:1592 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "utiliser un message au format autosquash pour corriger le commit spécifié" -#: builtin/commit.c:1598 +#: builtin/commit.c:1593 msgid "use autosquash formatted message to squash specified commit" msgstr "" "utiliser un message au format autosquash pour compresser le commit spécifié" -#: builtin/commit.c:1599 +#: builtin/commit.c:1594 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" "à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)" -#: builtin/commit.c:1600 builtin/log.c:1413 builtin/revert.c:86 +#: builtin/commit.c:1595 builtin/log.c:1413 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "ajouter une entrée Signed-off-by :" -#: builtin/commit.c:1601 +#: builtin/commit.c:1596 msgid "use specified template file" msgstr "utiliser le fichier de modèle spécifié" -#: builtin/commit.c:1602 +#: builtin/commit.c:1597 msgid "force edit of commit" msgstr "forcer l'édition du commit" -#: builtin/commit.c:1603 +#: builtin/commit.c:1598 msgid "default" msgstr "défaut" -#: builtin/commit.c:1603 builtin/tag.c:354 +#: builtin/commit.c:1598 builtin/tag.c:369 msgid "how to strip spaces and #comments from message" msgstr "comment éliminer les espaces et les commentaires # du message" -#: builtin/commit.c:1604 +#: builtin/commit.c:1599 msgid "include status in commit message template" msgstr "inclure le statut dans le modèle de message de validation" -#: builtin/commit.c:1606 builtin/merge.c:230 builtin/pull.c:166 +#: builtin/commit.c:1601 builtin/merge.c:234 builtin/pull.c:166 #: builtin/revert.c:93 msgid "GPG sign commit" msgstr "signer la validation avec GPG" -#: builtin/commit.c:1609 +#: builtin/commit.c:1604 msgid "Commit contents options" msgstr "Valider les options des contenus" -#: builtin/commit.c:1610 +#: builtin/commit.c:1605 msgid "commit all changed files" msgstr "valider tous les fichiers modifiés" -#: builtin/commit.c:1611 +#: builtin/commit.c:1606 msgid "add specified files to index for commit" msgstr "ajouter les fichiers spécifiés à l'index pour la validation" -#: builtin/commit.c:1612 +#: builtin/commit.c:1607 msgid "interactively add files" msgstr "ajouter des fichiers en mode interactif" -#: builtin/commit.c:1613 +#: builtin/commit.c:1608 msgid "interactively add changes" msgstr "ajouter les modifications en mode interactif" -#: builtin/commit.c:1614 +#: builtin/commit.c:1609 msgid "commit only specified files" msgstr "valider seulement les fichiers spécifiés" -#: builtin/commit.c:1615 +#: builtin/commit.c:1610 msgid "bypass pre-commit and commit-msg hooks" msgstr "éviter d'utiliser les crochets pre-commit et commit-msg" -#: builtin/commit.c:1616 +#: builtin/commit.c:1611 msgid "show what would be committed" msgstr "afficher ce qui serait validé" -#: builtin/commit.c:1627 +#: builtin/commit.c:1622 msgid "amend previous commit" msgstr "corriger la validation précédente" -#: builtin/commit.c:1628 +#: builtin/commit.c:1623 msgid "bypass post-rewrite hook" msgstr "éviter d'utiliser le crochet post-rewrite" -#: builtin/commit.c:1633 +#: builtin/commit.c:1628 msgid "ok to record an empty change" msgstr "accepter d'enregistrer une modification vide" -#: builtin/commit.c:1635 +#: builtin/commit.c:1630 msgid "ok to record a change with an empty message" msgstr "accepter d'enregistrer une modification avec un message vide" -#: builtin/commit.c:1664 +#: builtin/commit.c:1659 msgid "could not parse HEAD commit" msgstr "impossible d'analyser le commit HEAD" -#: builtin/commit.c:1712 +#: builtin/commit.c:1707 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Fichier MERGE_HEAD corrompu (%s)" -#: builtin/commit.c:1719 +#: builtin/commit.c:1714 msgid "could not read MERGE_MODE" msgstr "impossible de lire MERGE_MODE" -#: builtin/commit.c:1738 +#: builtin/commit.c:1733 #, c-format msgid "could not read commit message: %s" msgstr "impossible de lire le message de validation : %s" -#: builtin/commit.c:1749 +#: builtin/commit.c:1744 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Abandon de la validation ; vous n'avez pas édité le message\n" -#: builtin/commit.c:1754 -#, fuzzy, c-format +#: builtin/commit.c:1749 +#, c-format msgid "Aborting commit due to empty commit message.\n" -msgstr "Abandon de la validation dû à un message de validation vide\n" +msgstr "Abandon de la validation dû à un message de validation vide.\n" -#: builtin/commit.c:1802 +#: builtin/commit.c:1797 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -7365,6 +7669,91 @@ msgstr "plus de deux blobs spécifiés : '%s'" msgid "unhandled object '%s' given." msgstr "objet non géré '%s' spécifié." +#: builtin/difftool.c:28 +msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" +msgstr "git difftool [<options>] [<commit> [<commit>]] [--] [<chemin>...]" + +#: builtin/difftool.c:241 +#, c-format +msgid "failed: %d" +msgstr "échec : %d" + +#: builtin/difftool.c:342 +msgid "" +"combined diff formats('-c' and '--cc') are not supported in\n" +"directory diff mode('-d' and '--dir-diff')." +msgstr "" +"les formats de diff combinés ('-c' et '--cc') ne sont pas supportés\n" +"dans le mode de diff de répertoire ('-d' et '--dir-diff')." + +#: builtin/difftool.c:567 +#, c-format +msgid "both files modified: '%s' and '%s'." +msgstr "les deux fichiers sont modifiés : '%s' et '%s'." + +#: builtin/difftool.c:569 +msgid "working tree file has been left." +msgstr "le fichier dans l'arbre de travail a été laissé." + +#: builtin/difftool.c:580 +#, c-format +msgid "temporary files exist in '%s'." +msgstr "des fichiers temporaires existent dans '%s'." + +#: builtin/difftool.c:581 +msgid "you may want to cleanup or recover these." +msgstr "vous pourriez souhaiter les nettoyer ou les récupérer." + +#: builtin/difftool.c:626 +msgid "use `diff.guitool` instead of `diff.tool`" +msgstr "utiliser `diff.guitool` au lieu de `diff.tool`" + +#: builtin/difftool.c:628 +msgid "perform a full-directory diff" +msgstr "réalise un diff de répertoire complet" + +#: builtin/difftool.c:630 +msgid "do not prompt before launching a diff tool" +msgstr "ne pas confirmer avant de lancer l'outil de diff" + +#: builtin/difftool.c:636 +msgid "use symlinks in dir-diff mode" +msgstr "utiliser les liens symboliques en mode de diff de répertoire" + +#: builtin/difftool.c:637 +msgid "<tool>" +msgstr "<outil>" + +#: builtin/difftool.c:638 +msgid "use the specified diff tool" +msgstr "utiliser l'outil de diff spécifié" + +#: builtin/difftool.c:640 +msgid "print a list of diff tools that may be used with `--tool`" +msgstr "afficher une liste des outils de diff utilisables avec `--tool`" + +#: builtin/difftool.c:643 +msgid "" +"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " +"code" +msgstr "provoque la fin de 'git-difftool' si l'outil de diff invoqué renvoie un code non-nul" + +#: builtin/difftool.c:645 +msgid "<command>" +msgstr "<commande>" + +#: builtin/difftool.c:646 +msgid "specify a custom command for viewing diffs" +msgstr "spécifier une commande personnalisée pour visualiser les différences" + +#: builtin/difftool.c:670 +msgid "no <tool> given for --tool=<tool>" +msgstr "pas d'<outil> spécifié pour --tool=<outil>" + +#: builtin/difftool.c:677 +msgid "no <cmd> given for --extcmd=<cmd>" +msgstr "pas de <commande> spécifié pour --extcmd=<commande>" + #: builtin/fast-export.c:25 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [options-de-liste-de-révisions]" @@ -7524,79 +7913,79 @@ msgstr "correspondance de référence" msgid "specify fetch refmap" msgstr "spécifier une correspondance de référence pour la récupération" -#: builtin/fetch.c:398 +#: builtin/fetch.c:395 msgid "Couldn't find remote ref HEAD" msgstr "impossible de trouver la référence HEAD distante" -#: builtin/fetch.c:514 +#: builtin/fetch.c:511 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "" "le paramètre de configuration fetch.output contient une valeur invalide %s" -#: builtin/fetch.c:607 +#: builtin/fetch.c:604 #, c-format msgid "object %s not found" msgstr "objet %s non trouvé" -#: builtin/fetch.c:611 +#: builtin/fetch.c:608 msgid "[up to date]" msgstr "[à jour]" -#: builtin/fetch.c:624 builtin/fetch.c:704 +#: builtin/fetch.c:621 builtin/fetch.c:701 msgid "[rejected]" msgstr "[rejeté]" -#: builtin/fetch.c:625 +#: builtin/fetch.c:622 msgid "can't fetch in current branch" msgstr "impossible de récupérer dans la branche actuelle" -#: builtin/fetch.c:634 +#: builtin/fetch.c:631 msgid "[tag update]" msgstr "[mise à jour de l'étiquette]" -#: builtin/fetch.c:635 builtin/fetch.c:668 builtin/fetch.c:684 -#: builtin/fetch.c:699 +#: builtin/fetch.c:632 builtin/fetch.c:665 builtin/fetch.c:681 +#: builtin/fetch.c:696 msgid "unable to update local ref" msgstr "impossible de mettre à jour la référence locale" -#: builtin/fetch.c:654 +#: builtin/fetch.c:651 msgid "[new tag]" msgstr "[nouvelle étiquette]" -#: builtin/fetch.c:657 +#: builtin/fetch.c:654 msgid "[new branch]" msgstr "[nouvelle branche]" -#: builtin/fetch.c:660 +#: builtin/fetch.c:657 msgid "[new ref]" msgstr "[nouvelle référence]" -#: builtin/fetch.c:699 +#: builtin/fetch.c:696 msgid "forced update" msgstr "mise à jour forcée" -#: builtin/fetch.c:704 +#: builtin/fetch.c:701 msgid "non-fast-forward" msgstr "pas en avance rapide" -#: builtin/fetch.c:749 +#: builtin/fetch.c:746 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s n'a pas envoyé tous les objets nécessaires\n" -#: builtin/fetch.c:769 +#: builtin/fetch.c:766 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" "%s rejeté parce que les racines superficielles ne sont pas mises à jour" -#: builtin/fetch.c:856 builtin/fetch.c:952 +#: builtin/fetch.c:853 builtin/fetch.c:949 #, c-format msgid "From %.*s\n" msgstr "Depuis %.*s\n" -#: builtin/fetch.c:867 +#: builtin/fetch.c:864 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -7605,55 +7994,55 @@ msgstr "" "des références locales n'ont pas pu être mises à jour ; essayez de lancer\n" " 'git remote prune %s' pour supprimer des branches anciennes en conflit" -#: builtin/fetch.c:922 +#: builtin/fetch.c:919 #, c-format msgid " (%s will become dangling)" msgstr " (%s sera en suspens)" -#: builtin/fetch.c:923 +#: builtin/fetch.c:920 #, c-format msgid " (%s has become dangling)" msgstr " (%s est devenu en suspens)" -#: builtin/fetch.c:955 +#: builtin/fetch.c:952 msgid "[deleted]" msgstr "[supprimé]" -#: builtin/fetch.c:956 builtin/remote.c:1020 +#: builtin/fetch.c:953 builtin/remote.c:1020 msgid "(none)" msgstr "(aucun(e))" -#: builtin/fetch.c:979 +#: builtin/fetch.c:976 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Refus de récupérer dans la branche courant %s d'un dépôt non nu" -#: builtin/fetch.c:998 +#: builtin/fetch.c:995 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "La valeur \"%2$s\" de l'option \"%1$s\" est invalide pour %3$s" -#: builtin/fetch.c:1001 +#: builtin/fetch.c:998 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "L'option \"%s\" est ignorée pour %s\n" -#: builtin/fetch.c:1077 +#: builtin/fetch.c:1074 #, c-format msgid "Don't know how to fetch from %s" msgstr "Je ne sais pas récupérer depuis %s" -#: builtin/fetch.c:1237 +#: builtin/fetch.c:1234 #, c-format msgid "Fetching %s\n" msgstr "Récupération de %s\n" -#: builtin/fetch.c:1239 builtin/remote.c:96 +#: builtin/fetch.c:1236 builtin/remote.c:96 #, c-format msgid "Could not fetch %s" msgstr "Impossible de récupérer %s" -#: builtin/fetch.c:1257 +#: builtin/fetch.c:1254 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -7661,40 +8050,40 @@ msgstr "" "Aucun dépôt distant spécifié. Veuillez spécifier une URL ou un nom\n" "distant depuis lesquels les nouvelles révisions devraient être récupérées." -#: builtin/fetch.c:1280 +#: builtin/fetch.c:1277 msgid "You need to specify a tag name." msgstr "Vous devez spécifier un nom d'étiquette." -#: builtin/fetch.c:1322 +#: builtin/fetch.c:1319 msgid "Negative depth in --deepen is not supported" msgstr "Une profondeur négative dans --deepen n'est pas supportée" -#: builtin/fetch.c:1324 +#: builtin/fetch.c:1321 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen et --depth sont mutuellement exclusifs" -#: builtin/fetch.c:1329 +#: builtin/fetch.c:1326 msgid "--depth and --unshallow cannot be used together" msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble" -#: builtin/fetch.c:1331 +#: builtin/fetch.c:1328 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow sur un dépôt complet n'a pas de sens" -#: builtin/fetch.c:1353 +#: builtin/fetch.c:1350 msgid "fetch --all does not take a repository argument" msgstr "fetch --all n'accepte pas d'argument de dépôt" -#: builtin/fetch.c:1355 +#: builtin/fetch.c:1352 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all n'a pas de sens avec des spécifications de référence" -#: builtin/fetch.c:1366 +#: builtin/fetch.c:1363 #, c-format msgid "No such remote or remote group: %s" msgstr "distant ou groupe distant inexistant : %s" -#: builtin/fetch.c:1374 +#: builtin/fetch.c:1371 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" "La récupération d'un groupe et les spécifications de référence n'ont pas de " @@ -7762,7 +8151,7 @@ msgstr "échapper les champs réservés pour compatibilité avec Tcl" msgid "show only <n> matched refs" msgstr "n'afficher que <n> références correspondant" -#: builtin/for-each-ref.c:37 builtin/tag.c:372 +#: builtin/for-each-ref.c:37 builtin/tag.c:387 builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "format à utiliser pour la sortie" @@ -7782,64 +8171,64 @@ msgstr "afficher seulement les références qui ne sont pas fusionnées" msgid "print only refs which contain the commit" msgstr "afficher seulement les références qui contiennent le commit" -#: builtin/fsck.c:519 +#: builtin/fsck.c:554 msgid "Checking object directories" msgstr "Vérification des répertoires d'objet" -#: builtin/fsck.c:588 +#: builtin/fsck.c:646 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<options>] [<objet>...]" -#: builtin/fsck.c:594 +#: builtin/fsck.c:652 msgid "show unreachable objects" msgstr "afficher les objets inaccessibles" -#: builtin/fsck.c:595 +#: builtin/fsck.c:653 msgid "show dangling objects" msgstr "afficher les objets en suspens" -#: builtin/fsck.c:596 +#: builtin/fsck.c:654 msgid "report tags" msgstr "afficher les étiquettes" -#: builtin/fsck.c:597 +#: builtin/fsck.c:655 msgid "report root nodes" msgstr "signaler les nœuds racines" -#: builtin/fsck.c:598 +#: builtin/fsck.c:656 msgid "make index objects head nodes" msgstr "considérer les objets de l'index comme nœuds tête" # translated from man page -#: builtin/fsck.c:599 +#: builtin/fsck.c:657 msgid "make reflogs head nodes (default)" msgstr "considérer les reflogs comme nœuds tête (par défaut)" -#: builtin/fsck.c:600 +#: builtin/fsck.c:658 msgid "also consider packs and alternate objects" msgstr "inspecter aussi les objets pack et alternatifs" -#: builtin/fsck.c:601 +#: builtin/fsck.c:659 msgid "check only connectivity" msgstr "ne vérifier que la connectivité" -#: builtin/fsck.c:602 +#: builtin/fsck.c:660 msgid "enable more strict checking" msgstr "activer une vérification plus strict" -#: builtin/fsck.c:604 +#: builtin/fsck.c:662 msgid "write dangling objects in .git/lost-found" msgstr "écrire les objets en suspens dans .git/lost-found" -#: builtin/fsck.c:605 builtin/prune.c:107 +#: builtin/fsck.c:663 builtin/prune.c:107 msgid "show progress" msgstr "afficher la progression" -#: builtin/fsck.c:606 +#: builtin/fsck.c:664 msgid "show verbose names for reachable objects" msgstr "afficher les noms étendus pour les objets inaccessibles" -#: builtin/fsck.c:665 +#: builtin/fsck.c:725 msgid "Checking objects" msgstr "Vérification des objets" @@ -7857,7 +8246,7 @@ msgstr "%s invalide : '%s'" msgid "insanely long object directory %.*s" msgstr "objet répertoire démentiellement long %.*s" -#: builtin/gc.c:290 +#: builtin/gc.c:297 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -7873,42 +8262,42 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:327 +#: builtin/gc.c:334 msgid "prune unreferenced objects" msgstr "éliminer les objets non référencés" -#: builtin/gc.c:329 +#: builtin/gc.c:336 msgid "be more thorough (increased runtime)" msgstr "être plus consciencieux (durée de traitement allongée)" -#: builtin/gc.c:330 +#: builtin/gc.c:337 msgid "enable auto-gc mode" msgstr "activer le mode auto-gc" -#: builtin/gc.c:331 +#: builtin/gc.c:338 msgid "force running gc even if there may be another gc running" msgstr "" "forcer le lancement du ramasse-miettes même si un autre ramasse-miettes " "tourne déjà" -#: builtin/gc.c:373 +#: builtin/gc.c:380 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" "Compression automatique du dépôt en tâche de fond pour optimiser les " "performances.\n" -#: builtin/gc.c:375 +#: builtin/gc.c:382 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Compression du dépôt pour optimiser les performances.\n" -#: builtin/gc.c:376 +#: builtin/gc.c:383 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Voir \"git help gc\" pour toute information sur le nettoyage manuel.\n" -#: builtin/gc.c:397 +#: builtin/gc.c:404 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -7916,249 +8305,265 @@ msgstr "" "un ramasse-miettes est déjà en cours sur la machine '%s' pid %<PRIuMAX> " "(utilisez --force si ce n'est pas le cas)" -#: builtin/gc.c:441 +#: builtin/gc.c:448 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" "Il y a trop d'objets seuls inaccessibles ; lancez 'git prune' pour les " "supprimer." -#: builtin/grep.c:23 +#: builtin/grep.c:25 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<options>] [-e] <motif> [<révision>...] [[--] <chemin>...]" -#: builtin/grep.c:219 +#: builtin/grep.c:232 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep : échec de création du fil: %s" -#: builtin/grep.c:277 +#: builtin/grep.c:290 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "nombre de fils spécifié invalide (%d) pour %s" -#: builtin/grep.c:453 builtin/grep.c:488 +#: builtin/grep.c:763 builtin/grep.c:804 #, c-format msgid "unable to read tree (%s)" msgstr "impossible de lire l'arbre (%s)" -#: builtin/grep.c:503 +#: builtin/grep.c:823 #, c-format msgid "unable to grep from object of type %s" msgstr "impossible de faire un grep sur un objet de type %s" -#: builtin/grep.c:561 +#: builtin/grep.c:887 #, c-format msgid "switch `%c' expects a numerical value" msgstr "l'option '%c' attend un valeur numérique" -#: builtin/grep.c:647 +#: builtin/grep.c:973 msgid "search in index instead of in the work tree" msgstr "rechercher dans l'index plutôt que dans la copie de travail" -#: builtin/grep.c:649 +#: builtin/grep.c:975 msgid "find in contents not managed by git" msgstr "rechercher dans les contenus non gérés par git" -#: builtin/grep.c:651 +#: builtin/grep.c:977 msgid "search in both tracked and untracked files" msgstr "rechercher dans les fichiers suivis et non-suivis" -#: builtin/grep.c:653 +#: builtin/grep.c:979 msgid "ignore files specified via '.gitignore'" msgstr "ignorer les fichiers spécifiés via '.gitignore'" -#: builtin/grep.c:656 +#: builtin/grep.c:981 +msgid "recursivley search in each submodule" +msgstr "rechercher récursivement dans chaque sous-module" + +#: builtin/grep.c:983 +msgid "basename" +msgstr "nom de base" + +#: builtin/grep.c:984 +msgid "prepend parent project's basename to output" +msgstr "préfixer le nom de base du projet parent à la sortie" + +#: builtin/grep.c:987 msgid "show non-matching lines" msgstr "afficher les lignes qui ne correspondent pas" -#: builtin/grep.c:658 +#: builtin/grep.c:989 msgid "case insensitive matching" msgstr "correspondance insensible à la casse" -#: builtin/grep.c:660 +#: builtin/grep.c:991 msgid "match patterns only at word boundaries" msgstr "rechercher les motifs aux séparateurs de mots" -#: builtin/grep.c:662 +#: builtin/grep.c:993 msgid "process binary files as text" msgstr "traiter les fichiers binaires comme texte" -#: builtin/grep.c:664 +#: builtin/grep.c:995 msgid "don't match patterns in binary files" msgstr "ne pas chercher les motifs dans les fichiers binaires" -#: builtin/grep.c:667 +#: builtin/grep.c:998 msgid "process binary files with textconv filters" msgstr "traiter les fichiers binaires avec les filtres textconv" -#: builtin/grep.c:669 +#: builtin/grep.c:1000 msgid "descend at most <depth> levels" msgstr "descendre au plus de <profondeur> dans l'arborescence" -#: builtin/grep.c:673 +#: builtin/grep.c:1004 msgid "use extended POSIX regular expressions" msgstr "utiliser des expressions régulières étendues POSIX" -#: builtin/grep.c:676 +#: builtin/grep.c:1007 msgid "use basic POSIX regular expressions (default)" msgstr "utiliser des expressions régulières basiques POSIX (par défaut)" -#: builtin/grep.c:679 +#: builtin/grep.c:1010 msgid "interpret patterns as fixed strings" msgstr "interpréter les motifs comme de chaînes fixes" -#: builtin/grep.c:682 +#: builtin/grep.c:1013 msgid "use Perl-compatible regular expressions" msgstr "utiliser des expressions régulières compatibles avec Perl" -#: builtin/grep.c:685 +#: builtin/grep.c:1016 msgid "show line numbers" msgstr "afficher les numéros de ligne" -#: builtin/grep.c:686 +#: builtin/grep.c:1017 msgid "don't show filenames" msgstr "ne pas pas afficher les noms de fichier" -#: builtin/grep.c:687 +#: builtin/grep.c:1018 msgid "show filenames" msgstr "afficher les noms de fichier" -#: builtin/grep.c:689 +#: builtin/grep.c:1020 msgid "show filenames relative to top directory" msgstr "afficher les noms de fichiers relativement au répertoire de base" -#: builtin/grep.c:691 +#: builtin/grep.c:1022 msgid "show only filenames instead of matching lines" msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant" -#: builtin/grep.c:693 +#: builtin/grep.c:1024 msgid "synonym for --files-with-matches" msgstr "synonyme pour --files-with-matches" -#: builtin/grep.c:696 +#: builtin/grep.c:1027 msgid "show only the names of files without match" msgstr "n'afficher que les noms des fichiers sans correspondance" -#: builtin/grep.c:698 +#: builtin/grep.c:1029 msgid "print NUL after filenames" msgstr "imprimer une caractère NUL après le noms de fichier" -#: builtin/grep.c:700 +#: builtin/grep.c:1031 msgid "show the number of matches instead of matching lines" msgstr "afficher le nombre de correspondances au lieu des lignes correspondant" -#: builtin/grep.c:701 +#: builtin/grep.c:1032 msgid "highlight matches" msgstr "mettre en évidence les correspondances" -#: builtin/grep.c:703 +#: builtin/grep.c:1034 msgid "print empty line between matches from different files" msgstr "" "imprimer une ligne vide entre les correspondances de fichiers différents" -#: builtin/grep.c:705 +#: builtin/grep.c:1036 msgid "show filename only once above matches from same file" msgstr "" "afficher le nom de fichier une fois au dessus des correspondances du même " "fichier" -#: builtin/grep.c:708 +#: builtin/grep.c:1039 msgid "show <n> context lines before and after matches" msgstr "afficher <n> lignes de contexte avant et après les correspondances" -#: builtin/grep.c:711 +#: builtin/grep.c:1042 msgid "show <n> context lines before matches" msgstr "afficher <n> lignes de contexte avant les correspondances" -#: builtin/grep.c:713 +#: builtin/grep.c:1044 msgid "show <n> context lines after matches" msgstr "afficher <n> lignes de contexte après les correspondances" -#: builtin/grep.c:715 +#: builtin/grep.c:1046 msgid "use <n> worker threads" msgstr "utiliser <n> fils de travail" -#: builtin/grep.c:716 +#: builtin/grep.c:1047 msgid "shortcut for -C NUM" msgstr "raccourci pour -C NUM" -#: builtin/grep.c:719 +#: builtin/grep.c:1050 msgid "show a line with the function name before matches" msgstr "" "afficher une ligne avec le nom de la fonction avant les correspondances" -#: builtin/grep.c:721 +#: builtin/grep.c:1052 msgid "show the surrounding function" msgstr "afficher la fonction contenante" -#: builtin/grep.c:724 +#: builtin/grep.c:1055 msgid "read patterns from file" msgstr "lire les motifs depuis fichier" -#: builtin/grep.c:726 +#: builtin/grep.c:1057 msgid "match <pattern>" msgstr "rechercher <motif>" -#: builtin/grep.c:728 +#: builtin/grep.c:1059 msgid "combine patterns specified with -e" msgstr "combiner les motifs spécifiés par -e" -#: builtin/grep.c:740 +#: builtin/grep.c:1071 msgid "indicate hit with exit status without output" msgstr "" "indiquer des correspondances avec le code de sortie mais sans rien afficher" -#: builtin/grep.c:742 +#: builtin/grep.c:1073 msgid "show only matches from files that match all patterns" msgstr "" "n'afficher que les correspondances de fichiers qui correspondent à tous les " "motifs" -#: builtin/grep.c:744 +#: builtin/grep.c:1075 msgid "show parse tree for grep expression" msgstr "afficher l'arbre d'analyse pour le motif grep" -#: builtin/grep.c:748 +#: builtin/grep.c:1079 msgid "pager" msgstr "pagineur" -#: builtin/grep.c:748 +#: builtin/grep.c:1079 msgid "show matching files in the pager" msgstr "afficher les fichiers correspondant dans le pagineur" -#: builtin/grep.c:751 +#: builtin/grep.c:1082 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permettre l'appel de grep(1) (ignoré par ce build)" -#: builtin/grep.c:814 +#: builtin/grep.c:1146 msgid "no pattern given." msgstr "aucun motif fourni." -#: builtin/grep.c:846 builtin/index-pack.c:1480 +#: builtin/grep.c:1178 builtin/index-pack.c:1482 #, c-format msgid "invalid number of threads specified (%d)" msgstr "nombre de fils spécifié invalide (%d)" -#: builtin/grep.c:876 +#: builtin/grep.c:1215 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager ne fonctionne que sur la copie de travail" -#: builtin/grep.c:902 +#: builtin/grep.c:1238 +msgid "option not supported with --recurse-submodules." +msgstr "option non supportée avec --recurse-submodules." + +#: builtin/grep.c:1244 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached ou --untracked ne peuvent pas être utilisés avec --no-index." -#: builtin/grep.c:907 +#: builtin/grep.c:1249 msgid "--no-index or --untracked cannot be used with revs." msgstr "" "--no-index ou --untracked ne peuvent pas être utilisés avec des révisions." -#: builtin/grep.c:910 +#: builtin/grep.c:1252 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" "--[no-]exclude-standard ne peut pas être utilisé avec du contenu suivi." -#: builtin/grep.c:918 +#: builtin/grep.c:1260 msgid "both --cached and trees are given." msgstr "--cached et des arbres sont fournis en même temps." @@ -8439,184 +8844,188 @@ msgid "serious inflate inconsistency" msgstr "grave incohérence dans la décompression (inflate)" #: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777 -#: builtin/index-pack.c:811 builtin/index-pack.c:820 +#: builtin/index-pack.c:813 builtin/index-pack.c:822 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "COLLISION SHA1 TROUVÉE AVEC %s !" -#: builtin/index-pack.c:751 builtin/pack-objects.c:166 -#: builtin/pack-objects.c:258 +#: builtin/index-pack.c:751 builtin/pack-objects.c:164 +#: builtin/pack-objects.c:256 #, c-format msgid "unable to read %s" msgstr "impossible de lire %s" -#: builtin/index-pack.c:817 +#: builtin/index-pack.c:819 #, c-format msgid "cannot read existing object %s" msgstr "impossible de lire l'objet existant %s" -#: builtin/index-pack.c:831 +#: builtin/index-pack.c:833 #, c-format msgid "invalid blob object %s" msgstr "objet blob invalide %s" -#: builtin/index-pack.c:845 +#: builtin/index-pack.c:847 #, c-format msgid "invalid %s" msgstr "%s invalide" -#: builtin/index-pack.c:848 +#: builtin/index-pack.c:850 msgid "Error in object" msgstr "Erreur dans l'objet" -#: builtin/index-pack.c:850 +#: builtin/index-pack.c:852 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Tous les objets enfants de %s ne sont pas accessibles" -#: builtin/index-pack.c:922 builtin/index-pack.c:953 +#: builtin/index-pack.c:924 builtin/index-pack.c:955 msgid "failed to apply delta" msgstr "échec d'application du delta" -#: builtin/index-pack.c:1123 +#: builtin/index-pack.c:1125 msgid "Receiving objects" msgstr "Réception d'objets" -#: builtin/index-pack.c:1123 +#: builtin/index-pack.c:1125 msgid "Indexing objects" msgstr "Indexation d'objets" -#: builtin/index-pack.c:1155 +#: builtin/index-pack.c:1157 msgid "pack is corrupted (SHA1 mismatch)" msgstr "le paquet est corrompu (SHA1 ne correspond pas)" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1162 msgid "cannot fstat packfile" msgstr "impossible d'obtenir le statut (fstat) du fichier paquet" -#: builtin/index-pack.c:1163 +#: builtin/index-pack.c:1165 msgid "pack has junk at the end" msgstr "le paquet est invalide à la fin" -#: builtin/index-pack.c:1174 +#: builtin/index-pack.c:1176 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "confusion extrême dans parse_pack_objects()" -#: builtin/index-pack.c:1197 +#: builtin/index-pack.c:1199 msgid "Resolving deltas" msgstr "Résolution des deltas" -#: builtin/index-pack.c:1208 +#: builtin/index-pack.c:1210 #, c-format msgid "unable to create thread: %s" msgstr "impossible de créer le fil : %s" -#: builtin/index-pack.c:1250 +#: builtin/index-pack.c:1252 msgid "confusion beyond insanity" msgstr "confusion extrême" -#: builtin/index-pack.c:1256 +#: builtin/index-pack.c:1258 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "complété avec %d objet local" msgstr[1] "complété avec %d objets locaux" -#: builtin/index-pack.c:1268 +#: builtin/index-pack.c:1270 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" "Somme de contrôle de fin inattendue pour %s (corruption sur le disque ?)" -#: builtin/index-pack.c:1272 +#: builtin/index-pack.c:1274 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "le paquet a %d delta non résolu" msgstr[1] "le paquet a %d deltas non résolus" -#: builtin/index-pack.c:1296 +#: builtin/index-pack.c:1298 #, c-format msgid "unable to deflate appended object (%d)" msgstr "impossible de compresser l'objet ajouté (%d)" -#: builtin/index-pack.c:1372 +#: builtin/index-pack.c:1374 #, c-format msgid "local object %s is corrupt" msgstr "l'objet local %s est corrompu" -#: builtin/index-pack.c:1396 +#: builtin/index-pack.c:1398 msgid "error while closing pack file" msgstr "erreur en fermeture du fichier paquet" -#: builtin/index-pack.c:1409 +#: builtin/index-pack.c:1411 #, c-format msgid "cannot write keep file '%s'" msgstr "impossible d'écrire le fichier \"keep\" '%s'" -#: builtin/index-pack.c:1417 +#: builtin/index-pack.c:1419 #, c-format msgid "cannot close written keep file '%s'" msgstr "impossible de fermer le fichier \"keep\" '%s'" -#: builtin/index-pack.c:1430 +#: builtin/index-pack.c:1432 msgid "cannot store pack file" msgstr "impossible de stocker le fichier paquet" -#: builtin/index-pack.c:1441 +#: builtin/index-pack.c:1443 msgid "cannot store index file" msgstr "impossible de stocker le fichier d'index" -#: builtin/index-pack.c:1474 +#: builtin/index-pack.c:1476 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "mauvais pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1484 builtin/index-pack.c:1681 +#: builtin/index-pack.c:1486 builtin/index-pack.c:1683 #, c-format msgid "no threads support, ignoring %s" msgstr "pas de support des fils, ignore %s" -#: builtin/index-pack.c:1542 +#: builtin/index-pack.c:1544 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Impossible d'ouvrir le fichier paquet existant '%s'" -#: builtin/index-pack.c:1544 +#: builtin/index-pack.c:1546 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Impossible d'ouvrir le fichier paquet d'index existant pour '%s'" -#: builtin/index-pack.c:1591 +#: builtin/index-pack.c:1593 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "pas un delta : %d objet" msgstr[1] "pas un delta : %d objets" -#: builtin/index-pack.c:1598 +#: builtin/index-pack.c:1600 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "longueur chaînée = %d : %lu objet" msgstr[1] "longueur chaînée = %d : %lu objets" -#: builtin/index-pack.c:1611 +#: builtin/index-pack.c:1613 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "le nom de fichier paquet '%s' ne se termine pas par '.pack'" -#: builtin/index-pack.c:1693 builtin/index-pack.c:1696 -#: builtin/index-pack.c:1712 builtin/index-pack.c:1716 +#: builtin/index-pack.c:1695 builtin/index-pack.c:1698 +#: builtin/index-pack.c:1714 builtin/index-pack.c:1718 #, c-format msgid "bad %s" msgstr "mauvais %s" -#: builtin/index-pack.c:1732 +#: builtin/index-pack.c:1734 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin ne peut pas être utilisé sans --stdin" -#: builtin/index-pack.c:1740 +#: builtin/index-pack.c:1736 +msgid "--stdin requires a git repository" +msgstr "--stdin requiert un dépôt git" + +#: builtin/index-pack.c:1744 msgid "--verify with no packfile name given" msgstr "--verify sans nom de fichier paquet donné" @@ -8866,7 +9275,7 @@ msgstr "Deux répertoires de sortie ?" msgid "Unknown commit %s" msgstr "Commit inconnu %s" -#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:455 +#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:476 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Impossible de résoudre '%s' comme une référence valide." @@ -9260,35 +9669,35 @@ msgstr "afficher la réf sous-jacente en plus de l'objet pointé par elle" msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "git ls-tree [<options>] <arbre ou apparenté> [<chemin>...]" -#: builtin/ls-tree.c:128 +#: builtin/ls-tree.c:126 msgid "only show trees" msgstr "afficher seulement les arbres" -#: builtin/ls-tree.c:130 +#: builtin/ls-tree.c:128 msgid "recurse into subtrees" msgstr "parcourir les sous-arbres" -#: builtin/ls-tree.c:132 +#: builtin/ls-tree.c:130 msgid "show trees when recursing" msgstr "afficher les arbres en les parcourant" -#: builtin/ls-tree.c:135 +#: builtin/ls-tree.c:133 msgid "terminate entries with NUL byte" msgstr "terminer les éléments avec un octet NUL" -#: builtin/ls-tree.c:136 +#: builtin/ls-tree.c:134 msgid "include object size" msgstr "inclure la taille d'objet" -#: builtin/ls-tree.c:138 builtin/ls-tree.c:140 +#: builtin/ls-tree.c:136 builtin/ls-tree.c:138 msgid "list only filenames" msgstr "afficher seulement les noms de fichiers" -#: builtin/ls-tree.c:143 +#: builtin/ls-tree.c:141 msgid "use full path names" msgstr "utiliser les noms de chemins complets" -#: builtin/ls-tree.c:145 +#: builtin/ls-tree.c:143 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "" "afficher l'arbre entier ; pas seulement le répertoire courant (implique --" @@ -9306,165 +9715,173 @@ msgstr "git merge [<options>] <message> HEAD <commit>" msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:102 +#: builtin/merge.c:49 +msgid "git merge --continue" +msgstr "git merge --continue" + +#: builtin/merge.c:104 msgid "switch `m' requires a value" msgstr "le commutateur `m' a besoin d'une valeur" -#: builtin/merge.c:139 +#: builtin/merge.c:141 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Impossible de trouver la stratégie de fusion '%s'.\n" -#: builtin/merge.c:140 +#: builtin/merge.c:142 #, c-format msgid "Available strategies are:" msgstr "Les stratégies disponibles sont :" -#: builtin/merge.c:145 +#: builtin/merge.c:147 #, c-format msgid "Available custom strategies are:" msgstr "Les stratégies personnalisées sont :" -#: builtin/merge.c:195 builtin/pull.c:127 +#: builtin/merge.c:197 builtin/pull.c:127 msgid "do not show a diffstat at the end of the merge" msgstr "ne pas afficher un diffstat à la fin de la fusion" -#: builtin/merge.c:198 builtin/pull.c:130 +#: builtin/merge.c:200 builtin/pull.c:130 msgid "show a diffstat at the end of the merge" msgstr "afficher un diffstat à la fin de la fusion" -#: builtin/merge.c:199 builtin/pull.c:133 +#: builtin/merge.c:201 builtin/pull.c:133 msgid "(synonym to --stat)" msgstr "(synonyme de --stat)" -#: builtin/merge.c:201 builtin/pull.c:136 +#: builtin/merge.c:203 builtin/pull.c:136 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "ajouter (au plus <n>) éléments du journal court au message de validation de " "la fusion" -#: builtin/merge.c:204 builtin/pull.c:139 +#: builtin/merge.c:206 builtin/pull.c:139 msgid "create a single commit instead of doing a merge" msgstr "créer une validation unique au lieu de faire une fusion" -#: builtin/merge.c:206 builtin/pull.c:142 +#: builtin/merge.c:208 builtin/pull.c:142 msgid "perform a commit if the merge succeeds (default)" msgstr "effectuer une validation si la fusion réussit (défaut)" -#: builtin/merge.c:208 builtin/pull.c:145 +#: builtin/merge.c:210 builtin/pull.c:145 msgid "edit message before committing" msgstr "éditer le message avant la validation" -#: builtin/merge.c:209 +#: builtin/merge.c:211 msgid "allow fast-forward (default)" msgstr "autoriser l'avance rapide (défaut)" -#: builtin/merge.c:211 builtin/pull.c:151 +#: builtin/merge.c:213 builtin/pull.c:151 msgid "abort if fast-forward is not possible" msgstr "abandonner si l'avance rapide n'est pas possible" -#: builtin/merge.c:215 builtin/pull.c:154 +#: builtin/merge.c:217 builtin/pull.c:154 msgid "verify that the named commit has a valid GPG signature" msgstr "vérifier que le commit nommé a une signature GPG valide" -#: builtin/merge.c:216 builtin/notes.c:774 builtin/pull.c:158 +#: builtin/merge.c:218 builtin/notes.c:774 builtin/pull.c:158 #: builtin/revert.c:89 msgid "strategy" msgstr "stratégie" -#: builtin/merge.c:217 builtin/pull.c:159 +#: builtin/merge.c:219 builtin/pull.c:159 msgid "merge strategy to use" msgstr "stratégie de fusion à utiliser" -#: builtin/merge.c:218 builtin/pull.c:162 +#: builtin/merge.c:220 builtin/pull.c:162 msgid "option=value" msgstr "option=valeur" -#: builtin/merge.c:219 builtin/pull.c:163 +#: builtin/merge.c:221 builtin/pull.c:163 msgid "option for selected merge strategy" msgstr "option pour la stratégie de fusion sélectionnée" -#: builtin/merge.c:221 +#: builtin/merge.c:223 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" "message de validation de la fusion (pour une fusion sans avance rapide)" -#: builtin/merge.c:225 +#: builtin/merge.c:227 msgid "abort the current in-progress merge" msgstr "abandonner la fusion en cours" -#: builtin/merge.c:227 builtin/pull.c:170 +#: builtin/merge.c:229 +msgid "continue the current in-progress merge" +msgstr "continuer la fusion en cours" + +#: builtin/merge.c:231 builtin/pull.c:170 msgid "allow merging unrelated histories" msgstr "permettre la fusion d'historiques sans rapport" -#: builtin/merge.c:255 +#: builtin/merge.c:259 msgid "could not run stash." msgstr "impossible de lancer le remisage." -#: builtin/merge.c:260 +#: builtin/merge.c:264 msgid "stash failed" msgstr "échec du remisage" -#: builtin/merge.c:265 +#: builtin/merge.c:269 #, c-format msgid "not a valid object: %s" msgstr "pas un objet valide : %s" -#: builtin/merge.c:284 builtin/merge.c:301 +#: builtin/merge.c:288 builtin/merge.c:305 msgid "read-tree failed" msgstr "read-tree a échoué" -#: builtin/merge.c:331 +#: builtin/merge.c:335 msgid " (nothing to squash)" msgstr " (rien à compresser)" -#: builtin/merge.c:342 +#: builtin/merge.c:346 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Validation compressée -- HEAD non mise à jour\n" -#: builtin/merge.c:392 +#: builtin/merge.c:396 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Pas de message de fusion -- pas de mise à jour de HEAD\n" -#: builtin/merge.c:443 +#: builtin/merge.c:447 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' ne pointe pas sur un commit" -#: builtin/merge.c:533 +#: builtin/merge.c:537 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s" -#: builtin/merge.c:652 +#: builtin/merge.c:656 msgid "Not handling anything other than two heads merge." msgstr "Impossible de gérer autre chose que la fusion de deux têtes." -#: builtin/merge.c:666 +#: builtin/merge.c:670 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Options inconnue pour merge-recursive : -X%s" -#: builtin/merge.c:681 +#: builtin/merge.c:685 #, c-format msgid "unable to write %s" msgstr "impossible d'écrire %s" -#: builtin/merge.c:733 +#: builtin/merge.c:737 #, c-format msgid "Could not read from '%s'" msgstr "Impossible de lire depuis '%s'" -#: builtin/merge.c:742 +#: builtin/merge.c:746 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Pas de validation de la fusion ; utilisez 'git commit' pour terminer la " "fusion.\n" -#: builtin/merge.c:748 +#: builtin/merge.c:752 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -9481,68 +9898,80 @@ msgstr "" "Les lignes commençant par '%c' seront ignorées, et un message vide\n" "abandonne la validation.\n" -#: builtin/merge.c:772 +#: builtin/merge.c:776 msgid "Empty commit message." msgstr "Message de validation vide." -#: builtin/merge.c:792 +#: builtin/merge.c:796 #, c-format msgid "Wonderful.\n" msgstr "Merveilleux.\n" -#: builtin/merge.c:847 +#: builtin/merge.c:851 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "La fusion automatique a échoué ; réglez les conflits et validez le " "résultat.\n" -#: builtin/merge.c:863 +#: builtin/merge.c:867 #, c-format msgid "'%s' is not a commit" msgstr "'%s' n'est pas une validation" -#: builtin/merge.c:904 +#: builtin/merge.c:908 msgid "No current branch." msgstr "Pas de branche courante." -#: builtin/merge.c:906 +#: builtin/merge.c:910 msgid "No remote for the current branch." msgstr "Pas de branche distante pour la branche courante." -#: builtin/merge.c:908 +#: builtin/merge.c:912 msgid "No default upstream defined for the current branch." msgstr "Pas de branche amont par défaut définie pour la branche courante." -#: builtin/merge.c:913 +#: builtin/merge.c:917 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Pas de branche de suivi pour %s depuis %s" -#: builtin/merge.c:960 +#: builtin/merge.c:964 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Mauvaise valeur '%s' dans l'environnement '%s'" -#: builtin/merge.c:1034 +#: builtin/merge.c:1038 #, c-format msgid "could not close '%s'" msgstr "impossible de fermer '%s'" -#: builtin/merge.c:1061 +#: builtin/merge.c:1065 #, c-format msgid "not something we can merge in %s: %s" msgstr "pas possible de fusionner ceci dans %s : %s" -#: builtin/merge.c:1095 +#: builtin/merge.c:1099 msgid "not something we can merge" msgstr "pas possible de fusionner ceci" -#: builtin/merge.c:1162 +#: builtin/merge.c:1167 +msgid "--abort expects no arguments" +msgstr "--abort n'accepte pas d'argument" + +#: builtin/merge.c:1171 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Il n'y a pas de fusion à abandonner (MERGE_HEAD manquant)." -#: builtin/merge.c:1178 +#: builtin/merge.c:1183 +msgid "--continue expects no arguments" +msgstr "--continue ne supporte aucun argument" + +#: builtin/merge.c:1187 +msgid "There is no merge in progress (MERGE_HEAD missing)." +msgstr "Il n'y a pas de fusion en cours (MERGE_HEAD manquant)." + +#: builtin/merge.c:1203 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -9550,7 +9979,7 @@ msgstr "" "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n" "Veuillez valider vos modifications avant de pouvoir fusionner." -#: builtin/merge.c:1185 +#: builtin/merge.c:1210 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -9558,114 +9987,114 @@ msgstr "" "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n" "Veuillez valider vos modifications avant de pouvoir fusionner." -#: builtin/merge.c:1188 +#: builtin/merge.c:1213 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe)." -#: builtin/merge.c:1197 +#: builtin/merge.c:1222 msgid "You cannot combine --squash with --no-ff." msgstr "Vous ne pouvez pas combiner --squash avec --no-ff." -#: builtin/merge.c:1205 +#: builtin/merge.c:1230 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "Pas de validation spécifiée et merge.defaultToUpstream n'est pas défini." -#: builtin/merge.c:1222 +#: builtin/merge.c:1247 msgid "Squash commit into empty head not supported yet" msgstr "La validation compressée vers une tête vide n'est pas encore supportée" -#: builtin/merge.c:1224 +#: builtin/merge.c:1249 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Une validation sans avance rapide n'a pas de sens dans une tête vide" -#: builtin/merge.c:1229 +#: builtin/merge.c:1254 #, c-format msgid "%s - not something we can merge" msgstr "%s - pas possible de fusionner ceci" -#: builtin/merge.c:1231 +#: builtin/merge.c:1256 msgid "Can merge only exactly one commit into empty head" msgstr "" "Possible de fusionner exactement une seule validation dans une tête vide" -#: builtin/merge.c:1287 +#: builtin/merge.c:1312 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "La validation %s a une signature GPG non fiable, prétendument par %s." -#: builtin/merge.c:1290 +#: builtin/merge.c:1315 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "La validation %s a une mauvaise signature GPG prétendument par %s." -#: builtin/merge.c:1293 +#: builtin/merge.c:1318 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "La validation %s n'a pas de signature GPG." -#: builtin/merge.c:1296 +#: builtin/merge.c:1321 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "La validation %s a une signature GPG correcte par %s\n" -#: builtin/merge.c:1358 +#: builtin/merge.c:1383 msgid "refusing to merge unrelated histories" msgstr "refus de fusionner des historiques sans relation" -#: builtin/merge.c:1367 +#: builtin/merge.c:1392 msgid "Already up-to-date." msgstr "Déjà à jour." -#: builtin/merge.c:1377 +#: builtin/merge.c:1402 #, c-format msgid "Updating %s..%s\n" msgstr "Mise à jour %s..%s\n" -#: builtin/merge.c:1418 +#: builtin/merge.c:1443 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Essai de fusion vraiment triviale dans l'index...\n" -#: builtin/merge.c:1425 +#: builtin/merge.c:1450 #, c-format msgid "Nope.\n" msgstr "Non.\n" -#: builtin/merge.c:1450 +#: builtin/merge.c:1475 msgid "Already up-to-date. Yeeah!" msgstr "Déjà à jour. Ouais !" -#: builtin/merge.c:1456 +#: builtin/merge.c:1481 msgid "Not possible to fast-forward, aborting." msgstr "Pas possible d'avancer rapidement, abandon." -#: builtin/merge.c:1479 builtin/merge.c:1558 +#: builtin/merge.c:1504 builtin/merge.c:1583 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Retour de l'arbre à l'original...\n" -#: builtin/merge.c:1483 +#: builtin/merge.c:1508 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Essai de la stratégie de fusion %s...\n" -#: builtin/merge.c:1549 +#: builtin/merge.c:1574 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Aucune stratégie de fusion n'a pris en charge la fusion.\n" -#: builtin/merge.c:1551 +#: builtin/merge.c:1576 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "La fusion avec la stratégie %s a échoué.\n" -#: builtin/merge.c:1560 +#: builtin/merge.c:1585 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Utilisation de %s pour préparer la résolution à la main.\n" -#: builtin/merge.c:1572 +#: builtin/merge.c:1597 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -9798,96 +10227,96 @@ msgstr "autoriser les objets manquants" msgid "allow creation of more than one tree" msgstr "autoriser la création de plus d'un arbre" -#: builtin/mv.c:15 +#: builtin/mv.c:16 msgid "git mv [<options>] <source>... <destination>" msgstr "git mv [<options>] <source>... <destination>" -#: builtin/mv.c:70 +#: builtin/mv.c:82 #, c-format msgid "Directory %s is in index and no submodule?" msgstr "Le répertoire %s est dans l'index et pourtant aucun sous-module ?" -#: builtin/mv.c:72 builtin/rm.c:317 +#: builtin/mv.c:84 builtin/rm.c:290 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" "Veuillez indexer vos modifications de .gitmodules ou les remiser pour " "continuer" -#: builtin/mv.c:90 +#: builtin/mv.c:102 #, c-format msgid "%.*s is in index" msgstr "%.*s est dans l'index" -#: builtin/mv.c:112 +#: builtin/mv.c:124 msgid "force move/rename even if target exists" msgstr "forcer le déplacement/renommage même si la cible existe" -#: builtin/mv.c:113 +#: builtin/mv.c:125 msgid "skip move/rename errors" msgstr "sauter les erreurs de déplacement/renommage" -#: builtin/mv.c:155 +#: builtin/mv.c:167 #, c-format msgid "destination '%s' is not a directory" msgstr "la destination '%s' n'est pas un répertoire" -#: builtin/mv.c:166 +#: builtin/mv.c:178 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Vérification du renommage de '%s' en '%s'\n" -#: builtin/mv.c:170 +#: builtin/mv.c:182 msgid "bad source" msgstr "mauvaise source" -#: builtin/mv.c:173 +#: builtin/mv.c:185 msgid "can not move directory into itself" msgstr "impossible de déplacer un répertoire dans lui-même" -#: builtin/mv.c:176 +#: builtin/mv.c:188 msgid "cannot move directory over file" msgstr "impossible de déplacer un répertoire sur un fichier" -#: builtin/mv.c:185 +#: builtin/mv.c:197 msgid "source directory is empty" msgstr "le répertoire source est vide" -#: builtin/mv.c:210 +#: builtin/mv.c:222 msgid "not under version control" msgstr "pas sous le contrôle de version" -#: builtin/mv.c:213 +#: builtin/mv.c:225 msgid "destination exists" msgstr "la destination existe" -#: builtin/mv.c:221 +#: builtin/mv.c:233 #, c-format msgid "overwriting '%s'" msgstr "écrasement de '%s'" -#: builtin/mv.c:224 +#: builtin/mv.c:236 msgid "Cannot overwrite" msgstr "Impossible d'écraser" -#: builtin/mv.c:227 +#: builtin/mv.c:239 msgid "multiple sources for the same target" msgstr "multiples sources pour la même destination" -#: builtin/mv.c:229 +#: builtin/mv.c:241 msgid "destination directory does not exist" msgstr "le répertoire de destination n'existe pas" -#: builtin/mv.c:236 +#: builtin/mv.c:248 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, source=%s, destination=%s" -#: builtin/mv.c:257 +#: builtin/mv.c:269 #, c-format msgid "Renaming %s to %s\n" msgstr "Renommage de %s en %s\n" -#: builtin/mv.c:263 builtin/remote.c:710 builtin/repack.c:375 +#: builtin/mv.c:275 builtin/remote.c:710 builtin/repack.c:384 #, c-format msgid "renaming '%s' failed" msgstr "le renommage de '%s' a échoué" @@ -10076,12 +10505,12 @@ msgstr "impossible d'écrire l'objet note" msgid "the note contents have been left in %s" msgstr "le contenu de la note a été laissé dans %s" -#: builtin/notes.c:233 builtin/tag.c:439 +#: builtin/notes.c:233 builtin/tag.c:460 #, c-format msgid "cannot read '%s'" msgstr "impossible de lire '%s'" -#: builtin/notes.c:235 builtin/tag.c:442 +#: builtin/notes.c:235 builtin/tag.c:463 #, c-format msgid "could not open or read '%s'" msgstr "impossible d'ouvrir ou lire '%s'" @@ -10363,186 +10792,186 @@ msgstr "" "git pack-objects [options...] base-name [< <liste-références> | < <liste-" "objets>]" -#: builtin/pack-objects.c:179 builtin/pack-objects.c:182 +#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 #, c-format msgid "deflate error (%d)" msgstr "erreur de compression (%d)" -#: builtin/pack-objects.c:768 +#: builtin/pack-objects.c:766 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "désactivation de l'écriture en bitmap, les fichiers paquets sont scindés à " "cause de pack.packSizeLimit" -#: builtin/pack-objects.c:781 +#: builtin/pack-objects.c:779 msgid "Writing objects" msgstr "Écriture des objets" -#: builtin/pack-objects.c:1070 +#: builtin/pack-objects.c:1068 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "désactivation de l'écriture en bitmap car certains objets ne sont pas " "compressés" -#: builtin/pack-objects.c:2346 +#: builtin/pack-objects.c:2344 msgid "Compressing objects" msgstr "Compression des objets" -#: builtin/pack-objects.c:2759 +#: builtin/pack-objects.c:2747 #, c-format msgid "unsupported index version %s" msgstr "version d'index non supportée %s" -#: builtin/pack-objects.c:2763 +#: builtin/pack-objects.c:2751 #, c-format msgid "bad index version '%s'" msgstr "mauvaise version d'index '%s'" -#: builtin/pack-objects.c:2793 +#: builtin/pack-objects.c:2781 msgid "do not show progress meter" msgstr "ne pas afficher la barre de progression" -#: builtin/pack-objects.c:2795 +#: builtin/pack-objects.c:2783 msgid "show progress meter" msgstr "afficher la barre de progression" -#: builtin/pack-objects.c:2797 +#: builtin/pack-objects.c:2785 msgid "show progress meter during object writing phase" msgstr "afficher la barre de progression durant la phase d'écrite des objets" -#: builtin/pack-objects.c:2800 +#: builtin/pack-objects.c:2788 msgid "similar to --all-progress when progress meter is shown" msgstr "similaire à --all-progress quand la barre de progression est affichée" -#: builtin/pack-objects.c:2801 +#: builtin/pack-objects.c:2789 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2802 +#: builtin/pack-objects.c:2790 msgid "write the pack index file in the specified idx format version" msgstr "" "écrire le fichier d'index du paquet dans le format d'index de version " "spécifié" -#: builtin/pack-objects.c:2805 +#: builtin/pack-objects.c:2793 msgid "maximum size of each output pack file" msgstr "taille maximum de chaque fichier paquet en sortie" -#: builtin/pack-objects.c:2807 +#: builtin/pack-objects.c:2795 msgid "ignore borrowed objects from alternate object store" msgstr "ignorer les objets empruntés à un autre magasin d'objets" -#: builtin/pack-objects.c:2809 +#: builtin/pack-objects.c:2797 msgid "ignore packed objects" msgstr "ignorer les objets empaquetés" -#: builtin/pack-objects.c:2811 +#: builtin/pack-objects.c:2799 msgid "limit pack window by objects" msgstr "limiter la fenêtre d'empaquetage par objets" -#: builtin/pack-objects.c:2813 +#: builtin/pack-objects.c:2801 msgid "limit pack window by memory in addition to object limit" msgstr "" "limiter la fenêtre d'empaquetage par mémoire en plus de la limite d'objets" -#: builtin/pack-objects.c:2815 +#: builtin/pack-objects.c:2803 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" "longueur maximum de la chaîne de delta autorisée dans le paquet résultant" -#: builtin/pack-objects.c:2817 +#: builtin/pack-objects.c:2805 msgid "reuse existing deltas" msgstr "réutiliser les deltas existants" -#: builtin/pack-objects.c:2819 +#: builtin/pack-objects.c:2807 msgid "reuse existing objects" msgstr "réutiliser les objets existants" -#: builtin/pack-objects.c:2821 +#: builtin/pack-objects.c:2809 msgid "use OFS_DELTA objects" msgstr "utiliser les objets OFS_DELTA" -#: builtin/pack-objects.c:2823 +#: builtin/pack-objects.c:2811 msgid "use threads when searching for best delta matches" msgstr "" "utiliser des fils lors de la recherche pour une meilleurs correspondance des " "deltas" -#: builtin/pack-objects.c:2825 +#: builtin/pack-objects.c:2813 msgid "do not create an empty pack output" msgstr "ne pas créer un paquet vide" -#: builtin/pack-objects.c:2827 +#: builtin/pack-objects.c:2815 msgid "read revision arguments from standard input" msgstr "lire les paramètres de révision depuis l'entrée standard" -#: builtin/pack-objects.c:2829 +#: builtin/pack-objects.c:2817 msgid "limit the objects to those that are not yet packed" msgstr "limiter les objets à ceux qui ne sont pas encore empaquetés" -#: builtin/pack-objects.c:2832 +#: builtin/pack-objects.c:2820 msgid "include objects reachable from any reference" msgstr "inclure les objets accessibles depuis toute référence" -#: builtin/pack-objects.c:2835 +#: builtin/pack-objects.c:2823 msgid "include objects referred by reflog entries" msgstr "inclure les objets référencés par les éléments de reflog" -#: builtin/pack-objects.c:2838 +#: builtin/pack-objects.c:2826 msgid "include objects referred to by the index" msgstr "inclure les objets référencés par l'index" -#: builtin/pack-objects.c:2841 +#: builtin/pack-objects.c:2829 msgid "output pack to stdout" msgstr "afficher l'empaquetage sur la sortie standard" -#: builtin/pack-objects.c:2843 +#: builtin/pack-objects.c:2831 msgid "include tag objects that refer to objects to be packed" msgstr "inclure les objets d'étiquettes qui réfèrent à des objets à empaqueter" -#: builtin/pack-objects.c:2845 +#: builtin/pack-objects.c:2833 msgid "keep unreachable objects" msgstr "garder les objets inaccessibles" -#: builtin/pack-objects.c:2847 +#: builtin/pack-objects.c:2835 msgid "pack loose unreachable objects" msgstr "empaqueter les objets inaccessibles détachés" -#: builtin/pack-objects.c:2849 +#: builtin/pack-objects.c:2837 msgid "unpack unreachable objects newer than <time>" msgstr "dépaqueter les objets inaccessibles plus récents que <heure>" -#: builtin/pack-objects.c:2852 +#: builtin/pack-objects.c:2840 msgid "create thin packs" msgstr "créer des paquets légers" -#: builtin/pack-objects.c:2854 +#: builtin/pack-objects.c:2842 msgid "create packs suitable for shallow fetches" msgstr "créer des paquets permettant des récupérations superficielles" -#: builtin/pack-objects.c:2856 +#: builtin/pack-objects.c:2844 msgid "ignore packs that have companion .keep file" msgstr "ignorer les paquets qui ont un fichier .keep" -#: builtin/pack-objects.c:2858 +#: builtin/pack-objects.c:2846 msgid "pack compression level" msgstr "niveau de compression du paquet" -#: builtin/pack-objects.c:2860 +#: builtin/pack-objects.c:2848 msgid "do not hide commits by grafts" msgstr "ne pas cacher les validations par greffes" -#: builtin/pack-objects.c:2862 +#: builtin/pack-objects.c:2850 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "utiliser un index en bitmap si disponible pour accélerer le décompte des " "objets" -#: builtin/pack-objects.c:2864 +#: builtin/pack-objects.c:2852 msgid "write a bitmap index together with the pack index" msgstr "écrire un index en bitmap associé à l'index de paquet" -#: builtin/pack-objects.c:2993 +#: builtin/pack-objects.c:2979 msgid "Counting objects" msgstr "Décompte des objets" @@ -10676,7 +11105,7 @@ msgstr "Référez-vous à git-pull(1) pour de plus amples détails." msgid "<remote>" msgstr "<distant>" -#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:451 +#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:455 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<branche>" @@ -10746,8 +11175,7 @@ msgid "" "to recover." msgstr "" "Avance rapide de votre arbre de travail impossible.\n" -"Après vous être assuré que toute modification précieuse a été sauvegardée " -"avec\n" +"Après avoir vérifié que toute modification précieuse a été sauvegardée avec\n" "$ git diff %s\n" "lancez\n" "$ git reset --hard\n" @@ -10853,14 +11281,14 @@ msgstr "" "pas une branche amont de votre branche courante '%s', sans me dire\n" "quoi pousser pour mettre à jour quelle branche amont." -#: builtin/push.c:242 +#: builtin/push.c:245 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "Vous n'avez pas spécifié de spécifications de référence à pousser, et push." "default est \"nothing\"." -#: builtin/push.c:249 +#: builtin/push.c:252 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -10875,7 +11303,7 @@ msgstr "" "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus " "d'information." -#: builtin/push.c:255 +#: builtin/push.c:258 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" @@ -10890,7 +11318,7 @@ msgstr "" "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus " "d'information." -#: builtin/push.c:261 +#: builtin/push.c:264 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" @@ -10908,13 +11336,13 @@ msgstr "" "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus " "d'information." -#: builtin/push.c:268 +#: builtin/push.c:271 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" "Les mises à jour ont été rejetées car l'étiquette existe déjà dans la " "branche distante." -#: builtin/push.c:271 +#: builtin/push.c:274 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" @@ -10926,22 +11354,22 @@ msgstr "" "pointer\n" "vers un objet qui n'est pas un commit, sans utiliser l'option '--force'.\n" -#: builtin/push.c:331 +#: builtin/push.c:334 #, c-format msgid "Pushing to %s\n" msgstr "Poussée vers %s\n" -#: builtin/push.c:335 +#: builtin/push.c:338 #, c-format msgid "failed to push some refs to '%s'" msgstr "impossible de pousser des références vers '%s'" -#: builtin/push.c:366 +#: builtin/push.c:369 #, c-format msgid "bad repository '%s'" msgstr "mauvais dépôt '%s'" -#: builtin/push.c:367 +#: builtin/push.c:370 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -10963,113 +11391,113 @@ msgstr "" "\n" " git push <nom>\n" -#: builtin/push.c:385 +#: builtin/push.c:388 msgid "--all and --tags are incompatible" msgstr "--all et --tags sont incompatibles" -#: builtin/push.c:386 +#: builtin/push.c:389 msgid "--all can't be combined with refspecs" msgstr "--all ne peut pas être combiné avec des spécifications de référence" -#: builtin/push.c:391 +#: builtin/push.c:394 msgid "--mirror and --tags are incompatible" msgstr "--mirror et --tags sont incompatibles" -#: builtin/push.c:392 +#: builtin/push.c:395 msgid "--mirror can't be combined with refspecs" msgstr "--mirror ne peut pas être combiné avec des spécifications de référence" -#: builtin/push.c:397 +#: builtin/push.c:400 msgid "--all and --mirror are incompatible" msgstr "--all et --mirror sont incompatibles" -#: builtin/push.c:515 +#: builtin/push.c:518 msgid "repository" msgstr "dépôt" -#: builtin/push.c:516 builtin/send-pack.c:161 +#: builtin/push.c:519 builtin/send-pack.c:161 msgid "push all refs" msgstr "pousser toutes les références" -#: builtin/push.c:517 builtin/send-pack.c:163 +#: builtin/push.c:520 builtin/send-pack.c:163 msgid "mirror all refs" msgstr "refléter toutes les références" -#: builtin/push.c:519 +#: builtin/push.c:522 msgid "delete refs" msgstr "supprimer les références" -#: builtin/push.c:520 +#: builtin/push.c:523 msgid "push tags (can't be used with --all or --mirror)" msgstr "" "pousser les étiquettes (ne peut pas être utilisé avec --all ou --mirror)" -#: builtin/push.c:523 builtin/send-pack.c:164 +#: builtin/push.c:526 builtin/send-pack.c:164 msgid "force updates" msgstr "forcer les mises à jour" -#: builtin/push.c:525 builtin/send-pack.c:175 +#: builtin/push.c:528 builtin/send-pack.c:175 msgid "refname>:<expect" msgstr "nom de référence>:<attendu" -#: builtin/push.c:526 builtin/send-pack.c:176 +#: builtin/push.c:529 builtin/send-pack.c:176 msgid "require old value of ref to be at this value" msgstr "exiger que l'ancienne valeur de la référence soit à cette valeur" -#: builtin/push.c:529 +#: builtin/push.c:532 msgid "control recursive pushing of submodules" msgstr "contrôler la poussée récursive des sous-modules" -#: builtin/push.c:531 builtin/send-pack.c:169 +#: builtin/push.c:534 builtin/send-pack.c:169 msgid "use thin pack" msgstr "utiliser un empaquetage léger" -#: builtin/push.c:532 builtin/push.c:533 builtin/send-pack.c:158 +#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:158 #: builtin/send-pack.c:159 msgid "receive pack program" msgstr "recevoir le programme d'empaquetage" -#: builtin/push.c:534 +#: builtin/push.c:537 msgid "set upstream for git pull/status" msgstr "définir la branche amont pour git pull/status" -#: builtin/push.c:537 +#: builtin/push.c:540 msgid "prune locally removed refs" msgstr "éliminer les références locales supprimées" -#: builtin/push.c:539 +#: builtin/push.c:542 msgid "bypass pre-push hook" msgstr "éviter d'utiliser le crochet pre-push" -#: builtin/push.c:540 +#: builtin/push.c:543 msgid "push missing but relevant tags" msgstr "pousser les étiquettes manquantes mais pertinentes" -#: builtin/push.c:543 builtin/send-pack.c:166 +#: builtin/push.c:546 builtin/send-pack.c:166 msgid "GPG sign the push" msgstr "signer la poussée avec GPG" -#: builtin/push.c:545 builtin/send-pack.c:170 +#: builtin/push.c:548 builtin/send-pack.c:170 msgid "request atomic transaction on remote side" msgstr "demande une transaction atomique sur le serveur distant" -#: builtin/push.c:546 +#: builtin/push.c:549 msgid "server-specific" msgstr "spécifique au serveur" -#: builtin/push.c:546 +#: builtin/push.c:549 msgid "option to transmit" msgstr "option à transmettre" -#: builtin/push.c:560 +#: builtin/push.c:563 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete est incompatible avec --all, --mirror et --tags" -#: builtin/push.c:562 +#: builtin/push.c:565 msgid "--delete doesn't make sense without any refs" msgstr "--delete n'a pas de sens sans aucune référence" -#: builtin/push.c:579 +#: builtin/push.c:584 msgid "push options must not have new line characters" msgstr "" "les options de poussée ne peuvent pas contenir de caractères de nouvelle " @@ -11161,8 +11589,8 @@ msgid "" "with what you pushed, and will require 'git reset --hard' to match\n" "the work tree to HEAD.\n" "\n" -"You can set 'receive.denyCurrentBranch' configuration variable to\n" -"'ignore' or 'warn' in the remote repository to allow pushing into\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" @@ -11741,84 +12169,92 @@ msgstr "Sous-commande inconnue : %s" msgid "git repack [<options>]" msgstr "git repack [<options>]" -#: builtin/repack.c:160 +#: builtin/repack.c:22 +msgid "" +"Incremental repacks are incompatible with bitmap indexes. Use\n" +"--no-write-bitmap-index or disable the pack.writebitmaps configuration." +msgstr "" +"Les repaquetages incrémentaux sont incompatibles avec les index bitmap. Utilisez\n" +"--no-write-bitmap-index ou désactivez le paramètre pack.writebitmaps." + +#: builtin/repack.c:166 msgid "pack everything in a single pack" msgstr "empaqueter tout dans un seul paquet" -#: builtin/repack.c:162 +#: builtin/repack.c:168 msgid "same as -a, and turn unreachable objects loose" msgstr "identique à -a et transformer les objets inaccessibles en suspens" -#: builtin/repack.c:165 +#: builtin/repack.c:171 msgid "remove redundant packs, and run git-prune-packed" msgstr "supprimer les paquets redondants et lancer git-prune-packed" -#: builtin/repack.c:167 +#: builtin/repack.c:173 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "passer --no-reuse-delta à git-pack-objects" -#: builtin/repack.c:169 +#: builtin/repack.c:175 msgid "pass --no-reuse-object to git-pack-objects" msgstr "passer --no-reuse-object à git-pack-objects" -#: builtin/repack.c:171 +#: builtin/repack.c:177 msgid "do not run git-update-server-info" msgstr "ne pas lancer git update-server-info" -#: builtin/repack.c:174 +#: builtin/repack.c:180 msgid "pass --local to git-pack-objects" msgstr "passer --local à git-pack-objects" -#: builtin/repack.c:176 +#: builtin/repack.c:182 msgid "write bitmap index" msgstr "écrire un index en bitmap" -#: builtin/repack.c:177 +#: builtin/repack.c:183 msgid "approxidate" msgstr "date approximative" -#: builtin/repack.c:178 +#: builtin/repack.c:184 msgid "with -A, do not loosen objects older than this" msgstr "avec -A, ne pas suspendre les objets plus vieux que celui-ci" -#: builtin/repack.c:180 +#: builtin/repack.c:186 msgid "with -a, repack unreachable objects" msgstr "avec -a, repaquétiser les objets inaccessibles" -#: builtin/repack.c:182 +#: builtin/repack.c:188 msgid "size of the window used for delta compression" msgstr "taille de la fenêtre utilisée pour la compression des deltas" -#: builtin/repack.c:183 builtin/repack.c:187 +#: builtin/repack.c:189 builtin/repack.c:193 msgid "bytes" msgstr "octets" -#: builtin/repack.c:184 +#: builtin/repack.c:190 msgid "same as the above, but limit memory size instead of entries count" msgstr "" "idem ci-dessus, mais limiter la taille mémoire au lieu du nombre d'éléments" -#: builtin/repack.c:186 +#: builtin/repack.c:192 msgid "limits the maximum delta depth" msgstr "limite la profondeur maximale des deltas" -#: builtin/repack.c:188 +#: builtin/repack.c:194 msgid "maximum size of each packfile" msgstr "taille maximum de chaque fichier paquet" -#: builtin/repack.c:190 +#: builtin/repack.c:196 msgid "repack objects in packs marked with .keep" msgstr "réempaqueter les objets dans des paquets marqués avec .keep" -#: builtin/repack.c:200 +#: builtin/repack.c:206 msgid "cannot delete packs in a precious-objects repo" msgstr "impossible de supprimer les paquets dans un dépôt d'objets précieux" -#: builtin/repack.c:204 +#: builtin/repack.c:210 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable et -A sont incompatibles" -#: builtin/repack.c:391 builtin/worktree.c:115 +#: builtin/repack.c:400 builtin/worktree.c:115 #, c-format msgid "failed to remove '%s'" msgstr "échec de la suppression de '%s'" @@ -12052,23 +12488,23 @@ msgstr "Impossible d'écrire le nouveau fichier d'index." msgid "rev-list does not support display of notes" msgstr "rev-list ne supporte l'affichage des notes" -#: builtin/rev-parse.c:386 +#: builtin/rev-parse.c:391 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<options>] -- [<arguments>...]" -#: builtin/rev-parse.c:391 +#: builtin/rev-parse.c:396 msgid "keep the `--` passed as an arg" msgstr "garder le `--` passé en argument" -#: builtin/rev-parse.c:393 +#: builtin/rev-parse.c:398 msgid "stop parsing after the first non-option argument" msgstr "arrêt de l'analyse après le premier argument qui n'est pas une option" -#: builtin/rev-parse.c:396 +#: builtin/rev-parse.c:401 msgid "output in stuck long form" msgstr "sortie en forme longue fixée" -#: builtin/rev-parse.c:527 +#: builtin/rev-parse.c:532 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -12168,30 +12604,7 @@ msgstr "le picorage a échoué" msgid "git rm [<options>] [--] <file>..." msgstr "git rm [<options>] [--] <fichier>..." -#: builtin/rm.c:65 -msgid "" -"the following submodule (or one of its nested submodules)\n" -"uses a .git directory:" -msgid_plural "" -"the following submodules (or one of their nested submodules)\n" -"use a .git directory:" -msgstr[0] "" -"le sous-module suivant (ou un de ses sous-modules imbriqués)\n" -"utilise un répertoire .git :" -msgstr[1] "" -"les sous-modules suivants (ou un de leurs sous-modules imbriqués)\n" -"utilisent un répertoire .git :" - -#: builtin/rm.c:71 -msgid "" -"\n" -"(use 'rm -rf' if you really want to remove it including all of its history)" -msgstr "" -"\n" -"(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout son " -"historique)" - -#: builtin/rm.c:230 +#: builtin/rm.c:205 msgid "" "the following file has staged content different from both the\n" "file and the HEAD:" @@ -12205,7 +12618,7 @@ msgstr[1] "" "les fichiers suivants ont du contenu indexé différent\n" "du fichier et de HEAD :" -#: builtin/rm.c:235 +#: builtin/rm.c:210 msgid "" "\n" "(use -f to force removal)" @@ -12213,13 +12626,13 @@ msgstr "" "\n" "(utilisez -f pour forcer la suppression)" -#: builtin/rm.c:239 +#: builtin/rm.c:214 msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" msgstr[0] "le fichier suivant a des changements indexés :" msgstr[1] "les fichiers suivants ont des changements indexés :" -#: builtin/rm.c:243 builtin/rm.c:254 +#: builtin/rm.c:218 builtin/rm.c:227 msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" @@ -12227,42 +12640,47 @@ msgstr "" "\n" "(utilisez --cached pour garder le fichier, ou -f pour forcer la suppression)" -#: builtin/rm.c:251 +#: builtin/rm.c:224 msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" msgstr[0] "le fichier suivant a des modifications locales :" msgstr[1] "les fichiers suivants ont des modifications locales :" -#: builtin/rm.c:269 +#: builtin/rm.c:242 msgid "do not list removed files" msgstr "ne pas afficher les fichiers supprimés" -#: builtin/rm.c:270 +#: builtin/rm.c:243 msgid "only remove from the index" msgstr "supprimer seulement de l'index" -#: builtin/rm.c:271 +#: builtin/rm.c:244 msgid "override the up-to-date check" msgstr "outrepasser la vérification des fichiers à jour" -#: builtin/rm.c:272 +#: builtin/rm.c:245 msgid "allow recursive removal" msgstr "autoriser la suppression récursive" -#: builtin/rm.c:274 +#: builtin/rm.c:247 msgid "exit with a zero status even if nothing matched" msgstr "sortir avec un statut zéro même si rien ne correspondait" -#: builtin/rm.c:335 +#: builtin/rm.c:308 #, c-format msgid "not removing '%s' recursively without -r" msgstr "pas de suppression récursive de '%s' sans -r" -#: builtin/rm.c:374 +#: builtin/rm.c:347 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm : impossible de supprimer %s" +#: builtin/rm.c:370 +#, c-format +msgid "could not remove '%s'" +msgstr "impossible de supprimer '%s'" + #: builtin/send-pack.c:18 msgid "" "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" @@ -12296,25 +12714,29 @@ msgstr "afficher les messages du greffon de protocole distant" msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" msgstr "git shortlog [<options>] [<intervalle-révisions>] [[--] [<chemin>...]]" -#: builtin/shortlog.c:242 +#: builtin/shortlog.c:249 +msgid "Group by committer rather than author" +msgstr "Grouper par validateur plutôt que par auteur" + +#: builtin/shortlog.c:251 msgid "sort output according to the number of commits per author" msgstr "trier la sortie sur le nombre de validations par auteur" -#: builtin/shortlog.c:244 +#: builtin/shortlog.c:253 msgid "Suppress commit descriptions, only provides commit count" msgstr "" "Supprimer les descriptions de validation, fournit seulement le nombre de " "validations" -#: builtin/shortlog.c:246 +#: builtin/shortlog.c:255 msgid "Show the email address of each author" msgstr "Afficher l'adresse e-mail de chaque auteur" -#: builtin/shortlog.c:247 +#: builtin/shortlog.c:256 msgid "w[,i1[,i2]]" msgstr "w[,i1[,i2]]" -#: builtin/shortlog.c:248 +#: builtin/shortlog.c:257 msgid "Linewrap output" msgstr "Couper les lignes" @@ -12468,38 +12890,38 @@ msgstr "" msgid "git show-ref --exclude-existing[=<pattern>]" msgstr "git show-ref --exclude-existing[=<motif>]" -#: builtin/show-ref.c:165 +#: builtin/show-ref.c:159 msgid "only show tags (can be combined with heads)" msgstr "afficher seulement les étiquettes (peut être combiné avec heads)" -#: builtin/show-ref.c:166 +#: builtin/show-ref.c:160 msgid "only show heads (can be combined with tags)" msgstr "afficher seulement les têtes (peut être combiné avec tags)" -#: builtin/show-ref.c:167 +#: builtin/show-ref.c:161 msgid "stricter reference checking, requires exact ref path" msgstr "" "vérification de référence plus stricte, nécessite un chemin de référence " "exact" -#: builtin/show-ref.c:170 builtin/show-ref.c:172 +#: builtin/show-ref.c:164 builtin/show-ref.c:166 msgid "show the HEAD reference, even if it would be filtered out" msgstr "afficher la référence HEAD, même si elle serait filtrée" -#: builtin/show-ref.c:174 +#: builtin/show-ref.c:168 msgid "dereference tags into object IDs" msgstr "déréférencer les étiquettes en IDs d'objet" -#: builtin/show-ref.c:176 +#: builtin/show-ref.c:170 msgid "only show SHA1 hash using <n> digits" msgstr "afficher seulement le hachage SHA1 en utilisant <n> chiffres" -#: builtin/show-ref.c:180 +#: builtin/show-ref.c:174 msgid "do not print results to stdout (useful with --verify)" msgstr "" "ne pas afficher les résultats sur la sortie standard (pratique avec --verify)" -#: builtin/show-ref.c:182 +#: builtin/show-ref.c:176 msgid "show refs from stdin that aren't in local repository" msgstr "" "afficher les références de l'entrée standard qui ne sont pas dans le dépôt " @@ -12523,12 +12945,12 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "ajouter devant chaque ligne le caractère de commentaire et un espace" -#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1046 +#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1062 #, c-format msgid "No such ref: %s" msgstr "Référence inexistante : %s" -#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1055 +#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1071 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Nom de référence complet attendu, %s obtenu" @@ -12538,8 +12960,7 @@ msgstr "Nom de référence complet attendu, %s obtenu" msgid "cannot strip one component off url '%s'" msgstr "impossible de supprimer un composant de l'URL '%s'" -#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:408 -#: builtin/submodule--helper.c:590 +#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:592 msgid "alternative anchor for relative paths" msgstr "ancre alternative pour les chemins relatifs" @@ -12547,91 +12968,91 @@ msgstr "ancre alternative pour les chemins relatifs" msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]" -#: builtin/submodule--helper.c:329 builtin/submodule--helper.c:343 +#: builtin/submodule--helper.c:333 builtin/submodule--helper.c:347 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "URL non trouvée pour le chemin de sous-module '%s' dans .gitmodules" -#: builtin/submodule--helper.c:369 +#: builtin/submodule--helper.c:373 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Échec d'enregistrement de l'URL pour le chemin de sous-module '%s'" -#: builtin/submodule--helper.c:373 +#: builtin/submodule--helper.c:377 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Sous-module '%s' (%s) enregistré pour le chemin '%s'\n" -#: builtin/submodule--helper.c:383 +#: builtin/submodule--helper.c:387 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "" "attention : nous vous suggérons de spécifier une commande de mode de mise à " "jour pour le sous-module '%s'\n" -#: builtin/submodule--helper.c:390 +#: builtin/submodule--helper.c:394 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" "Échec d'enregistrement du mode de mise à jour pour le chemin de sous-module " "'%s'" -#: builtin/submodule--helper.c:409 +#: builtin/submodule--helper.c:410 msgid "Suppress output for initializing a submodule" msgstr "Supprimer la sortie lors de l'initialisation d'un sous-module" -#: builtin/submodule--helper.c:414 +#: builtin/submodule--helper.c:415 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper init [<chemin>]" -#: builtin/submodule--helper.c:435 +#: builtin/submodule--helper.c:436 msgid "git submodule--helper name <path>" msgstr "git submodule--helper <nom> <chemin>" -#: builtin/submodule--helper.c:441 +#: builtin/submodule--helper.c:442 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "" "Pas de mise en correspondance du sous-module trouvé dans .gitmodules pour le " "chemin '%s'" -#: builtin/submodule--helper.c:524 builtin/submodule--helper.c:527 +#: builtin/submodule--helper.c:525 builtin/submodule--helper.c:528 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "le sous-module '%s' ne peut pas ajouter d'alternative : %s" -#: builtin/submodule--helper.c:563 +#: builtin/submodule--helper.c:564 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "" "La valeur '%s' pour submodule.alternateErrorStrategy n'est pas reconnue" -#: builtin/submodule--helper.c:570 +#: builtin/submodule--helper.c:571 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "La valeur '%s' pour submodule.alternateLocation n'est pas reconnue" -#: builtin/submodule--helper.c:593 +#: builtin/submodule--helper.c:595 msgid "where the new submodule will be cloned to" msgstr "emplacement où le sous-module sera cloné" -#: builtin/submodule--helper.c:596 +#: builtin/submodule--helper.c:598 msgid "name of the new submodule" msgstr "nom du nouveau sous-module" -#: builtin/submodule--helper.c:599 +#: builtin/submodule--helper.c:601 msgid "url where to clone the submodule from" msgstr "URL depuis laquelle cloner le sous-module" -#: builtin/submodule--helper.c:605 +#: builtin/submodule--helper.c:607 msgid "depth for shallow clones" msgstr "profondeur de l'historique des clones superficiels" -#: builtin/submodule--helper.c:608 builtin/submodule--helper.c:964 +#: builtin/submodule--helper.c:610 builtin/submodule--helper.c:980 msgid "force cloning progress" msgstr "forcer l'affichage de la progression du clonage" -#: builtin/submodule--helper.c:613 +#: builtin/submodule--helper.c:615 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -12639,98 +13060,93 @@ msgstr "" "git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference " "<dépôt>] [--name <nom>] [--depth <profondeur>] --url <url> --path <chemin>" -#: builtin/submodule--helper.c:638 builtin/submodule--helper.c:648 -#, c-format -msgid "could not create directory '%s'" -msgstr "impossible de créer le répertoire '%s'" - -#: builtin/submodule--helper.c:644 +#: builtin/submodule--helper.c:646 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "Le clonage de '%s' dans le chemin de sous-module '%s' a échoué" -#: builtin/submodule--helper.c:660 +#: builtin/submodule--helper.c:662 #, c-format msgid "cannot open file '%s'" msgstr "impossible d'ouvrir le fichier '%s'" -#: builtin/submodule--helper.c:665 +#: builtin/submodule--helper.c:667 #, c-format msgid "could not close file %s" msgstr "impossible de fermer le fichier %s" -#: builtin/submodule--helper.c:672 +#: builtin/submodule--helper.c:674 #, c-format msgid "could not get submodule directory for '%s'" msgstr "impossible de créer le répertoire de sous-module pour '%s'" -#: builtin/submodule--helper.c:726 +#: builtin/submodule--helper.c:742 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Le chemin de sous-module '%s' n'est pas initialisé" -#: builtin/submodule--helper.c:730 +#: builtin/submodule--helper.c:746 msgid "Maybe you want to use 'update --init'?" msgstr "Vous voudriez sûrement utiliser 'update --init' ?" -#: builtin/submodule--helper.c:756 +#: builtin/submodule--helper.c:772 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Sous-module non fusionné %s non traité" -#: builtin/submodule--helper.c:777 +#: builtin/submodule--helper.c:793 #, c-format msgid "Skipping submodule '%s'" msgstr "Sous-module '%s' non traité" -#: builtin/submodule--helper.c:913 +#: builtin/submodule--helper.c:929 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Impossible de cloner '%s'. Réessai prévu" -#: builtin/submodule--helper.c:924 +#: builtin/submodule--helper.c:940 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Impossible de cloner '%s' pour la seconde fois, abandon" -#: builtin/submodule--helper.c:945 +#: builtin/submodule--helper.c:961 builtin/submodule--helper.c:1105 msgid "path into the working tree" msgstr "chemin dans la copie de travail" -#: builtin/submodule--helper.c:948 +#: builtin/submodule--helper.c:964 msgid "path into the working tree, across nested submodule boundaries" msgstr "" "chemin dans la copie de travail, traversant les frontières de sous-modules" -#: builtin/submodule--helper.c:952 +#: builtin/submodule--helper.c:968 msgid "rebase, merge, checkout or none" msgstr "valeurs possibles : rebase, merge, checkout ou none" -#: builtin/submodule--helper.c:956 +#: builtin/submodule--helper.c:972 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "Créer un clone superficiel tronqué au nombre de révisions spécifié" -#: builtin/submodule--helper.c:959 +#: builtin/submodule--helper.c:975 msgid "parallel jobs" msgstr "jobs parallèles" -#: builtin/submodule--helper.c:961 +#: builtin/submodule--helper.c:977 msgid "whether the initial clone should follow the shallow recommendation" msgstr "spécifie si le clonage initial doit être aussi superficiel" -#: builtin/submodule--helper.c:962 +#: builtin/submodule--helper.c:978 msgid "don't print cloning progress" msgstr "ne pas afficher la progression du clonage" -#: builtin/submodule--helper.c:969 +#: builtin/submodule--helper.c:985 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update_clone [--prefix=<chemin>] [<chemin>...]" -#: builtin/submodule--helper.c:979 +#: builtin/submodule--helper.c:995 msgid "bad value for update parameter" msgstr "valeur invalide pour la mise à jour du paramètre" -#: builtin/submodule--helper.c:1050 +#: builtin/submodule--helper.c:1066 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -12739,12 +13155,25 @@ msgstr "" "la branche du sous-module %s est configurée pour hériter de la branche du " "superprojet, mais le superprojet n'est sur aucune branche" -#: builtin/submodule--helper.c:1100 +#: builtin/submodule--helper.c:1106 +msgid "recurse into submodules" +msgstr "parcourir récursivement les sous-modules" + +#: builtin/submodule--helper.c:1112 +msgid "git submodule--helper embed-git-dir [<path>...]" +msgstr "git submodule--helper embed-git-dir [<chemin>...]" + +#: builtin/submodule--helper.c:1157 msgid "submodule--helper subcommand must be called with a subcommand" msgstr "" "la sous-commande submodule--helper doit être appelée avec une sous-commande" -#: builtin/submodule--helper.c:1107 +#: builtin/submodule--helper.c:1164 +#, c-format +msgid "%s doesn't support --super-prefix" +msgstr "%s ne gère pas --super-prefix" + +#: builtin/submodule--helper.c:1170 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' n'est pas une sous-commande valide de submodule--helper" @@ -12799,25 +13228,25 @@ msgstr "" "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<motif>...]" #: builtin/tag.c:27 -msgid "git tag -v <tagname>..." -msgstr "git tag -v <nométiquette>..." +msgid "git tag -v [--format=<format>] <tagname>..." +msgstr "git tag -v [--format=<format>] <nométiquette>..." -#: builtin/tag.c:81 +#: builtin/tag.c:82 #, c-format msgid "tag name too long: %.*s..." msgstr "nom d'étiquette trop long : %.*s..." -#: builtin/tag.c:86 +#: builtin/tag.c:87 #, c-format msgid "tag '%s' not found." msgstr "étiquette '%s' non trouvée." -#: builtin/tag.c:101 +#: builtin/tag.c:102 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Étiquette '%s' supprimée (elle était sur %s)\n" -#: builtin/tag.c:117 +#: builtin/tag.c:131 #, c-format msgid "" "\n" @@ -12830,7 +13259,7 @@ msgstr "" " %s\n" "Les lignes commençant par '%c' seront ignorées.\n" -#: builtin/tag.c:121 +#: builtin/tag.c:135 #, c-format msgid "" "\n" @@ -12845,138 +13274,138 @@ msgstr "" "Les lignes commençant par '%c' seront gardées ; vous pouvez les retirer vous-" "même si vous le souhaitez.\n" -#: builtin/tag.c:199 +#: builtin/tag.c:213 msgid "unable to sign the tag" msgstr "impossible de signer l'étiquette" -#: builtin/tag.c:201 +#: builtin/tag.c:215 msgid "unable to write tag file" msgstr "impossible d'écrire le fichier d'étiquettes" -#: builtin/tag.c:226 +#: builtin/tag.c:240 msgid "bad object type." msgstr "mauvais type d'objet." -#: builtin/tag.c:239 +#: builtin/tag.c:253 msgid "tag header too big." msgstr "en-tête d'étiquette trop gros." -#: builtin/tag.c:275 +#: builtin/tag.c:289 msgid "no tag message?" msgstr "pas de message pour l'étiquette ?" -#: builtin/tag.c:281 +#: builtin/tag.c:295 #, c-format msgid "The tag message has been left in %s\n" msgstr "Le message pour l'étiquette a été laissé dans %s\n" -#: builtin/tag.c:339 +#: builtin/tag.c:354 msgid "list tag names" msgstr "afficher les noms des étiquettes" -#: builtin/tag.c:341 +#: builtin/tag.c:356 msgid "print <n> lines of each tag message" msgstr "affiche <n> lignes de chaque message d'étiquette" -#: builtin/tag.c:343 +#: builtin/tag.c:358 msgid "delete tags" msgstr "supprimer des étiquettes" -#: builtin/tag.c:344 +#: builtin/tag.c:359 msgid "verify tags" msgstr "vérifier des étiquettes" -#: builtin/tag.c:346 +#: builtin/tag.c:361 msgid "Tag creation options" msgstr "Options de création de l'étiquette" -#: builtin/tag.c:348 +#: builtin/tag.c:363 msgid "annotated tag, needs a message" msgstr "étiquette annotée, nécessite un message" -#: builtin/tag.c:350 +#: builtin/tag.c:365 msgid "tag message" msgstr "message pour l'étiquette" -#: builtin/tag.c:352 +#: builtin/tag.c:367 msgid "annotated and GPG-signed tag" msgstr "étiquette annotée et signée avec GPG" -#: builtin/tag.c:356 +#: builtin/tag.c:371 msgid "use another key to sign the tag" msgstr "utiliser une autre clé pour signer l'étiquette" -#: builtin/tag.c:357 +#: builtin/tag.c:372 msgid "replace the tag if exists" msgstr "remplacer l'étiquette si elle existe" -#: builtin/tag.c:358 builtin/update-ref.c:368 +#: builtin/tag.c:373 builtin/update-ref.c:368 msgid "create a reflog" msgstr "créer un reflog" -#: builtin/tag.c:360 +#: builtin/tag.c:375 msgid "Tag listing options" msgstr "Options d'affichage des étiquettes" -#: builtin/tag.c:361 +#: builtin/tag.c:376 msgid "show tag list in columns" msgstr "afficher la liste des étiquettes sous forme de colonnes" -#: builtin/tag.c:362 builtin/tag.c:363 +#: builtin/tag.c:377 builtin/tag.c:378 msgid "print only tags that contain the commit" msgstr "afficher seulement les étiquettes qui contiennent la validation" -#: builtin/tag.c:364 +#: builtin/tag.c:379 msgid "print only tags that are merged" msgstr "afficher seulement les étiquettes qui sont fusionnées" -#: builtin/tag.c:365 +#: builtin/tag.c:380 msgid "print only tags that are not merged" msgstr "afficher seulement les étiquettes qui ne sont pas fusionnées" -#: builtin/tag.c:370 +#: builtin/tag.c:385 msgid "print only tags of the object" msgstr "afficher seulement les étiquettes de l'objet" -#: builtin/tag.c:399 +#: builtin/tag.c:415 msgid "--column and -n are incompatible" msgstr "--column et -n sont incompatibles" -#: builtin/tag.c:419 +#: builtin/tag.c:437 msgid "-n option is only allowed with -l." msgstr "l'option -n est autorisée seulement avec -l." -#: builtin/tag.c:421 +#: builtin/tag.c:439 msgid "--contains option is only allowed with -l." msgstr "l'option --contains est autorisée seulement avec -l." -#: builtin/tag.c:423 +#: builtin/tag.c:441 msgid "--points-at option is only allowed with -l." msgstr "l'option --points-at est autorisée seulement avec -l." -#: builtin/tag.c:425 +#: builtin/tag.c:443 msgid "--merged and --no-merged option are only allowed with -l" msgstr "les options --merged et --no-merged ne sont autorisées qu'avec -l" -#: builtin/tag.c:433 +#: builtin/tag.c:454 msgid "only one -F or -m option is allowed." msgstr "une seule option -F ou -m est autorisée." -#: builtin/tag.c:452 +#: builtin/tag.c:473 msgid "too many params" msgstr "trop de paramètres" -#: builtin/tag.c:458 +#: builtin/tag.c:479 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' n'est pas un nom d'étiquette valide." -#: builtin/tag.c:463 +#: builtin/tag.c:484 #, c-format msgid "tag '%s' already exists" msgstr "l'étiquette '%s' existe déjà" -#: builtin/tag.c:491 +#: builtin/tag.c:512 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Étiquette '%s' mise à jour (elle était sur %s)\n" @@ -13176,7 +13605,7 @@ msgstr "tester si le système de fichier supporte le cache de non-suivis" msgid "enable untracked cache without testing the filesystem" msgstr "activer le cache de non-suivis sans tester le système de fichier" -#: builtin/update-index.c:1119 +#: builtin/update-index.c:1120 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -13184,11 +13613,11 @@ msgstr "" "core.untrackedCache est réglé à true ; supprimez-le ou changez-le si vous " "souhaitez vraiment désactiver le cache des fichiers non-suivis" -#: builtin/update-index.c:1123 +#: builtin/update-index.c:1124 msgid "Untracked cache disabled" msgstr "Le cache non suivi est désactivé" -#: builtin/update-index.c:1131 +#: builtin/update-index.c:1132 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -13196,7 +13625,7 @@ msgstr "" "core.untrackedCache est réglé à false ; supprimez-le ou changez-le si vous " "souhaitez vraiment activer le cache des fichiers non-suivis" -#: builtin/update-index.c:1135 +#: builtin/update-index.c:1136 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Le cache non suivi est activé pour '%s'" @@ -13247,7 +13676,7 @@ msgstr "git verify-commit [-v | --verbose] <commit>..." msgid "print commit contents" msgstr "afficher le contenu du commit" -#: builtin/verify-commit.c:73 builtin/verify-tag.c:35 +#: builtin/verify-commit.c:73 builtin/verify-tag.c:37 msgid "print raw gpg status output" msgstr "afficher les messages bruts de gpg" @@ -13263,11 +13692,11 @@ msgstr "verbeux" msgid "show statistics only" msgstr "afficher seulement les statistiques" -#: builtin/verify-tag.c:17 -msgid "git verify-tag [-v | --verbose] <tag>..." -msgstr "git verify-tag [-v | --verbose] <étiquette>..." +#: builtin/verify-tag.c:18 +msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." +msgstr "git verify-tag [-v | --verbose] [--format=<format>] <étiquette>..." -#: builtin/verify-tag.c:34 +#: builtin/verify-tag.c:36 msgid "print tag contents" msgstr "afficher le contenu de l'étiquette" @@ -13356,31 +13785,31 @@ msgstr "remplissage de la nouvelle copie de travail" msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B et --detach sont mutuellement exclusifs" -#: builtin/worktree.c:470 +#: builtin/worktree.c:472 msgid "reason for locking" msgstr "raison du vérouillage" -#: builtin/worktree.c:482 builtin/worktree.c:515 +#: builtin/worktree.c:484 builtin/worktree.c:517 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' n'est pas une copie de travail" -#: builtin/worktree.c:484 builtin/worktree.c:517 +#: builtin/worktree.c:486 builtin/worktree.c:519 msgid "The main working tree cannot be locked or unlocked" msgstr "" "La copie de travail principale ne peut pas être vérouillée ou dévérouillée" -#: builtin/worktree.c:489 +#: builtin/worktree.c:491 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' est déjà verrouillé, car '%s'" -#: builtin/worktree.c:491 +#: builtin/worktree.c:493 #, c-format msgid "'%s' is already locked" msgstr "'%s' est déjà verrouillé" -#: builtin/worktree.c:519 +#: builtin/worktree.c:521 #, c-format msgid "'%s' is not locked" msgstr "'%s' n'est pas verrouillé" @@ -13405,21 +13834,21 @@ msgstr "seulement utile pour le débogage" msgid "git upload-pack [<options>] <dir>" msgstr "git upload-pack [<options>] <répertoire>" -#: upload-pack.c:1028 +#: upload-pack.c:1036 msgid "quit after a single request/response exchange" msgstr "quitter après un unique échange requête/réponse" -#: upload-pack.c:1030 +#: upload-pack.c:1038 msgid "exit immediately after initial ref advertisement" msgstr "Sortir immédiatement après l'annonce initiale des références" -#: upload-pack.c:1032 +#: upload-pack.c:1040 msgid "do not try <directory>/.git/ if <directory> is no Git directory" msgstr "" "nes pas essayer <répertoire>/.git/ si <répertoire> n'est pas un répertoire " "Git" -#: upload-pack.c:1034 +#: upload-pack.c:1042 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "interrompre le transfer après <n> secondes d'inactivité" @@ -13450,14 +13879,30 @@ msgstr "" "quelques concepts. Voir 'git help <commande>' ou 'git help <concept>'\n" "pour en lire plus à propos d'une commande spécifique ou d'un concept." -#: http.c:342 +#: http.c:344 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "La délégation de commande n'est pas supporté avec cuRL < 7.22.0" -#: http.c:351 +#: http.c:353 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "L'épinglage de clé publique n'est pas supporté avec cuRL < 7.44.0" +#: http.c:1713 +#, c-format +msgid "" +"unable to update url base from redirection:\n" +" asked for: %s\n" +" redirect: %s" +msgstr "" +"impossible de mettre à jour la base de l'url depuis la redirection :\n" +" demandé : %s\n" +" redirection : %s" + +#: remote-curl.c:319 +#, c-format +msgid "redirecting to %s" +msgstr "redirection vers %s" + #: common-cmds.h:9 msgid "start a working area (see also: git help tutorial)" msgstr "démarrer une zone de travail (voir aussi : git help tutorial)" @@ -13667,7 +14112,7 @@ msgstr "Attention : bissection avec seulement une validation $TERM_BAD." #. at this point. #: git-bisect.sh:328 msgid "Are you sure [Y/n]? " -msgstr "Êtes-vous sûr [Y/n] ? " +msgstr "Confirmez-vous [Y/n] ? " #: git-bisect.sh:340 #, sh-format @@ -13835,7 +14280,7 @@ msgstr "Essai de fusion simple avec $pretty_name" msgid "Simple merge did not work, trying automatic merge." msgstr "La fusion simple a échoué, essai avec la fusion automatique." -#: git-rebase.sh:56 +#: git-rebase.sh:57 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" @@ -13847,53 +14292,39 @@ msgstr "" "Pour extraire la branche d'origine et stopper le rebasage, lancez \"git " "rebase --abort\"." -#: git-rebase.sh:156 git-rebase.sh:395 +#: git-rebase.sh:157 git-rebase.sh:396 #, sh-format msgid "Could not move back to $head_name" msgstr "Impossible de revenir à $head_name" -#: git-rebase.sh:167 -msgid "Applied autostash." -msgstr "Autoremisage appliqué." - -#: git-rebase.sh:170 +#: git-rebase.sh:171 #, sh-format msgid "Cannot store $stash_sha1" msgstr "Impossible de stocker $stash_sha1" -#: git-rebase.sh:171 -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 "" -"L'application de l'autoremisage a provoqué des conflits\n" -"Vos modifications sont à l'abri dans la remise.\n" -"Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n" - -#: git-rebase.sh:210 +#: git-rebase.sh:211 msgid "The pre-rebase hook refused to rebase." msgstr "Le crochet pre-rebase a refusé de rebaser." -#: git-rebase.sh:215 +#: git-rebase.sh:216 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "Il semble que git-am soit en cours. Impossible de rebaser." -#: git-rebase.sh:356 +#: git-rebase.sh:357 msgid "No rebase in progress?" msgstr "Pas de rebasage en cours ?" -#: git-rebase.sh:367 +#: git-rebase.sh:368 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "L'action --edit-todo peut seulement être utilisée lors d'un rebasage " "interactif." -#: git-rebase.sh:374 +#: git-rebase.sh:375 msgid "Cannot read HEAD" msgstr "Impossible de lire HEAD" -#: git-rebase.sh:377 +#: git-rebase.sh:378 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -13901,7 +14332,7 @@ msgstr "" "Vous devez éditer tous les conflits de fusion et\n" "les marquer comme résolus avec git add" -#: git-rebase.sh:414 +#: git-rebase.sh:418 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -13923,65 +14354,65 @@ msgstr "" "chose\n" "d'important ici." -#: git-rebase.sh:465 +#: git-rebase.sh:469 #, sh-format msgid "invalid upstream $upstream_name" msgstr "invalide $upstream_name en amont" -#: git-rebase.sh:489 +#: git-rebase.sh:493 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name : il y a plus d'une base de fusion" -#: git-rebase.sh:492 git-rebase.sh:496 +#: git-rebase.sh:496 git-rebase.sh:500 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name : il n'y a pas de base de fusion" -#: git-rebase.sh:501 +#: git-rebase.sh:505 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "Ne pointe pas sur une validation valide : $onto_name" -#: git-rebase.sh:524 +#: git-rebase.sh:528 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "fatal : pas de branche : $branch_name" -#: git-rebase.sh:557 +#: git-rebase.sh:561 msgid "Cannot autostash" msgstr "Autoremisage impossible" -#: git-rebase.sh:562 +#: git-rebase.sh:566 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Autoremisage créé : $stash_abbrev" -#: git-rebase.sh:566 +#: git-rebase.sh:570 msgid "Please commit or stash them." msgstr "Veuillez les valider ou les remiser." -#: git-rebase.sh:586 +#: git-rebase.sh:590 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "La branche courante $branch_name est à jour." -#: git-rebase.sh:590 +#: git-rebase.sh:594 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "La branche courante $branch_name est à jour, rebasage forcé." -#: git-rebase.sh:601 +#: git-rebase.sh:605 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Changements de $mb sur $onto :" -#: git-rebase.sh:610 +#: git-rebase.sh:614 msgid "First, rewinding head to replay your work on top of it..." msgstr "" "Premièrement, rembobinons head pour rejouer votre travail par-dessus..." -#: git-rebase.sh:620 +#: git-rebase.sh:624 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "$branch_name mise à jour en avance rapide sur $onto_name." @@ -14147,23 +14578,28 @@ msgstr "Aucune branche spécifiée" msgid "(To restore them type \"git stash apply\")" msgstr "(Pour les restaurer tapez \"git stash apply\")" -#: git-submodule.sh:184 +#: git-submodule.sh:181 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" "Un chemin relatif ne peut être utilisé que depuis la racine de la copie de " "travail" -#: git-submodule.sh:194 +#: git-submodule.sh:191 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "L'URL de dépôt '$repo' doit être absolu ou commencer par ./|../" -#: git-submodule.sh:211 +#: git-submodule.sh:210 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' existe déjà dans l'index" -#: git-submodule.sh:215 +#: git-submodule.sh:213 +#, sh-format +msgid "'$sm_path' already exists in the index and is not a submodule" +msgstr "'$sm_path' existe déjà dans l'index et n'est pas un sous-module" + +#: git-submodule.sh:218 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -14174,24 +14610,24 @@ msgstr "" "$sm_path\n" "Utilisez -f si vous voulez vraiment l'ajouter." -#: git-submodule.sh:233 +#: git-submodule.sh:236 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "Ajout du dépôt existant à '$sm_path' dans l'index" -#: git-submodule.sh:235 +#: git-submodule.sh:238 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' existe déjà et n'est pas un dépôt git valide" -#: git-submodule.sh:243 +#: git-submodule.sh:246 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" "Un répertoire git pour '$sm_name' est trouvé en local avec le(s) serveur(s) " "distant(s) :" -#: git-submodule.sh:245 +#: git-submodule.sh:248 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -14208,48 +14644,48 @@ msgstr "" "correct\n" "ou si ceci n'est pas clair, choisissez un autre nom avec l'option '--name'." -#: git-submodule.sh:251 +#: git-submodule.sh:254 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "Réactivation du répertoire git local pour le sous-module '$sm_name'." -#: git-submodule.sh:263 +#: git-submodule.sh:266 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Impossible d'extraire le sous-module '$sm_path'" -#: git-submodule.sh:268 +#: git-submodule.sh:271 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Échec d'ajout du sous-module '$sm_path'" -#: git-submodule.sh:277 +#: git-submodule.sh:280 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Échec d'enregistrement du sous-module '$sm_path'" -#: git-submodule.sh:324 +#: git-submodule.sh:327 #, sh-format msgid "Entering '$displaypath'" msgstr "Entrée dans '$displaypath'" -#: git-submodule.sh:344 +#: git-submodule.sh:347 #, sh-format msgid "Stopping at '$displaypath'; script returned non-zero status." msgstr "Arrêt sur '$displaypath' ; le script a retourné un statut non nul." -#: git-submodule.sh:415 +#: git-submodule.sh:418 #, sh-format msgid "pathspec and --all are incompatible" msgstr "un spécificateur de chemin et --all sont incompatibles" -#: git-submodule.sh:420 +#: git-submodule.sh:423 #, sh-format msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "" "Utilisez '--all' si vous voulez vraiment réinitialiser tous les sous-modules" -#: git-submodule.sh:440 +#: git-submodule.sh:443 #, sh-format msgid "" "Submodule work tree '$displaypath' contains a .git directory\n" @@ -14260,7 +14696,7 @@ msgstr "" "(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout son " "historique)" -#: git-submodule.sh:448 +#: git-submodule.sh:451 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " @@ -14269,42 +14705,42 @@ msgstr "" "La copie de travail du sous-module '$displaypath' contient des modifications " "locales ; utilisez '-f' pour les annuler" -#: git-submodule.sh:451 +#: git-submodule.sh:454 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "Répertoire '$displaypath' nettoyé" -#: git-submodule.sh:452 +#: git-submodule.sh:455 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "" "Impossible de supprimer la copie de travail du sous-module '$displaypath'" -#: git-submodule.sh:455 +#: git-submodule.sh:458 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "Impossible de créer le répertoire vide du sous-module '$displaypath'" -#: git-submodule.sh:464 +#: git-submodule.sh:467 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" "Le sous-module '$name' ($url) n'est pas enregistré pour le chemin " "'$displaypath'" -#: git-submodule.sh:617 +#: git-submodule.sh:623 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" "Impossible de trouver la révision courante dans le chemin de sous-module " "'$displaypath'" -#: git-submodule.sh:627 +#: git-submodule.sh:633 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Impossible de rapatrier dans le chemin de sous-module '$sm_path'" -#: git-submodule.sh:632 +#: git-submodule.sh:638 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -14313,12 +14749,12 @@ msgstr "" "Impossible de trouver la révision courante ${remote_name}/${branch} dans le " "chemin de sous-module '$sm_path'" -#: git-submodule.sh:650 +#: git-submodule.sh:656 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "Impossible de rapatrier dans le chemin de sous-module '$displaypath'" -#: git-submodule.sh:656 +#: git-submodule.sh:662 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -14327,88 +14763,88 @@ msgstr "" "Chemin de sous-module '$displaypath' récupéré, mais il ne contenait pas " "$sha1. La récupération directe de ce commit a échoué." -#: git-submodule.sh:663 +#: git-submodule.sh:669 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" "Impossible d'extraire '$sha1' dans le chemin de sous-module '$displaypath'" -#: git-submodule.sh:664 +#: git-submodule.sh:670 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Chemin de sous-module '$displaypath' : '$sha1' extrait" -#: git-submodule.sh:668 +#: git-submodule.sh:674 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" "Impossible de rebaser '$sha1' dans le chemin de sous-module '$displaypath'" -#: git-submodule.sh:669 +#: git-submodule.sh:675 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Chemin de sous-module '$displaypath' : rebasé dans '$sha1'" -#: git-submodule.sh:674 +#: git-submodule.sh:680 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" "Impossible de fusionner '$sha1' dans le chemin de sous-module '$displaypath'" -#: git-submodule.sh:675 +#: git-submodule.sh:681 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Chemin de sous-module '$displaypath' : fusionné dans '$sha1'" -#: git-submodule.sh:680 +#: git-submodule.sh:686 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "L'exécution de '$command $sha1' a échoué dans le chemin de sous-module " "'$displaypath'" -#: git-submodule.sh:681 +#: git-submodule.sh:687 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Chemin de sous-module '$displaypath' : '$command $sha1'" -#: git-submodule.sh:712 +#: git-submodule.sh:718 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Échec de parcours dans le chemin du sous-module '$displaypath'" -#: git-submodule.sh:820 +#: git-submodule.sh:826 msgid "The --cached option cannot be used with the --files option" msgstr "L'option --cached ne peut pas être utilisée avec l'option --files" -#: git-submodule.sh:872 +#: git-submodule.sh:878 #, sh-format msgid "unexpected mode $mod_dst" msgstr "mode $mod_dst inattendu" -#: git-submodule.sh:892 +#: git-submodule.sh:898 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Attention : $display_name ne contient pas la validation $sha1_src" -#: git-submodule.sh:895 +#: git-submodule.sh:901 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Attention : $display_name ne contient pas la validation $sha1_dst" -#: git-submodule.sh:898 +#: git-submodule.sh:904 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" " Attention : $display_name ne contient pas les validations $sha1_src et " "$sha1_dst" -#: git-submodule.sh:1045 +#: git-submodule.sh:1051 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "Échec de parcours dans le chemin du sous-module '$sm_path'" -#: git-submodule.sh:1112 +#: git-submodule.sh:1118 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Synchronisation de l'URL sous-module pour '$displaypath'" @@ -14418,12 +14854,12 @@ msgstr "Synchronisation de l'URL sous-module pour '$displaypath'" msgid "See git-${cmd}(1) for details." msgstr "Référez-vous à git-${cmd}(1) pour de plus amples détails." -#: git-rebase--interactive.sh:131 +#: git-rebase--interactive.sh:140 #, sh-format msgid "Rebasing ($new_count/$total)" msgstr "Rebasage ($new_count/$total)" -#: git-rebase--interactive.sh:147 +#: git-rebase--interactive.sh:156 msgid "" "\n" "Commands:\n" @@ -14449,7 +14885,7 @@ msgstr "" "\n" "Vous pouvez réordonner ces lignes ; elles sont exécutées de haut en bas.\n" -#: git-rebase--interactive.sh:162 +#: git-rebase--interactive.sh:171 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -14458,7 +14894,7 @@ msgstr "" "Ne supprimez aucune ligne. Utilisez 'drop' explicitement pour supprimer un " "commit.\n" -#: git-rebase--interactive.sh:166 +#: git-rebase--interactive.sh:175 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -14466,7 +14902,7 @@ msgstr "" "\n" "Si vous éliminez une ligne ici, LE COMMIT CORRESPONDANT SERA PERDU.\n" -#: git-rebase--interactive.sh:202 +#: git-rebase--interactive.sh:211 #, sh-format msgid "" "You can amend the commit now, with\n" @@ -14485,87 +14921,83 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--interactive.sh:227 +#: git-rebase--interactive.sh:236 #, sh-format msgid "$sha1: not a commit that can be picked" msgstr "$sha1 n'est pas un commit qui peut être picorer" -#: git-rebase--interactive.sh:266 +#: git-rebase--interactive.sh:275 #, sh-format msgid "Invalid commit name: $sha1" msgstr "Nom de commit invalide : $sha1" -#: git-rebase--interactive.sh:308 +#: git-rebase--interactive.sh:317 msgid "Cannot write current commit's replacement sha1" msgstr "Impossible de sauver le sha1 du remplaçant du commit en cours" -#: git-rebase--interactive.sh:360 +#: git-rebase--interactive.sh:369 #, sh-format msgid "Fast-forward to $sha1" msgstr "Avance rapide sur $sha1" -#: git-rebase--interactive.sh:362 +#: git-rebase--interactive.sh:371 #, sh-format msgid "Cannot fast-forward to $sha1" msgstr "Avance rapide impossible sur $sha1" -#: git-rebase--interactive.sh:371 +#: git-rebase--interactive.sh:380 #, sh-format msgid "Cannot move HEAD to $first_parent" msgstr "Impossible de déplacer HEAD sur $first_parent" -#: git-rebase--interactive.sh:376 +#: git-rebase--interactive.sh:385 #, sh-format msgid "Refusing to squash a merge: $sha1" msgstr "Refus d'écraser un commit de fusion: $sha1" -#: git-rebase--interactive.sh:390 +#: git-rebase--interactive.sh:399 #, sh-format msgid "Error redoing merge $sha1" msgstr "Erreur lors de la réapplication de la fusion $sha1" -#: git-rebase--interactive.sh:398 +#: git-rebase--interactive.sh:407 #, sh-format msgid "Could not pick $sha1" msgstr "Impossible de picorer $sha1" -#: git-rebase--interactive.sh:407 +#: git-rebase--interactive.sh:416 #, sh-format msgid "This is the commit message #${n}:" msgstr "Ceci est le ${n}ième message de validation :" -#: git-rebase--interactive.sh:412 +#: git-rebase--interactive.sh:421 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "Le message de validation ${n} sera ignoré :" -#: git-rebase--interactive.sh:423 +#: git-rebase--interactive.sh:432 #, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." msgstr[0] "Ceci est la combinaison de $count commit." msgstr[1] "Ceci est la combinaison de $count commits." -#: git-rebase--interactive.sh:431 +#: git-rebase--interactive.sh:441 #, sh-format msgid "Cannot write $fixup_msg" msgstr "Impossible d'écrire $fixup_msg" -#: git-rebase--interactive.sh:434 +#: git-rebase--interactive.sh:444 msgid "This is a combination of 2 commits." msgstr "Ceci est la combinaison de 2 commits." -#: git-rebase--interactive.sh:435 -msgid "This is the 1st commit message:" -msgstr "Ceci est le premier message de validation :" - -#: git-rebase--interactive.sh:475 git-rebase--interactive.sh:518 -#: git-rebase--interactive.sh:521 +#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528 +#: git-rebase--interactive.sh:531 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "Impossible d'appliquer $sha1... $rest" -#: git-rebase--interactive.sh:549 +#: git-rebase--interactive.sh:559 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -14582,31 +15014,31 @@ msgstr "" "le\n" "problème avant de pouvoir reformuler le message du commit." -#: git-rebase--interactive.sh:564 +#: git-rebase--interactive.sh:574 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "Arrêté à $sha1_abbrev... $rest" -#: git-rebase--interactive.sh:579 +#: git-rebase--interactive.sh:589 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "'$squash_style' impossible avec le commit précédent" -#: git-rebase--interactive.sh:621 +#: git-rebase--interactive.sh:631 #, sh-format msgid "Executing: $rest" msgstr "Exécution : $rest" -#: git-rebase--interactive.sh:629 +#: git-rebase--interactive.sh:639 #, sh-format msgid "Execution failed: $rest" msgstr "L'exécution a échoué : $rest" -#: git-rebase--interactive.sh:631 +#: git-rebase--interactive.sh:641 msgid "and made changes to the index and/or the working tree" msgstr "et a mis à jour l'index ou la copie de travail" -#: git-rebase--interactive.sh:633 +#: git-rebase--interactive.sh:643 msgid "" "You can fix the problem, and then run\n" "\n" @@ -14617,7 +15049,7 @@ msgstr "" "git rebase --continue" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--interactive.sh:646 +#: git-rebase--interactive.sh:656 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -14632,25 +15064,25 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--interactive.sh:657 +#: git-rebase--interactive.sh:667 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "Commande inconnue : $command $sha1 $rest" -#: git-rebase--interactive.sh:658 +#: git-rebase--interactive.sh:668 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "Veuillez corriger ceci en utilisant 'git rebase --edit-todo'." -#: git-rebase--interactive.sh:693 +#: git-rebase--interactive.sh:703 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "Rebasage et mise à jour de $head_name avec succès." -#: git-rebase--interactive.sh:740 +#: git-rebase--interactive.sh:750 msgid "Could not skip unnecessary pick commands" msgstr "Impossible d'éviter les commandes de picorage non nécessaires" -#: git-rebase--interactive.sh:898 +#: git-rebase--interactive.sh:908 #, sh-format msgid "" "Warning: the SHA-1 is missing or isn't a commit in the following line:\n" @@ -14659,7 +15091,7 @@ msgstr "" "Attention : le SHA-1 manque ou n'est pas un commit dans la ligne suivante :\n" " - $line" -#: git-rebase--interactive.sh:931 +#: git-rebase--interactive.sh:941 #, sh-format msgid "" "Warning: the command isn't recognized in the following line:\n" @@ -14668,11 +15100,11 @@ msgstr "" "Attention : la commande n'est pas reconnue dans le ligne suivante :\n" " - $line" -#: git-rebase--interactive.sh:970 +#: git-rebase--interactive.sh:980 msgid "could not detach HEAD" msgstr "Impossible de détacher HEAD" -#: git-rebase--interactive.sh:1008 +#: git-rebase--interactive.sh:1018 msgid "" "Warning: some commits may have been dropped accidentally.\n" "Dropped commits (newer to older):" @@ -14680,7 +15112,7 @@ msgstr "" "Attention : certains commits ont pu être accidentellement supprimés.\n" "Commits supprimés (du plus jeune au plus vieux) :" -#: git-rebase--interactive.sh:1016 +#: git-rebase--interactive.sh:1026 msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" "\n" @@ -14695,7 +15127,7 @@ msgstr "" "d'avertissements.\n" "Les comportements disponibles sont : ignore, warn, error." -#: git-rebase--interactive.sh:1027 +#: git-rebase--interactive.sh:1037 #, sh-format msgid "" "Unrecognized setting $check_level for option rebase.missingCommitsCheck. " @@ -14704,7 +15136,7 @@ msgstr "" "Paramètre non reconnu $check_level pour l'option rebase.missingCommitsCheck. " "Ignoré." -#: git-rebase--interactive.sh:1044 +#: git-rebase--interactive.sh:1054 msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" "continue'." @@ -14712,15 +15144,15 @@ msgstr "" "Vous pouvez corriger ceci avec 'git rebase --edit-todo' puis lancez 'git " "rebase --continue'." -#: git-rebase--interactive.sh:1045 +#: git-rebase--interactive.sh:1055 msgid "Or you can abort the rebase with 'git rebase --abort'." msgstr "Ou bien vous pouvez abandonner le rebasage avec 'git rebase --abort'." -#: git-rebase--interactive.sh:1069 +#: git-rebase--interactive.sh:1079 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "Impossible de supprimer CHERRY_PICK_HEAD" -#: git-rebase--interactive.sh:1074 +#: git-rebase--interactive.sh:1084 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -14751,12 +15183,12 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--interactive.sh:1091 +#: git-rebase--interactive.sh:1101 msgid "Error trying to find the author identity to amend commit" msgstr "" "Erreur lors de la recherche de l'identité de l'auteur pour corriger le commit" -#: git-rebase--interactive.sh:1096 +#: git-rebase--interactive.sh:1106 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -14764,11 +15196,11 @@ msgstr "" "Vous avez des modifications non validées dans votre copie de travail.\n" "Veuillez les valider d'abord, puis relancer 'git rebase --continue'." -#: git-rebase--interactive.sh:1101 git-rebase--interactive.sh:1105 +#: git-rebase--interactive.sh:1111 git-rebase--interactive.sh:1115 msgid "Could not commit staged changes." msgstr "impossible de valider les modifications indexées." -#: git-rebase--interactive.sh:1129 +#: git-rebase--interactive.sh:1139 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -14783,40 +15215,40 @@ msgstr "" " git rebase --continue\n" "\n" -#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1295 +#: git-rebase--interactive.sh:1147 git-rebase--interactive.sh:1305 msgid "Could not execute editor" msgstr "Impossible de lancer l'éditeur" -#: git-rebase--interactive.sh:1150 +#: git-rebase--interactive.sh:1160 #, sh-format msgid "Could not checkout $switch_to" msgstr "Impossible d'extraire $switch_to" -#: git-rebase--interactive.sh:1155 +#: git-rebase--interactive.sh:1165 msgid "No HEAD?" msgstr "Pas de HEAD ?" -#: git-rebase--interactive.sh:1156 +#: git-rebase--interactive.sh:1166 #, sh-format msgid "Could not create temporary $state_dir" msgstr "Impossible de créer un répertoire temporaire $state_dir" -#: git-rebase--interactive.sh:1158 +#: git-rebase--interactive.sh:1168 msgid "Could not mark as interactive" msgstr "Impossible de marquer comme interactif" -#: git-rebase--interactive.sh:1168 git-rebase--interactive.sh:1173 +#: git-rebase--interactive.sh:1178 git-rebase--interactive.sh:1183 msgid "Could not init rewritten commits" msgstr "Impossible d'initialiser les commits réécrits" -#: git-rebase--interactive.sh:1273 +#: git-rebase--interactive.sh:1283 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "Rebasage de $shortrevisions sur $shortonto ($todocount commande)" msgstr[1] "Rebasage de $shortrevisions sur $shortonto ($todocount commandes)" -#: git-rebase--interactive.sh:1278 +#: git-rebase--interactive.sh:1288 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -14826,7 +15258,7 @@ msgstr "" "Cependant, si vous effacez tout, le rebasage sera annulé.\n" "\n" -#: git-rebase--interactive.sh:1285 +#: git-rebase--interactive.sh:1295 msgid "Note that empty commits are commented out" msgstr "Veuillez noter que les commits vides sont en commentaire" @@ -14897,6 +15329,894 @@ msgstr "" msgid "Unable to determine absolute path of git directory" msgstr "Impossible de déterminer le chemin absolu du répertoire git" +#. TRANSLATORS: you can adjust this to align "git add -i" status menu +#: git-add--interactive.perl:238 +#, perl-format +msgid "%12s %12s %s" +msgstr "%12s %s12s %s" + +#: git-add--interactive.perl:239 +msgid "staged" +msgstr "indexé" + +#: git-add--interactive.perl:239 +msgid "unstaged" +msgstr "non-indexé" + +#: git-add--interactive.perl:297 git-add--interactive.perl:322 +msgid "binary" +msgstr "binaire" + +#: git-add--interactive.perl:306 git-add--interactive.perl:360 +msgid "nothing" +msgstr "rien" + +#: git-add--interactive.perl:342 git-add--interactive.perl:357 +msgid "unchanged" +msgstr "inchangé" + +#: git-add--interactive.perl:653 +#, perl-format +msgid "added %d path\n" +msgid_plural "added %d paths\n" +msgstr[0] "%d chemin ajouté\n" +msgstr[1] "%d chemins ajoutés\n" + +#: git-add--interactive.perl:656 +#, perl-format +msgid "updated %d path\n" +msgid_plural "updated %d paths\n" +msgstr[0] "%d chemin mis à jour\n" +msgstr[1] "%d chemins mis à jour\n" + +#: git-add--interactive.perl:659 +#, perl-format +msgid "reverted %d path\n" +msgid_plural "reverted %d paths\n" +msgstr[0] "%d chemin inversé\n" +msgstr[1] "%d chemins inversés\n" + +#: git-add--interactive.perl:662 +#, perl-format +msgid "touched %d path\n" +msgid_plural "touched %d paths\n" +msgstr[0] "%d chemin touché\n" +msgstr[1] "%d chemins touchés\n" + +#: git-add--interactive.perl:671 +msgid "Update" +msgstr "Mise à jour" + +#: git-add--interactive.perl:683 +msgid "Revert" +msgstr "Inverser" + +#: git-add--interactive.perl:706 +#, perl-format +msgid "note: %s is untracked now.\n" +msgstr "note : %s n'est plus suivi à présent.\n" + +#: git-add--interactive.perl:717 +msgid "Add untracked" +msgstr "Ajouter un fichier non-suivi" + +#: git-add--interactive.perl:723 +msgid "No untracked files.\n" +msgstr "Aucun Fichier non suivi.\n" + +#: git-add--interactive.perl:1039 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for staging." +msgstr "" +"Si le patch s'applique proprement, la section éditée sera\n" +"immédiatement marquée comme indexée." + +#: git-add--interactive.perl:1042 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for stashing." +msgstr "" +"Si le patch s'applique proprement, la section éditée sera\n" +"immédiatement marquée comme remisée." + +#: git-add--interactive.perl:1045 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for unstaging." +msgstr "" +"Si le patch s'applique proprement, la section éditée sera\n" +"immédiatement marquée comme desindexée." + +#: git-add--interactive.perl:1048 git-add--interactive.perl:1057 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for applying." +msgstr "" +"Si le patch s'applique proprement, la section éditée sera\n" +"immediatement marquée comme appliquée." + +#: git-add--interactive.perl:1051 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for discarding" +msgstr "" +"Si le patch s'applique proprement, la section éditée sera\n" +"immediatement marquée comme éliminée" + +#: git-add--interactive.perl:1054 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for discarding." +msgstr "" +"Si le patch s'applique proprement, la section éditée sera\n" +"immediatement marquée comme éliminée." + +#: git-add--interactive.perl:1067 +#, perl-format +msgid "failed to open hunk edit file for writing: %s" +msgstr "impossible d'ouvrir le fichier d'édition de section en écriture : %s" + +#: git-add--interactive.perl:1068 +msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" +msgstr "Mode d'édition manuelle de section -- voir ci-dessous pour un guide rapide.\n" + +#: git-add--interactive.perl:1074 +#, 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" +"Pour éliminer les lignes '%s', rendez-les ' ' (contexte).\n" +"Pour éliminer les lignes '%s', effacez-les.\n" +"Les lignes commençant par %s seront éliminées.\n" + +#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. +#: git-add--interactive.perl:1082 +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 ça ne s'applique pas proprement, vous aurez la possibilité de\n" +"l'éditer à nouveau. Si toutes les lignes de la section sont supprimées,\n" +"alors l'édition sera abandonnée et la section conservée.\n" + +#: git-add--interactive.perl:1096 +#, perl-format +msgid "failed to open hunk edit file for reading: %s" +msgstr "échec de l'ouverture du fichier d'édition de section en lecture : %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:1187 +msgid "" +"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +msgstr "Votre section éditée ne s'applique pas. L'éditer à nouveau (\"no\" l'élimine !) [y|n] ? " + +#: git-add--interactive.perl:1196 +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 - indexer cette section\n" +"n - ne pas indexer cette section\n" +"q - quitter ; ne pas indexer cette section ni les autres restantes\n" +"a - indexer cette section et toutes les suivantes de ce fichier\n" +"d - ne pas indexer cette section ni les suivantes de ce fichier" + +#: git-add--interactive.perl:1202 +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 - remiser cette section\n" +"n - ne pas remiser cette section\n" +"q - quitter ; ne pas remiser cette section ni les autres restantes\n" +"a - remiser cette section et toutes les suivantes de ce fichier\n" +"d - ne pas remiser cette section ni les suivantes de ce fichier" + +#: git-add--interactive.perl:1208 +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 - désindexer cette section\n" +"n - ne pas désindexer cette section\n" +"q - quitter ; ne pas désindexer cette section ni les autres restantes\n" +"a - désindexer cette section et toutes les suivantes de ce fichier\n" +"d - ne pas désindexer cette section ni les suivantes de ce fichier" + +#: git-add--interactive.perl:1214 +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 - appliquer cette section\n" +"n - ne pas appliquer cette section\n" +"q - quitter ; ne pas appliquer cette section ni les autres restantes\n" +"a - appliquer cette section et toutes les suivantes de ce fichier\n" +"d - ne pas appliquer cette section ni les suivantes de ce fichier" + +#: git-add--interactive.perl:1220 +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 - supprimer cette section\n" +"n - ne pas supprimer cette section\n" +"q - quitter ; ne pas supprimer cette section ni les autres restantes\n" +"a - supprimer cette section et toutes les suivantes de ce fichier\n" +"d - ne pas supprimer cette section ni les suivantes de ce fichier" + +#: git-add--interactive.perl:1226 +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 - éliminer cette section de l'index et de l'arbre de travail\n" +"n - ne pas éliminer cette section\n" +"q - quitter ; ne pas éliminer cette section ni les autres restantes\n" +"a - éliminer cette section et toutes les suivantes de ce fichier\n" +"d - ne pas éliminer cette section ni les suivantes de ce fichier" + +#: git-add--interactive.perl:1232 +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 - appliquer cette section à l'index et à l'arbre de travail\n" +"n - ne pas appliquer cette section\n" +"q - quitter ; ne pas appliquer cette section ni les autres restantes\n" +"a - appliquer cette section et toutes les suivantes de ce fichier\n" +"d - ne pas appliquer cette section ni les suivantes de ce fichier" + +#: git-add--interactive.perl:1241 +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 - selectionner une section et s'y rendre\n" +"/ - rechercher une section correspondant à une regex donnée\n" +"j - laisser cette section non décidée et aller à la suivante non-décidée\n" +"J - laisser cette section non décidée et aller à la suivante\n" +"k - laisser cette section non décidée et aller à la précédente non-décidée\n" +"K - laisser cette section non décidée et aller à la précédente\n" +"s - découper la section en sections plus petites\n" +"e - éditer manuellement la section actuelle\n" +"? - afficher l'aide\n" + +#: git-add--interactive.perl:1272 +msgid "The selected hunks do not apply to the index!\n" +msgstr "Les sections sélectionnées ne s'applique pas à l'index !\n" + +#: git-add--interactive.perl:1273 +msgid "Apply them to the worktree anyway? " +msgstr "Les appliquer quand même à l'arbre de travail ? " + +#: git-add--interactive.perl:1276 +msgid "Nothing was applied.\n" +msgstr "Rien n'a été appliqué.\n" + +#: git-add--interactive.perl:1287 +#, perl-format +msgid "ignoring unmerged: %s\n" +msgstr "fichier non-fusionné ignoré : %s\n" + +#: git-add--interactive.perl:1296 +msgid "Only binary files changed.\n" +msgstr "Seuls des fichiers binaires ont changé.\n" + +#: git-add--interactive.perl:1298 +msgid "No changes.\n" +msgstr "Aucune modification.\n" + +#: git-add--interactive.perl:1306 +msgid "Patch update" +msgstr "Mise à jour par patch" + +#: git-add--interactive.perl:1358 +#, perl-format +msgid "Stage mode change [y,n,q,a,d,/%s,?]? " +msgstr "Indexer le changement de mode [y,n,q,a,d,/%s,?] ? " + +#: git-add--interactive.perl:1359 +#, perl-format +msgid "Stage deletion [y,n,q,a,d,/%s,?]? " +msgstr "Indexer la suppression [y,n,q,a,d,/%s,?] ? " + +#: git-add--interactive.perl:1360 +#, perl-format +msgid "Stage this hunk [y,n,q,a,d,/%s,?]? " +msgstr "Indexer cette section [y,n,q,a,d,/%s,?] ? " + +#: git-add--interactive.perl:1363 +#, perl-format +msgid "Stash mode change [y,n,q,a,d,/%s,?]? " +msgstr "Remiser le changement de mode [y,n,q,a,d,/%s,?] ? " + +#: git-add--interactive.perl:1364 +#, perl-format +msgid "Stash deletion [y,n,q,a,d,/%s,?]? " +msgstr "Remiser la suppression [y,n,q,a,d,/%s,?] ? " + +#: git-add--interactive.perl:1365 +#, perl-format +msgid "Stash this hunk [y,n,q,a,d,/%s,?]? " +msgstr "Remiser cette section [y,n,q,a,d,/%s,?] ? " + +#: git-add--interactive.perl:1368 +#, perl-format +msgid "Unstage mode change [y,n,q,a,d,/%s,?]? " +msgstr "Désindexer le changement de mode [y,n,q,a,d,/%s,?] ? " + +#: git-add--interactive.perl:1369 +#, perl-format +msgid "Unstage deletion [y,n,q,a,d,/%s,?]? " +msgstr "Désindexer la suppression [y,n,q,a,d,/%s,?] ? " + +#: git-add--interactive.perl:1370 +#, perl-format +msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? " +msgstr "Désindexer cette section [y,n,q,a,d,/%s,?] ? " + +#: git-add--interactive.perl:1373 +#, perl-format +msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? " +msgstr "Appliquer le changement de mode à l'index [y,n,q,a,d,/%s,?] ? " + +#: git-add--interactive.perl:1374 +#, perl-format +msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? " +msgstr "Appliquer la suppression à l'index [y,n,q,a,d,/%s,?] ? " + +#: git-add--interactive.perl:1375 +#, perl-format +msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? " +msgstr "Appliquer cette section à l'index [y,n,q,a,d,/%s,?] ? " + +#: git-add--interactive.perl:1378 +#, perl-format +msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? " +msgstr "Abandonner le changement de mode dans l'arbre [y,n,q,a,d,/%s,?] ? " + +#: git-add--interactive.perl:1379 +#, perl-format +msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? " +msgstr "Abandonner la suppression dans l'arbre [y,n,q,a,d,/%s,?] ? " + +#: git-add--interactive.perl:1380 +#, perl-format +msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? " +msgstr "Abandonner cette section dans l'arbre [y,n,q,a,d,/%s,?] ? " + +#: git-add--interactive.perl:1383 +#, perl-format +msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "Abandonner le changement de mode dans l'index et l'arbre [y,n,q,a,d,/%s,?] ? " + +#: git-add--interactive.perl:1384 +#, perl-format +msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "Abandonner la suppression de l'index et de l'arbre [y,n,q,a,d,/%s,?] ? " + +#: git-add--interactive.perl:1385 +#, perl-format +msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "Supprimer la section dans l'index et l'arbre de travail [y,n,q,a,d,/%s,?] ? " + +#: git-add--interactive.perl:1388 +#, perl-format +msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "Appliquer le changement de mode dans l'index et l'arbre de travail [y,n,q,a,d,/%s,?] ? " + +#: git-add--interactive.perl:1389 +#, perl-format +msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "Appliquer la suppression dans l'index et l'arbre de travail [y,n,q,a,d,/%s,?] ? " + +#: git-add--interactive.perl:1390 +#, perl-format +msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "Appliquer la section à l'index et l'arbre de travail [y,n,q,a,d,/%s,?] ? " + +#: git-add--interactive.perl:1493 +msgid "go to which hunk (<ret> to see more)? " +msgstr "aller à quelle section (<ret> pour voir plus) ? " + +#: git-add--interactive.perl:1495 +msgid "go to which hunk? " +msgstr "aller à quelle section ? " + +#: git-add--interactive.perl:1504 +#, perl-format +msgid "Invalid number: '%s'\n" +msgstr "Nombre invalide : '%s'\n" + +#: git-add--interactive.perl:1509 +#, perl-format +msgid "Sorry, only %d hunk available.\n" +msgid_plural "Sorry, only %d hunks available.\n" +msgstr[0] "Désolé, %d seule section disponible.\n" +msgstr[1] "Désolé, Seulement %d sections disponibles.\n" + +#: git-add--interactive.perl:1535 +msgid "search for regex? " +msgstr "rechercher la regex ? " + +#: git-add--interactive.perl:1548 +#, perl-format +msgid "Malformed search regexp %s: %s\n" +msgstr "Regex de recherche malformée %s : %s\n" + +#: git-add--interactive.perl:1558 +msgid "No hunk matches the given pattern\n" +msgstr "Aucune section ne correspond au motif donné\n" + +#: git-add--interactive.perl:1570 git-add--interactive.perl:1592 +msgid "No previous hunk\n" +msgstr "Pas de section précédente\n" + +#: git-add--interactive.perl:1579 git-add--interactive.perl:1598 +msgid "No next hunk\n" +msgstr "Pas de section suivante\n" + +#: git-add--interactive.perl:1606 +#, perl-format +msgid "Split into %d hunk.\n" +msgid_plural "Split into %d hunks.\n" +msgstr[0] "Découpée en %d section.\n" +msgstr[1] "Découpée en %d sections.\n" + +#: git-add--interactive.perl:1658 +msgid "Review diff" +msgstr "Réviser la différence" + +#. TRANSLATORS: please do not translate the command names +#. 'status', 'update', 'revert', etc. +#: git-add--interactive.perl:1677 +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\t - view diff between HEAD and index\n" +"add untracked - add contents of untracked files to the staged set of " +"changes\n" +msgstr "" +"status - montrer les chemins modifiés\n" +"update - ajouter l'état de l'arbre de travail aux modifications à indexer\n" +"revert - faire revenir les modifications à indexer à la version HEAD\n" +"patch - sélectionner les sections et mettre à jour sélectivement\n" +"diff\t - visualiser les diff entre HEAD et l'index\n" +"add untracked - Ajouter les fichiers non-suivis aux modifications à indexer\n" + +#: git-add--interactive.perl:1694 git-add--interactive.perl:1699 +#: git-add--interactive.perl:1702 git-add--interactive.perl:1709 +#: git-add--interactive.perl:1713 git-add--interactive.perl:1719 +msgid "missing --" +msgstr "-- manquant" + +#: git-add--interactive.perl:1715 +#, perl-format +msgid "unknown --patch mode: %s" +msgstr "mode de --patch inconnu : %s" + +#: git-add--interactive.perl:1721 git-add--interactive.perl:1727 +#, perl-format +msgid "invalid argument %s, expecting --" +msgstr "argument invalide %s, -- attendu" + +#: git-send-email.perl:121 +msgid "local zone differs from GMT by a non-minute interval\n" +msgstr "la zone locale diffère du GMT par un interval supérieur à une minute\n" + +#: git-send-email.perl:128 git-send-email.perl:134 +msgid "local time offset greater than or equal to 24 hours\n" +msgstr "le décalage de temps local est plus grand ou égal à 24 heures\n" + +#: git-send-email.perl:202 git-send-email.perl:208 +msgid "the editor exited uncleanly, aborting everything" +msgstr "l'éditeur est sorti en erreur, abandon total" + +#: git-send-email.perl:282 +#, perl-format +msgid "" +"'%s' contains an intermediate version of the email you were composing.\n" +msgstr "'%s' contient une version intermédiaire du courriel que vous composiez.\n" + +#: git-send-email.perl:287 +#, perl-format +msgid "'%s.final' contains the composed email.\n" +msgstr "'%s.final' contient le courriel composé.\n" + +#: git-send-email.perl:305 +msgid "--dump-aliases incompatible with other options\n" +msgstr "--dump-aliases est incompatible avec d'autres options\n" + +#: git-send-email.perl:368 git-send-email.perl:623 +msgid "Cannot run git format-patch from outside a repository\n" +msgstr "Lancement de git format-patch impossible à l'extérieur d'un dépôt\n" + +#: git-send-email.perl:437 +#, perl-format +msgid "Unknown --suppress-cc field: '%s'\n" +msgstr "Champ de --suppress-cc inconnu : '%s'\n" + +#: git-send-email.perl:466 +#, perl-format +msgid "Unknown --confirm setting: '%s'\n" +msgstr "Paramètre de --confirm inconnu : '%s'\n" + +#: git-send-email.perl:498 +#, perl-format +msgid "warning: sendmail alias with quotes is not supported: %s\n" +msgstr "attention : les guillemets ne sont pas supportés dans alias sendmail : %s\n" + +#: git-send-email.perl:500 +#, perl-format +msgid "warning: `:include:` not supported: %s\n" +msgstr "attention : `:include:` n'est pas supporté : %s\n" + +#: git-send-email.perl:502 +#, perl-format +msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" +msgstr "attention : les redirections `/file` ou `|pipe` ne sont pas supportées : %s\n" + +#: git-send-email.perl:507 +#, perl-format +msgid "warning: sendmail line is not recognized: %s\n" +msgstr "attention : ligne sendmail non reconnue : %s\n" + +#: git-send-email.perl:589 +#, 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 "" +"Le fichier '%s' existe mais ce pourrait aussi être la plage de commmits\n" +"pour lequel les patches sont à produire. Veuillez préciser...\n" +"\n" +" * en indiquant \"./%s\" si vous désignez un fichier, ou\n" +" * en fournissant l'option --format-patch pour une plage.\n" + +#: git-send-email.perl:610 +#, perl-format +msgid "Failed to opendir %s: %s" +msgstr "Échec à l'ouverture du répertoire %s : %s" + +#: git-send-email.perl:634 +#, perl-format +msgid "" +"fatal: %s: %s\n" +"warning: no patches were sent\n" +msgstr "" +"fatal : %s : %s\n" +"attention : aucun patch envoyé\n" + +#: git-send-email.perl:645 +msgid "" +"\n" +"No patch files specified!\n" +"\n" +msgstr "\nAucun fichier patch spécifié !\n\n" + +#: git-send-email.perl:658 +#, perl-format +msgid "No subject line in %s?" +msgstr "Ligne de sujet non trouvée dans %s ?" + +#: git-send-email.perl:668 +#, perl-format +msgid "Failed to open for writing %s: %s" +msgstr "Impossible d'ouvrir %s en écriture : %s" + +#: git-send-email.perl:678 +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 "" +"Les lignes commençant par \"GIT:\" seront supprimées.\n" +"Envisagez d'inclure un diffstat global ou une table des matières\n" +"pour le patch que vous êtes en train d'écrire.\n" +"\n" +"Effacez le corps si vous ne souhaitez pas envoyer un résumé.\n" + +#: git-send-email.perl:701 +#, perl-format +msgid "Failed to open %s.final: %s" +msgstr "Échec à l'ouverture de %s.final : %s" + +#: git-send-email.perl:704 +#, perl-format +msgid "Failed to open %s: %s" +msgstr "Échec à l'ouverture de %s : %s" + +#: git-send-email.perl:739 +msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n" +msgstr "Les champs To/CC/Bcc ne sont pas encore interprétés, ils ont été ignorés\n" + +#: git-send-email.perl:748 +msgid "Summary email is empty, skipping it\n" +msgstr "Le courriel de résumé etant vide, il a été ignoré\n" + +#. TRANSLATORS: please keep [y/N] as is. +#: git-send-email.perl:780 +#, perl-format +msgid "Are you sure you want to use <%s> [y/N]? " +msgstr "Êtes-vous sur de vouloir utiliser <%s> [y/N] ? " + +#: git-send-email.perl:809 +msgid "" +"The following files are 8bit, but do not declare a Content-Transfer-" +"Encoding.\n" +msgstr "Les fichiers suivants sont 8bit mais ne déclarent pas de champs Content-Transfer-Encoding.\n" + +#: git-send-email.perl:814 +msgid "Which 8bit encoding should I declare [UTF-8]? " +msgstr "Quel encodage 8bit doit être déclaré [UTF8] ? " + +#: git-send-email.perl:822 +#, 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 "" +"Envoi refusé parce que le patch\n" +"\t%s\n" +"a un sujet modèle '*** SUBJECT HERE ***'. Passez --force is vous souhaitez vraiment envoyer.\n" + +#: git-send-email.perl:841 +msgid "To whom should the emails be sent (if anyone)?" +msgstr "À qui les courriels doivent-ils être envoyés (s'il y en a) ?" + +#: git-send-email.perl:859 +#, perl-format +msgid "fatal: alias '%s' expands to itself\n" +msgstr "fatal : l'alias '%s' se développe en lui-même\n" + +#: git-send-email.perl:871 +msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " +msgstr "Message-ID à utiliser comme In-Reply-to pour le premier courriel (s'il y en a) ? " + +#: git-send-email.perl:921 git-send-email.perl:929 +#, perl-format +msgid "error: unable to extract a valid address from: %s\n" +msgstr "erreur : impossible d'extraire une adresse valide depuis : %s\n" + +#. TRANSLATORS: Make sure to include [q] [d] [e] in your +#. translation. The program will only accept English input +#. at this point. +#: git-send-email.perl:933 +msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " +msgstr "Que faire de cette adresse ? ([q]uitter|[d]élaisser|[e]diter): " + +#: git-send-email.perl:1234 +#, perl-format +msgid "CA path \"%s\" does not exist" +msgstr "le chemin vers la CA \"%s\" n'existe pas" + +#: git-send-email.perl:1309 +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 liste CC ci-dessus a été étendue avec des adresses\n" +" supplémentaires trouvées dans le message de validation.\n" +" Par défaut dans ce cas, send-email demande confirmation avant envoi.\n" +" Ce comportement est géré par le paramètre de configuration\n" +" sendemail.confirm.\n" +"\n" +" Pour tout information complémentaire, lancez 'git send-email --help'.\n" +" Pour conserver le comportement actuel, mais éliminer ce message,\n" +" lancez '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:1324 +msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): " +msgstr "Envoyer ce courriel ? ([y]es|[n]o|[q]uit|[a]ll) : " + +#: git-send-email.perl:1327 +msgid "Send this email reply required" +msgstr "Une réponse est nécessaire" + +#: git-send-email.perl:1353 +msgid "The required SMTP server is not properly defined." +msgstr "Le serveur SMTP nécessaire n'est pas défini correctement." + +#: git-send-email.perl:1397 +#, perl-format +msgid "Server does not support STARTTLS! %s" +msgstr "Le serveur ne supporte pas STARTTLS ! %s" + +#: git-send-email.perl:1403 +msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." +msgstr "Impossible d'initialiser SMTP. Vérifiez la configuration et utilisez --smtp-debug." + +#: git-send-email.perl:1421 +#, perl-format +msgid "Failed to send %s\n" +msgstr "échec de l'envoi de %s\n" + +#: git-send-email.perl:1424 +#, perl-format +msgid "Dry-Sent %s\n" +msgstr "Envoi simulé de %s\n" + +#: git-send-email.perl:1424 +#, perl-format +msgid "Sent %s\n" +msgstr "%s envoyé\n" + +#: git-send-email.perl:1426 +msgid "Dry-OK. Log says:\n" +msgstr "Simulation OK. Le journal indique :\n" + +#: git-send-email.perl:1426 +msgid "OK. Log says:\n" +msgstr "OK. Le journal indique :\n" + +#: git-send-email.perl:1438 +msgid "Result: " +msgstr "Résultat : " + +#: git-send-email.perl:1441 +msgid "Result: OK\n" +msgstr "Résultat : OK\n" + +#: git-send-email.perl:1454 +#, perl-format +msgid "can't open file %s" +msgstr "impossible d'ouvrir le fichier %s" + +#: git-send-email.perl:1501 git-send-email.perl:1521 +#, perl-format +msgid "(mbox) Adding cc: %s from line '%s'\n" +msgstr "(mbox) Ajout de cc: %s depuis la ligne '%s'\n" + +#: git-send-email.perl:1507 +#, perl-format +msgid "(mbox) Adding to: %s from line '%s'\n" +msgstr "(mbox) Ajout de to: %s depuis la ligne '%s'\n" + +#: git-send-email.perl:1555 +#, perl-format +msgid "(non-mbox) Adding cc: %s from line '%s'\n" +msgstr "(non-mbox) Ajout de cc: %s depuis la ligne '%s'\n" + +#: git-send-email.perl:1578 +#, perl-format +msgid "(body) Adding cc: %s from line '%s'\n" +msgstr "(corps) Ajout de cc: %s depuis la ligne '%s'\n" + +#: git-send-email.perl:1676 +#, perl-format +msgid "(%s) Could not execute '%s'" +msgstr "(%s) Impossible d'exécuter '%s'" + +#: git-send-email.perl:1683 +#, perl-format +msgid "(%s) Adding %s: %s from: '%s'\n" +msgstr "(%s) Ajout de %s : %s depuis : '%s'\n" + +#: git-send-email.perl:1687 +#, perl-format +msgid "(%s) failed to close pipe to '%s'" +msgstr "(%s) échec de la fermeture du pipe vers '%s'" + +#: git-send-email.perl:1714 +msgid "cannot send message as 7bit" +msgstr "impossible d'envoyer un message comme 7bit" + +#: git-send-email.perl:1722 +msgid "invalid transfer encoding" +msgstr "codage de transfert invalide" + +#: git-send-email.perl:1741 git-send-email.perl:1792 git-send-email.perl:1802 +#, perl-format +msgid "unable to open %s: %s\n" +msgstr "impossible d'ouvrir %s :%s\n" + +#: git-send-email.perl:1744 +#, perl-format +msgid "%s: patch contains a line longer than 998 characters" +msgstr "%s : le patch contient une ligne plus longue que 998 caractères" + +#: git-send-email.perl:1760 +#, perl-format +msgid "Skipping %s with backup suffix '%s'.\n" +msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n" + +#. TRANSLATORS: please keep "[y|N]" as is. +#: git-send-email.perl:1764 +#, perl-format +msgid "Do you really want to send %s? [y|N]: " +msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : " + +#~ msgid "Use an experimental blank-line-based heuristic to improve diffs" +#~ msgstr "" +#~ "Utiliser une heuristique expérimentale reposant sur les lignes vides pour " +#~ "améliorer le diffs" + +#~ msgid "Clever... amending the last one with dirty index." +#~ msgstr "Malin... correction du dernier avec un index sale." + +#~ msgid "" +#~ "the following submodule (or one of its nested submodules)\n" +#~ "uses a .git directory:" +#~ msgid_plural "" +#~ "the following submodules (or one of their nested submodules)\n" +#~ "use a .git directory:" +#~ msgstr[0] "" +#~ "le sous-module suivant (ou un de ses sous-modules imbriqués)\n" +#~ "utilise un répertoire .git :" +#~ msgstr[1] "" +#~ "les sous-modules suivants (ou un de leurs sous-modules imbriqués)\n" +#~ "utilisent un répertoire .git :" + +#~ msgid "" +#~ "\n" +#~ "(use 'rm -rf' if you really want to remove it including all of its " +#~ "history)" +#~ msgstr "" +#~ "\n" +#~ "(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout " +#~ "son historique)" + #~ msgid "Could not write to %s" #~ msgstr "Impossible d'écrire dans %s" @@ -15047,9 +16367,6 @@ msgstr "Impossible de déterminer le chemin absolu du répertoire git" #~ msgid "bug: unhandled diff status %c" #~ msgstr "bogue : état de diff non géré %c" -#~ msgid "read of %s failed" -#~ msgstr "échec de la lecture de %s" - #~ msgid "could not write branch description template" #~ msgstr "impossible d'écrire le modèle de description de branche" @@ -15113,8 +16430,8 @@ msgstr "Impossible de déterminer le chemin absolu du répertoire git" #~ "or you are unsure what this means choose another name with the '--name' " #~ "option." #~ msgstr "" -#~ "ou vous ne savez pas ce que cela signifie de choisir un autre nom avec " -#~ "l'option '--name'." +#~ "ou si vous ne savez pas ce que cela signifie, choisissez un autre nom " +#~ "avec l'option '--name'." #~ msgid "Submodule work tree '$displaypath' contains a .git directory" #~ msgstr "" @@ -15134,12 +16451,6 @@ msgstr "Impossible de déterminer le chemin absolu du répertoire git" #~ msgid "unable to access '%s': %s" #~ msgstr "impossible d'accéder à '%s' : %s" -#~ msgid "could not open '%s' for reading: %s" -#~ msgstr "impossible d'ouvrir '%s' en lecture : %s" - -#~ msgid "could not open '%s' for writing: %s" -#~ msgstr "impossible d'ouvrir '%s' en écriture : %s" - #~ msgid " git branch -d %s\n" #~ msgstr " git branch -d %s\n" diff --git a/po/git.pot b/po/git.pot index e4e29ebfd..9e836b10b 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: 2016-11-25 22:50+0800\n" +"POT-Creation-Date: 2017-02-04 13:02+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:114 builtin/merge.c:1181 +#: advice.c:114 builtin/merge.c:1206 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" @@ -504,7 +504,7 @@ msgstr[1] "" msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989 +#: apply.c:4540 builtin/fetch.c:737 builtin/fetch.c:986 #, c-format msgid "cannot open %s" msgstr "" @@ -558,15 +558,16 @@ msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "" msgstr[1] "" -#: apply.c:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431 +#: apply.c:4888 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391 msgid "Unable to write new index file" msgstr "" #: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280 #: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180 -#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:407 -#: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592 -#: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947 +#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:591 +#: builtin/submodule--helper.c:594 builtin/submodule--helper.c:960 +#: builtin/submodule--helper.c:963 builtin/submodule--helper.c:1104 +#: git-add--interactive.perl:239 msgid "path" msgstr "" @@ -667,8 +668,8 @@ msgid "allow overlapping hunks" msgstr "" #: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19 -#: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593 -#: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114 +#: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651 +#: builtin/log.c:1860 builtin/mv.c:122 builtin/read-tree.c:114 msgid "be verbose" msgstr "" @@ -705,7 +706,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "" -#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327 +#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" @@ -726,8 +727,8 @@ msgstr "" msgid "prepend prefix to each pathname in the archive" msgstr "" -#: archive.c:432 builtin/blame.c:2603 builtin/blame.c:2604 builtin/config.c:59 -#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:723 +#: archive.c:432 builtin/blame.c:2607 builtin/blame.c:2608 builtin/config.c:59 +#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1054 #: builtin/hash-object.c:101 builtin/ls-files.c:539 builtin/ls-files.c:542 #: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109 #: parse-options.h:153 @@ -763,7 +764,7 @@ msgid "list supported archive formats" msgstr "" #: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88 -#: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953 +#: builtin/submodule--helper.c:603 builtin/submodule--helper.c:969 msgid "repo" msgstr "" @@ -851,7 +852,7 @@ msgstr "" #: bisect.c:750 #, c-format msgid "" -"Some %s revs are not ancestor of the %s rev.\n" +"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 "" @@ -874,7 +875,7 @@ msgstr "" msgid "a %s revision is needed" msgstr "" -#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248 +#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:262 #, c-format msgid "could not create file '%s'" msgstr "" @@ -1050,7 +1051,7 @@ msgstr "" msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:87 sequencer.c:963 builtin/commit.c:777 +#: bundle.c:87 sequencer.c:1331 sequencer.c:1752 builtin/commit.c:777 #, c-format msgid "could not open '%s'" msgstr "" @@ -1059,10 +1060,10 @@ msgstr "" msgid "Repository lacks these prerequisite commits:" msgstr "" -#: bundle.c:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374 -#: builtin/blame.c:2814 builtin/commit.c:1061 builtin/log.c:348 +#: bundle.c:163 ref-filter.c:1499 sequencer.c:1154 sequencer.c:2290 +#: builtin/blame.c:2820 builtin/commit.c:1061 builtin/log.c:348 #: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909 -#: builtin/merge.c:356 builtin/shortlog.c:170 +#: builtin/merge.c:360 builtin/shortlog.c:177 msgid "revision walk setup failed" msgstr "" @@ -1101,7 +1102,7 @@ msgstr "" msgid "ref '%s' is excluded by the rev-list options" msgstr "" -#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273 +#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:282 #, c-format msgid "unrecognized argument: %s" msgstr "" @@ -1119,13 +1120,13 @@ msgstr "" msgid "index-pack died" msgstr "" -#: color.c:290 +#: color.c:300 #, c-format msgid "invalid color value: %.*s" msgstr "" -#: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493 -#: builtin/am.c:2127 +#: commit.c:40 sequencer.c:1564 builtin/am.c:421 builtin/am.c:457 +#: builtin/am.c:1493 builtin/am.c:2127 #, c-format msgid "could not parse %s" msgstr "" @@ -1146,123 +1147,133 @@ msgstr "" msgid "memory exhausted" msgstr "" -#: config.c:516 +#: config.c:518 #, c-format msgid "bad config line %d in blob %s" msgstr "" -#: config.c:520 +#: config.c:522 #, c-format msgid "bad config line %d in file %s" msgstr "" -#: config.c:524 +#: config.c:526 #, c-format msgid "bad config line %d in standard input" msgstr "" -#: config.c:528 +#: config.c:530 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "" -#: config.c:532 +#: config.c:534 #, c-format msgid "bad config line %d in command line %s" msgstr "" -#: config.c:536 +#: config.c:538 #, c-format msgid "bad config line %d in %s" msgstr "" -#: config.c:655 +#: config.c:657 msgid "out of range" msgstr "" -#: config.c:655 +#: config.c:657 msgid "invalid unit" msgstr "" -#: config.c:661 +#: config.c:663 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "" -#: config.c:666 +#: config.c:668 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "" -#: config.c:669 +#: config.c:671 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" -#: config.c:672 +#: config.c:674 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" -#: config.c:675 +#: config.c:677 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" -#: config.c:678 +#: config.c:680 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" -#: config.c:681 +#: config.c:683 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "" -#: config.c:768 +#: config.c:770 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "" -#: config.c:852 config.c:863 +#: config.c:865 config.c:876 #, c-format msgid "bad zlib compression level %d" msgstr "" -#: config.c:978 +#: config.c:993 #, c-format msgid "invalid mode for object creation: %s" msgstr "" -#: config.c:1312 +#: config.c:1149 +#, c-format +msgid "bad pack compression level %d" +msgstr "" + +#: config.c:1339 msgid "unable to parse command-line config" msgstr "" -#: config.c:1362 +#: config.c:1389 msgid "unknown error occurred while reading the configuration files" msgstr "" -#: config.c:1716 +#: config.c:1743 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" -#: config.c:1718 +#: config.c:1745 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" -#: config.c:1777 +#: config.c:1804 #, c-format msgid "%s has multiple values" msgstr "" -#: config.c:2311 +#: config.c:2225 config.c:2450 +#, c-format +msgid "fstat on %s failed" +msgstr "" + +#: config.c:2343 #, c-format msgid "could not set '%s' to '%s'" msgstr "" -#: config.c:2313 +#: config.c:2345 #, c-format msgid "could not unset '%s'" msgstr "" @@ -1279,7 +1290,7 @@ msgid "" "and the repository exists." msgstr "" -#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140 +#: connected.c:63 builtin/fsck.c:190 builtin/prune.c:140 msgid "Checking connectivity" msgstr "" @@ -1411,65 +1422,70 @@ msgstr "" msgid " Unknown dirstat parameter '%s'\n" msgstr "" -#: diff.c:283 +#: diff.c:281 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" -#: diff.c:346 +#: diff.c:344 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" -#: diff.c:3087 +#: diff.c:3085 #, c-format msgid "external diff died, stopping at %s" msgstr "" -#: diff.c:3412 +#: diff.c:3411 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" -#: diff.c:3502 +#: diff.c:3501 msgid "--follow requires exactly one pathspec" msgstr "" -#: diff.c:3665 +#: diff.c:3664 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: diff.c:3679 +#: diff.c:3678 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "" -#: diff.c:4700 +#: diff.c:4695 msgid "inexact rename detection was skipped due to too many files." msgstr "" -#: diff.c:4703 +#: diff.c:4698 msgid "only found copies from modified paths due to too many files." msgstr "" -#: diff.c:4706 +#: diff.c:4701 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "" -#: dir.c:1866 +#: dir.c:1863 msgid "failed to get kernel name and information" msgstr "" -#: dir.c:1985 +#: dir.c:1982 msgid "Untracked cache is disabled on this system or location." msgstr "" +#: dir.c:2760 +#, c-format +msgid "could not migrate git directory from '%s' to '%s'" +msgstr "" + #: fetch-pack.c:213 msgid "git fetch-pack: expected shallow list" msgstr "" @@ -1650,63 +1666,68 @@ msgstr "" msgid "failed writing detached signature to '%s'" msgstr "" -#: grep.c:1782 +#: graph.c:96 +#, c-format +msgid "ignore invalid color '%.*s' in log.graphColors" +msgstr "" + +#: grep.c:1794 #, c-format msgid "'%s': unable to read %s" msgstr "" -#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155 +#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:133 #, c-format msgid "failed to stat '%s'" msgstr "" -#: grep.c:1810 +#: grep.c:1822 #, c-format msgid "'%s': short read" msgstr "" -#: help.c:203 +#: help.c:218 #, c-format msgid "available git commands in '%s'" msgstr "" -#: help.c:210 +#: help.c:225 msgid "git commands available from elsewhere on your $PATH" msgstr "" -#: help.c:241 +#: help.c:256 msgid "These are common Git commands used in various situations:" msgstr "" -#: help.c:306 +#: help.c:321 #, 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 "" -#: help.c:361 +#: help.c:376 msgid "Uh oh. Your system reports no Git commands at all." msgstr "" -#: help.c:383 +#: help.c:398 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" "Continuing under the assumption that you meant '%s'" msgstr "" -#: help.c:388 +#: help.c:403 #, c-format msgid "in %0.1f seconds automatically..." msgstr "" -#: help.c:395 +#: help.c:410 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "" -#: help.c:399 help.c:465 +#: help.c:414 help.c:480 msgid "" "\n" "Did you mean this?" @@ -1716,7 +1737,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: help.c:461 +#: help.c:476 #, c-format msgid "%s: %s - %s" msgstr "" @@ -1766,229 +1787,229 @@ msgstr "" msgid "(bad commit)\n" msgstr "" -#: merge-recursive.c:231 +#: merge-recursive.c:231 merge-recursive.c:239 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "" -#: merge-recursive.c:301 +#: merge-recursive.c:303 msgid "error building trees" msgstr "" -#: merge-recursive.c:720 +#: merge-recursive.c:727 #, c-format msgid "failed to create path '%s'%s" msgstr "" -#: merge-recursive.c:731 +#: merge-recursive.c:738 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "" -#: merge-recursive.c:745 merge-recursive.c:764 +#: merge-recursive.c:752 merge-recursive.c:771 msgid ": perhaps a D/F conflict?" msgstr "" -#: merge-recursive.c:754 +#: merge-recursive.c:761 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" -#: merge-recursive.c:796 builtin/cat-file.c:34 +#: merge-recursive.c:803 builtin/cat-file.c:34 #, c-format msgid "cannot read object %s '%s'" msgstr "" -#: merge-recursive.c:798 +#: merge-recursive.c:805 #, c-format msgid "blob expected for %s '%s'" msgstr "" -#: merge-recursive.c:822 +#: merge-recursive.c:829 #, c-format msgid "failed to open '%s': %s" msgstr "" -#: merge-recursive.c:833 +#: merge-recursive.c:840 #, c-format msgid "failed to symlink '%s': %s" msgstr "" -#: merge-recursive.c:838 +#: merge-recursive.c:845 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" -#: merge-recursive.c:978 +#: merge-recursive.c:985 msgid "Failed to execute internal merge" msgstr "" -#: merge-recursive.c:982 +#: merge-recursive.c:989 #, c-format msgid "Unable to add %s to database" msgstr "" -#: merge-recursive.c:1081 merge-recursive.c:1095 +#: merge-recursive.c:1088 merge-recursive.c:1102 #, 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:1087 merge-recursive.c:1100 +#: merge-recursive.c:1094 merge-recursive.c:1107 #, 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:1143 +#: merge-recursive.c:1150 msgid "rename" msgstr "" -#: merge-recursive.c:1143 +#: merge-recursive.c:1150 msgid "renamed" msgstr "" -#: merge-recursive.c:1200 +#: merge-recursive.c:1207 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "" -#: merge-recursive.c:1225 +#: merge-recursive.c:1232 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" "\"->\"%s\" in \"%s\"%s" msgstr "" -#: merge-recursive.c:1230 +#: merge-recursive.c:1237 msgid " (left unresolved)" msgstr "" -#: merge-recursive.c:1292 +#: merge-recursive.c:1299 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" -#: merge-recursive.c:1325 +#: merge-recursive.c:1332 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "" -#: merge-recursive.c:1531 +#: merge-recursive.c:1538 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" -#: merge-recursive.c:1546 +#: merge-recursive.c:1553 #, c-format msgid "Adding merged %s" msgstr "" -#: merge-recursive.c:1553 merge-recursive.c:1766 +#: merge-recursive.c:1560 merge-recursive.c:1774 #, c-format msgid "Adding as %s instead" msgstr "" -#: merge-recursive.c:1610 +#: merge-recursive.c:1617 #, c-format msgid "cannot read object %s" msgstr "" -#: merge-recursive.c:1613 +#: merge-recursive.c:1620 #, c-format msgid "object %s is not a blob" msgstr "" -#: merge-recursive.c:1666 +#: merge-recursive.c:1673 msgid "modify" msgstr "" -#: merge-recursive.c:1666 +#: merge-recursive.c:1673 msgid "modified" msgstr "" -#: merge-recursive.c:1676 +#: merge-recursive.c:1683 msgid "content" msgstr "" -#: merge-recursive.c:1683 +#: merge-recursive.c:1690 msgid "add/add" msgstr "" -#: merge-recursive.c:1718 +#: merge-recursive.c:1726 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "" -#: merge-recursive.c:1732 +#: merge-recursive.c:1740 #, c-format msgid "Auto-merging %s" msgstr "" -#: merge-recursive.c:1736 git-submodule.sh:924 +#: merge-recursive.c:1744 git-submodule.sh:930 msgid "submodule" msgstr "" -#: merge-recursive.c:1737 +#: merge-recursive.c:1745 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "" -#: merge-recursive.c:1831 +#: merge-recursive.c:1839 #, c-format msgid "Removing %s" msgstr "" -#: merge-recursive.c:1857 +#: merge-recursive.c:1865 msgid "file/directory" msgstr "" -#: merge-recursive.c:1863 +#: merge-recursive.c:1871 msgid "directory/file" msgstr "" -#: merge-recursive.c:1868 +#: merge-recursive.c:1877 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -#: merge-recursive.c:1877 +#: merge-recursive.c:1886 #, c-format msgid "Adding %s" msgstr "" -#: merge-recursive.c:1914 +#: merge-recursive.c:1923 msgid "Already up-to-date!" msgstr "" -#: merge-recursive.c:1923 +#: merge-recursive.c:1932 #, c-format msgid "merging of trees %s and %s failed" msgstr "" -#: merge-recursive.c:2006 +#: merge-recursive.c:2015 msgid "Merging:" msgstr "" -#: merge-recursive.c:2019 +#: merge-recursive.c:2028 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:2058 +#: merge-recursive.c:2067 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:2121 +#: merge-recursive.c:2130 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788 +#: merge-recursive.c:2144 builtin/merge.c:645 builtin/merge.c:792 msgid "Unable to write index." msgstr "" @@ -2066,91 +2087,96 @@ msgstr "" msgid "Could not make %s writable by group" msgstr "" -#: pathspec.c:133 +#: pathspec.c:142 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" -#: pathspec.c:143 +#: pathspec.c:149 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" msgstr "" -#: pathspec.c:177 +#: pathspec.c:188 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "" -#: pathspec.c:183 +#: pathspec.c:201 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "" -#: pathspec.c:187 +#: pathspec.c:206 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "" -#: pathspec.c:205 +#: pathspec.c:238 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "" -#: pathspec.c:230 +#: pathspec.c:293 pathspec.c:315 +#, c-format +msgid "Pathspec '%s' is in submodule '%.*s'" +msgstr "" + +#: pathspec.c:350 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "" -#: pathspec.c:241 +#: pathspec.c:363 #, c-format msgid "%s: '%s' is outside repository" msgstr "" -#: pathspec.c:291 +#: pathspec.c:451 #, c-format -msgid "Pathspec '%s' is in submodule '%.*s'" +msgid "'%s' (mnemonic: '%c')" msgstr "" -#: pathspec.c:353 +#: pathspec.c:461 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "" -#: pathspec.c:408 +#: pathspec.c:511 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:440 +#: pathspec.c:535 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "" -#: pathspec.c:449 +#: pathspec.c:544 msgid "" "There is nothing to exclude from by :(exclude) patterns.\n" "Perhaps you forgot to add either ':/' or '.' ?" msgstr "" -#: pretty.c:971 +#: pretty.c:982 msgid "unable to parse --pretty format" msgstr "" -#: read-cache.c:1315 +#: read-cache.c:1307 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1325 +#: read-cache.c:1317 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" "Using version %i" msgstr "" -#: refs.c:576 builtin/merge.c:840 +#: refs.c:576 builtin/merge.c:844 #, c-format msgid "Could not open '%s' for writing" msgstr "" @@ -2170,227 +2196,232 @@ msgstr "" msgid "could not remove reference %s" msgstr "" -#: ref-filter.c:55 +#: ref-filter.c:56 #, c-format msgid "expected format: %%(color:<color>)" msgstr "" -#: ref-filter.c:57 +#: ref-filter.c:58 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "" -#: ref-filter.c:71 +#: ref-filter.c:72 #, c-format msgid "unrecognized format: %%(%s)" msgstr "" -#: ref-filter.c:77 +#: ref-filter.c:78 #, c-format msgid "%%(body) does not take arguments" msgstr "" -#: ref-filter.c:84 +#: ref-filter.c:85 #, c-format msgid "%%(subject) does not take arguments" msgstr "" -#: ref-filter.c:101 +#: ref-filter.c:92 +#, c-format +msgid "%%(trailers) does not take arguments" +msgstr "" + +#: ref-filter.c:111 #, c-format msgid "positive value expected contents:lines=%s" msgstr "" -#: ref-filter.c:103 +#: ref-filter.c:113 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "" -#: ref-filter.c:113 +#: ref-filter.c:123 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "" -#: ref-filter.c:135 +#: ref-filter.c:145 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "" -#: ref-filter.c:147 +#: ref-filter.c:157 #, c-format msgid "unrecognized position:%s" msgstr "" -#: ref-filter.c:151 +#: ref-filter.c:161 #, c-format msgid "unrecognized width:%s" msgstr "" -#: ref-filter.c:157 +#: ref-filter.c:167 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "" -#: ref-filter.c:161 +#: ref-filter.c:171 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "" -#: ref-filter.c:244 +#: ref-filter.c:255 #, c-format msgid "malformed field name: %.*s" msgstr "" -#: ref-filter.c:270 +#: ref-filter.c:281 #, c-format msgid "unknown field name: %.*s" msgstr "" -#: ref-filter.c:372 +#: ref-filter.c:383 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "" -#: ref-filter.c:424 +#: ref-filter.c:435 #, c-format msgid "malformed format string %s" msgstr "" -#: ref-filter.c:878 +#: ref-filter.c:898 msgid ":strip= requires a positive integer argument" msgstr "" -#: ref-filter.c:883 +#: ref-filter.c:903 #, c-format msgid "ref '%s' does not have %ld components to :strip" msgstr "" -#: ref-filter.c:1046 +#: ref-filter.c:1066 #, c-format msgid "unknown %.*s format %s" msgstr "" -#: ref-filter.c:1066 ref-filter.c:1097 +#: ref-filter.c:1086 ref-filter.c:1117 #, c-format msgid "missing object %s for %s" msgstr "" -#: ref-filter.c:1069 ref-filter.c:1100 +#: ref-filter.c:1089 ref-filter.c:1120 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "" -#: ref-filter.c:1311 +#: ref-filter.c:1343 #, c-format msgid "malformed object at '%s'" msgstr "" -#: ref-filter.c:1373 +#: ref-filter.c:1410 #, c-format msgid "ignoring ref with broken name %s" msgstr "" -#: ref-filter.c:1378 +#: ref-filter.c:1415 #, c-format msgid "ignoring broken ref %s" msgstr "" -#: ref-filter.c:1633 +#: ref-filter.c:1670 #, c-format msgid "format: %%(end) atom missing" msgstr "" -#: ref-filter.c:1687 +#: ref-filter.c:1734 #, c-format msgid "malformed object name %s" msgstr "" -#: remote.c:746 +#: remote.c:754 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "" -#: remote.c:750 +#: remote.c:758 #, c-format msgid "%s usually tracks %s, not %s" msgstr "" -#: remote.c:754 +#: remote.c:762 #, c-format msgid "%s tracks both %s and %s" msgstr "" -#: remote.c:762 +#: remote.c:770 msgid "Internal error" msgstr "" -#: remote.c:1677 remote.c:1720 +#: remote.c:1685 remote.c:1787 msgid "HEAD does not point to a branch" msgstr "" -#: remote.c:1686 +#: remote.c:1694 #, c-format msgid "no such branch: '%s'" msgstr "" -#: remote.c:1689 +#: remote.c:1697 #, c-format msgid "no upstream configured for branch '%s'" msgstr "" -#: remote.c:1695 +#: remote.c:1703 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "" -#: remote.c:1710 +#: remote.c:1718 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" -#: remote.c:1725 +#: remote.c:1730 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "" -#: remote.c:1736 +#: remote.c:1741 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "" -#: remote.c:1749 +#: remote.c:1754 msgid "push has no destination (push.default is 'nothing')" msgstr "" -#: remote.c:1771 +#: remote.c:1776 msgid "cannot resolve 'simple' push to a single destination" msgstr "" -#: remote.c:2073 +#: remote.c:2081 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" -#: remote.c:2077 +#: remote.c:2085 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr "" -#: remote.c:2080 +#: remote.c:2088 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "" -#: remote.c:2084 +#: remote.c:2092 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "" msgstr[1] "" -#: remote.c:2090 +#: remote.c:2098 msgid " (use \"git push\" to publish your local commits)\n" msgstr "" -#: remote.c:2093 +#: remote.c:2101 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -2398,11 +2429,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2101 +#: remote.c:2109 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" -#: remote.c:2104 +#: remote.c:2112 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -2413,7 +2444,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2114 +#: remote.c:2122 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" @@ -2430,11 +2461,11 @@ msgstr "" msgid "--first-parent is incompatible with --bisect" msgstr "" -#: run-command.c:106 +#: run-command.c:125 msgid "open /dev/null failed" msgstr "" -#: run-command.c:108 +#: run-command.c:127 #, c-format msgid "dup2(%d,%d) failed" msgstr "" @@ -2461,81 +2492,93 @@ msgstr "" msgid "the receiving end does not support push options" msgstr "" -#: sequencer.c:171 +#: sequencer.c:215 msgid "revert" msgstr "" -#: sequencer.c:171 +#: sequencer.c:217 msgid "cherry-pick" msgstr "" -#: sequencer.c:228 +#: sequencer.c:219 +msgid "rebase -i" +msgstr "" + +#: sequencer.c:221 +#, c-format +msgid "Unknown action: %d" +msgstr "" + +#: sequencer.c:278 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" msgstr "" -#: sequencer.c:231 +#: sequencer.c:281 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:244 sequencer.c:1209 +#: sequencer.c:294 sequencer.c:1667 #, c-format msgid "could not lock '%s'" msgstr "" -#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214 +#: sequencer.c:297 sequencer.c:1545 sequencer.c:1672 sequencer.c:1686 #, c-format msgid "could not write to '%s'" msgstr "" -#: sequencer.c:251 +#: sequencer.c:301 #, c-format msgid "could not write eol to '%s'" msgstr "" -#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216 +#: sequencer.c:305 sequencer.c:1550 sequencer.c:1674 #, c-format msgid "failed to finalize '%s'." msgstr "" -#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032 +#: sequencer.c:329 sequencer.c:808 sequencer.c:1571 builtin/am.c:259 +#: builtin/commit.c:749 builtin/merge.c:1036 #, c-format msgid "could not read '%s'" msgstr "" -#: sequencer.c:305 +#: sequencer.c:355 #, c-format msgid "your local changes would be overwritten by %s." msgstr "" -#: sequencer.c:309 +#: sequencer.c:359 msgid "commit your changes or stash them to proceed." msgstr "" -#: sequencer.c:324 +#: sequencer.c:388 #, c-format msgid "%s: fast-forward" msgstr "" -#. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:399 +#. TRANSLATORS: %s will be "revert", "cherry-pick" or +#. * "rebase -i". +#. +#: sequencer.c:470 #, c-format msgid "%s: Unable to write new index file" msgstr "" -#: sequencer.c:418 +#: sequencer.c:489 msgid "could not resolve HEAD commit\n" msgstr "" -#: sequencer.c:438 +#: sequencer.c:509 msgid "unable to update cache tree\n" msgstr "" -#: sequencer.c:483 +#: sequencer.c:592 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -2552,172 +2595,369 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:567 +#: sequencer.c:688 #, c-format msgid "could not parse commit %s\n" msgstr "" -#: sequencer.c:572 +#: sequencer.c:693 #, c-format msgid "could not parse parent commit %s\n" msgstr "" -#: sequencer.c:656 +#: sequencer.c:815 +#, c-format +msgid "" +"unexpected 1st line of squash message:\n" +"\n" +"\t%.*s" +msgstr "" + +#: sequencer.c:821 +#, c-format +msgid "" +"invalid 1st line of squash message:\n" +"\n" +"\t%.*s" +msgstr "" + +#: sequencer.c:827 sequencer.c:852 +#, c-format +msgid "This is a combination of %d commits." +msgstr "" + +#: sequencer.c:836 +msgid "need a HEAD to fixup" +msgstr "" + +#: sequencer.c:838 +msgid "could not read HEAD" +msgstr "" + +#: sequencer.c:840 +msgid "could not read HEAD's commit message" +msgstr "" + +#: sequencer.c:846 +#, c-format +msgid "cannot write '%s'" +msgstr "" + +#: sequencer.c:855 git-rebase--interactive.sh:445 +msgid "This is the 1st commit message:" +msgstr "" + +#: sequencer.c:863 +#, c-format +msgid "could not read commit message of %s" +msgstr "" + +#: sequencer.c:870 +#, c-format +msgid "This is the commit message #%d:" +msgstr "" + +#: sequencer.c:875 +#, c-format +msgid "The commit message #%d will be skipped:" +msgstr "" + +#: sequencer.c:880 +#, c-format +msgid "unknown command: %d" +msgstr "" + +#: sequencer.c:946 msgid "your index file is unmerged." msgstr "" -#: sequencer.c:675 +#: sequencer.c:964 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:683 +#: sequencer.c:972 #, c-format msgid "commit %s does not have parent %d" msgstr "" -#: sequencer.c:687 +#: sequencer.c:976 #, c-format msgid "mainline was specified but commit %s is not a merge." msgstr "" +#: sequencer.c:982 +#, 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:700 +#: sequencer.c:1001 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:705 +#: sequencer.c:1063 sequencer.c:1812 #, c-format -msgid "cannot get commit message for %s" +msgid "could not rename '%s' to '%s'" msgstr "" -#: sequencer.c:797 +#: sequencer.c:1114 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:798 +#: sequencer.c:1115 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:833 +#: sequencer.c:1157 msgid "empty commit set passed" msgstr "" -#: sequencer.c:843 +#: sequencer.c:1167 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:850 +#: sequencer.c:1174 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:944 +#: sequencer.c:1294 #, c-format msgid "invalid line %d: %.*s" msgstr "" -#: sequencer.c:950 -msgid "no commits parsed." +#: sequencer.c:1302 +#, c-format +msgid "cannot '%s' without a previous commit" msgstr "" -#: sequencer.c:966 +#: sequencer.c:1334 #, c-format msgid "could not read '%s'." msgstr "" -#: sequencer.c:972 +#: sequencer.c:1341 +msgid "please fix this using 'git rebase --edit-todo'." +msgstr "" + +#: sequencer.c:1343 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "" -#: sequencer.c:983 +#: sequencer.c:1348 +msgid "no commits parsed." +msgstr "" + +#: sequencer.c:1359 msgid "cannot cherry-pick during a revert." msgstr "" -#: sequencer.c:985 +#: sequencer.c:1361 msgid "cannot revert during a cherry-pick." msgstr "" -#: sequencer.c:1028 +#: sequencer.c:1424 #, c-format msgid "invalid key: %s" msgstr "" -#: sequencer.c:1031 +#: sequencer.c:1427 #, c-format msgid "invalid value for %s: %s" msgstr "" -#: sequencer.c:1063 +#: sequencer.c:1484 #, c-format msgid "malformed options sheet: '%s'" msgstr "" -#: sequencer.c:1101 +#: sequencer.c:1522 msgid "a cherry-pick or revert is already in progress" msgstr "" -#: sequencer.c:1102 +#: sequencer.c:1523 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "" -#: sequencer.c:1106 +#: sequencer.c:1526 #, c-format msgid "could not create sequencer directory '%s'" msgstr "" -#: sequencer.c:1120 +#: sequencer.c:1540 msgid "could not lock HEAD" msgstr "" -#: sequencer.c:1151 sequencer.c:1289 +#: sequencer.c:1596 sequencer.c:2150 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:1153 +#: sequencer.c:1598 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:1155 sequencer.c:1189 +#: sequencer.c:1600 sequencer.c:1634 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:1175 builtin/grep.c:578 +#: sequencer.c:1620 builtin/grep.c:904 #, c-format msgid "cannot open '%s'" msgstr "" -#: sequencer.c:1177 +#: sequencer.c:1622 #, c-format msgid "cannot read '%s': %s" msgstr "" -#: sequencer.c:1178 +#: sequencer.c:1623 msgid "unexpected end of file" msgstr "" -#: sequencer.c:1184 +#: sequencer.c:1629 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:1354 +#: sequencer.c:1640 +msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" +msgstr "" + +#: sequencer.c:1777 sequencer.c:2049 +msgid "cannot read HEAD" +msgstr "" + +#: sequencer.c:1817 builtin/difftool.c:574 +#, c-format +msgid "could not copy '%s' to '%s'" +msgstr "" + +#: sequencer.c:1833 +msgid "could not read index" +msgstr "" + +#: sequencer.c:1838 +#, c-format +msgid "" +"execution failed: %s\n" +"%sYou can fix the problem, and then run\n" +"\n" +" git rebase --continue\n" +"\n" +msgstr "" + +#: sequencer.c:1844 +msgid "and made changes to the index and/or the working tree\n" +msgstr "" + +#: sequencer.c:1850 +#, 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 "" + +#: sequencer.c:1905 git-rebase.sh:168 +#, c-format +msgid "Applied autostash." +msgstr "" + +#: sequencer.c:1917 +#, c-format +msgid "cannot store %s" +msgstr "" + +#: sequencer.c:1919 git-rebase.sh:172 +#, 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 "" + +#: sequencer.c:2000 +#, c-format +msgid "stopped at %s... %.*s" +msgstr "" + +#: sequencer.c:2027 +#, c-format +msgid "unknown command %d" +msgstr "" + +#: sequencer.c:2057 +msgid "could not read orig-head" +msgstr "" + +#: sequencer.c:2061 +msgid "could not read 'onto'" +msgstr "" + +#: sequencer.c:2068 +#, c-format +msgid "could not update %s" +msgstr "" + +#: sequencer.c:2075 +#, c-format +msgid "could not update HEAD to %s" +msgstr "" + +#: sequencer.c:2159 +msgid "cannot rebase: You have unstaged changes." +msgstr "" + +#: sequencer.c:2164 +msgid "could not remove CHERRY_PICK_HEAD" +msgstr "" + +#: sequencer.c:2173 +msgid "cannot amend non-existing commit" +msgstr "" + +#: sequencer.c:2175 +#, c-format +msgid "invalid file: '%s'" +msgstr "" + +#: sequencer.c:2177 +#, c-format +msgid "invalid contents: '%s'" +msgstr "" + +#: sequencer.c:2180 +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:2190 +msgid "could not commit staged changes." +msgstr "" + +#: sequencer.c:2270 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "" -#: sequencer.c:1358 +#: sequencer.c:2274 #, c-format msgid "%s: bad revision" msgstr "" -#: sequencer.c:1391 +#: sequencer.c:2307 msgid "can't revert as initial commit" msgstr "" @@ -2744,82 +2984,82 @@ msgid "" "'git <command> [<revision>...] -- [<file>...]'" msgstr "" -#: setup.c:468 +#: setup.c:470 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "" -#: setup.c:476 +#: setup.c:478 msgid "unknown repository extensions found:" msgstr "" -#: setup.c:762 +#: setup.c:768 #, c-format msgid "Not a git repository (or any of the parent directories): %s" msgstr "" -#: setup.c:764 setup.c:915 builtin/index-pack.c:1641 +#: setup.c:770 setup.c:922 builtin/index-pack.c:1643 msgid "Cannot come back to cwd" msgstr "" -#: setup.c:845 +#: setup.c:852 msgid "Unable to read current working directory" msgstr "" -#: setup.c:920 +#: setup.c:927 #, 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:927 +#: setup.c:934 #, c-format msgid "Cannot change to '%s/..'" msgstr "" -#: setup.c:989 +#: setup.c:996 #, 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:473 +#: sha1_file.c:490 #, c-format msgid "path '%s' does not exist" msgstr "" -#: sha1_file.c:499 +#: sha1_file.c:516 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" -#: sha1_file.c:505 +#: sha1_file.c:522 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "" -#: sha1_file.c:511 +#: sha1_file.c:528 #, c-format msgid "reference repository '%s' is shallow" msgstr "" -#: sha1_file.c:519 +#: sha1_file.c:536 #, c-format msgid "reference repository '%s' is grafted" msgstr "" -#: sha1_file.c:1159 +#: sha1_file.c:1176 msgid "offset before end of packfile (broken .idx?)" msgstr "" -#: sha1_file.c:2592 +#: sha1_file.c:2637 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" -#: sha1_file.c:2596 +#: sha1_file.c:2641 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" @@ -2846,88 +3086,128 @@ msgid "" "running \"git config advice.objectNameWarning false\"" msgstr "" -#: submodule.c:64 submodule.c:98 +#: submodule.c:65 submodule.c:99 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" -#: submodule.c:68 submodule.c:102 +#: submodule.c:69 submodule.c:103 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "" -#: submodule.c:76 +#: submodule.c:77 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "" -#: submodule.c:109 +#: submodule.c:110 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "" -#: submodule.c:120 +#: submodule.c:121 msgid "staging updated .gitmodules failed" msgstr "" -#: submodule.c:158 +#: submodule.c:159 msgid "negative values not allowed for submodule.fetchJobs" msgstr "" -#: submodule-config.c:358 +#: submodule.c:1184 +#, c-format +msgid "could not start 'git status in submodule '%s'" +msgstr "" + +#: submodule.c:1197 +#, c-format +msgid "could not run 'git status in submodule '%s'" +msgstr "" + +#: submodule.c:1398 +#, c-format +msgid "" +"relocate_gitdir for submodule '%s' with more than one worktree not supported" +msgstr "" + +#: submodule.c:1410 submodule.c:1471 +#, c-format +msgid "could not lookup name for submodule '%s'" +msgstr "" + +#: submodule.c:1414 submodule.c:1474 builtin/submodule--helper.c:640 +#: builtin/submodule--helper.c:650 +#, c-format +msgid "could not create directory '%s'" +msgstr "" + +#: submodule.c:1420 +#, c-format +msgid "" +"Migrating git directory of '%s%s' from\n" +"'%s' to\n" +"'%s'\n" +msgstr "" + +#: submodule.c:1512 +#, c-format +msgid "could not recurse into submodule '%s'" +msgstr "" + +#: submodule-config.c:360 #, c-format msgid "invalid value for %s" msgstr "" -#: trailer.c:238 +#: trailer.c:240 #, c-format msgid "running trailer command '%s' failed" msgstr "" -#: trailer.c:471 trailer.c:475 trailer.c:479 trailer.c:533 trailer.c:537 -#: trailer.c:541 +#: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539 +#: trailer.c:543 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "" -#: trailer.c:523 trailer.c:528 builtin/remote.c:289 +#: trailer.c:525 trailer.c:530 builtin/remote.c:289 #, c-format msgid "more than one %s" msgstr "" -#: trailer.c:672 +#: trailer.c:702 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "" -#: trailer.c:695 +#: trailer.c:722 #, c-format msgid "could not read input file '%s'" msgstr "" -#: trailer.c:698 +#: trailer.c:725 msgid "could not read from stdin" msgstr "" -#: trailer.c:929 builtin/am.c:44 +#: trailer.c:949 builtin/am.c:44 #, c-format msgid "could not stat %s" msgstr "" -#: trailer.c:931 +#: trailer.c:951 #, c-format msgid "file %s is not a regular file" msgstr "" -#: trailer.c:933 +#: trailer.c:953 #, c-format msgid "file %s is not writable by user" msgstr "" -#: trailer.c:945 +#: trailer.c:965 msgid "could not open temporary file" msgstr "" -#: trailer.c:983 +#: trailer.c:1001 #, c-format msgid "could not rename temporary file to %s" msgstr "" @@ -2942,14 +3222,14 @@ msgstr "" msgid "transport: invalid depth option '%s'" msgstr "" -#: transport.c:817 +#: transport.c:885 #, c-format msgid "" "The following submodule paths contain changes that can\n" "not be found on any remote:\n" msgstr "" -#: transport.c:821 +#: transport.c:889 #, c-format msgid "" "\n" @@ -2965,7 +3245,7 @@ msgid "" "\n" msgstr "" -#: transport.c:829 +#: transport.c:897 msgid "Aborting." msgstr "" @@ -2990,98 +3270,98 @@ msgstr "" msgid "too-short tree file" msgstr "" -#: unpack-trees.c:64 +#: unpack-trees.c:99 #, 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:66 +#: unpack-trees.c:101 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%s" msgstr "" -#: unpack-trees.c:69 +#: unpack-trees.c:104 #, 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:71 +#: unpack-trees.c:106 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:74 +#: unpack-trees.c:109 #, 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:76 +#: unpack-trees.c:111 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:81 +#: unpack-trees.c:116 #, c-format msgid "" -"Updating the following directories would lose untracked files in it:\n" +"Updating the following directories would lose untracked files in them:\n" "%s" msgstr "" -#: unpack-trees.c:85 +#: unpack-trees.c:120 #, 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:87 +#: unpack-trees.c:122 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%s" msgstr "" -#: unpack-trees.c:90 +#: unpack-trees.c:125 #, 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:92 +#: unpack-trees.c:127 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:95 +#: unpack-trees.c:130 #, 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:97 +#: unpack-trees.c:132 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:102 +#: unpack-trees.c:137 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3089,7 +3369,7 @@ msgid "" "%%sPlease move or remove them before you switch branches." msgstr "" -#: unpack-trees.c:104 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3097,47 +3377,47 @@ msgid "" "%%s" msgstr "" -#: unpack-trees.c:107 +#: unpack-trees.c:142 #, 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:109 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:112 +#: unpack-trees.c:147 #, 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:114 +#: unpack-trees.c:149 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:121 +#: unpack-trees.c:156 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "" -#: unpack-trees.c:124 +#: unpack-trees.c:159 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up-to-date:\n" "%s" msgstr "" -#: unpack-trees.c:126 +#: unpack-trees.c:161 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -3145,7 +3425,7 @@ msgid "" "%s" msgstr "" -#: unpack-trees.c:128 +#: unpack-trees.c:163 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -3153,12 +3433,12 @@ msgid "" "%s" msgstr "" -#: unpack-trees.c:205 +#: unpack-trees.c:240 #, c-format msgid "Aborting\n" msgstr "" -#: unpack-trees.c:237 +#: unpack-trees.c:270 msgid "Checking out files" msgstr "" @@ -3207,7 +3487,7 @@ msgid "could not open '%s' for writing" msgstr "" #: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759 -#: builtin/am.c:847 builtin/commit.c:1705 builtin/merge.c:1029 +#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1033 #: builtin/pull.c:341 #, c-format msgid "could not open '%s' for reading" @@ -3413,178 +3693,182 @@ msgstr "" msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" -#: wt-status.c:1172 +#: wt-status.c:1176 +msgid "git-rebase-todo is missing." +msgstr "" + +#: wt-status.c:1178 msgid "No commands done." msgstr "" -#: wt-status.c:1175 +#: wt-status.c:1181 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "" msgstr[1] "" -#: wt-status.c:1186 +#: wt-status.c:1192 #, c-format msgid " (see more in file %s)" msgstr "" -#: wt-status.c:1191 +#: wt-status.c:1197 msgid "No commands remaining." msgstr "" -#: wt-status.c:1194 +#: wt-status.c:1200 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "" msgstr[1] "" -#: wt-status.c:1202 +#: wt-status.c:1208 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr "" -#: wt-status.c:1215 +#: wt-status.c:1221 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1220 +#: wt-status.c:1226 msgid "You are currently rebasing." msgstr "" -#: wt-status.c:1234 +#: wt-status.c:1240 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1236 +#: wt-status.c:1242 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1238 +#: wt-status.c:1244 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" -#: wt-status.c:1244 +#: wt-status.c:1250 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1248 +#: wt-status.c:1254 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1253 +#: wt-status.c:1259 msgid "You are currently splitting a commit during a rebase." msgstr "" -#: wt-status.c:1256 +#: wt-status.c:1262 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1260 +#: wt-status.c:1266 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1265 +#: wt-status.c:1271 msgid "You are currently editing a commit during a rebase." msgstr "" -#: wt-status.c:1268 +#: wt-status.c:1274 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" -#: wt-status.c:1270 +#: wt-status.c:1276 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -#: wt-status.c:1280 +#: wt-status.c:1286 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "" -#: wt-status.c:1285 +#: wt-status.c:1291 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1288 +#: wt-status.c:1294 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1290 +#: wt-status.c:1296 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" -#: wt-status.c:1299 +#: wt-status.c:1305 #, c-format msgid "You are currently reverting commit %s." msgstr "" -#: wt-status.c:1304 +#: wt-status.c:1310 msgid " (fix conflicts and run \"git revert --continue\")" msgstr "" -#: wt-status.c:1307 +#: wt-status.c:1313 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" -#: wt-status.c:1309 +#: wt-status.c:1315 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" -#: wt-status.c:1320 +#: wt-status.c:1326 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "" -#: wt-status.c:1324 +#: wt-status.c:1330 msgid "You are currently bisecting." msgstr "" -#: wt-status.c:1327 +#: wt-status.c:1333 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -#: wt-status.c:1524 +#: wt-status.c:1530 msgid "On branch " msgstr "" -#: wt-status.c:1530 +#: wt-status.c:1536 msgid "interactive rebase in progress; onto " msgstr "" -#: wt-status.c:1532 +#: wt-status.c:1538 msgid "rebase in progress; onto " msgstr "" -#: wt-status.c:1537 +#: wt-status.c:1543 msgid "HEAD detached at " msgstr "" -#: wt-status.c:1539 +#: wt-status.c:1545 msgid "HEAD detached from " msgstr "" -#: wt-status.c:1542 +#: wt-status.c:1548 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:1560 +#: wt-status.c:1566 msgid "Initial commit" msgstr "" -#: wt-status.c:1574 +#: wt-status.c:1580 msgid "Untracked files" msgstr "" -#: wt-status.c:1576 +#: wt-status.c:1582 msgid "Ignored files" msgstr "" -#: wt-status.c:1580 +#: wt-status.c:1586 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -3592,92 +3876,92 @@ msgid "" "new files yourself (see 'git help status')." msgstr "" -#: wt-status.c:1586 +#: wt-status.c:1592 #, c-format msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:1588 +#: wt-status.c:1594 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:1594 +#: wt-status.c:1600 msgid "No changes" msgstr "" -#: wt-status.c:1599 +#: wt-status.c:1605 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -#: wt-status.c:1602 +#: wt-status.c:1608 #, c-format msgid "no changes added to commit\n" msgstr "" -#: wt-status.c:1605 +#: wt-status.c:1611 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -#: wt-status.c:1608 +#: wt-status.c:1614 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" -#: wt-status.c:1611 +#: wt-status.c:1617 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -#: wt-status.c:1614 wt-status.c:1619 +#: wt-status.c:1620 wt-status.c:1625 #, c-format msgid "nothing to commit\n" msgstr "" -#: wt-status.c:1617 +#: wt-status.c:1623 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -#: wt-status.c:1621 +#: wt-status.c:1627 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "" -#: wt-status.c:1728 +#: wt-status.c:1734 msgid "Initial commit on " msgstr "" -#: wt-status.c:1732 +#: wt-status.c:1738 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:1761 +#: wt-status.c:1767 msgid "gone" msgstr "" -#: wt-status.c:1763 wt-status.c:1771 +#: wt-status.c:1769 wt-status.c:1777 msgid "behind " msgstr "" -#: wt-status.c:1766 wt-status.c:1769 +#: wt-status.c:1772 wt-status.c:1775 msgid "ahead " msgstr "" #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2270 +#: wt-status.c:2277 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "" -#: wt-status.c:2276 +#: wt-status.c:2283 msgid "additionally, your index contains uncommitted changes." msgstr "" -#: wt-status.c:2278 +#: wt-status.c:2285 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "" @@ -3709,7 +3993,7 @@ msgstr "" msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/add.c:209 builtin/rev-parse.c:840 +#: builtin/add.c:209 builtin/rev-parse.c:845 msgid "Could not read the index" msgstr "" @@ -3744,9 +4028,9 @@ msgstr "" msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:111 -#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:521 -#: builtin/remote.c:1326 builtin/rm.c:268 builtin/send-pack.c:162 +#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:123 +#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524 +#: builtin/remote.c:1326 builtin/rm.c:241 builtin/send-pack.c:162 msgid "dry run" msgstr "" @@ -3754,7 +4038,7 @@ msgstr "" msgid "interactive picking" msgstr "" -#: builtin/add.c:270 builtin/checkout.c:1156 builtin/reset.c:286 +#: builtin/add.c:270 builtin/checkout.c:1159 builtin/reset.c:286 msgid "select hunks interactively" msgstr "" @@ -3836,7 +4120,7 @@ msgstr "" #: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279 #: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350 -#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271 #: builtin/submodule--helper.c:244 msgid "index file corrupt" msgstr "" @@ -3953,7 +4237,7 @@ msgstr "" msgid "Failed to merge in the changes." msgstr "" -#: builtin/am.c:1686 builtin/merge.c:628 +#: builtin/am.c:1686 builtin/merge.c:632 msgid "git write-tree failed to write a tree" msgstr "" @@ -3961,8 +4245,8 @@ msgstr "" msgid "applying to an empty history" msgstr "" -#: builtin/am.c:1706 builtin/commit.c:1769 builtin/merge.c:798 -#: builtin/merge.c:823 +#: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802 +#: builtin/merge.c:827 msgid "failed to write commit object" msgstr "" @@ -4066,7 +4350,7 @@ msgid "allow fall back on 3way merging if needed" msgstr "" #: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57 -#: builtin/repack.c:172 +#: builtin/repack.c:178 msgid "be quiet" msgstr "" @@ -4109,15 +4393,15 @@ msgid "pass it through git-apply" msgstr "" #: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 -#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135 -#: builtin/pull.c:194 builtin/repack.c:181 builtin/repack.c:185 -#: builtin/show-branch.c:644 builtin/show-ref.c:175 builtin/tag.c:340 +#: builtin/grep.c:1038 builtin/merge.c:202 builtin/pull.c:135 +#: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191 +#: builtin/show-branch.c:644 builtin/show-ref.c:169 builtin/tag.c:355 #: parse-options.h:132 parse-options.h:134 parse-options.h:245 msgid "n" msgstr "" #: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438 -#: builtin/tag.c:372 +#: builtin/tag.c:387 builtin/verify-tag.c:38 msgid "format" msgstr "" @@ -4153,8 +4437,8 @@ msgstr "" msgid "use current timestamp for author date" msgstr "" -#: builtin/am.c:2315 builtin/commit.c:1605 builtin/merge.c:229 -#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:355 +#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:233 +#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:370 msgid "key-id" msgstr "" @@ -4251,115 +4535,111 @@ msgstr "" msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "" -#: builtin/blame.c:1781 +#: builtin/blame.c:1786 msgid "Blaming lines" msgstr "" -#: builtin/blame.c:2577 +#: builtin/blame.c:2582 msgid "Show blame entries as we find them, incrementally" msgstr "" -#: builtin/blame.c:2578 +#: builtin/blame.c:2583 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" -#: builtin/blame.c:2579 +#: builtin/blame.c:2584 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" -#: builtin/blame.c:2580 +#: builtin/blame.c:2585 msgid "Show work cost statistics" msgstr "" -#: builtin/blame.c:2581 +#: builtin/blame.c:2586 msgid "Force progress reporting" msgstr "" -#: builtin/blame.c:2582 +#: builtin/blame.c:2587 msgid "Show output score for blame entries" msgstr "" -#: builtin/blame.c:2583 +#: builtin/blame.c:2588 msgid "Show original filename (Default: auto)" msgstr "" -#: builtin/blame.c:2584 +#: builtin/blame.c:2589 msgid "Show original linenumber (Default: off)" msgstr "" -#: builtin/blame.c:2585 +#: builtin/blame.c:2590 msgid "Show in a format designed for machine consumption" msgstr "" -#: builtin/blame.c:2586 +#: builtin/blame.c:2591 msgid "Show porcelain format with per-line commit information" msgstr "" -#: builtin/blame.c:2587 +#: builtin/blame.c:2592 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" -#: builtin/blame.c:2588 +#: builtin/blame.c:2593 msgid "Show raw timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2589 +#: builtin/blame.c:2594 msgid "Show long commit SHA1 (Default: off)" msgstr "" -#: builtin/blame.c:2590 +#: builtin/blame.c:2595 msgid "Suppress author name and timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2591 +#: builtin/blame.c:2596 msgid "Show author email instead of name (Default: off)" msgstr "" -#: builtin/blame.c:2592 +#: builtin/blame.c:2597 msgid "Ignore whitespace differences" msgstr "" -#: builtin/blame.c:2599 -msgid "Use an experimental indent-based heuristic to improve diffs" -msgstr "" - -#: builtin/blame.c:2600 -msgid "Use an experimental blank-line-based heuristic to improve diffs" +#: builtin/blame.c:2604 +msgid "Use an experimental heuristic to improve diffs" msgstr "" -#: builtin/blame.c:2602 +#: builtin/blame.c:2606 msgid "Spend extra cycles to find better match" msgstr "" -#: builtin/blame.c:2603 +#: builtin/blame.c:2607 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" -#: builtin/blame.c:2604 +#: builtin/blame.c:2608 msgid "Use <file>'s contents as the final image" msgstr "" -#: builtin/blame.c:2605 builtin/blame.c:2606 +#: builtin/blame.c:2609 builtin/blame.c:2610 msgid "score" msgstr "" -#: builtin/blame.c:2605 +#: builtin/blame.c:2609 msgid "Find line copies within and across files" msgstr "" -#: builtin/blame.c:2606 +#: builtin/blame.c:2610 msgid "Find line movements within and across files" msgstr "" -#: builtin/blame.c:2607 +#: builtin/blame.c:2611 msgid "n,m" msgstr "" -#: builtin/blame.c:2607 +#: builtin/blame.c:2611 msgid "Process only line range n,m, counting from 1" msgstr "" -#: builtin/blame.c:2654 +#: builtin/blame.c:2658 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" @@ -4369,38 +4649,38 @@ msgstr "" #. 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:2700 +#: builtin/blame.c:2706 msgid "4 years, 11 months ago" msgstr "" -#: builtin/blame.c:2780 +#: builtin/blame.c:2786 msgid "--contents and --reverse do not blend well." msgstr "" -#: builtin/blame.c:2800 +#: builtin/blame.c:2806 msgid "cannot use --contents with final commit object name" msgstr "" -#: builtin/blame.c:2805 +#: builtin/blame.c:2811 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" -#: builtin/blame.c:2832 +#: builtin/blame.c:2838 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" -#: builtin/blame.c:2843 +#: builtin/blame.c:2849 #, c-format msgid "no such path %s in %s" msgstr "" -#: builtin/blame.c:2854 +#: builtin/blame.c:2860 #, c-format msgid "cannot read blob %s for path %s" msgstr "" -#: builtin/blame.c:2873 +#: builtin/blame.c:2879 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" @@ -4572,44 +4852,44 @@ msgstr "" msgid "(no branch)" msgstr "" -#: builtin/branch.c:544 +#: builtin/branch.c:535 #, c-format msgid "Branch %s is being rebased at %s" msgstr "" -#: builtin/branch.c:548 +#: builtin/branch.c:539 #, c-format msgid "Branch %s is being bisected at %s" msgstr "" -#: builtin/branch.c:563 +#: builtin/branch.c:554 msgid "cannot rename the current branch while not on any." msgstr "" -#: builtin/branch.c:573 +#: builtin/branch.c:564 #, c-format msgid "Invalid branch name: '%s'" msgstr "" -#: builtin/branch.c:590 +#: builtin/branch.c:581 msgid "Branch rename failed" msgstr "" -#: builtin/branch.c:594 +#: builtin/branch.c:585 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "" -#: builtin/branch.c:597 +#: builtin/branch.c:588 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "" -#: builtin/branch.c:604 +#: builtin/branch.c:595 msgid "Branch is renamed, but update of config-file failed" msgstr "" -#: builtin/branch.c:620 +#: builtin/branch.c:611 #, c-format msgid "" "Please edit the description for the branch\n" @@ -4617,207 +4897,211 @@ msgid "" "Lines starting with '%c' will be stripped.\n" msgstr "" -#: builtin/branch.c:651 +#: builtin/branch.c:643 msgid "Generic options" msgstr "" -#: builtin/branch.c:653 +#: builtin/branch.c:645 msgid "show hash and subject, give twice for upstream branch" msgstr "" -#: builtin/branch.c:654 +#: builtin/branch.c:646 msgid "suppress informational messages" msgstr "" -#: builtin/branch.c:655 +#: builtin/branch.c:647 msgid "set up tracking mode (see git-pull(1))" msgstr "" -#: builtin/branch.c:657 +#: builtin/branch.c:649 msgid "change upstream info" msgstr "" -#: builtin/branch.c:659 +#: builtin/branch.c:651 msgid "upstream" msgstr "" -#: builtin/branch.c:659 +#: builtin/branch.c:651 msgid "change the upstream info" msgstr "" -#: builtin/branch.c:660 +#: builtin/branch.c:652 msgid "Unset the upstream info" msgstr "" -#: builtin/branch.c:661 +#: builtin/branch.c:653 msgid "use colored output" msgstr "" -#: builtin/branch.c:662 +#: builtin/branch.c:654 msgid "act on remote-tracking branches" msgstr "" -#: builtin/branch.c:664 builtin/branch.c:665 +#: builtin/branch.c:656 builtin/branch.c:657 msgid "print only branches that contain the commit" msgstr "" -#: builtin/branch.c:668 +#: builtin/branch.c:660 msgid "Specific git-branch actions:" msgstr "" -#: builtin/branch.c:669 +#: builtin/branch.c:661 msgid "list both remote-tracking and local branches" msgstr "" -#: builtin/branch.c:671 +#: builtin/branch.c:663 msgid "delete fully merged branch" msgstr "" -#: builtin/branch.c:672 +#: builtin/branch.c:664 msgid "delete branch (even if not merged)" msgstr "" -#: builtin/branch.c:673 +#: builtin/branch.c:665 msgid "move/rename a branch and its reflog" msgstr "" -#: builtin/branch.c:674 +#: builtin/branch.c:666 msgid "move/rename a branch, even if target exists" msgstr "" -#: builtin/branch.c:675 +#: builtin/branch.c:667 msgid "list branch names" msgstr "" -#: builtin/branch.c:676 +#: builtin/branch.c:668 msgid "create the branch's reflog" msgstr "" -#: builtin/branch.c:678 +#: builtin/branch.c:670 msgid "edit the description for the branch" msgstr "" -#: builtin/branch.c:679 +#: builtin/branch.c:671 msgid "force creation, move/rename, deletion" msgstr "" -#: builtin/branch.c:680 +#: builtin/branch.c:672 msgid "print only branches that are merged" msgstr "" -#: builtin/branch.c:681 +#: builtin/branch.c:673 msgid "print only branches that are not merged" msgstr "" -#: builtin/branch.c:682 +#: builtin/branch.c:674 msgid "list branches in columns" msgstr "" -#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366 +#: builtin/branch.c:675 builtin/for-each-ref.c:38 builtin/tag.c:381 msgid "key" msgstr "" -#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367 +#: builtin/branch.c:676 builtin/for-each-ref.c:39 builtin/tag.c:382 msgid "field name to sort on" msgstr "" -#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:404 +#: builtin/branch.c:678 builtin/for-each-ref.c:41 builtin/notes.c:404 #: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570 -#: builtin/tag.c:369 +#: builtin/tag.c:384 msgid "object" msgstr "" -#: builtin/branch.c:687 +#: builtin/branch.c:679 msgid "print only branches of the object" msgstr "" -#: builtin/branch.c:705 +#: builtin/branch.c:681 builtin/for-each-ref.c:46 builtin/tag.c:388 +msgid "sorting and filtering are case insensitive" +msgstr "" + +#: builtin/branch.c:698 msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: builtin/branch.c:709 builtin/clone.c:706 +#: builtin/branch.c:702 builtin/clone.c:706 msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:729 +#: builtin/branch.c:724 msgid "--column and --verbose are incompatible" msgstr "" -#: builtin/branch.c:740 builtin/branch.c:782 +#: builtin/branch.c:735 builtin/branch.c:787 msgid "branch name required" msgstr "" -#: builtin/branch.c:758 +#: builtin/branch.c:763 msgid "Cannot give description to detached HEAD" msgstr "" -#: builtin/branch.c:763 +#: builtin/branch.c:768 msgid "cannot edit description of more than one branch" msgstr "" -#: builtin/branch.c:770 +#: builtin/branch.c:775 #, c-format msgid "No commit on branch '%s' yet." msgstr "" -#: builtin/branch.c:773 +#: builtin/branch.c:778 #, c-format msgid "No branch named '%s'." msgstr "" -#: builtin/branch.c:788 +#: builtin/branch.c:793 msgid "too many branches for a rename operation" msgstr "" -#: builtin/branch.c:793 +#: builtin/branch.c:798 msgid "too many branches to set new upstream" msgstr "" -#: builtin/branch.c:797 +#: builtin/branch.c:802 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" -#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843 +#: builtin/branch.c:805 builtin/branch.c:827 builtin/branch.c:848 #, c-format msgid "no such branch '%s'" msgstr "" -#: builtin/branch.c:804 +#: builtin/branch.c:809 #, c-format msgid "branch '%s' does not exist" msgstr "" -#: builtin/branch.c:816 +#: builtin/branch.c:821 msgid "too many branches to unset upstream" msgstr "" -#: builtin/branch.c:820 +#: builtin/branch.c:825 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" -#: builtin/branch.c:826 +#: builtin/branch.c:831 #, c-format msgid "Branch '%s' has no upstream information" msgstr "" -#: builtin/branch.c:840 +#: builtin/branch.c:845 msgid "it does not make sense to create 'HEAD' manually" msgstr "" -#: builtin/branch.c:846 +#: builtin/branch.c:851 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" -#: builtin/branch.c:849 +#: builtin/branch.c:854 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" "track or --set-upstream-to\n" msgstr "" -#: builtin/branch.c:866 +#: builtin/branch.c:871 #, c-format msgid "" "\n" @@ -4878,7 +5162,7 @@ msgstr "" msgid "for blob objects, run filters on object's content" msgstr "" -#: builtin/cat-file.c:561 git-submodule.sh:923 +#: builtin/cat-file.c:561 git-submodule.sh:929 msgid "blob" msgstr "" @@ -4934,7 +5218,7 @@ msgstr "" msgid "terminate input and output records by a NUL character" msgstr "" -#: builtin/check-ignore.c:18 builtin/checkout.c:1137 builtin/gc.c:325 +#: builtin/check-ignore.c:18 builtin/checkout.c:1140 builtin/gc.c:332 msgid "suppress progress reporting" msgstr "" @@ -5024,9 +5308,9 @@ msgid "write the content to temporary files" msgstr "" #: builtin/checkout-index.c:174 builtin/column.c:30 -#: builtin/submodule--helper.c:595 builtin/submodule--helper.c:598 -#: builtin/submodule--helper.c:604 builtin/submodule--helper.c:951 -#: builtin/worktree.c:469 +#: builtin/submodule--helper.c:597 builtin/submodule--helper.c:600 +#: builtin/submodule--helper.c:606 builtin/submodule--helper.c:967 +#: builtin/worktree.c:471 msgid "string" msgstr "" @@ -5101,50 +5385,50 @@ msgstr "" msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:624 +#: builtin/checkout.c:625 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "" -#: builtin/checkout.c:663 +#: builtin/checkout.c:666 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:667 builtin/clone.c:660 +#: builtin/checkout.c:670 builtin/clone.c:660 msgid "unable to update HEAD" msgstr "" -#: builtin/checkout.c:671 +#: builtin/checkout.c:674 #, c-format msgid "Reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:674 +#: builtin/checkout.c:677 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:678 +#: builtin/checkout.c:681 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:680 builtin/checkout.c:1069 +#: builtin/checkout.c:683 builtin/checkout.c:1072 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:682 +#: builtin/checkout.c:685 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:733 +#: builtin/checkout.c:736 #, c-format msgid " ... and %d more.\n" msgstr "" -#: builtin/checkout.c:739 +#: builtin/checkout.c:742 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -5159,7 +5443,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:758 +#: builtin/checkout.c:761 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -5176,162 +5460,162 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:794 +#: builtin/checkout.c:797 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:798 +#: builtin/checkout.c:801 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:825 builtin/checkout.c:1064 +#: builtin/checkout.c:828 builtin/checkout.c:1067 msgid "You are on a branch yet to be born" msgstr "" -#: builtin/checkout.c:970 +#: builtin/checkout.c:973 #, c-format msgid "only one reference expected, %d given." msgstr "" -#: builtin/checkout.c:1010 builtin/worktree.c:214 +#: builtin/checkout.c:1013 builtin/worktree.c:214 #, c-format msgid "invalid reference: %s" msgstr "" -#: builtin/checkout.c:1039 +#: builtin/checkout.c:1042 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:1078 +#: builtin/checkout.c:1081 msgid "paths cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1081 builtin/checkout.c:1085 +#: builtin/checkout.c:1084 builtin/checkout.c:1088 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1089 builtin/checkout.c:1092 builtin/checkout.c:1097 -#: builtin/checkout.c:1100 +#: builtin/checkout.c:1092 builtin/checkout.c:1095 builtin/checkout.c:1100 +#: builtin/checkout.c:1103 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "" -#: builtin/checkout.c:1105 +#: builtin/checkout.c:1108 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" -#: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:93 +#: builtin/checkout.c:1141 builtin/checkout.c:1143 builtin/clone.c:93 #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324 #: builtin/worktree.c:326 msgid "branch" msgstr "" -#: builtin/checkout.c:1139 +#: builtin/checkout.c:1142 msgid "create and checkout a new branch" msgstr "" -#: builtin/checkout.c:1141 +#: builtin/checkout.c:1144 msgid "create/reset and checkout a branch" msgstr "" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1145 msgid "create reflog for new branch" msgstr "" -#: builtin/checkout.c:1143 builtin/worktree.c:328 +#: builtin/checkout.c:1146 builtin/worktree.c:328 msgid "detach HEAD at named commit" msgstr "" -#: builtin/checkout.c:1144 +#: builtin/checkout.c:1147 msgid "set upstream info for new branch" msgstr "" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1149 msgid "new-branch" msgstr "" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1149 msgid "new unparented branch" msgstr "" -#: builtin/checkout.c:1147 +#: builtin/checkout.c:1150 msgid "checkout our version for unmerged files" msgstr "" -#: builtin/checkout.c:1149 +#: builtin/checkout.c:1152 msgid "checkout their version for unmerged files" msgstr "" -#: builtin/checkout.c:1151 +#: builtin/checkout.c:1154 msgid "force checkout (throw away local modifications)" msgstr "" -#: builtin/checkout.c:1152 +#: builtin/checkout.c:1155 msgid "perform a 3-way merge with the new branch" msgstr "" -#: builtin/checkout.c:1153 builtin/merge.c:231 +#: builtin/checkout.c:1156 builtin/merge.c:235 msgid "update ignored files (default)" msgstr "" -#: builtin/checkout.c:1154 builtin/log.c:1466 parse-options.h:251 +#: builtin/checkout.c:1157 builtin/log.c:1466 parse-options.h:251 msgid "style" msgstr "" -#: builtin/checkout.c:1155 +#: builtin/checkout.c:1158 msgid "conflict style (merge or diff3)" msgstr "" -#: builtin/checkout.c:1158 +#: builtin/checkout.c:1161 msgid "do not limit pathspecs to sparse entries only" msgstr "" -#: builtin/checkout.c:1160 +#: builtin/checkout.c:1163 msgid "second guess 'git checkout <no-such-branch>'" msgstr "" -#: builtin/checkout.c:1162 +#: builtin/checkout.c:1165 msgid "do not check if another worktree is holding the given ref" msgstr "" -#: builtin/checkout.c:1163 builtin/clone.c:63 builtin/fetch.c:119 -#: builtin/merge.c:228 builtin/pull.c:117 builtin/push.c:536 +#: builtin/checkout.c:1166 builtin/clone.c:63 builtin/fetch.c:119 +#: builtin/merge.c:232 builtin/pull.c:117 builtin/push.c:539 #: builtin/send-pack.c:168 msgid "force progress reporting" msgstr "" -#: builtin/checkout.c:1194 +#: builtin/checkout.c:1197 msgid "-b, -B and --orphan are mutually exclusive" msgstr "" -#: builtin/checkout.c:1211 +#: builtin/checkout.c:1214 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:1216 +#: builtin/checkout.c:1219 msgid "Missing branch name; try -b" msgstr "" -#: builtin/checkout.c:1252 +#: builtin/checkout.c:1255 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1259 +#: builtin/checkout.c:1262 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" "Did you intend to checkout '%s' which can not be resolved as commit?" msgstr "" -#: builtin/checkout.c:1264 +#: builtin/checkout.c:1267 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" -#: builtin/checkout.c:1268 +#: builtin/checkout.c:1271 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -5367,15 +5651,17 @@ msgstr "" msgid "failed to remove %s" msgstr "" -#: builtin/clean.c:291 +#: builtin/clean.c:291 git-add--interactive.perl:623 +#, c-format msgid "" "Prompt help:\n" "1 - select a numbered item\n" "foo - select item based on unique prefix\n" -" - (empty) select nothing" +" - (empty) select nothing\n" msgstr "" -#: builtin/clean.c:295 +#: builtin/clean.c:295 git-add--interactive.perl:632 +#, c-format msgid "" "Prompt help:\n" "1 - select a single item\n" @@ -5384,12 +5670,13 @@ msgid "" "foo - select item based on unique prefix\n" "-... - unselect specified items\n" "* - choose all items\n" -" - (empty) finish selecting" +" - (empty) finish selecting\n" msgstr "" -#: builtin/clean.c:511 -#, c-format -msgid "Huh (%s)?" +#: builtin/clean.c:511 git-add--interactive.perl:598 +#: git-add--interactive.perl:603 +#, c-format, perl-format +msgid "Huh (%s)?\n" msgstr "" #: builtin/clean.c:653 @@ -5412,8 +5699,9 @@ msgstr "" msgid "Remove %s [y/N]? " msgstr "" -#: builtin/clean.c:777 -msgid "Bye." +#: builtin/clean.c:777 git-add--interactive.perl:1669 +#, c-format +msgid "Bye.\n" msgstr "" #: builtin/clean.c:785 @@ -5427,11 +5715,11 @@ msgid "" "? - help for prompt selection" msgstr "" -#: builtin/clean.c:812 +#: builtin/clean.c:812 git-add--interactive.perl:1745 msgid "*** Commands ***" msgstr "" -#: builtin/clean.c:813 +#: builtin/clean.c:813 git-add--interactive.perl:1742 msgid "What now" msgstr "" @@ -5461,8 +5749,8 @@ msgstr "" msgid "remove whole directories" msgstr "" -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:725 -#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:182 +#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:1056 +#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:176 msgid "pattern" msgstr "" @@ -5538,8 +5826,8 @@ msgstr "" msgid "directory from which templates will be used" msgstr "" -#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:602 -#: builtin/submodule--helper.c:954 +#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:604 +#: builtin/submodule--helper.c:970 msgid "reference repository" msgstr "" @@ -5563,7 +5851,7 @@ msgstr "" msgid "path to git-upload-pack on the remote" msgstr "" -#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668 +#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:999 #: builtin/pull.c:202 msgid "depth" msgstr "" @@ -5572,7 +5860,7 @@ msgstr "" msgid "create a shallow clone of that depth" msgstr "" -#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848 +#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2836 #: parse-options.h:142 msgid "time" msgstr "" @@ -5586,7 +5874,7 @@ msgid "revision" msgstr "" #: builtin/clone.c:102 builtin/fetch.c:125 -msgid "deepen history of shallow clone by excluding rev" +msgid "deepen history of shallow clone, excluding rev" msgstr "" #: builtin/clone.c:104 @@ -5613,11 +5901,11 @@ msgstr "" msgid "set config inside the new repository" msgstr "" -#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:547 +#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:550 msgid "use IPv4 addresses only" msgstr "" -#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:549 +#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:552 msgid "use IPv6 addresses only" msgstr "" @@ -5725,7 +6013,7 @@ msgstr "" msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:905 builtin/fetch.c:1338 +#: builtin/clone.c:905 builtin/fetch.c:1335 #, c-format msgid "depth %s is not a positive number" msgstr "" @@ -5740,8 +6028,9 @@ msgstr "" msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:940 builtin/clone.c:951 builtin/submodule--helper.c:657 -#: builtin/worktree.c:222 builtin/worktree.c:249 +#: builtin/clone.c:940 builtin/clone.c:951 builtin/difftool.c:252 +#: builtin/submodule--helper.c:659 builtin/worktree.c:222 +#: builtin/worktree.c:249 #, c-format msgid "could not create leading directories of '%s'" msgstr "" @@ -5970,7 +6259,7 @@ msgstr "" msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:704 builtin/shortlog.c:286 +#: builtin/commit.c:704 builtin/shortlog.c:295 #, c-format msgid "(reading log message from standard input)\n" msgstr "" @@ -6054,7 +6343,7 @@ msgstr "" msgid "Error building trees" msgstr "" -#: builtin/commit.c:969 builtin/tag.c:266 +#: builtin/commit.c:968 builtin/tag.c:280 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" @@ -6064,7 +6353,7 @@ msgstr "" msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" -#: builtin/commit.c:1086 builtin/commit.c:1327 +#: builtin/commit.c:1086 builtin/commit.c:1325 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" @@ -6114,262 +6403,258 @@ msgid "No paths with --include/--only does not make sense." msgstr "" #: builtin/commit.c:1212 -msgid "Clever... amending the last one with dirty index." -msgstr "" - -#: builtin/commit.c:1214 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" -#: builtin/commit.c:1226 builtin/tag.c:474 +#: builtin/commit.c:1224 builtin/tag.c:495 #, c-format msgid "Invalid cleanup mode %s" msgstr "" -#: builtin/commit.c:1231 +#: builtin/commit.c:1229 msgid "Paths with -a does not make sense." msgstr "" -#: builtin/commit.c:1341 builtin/commit.c:1617 +#: builtin/commit.c:1339 builtin/commit.c:1612 msgid "show status concisely" msgstr "" -#: builtin/commit.c:1343 builtin/commit.c:1619 +#: builtin/commit.c:1341 builtin/commit.c:1614 msgid "show branch information" msgstr "" -#: builtin/commit.c:1345 +#: builtin/commit.c:1343 msgid "version" msgstr "" -#: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522 -#: builtin/worktree.c:440 +#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525 +#: builtin/worktree.c:442 msgid "machine-readable output" msgstr "" -#: builtin/commit.c:1348 builtin/commit.c:1623 +#: builtin/commit.c:1346 builtin/commit.c:1618 msgid "show status in long format (default)" msgstr "" -#: builtin/commit.c:1351 builtin/commit.c:1626 +#: builtin/commit.c:1349 builtin/commit.c:1621 msgid "terminate entries with NUL" msgstr "" -#: builtin/commit.c:1353 builtin/commit.c:1629 builtin/fast-export.c:981 -#: builtin/fast-export.c:984 builtin/tag.c:353 +#: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981 +#: builtin/fast-export.c:984 builtin/tag.c:368 msgid "mode" msgstr "" -#: builtin/commit.c:1354 builtin/commit.c:1629 +#: builtin/commit.c:1352 builtin/commit.c:1624 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -#: builtin/commit.c:1357 +#: builtin/commit.c:1355 msgid "show ignored files" msgstr "" -#: builtin/commit.c:1358 parse-options.h:155 +#: builtin/commit.c:1356 parse-options.h:155 msgid "when" msgstr "" -#: builtin/commit.c:1359 +#: builtin/commit.c:1357 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" -#: builtin/commit.c:1361 +#: builtin/commit.c:1359 msgid "list untracked files in columns" msgstr "" -#: builtin/commit.c:1437 +#: builtin/commit.c:1435 msgid "couldn't look up newly created commit" msgstr "" -#: builtin/commit.c:1439 +#: builtin/commit.c:1437 msgid "could not parse newly created commit" msgstr "" -#: builtin/commit.c:1484 +#: builtin/commit.c:1482 msgid "detached HEAD" msgstr "" -#: builtin/commit.c:1487 +#: builtin/commit.c:1485 msgid " (root-commit)" msgstr "" -#: builtin/commit.c:1587 +#: builtin/commit.c:1582 msgid "suppress summary after successful commit" msgstr "" -#: builtin/commit.c:1588 +#: builtin/commit.c:1583 msgid "show diff in commit message template" msgstr "" -#: builtin/commit.c:1590 +#: builtin/commit.c:1585 msgid "Commit message options" msgstr "" -#: builtin/commit.c:1591 builtin/tag.c:351 +#: builtin/commit.c:1586 builtin/tag.c:366 msgid "read message from file" msgstr "" -#: builtin/commit.c:1592 +#: builtin/commit.c:1587 msgid "author" msgstr "" -#: builtin/commit.c:1592 +#: builtin/commit.c:1587 msgid "override author for commit" msgstr "" -#: builtin/commit.c:1593 builtin/gc.c:326 +#: builtin/commit.c:1588 builtin/gc.c:333 msgid "date" msgstr "" -#: builtin/commit.c:1593 +#: builtin/commit.c:1588 msgid "override date for commit" msgstr "" -#: builtin/commit.c:1594 builtin/merge.c:220 builtin/notes.c:398 -#: builtin/notes.c:561 builtin/tag.c:349 +#: builtin/commit.c:1589 builtin/merge.c:222 builtin/notes.c:398 +#: builtin/notes.c:561 builtin/tag.c:364 msgid "message" msgstr "" -#: builtin/commit.c:1594 +#: builtin/commit.c:1589 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:79 +#: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592 +#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:81 msgid "commit" msgstr "" -#: builtin/commit.c:1595 +#: builtin/commit.c:1590 msgid "reuse and edit message from specified commit" msgstr "" -#: builtin/commit.c:1596 +#: builtin/commit.c:1591 msgid "reuse message from specified commit" msgstr "" -#: builtin/commit.c:1597 +#: builtin/commit.c:1592 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -#: builtin/commit.c:1598 +#: builtin/commit.c:1593 msgid "use autosquash formatted message to squash specified commit" msgstr "" -#: builtin/commit.c:1599 +#: builtin/commit.c:1594 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1600 builtin/log.c:1413 builtin/revert.c:86 +#: builtin/commit.c:1595 builtin/log.c:1413 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "" -#: builtin/commit.c:1601 +#: builtin/commit.c:1596 msgid "use specified template file" msgstr "" -#: builtin/commit.c:1602 +#: builtin/commit.c:1597 msgid "force edit of commit" msgstr "" -#: builtin/commit.c:1603 +#: builtin/commit.c:1598 msgid "default" msgstr "" -#: builtin/commit.c:1603 builtin/tag.c:354 +#: builtin/commit.c:1598 builtin/tag.c:369 msgid "how to strip spaces and #comments from message" msgstr "" -#: builtin/commit.c:1604 +#: builtin/commit.c:1599 msgid "include status in commit message template" msgstr "" -#: builtin/commit.c:1606 builtin/merge.c:230 builtin/pull.c:166 +#: builtin/commit.c:1601 builtin/merge.c:234 builtin/pull.c:166 #: builtin/revert.c:93 msgid "GPG sign commit" msgstr "" -#: builtin/commit.c:1609 +#: builtin/commit.c:1604 msgid "Commit contents options" msgstr "" -#: builtin/commit.c:1610 +#: builtin/commit.c:1605 msgid "commit all changed files" msgstr "" -#: builtin/commit.c:1611 +#: builtin/commit.c:1606 msgid "add specified files to index for commit" msgstr "" -#: builtin/commit.c:1612 +#: builtin/commit.c:1607 msgid "interactively add files" msgstr "" -#: builtin/commit.c:1613 +#: builtin/commit.c:1608 msgid "interactively add changes" msgstr "" -#: builtin/commit.c:1614 +#: builtin/commit.c:1609 msgid "commit only specified files" msgstr "" -#: builtin/commit.c:1615 +#: builtin/commit.c:1610 msgid "bypass pre-commit and commit-msg hooks" msgstr "" -#: builtin/commit.c:1616 +#: builtin/commit.c:1611 msgid "show what would be committed" msgstr "" -#: builtin/commit.c:1627 +#: builtin/commit.c:1622 msgid "amend previous commit" msgstr "" -#: builtin/commit.c:1628 +#: builtin/commit.c:1623 msgid "bypass post-rewrite hook" msgstr "" -#: builtin/commit.c:1633 +#: builtin/commit.c:1628 msgid "ok to record an empty change" msgstr "" -#: builtin/commit.c:1635 +#: builtin/commit.c:1630 msgid "ok to record a change with an empty message" msgstr "" -#: builtin/commit.c:1664 +#: builtin/commit.c:1659 msgid "could not parse HEAD commit" msgstr "" -#: builtin/commit.c:1712 +#: builtin/commit.c:1707 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1719 +#: builtin/commit.c:1714 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1738 +#: builtin/commit.c:1733 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1749 +#: builtin/commit.c:1744 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1754 +#: builtin/commit.c:1749 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1802 +#: builtin/commit.c:1797 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -6705,6 +6990,89 @@ msgstr "" msgid "unhandled object '%s' given." msgstr "" +#: builtin/difftool.c:28 +msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" +msgstr "" + +#: builtin/difftool.c:241 +#, c-format +msgid "failed: %d" +msgstr "" + +#: builtin/difftool.c:342 +msgid "" +"combined diff formats('-c' and '--cc') are not supported in\n" +"directory diff mode('-d' and '--dir-diff')." +msgstr "" + +#: builtin/difftool.c:567 +#, c-format +msgid "both files modified: '%s' and '%s'." +msgstr "" + +#: builtin/difftool.c:569 +msgid "working tree file has been left." +msgstr "" + +#: builtin/difftool.c:580 +#, c-format +msgid "temporary files exist in '%s'." +msgstr "" + +#: builtin/difftool.c:581 +msgid "you may want to cleanup or recover these." +msgstr "" + +#: builtin/difftool.c:626 +msgid "use `diff.guitool` instead of `diff.tool`" +msgstr "" + +#: builtin/difftool.c:628 +msgid "perform a full-directory diff" +msgstr "" + +#: builtin/difftool.c:630 +msgid "do not prompt before launching a diff tool" +msgstr "" + +#: builtin/difftool.c:636 +msgid "use symlinks in dir-diff mode" +msgstr "" + +#: builtin/difftool.c:637 +msgid "<tool>" +msgstr "" + +#: builtin/difftool.c:638 +msgid "use the specified diff tool" +msgstr "" + +#: builtin/difftool.c:640 +msgid "print a list of diff tools that may be used with `--tool`" +msgstr "" + +#: builtin/difftool.c:643 +msgid "" +"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " +"code" +msgstr "" + +#: builtin/difftool.c:645 +msgid "<command>" +msgstr "" + +#: builtin/difftool.c:646 +msgid "specify a custom command for viewing diffs" +msgstr "" + +#: builtin/difftool.c:670 +msgid "no <tool> given for --tool=<tool>" +msgstr "" + +#: builtin/difftool.c:677 +msgid "no <cmd> given for --extcmd=<cmd>" +msgstr "" + #: builtin/fast-export.c:25 msgid "git fast-export [rev-list-opts]" msgstr "" @@ -6861,171 +7229,171 @@ msgstr "" msgid "specify fetch refmap" msgstr "" -#: builtin/fetch.c:398 +#: builtin/fetch.c:395 msgid "Couldn't find remote ref HEAD" msgstr "" -#: builtin/fetch.c:514 +#: builtin/fetch.c:511 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "" -#: builtin/fetch.c:607 +#: builtin/fetch.c:604 #, c-format msgid "object %s not found" msgstr "" -#: builtin/fetch.c:611 +#: builtin/fetch.c:608 msgid "[up to date]" msgstr "" -#: builtin/fetch.c:624 builtin/fetch.c:704 +#: builtin/fetch.c:621 builtin/fetch.c:701 msgid "[rejected]" msgstr "" -#: builtin/fetch.c:625 +#: builtin/fetch.c:622 msgid "can't fetch in current branch" msgstr "" -#: builtin/fetch.c:634 +#: builtin/fetch.c:631 msgid "[tag update]" msgstr "" -#: builtin/fetch.c:635 builtin/fetch.c:668 builtin/fetch.c:684 -#: builtin/fetch.c:699 +#: builtin/fetch.c:632 builtin/fetch.c:665 builtin/fetch.c:681 +#: builtin/fetch.c:696 msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:654 +#: builtin/fetch.c:651 msgid "[new tag]" msgstr "" -#: builtin/fetch.c:657 +#: builtin/fetch.c:654 msgid "[new branch]" msgstr "" -#: builtin/fetch.c:660 +#: builtin/fetch.c:657 msgid "[new ref]" msgstr "" -#: builtin/fetch.c:699 +#: builtin/fetch.c:696 msgid "forced update" msgstr "" -#: builtin/fetch.c:704 +#: builtin/fetch.c:701 msgid "non-fast-forward" msgstr "" -#: builtin/fetch.c:749 +#: builtin/fetch.c:746 #, c-format msgid "%s did not send all necessary objects\n" msgstr "" -#: builtin/fetch.c:769 +#: builtin/fetch.c:766 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" -#: builtin/fetch.c:856 builtin/fetch.c:952 +#: builtin/fetch.c:853 builtin/fetch.c:949 #, c-format msgid "From %.*s\n" msgstr "" -#: builtin/fetch.c:867 +#: builtin/fetch.c:864 #, 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:922 +#: builtin/fetch.c:919 #, c-format msgid " (%s will become dangling)" msgstr "" -#: builtin/fetch.c:923 +#: builtin/fetch.c:920 #, c-format msgid " (%s has become dangling)" msgstr "" -#: builtin/fetch.c:955 +#: builtin/fetch.c:952 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:956 builtin/remote.c:1020 +#: builtin/fetch.c:953 builtin/remote.c:1020 msgid "(none)" msgstr "" -#: builtin/fetch.c:979 +#: builtin/fetch.c:976 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:998 +#: builtin/fetch.c:995 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/fetch.c:1001 +#: builtin/fetch.c:998 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" -#: builtin/fetch.c:1077 +#: builtin/fetch.c:1074 #, c-format msgid "Don't know how to fetch from %s" msgstr "" -#: builtin/fetch.c:1237 +#: builtin/fetch.c:1234 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:1239 builtin/remote.c:96 +#: builtin/fetch.c:1236 builtin/remote.c:96 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:1257 +#: builtin/fetch.c:1254 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:1280 +#: builtin/fetch.c:1277 msgid "You need to specify a tag name." msgstr "" -#: builtin/fetch.c:1322 +#: builtin/fetch.c:1319 msgid "Negative depth in --deepen is not supported" msgstr "" -#: builtin/fetch.c:1324 +#: builtin/fetch.c:1321 msgid "--deepen and --depth are mutually exclusive" msgstr "" -#: builtin/fetch.c:1329 +#: builtin/fetch.c:1326 msgid "--depth and --unshallow cannot be used together" msgstr "" -#: builtin/fetch.c:1331 +#: builtin/fetch.c:1328 msgid "--unshallow on a complete repository does not make sense" msgstr "" -#: builtin/fetch.c:1353 +#: builtin/fetch.c:1350 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:1355 +#: builtin/fetch.c:1352 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:1366 +#: builtin/fetch.c:1363 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:1374 +#: builtin/fetch.c:1371 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" @@ -7090,7 +7458,7 @@ msgstr "" msgid "show only <n> matched refs" msgstr "" -#: builtin/for-each-ref.c:37 builtin/tag.c:372 +#: builtin/for-each-ref.c:37 builtin/tag.c:387 builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "" @@ -7110,63 +7478,63 @@ msgstr "" msgid "print only refs which contain the commit" msgstr "" -#: builtin/fsck.c:519 +#: builtin/fsck.c:554 msgid "Checking object directories" msgstr "" -#: builtin/fsck.c:588 +#: builtin/fsck.c:646 msgid "git fsck [<options>] [<object>...]" msgstr "" -#: builtin/fsck.c:594 +#: builtin/fsck.c:652 msgid "show unreachable objects" msgstr "" -#: builtin/fsck.c:595 +#: builtin/fsck.c:653 msgid "show dangling objects" msgstr "" -#: builtin/fsck.c:596 +#: builtin/fsck.c:654 msgid "report tags" msgstr "" -#: builtin/fsck.c:597 +#: builtin/fsck.c:655 msgid "report root nodes" msgstr "" -#: builtin/fsck.c:598 +#: builtin/fsck.c:656 msgid "make index objects head nodes" msgstr "" -#: builtin/fsck.c:599 +#: builtin/fsck.c:657 msgid "make reflogs head nodes (default)" msgstr "" -#: builtin/fsck.c:600 +#: builtin/fsck.c:658 msgid "also consider packs and alternate objects" msgstr "" -#: builtin/fsck.c:601 +#: builtin/fsck.c:659 msgid "check only connectivity" msgstr "" -#: builtin/fsck.c:602 +#: builtin/fsck.c:660 msgid "enable more strict checking" msgstr "" -#: builtin/fsck.c:604 +#: builtin/fsck.c:662 msgid "write dangling objects in .git/lost-found" msgstr "" -#: builtin/fsck.c:605 builtin/prune.c:107 +#: builtin/fsck.c:663 builtin/prune.c:107 msgid "show progress" msgstr "" -#: builtin/fsck.c:606 +#: builtin/fsck.c:664 msgid "show verbose names for reachable objects" msgstr "" -#: builtin/fsck.c:665 +#: builtin/fsck.c:725 msgid "Checking objects" msgstr "" @@ -7184,7 +7552,7 @@ msgstr "" msgid "insanely long object directory %.*s" msgstr "" -#: builtin/gc.c:290 +#: builtin/gc.c:297 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -7194,275 +7562,291 @@ msgid "" "%s" msgstr "" -#: builtin/gc.c:327 +#: builtin/gc.c:334 msgid "prune unreferenced objects" msgstr "" -#: builtin/gc.c:329 +#: builtin/gc.c:336 msgid "be more thorough (increased runtime)" msgstr "" -#: builtin/gc.c:330 +#: builtin/gc.c:337 msgid "enable auto-gc mode" msgstr "" -#: builtin/gc.c:331 +#: builtin/gc.c:338 msgid "force running gc even if there may be another gc running" msgstr "" -#: builtin/gc.c:373 +#: builtin/gc.c:380 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" -#: builtin/gc.c:375 +#: builtin/gc.c:382 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "" -#: builtin/gc.c:376 +#: builtin/gc.c:383 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "" -#: builtin/gc.c:397 +#: builtin/gc.c:404 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "" -#: builtin/gc.c:441 +#: builtin/gc.c:448 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" -#: builtin/grep.c:23 +#: builtin/grep.c:25 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "" -#: builtin/grep.c:219 +#: builtin/grep.c:232 #, c-format msgid "grep: failed to create thread: %s" msgstr "" -#: builtin/grep.c:277 +#: builtin/grep.c:290 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "" -#: builtin/grep.c:453 builtin/grep.c:488 +#: builtin/grep.c:763 builtin/grep.c:804 #, c-format msgid "unable to read tree (%s)" msgstr "" -#: builtin/grep.c:503 +#: builtin/grep.c:823 #, c-format msgid "unable to grep from object of type %s" msgstr "" -#: builtin/grep.c:561 +#: builtin/grep.c:887 #, c-format msgid "switch `%c' expects a numerical value" msgstr "" -#: builtin/grep.c:647 +#: builtin/grep.c:973 msgid "search in index instead of in the work tree" msgstr "" -#: builtin/grep.c:649 +#: builtin/grep.c:975 msgid "find in contents not managed by git" msgstr "" -#: builtin/grep.c:651 +#: builtin/grep.c:977 msgid "search in both tracked and untracked files" msgstr "" -#: builtin/grep.c:653 +#: builtin/grep.c:979 msgid "ignore files specified via '.gitignore'" msgstr "" -#: builtin/grep.c:656 +#: builtin/grep.c:981 +msgid "recursivley search in each submodule" +msgstr "" + +#: builtin/grep.c:983 +msgid "basename" +msgstr "" + +#: builtin/grep.c:984 +msgid "prepend parent project's basename to output" +msgstr "" + +#: builtin/grep.c:987 msgid "show non-matching lines" msgstr "" -#: builtin/grep.c:658 +#: builtin/grep.c:989 msgid "case insensitive matching" msgstr "" -#: builtin/grep.c:660 +#: builtin/grep.c:991 msgid "match patterns only at word boundaries" msgstr "" -#: builtin/grep.c:662 +#: builtin/grep.c:993 msgid "process binary files as text" msgstr "" -#: builtin/grep.c:664 +#: builtin/grep.c:995 msgid "don't match patterns in binary files" msgstr "" -#: builtin/grep.c:667 +#: builtin/grep.c:998 msgid "process binary files with textconv filters" msgstr "" -#: builtin/grep.c:669 +#: builtin/grep.c:1000 msgid "descend at most <depth> levels" msgstr "" -#: builtin/grep.c:673 +#: builtin/grep.c:1004 msgid "use extended POSIX regular expressions" msgstr "" -#: builtin/grep.c:676 +#: builtin/grep.c:1007 msgid "use basic POSIX regular expressions (default)" msgstr "" -#: builtin/grep.c:679 +#: builtin/grep.c:1010 msgid "interpret patterns as fixed strings" msgstr "" -#: builtin/grep.c:682 +#: builtin/grep.c:1013 msgid "use Perl-compatible regular expressions" msgstr "" -#: builtin/grep.c:685 +#: builtin/grep.c:1016 msgid "show line numbers" msgstr "" -#: builtin/grep.c:686 +#: builtin/grep.c:1017 msgid "don't show filenames" msgstr "" -#: builtin/grep.c:687 +#: builtin/grep.c:1018 msgid "show filenames" msgstr "" -#: builtin/grep.c:689 +#: builtin/grep.c:1020 msgid "show filenames relative to top directory" msgstr "" -#: builtin/grep.c:691 +#: builtin/grep.c:1022 msgid "show only filenames instead of matching lines" msgstr "" -#: builtin/grep.c:693 +#: builtin/grep.c:1024 msgid "synonym for --files-with-matches" msgstr "" -#: builtin/grep.c:696 +#: builtin/grep.c:1027 msgid "show only the names of files without match" msgstr "" -#: builtin/grep.c:698 +#: builtin/grep.c:1029 msgid "print NUL after filenames" msgstr "" -#: builtin/grep.c:700 +#: builtin/grep.c:1031 msgid "show the number of matches instead of matching lines" msgstr "" -#: builtin/grep.c:701 +#: builtin/grep.c:1032 msgid "highlight matches" msgstr "" -#: builtin/grep.c:703 +#: builtin/grep.c:1034 msgid "print empty line between matches from different files" msgstr "" -#: builtin/grep.c:705 +#: builtin/grep.c:1036 msgid "show filename only once above matches from same file" msgstr "" -#: builtin/grep.c:708 +#: builtin/grep.c:1039 msgid "show <n> context lines before and after matches" msgstr "" -#: builtin/grep.c:711 +#: builtin/grep.c:1042 msgid "show <n> context lines before matches" msgstr "" -#: builtin/grep.c:713 +#: builtin/grep.c:1044 msgid "show <n> context lines after matches" msgstr "" -#: builtin/grep.c:715 +#: builtin/grep.c:1046 msgid "use <n> worker threads" msgstr "" -#: builtin/grep.c:716 +#: builtin/grep.c:1047 msgid "shortcut for -C NUM" msgstr "" -#: builtin/grep.c:719 +#: builtin/grep.c:1050 msgid "show a line with the function name before matches" msgstr "" -#: builtin/grep.c:721 +#: builtin/grep.c:1052 msgid "show the surrounding function" msgstr "" -#: builtin/grep.c:724 +#: builtin/grep.c:1055 msgid "read patterns from file" msgstr "" -#: builtin/grep.c:726 +#: builtin/grep.c:1057 msgid "match <pattern>" msgstr "" -#: builtin/grep.c:728 +#: builtin/grep.c:1059 msgid "combine patterns specified with -e" msgstr "" -#: builtin/grep.c:740 +#: builtin/grep.c:1071 msgid "indicate hit with exit status without output" msgstr "" -#: builtin/grep.c:742 +#: builtin/grep.c:1073 msgid "show only matches from files that match all patterns" msgstr "" -#: builtin/grep.c:744 +#: builtin/grep.c:1075 msgid "show parse tree for grep expression" msgstr "" -#: builtin/grep.c:748 +#: builtin/grep.c:1079 msgid "pager" msgstr "" -#: builtin/grep.c:748 +#: builtin/grep.c:1079 msgid "show matching files in the pager" msgstr "" -#: builtin/grep.c:751 +#: builtin/grep.c:1082 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" -#: builtin/grep.c:814 +#: builtin/grep.c:1146 msgid "no pattern given." msgstr "" -#: builtin/grep.c:846 builtin/index-pack.c:1480 +#: builtin/grep.c:1178 builtin/index-pack.c:1482 #, c-format msgid "invalid number of threads specified (%d)" msgstr "" -#: builtin/grep.c:876 +#: builtin/grep.c:1215 msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/grep.c:902 +#: builtin/grep.c:1238 +msgid "option not supported with --recurse-submodules." +msgstr "" + +#: builtin/grep.c:1244 msgid "--cached or --untracked cannot be used with --no-index." msgstr "" -#: builtin/grep.c:907 +#: builtin/grep.c:1249 msgid "--no-index or --untracked cannot be used with revs." msgstr "" -#: builtin/grep.c:910 +#: builtin/grep.c:1252 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" -#: builtin/grep.c:918 +#: builtin/grep.c:1260 msgid "both --cached and trees are given." msgstr "" @@ -7734,183 +8118,187 @@ msgid "serious inflate inconsistency" msgstr "" #: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777 -#: builtin/index-pack.c:811 builtin/index-pack.c:820 +#: builtin/index-pack.c:813 builtin/index-pack.c:822 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" -#: builtin/index-pack.c:751 builtin/pack-objects.c:166 -#: builtin/pack-objects.c:258 +#: builtin/index-pack.c:751 builtin/pack-objects.c:164 +#: builtin/pack-objects.c:256 #, c-format msgid "unable to read %s" msgstr "" -#: builtin/index-pack.c:817 +#: builtin/index-pack.c:819 #, c-format msgid "cannot read existing object %s" msgstr "" -#: builtin/index-pack.c:831 +#: builtin/index-pack.c:833 #, c-format msgid "invalid blob object %s" msgstr "" -#: builtin/index-pack.c:845 +#: builtin/index-pack.c:847 #, c-format msgid "invalid %s" msgstr "" -#: builtin/index-pack.c:848 +#: builtin/index-pack.c:850 msgid "Error in object" msgstr "" -#: builtin/index-pack.c:850 +#: builtin/index-pack.c:852 #, c-format msgid "Not all child objects of %s are reachable" msgstr "" -#: builtin/index-pack.c:922 builtin/index-pack.c:953 +#: builtin/index-pack.c:924 builtin/index-pack.c:955 msgid "failed to apply delta" msgstr "" -#: builtin/index-pack.c:1123 +#: builtin/index-pack.c:1125 msgid "Receiving objects" msgstr "" -#: builtin/index-pack.c:1123 +#: builtin/index-pack.c:1125 msgid "Indexing objects" msgstr "" -#: builtin/index-pack.c:1155 +#: builtin/index-pack.c:1157 msgid "pack is corrupted (SHA1 mismatch)" msgstr "" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1162 msgid "cannot fstat packfile" msgstr "" -#: builtin/index-pack.c:1163 +#: builtin/index-pack.c:1165 msgid "pack has junk at the end" msgstr "" -#: builtin/index-pack.c:1174 +#: builtin/index-pack.c:1176 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "" -#: builtin/index-pack.c:1197 +#: builtin/index-pack.c:1199 msgid "Resolving deltas" msgstr "" -#: builtin/index-pack.c:1208 +#: builtin/index-pack.c:1210 #, c-format msgid "unable to create thread: %s" msgstr "" -#: builtin/index-pack.c:1250 +#: builtin/index-pack.c:1252 msgid "confusion beyond insanity" msgstr "" -#: builtin/index-pack.c:1256 +#: builtin/index-pack.c:1258 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1268 +#: builtin/index-pack.c:1270 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" -#: builtin/index-pack.c:1272 +#: builtin/index-pack.c:1274 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1296 +#: builtin/index-pack.c:1298 #, c-format msgid "unable to deflate appended object (%d)" msgstr "" -#: builtin/index-pack.c:1372 +#: builtin/index-pack.c:1374 #, c-format msgid "local object %s is corrupt" msgstr "" -#: builtin/index-pack.c:1396 +#: builtin/index-pack.c:1398 msgid "error while closing pack file" msgstr "" -#: builtin/index-pack.c:1409 +#: builtin/index-pack.c:1411 #, c-format msgid "cannot write keep file '%s'" msgstr "" -#: builtin/index-pack.c:1417 +#: builtin/index-pack.c:1419 #, c-format msgid "cannot close written keep file '%s'" msgstr "" -#: builtin/index-pack.c:1430 +#: builtin/index-pack.c:1432 msgid "cannot store pack file" msgstr "" -#: builtin/index-pack.c:1441 +#: builtin/index-pack.c:1443 msgid "cannot store index file" msgstr "" -#: builtin/index-pack.c:1474 +#: builtin/index-pack.c:1476 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "" -#: builtin/index-pack.c:1484 builtin/index-pack.c:1681 +#: builtin/index-pack.c:1486 builtin/index-pack.c:1683 #, c-format msgid "no threads support, ignoring %s" msgstr "" -#: builtin/index-pack.c:1542 +#: builtin/index-pack.c:1544 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "" -#: builtin/index-pack.c:1544 +#: builtin/index-pack.c:1546 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "" -#: builtin/index-pack.c:1591 +#: builtin/index-pack.c:1593 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1598 +#: builtin/index-pack.c:1600 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1611 +#: builtin/index-pack.c:1613 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "" -#: builtin/index-pack.c:1693 builtin/index-pack.c:1696 -#: builtin/index-pack.c:1712 builtin/index-pack.c:1716 +#: builtin/index-pack.c:1695 builtin/index-pack.c:1698 +#: builtin/index-pack.c:1714 builtin/index-pack.c:1718 #, c-format msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1732 +#: builtin/index-pack.c:1734 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1740 +#: builtin/index-pack.c:1736 +msgid "--stdin requires a git repository" +msgstr "" + +#: builtin/index-pack.c:1744 msgid "--verify with no packfile name given" msgstr "" @@ -8152,7 +8540,7 @@ msgstr "" msgid "Unknown commit %s" msgstr "" -#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:455 +#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:476 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "" @@ -8527,35 +8915,35 @@ msgstr "" msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "" -#: builtin/ls-tree.c:128 +#: builtin/ls-tree.c:126 msgid "only show trees" msgstr "" -#: builtin/ls-tree.c:130 +#: builtin/ls-tree.c:128 msgid "recurse into subtrees" msgstr "" -#: builtin/ls-tree.c:132 +#: builtin/ls-tree.c:130 msgid "show trees when recursing" msgstr "" -#: builtin/ls-tree.c:135 +#: builtin/ls-tree.c:133 msgid "terminate entries with NUL byte" msgstr "" -#: builtin/ls-tree.c:136 +#: builtin/ls-tree.c:134 msgid "include object size" msgstr "" -#: builtin/ls-tree.c:138 builtin/ls-tree.c:140 +#: builtin/ls-tree.c:136 builtin/ls-tree.c:138 msgid "list only filenames" msgstr "" -#: builtin/ls-tree.c:143 +#: builtin/ls-tree.c:141 msgid "use full path names" msgstr "" -#: builtin/ls-tree.c:145 +#: builtin/ls-tree.c:143 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "" @@ -8571,160 +8959,168 @@ msgstr "" msgid "git merge --abort" msgstr "" -#: builtin/merge.c:102 +#: builtin/merge.c:49 +msgid "git merge --continue" +msgstr "" + +#: builtin/merge.c:104 msgid "switch `m' requires a value" msgstr "" -#: builtin/merge.c:139 +#: builtin/merge.c:141 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "" -#: builtin/merge.c:140 +#: builtin/merge.c:142 #, c-format msgid "Available strategies are:" msgstr "" -#: builtin/merge.c:145 +#: builtin/merge.c:147 #, c-format msgid "Available custom strategies are:" msgstr "" -#: builtin/merge.c:195 builtin/pull.c:127 +#: builtin/merge.c:197 builtin/pull.c:127 msgid "do not show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:198 builtin/pull.c:130 +#: builtin/merge.c:200 builtin/pull.c:130 msgid "show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:199 builtin/pull.c:133 +#: builtin/merge.c:201 builtin/pull.c:133 msgid "(synonym to --stat)" msgstr "" -#: builtin/merge.c:201 builtin/pull.c:136 +#: builtin/merge.c:203 builtin/pull.c:136 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" -#: builtin/merge.c:204 builtin/pull.c:139 +#: builtin/merge.c:206 builtin/pull.c:139 msgid "create a single commit instead of doing a merge" msgstr "" -#: builtin/merge.c:206 builtin/pull.c:142 +#: builtin/merge.c:208 builtin/pull.c:142 msgid "perform a commit if the merge succeeds (default)" msgstr "" -#: builtin/merge.c:208 builtin/pull.c:145 +#: builtin/merge.c:210 builtin/pull.c:145 msgid "edit message before committing" msgstr "" -#: builtin/merge.c:209 +#: builtin/merge.c:211 msgid "allow fast-forward (default)" msgstr "" -#: builtin/merge.c:211 builtin/pull.c:151 +#: builtin/merge.c:213 builtin/pull.c:151 msgid "abort if fast-forward is not possible" msgstr "" -#: builtin/merge.c:215 builtin/pull.c:154 +#: builtin/merge.c:217 builtin/pull.c:154 msgid "verify that the named commit has a valid GPG signature" msgstr "" -#: builtin/merge.c:216 builtin/notes.c:774 builtin/pull.c:158 +#: builtin/merge.c:218 builtin/notes.c:774 builtin/pull.c:158 #: builtin/revert.c:89 msgid "strategy" msgstr "" -#: builtin/merge.c:217 builtin/pull.c:159 +#: builtin/merge.c:219 builtin/pull.c:159 msgid "merge strategy to use" msgstr "" -#: builtin/merge.c:218 builtin/pull.c:162 +#: builtin/merge.c:220 builtin/pull.c:162 msgid "option=value" msgstr "" -#: builtin/merge.c:219 builtin/pull.c:163 +#: builtin/merge.c:221 builtin/pull.c:163 msgid "option for selected merge strategy" msgstr "" -#: builtin/merge.c:221 +#: builtin/merge.c:223 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" -#: builtin/merge.c:225 +#: builtin/merge.c:227 msgid "abort the current in-progress merge" msgstr "" -#: builtin/merge.c:227 builtin/pull.c:170 +#: builtin/merge.c:229 +msgid "continue the current in-progress merge" +msgstr "" + +#: builtin/merge.c:231 builtin/pull.c:170 msgid "allow merging unrelated histories" msgstr "" -#: builtin/merge.c:255 +#: builtin/merge.c:259 msgid "could not run stash." msgstr "" -#: builtin/merge.c:260 +#: builtin/merge.c:264 msgid "stash failed" msgstr "" -#: builtin/merge.c:265 +#: builtin/merge.c:269 #, c-format msgid "not a valid object: %s" msgstr "" -#: builtin/merge.c:284 builtin/merge.c:301 +#: builtin/merge.c:288 builtin/merge.c:305 msgid "read-tree failed" msgstr "" -#: builtin/merge.c:331 +#: builtin/merge.c:335 msgid " (nothing to squash)" msgstr "" -#: builtin/merge.c:342 +#: builtin/merge.c:346 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:392 +#: builtin/merge.c:396 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:443 +#: builtin/merge.c:447 #, c-format msgid "'%s' does not point to a commit" msgstr "" -#: builtin/merge.c:533 +#: builtin/merge.c:537 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" -#: builtin/merge.c:652 +#: builtin/merge.c:656 msgid "Not handling anything other than two heads merge." msgstr "" -#: builtin/merge.c:666 +#: builtin/merge.c:670 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" -#: builtin/merge.c:681 +#: builtin/merge.c:685 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:733 +#: builtin/merge.c:737 #, c-format msgid "Could not read from '%s'" msgstr "" -#: builtin/merge.c:742 +#: builtin/merge.c:746 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -#: builtin/merge.c:748 +#: builtin/merge.c:752 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -8734,183 +9130,195 @@ msgid "" "the commit.\n" msgstr "" -#: builtin/merge.c:772 +#: builtin/merge.c:776 msgid "Empty commit message." msgstr "" -#: builtin/merge.c:792 +#: builtin/merge.c:796 #, c-format msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:847 +#: builtin/merge.c:851 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:863 +#: builtin/merge.c:867 #, c-format msgid "'%s' is not a commit" msgstr "" -#: builtin/merge.c:904 +#: builtin/merge.c:908 msgid "No current branch." msgstr "" -#: builtin/merge.c:906 +#: builtin/merge.c:910 msgid "No remote for the current branch." msgstr "" -#: builtin/merge.c:908 +#: builtin/merge.c:912 msgid "No default upstream defined for the current branch." msgstr "" -#: builtin/merge.c:913 +#: builtin/merge.c:917 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:960 +#: builtin/merge.c:964 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "" -#: builtin/merge.c:1034 +#: builtin/merge.c:1038 #, c-format msgid "could not close '%s'" msgstr "" -#: builtin/merge.c:1061 +#: builtin/merge.c:1065 #, c-format msgid "not something we can merge in %s: %s" msgstr "" -#: builtin/merge.c:1095 +#: builtin/merge.c:1099 msgid "not something we can merge" msgstr "" -#: builtin/merge.c:1162 +#: builtin/merge.c:1167 +msgid "--abort expects no arguments" +msgstr "" + +#: builtin/merge.c:1171 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1178 +#: builtin/merge.c:1183 +msgid "--continue expects no arguments" +msgstr "" + +#: builtin/merge.c:1187 +msgid "There is no merge in progress (MERGE_HEAD missing)." +msgstr "" + +#: builtin/merge.c:1203 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1185 +#: builtin/merge.c:1210 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1188 +#: builtin/merge.c:1213 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1197 +#: builtin/merge.c:1222 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1205 +#: builtin/merge.c:1230 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1222 +#: builtin/merge.c:1247 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1224 +#: builtin/merge.c:1249 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1229 +#: builtin/merge.c:1254 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1231 +#: builtin/merge.c:1256 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:1287 +#: builtin/merge.c:1312 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" -#: builtin/merge.c:1290 +#: builtin/merge.c:1315 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" -#: builtin/merge.c:1293 +#: builtin/merge.c:1318 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "" -#: builtin/merge.c:1296 +#: builtin/merge.c:1321 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "" -#: builtin/merge.c:1358 +#: builtin/merge.c:1383 msgid "refusing to merge unrelated histories" msgstr "" -#: builtin/merge.c:1367 +#: builtin/merge.c:1392 msgid "Already up-to-date." msgstr "" -#: builtin/merge.c:1377 +#: builtin/merge.c:1402 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1418 +#: builtin/merge.c:1443 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1425 +#: builtin/merge.c:1450 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1450 +#: builtin/merge.c:1475 msgid "Already up-to-date. Yeeah!" msgstr "" -#: builtin/merge.c:1456 +#: builtin/merge.c:1481 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1479 builtin/merge.c:1558 +#: builtin/merge.c:1504 builtin/merge.c:1583 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1483 +#: builtin/merge.c:1508 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1549 +#: builtin/merge.c:1574 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1551 +#: builtin/merge.c:1576 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1560 +#: builtin/merge.c:1585 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1572 +#: builtin/merge.c:1597 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -9040,94 +9448,94 @@ msgstr "" msgid "allow creation of more than one tree" msgstr "" -#: builtin/mv.c:15 +#: builtin/mv.c:16 msgid "git mv [<options>] <source>... <destination>" msgstr "" -#: builtin/mv.c:70 +#: builtin/mv.c:82 #, c-format msgid "Directory %s is in index and no submodule?" msgstr "" -#: builtin/mv.c:72 builtin/rm.c:317 +#: builtin/mv.c:84 builtin/rm.c:290 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" -#: builtin/mv.c:90 +#: builtin/mv.c:102 #, c-format msgid "%.*s is in index" msgstr "" -#: builtin/mv.c:112 +#: builtin/mv.c:124 msgid "force move/rename even if target exists" msgstr "" -#: builtin/mv.c:113 +#: builtin/mv.c:125 msgid "skip move/rename errors" msgstr "" -#: builtin/mv.c:155 +#: builtin/mv.c:167 #, c-format msgid "destination '%s' is not a directory" msgstr "" -#: builtin/mv.c:166 +#: builtin/mv.c:178 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "" -#: builtin/mv.c:170 +#: builtin/mv.c:182 msgid "bad source" msgstr "" -#: builtin/mv.c:173 +#: builtin/mv.c:185 msgid "can not move directory into itself" msgstr "" -#: builtin/mv.c:176 +#: builtin/mv.c:188 msgid "cannot move directory over file" msgstr "" -#: builtin/mv.c:185 +#: builtin/mv.c:197 msgid "source directory is empty" msgstr "" -#: builtin/mv.c:210 +#: builtin/mv.c:222 msgid "not under version control" msgstr "" -#: builtin/mv.c:213 +#: builtin/mv.c:225 msgid "destination exists" msgstr "" -#: builtin/mv.c:221 +#: builtin/mv.c:233 #, c-format msgid "overwriting '%s'" msgstr "" -#: builtin/mv.c:224 +#: builtin/mv.c:236 msgid "Cannot overwrite" msgstr "" -#: builtin/mv.c:227 +#: builtin/mv.c:239 msgid "multiple sources for the same target" msgstr "" -#: builtin/mv.c:229 +#: builtin/mv.c:241 msgid "destination directory does not exist" msgstr "" -#: builtin/mv.c:236 +#: builtin/mv.c:248 #, c-format msgid "%s, source=%s, destination=%s" msgstr "" -#: builtin/mv.c:257 +#: builtin/mv.c:269 #, c-format msgid "Renaming %s to %s\n" msgstr "" -#: builtin/mv.c:263 builtin/remote.c:710 builtin/repack.c:375 +#: builtin/mv.c:275 builtin/remote.c:710 builtin/repack.c:384 #, c-format msgid "renaming '%s' failed" msgstr "" @@ -9308,12 +9716,12 @@ msgstr "" msgid "the note contents have been left in %s" msgstr "" -#: builtin/notes.c:233 builtin/tag.c:439 +#: builtin/notes.c:233 builtin/tag.c:460 #, c-format msgid "cannot read '%s'" msgstr "" -#: builtin/notes.c:235 builtin/tag.c:442 +#: builtin/notes.c:235 builtin/tag.c:463 #, c-format msgid "could not open or read '%s'" msgstr "" @@ -9577,174 +9985,174 @@ msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" -#: builtin/pack-objects.c:179 builtin/pack-objects.c:182 +#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 #, c-format msgid "deflate error (%d)" msgstr "" -#: builtin/pack-objects.c:768 +#: builtin/pack-objects.c:766 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" -#: builtin/pack-objects.c:781 +#: builtin/pack-objects.c:779 msgid "Writing objects" msgstr "" -#: builtin/pack-objects.c:1070 +#: builtin/pack-objects.c:1068 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" -#: builtin/pack-objects.c:2346 +#: builtin/pack-objects.c:2344 msgid "Compressing objects" msgstr "" -#: builtin/pack-objects.c:2759 +#: builtin/pack-objects.c:2747 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:2763 +#: builtin/pack-objects.c:2751 #, c-format msgid "bad index version '%s'" msgstr "" -#: builtin/pack-objects.c:2793 +#: builtin/pack-objects.c:2781 msgid "do not show progress meter" msgstr "" -#: builtin/pack-objects.c:2795 +#: builtin/pack-objects.c:2783 msgid "show progress meter" msgstr "" -#: builtin/pack-objects.c:2797 +#: builtin/pack-objects.c:2785 msgid "show progress meter during object writing phase" msgstr "" -#: builtin/pack-objects.c:2800 +#: builtin/pack-objects.c:2788 msgid "similar to --all-progress when progress meter is shown" msgstr "" -#: builtin/pack-objects.c:2801 +#: builtin/pack-objects.c:2789 msgid "version[,offset]" msgstr "" -#: builtin/pack-objects.c:2802 +#: builtin/pack-objects.c:2790 msgid "write the pack index file in the specified idx format version" msgstr "" -#: builtin/pack-objects.c:2805 +#: builtin/pack-objects.c:2793 msgid "maximum size of each output pack file" msgstr "" -#: builtin/pack-objects.c:2807 +#: builtin/pack-objects.c:2795 msgid "ignore borrowed objects from alternate object store" msgstr "" -#: builtin/pack-objects.c:2809 +#: builtin/pack-objects.c:2797 msgid "ignore packed objects" msgstr "" -#: builtin/pack-objects.c:2811 +#: builtin/pack-objects.c:2799 msgid "limit pack window by objects" msgstr "" -#: builtin/pack-objects.c:2813 +#: builtin/pack-objects.c:2801 msgid "limit pack window by memory in addition to object limit" msgstr "" -#: builtin/pack-objects.c:2815 +#: builtin/pack-objects.c:2803 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" -#: builtin/pack-objects.c:2817 +#: builtin/pack-objects.c:2805 msgid "reuse existing deltas" msgstr "" -#: builtin/pack-objects.c:2819 +#: builtin/pack-objects.c:2807 msgid "reuse existing objects" msgstr "" -#: builtin/pack-objects.c:2821 +#: builtin/pack-objects.c:2809 msgid "use OFS_DELTA objects" msgstr "" -#: builtin/pack-objects.c:2823 +#: builtin/pack-objects.c:2811 msgid "use threads when searching for best delta matches" msgstr "" -#: builtin/pack-objects.c:2825 +#: builtin/pack-objects.c:2813 msgid "do not create an empty pack output" msgstr "" -#: builtin/pack-objects.c:2827 +#: builtin/pack-objects.c:2815 msgid "read revision arguments from standard input" msgstr "" -#: builtin/pack-objects.c:2829 +#: builtin/pack-objects.c:2817 msgid "limit the objects to those that are not yet packed" msgstr "" -#: builtin/pack-objects.c:2832 +#: builtin/pack-objects.c:2820 msgid "include objects reachable from any reference" msgstr "" -#: builtin/pack-objects.c:2835 +#: builtin/pack-objects.c:2823 msgid "include objects referred by reflog entries" msgstr "" -#: builtin/pack-objects.c:2838 +#: builtin/pack-objects.c:2826 msgid "include objects referred to by the index" msgstr "" -#: builtin/pack-objects.c:2841 +#: builtin/pack-objects.c:2829 msgid "output pack to stdout" msgstr "" -#: builtin/pack-objects.c:2843 +#: builtin/pack-objects.c:2831 msgid "include tag objects that refer to objects to be packed" msgstr "" -#: builtin/pack-objects.c:2845 +#: builtin/pack-objects.c:2833 msgid "keep unreachable objects" msgstr "" -#: builtin/pack-objects.c:2847 +#: builtin/pack-objects.c:2835 msgid "pack loose unreachable objects" msgstr "" -#: builtin/pack-objects.c:2849 +#: builtin/pack-objects.c:2837 msgid "unpack unreachable objects newer than <time>" msgstr "" -#: builtin/pack-objects.c:2852 +#: builtin/pack-objects.c:2840 msgid "create thin packs" msgstr "" -#: builtin/pack-objects.c:2854 +#: builtin/pack-objects.c:2842 msgid "create packs suitable for shallow fetches" msgstr "" -#: builtin/pack-objects.c:2856 +#: builtin/pack-objects.c:2844 msgid "ignore packs that have companion .keep file" msgstr "" -#: builtin/pack-objects.c:2858 +#: builtin/pack-objects.c:2846 msgid "pack compression level" msgstr "" -#: builtin/pack-objects.c:2860 +#: builtin/pack-objects.c:2848 msgid "do not hide commits by grafts" msgstr "" -#: builtin/pack-objects.c:2862 +#: builtin/pack-objects.c:2850 msgid "use a bitmap index if available to speed up counting objects" msgstr "" -#: builtin/pack-objects.c:2864 +#: builtin/pack-objects.c:2852 msgid "write a bitmap index together with the pack index" msgstr "" -#: builtin/pack-objects.c:2993 +#: builtin/pack-objects.c:2979 msgid "Counting objects" msgstr "" @@ -9868,7 +10276,7 @@ msgstr "" msgid "<remote>" msgstr "" -#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:451 +#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:455 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "" @@ -10001,12 +10409,12 @@ msgid "" "to update which remote branch." msgstr "" -#: builtin/push.c:242 +#: builtin/push.c:245 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" -#: builtin/push.c:249 +#: builtin/push.c:252 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -10014,7 +10422,7 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:255 +#: builtin/push.c:258 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" @@ -10022,7 +10430,7 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:261 +#: builtin/push.c:264 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" @@ -10031,33 +10439,33 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:268 +#: builtin/push.c:271 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" -#: builtin/push.c:271 +#: builtin/push.c:274 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" "without using the '--force' option.\n" msgstr "" -#: builtin/push.c:331 +#: builtin/push.c:334 #, c-format msgid "Pushing to %s\n" msgstr "" -#: builtin/push.c:335 +#: builtin/push.c:338 #, c-format msgid "failed to push some refs to '%s'" msgstr "" -#: builtin/push.c:366 +#: builtin/push.c:369 #, c-format msgid "bad repository '%s'" msgstr "" -#: builtin/push.c:367 +#: builtin/push.c:370 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -10070,112 +10478,112 @@ msgid "" " git push <name>\n" msgstr "" -#: builtin/push.c:385 +#: builtin/push.c:388 msgid "--all and --tags are incompatible" msgstr "" -#: builtin/push.c:386 +#: builtin/push.c:389 msgid "--all can't be combined with refspecs" msgstr "" -#: builtin/push.c:391 +#: builtin/push.c:394 msgid "--mirror and --tags are incompatible" msgstr "" -#: builtin/push.c:392 +#: builtin/push.c:395 msgid "--mirror can't be combined with refspecs" msgstr "" -#: builtin/push.c:397 +#: builtin/push.c:400 msgid "--all and --mirror are incompatible" msgstr "" -#: builtin/push.c:515 +#: builtin/push.c:518 msgid "repository" msgstr "" -#: builtin/push.c:516 builtin/send-pack.c:161 +#: builtin/push.c:519 builtin/send-pack.c:161 msgid "push all refs" msgstr "" -#: builtin/push.c:517 builtin/send-pack.c:163 +#: builtin/push.c:520 builtin/send-pack.c:163 msgid "mirror all refs" msgstr "" -#: builtin/push.c:519 +#: builtin/push.c:522 msgid "delete refs" msgstr "" -#: builtin/push.c:520 +#: builtin/push.c:523 msgid "push tags (can't be used with --all or --mirror)" msgstr "" -#: builtin/push.c:523 builtin/send-pack.c:164 +#: builtin/push.c:526 builtin/send-pack.c:164 msgid "force updates" msgstr "" -#: builtin/push.c:525 builtin/send-pack.c:175 +#: builtin/push.c:528 builtin/send-pack.c:175 msgid "refname>:<expect" msgstr "" -#: builtin/push.c:526 builtin/send-pack.c:176 +#: builtin/push.c:529 builtin/send-pack.c:176 msgid "require old value of ref to be at this value" msgstr "" -#: builtin/push.c:529 +#: builtin/push.c:532 msgid "control recursive pushing of submodules" msgstr "" -#: builtin/push.c:531 builtin/send-pack.c:169 +#: builtin/push.c:534 builtin/send-pack.c:169 msgid "use thin pack" msgstr "" -#: builtin/push.c:532 builtin/push.c:533 builtin/send-pack.c:158 +#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:158 #: builtin/send-pack.c:159 msgid "receive pack program" msgstr "" -#: builtin/push.c:534 +#: builtin/push.c:537 msgid "set upstream for git pull/status" msgstr "" -#: builtin/push.c:537 +#: builtin/push.c:540 msgid "prune locally removed refs" msgstr "" -#: builtin/push.c:539 +#: builtin/push.c:542 msgid "bypass pre-push hook" msgstr "" -#: builtin/push.c:540 +#: builtin/push.c:543 msgid "push missing but relevant tags" msgstr "" -#: builtin/push.c:543 builtin/send-pack.c:166 +#: builtin/push.c:546 builtin/send-pack.c:166 msgid "GPG sign the push" msgstr "" -#: builtin/push.c:545 builtin/send-pack.c:170 +#: builtin/push.c:548 builtin/send-pack.c:170 msgid "request atomic transaction on remote side" msgstr "" -#: builtin/push.c:546 +#: builtin/push.c:549 msgid "server-specific" msgstr "" -#: builtin/push.c:546 +#: builtin/push.c:549 msgid "option to transmit" msgstr "" -#: builtin/push.c:560 +#: builtin/push.c:563 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" -#: builtin/push.c:562 +#: builtin/push.c:565 msgid "--delete doesn't make sense without any refs" msgstr "" -#: builtin/push.c:579 +#: builtin/push.c:584 msgid "push options must not have new line characters" msgstr "" @@ -10261,8 +10669,8 @@ msgid "" "with what you pushed, and will require 'git reset --hard' to match\n" "the work tree to HEAD.\n" "\n" -"You can set 'receive.denyCurrentBranch' configuration variable to\n" -"'ignore' or 'warn' in the remote repository to allow pushing into\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" @@ -10796,83 +11204,89 @@ msgstr "" msgid "git repack [<options>]" msgstr "" -#: builtin/repack.c:160 +#: builtin/repack.c:22 +msgid "" +"Incremental repacks are incompatible with bitmap indexes. Use\n" +"--no-write-bitmap-index or disable the pack.writebitmaps configuration." +msgstr "" + +#: builtin/repack.c:166 msgid "pack everything in a single pack" msgstr "" -#: builtin/repack.c:162 +#: builtin/repack.c:168 msgid "same as -a, and turn unreachable objects loose" msgstr "" -#: builtin/repack.c:165 +#: builtin/repack.c:171 msgid "remove redundant packs, and run git-prune-packed" msgstr "" -#: builtin/repack.c:167 +#: builtin/repack.c:173 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "" -#: builtin/repack.c:169 +#: builtin/repack.c:175 msgid "pass --no-reuse-object to git-pack-objects" msgstr "" -#: builtin/repack.c:171 +#: builtin/repack.c:177 msgid "do not run git-update-server-info" msgstr "" -#: builtin/repack.c:174 +#: builtin/repack.c:180 msgid "pass --local to git-pack-objects" msgstr "" -#: builtin/repack.c:176 +#: builtin/repack.c:182 msgid "write bitmap index" msgstr "" -#: builtin/repack.c:177 +#: builtin/repack.c:183 msgid "approxidate" msgstr "" -#: builtin/repack.c:178 +#: builtin/repack.c:184 msgid "with -A, do not loosen objects older than this" msgstr "" -#: builtin/repack.c:180 +#: builtin/repack.c:186 msgid "with -a, repack unreachable objects" msgstr "" -#: builtin/repack.c:182 +#: builtin/repack.c:188 msgid "size of the window used for delta compression" msgstr "" -#: builtin/repack.c:183 builtin/repack.c:187 +#: builtin/repack.c:189 builtin/repack.c:193 msgid "bytes" msgstr "" -#: builtin/repack.c:184 +#: builtin/repack.c:190 msgid "same as the above, but limit memory size instead of entries count" msgstr "" -#: builtin/repack.c:186 +#: builtin/repack.c:192 msgid "limits the maximum delta depth" msgstr "" -#: builtin/repack.c:188 +#: builtin/repack.c:194 msgid "maximum size of each packfile" msgstr "" -#: builtin/repack.c:190 +#: builtin/repack.c:196 msgid "repack objects in packs marked with .keep" msgstr "" -#: builtin/repack.c:200 +#: builtin/repack.c:206 msgid "cannot delete packs in a precious-objects repo" msgstr "" -#: builtin/repack.c:204 +#: builtin/repack.c:210 msgid "--keep-unreachable and -A are incompatible" msgstr "" -#: builtin/repack.c:391 builtin/worktree.c:115 +#: builtin/repack.c:400 builtin/worktree.c:115 #, c-format msgid "failed to remove '%s'" msgstr "" @@ -11098,23 +11512,23 @@ msgstr "" msgid "rev-list does not support display of notes" msgstr "" -#: builtin/rev-parse.c:386 +#: builtin/rev-parse.c:391 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "" -#: builtin/rev-parse.c:391 +#: builtin/rev-parse.c:396 msgid "keep the `--` passed as an arg" msgstr "" -#: builtin/rev-parse.c:393 +#: builtin/rev-parse.c:398 msgid "stop parsing after the first non-option argument" msgstr "" -#: builtin/rev-parse.c:396 +#: builtin/rev-parse.c:401 msgid "output in stuck long form" msgstr "" -#: builtin/rev-parse.c:527 +#: builtin/rev-parse.c:532 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -11208,23 +11622,7 @@ msgstr "" msgid "git rm [<options>] [--] <file>..." msgstr "" -#: builtin/rm.c:65 -msgid "" -"the following submodule (or one of its nested submodules)\n" -"uses a .git directory:" -msgid_plural "" -"the following submodules (or one of their nested submodules)\n" -"use a .git directory:" -msgstr[0] "" -msgstr[1] "" - -#: builtin/rm.c:71 -msgid "" -"\n" -"(use 'rm -rf' if you really want to remove it including all of its history)" -msgstr "" - -#: builtin/rm.c:230 +#: builtin/rm.c:205 msgid "" "the following file has staged content different from both the\n" "file and the HEAD:" @@ -11234,60 +11632,65 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/rm.c:235 +#: builtin/rm.c:210 msgid "" "\n" "(use -f to force removal)" msgstr "" -#: builtin/rm.c:239 +#: builtin/rm.c:214 msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" msgstr[0] "" msgstr[1] "" -#: builtin/rm.c:243 builtin/rm.c:254 +#: builtin/rm.c:218 builtin/rm.c:227 msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" msgstr "" -#: builtin/rm.c:251 +#: builtin/rm.c:224 msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" msgstr[0] "" msgstr[1] "" -#: builtin/rm.c:269 +#: builtin/rm.c:242 msgid "do not list removed files" msgstr "" -#: builtin/rm.c:270 +#: builtin/rm.c:243 msgid "only remove from the index" msgstr "" -#: builtin/rm.c:271 +#: builtin/rm.c:244 msgid "override the up-to-date check" msgstr "" -#: builtin/rm.c:272 +#: builtin/rm.c:245 msgid "allow recursive removal" msgstr "" -#: builtin/rm.c:274 +#: builtin/rm.c:247 msgid "exit with a zero status even if nothing matched" msgstr "" -#: builtin/rm.c:335 +#: builtin/rm.c:308 #, c-format msgid "not removing '%s' recursively without -r" msgstr "" -#: builtin/rm.c:374 +#: builtin/rm.c:347 #, c-format msgid "git rm: unable to remove %s" msgstr "" +#: builtin/rm.c:370 +#, c-format +msgid "could not remove '%s'" +msgstr "" + #: builtin/send-pack.c:18 msgid "" "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" @@ -11316,23 +11719,27 @@ msgstr "" msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" msgstr "" -#: builtin/shortlog.c:242 +#: builtin/shortlog.c:249 +msgid "Group by committer rather than author" +msgstr "" + +#: builtin/shortlog.c:251 msgid "sort output according to the number of commits per author" msgstr "" -#: builtin/shortlog.c:244 +#: builtin/shortlog.c:253 msgid "Suppress commit descriptions, only provides commit count" msgstr "" -#: builtin/shortlog.c:246 +#: builtin/shortlog.c:255 msgid "Show the email address of each author" msgstr "" -#: builtin/shortlog.c:247 +#: builtin/shortlog.c:256 msgid "w[,i1[,i2]]" msgstr "" -#: builtin/shortlog.c:248 +#: builtin/shortlog.c:257 msgid "Linewrap output" msgstr "" @@ -11476,35 +11883,35 @@ msgstr "" msgid "git show-ref --exclude-existing[=<pattern>]" msgstr "" -#: builtin/show-ref.c:165 +#: builtin/show-ref.c:159 msgid "only show tags (can be combined with heads)" msgstr "" -#: builtin/show-ref.c:166 +#: builtin/show-ref.c:160 msgid "only show heads (can be combined with tags)" msgstr "" -#: builtin/show-ref.c:167 +#: builtin/show-ref.c:161 msgid "stricter reference checking, requires exact ref path" msgstr "" -#: builtin/show-ref.c:170 builtin/show-ref.c:172 +#: builtin/show-ref.c:164 builtin/show-ref.c:166 msgid "show the HEAD reference, even if it would be filtered out" msgstr "" -#: builtin/show-ref.c:174 +#: builtin/show-ref.c:168 msgid "dereference tags into object IDs" msgstr "" -#: builtin/show-ref.c:176 +#: builtin/show-ref.c:170 msgid "only show SHA1 hash using <n> digits" msgstr "" -#: builtin/show-ref.c:180 +#: builtin/show-ref.c:174 msgid "do not print results to stdout (useful with --verify)" msgstr "" -#: builtin/show-ref.c:182 +#: builtin/show-ref.c:176 msgid "show refs from stdin that aren't in local repository" msgstr "" @@ -11524,12 +11931,12 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "" -#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1046 +#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1062 #, c-format msgid "No such ref: %s" msgstr "" -#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1055 +#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1071 #, c-format msgid "Expecting a full ref name, got %s" msgstr "" @@ -11539,8 +11946,7 @@ msgstr "" msgid "cannot strip one component off url '%s'" msgstr "" -#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:408 -#: builtin/submodule--helper.c:590 +#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:592 msgid "alternative anchor for relative paths" msgstr "" @@ -11548,191 +11954,199 @@ msgstr "" msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "" -#: builtin/submodule--helper.c:329 builtin/submodule--helper.c:343 +#: builtin/submodule--helper.c:333 builtin/submodule--helper.c:347 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "" -#: builtin/submodule--helper.c:369 +#: builtin/submodule--helper.c:373 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:373 +#: builtin/submodule--helper.c:377 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "" -#: builtin/submodule--helper.c:383 +#: builtin/submodule--helper.c:387 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "" -#: builtin/submodule--helper.c:390 +#: builtin/submodule--helper.c:394 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:409 +#: builtin/submodule--helper.c:410 msgid "Suppress output for initializing a submodule" msgstr "" -#: builtin/submodule--helper.c:414 +#: builtin/submodule--helper.c:415 msgid "git submodule--helper init [<path>]" msgstr "" -#: builtin/submodule--helper.c:435 +#: builtin/submodule--helper.c:436 msgid "git submodule--helper name <path>" msgstr "" -#: builtin/submodule--helper.c:441 +#: builtin/submodule--helper.c:442 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "" -#: builtin/submodule--helper.c:524 builtin/submodule--helper.c:527 +#: builtin/submodule--helper.c:525 builtin/submodule--helper.c:528 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "" -#: builtin/submodule--helper.c:563 +#: builtin/submodule--helper.c:564 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "" -#: builtin/submodule--helper.c:570 +#: builtin/submodule--helper.c:571 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "" -#: builtin/submodule--helper.c:593 +#: builtin/submodule--helper.c:595 msgid "where the new submodule will be cloned to" msgstr "" -#: builtin/submodule--helper.c:596 +#: builtin/submodule--helper.c:598 msgid "name of the new submodule" msgstr "" -#: builtin/submodule--helper.c:599 +#: builtin/submodule--helper.c:601 msgid "url where to clone the submodule from" msgstr "" -#: builtin/submodule--helper.c:605 +#: builtin/submodule--helper.c:607 msgid "depth for shallow clones" msgstr "" -#: builtin/submodule--helper.c:608 builtin/submodule--helper.c:964 +#: builtin/submodule--helper.c:610 builtin/submodule--helper.c:980 msgid "force cloning progress" msgstr "" -#: builtin/submodule--helper.c:613 +#: builtin/submodule--helper.c:615 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" msgstr "" -#: builtin/submodule--helper.c:638 builtin/submodule--helper.c:648 -#, c-format -msgid "could not create directory '%s'" -msgstr "" - -#: builtin/submodule--helper.c:644 +#: builtin/submodule--helper.c:646 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "" -#: builtin/submodule--helper.c:660 +#: builtin/submodule--helper.c:662 #, c-format msgid "cannot open file '%s'" msgstr "" -#: builtin/submodule--helper.c:665 +#: builtin/submodule--helper.c:667 #, c-format msgid "could not close file %s" msgstr "" -#: builtin/submodule--helper.c:672 +#: builtin/submodule--helper.c:674 #, c-format msgid "could not get submodule directory for '%s'" msgstr "" -#: builtin/submodule--helper.c:726 +#: builtin/submodule--helper.c:742 #, c-format msgid "Submodule path '%s' not initialized" msgstr "" -#: builtin/submodule--helper.c:730 +#: builtin/submodule--helper.c:746 msgid "Maybe you want to use 'update --init'?" msgstr "" -#: builtin/submodule--helper.c:756 +#: builtin/submodule--helper.c:772 #, c-format msgid "Skipping unmerged submodule %s" msgstr "" -#: builtin/submodule--helper.c:777 +#: builtin/submodule--helper.c:793 #, c-format msgid "Skipping submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:913 +#: builtin/submodule--helper.c:929 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "" -#: builtin/submodule--helper.c:924 +#: builtin/submodule--helper.c:940 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "" -#: builtin/submodule--helper.c:945 +#: builtin/submodule--helper.c:961 builtin/submodule--helper.c:1105 msgid "path into the working tree" msgstr "" -#: builtin/submodule--helper.c:948 +#: builtin/submodule--helper.c:964 msgid "path into the working tree, across nested submodule boundaries" msgstr "" -#: builtin/submodule--helper.c:952 +#: builtin/submodule--helper.c:968 msgid "rebase, merge, checkout or none" msgstr "" -#: builtin/submodule--helper.c:956 +#: builtin/submodule--helper.c:972 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "" -#: builtin/submodule--helper.c:959 +#: builtin/submodule--helper.c:975 msgid "parallel jobs" msgstr "" -#: builtin/submodule--helper.c:961 +#: builtin/submodule--helper.c:977 msgid "whether the initial clone should follow the shallow recommendation" msgstr "" -#: builtin/submodule--helper.c:962 +#: builtin/submodule--helper.c:978 msgid "don't print cloning progress" msgstr "" -#: builtin/submodule--helper.c:969 +#: builtin/submodule--helper.c:985 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "" -#: builtin/submodule--helper.c:979 +#: builtin/submodule--helper.c:995 msgid "bad value for update parameter" msgstr "" -#: builtin/submodule--helper.c:1050 +#: builtin/submodule--helper.c:1066 #, 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:1100 +#: builtin/submodule--helper.c:1106 +msgid "recurse into submodules" +msgstr "" + +#: builtin/submodule--helper.c:1112 +msgid "git submodule--helper embed-git-dir [<path>...]" +msgstr "" + +#: builtin/submodule--helper.c:1157 msgid "submodule--helper subcommand must be called with a subcommand" msgstr "" -#: builtin/submodule--helper.c:1107 +#: builtin/submodule--helper.c:1164 +#, c-format +msgid "%s doesn't support --super-prefix" +msgstr "" + +#: builtin/submodule--helper.c:1170 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "" @@ -11782,25 +12196,25 @@ msgid "" msgstr "" #: builtin/tag.c:27 -msgid "git tag -v <tagname>..." +msgid "git tag -v [--format=<format>] <tagname>..." msgstr "" -#: builtin/tag.c:81 +#: builtin/tag.c:82 #, c-format msgid "tag name too long: %.*s..." msgstr "" -#: builtin/tag.c:86 +#: builtin/tag.c:87 #, c-format msgid "tag '%s' not found." msgstr "" -#: builtin/tag.c:101 +#: builtin/tag.c:102 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "" -#: builtin/tag.c:117 +#: builtin/tag.c:131 #, c-format msgid "" "\n" @@ -11809,7 +12223,7 @@ msgid "" "Lines starting with '%c' will be ignored.\n" msgstr "" -#: builtin/tag.c:121 +#: builtin/tag.c:135 #, c-format msgid "" "\n" @@ -11819,138 +12233,138 @@ msgid "" "want to.\n" msgstr "" -#: builtin/tag.c:199 +#: builtin/tag.c:213 msgid "unable to sign the tag" msgstr "" -#: builtin/tag.c:201 +#: builtin/tag.c:215 msgid "unable to write tag file" msgstr "" -#: builtin/tag.c:226 +#: builtin/tag.c:240 msgid "bad object type." msgstr "" -#: builtin/tag.c:239 +#: builtin/tag.c:253 msgid "tag header too big." msgstr "" -#: builtin/tag.c:275 +#: builtin/tag.c:289 msgid "no tag message?" msgstr "" -#: builtin/tag.c:281 +#: builtin/tag.c:295 #, c-format msgid "The tag message has been left in %s\n" msgstr "" -#: builtin/tag.c:339 +#: builtin/tag.c:354 msgid "list tag names" msgstr "" -#: builtin/tag.c:341 +#: builtin/tag.c:356 msgid "print <n> lines of each tag message" msgstr "" -#: builtin/tag.c:343 +#: builtin/tag.c:358 msgid "delete tags" msgstr "" -#: builtin/tag.c:344 +#: builtin/tag.c:359 msgid "verify tags" msgstr "" -#: builtin/tag.c:346 +#: builtin/tag.c:361 msgid "Tag creation options" msgstr "" -#: builtin/tag.c:348 +#: builtin/tag.c:363 msgid "annotated tag, needs a message" msgstr "" -#: builtin/tag.c:350 +#: builtin/tag.c:365 msgid "tag message" msgstr "" -#: builtin/tag.c:352 +#: builtin/tag.c:367 msgid "annotated and GPG-signed tag" msgstr "" -#: builtin/tag.c:356 +#: builtin/tag.c:371 msgid "use another key to sign the tag" msgstr "" -#: builtin/tag.c:357 +#: builtin/tag.c:372 msgid "replace the tag if exists" msgstr "" -#: builtin/tag.c:358 builtin/update-ref.c:368 +#: builtin/tag.c:373 builtin/update-ref.c:368 msgid "create a reflog" msgstr "" -#: builtin/tag.c:360 +#: builtin/tag.c:375 msgid "Tag listing options" msgstr "" -#: builtin/tag.c:361 +#: builtin/tag.c:376 msgid "show tag list in columns" msgstr "" -#: builtin/tag.c:362 builtin/tag.c:363 +#: builtin/tag.c:377 builtin/tag.c:378 msgid "print only tags that contain the commit" msgstr "" -#: builtin/tag.c:364 +#: builtin/tag.c:379 msgid "print only tags that are merged" msgstr "" -#: builtin/tag.c:365 +#: builtin/tag.c:380 msgid "print only tags that are not merged" msgstr "" -#: builtin/tag.c:370 +#: builtin/tag.c:385 msgid "print only tags of the object" msgstr "" -#: builtin/tag.c:399 +#: builtin/tag.c:415 msgid "--column and -n are incompatible" msgstr "" -#: builtin/tag.c:419 +#: builtin/tag.c:437 msgid "-n option is only allowed with -l." msgstr "" -#: builtin/tag.c:421 +#: builtin/tag.c:439 msgid "--contains option is only allowed with -l." msgstr "" -#: builtin/tag.c:423 +#: builtin/tag.c:441 msgid "--points-at option is only allowed with -l." msgstr "" -#: builtin/tag.c:425 +#: builtin/tag.c:443 msgid "--merged and --no-merged option are only allowed with -l" msgstr "" -#: builtin/tag.c:433 +#: builtin/tag.c:454 msgid "only one -F or -m option is allowed." msgstr "" -#: builtin/tag.c:452 +#: builtin/tag.c:473 msgid "too many params" msgstr "" -#: builtin/tag.c:458 +#: builtin/tag.c:479 #, c-format msgid "'%s' is not a valid tag name." msgstr "" -#: builtin/tag.c:463 +#: builtin/tag.c:484 #, c-format msgid "tag '%s' already exists" msgstr "" -#: builtin/tag.c:491 +#: builtin/tag.c:512 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "" @@ -12137,23 +12551,23 @@ msgstr "" msgid "enable untracked cache without testing the filesystem" msgstr "" -#: builtin/update-index.c:1119 +#: builtin/update-index.c:1120 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:1123 +#: builtin/update-index.c:1124 msgid "Untracked cache disabled" msgstr "" -#: builtin/update-index.c:1131 +#: builtin/update-index.c:1132 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:1135 +#: builtin/update-index.c:1136 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "" @@ -12202,7 +12616,7 @@ msgstr "" msgid "print commit contents" msgstr "" -#: builtin/verify-commit.c:73 builtin/verify-tag.c:35 +#: builtin/verify-commit.c:73 builtin/verify-tag.c:37 msgid "print raw gpg status output" msgstr "" @@ -12218,11 +12632,11 @@ msgstr "" msgid "show statistics only" msgstr "" -#: builtin/verify-tag.c:17 -msgid "git verify-tag [-v | --verbose] <tag>..." +#: builtin/verify-tag.c:18 +msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." msgstr "" -#: builtin/verify-tag.c:34 +#: builtin/verify-tag.c:36 msgid "print tag contents" msgstr "" @@ -12306,30 +12720,30 @@ msgstr "" msgid "-b, -B, and --detach are mutually exclusive" msgstr "" -#: builtin/worktree.c:470 +#: builtin/worktree.c:472 msgid "reason for locking" msgstr "" -#: builtin/worktree.c:482 builtin/worktree.c:515 +#: builtin/worktree.c:484 builtin/worktree.c:517 #, c-format msgid "'%s' is not a working tree" msgstr "" -#: builtin/worktree.c:484 builtin/worktree.c:517 +#: builtin/worktree.c:486 builtin/worktree.c:519 msgid "The main working tree cannot be locked or unlocked" msgstr "" -#: builtin/worktree.c:489 +#: builtin/worktree.c:491 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "" -#: builtin/worktree.c:491 +#: builtin/worktree.c:493 #, c-format msgid "'%s' is already locked" msgstr "" -#: builtin/worktree.c:519 +#: builtin/worktree.c:521 #, c-format msgid "'%s' is not locked" msgstr "" @@ -12354,19 +12768,19 @@ msgstr "" msgid "git upload-pack [<options>] <dir>" msgstr "" -#: upload-pack.c:1028 +#: upload-pack.c:1036 msgid "quit after a single request/response exchange" msgstr "" -#: upload-pack.c:1030 +#: upload-pack.c:1038 msgid "exit immediately after initial ref advertisement" msgstr "" -#: upload-pack.c:1032 +#: upload-pack.c:1040 msgid "do not try <directory>/.git/ if <directory> is no Git directory" msgstr "" -#: upload-pack.c:1034 +#: upload-pack.c:1042 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "" @@ -12390,14 +12804,27 @@ msgid "" "to read about a specific subcommand or concept." msgstr "" -#: http.c:342 +#: http.c:344 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "" -#: http.c:351 +#: http.c:353 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "" +#: http.c:1713 +#, c-format +msgid "" +"unable to update url base from redirection:\n" +" asked for: %s\n" +" redirect: %s" +msgstr "" + +#: remote-curl.c:319 +#, c-format +msgid "redirecting to %s" +msgstr "" + #: common-cmds.h:9 msgid "start a working area (see also: git help tutorial)" msgstr "" @@ -12746,7 +13173,7 @@ msgstr "" msgid "Simple merge did not work, trying automatic merge." msgstr "" -#: git-rebase.sh:56 +#: git-rebase.sh:57 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" @@ -12754,54 +13181,43 @@ msgid "" "\"." msgstr "" -#: git-rebase.sh:156 git-rebase.sh:395 +#: git-rebase.sh:157 git-rebase.sh:396 #, sh-format msgid "Could not move back to $head_name" msgstr "" -#: git-rebase.sh:167 -msgid "Applied autostash." -msgstr "" - -#: git-rebase.sh:170 +#: git-rebase.sh:171 #, sh-format msgid "Cannot store $stash_sha1" msgstr "" -#: git-rebase.sh:171 -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 "" - -#: git-rebase.sh:210 +#: git-rebase.sh:211 msgid "The pre-rebase hook refused to rebase." msgstr "" -#: git-rebase.sh:215 +#: git-rebase.sh:216 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "" -#: git-rebase.sh:356 +#: git-rebase.sh:357 msgid "No rebase in progress?" msgstr "" -#: git-rebase.sh:367 +#: git-rebase.sh:368 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" -#: git-rebase.sh:374 +#: git-rebase.sh:375 msgid "Cannot read HEAD" msgstr "" -#: git-rebase.sh:377 +#: git-rebase.sh:378 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" msgstr "" -#: git-rebase.sh:414 +#: git-rebase.sh:418 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -12814,64 +13230,64 @@ msgid "" "valuable there." msgstr "" -#: git-rebase.sh:465 +#: git-rebase.sh:469 #, sh-format msgid "invalid upstream $upstream_name" msgstr "" -#: git-rebase.sh:489 +#: git-rebase.sh:493 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "" -#: git-rebase.sh:492 git-rebase.sh:496 +#: git-rebase.sh:496 git-rebase.sh:500 #, sh-format msgid "$onto_name: there is no merge base" msgstr "" -#: git-rebase.sh:501 +#: git-rebase.sh:505 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "" -#: git-rebase.sh:524 +#: git-rebase.sh:528 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "" -#: git-rebase.sh:557 +#: git-rebase.sh:561 msgid "Cannot autostash" msgstr "" -#: git-rebase.sh:562 +#: git-rebase.sh:566 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "" -#: git-rebase.sh:566 +#: git-rebase.sh:570 msgid "Please commit or stash them." msgstr "" -#: git-rebase.sh:586 +#: git-rebase.sh:590 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "" -#: git-rebase.sh:590 +#: git-rebase.sh:594 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "" -#: git-rebase.sh:601 +#: git-rebase.sh:605 #, sh-format msgid "Changes from $mb to $onto:" msgstr "" -#: git-rebase.sh:610 +#: git-rebase.sh:614 msgid "First, rewinding head to replay your work on top of it..." msgstr "" -#: git-rebase.sh:620 +#: git-rebase.sh:624 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "" @@ -13034,21 +13450,26 @@ msgstr "" msgid "(To restore them type \"git stash apply\")" msgstr "" -#: git-submodule.sh:184 +#: git-submodule.sh:181 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" -#: git-submodule.sh:194 +#: git-submodule.sh:191 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "" -#: git-submodule.sh:211 +#: git-submodule.sh:210 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "" -#: git-submodule.sh:215 +#: git-submodule.sh:213 +#, sh-format +msgid "'$sm_path' already exists in the index and is not a submodule" +msgstr "" + +#: git-submodule.sh:218 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -13056,22 +13477,22 @@ msgid "" "Use -f if you really want to add it." msgstr "" -#: git-submodule.sh:233 +#: git-submodule.sh:236 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "" -#: git-submodule.sh:235 +#: git-submodule.sh:238 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "" -#: git-submodule.sh:243 +#: git-submodule.sh:246 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" -#: git-submodule.sh:245 +#: git-submodule.sh:248 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -13082,184 +13503,184 @@ msgid "" "option." msgstr "" -#: git-submodule.sh:251 +#: git-submodule.sh:254 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "" -#: git-submodule.sh:263 +#: git-submodule.sh:266 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "" -#: git-submodule.sh:268 +#: git-submodule.sh:271 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "" -#: git-submodule.sh:277 +#: git-submodule.sh:280 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "" -#: git-submodule.sh:324 +#: git-submodule.sh:327 #, sh-format msgid "Entering '$displaypath'" msgstr "" -#: git-submodule.sh:344 +#: git-submodule.sh:347 #, sh-format msgid "Stopping at '$displaypath'; script returned non-zero status." msgstr "" -#: git-submodule.sh:415 +#: git-submodule.sh:418 #, sh-format msgid "pathspec and --all are incompatible" msgstr "" -#: git-submodule.sh:420 +#: git-submodule.sh:423 #, sh-format msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "" -#: git-submodule.sh:440 +#: git-submodule.sh:443 #, 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 "" -#: git-submodule.sh:448 +#: git-submodule.sh:451 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " "discard them" msgstr "" -#: git-submodule.sh:451 +#: git-submodule.sh:454 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "" -#: git-submodule.sh:452 +#: git-submodule.sh:455 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "" -#: git-submodule.sh:455 +#: git-submodule.sh:458 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "" -#: git-submodule.sh:464 +#: git-submodule.sh:467 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" -#: git-submodule.sh:617 +#: git-submodule.sh:623 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:627 +#: git-submodule.sh:633 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:632 +#: git-submodule.sh:638 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " "'$sm_path'" msgstr "" -#: git-submodule.sh:650 +#: git-submodule.sh:656 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:656 +#: git-submodule.sh:662 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " "Direct fetching of that commit failed." msgstr "" -#: git-submodule.sh:663 +#: git-submodule.sh:669 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:664 +#: git-submodule.sh:670 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "" -#: git-submodule.sh:668 +#: git-submodule.sh:674 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:669 +#: git-submodule.sh:675 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "" -#: git-submodule.sh:674 +#: git-submodule.sh:680 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:675 +#: git-submodule.sh:681 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "" -#: git-submodule.sh:680 +#: git-submodule.sh:686 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:681 +#: git-submodule.sh:687 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "" -#: git-submodule.sh:712 +#: git-submodule.sh:718 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:820 +#: git-submodule.sh:826 msgid "The --cached option cannot be used with the --files option" msgstr "" -#: git-submodule.sh:872 +#: git-submodule.sh:878 #, sh-format msgid "unexpected mode $mod_dst" msgstr "" -#: git-submodule.sh:892 +#: git-submodule.sh:898 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr "" -#: git-submodule.sh:895 +#: git-submodule.sh:901 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr "" -#: git-submodule.sh:898 +#: git-submodule.sh:904 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" -#: git-submodule.sh:1045 +#: git-submodule.sh:1051 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:1112 +#: git-submodule.sh:1118 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "" @@ -13374,26 +13795,22 @@ msgid_plural "This is a combination of $count commits." msgstr[0] "" msgstr[1] "" -#: git-rebase--interactive.sh:440 +#: git-rebase--interactive.sh:441 #, sh-format msgid "Cannot write $fixup_msg" msgstr "" -#: git-rebase--interactive.sh:443 -msgid "This is a combination of 2 commits." -msgstr "" - #: git-rebase--interactive.sh:444 -msgid "This is the 1st commit message:" +msgid "This is a combination of 2 commits." msgstr "" -#: git-rebase--interactive.sh:484 git-rebase--interactive.sh:527 -#: git-rebase--interactive.sh:530 +#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528 +#: git-rebase--interactive.sh:531 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "" -#: git-rebase--interactive.sh:558 +#: git-rebase--interactive.sh:559 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -13403,31 +13820,31 @@ msgid "" "you are able to reword the commit." msgstr "" -#: git-rebase--interactive.sh:573 +#: git-rebase--interactive.sh:574 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "" -#: git-rebase--interactive.sh:588 +#: git-rebase--interactive.sh:589 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "" -#: git-rebase--interactive.sh:630 +#: git-rebase--interactive.sh:631 #, sh-format msgid "Executing: $rest" msgstr "" -#: git-rebase--interactive.sh:638 +#: git-rebase--interactive.sh:639 #, sh-format msgid "Execution failed: $rest" msgstr "" -#: git-rebase--interactive.sh:640 +#: git-rebase--interactive.sh:641 msgid "and made changes to the index and/or the working tree" msgstr "" -#: git-rebase--interactive.sh:642 +#: git-rebase--interactive.sh:643 msgid "" "You can fix the problem, and then run\n" "\n" @@ -13435,7 +13852,7 @@ msgid "" msgstr "" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--interactive.sh:655 +#: git-rebase--interactive.sh:656 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -13445,49 +13862,49 @@ msgid "" "\tgit rebase --continue" msgstr "" -#: git-rebase--interactive.sh:666 +#: git-rebase--interactive.sh:667 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "" -#: git-rebase--interactive.sh:667 +#: git-rebase--interactive.sh:668 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "" -#: git-rebase--interactive.sh:702 +#: git-rebase--interactive.sh:703 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "" -#: git-rebase--interactive.sh:749 +#: git-rebase--interactive.sh:750 msgid "Could not skip unnecessary pick commands" msgstr "" -#: git-rebase--interactive.sh:907 +#: 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:940 +#: 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:979 +#: git-rebase--interactive.sh:980 msgid "could not detach HEAD" msgstr "" -#: git-rebase--interactive.sh:1017 +#: 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:1025 +#: git-rebase--interactive.sh:1026 msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" "\n" @@ -13496,28 +13913,28 @@ msgid "" "The possible behaviours are: ignore, warn, error." msgstr "" -#: git-rebase--interactive.sh:1036 +#: git-rebase--interactive.sh:1037 #, sh-format msgid "" "Unrecognized setting $check_level for option rebase.missingCommitsCheck. " "Ignoring." msgstr "" -#: git-rebase--interactive.sh:1053 +#: 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:1054 +#: git-rebase--interactive.sh:1055 msgid "Or you can abort the rebase with 'git rebase --abort'." msgstr "" -#: git-rebase--interactive.sh:1078 +#: git-rebase--interactive.sh:1079 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "" -#: git-rebase--interactive.sh:1083 +#: git-rebase--interactive.sh:1084 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -13535,21 +13952,21 @@ msgid "" " git rebase --continue\n" msgstr "" -#: git-rebase--interactive.sh:1100 +#: git-rebase--interactive.sh:1101 msgid "Error trying to find the author identity to amend commit" msgstr "" -#: git-rebase--interactive.sh:1105 +#: git-rebase--interactive.sh:1106 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:1110 git-rebase--interactive.sh:1114 +#: git-rebase--interactive.sh:1111 git-rebase--interactive.sh:1115 msgid "Could not commit staged changes." msgstr "" -#: git-rebase--interactive.sh:1138 +#: git-rebase--interactive.sh:1139 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -13558,47 +13975,47 @@ msgid "" "\n" msgstr "" -#: git-rebase--interactive.sh:1146 git-rebase--interactive.sh:1304 +#: git-rebase--interactive.sh:1147 git-rebase--interactive.sh:1305 msgid "Could not execute editor" msgstr "" -#: git-rebase--interactive.sh:1159 +#: git-rebase--interactive.sh:1160 #, sh-format msgid "Could not checkout $switch_to" msgstr "" -#: git-rebase--interactive.sh:1164 +#: git-rebase--interactive.sh:1165 msgid "No HEAD?" msgstr "" -#: git-rebase--interactive.sh:1165 +#: git-rebase--interactive.sh:1166 #, sh-format msgid "Could not create temporary $state_dir" msgstr "" -#: git-rebase--interactive.sh:1167 +#: git-rebase--interactive.sh:1168 msgid "Could not mark as interactive" msgstr "" -#: git-rebase--interactive.sh:1177 git-rebase--interactive.sh:1182 +#: git-rebase--interactive.sh:1178 git-rebase--interactive.sh:1183 msgid "Could not init rewritten commits" msgstr "" -#: git-rebase--interactive.sh:1282 +#: git-rebase--interactive.sh:1283 #, 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:1287 +#: git-rebase--interactive.sh:1288 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" "\n" msgstr "" -#: git-rebase--interactive.sh:1294 +#: git-rebase--interactive.sh:1295 msgid "Note that empty commits are commented out" msgstr "" @@ -13658,3 +14075,767 @@ msgstr "" #: git-sh-setup.sh:377 msgid "Unable to determine absolute path of git directory" msgstr "" + +#. TRANSLATORS: you can adjust this to align "git add -i" status menu +#: git-add--interactive.perl:238 +#, perl-format +msgid "%12s %12s %s" +msgstr "" + +#: git-add--interactive.perl:239 +msgid "staged" +msgstr "" + +#: git-add--interactive.perl:239 +msgid "unstaged" +msgstr "" + +#: git-add--interactive.perl:297 git-add--interactive.perl:322 +msgid "binary" +msgstr "" + +#: git-add--interactive.perl:306 git-add--interactive.perl:360 +msgid "nothing" +msgstr "" + +#: git-add--interactive.perl:342 git-add--interactive.perl:357 +msgid "unchanged" +msgstr "" + +#: git-add--interactive.perl:653 +#, perl-format +msgid "added %d path\n" +msgid_plural "added %d paths\n" +msgstr[0] "" +msgstr[1] "" + +#: git-add--interactive.perl:656 +#, perl-format +msgid "updated %d path\n" +msgid_plural "updated %d paths\n" +msgstr[0] "" +msgstr[1] "" + +#: git-add--interactive.perl:659 +#, perl-format +msgid "reverted %d path\n" +msgid_plural "reverted %d paths\n" +msgstr[0] "" +msgstr[1] "" + +#: git-add--interactive.perl:662 +#, perl-format +msgid "touched %d path\n" +msgid_plural "touched %d paths\n" +msgstr[0] "" +msgstr[1] "" + +#: git-add--interactive.perl:671 +msgid "Update" +msgstr "" + +#: git-add--interactive.perl:683 +msgid "Revert" +msgstr "" + +#: git-add--interactive.perl:706 +#, perl-format +msgid "note: %s is untracked now.\n" +msgstr "" + +#: git-add--interactive.perl:717 +msgid "Add untracked" +msgstr "" + +#: git-add--interactive.perl:723 +msgid "No untracked files.\n" +msgstr "" + +#: git-add--interactive.perl:1039 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for staging." +msgstr "" + +#: git-add--interactive.perl:1042 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for stashing." +msgstr "" + +#: git-add--interactive.perl:1045 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for unstaging." +msgstr "" + +#: git-add--interactive.perl:1048 git-add--interactive.perl:1057 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for applying." +msgstr "" + +#: git-add--interactive.perl:1051 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for discarding" +msgstr "" + +#: git-add--interactive.perl:1054 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for discarding." +msgstr "" + +#: git-add--interactive.perl:1067 +#, perl-format +msgid "failed to open hunk edit file for writing: %s" +msgstr "" + +#: git-add--interactive.perl:1068 +msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" +msgstr "" + +#: git-add--interactive.perl:1074 +#, 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 "" + +#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. +#: git-add--interactive.perl:1082 +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 "" + +#: git-add--interactive.perl:1096 +#, perl-format +msgid "failed to open hunk edit file for reading: %s" +msgstr "" + +#. 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:1187 +msgid "" +"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +msgstr "" + +#: git-add--interactive.perl:1196 +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 "" + +#: git-add--interactive.perl:1202 +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 "" + +#: git-add--interactive.perl:1208 +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 "" + +#: git-add--interactive.perl:1214 +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 "" + +#: git-add--interactive.perl:1220 +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 "" + +#: git-add--interactive.perl:1226 +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 "" + +#: git-add--interactive.perl:1232 +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 "" + +#: git-add--interactive.perl:1241 +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 "" + +#: git-add--interactive.perl:1272 +msgid "The selected hunks do not apply to the index!\n" +msgstr "" + +#: git-add--interactive.perl:1273 +msgid "Apply them to the worktree anyway? " +msgstr "" + +#: git-add--interactive.perl:1276 +msgid "Nothing was applied.\n" +msgstr "" + +#: git-add--interactive.perl:1287 +#, perl-format +msgid "ignoring unmerged: %s\n" +msgstr "" + +#: git-add--interactive.perl:1296 +msgid "Only binary files changed.\n" +msgstr "" + +#: git-add--interactive.perl:1298 +msgid "No changes.\n" +msgstr "" + +#: git-add--interactive.perl:1306 +msgid "Patch update" +msgstr "" + +#: git-add--interactive.perl:1358 +#, perl-format +msgid "Stage mode change [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1359 +#, perl-format +msgid "Stage deletion [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1360 +#, perl-format +msgid "Stage this hunk [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1363 +#, perl-format +msgid "Stash mode change [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1364 +#, perl-format +msgid "Stash deletion [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1365 +#, perl-format +msgid "Stash this hunk [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1368 +#, perl-format +msgid "Unstage mode change [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1369 +#, perl-format +msgid "Unstage deletion [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1370 +#, perl-format +msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1373 +#, perl-format +msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1374 +#, perl-format +msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1375 +#, perl-format +msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1378 +#, perl-format +msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1379 +#, perl-format +msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1380 +#, perl-format +msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1383 +#, perl-format +msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1384 +#, perl-format +msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1385 +#, perl-format +msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1388 +#, perl-format +msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1389 +#, perl-format +msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1390 +#, perl-format +msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1493 +msgid "go to which hunk (<ret> to see more)? " +msgstr "" + +#: git-add--interactive.perl:1495 +msgid "go to which hunk? " +msgstr "" + +#: git-add--interactive.perl:1504 +#, perl-format +msgid "Invalid number: '%s'\n" +msgstr "" + +#: git-add--interactive.perl:1509 +#, perl-format +msgid "Sorry, only %d hunk available.\n" +msgid_plural "Sorry, only %d hunks available.\n" +msgstr[0] "" +msgstr[1] "" + +#: git-add--interactive.perl:1535 +msgid "search for regex? " +msgstr "" + +#: git-add--interactive.perl:1548 +#, perl-format +msgid "Malformed search regexp %s: %s\n" +msgstr "" + +#: git-add--interactive.perl:1558 +msgid "No hunk matches the given pattern\n" +msgstr "" + +#: git-add--interactive.perl:1570 git-add--interactive.perl:1592 +msgid "No previous hunk\n" +msgstr "" + +#: git-add--interactive.perl:1579 git-add--interactive.perl:1598 +msgid "No next hunk\n" +msgstr "" + +#: git-add--interactive.perl:1606 +#, perl-format +msgid "Split into %d hunk.\n" +msgid_plural "Split into %d hunks.\n" +msgstr[0] "" +msgstr[1] "" + +#: git-add--interactive.perl:1658 +msgid "Review diff" +msgstr "" + +#. TRANSLATORS: please do not translate the command names +#. 'status', 'update', 'revert', etc. +#: git-add--interactive.perl:1677 +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\t - view diff between HEAD and index\n" +"add untracked - add contents of untracked files to the staged set of " +"changes\n" +msgstr "" + +#: git-add--interactive.perl:1694 git-add--interactive.perl:1699 +#: git-add--interactive.perl:1702 git-add--interactive.perl:1709 +#: git-add--interactive.perl:1713 git-add--interactive.perl:1719 +msgid "missing --" +msgstr "" + +#: git-add--interactive.perl:1715 +#, perl-format +msgid "unknown --patch mode: %s" +msgstr "" + +#: git-add--interactive.perl:1721 git-add--interactive.perl:1727 +#, perl-format +msgid "invalid argument %s, expecting --" +msgstr "" + +#: git-send-email.perl:121 +msgid "local zone differs from GMT by a non-minute interval\n" +msgstr "" + +#: git-send-email.perl:128 git-send-email.perl:134 +msgid "local time offset greater than or equal to 24 hours\n" +msgstr "" + +#: git-send-email.perl:202 git-send-email.perl:208 +msgid "the editor exited uncleanly, aborting everything" +msgstr "" + +#: git-send-email.perl:282 +#, perl-format +msgid "" +"'%s' contains an intermediate version of the email you were composing.\n" +msgstr "" + +#: git-send-email.perl:287 +#, perl-format +msgid "'%s.final' contains the composed email.\n" +msgstr "" + +#: git-send-email.perl:305 +msgid "--dump-aliases incompatible with other options\n" +msgstr "" + +#: git-send-email.perl:368 git-send-email.perl:623 +msgid "Cannot run git format-patch from outside a repository\n" +msgstr "" + +#: git-send-email.perl:437 +#, perl-format +msgid "Unknown --suppress-cc field: '%s'\n" +msgstr "" + +#: git-send-email.perl:466 +#, perl-format +msgid "Unknown --confirm setting: '%s'\n" +msgstr "" + +#: git-send-email.perl:498 +#, perl-format +msgid "warning: sendmail alias with quotes is not supported: %s\n" +msgstr "" + +#: git-send-email.perl:500 +#, perl-format +msgid "warning: `:include:` not supported: %s\n" +msgstr "" + +#: git-send-email.perl:502 +#, perl-format +msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" +msgstr "" + +#: git-send-email.perl:507 +#, perl-format +msgid "warning: sendmail line is not recognized: %s\n" +msgstr "" + +#: git-send-email.perl:589 +#, 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 "" + +#: git-send-email.perl:610 +#, perl-format +msgid "Failed to opendir %s: %s" +msgstr "" + +#: git-send-email.perl:634 +#, perl-format +msgid "" +"fatal: %s: %s\n" +"warning: no patches were sent\n" +msgstr "" + +#: git-send-email.perl:645 +msgid "" +"\n" +"No patch files specified!\n" +"\n" +msgstr "" + +#: git-send-email.perl:658 +#, perl-format +msgid "No subject line in %s?" +msgstr "" + +#: git-send-email.perl:668 +#, perl-format +msgid "Failed to open for writing %s: %s" +msgstr "" + +#: git-send-email.perl:678 +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 "" + +#: git-send-email.perl:701 +#, perl-format +msgid "Failed to open %s.final: %s" +msgstr "" + +#: git-send-email.perl:704 +#, perl-format +msgid "Failed to open %s: %s" +msgstr "" + +#: git-send-email.perl:739 +msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n" +msgstr "" + +#: git-send-email.perl:748 +msgid "Summary email is empty, skipping it\n" +msgstr "" + +#. TRANSLATORS: please keep [y/N] as is. +#: git-send-email.perl:780 +#, perl-format +msgid "Are you sure you want to use <%s> [y/N]? " +msgstr "" + +#: git-send-email.perl:809 +msgid "" +"The following files are 8bit, but do not declare a Content-Transfer-" +"Encoding.\n" +msgstr "" + +#: git-send-email.perl:814 +msgid "Which 8bit encoding should I declare [UTF-8]? " +msgstr "" + +#: git-send-email.perl:822 +#, 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 "" + +#: git-send-email.perl:841 +msgid "To whom should the emails be sent (if anyone)?" +msgstr "" + +#: git-send-email.perl:859 +#, perl-format +msgid "fatal: alias '%s' expands to itself\n" +msgstr "" + +#: git-send-email.perl:871 +msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " +msgstr "" + +#: git-send-email.perl:921 git-send-email.perl:929 +#, perl-format +msgid "error: unable to extract a valid address from: %s\n" +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:933 +msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " +msgstr "" + +#: git-send-email.perl:1234 +#, perl-format +msgid "CA path \"%s\" does not exist" +msgstr "" + +#: git-send-email.perl:1309 +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 "" + +#. 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:1324 +msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): " +msgstr "" + +#: git-send-email.perl:1327 +msgid "Send this email reply required" +msgstr "" + +#: git-send-email.perl:1353 +msgid "The required SMTP server is not properly defined." +msgstr "" + +#: git-send-email.perl:1397 +#, perl-format +msgid "Server does not support STARTTLS! %s" +msgstr "" + +#: git-send-email.perl:1403 +msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." +msgstr "" + +#: git-send-email.perl:1421 +#, perl-format +msgid "Failed to send %s\n" +msgstr "" + +#: git-send-email.perl:1424 +#, perl-format +msgid "Dry-Sent %s\n" +msgstr "" + +#: git-send-email.perl:1424 +#, perl-format +msgid "Sent %s\n" +msgstr "" + +#: git-send-email.perl:1426 +msgid "Dry-OK. Log says:\n" +msgstr "" + +#: git-send-email.perl:1426 +msgid "OK. Log says:\n" +msgstr "" + +#: git-send-email.perl:1438 +msgid "Result: " +msgstr "" + +#: git-send-email.perl:1441 +msgid "Result: OK\n" +msgstr "" + +#: git-send-email.perl:1454 +#, perl-format +msgid "can't open file %s" +msgstr "" + +#: git-send-email.perl:1501 git-send-email.perl:1521 +#, perl-format +msgid "(mbox) Adding cc: %s from line '%s'\n" +msgstr "" + +#: git-send-email.perl:1507 +#, perl-format +msgid "(mbox) Adding to: %s from line '%s'\n" +msgstr "" + +#: git-send-email.perl:1555 +#, perl-format +msgid "(non-mbox) Adding cc: %s from line '%s'\n" +msgstr "" + +#: git-send-email.perl:1578 +#, perl-format +msgid "(body) Adding cc: %s from line '%s'\n" +msgstr "" + +#: git-send-email.perl:1676 +#, perl-format +msgid "(%s) Could not execute '%s'" +msgstr "" + +#: git-send-email.perl:1683 +#, perl-format +msgid "(%s) Adding %s: %s from: '%s'\n" +msgstr "" + +#: git-send-email.perl:1687 +#, perl-format +msgid "(%s) failed to close pipe to '%s'" +msgstr "" + +#: git-send-email.perl:1714 +msgid "cannot send message as 7bit" +msgstr "" + +#: git-send-email.perl:1722 +msgid "invalid transfer encoding" +msgstr "" + +#: git-send-email.perl:1741 git-send-email.perl:1792 git-send-email.perl:1802 +#, perl-format +msgid "unable to open %s: %s\n" +msgstr "" + +#: git-send-email.perl:1744 +#, perl-format +msgid "%s: patch contains a line longer than 998 characters" +msgstr "" + +#: git-send-email.perl:1760 +#, perl-format +msgid "Skipping %s with backup suffix '%s'.\n" +msgstr "" + +#. TRANSLATORS: please keep "[y|N]" as is. +#: git-send-email.perl:1764 +#, perl-format +msgid "Do you really want to send %s? [y|N]: " +msgstr "" @@ -1,10 +1,10 @@ # Git Korean translation -# Copyright (C) 2015-2016 Changwoo Ryu and contributors +# Copyright (C) 2015-2017 Changwoo Ryu and contributors # This file is distributed under the same license as the Git package. # # Contributors: # Hyunjun Kim <yoloseem AT users.noreply.github.com>, 2015. -# Changwoo Ryu <cwryu@debian.org>, 2015-2016. +# Changwoo Ryu <cwryu@debian.org>, 2015-2017. # # - 작업자는 위 Contributors 목록에 추가해 주세요. # - 번역하면서 80컬럼을 넘어가지 않도록 해 주세요. @@ -58,8 +58,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2016-11-25 22:50+0800\n" -"PO-Revision-Date: 2016-11-25 22:56+0800\n" +"POT-Creation-Date: 2017-02-04 13:02+0800\n" +"PO-Revision-Date: 2017-02-11 11:31+0900\n" "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n" "Language-Team: Git Korean translation <http://github.com/changwoo/git-l10n-" "ko>\n" @@ -111,7 +111,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "해결하지 못한 충돌 때문에 끝납니다." -#: advice.c:114 builtin/merge.c:1181 +#: advice.c:114 builtin/merge.c:1206 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "병합 작업을 다 마치지 않았습니다 (MERGE_HEAD 파일이 있습니다)." @@ -577,7 +577,7 @@ msgstr[0] "%%s 패치를 (%d개 거부) 적용..." msgid "truncating .rej filename to %.*s.rej" msgstr "truncating .rej 파일 이름을 '%.*s.rej'(으)로 자름" -#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989 +#: apply.c:4540 builtin/fetch.c:737 builtin/fetch.c:986 #, c-format msgid "cannot open %s" msgstr "%s을(를) 열 수 없습니다" @@ -628,15 +628,16 @@ msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "공백 오류를 바로잡은 뒤에 %d번 줄 적용." -#: apply.c:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431 +#: apply.c:4888 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391 msgid "Unable to write new index file" msgstr "새 인덱스 파일에 쓸 수 없습니다" #: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280 #: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180 -#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:407 -#: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592 -#: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947 +#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:591 +#: builtin/submodule--helper.c:594 builtin/submodule--helper.c:960 +#: builtin/submodule--helper.c:963 builtin/submodule--helper.c:1104 +#: git-add--interactive.perl:239 msgid "path" msgstr "경로" @@ -737,8 +738,8 @@ msgid "allow overlapping hunks" msgstr "패치 부분이 겹쳐도 허용합니다" #: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19 -#: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593 -#: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114 +#: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651 +#: builtin/log.c:1860 builtin/mv.c:122 builtin/read-tree.c:114 msgid "be verbose" msgstr "자세히 표시" @@ -777,7 +778,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <저장소> [--exec <명령>] --list" -#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327 +#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300 #, c-format msgid "pathspec '%s' did not match any files" msgstr "'%s' 경로명세가 어떤 파일과도 일치하지 않습니다" @@ -798,11 +799,11 @@ msgstr "접두어" msgid "prepend prefix to each pathname in the archive" msgstr "아카이브의 각 경로 이름의 앞에 지정한 경로를 붙입니다" -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2603 -#: builtin/blame.c:2604 builtin/config.c:59 builtin/fast-export.c:987 -#: builtin/fast-export.c:989 builtin/grep.c:723 builtin/hash-object.c:101 -#: builtin/ls-files.c:539 builtin/ls-files.c:542 builtin/notes.c:401 -#: builtin/notes.c:564 builtin/read-tree.c:109 parse-options.h:153 +#: archive.c:432 builtin/blame.c:2607 builtin/blame.c:2608 builtin/config.c:59 +#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1054 +#: builtin/hash-object.c:101 builtin/ls-files.c:539 builtin/ls-files.c:542 +#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109 +#: parse-options.h:153 msgid "file" msgstr "파일" @@ -835,7 +836,7 @@ msgid "list supported archive formats" msgstr "지원하는 압축 형식의 목록을 표시합니다" #: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88 -#: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953 +#: builtin/submodule--helper.c:603 builtin/submodule--helper.c:969 msgid "repo" msgstr "저장소" @@ -931,7 +932,7 @@ msgstr "" #: bisect.c:750 #, c-format msgid "" -"Some %s revs are not ancestor of the %s rev.\n" +"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 "" @@ -960,7 +961,7 @@ msgstr "이등분: 병합 베이스를 시험해야 합니다\n" msgid "a %s revision is needed" msgstr "하나의 %s 리비전이 필요합니다" -#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248 +#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:262 #, c-format msgid "could not create file '%s'" msgstr "'%s' 파일을 만들 수 없습니다" @@ -1152,7 +1153,7 @@ msgstr "'%s' 파일이 버전2 번들 파일로 보이지 않습니다" msgid "unrecognized header: %s%s (%d)" msgstr "인식할 수 없는 헤더: %s%s (%d)" -#: bundle.c:87 sequencer.c:963 builtin/commit.c:777 +#: bundle.c:87 sequencer.c:1331 sequencer.c:1752 builtin/commit.c:777 #, c-format msgid "could not open '%s'" msgstr "'%s'을(를) 열 수 없습니다" @@ -1161,10 +1162,10 @@ msgstr "'%s'을(를) 열 수 없습니다" msgid "Repository lacks these prerequisite commits:" msgstr "저장소에 필수적인 다음 커밋이 없습니다:" -#: bundle.c:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374 -#: builtin/blame.c:2814 builtin/commit.c:1061 builtin/log.c:348 +#: bundle.c:163 ref-filter.c:1499 sequencer.c:1154 sequencer.c:2290 +#: builtin/blame.c:2820 builtin/commit.c:1061 builtin/log.c:348 #: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909 -#: builtin/merge.c:356 builtin/shortlog.c:170 +#: builtin/merge.c:360 builtin/shortlog.c:177 msgid "revision walk setup failed" msgstr "리비전 walk 준비가 실패했습니다" @@ -1201,7 +1202,7 @@ msgstr "rev-list 명령이 죽었습니다" msgid "ref '%s' is excluded by the rev-list options" msgstr "rev-list 옵션에서 '%s' 레퍼런스가 제외되었습니다" -#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273 +#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:282 #, c-format msgid "unrecognized argument: %s" msgstr "알 수 없는 인자: %s" @@ -1219,13 +1220,13 @@ msgstr "'%s'을(를) 만들 수 없습니다" msgid "index-pack died" msgstr "index-pack 명령이 죽었습니다" -#: color.c:290 +#: color.c:300 #, c-format msgid "invalid color value: %.*s" msgstr "잘못된 색 값: %.*s" -#: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493 -#: builtin/am.c:2127 +#: commit.c:40 sequencer.c:1564 builtin/am.c:421 builtin/am.c:457 +#: builtin/am.c:1493 builtin/am.c:2127 #, c-format msgid "could not parse %s" msgstr "parse %s을(를) 파싱할 수 없습니다" @@ -1249,123 +1250,133 @@ msgstr "" msgid "memory exhausted" msgstr "메모리 바닥남" -#: config.c:516 +#: config.c:518 #, c-format msgid "bad config line %d in blob %s" msgstr "블롭 %2$s 안에 %1$d번 줄에 잘못된 설정" -#: config.c:520 +#: config.c:522 #, c-format msgid "bad config line %d in file %s" msgstr "파일 %2$s 안에 %1$d번 줄에 잘못된 설정" -#: config.c:524 +#: config.c:526 #, c-format msgid "bad config line %d in standard input" msgstr "표준 입력 안에 %d번 줄에 잘못된 설정" -#: config.c:528 +#: config.c:530 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "하위 모듈 블롭 %2$s 안에 %1$d번 줄에 잘못된 설정" -#: config.c:532 +#: config.c:534 #, c-format msgid "bad config line %d in command line %s" msgstr "명령행 %2$s 안에 %1$d번 줄에 잘못된 설정" -#: config.c:536 +#: config.c:538 #, c-format msgid "bad config line %d in %s" msgstr "%2$s 안에 %1$d번 줄에 잘못된 설정" -#: config.c:655 +#: config.c:657 msgid "out of range" msgstr "범위를 벗어남" -#: config.c:655 +#: config.c:657 msgid "invalid unit" msgstr "단위가 잘못됨" -#: config.c:661 +#: config.c:663 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "잘못된 수치 설정 값 '%s' (키 '%s'): %s" -#: config.c:666 +#: config.c:668 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "잘못된 수치 설정 값 '%s' (키 '%s', 블롭 %s): %s" -#: config.c:669 +#: config.c:671 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "잘못된 수치 설정 값 '%s' (키 '%s', 파일 %s): %s" -#: config.c:672 +#: config.c:674 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "잘못된 수치 설정 값 '%s' (키 '%s', 표준입력): %s" -#: config.c:675 +#: config.c:677 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "잘못된 수치 설정 값 '%s' (키 '%s', 하위 모듈 블롭 %s): %s" -#: config.c:678 +#: config.c:680 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "잘못된 수치 설정 값 '%s' (키 '%s', 명령행 %s): %s" -#: config.c:681 +#: config.c:683 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "잘못된 수치 설정 값 '%s' (키 '%s', %s 안에): %s" -#: config.c:768 +#: config.c:770 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "다음에 사용자 디렉터리 확장에 실패: '%s'" -#: config.c:852 config.c:863 +#: config.c:865 config.c:876 #, c-format msgid "bad zlib compression level %d" msgstr "%d번은 올바른 zlib 압축 단계가 아닙니다" -#: config.c:978 +#: config.c:993 #, c-format msgid "invalid mode for object creation: %s" msgstr "오브젝트 생성 모드가 올바르지 않습니다: %s" -#: config.c:1312 +#: config.c:1149 +#, c-format +msgid "bad pack compression level %d" +msgstr "잘못 묶음 압축 단계 %d" + +#: config.c:1339 msgid "unable to parse command-line config" msgstr "명령행 설정을 파싱할 수 없습니다" -#: config.c:1362 +#: config.c:1389 msgid "unknown error occurred while reading the configuration files" msgstr "설정 파일을 읽는 중 알 수 없는 오류가 생겼습니다" -#: config.c:1716 +#: config.c:1743 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "명령행 설정에서 '%s'을(를) 설정할 수 없습니다" -#: config.c:1718 +#: config.c:1745 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "'%2$s' 파일의 %3$d번 줄 '%1$s' 설정 변수가 잘못되었습니다" -#: config.c:1777 +#: config.c:1804 #, c-format msgid "%s has multiple values" msgstr "%s은(는) 여러 개 값이 있습니다" -#: config.c:2311 +#: config.c:2225 config.c:2450 +#, c-format +msgid "fstat on %s failed" +msgstr "%s에 대해 fstat 실패" + +#: config.c:2343 #, c-format msgid "could not set '%s' to '%s'" msgstr "'%s'을(를) '%s'(으)로 설정할 수 없습니다" -#: config.c:2313 +#: config.c:2345 #, c-format msgid "could not unset '%s'" msgstr "'%s' 설정을 지울 수 없습니다" @@ -1386,7 +1397,7 @@ msgstr "" "올바른 접근 권한이 있는지, 그리고 저장소가 있는지\n" "확인하십시오." -#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140 +#: connected.c:63 builtin/fsck.c:190 builtin/prune.c:140 msgid "Checking connectivity" msgstr "연결을 확인하는 중입니다" @@ -1513,12 +1524,12 @@ msgstr " dirstat 자름 퍼센트 값 '%s' 파싱에 실패했습니다\n" msgid " Unknown dirstat parameter '%s'\n" msgstr " 알 수 없는 dirstat 파라미터 '%s'\n" -#: diff.c:283 +#: diff.c:281 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "'diff.submodule' 설정 변수에 알 수 없는 값: '%s'" -#: diff.c:346 +#: diff.c:344 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -1527,21 +1538,21 @@ msgstr "" "'diff.submodule' 설정 변수에 오류:\n" "%s'" -#: diff.c:3087 +#: diff.c:3085 #, c-format msgid "external diff died, stopping at %s" msgstr "외부 diff 프로그램이 죽음, %s 위치에서 멈춤" -#: diff.c:3412 +#: diff.c:3411 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" "\"--name-only, --name-status, --check, -s 옵션 중 하나만 쓸 수 있습니다" -#: diff.c:3502 +#: diff.c:3501 msgid "--follow requires exactly one pathspec" msgstr "--follow 옵션에는 정확히 하나의 경로명세가 필요합니다" -#: diff.c:3665 +#: diff.c:3664 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -1550,33 +1561,38 @@ msgstr "" "--dirstat/-X 옵션 파라미터를 파싱하는데 실패했습니다:\n" "%s" -#: diff.c:3679 +#: diff.c:3678 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "--submodule 옵션 파라미터 파싱에 실패했습니다: '%s'" -#: diff.c:4700 +#: diff.c:4695 msgid "inexact rename detection was skipped due to too many files." msgstr "파일이 너무 많아서 부정확한 이름 바꾸기 검색 기능을 건너뜁니다." -#: diff.c:4703 +#: diff.c:4698 msgid "only found copies from modified paths due to too many files." msgstr "파일이 너무 많아서 수정한 경로의 복사본만 찾았습니다." -#: diff.c:4706 +#: diff.c:4701 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "%s 변수를 최소한 %d(으)로 설정하고 명령을 다시 시도해 보십시오." -#: dir.c:1866 +#: dir.c:1863 msgid "failed to get kernel name and information" msgstr "커널 이름과 정보를 가져오는데 실패했습니다" -#: dir.c:1985 +#: dir.c:1982 msgid "Untracked cache is disabled on this system or location." msgstr "이 시스템 또는 위치에서는 추적되지 않는 캐시를 사용하지 않습니다." +#: dir.c:2760 +#, c-format +msgid "could not migrate git directory from '%s' to '%s'" +msgstr "'%s'에서 '%s'(으)로 git 디렉터리를 옮겨올 수 없습니다" + #: fetch-pack.c:213 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: 얕은 목록을 예상함" @@ -1757,35 +1773,40 @@ msgstr "임시 파일을 만들 수 없습니다" msgid "failed writing detached signature to '%s'" msgstr "분리된 서명을 '%s'에 쓰는데 실패했습니다" -#: grep.c:1782 +#: graph.c:96 +#, c-format +msgid "ignore invalid color '%.*s' in log.graphColors" +msgstr "log.graphColors에 잘못된 색을 ('%.*s') 무시합니다" + +#: grep.c:1794 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': %s을(를) 읽을 수 없습니다" -#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155 +#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:133 #, c-format msgid "failed to stat '%s'" msgstr "'%s'에 대해 stat()이 실패했습니다" -#: grep.c:1810 +#: grep.c:1822 #, c-format msgid "'%s': short read" msgstr "'%s': 읽다가 잘림" -#: help.c:203 +#: help.c:218 #, c-format msgid "available git commands in '%s'" msgstr "'%s'에 있는 깃 명령" -#: help.c:210 +#: help.c:225 msgid "git commands available from elsewhere on your $PATH" msgstr "다른 $PATH에 있는 깃 명령" -#: help.c:241 +#: help.c:256 msgid "These are common Git commands used in various situations:" msgstr "다음은 여러가지 상황에서 자주 사용하는 깃 명령입니다:" -#: help.c:306 +#: help.c:321 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -1794,11 +1815,11 @@ msgstr "" "'%s'은(는) 깃 명령으로 보이지만, 실행할 수\n" "없습니다. 아마도 git-%s 망가진 것 같습니다." -#: help.c:361 +#: help.c:376 msgid "Uh oh. Your system reports no Git commands at all." msgstr "어라라. 시스템에 깃 명령이 하나도 없다고 나옵니다." -#: help.c:383 +#: help.c:398 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" @@ -1807,17 +1828,17 @@ msgstr "" "경고: 이름이 '%s'인 깃 명령을 실행했지만, 그 명령이 없습니다.\n" "자동으로 '%s' 명령이라고 가정하고 계속합니다" -#: help.c:388 +#: help.c:403 #, c-format msgid "in %0.1f seconds automatically..." msgstr "(%0.1f초 뒤에)..." -#: help.c:395 +#: help.c:410 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: '%s'은(는) 깃 명령이 아닙니다. 'git --help'를 참고하십시오." -#: help.c:399 help.c:465 +#: help.c:414 help.c:480 msgid "" "\n" "Did you mean this?" @@ -1828,7 +1849,7 @@ msgstr[0] "" "\n" "다음을 의도하신 것 아니었나요?" -#: help.c:461 +#: help.c:476 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" @@ -1896,69 +1917,69 @@ msgstr "새 인덱스 파일을 쓸 수 없습니다" msgid "(bad commit)\n" msgstr "(잘못된 커밋)\n" -#: merge-recursive.c:231 +#: merge-recursive.c:231 merge-recursive.c:239 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "'%s' 경로에 대해 addinfo_cache가 실패했습니다" -#: merge-recursive.c:301 +#: merge-recursive.c:303 msgid "error building trees" msgstr "트리 빌드에 오류" -#: merge-recursive.c:720 +#: merge-recursive.c:727 #, c-format msgid "failed to create path '%s'%s" msgstr "'%s' 경로 만들기에 실패했습니다%s" -#: merge-recursive.c:731 +#: merge-recursive.c:738 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "하위 디렉터리에 공간을 만드려고 %s을(를) 제거합니다\n" -#: merge-recursive.c:745 merge-recursive.c:764 +#: merge-recursive.c:752 merge-recursive.c:771 msgid ": perhaps a D/F conflict?" msgstr ": 아마도 D/F 충돌?" -#: merge-recursive.c:754 +#: merge-recursive.c:761 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "'%s' 위치의 추적되지 않는 파일을 잃기를 거부합니다" -#: merge-recursive.c:796 builtin/cat-file.c:34 +#: merge-recursive.c:803 builtin/cat-file.c:34 #, c-format msgid "cannot read object %s '%s'" msgstr "%s '%s' 오브젝트를 읽을 수 없음" -#: merge-recursive.c:798 +#: merge-recursive.c:805 #, c-format msgid "blob expected for %s '%s'" msgstr "%s '%s'에 대해 블롭을 예상" -#: merge-recursive.c:822 +#: merge-recursive.c:829 #, c-format msgid "failed to open '%s': %s" msgstr "'%s'을(를) 여는데 실패: %s" -#: merge-recursive.c:833 +#: merge-recursive.c:840 #, c-format msgid "failed to symlink '%s': %s" msgstr "'%s' 심볼릭 링크에 실패: %s" -#: merge-recursive.c:838 +#: merge-recursive.c:845 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "다음을 어떻게 할지 알 수 없습니다: %06o %s '%s'" -#: merge-recursive.c:978 +#: merge-recursive.c:985 msgid "Failed to execute internal merge" msgstr "내부 병합 실행에 실패" -#: merge-recursive.c:982 +#: merge-recursive.c:989 #, c-format msgid "Unable to add %s to database" msgstr "%s을(를) 데이터베이스에 추가할 수 없습니다" -#: merge-recursive.c:1081 merge-recursive.c:1095 +#: merge-recursive.c:1088 merge-recursive.c:1102 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -1966,7 +1987,7 @@ msgid "" msgstr "" "충돌! (%s/삭제): %s (위치 %s) 및 %s (%s에서) 삭제. %s 버전의 %s 트리에 남음." -#: merge-recursive.c:1087 merge-recursive.c:1100 +#: merge-recursive.c:1094 merge-recursive.c:1107 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -1975,20 +1996,20 @@ msgstr "" "충돌! (%s/삭제): %s (위치 %s) 및 %s (위치 %s) 삭제. %s 버전의 %s 트리에 " "%s(으)로 남음." -#: merge-recursive.c:1143 +#: merge-recursive.c:1150 msgid "rename" msgstr "이름바꾸기" -#: merge-recursive.c:1143 +#: merge-recursive.c:1150 msgid "renamed" msgstr "이름바꿈" -#: merge-recursive.c:1200 +#: merge-recursive.c:1207 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s은(는) %s에 있는 디렉터리로 %s(으)로 이름을 바꿉니다" -#: merge-recursive.c:1225 +#: merge-recursive.c:1232 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -1997,136 +2018,136 @@ msgstr "" "충돌! (이름바꾸기/이름바꾸기): \"%3$s\" 브랜치에서 이름바꾸기 \"%1$s\"->" "\"%2$s\" \"%6$s\" 브랜치에서 이름 바꾸기 \"%4$s\"->\"%5$s\"%7$s" -#: merge-recursive.c:1230 +#: merge-recursive.c:1237 msgid " (left unresolved)" msgstr " (해결되지 않음)" -#: merge-recursive.c:1292 +#: merge-recursive.c:1299 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "충돌! (rename/rename): 이름 바꾸기 %s->%s (위치 %s). 이름 바꾸기 %s->%s (위" "치 %s)" -#: merge-recursive.c:1325 +#: merge-recursive.c:1332 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "대신 이름을 %s에서 %s(으)로 바꾸고 %s에서 %s(으)로 바꿉니다" -#: merge-recursive.c:1531 +#: merge-recursive.c:1538 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "충돌! (rename/add): 이름 바꾸기 %s->%s (위치 %s). %s 추가 (위치 %s)" -#: merge-recursive.c:1546 +#: merge-recursive.c:1553 #, c-format msgid "Adding merged %s" msgstr "병합된 %s을(를) 추가합니다" -#: merge-recursive.c:1553 merge-recursive.c:1766 +#: merge-recursive.c:1560 merge-recursive.c:1774 #, c-format msgid "Adding as %s instead" msgstr "대신 %s(으)로 추가합니다" -#: merge-recursive.c:1610 +#: merge-recursive.c:1617 #, c-format msgid "cannot read object %s" msgstr "%s 오브젝트를 읽을 수 없습니다" -#: merge-recursive.c:1613 +#: merge-recursive.c:1620 #, c-format msgid "object %s is not a blob" msgstr "%s 오브젝트는 블롭이 아닙니다" -#: merge-recursive.c:1666 +#: merge-recursive.c:1673 msgid "modify" msgstr "수정" -#: merge-recursive.c:1666 +#: merge-recursive.c:1673 msgid "modified" msgstr "수정됨" -#: merge-recursive.c:1676 +#: merge-recursive.c:1683 msgid "content" msgstr "내용" -#: merge-recursive.c:1683 +#: merge-recursive.c:1690 msgid "add/add" msgstr "추가/추가" -#: merge-recursive.c:1718 +#: merge-recursive.c:1726 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "건너뛰기: %s (기존과 같게 병합)" -#: merge-recursive.c:1732 +#: merge-recursive.c:1740 #, c-format msgid "Auto-merging %s" msgstr "자동 병합: %s" -#: merge-recursive.c:1736 git-submodule.sh:924 +#: merge-recursive.c:1744 git-submodule.sh:930 msgid "submodule" msgstr "하위 모듈" -#: merge-recursive.c:1737 +#: merge-recursive.c:1745 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "충돌! (%s): %s에 병합 충돌" -#: merge-recursive.c:1831 +#: merge-recursive.c:1839 #, c-format msgid "Removing %s" msgstr "제거: %s" -#: merge-recursive.c:1857 +#: merge-recursive.c:1865 msgid "file/directory" msgstr "파일/디렉터리" -#: merge-recursive.c:1863 +#: merge-recursive.c:1871 msgid "directory/file" msgstr "디렉터리/파일" -#: merge-recursive.c:1868 +#: merge-recursive.c:1877 #, 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:1877 +#: merge-recursive.c:1886 #, c-format msgid "Adding %s" msgstr "추가: %s" -#: merge-recursive.c:1914 +#: merge-recursive.c:1923 msgid "Already up-to-date!" msgstr "이미 업데이트 상태입니다!" -#: merge-recursive.c:1923 +#: merge-recursive.c:1932 #, c-format msgid "merging of trees %s and %s failed" msgstr "%s 및 %s 트리의 병합이 실패했습니다" -#: merge-recursive.c:2006 +#: merge-recursive.c:2015 msgid "Merging:" msgstr "병합:" -#: merge-recursive.c:2019 +#: merge-recursive.c:2028 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "과거의 공통 커밋 %u개 발견:" -#: merge-recursive.c:2058 +#: merge-recursive.c:2067 msgid "merge returned no commit" msgstr "병합 결과에 커밋이 없습니다" -#: merge-recursive.c:2121 +#: merge-recursive.c:2130 #, c-format msgid "Could not parse object '%s'" msgstr "'%s' 오브젝트를 파싱할 수 없습니다" -#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788 +#: merge-recursive.c:2144 builtin/merge.c:645 builtin/merge.c:792 msgid "Unable to write index." msgstr "인덱스를 쓸 수 없습니다." @@ -2207,57 +2228,62 @@ msgstr "잘못된 형식의 오브젝트 이름 '%s'" msgid "Could not make %s writable by group" msgstr "%s을(를) 그룹에서 쓰기 가능하도록 만들 수 없습니다" -#: pathspec.c:133 +#: pathspec.c:142 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "'glob' 및 'noglob' 경로명세 전체 설정은 호환되지 않습니다" -#: pathspec.c:143 +#: pathspec.c:149 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" msgstr "" "'literal' 경로명세 전체 설정은 다른 경로명세 전체 설정과 호환되지 않습니다" -#: pathspec.c:177 +#: pathspec.c:188 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "경로명세 지시어 'prefix'에 잘못된 파라미터" -#: pathspec.c:183 +#: pathspec.c:201 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "잘못된 경로명세 지시어 '%.*s' (위치 '%s')" -#: pathspec.c:187 +#: pathspec.c:206 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "경로 명세 지시어 끝에 ')' 빠짐 (위치 '%s')" -#: pathspec.c:205 +#: pathspec.c:238 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "구현되지 않은 경로명세 지시어 '%c' (위치 '%s')" -#: pathspec.c:230 +#: pathspec.c:293 pathspec.c:315 +#, c-format +msgid "Pathspec '%s' is in submodule '%.*s'" +msgstr "경로명세 '%s'은(는) ''%.*s' 하위 모듈 안에 있습니다" + +#: pathspec.c:350 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: 'literal'과 'glob'은 호환되지 않습니다" -#: pathspec.c:241 +#: pathspec.c:363 #, c-format msgid "%s: '%s' is outside repository" msgstr "%s: '%s'은(는) 저장소 밖입니다" -#: pathspec.c:291 +#: pathspec.c:451 #, c-format -msgid "Pathspec '%s' is in submodule '%.*s'" -msgstr "경로명세 '%s'은(는) ''%.*s' 하위 모듈 안에 있습니다" +msgid "'%s' (mnemonic: '%c')" +msgstr "'%s' (단축키: '%c')" -#: pathspec.c:353 +#: pathspec.c:461 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: 경로명세 지시어가 이 명령어에서 지원하지 않습니다: %s" -#: pathspec.c:408 +#: pathspec.c:511 msgid "" "empty strings as pathspecs will be made invalid in upcoming releases. please " "use . instead if you meant to match all paths" @@ -2265,12 +2291,12 @@ msgstr "" "경로명세로 빈 문자열을 넣는 일은 다음 릴리스에서 오류로 취급할 예정입니다. 모" "든 경로를 지정하려면 점(.)을 사용하십시오." -#: pathspec.c:440 +#: pathspec.c:535 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "'%s' 경로명세는 심볼릭 링크 아래에 있습니다" -#: pathspec.c:449 +#: pathspec.c:544 msgid "" "There is nothing to exclude from by :(exclude) patterns.\n" "Perhaps you forgot to add either ':/' or '.' ?" @@ -2278,11 +2304,11 @@ msgstr "" ":(exclude) 패턴으로 제외할 사항이 없습니다.\n" "':/' 또는 '.' 추가를 잊으신 것 아닙니까?" -#: pretty.c:971 +#: pretty.c:982 msgid "unable to parse --pretty format" msgstr "--pretty 형식을 파싱할 수 없습니다" -#: read-cache.c:1315 +#: read-cache.c:1307 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -2291,7 +2317,7 @@ msgstr "" "index.version이 설정되었지만, 이 값이 잘못되었습니다.\n" "%i 버전을 사용합니다" -#: read-cache.c:1325 +#: read-cache.c:1317 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -2300,7 +2326,7 @@ msgstr "" "GIT_INDEX_VERSION이 설정되었지만, 이 값이 잘못되었습니다.\n" "%i 버전을 사용합니다" -#: refs.c:576 builtin/merge.c:840 +#: refs.c:576 builtin/merge.c:844 #, c-format msgid "Could not open '%s' for writing" msgstr "'%s'을(를) 쓰기용으로 열 수 없습니다" @@ -2320,237 +2346,242 @@ msgstr "레퍼런스를 삭제할 수 없습니다: %s" msgid "could not remove reference %s" msgstr "%s 레퍼런스를 제거할 수 없습니다" -#: ref-filter.c:55 +#: ref-filter.c:56 #, c-format msgid "expected format: %%(color:<color>)" msgstr "예상한 형식: %%(color:<색>)" -#: ref-filter.c:57 +#: ref-filter.c:58 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "인식할 수 없는 색: %%(color:%s)" -#: ref-filter.c:71 +#: ref-filter.c:72 #, c-format msgid "unrecognized format: %%(%s)" msgstr "알 수 없는 형식: %%(%s)" -#: ref-filter.c:77 +#: ref-filter.c:78 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body)에 인자를 받지 않습니다" -#: ref-filter.c:84 +#: ref-filter.c:85 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject)에 인자를 받지 않습니다" -#: ref-filter.c:101 +#: ref-filter.c:92 +#, c-format +msgid "%%(trailers) does not take arguments" +msgstr "%%(trailers)에 인자를 받지 않습니다" + +#: ref-filter.c:111 #, c-format msgid "positive value expected contents:lines=%s" msgstr "'contents:lines=%s'에서 0보다 큰 값이 와야 합니다" -#: ref-filter.c:103 +#: ref-filter.c:113 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "알 수 없는 %%(contents) 인자: %s" -#: ref-filter.c:113 +#: ref-filter.c:123 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "알 수 없는 %%(objectname) 인자: %s" -#: ref-filter.c:135 +#: ref-filter.c:145 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "예상한 형식: %%(align:<너비>,<위치>)" -#: ref-filter.c:147 +#: ref-filter.c:157 #, c-format msgid "unrecognized position:%s" msgstr "인식할 수 없는 위치:%s" -#: ref-filter.c:151 +#: ref-filter.c:161 #, c-format msgid "unrecognized width:%s" msgstr "인식할 수 없는 너비:%s" -#: ref-filter.c:157 +#: ref-filter.c:167 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "인식할 수 없는 %%(align) 인자:%s" -#: ref-filter.c:161 +#: ref-filter.c:171 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "%%(align) 아톰에 너비가 0보다 커야 합니다" -#: ref-filter.c:244 +#: ref-filter.c:255 #, c-format msgid "malformed field name: %.*s" msgstr "잘못된 형식의 필드 이름: %.*s" -#: ref-filter.c:270 +#: ref-filter.c:281 #, c-format msgid "unknown field name: %.*s" msgstr "알 수 없는 필드 이름: %.*s" -#: ref-filter.c:372 +#: ref-filter.c:383 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "형식: %%(end) 아톰이 대응되는 아톰 없이 사용되었습니다" -#: ref-filter.c:424 +#: ref-filter.c:435 #, c-format msgid "malformed format string %s" msgstr "잘못된 형식의 문자열 %s" -#: ref-filter.c:878 +#: ref-filter.c:898 msgid ":strip= requires a positive integer argument" msgstr ":strip= 명령에는 0보다 큰 정수 인자가 필요합니다" -#: ref-filter.c:883 +#: ref-filter.c:903 #, c-format msgid "ref '%s' does not have %ld components to :strip" msgstr "'%s' 레퍼런스에 :strip할 구성 요소 %ld개가 없습니다" -#: ref-filter.c:1046 +#: ref-filter.c:1066 #, c-format msgid "unknown %.*s format %s" msgstr "알 수 없는 %.*s 형식 %s" -#: ref-filter.c:1066 ref-filter.c:1097 +#: ref-filter.c:1086 ref-filter.c:1117 #, c-format msgid "missing object %s for %s" msgstr "없는 오브젝트 %s, %s에 대해" -#: ref-filter.c:1069 ref-filter.c:1100 +#: ref-filter.c:1089 ref-filter.c:1120 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "%s에 parse_object_buffer 실패 (%s에 대해)" -#: ref-filter.c:1311 +#: ref-filter.c:1343 #, c-format msgid "malformed object at '%s'" msgstr "'%s'에 잘못된 형식의 오브젝트" -#: ref-filter.c:1373 +#: ref-filter.c:1410 #, c-format msgid "ignoring ref with broken name %s" msgstr "망가진 이름 %s에 레퍼런스를 무시합니다" -#: ref-filter.c:1378 +#: ref-filter.c:1415 #, c-format msgid "ignoring broken ref %s" msgstr "망가진 레퍼런스 %s 무시" -#: ref-filter.c:1633 +#: ref-filter.c:1670 #, c-format msgid "format: %%(end) atom missing" msgstr "형식: %%(end) 아톰이 없습니다" -#: ref-filter.c:1687 +#: ref-filter.c:1734 #, c-format msgid "malformed object name %s" msgstr "잘못된 형식의 오브젝트 이름 %s" -#: remote.c:746 +#: remote.c:754 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "%s 및 %s을(를) 모두 %s에 가져올 수 없습니다" -#: remote.c:750 +#: remote.c:758 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s은(는) 보통 %s을(를) 추적하고, %s을(를) 추적하지 않습니다" -#: remote.c:754 +#: remote.c:762 #, c-format msgid "%s tracks both %s and %s" msgstr "%s은(는) %s 및 %s 모두 추적합니다" -#: remote.c:762 +#: remote.c:770 msgid "Internal error" msgstr "내부 오류" -#: remote.c:1677 remote.c:1720 +#: remote.c:1685 remote.c:1787 msgid "HEAD does not point to a branch" msgstr "HEAD가 브랜치를 가리키지 않습니다" -#: remote.c:1686 +#: remote.c:1694 #, c-format msgid "no such branch: '%s'" msgstr "그런 브랜치가 없습니다: '%s'" -#: remote.c:1689 +#: remote.c:1697 #, c-format msgid "no upstream configured for branch '%s'" msgstr "'%s' 브랜치에 대해 업스트림을 설정하지 않았습니다" -#: remote.c:1695 +#: remote.c:1703 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "업스트림 '%s' 브랜치가 리모트 추적 브랜치로 저장되지 않았습니다" -#: remote.c:1710 +#: remote.c:1718 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "리모트 '%2$s'의 푸시 대상 '%1$s'에 로컬 추적 브랜치가 없습니다" -#: remote.c:1725 +#: remote.c:1730 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "'%s' 브랜치에 푸시 리모트가 없습니다" -#: remote.c:1736 +#: remote.c:1741 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "'%s'에 대한 푸시 레퍼런스명세에 '%s'이(가) 들어 있지 않습니다" -#: remote.c:1749 +#: remote.c:1754 msgid "push has no destination (push.default is 'nothing')" msgstr "푸시의 대상이 없습니다 (push.default가 'nothing'입니다)" -#: remote.c:1771 +#: remote.c:1776 msgid "cannot resolve 'simple' push to a single destination" msgstr "하나의 대상에 대해 'simple' 푸시를 처리할 수 없습니다" -#: remote.c:2073 +#: remote.c:2081 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "현재 브랜치가 '%s' 기반이지만, 업스트림이 없어졌습니다.\n" -#: remote.c:2077 +#: remote.c:2085 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (바로잡으려면 \"git branch --unset-upstream\"을 사용하십시오)\n" -#: remote.c:2080 +#: remote.c:2088 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "브랜치가 '%s'에 맞게 업데이트된 상태입니다.\n" -#: remote.c:2084 +#: remote.c:2092 #, 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] "브랜치가 '%s'보다 %d개 커밋만큼 앞에 있습니다.\n" -#: remote.c:2090 +#: remote.c:2098 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (로컬에 있는 커밋을 제출하려면 \"git push\"를 사용하십시오)\n" -#: remote.c:2093 +#: remote.c:2101 #, 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] "브랜치가 '%s'보다 %d개 커밋 뒤에 있고, 앞으로 돌릴 수 있습니다.\n" -#: remote.c:2101 +#: remote.c:2109 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (로컬 브랜치를 업데이트하려면 \"git pull\"을 사용하십시오)\n" -#: remote.c:2104 +#: remote.c:2112 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -2562,7 +2593,7 @@ msgstr[0] "" "현재 브랜치와 '%s'이(가) 갈라졌습니다,\n" "다른 커밋이 각각 %d개와 %d개 있습니다.\n" -#: remote.c:2114 +#: remote.c:2122 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" " (리모트의 브랜치를 현재 브랜치로 병합하려면 \"git pull\"을 사용하십시오)\n" @@ -2580,11 +2611,11 @@ msgstr "현재 '%s' 브랜치에 아직 아무 커밋도 없습니다" msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent 옵션은 --bisect 옵션과 호환되지 않습니다" -#: run-command.c:106 +#: run-command.c:125 msgid "open /dev/null failed" msgstr "/dev/null 열기 실패" -#: run-command.c:108 +#: run-command.c:127 #, c-format msgid "dup2(%d,%d) failed" msgstr "dup2(%d,%d) 실패" @@ -2612,15 +2643,24 @@ msgstr "받는 쪽에서 --atomic 푸시를 지원하지 않습니다" msgid "the receiving end does not support push options" msgstr "받는 쪽에서 푸시 옵션을 지원하지 않습니다" -#: sequencer.c:171 +#: sequencer.c:215 msgid "revert" -msgstr "되돌리기" +msgstr "revert" -#: sequencer.c:171 +#: sequencer.c:217 msgid "cherry-pick" -msgstr "빼오기" +msgstr "cherry-pick" -#: sequencer.c:228 +#: sequencer.c:219 +msgid "rebase -i" +msgstr "rebase -i" + +#: sequencer.c:221 +#, c-format +msgid "Unknown action: %d" +msgstr "알 수 없는 동작: %d" + +#: sequencer.c:278 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -2628,7 +2668,7 @@ msgstr "" "이 충돌을 해결한 뒤에, 바로잡은 경로를\n" "'git add <경로>' 또는 'git rm <경로>'로 표시하십시오" -#: sequencer.c:231 +#: sequencer.c:281 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -2638,60 +2678,63 @@ msgstr "" "'git add <경로>' 또는 'git rm <경로>'로 표시하십시오.\n" "그리고 결과물을 'git commit'으로 커밋하십시오" -#: sequencer.c:244 sequencer.c:1209 +#: sequencer.c:294 sequencer.c:1667 #, c-format msgid "could not lock '%s'" msgstr "'%s'을(를) 잠글 수 없습니다" -#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214 +#: sequencer.c:297 sequencer.c:1545 sequencer.c:1672 sequencer.c:1686 #, c-format msgid "could not write to '%s'" msgstr "'%s'에 쓸 수 없습니다" -#: sequencer.c:251 +#: sequencer.c:301 #, c-format msgid "could not write eol to '%s'" msgstr "'%s'에 줄바꿈을 쓸 수 없습니다" -#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216 +#: sequencer.c:305 sequencer.c:1550 sequencer.c:1674 #, c-format msgid "failed to finalize '%s'." -msgstr "'%s' 마치는데 실패했습니다" +msgstr "'%s' 마치는데 실패했습니다." -#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032 +#: sequencer.c:329 sequencer.c:808 sequencer.c:1571 builtin/am.c:259 +#: builtin/commit.c:749 builtin/merge.c:1036 #, c-format msgid "could not read '%s'" msgstr "'%s'에서 읽을 수 없습니다" -#: sequencer.c:305 +#: sequencer.c:355 #, c-format msgid "your local changes would be overwritten by %s." msgstr "로컬 변경 사항을 %s 때문에 덮어 쓰게 됩니다." -#: sequencer.c:309 +#: sequencer.c:359 msgid "commit your changes or stash them to proceed." msgstr "변경 사항을 커밋하거나 스태시한 다음 계속하십시오." -#: sequencer.c:324 +#: sequencer.c:388 #, c-format msgid "%s: fast-forward" msgstr "%s: 정방향 진행" -#. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:399 +#. TRANSLATORS: %s will be "revert", "cherry-pick" or +#. * "rebase -i". +#. +#: sequencer.c:470 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: 새 인덱스 파일을 쓸 수 없습니다" -#: sequencer.c:418 +#: sequencer.c:489 msgid "could not resolve HEAD commit\n" msgstr "HEAD 커밋을 처리할 수 없습니다\n" -#: sequencer.c:438 +#: sequencer.c:509 msgid "unable to update cache tree\n" msgstr "캐시 트리를 업데이트할 수 없습니다\n" -#: sequencer.c:483 +#: sequencer.c:592 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -2721,173 +2764,393 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:567 +#: sequencer.c:688 #, c-format msgid "could not parse commit %s\n" msgstr "%s 커밋을 파싱할 수 없습니다\n" -#: sequencer.c:572 +#: sequencer.c:693 #, c-format msgid "could not parse parent commit %s\n" msgstr "%s 이전 커밋을 파싱할 수 없습니다\n" -#: sequencer.c:656 +#: sequencer.c:815 +#, c-format +msgid "" +"unexpected 1st line of squash message:\n" +"\n" +"\t%.*s" +msgstr "" +"커밋 합치기 메시지의 첫 줄이 예상치 못함:\n" +"\n" +"\t%.*s" + +#: sequencer.c:821 +#, c-format +msgid "" +"invalid 1st line of squash message:\n" +"\n" +"\t%.*s" +msgstr "" +"커밋 합치기 메시지의 첫 줄이 잘못됨:\n" +"\n" +"\t%.*s" + +#: sequencer.c:827 sequencer.c:852 +#, c-format +msgid "This is a combination of %d commits." +msgstr "커밋 %d개가 섞인 결과입니다." + +#: sequencer.c:836 +msgid "need a HEAD to fixup" +msgstr "바로잡으려면 HEAD가 필요합니다" + +#: sequencer.c:838 +msgid "could not read HEAD" +msgstr "HEAD를 읽을 수 없습니다" + +#: sequencer.c:840 +msgid "could not read HEAD's commit message" +msgstr "HEAD의 커밋 메시지를 읽을 수 없습니다" + +#: sequencer.c:846 +#, c-format +msgid "cannot write '%s'" +msgstr "'%s'을(를) 쓸 수 없습니다" + +#: sequencer.c:855 git-rebase--interactive.sh:445 +msgid "This is the 1st commit message:" +msgstr "1번째 커밋 메시지입니다:" + +#: sequencer.c:863 +#, c-format +msgid "could not read commit message of %s" +msgstr "%s의 커밋 메시지를 읽을 수 없습니다" + +#: sequencer.c:870 +#, c-format +msgid "This is the commit message #%d:" +msgstr "커밋 메시지 #%d번입니다:" + +#: sequencer.c:875 +#, c-format +msgid "The commit message #%d will be skipped:" +msgstr "커밋 메시지 #%d번을 건너뜁니다:" + +#: sequencer.c:880 +#, c-format +msgid "unknown command: %d" +msgstr "알 수 없는 명령: %d" + +#: sequencer.c:946 msgid "your index file is unmerged." msgstr "인덱스 파일이 병합되지 않았습니다." -#: sequencer.c:675 +#: sequencer.c:964 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "%s 커밋은 병합이지만 -m 옵션이 주어지지 않았습니다." # FIXME: "parent %d" 번호가 무슨 의미? -#: sequencer.c:683 +#: sequencer.c:972 #, c-format msgid "commit %s does not have parent %d" msgstr "%s 커밋에 이전 커밋 %d이(가) 없습니다" -#: sequencer.c:687 +#: sequencer.c:976 #, c-format msgid "mainline was specified but commit %s is not a merge." msgstr "메인라인을 지정했지만 %s 커밋이 병합 커밋이 아닙니다." +#: sequencer.c:982 +#, 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:700 +#: sequencer.c:1001 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: %s 이전 커밋을 파싱할 수 없습니다" -#: sequencer.c:705 +#: sequencer.c:1063 sequencer.c:1812 #, c-format -msgid "cannot get commit message for %s" -msgstr "%s에 대한 커밋 메시지를 가져올 수 없습니다" +msgid "could not rename '%s' to '%s'" +msgstr "'%s'에서 '%s'(으)로 이름을 바꿀 수 없습니다" -#: sequencer.c:797 +#: sequencer.c:1114 #, c-format msgid "could not revert %s... %s" msgstr "다음을 되돌릴(revert) 수 없습니다: %s... %s" -#: sequencer.c:798 +#: sequencer.c:1115 #, c-format msgid "could not apply %s... %s" msgstr "다음을 적용할(apply) 수 없습니다: %s... %s" -#: sequencer.c:833 +#: sequencer.c:1157 msgid "empty commit set passed" msgstr "빈 커밋 모음을 건너 뜁니다" -#: sequencer.c:843 +#: sequencer.c:1167 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: 인덱스 읽기에 실패했습니다" -#: sequencer.c:850 +#: sequencer.c:1174 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: 인덱스 새로 고침에 실패했습니다" -#: sequencer.c:944 +#: sequencer.c:1294 #, c-format msgid "invalid line %d: %.*s" msgstr "잘못된 줄 %d: %.*s" -#: sequencer.c:950 -msgid "no commits parsed." -msgstr "파싱한 커밋이 없습니다." +#: sequencer.c:1302 +#, c-format +msgid "cannot '%s' without a previous commit" +msgstr "이전 커밋 없이 '%s' 수행할 수 없습니다" -#: sequencer.c:966 +#: sequencer.c:1334 #, c-format msgid "could not read '%s'." msgstr "'%s'에서 읽을 수 없습니다." -#: sequencer.c:972 +#: sequencer.c:1341 +msgid "please fix this using 'git rebase --edit-todo'." +msgstr "'git rebase --edit-todo' 명령으로 바로잡으십시오." + +#: sequencer.c:1343 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "사용 불가능 인스트럭션 시트: '%s'" -#: sequencer.c:983 +#: sequencer.c:1348 +msgid "no commits parsed." +msgstr "파싱한 커밋이 없습니다." + +#: sequencer.c:1359 msgid "cannot cherry-pick during a revert." msgstr "되돌리기(revert) 중에 빼오기(cherry-pick)를 할 수 없습니다." -#: sequencer.c:985 +#: sequencer.c:1361 msgid "cannot revert during a cherry-pick." msgstr "빼오기(cherry-pick) 중에 되돌리기(revert)를 할 수 없습니다." -#: sequencer.c:1028 +#: sequencer.c:1424 #, c-format msgid "invalid key: %s" msgstr "잘못된 키: %s" -#: sequencer.c:1031 +#: sequencer.c:1427 #, c-format msgid "invalid value for %s: %s" msgstr "%s의 값이 잘못됨: %s" -#: sequencer.c:1063 +#: sequencer.c:1484 #, c-format msgid "malformed options sheet: '%s'" msgstr "형식이 잘못된 옵션 시트: '%s'" -#: sequencer.c:1101 +#: sequencer.c:1522 msgid "a cherry-pick or revert is already in progress" msgstr "이미 커밋 빼오기(cherry-pick) 또는 되돌리기(revert)가 진행 중입니다" -#: sequencer.c:1102 +#: sequencer.c:1523 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "\"git cherry-pick (--continue | --quit | --abort)\" 명령을 해 보십시오" -#: sequencer.c:1106 +#: sequencer.c:1526 #, c-format msgid "could not create sequencer directory '%s'" msgstr "'%s' 시퀀서 디렉터리를 만들 수 없습니다" -#: sequencer.c:1120 +#: sequencer.c:1540 msgid "could not lock HEAD" msgstr "HEAD를 잠글 수 없습니다" -#: sequencer.c:1151 sequencer.c:1289 +#: sequencer.c:1596 sequencer.c:2150 msgid "no cherry-pick or revert in progress" msgstr "빼오기(cherry-pick) 또는 되돌리기(revert)가 진행 중이지 않습니다" -#: sequencer.c:1153 +#: sequencer.c:1598 msgid "cannot resolve HEAD" msgstr "HEAD를 구해 올 수 없습니다" -#: sequencer.c:1155 sequencer.c:1189 +#: sequencer.c:1600 sequencer.c:1634 msgid "cannot abort from a branch yet to be born" msgstr "새로 만들고 있는 브랜치에서 중지할 수 없습니다" -#: sequencer.c:1175 builtin/grep.c:578 +#: sequencer.c:1620 builtin/grep.c:904 #, c-format msgid "cannot open '%s'" msgstr "'%s'을(를) 열 수 없습니다" -#: sequencer.c:1177 +#: sequencer.c:1622 #, c-format msgid "cannot read '%s': %s" msgstr "'%s'을(를) 읽을 수 없습니다: %s" -#: sequencer.c:1178 +#: sequencer.c:1623 msgid "unexpected end of file" msgstr "예상치 못하게 파일이 끝났습니다" -#: sequencer.c:1184 +#: sequencer.c:1629 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "빼오기 전에 저장한 HEAD 파일이('%s') 손상되었습니다" -#: sequencer.c:1354 +#: sequencer.c:1640 +msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" +msgstr "HEAD를 옮긴 것 같습니다. 되돌리지 않습니다. HEAD를 확인하십시오!" + +#: sequencer.c:1777 sequencer.c:2049 +msgid "cannot read HEAD" +msgstr "HEAD를 읽을 수 없습니다" + +#: sequencer.c:1817 builtin/difftool.c:574 +#, c-format +msgid "could not copy '%s' to '%s'" +msgstr "'%s'에서 '%s'(으)로 복사할 수 없습니다" + +#: sequencer.c:1833 +msgid "could not read index" +msgstr "인덱스를 읽을 수 없습니다" + +#: sequencer.c:1838 +#, c-format +msgid "" +"execution failed: %s\n" +"%sYou can fix the problem, and then run\n" +"\n" +" git rebase --continue\n" +"\n" +msgstr "" +"실행 실패: %s\n" +"%s문제를 바로잡고, 다음을 실행하십시오\n" +"\n" +" git rebase --continue\n" +"\n" + +#: sequencer.c:1844 +msgid "and made changes to the index and/or the working tree\n" +msgstr "그리고 인덱스 그리고/또는 작업 폴더에 변경 사항이 있습니다\n" + +#: sequencer.c:1850 +#, 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 "" +"실행 성공: %s\n" +"하지만 변경 사항을 인덱스 및/또는 작업 폴더에 남겨둡니다.\n" +"변경 사항을 커밋하거나 스태시에 넣으려면, 다음을 실행하십시오:\n" +"\n" +" git rebase --continue\n" +"\n" + +#: sequencer.c:1905 git-rebase.sh:168 +#, c-format +msgid "Applied autostash." +msgstr "자동스태시 적용." + +#: sequencer.c:1917 +#, c-format +msgid "cannot store %s" +msgstr "%s을(를) 저장할 수 없습니다" + +#: sequencer.c:1919 git-rebase.sh:172 +#, 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 "" +"자동스태시 적용에 충돌이 발생했습니다.\n" +"변경 사항은 스태시 안에 안전하게 들어 있습니다.\n" +"언제든지 \"git stash pop\" 또는 \"git stash drop\"을 실행할 수 있습니다.\n" + +#: sequencer.c:2000 +#, c-format +msgid "stopped at %s... %.*s" +msgstr "%s...%.*s 위치에서 멈췄습니다" + +#: sequencer.c:2027 +#, c-format +msgid "unknown command %d" +msgstr "알 수 없는 명령 %d" + +#: sequencer.c:2057 +msgid "could not read orig-head" +msgstr "orig-head를 읽을 수 없습니다" + +#: sequencer.c:2061 +msgid "could not read 'onto'" +msgstr "'onto'를 읽을 수 없습니다" + +#: sequencer.c:2068 +#, c-format +msgid "could not update %s" +msgstr "%s을(를) 업데이트할 수 없습니다" + +#: sequencer.c:2075 +#, c-format +msgid "could not update HEAD to %s" +msgstr "HEAD를 %s 위치로 업데이트할 수 없습니다" + +#: sequencer.c:2159 +msgid "cannot rebase: You have unstaged changes." +msgstr "리베이스할 수 없습니다: 스테이징하지 않은 변경 사항이 있습니다." + +#: sequencer.c:2164 +msgid "could not remove CHERRY_PICK_HEAD" +msgstr "CHERRY_PICK_HEAD를 제거할 수 없습니다" + +#: sequencer.c:2173 +msgid "cannot amend non-existing commit" +msgstr "없는 커밋을 수정할 수 없습니다" + +#: sequencer.c:2175 +#, c-format +msgid "invalid file: '%s'" +msgstr "잘못된 키: '%s'" + +#: sequencer.c:2177 +#, c-format +msgid "invalid contents: '%s'" +msgstr "잘못된 내용: '%s'" + +#: sequencer.c:2180 +msgid "" +"\n" +"You have uncommitted changes in your working tree. Please, commit them\n" +"first and then run 'git rebase --continue' again." +msgstr "" +"\n" +"작업 폴더에 커밋하지 않은 변경 사항이 있습니다. 이 사항을 먼저\n" +"커밋하고 'git rebase --continue' 명령을 다시 실행하십시오." + +#: sequencer.c:2190 +msgid "could not commit staged changes." +msgstr "스테이징한 변경 사항을 커밋할 수 없습니다." + +#: sequencer.c:2270 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: %s 커밋을 빼올 수 없습니다" -#: sequencer.c:1358 +#: sequencer.c:2274 #, c-format msgid "%s: bad revision" msgstr "%s: 잘못된 리비전" -#: sequencer.c:1391 +#: sequencer.c:2307 msgid "can't revert as initial commit" msgstr "최초의 커밋으로 되돌릴 수 없습니다" @@ -2922,29 +3185,29 @@ msgstr "" "경로와 리비전을 구분하려면 다음과 같이 '--'를 사용하십시오:\n" "'git <명령> [<리비전>...] -- [<파일>...]'" -#: setup.c:468 +#: setup.c:470 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "깃 저장소 버전 <= %d 버전을 기대하지만, %d 버전이 발견되었습니다" -#: setup.c:476 +#: setup.c:478 msgid "unknown repository extensions found:" msgstr "알 수 없는 저장소 확장이 있습니다:" -#: setup.c:762 +#: setup.c:768 #, c-format msgid "Not a git repository (or any of the parent directories): %s" msgstr "(현재 폴더 또는 상위 폴더가) 깃 저장소가 아닙니다: %s" -#: setup.c:764 setup.c:915 builtin/index-pack.c:1641 +#: setup.c:770 setup.c:922 builtin/index-pack.c:1643 msgid "Cannot come back to cwd" msgstr "현재 디렉터리로 돌아올 수 없습니다" -#: setup.c:845 +#: setup.c:852 msgid "Unable to read current working directory" msgstr "현재 작업 디렉터리를 읽을 수 없습니다" -#: setup.c:920 +#: setup.c:927 #, c-format msgid "" "Not a git repository (or any parent up to mount point %s)\n" @@ -2954,12 +3217,12 @@ msgstr "" "파일 시스템 경계에서 중지합니다. (GIT_DISCOVERY_ACROSS_FILESYSTEM 설정되지 않" "음)" -#: setup.c:927 +#: setup.c:934 #, c-format msgid "Cannot change to '%s/..'" msgstr "'%s/..' 위치로 이동할 수 없습니다" -#: setup.c:989 +#: setup.c:996 #, c-format msgid "" "Problem with core.sharedRepository filemode value (0%.3o).\n" @@ -2968,42 +3231,42 @@ msgstr "" "core.sharedRepository 파일모드 값에 (0%.3o) 문제가 있습니다.\n" "파일의 소유자에 읽기와 쓰기 권한이 있어야 합니다." -#: sha1_file.c:473 +#: sha1_file.c:490 #, c-format msgid "path '%s' does not exist" msgstr "'%s' 경로가 없습니다" -#: sha1_file.c:499 +#: sha1_file.c:516 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" "레퍼런스 '%s' 저장소를 연결된 체크아웃으로 쓰기는 아직 지원하지 않습니다." -#: sha1_file.c:505 +#: sha1_file.c:522 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "레퍼런스 '%s' 저장소가 로컬 저장소가 아닙니다." -#: sha1_file.c:511 +#: sha1_file.c:528 #, c-format msgid "reference repository '%s' is shallow" msgstr "레퍼런스 '%s' 저장소가 얕은 저장소입니다" -#: sha1_file.c:519 +#: sha1_file.c:536 #, c-format msgid "reference repository '%s' is grafted" msgstr "레퍼런스 '%s' 저장소가 붙어 있는 저장소입니다" -#: sha1_file.c:1159 +#: sha1_file.c:1176 msgid "offset before end of packfile (broken .idx?)" msgstr "오프셋이 묶음 파일 앞입니다 (망가진 .idx?)" -#: sha1_file.c:2592 +#: sha1_file.c:2637 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "오프셋이 %s의 묶음 인덱스 시작보다 앞입니다 (망가진 인덱스?)" -#: sha1_file.c:2596 +#: sha1_file.c:2641 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "오프셋이 %s의 묶음 인덱스 끝보다 뒤입니다 (망가진 인덱스?)" @@ -3039,89 +3302,132 @@ msgstr "" "확인해 보시고 잘못 만들어진 것이면 지우십시오. 이 메시지를 보고 싶지\n" "않으면 \"git config advice.objectNameWarning false\" 명령을 사용하십시오." -#: submodule.c:64 submodule.c:98 +#: submodule.c:65 submodule.c:99 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" "병합하지 않은 .gitmodules를 바꿀 수 없습니다. 병합 충돌을 먼저 해결하십시오" -#: submodule.c:68 submodule.c:102 +#: submodule.c:69 submodule.c:103 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "경로가 %s일 때 .gitmodules의 섹션을 찾을 수 없습니다" -#: submodule.c:76 +#: submodule.c:77 #, c-format msgid "Could not update .gitmodules entry %s" msgstr ".gitmodules 항목 %s을(를) 업데이트할 수 없습니다" -#: submodule.c:109 +#: submodule.c:110 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "%s에 대한 .gitmodules 항목을 제거할 수 없습니다" -#: submodule.c:120 +#: submodule.c:121 msgid "staging updated .gitmodules failed" msgstr "업데이트한 .gitmodules를 커밋할 사항으로 표시하는데 실패" -#: submodule.c:158 +#: submodule.c:159 msgid "negative values not allowed for submodule.fetchJobs" msgstr "submodule.fetchJobs 값에 음수를 쓸 수 없습니다" -#: submodule-config.c:358 +#: submodule.c:1184 +#, c-format +msgid "could not start 'git status in submodule '%s'" +msgstr "서브모듈 '%s'에서 'git status'를 시작할 수 없습니다" + +#: submodule.c:1197 +#, c-format +msgid "could not run 'git status in submodule '%s'" +msgstr "서브모듈 '%s'에서 'git status'를 실행할 수 없습니다" + +#: submodule.c:1398 +#, c-format +msgid "" +"relocate_gitdir for submodule '%s' with more than one worktree not supported" +msgstr "여러 개의 작업 폴더가 있는 하위 모듈 '%s'에 대해 relocate_gitdir은 지원하지 않습니다" + +#: submodule.c:1410 submodule.c:1471 +#, c-format +msgid "could not lookup name for submodule '%s'" +msgstr "하위 모듈 '%s'의 이름을 찾아볼 수 없습니다" + +#: submodule.c:1414 submodule.c:1474 builtin/submodule--helper.c:640 +#: builtin/submodule--helper.c:650 +#, c-format +msgid "could not create directory '%s'" +msgstr "'%s' 디렉터리를 만들 수 없습니다" + +#: submodule.c:1420 +#, c-format +msgid "" +"Migrating git directory of '%s%s' from\n" +"'%s' to\n" +"'%s'\n" +msgstr "" +"'%s%s'의 깃 디렉터리를 옮깁니다:\n" +"'%s'에서\n" +"'%s'(으)로\n" + +#: submodule.c:1512 +#, c-format +msgid "could not recurse into submodule '%s'" +msgstr "재귀적으로 '%s' 하위 모듈에 들어갈 수 없습니다" + +#: submodule-config.c:360 #, c-format msgid "invalid value for %s" msgstr "%s의 값이 올바르지 않습니다" -#: trailer.c:238 +#: trailer.c:240 #, c-format msgid "running trailer command '%s' failed" msgstr "트레일러 명령 '%s' 실행 실패" -#: trailer.c:471 trailer.c:475 trailer.c:479 trailer.c:533 trailer.c:537 -#: trailer.c:541 +#: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539 +#: trailer.c:543 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "알 수 없는 값 '%s', 키 '%s'" -#: trailer.c:523 trailer.c:528 builtin/remote.c:289 +#: trailer.c:525 trailer.c:530 builtin/remote.c:289 #, c-format msgid "more than one %s" msgstr "%s이(가) 여러개입니다" -#: trailer.c:672 +#: trailer.c:702 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "트레일러 '%.*s'에서 빈 트레일러 토큰" -#: trailer.c:695 +#: trailer.c:722 #, c-format msgid "could not read input file '%s'" msgstr "'%s' 입력 파일을 읽을 수 없습니다" -#: trailer.c:698 +#: trailer.c:725 msgid "could not read from stdin" msgstr "표준 입력에서 읽을 수 없습니다" -#: trailer.c:929 builtin/am.c:44 +#: trailer.c:949 builtin/am.c:44 #, c-format msgid "could not stat %s" msgstr "%s에 대해 stat()할 수 없습니다" -#: trailer.c:931 +#: trailer.c:951 #, c-format msgid "file %s is not a regular file" msgstr "'%s' 파일이 일반 파일이 아닙니다" -#: trailer.c:933 +#: trailer.c:953 #, c-format msgid "file %s is not writable by user" msgstr "사용자가 %s 파일에 쓸 수 없습니다" -#: trailer.c:945 +#: trailer.c:965 msgid "could not open temporary file" msgstr "임시 파일을 열 수 없습니다: %s" -#: trailer.c:983 +#: trailer.c:1001 #, c-format msgid "could not rename temporary file to %s" msgstr "임시 파일 이름을 '%s'(으)로 바꿀 수 없습니다" @@ -3129,14 +3435,14 @@ msgstr "임시 파일 이름을 '%s'(으)로 바꿀 수 없습니다" #: transport.c:62 #, c-format msgid "Would set upstream of '%s' to '%s' of '%s'\n" -msgstr "'%1$s'의 업스트림을 '%3$s'의 '%2$s'(으)로 설정할 것입니다\n" +msgstr "'%1$s'의 업스트림을 '%3$s'의 '%2$s'(으)로 설정합니다\n" #: transport.c:151 #, c-format msgid "transport: invalid depth option '%s'" msgstr "transport: 잘못된 깊이 옵션: %s" -#: transport.c:817 +#: transport.c:885 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -3145,7 +3451,7 @@ msgstr "" "다음 하위 모듈 경로에 리모트 어디에도 없는\n" "변경 사항이 있습니다:\n" -#: transport.c:821 +#: transport.c:889 #, c-format msgid "" "\n" @@ -3172,7 +3478,7 @@ msgstr "" "명령을 시도해 보십시오\n" "\n" -#: transport.c:829 +#: transport.c:897 msgid "Aborting." msgstr "중지함." @@ -3197,7 +3503,7 @@ msgstr "트리 엔트리에 빈 파일 이름" msgid "too-short tree file" msgstr "너무 짧은 트리 파일" -#: unpack-trees.c:64 +#: unpack-trees.c:99 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3206,7 +3512,7 @@ msgstr "" "다음 파일의 로컬 변경 사항을 체크아웃 때문에 덮어 쓰게 됩니다:\n" "%%s브랜치를 전환하기 전에 변경 사항을 커밋하거나 스태시하십시오." -#: unpack-trees.c:66 +#: unpack-trees.c:101 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3215,7 +3521,7 @@ msgstr "" "다음 파일의 로컬 변경 사항을 체크아웃 때문에 덮어 쓰게 됩니다:\n" "%%s" -#: unpack-trees.c:69 +#: unpack-trees.c:104 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3224,14 +3530,14 @@ msgstr "" "다음 파일의 로컬 변경 사항을 병합 때문에 덮어 쓰게 됩니다:\n" "%%s병합하기 전에 변경 사항을 커밋하거나 스태시하십시오." -#: unpack-trees.c:71 +#: unpack-trees.c:106 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%s" msgstr "다음 파일의 로컬 변경 사항을 병합 때문에 덮어 쓰게 됩니다." -#: unpack-trees.c:74 +#: unpack-trees.c:109 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -3240,7 +3546,7 @@ msgstr "" "다음 파일의 로컬 변경 사항을 %s 때문에 덮어 쓰게 됩니다:\n" "%%s%s 전에 변경 사항을 커밋하거나 스태시하십시오." -#: unpack-trees.c:76 +#: unpack-trees.c:111 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -3249,16 +3555,16 @@ msgstr "" "다음 파일의 로컬 변경 사항을 %s 때문에 덮어 쓰게 됩니다:\n" "%%s" -#: unpack-trees.c:81 +#: unpack-trees.c:116 #, c-format msgid "" -"Updating the following directories would lose untracked files in it:\n" +"Updating the following directories would lose untracked files in them:\n" "%s" msgstr "" "다음 디렉터리를 업데이트하면 그 안의 추적하지 않는 파일을 잃어버립니다:\n" "%s" -#: unpack-trees.c:85 +#: unpack-trees.c:120 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -3267,7 +3573,7 @@ msgstr "" "체크아웃 때문에 추적하지 않는 다음 작업 폴더의 파일이 제거됩니다:\n" "%%s브랜치를 전환하기 전에 이 파일을 옮기거나 제거하십시오." -#: unpack-trees.c:87 +#: unpack-trees.c:122 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -3276,7 +3582,7 @@ msgstr "" "체크아웃 때문에 추적하지 않는 다음 작업 폴더 파일이 제거됩니다:\n" "%%s" -#: unpack-trees.c:90 +#: unpack-trees.c:125 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -3285,7 +3591,7 @@ msgstr "" "병합 때문에 추적하지 않는 다음 작업 폴더의 파일이 제거됩니다:\n" "%%s병합하기 전에 이 파일을 옮기거나 제거하십시오." -#: unpack-trees.c:92 +#: unpack-trees.c:127 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -3294,7 +3600,7 @@ msgstr "" "병합 때문에 추적하지 않는 다음 작업 폴더 파일이 제거됩니다:\n" "%%s" -#: unpack-trees.c:95 +#: unpack-trees.c:130 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -3303,7 +3609,7 @@ msgstr "" "%s 때문에 추적하지 않는 다음 작업 폴더의 파일이 제거됩니다:\n" "%%s%s 하기 전에 이 파일을 옮기거나 제거하십시오." -#: unpack-trees.c:97 +#: unpack-trees.c:132 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -3312,7 +3618,7 @@ msgstr "" "%s 때문에 추적하지 않는 다음 작업 폴더 파일이 제거됩니다:\n" "%%s" -#: unpack-trees.c:102 +#: unpack-trees.c:137 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3322,7 +3628,7 @@ msgstr "" "체크아웃 때문에 추적하지 않는 다음 작업 폴더의 파일을 덮어씁니다:\n" "%%s브랜치를 전환하기 전에 이 파일을 옮기거나 제거하십시오." -#: unpack-trees.c:104 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3332,7 +3638,7 @@ msgstr "" "체크아웃 때문에 추적하지 않는 다음 작업 폴더 파일을 덮어씁니다:\n" "%%s" -#: unpack-trees.c:107 +#: unpack-trees.c:142 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -3341,7 +3647,7 @@ msgstr "" "병합 때문에 추적하지 않는 다음 작업 폴더의 파일을 덮어씁니다:\n" "%%s병합하기 전에 이 파일을 옮기거나 제거하십시오." -#: unpack-trees.c:109 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -3350,7 +3656,7 @@ msgstr "" "병합 때문에 추적하지 않는 다음 작업 폴더 파일을 덮어씁니다:\n" "%%s" -#: unpack-trees.c:112 +#: unpack-trees.c:147 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -3359,7 +3665,7 @@ msgstr "" "%s 때문에 추적하지 않는 다음 작업 폴더의 파일을 덮어씁니다:\n" "%%s%s 하기 전에 이 파일을 옮기거나 제거하십시오." -#: unpack-trees.c:114 +#: unpack-trees.c:149 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -3368,12 +3674,12 @@ msgstr "" "%s 때문에 추적하지 않는 다음 작업 폴더 파일을 덮어씁니다:\n" "%%s" -#: unpack-trees.c:121 +#: unpack-trees.c:156 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "'%s' 항목이 '%s'와(과) 겹칩니다. 묶을 수 없습니다." -#: unpack-trees.c:124 +#: unpack-trees.c:159 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up-to-date:\n" @@ -3383,7 +3689,7 @@ msgstr "" "았습니다:\n" "%s" -#: unpack-trees.c:126 +#: unpack-trees.c:161 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -3394,7 +3700,7 @@ msgstr "" "다:\n" "%s" -#: unpack-trees.c:128 +#: unpack-trees.c:163 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -3405,12 +3711,12 @@ msgstr "" "다:\n" "%s" -#: unpack-trees.c:205 +#: unpack-trees.c:240 #, c-format msgid "Aborting\n" msgstr "중지함\n" -#: unpack-trees.c:237 +#: unpack-trees.c:270 msgid "Checking out files" msgstr "파일을 가져옵니다" @@ -3459,7 +3765,7 @@ msgid "could not open '%s' for writing" msgstr "'%s'을(를) 쓰기용으로 열 수 없습니다" #: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759 -#: builtin/am.c:847 builtin/commit.c:1705 builtin/merge.c:1029 +#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1033 #: builtin/pull.c:341 #, c-format msgid "could not open '%s' for reading" @@ -3671,179 +3977,183 @@ msgstr " (이 패치를 건너 뛰려면 \"git am --skip\"을 사용하십시 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (원본 브랜치를 복구하려면 \"git am --abort\"를 사용하십시오)" -#: wt-status.c:1172 +#: wt-status.c:1176 +msgid "git-rebase-todo is missing." +msgstr "git-rebase-todo가 없습니다." + +#: wt-status.c:1178 msgid "No commands done." msgstr "완료한 명령 없음." -#: wt-status.c:1175 +#: wt-status.c:1181 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "최근 완료한 명령 (%d개 명령 완료):" -#: wt-status.c:1186 +#: wt-status.c:1192 #, c-format msgid " (see more in file %s)" msgstr " (자세한 정보는 %s 파일 참고)" -#: wt-status.c:1191 +#: wt-status.c:1197 msgid "No commands remaining." msgstr "명령이 남아있지 않음." -#: wt-status.c:1194 +#: wt-status.c:1200 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "다음에 할 명령 (%d개 명령 남음):" -#: wt-status.c:1202 +#: wt-status.c:1208 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (보고 편집하려면 \"git rebase --edit-todo\"를 사용하십시오)" -#: wt-status.c:1215 +#: wt-status.c:1221 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "현재 '%s' 브랜치를 '%s' 위로 리베이스하는 중입니다." -#: wt-status.c:1220 +#: wt-status.c:1226 msgid "You are currently rebasing." msgstr "현재 리베이스하는 중입니다." -#: wt-status.c:1234 +#: wt-status.c:1240 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (충돌을 바로잡고 \"git rebase --continue\"를 사용하십시오)" -#: wt-status.c:1236 +#: wt-status.c:1242 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (이 패치를 건너뛰려면 \"git rebase --skip\"을 사용하십시오)" -#: wt-status.c:1238 +#: wt-status.c:1244 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (원본 브랜치를 가져오려면 \"git rebase --abort\"를 사용하십시오)" -#: wt-status.c:1244 +#: wt-status.c:1250 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" " (모든 충돌을 바로잡았습니다: \"git rebase --continue\"를 실행하십시오)" -#: wt-status.c:1248 +#: wt-status.c:1254 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "현재 '%s' 브랜치를 '%s' 위로 리베이스하는 중 커밋을 분리하는 중입니다." -#: wt-status.c:1253 +#: wt-status.c:1259 msgid "You are currently splitting a commit during a rebase." msgstr "현재 리베이스하는 중 커밋을 분리하는 중입니다." -#: wt-status.c:1256 +#: wt-status.c:1262 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " (작업 폴더가 깨끗해지면, \"git rebase --continue\"를 실행하십시오)" -#: wt-status.c:1260 +#: wt-status.c:1266 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "'%s' 브랜치를 '%s' 위로 리베이스하는 중 커밋을 편집하는 중입니다." -#: wt-status.c:1265 +#: wt-status.c:1271 msgid "You are currently editing a commit during a rebase." msgstr "리베이스 중에 커밋을 편집하는 중입니다." -#: wt-status.c:1268 +#: wt-status.c:1274 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (현재 커밋을 수정하려면 \"git commit --amend\"을 사용하십시오)" -#: wt-status.c:1270 +#: wt-status.c:1276 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " (변경 사항에 만족할 때 \"git rebase --continue\"를 사용하십시오)" -#: wt-status.c:1280 +#: wt-status.c:1286 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "현재 %s 커밋을 뽑아 내고 있습니다." -#: wt-status.c:1285 +#: wt-status.c:1291 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (충돌을 바로잡고 \"git cherry-pick --continue\"를 실행하십시오)" -#: wt-status.c:1288 +#: wt-status.c:1294 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (모든 충돌을 바로잡았습니다: \"git cherry-pick --continue\"를 실행하십시오)" -#: wt-status.c:1290 +#: wt-status.c:1296 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " (뽑기 작업을 취소하려면 \"git cherry-pick --abort\"를 사용하십시오)" -#: wt-status.c:1299 +#: wt-status.c:1305 #, c-format msgid "You are currently reverting commit %s." msgstr "현재 %s 커밋을 되돌리는 중입니다." -#: wt-status.c:1304 +#: wt-status.c:1310 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (충돌을 바로잡고 \"git revert --continue\"를 실행하십시오)" -#: wt-status.c:1307 +#: wt-status.c:1313 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" " (모든 충돌을 바로잡았습니다: \"git revert --continue\"를 실행하십시오)" -#: wt-status.c:1309 +#: wt-status.c:1315 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (되돌리기 작업을 취소하려면 \"git revert --abort\"를 사용하십시오)" -#: wt-status.c:1320 +#: wt-status.c:1326 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "'이등분하는 중입니다. '%s' 브랜치부터 시작." -#: wt-status.c:1324 +#: wt-status.c:1330 msgid "You are currently bisecting." msgstr "'이등분하는 중입니다." -#: wt-status.c:1327 +#: wt-status.c:1333 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (원래 브랜치로 돌아가려면 \"git bisect reset\"을 사용하십시오)" -#: wt-status.c:1524 +#: wt-status.c:1530 msgid "On branch " msgstr "현재 브랜치 " -#: wt-status.c:1530 +#: wt-status.c:1536 msgid "interactive rebase in progress; onto " msgstr "대화형 리베이스 진행 중. 갈 위치는 " -#: wt-status.c:1532 +#: wt-status.c:1538 msgid "rebase in progress; onto " msgstr "리베이스 진행 중. 갈 위치는 " -#: wt-status.c:1537 +#: wt-status.c:1543 msgid "HEAD detached at " msgstr "HEAD가 다음 위치에서 분리: " -#: wt-status.c:1539 +#: wt-status.c:1545 msgid "HEAD detached from " msgstr "HEAD가 다음으로부터 분리: " -#: wt-status.c:1542 +#: wt-status.c:1548 msgid "Not currently on any branch." msgstr "현재 어떤 브랜치도 사용하지 않음." -#: wt-status.c:1560 +#: wt-status.c:1566 msgid "Initial commit" msgstr "최초 커밋" -#: wt-status.c:1574 +#: wt-status.c:1580 msgid "Untracked files" msgstr "추적하지 않는 파일" -#: wt-status.c:1576 +#: wt-status.c:1582 msgid "Ignored files" msgstr "무시한 파일" -#: wt-status.c:1580 +#: wt-status.c:1586 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -3854,20 +4164,20 @@ msgstr "" "'status -uno' 옵션을 쓰면 빨라질 수도 있지만, 새 파일을\n" "직접 찾아서 추가해야 합니다. ('git help status' 참고)" -#: wt-status.c:1586 +#: wt-status.c:1592 #, c-format msgid "Untracked files not listed%s" msgstr "추적하지 않는 파일을 보지 않습니다%s" -#: wt-status.c:1588 +#: wt-status.c:1594 msgid " (use -u option to show untracked files)" msgstr " (추적하지 않는 파일을 보려면 -u 옵션을 사용하십시오)" -#: wt-status.c:1594 +#: wt-status.c:1600 msgid "No changes" msgstr "변경 사항 없음" -#: wt-status.c:1599 +#: wt-status.c:1605 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" @@ -3875,12 +4185,12 @@ msgstr "" "\"를\n" "사용하십시오)\n" -#: wt-status.c:1602 +#: wt-status.c:1608 #, c-format msgid "no changes added to commit\n" msgstr "커밋할 변경 사항을 추가하지 않았습니다\n" -#: wt-status.c:1605 +#: wt-status.c:1611 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -3890,65 +4200,65 @@ msgstr "" "\"git\n" "add\"를 사용하십시오)\n" -#: wt-status.c:1608 +#: wt-status.c:1614 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "커밋할 사항을 추가하지 않았지만 추적하지 않는 파일이 있습니다\n" -#: wt-status.c:1611 +#: wt-status.c:1617 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "커밋할 사항 없음 (파일을 만들거나 복사하고 \"git add\"를 사용하면 추적합니" "다)\n" -#: wt-status.c:1614 wt-status.c:1619 +#: wt-status.c:1620 wt-status.c:1625 #, c-format msgid "nothing to commit\n" msgstr "커밋할 사항 없음\n" -#: wt-status.c:1617 +#: wt-status.c:1623 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "커밋할 사항 없음 (추적하지 않는 파일을 보려면 -u 옵션을 사용하십시오)\n" -#: wt-status.c:1621 +#: wt-status.c:1627 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "커밋할 사항 없음, 작업 폴더 깨끗함\n" -#: wt-status.c:1728 +#: wt-status.c:1734 msgid "Initial commit on " msgstr "최초 커밋, 브랜치: " -#: wt-status.c:1732 +#: wt-status.c:1738 msgid "HEAD (no branch)" msgstr "HEAD (브랜치 없음)" -#: wt-status.c:1761 +#: wt-status.c:1767 msgid "gone" msgstr "없음" -#: wt-status.c:1763 wt-status.c:1771 +#: wt-status.c:1769 wt-status.c:1777 msgid "behind " msgstr "다음 뒤에: " -#: wt-status.c:1766 wt-status.c:1769 +#: wt-status.c:1772 wt-status.c:1775 msgid "ahead " msgstr "다음 앞에: " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2270 +#: wt-status.c:2277 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "%s 할 수 없습니다: 스테이징하지 않은 변경 사항이 있습니다." -#: wt-status.c:2276 +#: wt-status.c:2283 msgid "additionally, your index contains uncommitted changes." msgstr "추가로, 인덱스에 커밋하지 않은 변경 사항이 있습니다." -#: wt-status.c:2278 +#: wt-status.c:2285 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "%s 할 수 없습니다: 인덱스에 커밋하지 않은 변경 사항이 있습니다." @@ -3980,7 +4290,7 @@ msgstr "'%s' 제거\n" msgid "Unstaged changes after refreshing the index:" msgstr "인덱스를 새로 고친 다음 커밋 표시하지 않은 변경 사항:" -#: builtin/add.c:209 builtin/rev-parse.c:840 +#: builtin/add.c:209 builtin/rev-parse.c:845 msgid "Could not read the index" msgstr "인덱스를 읽을 수 없습니다" @@ -4015,9 +4325,9 @@ msgstr "'%s'을(를) 적용할 수 없습니다" msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "다음 경로는 .gitignore 파일 중 하나 때문에 무시합니다:\n" -#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:111 -#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:521 -#: builtin/remote.c:1326 builtin/rm.c:268 builtin/send-pack.c:162 +#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:123 +#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524 +#: builtin/remote.c:1326 builtin/rm.c:241 builtin/send-pack.c:162 msgid "dry run" msgstr "가짜로 실행" @@ -4025,7 +4335,7 @@ msgstr "가짜로 실행" msgid "interactive picking" msgstr "대화식으로 고릅니다" -#: builtin/add.c:270 builtin/checkout.c:1156 builtin/reset.c:286 +#: builtin/add.c:270 builtin/checkout.c:1159 builtin/reset.c:286 msgid "select hunks interactively" msgstr "대화식으로 변경된 부분을 선택합니다" @@ -4108,7 +4418,7 @@ msgstr "'git add .' 명령을 실행하려고 한 것 아니었습니까?\n" #: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279 #: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350 -#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271 #: builtin/submodule--helper.c:244 msgid "index file corrupt" msgstr "인덱스 파일이 손상되었습니다" @@ -4228,7 +4538,7 @@ msgstr "베이스 패치 적용 및 3-방향 병합으로 대신합니다..." msgid "Failed to merge in the changes." msgstr "변경 사항에서 병합하는데 실패했습니다." -#: builtin/am.c:1686 builtin/merge.c:628 +#: builtin/am.c:1686 builtin/merge.c:632 msgid "git write-tree failed to write a tree" msgstr "git write-tree가 트리를 쓰는데 실패했습니다" @@ -4236,8 +4546,8 @@ msgstr "git write-tree가 트리를 쓰는데 실패했습니다" msgid "applying to an empty history" msgstr "빈 커밋 내역에 대해 적용합니다" -#: builtin/am.c:1706 builtin/commit.c:1769 builtin/merge.c:798 -#: builtin/merge.c:823 +#: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802 +#: builtin/merge.c:827 msgid "failed to write commit object" msgstr "커밋 오브젝트를 쓰는데 실패했습니다" @@ -4349,7 +4659,7 @@ msgid "allow fall back on 3way merging if needed" msgstr "필요하면 3-방향 병합으로 대신하도록 허용합니다" #: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57 -#: builtin/repack.c:172 +#: builtin/repack.c:178 msgid "be quiet" msgstr "간략히 표시합니다" @@ -4393,15 +4703,15 @@ msgid "pass it through git-apply" msgstr "git-apply에 넘깁니다" #: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 -#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135 -#: builtin/pull.c:194 builtin/repack.c:181 builtin/repack.c:185 -#: builtin/show-branch.c:644 builtin/show-ref.c:175 builtin/tag.c:340 +#: builtin/grep.c:1038 builtin/merge.c:202 builtin/pull.c:135 +#: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191 +#: builtin/show-branch.c:644 builtin/show-ref.c:169 builtin/tag.c:355 #: parse-options.h:132 parse-options.h:134 parse-options.h:245 msgid "n" msgstr "n" #: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438 -#: builtin/tag.c:372 +#: builtin/tag.c:387 builtin/verify-tag.c:38 msgid "format" msgstr "형식" @@ -4439,8 +4749,8 @@ msgstr "커미터 시각을 작성자 시각으로 넣습니다" msgid "use current timestamp for author date" msgstr "현재 시각을 작성자 시각으로 사용합니다" -#: builtin/am.c:2315 builtin/commit.c:1605 builtin/merge.c:229 -#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:355 +#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:233 +#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:370 msgid "key-id" msgstr "키-ID" @@ -4541,115 +4851,111 @@ msgstr "git blame [<옵션>] [<리비전-옵션>] [<리비전>] [--] <파일>" msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<리비전-옵션>은 git-rev-list(1)에 설명되어 있습니다" -#: builtin/blame.c:1781 +#: builtin/blame.c:1786 msgid "Blaming lines" msgstr "블레임 줄" -#: builtin/blame.c:2577 +#: builtin/blame.c:2582 msgid "Show blame entries as we find them, incrementally" msgstr "블레임 항목을 찾자마자 점진적으로 표시합니다" -#: builtin/blame.c:2578 +#: builtin/blame.c:2583 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "가장자리 커밋에 대해 빈 SHA-1을 표시합니다 (기본값: 꺼짐)" -#: builtin/blame.c:2579 +#: builtin/blame.c:2584 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "최상위 커밋을 가장자리 커밋으로 취급하지 않습니다 (기본값: 꺼짐)" -#: builtin/blame.c:2580 +#: builtin/blame.c:2585 msgid "Show work cost statistics" msgstr "작업 비용 통계를 표시합니다" -#: builtin/blame.c:2581 +#: builtin/blame.c:2586 msgid "Force progress reporting" msgstr "강제로 진행 상황을 표시합니다" -#: builtin/blame.c:2582 +#: builtin/blame.c:2587 msgid "Show output score for blame entries" msgstr "블레임 항목에 대해 출력 점수를 표시합니다" -#: builtin/blame.c:2583 +#: builtin/blame.c:2588 msgid "Show original filename (Default: auto)" msgstr "원래 파일 이름 표시 (기본값: 자동)" -#: builtin/blame.c:2584 +#: builtin/blame.c:2589 msgid "Show original linenumber (Default: off)" msgstr "원래 줄 번호 표시 (기본값: 하지 않음)" -#: builtin/blame.c:2585 +#: builtin/blame.c:2590 msgid "Show in a format designed for machine consumption" msgstr "컴퓨터 처리용으로 설계된 형식으로 표시합니다" -#: builtin/blame.c:2586 +#: builtin/blame.c:2591 msgid "Show porcelain format with per-line commit information" msgstr "줄마다 커밋 정보가 표시되는 사용자용 형식으로 표시합니다" -#: builtin/blame.c:2587 +#: builtin/blame.c:2592 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "git-annotate와 동일한 형식을 사용합니다 (기본값: 꺼짐)" -#: builtin/blame.c:2588 +#: builtin/blame.c:2593 msgid "Show raw timestamp (Default: off)" msgstr "내부 형식으로 시각을 표시합니다 (기본값: 꺼짐)" -#: builtin/blame.c:2589 +#: builtin/blame.c:2594 msgid "Show long commit SHA1 (Default: off)" msgstr "길게 커밋 SHA1을 표시합니다 (기본값: 꺼짐)" -#: builtin/blame.c:2590 +#: builtin/blame.c:2595 msgid "Suppress author name and timestamp (Default: off)" msgstr "작성자 이름과 시각을 표시하지 않습니다 (기본값: 꺼짐)" -#: builtin/blame.c:2591 +#: builtin/blame.c:2596 msgid "Show author email instead of name (Default: off)" msgstr "작성자 이름 대신에 전자메일을 표시합니다 (기본값: 꺼짐)" -#: builtin/blame.c:2592 +#: builtin/blame.c:2597 msgid "Ignore whitespace differences" msgstr "공백 문자 차이점을 무시합니다" -#: builtin/blame.c:2599 -msgid "Use an experimental indent-based heuristic to improve diffs" -msgstr "diff를 향상하는데 실험적인 들여쓰기 기반 휴리스틱을 사용합니다." - -#: builtin/blame.c:2600 -msgid "Use an experimental blank-line-based heuristic to improve diffs" -msgstr "diff를 향상하는데 실험적인 빈 줄 기반 휴리스틱을 사용합니다." +#: builtin/blame.c:2604 +msgid "Use an experimental heuristic to improve diffs" +msgstr "diff를 향상하는데 실험적인 휴리스틱을 사용합니다" -#: builtin/blame.c:2602 +#: builtin/blame.c:2606 msgid "Spend extra cycles to find better match" msgstr "더 일치하는 항목을 찾는데 더 시간을 소모합니다" -#: builtin/blame.c:2603 +#: builtin/blame.c:2607 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "git-rev-list를 호출하는 대신 <파일>에서 리비전을 사용합니다" -#: builtin/blame.c:2604 +#: builtin/blame.c:2608 msgid "Use <file>'s contents as the final image" msgstr "<파일>의 내용을 최종 이미지로 사용합니다" -#: builtin/blame.c:2605 builtin/blame.c:2606 +#: builtin/blame.c:2609 builtin/blame.c:2610 msgid "score" msgstr "점수" -#: builtin/blame.c:2605 +#: builtin/blame.c:2609 msgid "Find line copies within and across files" msgstr "파일 내부와 파일 사이의 복사된 줄을 찾습니다" -#: builtin/blame.c:2606 +#: builtin/blame.c:2610 msgid "Find line movements within and across files" msgstr "파일 내부와 파일 사이의 옮겨진 줄을 찾습니다" -#: builtin/blame.c:2607 +#: builtin/blame.c:2611 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2607 +#: builtin/blame.c:2611 msgid "Process only line range n,m, counting from 1" msgstr "n,m줄 (1번 줄부터 시작) 사이의 범위만 처리" -#: builtin/blame.c:2654 +#: builtin/blame.c:2658 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "--progress 옵션은 --incremental 옵션이나 포스레인 형식에서 사용할 수 없습니다" @@ -4660,41 +4966,41 @@ msgstr "" #. 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:2700 +#: builtin/blame.c:2706 msgid "4 years, 11 months ago" msgstr "4년 11달 전" -#: builtin/blame.c:2780 +#: builtin/blame.c:2786 msgid "--contents and --reverse do not blend well." msgstr "--contents 및 --reverse 옵션은 호환되지 않습니다." -#: builtin/blame.c:2800 +#: builtin/blame.c:2806 msgid "cannot use --contents with final commit object name" msgstr "--contents 옵션을 마지막 오브젝트 이름에 사용할 수 없습니다" -#: builtin/blame.c:2805 +#: builtin/blame.c:2811 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse 및 --first-parent 옵션을 같이 쓰면 최근 커밋을 지정해야 합니다" -#: builtin/blame.c:2832 +#: builtin/blame.c:2838 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "--reverse 및 --first-parent 옵션을 같이 쓰면 최초-상위 체인과 범위가 필요합니" "다" -#: builtin/blame.c:2843 +#: builtin/blame.c:2849 #, c-format msgid "no such path %s in %s" msgstr "%s 경로가 %s 안에 없습니다" -#: builtin/blame.c:2854 +#: builtin/blame.c:2860 #, c-format msgid "cannot read blob %s for path %s" msgstr "%s 경로에 대해 %s 블롭을 읽을 수 없음" -#: builtin/blame.c:2873 +#: builtin/blame.c:2879 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" @@ -4871,44 +5177,44 @@ msgstr "(HEAD %s(으)로부터 분리됨)" msgid "(no branch)" msgstr "(브랜치 없음)" -#: builtin/branch.c:544 +#: builtin/branch.c:535 #, c-format msgid "Branch %s is being rebased at %s" msgstr "%s 브랜치를 %s 위치에 리베이스합니다" -#: builtin/branch.c:548 +#: builtin/branch.c:539 #, c-format msgid "Branch %s is being bisected at %s" msgstr "%s 브랜치를 %s 위치에서 bisect합니다" -#: builtin/branch.c:563 +#: builtin/branch.c:554 msgid "cannot rename the current branch while not on any." msgstr "브랜치 위에 없으면서 현재 브랜치 이름을 바꿀 수 없습니다." -#: builtin/branch.c:573 +#: builtin/branch.c:564 #, c-format msgid "Invalid branch name: '%s'" msgstr "잘못된 브랜치 이름: '%s'" -#: builtin/branch.c:590 +#: builtin/branch.c:581 msgid "Branch rename failed" msgstr "브랜치 이름 바꾸기 실패" -#: builtin/branch.c:594 +#: builtin/branch.c:585 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "이름이 잘못된 '%s' 브랜치의 이름을 다르게 바꿉니다" -#: builtin/branch.c:597 +#: builtin/branch.c:588 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "브랜치 이름을 %s(으)로 바꾸지만, HEAD를 업데이트하지 않습니다!" -#: builtin/branch.c:604 +#: builtin/branch.c:595 msgid "Branch is renamed, but update of config-file failed" msgstr "브랜치의 이름을 바꾸지만, config-file 업데이트가 실패했습니다" -#: builtin/branch.c:620 +#: builtin/branch.c:611 #, c-format msgid "" "Please edit the description for the branch\n" @@ -4919,164 +5225,168 @@ msgstr "" " %s\n" "'%c' 문자로 시작하는 줄은 무시됩니다.\n" -#: builtin/branch.c:651 +#: builtin/branch.c:643 msgid "Generic options" msgstr "일반 옵션" # FIXME: give twice? -#: builtin/branch.c:653 +#: builtin/branch.c:645 msgid "show hash and subject, give twice for upstream branch" msgstr "해시와 제목을 표시하고, 업스트림 브랜치에 대한 위치를 표시합니다" -#: builtin/branch.c:654 +#: builtin/branch.c:646 msgid "suppress informational messages" msgstr "여러가지 안내 메시지를 표시하지 않습니다" -#: builtin/branch.c:655 +#: builtin/branch.c:647 msgid "set up tracking mode (see git-pull(1))" msgstr "추적 모드를 설정합니다 (git-pull(1) 참고)" -#: builtin/branch.c:657 +#: builtin/branch.c:649 msgid "change upstream info" msgstr "업스트림 정보를 바꿉니다" -#: builtin/branch.c:659 +#: builtin/branch.c:651 msgid "upstream" msgstr "업스트림" -#: builtin/branch.c:659 +#: builtin/branch.c:651 msgid "change the upstream info" msgstr "업스트림 정보를 바꿉니다" -#: builtin/branch.c:660 +#: builtin/branch.c:652 msgid "Unset the upstream info" msgstr "업스트림 정보를 해제합니다" -#: builtin/branch.c:661 +#: builtin/branch.c:653 msgid "use colored output" msgstr "여러 색으로 출력합니다" -#: builtin/branch.c:662 +#: builtin/branch.c:654 msgid "act on remote-tracking branches" msgstr "리모트 추적 브랜치에 대해 동작합니다" -#: builtin/branch.c:664 builtin/branch.c:665 +#: builtin/branch.c:656 builtin/branch.c:657 msgid "print only branches that contain the commit" msgstr "커밋이 있는 브랜치만 표시합니다" -#: builtin/branch.c:668 +#: builtin/branch.c:660 msgid "Specific git-branch actions:" msgstr "특정 git-branch 동작:" -#: builtin/branch.c:669 +#: builtin/branch.c:661 msgid "list both remote-tracking and local branches" msgstr "리모트와 로컬의 브랜치 목록을 모두 표시합니다" -#: builtin/branch.c:671 +#: builtin/branch.c:663 msgid "delete fully merged branch" msgstr "완전히 병합된 브랜치를 삭제합니다" -#: builtin/branch.c:672 +#: builtin/branch.c:664 msgid "delete branch (even if not merged)" msgstr "브랜치를 삭제합니다 (병합되지 않았더라도)" -#: builtin/branch.c:673 +#: builtin/branch.c:665 msgid "move/rename a branch and its reflog" msgstr "브랜치와 그 reflog를 옮기거나 이름을 바꿉니다" -#: builtin/branch.c:674 +#: builtin/branch.c:666 msgid "move/rename a branch, even if target exists" msgstr "대상이 이미 있더라도 브랜치를 옮기거나 이름을 바꿉니다" -#: builtin/branch.c:675 +#: builtin/branch.c:667 msgid "list branch names" msgstr "브랜치 이름 목록을 표시합니다" -#: builtin/branch.c:676 +#: builtin/branch.c:668 msgid "create the branch's reflog" msgstr "브랜치의 reflog를 만듭니다" -#: builtin/branch.c:678 +#: builtin/branch.c:670 msgid "edit the description for the branch" msgstr "브랜치의 설명을 편집합니다" -#: builtin/branch.c:679 +#: builtin/branch.c:671 msgid "force creation, move/rename, deletion" msgstr "강제로 만들고, 옮기거나 이름을 바꾸고, 삭제합니다" -#: builtin/branch.c:680 +#: builtin/branch.c:672 msgid "print only branches that are merged" msgstr "병합되는 브랜치만 표시합니다" -#: builtin/branch.c:681 +#: builtin/branch.c:673 msgid "print only branches that are not merged" msgstr "병합되지 않는 브랜치만 표시합니다" -#: builtin/branch.c:682 +#: builtin/branch.c:674 msgid "list branches in columns" msgstr "목록을 여러 열로 표시합니다" -#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366 +#: builtin/branch.c:675 builtin/for-each-ref.c:38 builtin/tag.c:381 msgid "key" msgstr "키" -#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367 +#: builtin/branch.c:676 builtin/for-each-ref.c:39 builtin/tag.c:382 msgid "field name to sort on" msgstr "정렬한 기준이 되는 필드 이름" -#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:404 +#: builtin/branch.c:678 builtin/for-each-ref.c:41 builtin/notes.c:404 #: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570 -#: builtin/tag.c:369 +#: builtin/tag.c:384 msgid "object" msgstr "오브젝트" -#: builtin/branch.c:687 +#: builtin/branch.c:679 msgid "print only branches of the object" msgstr "해당 오브젝트의 브랜치만 표시합니다" -#: builtin/branch.c:705 +#: builtin/branch.c:681 builtin/for-each-ref.c:46 builtin/tag.c:388 +msgid "sorting and filtering are case insensitive" +msgstr "정렬과 필터링은 대소문자를 구분하지 않습니다" + +#: builtin/branch.c:698 msgid "Failed to resolve HEAD as a valid ref." msgstr "HEAD를 올바른 레퍼런스로 구해내는데 실패했습니다." -#: builtin/branch.c:709 builtin/clone.c:706 +#: builtin/branch.c:702 builtin/clone.c:706 msgid "HEAD not found below refs/heads!" msgstr "레퍼런스/헤드 아래에 HEAD가 없습니다!" -#: builtin/branch.c:729 +#: builtin/branch.c:724 msgid "--column and --verbose are incompatible" msgstr "--column 및 --verbose 옵션은 호환되지 않습니다" -#: builtin/branch.c:740 builtin/branch.c:782 +#: builtin/branch.c:735 builtin/branch.c:787 msgid "branch name required" msgstr "브랜치 이름이 필요합니다" -#: builtin/branch.c:758 +#: builtin/branch.c:763 msgid "Cannot give description to detached HEAD" msgstr "분리된 HEAD에 대한 설명을 부여할 수 없습니다" -#: builtin/branch.c:763 +#: builtin/branch.c:768 msgid "cannot edit description of more than one branch" msgstr "여러 브랜치에 대한 설명을 편집할 수 없습니다" -#: builtin/branch.c:770 +#: builtin/branch.c:775 #, c-format msgid "No commit on branch '%s' yet." msgstr "아직 '%s' 브랜치에 커밋이 없습니다." -#: builtin/branch.c:773 +#: builtin/branch.c:778 #, c-format msgid "No branch named '%s'." msgstr "이름이 '%s'인 브랜치가 없습니다." -#: builtin/branch.c:788 +#: builtin/branch.c:793 msgid "too many branches for a rename operation" msgstr "이름 바꾸기 작업에 대해 브랜치가 너무 많습니다" -#: builtin/branch.c:793 +#: builtin/branch.c:798 msgid "too many branches to set new upstream" msgstr "새 업스트림을 설정하는데 브랜치가 너무 많습니다" -#: builtin/branch.c:797 +#: builtin/branch.c:802 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -5084,41 +5394,41 @@ msgstr "" "HEAD의 업스트림을 %s(으)로 설정할 수 없습니다. 어떤 브랜치도 가리키지 않습니" "다." -#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843 +#: builtin/branch.c:805 builtin/branch.c:827 builtin/branch.c:848 #, c-format msgid "no such branch '%s'" msgstr "그런 브랜치가 ('%s') 없습니다" -#: builtin/branch.c:804 +#: builtin/branch.c:809 #, c-format msgid "branch '%s' does not exist" msgstr "'%s' 브랜치가 없습니다" -#: builtin/branch.c:816 +#: builtin/branch.c:821 msgid "too many branches to unset upstream" msgstr "업스트림 설정을 해제하는데 브랜치가 너무 많습니다" -#: builtin/branch.c:820 +#: builtin/branch.c:825 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "HEAD의 업스트림 설정을 해제할 수 없습니다. 어떤 브랜치도 가리키지 않습니다." -#: builtin/branch.c:826 +#: builtin/branch.c:831 #, c-format msgid "Branch '%s' has no upstream information" msgstr "'%s' 브랜치에 업스트림 정보가 없습니다" -#: builtin/branch.c:840 +#: builtin/branch.c:845 msgid "it does not make sense to create 'HEAD' manually" msgstr "'HEAD'를 수동으로 만드는 건 앞뒤가 맞지 않습니다" -#: builtin/branch.c:846 +#: builtin/branch.c:851 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "'git branch'에 대해 -a 및 -r 옵션은 브랜치 이름과 같이 쓰면 앞뒤가 맞지 않습" "니다" -#: builtin/branch.c:849 +#: builtin/branch.c:854 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -5127,7 +5437,7 @@ msgstr "" "--set-upstream 옵션은 더 이상 사용되지 않고 제거될 예정입니다. --track 또는 " "--set-upstream-to 옵션을 사용해 보십시오\n" -#: builtin/branch.c:866 +#: builtin/branch.c:871 #, c-format msgid "" "\n" @@ -5194,7 +5504,7 @@ msgstr "블롭 오브젝트에 대해서는, 오브젝트의 내용에 대해 te msgid "for blob objects, run filters on object's content" msgstr "블롭 오브젝트에 대해서는, 오브젝트의 내용에 대해 필터를 실행합니다" -#: builtin/cat-file.c:561 git-submodule.sh:923 +#: builtin/cat-file.c:561 git-submodule.sh:929 msgid "blob" msgstr "블롭" @@ -5251,7 +5561,7 @@ msgstr "표준 입력에서 파일 이름을 읽습니다" msgid "terminate input and output records by a NUL character" msgstr "NUL 문자를 기준으로 자료 입력 및 출력을 멈춥니다" -#: builtin/check-ignore.c:18 builtin/checkout.c:1137 builtin/gc.c:325 +#: builtin/check-ignore.c:18 builtin/checkout.c:1140 builtin/gc.c:332 msgid "suppress progress reporting" msgstr "진행 상황 표시를 하지 않습니다" @@ -5341,9 +5651,9 @@ msgid "write the content to temporary files" msgstr "내용을 임시 파일에 씁니다" #: builtin/checkout-index.c:174 builtin/column.c:30 -#: builtin/submodule--helper.c:595 builtin/submodule--helper.c:598 -#: builtin/submodule--helper.c:604 builtin/submodule--helper.c:951 -#: builtin/worktree.c:469 +#: builtin/submodule--helper.c:597 builtin/submodule--helper.c:600 +#: builtin/submodule--helper.c:606 builtin/submodule--helper.c:967 +#: builtin/worktree.c:471 msgid "string" msgstr "문자열" @@ -5418,50 +5728,50 @@ msgstr "'%s' 경로를 병합하지 않았습니다" msgid "you need to resolve your current index first" msgstr "현재 인덱스를 먼저 해결해야 합니다" -#: builtin/checkout.c:624 +#: builtin/checkout.c:625 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "'%s'에 대해 reflog할 수 없습니다: %s\n" -#: builtin/checkout.c:663 +#: builtin/checkout.c:666 msgid "HEAD is now at" msgstr "HEAD의 현재 위치는" -#: builtin/checkout.c:667 builtin/clone.c:660 +#: builtin/checkout.c:670 builtin/clone.c:660 msgid "unable to update HEAD" msgstr "HEAD를 업데이트할 수 없습니다" -#: builtin/checkout.c:671 +#: builtin/checkout.c:674 #, c-format msgid "Reset branch '%s'\n" msgstr "'%s' 브랜치 리셋\n" -#: builtin/checkout.c:674 +#: builtin/checkout.c:677 #, c-format msgid "Already on '%s'\n" msgstr "이미 '%s'에 있습니다\n" -#: builtin/checkout.c:678 +#: builtin/checkout.c:681 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "'%s' 브랜치로 전환하고 리셋합니다\n" -#: builtin/checkout.c:680 builtin/checkout.c:1069 +#: builtin/checkout.c:683 builtin/checkout.c:1072 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "새로 만든 '%s' 브랜치로 전환합니다\n" -#: builtin/checkout.c:682 +#: builtin/checkout.c:685 #, c-format msgid "Switched to branch '%s'\n" msgstr "'%s' 브랜치로 전환합니다\n" -#: builtin/checkout.c:733 +#: builtin/checkout.c:736 #, c-format msgid " ... and %d more.\n" msgstr " ... 그리고 %d개 더.\n" -#: builtin/checkout.c:739 +#: builtin/checkout.c:742 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -5479,7 +5789,7 @@ msgstr[0] "" "\n" "%s\n" -#: builtin/checkout.c:758 +#: builtin/checkout.c:761 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -5500,151 +5810,151 @@ msgstr[0] "" " git branch <새-브랜치-이름> %s\n" "\n" -#: builtin/checkout.c:794 +#: builtin/checkout.c:797 msgid "internal error in revision walk" msgstr "리비전 walk에 내부 오류" -#: builtin/checkout.c:798 +#: builtin/checkout.c:801 msgid "Previous HEAD position was" msgstr "이전 HEAD 위치는" -#: builtin/checkout.c:825 builtin/checkout.c:1064 +#: builtin/checkout.c:828 builtin/checkout.c:1067 msgid "You are on a branch yet to be born" msgstr "현재 위치가 만들 예정인 브랜치에 있습니다" -#: builtin/checkout.c:970 +#: builtin/checkout.c:973 #, c-format msgid "only one reference expected, %d given." msgstr "하나의 레퍼런스만 지정해야 하지만 %d개를 지정했습니다." -#: builtin/checkout.c:1010 builtin/worktree.c:214 +#: builtin/checkout.c:1013 builtin/worktree.c:214 #, c-format msgid "invalid reference: %s" msgstr "잘못된 레퍼런스: %s" -#: builtin/checkout.c:1039 +#: builtin/checkout.c:1042 #, c-format msgid "reference is not a tree: %s" msgstr "레퍼런스가 트리가 아닙니다: %s" -#: builtin/checkout.c:1078 +#: builtin/checkout.c:1081 msgid "paths cannot be used with switching branches" msgstr "브랜치를 전환하는데 경로를 사용할 수 없습니다" -#: builtin/checkout.c:1081 builtin/checkout.c:1085 +#: builtin/checkout.c:1084 builtin/checkout.c:1088 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' 옵션은 브랜치를 전환할 때 쓸 수 없습니다" -#: builtin/checkout.c:1089 builtin/checkout.c:1092 builtin/checkout.c:1097 -#: builtin/checkout.c:1100 +#: builtin/checkout.c:1092 builtin/checkout.c:1095 builtin/checkout.c:1100 +#: builtin/checkout.c:1103 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' 옵션은 '%s' 옵션과 같이 쓸 수 없습니다" -#: builtin/checkout.c:1105 +#: builtin/checkout.c:1108 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "브랜치를 커밋이 아닌 '%s'(으)로 전환할 수 없습니다" -#: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:93 +#: builtin/checkout.c:1141 builtin/checkout.c:1143 builtin/clone.c:93 #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324 #: builtin/worktree.c:326 msgid "branch" msgstr "브랜치" -#: builtin/checkout.c:1139 +#: builtin/checkout.c:1142 msgid "create and checkout a new branch" msgstr "새 브랜치를 만들고 가져옵니다" -#: builtin/checkout.c:1141 +#: builtin/checkout.c:1144 msgid "create/reset and checkout a branch" msgstr "브랜치를 만들거나 리셋하고 가져옵니다" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1145 msgid "create reflog for new branch" msgstr "새 브랜치에 대한 reflog를 만듭니다" -#: builtin/checkout.c:1143 builtin/worktree.c:328 +#: builtin/checkout.c:1146 builtin/worktree.c:328 msgid "detach HEAD at named commit" msgstr "HEAD를 해당 커밋에서 분리합니다" -#: builtin/checkout.c:1144 +#: builtin/checkout.c:1147 msgid "set upstream info for new branch" msgstr "새 브랜치에 대한 업스트림 정보를 설정합니다" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1149 msgid "new-branch" msgstr "새-브랜치" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1149 msgid "new unparented branch" msgstr "상위 브랜치가 없는 새 브랜치" -#: builtin/checkout.c:1147 +#: builtin/checkout.c:1150 msgid "checkout our version for unmerged files" msgstr "병합되지 않은 파일에 대해 우리쪽 버전을 가져옵니다" -#: builtin/checkout.c:1149 +#: builtin/checkout.c:1152 msgid "checkout their version for unmerged files" msgstr "병합되지 않은 파일에 대해 상대편 버전을 가져옵니다" -#: builtin/checkout.c:1151 +#: builtin/checkout.c:1154 msgid "force checkout (throw away local modifications)" msgstr "강제로 체크아웃합니다 (로컬에서 수정한 사항을 버립니다)" -#: builtin/checkout.c:1152 +#: builtin/checkout.c:1155 msgid "perform a 3-way merge with the new branch" msgstr "새 브랜치에 대해 3-방향 병합을 수행합니다" -#: builtin/checkout.c:1153 builtin/merge.c:231 +#: builtin/checkout.c:1156 builtin/merge.c:235 msgid "update ignored files (default)" msgstr "무시하는 파일을 업데이트합니다 (기본값)" -#: builtin/checkout.c:1154 builtin/log.c:1466 parse-options.h:251 +#: builtin/checkout.c:1157 builtin/log.c:1466 parse-options.h:251 msgid "style" msgstr "스타일" -#: builtin/checkout.c:1155 +#: builtin/checkout.c:1158 msgid "conflict style (merge or diff3)" msgstr "충돌 스타일 (merge 또는 diff3)" # FIXME: 의미 불명 -#: builtin/checkout.c:1158 +#: builtin/checkout.c:1161 msgid "do not limit pathspecs to sparse entries only" msgstr "경로명세를 드문 항목에만 제한하지 않습니다" -#: builtin/checkout.c:1160 +#: builtin/checkout.c:1163 msgid "second guess 'git checkout <no-such-branch>'" msgstr "'git checkout <없는-브랜치>'에 대해 추측합니다" -#: builtin/checkout.c:1162 +#: builtin/checkout.c:1165 msgid "do not check if another worktree is holding the given ref" msgstr "다른 작업폴더에 주어진 레퍼런스가 있는지 확인하지 않습니다" -#: builtin/checkout.c:1163 builtin/clone.c:63 builtin/fetch.c:119 -#: builtin/merge.c:228 builtin/pull.c:117 builtin/push.c:536 +#: builtin/checkout.c:1166 builtin/clone.c:63 builtin/fetch.c:119 +#: builtin/merge.c:232 builtin/pull.c:117 builtin/push.c:539 #: builtin/send-pack.c:168 msgid "force progress reporting" msgstr "강제로 진행 상황을 표시합니다" -#: builtin/checkout.c:1194 +#: builtin/checkout.c:1197 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B 및 --orphan 옵션은 서로 호환되지 않습니다" -#: builtin/checkout.c:1211 +#: builtin/checkout.c:1214 msgid "--track needs a branch name" msgstr "--track 옵션은 브랜치 이름이 필요합니다" -#: builtin/checkout.c:1216 +#: builtin/checkout.c:1219 msgid "Missing branch name; try -b" msgstr "브랜치 이름이 없습니다. -b 옵션을 사용해 보십시오" -#: builtin/checkout.c:1252 +#: builtin/checkout.c:1255 msgid "invalid path specification" msgstr "경로 명세가 잘못되었습니다" -#: builtin/checkout.c:1259 +#: builtin/checkout.c:1262 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -5653,12 +5963,12 @@ msgstr "" "동시에 경로를 업데이트하고 '%s' 브랜치로 전환할 수 없습니다.\n" "커밋을 확인할 수 없는 '%s'을(를) 가져오려고 하셨습니까?" -#: builtin/checkout.c:1264 +#: builtin/checkout.c:1267 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach 옵션은 경로 인자를 받지 않습니다 '%s'" -#: builtin/checkout.c:1268 +#: builtin/checkout.c:1271 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -5697,19 +6007,21 @@ msgstr "%s 저장소 건너뛸 예정\n" msgid "failed to remove %s" msgstr "%s 제거에 실패했습니다" -#: builtin/clean.c:291 +#: builtin/clean.c:291 git-add--interactive.perl:623 +#, c-format msgid "" "Prompt help:\n" "1 - select a numbered item\n" "foo - select item based on unique prefix\n" -" - (empty) select nothing" +" - (empty) select nothing\n" msgstr "" "프롬프트 도움말:\n" "1 - 해당 번호의 항목을 선택\n" "foo - 유일한 접두어에 해당하는 항목 선택\n" -" - (빈 입력) 선택하지 않음" +" - (빈 입력) 선택하지 않음\n" -#: builtin/clean.c:295 +#: builtin/clean.c:295 git-add--interactive.perl:632 +#, c-format msgid "" "Prompt help:\n" "1 - select a single item\n" @@ -5718,7 +6030,7 @@ msgid "" "foo - select item based on unique prefix\n" "-... - unselect specified items\n" "* - choose all items\n" -" - (empty) finish selecting" +" - (empty) finish selecting\n" msgstr "" "프롬프트 도움말:\n" "1 - 해당 번호의 항목을 선택\n" @@ -5727,12 +6039,13 @@ msgstr "" "foo - 유일한 접두어에 해당하는 항목 선택\n" "-... - 해당 항목 선택 해제\n" "* - 모든 항목 선택\n" -" - (빈 입력) 선택 마침" +" - (빈 입력) 선택 마침\n" -#: builtin/clean.c:511 -#, c-format -msgid "Huh (%s)?" -msgstr "어라라 (%s)?" +#: builtin/clean.c:511 git-add--interactive.perl:598 +#: git-add--interactive.perl:603 +#, c-format, perl-format +msgid "Huh (%s)?\n" +msgstr "어라라 (%s)?\n" #: builtin/clean.c:653 #, c-format @@ -5754,9 +6067,10 @@ msgstr "삭제할 항목을 선택하십시오" msgid "Remove %s [y/N]? " msgstr "%s 제거합니까 [y/N]? " -#: builtin/clean.c:777 -msgid "Bye." -msgstr "끝." +#: builtin/clean.c:777 git-add--interactive.perl:1669 +#, c-format +msgid "Bye.\n" +msgstr "끝.\n" #: builtin/clean.c:785 msgid "" @@ -5776,11 +6090,11 @@ msgstr "" "help - 이 화면 표시\n" "? - 프롬프트 선택 도움말" -#: builtin/clean.c:812 +#: builtin/clean.c:812 git-add--interactive.perl:1745 msgid "*** Commands ***" msgstr "*** 명령 ***" -#: builtin/clean.c:813 +#: builtin/clean.c:813 git-add--interactive.perl:1742 msgid "What now" msgstr "무엇을 할까요" @@ -5809,8 +6123,8 @@ msgstr "대화형 지우기" msgid "remove whole directories" msgstr "전체 디렉터리 제거" -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:725 -#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:182 +#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:1056 +#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:176 msgid "pattern" msgstr "패턴" @@ -5890,8 +6204,8 @@ msgstr "서식-디렉터리" msgid "directory from which templates will be used" msgstr "서식을 사용할 디렉터리 위치" -#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:602 -#: builtin/submodule--helper.c:954 +#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:604 +#: builtin/submodule--helper.c:970 msgid "reference repository" msgstr "레퍼런스 저장소" @@ -5915,8 +6229,7 @@ msgstr "리모트의 HEAD 대신 <브랜치>를 가져옵니다" msgid "path to git-upload-pack on the remote" msgstr "리모트의 git-upload-pack 경로" -#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668 -#: builtin/pull.c:202 +#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:999 builtin/pull.c:202 msgid "depth" msgstr "깊이" @@ -5924,7 +6237,7 @@ msgstr "깊이" msgid "create a shallow clone of that depth" msgstr "지정한 깊이의 얕은 복제를 만듭니다" -#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848 +#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2836 #: parse-options.h:142 msgid "time" msgstr "시각" @@ -5938,8 +6251,8 @@ msgid "revision" msgstr "리비전" #: builtin/clone.c:102 builtin/fetch.c:125 -msgid "deepen history of shallow clone by excluding rev" -msgstr "레퍼런스를 제외해 얕은 복제의 커밋 내역을 깊게 만듭니다" +msgid "deepen history of shallow clone, excluding rev" +msgstr "리비전을 제외해 얕은 복제의 커밋 내역을 깊게 만듭니다" #: builtin/clone.c:104 msgid "clone only one branch, HEAD or --branch" @@ -5965,11 +6278,11 @@ msgstr "키=값" msgid "set config inside the new repository" msgstr "새 저장소 안에서 설정합니다" -#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:547 +#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:550 msgid "use IPv4 addresses only" msgstr "IPv4 주소만 사용합니다" -#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:549 +#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:552 msgid "use IPv6 addresses only" msgstr "IPv6 주소만 사용합니다" @@ -6082,7 +6395,7 @@ msgstr "--bare 및 --separate-git-dir 옵션은 호환되지 않습니다." msgid "repository '%s' does not exist" msgstr "'%s' 저장소가 없습니다" -#: builtin/clone.c:905 builtin/fetch.c:1338 +#: builtin/clone.c:905 builtin/fetch.c:1335 #, c-format msgid "depth %s is not a positive number" msgstr "깊이가(%s) 0보다 큰 수가 아닙니다" @@ -6097,8 +6410,9 @@ msgstr "대상 경로가('%s') 이미 있고 빈 디렉터리가 아닙니다." msgid "working tree '%s' already exists." msgstr "작업 폴더가('%s') 이미 있습니다." -#: builtin/clone.c:940 builtin/clone.c:951 builtin/submodule--helper.c:657 -#: builtin/worktree.c:222 builtin/worktree.c:249 +#: builtin/clone.c:940 builtin/clone.c:951 builtin/difftool.c:252 +#: builtin/submodule--helper.c:659 builtin/worktree.c:222 +#: builtin/worktree.c:249 #, c-format msgid "could not create leading directories of '%s'" msgstr "'%s'의 앞 디렉터리를 만들 수 없습니다" @@ -6373,7 +6687,7 @@ msgstr "" msgid "could not lookup commit %s" msgstr "%s 커밋을 찾아볼 수 없습니다" -#: builtin/commit.c:704 builtin/shortlog.c:286 +#: builtin/commit.c:704 builtin/shortlog.c:295 #, c-format msgid "(reading log message from standard input)\n" msgstr "(표준 입력에서 로그 메시지를 읽음)\n" @@ -6472,7 +6786,7 @@ msgstr "인덱스를 읽을 수 없습니다" msgid "Error building trees" msgstr "트리를 만드는데 오류" -#: builtin/commit.c:969 builtin/tag.c:266 +#: builtin/commit.c:968 builtin/tag.c:280 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "메시지를 -m 또는 -F 옵션으로 입력하십시오.\n" @@ -6483,7 +6797,7 @@ msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' 옵션이 '이름 <전자메일>' 형식이 아니고 기존 작성자에도 없습니다" -#: builtin/commit.c:1086 builtin/commit.c:1327 +#: builtin/commit.c:1086 builtin/commit.c:1325 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "추적되지 않는 파일 모드가 ('%s') 잘못되었습니다" @@ -6535,67 +6849,63 @@ msgid "No paths with --include/--only does not make sense." msgstr "경로가 없이 --include/--only 옵션을 쓰면 앞뒤가 맞지 않습니다." #: builtin/commit.c:1212 -msgid "Clever... amending the last one with dirty index." -msgstr "기발하네요... 마지막을 변경된 인덱스로 바꿉니다." - -#: builtin/commit.c:1214 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" "-i 또는 -o 없이 명시적인 경로를 지정했습니다. --only 경로를 가정합니다..." -#: builtin/commit.c:1226 builtin/tag.c:474 +#: builtin/commit.c:1224 builtin/tag.c:495 #, c-format msgid "Invalid cleanup mode %s" msgstr "잘못된 정리 모드 %s" -#: builtin/commit.c:1231 +#: builtin/commit.c:1229 msgid "Paths with -a does not make sense." msgstr "-a 옵션과 경로를 같이 사용하면 앞뒤가 맞지 않습니다." -#: builtin/commit.c:1341 builtin/commit.c:1617 +#: builtin/commit.c:1339 builtin/commit.c:1612 msgid "show status concisely" msgstr "상태를 간략하게 표시합니다" -#: builtin/commit.c:1343 builtin/commit.c:1619 +#: builtin/commit.c:1341 builtin/commit.c:1614 msgid "show branch information" msgstr "브랜치 정보를 표시합니다" -#: builtin/commit.c:1345 +#: builtin/commit.c:1343 msgid "version" msgstr "버전" -#: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522 -#: builtin/worktree.c:440 +#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525 +#: builtin/worktree.c:442 msgid "machine-readable output" msgstr "컴퓨터가 읽을 수 있는 형식" -#: builtin/commit.c:1348 builtin/commit.c:1623 +#: builtin/commit.c:1346 builtin/commit.c:1618 msgid "show status in long format (default)" msgstr "긴 형식으로 상태를 표시합니다 (기본값)" -#: builtin/commit.c:1351 builtin/commit.c:1626 +#: builtin/commit.c:1349 builtin/commit.c:1621 msgid "terminate entries with NUL" msgstr "NUL 문자로 항목을 끝냅니다" -#: builtin/commit.c:1353 builtin/commit.c:1629 builtin/fast-export.c:981 -#: builtin/fast-export.c:984 builtin/tag.c:353 +#: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981 +#: builtin/fast-export.c:984 builtin/tag.c:368 msgid "mode" msgstr "모드" -#: builtin/commit.c:1354 builtin/commit.c:1629 +#: builtin/commit.c:1352 builtin/commit.c:1624 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "추적되지 않는 파일을 표시합니다. 추가 옵션: all, normal, no (기본값: all)" -#: builtin/commit.c:1357 +#: builtin/commit.c:1355 msgid "show ignored files" msgstr "무시되는 파일을 표시합니다" -#: builtin/commit.c:1358 parse-options.h:155 +#: builtin/commit.c:1356 parse-options.h:155 msgid "when" msgstr "언제" -#: builtin/commit.c:1359 +#: builtin/commit.c:1357 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -6603,198 +6913,198 @@ msgstr "" "하위 모듈의 변경을 무시합니다. 추가 옵션: all, dirty, untracked. (기본값: " "all)" -#: builtin/commit.c:1361 +#: builtin/commit.c:1359 msgid "list untracked files in columns" msgstr "추적되지 않는 파일의 목록을 여러 열로 표시합니다" -#: builtin/commit.c:1437 +#: builtin/commit.c:1435 msgid "couldn't look up newly created commit" msgstr "새로 만든 커밋을 찾아볼 수 없습니다" -#: builtin/commit.c:1439 +#: builtin/commit.c:1437 msgid "could not parse newly created commit" msgstr "새로 만든 커밋을 파싱할 수 없습니다" -#: builtin/commit.c:1484 +#: builtin/commit.c:1482 msgid "detached HEAD" msgstr "HEAD 분리됨" -#: builtin/commit.c:1487 +#: builtin/commit.c:1485 msgid " (root-commit)" msgstr " (최상위-커밋)" -#: builtin/commit.c:1587 +#: builtin/commit.c:1582 msgid "suppress summary after successful commit" msgstr "성공적인 커밋 후에 요약을 표시하지 않습니다" -#: builtin/commit.c:1588 +#: builtin/commit.c:1583 msgid "show diff in commit message template" msgstr "커밋 메시지 서식에 diff를 표시합니다" -#: builtin/commit.c:1590 +#: builtin/commit.c:1585 msgid "Commit message options" msgstr "커밋 메시지 옵션" -#: builtin/commit.c:1591 builtin/tag.c:351 +#: builtin/commit.c:1586 builtin/tag.c:366 msgid "read message from file" msgstr "파일에서 메시지를 읽습니다" -#: builtin/commit.c:1592 +#: builtin/commit.c:1587 msgid "author" msgstr "작성자" -#: builtin/commit.c:1592 +#: builtin/commit.c:1587 msgid "override author for commit" msgstr "커밋의 작성자를 지정합니다" -#: builtin/commit.c:1593 builtin/gc.c:326 +#: builtin/commit.c:1588 builtin/gc.c:333 msgid "date" msgstr "시각" -#: builtin/commit.c:1593 +#: builtin/commit.c:1588 msgid "override date for commit" msgstr "커밋의 시각을 지정합니다" -#: builtin/commit.c:1594 builtin/merge.c:220 builtin/notes.c:398 -#: builtin/notes.c:561 builtin/tag.c:349 +#: builtin/commit.c:1589 builtin/merge.c:222 builtin/notes.c:398 +#: builtin/notes.c:561 builtin/tag.c:364 msgid "message" msgstr "메시지" -#: builtin/commit.c:1594 +#: builtin/commit.c:1589 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:79 +#: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592 +#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:81 msgid "commit" msgstr "커밋" -#: builtin/commit.c:1595 +#: builtin/commit.c:1590 msgid "reuse and edit message from specified commit" msgstr "지정한 커밋의 메시지를 재사용하고 편집합니다" -#: builtin/commit.c:1596 +#: builtin/commit.c:1591 msgid "reuse message from specified commit" msgstr "지정한 커밋에서 메시지를 재사용합니다" -#: builtin/commit.c:1597 +#: builtin/commit.c:1592 msgid "use autosquash formatted message to fixup specified commit" msgstr "지정한 커밋을 수정하는데 autosquash 형식 메시지를 사용합니다" -#: builtin/commit.c:1598 +#: builtin/commit.c:1593 msgid "use autosquash formatted message to squash specified commit" msgstr "지정한 커밋을 합치는데 autosquash 형식 메시지를 사용합니다" -#: builtin/commit.c:1599 +#: builtin/commit.c:1594 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "커밋을 내가 작성한 것으로 만듭니다 (-C/-c/--amend와 같이 사용)" -#: builtin/commit.c:1600 builtin/log.c:1413 builtin/revert.c:86 +#: builtin/commit.c:1595 builtin/log.c:1413 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "Signed-off-by: 줄을 추가합니다" -#: builtin/commit.c:1601 +#: builtin/commit.c:1596 msgid "use specified template file" msgstr "지정한 서식 파일을 사용합니다" -#: builtin/commit.c:1602 +#: builtin/commit.c:1597 msgid "force edit of commit" msgstr "커밋 편집을 강제합니다" -#: builtin/commit.c:1603 +#: builtin/commit.c:1598 msgid "default" msgstr "기본값" -#: builtin/commit.c:1603 builtin/tag.c:354 +#: builtin/commit.c:1598 builtin/tag.c:369 msgid "how to strip spaces and #comments from message" msgstr "메시지에서 공백과 #주석을 지웁니다" -#: builtin/commit.c:1604 +#: builtin/commit.c:1599 msgid "include status in commit message template" msgstr "커밋 메시지 서식에 상태를 포함합니다" -#: builtin/commit.c:1606 builtin/merge.c:230 builtin/pull.c:166 +#: builtin/commit.c:1601 builtin/merge.c:234 builtin/pull.c:166 #: builtin/revert.c:93 msgid "GPG sign commit" msgstr "GPG 서명 커밋" -#: builtin/commit.c:1609 +#: builtin/commit.c:1604 msgid "Commit contents options" msgstr "커밋 내용 옵션" -#: builtin/commit.c:1610 +#: builtin/commit.c:1605 msgid "commit all changed files" msgstr "변경된 파일을 모두 커밋합니다" -#: builtin/commit.c:1611 +#: builtin/commit.c:1606 msgid "add specified files to index for commit" msgstr "지정한 파일을 커밋할 인덱스에 추가합니다" -#: builtin/commit.c:1612 +#: builtin/commit.c:1607 msgid "interactively add files" msgstr "대화형으로 파일을 추가합니다" -#: builtin/commit.c:1613 +#: builtin/commit.c:1608 msgid "interactively add changes" msgstr "대화형으로 변경 사항을 추가합니다" -#: builtin/commit.c:1614 +#: builtin/commit.c:1609 msgid "commit only specified files" msgstr "지정한 파일만 커밋합니다" -#: builtin/commit.c:1615 +#: builtin/commit.c:1610 msgid "bypass pre-commit and commit-msg hooks" msgstr "커밋 전 후크와 커밋 메시지 후크를 건너뜁니다" -#: builtin/commit.c:1616 +#: builtin/commit.c:1611 msgid "show what would be committed" msgstr "무엇을 커밋할지 표시합니다" -#: builtin/commit.c:1627 +#: builtin/commit.c:1622 msgid "amend previous commit" msgstr "바로 앞 커밋을 바꿉니다" -#: builtin/commit.c:1628 +#: builtin/commit.c:1623 msgid "bypass post-rewrite hook" msgstr "다시쓰기 후 후크를 건너뜁니다" -#: builtin/commit.c:1633 +#: builtin/commit.c:1628 msgid "ok to record an empty change" msgstr "빈 변경 사항을 기록하도록 허용합니다" -#: builtin/commit.c:1635 +#: builtin/commit.c:1630 msgid "ok to record a change with an empty message" msgstr "빈 메시지와 같이 변경 사항을 기록하도록 허용합니다" -#: builtin/commit.c:1664 +#: builtin/commit.c:1659 msgid "could not parse HEAD commit" msgstr "HEAD 커밋을 파싱할 수 없습니다" -#: builtin/commit.c:1712 +#: builtin/commit.c:1707 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "손상된 MERGE_HEAD 파일 (%s)" -#: builtin/commit.c:1719 +#: builtin/commit.c:1714 msgid "could not read MERGE_MODE" msgstr "MERGE_MODE를 읽을 수 없습니다" -#: builtin/commit.c:1738 +#: builtin/commit.c:1733 #, c-format msgid "could not read commit message: %s" msgstr "커밋 메시지를 읽을 수 없습니다: %s" -#: builtin/commit.c:1749 +#: builtin/commit.c:1744 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "커밋을 중지합니다. 메시지를 편집하지 않았습니다.\n" -#: builtin/commit.c:1754 +#: builtin/commit.c:1749 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "커밋을 중지합니다. 커밋 메시지가 비어 있습니다.\n" -#: builtin/commit.c:1802 +#: builtin/commit.c:1797 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -7116,7 +7426,7 @@ msgstr "이름이 없습니다. 아무것도 설명할 수 없습니다." #: builtin/describe.c:476 msgid "--dirty is incompatible with commit-ishes" -msgstr "--dirty 옵션은 커밋같은 항목과 호환되지 않았습니다" +msgstr "--dirty 옵션은 커밋같은 항목과 호환되지 않습니다" #: builtin/diff.c:86 #, c-format @@ -7147,6 +7457,91 @@ msgstr "두 개보다 많은 블롭이 주어졌습니다: '%s'" msgid "unhandled object '%s' given." msgstr "처리하지 않은 '%s' 오브젝트가 주어졌습니다." +#: builtin/difftool.c:28 +msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" +msgstr "git difftool [<옵션>] [<커밋> [<커밋>]] [--] [<경로>...]" + +#: builtin/difftool.c:241 +#, c-format +msgid "failed: %d" +msgstr "실패: %d" + +#: builtin/difftool.c:342 +msgid "" +"combined diff formats('-c' and '--cc') are not supported in\n" +"directory diff mode('-d' and '--dir-diff')." +msgstr "" +"컴바인드 diff 형식은 ('-c' 및 '--cc') 디렉터리 diff 모드에서는\n" +"('-d' 및 '--dir-diff') 지원하지 않습니다." + +#: builtin/difftool.c:567 +#, c-format +msgid "both files modified: '%s' and '%s'." +msgstr "두 파일이 수정되었습니다: '%s' 및 '%s'." + +#: builtin/difftool.c:569 +msgid "working tree file has been left." +msgstr "작업 폴더가 남겨져 있습니다." + +#: builtin/difftool.c:580 +#, c-format +msgid "temporary files exist in '%s'." +msgstr "임시 파일이 '%s'에 있습니다." + +#: builtin/difftool.c:581 +msgid "you may want to cleanup or recover these." +msgstr "이 파일을 지우거나 복구할 수 있습니다." + +#: builtin/difftool.c:626 +msgid "use `diff.guitool` instead of `diff.tool`" +msgstr "`diff.tool` 대신 `diff.guitool`을 사용하십시오" + +#: builtin/difftool.c:628 +msgid "perform a full-directory diff" +msgstr "전체 디렉터리 diff를 수행합니다" + +#: builtin/difftool.c:630 +msgid "do not prompt before launching a diff tool" +msgstr "diff 도구를 실행하기 전에 프롬프트를 표시하지 않습니다" + +#: builtin/difftool.c:636 +msgid "use symlinks in dir-diff mode" +msgstr "dir-diff 모드에서 심볼릭 링크를 사용합니다" + +#: builtin/difftool.c:637 +msgid "<tool>" +msgstr "<도구>" + +#: builtin/difftool.c:638 +msgid "use the specified diff tool" +msgstr "지정한 diff 도구를 사용합니다" + +#: builtin/difftool.c:640 +msgid "print a list of diff tools that may be used with `--tool`" +msgstr "`--tool` 옵션에서 사용할 수 있는 diff 도구 목록을 표시합니다" + +#: builtin/difftool.c:643 +msgid "" +"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " +"code" +msgstr "실행한 diff 도구가 0이 아닌 코드를 리턴하면 'git-difftool'이 끝나게 합니다" + +#: builtin/difftool.c:645 +msgid "<command>" +msgstr "<명령>" + +#: builtin/difftool.c:646 +msgid "specify a custom command for viewing diffs" +msgstr "diff를 보는 명령어를 사용자가 지정합니다" + +#: builtin/difftool.c:670 +msgid "no <tool> given for --tool=<tool>" +msgstr "--tool=<도구> 옵션에 <도구>가 주어지지 않았습니다" + +#: builtin/difftool.c:677 +msgid "no <cmd> given for --extcmd=<cmd>" +msgstr "--extcmd=<명령> 옵션에 <명령>이 주어지지 않았습니다" + #: builtin/fast-export.c:25 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-옵션]" @@ -7303,77 +7698,77 @@ msgstr "레퍼런스맵" msgid "specify fetch refmap" msgstr "레퍼런스맵 가져오기를 지정합니다" -#: builtin/fetch.c:398 +#: builtin/fetch.c:395 msgid "Couldn't find remote ref HEAD" msgstr "리모트 레퍼런스 HEAD를 찾을 수 없습니다" -#: builtin/fetch.c:514 +#: builtin/fetch.c:511 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "fetch.output 설정에 잘못된 값이 있습니다: %s" -#: builtin/fetch.c:607 +#: builtin/fetch.c:604 #, c-format msgid "object %s not found" msgstr "%s 오브젝트가 없습니다" -#: builtin/fetch.c:611 +#: builtin/fetch.c:608 msgid "[up to date]" msgstr "[최신 상태]" -#: builtin/fetch.c:624 builtin/fetch.c:704 +#: builtin/fetch.c:621 builtin/fetch.c:701 msgid "[rejected]" msgstr "[거부됨]" -#: builtin/fetch.c:625 +#: builtin/fetch.c:622 msgid "can't fetch in current branch" msgstr "현재 브랜치에서 가져올 수 없음" -#: builtin/fetch.c:634 +#: builtin/fetch.c:631 msgid "[tag update]" msgstr "[태그 업데이트]" -#: builtin/fetch.c:635 builtin/fetch.c:668 builtin/fetch.c:684 -#: builtin/fetch.c:699 +#: builtin/fetch.c:632 builtin/fetch.c:665 builtin/fetch.c:681 +#: builtin/fetch.c:696 msgid "unable to update local ref" msgstr "로컬 레퍼런스를 업데이트할 수 없습니다" -#: builtin/fetch.c:654 +#: builtin/fetch.c:651 msgid "[new tag]" msgstr "[새로운 태그]" -#: builtin/fetch.c:657 +#: builtin/fetch.c:654 msgid "[new branch]" msgstr "[새로운 브랜치]" -#: builtin/fetch.c:660 +#: builtin/fetch.c:657 msgid "[new ref]" msgstr "[새로운 레퍼런스]" -#: builtin/fetch.c:699 +#: builtin/fetch.c:696 msgid "forced update" msgstr "강제 업데이트" -#: builtin/fetch.c:704 +#: builtin/fetch.c:701 msgid "non-fast-forward" msgstr "정방향 진행이 아님" -#: builtin/fetch.c:749 +#: builtin/fetch.c:746 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s이(가) 모든 필요한 오브젝트를 보내지 않았습니다\n" -#: builtin/fetch.c:769 +#: builtin/fetch.c:766 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "얕은 최상위의 업데이트가 허용되지 않으므로 %s을(를) 거부합니다" -#: builtin/fetch.c:856 builtin/fetch.c:952 +#: builtin/fetch.c:853 builtin/fetch.c:949 #, c-format msgid "From %.*s\n" msgstr "%.*s URL에서\n" -#: builtin/fetch.c:867 +#: builtin/fetch.c:864 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -7382,55 +7777,55 @@ msgstr "" "업데이트할 수 없는 로컬 레퍼런스가 있습니다. 과거 충돌 브랜치를\n" " 제거하려면 'git remote prune %s' 명령을 실행해 보십시오" -#: builtin/fetch.c:922 +#: builtin/fetch.c:919 #, c-format msgid " (%s will become dangling)" msgstr " (%s 레퍼런스가 연결이 끊어지게 됩니다)" -#: builtin/fetch.c:923 +#: builtin/fetch.c:920 #, c-format msgid " (%s has become dangling)" msgstr " (%s 레퍼런스가 연결이 끊어졌습니다)" -#: builtin/fetch.c:955 +#: builtin/fetch.c:952 msgid "[deleted]" msgstr "[삭제됨]" -#: builtin/fetch.c:956 builtin/remote.c:1020 +#: builtin/fetch.c:953 builtin/remote.c:1020 msgid "(none)" msgstr "(없음)" -#: builtin/fetch.c:979 +#: builtin/fetch.c:976 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "간략한 저장소가 아닌 저장소의 현재 %s 브랜치로 가져오기를 거절합니다" -#: builtin/fetch.c:998 +#: builtin/fetch.c:995 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "\"%s\" 옵션의 \"%s\" 값은 %s에 대해 올바르지 않습니다" -#: builtin/fetch.c:1001 +#: builtin/fetch.c:998 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "\"%s\" 옵션은 '%s'에 대해 무시됩니다\n" -#: builtin/fetch.c:1077 +#: builtin/fetch.c:1074 #, c-format msgid "Don't know how to fetch from %s" msgstr "'%s'에서 가져오는 방법을 알 수 없습니다" -#: builtin/fetch.c:1237 +#: builtin/fetch.c:1234 #, c-format msgid "Fetching %s\n" msgstr "%s을(를) 가져오는 중\n" -#: builtin/fetch.c:1239 builtin/remote.c:96 +#: builtin/fetch.c:1236 builtin/remote.c:96 #, c-format msgid "Could not fetch %s" msgstr "%s을(를) 가져올 수 없습니다" -#: builtin/fetch.c:1257 +#: builtin/fetch.c:1254 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -7438,41 +7833,41 @@ msgstr "" "리모트 저장소를 지정하지 않았습니다. 새 리비전을 가져올 수 있는\n" "URL이나 리모트 이름을 지정하십시오." -#: builtin/fetch.c:1280 +#: builtin/fetch.c:1277 msgid "You need to specify a tag name." msgstr "태그 이름을 지정해야 합니다." -#: builtin/fetch.c:1322 +#: builtin/fetch.c:1319 msgid "Negative depth in --deepen is not supported" msgstr "--deepen 옵션에 음수 깊이는 지원하지 않습니다" -#: builtin/fetch.c:1324 +#: builtin/fetch.c:1321 msgid "--deepen and --depth are mutually exclusive" msgstr "-deepen, --depth 옵션 중 하나만 쓸 수 있습니다" -#: builtin/fetch.c:1329 +#: builtin/fetch.c:1326 msgid "--depth and --unshallow cannot be used together" msgstr "--depth 및 --unshallow 옵션은 같이 쓸 수 없습니다" -#: builtin/fetch.c:1331 +#: builtin/fetch.c:1328 msgid "--unshallow on a complete repository does not make sense" msgstr "" "완전한 저장소에 대해 --unshallow 옵션을 사용하는 건 앞뒤가 맞지 않습니다" -#: builtin/fetch.c:1353 +#: builtin/fetch.c:1350 msgid "fetch --all does not take a repository argument" msgstr "fetch --all 명령에 저장소 인자가 없습니다" -#: builtin/fetch.c:1355 +#: builtin/fetch.c:1352 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all 명령은 레퍼런스명세 인자와 같이 쓰면 앞뒤가 맞지 않습니다" -#: builtin/fetch.c:1366 +#: builtin/fetch.c:1363 #, c-format msgid "No such remote or remote group: %s" msgstr "그런 리모트나 리모트 그룹이 없습니다: %s" -#: builtin/fetch.c:1374 +#: builtin/fetch.c:1371 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "그룹을 가져오고 레퍼런스명세를 지정하면 앞뒤가 맞지 않습니다" @@ -7538,7 +7933,7 @@ msgstr "티클에 적합하게 플레이스홀더를 인용합니다" msgid "show only <n> matched refs" msgstr "<n>개의 해당하는 레퍼런스만 표시합니다" -#: builtin/for-each-ref.c:37 builtin/tag.c:372 +#: builtin/for-each-ref.c:37 builtin/tag.c:387 builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "출력에 사용할 형식" @@ -7558,63 +7953,63 @@ msgstr "병합하지 않는 레퍼런스만 표시합니다" msgid "print only refs which contain the commit" msgstr "커밋이 들어 있는 레퍼런스만 표시합니다" -#: builtin/fsck.c:519 +#: builtin/fsck.c:554 msgid "Checking object directories" msgstr "오브젝트 디렉터리를 확인하는 중입니다" -#: builtin/fsck.c:588 +#: builtin/fsck.c:646 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<옵션>] [<오브젝트>...]" -#: builtin/fsck.c:594 +#: builtin/fsck.c:652 msgid "show unreachable objects" msgstr "접근할 수 없는 오브젝트를 표시합니다" -#: builtin/fsck.c:595 +#: builtin/fsck.c:653 msgid "show dangling objects" msgstr "연결이 끊어진 오브젝트를 표시합니다" -#: builtin/fsck.c:596 +#: builtin/fsck.c:654 msgid "report tags" msgstr "태그를 알립니다" -#: builtin/fsck.c:597 +#: builtin/fsck.c:655 msgid "report root nodes" msgstr "최상위 노드를 알립니다" -#: builtin/fsck.c:598 +#: builtin/fsck.c:656 msgid "make index objects head nodes" msgstr "인덱스 오브젝트 헤드 노드를 만듭니다" -#: builtin/fsck.c:599 +#: builtin/fsck.c:657 msgid "make reflogs head nodes (default)" msgstr "reflog 헤드 노드를 만듭니다 (기본값)" -#: builtin/fsck.c:600 +#: builtin/fsck.c:658 msgid "also consider packs and alternate objects" msgstr "묶음과 보조 오브젝트도 만듭니다" -#: builtin/fsck.c:601 +#: builtin/fsck.c:659 msgid "check only connectivity" msgstr "연결만 확인합니다" -#: builtin/fsck.c:602 +#: builtin/fsck.c:660 msgid "enable more strict checking" msgstr "더 엄격하게 확인합니다" -#: builtin/fsck.c:604 +#: builtin/fsck.c:662 msgid "write dangling objects in .git/lost-found" msgstr ".git/lost-found 안에 연결이 끊어진 오브젝트를 씁니다" -#: builtin/fsck.c:605 builtin/prune.c:107 +#: builtin/fsck.c:663 builtin/prune.c:107 msgid "show progress" msgstr "진행 상황을 표시합니다" -#: builtin/fsck.c:606 +#: builtin/fsck.c:664 msgid "show verbose names for reachable objects" msgstr "접근할 수 없는 오브젝트의 이름을 자세히 표시합니다" -#: builtin/fsck.c:665 +#: builtin/fsck.c:725 msgid "Checking objects" msgstr "오브젝트를 확인합니다" @@ -7632,7 +8027,7 @@ msgstr "잘못된 %s: '%s'" msgid "insanely long object directory %.*s" msgstr "비정상적으로 긴 오브젝트 디렉터리 %.*s" -#: builtin/gc.c:290 +#: builtin/gc.c:297 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -7647,38 +8042,38 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:327 +#: builtin/gc.c:334 msgid "prune unreferenced objects" msgstr "레퍼런스하지 않는 오브젝트를 잘라냅니다" -#: builtin/gc.c:329 +#: builtin/gc.c:336 msgid "be more thorough (increased runtime)" msgstr "더 자세히 검사합니다 (실행 시간 늘어남)" -#: builtin/gc.c:330 +#: builtin/gc.c:337 msgid "enable auto-gc mode" msgstr "자동 가비지컬렉터 모드를 사용합니다" -#: builtin/gc.c:331 +#: builtin/gc.c:338 msgid "force running gc even if there may be another gc running" msgstr "이미 가비지컬렉터가 실행 중이더라도 강제로 가비지컬렉터를 실행합니다" -#: builtin/gc.c:373 +#: builtin/gc.c:380 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "최적 성능을 위해 백그라운드에서 자동으로 저장소의 묶음을 만듭니다.\n" -#: builtin/gc.c:375 +#: builtin/gc.c:382 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "최적 성능을 위해 자동으로 저장소의 묶음을 만듭니다.\n" -#: builtin/gc.c:376 +#: builtin/gc.c:383 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "수동 관리 작업은 \"git help gc\" 내용을 참고하십시오.\n" -#: builtin/gc.c:397 +#: builtin/gc.c:404 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -7686,240 +8081,256 @@ msgstr "" "가비지컬렉터가 이미 '%s' 컴퓨터에서 %<PRIuMAX> PID로 실행 중입니다 (아니면 --" "force를 사용하십시오)" -#: builtin/gc.c:441 +#: builtin/gc.c:448 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" "느슨한 오브젝트가 너무 많습니다. 제거하려면 'git prune'을 실행하십시오." -#: builtin/grep.c:23 +#: builtin/grep.c:25 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<옵션>] [-e] <패턴> [<리비전>...] [[--] <경로>...]" -#: builtin/grep.c:219 +#: builtin/grep.c:232 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep: 스레드를 만드는데 실패했습니다: %s" -#: builtin/grep.c:277 +#: builtin/grep.c:290 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "잘못된 스레드 수를 %2$s에 대해 지정했습니다 (%1$d)" -#: builtin/grep.c:453 builtin/grep.c:488 +#: builtin/grep.c:763 builtin/grep.c:804 #, c-format msgid "unable to read tree (%s)" msgstr "트리를 읽을 수 없습니다 (%s)" -#: builtin/grep.c:503 +#: builtin/grep.c:823 #, c-format msgid "unable to grep from object of type %s" msgstr "종류가 %s인 오브젝트에서 grep을 할 수 없습니다" -#: builtin/grep.c:561 +#: builtin/grep.c:887 #, c-format msgid "switch `%c' expects a numerical value" msgstr "`%c' 옵션에는 숫자 값이 와야 합니다" -#: builtin/grep.c:647 +#: builtin/grep.c:973 msgid "search in index instead of in the work tree" msgstr "작업 폴더 대신에 인덱스에서 검색합니다" -#: builtin/grep.c:649 +#: builtin/grep.c:975 msgid "find in contents not managed by git" msgstr "깃으로 관리하지 않은 내용에서 찾습니다" -#: builtin/grep.c:651 +#: builtin/grep.c:977 msgid "search in both tracked and untracked files" msgstr "추적되는 파일과 추적되지 않는 파일 모두에서 검색합니다" -#: builtin/grep.c:653 +#: builtin/grep.c:979 msgid "ignore files specified via '.gitignore'" msgstr "'.gitignore'로 지정한 파일을 무시합니다" -#: builtin/grep.c:656 +#: builtin/grep.c:981 +msgid "recursivley search in each submodule" +msgstr "하위 모듈에 재귀적으로 검색합니다" + +#: builtin/grep.c:983 +msgid "basename" +msgstr "베이스이름" + +#: builtin/grep.c:984 +msgid "prepend parent project's basename to output" +msgstr "프로젝트의 베이스일므을 출력 앞에 붙입니다" + +#: builtin/grep.c:987 msgid "show non-matching lines" msgstr "일치하지 않는 줄을 표시합니다" -#: builtin/grep.c:658 +#: builtin/grep.c:989 msgid "case insensitive matching" -msgstr "대소문자 구별하지 않고 맞춥니다" +msgstr "대소문자 구별하지 않고 비교합니다" -#: builtin/grep.c:660 +#: builtin/grep.c:991 msgid "match patterns only at word boundaries" msgstr "단어 경계 부분에 대해서만 패턴을 맞춥니다" -#: builtin/grep.c:662 +#: builtin/grep.c:993 msgid "process binary files as text" msgstr "바이너리 파일을 텍스트로 처리합니다" -#: builtin/grep.c:664 +#: builtin/grep.c:995 msgid "don't match patterns in binary files" msgstr "바이너리 파일에서 패턴을 맞추지 않습니다" -#: builtin/grep.c:667 +#: builtin/grep.c:998 msgid "process binary files with textconv filters" msgstr "textconv 필터를 사용해 바이너리 파일을 처리합니다" -#: builtin/grep.c:669 +#: builtin/grep.c:1000 msgid "descend at most <depth> levels" msgstr "최대 <깊이> 단계만큼 내려갑니다" -#: builtin/grep.c:673 +#: builtin/grep.c:1004 msgid "use extended POSIX regular expressions" msgstr "POSIX 확장 정규식을 사용합니다" -#: builtin/grep.c:676 +#: builtin/grep.c:1007 msgid "use basic POSIX regular expressions (default)" msgstr "기본 POSIX 정규식을 사용합니다 (기본값)" -#: builtin/grep.c:679 +#: builtin/grep.c:1010 msgid "interpret patterns as fixed strings" msgstr "패턴을 고정 문자열로 해석합니다" -#: builtin/grep.c:682 +#: builtin/grep.c:1013 msgid "use Perl-compatible regular expressions" msgstr "펄과 호환되는 정규식을 사용합니다" -#: builtin/grep.c:685 +#: builtin/grep.c:1016 msgid "show line numbers" msgstr "줄 번호를 표시합니다" -#: builtin/grep.c:686 +#: builtin/grep.c:1017 msgid "don't show filenames" msgstr "파일 이름을 표시하지 않습니다" -#: builtin/grep.c:687 +#: builtin/grep.c:1018 msgid "show filenames" msgstr "파일 이름을 표시합니다" -#: builtin/grep.c:689 +#: builtin/grep.c:1020 msgid "show filenames relative to top directory" msgstr "파일 이름을 최상위 디렉터리 상대 경로로 표시합니다" -#: builtin/grep.c:691 +#: builtin/grep.c:1022 msgid "show only filenames instead of matching lines" msgstr "일치하는 줄을 표시하지 않고 파일 이름만 표시합니다" -#: builtin/grep.c:693 +#: builtin/grep.c:1024 msgid "synonym for --files-with-matches" msgstr "--files-with-matches 옵션과 동일" -#: builtin/grep.c:696 +#: builtin/grep.c:1027 msgid "show only the names of files without match" msgstr "일치하지 않는 파일의 이름만 표시합니다" -#: builtin/grep.c:698 +#: builtin/grep.c:1029 msgid "print NUL after filenames" msgstr "파일 이름 다음에 NUL을 출력합니다" -#: builtin/grep.c:700 +#: builtin/grep.c:1031 msgid "show the number of matches instead of matching lines" msgstr "일치하는 줄을 표시하지 않고 일치하는 수를 표시합니다" -#: builtin/grep.c:701 +#: builtin/grep.c:1032 msgid "highlight matches" msgstr "일치하는 부분을 강조합니다" -#: builtin/grep.c:703 +#: builtin/grep.c:1034 msgid "print empty line between matches from different files" msgstr "다른 파일 사이에 일치하는 부분의 사이에 빈 줄을 출력합니다" -#: builtin/grep.c:705 +#: builtin/grep.c:1036 msgid "show filename only once above matches from same file" msgstr "같은 파일에서 여러 개가 일치하면 파일 이름을 한 번만 표시합니다" -#: builtin/grep.c:708 +#: builtin/grep.c:1039 msgid "show <n> context lines before and after matches" msgstr "일치하는 부분 앞뒤에 컨텍스트를 <n>줄 표시합니다" -#: builtin/grep.c:711 +#: builtin/grep.c:1042 msgid "show <n> context lines before matches" msgstr "일치하는 부분 앞에 컨텍스트를 <n>줄 표시합니다" -#: builtin/grep.c:713 +#: builtin/grep.c:1044 msgid "show <n> context lines after matches" msgstr "일치하는 부분 뒤에 컨텍스트를 <n>줄 표시합니다" -#: builtin/grep.c:715 +#: builtin/grep.c:1046 msgid "use <n> worker threads" msgstr "<n>개의 작업 스레드를 사용합니다" -#: builtin/grep.c:716 +#: builtin/grep.c:1047 msgid "shortcut for -C NUM" msgstr "-C NUM 옵션의 줄임" -#: builtin/grep.c:719 +#: builtin/grep.c:1050 msgid "show a line with the function name before matches" msgstr "일치 항목 앞에 함수 이름 줄을 표시합니다" -#: builtin/grep.c:721 +#: builtin/grep.c:1052 msgid "show the surrounding function" msgstr "들어 있는 함수를 표시합니다" -#: builtin/grep.c:724 +#: builtin/grep.c:1055 msgid "read patterns from file" msgstr "파일에서 패턴을 읽습니다" -#: builtin/grep.c:726 +#: builtin/grep.c:1057 msgid "match <pattern>" msgstr "<패턴>과 일치" -#: builtin/grep.c:728 +#: builtin/grep.c:1059 msgid "combine patterns specified with -e" msgstr "-e 옵션으로 지정한 패턴을 결합합니다" -#: builtin/grep.c:740 +#: builtin/grep.c:1071 msgid "indicate hit with exit status without output" msgstr "출력하지 않고 일치하는 항목을 exit() 상태 번호로 리턴합니다" -#: builtin/grep.c:742 +#: builtin/grep.c:1073 msgid "show only matches from files that match all patterns" msgstr "모든 패턴과 일치하는 파일의 일치하는 부분만 표시합니다" -#: builtin/grep.c:744 +#: builtin/grep.c:1075 msgid "show parse tree for grep expression" msgstr "grep 표현식에 대한 파싱 트리를 표시합니다" -#: builtin/grep.c:748 +#: builtin/grep.c:1079 msgid "pager" msgstr "페이저" -#: builtin/grep.c:748 +#: builtin/grep.c:1079 msgid "show matching files in the pager" msgstr "일치하는 파일을 페이저 프로그램에서 표시합니다" -#: builtin/grep.c:751 +#: builtin/grep.c:1082 msgid "allow calling of grep(1) (ignored by this build)" msgstr "grep(1) 실행을 허용합니다 (이 빌드에서는 무시)" -#: builtin/grep.c:814 +#: builtin/grep.c:1146 msgid "no pattern given." msgstr "패턴을 지정하지 않았습니다." -#: builtin/grep.c:846 builtin/index-pack.c:1480 +#: builtin/grep.c:1178 builtin/index-pack.c:1482 #, c-format msgid "invalid number of threads specified (%d)" msgstr "잘못된 스레드 수를 지정했습니다 (%d)" -#: builtin/grep.c:876 +#: builtin/grep.c:1215 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager 옵션은 작업 폴더에서만 동작합니다" -#: builtin/grep.c:902 +#: builtin/grep.c:1238 +msgid "option not supported with --recurse-submodules." +msgstr "--recurse-submodules와 같이 지원하지 않는 옵션입니다." + +#: builtin/grep.c:1244 msgid "--cached or --untracked cannot be used with --no-index." msgstr "" "--cached 또는 --untracked 옵션은 --no-index 옵션과 같이 쓸 수 없습니다." -#: builtin/grep.c:907 +#: builtin/grep.c:1249 msgid "--no-index or --untracked cannot be used with revs." msgstr "--no-index 또는 --untracked 옵션은 리비전과 같이 쓸 수 없습니다." -#: builtin/grep.c:910 +#: builtin/grep.c:1252 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard 옵션은 추적되는 내용에 대해 쓸 수 없습니다." -#: builtin/grep.c:918 +#: builtin/grep.c:1260 msgid "both --cached and trees are given." msgstr "--cached 옵션과 트리를 모두 지정했습니다." @@ -8195,179 +8606,183 @@ 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:811 builtin/index-pack.c:820 +#: builtin/index-pack.c:813 builtin/index-pack.c:822 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1 충돌이 %s에서 발견되었습니다!" -#: builtin/index-pack.c:751 builtin/pack-objects.c:166 -#: builtin/pack-objects.c:258 +#: builtin/index-pack.c:751 builtin/pack-objects.c:164 +#: builtin/pack-objects.c:256 #, c-format msgid "unable to read %s" msgstr "%s을(를) 읽을 수 없습니다" -#: builtin/index-pack.c:817 +#: builtin/index-pack.c:819 #, c-format msgid "cannot read existing object %s" msgstr "기존 %s 오브젝트를 읽을 수 없습니다" -#: builtin/index-pack.c:831 +#: builtin/index-pack.c:833 #, c-format msgid "invalid blob object %s" msgstr "잘못된 블롭 오브젝트 %s" -#: builtin/index-pack.c:845 +#: builtin/index-pack.c:847 #, c-format msgid "invalid %s" msgstr "잘못된 %s" -#: builtin/index-pack.c:848 +#: builtin/index-pack.c:850 msgid "Error in object" msgstr "오브젝트에 오류" -#: builtin/index-pack.c:850 +#: builtin/index-pack.c:852 #, c-format msgid "Not all child objects of %s are reachable" msgstr "%s의 모든 하위 오브젝트에 접근할 수 없습니다" -#: builtin/index-pack.c:922 builtin/index-pack.c:953 +#: builtin/index-pack.c:924 builtin/index-pack.c:955 msgid "failed to apply delta" msgstr "델타를 적용하는데 실패했습니다" -#: builtin/index-pack.c:1123 +#: builtin/index-pack.c:1125 msgid "Receiving objects" msgstr "오브젝트를 받는 중" -#: builtin/index-pack.c:1123 +#: builtin/index-pack.c:1125 msgid "Indexing objects" msgstr "오브젝트 인덱스를 만드는 중" -#: builtin/index-pack.c:1155 +#: builtin/index-pack.c:1157 msgid "pack is corrupted (SHA1 mismatch)" msgstr "묶음이 손상되었습니다 (SHA1 일치하지 않음)" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1162 msgid "cannot fstat packfile" msgstr "묶음 파일에 대해 fstat()할 수 없습니다" -#: builtin/index-pack.c:1163 +#: builtin/index-pack.c:1165 msgid "pack has junk at the end" msgstr "묶음의 끝에 쓰레기 데이터가 있습니다" -#: builtin/index-pack.c:1174 +#: builtin/index-pack.c:1176 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "parse_pack_objects()에서 극심한 혼란" -#: builtin/index-pack.c:1197 +#: builtin/index-pack.c:1199 msgid "Resolving deltas" msgstr "델타를 알아내는 중" -#: builtin/index-pack.c:1208 +#: builtin/index-pack.c:1210 #, c-format msgid "unable to create thread: %s" msgstr "스레드를 만들 수 없습니다: %s" -#: builtin/index-pack.c:1250 +#: builtin/index-pack.c:1252 msgid "confusion beyond insanity" msgstr "극심한 혼란" -#: builtin/index-pack.c:1256 +#: builtin/index-pack.c:1258 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "로컬 오브젝트 %d개 마침" -#: builtin/index-pack.c:1268 +#: builtin/index-pack.c:1270 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "%s에 대해 예상치 못한 테일 체크섬 (디스크 손상?)" -#: builtin/index-pack.c:1272 +#: builtin/index-pack.c:1274 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "묶음에 알아내지 못한 델타 %d개가 있습니다" -#: builtin/index-pack.c:1296 +#: builtin/index-pack.c:1298 #, c-format msgid "unable to deflate appended object (%d)" msgstr "추가한 오브젝트를 deflate할 수 없습니다 (%d)" -#: builtin/index-pack.c:1372 +#: builtin/index-pack.c:1374 #, c-format msgid "local object %s is corrupt" msgstr "%s 로컬 오브젝트가 손상되었습니다" -#: builtin/index-pack.c:1396 +#: builtin/index-pack.c:1398 msgid "error while closing pack file" msgstr "묶음 파일을 닫는데 오류" -#: builtin/index-pack.c:1409 +#: builtin/index-pack.c:1411 #, c-format msgid "cannot write keep file '%s'" msgstr "'%s' 보존 파일을 쓸 수 없습니다" -#: builtin/index-pack.c:1417 +#: builtin/index-pack.c:1419 #, c-format msgid "cannot close written keep file '%s'" msgstr "쓴 '%s' 보존 파일을 닫지 못했습니다" -#: builtin/index-pack.c:1430 +#: builtin/index-pack.c:1432 msgid "cannot store pack file" msgstr "묶음 파일을 저장할 수 없습니다" -#: builtin/index-pack.c:1441 +#: builtin/index-pack.c:1443 msgid "cannot store index file" msgstr "인덱스 파일을 저장할 수 없습니다" -#: builtin/index-pack.c:1474 +#: builtin/index-pack.c:1476 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "잘못된 pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1484 builtin/index-pack.c:1681 +#: builtin/index-pack.c:1486 builtin/index-pack.c:1683 #, c-format msgid "no threads support, ignoring %s" msgstr "스레드 기능이 없습니다. %s 무시" -#: builtin/index-pack.c:1542 +#: builtin/index-pack.c:1544 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "기존 '%s' 묶음 파일을 열 수 없습니다" -#: builtin/index-pack.c:1544 +#: builtin/index-pack.c:1546 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "'%s'에 대한 기존 묶음 idx 파일을 열 수 없습니다" -#: builtin/index-pack.c:1591 +#: builtin/index-pack.c:1593 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "델타 아님: 오브젝트 %d개" -#: builtin/index-pack.c:1598 +#: builtin/index-pack.c:1600 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "체인 길이 = %d: 오브젝트 %lu개" -#: builtin/index-pack.c:1611 +#: builtin/index-pack.c:1613 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "'%s' 묶음파일 이름이 '.pack'으로 끝나지 않습니다" -#: builtin/index-pack.c:1693 builtin/index-pack.c:1696 -#: builtin/index-pack.c:1712 builtin/index-pack.c:1716 +#: builtin/index-pack.c:1695 builtin/index-pack.c:1698 +#: builtin/index-pack.c:1714 builtin/index-pack.c:1718 #, c-format msgid "bad %s" msgstr "잘못된 %s" -#: builtin/index-pack.c:1732 +#: builtin/index-pack.c:1734 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin 옵션은 --stdin 옵션과 같이 쓸 수 없습니다" -#: builtin/index-pack.c:1740 +#: builtin/index-pack.c:1736 +msgid "--stdin requires a git repository" +msgstr "--stdin 옵션은 깃 저장소가 필요합니다" + +#: builtin/index-pack.c:1744 msgid "--verify with no packfile name given" msgstr "--verify 옵션에 묶음파일 이름을 지정하지 않았습니다" @@ -8615,7 +9030,7 @@ msgstr "출력 디렉터리가 두개?" msgid "Unknown commit %s" msgstr "알 수 없는 커밋 %s" -#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:455 +#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:476 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "'%s'을(를) 올바른 레퍼런스로 알아내는데 실패했습니다." @@ -8999,35 +9414,35 @@ msgstr "레퍼런스와 레퍼런스가 가리키는 오브젝트를 표시합 msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "git ls-tree [<옵션>] <트리-따위> [<경로>...]" -#: builtin/ls-tree.c:128 +#: builtin/ls-tree.c:126 msgid "only show trees" msgstr "트리만 표시" -#: builtin/ls-tree.c:130 +#: builtin/ls-tree.c:128 msgid "recurse into subtrees" msgstr "하위 트리로 재귀적으로 적용" -#: builtin/ls-tree.c:132 +#: builtin/ls-tree.c:130 msgid "show trees when recursing" msgstr "재귀적으로 적용할 때 트리 표시" -#: builtin/ls-tree.c:135 +#: builtin/ls-tree.c:133 msgid "terminate entries with NUL byte" msgstr "항목을 NUL 바이트로 끝냅니다" -#: builtin/ls-tree.c:136 +#: builtin/ls-tree.c:134 msgid "include object size" msgstr "오브젝트 크기 포함" -#: builtin/ls-tree.c:138 builtin/ls-tree.c:140 +#: builtin/ls-tree.c:136 builtin/ls-tree.c:138 msgid "list only filenames" msgstr "파일 이름만 목록 표시" -#: builtin/ls-tree.c:143 +#: builtin/ls-tree.c:141 msgid "use full path names" msgstr "전체 경로 이름 사용" -#: builtin/ls-tree.c:145 +#: builtin/ls-tree.c:143 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "전체 트리 목록 표시, 현재 디렉터리만 아니라 (--full-name 옵션 포함)" @@ -9043,161 +9458,169 @@ msgstr "git merge [<옵션>] <메시지> HEAD <커밋>" msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:102 +#: builtin/merge.c:49 +msgid "git merge --continue" +msgstr "git merge --continue" + +#: builtin/merge.c:104 msgid "switch `m' requires a value" msgstr "`m' 옵션에는 값이 필요합니다" -#: builtin/merge.c:139 +#: builtin/merge.c:141 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "'%s' 병합 전략을 찾을 수 없습니다.\n" -#: builtin/merge.c:140 +#: builtin/merge.c:142 #, c-format msgid "Available strategies are:" msgstr "사용 가능한 전략은:" -#: builtin/merge.c:145 +#: builtin/merge.c:147 #, c-format msgid "Available custom strategies are:" msgstr "사용 가능한 사용자 설정 전략은:" -#: builtin/merge.c:195 builtin/pull.c:127 +#: builtin/merge.c:197 builtin/pull.c:127 msgid "do not show a diffstat at the end of the merge" msgstr "병합이 끝날 때 diffstat을 표시하지 않습니다" -#: builtin/merge.c:198 builtin/pull.c:130 +#: builtin/merge.c:200 builtin/pull.c:130 msgid "show a diffstat at the end of the merge" msgstr "병합이 끝날 때 diffstat을 표시합니다" -#: builtin/merge.c:199 builtin/pull.c:133 +#: builtin/merge.c:201 builtin/pull.c:133 msgid "(synonym to --stat)" msgstr "(--stat 옵션과 동일)" -#: builtin/merge.c:201 builtin/pull.c:136 +#: builtin/merge.c:203 builtin/pull.c:136 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "병합 커밋의 메시지에 shortlog 항목을 (최대 <n>개) 추가합니다" -#: builtin/merge.c:204 builtin/pull.c:139 +#: builtin/merge.c:206 builtin/pull.c:139 msgid "create a single commit instead of doing a merge" msgstr "병합하는 대신 하나의 커밋을 만듭니다" -#: builtin/merge.c:206 builtin/pull.c:142 +#: builtin/merge.c:208 builtin/pull.c:142 msgid "perform a commit if the merge succeeds (default)" msgstr "병합이 성공하면 커밋을 합니다 (기본값)" -#: builtin/merge.c:208 builtin/pull.c:145 +#: builtin/merge.c:210 builtin/pull.c:145 msgid "edit message before committing" msgstr "커밋 전에 메시지를 편집합니다" -#: builtin/merge.c:209 +#: builtin/merge.c:211 msgid "allow fast-forward (default)" msgstr "정방향 진행을 허용합니다 (기본값)" -#: builtin/merge.c:211 builtin/pull.c:151 +#: builtin/merge.c:213 builtin/pull.c:151 msgid "abort if fast-forward is not possible" msgstr "정방향 진행이 불가능하면 중지합니다" -#: builtin/merge.c:215 builtin/pull.c:154 +#: builtin/merge.c:217 builtin/pull.c:154 msgid "verify that the named commit has a valid GPG signature" msgstr "지정한 커밋에 올바른 GPG 서명이 있는지 검증합니다" -#: builtin/merge.c:216 builtin/notes.c:774 builtin/pull.c:158 +#: builtin/merge.c:218 builtin/notes.c:774 builtin/pull.c:158 #: builtin/revert.c:89 msgid "strategy" msgstr "전략" -#: builtin/merge.c:217 builtin/pull.c:159 +#: builtin/merge.c:219 builtin/pull.c:159 msgid "merge strategy to use" msgstr "사용할 병합 전략" -#: builtin/merge.c:218 builtin/pull.c:162 +#: builtin/merge.c:220 builtin/pull.c:162 msgid "option=value" msgstr "옵션=값" -#: builtin/merge.c:219 builtin/pull.c:163 +#: builtin/merge.c:221 builtin/pull.c:163 msgid "option for selected merge strategy" msgstr "선택한 병합 전략에 대한 옵션" -#: builtin/merge.c:221 +#: builtin/merge.c:223 msgid "merge commit message (for a non-fast-forward merge)" msgstr "병합 커밋 메시지 (정방향이 아닌 병합에 대해)" -#: builtin/merge.c:225 +#: builtin/merge.c:227 msgid "abort the current in-progress merge" msgstr "현재 진행 중인 병합을 중지합니다" -#: builtin/merge.c:227 builtin/pull.c:170 +#: builtin/merge.c:229 +msgid "continue the current in-progress merge" +msgstr "현재 진행 중인 병합을 계속합니다" + +#: builtin/merge.c:231 builtin/pull.c:170 msgid "allow merging unrelated histories" msgstr "관계 없는 커밋 내역의 병합을 허용합니다" -#: builtin/merge.c:255 +#: builtin/merge.c:259 msgid "could not run stash." msgstr "stash를 실행할 수 없습니다." -#: builtin/merge.c:260 +#: builtin/merge.c:264 msgid "stash failed" msgstr "스태시 실패" -#: builtin/merge.c:265 +#: builtin/merge.c:269 #, c-format msgid "not a valid object: %s" msgstr "올바른 오브젝트가 아닙니다: %s" -#: builtin/merge.c:284 builtin/merge.c:301 +#: builtin/merge.c:288 builtin/merge.c:305 msgid "read-tree failed" msgstr "read-tree 실패" -#: builtin/merge.c:331 +#: builtin/merge.c:335 msgid " (nothing to squash)" msgstr " (합칠 내용이 없습니다)" -#: builtin/merge.c:342 +#: builtin/merge.c:346 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "커밋 합치기 -- HEAD를 업데이트하지 않습니다\n" -#: builtin/merge.c:392 +#: builtin/merge.c:396 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "병합 메시지가 없습니다 -- HEAD를 업데이트하지 않습니다\n" -#: builtin/merge.c:443 +#: builtin/merge.c:447 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s'이(가) 커밋을 가리키지 않습니다" -#: builtin/merge.c:533 +#: builtin/merge.c:537 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "잘못된 branch.%s.mergeoptions 문자열: %s" -#: builtin/merge.c:652 +#: builtin/merge.c:656 msgid "Not handling anything other than two heads merge." msgstr "두 개의 헤드 병합 외에는 처리하지 않습니다." -#: builtin/merge.c:666 +#: builtin/merge.c:670 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "merge-recursive에 대해 알 수 없는 옵션: -X%s" -#: builtin/merge.c:681 +#: builtin/merge.c:685 #, c-format msgid "unable to write %s" msgstr "%s에 쓸 수 없습니다" -#: builtin/merge.c:733 +#: builtin/merge.c:737 #, c-format msgid "Could not read from '%s'" msgstr "'%s'에서 읽을 수 없습니다" -#: builtin/merge.c:742 +#: builtin/merge.c:746 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "병합을 커밋하지 않습니다. 병합을 마치려면 'git commit'을 사용하십시오.\n" -#: builtin/merge.c:748 +#: builtin/merge.c:752 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -9213,66 +9636,78 @@ msgstr "" "'%c' 문자로 시작하는 줄은 무시되고, 메시지가 비어 있으면 커밋을\n" "중지합니다.\n" -#: builtin/merge.c:772 +#: builtin/merge.c:776 msgid "Empty commit message." msgstr "빈 커밋 메시지." -#: builtin/merge.c:792 +#: builtin/merge.c:796 #, c-format msgid "Wonderful.\n" msgstr "훌륭합니다.\n" -#: builtin/merge.c:847 +#: builtin/merge.c:851 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "자동 병합이 실패했습니다. 충돌을 바로잡고 결과물을 커밋하십시오.\n" -#: builtin/merge.c:863 +#: builtin/merge.c:867 #, c-format msgid "'%s' is not a commit" msgstr "'%s'은(는) 커밋이 아닙니다" -#: builtin/merge.c:904 +#: builtin/merge.c:908 msgid "No current branch." msgstr "현재 브랜치가 없습니다." -#: builtin/merge.c:906 +#: builtin/merge.c:910 msgid "No remote for the current branch." msgstr "현재 브랜치에 대한 리모트가 없습니다." -#: builtin/merge.c:908 +#: builtin/merge.c:912 msgid "No default upstream defined for the current branch." msgstr "현재 브랜치에 대해 기본 업스트림을 지정하지 않았습니다." -#: builtin/merge.c:913 +#: builtin/merge.c:917 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "리모트 %2$s에서 %1$s에 대한 리모트 추적 브랜치가 없습니다" -#: builtin/merge.c:960 +#: builtin/merge.c:964 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "잘못된 값 '%s', 환경 '%s'" -#: builtin/merge.c:1034 +#: builtin/merge.c:1038 #, c-format msgid "could not close '%s'" msgstr "'%s'을(를) 닫을 수 없습니다" -#: builtin/merge.c:1061 +#: builtin/merge.c:1065 #, c-format msgid "not something we can merge in %s: %s" msgstr "%s 안에서 병합할 수 있는 항목이 아닙니다: %s" -#: builtin/merge.c:1095 +#: builtin/merge.c:1099 msgid "not something we can merge" msgstr "병합할 수 있는 항목이 아닙니다" -#: builtin/merge.c:1162 +#: builtin/merge.c:1167 +msgid "--abort expects no arguments" +msgstr "--abort 옵션은 인자를 받지 않습니다" + +#: builtin/merge.c:1171 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "중지할 병합 작업이 없습니다. (MERGE_HEAD가 없음)" -#: builtin/merge.c:1178 +#: builtin/merge.c:1183 +msgid "--continue expects no arguments" +msgstr "--continue 옵션은 인자를 받지 않습니다" + +#: builtin/merge.c:1187 +msgid "There is no merge in progress (MERGE_HEAD missing)." +msgstr "진행 중인 병합 작업이 없습니다. (MERGE_HEAD가 없음)" + +#: builtin/merge.c:1203 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -9280,7 +9715,7 @@ msgstr "" "병합을 마치지 않았습니다. (MERGE_HEAD 있음)\n" "병합하기 전에 변경 사항을 커밋하십시오." -#: builtin/merge.c:1185 +#: builtin/merge.c:1210 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -9288,112 +9723,112 @@ msgstr "" "커밋 빼오기를 마치지 않았습니다. (COMMIT_PICK_HEAD 있음)\n" "병합하기 전에 변경 사항을 커밋하십시오." -#: builtin/merge.c:1188 +#: builtin/merge.c:1213 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "커밋 빼오기를 마치지 않았습니다. (CHERRY_PICK_HEAD 있음)" -#: builtin/merge.c:1197 +#: builtin/merge.c:1222 msgid "You cannot combine --squash with --no-ff." msgstr "--squash 옵션을 --no-ff 옵션과 같이 쓸 수 없습니다." -#: builtin/merge.c:1205 +#: builtin/merge.c:1230 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "커밋을 지정하지 않았고 merge.defaultToUpstream를 설정하지 않았습니다." -#: builtin/merge.c:1222 +#: builtin/merge.c:1247 msgid "Squash commit into empty head not supported yet" msgstr "빈 헤드로 커밋을 합치기는 지원하지 않습니다" -#: builtin/merge.c:1224 +#: builtin/merge.c:1249 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "정방향이 아닌 커밋은 빈 헤드에서는 앞뒤가 맞지 않습니다" -#: builtin/merge.c:1229 +#: builtin/merge.c:1254 #, c-format msgid "%s - not something we can merge" msgstr "%s - 병합할 수 있는 항목이 아닙니다" -#: builtin/merge.c:1231 +#: builtin/merge.c:1256 msgid "Can merge only exactly one commit into empty head" msgstr "빈 헤드에는 정확히 하나의 커밋만 병합할 수 있습니다" -#: builtin/merge.c:1287 +#: builtin/merge.c:1312 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "%s 커밋에 신뢰하지 않는 (서명자가 %s라고 하는) GPG 서명이 있습니다." -#: builtin/merge.c:1290 +#: builtin/merge.c:1315 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "%s 커밋에 잘못된 (서명자가 %s라고 하는) GPG 서명이 있습니다." -#: builtin/merge.c:1293 +#: builtin/merge.c:1318 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "%s 커밋에 GPG 서명이 없습니다." -#: builtin/merge.c:1296 +#: builtin/merge.c:1321 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "%s 커밋에 %s의 올바른 GPG 서명이 없습니다\n" -#: builtin/merge.c:1358 +#: builtin/merge.c:1383 msgid "refusing to merge unrelated histories" msgstr "관계 없는 커밋 내역의 병합을 거부합니다" -#: builtin/merge.c:1367 +#: builtin/merge.c:1392 msgid "Already up-to-date." msgstr "이미 업데이트 상태입니다." -#: builtin/merge.c:1377 +#: builtin/merge.c:1402 #, c-format msgid "Updating %s..%s\n" msgstr "업데이트 중 %s..%s\n" -#: builtin/merge.c:1418 +#: builtin/merge.c:1443 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "아주 간단한 인덱스 내부 병합을 시도합니다...\n" -#: builtin/merge.c:1425 +#: builtin/merge.c:1450 #, c-format msgid "Nope.\n" msgstr "아님.\n" -#: builtin/merge.c:1450 +#: builtin/merge.c:1475 msgid "Already up-to-date. Yeeah!" msgstr "이미 업데이트 상태입니다. 야호!" -#: builtin/merge.c:1456 +#: builtin/merge.c:1481 msgid "Not possible to fast-forward, aborting." msgstr "정방향이 불가능하므로, 중지합니다." -#: builtin/merge.c:1479 builtin/merge.c:1558 +#: builtin/merge.c:1504 builtin/merge.c:1583 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "트리를 본래 위치로 되돌립니다...\n" -#: builtin/merge.c:1483 +#: builtin/merge.c:1508 #, c-format msgid "Trying merge strategy %s...\n" msgstr "병합 전략 %s 시도...\n" -#: builtin/merge.c:1549 +#: builtin/merge.c:1574 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "병합을 처리한 전략이 없습니다.\n" -#: builtin/merge.c:1551 +#: builtin/merge.c:1576 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "전략 %s(으)로 병합이 실패했습니다.\n" -#: builtin/merge.c:1560 +#: builtin/merge.c:1585 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "수동 해결의 준비를 위해 %s 전략을 사용합니다.\n" -#: builtin/merge.c:1572 +#: builtin/merge.c:1597 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "자동 병합이 잘 진행되었습니다. 요청한대로 커밋 전에 중지합니다\n" @@ -9524,94 +9959,94 @@ msgstr "없는 오브젝트를 허용합니다" msgid "allow creation of more than one tree" msgstr "여러개 트리 만들기를 허용합니다" -#: builtin/mv.c:15 +#: builtin/mv.c:16 msgid "git mv [<options>] <source>... <destination>" msgstr "git mv [<옵션>] <원본>... <대상>" -#: builtin/mv.c:70 +#: builtin/mv.c:82 #, c-format msgid "Directory %s is in index and no submodule?" msgstr "%s 디렉터리가 인덱스에 있고 하위 모듈이 없습니다?" -#: builtin/mv.c:72 builtin/rm.c:317 +#: builtin/mv.c:84 builtin/rm.c:290 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "계속하려면 .gitmodules의 변경 사항을 스테이지에 넣거나 스태시 하십시오" -#: builtin/mv.c:90 +#: builtin/mv.c:102 #, c-format msgid "%.*s is in index" msgstr "%.*s이(가) 인덱스에 있습니다" -#: builtin/mv.c:112 +#: builtin/mv.c:124 msgid "force move/rename even if target exists" msgstr "대상이 이미 있어도 강제로 옮기기/이름 바꾸기를 합니다" -#: builtin/mv.c:113 +#: builtin/mv.c:125 msgid "skip move/rename errors" msgstr "옮기기/이름 바꾸기 오류를 건너 뜁니다" -#: builtin/mv.c:155 +#: builtin/mv.c:167 #, c-format msgid "destination '%s' is not a directory" msgstr "대상이 ('%s') 디렉터리가 아닙니다" -#: builtin/mv.c:166 +#: builtin/mv.c:178 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "'%s'을(를) '%s'(으)로 이름 바꾸기합니다\n" -#: builtin/mv.c:170 +#: builtin/mv.c:182 msgid "bad source" msgstr "잘못된 원본" -#: builtin/mv.c:173 +#: builtin/mv.c:185 msgid "can not move directory into itself" msgstr "디렉터리를 자기 자신으로 옮길 수 없습니다" -#: builtin/mv.c:176 +#: builtin/mv.c:188 msgid "cannot move directory over file" msgstr "디렉터리를 파일로 옮길 수 없습니다" -#: builtin/mv.c:185 +#: builtin/mv.c:197 msgid "source directory is empty" msgstr "원본 디렉터리가 비어 있습니다" -#: builtin/mv.c:210 +#: builtin/mv.c:222 msgid "not under version control" msgstr "버전 컨트롤 중이 아닙니다" -#: builtin/mv.c:213 +#: builtin/mv.c:225 msgid "destination exists" msgstr "대상이 있습니다" -#: builtin/mv.c:221 +#: builtin/mv.c:233 #, c-format msgid "overwriting '%s'" msgstr "'%s' 덮어쓰기" -#: builtin/mv.c:224 +#: builtin/mv.c:236 msgid "Cannot overwrite" msgstr "덮어쓸 수 없습니다" -#: builtin/mv.c:227 +#: builtin/mv.c:239 msgid "multiple sources for the same target" msgstr "동일한 대상에 대해 여러 개 원본" -#: builtin/mv.c:229 +#: builtin/mv.c:241 msgid "destination directory does not exist" msgstr "대상 디렉터리가 없습니다" -#: builtin/mv.c:236 +#: builtin/mv.c:248 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, 원본=%s, 대상=%s" -#: builtin/mv.c:257 +#: builtin/mv.c:269 #, c-format msgid "Renaming %s to %s\n" msgstr "이름 바꾸기, '%s'에서 '%s'(으)로\n" -#: builtin/mv.c:263 builtin/remote.c:710 builtin/repack.c:375 +#: builtin/mv.c:275 builtin/remote.c:710 builtin/repack.c:384 #, c-format msgid "renaming '%s' failed" msgstr "'%s'의 이름 바꾸기가 실패했습니다" @@ -9798,12 +10233,12 @@ msgstr "노트 오브젝트를 쓸 수 없습니다" msgid "the note contents have been left in %s" msgstr "노트 내용은 %s에 남습니다" -#: builtin/notes.c:233 builtin/tag.c:439 +#: builtin/notes.c:233 builtin/tag.c:460 #, c-format msgid "cannot read '%s'" msgstr "'%s'을(를) 읽을 수 없습니다" -#: builtin/notes.c:235 builtin/tag.c:442 +#: builtin/notes.c:235 builtin/tag.c:463 #, c-format msgid "could not open or read '%s'" msgstr "'%s'을(를) 열거나 읽을 수 없습니다" @@ -10081,176 +10516,176 @@ msgstr "" "git pack-objects [<옵션>...] <베이스이름> [< <레퍼런스목록> | < <오브젝트목록" ">]" -#: builtin/pack-objects.c:179 builtin/pack-objects.c:182 +#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 #, c-format msgid "deflate error (%d)" msgstr "deflate 오류 (%d)" -#: builtin/pack-objects.c:768 +#: builtin/pack-objects.c:766 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "배트맵 쓰기를 하지 않습니다. 묶음은 pack.packSizeLimit 값에 따라 쪼개집니다" -#: builtin/pack-objects.c:781 +#: builtin/pack-objects.c:779 msgid "Writing objects" msgstr "오브젝트 쓰는 중" -#: builtin/pack-objects.c:1070 +#: builtin/pack-objects.c:1068 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "묶음에 들어있지 않은 오브젝트가 있으므로, 비트맵 쓰기를 하지 않습니다" -#: builtin/pack-objects.c:2346 +#: builtin/pack-objects.c:2344 msgid "Compressing objects" msgstr "오브젝트 압축하는 중" -#: builtin/pack-objects.c:2759 +#: builtin/pack-objects.c:2747 #, c-format msgid "unsupported index version %s" msgstr "지원하지 않는 인덱스 버전 %s" -#: builtin/pack-objects.c:2763 +#: builtin/pack-objects.c:2751 #, c-format msgid "bad index version '%s'" msgstr "잘못된 인덱스 버전 '%s'" -#: builtin/pack-objects.c:2793 +#: builtin/pack-objects.c:2781 msgid "do not show progress meter" msgstr "진행률을 표시하지 않습니다" -#: builtin/pack-objects.c:2795 +#: builtin/pack-objects.c:2783 msgid "show progress meter" msgstr "진행률을 표시합니다" -#: builtin/pack-objects.c:2797 +#: builtin/pack-objects.c:2785 msgid "show progress meter during object writing phase" msgstr "오브젝트 쓰기 단계에서 진행률을 표시합니다" -#: builtin/pack-objects.c:2800 +#: builtin/pack-objects.c:2788 msgid "similar to --all-progress when progress meter is shown" msgstr "진행률이 표시될 때 --all-progress와 비슷합니다" -#: builtin/pack-objects.c:2801 +#: builtin/pack-objects.c:2789 msgid "version[,offset]" msgstr "버전[,오프셋]" -#: builtin/pack-objects.c:2802 +#: builtin/pack-objects.c:2790 msgid "write the pack index file in the specified idx format version" msgstr "지정한 버전의 인덱스 형식에 따라 묶음 인덱스 파일을 씁니다" -#: builtin/pack-objects.c:2805 +#: builtin/pack-objects.c:2793 msgid "maximum size of each output pack file" msgstr "출력 묶음 파일의 최대 크기" -#: builtin/pack-objects.c:2807 +#: builtin/pack-objects.c:2795 msgid "ignore borrowed objects from alternate object store" msgstr "보조 오브젝트 저장소에서 빌려온 오브젝트를 무시합니다" -#: builtin/pack-objects.c:2809 +#: builtin/pack-objects.c:2797 msgid "ignore packed objects" msgstr "묶음 오브젝트를 무시합니다" -#: builtin/pack-objects.c:2811 +#: builtin/pack-objects.c:2799 msgid "limit pack window by objects" msgstr "묶음 윈도우를 오브젝트 단위로 제한합니다" -#: builtin/pack-objects.c:2813 +#: builtin/pack-objects.c:2801 msgid "limit pack window by memory in addition to object limit" msgstr "묶음 윈도우를 오브젝트 단위에 추가로 메모리 단위로 제한합니다" -#: builtin/pack-objects.c:2815 +#: builtin/pack-objects.c:2803 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "결과물 묶음에서 허용되는 최대 길이의 델타 체인" -#: builtin/pack-objects.c:2817 +#: builtin/pack-objects.c:2805 msgid "reuse existing deltas" msgstr "기존 델타를 재사용합니다" -#: builtin/pack-objects.c:2819 +#: builtin/pack-objects.c:2807 msgid "reuse existing objects" msgstr "기존 오브젝트를 재사용합니다" -#: builtin/pack-objects.c:2821 +#: builtin/pack-objects.c:2809 msgid "use OFS_DELTA objects" msgstr "OFS_DELTA 오브젝트를 사용합니다" -#: builtin/pack-objects.c:2823 +#: builtin/pack-objects.c:2811 msgid "use threads when searching for best delta matches" msgstr "최상의 델타 일치를 검색하는데 스레드를 사용합니다" -#: builtin/pack-objects.c:2825 +#: builtin/pack-objects.c:2813 msgid "do not create an empty pack output" msgstr "빈 묶음 출력을 만들지 않습니다" -#: builtin/pack-objects.c:2827 +#: builtin/pack-objects.c:2815 msgid "read revision arguments from standard input" msgstr "표준 입력에서 리비전 인자를 읽습니다" -#: builtin/pack-objects.c:2829 +#: builtin/pack-objects.c:2817 msgid "limit the objects to those that are not yet packed" msgstr "묶지 않는 오브젝트 수를 제한합니다" -#: builtin/pack-objects.c:2832 +#: builtin/pack-objects.c:2820 msgid "include objects reachable from any reference" msgstr "모든 레퍼런스에서 접근 가능한 오브젝트를 포함합니다" -#: builtin/pack-objects.c:2835 +#: builtin/pack-objects.c:2823 msgid "include objects referred by reflog entries" msgstr "reflog 항목에서 레퍼런스할 수 있는 오브젝트를 포함합니다" -#: builtin/pack-objects.c:2838 +#: builtin/pack-objects.c:2826 msgid "include objects referred to by the index" msgstr "인덱스에서< 레퍼런스하는 오브젝트를 포함합니다" -#: builtin/pack-objects.c:2841 +#: builtin/pack-objects.c:2829 msgid "output pack to stdout" msgstr "묶음을 표준 출력으로 출력합니다" -#: builtin/pack-objects.c:2843 +#: builtin/pack-objects.c:2831 msgid "include tag objects that refer to objects to be packed" msgstr "묶음에 들어갈 오브젝트를 레퍼런스하는 태그 오브젝트를 포함합니다" -#: builtin/pack-objects.c:2845 +#: builtin/pack-objects.c:2833 msgid "keep unreachable objects" msgstr "접근 불가능 오브젝트를 보존합니다" -#: builtin/pack-objects.c:2847 +#: builtin/pack-objects.c:2835 msgid "pack loose unreachable objects" msgstr "느슨한 접근 불가능 오브젝트를 묶습니다" -#: builtin/pack-objects.c:2849 +#: builtin/pack-objects.c:2837 msgid "unpack unreachable objects newer than <time>" msgstr "<시각>보다 새로운 접근 불가능 오브젝트의 묶음을 풉니다" -#: builtin/pack-objects.c:2852 +#: builtin/pack-objects.c:2840 msgid "create thin packs" msgstr "얇은 묶음을 만듭니다" -#: builtin/pack-objects.c:2854 +#: builtin/pack-objects.c:2842 msgid "create packs suitable for shallow fetches" msgstr "얕은 가져오기에 적합한 묶음을 만듭니다" -#: builtin/pack-objects.c:2856 +#: builtin/pack-objects.c:2844 msgid "ignore packs that have companion .keep file" msgstr "해당하는 .keep 파일이 있는 묶음을 무시합니다" -#: builtin/pack-objects.c:2858 +#: builtin/pack-objects.c:2846 msgid "pack compression level" msgstr "묶음 압축 단계" # FIXME: graft? -#: builtin/pack-objects.c:2860 +#: builtin/pack-objects.c:2848 msgid "do not hide commits by grafts" msgstr "붙어 있는 커밋을 숨기지 않습니다" -#: builtin/pack-objects.c:2862 +#: builtin/pack-objects.c:2850 msgid "use a bitmap index if available to speed up counting objects" msgstr "가능하면 비트맵 인덱스를 사용해 오브젝트 세기 속도를 높입니다" -#: builtin/pack-objects.c:2864 +#: builtin/pack-objects.c:2852 msgid "write a bitmap index together with the pack index" msgstr "묶음 인덱스와 같이 비트맵 인덱스를 씁니다" -#: builtin/pack-objects.c:2993 +#: builtin/pack-objects.c:2979 msgid "Counting objects" msgstr "오브젝트 개수 세는 중" @@ -10379,7 +10814,7 @@ msgstr "자세한 정보는 git-pull(1) 페이지를 참고하십시오." msgid "<remote>" msgstr "<리모트>" -#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:451 +#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:455 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<브랜치>" @@ -10549,13 +10984,13 @@ msgstr "" "'%s' 브랜치의 업스트림이 아닙니다. 어떤 리모트 브랜치에 무엇을\n" "푸시할지 설정하지 않았습니다." -#: builtin/push.c:242 +#: builtin/push.c:245 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "푸시할 레퍼런스명세를 지정하지 않았고, push.default 값이 'nothing'입니다." -#: builtin/push.c:249 +#: builtin/push.c:252 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -10568,7 +11003,7 @@ msgstr "" "자세한 정보는 'git push --help'의 \"Note about fast-forwards' 부분을\n" "참고하십시오." -#: builtin/push.c:255 +#: builtin/push.c:258 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" @@ -10581,7 +11016,7 @@ msgstr "" "자세한 정보는 'git push --help'의 \"Note about fast-forwards' 부분을\n" "참고하십시오." -#: builtin/push.c:261 +#: builtin/push.c:264 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" @@ -10597,11 +11032,11 @@ msgstr "" "자세한 정보는 'git push --help'의 \"Note about fast-forwards' 부분을\n" "참고하십시오." -#: builtin/push.c:268 +#: builtin/push.c:271 msgid "Updates were rejected because the tag already exists in the remote." msgstr "리모트에 태그가 이미 있기 때문에 업데이트가 거부되었습니다." -#: builtin/push.c:271 +#: builtin/push.c:274 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" @@ -10611,22 +11046,22 @@ msgstr "" "레퍼런스를 업데이트하거나, 커밋이 아닌 오브젝트를 가리키도록\n" "업데이트할 수 없습니다.\n" -#: builtin/push.c:331 +#: builtin/push.c:334 #, c-format msgid "Pushing to %s\n" msgstr "다음에 푸시: %s\n" -#: builtin/push.c:335 +#: builtin/push.c:338 #, c-format msgid "failed to push some refs to '%s'" msgstr "레퍼런스를 '%s'에 푸시하는데 실패했습니다" -#: builtin/push.c:366 +#: builtin/push.c:369 #, c-format msgid "bad repository '%s'" msgstr "잘못된 저장소 '%s'" -#: builtin/push.c:367 +#: builtin/push.c:370 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -10647,112 +11082,112 @@ msgstr "" "\n" " git push <name>\n" -#: builtin/push.c:385 +#: builtin/push.c:388 msgid "--all and --tags are incompatible" msgstr "--all 및 --tags 옵션은 호환되지 않습니다" -#: builtin/push.c:386 +#: builtin/push.c:389 msgid "--all can't be combined with refspecs" msgstr "--all 옵션은 레퍼런스명세와 같이 쓸 수 없습니다" -#: builtin/push.c:391 +#: builtin/push.c:394 msgid "--mirror and --tags are incompatible" msgstr "--mirror 및 --tags 옵션은 호환되지 않습니다" -#: builtin/push.c:392 +#: builtin/push.c:395 msgid "--mirror can't be combined with refspecs" msgstr "--mirror 옵션은 레퍼런스명세와 같이 쓸 수 없습니다" -#: builtin/push.c:397 +#: builtin/push.c:400 msgid "--all and --mirror are incompatible" msgstr "--all 및 --mirror 옵션은 호환되지 않습니다" -#: builtin/push.c:515 +#: builtin/push.c:518 msgid "repository" msgstr "저장소" -#: builtin/push.c:516 builtin/send-pack.c:161 +#: builtin/push.c:519 builtin/send-pack.c:161 msgid "push all refs" msgstr "모든 레퍼런스 푸시하기" -#: builtin/push.c:517 builtin/send-pack.c:163 +#: builtin/push.c:520 builtin/send-pack.c:163 msgid "mirror all refs" msgstr "모든 레퍼런스 미러" -#: builtin/push.c:519 +#: builtin/push.c:522 msgid "delete refs" msgstr "레퍼런스 삭제" -#: builtin/push.c:520 +#: builtin/push.c:523 msgid "push tags (can't be used with --all or --mirror)" msgstr "태그 푸시하기 (--all 또는 --mirror 옵션과 같이 쓸 수 없음)" -#: builtin/push.c:523 builtin/send-pack.c:164 +#: builtin/push.c:526 builtin/send-pack.c:164 msgid "force updates" msgstr "강제로 업데이트" -#: builtin/push.c:525 builtin/send-pack.c:175 +#: builtin/push.c:528 builtin/send-pack.c:175 msgid "refname>:<expect" msgstr "레퍼런스이름>:<예상" -#: builtin/push.c:526 builtin/send-pack.c:176 +#: builtin/push.c:529 builtin/send-pack.c:176 msgid "require old value of ref to be at this value" msgstr "레퍼런스의 과거 값이 이 값이어야 합니다" -#: builtin/push.c:529 +#: builtin/push.c:532 msgid "control recursive pushing of submodules" msgstr "재귀적 하위 모듈 푸시 방식을 설정합니다" -#: builtin/push.c:531 builtin/send-pack.c:169 +#: builtin/push.c:534 builtin/send-pack.c:169 msgid "use thin pack" msgstr "얇은 묶음을 사용합니다" -#: builtin/push.c:532 builtin/push.c:533 builtin/send-pack.c:158 +#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:158 #: builtin/send-pack.c:159 msgid "receive pack program" msgstr "receive pack 프로그램" -#: builtin/push.c:534 +#: builtin/push.c:537 msgid "set upstream for git pull/status" msgstr "git pull/status에 대한 업스트림을 설정합니다" -#: builtin/push.c:537 +#: builtin/push.c:540 msgid "prune locally removed refs" msgstr "로컬에서 제거한 레퍼런스를 잘라냅니다" -#: builtin/push.c:539 +#: builtin/push.c:542 msgid "bypass pre-push hook" msgstr "푸시 전 후크를 건너뜁니다" -#: builtin/push.c:540 +#: builtin/push.c:543 msgid "push missing but relevant tags" msgstr "빠졌지만 관련된 태그를 푸시합니다" -#: builtin/push.c:543 builtin/send-pack.c:166 +#: builtin/push.c:546 builtin/send-pack.c:166 msgid "GPG sign the push" msgstr "푸시에 GPG 서명" -#: builtin/push.c:545 builtin/send-pack.c:170 +#: builtin/push.c:548 builtin/send-pack.c:170 msgid "request atomic transaction on remote side" msgstr "리모트 쪽에 원자 트랜잭션을 요청합니다" -#: builtin/push.c:546 +#: builtin/push.c:549 msgid "server-specific" msgstr "서버-전용-옵션" -#: builtin/push.c:546 +#: builtin/push.c:549 msgid "option to transmit" msgstr "전송할 옵션" -#: builtin/push.c:560 +#: builtin/push.c:563 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete 옵션은 --all, --mirror, --tags 옵션과 호환되지 않습니다" -#: builtin/push.c:562 +#: builtin/push.c:565 msgid "--delete doesn't make sense without any refs" msgstr "--delete 옵션은 레퍼런스 없이 앞뒤가 맞지 않습니다" -#: builtin/push.c:579 +#: builtin/push.c:584 msgid "push options must not have new line characters" msgstr "푸시 옵션에는 줄바꿈 문자가 들어갈 수 없습니다" @@ -10841,8 +11276,8 @@ msgid "" "with what you pushed, and will require 'git reset --hard' to match\n" "the work tree to HEAD.\n" "\n" -"You can set 'receive.denyCurrentBranch' configuration variable to\n" -"'ignore' or 'warn' in the remote repository to allow pushing into\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" @@ -11402,84 +11837,92 @@ msgstr "알 수 없는 하위 명령: %s" msgid "git repack [<options>]" msgstr "git repack [<옵션>]" -#: builtin/repack.c:160 +#: builtin/repack.c:22 +msgid "" +"Incremental repacks are incompatible with bitmap indexes. Use\n" +"--no-write-bitmap-index or disable the pack.writebitmaps configuration." +msgstr "" +"점진적인 repack은 비트맵 인덱스와 호환되지 않습니다.\n" +"--no-write-bitmap-index를 사용하거나 pack.writebitmaps 설정을 끄십시오." + +#: builtin/repack.c:166 msgid "pack everything in a single pack" msgstr "하나의 묶음 안에 모두 묶습니다" -#: builtin/repack.c:162 +#: builtin/repack.c:168 msgid "same as -a, and turn unreachable objects loose" msgstr "-a와 동일하고, 접근 불가능 오브젝트를 느슨하게 바꿉니다" -#: builtin/repack.c:165 +#: builtin/repack.c:171 msgid "remove redundant packs, and run git-prune-packed" msgstr "여분의 묶음을 제거하고, git-prune-packed를 실행합니다" -#: builtin/repack.c:167 +#: builtin/repack.c:173 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "git-pack-objects에 --no-reuse-delta 옵션을 넘깁니다" -#: builtin/repack.c:169 +#: builtin/repack.c:175 msgid "pass --no-reuse-object to git-pack-objects" msgstr "git-pack-objects에 --no-reuse-object 옵션을 넘깁니다" -#: builtin/repack.c:171 +#: builtin/repack.c:177 msgid "do not run git-update-server-info" msgstr "git-update-server-info를 실행하지 않습니다" -#: builtin/repack.c:174 +#: builtin/repack.c:180 msgid "pass --local to git-pack-objects" msgstr "git-pack-objects에 --local 옵션을 넘깁니다" -#: builtin/repack.c:176 +#: builtin/repack.c:182 msgid "write bitmap index" msgstr "비트맵 인덱스를 씁니다" -#: builtin/repack.c:177 +#: builtin/repack.c:183 msgid "approxidate" msgstr "대략의시각" -#: builtin/repack.c:178 +#: builtin/repack.c:184 msgid "with -A, do not loosen objects older than this" msgstr "" "-A에 추가로, 지정한 시각보다 오래된 오브젝트를 느슨하게 만들지 않습니다" -#: builtin/repack.c:180 +#: builtin/repack.c:186 msgid "with -a, repack unreachable objects" msgstr "-a와 같이, 접근 불가능 오브젝트를 다시 묶습니다" -#: builtin/repack.c:182 +#: builtin/repack.c:188 msgid "size of the window used for delta compression" msgstr "델타 압축에 사용할 윈도우 크기" -#: builtin/repack.c:183 builtin/repack.c:187 +#: builtin/repack.c:189 builtin/repack.c:193 msgid "bytes" msgstr "바이트수" -#: builtin/repack.c:184 +#: builtin/repack.c:190 msgid "same as the above, but limit memory size instead of entries count" msgstr "위와 동일하지만, 항목 수 대신 메모리 크기를 제한합니다" -#: builtin/repack.c:186 +#: builtin/repack.c:192 msgid "limits the maximum delta depth" msgstr "최대 델타 깊이를 제한합니다" -#: builtin/repack.c:188 +#: builtin/repack.c:194 msgid "maximum size of each packfile" msgstr "묶음 파일의 최대 크기" -#: builtin/repack.c:190 +#: builtin/repack.c:196 msgid "repack objects in packs marked with .keep" msgstr ".keep으로 표시된 묶음의 오브젝트를 다시 묶습니다" -#: builtin/repack.c:200 +#: builtin/repack.c:206 msgid "cannot delete packs in a precious-objects repo" msgstr "precious-objects 저장소의 묶음을 삭제할 수 없습니다" -#: builtin/repack.c:204 +#: builtin/repack.c:210 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable 및 -A 옵션은 호환되지 않습니다" -#: builtin/repack.c:391 builtin/worktree.c:115 +#: builtin/repack.c:400 builtin/worktree.c:115 #, c-format msgid "failed to remove '%s'" msgstr "'%s' 제거에 실패했습니다" @@ -11709,23 +12152,23 @@ msgstr "새 인덱스 파일을 쓸 수 없습니다." msgid "rev-list does not support display of notes" msgstr "rev-list는 노트 표시를 지원하지 않습니다" -#: builtin/rev-parse.c:386 +#: builtin/rev-parse.c:391 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<옵션>] -- [<인자>...]" -#: builtin/rev-parse.c:391 +#: builtin/rev-parse.c:396 msgid "keep the `--` passed as an arg" msgstr "인자로 넘긴 `--`를 유지합니다" -#: builtin/rev-parse.c:393 +#: builtin/rev-parse.c:398 msgid "stop parsing after the first non-option argument" msgstr "첫번째 옵션이 아닌 인자 뒤에 파싱을 중지합니다" -#: builtin/rev-parse.c:396 +#: builtin/rev-parse.c:401 msgid "output in stuck long form" msgstr "stuck long 형식으로 출력합니다" -#: builtin/rev-parse.c:527 +#: builtin/rev-parse.c:532 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -11826,26 +12269,7 @@ msgstr "cherry-pick 실패" msgid "git rm [<options>] [--] <file>..." msgstr "git rm [<옵션>] [--] <파일>..." -#: builtin/rm.c:65 -msgid "" -"the following submodule (or one of its nested submodules)\n" -"uses a .git directory:" -msgid_plural "" -"the following submodules (or one of their nested submodules)\n" -"use a .git directory:" -msgstr[0] "" -"다음 하위 모듈이 (또는 그 내부 하위 모듈이) .git\n" -"디렉터리를 사용합니다:" - -#: builtin/rm.c:71 -msgid "" -"\n" -"(use 'rm -rf' if you really want to remove it including all of its history)" -msgstr "" -"\n" -"(정말로 그 커밋 내역까지 포함해 제거하려면 'rm -rf'를 사용하십시오)" - -#: builtin/rm.c:230 +#: builtin/rm.c:205 msgid "" "the following file has staged content different from both the\n" "file and the HEAD:" @@ -11856,7 +12280,7 @@ msgstr[0] "" "다음 파일에 파일과 HEAD 모두 다른 스테이징한 내용이\n" "있습니다:" -#: builtin/rm.c:235 +#: builtin/rm.c:210 msgid "" "\n" "(use -f to force removal)" @@ -11864,12 +12288,12 @@ msgstr "" "\n" "(강제로 제거하려면 -f 옵션을 사용하십시오)" -#: builtin/rm.c:239 +#: builtin/rm.c:214 msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" msgstr[0] "다음 파일이 인덱스에 스테이징한 변경 사항이 있습니다:" -#: builtin/rm.c:243 builtin/rm.c:254 +#: builtin/rm.c:218 builtin/rm.c:227 msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" @@ -11877,41 +12301,46 @@ msgstr "" "\n" "(파일을 유지하려면 --cached 옵션, 강제로 제거하려면 -f 옵션을 사용하십시오)" -#: builtin/rm.c:251 +#: builtin/rm.c:224 msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" msgstr[0] "다음 파일에 로컬 수정 사항이 있습니다:" -#: builtin/rm.c:269 +#: builtin/rm.c:242 msgid "do not list removed files" msgstr "제거한 파일 목록을 표시하지 않습니다" -#: builtin/rm.c:270 +#: builtin/rm.c:243 msgid "only remove from the index" msgstr "인덱스에서만 제거합니다" -#: builtin/rm.c:271 +#: builtin/rm.c:244 msgid "override the up-to-date check" msgstr "최신 버전 확인을 하지 않습니다" -#: builtin/rm.c:272 +#: builtin/rm.c:245 msgid "allow recursive removal" msgstr "재귀적 제거를 허용합니다" -#: builtin/rm.c:274 +#: builtin/rm.c:247 msgid "exit with a zero status even if nothing matched" msgstr "아무 것도 일치하지 않으면 상태 0번으로 끝납니다" -#: builtin/rm.c:335 +#: builtin/rm.c:308 #, c-format msgid "not removing '%s' recursively without -r" msgstr "-r 옵션이 없으면 재귀적으로 '%s'을(를) 제거하지 않습니다" -#: builtin/rm.c:374 +#: builtin/rm.c:347 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: %s을(를) 제거할 수 없습니다" +#: builtin/rm.c:370 +#, c-format +msgid "could not remove '%s'" +msgstr "'%s'을(를) 제거할 수 없습니다" + #: builtin/send-pack.c:18 msgid "" "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" @@ -11944,23 +12373,27 @@ msgstr "리모트 도움 프로그램의 상태를 표시합니다" msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" msgstr "git shortlog [<옵션>] [<리비전-범위>] [[--] [<경로>...]]" -#: builtin/shortlog.c:242 +#: builtin/shortlog.c:249 +msgid "Group by committer rather than author" +msgstr "작성자가 아닌 커미터로 묶습니다" + +#: builtin/shortlog.c:251 msgid "sort output according to the number of commits per author" msgstr "작성자별 커밋 수에 따라 정렬합니다" -#: builtin/shortlog.c:244 +#: builtin/shortlog.c:253 msgid "Suppress commit descriptions, only provides commit count" msgstr "커밋 설명을 생략하고, 커밋 수만 표시합니다" -#: builtin/shortlog.c:246 +#: builtin/shortlog.c:255 msgid "Show the email address of each author" msgstr "작성자의 전자메일 주소를 표시합니다" -#: builtin/shortlog.c:247 +#: builtin/shortlog.c:256 msgid "w[,i1[,i2]]" msgstr "w[,i1[,i2]]" -#: builtin/shortlog.c:248 +#: builtin/shortlog.c:257 msgid "Linewrap output" msgstr "줄바꿈 출력" @@ -12109,35 +12542,35 @@ msgstr "" msgid "git show-ref --exclude-existing[=<pattern>]" msgstr "git show-ref --exclude-existing[=<패턴>]" -#: builtin/show-ref.c:165 +#: builtin/show-ref.c:159 msgid "only show tags (can be combined with heads)" msgstr "태그만 표시 (헤드와 결합 가능)" -#: builtin/show-ref.c:166 +#: builtin/show-ref.c:160 msgid "only show heads (can be combined with tags)" msgstr "헤드만 표시 (태그와 결합 가능)" -#: builtin/show-ref.c:167 +#: builtin/show-ref.c:161 msgid "stricter reference checking, requires exact ref path" msgstr "더 엄격한 레퍼런스 검사, 정확히 하나의 레퍼런스 경로 필요" -#: builtin/show-ref.c:170 builtin/show-ref.c:172 +#: builtin/show-ref.c:164 builtin/show-ref.c:166 msgid "show the HEAD reference, even if it would be filtered out" msgstr "HEAD 레퍼런스를 표시합니다 (필터링되서 제외되더라도)" -#: builtin/show-ref.c:174 +#: builtin/show-ref.c:168 msgid "dereference tags into object IDs" msgstr "태그를 오브젝트 ID로 따라갑니다" -#: builtin/show-ref.c:176 +#: builtin/show-ref.c:170 msgid "only show SHA1 hash using <n> digits" msgstr "SHA-1 표시에 <n>개의 숫자만 사용합니다" -#: builtin/show-ref.c:180 +#: builtin/show-ref.c:174 msgid "do not print results to stdout (useful with --verify)" msgstr "표준 출력에 결과를 표시하지 않습니다 (--verify 옵션과 사용하면 좋음)" -#: builtin/show-ref.c:182 +#: builtin/show-ref.c:176 msgid "show refs from stdin that aren't in local repository" msgstr "로컬 저장소에 없는 레퍼런스를 표준 입력에서 읽어 표시합니다" @@ -12157,12 +12590,12 @@ msgstr "주석 문자로 시작하는 모든 줄을 건너뛰고 제거합니다 msgid "prepend comment character and space to each line" msgstr "각 줄의 앞에 주석 문자와 공백을 붙입니다" -#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1046 +#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1062 #, c-format msgid "No such ref: %s" msgstr "그런 레퍼런스가 없습니다: %s" -#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1055 +#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1071 #, c-format msgid "Expecting a full ref name, got %s" msgstr "전체 레퍼런스 이름이 필요하지만, 입력은 %s" @@ -12172,8 +12605,7 @@ msgstr "전체 레퍼런스 이름이 필요하지만, 입력은 %s" msgid "cannot strip one component off url '%s'" msgstr "'%s' URL 하나의 단계를 잘라낼 수 없습니다" -#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:408 -#: builtin/submodule--helper.c:590 +#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:592 msgid "alternative anchor for relative paths" msgstr "상대 경로에 사용할 또다른 기준" @@ -12181,84 +12613,84 @@ msgstr "상대 경로에 사용할 또다른 기준" msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<경로>] [<경로>...]" -#: builtin/submodule--helper.c:329 builtin/submodule--helper.c:343 +#: builtin/submodule--helper.c:333 builtin/submodule--helper.c:347 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr ".gitmodules에서 하위 모듈 경로 '%s'에 대한 URL이 없습니다" -#: builtin/submodule--helper.c:369 +#: builtin/submodule--helper.c:373 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "하위 모듈 경로 '%s'에 대한 URL을 등록하는데 실패했습니다" -#: builtin/submodule--helper.c:373 +#: builtin/submodule--helper.c:377 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "'%3$s' 경로에 대해 '%1$s' (%2$s) 하위 모듈 등록\n" -#: builtin/submodule--helper.c:383 +#: builtin/submodule--helper.c:387 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "경고: '%s' 하위 모듈에 대해 커맨드 업데이트 모드가 제안되었습니다\n" -#: builtin/submodule--helper.c:390 +#: builtin/submodule--helper.c:394 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "'%s' 하위 모듈에 대해 업데이트 모드 등록이 실패했습니다" -#: builtin/submodule--helper.c:409 +#: builtin/submodule--helper.c:410 msgid "Suppress output for initializing a submodule" msgstr "하위 모듈 초기화에 출력을 하지 않습니다" -#: builtin/submodule--helper.c:414 +#: builtin/submodule--helper.c:415 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper init [<경로>]" -#: builtin/submodule--helper.c:435 +#: builtin/submodule--helper.c:436 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <경로>" -#: builtin/submodule--helper.c:441 +#: builtin/submodule--helper.c:442 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "경로 '%s'에 대해 .gitmodules에 있는 하위모듈 매핑이 없습니다" -#: builtin/submodule--helper.c:524 builtin/submodule--helper.c:527 +#: builtin/submodule--helper.c:525 builtin/submodule--helper.c:528 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "'%s' 하위 모듈에 보조 오브젝트를 추가할 수 없습니다: %s" -#: builtin/submodule--helper.c:563 +#: builtin/submodule--helper.c:564 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "submodule.alternateErrorStrategy에 대한 값이('%s') 알 수 없는 값입니다" -#: builtin/submodule--helper.c:570 +#: builtin/submodule--helper.c:571 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "submodule.alternateLocation에 대한 값이('%s') 알 수 없는 값입니다" -#: builtin/submodule--helper.c:593 +#: builtin/submodule--helper.c:595 msgid "where the new submodule will be cloned to" msgstr "새 하위 모듈을 복제할 대상 위치" -#: builtin/submodule--helper.c:596 +#: builtin/submodule--helper.c:598 msgid "name of the new submodule" msgstr "새 하위 모듈 이름" -#: builtin/submodule--helper.c:599 +#: builtin/submodule--helper.c:601 msgid "url where to clone the submodule from" msgstr "하위 모듈을 복제해 올 URL" -#: builtin/submodule--helper.c:605 +#: builtin/submodule--helper.c:607 msgid "depth for shallow clones" msgstr "얕은 복제에 사용할 깊이" -#: builtin/submodule--helper.c:608 builtin/submodule--helper.c:964 +#: builtin/submodule--helper.c:610 builtin/submodule--helper.c:980 msgid "force cloning progress" msgstr "복제 진행 상황을 항상 표시합니다" -#: builtin/submodule--helper.c:613 +#: builtin/submodule--helper.c:615 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -12266,97 +12698,92 @@ msgstr "" "git submodule--helper clone [--prefix=<경로>] [--quiet] [--reference <저장소" ">] [--name <이름>] [--depth <깊이>] --url <url> --path <경로>" -#: builtin/submodule--helper.c:638 builtin/submodule--helper.c:648 -#, c-format -msgid "could not create directory '%s'" -msgstr "'%s' 디렉터리를 만들 수 없습니다" - -#: builtin/submodule--helper.c:644 +#: builtin/submodule--helper.c:646 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "'%s'에서 하위 모듈 경로 '%s'에 복제하는데 실패했습니다" -#: builtin/submodule--helper.c:660 +#: builtin/submodule--helper.c:662 #, c-format msgid "cannot open file '%s'" msgstr "'%s' 파일을 열 수 없습니다" -#: builtin/submodule--helper.c:665 +#: builtin/submodule--helper.c:667 #, c-format msgid "could not close file %s" msgstr "%s 파일을 닫을 수 없습니다" -#: builtin/submodule--helper.c:672 +#: builtin/submodule--helper.c:674 #, c-format msgid "could not get submodule directory for '%s'" msgstr "'%s'에 대한 하위 모듈 디렉터리를 가져올 수 없습니다" -#: builtin/submodule--helper.c:726 +#: builtin/submodule--helper.c:742 #, c-format msgid "Submodule path '%s' not initialized" msgstr "'%s' 하위 모듈 경로가 초기화되지 않았습니다" -#: builtin/submodule--helper.c:730 +#: builtin/submodule--helper.c:746 msgid "Maybe you want to use 'update --init'?" msgstr "'update --init'을 하려고 한 것 아니었습니까?" -#: builtin/submodule--helper.c:756 +#: builtin/submodule--helper.c:772 #, c-format msgid "Skipping unmerged submodule %s" msgstr "병합하지 하위 모듈 %s 건너뜀" -#: builtin/submodule--helper.c:777 +#: builtin/submodule--helper.c:793 #, c-format msgid "Skipping submodule '%s'" msgstr "하위 모듈 '%s' 건너뜀" -#: builtin/submodule--helper.c:913 +#: builtin/submodule--helper.c:929 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "'%s' 복제하는데 실패했습니다. 재시도 예정" -#: builtin/submodule--helper.c:924 +#: builtin/submodule--helper.c:940 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "두번째 '%s' 복제하는데 실패했습니다. 중지합니다" -#: builtin/submodule--helper.c:945 +#: builtin/submodule--helper.c:961 builtin/submodule--helper.c:1105 msgid "path into the working tree" msgstr "작업 폴더로 가는 경로" -#: builtin/submodule--helper.c:948 +#: builtin/submodule--helper.c:964 msgid "path into the working tree, across nested submodule boundaries" msgstr "작업 폴더로 가는 경로, 내장된 하위 모듈의 경계 통과" -#: builtin/submodule--helper.c:952 +#: builtin/submodule--helper.c:968 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout 또는 none" -#: builtin/submodule--helper.c:956 +#: builtin/submodule--helper.c:972 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "지정한 개수의 리비전에서 잘린 얕은 복제를 만듭니다" -#: builtin/submodule--helper.c:959 +#: builtin/submodule--helper.c:975 msgid "parallel jobs" msgstr "병렬 작업 개수" -#: builtin/submodule--helper.c:961 +#: builtin/submodule--helper.c:977 msgid "whether the initial clone should follow the shallow recommendation" msgstr "최초 복제가 얕은 복제 추천을 따를지 여부" -#: builtin/submodule--helper.c:962 +#: builtin/submodule--helper.c:978 msgid "don't print cloning progress" msgstr "복제 과정을 표시하지 않습니다" -#: builtin/submodule--helper.c:969 +#: builtin/submodule--helper.c:985 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update_clone [--prefix=<경로>] [<경로>...]" -#: builtin/submodule--helper.c:979 +#: builtin/submodule--helper.c:995 msgid "bad value for update parameter" msgstr "파라미터 업데이트에 값이 잘못되었습니다" -#: builtin/submodule--helper.c:1050 +#: builtin/submodule--helper.c:1066 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -12365,11 +12792,24 @@ msgstr "" "하위 모듈 (%s) 브랜치가 상위 프로젝트 브랜치를 이어받도록 설정되었지만, 상위 " "프로젝트에 브랜치가 없습니다" -#: builtin/submodule--helper.c:1100 +#: builtin/submodule--helper.c:1106 +msgid "recurse into submodules" +msgstr "하위 모듈에 재귀적으로 적용" + +#: builtin/submodule--helper.c:1112 +msgid "git submodule--helper embed-git-dir [<path>...]" +msgstr "git submodule--helper embed-git-dir [<경로>...]" + +#: builtin/submodule--helper.c:1157 msgid "submodule--helper subcommand must be called with a subcommand" msgstr "submodule--helper 하위 명령은 하위 명령으로 호출해야 합니다" -#: builtin/submodule--helper.c:1107 +#: builtin/submodule--helper.c:1164 +#, c-format +msgid "%s doesn't support --super-prefix" +msgstr "%s에서 --super-prefix 옵션을 지원하지 않습니다" + +#: builtin/submodule--helper.c:1170 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s'은(는) 올바른 submodule--helper 하위 명령이 아닙니다" @@ -12423,25 +12863,25 @@ msgstr "" "\t\t[--format=<형식>] [--[no-]merged [<커밋>]] [<패턴>...]" #: builtin/tag.c:27 -msgid "git tag -v <tagname>..." -msgstr "git tag -v <태그이름>..." +msgid "git tag -v [--format=<format>] <tagname>..." +msgstr "git tag -v [--format=<형식>] <태그이름>..." -#: builtin/tag.c:81 +#: builtin/tag.c:82 #, c-format msgid "tag name too long: %.*s..." msgstr "태그 이름이 너무 깁니다: %.*s..." -#: builtin/tag.c:86 +#: builtin/tag.c:87 #, c-format msgid "tag '%s' not found." msgstr "'%s' 태그가 없습니다." -#: builtin/tag.c:101 +#: builtin/tag.c:102 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "'%s' 태그 삭제함 (과거 %s)\n" -#: builtin/tag.c:117 +#: builtin/tag.c:131 #, c-format msgid "" "\n" @@ -12454,7 +12894,7 @@ msgstr "" " %s\n" "'%c' 문자로 시작하는 줄은 무시됩니다.\n" -#: builtin/tag.c:121 +#: builtin/tag.c:135 #, c-format msgid "" "\n" @@ -12468,138 +12908,138 @@ msgstr "" " %s\n" "'%c' 문자로 시작하는 줄은 유지됩니다. 제거하려면 직접 지워야 합니다.\n" -#: builtin/tag.c:199 +#: builtin/tag.c:213 msgid "unable to sign the tag" msgstr "태그에 서명할 수 없습니다" -#: builtin/tag.c:201 +#: builtin/tag.c:215 msgid "unable to write tag file" msgstr "태그 파일을 쓸 수 없습니다" -#: builtin/tag.c:226 +#: builtin/tag.c:240 msgid "bad object type." msgstr "잘못된 오브젝트 종류." -#: builtin/tag.c:239 +#: builtin/tag.c:253 msgid "tag header too big." msgstr "태그 헤더가 너무 큽니다." -#: builtin/tag.c:275 +#: builtin/tag.c:289 msgid "no tag message?" msgstr "태그 메시지 없음?" -#: builtin/tag.c:281 +#: builtin/tag.c:295 #, c-format msgid "The tag message has been left in %s\n" msgstr "태그 메시지가 %s 파일에 남아 있습니다\n" -#: builtin/tag.c:339 +#: builtin/tag.c:354 msgid "list tag names" msgstr "태그 이름 목록을 표시합니다" -#: builtin/tag.c:341 +#: builtin/tag.c:356 msgid "print <n> lines of each tag message" msgstr "각 태그 메시지의 <n>줄을 표시합니다" -#: builtin/tag.c:343 +#: builtin/tag.c:358 msgid "delete tags" msgstr "태그를 삭제합니다" -#: builtin/tag.c:344 +#: builtin/tag.c:359 msgid "verify tags" msgstr "태그를 검증합니다" -#: builtin/tag.c:346 +#: builtin/tag.c:361 msgid "Tag creation options" msgstr "태그 만들기 옵션" -#: builtin/tag.c:348 +#: builtin/tag.c:363 msgid "annotated tag, needs a message" msgstr "주석 달린 태그, 메시지가 필요합니다" -#: builtin/tag.c:350 +#: builtin/tag.c:365 msgid "tag message" msgstr "태그 메시지" -#: builtin/tag.c:352 +#: builtin/tag.c:367 msgid "annotated and GPG-signed tag" msgstr "주석 달리고 GPG 서명한 태그" -#: builtin/tag.c:356 +#: builtin/tag.c:371 msgid "use another key to sign the tag" msgstr "태그를 서명하는데 지정한 키를 사용합니다" -#: builtin/tag.c:357 +#: builtin/tag.c:372 msgid "replace the tag if exists" msgstr "태그가 있으면 바꿉니다" -#: builtin/tag.c:358 builtin/update-ref.c:368 +#: builtin/tag.c:373 builtin/update-ref.c:368 msgid "create a reflog" msgstr "reflog를 만듭니다" -#: builtin/tag.c:360 +#: builtin/tag.c:375 msgid "Tag listing options" msgstr "태그 목록 보기 옵션" -#: builtin/tag.c:361 +#: builtin/tag.c:376 msgid "show tag list in columns" msgstr "태그 목록을 여러 열로 표시합니다" -#: builtin/tag.c:362 builtin/tag.c:363 +#: builtin/tag.c:377 builtin/tag.c:378 msgid "print only tags that contain the commit" msgstr "해당 커밋이 들어 있는 태그만 표시합니다" -#: builtin/tag.c:364 +#: builtin/tag.c:379 msgid "print only tags that are merged" msgstr "병합된 태그만 표시합니다" -#: builtin/tag.c:365 +#: builtin/tag.c:380 msgid "print only tags that are not merged" msgstr "병합되지 않은 태그만 표시합니다" -#: builtin/tag.c:370 +#: builtin/tag.c:385 msgid "print only tags of the object" msgstr "해당 오브젝트의 태그만 표시합니다" -#: builtin/tag.c:399 +#: builtin/tag.c:415 msgid "--column and -n are incompatible" msgstr "--column 및 -n 옵션은 호환되지 않습니다" -#: builtin/tag.c:419 +#: builtin/tag.c:437 msgid "-n option is only allowed with -l." msgstr "-n 옵션은 -l 옵션과 같이 써야 합니다." -#: builtin/tag.c:421 +#: builtin/tag.c:439 msgid "--contains option is only allowed with -l." msgstr "--contains 옵션은 -l 옵션과 같이 써야 합니다." -#: builtin/tag.c:423 +#: builtin/tag.c:441 msgid "--points-at option is only allowed with -l." msgstr "--points-at 옵션은 -l 옵션과 같이 써야 합니다." -#: builtin/tag.c:425 +#: builtin/tag.c:443 msgid "--merged and --no-merged option are only allowed with -l" msgstr "--merged 및 --no-merged 옵션은 -l 옵션과 같이 써야 합니다." -#: builtin/tag.c:433 +#: builtin/tag.c:454 msgid "only one -F or -m option is allowed." msgstr "하나의 -F 또는 -m 옵션만 쓸 수 있습니다." -#: builtin/tag.c:452 +#: builtin/tag.c:473 msgid "too many params" msgstr "파라미터가 너무 많습니다" -#: builtin/tag.c:458 +#: builtin/tag.c:479 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s'은(는) 올바른 태그 이름이 아닙니다." -#: builtin/tag.c:463 +#: builtin/tag.c:484 #, c-format msgid "tag '%s' already exists" msgstr "태그 '%s'이(가) 이미 있습니다" -#: builtin/tag.c:491 +#: builtin/tag.c:512 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "태그 '%s' 업데이트 (과거 %s)\n" @@ -12787,7 +13227,7 @@ msgstr "파일 시스템이 추적하지 않는 캐시를 지원하는지 검사 msgid "enable untracked cache without testing the filesystem" msgstr "파일 시스템 시험 없이 추적하지 않는 캐시를 사용합니다" -#: builtin/update-index.c:1119 +#: builtin/update-index.c:1120 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -12795,11 +13235,11 @@ msgstr "" "core.untrackedCache값이 참입니다. 정말로 추적하지 않는 파일 캐시를 사용하지 " "않으려면 이 값을 제거하거나 바꾸십시오." -#: builtin/update-index.c:1123 +#: builtin/update-index.c:1124 msgid "Untracked cache disabled" msgstr "추적되지 않는 파일 캐시를 사용하지 않습니다" -#: builtin/update-index.c:1131 +#: builtin/update-index.c:1132 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -12807,7 +13247,7 @@ msgstr "" "core.untrackedCache값이 거짓입니다. 정말로 추적하지 않는 파일 캐시를 사용하려" "면 이 값을 제거하거나 바꾸십시오." -#: builtin/update-index.c:1135 +#: builtin/update-index.c:1136 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "'%s'에 대해 추적되지 않는 캐시를 사용하지 않습니다" @@ -12856,7 +13296,7 @@ msgstr "git verify-commit [-v | --verbose] <커밋>..." msgid "print commit contents" msgstr "커밋 내용을 표시합니다" -#: builtin/verify-commit.c:73 builtin/verify-tag.c:35 +#: builtin/verify-commit.c:73 builtin/verify-tag.c:37 msgid "print raw gpg status output" msgstr "원본 GPG 상태를 출력합니다" @@ -12872,11 +13312,11 @@ msgstr "자세히 표시" msgid "show statistics only" msgstr "통계만 표시" -#: builtin/verify-tag.c:17 -msgid "git verify-tag [-v | --verbose] <tag>..." -msgstr "git verify-tag [-v | --verbose] <태그>..." +#: builtin/verify-tag.c:18 +msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." +msgstr "git verify-tag [-v | --verbose] [--format=<형식>] <태그>..." -#: builtin/verify-tag.c:34 +#: builtin/verify-tag.c:36 msgid "print tag contents" msgstr "태그 내용 표시" @@ -12960,30 +13400,30 @@ msgstr "새 작업 폴더를 만듭니다" msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B, --detach 옵션 중 하나만 쓸 수 있습니다" -#: builtin/worktree.c:470 +#: builtin/worktree.c:472 msgid "reason for locking" msgstr "잠그는 이유" -#: builtin/worktree.c:482 builtin/worktree.c:515 +#: builtin/worktree.c:484 builtin/worktree.c:517 #, c-format msgid "'%s' is not a working tree" msgstr "'%s'은(는) 작업 폴더가 아닙니다" -#: builtin/worktree.c:484 builtin/worktree.c:517 +#: builtin/worktree.c:486 builtin/worktree.c:519 msgid "The main working tree cannot be locked or unlocked" msgstr "메인 작업 폴더를 잠그거나 잠금 해제할 수 없습니다" -#: builtin/worktree.c:489 +#: builtin/worktree.c:491 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s'은(는) 이미 잠겼습니다. 이유: %s" -#: builtin/worktree.c:491 +#: builtin/worktree.c:493 #, c-format msgid "'%s' is already locked" msgstr "'%s'은(는) 이미 잠겼습니다" -#: builtin/worktree.c:519 +#: builtin/worktree.c:521 #, c-format msgid "'%s' is not locked" msgstr "'%s'은(는) 잠기지 않았습니다" @@ -13008,20 +13448,20 @@ msgstr "디버깅 용도로만 사용" msgid "git upload-pack [<options>] <dir>" msgstr "git upload-pack [<옵션>] <디렉터리>" -#: upload-pack.c:1028 +#: upload-pack.c:1036 msgid "quit after a single request/response exchange" msgstr "하나의 요청/응답 교환 뒤에 끝납니다" -#: upload-pack.c:1030 +#: upload-pack.c:1038 msgid "exit immediately after initial ref advertisement" msgstr "최초 레퍼런스 알림 뒤에 즉시 끝납니다" -#: upload-pack.c:1032 +#: upload-pack.c:1040 msgid "do not try <directory>/.git/ if <directory> is no Git directory" msgstr "" "<디렉터리>가 깃 디렉터리가 아니면 <디렉터리>/.git/ 폴더를 시도하지 않습니다." -#: upload-pack.c:1034 +#: upload-pack.c:1042 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "<n>초 동안 반응이 없으면 전송을 중지합니다" @@ -13053,14 +13493,30 @@ msgstr "" "<명령>' 또는 'git help <개념>' 명령을 실행하십시오." # HTTP delegation -#: http.c:342 +#: http.c:344 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "딜리게이션 컨트롤은 cURL 7.44.0 앞 버전에서는 지원하지 않습니다" -#: http.c:351 +#: http.c:353 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "공개 키 고정은 cURL 7.44.0 앞 버전에서는 지원하지 않습니다" +#: http.c:1713 +#, c-format +msgid "" +"unable to update url base from redirection:\n" +" asked for: %s\n" +" redirect: %s" +msgstr "" +"리다이렉션에서 URL 베이스를 업데이트할 수 없습니다:\n" +" 요청: %s\n" +" 리다이렉트: %s" + +#: remote-curl.c:319 +#, c-format +msgid "redirecting to %s" +msgstr "%s(으)로 리다이렉트" + #: common-cmds.h:9 msgid "start a working area (see also: git help tutorial)" msgstr "작업 공간 시작 (참고: git help tutorial)" @@ -13424,7 +13880,7 @@ msgstr "$pretty_name에 간단한 병합 시도합니다" msgid "Simple merge did not work, trying automatic merge." msgstr "간단한 병합이 동작하지 않습니다. 자동 병합을 시도합니다." -#: git-rebase.sh:56 +#: git-rebase.sh:57 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" @@ -13436,51 +13892,37 @@ msgstr "" "원래 브랜치를 체크아웃하고 리베이스를 중지하려면, \"git rebase --abort\"를 실" "행하십시오." -#: git-rebase.sh:156 git-rebase.sh:395 +#: git-rebase.sh:157 git-rebase.sh:396 #, sh-format msgid "Could not move back to $head_name" msgstr "'$head_name' 위치로 돌아갈 수 없습니다" -#: git-rebase.sh:167 -msgid "Applied autostash." -msgstr "자동스태시 적용." - -#: git-rebase.sh:170 +#: git-rebase.sh:171 #, sh-format msgid "Cannot store $stash_sha1" msgstr "\"$stash_sha1\"을(를) 저장할 수 없습니다" -#: git-rebase.sh:171 -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 "" -"자동스태시 적용에 충돌이 발생했습니다.\n" -"변경 사항은 스태시 안에 안전하게 들어 있습니다.\n" -"언제든지 \"git stash pop\" 또는 \"git stash drop\"을 실행할 수 있습니다.\n" - -#: git-rebase.sh:210 +#: git-rebase.sh:211 msgid "The pre-rebase hook refused to rebase." msgstr "리베이스 전 후크에서 리베이스를 거부했습니다." -#: git-rebase.sh:215 +#: git-rebase.sh:216 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "git-am이 진행 중인 것처럼 보입니다. 리베이스할 수 없습니다." -#: git-rebase.sh:356 +#: git-rebase.sh:357 msgid "No rebase in progress?" msgstr "리베이스가 진행 중이지 않습니다" -#: git-rebase.sh:367 +#: git-rebase.sh:368 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "--edit-todo 동작은 대화형 리베이스에서만 사용할 수 있습니다." -#: git-rebase.sh:374 +#: git-rebase.sh:375 msgid "Cannot read HEAD" msgstr "HEAD를 읽을 수 없습니다" -#: git-rebase.sh:377 +#: git-rebase.sh:378 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -13488,7 +13930,7 @@ msgstr "" "모든 병합 충돌을 편집하고 git add\n" "명령으로 해결되었다고 표시해야 합니다" -#: git-rebase.sh:414 +#: git-rebase.sh:418 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -13509,64 +13951,64 @@ msgstr "" "이 명령을 다시 실행하십시오. 중요한 사항이 남아 있을 경우를\n" "대비해 여기서 멈춥니다." -#: git-rebase.sh:465 +#: git-rebase.sh:469 #, sh-format msgid "invalid upstream $upstream_name" msgstr "잘못된 업스트림 $upstream_name" -#: git-rebase.sh:489 +#: git-rebase.sh:493 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: 여러 개의 병합 베이스가 있습니다" -#: git-rebase.sh:492 git-rebase.sh:496 +#: git-rebase.sh:496 git-rebase.sh:500 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: 병합 베이스가 없습니다" -#: git-rebase.sh:501 +#: git-rebase.sh:505 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "올바른 커밋을 가리키지 않습니다: $onto_name" -#: git-rebase.sh:524 +#: git-rebase.sh:528 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "치명적 이상: 그런 브랜치가 없습니다: $branch_name" -#: git-rebase.sh:557 +#: git-rebase.sh:561 msgid "Cannot autostash" msgstr "자동 스태시를 할 수 없습니다" -#: git-rebase.sh:562 +#: git-rebase.sh:566 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "자동 스태시를 만들었습니다: $stash_abbrev" -#: git-rebase.sh:566 +#: git-rebase.sh:570 msgid "Please commit or stash them." msgstr "커밋하거나 스태시에 넣으십시오." -#: git-rebase.sh:586 +#: git-rebase.sh:590 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "현재 브랜치가 ($branch_name) 최신 상태입니다." -#: git-rebase.sh:590 +#: git-rebase.sh:594 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "현재 브랜치가 ($branch_name) 최신 상태입니다. 강제 리베이스합니다." -#: git-rebase.sh:601 +#: git-rebase.sh:605 #, sh-format msgid "Changes from $mb to $onto:" msgstr "변경 사항 '$mb'에서 '$onto'(으)로:" -#: git-rebase.sh:610 +#: git-rebase.sh:614 msgid "First, rewinding head to replay your work on top of it..." msgstr "작업 사항을 다시 넣기 위해 먼저 헤드를 뒤로 돌립니다..." -#: git-rebase.sh:620 +#: git-rebase.sh:624 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "$branch_name 브랜치를 $onto_name 위치로 정방향 진행합니다." @@ -13732,21 +14174,26 @@ msgstr "브랜치 이름을 지정하지 않았습니다" msgid "(To restore them type \"git stash apply\")" msgstr "(복구하려면 \"git stash apply\"를 실행하십시오)" -#: git-submodule.sh:184 +#: git-submodule.sh:181 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "상대 경로는 작업 폴더의 최상위에서만 쓸 수 있습니다" -#: git-submodule.sh:194 +#: git-submodule.sh:191 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "저장소 URL: '$repo' 값은 절대 경로거나 ./ 또는 ../로 시작해야 합니다." -#: git-submodule.sh:211 +#: git-submodule.sh:210 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path'은(는) 이미 인덱스에 있습니다" -#: git-submodule.sh:215 +#: git-submodule.sh:213 +#, sh-format +msgid "'$sm_path' already exists in the index and is not a submodule" +msgstr "'$sm_path'은(는) 이미 인덱스에 있고 하위 모듈이 아닙니다" + +#: git-submodule.sh:218 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -13757,22 +14204,22 @@ msgstr "" "$sm_path\n" "정말로 추가하려면 -f 옵션을 사용하십시오." -#: git-submodule.sh:233 +#: git-submodule.sh:236 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "'$sm_path'의 기존 저장소를 인덱스에 추가합니다" -#: git-submodule.sh:235 +#: git-submodule.sh:238 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path'이(가) 이미 있고 올바른 git 저장소가 아닙니다" -#: git-submodule.sh:243 +#: git-submodule.sh:246 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "'$sm_name'에 대한 깃 디렉터리가 로컬에서 리모트가 있는 채로 있습니다:" -#: git-submodule.sh:245 +#: git-submodule.sh:248 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -13787,47 +14234,47 @@ msgstr "" "'--force' 옵션을 사용하십시오. 로컬 깃 디렉터리가 올바른 저장소가 아니거나\n" "무슨 의미인지 잘 모르겠으면 '--name' 옵션으로 다른 이름을 선택하십시오." -#: git-submodule.sh:251 +#: git-submodule.sh:254 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "로컬 깃 디렉터리를 '$sm_name' 하위모듈로 다시 활성화합니다." -#: git-submodule.sh:263 +#: git-submodule.sh:266 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "'$sm_path' 하위 모듈을 체크아웃할 수 없습니다" -#: git-submodule.sh:268 +#: git-submodule.sh:271 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "'$sm_path' 하위 모듈을 추가하는데 실패했습니다" -#: git-submodule.sh:277 +#: git-submodule.sh:280 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "'$sm_path' 하위 모듈을 등록하는데 실패했습니다" -#: git-submodule.sh:324 +#: git-submodule.sh:327 #, sh-format msgid "Entering '$displaypath'" msgstr "'$displaypath' 들어감" -#: git-submodule.sh:344 +#: git-submodule.sh:347 #, sh-format msgid "Stopping at '$displaypath'; script returned non-zero status." msgstr "'$displaypath'에서 멈춤. 스크립트가 0이 아닌 상태를 리턴함." -#: git-submodule.sh:415 +#: git-submodule.sh:418 #, sh-format msgid "pathspec and --all are incompatible" msgstr "경로명세 및 --all 옵션은 호환되지 않습니다" -#: git-submodule.sh:420 +#: git-submodule.sh:423 #, sh-format msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "정말로 모든 하위 모듈 초기화를 해제하려면 '--all'을 사용하십시오" -#: git-submodule.sh:440 +#: git-submodule.sh:443 #, sh-format msgid "" "Submodule work tree '$displaypath' contains a .git directory\n" @@ -13836,7 +14283,7 @@ msgstr "" "하위 모듈 작업 폴더 '$displaypath'에 .git 디렉터리가 들어 있습니다\n" "(정말로 그 커밋 내역까지 포함해 제거하려면 'rm -rf'를 사용하십시오)" -#: git-submodule.sh:448 +#: git-submodule.sh:451 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " @@ -13845,38 +14292,38 @@ msgstr "" "하위 모듈 작업 폴더에 ('$displaypath') 로컬 수정 사항이 있습니다. 버리려면 '-" "f'를 사용하십시오" -#: git-submodule.sh:451 +#: git-submodule.sh:454 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "'$displaypath' 디렉터리를 지웁니다" -#: git-submodule.sh:452 +#: git-submodule.sh:455 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "하위 모듈 디렉터리를 ('$displaypath') 제거할 수 없습니다" -#: git-submodule.sh:455 +#: git-submodule.sh:458 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "빈 하위 모듈 디렉터리를 ('$displaypath') 만들 수 없습니다" -#: git-submodule.sh:464 +#: git-submodule.sh:467 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" "'$name' 하위 모듈이 ($url) '$displaypath' 경로에 대해 등록되지 않았습니다" -#: git-submodule.sh:617 +#: git-submodule.sh:623 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "하위 모듈 경로에서 ('$displaypath') 현재 리비전을 찾을 수 없습니다" -#: git-submodule.sh:627 +#: git-submodule.sh:633 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "하위 모듈 경로 '$sm_path'에서 가져올 수 없습니다" -#: git-submodule.sh:632 +#: git-submodule.sh:638 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -13885,12 +14332,12 @@ msgstr "" "하위 모듈 경로 '$sm_path'에서 현재 ${remote_name}/${branch} 리비전을 찾을 수 " "없습니다" -#: git-submodule.sh:650 +#: git-submodule.sh:656 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "하위 모듈 경로 '$displaypath'에서 가져올 수 없습니다" -#: git-submodule.sh:656 +#: git-submodule.sh:662 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -13899,82 +14346,82 @@ msgstr "" "'$displaypath' 하위 모듈 경로에서 가져왔지만, $sha1 커밋이 들어있지 않습니" "다. 이 커밋을 직접 가져오는데 실패했습니다." -#: git-submodule.sh:663 +#: git-submodule.sh:669 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "하위 모듈 경로 '$displaypath'에서 '$sha1'을(를) 체크아웃할 수 없습니다" -#: git-submodule.sh:664 +#: git-submodule.sh:670 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "하위 모듈 경로 '$displaypath': '$sha1' 체크아웃" -#: git-submodule.sh:668 +#: git-submodule.sh:674 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "하위 모듈 경로 '$displaypath'에서 '$sha1'을(를) 리베이스할 수 없습니다" -#: git-submodule.sh:669 +#: git-submodule.sh:675 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "하위 모듈 경로 '$displaypath': '$sha1'(으)로 리베이스" -#: git-submodule.sh:674 +#: git-submodule.sh:680 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "하위 모듈 경로 '$displaypath'에서 '$sha1' 병합할 수 없습니다" -#: git-submodule.sh:675 +#: git-submodule.sh:681 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "하위 모듈 경로 '$displaypath': '$sha1'에서 병합" -#: git-submodule.sh:680 +#: git-submodule.sh:686 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "'$command $sha1' 실행이 하위 모듈 경로 '$displaypath'에서 실패했습니다" -#: git-submodule.sh:681 +#: git-submodule.sh:687 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "하위 모듈 경로 '$displaypath': '$command $sha1'" -#: git-submodule.sh:712 +#: git-submodule.sh:718 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "재귀적으로 하위 모듈 경로 '$displaypath'에 들어가는데 실패했습니다" -#: git-submodule.sh:820 +#: git-submodule.sh:826 msgid "The --cached option cannot be used with the --files option" msgstr "--cached 옵션은 --files 옵션과 같이 쓸 수 없습니다" -#: git-submodule.sh:872 +#: git-submodule.sh:878 #, sh-format msgid "unexpected mode $mod_dst" msgstr "예상치 못한 모드 $mod_dst" -#: git-submodule.sh:892 +#: git-submodule.sh:898 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " 경고: '$display_name'에 '$sha1_src' 커밋이 들어있지 않습니다" -#: git-submodule.sh:895 +#: git-submodule.sh:901 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " 경고: '$display_name'에 '$sha1_dst' 커밋이 들어있지 않습니다" -#: git-submodule.sh:898 +#: git-submodule.sh:904 #, 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:1045 +#: git-submodule.sh:1051 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "재귀적으로 하위 모듈 경로 '$sm_path'에 들어가는데 실패했습니다" -#: git-submodule.sh:1112 +#: git-submodule.sh:1118 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "하위 모듈 URL을 '$displaypath'에 대해 동기화" @@ -13984,12 +14431,12 @@ msgstr "하위 모듈 URL을 '$displaypath'에 대해 동기화" msgid "See git-${cmd}(1) for details." msgstr "자세한 정보는 git-${cmd}(1) 페이지를 참고하십시오." -#: git-rebase--interactive.sh:131 +#: git-rebase--interactive.sh:140 #, sh-format msgid "Rebasing ($new_count/$total)" msgstr "리베이스중 ($new_count/$total)" -#: git-rebase--interactive.sh:147 +#: git-rebase--interactive.sh:156 msgid "" "\n" "Commands:\n" @@ -14015,7 +14462,7 @@ msgstr "" "\n" "이 줄은 순서를 바꿀 수 있습니다. 위에서 아래 순서로 실행합니다.\n" -#: git-rebase--interactive.sh:162 +#: git-rebase--interactive.sh:171 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -14023,7 +14470,7 @@ msgstr "" "\n" "줄을 제거하지 않습니다. 커밋을 제거하려면 명시적으로 'drop'을 사용하십시오.\n" -#: git-rebase--interactive.sh:166 +#: git-rebase--interactive.sh:175 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -14031,7 +14478,7 @@ msgstr "" "\n" "여기 줄을 제거하면 해당 커밋을 잃어버립니다!\n" -#: git-rebase--interactive.sh:202 +#: git-rebase--interactive.sh:211 #, sh-format msgid "" "You can amend the commit now, with\n" @@ -14050,86 +14497,82 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--interactive.sh:227 +#: git-rebase--interactive.sh:236 #, sh-format msgid "$sha1: not a commit that can be picked" msgstr "$sha1: 빼오기가 가능한 커밋이 아닙니다" -#: git-rebase--interactive.sh:266 +#: git-rebase--interactive.sh:275 #, sh-format msgid "Invalid commit name: $sha1" msgstr "잘못된 커밋 이름: $sha1" -#: git-rebase--interactive.sh:308 +#: git-rebase--interactive.sh:317 msgid "Cannot write current commit's replacement sha1" msgstr "현재 커밋의 대체 sha1을 쓸 수 없습니다" -#: git-rebase--interactive.sh:360 +#: git-rebase--interactive.sh:369 #, sh-format msgid "Fast-forward to $sha1" msgstr "정방향 진행, $sha1 위치로" -#: git-rebase--interactive.sh:362 +#: git-rebase--interactive.sh:371 #, sh-format msgid "Cannot fast-forward to $sha1" msgstr "$sha1 위치로 정방향 진행할 수 없습니다" -#: git-rebase--interactive.sh:371 +#: git-rebase--interactive.sh:380 #, sh-format msgid "Cannot move HEAD to $first_parent" msgstr "HEAD를 $first_parent 위치로 옮길 수 없습니다" -#: git-rebase--interactive.sh:376 +#: git-rebase--interactive.sh:385 #, sh-format msgid "Refusing to squash a merge: $sha1" msgstr "병합 squash 거부: $sha1" -#: git-rebase--interactive.sh:390 +#: git-rebase--interactive.sh:399 #, sh-format msgid "Error redoing merge $sha1" msgstr "$sha1 병합을 다시 하는데 오류" -#: git-rebase--interactive.sh:398 +#: git-rebase--interactive.sh:407 #, sh-format msgid "Could not pick $sha1" msgstr "$sha1을 빼오기 할 수 없습니다" -#: git-rebase--interactive.sh:407 +#: git-rebase--interactive.sh:416 #, sh-format msgid "This is the commit message #${n}:" msgstr "커밋 메시지 #${n}번입니다:" -#: git-rebase--interactive.sh:412 +#: git-rebase--interactive.sh:421 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "#${n}번째 커밋 메시지를 건너뜁니다:" -#: git-rebase--interactive.sh:423 +#: git-rebase--interactive.sh:432 #, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." msgstr[0] "커밋 $count개가 섞인 결과입니다." -#: git-rebase--interactive.sh:431 +#: git-rebase--interactive.sh:441 #, sh-format msgid "Cannot write $fixup_msg" msgstr "$fixup_msg를 쓸 수 없습니다" -#: git-rebase--interactive.sh:434 +#: git-rebase--interactive.sh:444 msgid "This is a combination of 2 commits." msgstr "커밋 2개가 섞인 결과입니다." -#: git-rebase--interactive.sh:435 -msgid "This is the 1st commit message:" -msgstr "1번째 커밋 메시지입니다:" - -#: git-rebase--interactive.sh:475 git-rebase--interactive.sh:518 -#: git-rebase--interactive.sh:521 +#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528 +#: git-rebase--interactive.sh:531 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "다음을 적용할(apply) 수 없습니다: $sha1... $rest" -#: git-rebase--interactive.sh:549 +#: git-rebase--interactive.sh:559 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -14142,31 +14585,31 @@ msgstr "" "대부분의 경우 빈 커밋 메시지 때문이거나, 또는 커밋 전 후크가 실패했기\n" "때문입니다. 커밋 메시지를 수정하기 전에 이 문제를 먼저 해결해야 합니다." -#: git-rebase--interactive.sh:564 +#: git-rebase--interactive.sh:574 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "다음에서 멈춥니다: $sha1_abbrev... $rest" -#: git-rebase--interactive.sh:579 +#: git-rebase--interactive.sh:589 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "이전 커밋 없이 '$squash_style' 수행할 수 없습니다" -#: git-rebase--interactive.sh:621 +#: git-rebase--interactive.sh:631 #, sh-format msgid "Executing: $rest" msgstr "실행 중: $rest" -#: git-rebase--interactive.sh:629 +#: git-rebase--interactive.sh:639 #, sh-format msgid "Execution failed: $rest" msgstr "실행 실패: $rest" -#: git-rebase--interactive.sh:631 +#: git-rebase--interactive.sh:641 msgid "and made changes to the index and/or the working tree" msgstr "그리고 인덱스 그리고/또는 작업 폴더에 변경 사항이 있습니다" -#: git-rebase--interactive.sh:633 +#: git-rebase--interactive.sh:643 msgid "" "You can fix the problem, and then run\n" "\n" @@ -14177,7 +14620,7 @@ msgstr "" "\tgit rebase --continue" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--interactive.sh:646 +#: git-rebase--interactive.sh:656 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -14192,25 +14635,25 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--interactive.sh:657 +#: git-rebase--interactive.sh:667 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "알 수 없는 명령: $command $sha1 $rest" -#: git-rebase--interactive.sh:658 +#: git-rebase--interactive.sh:668 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "'git rebase --edit-todo' 명령으로 바로잡으십시오." -#: git-rebase--interactive.sh:693 +#: git-rebase--interactive.sh:703 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "성공적으로 리베이스했고 $head_name 업데이트했습니다." -#: git-rebase--interactive.sh:740 +#: git-rebase--interactive.sh:750 msgid "Could not skip unnecessary pick commands" msgstr "불필요한 빼오기 명령을 건너뛸 수 없습니다" -#: git-rebase--interactive.sh:898 +#: git-rebase--interactive.sh:908 #, sh-format msgid "" "Warning: the SHA-1 is missing or isn't a commit in the following line:\n" @@ -14219,7 +14662,7 @@ msgstr "" "경고: 다음 줄에서 해당 SHA-1이 없거나 커밋이 아닙니다:\n" " - $line" -#: git-rebase--interactive.sh:931 +#: git-rebase--interactive.sh:941 #, sh-format msgid "" "Warning: the command isn't recognized in the following line:\n" @@ -14228,11 +14671,11 @@ msgstr "" "경고: 다음 줄에서 명령어가 무엇인지 알 수 없습니다:\n" " - $line" -#: git-rebase--interactive.sh:970 +#: git-rebase--interactive.sh:980 msgid "could not detach HEAD" msgstr "HEAD는 분리할 수 없습니다" -#: git-rebase--interactive.sh:1008 +#: git-rebase--interactive.sh:1018 msgid "" "Warning: some commits may have been dropped accidentally.\n" "Dropped commits (newer to older):" @@ -14240,7 +14683,7 @@ msgstr "" "경고: 일부 커밋이 의도치 않게 버려졌을 수도 있습니다.\n" "버려진 커밋 (최근에서 과거 순서):" -#: git-rebase--interactive.sh:1016 +#: git-rebase--interactive.sh:1026 msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" "\n" @@ -14255,7 +14698,7 @@ msgstr "" "다.\n" "가능한 동작은: ignore, warn, error" -#: git-rebase--interactive.sh:1027 +#: git-rebase--interactive.sh:1037 #, sh-format msgid "" "Unrecognized setting $check_level for option rebase.missingCommitsCheck. " @@ -14264,7 +14707,7 @@ msgstr "" "rebase.missingCommitsCheck 옵션에 대해 인식할 수 없는 $check_level 설정. 무시" "합니다." -#: git-rebase--interactive.sh:1044 +#: git-rebase--interactive.sh:1054 msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" "continue'." @@ -14272,15 +14715,15 @@ msgstr "" "'git rebase --edit-todo' 명령으로 바로잡을 수 있고 'git rebase --continue' 명" "령을 실행합니다." -#: git-rebase--interactive.sh:1045 +#: git-rebase--interactive.sh:1055 msgid "Or you can abort the rebase with 'git rebase --abort'." msgstr "아니면 'git rebase --abort' 명령으로 리베이스를 중지할 수도 있습니다." -#: git-rebase--interactive.sh:1069 +#: git-rebase--interactive.sh:1079 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "CHERRY_PICK_HEAD를 제거할 수 없습니다" -#: git-rebase--interactive.sh:1074 +#: git-rebase--interactive.sh:1084 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -14311,11 +14754,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--interactive.sh:1091 +#: git-rebase--interactive.sh:1101 msgid "Error trying to find the author identity to amend commit" msgstr "커밋을 수정한 작성자 신원을 찾는데 오류" -#: git-rebase--interactive.sh:1096 +#: git-rebase--interactive.sh:1106 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -14323,11 +14766,11 @@ msgstr "" "작업 폴더에 커밋하지 않은 변경 사항이 있습니다. 이 사항을 먼저\n" "커밋하고 'git rebase --continue' 명령을 다시 실행하십시오." -#: git-rebase--interactive.sh:1101 git-rebase--interactive.sh:1105 +#: git-rebase--interactive.sh:1111 git-rebase--interactive.sh:1115 msgid "Could not commit staged changes." msgstr "스테이징한 변경 사항은 커밋할 수 없습니다." -#: git-rebase--interactive.sh:1129 +#: git-rebase--interactive.sh:1139 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -14341,39 +14784,39 @@ msgstr "" " git rebase --continue\n" "\n" -#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1295 +#: git-rebase--interactive.sh:1147 git-rebase--interactive.sh:1305 msgid "Could not execute editor" msgstr "편집기를 실행할 수 없습니다" -#: git-rebase--interactive.sh:1150 +#: git-rebase--interactive.sh:1160 #, sh-format msgid "Could not checkout $switch_to" msgstr "$switch_to를 체크아웃할 수 없습니다" -#: git-rebase--interactive.sh:1155 +#: git-rebase--interactive.sh:1165 msgid "No HEAD?" msgstr "HEAD가 없습니다?" -#: git-rebase--interactive.sh:1156 +#: git-rebase--interactive.sh:1166 #, sh-format msgid "Could not create temporary $state_dir" msgstr "임시로 $state_dir 디렉터리를 만들 수 없습니다" -#: git-rebase--interactive.sh:1158 +#: git-rebase--interactive.sh:1168 msgid "Could not mark as interactive" msgstr "대화형으로 표시할 수 없습니다." -#: git-rebase--interactive.sh:1168 git-rebase--interactive.sh:1173 +#: git-rebase--interactive.sh:1178 git-rebase--interactive.sh:1183 msgid "Could not init rewritten commits" msgstr "다시 작성된 커밋을 초기화할 수 없습니다" -#: git-rebase--interactive.sh:1273 +#: git-rebase--interactive.sh:1283 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "리베이스 $shortrevisions, $shortonto 위로 (명령 $todocount개)" -#: git-rebase--interactive.sh:1278 +#: git-rebase--interactive.sh:1288 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -14383,7 +14826,7 @@ msgstr "" "하지만 모두 제거할 경우, 리베이스를 중지합니다.\n" "\n" -#: git-rebase--interactive.sh:1285 +#: git-rebase--interactive.sh:1295 msgid "Note that empty commits are commented out" msgstr "단 빈 커밋은 주석 처리되었습니다." @@ -14445,3 +14888,857 @@ msgstr "이 명령은 작업 폴더의 최상위에서만 쓸 수 있습니다." #: git-sh-setup.sh:377 msgid "Unable to determine absolute path of git directory" msgstr "깃 디렉터리의 절대 경로를 알아낼 수 없습니다" + +#. TRANSLATORS: you can adjust this to align "git add -i" status menu +#: git-add--interactive.perl:238 +#, perl-format +msgid "%12s %12s %s" +msgstr "%12s %12s %s" + +#: git-add--interactive.perl:239 +msgid "staged" +msgstr "스테이징" + +#: git-add--interactive.perl:239 +msgid "unstaged" +msgstr "안스테이징" + +#: git-add--interactive.perl:297 git-add--interactive.perl:322 +msgid "binary" +msgstr "바이너리" + +#: git-add--interactive.perl:306 git-add--interactive.perl:360 +msgid "nothing" +msgstr "없음" + +#: git-add--interactive.perl:342 git-add--interactive.perl:357 +msgid "unchanged" +msgstr "안바뀜" + +#: git-add--interactive.perl:653 +#, perl-format +msgid "added %d path\n" +msgid_plural "added %d paths\n" +msgstr[0] "경로 %d개 추가\n" + +#: git-add--interactive.perl:656 +#, perl-format +msgid "updated %d path\n" +msgid_plural "updated %d paths\n" +msgstr[0] "경로 %d개 업데이트\n" + +#: git-add--interactive.perl:659 +#, perl-format +msgid "reverted %d path\n" +msgid_plural "reverted %d paths\n" +msgstr[0] "경로 %d개 되돌림\n" + +#: git-add--interactive.perl:662 +#, perl-format +msgid "touched %d path\n" +msgid_plural "touched %d paths\n" +msgstr[0] "경로 %d개 건드림\n" + +#: git-add--interactive.perl:671 +msgid "Update" +msgstr "업데이트" + +#: git-add--interactive.perl:683 +msgid "Revert" +msgstr "되돌리기" + +#: git-add--interactive.perl:706 +#, perl-format +msgid "note: %s is untracked now.\n" +msgstr "주의: %s은(는) 현재 추적하지 않습니다.\n" + +#: git-add--interactive.perl:717 +msgid "Add untracked" +msgstr "추적하지 않는 파일 추가" + +#: git-add--interactive.perl:723 +msgid "No untracked files.\n" +msgstr "추적하지 않는 파일 없음.\n" + +#: git-add--interactive.perl:1039 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for staging." +msgstr "" +"패치가 깔끔하게 적용되면, 편집 부분은 즉시 스테이징으로\n" +"표시됩니다." + +#: git-add--interactive.perl:1042 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for stashing." +msgstr "" +"패치가 깔끔하게 적용되면, 편집 부분은 즉시 스태시에\n" +"표시됩니다." + +#: git-add--interactive.perl:1045 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for unstaging." +msgstr "" +"패치가 깔끔하게 적용되면, 편집 부분은 즉시 스테이징 아님으로\n" +"표시됩니다." + +#: git-add--interactive.perl:1048 git-add--interactive.perl:1057 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for applying." +msgstr "" +"패치가 깔끔하게 적용되면, 편집 부분은 즉시 적용으로\n" +"표시됩니다." + +#: git-add--interactive.perl:1051 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for discarding" +msgstr "" +"패치가 깔끔하게 적용되면, 편집 부분은 즉시 버림으로\n" +"표시됩니다" + +#: git-add--interactive.perl:1054 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for discarding." +msgstr "" +"패치가 깔끔하게 적용되면, 편집 부분은 즉시 버림으로\n" +"표시됩니다." + +#: git-add--interactive.perl:1067 +#, perl-format +msgid "failed to open hunk edit file for writing: %s" +msgstr "부분 편집 파일을 쓰기용으로 여는데 실패: '%s'" + +#: git-add--interactive.perl:1068 +msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" +msgstr "수동 부분 편집 모드 -- 빠른 설명은 맨 아래를 보십시오.\n" + +#: git-add--interactive.perl:1074 +#, 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" +"'%s' 줄을 제거하려면, 줄을 ' ' 줄로 만드십시오 (컨텍스트).\n" +"'%s' 줄을 제거하려면, 줄을 삭제하십시오..\n" +"%s(으)로 시작하는 줄은 제거됩니다\n" + +#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. +#: git-add--interactive.perl:1082 +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 "" +"깔끔하게 적용되지 않으면, 다시 편집할 기회가 있습니다. 모든 줄을 제거할 경우,\n" +"편집은 중단되고 이 부분은 변경되지 않은 상태로 남아있게 됩니다.\n" + +#: git-add--interactive.perl:1096 +#, perl-format +msgid "failed to open hunk edit file for reading: %s" +msgstr "부분 편집 파일을 읽기용으로 여는데 실패: '%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:1187 +msgid "" +"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +msgstr "편집한 부분이 적용되지 않습니다. 다시 편집하시겠습니까 (\"no\"라고 하면 버립니다!) [y/n]? " + +#: git-add--interactive.perl:1196 +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 - 이 부분 스테이징\n" +"n - 이 부분 스테이징하지 않음\n" +"q - 끝내기. 이 부분과 나머지 모두 스테이징하지 않음\n" +"a - 이 부분과 파일의 뒤 부분 모두 스테이징\n" +"d - 이 부분과 파일의 뒤 부분 모두 스테이징하지 않음" + +#: git-add--interactive.perl:1202 +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 - 이 부분 스태시\n" +"n - 이 부분 스태시하지 않음\n" +"q - 끝내기. 이 부분과 나머지 모두 스태시하지 않음\n" +"a - 이 부분과 파일의 뒤 부분 모두 스태시\n" +"d - 이 부분과 파일의 뒤 부분 모두 스태시하지 않음" + +#: git-add--interactive.perl:1208 +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 - 이 부분 스테이징 해제\n" +"n - 이 부분 스테이징 해제하지 않음\n" +"q - 끝내기. 이 부분과 나머지 모두 스테이징 해제하지 않음\n" +"a - 이 부분과 파일의 뒤 부분 모두 스테이징 해제\n" +"d - 이 부분과 파일의 뒤 부분 모두 스테이징 해제하지 않음" + +#: git-add--interactive.perl:1214 +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 - 이 부분 인덱스에 적용\n" +"n - 이 부분 인덱스에 적용하지 않음\n" +"q - 끝내기. 이 부분과 나머지 모두 적용하지 않음\n" +"a - 이 부분과 파일의 뒤 부분 모두 \n" +"d - 이 부분과 파일의 뒤 부분 모두 적용하지 않음" + +#: git-add--interactive.perl:1220 +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 - 이 부분 작업 폴더에서 버림\n" +"n - 이 부분 작업 폴더에서 버리지 않음\n" +"q - 끝내기. 이 부분과 나머지 모두 버리지 않음\n" +"a - 이 부분과 파일의 뒤 부분 모두 버림\n" +"d - 이 부분과 파일의 뒤 부분 모두 버리지 않음" + +#: git-add--interactive.perl:1226 +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 - 이 부분 인덱스와 작업 폴더에서 버림\n" +"n - 이 부분 인덱스와 작업 폴더에서 버리지 않음\n" +"q - 끝내기. 이 부분과 나머지 모두 버리지 않음\n" +"a - 이 부분과 파일의 뒤 부분 모두 버림\n" +"d - 이 부분과 파일의 뒤 부분 모두 버리지 않음" + +#: git-add--interactive.perl:1232 +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 - 이 부분 인덱스와 작업 폴더에 적용\n" +"n - 이 부분 인덱스와 작업 폴더에 적용하지 않음\n" +"q - 끝내기. 이 부분과 나머지 모두 적용하지 않음\n" +"a - 이 부분과 파일의 뒤 부분 모두 \n" +"d - 이 부분과 파일의 뒤 부분 모두 적용하지 않음" + +#: git-add--interactive.perl:1241 +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 - 이동할 부분 선택\n" +"/ - 주어진 정규식에 맞는 부분 검색\n" +"j - 이 부분 미결정 상태로 남겨두고, 다음 미결정 부분 보기\n" +"J - 이 부분 미결정 상태로 남겨두고, 다음 부분 보기\n" +"k - 이 부분 미결정 상태로 남겨두고, 이전 미결정 부분 보기\n" +"K - 이 부분 미결정 상태로 남겨두고, 이전 부분 보기\n" +"s - 현재 부분을 작은 부분을 쪼개기\n" +"e - 현재 부분을 수동으로 편집\n" +"? - 도움말 보기\n" + +#: git-add--interactive.perl:1272 +msgid "The selected hunks do not apply to the index!\n" +msgstr "선택한 부분은 인덱스에 적용되지 않습니다!\n" + +#: git-add--interactive.perl:1273 +msgid "Apply them to the worktree anyway? " +msgstr "그래도 작업 폴더에 적용할까요?" + +#: git-add--interactive.perl:1276 +msgid "Nothing was applied.\n" +msgstr "아무 것도 적용되지 않았습니다.\n" + +#: git-add--interactive.perl:1287 +#, perl-format +msgid "ignoring unmerged: %s\n" +msgstr "병합하지 않은 사항 무시: %s\n" + +#: git-add--interactive.perl:1296 +msgid "Only binary files changed.\n" +msgstr "바이너리 파일만 바뀌었습니다.\n" + +#: git-add--interactive.perl:1298 +msgid "No changes.\n" +msgstr "변경 사항 없음.\n" + +#: git-add--interactive.perl:1306 +msgid "Patch update" +msgstr "패치 업데이트" + +#: git-add--interactive.perl:1358 +#, perl-format +msgid "Stage mode change [y,n,q,a,d,/%s,?]? " +msgstr "모드 변경을 스테이징합니까 [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1359 +#, perl-format +msgid "Stage deletion [y,n,q,a,d,/%s,?]? " +msgstr "삭제를 스테이징합니까 [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1360 +#, perl-format +msgid "Stage this hunk [y,n,q,a,d,/%s,?]? " +msgstr "이 부분 스테이징합니까 [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1363 +#, perl-format +msgid "Stash mode change [y,n,q,a,d,/%s,?]? " +msgstr "모드 변경 스태시합니까 [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1364 +#, perl-format +msgid "Stash deletion [y,n,q,a,d,/%s,?]? " +msgstr "삭제 스태시합니까 [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1365 +#, perl-format +msgid "Stash this hunk [y,n,q,a,d,/%s,?]? " +msgstr "이 부분 스태시합니까 [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1368 +#, perl-format +msgid "Unstage mode change [y,n,q,a,d,/%s,?]? " +msgstr "모드 변경 스태시 해제합니까 [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1369 +#, perl-format +msgid "Unstage deletion [y,n,q,a,d,/%s,?]? " +msgstr "삭제 스태시 해제합니까 [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1370 +#, perl-format +msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? " +msgstr "이 부분 스태시 해제합니까 [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1373 +#, perl-format +msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? " +msgstr "모드 변경을 인덱스에 적용합니까 [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1374 +#, perl-format +msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? " +msgstr "삭제를 인덱스에 적용합니까 [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1375 +#, perl-format +msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? " +msgstr "이 부분을 인덱스에 적용합니까 [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1378 +#, perl-format +msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? " +msgstr "모드 변경을 작업 폴더에서 버립니까 [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1379 +#, perl-format +msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? " +msgstr "삭제를 작업 폴더에서 버립니까 [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1380 +#, perl-format +msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? " +msgstr "이 부분을 작업 폴더에서 버립니까 [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1383 +#, perl-format +msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "모드 변경을 인덱스와 작업 폴더에서 버립니까 [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1384 +#, perl-format +msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "삭제를 인덱스와 작업 폴더에서 버립니까 [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1385 +#, perl-format +msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "이 부분을 인덱스와 작업 폴더에서 버립니까 [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1388 +#, perl-format +msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "모드 변경을 인덱스와 작업 폴더에 적용합니까 [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1389 +#, perl-format +msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "삭제를 인덱스와 작업 폴더에 적용합니까 [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1390 +#, perl-format +msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "이 부분을 인덱스와 작업 폴더에 적용합니까 [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1493 +msgid "go to which hunk (<ret> to see more)? " +msgstr "어느 부분으로 이동합니까 (더 보려면 <ret>)? " + +#: git-add--interactive.perl:1495 +msgid "go to which hunk? " +msgstr "어느 부분으로 이동합니까? " + +#: git-add--interactive.perl:1504 +#, perl-format +msgid "Invalid number: '%s'\n" +msgstr "잘못된 번호: '%s'\n" + +#: git-add--interactive.perl:1509 +#, perl-format +msgid "Sorry, only %d hunk available.\n" +msgid_plural "Sorry, only %d hunks available.\n" +msgstr[0] "미안합니다. 부분이 %d개 밖에 없습니다.\n" + +#: git-add--interactive.perl:1535 +msgid "search for regex? " +msgstr "정규식을 검색합니까?" + +#: git-add--interactive.perl:1548 +#, perl-format +msgid "Malformed search regexp %s: %s\n" +msgstr "잘못된 형태의 검색 정규식 %s: %s\n" + +#: git-add--interactive.perl:1558 +msgid "No hunk matches the given pattern\n" +msgstr "[주어진 패턴에 맞는 부분이 없습니다\n" + +#: git-add--interactive.perl:1570 git-add--interactive.perl:1592 +msgid "No previous hunk\n" +msgstr "이전 부분이 없습니다\n" + +#: git-add--interactive.perl:1579 git-add--interactive.perl:1598 +msgid "No next hunk\n" +msgstr "다음 부분이 없습니다\n" + +#: git-add--interactive.perl:1606 +#, perl-format +msgid "Split into %d hunk.\n" +msgid_plural "Split into %d hunks.\n" +msgstr[0] "%d개 부분으로 나눕니다.\n" + +#: git-add--interactive.perl:1658 +msgid "Review diff" +msgstr "diff 검토" + +#. TRANSLATORS: please do not translate the command names +#. 'status', 'update', 'revert', etc. +#: git-add--interactive.perl:1677 +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\t - view diff between HEAD and index\n" +"add untracked - add contents of untracked files to the staged set of " +"changes\n" +msgstr "" +"status - 변경 사항이 있는 경로를 표시합니다\n" +"update - 변경 사항 스테이징 모음에 작업 폴더 상태를 추가합니다\n" +"revert - 변경 사항 스테이징 모음을 HEAD 버전으로 되돌립니다\n" +"patch - 바뀐 부분을 골라서 개별적으로 업데이트합니다\n" +"diff - HEAD와 인덱스 사이의 차이점을 봅니다\n" +"add untracked - 추적되지 않는 파일의 내용을 변경 사항 스테이징 모음에 추가합니다\n" + +#: git-add--interactive.perl:1694 git-add--interactive.perl:1699 +#: git-add--interactive.perl:1702 git-add--interactive.perl:1709 +#: git-add--interactive.perl:1713 git-add--interactive.perl:1719 +msgid "missing --" +msgstr "-- 빠짐" + +#: git-add--interactive.perl:1715 +#, perl-format +msgid "unknown --patch mode: %s" +msgstr "알 수 없는 --patch 모드: %s" + +#: git-add--interactive.perl:1721 git-add--interactive.perl:1727 +#, perl-format +msgid "invalid argument %s, expecting --" +msgstr "인자가 (%s) 잘못되었고, --가 와야 합니다" + +# 주의: 초 단위일 경우를 말한다 +#: git-send-email.perl:121 +msgid "local zone differs from GMT by a non-minute interval\n" +msgstr "지역 시간대와 GMT의 차이가 분 단위가 아닙니다\n" + +#: git-send-email.perl:128 git-send-email.perl:134 +msgid "local time offset greater than or equal to 24 hours\n" +msgstr "지역 시각 오프셋이 24시간보다 크거나 작습니다\n" + +#: git-send-email.perl:202 git-send-email.perl:208 +msgid "the editor exited uncleanly, aborting everything" +msgstr "편집기가 비정상적으로 끝나서, 모두 중지합니다" + +#: git-send-email.perl:282 +#, perl-format +msgid "" +"'%s' contains an intermediate version of the email you were composing.\n" +msgstr "'%s' 안에 작성 중이었던 중간 버전의 전자메일이 들어 있습니다.\n" + +#: git-send-email.perl:287 +#, perl-format +msgid "'%s.final' contains the composed email.\n" +msgstr "'%s.final' 안에 작성한 전자메일이 들어 있습니다.\n" + +#: git-send-email.perl:305 +msgid "--dump-aliases incompatible with other options\n" +msgstr "--dump-aliases 옵션은 다른 옵션과 호환되지 않습니다\n" + +#: git-send-email.perl:368 git-send-email.perl:623 +msgid "Cannot run git format-patch from outside a repository\n" +msgstr "저장소 밖에서 git format-patch 명령을 실행할 수 없습니다\n" + +#: git-send-email.perl:437 +#, perl-format +msgid "Unknown --suppress-cc field: '%s'\n" +msgstr "알 수 없는 --suppress-cc 필드: '%s'\n" + +#: git-send-email.perl:466 +#, perl-format +msgid "Unknown --confirm setting: '%s'\n" +msgstr "알 수 없는 --confirm 설정: '%s'\n" + +#: git-send-email.perl:498 +#, perl-format +msgid "warning: sendmail alias with quotes is not supported: %s\n" +msgstr "경고: 따옴표가 있는 sendmail 별칭은 지원하지 않습니다: %s\n" + +#: git-send-email.perl:500 +#, perl-format +msgid "warning: `:include:` not supported: %s\n" +msgstr "경고: `:include:`는 지원하지 않습니다: %s\n" + +#: git-send-email.perl:502 +#, perl-format +msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" +msgstr "경고: `/file` 또는 `|pipe` 리다이렉션은 지원하지 않습니다: %s\n" + +#: git-send-email.perl:507 +#, perl-format +msgid "warning: sendmail line is not recognized: %s\n" +msgstr "경고: sendmail 줄이 인식되지 않습니다: %s\n" + +#: git-send-email.perl:589 +#, 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 "" +"'%s' 파일이 있지만 이 파일은 패치를 만들 대상인 커밋의 범위가\n" +"될 수도 있습니다. 다음과 같이 애매함을 없애 주십시오...\n" +"\n" +" * 파일을 의도했다면 \"./%s\"(이)라고 쓰고, 아니면\n" +" * 범위를 의도했다면 --format-patch 옵션 사용\n" + +#: git-send-email.perl:610 +#, perl-format +msgid "Failed to opendir %s: %s" +msgstr "%s에 opendir 실패: %s" + +#: git-send-email.perl:634 +#, perl-format +msgid "" +"fatal: %s: %s\n" +"warning: no patches were sent\n" +msgstr "" +"치명적 오류: %s: %s\n" +"경고: 패치를 보내지 않았습니다\n" + +#: git-send-email.perl:645 +msgid "" +"\n" +"No patch files specified!\n" +"\n" +msgstr "\n패치 파일을 지정하지 않았습니다\n\n" + +#: git-send-email.perl:658 +#, perl-format +msgid "No subject line in %s?" +msgstr "%s 안에 제목 줄이 없습니다?" + +#: git-send-email.perl:668 +#, perl-format +msgid "Failed to open for writing %s: %s" +msgstr "%s에 쓰려고 여는데 실패: %s" + +#: git-send-email.perl:678 +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 "" +"\"GIT:\"으로 시작하는 줄은 제거됩니다.\n" +"작성 중인 패치에 대해 전체 diffstat을 포함하거나\n" +"목차를 포함해 보십시오.\n" +"\n" +"요약을 보내는 게 아니라면 본문 내용을 지우십시오.\n" + +#: git-send-email.perl:701 +#, perl-format +msgid "Failed to open %s.final: %s" +msgstr "%s.final을 여는데 실패: %s" + +#: git-send-email.perl:704 +#, perl-format +msgid "Failed to open %s: %s" +msgstr "%s을(를) 여는데 실패: %s" + +#: git-send-email.perl:739 +msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n" +msgstr "To/Cc/Bcc 필드가 해석되지 않아서, 무시합니다\n" + +#: git-send-email.perl:748 +msgid "Summary email is empty, skipping it\n" +msgstr "요약 전자메일이 비어 있어서 넘어갑니다.\n" + +#. TRANSLATORS: please keep [y/N] as is. +#: git-send-email.perl:780 +#, perl-format +msgid "Are you sure you want to use <%s> [y/N]? " +msgstr "정말로 <%s>을(를) 사용하시겠습니까 [y/N]? " + +# 주의: '8bit'이라고 그대로 쓴다. 메일 encoding 헤더에 쓸 literal을 가리킴 +#: git-send-email.perl:809 +msgid "" +"The following files are 8bit, but do not declare a Content-Transfer-" +"Encoding.\n" +msgstr "다음 파일이 8bit이지만, Content-Transfer-Encoding을 설정하지 않았습니다.\n" + +# 주의: '8bit'이라고 그대로 쓴다. 메일 encoding 헤더에 쓸 literal을 가리킴 +#: git-send-email.perl:814 +msgid "Which 8bit encoding should I declare [UTF-8]? " +msgstr "어떤 8bit 인코딩을 선언합니까 [UTF-8]? " + +#: git-send-email.perl:822 +#, 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 "" +"보내지 않습니다. 다음 패치가\n" +"\t%s\n" +"제목 서식인 '*** SUBJECT HERE ***'가 들어 있습니다. 정말로 보내려면 --force 옵션을 사용하십시오.\n" + +#: git-send-email.perl:841 +msgid "To whom should the emails be sent (if anyone)?" +msgstr "누구에게 전자메일을 보내야 합니까 (보낼 대상이 있다면)?" + +#: git-send-email.perl:859 +#, perl-format +msgid "fatal: alias '%s' expands to itself\n" +msgstr "치명적 오류: '%s' 별칭은 자기 자신을 가리킵니다\n" + +#: git-send-email.perl:871 +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:921 git-send-email.perl:929 +#, perl-format +msgid "error: unable to extract a valid address from: %s\n" +msgstr "오류: 다음에서 올바른 주소를 추출할 수 없습니다: %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:933 +msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " +msgstr "이 주소로 무엇을 하시겠습니까? ([q]끝내기|[d]버리기|[e]편집): " + +#: git-send-email.perl:1234 +#, perl-format +msgid "CA path \"%s\" does not exist" +msgstr "\"%s\" CA 경로가 없습니다" + +#: git-send-email.perl:1309 +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 "" +" 위의 Cc 목록은 패치 커밋 메시지에 들어 있는 추가 주소로\n" +" 확장됩니다. 기본값으로 확장되기 전에 send-email에서\n" +" 물어봅니다. 이런 동작은 sendmail.confirm 설정에서\n" +" 조정할 수 있습니다.\n" +"\n" +" 정보를 더 보려면, 'git send-email --help'를 실행하십시오.\n" +" 현재 동작을 유지하려면, 이 메시지를 무시하고,\n" +" 'git config --global sendemail.confirm auto' 명령을\n" +" 실행하십시오.\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:1324 +msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): " +msgstr "이 전자메일을 보내시겠습니까? ([y]예|[n]아니오|[q]끝내기|[a]모두): " + +#: git-send-email.perl:1327 +msgid "Send this email reply required" +msgstr "필요한 전자메일 답장 보냅니다" + +#: git-send-email.perl:1353 +msgid "The required SMTP server is not properly defined." +msgstr "필요한 SMTP 서버를 제대로 지정하지 않았습니다." + +#: git-send-email.perl:1397 +#, perl-format +msgid "Server does not support STARTTLS! %s" +msgstr "서버에서 STARTTLS를 지원하지 않습니다! %s" + +#: git-send-email.perl:1403 +msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." +msgstr "SMTP를 제대로 초기화할 수 없습니다. 설정을 확인하고 --smtp-debug 옵션을 사용하십시오." + +#: git-send-email.perl:1421 +#, perl-format +msgid "Failed to send %s\n" +msgstr "%s을(를) 보내는데 실패했습니다\n" + +#: git-send-email.perl:1424 +#, perl-format +msgid "Dry-Sent %s\n" +msgstr "%s 보내는 흉내\n" + +#: git-send-email.perl:1424 +#, perl-format +msgid "Sent %s\n" +msgstr "%s 보냄\n" + +#: git-send-email.perl:1426 +msgid "Dry-OK. Log says:\n" +msgstr "성공 흉내. 기록은:\n" + +#: git-send-email.perl:1426 +msgid "OK. Log says:\n" +msgstr "성공. 기록은:\n" + +#: git-send-email.perl:1438 +msgid "Result: " +msgstr "결과: " + +#: git-send-email.perl:1441 +msgid "Result: OK\n" +msgstr "결과: 정상\n" + +#: git-send-email.perl:1454 +#, perl-format +msgid "can't open file %s" +msgstr "%s 파일을 열 수 없습니다" + +#: git-send-email.perl:1501 git-send-email.perl:1521 +#, perl-format +msgid "(mbox) Adding cc: %s from line '%s'\n" +msgstr "(mbox) cc: %s 추가, '%s' 줄에서\n" + +#: git-send-email.perl:1507 +#, perl-format +msgid "(mbox) Adding to: %s from line '%s'\n" +msgstr "(mbox) to: %s 추가, '%s' 줄에서\n" + +#: git-send-email.perl:1555 +#, perl-format +msgid "(non-mbox) Adding cc: %s from line '%s'\n" +msgstr "(mbox아님) cc: %s 추가, '%s' 줄에서\n" + +#: git-send-email.perl:1578 +#, perl-format +msgid "(body) Adding cc: %s from line '%s'\n" +msgstr "(본문) cc: %s 추가, '%s' 줄에서\n" + +#: git-send-email.perl:1676 +#, perl-format +msgid "(%s) Could not execute '%s'" +msgstr "(%s) '%s'을 실행할 수 없습니다" + +#: git-send-email.perl:1683 +#, perl-format +msgid "(%s) Adding %s: %s from: '%s'\n" +msgstr "(%s) %s: %s 추가, '%s' 줄에서\n" + +#: git-send-email.perl:1687 +#, perl-format +msgid "(%s) failed to close pipe to '%s'" +msgstr "(%s) '%s'(을)를 향한 파이프를 닫는데 실패했습니다" + +#: git-send-email.perl:1714 +msgid "cannot send message as 7bit" +msgstr "메시지를 7비트로 보낼 수 없습니다" + +#: git-send-email.perl:1722 +msgid "invalid transfer encoding" +msgstr "잘못된 전송 인코딩" + +#: git-send-email.perl:1741 git-send-email.perl:1792 git-send-email.perl:1802 +#, perl-format +msgid "unable to open %s: %s\n" +msgstr "%s을(를) 열 수 없습니다: %s\n" + +#: git-send-email.perl:1744 +#, perl-format +msgid "%s: patch contains a line longer than 998 characters" +msgstr "%s: 패치에 998자보다 더 긴 줄이 들어 있습니다" + +#: git-send-email.perl:1760 +#, 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:1764 +#, perl-format +msgid "Do you really want to send %s? [y|N]: " +msgstr "정말로 %s 파일을 보내시겠습니까? [y|N]: " @@ -1,14 +1,14 @@ # Swedish translations for Git. -# Copyright (C) 2010-2016 Peter krefting <peter@softwolves.pp.se> +# Copyright (C) 2010-2017 Peter krefting <peter@softwolves.pp.se> # This file is distributed under the same license as the Git package. -# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012, 2013, 2014, 2015, 2016. +# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017. # msgid "" msgstr "" -"Project-Id-Version: git 2.11.0\n" +"Project-Id-Version: git 2.12.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2016-11-25 22:50+0800\n" -"PO-Revision-Date: 2016-11-25 22:59+0800\n" +"POT-Creation-Date: 2017-02-04 13:02+0800\n" +"PO-Revision-Date: 2017-02-11 20:13+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Svenska <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -70,7 +70,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "Avslutar på grund av olöst konflikgt." -#: advice.c:114 builtin/merge.c:1181 +#: advice.c:114 builtin/merge.c:1206 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." @@ -543,7 +543,7 @@ msgstr[1] "Tillämpade patchen %%s med %d refuserade..." msgid "truncating .rej filename to %.*s.rej" msgstr "trunkerar .rej-filnamnet till %.*s.rej" -#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989 +#: apply.c:4540 builtin/fetch.c:737 builtin/fetch.c:986 #, c-format msgid "cannot open %s" msgstr "kan inte öppna %s" @@ -597,15 +597,16 @@ 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:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431 +#: apply.c:4888 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" #: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280 #: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180 -#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:407 -#: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592 -#: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947 +#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:591 +#: builtin/submodule--helper.c:594 builtin/submodule--helper.c:960 +#: builtin/submodule--helper.c:963 builtin/submodule--helper.c:1104 +#: git-add--interactive.perl:239 msgid "path" msgstr "sökväg" @@ -706,8 +707,8 @@ msgid "allow overlapping hunks" msgstr "tillåt överlappande stycken" #: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19 -#: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593 -#: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114 +#: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651 +#: builtin/log.c:1860 builtin/mv.c:122 builtin/read-tree.c:114 msgid "be verbose" msgstr "var pratsam" @@ -746,7 +747,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <arkiv> [--exec <kmd>] --list" -#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327 +#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300 #, c-format msgid "pathspec '%s' did not match any files" msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer" @@ -767,11 +768,11 @@ msgstr "prefix" msgid "prepend prefix to each pathname in the archive" msgstr "lägg till prefix till varje sökväg i arkivet" -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2603 -#: builtin/blame.c:2604 builtin/config.c:59 builtin/fast-export.c:987 -#: builtin/fast-export.c:989 builtin/grep.c:723 builtin/hash-object.c:101 -#: builtin/ls-files.c:539 builtin/ls-files.c:542 builtin/notes.c:401 -#: builtin/notes.c:564 builtin/read-tree.c:109 parse-options.h:153 +#: archive.c:432 builtin/blame.c:2607 builtin/blame.c:2608 builtin/config.c:59 +#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1054 +#: builtin/hash-object.c:101 builtin/ls-files.c:539 builtin/ls-files.c:542 +#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109 +#: parse-options.h:153 msgid "file" msgstr "fil" @@ -804,7 +805,7 @@ msgid "list supported archive formats" msgstr "visa understödda arkivformat" #: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88 -#: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953 +#: builtin/submodule--helper.c:603 builtin/submodule--helper.c:969 msgid "repo" msgstr "arkiv" @@ -900,12 +901,12 @@ msgstr "" #: bisect.c:750 #, c-format msgid "" -"Some %s revs are not ancestor of the %s rev.\n" +"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 "" "Några %s-revisioner är inte föräldrar till %s-revisionen.\n" -"git bisect kan inte arbeta korrekt i detta fall.\n" +"git bisect kan inte fungera korrekt i detta fall.\n" "Kanske du skrev fel %s- och %s-revisioner?\n" #: bisect.c:763 @@ -930,7 +931,7 @@ msgstr "Bisect: en sammanslagningsbas måste testas\n" msgid "a %s revision is needed" msgstr "en %s-revision behövs" -#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248 +#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:262 #, c-format msgid "could not create file '%s'" msgstr "kunde inte skapa filen \"%s\"" @@ -1122,7 +1123,7 @@ 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:87 sequencer.c:963 builtin/commit.c:777 +#: bundle.c:87 sequencer.c:1331 sequencer.c:1752 builtin/commit.c:777 #, c-format msgid "could not open '%s'" msgstr "kunde inte öppna \"%s\"" @@ -1131,10 +1132,10 @@ msgstr "kunde inte öppna \"%s\"" msgid "Repository lacks these prerequisite commits:" msgstr "Arkivet saknar dessa nödvändiga incheckningar:" -#: bundle.c:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374 -#: builtin/blame.c:2814 builtin/commit.c:1061 builtin/log.c:348 +#: bundle.c:163 ref-filter.c:1499 sequencer.c:1154 sequencer.c:2290 +#: builtin/blame.c:2820 builtin/commit.c:1061 builtin/log.c:348 #: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909 -#: builtin/merge.c:356 builtin/shortlog.c:170 +#: builtin/merge.c:360 builtin/shortlog.c:177 msgid "revision walk setup failed" msgstr "misslyckades skapa revisionstraversering" @@ -1173,7 +1174,7 @@ msgstr "rev-list dog" msgid "ref '%s' is excluded by the rev-list options" msgstr "referensen \"%s\" exkluderas av argumenten till rev-list" -#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273 +#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:282 #, c-format msgid "unrecognized argument: %s" msgstr "okänt argument: %s" @@ -1191,13 +1192,13 @@ msgstr "kan inte skapa \"%s\"" msgid "index-pack died" msgstr "index-pack dog" -#: color.c:290 +#: color.c:300 #, c-format msgid "invalid color value: %.*s" msgstr "felaktigt färgvärde: %.*s" -#: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493 -#: builtin/am.c:2127 +#: commit.c:40 sequencer.c:1564 builtin/am.c:421 builtin/am.c:457 +#: builtin/am.c:1493 builtin/am.c:2127 #, c-format msgid "could not parse %s" msgstr "kunde inte tolka %s" @@ -1221,130 +1222,140 @@ msgstr "" msgid "memory exhausted" msgstr "minnet slut" -#: config.c:516 +#: config.c:518 #, c-format msgid "bad config line %d in blob %s" msgstr "felaktig konfigurationsfil rad %d i blob:en %s" -#: config.c:520 +#: config.c:522 #, c-format msgid "bad config line %d in file %s" msgstr "felaktig konfigurationsfil rad %d i filen %s" -#: config.c:524 +#: config.c:526 #, c-format msgid "bad config line %d in standard input" msgstr "felaktig konfigurationsfil rad %d i standard in" -#: config.c:528 +#: config.c:530 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s" -#: config.c:532 +#: config.c:534 #, c-format msgid "bad config line %d in command line %s" msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s" -#: config.c:536 +#: config.c:538 #, c-format msgid "bad config line %d in %s" msgstr "felaktig konfigurationsfil rad %d i %s" -#: config.c:655 +#: config.c:657 msgid "out of range" msgstr "utanför intervallet" -#: config.c:655 +#: config.c:657 msgid "invalid unit" msgstr "ogiltig enhet" -#: config.c:661 +#: config.c:663 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s" -#: config.c:666 +#: config.c:668 #, 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:669 +#: config.c:671 #, 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:672 +#: config.c:674 #, 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:675 +#: config.c:677 #, 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:678 +#: config.c:680 #, 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:681 +#: config.c:683 #, 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:768 +#: config.c:770 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "misslyckades expandera användarkatalog i: \"%s\"" -#: config.c:852 config.c:863 +#: config.c:865 config.c:876 #, c-format msgid "bad zlib compression level %d" msgstr "felaktigt zlib-komprimeringsgrad %d" -#: config.c:978 +#: config.c:993 #, c-format msgid "invalid mode for object creation: %s" msgstr "felaktigt läge för skapande av objekt: %s" -#: config.c:1312 +#: config.c:1149 +#, c-format +msgid "bad pack compression level %d" +msgstr "felaktig paketkomprimeringsgrad %d" + +#: config.c:1339 msgid "unable to parse command-line config" msgstr "kan inte tolka kommandoradskonfiguration" -#: config.c:1362 +#: config.c:1389 msgid "unknown error occurred while reading the configuration files" msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna" -#: config.c:1716 +#: config.c:1743 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration" -#: config.c:1718 +#: config.c:1745 #, 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:1777 +#: config.c:1804 #, c-format msgid "%s has multiple values" msgstr "%s har flera värden" -#: config.c:2311 +#: config.c:2225 config.c:2450 +#, c-format +msgid "fstat on %s failed" +msgstr "fstat misslyckades på %s" + +#: config.c:2343 #, c-format msgid "could not set '%s' to '%s'" msgstr "kunde inte ställa in \"%s\" till \"%s\"" -#: config.c:2313 +#: config.c:2345 #, c-format msgid "could not unset '%s'" msgstr "kunde inte ta bort inställning för \"%s\"" @@ -1367,7 +1378,7 @@ msgstr "" # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140 +#: connected.c:63 builtin/fsck.c:190 builtin/prune.c:140 msgid "Checking connectivity" msgstr "Kontrollerar konnektivitet" @@ -1503,12 +1514,12 @@ msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n" msgid " Unknown dirstat parameter '%s'\n" msgstr " Okänd dirstat-parameter \"%s\"\n" -#: diff.c:283 +#: diff.c:281 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\"" -#: diff.c:346 +#: diff.c:344 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -1517,20 +1528,20 @@ msgstr "" "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" "%s" -#: diff.c:3087 +#: diff.c:3085 #, c-format msgid "external diff died, stopping at %s" msgstr "extern diff dog, stannar vid %s" -#: diff.c:3412 +#: diff.c:3411 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, -check och -s är ömsesidigt uteslutande" -#: diff.c:3502 +#: diff.c:3501 msgid "--follow requires exactly one pathspec" msgstr "--follow kräver exakt en sökvägsangivelse" -#: diff.c:3665 +#: diff.c:3664 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -1539,35 +1550,40 @@ msgstr "" "Misslyckades tolka argument till flaggan --dirstat/-X;\n" "%s" -#: diff.c:3679 +#: diff.c:3678 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\"" -#: diff.c:4700 +#: diff.c:4695 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:4703 +#: diff.c:4698 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:4706 +#: diff.c:4701 #, 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:1866 +#: dir.c:1863 msgid "failed to get kernel name and information" msgstr "misslyckades hämta kärnans namn och information" -#: dir.c:1985 +#: dir.c:1982 msgid "Untracked cache is disabled on this system or location." msgstr "Ospårad cache är inaktiverad på systemet eller platsen." +#: dir.c:2760 +#, c-format +msgid "could not migrate git directory from '%s' to '%s'" +msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\"" + #: fetch-pack.c:213 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: förväntade grund lista" @@ -1748,35 +1764,40 @@ msgstr "kunde inte skapa temporära fil" msgid "failed writing detached signature to '%s'" msgstr "misslyckades skriva fristående signatur till \"%s\"" -#: grep.c:1782 +#: graph.c:96 +#, c-format +msgid "ignore invalid color '%.*s' in log.graphColors" +msgstr "ignorera felaktig färg \"%.*s\" i log.graphColors" + +#: grep.c:1794 #, c-format msgid "'%s': unable to read %s" msgstr "\"%s\" kunde inte läsa %s" -#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155 +#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:133 #, c-format msgid "failed to stat '%s'" msgstr "misslyckades ta status på \"%s\"" -#: grep.c:1810 +#: grep.c:1822 #, c-format msgid "'%s': short read" msgstr "\"%s\": kort läsning" -#: help.c:203 +#: help.c:218 #, c-format msgid "available git commands in '%s'" msgstr "git-kommandon tillgängliga i \"%s\"" -#: help.c:210 +#: help.c:225 msgid "git commands available from elsewhere on your $PATH" msgstr "git-kommandon från andra platser i din $PATH" -#: help.c:241 +#: help.c:256 msgid "These are common Git commands used in various situations:" msgstr "Dessa vanliga Git-kommandon används i olika situationer:" -#: help.c:306 +#: help.c:321 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -1785,11 +1806,11 @@ msgstr "" "\"%s\" verkar vara ett git-kommando, men vi kan inte\n" "köra det. Kanske git-%s är trasigt?" -#: help.c:361 +#: help.c:376 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Oj då. Ditt system rapporterar inga Git-kommandon alls." -#: help.c:383 +#: help.c:398 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" @@ -1798,17 +1819,17 @@ msgstr "" "VARNING: Du anropade ett Git-kommando vid namn \"%s\", som inte finns.\n" "Fortsätter under förutsättningen att du menade \"%s\"" -#: help.c:388 +#: help.c:403 #, c-format msgid "in %0.1f seconds automatically..." msgstr "automatiskt om %0.1f sekunder..." -#: help.c:395 +#: help.c:410 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: \"%s\" är inte ett git-kommando. Se \"git --help\"." -#: help.c:399 help.c:465 +#: help.c:414 help.c:480 msgid "" "\n" "Did you mean this?" @@ -1822,7 +1843,7 @@ msgstr[1] "" "\n" "Menade du ett av dessa?" -#: help.c:461 +#: help.c:476 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" @@ -1891,69 +1912,69 @@ msgstr "kunde inte skriva ny indexfil" msgid "(bad commit)\n" msgstr "(felaktig incheckning)\n" -#: merge-recursive.c:231 +#: merge-recursive.c:231 merge-recursive.c:239 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "addinfo_cache misslyckades för sökvägen \"%s\"" -#: merge-recursive.c:301 +#: merge-recursive.c:303 msgid "error building trees" msgstr "fel vid byggande av träd" -#: merge-recursive.c:720 +#: merge-recursive.c:727 #, c-format msgid "failed to create path '%s'%s" msgstr "misslyckades skapa sökvägen \"%s\"%s" -#: merge-recursive.c:731 +#: merge-recursive.c:738 #, 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:745 merge-recursive.c:764 +#: merge-recursive.c:752 merge-recursive.c:771 msgid ": perhaps a D/F conflict?" msgstr ": kanske en K/F-konflikt?" -#: merge-recursive.c:754 +#: merge-recursive.c:761 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "vägrar förlora ospårad fil vid \"%s\"" -#: merge-recursive.c:796 builtin/cat-file.c:34 +#: merge-recursive.c:803 builtin/cat-file.c:34 #, c-format msgid "cannot read object %s '%s'" msgstr "kan inte läsa objektet %s: \"%s\"" -#: merge-recursive.c:798 +#: merge-recursive.c:805 #, c-format msgid "blob expected for %s '%s'" msgstr "blob förväntades för %s \"%s\"" -#: merge-recursive.c:822 +#: merge-recursive.c:829 #, c-format msgid "failed to open '%s': %s" msgstr "misslyckades öppna \"%s\": %s" -#: merge-recursive.c:833 +#: merge-recursive.c:840 #, c-format msgid "failed to symlink '%s': %s" msgstr "misslyckades skapa symboliska länken \"%s\": %s" -#: merge-recursive.c:838 +#: merge-recursive.c:845 #, 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:978 +#: merge-recursive.c:985 msgid "Failed to execute internal merge" msgstr "Misslyckades exekvera intern sammanslagning" -#: merge-recursive.c:982 +#: merge-recursive.c:989 #, c-format msgid "Unable to add %s to database" msgstr "Kunde inte lägga till %s till databasen" -#: merge-recursive.c:1081 merge-recursive.c:1095 +#: merge-recursive.c:1088 merge-recursive.c:1102 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -1962,7 +1983,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:1087 merge-recursive.c:1100 +#: merge-recursive.c:1094 merge-recursive.c:1107 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -1971,20 +1992,20 @@ 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:1143 +#: merge-recursive.c:1150 msgid "rename" msgstr "namnbyte" -#: merge-recursive.c:1143 +#: merge-recursive.c:1150 msgid "renamed" msgstr "namnbytt" -#: merge-recursive.c:1200 +#: merge-recursive.c:1207 #, 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:1225 +#: merge-recursive.c:1232 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -1993,135 +2014,135 @@ msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" " "namnbyte \"%s\"->\"%s\" i \"%s\"%s" -#: merge-recursive.c:1230 +#: merge-recursive.c:1237 msgid " (left unresolved)" msgstr " (lämnad olöst)" -#: merge-recursive.c:1292 +#: merge-recursive.c:1299 #, 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:1325 +#: merge-recursive.c:1332 #, 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:1531 +#: merge-recursive.c:1538 #, 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:1546 +#: merge-recursive.c:1553 #, c-format msgid "Adding merged %s" msgstr "Lägger till sammanslagen %s" -#: merge-recursive.c:1553 merge-recursive.c:1766 +#: merge-recursive.c:1560 merge-recursive.c:1774 #, c-format msgid "Adding as %s instead" msgstr "Lägger till som %s istället" -#: merge-recursive.c:1610 +#: merge-recursive.c:1617 #, c-format msgid "cannot read object %s" msgstr "kan inte läsa objektet %s" -#: merge-recursive.c:1613 +#: merge-recursive.c:1620 #, c-format msgid "object %s is not a blob" msgstr "objektet %s är inte en blob" -#: merge-recursive.c:1666 +#: merge-recursive.c:1673 msgid "modify" msgstr "ändra" -#: merge-recursive.c:1666 +#: merge-recursive.c:1673 msgid "modified" msgstr "ändrad" -#: merge-recursive.c:1676 +#: merge-recursive.c:1683 msgid "content" msgstr "innehåll" -#: merge-recursive.c:1683 +#: merge-recursive.c:1690 msgid "add/add" msgstr "tillägg/tillägg" -#: merge-recursive.c:1718 +#: merge-recursive.c:1726 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Hoppade över %s (sammanslagen samma som befintlig)" -#: merge-recursive.c:1732 +#: merge-recursive.c:1740 #, c-format msgid "Auto-merging %s" msgstr "Slår ihop %s automatiskt" -#: merge-recursive.c:1736 git-submodule.sh:924 +#: merge-recursive.c:1744 git-submodule.sh:930 msgid "submodule" msgstr "undermodul" -#: merge-recursive.c:1737 +#: merge-recursive.c:1745 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s" -#: merge-recursive.c:1831 +#: merge-recursive.c:1839 #, c-format msgid "Removing %s" msgstr "Tar bort %s" -#: merge-recursive.c:1857 +#: merge-recursive.c:1865 msgid "file/directory" msgstr "fil/katalog" -#: merge-recursive.c:1863 +#: merge-recursive.c:1871 msgid "directory/file" msgstr "katalog/fil" -#: merge-recursive.c:1868 +#: merge-recursive.c:1877 #, 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:1877 +#: merge-recursive.c:1886 #, c-format msgid "Adding %s" msgstr "Lägger till %s" -#: merge-recursive.c:1914 +#: merge-recursive.c:1923 msgid "Already up-to-date!" msgstr "Redan à jour!" -#: merge-recursive.c:1923 +#: merge-recursive.c:1932 #, c-format msgid "merging of trees %s and %s failed" msgstr "sammanslagning av träden %s och %s misslyckades" -#: merge-recursive.c:2006 +#: merge-recursive.c:2015 msgid "Merging:" msgstr "Slår ihop:" -#: merge-recursive.c:2019 +#: merge-recursive.c:2028 #, 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:2058 +#: merge-recursive.c:2067 msgid "merge returned no commit" msgstr "sammanslagningen returnerade ingen incheckning" -#: merge-recursive.c:2121 +#: merge-recursive.c:2130 #, c-format msgid "Could not parse object '%s'" msgstr "Kunde inte tolka objektet \"%s\"" -#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788 +#: merge-recursive.c:2144 builtin/merge.c:645 builtin/merge.c:792 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." @@ -2203,12 +2224,12 @@ msgstr "felformat objektnamn \"%s\"" msgid "Could not make %s writable by group" msgstr "Kunde inte göra %s skrivbar för gruppen" -#: pathspec.c:133 +#: pathspec.c:142 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" "de globala sökvägsinställningarna \"glob\" och \"noglob\" är inkompatibla" -#: pathspec.c:143 +#: pathspec.c:149 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -2216,46 +2237,51 @@ msgstr "" "den globala sökvägsinställningen \"literal\" är inkompatibel med alla andra " "globala sökvägsinställningar" -#: pathspec.c:177 +#: pathspec.c:188 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "ogiltig parameter för sökvägsuttrycket för \"prefix\"" -#: pathspec.c:183 +#: pathspec.c:201 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "felaktigt sökvägsuttryck \"%.*s\" i \"%s\"" -#: pathspec.c:187 +#: pathspec.c:206 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "\")\" saknas i slutet av sökvägsuttrycket för \"%s\"" -#: pathspec.c:205 +#: pathspec.c:238 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Tecknet \"%c\" i sökvägsuttrycket i \"%s\" har inte implementerats" -#: pathspec.c:230 +#: pathspec.c:293 pathspec.c:315 +#, c-format +msgid "Pathspec '%s' is in submodule '%.*s'" +msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\"" + +#: pathspec.c:350 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: \"literal\" och \"glob\" är inkompatibla" -#: pathspec.c:241 +#: pathspec.c:363 #, c-format msgid "%s: '%s' is outside repository" msgstr "%s: \"%s\" är utanför arkivet" -#: pathspec.c:291 +#: pathspec.c:451 #, c-format -msgid "Pathspec '%s' is in submodule '%.*s'" -msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\"" +msgid "'%s' (mnemonic: '%c')" +msgstr "\"%s\" (minnesstöd: \"%c\")" -#: pathspec.c:353 +#: pathspec.c:461 #, c-format 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:408 +#: pathspec.c:511 msgid "" "empty strings as pathspecs will be made invalid in upcoming releases. please " "use . instead if you meant to match all paths" @@ -2263,12 +2289,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:440 +#: pathspec.c:535 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk" -#: pathspec.c:449 +#: pathspec.c:544 msgid "" "There is nothing to exclude from by :(exclude) patterns.\n" "Perhaps you forgot to add either ':/' or '.' ?" @@ -2276,11 +2302,11 @@ msgstr "" "Ingenting att exkludera från med :(exkludera)-mönster.\n" "Glömde du kanske att antingen lägga till \":/\" eller \".\"?" -#: pretty.c:971 +#: pretty.c:982 msgid "unable to parse --pretty format" msgstr "kunde inte tolka format för --pretty" -#: read-cache.c:1315 +#: read-cache.c:1307 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -2289,7 +2315,7 @@ msgstr "" "index.version satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:1325 +#: read-cache.c:1317 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -2298,7 +2324,7 @@ msgstr "" "GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n" "Använder version %i" -#: refs.c:576 builtin/merge.c:840 +#: refs.c:576 builtin/merge.c:844 #, c-format msgid "Could not open '%s' for writing" msgstr "Kunde inte öppna \"%s\" för skrivning" @@ -2318,227 +2344,232 @@ msgstr "kunde inte ta bort referenser: %s" msgid "could not remove reference %s" msgstr "kunde inte ta bort referensen %s" -#: ref-filter.c:55 +#: ref-filter.c:56 #, c-format msgid "expected format: %%(color:<color>)" msgstr "förväntat format: %%(color:<color>)" -#: ref-filter.c:57 +#: ref-filter.c:58 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "okänd färg: %%(color:%s)" -#: ref-filter.c:71 +#: ref-filter.c:72 #, c-format msgid "unrecognized format: %%(%s)" msgstr "okänt format: %%(%s)" -#: ref-filter.c:77 +#: ref-filter.c:78 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) tar inte argument" -#: ref-filter.c:84 +#: ref-filter.c:85 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) tar inte argument" -#: ref-filter.c:101 +#: ref-filter.c:92 +#, c-format +msgid "%%(trailers) does not take arguments" +msgstr "%%(trailers) tar inte argument" + +#: ref-filter.c:111 #, c-format msgid "positive value expected contents:lines=%s" msgstr "positivt värde förväntat contents:lines=%s" -#: ref-filter.c:103 +#: ref-filter.c:113 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "okänt %%(contents)-argument: %s" -#: ref-filter.c:113 +#: ref-filter.c:123 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "okänt %%(objectname)-argument: %s" -#: ref-filter.c:135 +#: ref-filter.c:145 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "förväntat format: %%(align:<bredd>,<position>)" -#: ref-filter.c:147 +#: ref-filter.c:157 #, c-format msgid "unrecognized position:%s" msgstr "okänd position:%s" -#: ref-filter.c:151 +#: ref-filter.c:161 #, c-format msgid "unrecognized width:%s" msgstr "okänd bredd:%s" -#: ref-filter.c:157 +#: ref-filter.c:167 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "okänt %%(align)-argument: %s" -#: ref-filter.c:161 +#: ref-filter.c:171 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "positiv bredd förväntad med atomen %%(align)" -#: ref-filter.c:244 +#: ref-filter.c:255 #, c-format msgid "malformed field name: %.*s" msgstr "felformat fältnamn: %.*s" -#: ref-filter.c:270 +#: ref-filter.c:281 #, c-format msgid "unknown field name: %.*s" msgstr "okänt fältnamn: %.*s" -#: ref-filter.c:372 +#: ref-filter.c:383 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "format: atomen %%(end) använd utan motsvarande atom" -#: ref-filter.c:424 +#: ref-filter.c:435 #, c-format msgid "malformed format string %s" msgstr "felformad formatsträng %s" -#: ref-filter.c:878 +#: ref-filter.c:898 msgid ":strip= requires a positive integer argument" msgstr ":strip= kräver ett positivt heltalsargument" -#: ref-filter.c:883 +#: ref-filter.c:903 #, c-format msgid "ref '%s' does not have %ld components to :strip" msgstr "referensen \"%s\" har inte %ld komponenter för :strip" -#: ref-filter.c:1046 +#: ref-filter.c:1066 #, c-format msgid "unknown %.*s format %s" msgstr "okänt \"%.*s\"-format %s" -#: ref-filter.c:1066 ref-filter.c:1097 +#: ref-filter.c:1086 ref-filter.c:1117 #, c-format msgid "missing object %s for %s" msgstr "objektet %s saknas för %s" -#: ref-filter.c:1069 ref-filter.c:1100 +#: ref-filter.c:1089 ref-filter.c:1120 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer misslyckades på %s för %s" -#: ref-filter.c:1311 +#: ref-filter.c:1343 #, c-format msgid "malformed object at '%s'" msgstr "felformat objekt vid \"%s\"" -#: ref-filter.c:1373 +#: ref-filter.c:1410 #, c-format msgid "ignoring ref with broken name %s" msgstr "ignorerar referens med trasigt namn %s" -#: ref-filter.c:1378 +#: ref-filter.c:1415 #, c-format msgid "ignoring broken ref %s" msgstr "ignorerar trasig referens %s" -#: ref-filter.c:1633 +#: ref-filter.c:1670 #, c-format msgid "format: %%(end) atom missing" msgstr "format: atomen %%(end) saknas" -#: ref-filter.c:1687 +#: ref-filter.c:1734 #, c-format msgid "malformed object name %s" msgstr "felformat objektnamn %s" -#: remote.c:746 +#: remote.c:754 #, 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:750 +#: remote.c:758 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s spårar vanligtvis %s, inte %s" -#: remote.c:754 +#: remote.c:762 #, c-format msgid "%s tracks both %s and %s" msgstr "%s spårar både %s och %s" -#: remote.c:762 +#: remote.c:770 msgid "Internal error" msgstr "Internt fel" -#: remote.c:1677 remote.c:1720 +#: remote.c:1685 remote.c:1787 msgid "HEAD does not point to a branch" msgstr "HEAD pekar inte på en gren" -#: remote.c:1686 +#: remote.c:1694 #, c-format msgid "no such branch: '%s'" msgstr "okänd gren: \"%s\"" -#: remote.c:1689 +#: remote.c:1697 #, c-format msgid "no upstream configured for branch '%s'" msgstr "ingen standarduppström angiven för grenen \"%s\"" -#: remote.c:1695 +#: remote.c:1703 #, 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:1710 +#: remote.c:1718 #, 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:1730 #, 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:1741 #, 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:1754 msgid "push has no destination (push.default is 'nothing')" msgstr "\"push\" har inget mål (push.default är \"ingenting\")" -#: remote.c:1771 +#: remote.c:1776 msgid "cannot resolve 'simple' push to a single destination" msgstr "\"enkel push\" motsvarar flera olika mål" -#: remote.c:2073 +#: remote.c:2081 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Din gren är baserad på \"%s\", men den har försvunnit uppströms.\n" -#: remote.c:2077 +#: remote.c:2085 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n" -#: remote.c:2080 +#: remote.c:2088 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "Din gren är à jour med \"%s\".\n" -#: remote.c:2084 +#: remote.c:2092 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Din gren ligger före \"%s\" med %d incheckning.\n" msgstr[1] "Din gren ligger före \"%s\" med %d incheckningar.\n" -#: remote.c:2090 +#: remote.c:2098 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (använd \"git push\" för att publicera dina lokala incheckningar)\n" -#: remote.c:2093 +#: remote.c:2101 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -2548,11 +2579,11 @@ msgstr[0] "" msgstr[1] "" "Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n" -#: remote.c:2101 +#: remote.c:2109 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (använd \"git pull\" för att uppdatera din lokala gren)\n" -#: remote.c:2104 +#: remote.c:2112 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -2567,7 +2598,7 @@ msgstr[1] "" "Din gren och \"%s\" har divergerat,\n" "och har %d respektive %d olika incheckningar.\n" -#: remote.c:2114 +#: remote.c:2122 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" @@ -2584,11 +2615,11 @@ msgstr "din nuvarande gren \"%s\" innehåller ännu inte några incheckningar" msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent är inkompatibelt med --bisect" -#: run-command.c:106 +#: run-command.c:125 msgid "open /dev/null failed" msgstr "misslyckades öppna /dev/null" -#: run-command.c:108 +#: run-command.c:127 #, c-format msgid "dup2(%d,%d) failed" msgstr "dup2(%d,%d) misslyckades" @@ -2617,15 +2648,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:171 +#: sequencer.c:215 msgid "revert" msgstr "revert" -#: sequencer.c:171 +#: sequencer.c:217 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:228 +#: sequencer.c:219 +msgid "rebase -i" +msgstr "rebase -i" + +#: sequencer.c:221 +#, c-format +msgid "Unknown action: %d" +msgstr "Okänd funktion: %d" + +#: sequencer.c:278 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -2633,7 +2673,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:231 +#: sequencer.c:281 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -2643,60 +2683,63 @@ msgstr "" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n" "och checka in resultatet med \"git commit\"" -#: sequencer.c:244 sequencer.c:1209 +#: sequencer.c:294 sequencer.c:1667 #, c-format msgid "could not lock '%s'" msgstr "kunde inte låsa \"%s\"" -#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214 +#: sequencer.c:297 sequencer.c:1545 sequencer.c:1672 sequencer.c:1686 #, c-format msgid "could not write to '%s'" msgstr "kunde inte skriva till \"%s\"" -#: sequencer.c:251 +#: sequencer.c:301 #, c-format msgid "could not write eol to '%s'" msgstr "kunde inte skriva radslut till \"%s\"" -#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216 +#: sequencer.c:305 sequencer.c:1550 sequencer.c:1674 #, c-format msgid "failed to finalize '%s'." msgstr "misslyckades färdigställa \"%s\"." -#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032 +#: sequencer.c:329 sequencer.c:808 sequencer.c:1571 builtin/am.c:259 +#: builtin/commit.c:749 builtin/merge.c:1036 #, c-format msgid "could not read '%s'" msgstr "kunde inte läsa \"%s\"" -#: sequencer.c:305 +#: sequencer.c:355 #, c-format msgid "your local changes would be overwritten by %s." msgstr "dina lokala ändringar skulle skrivas över av %s." -#: sequencer.c:309 +#: sequencer.c:359 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:324 +#: sequencer.c:388 #, c-format msgid "%s: fast-forward" msgstr "%s: snabbspola" -#. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:399 +#. TRANSLATORS: %s will be "revert", "cherry-pick" or +#. * "rebase -i". +#. +#: sequencer.c:470 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Kunde inte skriva ny indexfil" -#: sequencer.c:418 +#: sequencer.c:489 msgid "could not resolve HEAD commit\n" msgstr "kunde inte bestämma HEAD:s incheckning\n" -#: sequencer.c:438 +#: sequencer.c:509 msgid "unable to update cache tree\n" msgstr "kan inte uppdatera cacheträd\n" -#: sequencer.c:483 +#: sequencer.c:592 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -2725,172 +2768,394 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:567 +#: sequencer.c:688 #, c-format msgid "could not parse commit %s\n" msgstr "kunde inte tolka incheckningen %s\n" -#: sequencer.c:572 +#: sequencer.c:693 #, c-format msgid "could not parse parent commit %s\n" msgstr "kunde inte tolka föräldraincheckningen %s\n" -#: sequencer.c:656 +#: sequencer.c:815 +#, c-format +msgid "" +"unexpected 1st line of squash message:\n" +"\n" +"\t%.*s" +msgstr "" +"oväntad första rad i squash-meddelande:\n" +"\n" +"\t%.*s" + +#: sequencer.c:821 +#, c-format +msgid "" +"invalid 1st line of squash message:\n" +"\n" +"\t%.*s" +msgstr "" +"ogiltig första rad i squash-meddelande:\n" +"\n" +"\t%.*s" + +#: sequencer.c:827 sequencer.c:852 +#, c-format +msgid "This is a combination of %d commits." +msgstr "Det här är en kombination av %d incheckningar." + +#: sequencer.c:836 +msgid "need a HEAD to fixup" +msgstr "behöver en HEAD-incheckning att rätta" + +#: sequencer.c:838 +msgid "could not read HEAD" +msgstr "kunde inte läsa HEAD" + +#: sequencer.c:840 +msgid "could not read HEAD's commit message" +msgstr "kunde inte läsa HEAD:s incheckningsmeddelande" + +#: sequencer.c:846 +#, c-format +msgid "cannot write '%s'" +msgstr "kan inte skriva \"%s\"" + +#: sequencer.c:855 git-rebase--interactive.sh:445 +msgid "This is the 1st commit message:" +msgstr "Det här är 1:a incheckningsmeddelandet:" + +#: sequencer.c:863 +#, c-format +msgid "could not read commit message of %s" +msgstr "kunde inte läsa incheckningsmeddelande för %s" + +#: sequencer.c:870 +#, c-format +msgid "This is the commit message #%d:" +msgstr "Det här är incheckningsmeddelande %d:" + +#: sequencer.c:875 +#, c-format +msgid "The commit message #%d will be skipped:" +msgstr "Incheckningsmeddelande %d kommer hoppas över:" + +#: sequencer.c:880 +#, c-format +msgid "unknown command: %d" +msgstr "okänt kommando: %d" + +#: sequencer.c:946 msgid "your index file is unmerged." msgstr "din indexfil har inte slagits ihop." -#: sequencer.c:675 +#: sequencer.c:964 #, 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:683 +#: sequencer.c:972 #, c-format msgid "commit %s does not have parent %d" msgstr "incheckning %s har inte förälder %d" -#: sequencer.c:687 +#: sequencer.c:976 #, 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:982 +#, 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:700 +#: sequencer.c:1001 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kan inte tolka föräldraincheckningen %s" -#: sequencer.c:705 +#: sequencer.c:1063 sequencer.c:1812 #, c-format -msgid "cannot get commit message for %s" -msgstr "kan inte hämta incheckningsmeddelande för %s" +msgid "could not rename '%s' to '%s'" +msgstr "kunde inte byta namn på \"%s\" till \"%s\"" -#: sequencer.c:797 +#: sequencer.c:1114 #, c-format msgid "could not revert %s... %s" msgstr "kunde inte ångra %s... %s" -#: sequencer.c:798 +#: sequencer.c:1115 #, c-format msgid "could not apply %s... %s" msgstr "kunde inte tillämpa %s... %s" -#: sequencer.c:833 +#: sequencer.c:1157 msgid "empty commit set passed" msgstr "den angivna uppsättningen incheckningar är tom" -#: sequencer.c:843 +#: sequencer.c:1167 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: misslyckades läsa indexet" -#: sequencer.c:850 +#: sequencer.c:1174 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: misslyckades uppdatera indexet" -#: sequencer.c:944 +#: sequencer.c:1294 #, c-format msgid "invalid line %d: %.*s" msgstr "ogiltig rad %d: %.*s" -#: sequencer.c:950 -msgid "no commits parsed." -msgstr "inga incheckningar lästes." +#: sequencer.c:1302 +#, c-format +msgid "cannot '%s' without a previous commit" +msgstr "Kan inte utföra \"%s\" utan en föregående incheckning" -#: sequencer.c:966 +#: sequencer.c:1334 #, c-format msgid "could not read '%s'." msgstr "kunde inte läsa \"%s\"." -#: sequencer.c:972 +#: sequencer.c:1341 +msgid "please fix this using 'git rebase --edit-todo'." +msgstr "rätta det med \"git rebase --edit-todo\"." + +#: sequencer.c:1343 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "oanvändbart manus: %s" -#: sequencer.c:983 +#: sequencer.c:1348 +msgid "no commits parsed." +msgstr "inga incheckningar lästes." + +#: sequencer.c:1359 msgid "cannot cherry-pick during a revert." msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"." -#: sequencer.c:985 +#: sequencer.c:1361 msgid "cannot revert during a cherry-pick." msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"." -#: sequencer.c:1028 +#: sequencer.c:1424 #, c-format msgid "invalid key: %s" msgstr "felaktig nyckel: %s" -#: sequencer.c:1031 +#: sequencer.c:1427 #, c-format msgid "invalid value for %s: %s" msgstr "felaktigt värde för %s: %s" -#: sequencer.c:1063 +#: sequencer.c:1484 #, c-format msgid "malformed options sheet: '%s'" msgstr "trasigt manus: %s" -#: sequencer.c:1101 +#: sequencer.c:1522 msgid "a cherry-pick or revert is already in progress" msgstr "en \"cherry-pick\" eller \"revert\" pågår redan" -#: sequencer.c:1102 +#: sequencer.c:1523 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:1106 +#: sequencer.c:1526 #, c-format msgid "could not create sequencer directory '%s'" msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\"" -#: sequencer.c:1120 +#: sequencer.c:1540 msgid "could not lock HEAD" msgstr "kunde inte låsa HEAD" -#: sequencer.c:1151 sequencer.c:1289 +#: sequencer.c:1596 sequencer.c:2150 msgid "no cherry-pick or revert in progress" msgstr "ingen \"cherry-pick\" eller \"revert\" pågår" -#: sequencer.c:1153 +#: sequencer.c:1598 msgid "cannot resolve HEAD" msgstr "kan inte bestämma HEAD" -#: sequencer.c:1155 sequencer.c:1189 +#: sequencer.c:1600 sequencer.c:1634 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:1175 builtin/grep.c:578 +#: sequencer.c:1620 builtin/grep.c:904 #, c-format msgid "cannot open '%s'" msgstr "kan inte öppna \"%s\"" -#: sequencer.c:1177 +#: sequencer.c:1622 #, c-format msgid "cannot read '%s': %s" msgstr "kan inte läsa \"%s\": %s" -#: sequencer.c:1178 +#: sequencer.c:1623 msgid "unexpected end of file" msgstr "oväntat filslut" -#: sequencer.c:1184 +#: sequencer.c:1629 #, 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:1354 +#: sequencer.c:1640 +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:1777 sequencer.c:2049 +msgid "cannot read HEAD" +msgstr "kan inte läsa HEAD" + +#: sequencer.c:1817 builtin/difftool.c:574 +#, c-format +msgid "could not copy '%s' to '%s'" +msgstr "kunde inte kopiera in \"%s\" till \"%s\"" + +#: sequencer.c:1833 +msgid "could not read index" +msgstr "Kunde inte läsa indexet" + +#: sequencer.c:1838 +#, c-format +msgid "" +"execution failed: %s\n" +"%sYou can fix the problem, and then run\n" +"\n" +" git rebase --continue\n" +"\n" +msgstr "" +"körningen misslyckades: %s\n" +"%sDu kan rätta problemet och sedan köra\n" +"\n" +"\tgit rebase --continue\n" +"\n" + +#: sequencer.c:1844 +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:1850 +#, 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 "" +"körningen lyckades: %s\n" +"men lämnade kvar ändringar i indexet och/eller arbetskatalogen\n" +"Checka in eller utför \"stash\" på ändringarna och kör sedan\n" +"\n" +"\tgit rebase --continue\n" +"\n" + +#: sequencer.c:1905 git-rebase.sh:168 +#, c-format +msgid "Applied autostash." +msgstr "Tillämpade autostash." + +#: sequencer.c:1917 +#, c-format +msgid "cannot store %s" +msgstr "kan inte spara %s" + +#: sequencer.c:1919 git-rebase.sh:172 +#, 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 "" +"Tillämpning av autostash gav konflikter.\n" +"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:2000 +#, c-format +msgid "stopped at %s... %.*s" +msgstr "stoppade på %s... %.*s" + +#: sequencer.c:2027 +#, c-format +msgid "unknown command %d" +msgstr "okänt kommando %d" + +#: sequencer.c:2057 +msgid "could not read orig-head" +msgstr "Kunde inte läsa orig-head" + +#: sequencer.c:2061 +msgid "could not read 'onto'" +msgstr "kunde inte läsa \"onto\"" + +#: sequencer.c:2068 +#, c-format +msgid "could not update %s" +msgstr "kunde inte uppdatera %s" + +#: sequencer.c:2075 +#, c-format +msgid "could not update HEAD to %s" +msgstr "kunde inte uppdatera HEAD till %s" + +#: sequencer.c:2159 +msgid "cannot rebase: You have unstaged changes." +msgstr "kan inte ombasera: Du har oköade ändringar." + +#: sequencer.c:2164 +msgid "could not remove CHERRY_PICK_HEAD" +msgstr "kunde inte ta bort CHERRY_PICK_HEAD" + +#: sequencer.c:2173 +msgid "cannot amend non-existing commit" +msgstr "kan inte lägga till incheckning som inte finns" + +#: sequencer.c:2175 +#, c-format +msgid "invalid file: '%s'" +msgstr "ogiltig fil: \"%s\"" + +#: sequencer.c:2177 +#, c-format +msgid "invalid contents: '%s'" +msgstr "ogiltigt innehåll: \"%s\"" + +#: sequencer.c:2180 +msgid "" +"\n" +"You have uncommitted changes in your working tree. Please, commit them\n" +"first and then run 'git rebase --continue' again." +msgstr "" +"\n" +"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:2190 +msgid "could not commit staged changes." +msgstr "kunde inte checka in köade ändringar." + +#: sequencer.c:2270 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\"" -#: sequencer.c:1358 +#: sequencer.c:2274 #, c-format msgid "%s: bad revision" msgstr "%s: felaktig revision" -#: sequencer.c:1391 +#: sequencer.c:2307 msgid "can't revert as initial commit" msgstr "kan inte ångra som första incheckning" @@ -2927,29 +3192,29 @@ msgstr "" "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n" "\"git <kommando> [<revision>...] -- [<fil>...]\"" -#: setup.c:468 +#: setup.c:470 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Förväntade git-arkivversion <= %d, hittade %d" -#: setup.c:476 +#: setup.c:478 msgid "unknown repository extensions found:" msgstr "okända arkivutökningar hittades:" -#: setup.c:762 +#: setup.c:768 #, 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:764 setup.c:915 builtin/index-pack.c:1641 +#: setup.c:770 setup.c:922 builtin/index-pack.c:1643 msgid "Cannot come back to cwd" msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)" -#: setup.c:845 +#: setup.c:852 msgid "Unable to read current working directory" msgstr "Kan inte läsa aktuell arbetskatalog" -#: setup.c:920 +#: setup.c:927 #, c-format msgid "" "Not a git repository (or any parent up to mount point %s)\n" @@ -2959,12 +3224,12 @@ msgstr "" "monteringspunkten %s)\n" "Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)." -#: setup.c:927 +#: setup.c:934 #, c-format msgid "Cannot change to '%s/..'" msgstr "kan inte byta till \"%s/..\"" -#: setup.c:989 +#: setup.c:996 #, c-format msgid "" "Problem with core.sharedRepository filemode value (0%.3o).\n" @@ -2973,41 +3238,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:473 +#: sha1_file.c:490 #, c-format msgid "path '%s' does not exist" msgstr "sökvägen \"%s\" finns inte" -#: sha1_file.c:499 +#: sha1_file.c:516 #, 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:505 +#: sha1_file.c:522 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv." -#: sha1_file.c:511 +#: sha1_file.c:528 #, c-format msgid "reference repository '%s' is shallow" msgstr "referensarkivet \"%s\" är grunt" -#: sha1_file.c:519 +#: sha1_file.c:536 #, c-format msgid "reference repository '%s' is grafted" msgstr "referensarkivet \"%s\" är ympat" -#: sha1_file.c:1159 +#: sha1_file.c:1176 msgid "offset before end of packfile (broken .idx?)" msgstr "offset före slutet av packfilen (trasig .idx?)" -#: sha1_file.c:2592 +#: sha1_file.c:2637 #, 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:2596 +#: sha1_file.c:2641 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "offset borton slutet av packindex för %s (trunkerat index?)" @@ -3043,90 +3308,135 @@ 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:64 submodule.c:98 +#: submodule.c:65 submodule.c:99 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:68 submodule.c:102 +#: submodule.c:69 submodule.c:103 #, 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:76 +#: submodule.c:77 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Kunde inte uppdatera .gitmodules-posten %s" -#: submodule.c:109 +#: submodule.c:110 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "Kunde inte ta bort .gitmodules-posten för %s" -#: submodule.c:120 +#: submodule.c:121 msgid "staging updated .gitmodules failed" msgstr "misslyckades köa uppdaterad .gitmodules" -#: submodule.c:158 +#: submodule.c:159 msgid "negative values not allowed for submodule.fetchJobs" msgstr "negativa värden är inte tillåtna för submodule.fetchJobs" -#: submodule-config.c:358 +#: submodule.c:1184 +#, c-format +msgid "could not start 'git status in submodule '%s'" +msgstr "kunde inte starta \"git status\" i undermodulen \"%s\"" + +#: submodule.c:1197 +#, c-format +msgid "could not run 'git status in submodule '%s'" +msgstr "kunde inte köra \"git status\" i undermodulen \"%s\"" + +#: submodule.c:1398 +#, c-format +msgid "" +"relocate_gitdir for submodule '%s' with more than one worktree not supported" +msgstr "" +"relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, " +"stöds ej" + +#: submodule.c:1410 submodule.c:1471 +#, c-format +msgid "could not lookup name for submodule '%s'" +msgstr "kunde inte slå upp namnet för undermodulen \"%s\"" + +#: submodule.c:1414 submodule.c:1474 builtin/submodule--helper.c:640 +#: builtin/submodule--helper.c:650 +#, c-format +msgid "could not create directory '%s'" +msgstr "kunde inte skapa katalogen \"%s\"" + +#: submodule.c:1420 +#, c-format +msgid "" +"Migrating git directory of '%s%s' from\n" +"'%s' to\n" +"'%s'\n" +msgstr "" +"Migrerar git-katalogen för \"%s%s\" från\n" +"\"%s\" till\n" +"\"%s\"\n" + +#: submodule.c:1512 +#, c-format +msgid "could not recurse into submodule '%s'" +msgstr "kunde inte rekursera in i undermodulen \"%s\"" + +#: submodule-config.c:360 #, c-format msgid "invalid value for %s" msgstr "ogiltigt värde för %s" -#: trailer.c:238 +#: trailer.c:240 #, c-format msgid "running trailer command '%s' failed" msgstr "misslyckades utföra \"trailer\"-kommandot \"%s\"" -#: trailer.c:471 trailer.c:475 trailer.c:479 trailer.c:533 trailer.c:537 -#: trailer.c:541 +#: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539 +#: trailer.c:543 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "okänt värde \"%s\" för nyckeln \"%s\"" -#: trailer.c:523 trailer.c:528 builtin/remote.c:289 +#: trailer.c:525 trailer.c:530 builtin/remote.c:289 #, c-format msgid "more than one %s" msgstr "mer än en %s" -#: trailer.c:672 +#: trailer.c:702 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "tom släpradssymbol i släpraden \"%.*s\"" -#: trailer.c:695 +#: trailer.c:722 #, c-format msgid "could not read input file '%s'" msgstr "kunde inte läsa indatafilen \"%s\"" -#: trailer.c:698 +#: trailer.c:725 msgid "could not read from stdin" msgstr "Kunde inte läsa från standard in" -#: trailer.c:929 builtin/am.c:44 +#: trailer.c:949 builtin/am.c:44 #, c-format msgid "could not stat %s" msgstr "kunde inte ta status på %s" -#: trailer.c:931 +#: trailer.c:951 #, c-format msgid "file %s is not a regular file" msgstr "filen %s är inte en normal fil" -#: trailer.c:933 +#: trailer.c:953 #, c-format msgid "file %s is not writable by user" msgstr "filen %s är inte skrivbar av användaren" -#: trailer.c:945 +#: trailer.c:965 msgid "could not open temporary file" msgstr "kunde inte öppna temporär file" -#: trailer.c:983 +#: trailer.c:1001 #, c-format msgid "could not rename temporary file to %s" msgstr "kunde inte byta namn på temporär fil till %s" @@ -3141,7 +3451,7 @@ msgstr "Skulle sätta uppströms för \"%s\" till \"%s\" från \"%s\"\n" msgid "transport: invalid depth option '%s'" msgstr "transport: ogiltig flagga för depth: %s" -#: transport.c:817 +#: transport.c:885 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -3150,7 +3460,7 @@ msgstr "" "Följande undermodulsökvägar innehåller ändringar som\n" "inte kan hittas av fjärrarna:\n" -#: transport.c:821 +#: transport.c:889 #, c-format msgid "" "\n" @@ -3177,7 +3487,7 @@ msgstr "" "för att sända dem till fjärren.\n" "\n" -#: transport.c:829 +#: transport.c:897 msgid "Aborting." msgstr "Avbryter." @@ -3202,7 +3512,7 @@ msgstr "tomt filnamn i trädpost" msgid "too-short tree file" msgstr "trädfil för kort" -#: unpack-trees.c:64 +#: unpack-trees.c:99 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3211,7 +3521,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:66 +#: unpack-trees.c:101 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3220,7 +3530,7 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n" "%%s" -#: unpack-trees.c:69 +#: unpack-trees.c:104 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3230,7 +3540,7 @@ msgstr "" "sammanslagning:\n" "%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren." -#: unpack-trees.c:71 +#: unpack-trees.c:106 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3240,7 +3550,7 @@ msgstr "" "sammanslagning:\n" "%%s" -#: unpack-trees.c:74 +#: unpack-trees.c:109 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -3249,7 +3559,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:76 +#: unpack-trees.c:111 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -3258,17 +3568,17 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n" "%%s" -#: unpack-trees.c:81 +#: unpack-trees.c:116 #, c-format msgid "" -"Updating the following directories would lose untracked files in it:\n" +"Updating the following directories would lose untracked files in them:\n" "%s" msgstr "" "Uppdatering av följande kataloger gör att ospårade filer går förlorade i " "dem:\n" "%s" -#: unpack-trees.c:85 +#: unpack-trees.c:120 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -3277,7 +3587,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:87 +#: unpack-trees.c:122 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -3286,7 +3596,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n" "%%s" -#: unpack-trees.c:90 +#: unpack-trees.c:125 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -3296,7 +3606,7 @@ msgstr "" "sammanslagningen:\n" "%%sFlytta eller ta bort dem innan du slår samman." -#: unpack-trees.c:92 +#: unpack-trees.c:127 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -3306,7 +3616,7 @@ msgstr "" "sammanslagningen:\n" "%%s" -#: unpack-trees.c:95 +#: unpack-trees.c:130 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -3315,7 +3625,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:97 +#: unpack-trees.c:132 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -3324,7 +3634,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n" "%%s" -#: unpack-trees.c:102 +#: unpack-trees.c:137 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3335,7 +3645,7 @@ msgstr "" "utcheckningen:\n" "%%sFlytta eller ta bort dem innan du byter gren." -#: unpack-trees.c:104 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3346,7 +3656,7 @@ msgstr "" "utcheckningen:\n" "%%s" -#: unpack-trees.c:107 +#: unpack-trees.c:142 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -3356,7 +3666,7 @@ msgstr "" "sammanslagningen:\n" "%%sFlytta eller ta bort dem innan du byter gren." -#: unpack-trees.c:109 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -3366,7 +3676,7 @@ msgstr "" "sammanslagningen:\n" "%%s" -#: unpack-trees.c:112 +#: unpack-trees.c:147 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -3375,7 +3685,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:114 +#: unpack-trees.c:149 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -3384,12 +3694,12 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n" "%%s" -#: unpack-trees.c:121 +#: unpack-trees.c:156 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "Posten \"%s\" överlappar \"%s\". Kan inte binda." -#: unpack-trees.c:124 +#: unpack-trees.c:159 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up-to-date:\n" @@ -3398,7 +3708,7 @@ msgstr "" "Kan inte uppdatera gles utcheckning: följande poster är inte àjour:\n" "%s" -#: unpack-trees.c:126 +#: unpack-trees.c:161 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -3409,7 +3719,7 @@ msgstr "" "utcheckning:\n" "%s" -#: unpack-trees.c:128 +#: unpack-trees.c:163 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -3420,12 +3730,12 @@ msgstr "" "utcheckning:\n" "%s" -#: unpack-trees.c:205 +#: unpack-trees.c:240 #, c-format msgid "Aborting\n" msgstr "Avbryter\n" -#: unpack-trees.c:237 +#: unpack-trees.c:270 msgid "Checking out files" msgstr "Checkar ut filer" @@ -3474,7 +3784,7 @@ msgid "could not open '%s' for writing" msgstr "kunde inte öppna \"%s\" för skrivning" #: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759 -#: builtin/am.c:847 builtin/commit.c:1705 builtin/merge.c:1029 +#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1033 #: builtin/pull.c:341 #, c-format msgid "could not open '%s' for reading" @@ -3688,63 +3998,67 @@ msgstr " (använd \"git am --skip\" för att hoppa över patchen)" msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)" -#: wt-status.c:1172 +#: wt-status.c:1176 +msgid "git-rebase-todo is missing." +msgstr "git-rebase-todo saknas." + +#: wt-status.c:1178 msgid "No commands done." msgstr "Inga kommandon utförda." -#: wt-status.c:1175 +#: wt-status.c:1181 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Sista kommandot utfört (%d kommando utfört):" msgstr[1] "Sista kommandot utfört (%d kommandon utfört):" -#: wt-status.c:1186 +#: wt-status.c:1192 #, c-format msgid " (see more in file %s)" msgstr " (se fler i filen %s)" -#: wt-status.c:1191 +#: wt-status.c:1197 msgid "No commands remaining." msgstr "Inga kommandon återstår." -#: wt-status.c:1194 +#: wt-status.c:1200 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Nästa kommando att utföra (%d kommando återstår):" msgstr[1] "Följande kommandon att utföra (%d kommandon återstår):" -#: wt-status.c:1202 +#: wt-status.c:1208 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (använd \"git rebase --edit-todo\" för att visa och redigera)" -#: wt-status.c:1215 +#: wt-status.c:1221 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"." -#: wt-status.c:1220 +#: wt-status.c:1226 msgid "You are currently rebasing." msgstr "Du håller på med en ombasering." -#: wt-status.c:1234 +#: wt-status.c:1240 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")" -#: wt-status.c:1236 +#: wt-status.c:1242 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)" -#: wt-status.c:1238 +#: wt-status.c:1244 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)" -#: wt-status.c:1244 +#: wt-status.c:1250 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (alla konflikter rättade: kör \"git rebase --continue\")" -#: wt-status.c:1248 +#: wt-status.c:1254 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -3752,122 +4066,122 @@ msgstr "" "Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" " "ovanpå \"%s\"." -#: wt-status.c:1253 +#: wt-status.c:1259 msgid "You are currently splitting a commit during a rebase." msgstr "Du håller på att dela upp en incheckning i en ombasering." -#: wt-status.c:1256 +#: wt-status.c:1262 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")" -#: wt-status.c:1260 +#: wt-status.c:1266 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Du håller på att redigera en incheckning medan du ombaserar grenen \"%s\" " "ovanpå \"%s\"." -#: wt-status.c:1265 +#: wt-status.c:1271 msgid "You are currently editing a commit during a rebase." msgstr "Du håller på att redigera en incheckning under en ombasering." -#: wt-status.c:1268 +#: wt-status.c:1274 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" " (använd \"git commit --amend\" för att lägga till på aktuell incheckning)" -#: wt-status.c:1270 +#: wt-status.c:1276 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändringar)" -#: wt-status.c:1280 +#: wt-status.c:1286 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Du håller på med en \"cherry-pick\" av incheckningen %s." -#: wt-status.c:1285 +#: wt-status.c:1291 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")" -#: wt-status.c:1288 +#: wt-status.c:1294 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")" -#: wt-status.c:1290 +#: wt-status.c:1296 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-" "operationen)" -#: wt-status.c:1299 +#: wt-status.c:1305 #, c-format msgid "You are currently reverting commit %s." msgstr "Du håller på med att ångra incheckningen %s." -#: wt-status.c:1304 +#: wt-status.c:1310 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (rätta konflikter och kör sedan \"git revert --continue\")" -#: wt-status.c:1307 +#: wt-status.c:1313 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (alla konflikter rättade: kör \"git revert --continue\")" -#: wt-status.c:1309 +#: wt-status.c:1315 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)" -#: wt-status.c:1320 +#: wt-status.c:1326 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Du håller på med en \"bisect\", startad från grenen \"%s\"." -#: wt-status.c:1324 +#: wt-status.c:1330 msgid "You are currently bisecting." msgstr "Du håller på med en \"bisect\"." -#: wt-status.c:1327 +#: wt-status.c:1333 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" " (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)" -#: wt-status.c:1524 +#: wt-status.c:1530 msgid "On branch " msgstr "På grenen " -#: wt-status.c:1530 +#: wt-status.c:1536 msgid "interactive rebase in progress; onto " msgstr "interaktiv ombasering pågår; ovanpå" -#: wt-status.c:1532 +#: wt-status.c:1538 msgid "rebase in progress; onto " msgstr "ombasering pågår; ovanpå" -#: wt-status.c:1537 +#: wt-status.c:1543 msgid "HEAD detached at " msgstr "HEAD frånkopplad vid " -#: wt-status.c:1539 +#: wt-status.c:1545 msgid "HEAD detached from " msgstr "HEAD frånkopplad från " -#: wt-status.c:1542 +#: wt-status.c:1548 msgid "Not currently on any branch." msgstr "Inte på någon gren för närvarande." -#: wt-status.c:1560 +#: wt-status.c:1566 msgid "Initial commit" msgstr "Första incheckning" -#: wt-status.c:1574 +#: wt-status.c:1580 msgid "Untracked files" msgstr "Ospårade filer" -#: wt-status.c:1576 +#: wt-status.c:1582 msgid "Ignored files" msgstr "Ignorerade filer" -#: wt-status.c:1580 +#: wt-status.c:1586 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -3879,32 +4193,32 @@ msgstr "" "lägga till nya filer själv (se \"git help status\")." # %s är nästa sträng eller tom. -#: wt-status.c:1586 +#: wt-status.c:1592 #, c-format msgid "Untracked files not listed%s" msgstr "Ospårade filer visas ej%s" -#: wt-status.c:1588 +#: wt-status.c:1594 msgid " (use -u option to show untracked files)" msgstr " (använd flaggan -u för att visa ospårade filer)" -#: wt-status.c:1594 +#: wt-status.c:1600 msgid "No changes" msgstr "Inga ändringar" -#: wt-status.c:1599 +#: wt-status.c:1605 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a" "\")\n" -#: wt-status.c:1602 +#: wt-status.c:1608 #, c-format msgid "no changes added to commit\n" msgstr "inga ändringar att checka in\n" -#: wt-status.c:1605 +#: wt-status.c:1611 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -3913,62 +4227,62 @@ msgstr "" "inget köat för incheckning, men ospårade filer finns (spåra med \"git add" "\")\n" -#: wt-status.c:1608 +#: wt-status.c:1614 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "inget köat för incheckning, men ospårade filer finns\n" -#: wt-status.c:1611 +#: wt-status.c:1617 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n" -#: wt-status.c:1614 wt-status.c:1619 +#: wt-status.c:1620 wt-status.c:1625 #, c-format msgid "nothing to commit\n" msgstr "inget att checka in\n" -#: wt-status.c:1617 +#: wt-status.c:1623 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "inget att checka in (använd -u för att visa ospårade filer)\n" -#: wt-status.c:1621 +#: wt-status.c:1627 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "inget att checka in, arbetskatalogen ren\n" -#: wt-status.c:1728 +#: wt-status.c:1734 msgid "Initial commit on " msgstr "Första incheckning på " -#: wt-status.c:1732 +#: wt-status.c:1738 msgid "HEAD (no branch)" msgstr "HEAD (ingen gren)" -#: wt-status.c:1761 +#: wt-status.c:1767 msgid "gone" msgstr "försvunnen" -#: wt-status.c:1763 wt-status.c:1771 +#: wt-status.c:1769 wt-status.c:1777 msgid "behind " msgstr "efter " -#: wt-status.c:1766 wt-status.c:1769 +#: wt-status.c:1772 wt-status.c:1775 msgid "ahead " msgstr "före " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2270 +#: wt-status.c:2277 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "kan inte %s: Du har oköade ändringar." -#: wt-status.c:2276 +#: wt-status.c:2283 msgid "additionally, your index contains uncommitted changes." msgstr "dessutom innehåller dit index ändringar som inte har checkats in." -#: wt-status.c:2278 +#: wt-status.c:2285 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in." @@ -4000,7 +4314,7 @@ msgstr "ta bort \"%s\"\n" msgid "Unstaged changes after refreshing the index:" msgstr "Oköade ändringar efter att ha uppdaterat indexet:" -#: builtin/add.c:209 builtin/rev-parse.c:840 +#: builtin/add.c:209 builtin/rev-parse.c:845 msgid "Could not read the index" msgstr "Kunde inte läsa indexet" @@ -4035,9 +4349,9 @@ msgstr "Kunde inte tillämpa \"%s\"" 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:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:111 -#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:521 -#: builtin/remote.c:1326 builtin/rm.c:268 builtin/send-pack.c:162 +#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:123 +#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524 +#: builtin/remote.c:1326 builtin/rm.c:241 builtin/send-pack.c:162 msgid "dry run" msgstr "testkörning" @@ -4045,7 +4359,7 @@ msgstr "testkörning" msgid "interactive picking" msgstr "plocka interaktivt" -#: builtin/add.c:270 builtin/checkout.c:1156 builtin/reset.c:286 +#: builtin/add.c:270 builtin/checkout.c:1159 builtin/reset.c:286 msgid "select hunks interactively" msgstr "välj stycken interaktivt" @@ -4127,7 +4441,7 @@ msgstr "Kanske menade du att skriva \"git add .\"?\n" #: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279 #: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350 -#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271 #: builtin/submodule--helper.c:244 msgid "index file corrupt" msgstr "indexfilen trasig" @@ -4250,7 +4564,7 @@ msgstr "" msgid "Failed to merge in the changes." msgstr "Misslyckades slå ihop ändringarna." -#: builtin/am.c:1686 builtin/merge.c:628 +#: builtin/am.c:1686 builtin/merge.c:632 msgid "git write-tree failed to write a tree" msgstr "git write-tree misslyckades skriva ett träd" @@ -4258,8 +4572,8 @@ msgstr "git write-tree misslyckades skriva ett träd" msgid "applying to an empty history" msgstr "tillämpar på en tom historik" -#: builtin/am.c:1706 builtin/commit.c:1769 builtin/merge.c:798 -#: builtin/merge.c:823 +#: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802 +#: builtin/merge.c:827 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" @@ -4371,7 +4685,7 @@ msgid "allow fall back on 3way merging if needed" msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt" #: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57 -#: builtin/repack.c:172 +#: builtin/repack.c:178 msgid "be quiet" msgstr "var tyst" @@ -4414,15 +4728,15 @@ msgid "pass it through git-apply" msgstr "sänd det genom git-apply" #: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 -#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135 -#: builtin/pull.c:194 builtin/repack.c:181 builtin/repack.c:185 -#: builtin/show-branch.c:644 builtin/show-ref.c:175 builtin/tag.c:340 +#: builtin/grep.c:1038 builtin/merge.c:202 builtin/pull.c:135 +#: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191 +#: builtin/show-branch.c:644 builtin/show-ref.c:169 builtin/tag.c:355 #: parse-options.h:132 parse-options.h:134 parse-options.h:245 msgid "n" msgstr "n" #: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438 -#: builtin/tag.c:372 +#: builtin/tag.c:387 builtin/verify-tag.c:38 msgid "format" msgstr "format" @@ -4458,8 +4772,8 @@ msgstr "ljug om incheckningsdatum" msgid "use current timestamp for author date" msgstr "använd nuvarande tidsstämpel för författardatum" -#: builtin/am.c:2315 builtin/commit.c:1605 builtin/merge.c:229 -#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:355 +#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:233 +#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:370 msgid "key-id" msgstr "nyckel-id" @@ -4560,118 +4874,111 @@ msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>" msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)" -#: builtin/blame.c:1781 +#: builtin/blame.c:1786 msgid "Blaming lines" msgstr "Klandra rader" -#: builtin/blame.c:2577 +#: builtin/blame.c:2582 msgid "Show blame entries as we find them, incrementally" msgstr "Visa klandringsposter när vi hittar dem, interaktivt" -#: builtin/blame.c:2578 +#: builtin/blame.c:2583 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)" -#: builtin/blame.c:2579 +#: builtin/blame.c:2584 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Behandla inte rotincheckningar som gränser (Standard: av)" -#: builtin/blame.c:2580 +#: builtin/blame.c:2585 msgid "Show work cost statistics" msgstr "Visa statistik över arbetskostnad" -#: builtin/blame.c:2581 +#: builtin/blame.c:2586 msgid "Force progress reporting" msgstr "Tvinga förloppsrapportering" -#: builtin/blame.c:2582 +#: builtin/blame.c:2587 msgid "Show output score for blame entries" msgstr "Visa utdatapoäng för klandringsposter" -#: builtin/blame.c:2583 +#: builtin/blame.c:2588 msgid "Show original filename (Default: auto)" msgstr "Visa originalfilnamn (Standard: auto)" -#: builtin/blame.c:2584 +#: builtin/blame.c:2589 msgid "Show original linenumber (Default: off)" msgstr "Visa ursprungligt radnummer (Standard: av)" -#: builtin/blame.c:2585 +#: builtin/blame.c:2590 msgid "Show in a format designed for machine consumption" msgstr "Visa i ett format avsett för maskinkonsumtion" -#: builtin/blame.c:2586 +#: builtin/blame.c:2591 msgid "Show porcelain format with per-line commit information" msgstr "Visa porslinsformat med per-rad-incheckningsinformation" -#: builtin/blame.c:2587 +#: builtin/blame.c:2592 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "Använd samma utdataläge som git-annotate (Standard: av)" -#: builtin/blame.c:2588 +#: builtin/blame.c:2593 msgid "Show raw timestamp (Default: off)" msgstr "Visa rå tidsstämpel (Standard: av)" -#: builtin/blame.c:2589 +#: builtin/blame.c:2594 msgid "Show long commit SHA1 (Default: off)" msgstr "Visa lång inchecknings-SHA1 (Standard: av)" -#: builtin/blame.c:2590 +#: builtin/blame.c:2595 msgid "Suppress author name and timestamp (Default: off)" msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)" -#: builtin/blame.c:2591 +#: builtin/blame.c:2596 msgid "Show author email instead of name (Default: off)" msgstr "Visa författarens e-post istället för namn (Standard: av)" -#: builtin/blame.c:2592 +#: builtin/blame.c:2597 msgid "Ignore whitespace differences" msgstr "Ignorera ändringar i blanksteg" -#: builtin/blame.c:2599 -msgid "Use an experimental indent-based heuristic to improve diffs" -msgstr "" -"Använd en experimentell indenteringsbaserad algoritm för att förbättra diffar" - -#: builtin/blame.c:2600 -msgid "Use an experimental blank-line-based heuristic to improve diffs" -msgstr "" -"Använd en experimentell algoritm baserad på tomma rader för att förbättra " -"diffar" +#: builtin/blame.c:2604 +msgid "Use an experimental heuristic to improve diffs" +msgstr "Använd en experimentell algoritm för att förbättra diffar" -#: builtin/blame.c:2602 +#: builtin/blame.c:2606 msgid "Spend extra cycles to find better match" msgstr "Slösa extra cykler med att hitta bättre träff" -#: builtin/blame.c:2603 +#: builtin/blame.c:2607 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Använd revisioner från <fil> istället för att anropa git-rev-list" -#: builtin/blame.c:2604 +#: builtin/blame.c:2608 msgid "Use <file>'s contents as the final image" msgstr "Använd <fil>s innehåll som slutgiltig bild" -#: builtin/blame.c:2605 builtin/blame.c:2606 +#: builtin/blame.c:2609 builtin/blame.c:2610 msgid "score" msgstr "poäng" -#: builtin/blame.c:2605 +#: builtin/blame.c:2609 msgid "Find line copies within and across files" msgstr "Hitta kopierade rader inuti och mellan filer" -#: builtin/blame.c:2606 +#: builtin/blame.c:2610 msgid "Find line movements within and across files" msgstr "Hitta flyttade rader inuti och mellan filer" -#: builtin/blame.c:2607 +#: builtin/blame.c:2611 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2607 +#: builtin/blame.c:2611 msgid "Process only line range n,m, counting from 1" msgstr "Behandla endast radintervallet n,m, med början på 1" -#: builtin/blame.c:2654 +#: builtin/blame.c:2658 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "--progress kan inte användas med --incremental eller porslinsformat" @@ -4681,42 +4988,42 @@ msgstr "--progress kan inte användas med --incremental eller porslinsformat" #. 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:2700 +#: builtin/blame.c:2706 msgid "4 years, 11 months ago" msgstr "4 år, 11 månader sedan" -#: builtin/blame.c:2780 +#: builtin/blame.c:2786 msgid "--contents and --reverse do not blend well." msgstr "--contents och --reverse fungerar inte så bra tillsammans." -#: builtin/blame.c:2800 +#: builtin/blame.c:2806 msgid "cannot use --contents with final commit object name" msgstr "kan inte använda --contents med namn på slutgiltigt incheckningsobjekt" -#: builtin/blame.c:2805 +#: builtin/blame.c:2811 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse och --first-parent tillsammans kräver att du anger senaste " "incheckningen" -#: builtin/blame.c:2832 +#: builtin/blame.c:2838 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "--reverse --first-parent tillsammans kräver ett intervall på första-förälder-" "kedjan" -#: builtin/blame.c:2843 +#: builtin/blame.c:2849 #, c-format msgid "no such path %s in %s" msgstr "sökvägen %s i %s finns inte" -#: builtin/blame.c:2854 +#: builtin/blame.c:2860 #, c-format msgid "cannot read blob %s for path %s" msgstr "kan inte läsa objektet %s för sökvägen %s" -#: builtin/blame.c:2873 +#: builtin/blame.c:2879 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" @@ -4894,45 +5201,45 @@ msgstr "(HEAD frånkopplat från %s)" msgid "(no branch)" msgstr "(ingen gren)" -#: builtin/branch.c:544 +#: builtin/branch.c:535 #, c-format msgid "Branch %s is being rebased at %s" msgstr "Grenen %s ombaseras på %s" -#: builtin/branch.c:548 +#: builtin/branch.c:539 #, c-format msgid "Branch %s is being bisected at %s" msgstr "Grenen %s är i en \"bisect\" på %s" -#: builtin/branch.c:563 +#: builtin/branch.c:554 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:573 +#: builtin/branch.c:564 #, c-format msgid "Invalid branch name: '%s'" msgstr "Felaktigt namn på gren: \"%s\"" -#: builtin/branch.c:590 +#: builtin/branch.c:581 msgid "Branch rename failed" msgstr "Misslyckades byta namn på gren" -#: builtin/branch.c:594 +#: builtin/branch.c:585 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:597 +#: builtin/branch.c:588 #, 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:604 +#: builtin/branch.c:595 msgid "Branch is renamed, but update of config-file failed" msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:620 +#: builtin/branch.c:611 #, c-format msgid "" "Please edit the description for the branch\n" @@ -4943,204 +5250,208 @@ msgstr "" " %s\n" "Rader som inleds med \"%c\" ignoreras.\n" -#: builtin/branch.c:651 +#: builtin/branch.c:643 msgid "Generic options" msgstr "Allmänna flaggor" -#: builtin/branch.c:653 +#: builtin/branch.c:645 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:654 +#: builtin/branch.c:646 msgid "suppress informational messages" msgstr "undertryck informationsmeddelanden" -#: builtin/branch.c:655 +#: builtin/branch.c:647 msgid "set up tracking mode (see git-pull(1))" msgstr "ställ in spårningsläge (se git-pull(1))" -#: builtin/branch.c:657 +#: builtin/branch.c:649 msgid "change upstream info" msgstr "ändra uppströmsinformation" -#: builtin/branch.c:659 +#: builtin/branch.c:651 msgid "upstream" msgstr "uppströms" -#: builtin/branch.c:659 +#: builtin/branch.c:651 msgid "change the upstream info" msgstr "ändra uppströmsinformationen" -#: builtin/branch.c:660 +#: builtin/branch.c:652 msgid "Unset the upstream info" msgstr "ta bort uppströmsinformationen" -#: builtin/branch.c:661 +#: builtin/branch.c:653 msgid "use colored output" msgstr "använd färgad utdata" -#: builtin/branch.c:662 +#: builtin/branch.c:654 msgid "act on remote-tracking branches" msgstr "arbeta på fjärrspårande grenar" -#: builtin/branch.c:664 builtin/branch.c:665 +#: builtin/branch.c:656 builtin/branch.c:657 msgid "print only branches that contain the commit" msgstr "visa endast grenar som innehåller incheckningen" -#: builtin/branch.c:668 +#: builtin/branch.c:660 msgid "Specific git-branch actions:" msgstr "Specifika git-branch-åtgärder:" -#: builtin/branch.c:669 +#: builtin/branch.c:661 msgid "list both remote-tracking and local branches" msgstr "visa både fjärrspårande och lokala grenar" -#: builtin/branch.c:671 +#: builtin/branch.c:663 msgid "delete fully merged branch" msgstr "ta bort helt sammanslagen gren" -#: builtin/branch.c:672 +#: builtin/branch.c:664 msgid "delete branch (even if not merged)" msgstr "ta bort gren (även om inte helt sammanslagen)" -#: builtin/branch.c:673 +#: builtin/branch.c:665 msgid "move/rename a branch and its reflog" msgstr "flytta/ta bort en gren och dess reflogg" -#: builtin/branch.c:674 +#: builtin/branch.c:666 msgid "move/rename a branch, even if target exists" msgstr "flytta/ta bort en gren, även om målet finns" -#: builtin/branch.c:675 +#: builtin/branch.c:667 msgid "list branch names" msgstr "lista namn på grenar" -#: builtin/branch.c:676 +#: builtin/branch.c:668 msgid "create the branch's reflog" msgstr "skapa grenens reflogg" -#: builtin/branch.c:678 +#: builtin/branch.c:670 msgid "edit the description for the branch" msgstr "redigera beskrivning för grenen" -#: builtin/branch.c:679 +#: builtin/branch.c:671 msgid "force creation, move/rename, deletion" msgstr "tvinga skapande, flytt/namnändring, borttagande" -#: builtin/branch.c:680 +#: builtin/branch.c:672 msgid "print only branches that are merged" msgstr "visa endast sammanslagna grenar" -#: builtin/branch.c:681 +#: builtin/branch.c:673 msgid "print only branches that are not merged" msgstr "visa endast ej sammanslagna grenar" -#: builtin/branch.c:682 +#: builtin/branch.c:674 msgid "list branches in columns" msgstr "visa grenar i spalter" -#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366 +#: builtin/branch.c:675 builtin/for-each-ref.c:38 builtin/tag.c:381 msgid "key" msgstr "nyckel" -#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367 +#: builtin/branch.c:676 builtin/for-each-ref.c:39 builtin/tag.c:382 msgid "field name to sort on" msgstr "fältnamn att sortera på" -#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:404 +#: builtin/branch.c:678 builtin/for-each-ref.c:41 builtin/notes.c:404 #: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570 -#: builtin/tag.c:369 +#: builtin/tag.c:384 msgid "object" msgstr "objekt" -#: builtin/branch.c:687 +#: builtin/branch.c:679 msgid "print only branches of the object" msgstr "visa endast grenar för objektet" -#: builtin/branch.c:705 +#: builtin/branch.c:681 builtin/for-each-ref.c:46 builtin/tag.c:388 +msgid "sorting and filtering are case insensitive" +msgstr "sortering och filtrering skiljer gemener och VERSALER" + +#: builtin/branch.c:698 msgid "Failed to resolve HEAD as a valid ref." msgstr "Misslyckades slå upp HEAD som giltig referens" -#: builtin/branch.c:709 builtin/clone.c:706 +#: builtin/branch.c:702 builtin/clone.c:706 msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" -#: builtin/branch.c:729 +#: builtin/branch.c:724 msgid "--column and --verbose are incompatible" msgstr "--column och --verbose är inkompatibla" -#: builtin/branch.c:740 builtin/branch.c:782 +#: builtin/branch.c:735 builtin/branch.c:787 msgid "branch name required" msgstr "grennamn krävs" -#: builtin/branch.c:758 +#: builtin/branch.c:763 msgid "Cannot give description to detached HEAD" msgstr "Kan inte beskriva frånkopplad HEAD" -#: builtin/branch.c:763 +#: builtin/branch.c:768 msgid "cannot edit description of more than one branch" msgstr "kan inte redigera beskrivning för mer än en gren" -#: builtin/branch.c:770 +#: builtin/branch.c:775 #, c-format msgid "No commit on branch '%s' yet." msgstr "Inga incheckningar på grenen \"%s\" ännu" -#: builtin/branch.c:773 +#: builtin/branch.c:778 #, c-format msgid "No branch named '%s'." msgstr "Ingen gren vid namnet \"%s\"." -#: builtin/branch.c:788 +#: builtin/branch.c:793 msgid "too many branches for a rename operation" msgstr "för många grenar för namnbyte" -#: builtin/branch.c:793 +#: builtin/branch.c:798 msgid "too many branches to set new upstream" msgstr "för många grenar för att byta uppström" -#: builtin/branch.c:797 +#: builtin/branch.c:802 #, 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:800 builtin/branch.c:822 builtin/branch.c:843 +#: builtin/branch.c:805 builtin/branch.c:827 builtin/branch.c:848 #, c-format msgid "no such branch '%s'" msgstr "okänd gren \"%s\"" -#: builtin/branch.c:804 +#: builtin/branch.c:809 #, c-format msgid "branch '%s' does not exist" msgstr "grenen \"%s\" finns inte" -#: builtin/branch.c:816 +#: builtin/branch.c:821 msgid "too many branches to unset upstream" msgstr "för många grenar för att ta bort uppström" -#: builtin/branch.c:820 +#: builtin/branch.c:825 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:826 +#: builtin/branch.c:831 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Grenen \"%s\" har ingen uppströmsinformation" -#: builtin/branch.c:840 +#: builtin/branch.c:845 msgid "it does not make sense to create 'HEAD' manually" msgstr "kan inte skapa \"HEAD\" manuellt" -#: builtin/branch.c:846 +#: builtin/branch.c:851 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:849 +#: builtin/branch.c:854 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -5149,7 +5460,7 @@ msgstr "" "Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track " "eller --set-upstream-to\n" -#: builtin/branch.c:866 +#: builtin/branch.c:871 #, c-format msgid "" "\n" @@ -5217,7 +5528,7 @@ msgstr "för blob-objekt, kör filter på objektets innehåll" msgid "for blob objects, run filters on object's content" msgstr "för blob-objekt, kör filger på objektets innehåll" -#: builtin/cat-file.c:561 git-submodule.sh:923 +#: builtin/cat-file.c:561 git-submodule.sh:929 msgid "blob" msgstr "blob" @@ -5274,7 +5585,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:18 builtin/checkout.c:1137 builtin/gc.c:325 +#: builtin/check-ignore.c:18 builtin/checkout.c:1140 builtin/gc.c:332 msgid "suppress progress reporting" msgstr "undertryck förloppsrapportering" @@ -5364,9 +5675,9 @@ msgid "write the content to temporary files" msgstr "skriv innehåll till temporära filer" #: builtin/checkout-index.c:174 builtin/column.c:30 -#: builtin/submodule--helper.c:595 builtin/submodule--helper.c:598 -#: builtin/submodule--helper.c:604 builtin/submodule--helper.c:951 -#: builtin/worktree.c:469 +#: builtin/submodule--helper.c:597 builtin/submodule--helper.c:600 +#: builtin/submodule--helper.c:606 builtin/submodule--helper.c:967 +#: builtin/worktree.c:471 msgid "string" msgstr "sträng" @@ -5441,50 +5752,50 @@ msgstr "sökvägen \"%s\" har inte slagits ihop" msgid "you need to resolve your current index first" msgstr "du måste lösa ditt befintliga index först" -#: builtin/checkout.c:624 +#: builtin/checkout.c:625 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Kan inte skapa referenslogg för \"%s\": %s\n" -#: builtin/checkout.c:663 +#: builtin/checkout.c:666 msgid "HEAD is now at" msgstr "HEAD är nu på" -#: builtin/checkout.c:667 builtin/clone.c:660 +#: builtin/checkout.c:670 builtin/clone.c:660 msgid "unable to update HEAD" msgstr "kan inte uppdatera HEAD" -#: builtin/checkout.c:671 +#: builtin/checkout.c:674 #, c-format msgid "Reset branch '%s'\n" msgstr "Återställ gren \"%s\"\n" -#: builtin/checkout.c:674 +#: builtin/checkout.c:677 #, c-format msgid "Already on '%s'\n" msgstr "Redan på \"%s\"\n" -#: builtin/checkout.c:678 +#: builtin/checkout.c:681 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Växlade till och nollställde grenen \"%s\"\n" -#: builtin/checkout.c:680 builtin/checkout.c:1069 +#: builtin/checkout.c:683 builtin/checkout.c:1072 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Växlade till en ny gren \"%s\"\n" -#: builtin/checkout.c:682 +#: builtin/checkout.c:685 #, c-format msgid "Switched to branch '%s'\n" msgstr "Växlade till grenen \"%s\"\n" -#: builtin/checkout.c:733 +#: builtin/checkout.c:736 #, c-format msgid " ... and %d more.\n" msgstr " ... och %d till.\n" -#: builtin/checkout.c:739 +#: builtin/checkout.c:742 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -5507,7 +5818,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:758 +#: builtin/checkout.c:761 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -5534,151 +5845,151 @@ msgstr[1] "" " git branch <nytt_grennamn> %s\n" "\n" -#: builtin/checkout.c:794 +#: builtin/checkout.c:797 msgid "internal error in revision walk" msgstr "internt fel vid genomgång av revisioner (revision walk)" -#: builtin/checkout.c:798 +#: builtin/checkout.c:801 msgid "Previous HEAD position was" msgstr "Tidigare position för HEAD var" -#: builtin/checkout.c:825 builtin/checkout.c:1064 +#: builtin/checkout.c:828 builtin/checkout.c:1067 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:970 +#: builtin/checkout.c:973 #, c-format msgid "only one reference expected, %d given." msgstr "endast en referens förväntades, %d gavs." -#: builtin/checkout.c:1010 builtin/worktree.c:214 +#: builtin/checkout.c:1013 builtin/worktree.c:214 #, c-format msgid "invalid reference: %s" msgstr "felaktig referens: %s" -#: builtin/checkout.c:1039 +#: builtin/checkout.c:1042 #, c-format msgid "reference is not a tree: %s" msgstr "referensen är inte ett träd: %s" -#: builtin/checkout.c:1078 +#: builtin/checkout.c:1081 msgid "paths cannot be used with switching branches" msgstr "sökvägar kan inte användas vid byte av gren" -#: builtin/checkout.c:1081 builtin/checkout.c:1085 +#: builtin/checkout.c:1084 builtin/checkout.c:1088 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "\"%s\" kan inte användas vid byte av gren" -#: builtin/checkout.c:1089 builtin/checkout.c:1092 builtin/checkout.c:1097 -#: builtin/checkout.c:1100 +#: builtin/checkout.c:1092 builtin/checkout.c:1095 builtin/checkout.c:1100 +#: builtin/checkout.c:1103 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "\"%s\" kan inte användas med \"%s\"" -#: builtin/checkout.c:1105 +#: builtin/checkout.c:1108 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kan inte växla gren till icke-incheckningen \"%s\"" -#: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:93 +#: builtin/checkout.c:1141 builtin/checkout.c:1143 builtin/clone.c:93 #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324 #: builtin/worktree.c:326 msgid "branch" msgstr "gren" -#: builtin/checkout.c:1139 +#: builtin/checkout.c:1142 msgid "create and checkout a new branch" msgstr "skapa och checka ut en ny gren" -#: builtin/checkout.c:1141 +#: builtin/checkout.c:1144 msgid "create/reset and checkout a branch" msgstr "skapa/nollställ och checka ut en gren" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1145 msgid "create reflog for new branch" msgstr "skapa reflogg för ny gren" -#: builtin/checkout.c:1143 builtin/worktree.c:328 +#: builtin/checkout.c:1146 builtin/worktree.c:328 msgid "detach HEAD at named commit" msgstr "koppla från HEAD vid namngiven incheckning" -#: builtin/checkout.c:1144 +#: builtin/checkout.c:1147 msgid "set upstream info for new branch" msgstr "sätt uppströmsinformation för ny gren" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1149 msgid "new-branch" msgstr "ny-gren" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1149 msgid "new unparented branch" msgstr "ny gren utan förälder" -#: builtin/checkout.c:1147 +#: builtin/checkout.c:1150 msgid "checkout our version for unmerged files" msgstr "checka ut vår version för ej sammanslagna filer" -#: builtin/checkout.c:1149 +#: builtin/checkout.c:1152 msgid "checkout their version for unmerged files" msgstr "checka ut deras version för ej sammanslagna filer" -#: builtin/checkout.c:1151 +#: builtin/checkout.c:1154 msgid "force checkout (throw away local modifications)" msgstr "tvinga utcheckning (kasta bort lokala ändringar)" -#: builtin/checkout.c:1152 +#: builtin/checkout.c:1155 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:1153 builtin/merge.c:231 +#: builtin/checkout.c:1156 builtin/merge.c:235 msgid "update ignored files (default)" msgstr "uppdatera ignorerade filer (standard)" -#: builtin/checkout.c:1154 builtin/log.c:1466 parse-options.h:251 +#: builtin/checkout.c:1157 builtin/log.c:1466 parse-options.h:251 msgid "style" msgstr "stil" -#: builtin/checkout.c:1155 +#: builtin/checkout.c:1158 msgid "conflict style (merge or diff3)" msgstr "konfliktstil (merge eller diff3)" -#: builtin/checkout.c:1158 +#: builtin/checkout.c:1161 msgid "do not limit pathspecs to sparse entries only" msgstr "begränsa inte sökvägar till endast glesa poster" -#: builtin/checkout.c:1160 +#: builtin/checkout.c:1163 msgid "second guess 'git checkout <no-such-branch>'" msgstr "förutspå \"git checkout <gren-saknas>\"" -#: builtin/checkout.c:1162 +#: builtin/checkout.c:1165 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:1163 builtin/clone.c:63 builtin/fetch.c:119 -#: builtin/merge.c:228 builtin/pull.c:117 builtin/push.c:536 +#: builtin/checkout.c:1166 builtin/clone.c:63 builtin/fetch.c:119 +#: builtin/merge.c:232 builtin/pull.c:117 builtin/push.c:539 #: builtin/send-pack.c:168 msgid "force progress reporting" msgstr "tvinga förloppsrapportering" -#: builtin/checkout.c:1194 +#: builtin/checkout.c:1197 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B och --orphan är ömsesidigt uteslutande" -#: builtin/checkout.c:1211 +#: builtin/checkout.c:1214 msgid "--track needs a branch name" msgstr "--track behöver ett namn på en gren" -#: builtin/checkout.c:1216 +#: builtin/checkout.c:1219 msgid "Missing branch name; try -b" msgstr "Grennamn saknas; försök med -b" -#: builtin/checkout.c:1252 +#: builtin/checkout.c:1255 msgid "invalid path specification" msgstr "felaktig sökvägsangivelse" -#: builtin/checkout.c:1259 +#: builtin/checkout.c:1262 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -5687,12 +5998,12 @@ msgstr "" "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt.\n" "Ville du checka ut \"%s\" som inte kan lösas som en utcheckning?" -#: builtin/checkout.c:1264 +#: builtin/checkout.c:1267 #, 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:1268 +#: builtin/checkout.c:1271 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -5732,19 +6043,21 @@ msgstr "Skulle hoppa över arkivet %s\n" msgid "failed to remove %s" msgstr "misslyckades ta bort %s" -#: builtin/clean.c:291 +#: builtin/clean.c:291 git-add--interactive.perl:623 +#, c-format msgid "" "Prompt help:\n" "1 - select a numbered item\n" "foo - select item based on unique prefix\n" -" - (empty) select nothing" +" - (empty) select nothing\n" msgstr "" "Kommandohjälp:\n" "1 - markera en numrerad post\n" "foo - markera post baserad på unikt prefix\n" -" - (tomt) markera ingenting" +" - (tomt) markera ingenting\n" -#: builtin/clean.c:295 +#: builtin/clean.c:295 git-add--interactive.perl:632 +#, c-format msgid "" "Prompt help:\n" "1 - select a single item\n" @@ -5753,7 +6066,7 @@ msgid "" "foo - select item based on unique prefix\n" "-... - unselect specified items\n" "* - choose all items\n" -" - (empty) finish selecting" +" - (empty) finish selecting\n" msgstr "" "Kommandohjälp:\n" "1 - markera en ensam post\n" @@ -5762,12 +6075,13 @@ msgstr "" "foo - markera post baserad på unikt prefix\n" "-... - avmarkera specifika poster\n" "* - välj alla poster\n" -" - (tomt) avsluta markering" +" - (tomt) avsluta markering\n" -#: builtin/clean.c:511 -#, c-format -msgid "Huh (%s)?" -msgstr "Vadå (%s)?" +#: builtin/clean.c:511 git-add--interactive.perl:598 +#: git-add--interactive.perl:603 +#, c-format, perl-format +msgid "Huh (%s)?\n" +msgstr "Vadå (%s)?\n" #: builtin/clean.c:653 #, c-format @@ -5789,9 +6103,10 @@ msgstr "Välj poster att ta bort" msgid "Remove %s [y/N]? " msgstr "Ta bort %s [Y=ja / N=nej]?" -#: builtin/clean.c:777 -msgid "Bye." -msgstr "Hej då." +#: builtin/clean.c:777 git-add--interactive.perl:1669 +#, c-format +msgid "Bye.\n" +msgstr "Hej då.\n" #: builtin/clean.c:785 msgid "" @@ -5811,11 +6126,11 @@ msgstr "" "help - denna skärm\n" "? - hjälp för kommandoval" -#: builtin/clean.c:812 +#: builtin/clean.c:812 git-add--interactive.perl:1745 msgid "*** Commands ***" msgstr "*** Kommandon ***" -#: builtin/clean.c:813 +#: builtin/clean.c:813 git-add--interactive.perl:1742 msgid "What now" msgstr "Vad nu" @@ -5845,8 +6160,8 @@ msgstr "städa interaktivt" msgid "remove whole directories" msgstr "ta bort hela kataloger" -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:725 -#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:182 +#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:1056 +#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:176 msgid "pattern" msgstr "mönster" @@ -5926,8 +6241,8 @@ msgstr "mallkatalog" msgid "directory from which templates will be used" msgstr "katalog att använda mallar från" -#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:602 -#: builtin/submodule--helper.c:954 +#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:604 +#: builtin/submodule--helper.c:970 msgid "reference repository" msgstr "referensarkiv" @@ -5951,7 +6266,7 @@ msgstr "checka ut <gren> istället för fjärrens HEAD" msgid "path to git-upload-pack on the remote" msgstr "sökväg till git-upload-pack på fjärren" -#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668 +#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:999 #: builtin/pull.c:202 msgid "depth" msgstr "djup" @@ -5960,7 +6275,7 @@ msgstr "djup" msgid "create a shallow clone of that depth" msgstr "skapa en grund klon på detta djup" -#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848 +#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2836 #: parse-options.h:142 msgid "time" msgstr "tid" @@ -5974,8 +6289,8 @@ msgid "revision" msgstr "revision" #: builtin/clone.c:102 builtin/fetch.c:125 -msgid "deepen history of shallow clone by excluding rev" -msgstr "fördjupa historik för grund klon genom att exkludera revision" +msgid "deepen history of shallow clone, excluding rev" +msgstr "fördjupa historik för grund klon, exkludera revisionen" #: builtin/clone.c:104 msgid "clone only one branch, HEAD or --branch" @@ -6001,11 +6316,11 @@ msgstr "nyckel=värde" msgid "set config inside the new repository" msgstr "ställ in konfiguration i det nya arkivet" -#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:547 +#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:550 msgid "use IPv4 addresses only" msgstr "använd endast IPv4-adresser" -#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:549 +#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:552 msgid "use IPv6 addresses only" msgstr "använd endast IPv6-adresser" @@ -6119,7 +6434,7 @@ msgstr "flaggorna --bare och --separate-git-dir är inkompatibla." msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:905 builtin/fetch.c:1338 +#: builtin/clone.c:905 builtin/fetch.c:1335 #, c-format msgid "depth %s is not a positive number" msgstr "djupet %s är inte ett positivt tal" @@ -6134,8 +6449,9 @@ msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog." msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." -#: builtin/clone.c:940 builtin/clone.c:951 builtin/submodule--helper.c:657 -#: builtin/worktree.c:222 builtin/worktree.c:249 +#: builtin/clone.c:940 builtin/clone.c:951 builtin/difftool.c:252 +#: builtin/submodule--helper.c:659 builtin/worktree.c:222 +#: builtin/worktree.c:249 #, c-format msgid "could not create leading directories of '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" @@ -6405,7 +6721,7 @@ msgstr "" msgid "could not lookup commit %s" msgstr "kunde inte slå upp incheckningen %s" -#: builtin/commit.c:704 builtin/shortlog.c:286 +#: builtin/commit.c:704 builtin/shortlog.c:295 #, c-format msgid "(reading log message from standard input)\n" msgstr "(läser loggmeddelande från standard in)\n" @@ -6505,7 +6821,7 @@ msgstr "Kan inte läsa indexet" msgid "Error building trees" msgstr "Fel vid byggande av träd" -#: builtin/commit.c:969 builtin/tag.c:266 +#: builtin/commit.c:968 builtin/tag.c:280 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Ange meddelandet en av flaggorna -m eller -F.\n" @@ -6516,7 +6832,7 @@ 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:1086 builtin/commit.c:1327 +#: builtin/commit.c:1086 builtin/commit.c:1325 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ogiltigt läge för ospårade filer: \"%s\"" @@ -6567,65 +6883,61 @@ 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:1212 -msgid "Clever... amending the last one with dirty index." -msgstr "Smart... utöka den senaste med smutsigt index." - -#: builtin/commit.c:1214 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only sökvägar..." -#: builtin/commit.c:1226 builtin/tag.c:474 +#: builtin/commit.c:1224 builtin/tag.c:495 #, c-format msgid "Invalid cleanup mode %s" msgstr "Felaktigt städningsläge %s" -#: builtin/commit.c:1231 +#: builtin/commit.c:1229 msgid "Paths with -a does not make sense." msgstr "Kan inte ange sökvägar med -a." -#: builtin/commit.c:1341 builtin/commit.c:1617 +#: builtin/commit.c:1339 builtin/commit.c:1612 msgid "show status concisely" msgstr "visa koncis status" -#: builtin/commit.c:1343 builtin/commit.c:1619 +#: builtin/commit.c:1341 builtin/commit.c:1614 msgid "show branch information" msgstr "visa information om gren" -#: builtin/commit.c:1345 +#: builtin/commit.c:1343 msgid "version" msgstr "version" -#: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522 -#: builtin/worktree.c:440 +#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525 +#: builtin/worktree.c:442 msgid "machine-readable output" msgstr "maskinläsbar utdata" -#: builtin/commit.c:1348 builtin/commit.c:1623 +#: builtin/commit.c:1346 builtin/commit.c:1618 msgid "show status in long format (default)" msgstr "visa status i långt format (standard)" -#: builtin/commit.c:1351 builtin/commit.c:1626 +#: builtin/commit.c:1349 builtin/commit.c:1621 msgid "terminate entries with NUL" msgstr "terminera poster med NUL" -#: builtin/commit.c:1353 builtin/commit.c:1629 builtin/fast-export.c:981 -#: builtin/fast-export.c:984 builtin/tag.c:353 +#: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981 +#: builtin/fast-export.c:984 builtin/tag.c:368 msgid "mode" msgstr "läge" -#: builtin/commit.c:1354 builtin/commit.c:1629 +#: builtin/commit.c:1352 builtin/commit.c:1624 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:1357 +#: builtin/commit.c:1355 msgid "show ignored files" msgstr "visa ignorerade filer" -#: builtin/commit.c:1358 parse-options.h:155 +#: builtin/commit.c:1356 parse-options.h:155 msgid "when" msgstr "när" -#: builtin/commit.c:1359 +#: builtin/commit.c:1357 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -6633,201 +6945,201 @@ msgstr "" "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. " "(Default: all)" -#: builtin/commit.c:1361 +#: builtin/commit.c:1359 msgid "list untracked files in columns" msgstr "visa ospårade filer i spalter" -#: builtin/commit.c:1437 +#: builtin/commit.c:1435 msgid "couldn't look up newly created commit" msgstr "kunde inte slå upp en precis skapad incheckning" -#: builtin/commit.c:1439 +#: builtin/commit.c:1437 msgid "could not parse newly created commit" msgstr "kunde inte tolka en precis skapad incheckning" -#: builtin/commit.c:1484 +#: builtin/commit.c:1482 msgid "detached HEAD" msgstr "frånkopplad HEAD" -#: builtin/commit.c:1487 +#: builtin/commit.c:1485 msgid " (root-commit)" msgstr " (rotincheckning)" -#: builtin/commit.c:1587 +#: builtin/commit.c:1582 msgid "suppress summary after successful commit" msgstr "undertryck sammanfattning efter framgångsrik incheckning" -#: builtin/commit.c:1588 +#: builtin/commit.c:1583 msgid "show diff in commit message template" msgstr "visa diff i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1590 +#: builtin/commit.c:1585 msgid "Commit message options" msgstr "Alternativ för incheckningsmeddelande" -#: builtin/commit.c:1591 builtin/tag.c:351 +#: builtin/commit.c:1586 builtin/tag.c:366 msgid "read message from file" msgstr "läs meddelande från fil" -#: builtin/commit.c:1592 +#: builtin/commit.c:1587 msgid "author" msgstr "författare" -#: builtin/commit.c:1592 +#: builtin/commit.c:1587 msgid "override author for commit" msgstr "överstyr författare för incheckningen" -#: builtin/commit.c:1593 builtin/gc.c:326 +#: builtin/commit.c:1588 builtin/gc.c:333 msgid "date" msgstr "datum" -#: builtin/commit.c:1593 +#: builtin/commit.c:1588 msgid "override date for commit" msgstr "överstyr datum för incheckningen" -#: builtin/commit.c:1594 builtin/merge.c:220 builtin/notes.c:398 -#: builtin/notes.c:561 builtin/tag.c:349 +#: builtin/commit.c:1589 builtin/merge.c:222 builtin/notes.c:398 +#: builtin/notes.c:561 builtin/tag.c:364 msgid "message" msgstr "meddelande" -#: builtin/commit.c:1594 +#: builtin/commit.c:1589 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:79 +#: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592 +#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:81 msgid "commit" msgstr "incheckning" -#: builtin/commit.c:1595 +#: builtin/commit.c:1590 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:1591 msgid "reuse message from specified commit" msgstr "återanvänd meddelande från angiven incheckning" -#: builtin/commit.c:1597 +#: builtin/commit.c:1592 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:1593 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:1594 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:1413 builtin/revert.c:86 +#: builtin/commit.c:1595 builtin/log.c:1413 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "lägg till Signed-off-by:" -#: builtin/commit.c:1601 +#: builtin/commit.c:1596 msgid "use specified template file" msgstr "använd angiven mallfil" -#: builtin/commit.c:1602 +#: builtin/commit.c:1597 msgid "force edit of commit" msgstr "tvinga redigering av incheckning" -#: builtin/commit.c:1603 +#: builtin/commit.c:1598 msgid "default" msgstr "standard" -#: builtin/commit.c:1603 builtin/tag.c:354 +#: builtin/commit.c:1598 builtin/tag.c:369 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:1599 msgid "include status in commit message template" msgstr "inkludera status i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1606 builtin/merge.c:230 builtin/pull.c:166 +#: builtin/commit.c:1601 builtin/merge.c:234 builtin/pull.c:166 #: builtin/revert.c:93 msgid "GPG sign commit" msgstr "GPG-signera incheckning" -#: builtin/commit.c:1609 +#: builtin/commit.c:1604 msgid "Commit contents options" msgstr "Alternativ för incheckningens innehåll" -#: builtin/commit.c:1610 +#: builtin/commit.c:1605 msgid "commit all changed files" msgstr "checka in alla ändrade filer" -#: builtin/commit.c:1611 +#: builtin/commit.c:1606 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:1607 msgid "interactively add files" msgstr "lägg till filer interaktivt" -#: builtin/commit.c:1613 +#: builtin/commit.c:1608 msgid "interactively add changes" msgstr "lägg till ändringar interaktivt" -#: builtin/commit.c:1614 +#: builtin/commit.c:1609 msgid "commit only specified files" msgstr "checka endast in angivna filer" -#: builtin/commit.c:1615 +#: builtin/commit.c:1610 msgid "bypass pre-commit and commit-msg hooks" msgstr "förbigå pre-commit- och commit-msg-krokar" -#: builtin/commit.c:1616 +#: builtin/commit.c:1611 msgid "show what would be committed" msgstr "visa vad som skulle checkas in" -#: builtin/commit.c:1627 +#: builtin/commit.c:1622 msgid "amend previous commit" msgstr "lägg till föregående incheckning" -#: builtin/commit.c:1628 +#: builtin/commit.c:1623 msgid "bypass post-rewrite hook" msgstr "förbigå post-rewrite-krok" -#: builtin/commit.c:1633 +#: builtin/commit.c:1628 msgid "ok to record an empty change" msgstr "ok att registrera en tom ändring" -#: builtin/commit.c:1635 +#: builtin/commit.c:1630 msgid "ok to record a change with an empty message" msgstr "ok att registrera en ändring med tomt meddelande" -#: builtin/commit.c:1664 +#: builtin/commit.c:1659 msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: builtin/commit.c:1712 +#: builtin/commit.c:1707 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Trasig MERGE_HEAD-fil (%s)" -#: builtin/commit.c:1719 +#: builtin/commit.c:1714 msgid "could not read MERGE_MODE" msgstr "kunde inte läsa MERGE_MODE" -#: builtin/commit.c:1738 +#: builtin/commit.c:1733 #, c-format msgid "could not read commit message: %s" msgstr "kunde inte läsa incheckningsmeddelande: %s" -#: builtin/commit.c:1749 +#: builtin/commit.c:1744 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" -#: builtin/commit.c:1754 +#: builtin/commit.c:1749 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n" -#: builtin/commit.c:1802 +#: builtin/commit.c:1797 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -7180,6 +7492,94 @@ msgstr "mer än två blobbar angavs: \"%s\"" msgid "unhandled object '%s' given." msgstr "ej hanterat objekt \"%s\" angavs." +#: builtin/difftool.c:28 +msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" +msgstr "" +"git difftool [<flaggor>] [<incheckning> [<incheckning>]] [--] [<sökväg>...]" + +#: builtin/difftool.c:241 +#, c-format +msgid "failed: %d" +msgstr "misslyckades: %d" + +#: builtin/difftool.c:342 +msgid "" +"combined diff formats('-c' and '--cc') are not supported in\n" +"directory diff mode('-d' and '--dir-diff')." +msgstr "" +"kombinerade diff-format (\"-c\" och \"--cc\") stöds inte i\n" +"katalogdiffläge (\"-d\" och \"--dir-diff\")." + +#: builtin/difftool.c:567 +#, c-format +msgid "both files modified: '%s' and '%s'." +msgstr "bägge filerna ändrade: \"%s\" och \"%s\"." + +#: builtin/difftool.c:569 +msgid "working tree file has been left." +msgstr "filen i arbetskatalogen lämnades kvar." + +#: builtin/difftool.c:580 +#, c-format +msgid "temporary files exist in '%s'." +msgstr "temporära filer finns i \"%s\"." + +#: builtin/difftool.c:581 +msgid "you may want to cleanup or recover these." +msgstr "du kanske vill städa eller rädda dem." + +#: builtin/difftool.c:626 +msgid "use `diff.guitool` instead of `diff.tool`" +msgstr "använd \"diff.guitool\" istället för \"diff.tool\"" + +#: builtin/difftool.c:628 +msgid "perform a full-directory diff" +msgstr "utför diff för hela katalogen" + +#: builtin/difftool.c:630 +msgid "do not prompt before launching a diff tool" +msgstr "fråga inte vid start av diff-verktyg" + +#: builtin/difftool.c:636 +msgid "use symlinks in dir-diff mode" +msgstr "använd symboliska länkar i katalogdiffläge" + +#: builtin/difftool.c:637 +msgid "<tool>" +msgstr "<verktyg>" + +#: builtin/difftool.c:638 +msgid "use the specified diff tool" +msgstr "använd angivet diff-verktyg" + +#: builtin/difftool.c:640 +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:643 +msgid "" +"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " +"code" +msgstr "" +"låt \"git-difftool\" avbryta när ett anropat diff-verktyg ger returvärde " +"skilt från noll" + +#: builtin/difftool.c:645 +msgid "<command>" +msgstr "<kommando>" + +#: builtin/difftool.c:646 +msgid "specify a custom command for viewing diffs" +msgstr "ange eget kommando för att visa diffar" + +#: builtin/difftool.c:670 +msgid "no <tool> given for --tool=<tool>" +msgstr "inget <verktyg> angavs för --tool=<verktyg>" + +#: builtin/difftool.c:677 +msgid "no <cmd> given for --extcmd=<cmd>" +msgstr "inget <kommando> angavs för --extcmd=<kommando>" + #: builtin/fast-export.c:25 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-flaggor]" @@ -7336,77 +7736,77 @@ msgstr "referenskarta" msgid "specify fetch refmap" msgstr "ange referenskarta för \"fetch\"" -#: builtin/fetch.c:398 +#: builtin/fetch.c:395 msgid "Couldn't find remote ref HEAD" msgstr "Kunde inte hitta fjärr-referensen HEAD" -#: builtin/fetch.c:514 +#: builtin/fetch.c:511 #, 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:607 +#: builtin/fetch.c:604 #, c-format msgid "object %s not found" msgstr "objektet %s hittades inte" -#: builtin/fetch.c:611 +#: builtin/fetch.c:608 msgid "[up to date]" msgstr "[àjour]" -#: builtin/fetch.c:624 builtin/fetch.c:704 +#: builtin/fetch.c:621 builtin/fetch.c:701 msgid "[rejected]" msgstr "[refuserad]" -#: builtin/fetch.c:625 +#: builtin/fetch.c:622 msgid "can't fetch in current branch" msgstr "kan inte hämta i aktuell gren" -#: builtin/fetch.c:634 +#: builtin/fetch.c:631 msgid "[tag update]" msgstr "[uppdaterad tagg]" -#: builtin/fetch.c:635 builtin/fetch.c:668 builtin/fetch.c:684 -#: builtin/fetch.c:699 +#: builtin/fetch.c:632 builtin/fetch.c:665 builtin/fetch.c:681 +#: builtin/fetch.c:696 msgid "unable to update local ref" msgstr "kunde inte uppdatera lokal ref" -#: builtin/fetch.c:654 +#: builtin/fetch.c:651 msgid "[new tag]" msgstr "[ny tagg]" -#: builtin/fetch.c:657 +#: builtin/fetch.c:654 msgid "[new branch]" msgstr "[ny gren]" -#: builtin/fetch.c:660 +#: builtin/fetch.c:657 msgid "[new ref]" msgstr "[ny ref]" -#: builtin/fetch.c:699 +#: builtin/fetch.c:696 msgid "forced update" msgstr "tvingad uppdatering" -#: builtin/fetch.c:704 +#: builtin/fetch.c:701 msgid "non-fast-forward" msgstr "ej snabbspolad" -#: builtin/fetch.c:749 +#: builtin/fetch.c:746 #, 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:769 +#: builtin/fetch.c:766 #, 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:856 builtin/fetch.c:952 +#: builtin/fetch.c:853 builtin/fetch.c:949 #, c-format msgid "From %.*s\n" msgstr "Från %.*s\n" -#: builtin/fetch.c:867 +#: builtin/fetch.c:864 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -7415,55 +7815,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:922 +#: builtin/fetch.c:919 #, c-format msgid " (%s will become dangling)" msgstr " (%s kommer bli dinglande)" -#: builtin/fetch.c:923 +#: builtin/fetch.c:920 #, c-format msgid " (%s has become dangling)" msgstr " (%s har blivit dinglande)" -#: builtin/fetch.c:955 +#: builtin/fetch.c:952 msgid "[deleted]" msgstr "[borttagen]" -#: builtin/fetch.c:956 builtin/remote.c:1020 +#: builtin/fetch.c:953 builtin/remote.c:1020 msgid "(none)" msgstr "(ingen)" -#: builtin/fetch.c:979 +#: builtin/fetch.c:976 #, 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:998 +#: builtin/fetch.c:995 #, 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:1001 +#: builtin/fetch.c:998 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Flaggan \"%s\" ignoreras för %s\n" -#: builtin/fetch.c:1077 +#: builtin/fetch.c:1074 #, c-format msgid "Don't know how to fetch from %s" msgstr "Vet inte hur man hämtar från %s" -#: builtin/fetch.c:1237 +#: builtin/fetch.c:1234 #, c-format msgid "Fetching %s\n" msgstr "Hämtar %s\n" -#: builtin/fetch.c:1239 builtin/remote.c:96 +#: builtin/fetch.c:1236 builtin/remote.c:96 #, c-format msgid "Could not fetch %s" msgstr "Kunde inte hämta %s" -#: builtin/fetch.c:1257 +#: builtin/fetch.c:1254 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -7471,40 +7871,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:1280 +#: builtin/fetch.c:1277 msgid "You need to specify a tag name." msgstr "Du måste ange namnet på en tagg." -#: builtin/fetch.c:1322 +#: builtin/fetch.c:1319 msgid "Negative depth in --deepen is not supported" msgstr "Negativa djup stöds inte i --deepen" -#: builtin/fetch.c:1324 +#: builtin/fetch.c:1321 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen och --depth är ömsesidigt uteslutande" -#: builtin/fetch.c:1329 +#: builtin/fetch.c:1326 msgid "--depth and --unshallow cannot be used together" msgstr "--depth och --unshallow kan inte användas samtidigt" -#: builtin/fetch.c:1331 +#: builtin/fetch.c:1328 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow kan inte användas på ett komplett arkiv" -#: builtin/fetch.c:1353 +#: builtin/fetch.c:1350 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet på ett arkiv som argument" -#: builtin/fetch.c:1355 +#: builtin/fetch.c:1352 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kan inte anges med referensspecifikationer" -#: builtin/fetch.c:1366 +#: builtin/fetch.c:1363 #, c-format msgid "No such remote or remote group: %s" msgstr "Fjärren eller fjärrgruppen finns inte: %s" -#: builtin/fetch.c:1374 +#: builtin/fetch.c:1371 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Kan inte hämta från grupp och ange referensspecifikationer" @@ -7570,7 +7970,7 @@ 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:37 builtin/tag.c:372 +#: builtin/for-each-ref.c:37 builtin/tag.c:387 builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "format att använda för utdata" @@ -7590,65 +7990,65 @@ msgstr "visa endast referenser som ej slagits samman" msgid "print only refs which contain the commit" msgstr "visa endast referenser som innehåller incheckningen" -#: builtin/fsck.c:519 +#: builtin/fsck.c:554 msgid "Checking object directories" msgstr "Kontrollerar objektkataloger" -#: builtin/fsck.c:588 +#: builtin/fsck.c:646 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<flaggor>] [<objekt>...]" -#: builtin/fsck.c:594 +#: builtin/fsck.c:652 msgid "show unreachable objects" msgstr "visa onåbara objekt" -#: builtin/fsck.c:595 +#: builtin/fsck.c:653 msgid "show dangling objects" msgstr "visa dinglande objekt" -#: builtin/fsck.c:596 +#: builtin/fsck.c:654 msgid "report tags" msgstr "rapportera taggar" -#: builtin/fsck.c:597 +#: builtin/fsck.c:655 msgid "report root nodes" msgstr "rapportera rotnoder" -#: builtin/fsck.c:598 +#: builtin/fsck.c:656 msgid "make index objects head nodes" msgstr "gör indexojekt till huvudnoder" -#: builtin/fsck.c:599 +#: builtin/fsck.c:657 msgid "make reflogs head nodes (default)" msgstr "gör refloggar till huvudnoder (standard)" -#: builtin/fsck.c:600 +#: builtin/fsck.c:658 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:601 +#: builtin/fsck.c:659 msgid "check only connectivity" msgstr "kontrollera endast konnektivitet" -#: builtin/fsck.c:602 +#: builtin/fsck.c:660 msgid "enable more strict checking" msgstr "aktivera striktare kontroll" -#: builtin/fsck.c:604 +#: builtin/fsck.c:662 msgid "write dangling objects in .git/lost-found" msgstr "skriv dinglande objekt i .git/lost-found" -#: builtin/fsck.c:605 builtin/prune.c:107 +#: builtin/fsck.c:663 builtin/prune.c:107 msgid "show progress" msgstr "visa förlopp" -#: builtin/fsck.c:606 +#: builtin/fsck.c:664 msgid "show verbose names for reachable objects" msgstr "visa ordrika namn för nåbara objekt" -#: builtin/fsck.c:665 +#: builtin/fsck.c:725 msgid "Checking objects" msgstr "Kontrollerar objekt" @@ -7666,7 +8066,7 @@ msgstr "Felaktigt %s: \"%s\"" msgid "insanely long object directory %.*s" msgstr "tokigt lång objektkatalog %.*s" -#: builtin/gc.c:290 +#: builtin/gc.c:297 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -7681,38 +8081,38 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:327 +#: builtin/gc.c:334 msgid "prune unreferenced objects" msgstr "rensa ej refererade objekt" -#: builtin/gc.c:329 +#: builtin/gc.c:336 msgid "be more thorough (increased runtime)" msgstr "var mer grundlig (ökar körtiden)" -#: builtin/gc.c:330 +#: builtin/gc.c:337 msgid "enable auto-gc mode" msgstr "aktivera auto-gc-läge" -#: builtin/gc.c:331 +#: builtin/gc.c:338 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:373 +#: builtin/gc.c:380 #, 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:375 +#: builtin/gc.c:382 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Packar arkivet automatiskt för optimal prestanda.\n" -#: builtin/gc.c:376 +#: builtin/gc.c:383 #, 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:397 +#: builtin/gc.c:404 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -7720,240 +8120,256 @@ msgstr "" "gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte " "är fallet)" -#: builtin/gc.c:441 +#: builtin/gc.c:448 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" "Det finns för många onåbara lösa objekt; kör \"git prune\" för att ta bort " "dem." -#: builtin/grep.c:23 +#: builtin/grep.c:25 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<flaggor>] [-e] <mönster> [<rev>...] [[--] <sökväg>...]" -#: builtin/grep.c:219 +#: builtin/grep.c:232 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep: misslyckades skapa tråd. %s" -#: builtin/grep.c:277 +#: builtin/grep.c:290 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "felaktigt antal trådar angivet (%d) för %s" -#: builtin/grep.c:453 builtin/grep.c:488 +#: builtin/grep.c:763 builtin/grep.c:804 #, c-format msgid "unable to read tree (%s)" msgstr "kunde inte läsa träd (%s)" -#: builtin/grep.c:503 +#: builtin/grep.c:823 #, c-format msgid "unable to grep from object of type %s" msgstr "Kunde inte \"grep\" från objekt av typen %s" -#: builtin/grep.c:561 +#: builtin/grep.c:887 #, c-format msgid "switch `%c' expects a numerical value" msgstr "flaggan \"%c\" antar ett numeriskt värde" -#: builtin/grep.c:647 +#: builtin/grep.c:973 msgid "search in index instead of in the work tree" msgstr "sök i indexet istället för i arbetskatalogen" -#: builtin/grep.c:649 +#: builtin/grep.c:975 msgid "find in contents not managed by git" msgstr "sök i innehåll som inte hanteras av git" -#: builtin/grep.c:651 +#: builtin/grep.c:977 msgid "search in both tracked and untracked files" msgstr "sök i både spårade och ospårade filer" -#: builtin/grep.c:653 +#: builtin/grep.c:979 msgid "ignore files specified via '.gitignore'" msgstr "ignorera filer angivna i \".gitignore\"" -#: builtin/grep.c:656 +#: builtin/grep.c:981 +msgid "recursivley search in each submodule" +msgstr "sök varje undermodul rekursivt" + +#: builtin/grep.c:983 +msgid "basename" +msgstr "basnamn" + +#: builtin/grep.c:984 +msgid "prepend parent project's basename to output" +msgstr "lägg till föräldraprojektets basnamn i utdata" + +#: builtin/grep.c:987 msgid "show non-matching lines" msgstr "visa rader som inte träffas" -#: builtin/grep.c:658 +#: builtin/grep.c:989 msgid "case insensitive matching" msgstr "skiftlägesokänslig sökning" -#: builtin/grep.c:660 +#: builtin/grep.c:991 msgid "match patterns only at word boundaries" msgstr "matcha endast mönster vid ordgränser" -#: builtin/grep.c:662 +#: builtin/grep.c:993 msgid "process binary files as text" msgstr "hantera binärfiler som text" -#: builtin/grep.c:664 +#: builtin/grep.c:995 msgid "don't match patterns in binary files" msgstr "träffa inte mönster i binärfiler" -#: builtin/grep.c:667 +#: builtin/grep.c:998 msgid "process binary files with textconv filters" msgstr "hantera binärfiler med textconv-filter" -#: builtin/grep.c:669 +#: builtin/grep.c:1000 msgid "descend at most <depth> levels" msgstr "gå som mest ned <djup> nivåer" -#: builtin/grep.c:673 +#: builtin/grep.c:1004 msgid "use extended POSIX regular expressions" msgstr "använd utökade POSIX-reguljära uttryck" -#: builtin/grep.c:676 +#: builtin/grep.c:1007 msgid "use basic POSIX regular expressions (default)" msgstr "använd grundläggande POSIX-reguljära uttryck (standard)" -#: builtin/grep.c:679 +#: builtin/grep.c:1010 msgid "interpret patterns as fixed strings" msgstr "tolka mönster som fixerade strängar" -#: builtin/grep.c:682 +#: builtin/grep.c:1013 msgid "use Perl-compatible regular expressions" msgstr "använd Perlkompatibla reguljära uttryck" -#: builtin/grep.c:685 +#: builtin/grep.c:1016 msgid "show line numbers" msgstr "visa radnummer" -#: builtin/grep.c:686 +#: builtin/grep.c:1017 msgid "don't show filenames" msgstr "visa inte filnamn" -#: builtin/grep.c:687 +#: builtin/grep.c:1018 msgid "show filenames" msgstr "visa filnamn" -#: builtin/grep.c:689 +#: builtin/grep.c:1020 msgid "show filenames relative to top directory" msgstr "visa filnamn relativa till toppkatalogen" -#: builtin/grep.c:691 +#: builtin/grep.c:1022 msgid "show only filenames instead of matching lines" msgstr "visa endast filnamn istället för träffade rader" -#: builtin/grep.c:693 +#: builtin/grep.c:1024 msgid "synonym for --files-with-matches" msgstr "synonym för --files-with-matches" -#: builtin/grep.c:696 +#: builtin/grep.c:1027 msgid "show only the names of files without match" msgstr "visa endast namn på filer utan träffar" -#: builtin/grep.c:698 +#: builtin/grep.c:1029 msgid "print NUL after filenames" msgstr "skriv NUL efter filnamn" -#: builtin/grep.c:700 +#: builtin/grep.c:1031 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:701 +#: builtin/grep.c:1032 msgid "highlight matches" msgstr "ljusmarkera träffar" -#: builtin/grep.c:703 +#: builtin/grep.c:1034 msgid "print empty line between matches from different files" msgstr "skriv tomma rader mellan träffar från olika filer" -#: builtin/grep.c:705 +#: builtin/grep.c:1036 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:708 +#: builtin/grep.c:1039 msgid "show <n> context lines before and after matches" msgstr "visa <n> rader sammanhang före och efter träffar" -#: builtin/grep.c:711 +#: builtin/grep.c:1042 msgid "show <n> context lines before matches" msgstr "visa <n> rader sammanhang före träffar" -#: builtin/grep.c:713 +#: builtin/grep.c:1044 msgid "show <n> context lines after matches" msgstr "visa <n> rader sammanhang efter träffar" -#: builtin/grep.c:715 +#: builtin/grep.c:1046 msgid "use <n> worker threads" msgstr "använd <n> jobbtrådar" -#: builtin/grep.c:716 +#: builtin/grep.c:1047 msgid "shortcut for -C NUM" msgstr "genväg för -C NUM" -#: builtin/grep.c:719 +#: builtin/grep.c:1050 msgid "show a line with the function name before matches" msgstr "visa en rad med funktionsnamnet före träffen" -#: builtin/grep.c:721 +#: builtin/grep.c:1052 msgid "show the surrounding function" msgstr "visa den omkringliggande funktionen" -#: builtin/grep.c:724 +#: builtin/grep.c:1055 msgid "read patterns from file" msgstr "läs mönster från fil" -#: builtin/grep.c:726 +#: builtin/grep.c:1057 msgid "match <pattern>" msgstr "träffa <mönster>" -#: builtin/grep.c:728 +#: builtin/grep.c:1059 msgid "combine patterns specified with -e" msgstr "kombinera mönster som anges med -e" -#: builtin/grep.c:740 +#: builtin/grep.c:1071 msgid "indicate hit with exit status without output" msgstr "ange träff med slutstatuskod utan utdata" -#: builtin/grep.c:742 +#: builtin/grep.c:1073 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:744 +#: builtin/grep.c:1075 msgid "show parse tree for grep expression" msgstr "visa analysträd för grep-uttryck" -#: builtin/grep.c:748 +#: builtin/grep.c:1079 msgid "pager" msgstr "bläddrare" -#: builtin/grep.c:748 +#: builtin/grep.c:1079 msgid "show matching files in the pager" msgstr "visa träffade filer i filbläddraren" -#: builtin/grep.c:751 +#: builtin/grep.c:1082 msgid "allow calling of grep(1) (ignored by this build)" msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)" -#: builtin/grep.c:814 +#: builtin/grep.c:1146 msgid "no pattern given." msgstr "inget mönster angavs." -#: builtin/grep.c:846 builtin/index-pack.c:1480 +#: builtin/grep.c:1178 builtin/index-pack.c:1482 #, c-format msgid "invalid number of threads specified (%d)" msgstr "felaktigt antal trådar angivet (%d)" -#: builtin/grep.c:876 +#: builtin/grep.c:1215 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager fungerar endast i arbetskatalogen" -#: builtin/grep.c:902 +#: builtin/grep.c:1238 +msgid "option not supported with --recurse-submodules." +msgstr "flaggan stöds inte med --recurse-submodules." + +#: builtin/grep.c:1244 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached och --untracked kan inte användas med --no-index." -#: builtin/grep.c:907 +#: builtin/grep.c:1249 msgid "--no-index or --untracked cannot be used with revs." msgstr "--no-index och --untracked kan inte användas med revisioner." -#: builtin/grep.c:910 +#: builtin/grep.c:1252 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:918 +#: builtin/grep.c:1260 msgid "both --cached and trees are given." msgstr "både --cached och träd angavs." @@ -8232,183 +8648,187 @@ 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:811 builtin/index-pack.c:820 +#: builtin/index-pack.c:813 builtin/index-pack.c:822 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !" -#: builtin/index-pack.c:751 builtin/pack-objects.c:166 -#: builtin/pack-objects.c:258 +#: builtin/index-pack.c:751 builtin/pack-objects.c:164 +#: builtin/pack-objects.c:256 #, c-format msgid "unable to read %s" msgstr "kunde inte läsa %s" -#: builtin/index-pack.c:817 +#: builtin/index-pack.c:819 #, c-format msgid "cannot read existing object %s" msgstr "kan inte läsa befintligt objekt %s" -#: builtin/index-pack.c:831 +#: builtin/index-pack.c:833 #, c-format msgid "invalid blob object %s" msgstr "ogiltigt blob-objekt %s" -#: builtin/index-pack.c:845 +#: builtin/index-pack.c:847 #, c-format msgid "invalid %s" msgstr "ogiltigt %s" -#: builtin/index-pack.c:848 +#: builtin/index-pack.c:850 msgid "Error in object" msgstr "Fel i objekt" -#: builtin/index-pack.c:850 +#: builtin/index-pack.c:852 #, 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:922 builtin/index-pack.c:953 +#: builtin/index-pack.c:924 builtin/index-pack.c:955 msgid "failed to apply delta" msgstr "misslyckades tillämpa delta" -#: builtin/index-pack.c:1123 +#: builtin/index-pack.c:1125 msgid "Receiving objects" msgstr "Tar emot objekt" -#: builtin/index-pack.c:1123 +#: builtin/index-pack.c:1125 msgid "Indexing objects" msgstr "Skapar index för objekt" -#: builtin/index-pack.c:1155 +#: builtin/index-pack.c:1157 msgid "pack is corrupted (SHA1 mismatch)" msgstr "paketet är trasigt (SHA1 stämmer inte)" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1162 msgid "cannot fstat packfile" msgstr "kan inte utföra \"fstat\" på paketfil" -#: builtin/index-pack.c:1163 +#: builtin/index-pack.c:1165 msgid "pack has junk at the end" msgstr "paket har skräp i slutet" -#: builtin/index-pack.c:1174 +#: builtin/index-pack.c:1176 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "förvirrad bortom vanvett i parse_pack_objects()" -#: builtin/index-pack.c:1197 +#: builtin/index-pack.c:1199 msgid "Resolving deltas" msgstr "Analyserar delta" -#: builtin/index-pack.c:1208 +#: builtin/index-pack.c:1210 #, c-format msgid "unable to create thread: %s" msgstr "kunde inte skapa tråd: %s" -#: builtin/index-pack.c:1250 +#: builtin/index-pack.c:1252 msgid "confusion beyond insanity" msgstr "förvirrad bortom vanvett" -#: builtin/index-pack.c:1256 +#: builtin/index-pack.c:1258 #, 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:1268 +#: builtin/index-pack.c:1270 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Oväntad svanschecksumma för %s (trasig disk?)" -#: builtin/index-pack.c:1272 +#: builtin/index-pack.c:1274 #, 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:1296 +#: builtin/index-pack.c:1298 #, c-format msgid "unable to deflate appended object (%d)" msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)" -#: builtin/index-pack.c:1372 +#: builtin/index-pack.c:1374 #, c-format msgid "local object %s is corrupt" msgstr "lokalt objekt %s är trasigt" -#: builtin/index-pack.c:1396 +#: builtin/index-pack.c:1398 msgid "error while closing pack file" msgstr "fel vid stängning av paketfil" -#: builtin/index-pack.c:1409 +#: builtin/index-pack.c:1411 #, c-format msgid "cannot write keep file '%s'" msgstr "kan inte ta skriva \"keep\"-fil \"%s\"" -#: builtin/index-pack.c:1417 +#: builtin/index-pack.c:1419 #, c-format msgid "cannot close written keep file '%s'" msgstr "akn inte stänga skriven \"keep\"-fil \"%s\"" -#: builtin/index-pack.c:1430 +#: builtin/index-pack.c:1432 msgid "cannot store pack file" msgstr "kan inte spara paketfil" -#: builtin/index-pack.c:1441 +#: builtin/index-pack.c:1443 msgid "cannot store index file" msgstr "kan inte spara indexfil" -#: builtin/index-pack.c:1474 +#: builtin/index-pack.c:1476 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "felaktig pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1484 builtin/index-pack.c:1681 +#: builtin/index-pack.c:1486 builtin/index-pack.c:1683 #, c-format msgid "no threads support, ignoring %s" msgstr "trådstöd saknas, ignorerar %s" -#: builtin/index-pack.c:1542 +#: builtin/index-pack.c:1544 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kan inte öppna befintlig paketfil \"%s\"" -#: builtin/index-pack.c:1544 +#: builtin/index-pack.c:1546 #, 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:1591 +#: builtin/index-pack.c:1593 #, 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:1598 +#: builtin/index-pack.c:1600 #, 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:1611 +#: builtin/index-pack.c:1613 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\"" -#: builtin/index-pack.c:1693 builtin/index-pack.c:1696 -#: builtin/index-pack.c:1712 builtin/index-pack.c:1716 +#: builtin/index-pack.c:1695 builtin/index-pack.c:1698 +#: builtin/index-pack.c:1714 builtin/index-pack.c:1718 #, c-format msgid "bad %s" msgstr "felaktig %s" -#: builtin/index-pack.c:1732 +#: builtin/index-pack.c:1734 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin kan inte användas med --stdin" -#: builtin/index-pack.c:1740 +#: builtin/index-pack.c:1736 +msgid "--stdin requires a git repository" +msgstr "--stdin kräver ett git-arkiv" + +#: builtin/index-pack.c:1744 msgid "--verify with no packfile name given" msgstr "--verify angavs utan paketfilnamn" @@ -8656,7 +9076,7 @@ msgstr "Två utdatakataloger?" msgid "Unknown commit %s" msgstr "Okänd incheckning %s" -#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:455 +#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:476 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Kunde inte slå upp \"%s\" som en giltig referens." @@ -9038,35 +9458,35 @@ msgstr "visa underliggande referens och objektet det pekar på" msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "git ls-tree [<flaggor>] <träd-igt> [<sökväg>...]" -#: builtin/ls-tree.c:128 +#: builtin/ls-tree.c:126 msgid "only show trees" msgstr "visa endast träd" -#: builtin/ls-tree.c:130 +#: builtin/ls-tree.c:128 msgid "recurse into subtrees" msgstr "rekursera ner i underträd" -#: builtin/ls-tree.c:132 +#: builtin/ls-tree.c:130 msgid "show trees when recursing" msgstr "visa träd medan rekursering" -#: builtin/ls-tree.c:135 +#: builtin/ls-tree.c:133 msgid "terminate entries with NUL byte" msgstr "terminera poster med NUL-byte" -#: builtin/ls-tree.c:136 +#: builtin/ls-tree.c:134 msgid "include object size" msgstr "inkludera objektstorlek" -#: builtin/ls-tree.c:138 builtin/ls-tree.c:140 +#: builtin/ls-tree.c:136 builtin/ls-tree.c:138 msgid "list only filenames" msgstr "visa endast filnamn" -#: builtin/ls-tree.c:143 +#: builtin/ls-tree.c:141 msgid "use full path names" msgstr "använd fullständiga sökvägsnamn" -#: builtin/ls-tree.c:145 +#: builtin/ls-tree.c:143 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "visa hela trädet; inte bara aktuell katalog (implicerar --full-name)" @@ -9082,163 +9502,171 @@ msgstr "git merge [<flaggor>] <meddelande> HEAD <incheckning>" msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:102 +#: builtin/merge.c:49 +msgid "git merge --continue" +msgstr "git merge --continue" + +#: builtin/merge.c:104 msgid "switch `m' requires a value" msgstr "flaggan \"m\" behöver ett värde" -#: builtin/merge.c:139 +#: builtin/merge.c:141 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n" -#: builtin/merge.c:140 +#: builtin/merge.c:142 #, c-format msgid "Available strategies are:" msgstr "Tillgängliga strategier är:" -#: builtin/merge.c:145 +#: builtin/merge.c:147 #, c-format msgid "Available custom strategies are:" msgstr "Tillgängliga skräddarsydda strategier är:" -#: builtin/merge.c:195 builtin/pull.c:127 +#: builtin/merge.c:197 builtin/pull.c:127 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:198 builtin/pull.c:130 +#: builtin/merge.c:200 builtin/pull.c:130 msgid "show a diffstat at the end of the merge" msgstr "visa en diffstat när sammanslagningen är färdig" -#: builtin/merge.c:199 builtin/pull.c:133 +#: builtin/merge.c:201 builtin/pull.c:133 msgid "(synonym to --stat)" msgstr "(synonym till --stat)" -#: builtin/merge.c:201 builtin/pull.c:136 +#: builtin/merge.c:203 builtin/pull.c:136 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:204 builtin/pull.c:139 +#: builtin/merge.c:206 builtin/pull.c:139 msgid "create a single commit instead of doing a merge" msgstr "skapa en ensam incheckning istället för en sammanslagning" -#: builtin/merge.c:206 builtin/pull.c:142 +#: builtin/merge.c:208 builtin/pull.c:142 msgid "perform a commit if the merge succeeds (default)" msgstr "utför en incheckning om sammanslagningen lyckades (standard)" -#: builtin/merge.c:208 builtin/pull.c:145 +#: builtin/merge.c:210 builtin/pull.c:145 msgid "edit message before committing" msgstr "redigera meddelande innan incheckning" -#: builtin/merge.c:209 +#: builtin/merge.c:211 msgid "allow fast-forward (default)" msgstr "tillåt snabbspolning (standard)" -#: builtin/merge.c:211 builtin/pull.c:151 +#: builtin/merge.c:213 builtin/pull.c:151 msgid "abort if fast-forward is not possible" msgstr "avbryt om snabbspolning inte är möjlig" -#: builtin/merge.c:215 builtin/pull.c:154 +#: builtin/merge.c:217 builtin/pull.c:154 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:216 builtin/notes.c:774 builtin/pull.c:158 +#: builtin/merge.c:218 builtin/notes.c:774 builtin/pull.c:158 #: builtin/revert.c:89 msgid "strategy" msgstr "strategi" -#: builtin/merge.c:217 builtin/pull.c:159 +#: builtin/merge.c:219 builtin/pull.c:159 msgid "merge strategy to use" msgstr "sammanslagningsstrategi att använda" -#: builtin/merge.c:218 builtin/pull.c:162 +#: builtin/merge.c:220 builtin/pull.c:162 msgid "option=value" msgstr "alternativ=värde" -#: builtin/merge.c:219 builtin/pull.c:163 +#: builtin/merge.c:221 builtin/pull.c:163 msgid "option for selected merge strategy" msgstr "alternativ för vald sammanslagningsstrategi" -#: builtin/merge.c:221 +#: builtin/merge.c:223 msgid "merge commit message (for a non-fast-forward merge)" msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning" -#: builtin/merge.c:225 +#: builtin/merge.c:227 msgid "abort the current in-progress merge" msgstr "avbryt den pågående sammanslagningen" -#: builtin/merge.c:227 builtin/pull.c:170 +#: builtin/merge.c:229 +msgid "continue the current in-progress merge" +msgstr "fortsätt den pågående sammanslagningen" + +#: builtin/merge.c:231 builtin/pull.c:170 msgid "allow merging unrelated histories" msgstr "tillåt sammanslagning av orelaterade historier" -#: builtin/merge.c:255 +#: builtin/merge.c:259 msgid "could not run stash." msgstr "kunde köra stash." -#: builtin/merge.c:260 +#: builtin/merge.c:264 msgid "stash failed" msgstr "stash misslyckades" -#: builtin/merge.c:265 +#: builtin/merge.c:269 #, c-format msgid "not a valid object: %s" msgstr "inte ett giltigt objekt: %s" -#: builtin/merge.c:284 builtin/merge.c:301 +#: builtin/merge.c:288 builtin/merge.c:305 msgid "read-tree failed" msgstr "read-tree misslyckades" -#: builtin/merge.c:331 +#: builtin/merge.c:335 msgid " (nothing to squash)" msgstr " (inget att platta till)" -#: builtin/merge.c:342 +#: builtin/merge.c:346 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n" -#: builtin/merge.c:392 +#: builtin/merge.c:396 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n" -#: builtin/merge.c:443 +#: builtin/merge.c:447 #, c-format msgid "'%s' does not point to a commit" msgstr "\"%s\" verkar inte peka på en incheckning" -#: builtin/merge.c:533 +#: builtin/merge.c:537 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Felaktig branch.%s.mergeoptions-sträng: %s" -#: builtin/merge.c:652 +#: builtin/merge.c:656 msgid "Not handling anything other than two heads merge." msgstr "Hanterar inte något annat än en sammanslagning av två huvuden." -#: builtin/merge.c:666 +#: builtin/merge.c:670 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Felaktig flagga för merge-recursive: -X%s" -#: builtin/merge.c:681 +#: builtin/merge.c:685 #, c-format msgid "unable to write %s" msgstr "kunde inte skriva %s" -#: builtin/merge.c:733 +#: builtin/merge.c:737 #, c-format msgid "Could not read from '%s'" msgstr "Kunde inte läsa från \"%s\"" -#: builtin/merge.c:742 +#: builtin/merge.c:746 #, 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:748 +#: builtin/merge.c:752 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -9254,67 +9682,79 @@ msgstr "" "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n" "avbryter incheckningen.\n" -#: builtin/merge.c:772 +#: builtin/merge.c:776 msgid "Empty commit message." msgstr "Tomt incheckningsmeddelande." -#: builtin/merge.c:792 +#: builtin/merge.c:796 #, c-format msgid "Wonderful.\n" msgstr "Underbart.\n" -#: builtin/merge.c:847 +#: builtin/merge.c:851 #, 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:863 +#: builtin/merge.c:867 #, c-format msgid "'%s' is not a commit" msgstr "\"%s\" är inte en incheckning" -#: builtin/merge.c:904 +#: builtin/merge.c:908 msgid "No current branch." msgstr "Inte på någon gren." -#: builtin/merge.c:906 +#: builtin/merge.c:910 msgid "No remote for the current branch." msgstr "Ingen fjärr för aktuell gren." -#: builtin/merge.c:908 +#: builtin/merge.c:912 msgid "No default upstream defined for the current branch." msgstr "Ingen standarduppström angiven för aktuell gren." -#: builtin/merge.c:913 +#: builtin/merge.c:917 #, 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:960 +#: builtin/merge.c:964 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\"" -#: builtin/merge.c:1034 +#: builtin/merge.c:1038 #, c-format msgid "could not close '%s'" msgstr "kunde inte stänga \"%s\"" -#: builtin/merge.c:1061 +#: builtin/merge.c:1065 #, 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:1095 +#: builtin/merge.c:1099 msgid "not something we can merge" msgstr "inte något vi kan slå ihop" -#: builtin/merge.c:1162 +#: builtin/merge.c:1167 +msgid "--abort expects no arguments" +msgstr "--abort tar inga argument" + +#: builtin/merge.c:1171 msgid "There is no merge to abort (MERGE_HEAD missing)." -msgstr "Det finns ingen sammanslagning att avbryta (MERGE_HEAD saknas)." +msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)." + +#: builtin/merge.c:1183 +msgid "--continue expects no arguments" +msgstr "--continue tar inga argument" + +#: builtin/merge.c:1187 +msgid "There is no merge in progress (MERGE_HEAD missing)." +msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)." -#: builtin/merge.c:1178 +#: builtin/merge.c:1203 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -9322,7 +9762,7 @@ msgstr "" "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" "Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1185 +#: builtin/merge.c:1210 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -9330,114 +9770,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:1188 +#: builtin/merge.c:1213 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:1197 +#: builtin/merge.c:1222 msgid "You cannot combine --squash with --no-ff." msgstr "Du kan inte kombinera --squash med --no-ff." -#: builtin/merge.c:1205 +#: builtin/merge.c:1230 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt." -#: builtin/merge.c:1222 +#: builtin/merge.c:1247 msgid "Squash commit into empty head not supported yet" msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu" -#: builtin/merge.c:1224 +#: builtin/merge.c:1249 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:1229 +#: builtin/merge.c:1254 #, c-format msgid "%s - not something we can merge" msgstr "%s - inte något vi kan slå ihop" -#: builtin/merge.c:1231 +#: builtin/merge.c:1256 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:1287 +#: builtin/merge.c:1312 #, 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:1290 +#: builtin/merge.c:1315 #, 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:1293 +#: builtin/merge.c:1318 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Incheckning %s har inte någon GPG-signatur." -#: builtin/merge.c:1296 +#: builtin/merge.c:1321 #, 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:1358 +#: builtin/merge.c:1383 msgid "refusing to merge unrelated histories" msgstr "vägrar slå samman orelaterad historik" -#: builtin/merge.c:1367 +#: builtin/merge.c:1392 msgid "Already up-to-date." msgstr "Redan à jour." -#: builtin/merge.c:1377 +#: builtin/merge.c:1402 #, c-format msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" -#: builtin/merge.c:1418 +#: builtin/merge.c:1443 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" -#: builtin/merge.c:1425 +#: builtin/merge.c:1450 #, c-format msgid "Nope.\n" msgstr "Nej.\n" -#: builtin/merge.c:1450 +#: builtin/merge.c:1475 msgid "Already up-to-date. Yeeah!" msgstr "Redan à jour. Toppen!" -#: builtin/merge.c:1456 +#: builtin/merge.c:1481 msgid "Not possible to fast-forward, aborting." msgstr "Kan inte snabbspola, avbryter." -#: builtin/merge.c:1479 builtin/merge.c:1558 +#: builtin/merge.c:1504 builtin/merge.c:1583 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Återspolar trädet till orört...\n" -#: builtin/merge.c:1483 +#: builtin/merge.c:1508 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Försöker sammanslagningsstrategin %s...\n" -#: builtin/merge.c:1549 +#: builtin/merge.c:1574 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" -#: builtin/merge.c:1551 +#: builtin/merge.c:1576 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Sammanslagning med strategin %s misslyckades.\n" -#: builtin/merge.c:1560 +#: builtin/merge.c:1585 #, 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:1572 +#: builtin/merge.c:1597 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -9570,95 +10010,95 @@ msgstr "tillåt saknade objekt" msgid "allow creation of more than one tree" msgstr "tillåt skapa mer än ett träd" -#: builtin/mv.c:15 +#: builtin/mv.c:16 msgid "git mv [<options>] <source>... <destination>" msgstr "git mv [<flaggor>] <källa>... <mål>" -#: builtin/mv.c:70 +#: builtin/mv.c:82 #, c-format msgid "Directory %s is in index and no submodule?" msgstr "Katalogen %s är i indexet och inte en undermodul?" -#: builtin/mv.c:72 builtin/rm.c:317 +#: builtin/mv.c:84 builtin/rm.c:290 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" -#: builtin/mv.c:90 +#: builtin/mv.c:102 #, c-format msgid "%.*s is in index" msgstr "%.*s är i indexet" -#: builtin/mv.c:112 +#: builtin/mv.c:124 msgid "force move/rename even if target exists" msgstr "tvinga flytta/ändra namn även om målet finns" -#: builtin/mv.c:113 +#: builtin/mv.c:125 msgid "skip move/rename errors" msgstr "hoppa över fel vid flytt/namnändring" -#: builtin/mv.c:155 +#: builtin/mv.c:167 #, c-format msgid "destination '%s' is not a directory" msgstr "destinationen \"%s\" är ingen katalog" -#: builtin/mv.c:166 +#: 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:170 +#: builtin/mv.c:182 msgid "bad source" msgstr "felaktig källa" -#: builtin/mv.c:173 +#: builtin/mv.c:185 msgid "can not move directory into itself" msgstr "kan inte flytta katalog till sig själv" -#: builtin/mv.c:176 +#: builtin/mv.c:188 msgid "cannot move directory over file" msgstr "kan inte flytta katalog över fil" -#: builtin/mv.c:185 +#: builtin/mv.c:197 msgid "source directory is empty" msgstr "källkatalogen är tom" -#: builtin/mv.c:210 +#: builtin/mv.c:222 msgid "not under version control" msgstr "inte versionshanterad" -#: builtin/mv.c:213 +#: builtin/mv.c:225 msgid "destination exists" msgstr "destinationen finns" -#: builtin/mv.c:221 +#: builtin/mv.c:233 #, c-format msgid "overwriting '%s'" msgstr "skriver över \"%s\"" -#: builtin/mv.c:224 +#: builtin/mv.c:236 msgid "Cannot overwrite" msgstr "Kan inte skriva över" -#: builtin/mv.c:227 +#: builtin/mv.c:239 msgid "multiple sources for the same target" msgstr "flera källor för samma mål" -#: builtin/mv.c:229 +#: builtin/mv.c:241 msgid "destination directory does not exist" msgstr "destinationskatalogen finns inte" -#: builtin/mv.c:236 +#: builtin/mv.c:248 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, källa=%s, mål=%s" -#: builtin/mv.c:257 +#: builtin/mv.c:269 #, c-format msgid "Renaming %s to %s\n" msgstr "Byter namn på %s till %s\n" -#: builtin/mv.c:263 builtin/remote.c:710 builtin/repack.c:375 +#: builtin/mv.c:275 builtin/remote.c:710 builtin/repack.c:384 #, c-format msgid "renaming '%s' failed" msgstr "misslyckades byta namn på \"%s\"" @@ -9846,12 +10286,12 @@ 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:233 builtin/tag.c:439 +#: builtin/notes.c:233 builtin/tag.c:460 #, c-format msgid "cannot read '%s'" msgstr "kunde inte läsa \"%s\"" -#: builtin/notes.c:235 builtin/tag.c:442 +#: builtin/notes.c:235 builtin/tag.c:463 #, c-format msgid "could not open or read '%s'" msgstr "kunde inte öppna eller läsa \"%s\"" @@ -10130,175 +10570,175 @@ msgid "" msgstr "" "git pack-objects [<flaggor>...] <basnamn> [< <reflista> | < <objektlista>]" -#: builtin/pack-objects.c:179 builtin/pack-objects.c:182 +#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 #, c-format msgid "deflate error (%d)" msgstr "fel i deflate (%d)" -#: builtin/pack-objects.c:768 +#: builtin/pack-objects.c:766 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:781 +#: builtin/pack-objects.c:779 msgid "Writing objects" msgstr "Skriver objekt" -#: builtin/pack-objects.c:1070 +#: builtin/pack-objects.c:1068 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:2346 +#: builtin/pack-objects.c:2344 msgid "Compressing objects" msgstr "Komprimerar objekt" -#: builtin/pack-objects.c:2759 +#: builtin/pack-objects.c:2747 #, c-format msgid "unsupported index version %s" msgstr "indexversionen %s stöds ej" -#: builtin/pack-objects.c:2763 +#: builtin/pack-objects.c:2751 #, c-format msgid "bad index version '%s'" msgstr "felaktig indexversion \"%s\"" -#: builtin/pack-objects.c:2793 +#: builtin/pack-objects.c:2781 msgid "do not show progress meter" msgstr "visa inte förloppsindikator" -#: builtin/pack-objects.c:2795 +#: builtin/pack-objects.c:2783 msgid "show progress meter" msgstr "visa förloppsindikator" -#: builtin/pack-objects.c:2797 +#: builtin/pack-objects.c:2785 msgid "show progress meter during object writing phase" msgstr "visa förloppsindikator under objektskrivningsfasen" -#: builtin/pack-objects.c:2800 +#: builtin/pack-objects.c:2788 msgid "similar to --all-progress when progress meter is shown" msgstr "som --all-progress när förloppsindikatorn visas" -#: builtin/pack-objects.c:2801 +#: builtin/pack-objects.c:2789 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2802 +#: builtin/pack-objects.c:2790 msgid "write the pack index file in the specified idx format version" msgstr "skriv paketindexfilen i angiven indexformatversion" -#: builtin/pack-objects.c:2805 +#: builtin/pack-objects.c:2793 msgid "maximum size of each output pack file" msgstr "maximal storlek på varje utdatapaketfil" -#: builtin/pack-objects.c:2807 +#: builtin/pack-objects.c:2795 msgid "ignore borrowed objects from alternate object store" msgstr "ignorera lånade objekt från alternativa objektlager" -#: builtin/pack-objects.c:2809 +#: builtin/pack-objects.c:2797 msgid "ignore packed objects" msgstr "ignorera packade objekt" -#: builtin/pack-objects.c:2811 +#: builtin/pack-objects.c:2799 msgid "limit pack window by objects" msgstr "begränsa paketfönster efter objekt" -#: builtin/pack-objects.c:2813 +#: builtin/pack-objects.c:2801 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:2815 +#: builtin/pack-objects.c:2803 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:2817 +#: builtin/pack-objects.c:2805 msgid "reuse existing deltas" msgstr "återanvänd befintliga delta" -#: builtin/pack-objects.c:2819 +#: builtin/pack-objects.c:2807 msgid "reuse existing objects" msgstr "återanvänd befintliga objekt" -#: builtin/pack-objects.c:2821 +#: builtin/pack-objects.c:2809 msgid "use OFS_DELTA objects" msgstr "använd OFS_DELTA-objekt" -#: builtin/pack-objects.c:2823 +#: builtin/pack-objects.c:2811 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:2825 +#: builtin/pack-objects.c:2813 msgid "do not create an empty pack output" msgstr "försök inte skapa tom paketutdata" -#: builtin/pack-objects.c:2827 +#: builtin/pack-objects.c:2815 msgid "read revision arguments from standard input" msgstr "läs revisionsargument från standard in" -#: builtin/pack-objects.c:2829 +#: builtin/pack-objects.c:2817 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:2832 +#: builtin/pack-objects.c:2820 msgid "include objects reachable from any reference" msgstr "inkludera objekt som kan nås från någon referens" -#: builtin/pack-objects.c:2835 +#: builtin/pack-objects.c:2823 msgid "include objects referred by reflog entries" msgstr "inkludera objekt som refereras från referensloggposter" -#: builtin/pack-objects.c:2838 +#: builtin/pack-objects.c:2826 msgid "include objects referred to by the index" msgstr "inkludera objekt som refereras från indexet" -#: builtin/pack-objects.c:2841 +#: builtin/pack-objects.c:2829 msgid "output pack to stdout" msgstr "skriv paket på standard ut" -#: builtin/pack-objects.c:2843 +#: builtin/pack-objects.c:2831 msgid "include tag objects that refer to objects to be packed" msgstr "inkludera taggobjekt som refererar objekt som skall packas" -#: builtin/pack-objects.c:2845 +#: builtin/pack-objects.c:2833 msgid "keep unreachable objects" msgstr "behåll onåbara objekt" -#: builtin/pack-objects.c:2847 +#: builtin/pack-objects.c:2835 msgid "pack loose unreachable objects" msgstr "packa lösa onåbara objekt" -#: builtin/pack-objects.c:2849 +#: builtin/pack-objects.c:2837 msgid "unpack unreachable objects newer than <time>" msgstr "packa upp onåbara objekt nyare än <tid>" -#: builtin/pack-objects.c:2852 +#: builtin/pack-objects.c:2840 msgid "create thin packs" msgstr "skapa tunna paket" -#: builtin/pack-objects.c:2854 +#: builtin/pack-objects.c:2842 msgid "create packs suitable for shallow fetches" msgstr "skapa packfiler lämpade för grunda hämtningar" -#: builtin/pack-objects.c:2856 +#: builtin/pack-objects.c:2844 msgid "ignore packs that have companion .keep file" msgstr "ignorera paket som har tillhörande .keep-fil" -#: builtin/pack-objects.c:2858 +#: builtin/pack-objects.c:2846 msgid "pack compression level" msgstr "komprimeringsgrad för paket" -#: builtin/pack-objects.c:2860 +#: builtin/pack-objects.c:2848 msgid "do not hide commits by grafts" msgstr "göm inte incheckningar med ympningar (\"grafts\")" -#: builtin/pack-objects.c:2862 +#: builtin/pack-objects.c:2850 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:2864 +#: builtin/pack-objects.c:2852 msgid "write a bitmap index together with the pack index" msgstr "använd bitkartindex tillsammans med packindexet" -#: builtin/pack-objects.c:2993 +#: builtin/pack-objects.c:2979 msgid "Counting objects" msgstr "Räknar objekt" @@ -10431,7 +10871,7 @@ msgstr "Se git-pull(1) för detaljer." msgid "<remote>" msgstr "<fjärr>" -#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:451 +#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:455 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<gren>" @@ -10600,14 +11040,14 @@ msgstr "" "aktuella grenen \"%s\", utan att tala om för mig vad som\n" "skall sändas för att uppdatera fjärrgrenen." -#: builtin/push.c:242 +#: builtin/push.c:245 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "Du angav inga referensspecifikationer att sända, och push.default är " "\"nothing\"." -#: builtin/push.c:249 +#: builtin/push.c:252 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -10619,7 +11059,7 @@ msgstr "" "\"git pull ....\") innan du sänder igen.\n" "Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer." -#: builtin/push.c:255 +#: builtin/push.c:258 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" @@ -10631,7 +11071,7 @@ msgstr "" "\"git pull ...\") innan du sänder igen.\n" "Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer." -#: builtin/push.c:261 +#: builtin/push.c:264 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" @@ -10645,11 +11085,11 @@ msgstr "" "(t.ex. \"git pull ...\") innan du sänder igen.\n" "Se avsnittet \"Note about fast-forwards\" i \"git push --help\" för detaljer." -#: builtin/push.c:268 +#: builtin/push.c:271 msgid "Updates were rejected because the tag already exists in the remote." msgstr "Uppdateringarna avvisades eftersom taggen redan finns på fjärren." -#: builtin/push.c:271 +#: builtin/push.c:274 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" @@ -10660,22 +11100,22 @@ msgstr "" "pekar på något som inte är en incheckning, utan att använda flaggan\n" "\"--force\".\n" -#: builtin/push.c:331 +#: builtin/push.c:334 #, c-format msgid "Pushing to %s\n" msgstr "Sänder till %s\n" -#: builtin/push.c:335 +#: builtin/push.c:338 #, c-format msgid "failed to push some refs to '%s'" msgstr "misslyckades sända vissa referenser till \"%s\"" -#: builtin/push.c:366 +#: builtin/push.c:369 #, c-format msgid "bad repository '%s'" msgstr "felaktigt arkiv \"%s\"" -#: builtin/push.c:367 +#: builtin/push.c:370 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -10696,114 +11136,114 @@ msgstr "" "\n" " git push <namn>\n" -#: builtin/push.c:385 +#: builtin/push.c:388 msgid "--all and --tags are incompatible" msgstr "--all och --tags är inkompatibla" -#: builtin/push.c:386 +#: builtin/push.c:389 msgid "--all can't be combined with refspecs" msgstr "--all kan inte kombineras med referensspecifikationer" -#: builtin/push.c:391 +#: builtin/push.c:394 msgid "--mirror and --tags are incompatible" msgstr "--mirror och --tags är inkompatibla" -#: builtin/push.c:392 +#: builtin/push.c:395 msgid "--mirror can't be combined with refspecs" msgstr "--mirror kan inte kombineras med referensspecifikationer" -#: builtin/push.c:397 +#: builtin/push.c:400 msgid "--all and --mirror are incompatible" msgstr "--all och --mirror är inkompatibla" -#: builtin/push.c:515 +#: builtin/push.c:518 msgid "repository" msgstr "arkiv" -#: builtin/push.c:516 builtin/send-pack.c:161 +#: builtin/push.c:519 builtin/send-pack.c:161 msgid "push all refs" msgstr "sänd alla referenser" -#: builtin/push.c:517 builtin/send-pack.c:163 +#: builtin/push.c:520 builtin/send-pack.c:163 msgid "mirror all refs" msgstr "spegla alla referenser" -#: builtin/push.c:519 +#: builtin/push.c:522 msgid "delete refs" msgstr "ta bort referenser" -#: builtin/push.c:520 +#: builtin/push.c:523 msgid "push tags (can't be used with --all or --mirror)" msgstr "sänd taggar (kan inte användas med --all eller --mirror)" -#: builtin/push.c:523 builtin/send-pack.c:164 +#: builtin/push.c:526 builtin/send-pack.c:164 msgid "force updates" msgstr "tvinga uppdateringar" -#: builtin/push.c:525 builtin/send-pack.c:175 +#: builtin/push.c:528 builtin/send-pack.c:175 msgid "refname>:<expect" msgstr "refnamn>:<förvänta" -#: builtin/push.c:526 builtin/send-pack.c:176 +#: builtin/push.c:529 builtin/send-pack.c:176 msgid "require old value of ref to be at this value" msgstr "kräv att ref:s tidigare värde är detta" -#: builtin/push.c:529 +#: builtin/push.c:532 msgid "control recursive pushing of submodules" msgstr "styr rekursiv insändning av undermoduler" -#: builtin/push.c:531 builtin/send-pack.c:169 +#: builtin/push.c:534 builtin/send-pack.c:169 msgid "use thin pack" msgstr "använd tunna paket" -#: builtin/push.c:532 builtin/push.c:533 builtin/send-pack.c:158 +#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:158 #: builtin/send-pack.c:159 msgid "receive pack program" msgstr "program för att ta emot paket" -#: builtin/push.c:534 +#: builtin/push.c:537 msgid "set upstream for git pull/status" msgstr "ställ in uppström för git pull/status" -#: builtin/push.c:537 +#: builtin/push.c:540 msgid "prune locally removed refs" msgstr "ta bort lokalt borttagna referenser" -#: builtin/push.c:539 +#: builtin/push.c:542 msgid "bypass pre-push hook" msgstr "förbigå pre-push-krok" -#: builtin/push.c:540 +#: builtin/push.c:543 msgid "push missing but relevant tags" msgstr "sänd in saknade men relevanta taggar" -#: builtin/push.c:543 builtin/send-pack.c:166 +#: builtin/push.c:546 builtin/send-pack.c:166 msgid "GPG sign the push" msgstr "GPG-signera insändningen" -#: builtin/push.c:545 builtin/send-pack.c:170 +#: builtin/push.c:548 builtin/send-pack.c:170 msgid "request atomic transaction on remote side" msgstr "begär atomiska transaktioner på fjärrsidan" -#: builtin/push.c:546 +#: builtin/push.c:549 msgid "server-specific" msgstr "serverspecifik" -#: builtin/push.c:546 +#: builtin/push.c:549 msgid "option to transmit" msgstr "" "inget att checka in\n" "flagga att sända" -#: builtin/push.c:560 +#: builtin/push.c:563 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete är inkompatibel med --all, --mirror och --tags" -#: builtin/push.c:562 +#: builtin/push.c:565 msgid "--delete doesn't make sense without any refs" msgstr "--delete kan inte användas utan referenser" -#: builtin/push.c:579 +#: builtin/push.c:584 msgid "push options must not have new line characters" msgstr "push-flaggor kan inte innehålla radbrytning" @@ -10892,8 +11332,8 @@ msgid "" "with what you pushed, and will require 'git reset --hard' to match\n" "the work tree to HEAD.\n" "\n" -"You can set 'receive.denyCurrentBranch' configuration variable to\n" -"'ignore' or 'warn' in the remote repository to allow pushing into\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" @@ -11461,83 +11901,92 @@ msgstr "Okänt underkommando: %s" msgid "git repack [<options>]" msgstr "git repack [<flaggor>]" -#: builtin/repack.c:160 +#: builtin/repack.c:22 +msgid "" +"Incremental repacks are incompatible with bitmap indexes. Use\n" +"--no-write-bitmap-index or disable the pack.writebitmaps configuration." +msgstr "" +"Inkrementella ompackningar är inte kompatibla med bitmapp-index.\n" +"Använd --no-write-bitmap-index eller inaktivera inställningen\n" +"pack.writebitmaps" + +#: builtin/repack.c:166 msgid "pack everything in a single pack" msgstr "packa allt i ett enda paket" -#: builtin/repack.c:162 +#: builtin/repack.c:168 msgid "same as -a, and turn unreachable objects loose" msgstr "samma som -a, och gör onåbara objekt lösa" -#: builtin/repack.c:165 +#: builtin/repack.c:171 msgid "remove redundant packs, and run git-prune-packed" msgstr "ta bort överflödiga paket, och kör git-prune-packed" -#: builtin/repack.c:167 +#: builtin/repack.c:173 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "sänd --no-reuse-delta till git-pack-objects" -#: builtin/repack.c:169 +#: builtin/repack.c:175 msgid "pass --no-reuse-object to git-pack-objects" msgstr "sänd --no-reuse-object till git-pack-objects" -#: builtin/repack.c:171 +#: builtin/repack.c:177 msgid "do not run git-update-server-info" msgstr "kör inte git-update-server-info" -#: builtin/repack.c:174 +#: builtin/repack.c:180 msgid "pass --local to git-pack-objects" msgstr "sänd --local till git-pack-objects" -#: builtin/repack.c:176 +#: builtin/repack.c:182 msgid "write bitmap index" msgstr "skriv bitkartindex" -#: builtin/repack.c:177 +#: builtin/repack.c:183 msgid "approxidate" msgstr "cirkadatum" -#: builtin/repack.c:178 +#: builtin/repack.c:184 msgid "with -A, do not loosen objects older than this" msgstr "med -A, lös inte upp objekt äldre än detta" -#: builtin/repack.c:180 +#: builtin/repack.c:186 msgid "with -a, repack unreachable objects" msgstr "med -a, packa om onåbara objekt" -#: builtin/repack.c:182 +#: builtin/repack.c:188 msgid "size of the window used for delta compression" msgstr "storlek på fönster använt för deltakomprimering" -#: builtin/repack.c:183 builtin/repack.c:187 +#: builtin/repack.c:189 builtin/repack.c:193 msgid "bytes" msgstr "byte" -#: builtin/repack.c:184 +#: builtin/repack.c:190 msgid "same as the above, but limit memory size instead of entries count" msgstr "samma som ovan, men begränsa minnesstorleken istället för postantal" -#: builtin/repack.c:186 +#: builtin/repack.c:192 msgid "limits the maximum delta depth" msgstr "begränsa maximalt deltadjup" -#: builtin/repack.c:188 +#: builtin/repack.c:194 msgid "maximum size of each packfile" msgstr "maximal storlek på varje paketfil" -#: builtin/repack.c:190 +#: builtin/repack.c:196 msgid "repack objects in packs marked with .keep" msgstr "packa om objekt i paket märkta med .keep" -#: builtin/repack.c:200 +#: builtin/repack.c:206 msgid "cannot delete packs in a precious-objects repo" msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv" -#: builtin/repack.c:204 +#: builtin/repack.c:210 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable och -A kan inte användas samtidigt" -#: builtin/repack.c:391 builtin/worktree.c:115 +#: builtin/repack.c:400 builtin/worktree.c:115 #, c-format msgid "failed to remove '%s'" msgstr "misslyckades ta bort \"%s\"" @@ -11767,23 +12216,23 @@ msgstr "Kunde inte skriva ny indexfil." msgid "rev-list does not support display of notes" msgstr "rev-list stöder inte visning av anteckningar" -#: builtin/rev-parse.c:386 +#: builtin/rev-parse.c:391 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<options>] -- [<argument>...]" -#: builtin/rev-parse.c:391 +#: builtin/rev-parse.c:396 msgid "keep the `--` passed as an arg" msgstr "behåll \"--\" sänt som argument" -#: builtin/rev-parse.c:393 +#: builtin/rev-parse.c:398 msgid "stop parsing after the first non-option argument" msgstr "sluta tolka efter första argument som inte är flagga" -#: builtin/rev-parse.c:396 +#: builtin/rev-parse.c:401 msgid "output in stuck long form" msgstr "utdata fast i lång form" -#: builtin/rev-parse.c:527 +#: builtin/rev-parse.c:532 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -11883,29 +12332,7 @@ msgstr "\"cherry-pick\" misslyckades" msgid "git rm [<options>] [--] <file>..." msgstr "git rm [<flaggor>] [--] <fil>..." -#: builtin/rm.c:65 -msgid "" -"the following submodule (or one of its nested submodules)\n" -"uses a .git directory:" -msgid_plural "" -"the following submodules (or one of their nested submodules)\n" -"use a .git directory:" -msgstr[0] "" -"följande undermodul (eller en av dess nästlade undermoduler)\n" -"använder en .git-katalog:" -msgstr[1] "" -"följande undermoduler (eller en av deras nästlade undermoduler)\n" -"använder en .git-katalog:" - -#: builtin/rm.c:71 -msgid "" -"\n" -"(use 'rm -rf' if you really want to remove it including all of its history)" -msgstr "" -"\n" -"(använd \"rm -rf\" om du verkligen vill ta bort den och all dess historik)" - -#: builtin/rm.c:230 +#: builtin/rm.c:205 msgid "" "the following file has staged content different from both the\n" "file and the HEAD:" @@ -11917,7 +12344,7 @@ msgstr[0] "" msgstr[1] "" "följande filer har köat innehåll som skiljer sig både från filen och HEAD:" -#: builtin/rm.c:235 +#: builtin/rm.c:210 msgid "" "\n" "(use -f to force removal)" @@ -11925,13 +12352,13 @@ msgstr "" "\n" "(använd -f för att tvinga borttagning)" -#: builtin/rm.c:239 +#: builtin/rm.c:214 msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" msgstr[0] "följande fil har ändringar köade i indexet:" msgstr[1] "följande filer har ändringar köade i indexet:" -#: builtin/rm.c:243 builtin/rm.c:254 +#: builtin/rm.c:218 builtin/rm.c:227 msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" @@ -11939,42 +12366,47 @@ msgstr "" "\n" "(använd --cached för att behålla filen eller -f för att tvinga borttagning)" -#: builtin/rm.c:251 +#: builtin/rm.c:224 msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" msgstr[0] "följande fil har lokala ändringar:" msgstr[1] "följande filer har lokala ändringar:" -#: builtin/rm.c:269 +#: builtin/rm.c:242 msgid "do not list removed files" msgstr "lista inte borttagna filer" -#: builtin/rm.c:270 +#: builtin/rm.c:243 msgid "only remove from the index" msgstr "ta bara bort från indexet" -#: builtin/rm.c:271 +#: builtin/rm.c:244 msgid "override the up-to-date check" msgstr "överstyr àjour-testet" -#: builtin/rm.c:272 +#: builtin/rm.c:245 msgid "allow recursive removal" msgstr "tillåt rekursiv borttagning" -#: builtin/rm.c:274 +#: builtin/rm.c:247 msgid "exit with a zero status even if nothing matched" msgstr "avsluta med nollstatus även om inget träffades" -#: builtin/rm.c:335 +#: builtin/rm.c:308 #, c-format msgid "not removing '%s' recursively without -r" msgstr "tar inte bort \"%s\" rekursivt utan -r" -#: builtin/rm.c:374 +#: builtin/rm.c:347 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: kan inte ta bort %s" +#: builtin/rm.c:370 +#, c-format +msgid "could not remove '%s'" +msgstr "kunde inte ta bort \"%s\"" + #: builtin/send-pack.c:18 msgid "" "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" @@ -12007,23 +12439,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:242 +#: builtin/shortlog.c:249 +msgid "Group by committer rather than author" +msgstr "Gruppera efter incheckare istället för författare" + +#: builtin/shortlog.c:251 msgid "sort output according to the number of commits per author" msgstr "sortera utdata enligt antal incheckningar per författare" -#: builtin/shortlog.c:244 +#: builtin/shortlog.c:253 msgid "Suppress commit descriptions, only provides commit count" msgstr "Undertryck beskrivningar, visa bara antal incheckningar" -#: builtin/shortlog.c:246 +#: builtin/shortlog.c:255 msgid "Show the email address of each author" msgstr "Visa e-postadress för varje författare" -#: builtin/shortlog.c:247 +#: builtin/shortlog.c:256 msgid "w[,i1[,i2]]" msgstr "w[,i1[,i2]]" -#: builtin/shortlog.c:248 +#: builtin/shortlog.c:257 msgid "Linewrap output" msgstr "Radbryt utdata" @@ -12175,35 +12611,35 @@ msgstr "" msgid "git show-ref --exclude-existing[=<pattern>]" msgstr "git show-ref --exclude-existing[=<mönster>]" -#: builtin/show-ref.c:165 +#: builtin/show-ref.c:159 msgid "only show tags (can be combined with heads)" msgstr "visa endast taggar (kan kombineras med huvuden)" -#: builtin/show-ref.c:166 +#: builtin/show-ref.c:160 msgid "only show heads (can be combined with tags)" msgstr "visa endast huvuden (kan kombineras med taggar)" -#: builtin/show-ref.c:167 +#: builtin/show-ref.c:161 msgid "stricter reference checking, requires exact ref path" msgstr "striktare referenskontroll, kräver exakt referenssökväg" -#: builtin/show-ref.c:170 builtin/show-ref.c:172 +#: builtin/show-ref.c:164 builtin/show-ref.c:166 msgid "show the HEAD reference, even if it would be filtered out" msgstr "visa HEAD-refrens, även när den skulle filtreras ut" -#: builtin/show-ref.c:174 +#: builtin/show-ref.c:168 msgid "dereference tags into object IDs" msgstr "avreferera taggar till objekt-id" -#: builtin/show-ref.c:176 +#: builtin/show-ref.c:170 msgid "only show SHA1 hash using <n> digits" msgstr "visa SHA1-hash endast med <n> siffror" -#: builtin/show-ref.c:180 +#: builtin/show-ref.c:174 msgid "do not print results to stdout (useful with --verify)" msgstr "visa inte resultat på standard ut (användbart med --verify)" -#: builtin/show-ref.c:182 +#: builtin/show-ref.c:176 msgid "show refs from stdin that aren't in local repository" msgstr "visa referenser från standard in som inte finns i lokalt arkiv" @@ -12223,12 +12659,12 @@ msgstr "hoppa över och ta bort alla rader som inleds med kommentarstecken" msgid "prepend comment character and space to each line" msgstr "lägg in kommentarstecken och blanksteg först på varje rad" -#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1046 +#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1062 #, c-format msgid "No such ref: %s" msgstr "Ingen sådan referens: %s" -#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1055 +#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1071 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Förväntade fullt referensnamn, fick %s" @@ -12238,8 +12674,7 @@ msgstr "Förväntade fullt referensnamn, fick %s" msgid "cannot strip one component off url '%s'" msgstr "kan inte ta bort en komponent från url:en \"%s\"" -#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:408 -#: builtin/submodule--helper.c:590 +#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:592 msgid "alternative anchor for relative paths" msgstr "alternativa ankare för relativa sökvägar" @@ -12247,84 +12682,84 @@ msgstr "alternativa ankare för relativa sökvägar" msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]" -#: builtin/submodule--helper.c:329 builtin/submodule--helper.c:343 +#: builtin/submodule--helper.c:333 builtin/submodule--helper.c:347 #, 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:369 +#: builtin/submodule--helper.c:373 #, 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:373 +#: builtin/submodule--helper.c:377 #, 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:383 +#: builtin/submodule--helper.c:387 #, 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:390 +#: builtin/submodule--helper.c:394 #, 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:409 +#: builtin/submodule--helper.c:410 msgid "Suppress output for initializing a submodule" msgstr "Dölj utdata från initiering av undermodul" -#: builtin/submodule--helper.c:414 +#: builtin/submodule--helper.c:415 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper init [<sökväg>]" -#: builtin/submodule--helper.c:435 +#: builtin/submodule--helper.c:436 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <sökväg>" -#: builtin/submodule--helper.c:441 +#: builtin/submodule--helper.c:442 #, 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:524 builtin/submodule--helper.c:527 +#: builtin/submodule--helper.c:525 builtin/submodule--helper.c:528 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "undermodulen \"%s\" kan inte lägga till alternativ: %s" -#: builtin/submodule--helper.c:563 +#: builtin/submodule--helper.c:564 #, 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:570 +#: builtin/submodule--helper.c:571 #, 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:593 +#: builtin/submodule--helper.c:595 msgid "where the new submodule will be cloned to" msgstr "var den nya undermodulen skall klonas till" -#: builtin/submodule--helper.c:596 +#: builtin/submodule--helper.c:598 msgid "name of the new submodule" msgstr "namn på den nya undermodulen" -#: builtin/submodule--helper.c:599 +#: builtin/submodule--helper.c:601 msgid "url where to clone the submodule from" msgstr "URL att klona undermodulen från" -#: builtin/submodule--helper.c:605 +#: builtin/submodule--helper.c:607 msgid "depth for shallow clones" msgstr "djup för grunda kloner" -#: builtin/submodule--helper.c:608 builtin/submodule--helper.c:964 +#: builtin/submodule--helper.c:610 builtin/submodule--helper.c:980 msgid "force cloning progress" msgstr "tvinga kloningsförlopp" -#: builtin/submodule--helper.c:613 +#: builtin/submodule--helper.c:615 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -12332,97 +12767,92 @@ 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:638 builtin/submodule--helper.c:648 -#, c-format -msgid "could not create directory '%s'" -msgstr "kunde inte skapa katalogen \"%s\"" - -#: builtin/submodule--helper.c:644 +#: builtin/submodule--helper.c:646 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "misslyckades klona \"%s\" till undermodulsökvägen \"%s\"" -#: builtin/submodule--helper.c:660 +#: builtin/submodule--helper.c:662 #, c-format msgid "cannot open file '%s'" msgstr "kan inte öppna filen \"%s\"" -#: builtin/submodule--helper.c:665 +#: builtin/submodule--helper.c:667 #, c-format msgid "could not close file %s" msgstr "kunde inte stänga filen %s" -#: builtin/submodule--helper.c:672 +#: builtin/submodule--helper.c:674 #, c-format msgid "could not get submodule directory for '%s'" msgstr "kunde inte få tag i undermodulkatalog för \"%s\"" -#: builtin/submodule--helper.c:726 +#: builtin/submodule--helper.c:742 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Undermodulsökvägen \"%s\" har inte initierats" -#: builtin/submodule--helper.c:730 +#: builtin/submodule--helper.c:746 msgid "Maybe you want to use 'update --init'?" msgstr "Kanske menade du att använda \"update --init\"?" -#: builtin/submodule--helper.c:756 +#: builtin/submodule--helper.c:772 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Hoppar över ej sammanslagen undermodul %s" -#: builtin/submodule--helper.c:777 +#: builtin/submodule--helper.c:793 #, c-format msgid "Skipping submodule '%s'" msgstr "Hoppar över undermodulen \"%s\"" -#: builtin/submodule--helper.c:913 +#: builtin/submodule--helper.c:929 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Misslyckades klona \"%s\". Nytt försök planlagt" -#: builtin/submodule--helper.c:924 +#: builtin/submodule--helper.c:940 #, 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:945 +#: builtin/submodule--helper.c:961 builtin/submodule--helper.c:1105 msgid "path into the working tree" msgstr "sökväg inuti arbetskatalogen" -#: builtin/submodule--helper.c:948 +#: builtin/submodule--helper.c:964 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:952 +#: builtin/submodule--helper.c:968 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout eller none" -#: builtin/submodule--helper.c:956 +#: builtin/submodule--helper.c:972 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:959 +#: builtin/submodule--helper.c:975 msgid "parallel jobs" msgstr "parallella jobb" -#: builtin/submodule--helper.c:961 +#: builtin/submodule--helper.c:977 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:962 +#: builtin/submodule--helper.c:978 msgid "don't print cloning progress" msgstr "skriv inte klonförlopp" -#: builtin/submodule--helper.c:969 +#: builtin/submodule--helper.c:985 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:979 +#: builtin/submodule--helper.c:995 msgid "bad value for update parameter" msgstr "felaktigt värde för parametern update" -#: builtin/submodule--helper.c:1050 +#: builtin/submodule--helper.c:1066 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -12431,11 +12861,24 @@ 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:1100 +#: builtin/submodule--helper.c:1106 +msgid "recurse into submodules" +msgstr "rekursera ner i undermoduler" + +#: builtin/submodule--helper.c:1112 +msgid "git submodule--helper embed-git-dir [<path>...]" +msgstr "git submodule--helper embed-git-dir [<sökväg>...]" + +#: builtin/submodule--helper.c:1157 msgid "submodule--helper subcommand must be called with a subcommand" msgstr "underkommandot submodule--helper måste anropas med ett underkommando" -#: builtin/submodule--helper.c:1107 +#: builtin/submodule--helper.c:1164 +#, c-format +msgid "%s doesn't support --super-prefix" +msgstr "%s stöder inte --super-prefix" + +#: builtin/submodule--helper.c:1170 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper" @@ -12490,25 +12933,25 @@ msgstr "" "\t\t[--format=<format>] [--[no-]merged [<incheckning>]] [<mönster>...]" #: builtin/tag.c:27 -msgid "git tag -v <tagname>..." -msgstr "git tag -v <taggnamn>..." +msgid "git tag -v [--format=<format>] <tagname>..." +msgstr "git tag -v [--format=<format>] <taggnamn>..." -#: builtin/tag.c:81 +#: builtin/tag.c:82 #, c-format msgid "tag name too long: %.*s..." msgstr "taggnamnet för långt: %.*s..." -#: builtin/tag.c:86 +#: builtin/tag.c:87 #, c-format msgid "tag '%s' not found." msgstr "taggen \"%s\" hittades inte." -#: builtin/tag.c:101 +#: builtin/tag.c:102 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Tog bort tagg \"%s\" (var %s)\n" -#: builtin/tag.c:117 +#: builtin/tag.c:131 #, c-format msgid "" "\n" @@ -12521,7 +12964,7 @@ msgstr "" " %s\n" "Rader som inleds med \"%c\" ignoreras.\n" -#: builtin/tag.c:121 +#: builtin/tag.c:135 #, c-format msgid "" "\n" @@ -12536,138 +12979,138 @@ msgstr "" "Rader som inleds med \"%c\" kommer behållas; du kan själv ta bort dem om\n" "du vill.\n" -#: builtin/tag.c:199 +#: builtin/tag.c:213 msgid "unable to sign the tag" msgstr "kunde inte signera taggen" -#: builtin/tag.c:201 +#: builtin/tag.c:215 msgid "unable to write tag file" msgstr "kunde inte skriva tagg-filen" -#: builtin/tag.c:226 +#: builtin/tag.c:240 msgid "bad object type." msgstr "felaktig objekttyp" -#: builtin/tag.c:239 +#: builtin/tag.c:253 msgid "tag header too big." msgstr "tagghuvud för stort." -#: builtin/tag.c:275 +#: builtin/tag.c:289 msgid "no tag message?" msgstr "inget taggmeddelande?" -#: builtin/tag.c:281 +#: builtin/tag.c:295 #, c-format msgid "The tag message has been left in %s\n" msgstr "Taggmeddelandet har lämnats i %s\n" -#: builtin/tag.c:339 +#: builtin/tag.c:354 msgid "list tag names" msgstr "lista taggnamn" -#: builtin/tag.c:341 +#: builtin/tag.c:356 msgid "print <n> lines of each tag message" msgstr "visa <n> rader från varje taggmeddelande" -#: builtin/tag.c:343 +#: builtin/tag.c:358 msgid "delete tags" msgstr "ta bort taggar" -#: builtin/tag.c:344 +#: builtin/tag.c:359 msgid "verify tags" msgstr "verifiera taggar" -#: builtin/tag.c:346 +#: builtin/tag.c:361 msgid "Tag creation options" msgstr "Alternativ för att skapa taggar" -#: builtin/tag.c:348 +#: builtin/tag.c:363 msgid "annotated tag, needs a message" msgstr "annoterad tagg, behöver meddelande" -#: builtin/tag.c:350 +#: builtin/tag.c:365 msgid "tag message" msgstr "taggmeddelande" -#: builtin/tag.c:352 +#: builtin/tag.c:367 msgid "annotated and GPG-signed tag" msgstr "annoterad och GPG-signerad tagg" -#: builtin/tag.c:356 +#: builtin/tag.c:371 msgid "use another key to sign the tag" msgstr "använd annan nyckel för att signera taggen" -#: builtin/tag.c:357 +#: builtin/tag.c:372 msgid "replace the tag if exists" msgstr "ersätt taggen om den finns" -#: builtin/tag.c:358 builtin/update-ref.c:368 +#: builtin/tag.c:373 builtin/update-ref.c:368 msgid "create a reflog" msgstr "skapa en reflog" -#: builtin/tag.c:360 +#: builtin/tag.c:375 msgid "Tag listing options" msgstr "Alternativ för listning av taggar" -#: builtin/tag.c:361 +#: builtin/tag.c:376 msgid "show tag list in columns" msgstr "lista taggar i spalter" -#: builtin/tag.c:362 builtin/tag.c:363 +#: builtin/tag.c:377 builtin/tag.c:378 msgid "print only tags that contain the commit" msgstr "visa endast taggar som innehåller incheckningen" -#: builtin/tag.c:364 +#: builtin/tag.c:379 msgid "print only tags that are merged" msgstr "visa endast taggar som slagits samman" -#: builtin/tag.c:365 +#: builtin/tag.c:380 msgid "print only tags that are not merged" msgstr "visa endast taggar som ej slagits samman" -#: builtin/tag.c:370 +#: builtin/tag.c:385 msgid "print only tags of the object" msgstr "visa endast taggar för objektet" -#: builtin/tag.c:399 +#: builtin/tag.c:415 msgid "--column and -n are incompatible" msgstr "--column och -n är inkompatibla" -#: builtin/tag.c:419 +#: builtin/tag.c:437 msgid "-n option is only allowed with -l." msgstr "Flaggan -n är endast tillåten tillsammans med -l." -#: builtin/tag.c:421 +#: builtin/tag.c:439 msgid "--contains option is only allowed with -l." msgstr "Flaggan --contains är endast tillåten tillsammans med -l" -#: builtin/tag.c:423 +#: builtin/tag.c:441 msgid "--points-at option is only allowed with -l." msgstr "Flaggan --points-at är endast tillåten tillsammans med -l." -#: builtin/tag.c:425 +#: builtin/tag.c:443 msgid "--merged and --no-merged option are only allowed with -l" msgstr "flaggorna --merged och --no-merged tillåts endast tillsammans med -l" -#: builtin/tag.c:433 +#: builtin/tag.c:454 msgid "only one -F or -m option is allowed." msgstr "endast en av flaggorna -F eller -m tillåts." -#: builtin/tag.c:452 +#: builtin/tag.c:473 msgid "too many params" msgstr "för många parametrar" -#: builtin/tag.c:458 +#: builtin/tag.c:479 #, c-format msgid "'%s' is not a valid tag name." msgstr "\"%s\" är inte ett giltigt taggnamn." -#: builtin/tag.c:463 +#: builtin/tag.c:484 #, c-format msgid "tag '%s' already exists" msgstr "taggen \"%s\" finns redan" -#: builtin/tag.c:491 +#: builtin/tag.c:512 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Uppdaterad tagg \"%s\" (var %s)\n" @@ -12857,7 +13300,7 @@ msgstr "testa om filsystemet stöder ospårad cache" msgid "enable untracked cache without testing the filesystem" msgstr "aktivera ospårad cache utan att testa filsystemet" -#: builtin/update-index.c:1119 +#: builtin/update-index.c:1120 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -12865,11 +13308,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:1123 +#: builtin/update-index.c:1124 msgid "Untracked cache disabled" msgstr "Ospårad cache är inaktiverad" -#: builtin/update-index.c:1131 +#: builtin/update-index.c:1132 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -12877,7 +13320,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:1135 +#: builtin/update-index.c:1136 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Ospårad cache är aktiverad för \"%s\"" @@ -12926,7 +13369,7 @@ msgstr "git verify-commit [-v | --verbose] <incheckning>..." msgid "print commit contents" msgstr "visa innehåll för incheckning" -#: builtin/verify-commit.c:73 builtin/verify-tag.c:35 +#: builtin/verify-commit.c:73 builtin/verify-tag.c:37 msgid "print raw gpg status output" msgstr "visa råa gpg-statusdata" @@ -12942,11 +13385,11 @@ msgstr "pratsam" msgid "show statistics only" msgstr "visa endast statistik" -#: builtin/verify-tag.c:17 -msgid "git verify-tag [-v | --verbose] <tag>..." -msgstr "git verify-tag [-v | --verbose] <tagg>..." +#: builtin/verify-tag.c:18 +msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." +msgstr "git verify-tag [-v | --verbose] [--format=<format] <tagg>..." -#: builtin/verify-tag.c:34 +#: builtin/verify-tag.c:36 msgid "print tag contents" msgstr "visa innehåll för tag" @@ -13031,30 +13474,30 @@ msgstr "befolka den nya arbetskatalogen" msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B och --detach är ömsesidigt uteslutande" -#: builtin/worktree.c:470 +#: builtin/worktree.c:472 msgid "reason for locking" msgstr "orsak till lås" -#: builtin/worktree.c:482 builtin/worktree.c:515 +#: builtin/worktree.c:484 builtin/worktree.c:517 #, c-format msgid "'%s' is not a working tree" msgstr "\"%s\" är inte en arbetskatalog" -#: builtin/worktree.c:484 builtin/worktree.c:517 +#: builtin/worktree.c:486 builtin/worktree.c:519 msgid "The main working tree cannot be locked or unlocked" msgstr "Huvudarbetskatalogen kan inte låsas eller låsas upp" -#: builtin/worktree.c:489 +#: builtin/worktree.c:491 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "\"%s\" är redan låst, orsak: %s" -#: builtin/worktree.c:491 +#: builtin/worktree.c:493 #, c-format msgid "'%s' is already locked" msgstr "\"%s\" är redan låst" -#: builtin/worktree.c:519 +#: builtin/worktree.c:521 #, c-format msgid "'%s' is not locked" msgstr "\"%s\" är inte låst" @@ -13079,19 +13522,19 @@ msgstr "endast användbart vid felsökning" msgid "git upload-pack [<options>] <dir>" msgstr "git upload-pack [<flaggor>] <katalog>" -#: upload-pack.c:1028 +#: upload-pack.c:1036 msgid "quit after a single request/response exchange" msgstr "avsluta omedelbart efter första anrop/svar-utväxling" -#: upload-pack.c:1030 +#: upload-pack.c:1038 msgid "exit immediately after initial ref advertisement" msgstr "avsluta omedelbart efter inledande kungörelse av referenser" -#: upload-pack.c:1032 +#: upload-pack.c:1040 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:1034 +#: upload-pack.c:1042 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "avbryt överföringen efter <n> sekunders inaktivitet" @@ -13122,14 +13565,30 @@ 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:342 +#: http.c:344 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "Delegerad styrning stöds inte av cURL < 7.22.0" -#: http.c:351 +#: http.c:353 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:1713 +#, c-format +msgid "" +"unable to update url base from redirection:\n" +" asked for: %s\n" +" redirect: %s" +msgstr "" +"kan inte uppdatera urlbas från omdirigerin:\n" +" bad om: %s\n" +" omdirigering: %s" + +#: remote-curl.c:319 +#, c-format +msgid "redirecting to %s" +msgstr "omdirigerar till %s" + #: common-cmds.h:9 msgid "start a working area (see also: git help tutorial)" msgstr "starta arbetskatalog (se också: git help tutorial)" @@ -13502,7 +13961,7 @@ msgstr "Försök enkel sammanslagning med $pretty_name" msgid "Simple merge did not work, trying automatic merge." msgstr "Enkel sammanslagning misslyckades, försöker automatisk sammanslagning." -#: git-rebase.sh:56 +#: git-rebase.sh:57 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" @@ -13513,51 +13972,37 @@ msgstr "" "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\"." -#: git-rebase.sh:156 git-rebase.sh:395 +#: git-rebase.sh:157 git-rebase.sh:396 #, sh-format msgid "Could not move back to $head_name" msgstr "Kunde inte flytta tillbaka till $head_name" -#: git-rebase.sh:167 -msgid "Applied autostash." -msgstr "Tillämpade autostash." - -#: git-rebase.sh:170 +#: git-rebase.sh:171 #, sh-format msgid "Cannot store $stash_sha1" msgstr "Kan inte spara $stash_sha1" -#: git-rebase.sh:171 -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 "" -"Tillämpning av autostash gav konflikter.\n" -"Dina ändringar är säkra i stashen.\n" -"Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n" - -#: git-rebase.sh:210 +#: git-rebase.sh:211 msgid "The pre-rebase hook refused to rebase." msgstr "Kroken pre-rebase vägrade ombaseringen." -#: git-rebase.sh:215 +#: git-rebase.sh:216 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:356 +#: git-rebase.sh:357 msgid "No rebase in progress?" msgstr "Ingen ombasering pågår?" -#: git-rebase.sh:367 +#: git-rebase.sh:368 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:374 +#: git-rebase.sh:375 msgid "Cannot read HEAD" msgstr "Kan inte läsa HEAD" -#: git-rebase.sh:377 +#: git-rebase.sh:378 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -13565,7 +14010,7 @@ msgstr "" "Du måste redigera alla sammanslagningskonflikter och\n" "därefter markera dem som lösta med git add" -#: git-rebase.sh:414 +#: git-rebase.sh:418 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -13586,65 +14031,65 @@ msgstr "" "och kör programmet igen. Jag avslutar ifall du fortfarande har\n" "något av värde där." -#: git-rebase.sh:465 +#: git-rebase.sh:469 #, sh-format msgid "invalid upstream $upstream_name" msgstr "ogiltig uppström $upstream_name" -#: git-rebase.sh:489 +#: git-rebase.sh:493 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: mer än en sammanslagningsbas finns" -#: git-rebase.sh:492 git-rebase.sh:496 +#: git-rebase.sh:496 git-rebase.sh:500 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: ingen sammanslagningsbas finns" -#: git-rebase.sh:501 +#: git-rebase.sh:505 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "Peka på en giltig incheckning: $onto_name" -#: git-rebase.sh:524 +#: git-rebase.sh:528 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "ödesdigert: ingen sådan gren: $branch_name" -#: git-rebase.sh:557 +#: git-rebase.sh:561 msgid "Cannot autostash" msgstr "Kan inte utföra \"autostash\"" -#: git-rebase.sh:562 +#: git-rebase.sh:566 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Skapade autostash: $stash_abbrev" -#: git-rebase.sh:566 +#: git-rebase.sh:570 msgid "Please commit or stash them." msgstr "Checka in eller använd \"stash\" på dem." -#: git-rebase.sh:586 +#: git-rebase.sh:590 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "Aktuell gren $branch_name är à jour." -#: git-rebase.sh:590 +#: git-rebase.sh:594 #, 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:601 +#: git-rebase.sh:605 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Ändringar från $mb till $onto:" -#: git-rebase.sh:610 +#: git-rebase.sh:614 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:620 +#: git-rebase.sh:624 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "Snabbspolade $branch_name till $onto_name." @@ -13810,21 +14255,26 @@ msgstr "Inget grennamn angavs" msgid "(To restore them type \"git stash apply\")" msgstr "(För att återställa dem, skriv \"git stash apply\")" -#: git-submodule.sh:184 +#: git-submodule.sh:181 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "Relativ sökväg kan endast användas från arbetskatalogens toppnivå" -#: git-submodule.sh:194 +#: git-submodule.sh:191 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "arkiv-URL: \"$repo\" måste vara absolut eller börja med ./|../" -#: git-submodule.sh:211 +#: git-submodule.sh:210 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "\"$sm_path\" finns redan i indexet" -#: git-submodule.sh:215 +#: git-submodule.sh:213 +#, sh-format +msgid "'$sm_path' already exists in the index and is not a submodule" +msgstr "\"$sm_path\" finns redan i indexet och är inte en undermodul" + +#: git-submodule.sh:218 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -13835,22 +14285,22 @@ msgstr "" "$sm_path\n" "Använd -f om du verkligen vill lägga till den" -#: git-submodule.sh:233 +#: git-submodule.sh:236 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "Lägger till befintligt arkiv i \"$sm_path\" i indexet" -#: git-submodule.sh:235 +#: git-submodule.sh:238 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "\"$sm_path\" finns redan och är inte ett giltigt git-arkiv" -#: git-submodule.sh:243 +#: git-submodule.sh:246 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "En git-katalog för \"$sm_name\" hittades lokalt med fjärr(ar):" -#: git-submodule.sh:245 +#: git-submodule.sh:248 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -13868,48 +14318,48 @@ msgstr "" "arkiv eller om du är osäker på vad det här betyder, välj ett annat namn med\n" "flaggan \"--name\"." -#: git-submodule.sh:251 +#: git-submodule.sh:254 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "Aktiverar lokal git-katalog för undermodulen \"$sm_name\" på nytt." -#: git-submodule.sh:263 +#: git-submodule.sh:266 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Kan inte checka ut undermodulen \"$sm_path\"" -#: git-submodule.sh:268 +#: git-submodule.sh:271 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Misslyckades lägga till undermodulen \"$sm_path\"" -#: git-submodule.sh:277 +#: git-submodule.sh:280 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Misslyckades registrera undermodulen \"$sm_path\"" -#: git-submodule.sh:324 +#: git-submodule.sh:327 #, sh-format msgid "Entering '$displaypath'" msgstr "Går in i \"$displaypath\"" -#: git-submodule.sh:344 +#: git-submodule.sh:347 #, sh-format msgid "Stopping at '$displaypath'; script returned non-zero status." msgstr "" "Stoppar på \"$displaypath\"; skriptet returnerade en status skild från noll." -#: git-submodule.sh:415 +#: git-submodule.sh:418 #, sh-format msgid "pathspec and --all are incompatible" msgstr "sökvägsangivelse och --all är inkompatibla" -#: git-submodule.sh:420 +#: git-submodule.sh:423 #, sh-format msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "Använd \"--all\" om du verkligen vill avinitiera alla undermoduler" -#: git-submodule.sh:440 +#: git-submodule.sh:443 #, sh-format msgid "" "Submodule work tree '$displaypath' contains a .git directory\n" @@ -13918,7 +14368,7 @@ msgstr "" "Undermodulsarbetskatalogen \"$displaypath\" innehåller en .git-katalog\n" "(använd \"rm -rf\" om du verkligen vill ta bort den och all dess historik)" -#: git-submodule.sh:448 +#: git-submodule.sh:451 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " @@ -13927,38 +14377,38 @@ msgstr "" "Undermodulens arbetskatalog \"$displaypath\" har lokala ändringar; \"-f\" " "kastar bort dem" -#: git-submodule.sh:451 +#: git-submodule.sh:454 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "Rensade katalogen \"$displaypath\"" -#: git-submodule.sh:452 +#: git-submodule.sh:455 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "Kunde inte ta bort undermodulens arbetskatalog \"$displaypath\"" -#: git-submodule.sh:455 +#: git-submodule.sh:458 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "Kunde inte skapa tom undermodulskatalog \"$displaypath\"" -#: git-submodule.sh:464 +#: git-submodule.sh:467 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" "Undermodulen \"$name\" ($url) avregistrerad för sökvägen \"$displaypath\"" -#: git-submodule.sh:617 +#: git-submodule.sh:623 #, 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:627 +#: git-submodule.sh:633 #, 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:632 +#: git-submodule.sh:638 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -13967,12 +14417,12 @@ msgstr "" "Kan inte hitta aktuell revision för ${remote_name}/${branch} i " "undermodulsökvägen \"$sm_path\"" -#: git-submodule.sh:650 +#: git-submodule.sh:656 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "Kan inte hämta i undermodulsökväg \"$displaypath\"" -#: git-submodule.sh:656 +#: git-submodule.sh:662 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -13981,84 +14431,84 @@ msgstr "" "Hämtade i undermodulssökvägen \"$displaypath\", men den innehöll inte $sha1. " "Direkt hämtning av incheckningen misslyckades." -#: git-submodule.sh:663 +#: git-submodule.sh:669 #, 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:664 +#: git-submodule.sh:670 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\"" -#: git-submodule.sh:668 +#: git-submodule.sh:674 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "Kan inte ombasera \"$sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:669 +#: git-submodule.sh:675 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": ombaserade in i \"$sha1\"" -#: git-submodule.sh:674 +#: git-submodule.sh:680 #, 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:675 +#: git-submodule.sh:681 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\"" -#: git-submodule.sh:680 +#: git-submodule.sh:686 #, 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:681 +#: git-submodule.sh:687 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\"" -#: git-submodule.sh:712 +#: git-submodule.sh:718 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:820 +#: git-submodule.sh:826 msgid "The --cached option cannot be used with the --files option" msgstr "Flaggan --cached kan inte användas med flaggan --files" -#: git-submodule.sh:872 +#: git-submodule.sh:878 #, sh-format msgid "unexpected mode $mod_dst" msgstr "oväntat läge $mod_dst" -#: git-submodule.sh:892 +#: git-submodule.sh:898 #, 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:895 +#: git-submodule.sh:901 #, 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:898 +#: git-submodule.sh:904 #, 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:1045 +#: git-submodule.sh:1051 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\"" -#: git-submodule.sh:1112 +#: git-submodule.sh:1118 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Synkroniserar undermodul-url för \"$displaypath\"" @@ -14068,12 +14518,12 @@ msgstr "Synkroniserar undermodul-url för \"$displaypath\"" msgid "See git-${cmd}(1) for details." msgstr "Se git-${cmd}(1) för detaljer." -#: git-rebase--interactive.sh:131 +#: git-rebase--interactive.sh:140 #, sh-format msgid "Rebasing ($new_count/$total)" msgstr "Ombaserar ($new_count/$total)" -#: git-rebase--interactive.sh:147 +#: git-rebase--interactive.sh:156 msgid "" "\n" "Commands:\n" @@ -14099,7 +14549,7 @@ msgstr "" "\n" "Du kan byta ordning på raderna, de utförs uppifrån och ned.\n" -#: git-rebase--interactive.sh:162 +#: git-rebase--interactive.sh:171 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -14108,7 +14558,7 @@ msgstr "" "Ta inte bort rader. Använd \"drop\" för att specifikt förkasta en " "incheckning.\n" -#: git-rebase--interactive.sh:166 +#: git-rebase--interactive.sh:175 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -14116,7 +14566,7 @@ msgstr "" "\n" "Om du tar bort en rad KOMMER DEN INCHECKNINGEN ATT FÖRLORAS.\n" -#: git-rebase--interactive.sh:202 +#: git-rebase--interactive.sh:211 #, sh-format msgid "" "You can amend the commit now, with\n" @@ -14135,87 +14585,83 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--interactive.sh:227 +#: git-rebase--interactive.sh:236 #, sh-format msgid "$sha1: not a commit that can be picked" msgstr "$sha1: inte en incheckning som kan väljas" -#: git-rebase--interactive.sh:266 +#: git-rebase--interactive.sh:275 #, sh-format msgid "Invalid commit name: $sha1" msgstr "Felaktigt incheckningsnamn: $sha1" -#: git-rebase--interactive.sh:308 +#: git-rebase--interactive.sh:317 msgid "Cannot write current commit's replacement sha1" msgstr "Kan inte skriva ersättnings-sha1 för aktuell incheckning" -#: git-rebase--interactive.sh:360 +#: git-rebase--interactive.sh:369 #, sh-format msgid "Fast-forward to $sha1" msgstr "Snabbspolade till $sha1" -#: git-rebase--interactive.sh:362 +#: git-rebase--interactive.sh:371 #, sh-format msgid "Cannot fast-forward to $sha1" msgstr "Kan inte snabbspola till $sha1" -#: git-rebase--interactive.sh:371 +#: git-rebase--interactive.sh:380 #, sh-format msgid "Cannot move HEAD to $first_parent" msgstr "Kan inte flytta HEAD till $first_parent" -#: git-rebase--interactive.sh:376 +#: git-rebase--interactive.sh:385 #, sh-format msgid "Refusing to squash a merge: $sha1" msgstr "Vägrar utföra \"squash\" på en sammanslagning: $sha1" -#: git-rebase--interactive.sh:390 +#: git-rebase--interactive.sh:399 #, sh-format msgid "Error redoing merge $sha1" msgstr "Fel när sammanslagningen $sha1 skulle göras om" -#: git-rebase--interactive.sh:398 +#: git-rebase--interactive.sh:407 #, sh-format msgid "Could not pick $sha1" msgstr "Kunde inte välja $sha1" -#: git-rebase--interactive.sh:407 +#: git-rebase--interactive.sh:416 #, sh-format msgid "This is the commit message #${n}:" msgstr "Det här är incheckningsmeddelande ${n}:" -#: git-rebase--interactive.sh:412 +#: git-rebase--interactive.sh:421 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "Incheckningsmeddelande ${n} kommer hoppas över:" -#: git-rebase--interactive.sh:423 +#: git-rebase--interactive.sh:432 #, 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:431 +#: git-rebase--interactive.sh:441 #, sh-format msgid "Cannot write $fixup_msg" msgstr "Kan inte skriva $fixup_msg" -#: git-rebase--interactive.sh:434 +#: git-rebase--interactive.sh:444 msgid "This is a combination of 2 commits." msgstr "Det här är en kombination av 2 incheckningar." -#: git-rebase--interactive.sh:435 -msgid "This is the 1st commit message:" -msgstr "Det här är 1:a incheckningsmeddelandet:" - -#: git-rebase--interactive.sh:475 git-rebase--interactive.sh:518 -#: git-rebase--interactive.sh:521 +#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528 +#: git-rebase--interactive.sh:531 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "kunde inte tillämpa $sha1... $rest" -#: git-rebase--interactive.sh:549 +#: git-rebase--interactive.sh:559 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -14229,31 +14675,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:564 +#: git-rebase--interactive.sh:574 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "Stoppade på $sha1_abbrev... $rest" -#: git-rebase--interactive.sh:579 +#: git-rebase--interactive.sh:589 #, 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:621 +#: git-rebase--interactive.sh:631 #, sh-format msgid "Executing: $rest" msgstr "Kör: $rest" -#: git-rebase--interactive.sh:629 +#: git-rebase--interactive.sh:639 #, sh-format msgid "Execution failed: $rest" msgstr "Körning misslyckades: $rest" -#: git-rebase--interactive.sh:631 +#: git-rebase--interactive.sh:641 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:633 +#: git-rebase--interactive.sh:643 msgid "" "You can fix the problem, and then run\n" "\n" @@ -14264,7 +14710,7 @@ msgstr "" "\tgit rebase --continue\"" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--interactive.sh:646 +#: git-rebase--interactive.sh:656 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -14279,25 +14725,25 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--interactive.sh:657 +#: git-rebase--interactive.sh:667 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "Okänt kommando: $command $sha1 $rest" -#: git-rebase--interactive.sh:658 +#: git-rebase--interactive.sh:668 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "Rätta det med \"git rebase --edit-todo\"." -#: git-rebase--interactive.sh:693 +#: git-rebase--interactive.sh:703 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "Lyckades ombasera och uppdatera $head_name." -#: git-rebase--interactive.sh:740 +#: 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:898 +#: git-rebase--interactive.sh:908 #, sh-format msgid "" "Warning: the SHA-1 is missing or isn't a commit in the following line:\n" @@ -14306,7 +14752,7 @@ msgstr "" "Varning: SHA-1 saknas eller inte en incheckning på följande rad:\n" " - $line" -#: git-rebase--interactive.sh:931 +#: git-rebase--interactive.sh:941 #, sh-format msgid "" "Warning: the command isn't recognized in the following line:\n" @@ -14315,11 +14761,11 @@ msgstr "" "Varning: kommandot kändes inte igen på följande rad:\n" " - $line" -#: git-rebase--interactive.sh:970 +#: git-rebase--interactive.sh:980 msgid "could not detach HEAD" msgstr "kunde inte koppla från HEAD" -#: git-rebase--interactive.sh:1008 +#: git-rebase--interactive.sh:1018 msgid "" "Warning: some commits may have been dropped accidentally.\n" "Dropped commits (newer to older):" @@ -14327,7 +14773,7 @@ msgstr "" "Varning: vissa incheckningar kan av misstag ha tappats.\n" "Tappade incheckningar (nyaste först):" -#: git-rebase--interactive.sh:1016 +#: git-rebase--interactive.sh:1026 msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" "\n" @@ -14344,7 +14790,7 @@ msgstr "" "Möjliga bettenden är: \"ignore\" (ignorera), \"warn\" (varna), \"error" "\" (fel)." -#: git-rebase--interactive.sh:1027 +#: git-rebase--interactive.sh:1037 #, sh-format msgid "" "Unrecognized setting $check_level for option rebase.missingCommitsCheck. " @@ -14352,7 +14798,7 @@ msgid "" msgstr "" "Okänt val $check_level för flaggan rebase.missingCommitsCheck. Ignorerar." -#: git-rebase--interactive.sh:1044 +#: git-rebase--interactive.sh:1054 msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" "continue'." @@ -14360,15 +14806,15 @@ msgstr "" "Du kan rätta detta med \"git rebase --edit-todo\" följt av \"git rebase --" "continue\"." -#: git-rebase--interactive.sh:1045 +#: 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:1069 +#: git-rebase--interactive.sh:1079 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "Kunde inte ta bort CHERRY_PICK_HEAD" -#: git-rebase--interactive.sh:1074 +#: git-rebase--interactive.sh:1084 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -14399,11 +14845,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--interactive.sh:1091 +#: git-rebase--interactive.sh:1101 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:1096 +#: git-rebase--interactive.sh:1106 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -14411,11 +14857,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:1101 git-rebase--interactive.sh:1105 +#: git-rebase--interactive.sh:1111 git-rebase--interactive.sh:1115 msgid "Could not commit staged changes." msgstr "Kunde inte checka in köade ändringar." -#: git-rebase--interactive.sh:1129 +#: git-rebase--interactive.sh:1139 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -14429,40 +14875,40 @@ msgstr "" " git rebase --continue\n" "\n" -#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1295 +#: git-rebase--interactive.sh:1147 git-rebase--interactive.sh:1305 msgid "Could not execute editor" msgstr "Kunde inte starta textredigerare" -#: git-rebase--interactive.sh:1150 +#: git-rebase--interactive.sh:1160 #, sh-format msgid "Could not checkout $switch_to" msgstr "Kunde inte checka ut $switch_to" -#: git-rebase--interactive.sh:1155 +#: git-rebase--interactive.sh:1165 msgid "No HEAD?" msgstr "Inget HEAD?" -#: git-rebase--interactive.sh:1156 +#: git-rebase--interactive.sh:1166 #, sh-format msgid "Could not create temporary $state_dir" msgstr "Kunde inte skapa temporär $state_dir" -#: git-rebase--interactive.sh:1158 +#: git-rebase--interactive.sh:1168 msgid "Could not mark as interactive" msgstr "Kunde inte markera som interaktiv" -#: git-rebase--interactive.sh:1168 git-rebase--interactive.sh:1173 +#: git-rebase--interactive.sh:1178 git-rebase--interactive.sh:1183 msgid "Could not init rewritten commits" msgstr "Kunde inte initiera omskrivna incheckningar" -#: git-rebase--interactive.sh:1273 +#: git-rebase--interactive.sh:1283 #, 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:1278 +#: git-rebase--interactive.sh:1288 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -14472,7 +14918,7 @@ msgstr "" "Ombaseringen kommer dock att avbrytas om du tar bort allting.\n" "\n" -#: git-rebase--interactive.sh:1285 +#: git-rebase--interactive.sh:1295 msgid "Note that empty commits are commented out" msgstr "Observera att tomma incheckningar är utkommenterade" @@ -14536,6 +14982,908 @@ msgstr "Du måste köra kommandot från arbetskatalogens toppnivå." msgid "Unable to determine absolute path of git directory" msgstr "Kunde inte bestämma absolut sökväg till git-katalogen" +#. TRANSLATORS: you can adjust this to align "git add -i" status menu +#: git-add--interactive.perl:238 +#, perl-format +msgid "%12s %12s %s" +msgstr "%12s %12s %s" + +#: git-add--interactive.perl:239 +msgid "staged" +msgstr "köad" + +#: git-add--interactive.perl:239 +msgid "unstaged" +msgstr "ej köad" + +#: git-add--interactive.perl:297 git-add--interactive.perl:322 +msgid "binary" +msgstr "binär" + +#: git-add--interactive.perl:306 git-add--interactive.perl:360 +msgid "nothing" +msgstr "ingenting" + +#: git-add--interactive.perl:342 git-add--interactive.perl:357 +msgid "unchanged" +msgstr "oändrad" + +#: git-add--interactive.perl:653 +#, perl-format +msgid "added %d path\n" +msgid_plural "added %d paths\n" +msgstr[0] "lade till %d sökväg\n" +msgstr[1] "lade till %d sökvägar\n" + +#: git-add--interactive.perl:656 +#, perl-format +msgid "updated %d path\n" +msgid_plural "updated %d paths\n" +msgstr[0] "uppdaterade %d sökväg\n" +msgstr[1] "uppdaterade %d sökvägar\n" + +#: git-add--interactive.perl:659 +#, perl-format +msgid "reverted %d path\n" +msgid_plural "reverted %d paths\n" +msgstr[0] "återställde %d sökväg\n" +msgstr[1] "återställde %d sökvägar\n" + +#: git-add--interactive.perl:662 +#, perl-format +msgid "touched %d path\n" +msgid_plural "touched %d paths\n" +msgstr[0] "rörde %d sökväg\n" +msgstr[1] "rörde %d sökvägar\n" + +#: git-add--interactive.perl:671 +msgid "Update" +msgstr "Uppdatera" + +#: git-add--interactive.perl:683 +msgid "Revert" +msgstr "Återställ" + +#: git-add--interactive.perl:706 +#, perl-format +msgid "note: %s is untracked now.\n" +msgstr "observera: %s spåras inte längre.\n" + +#: git-add--interactive.perl:717 +msgid "Add untracked" +msgstr "Lägg till ospårad" + +#: git-add--interactive.perl:723 +msgid "No untracked files.\n" +msgstr "Inga ospårade filer.\n" + +#: git-add--interactive.perl:1039 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for staging." +msgstr "" +"Om patchen kan appliceras rent kommer det redigerade stycket att\n" +"köas omedelbart." + +#: git-add--interactive.perl:1042 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for stashing." +msgstr "" +"Om patchen kan appliceras rent kommer det redigerade stycket att\n" +"läggas till i \"stash\" omedelbart." + +#: git-add--interactive.perl:1045 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for unstaging." +msgstr "" +"Om patchen kan appliceras rent kommer det redigerade stycket att\n" +"tas bort från kön omedelbart." + +#: git-add--interactive.perl:1048 git-add--interactive.perl:1057 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for applying." +msgstr "" +"Om patchen kan appliceras rent kommer det redigerade stycket att\n" +"markeras för applicering omedelbart." + +#: git-add--interactive.perl:1051 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for discarding" +msgstr "" +"Om patchen kan appliceras rent kommer det redigerade stycket att\n" +"markeras för kasta omedelbart" + +#: git-add--interactive.perl:1054 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for discarding." +msgstr "" +"Om patchen kan appliceras rent kommer det redigerade stycket att\n" +"markeras för kasta omedelbart." + +#: git-add--interactive.perl:1067 +#, perl-format +msgid "failed to open hunk edit file for writing: %s" +msgstr "misslyckades öppna styckeredigeringsfil för skrivning: %s" + +#: git-add--interactive.perl:1068 +msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" +msgstr "Manuellt styckeredigeringsläge -- se nederst för snabbguide.\n" + +#: git-add--interactive.perl:1074 +#, 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" +"Ta bort \"%s\" rader genom att göra dem \" \"-rader (sammanhang).\n" +"Ta bort \"%s\" rader genom att radera dem.\n" +"Rader som börjar med %s kommer att tas bort.\n" + +#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. +#: git-add--interactive.perl:1082 +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 "" +"Om patchen inte kan appliceras rent kommer du få en möjlighet att\n" +"redigera den igen. Om alla rader i ett stycke tas bort avbryts\n" +"redigeringen och stycket lämnas oförändrat.\n" + +#: git-add--interactive.perl:1096 +#, perl-format +msgid "failed to open hunk edit file for reading: %s" +msgstr "misslyckades öppna styckesredigeringsfil för läsning: %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:1187 +msgid "" +"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +msgstr "" +"Ditt redigerade stycke kan inte appliceras. Redigera igen (\"nej\" kastar!) " +"[y/n]?" + +#: git-add--interactive.perl:1196 +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 - köa stycket\n" +"n - köa inte stycket\n" +"q - avsluta; köa inte stycket eller något av de följande\n" +"a - köa stycket och alla följande i filen\n" +"d - köa inte stycket eller något av de följande i filen" + +#: git-add--interactive.perl:1202 +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 - \"stash\":a stycket\n" +"n - \"stash\":a inte stycket\n" +"q - avsluta; \"stash\":a inte stycket eller något av de följande\n" +"a - \"stash\":a stycket och alla följande i filen\n" +"d - \"stash\":a inte stycket eller något av de följande i filen" + +#: git-add--interactive.perl:1208 +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 - ta bort stycket från kön\n" +"n - ta inte bort stycket från kön\n" +"q - avsluta; ta inte bort stycket eller något av de följande från kön\n" +"a - ta bort stycket och alla följande i filen från kön\n" +"d - ta inte bort stycket eller något av de följande i filen från kön" + +#: git-add--interactive.perl:1214 +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 - applicera stycket på indexet\n" +"n - applicera inte stycket på indexet\n" +"q - avsluta; applicera inte stycket eller något av de följande\n" +"a - applicera stycket och alla följande i filen\n" +"d - applicera inte stycket eller något av de följande i filen" + +#: git-add--interactive.perl:1220 +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 - förkasta stycket från arbetskatalogen\n" +"n - förkasta inte stycket från arbetskatalogen\n" +"q - avsluta; förkasta inte stycket eller något av de följande\n" +"a - förkasta stycket och alla följande i filen\n" +"d - förkasta inte stycket eller något av de följande i filen" + +#: git-add--interactive.perl:1226 +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 - förkasta stycket från indexet och arbetskatalogen\n" +"n - förkasta inte stycket från indexet och arbetskatalogen\n" +"q - avsluta; förkasta inte stycket eller något av de följande\n" +"a - förkasta stycket och alla följande i filen\n" +"d - förkasta inte stycket eller något av de följande i filen" + +#: git-add--interactive.perl:1232 +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 - applicera stycket på indexet och arbetskatalogen\n" +"n - applicera inte stycket på indexet och arbetskatalogen\n" +"q - avsluta; applicera inte stycket eller något av de följande\n" +"a - applicera stycket och alla följande i filen\n" +"d - applicera inte stycket eller något av de följande i filen" + +#: git-add--interactive.perl:1241 +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 - välj ett stycke att gå till\n" +"/ - sök efter stycke som motsvarar angivet reguljärt uttryck\n" +"j - lämna stycket obestämt, se nästa obestämda stycke\n" +"J - lämna stycket obestämt, se nästa stycke\n" +"k - lämna stycket obestämt, se föregående obestämda stycke\n" +"K - lämna stycket obestämt, se föregående stycke\n" +"s - dela aktuellt stycke i mindre styckens\n" +"e - redigera aktuellt stycke manuellt\n" +"? - visa hjälp\n" + +#: git-add--interactive.perl:1272 +msgid "The selected hunks do not apply to the index!\n" +msgstr "Markerade stycken kan inte appliceras på indexet!\n" + +#: git-add--interactive.perl:1273 +msgid "Apply them to the worktree anyway? " +msgstr "Applicera dem på arbetskatalogen trots det? " + +#: git-add--interactive.perl:1276 +msgid "Nothing was applied.\n" +msgstr "Ingenting applicerades.\n" + +#: git-add--interactive.perl:1287 +#, perl-format +msgid "ignoring unmerged: %s\n" +msgstr "ignorerar ej sammanslagen: %s\n" + +#: git-add--interactive.perl:1296 +msgid "Only binary files changed.\n" +msgstr "Endast binära filer ändrade.\n" + +#: git-add--interactive.perl:1298 +msgid "No changes.\n" +msgstr "Inga ändringar.\n" + +#: git-add--interactive.perl:1306 +msgid "Patch update" +msgstr "Uppdatera patch" + +#: git-add--interactive.perl:1358 +#, perl-format +msgid "Stage mode change [y,n,q,a,d,/%s,?]? " +msgstr "Köa ändrat läge [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1359 +#, perl-format +msgid "Stage deletion [y,n,q,a,d,/%s,?]? " +msgstr "Köa borttagning [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1360 +#, perl-format +msgid "Stage this hunk [y,n,q,a,d,/%s,?]? " +msgstr "Köa stycket [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1363 +#, perl-format +msgid "Stash mode change [y,n,q,a,d,/%s,?]? " +msgstr "Stash:a ändrat läge [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1364 +#, perl-format +msgid "Stash deletion [y,n,q,a,d,/%s,?]? " +msgstr "Stash:a borttagning [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1365 +#, perl-format +msgid "Stash this hunk [y,n,q,a,d,/%s,?]? " +msgstr "Stash:a stycket [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1368 +#, perl-format +msgid "Unstage mode change [y,n,q,a,d,/%s,?]? " +msgstr "Ta bort ändrat läge från kön [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1369 +#, perl-format +msgid "Unstage deletion [y,n,q,a,d,/%s,?]? " +msgstr "Ta bort borttagning från kön [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1370 +#, perl-format +msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? " +msgstr "Ta bort stycket från kön [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1373 +#, perl-format +msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? " +msgstr "Applicera ändrat läge på indexet [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1374 +#, perl-format +msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? " +msgstr "Applicera borttagning på indexet [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1375 +#, perl-format +msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? " +msgstr "Applicera stycket på indexet [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1378 +#, perl-format +msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? " +msgstr "Kasta ändrat läge från arbetskatalogen [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1379 +#, perl-format +msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? " +msgstr "Kasta borttagning från arbetskatalogen [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1380 +#, perl-format +msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? " +msgstr "Kasta stycket från arbetskatalogen [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1383 +#, perl-format +msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "Kasta ändrat läge från indexet och arbetskatalogen [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1384 +#, perl-format +msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "Kasta borttagning från indexet och arbetskatalogen [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1385 +#, perl-format +msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "Kasta stycket från indexet och arbetskatalogen [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1388 +#, perl-format +msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "" +"Applicera ändrat läge på indexet och arbetskatalogen [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1389 +#, perl-format +msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "" +"Applicera borttagning på indexet och arbetskatalogen [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1390 +#, perl-format +msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "Applicera stycket på indexet och arbetskatalogen [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1493 +msgid "go to which hunk (<ret> to see more)? " +msgstr "gå till vilket stycke (<ret> för att se fler)?" + +#: git-add--interactive.perl:1495 +msgid "go to which hunk? " +msgstr "gå till vilket stycke?" + +#: git-add--interactive.perl:1504 +#, perl-format +msgid "Invalid number: '%s'\n" +msgstr "Ogiltigt siffervärde: \"%s\"\n" + +#: git-add--interactive.perl:1509 +#, perl-format +msgid "Sorry, only %d hunk available.\n" +msgid_plural "Sorry, only %d hunks available.\n" +msgstr[0] "Beklagar, det finns bara %d stycke.\n" +msgstr[1] "Beklagar, det finns bara %d stycken.\n" + +#: git-add--interactive.perl:1535 +msgid "search for regex? " +msgstr "sök efter reguljärt uttryck? " + +#: git-add--interactive.perl:1548 +#, perl-format +msgid "Malformed search regexp %s: %s\n" +msgstr "Felaktigt format på reguljärt sökuttryck %s: %s\n" + +#: git-add--interactive.perl:1558 +msgid "No hunk matches the given pattern\n" +msgstr "Inga stycken motsvarar givet mönster\n" + +#: git-add--interactive.perl:1570 git-add--interactive.perl:1592 +msgid "No previous hunk\n" +msgstr "Inget föregående stycke\n" + +#: git-add--interactive.perl:1579 git-add--interactive.perl:1598 +msgid "No next hunk\n" +msgstr "Inget följande stycke\n" + +#: git-add--interactive.perl:1606 +#, perl-format +msgid "Split into %d hunk.\n" +msgid_plural "Split into %d hunks.\n" +msgstr[0] "Dela i %d stycke.\n" +msgstr[1] "Dela i %d stycken.\n" + +#: git-add--interactive.perl:1658 +msgid "Review diff" +msgstr "Granska diff" + +#. TRANSLATORS: please do not translate the command names +#. 'status', 'update', 'revert', etc. +#: git-add--interactive.perl:1677 +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\t - view diff between HEAD and index\n" +"add untracked - add contents of untracked files to the staged set of " +"changes\n" +msgstr "" +"status - visa sökvägar med ändringar\n" +"update - lägg arbetskatalogens tillstånd till köade ändringar\n" +"revert - återställ köade ändringar till HEAD-versionen\n" +"patch - välj och uppdatera valda stycken\n" +"diff\t - visa diff mellan HEAD och index\n" +"add untracked - lägg till innehåll i ospårade filer till köade ändringar\n" + +#: git-add--interactive.perl:1694 git-add--interactive.perl:1699 +#: git-add--interactive.perl:1702 git-add--interactive.perl:1709 +#: git-add--interactive.perl:1713 git-add--interactive.perl:1719 +msgid "missing --" +msgstr "saknad --" + +#: git-add--interactive.perl:1715 +#, perl-format +msgid "unknown --patch mode: %s" +msgstr "okänt läge för --patch: %s" + +#: git-add--interactive.perl:1721 git-add--interactive.perl:1727 +#, perl-format +msgid "invalid argument %s, expecting --" +msgstr "felaktigt argument %s, förväntar --" + +#: git-send-email.perl:121 +msgid "local zone differs from GMT by a non-minute interval\n" +msgstr "lokal zon skiljer sig från GMT med delar av minuter\n" + +#: git-send-email.perl:128 git-send-email.perl:134 +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:202 git-send-email.perl:208 +msgid "the editor exited uncleanly, aborting everything" +msgstr "textredigeringsprogrammet avslutades med fel, avbryter allting" + +#: git-send-email.perl:282 +#, 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:287 +#, perl-format +msgid "'%s.final' contains the composed email.\n" +msgstr "\"%s.final\" innehåller det skrivna brevet.\n" + +#: git-send-email.perl:305 +msgid "--dump-aliases incompatible with other options\n" +msgstr "--dump-alias är inkompatibelt med andra flaggor\n" + +#: git-send-email.perl:368 git-send-email.perl:623 +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:437 +#, perl-format +msgid "Unknown --suppress-cc field: '%s'\n" +msgstr "Okänt fält i --suppress-cc: \"%s\"\n" + +#: git-send-email.perl:466 +#, perl-format +msgid "Unknown --confirm setting: '%s'\n" +msgstr "Okänd inställning i --confirm: \"%s\"\n" + +#: git-send-email.perl:498 +#, 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:500 +#, perl-format +msgid "warning: `:include:` not supported: %s\n" +msgstr "varning: \":include:\" stöds inte: %s\n" + +#: git-send-email.perl:502 +#, 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:507 +#, 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:589 +#, 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 "" +"Filen \"%s\" finns men kan också vara ett incheckningsintervall\n" +"att skapa patchar för. Gör otvetydigt genom att...\n" +"\n" +" * Säga \"./%s\" om du menar en fil; eller\n" +" * Ange flaggan --format-patch om du menar ett intervall.\n" + +#: git-send-email.perl:610 +#, perl-format +msgid "Failed to opendir %s: %s" +msgstr "Misslyckades utföra opendir %s: %s" + +#: git-send-email.perl:634 +#, perl-format +msgid "" +"fatal: %s: %s\n" +"warning: no patches were sent\n" +msgstr "" +"ödesdigert: %s: %s\n" +"varning: inga patchar har sänts\n" + +#: git-send-email.perl:645 +msgid "" +"\n" +"No patch files specified!\n" +"\n" +msgstr "" +"\n" +"Inga patchfiler angavs!\n" +"\n" + +#: git-send-email.perl:658 +#, perl-format +msgid "No subject line in %s?" +msgstr "Ingen ärenderad i %s?" + +#: git-send-email.perl:668 +#, perl-format +msgid "Failed to open for writing %s: %s" +msgstr "Kunde inte öppna för skrivning %s: %s" + +#: git-send-email.perl:678 +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 "" +"Rader som börjar med \"GIT:\" kommer tas bort.\n" +"Överväg att ta med en övergripande diffstatus eller\n" +"innehållsförteckning för patchen du skriver.\n" +"\n" +"Rensa brevkroppen om du inte vill sända någon sammanfattning.\n" + +#: git-send-email.perl:701 +#, perl-format +msgid "Failed to open %s.final: %s" +msgstr "Misslyckades öppna %s.final: %s" + +#: git-send-email.perl:704 +#, perl-format +msgid "Failed to open %s: %s" +msgstr "Misslyckades öppna %s: %s" + +#: git-send-email.perl:739 +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:748 +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:780 +#, 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:809 +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:814 +msgid "Which 8bit encoding should I declare [UTF-8]? " +msgstr "Vilken åttabitarsteckenkodning skall jag ange [UTF-8]?" + +#: git-send-email.perl:822 +#, 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 "" +"Vägrar sända eftersom patchen\n" +"\t%s\n" +"har mallärendet \"*** SUBJECT HERE ***\". Använd --force om du verkligen " +"vill sända.\n" + +#: git-send-email.perl:841 +msgid "To whom should the emails be sent (if anyone)?" +msgstr "Till vem skall breven sändas (om någon)?" + +#: git-send-email.perl:859 +#, perl-format +msgid "fatal: alias '%s' expands to itself\n" +msgstr "ödesdigert: aliaset \"%s\" expanderar till sig själv\n" + +#: git-send-email.perl:871 +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:921 git-send-email.perl:929 +#, 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" + +#. 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:933 +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:1234 +#, perl-format +msgid "CA path \"%s\" does not exist" +msgstr "CA-sökvägen \"%s\" finns inte" + +#: git-send-email.perl:1309 +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 "" +" Kopielistan ovan har utökats av ytterligare adresser\n" +" funna i patchens incheckningsmeddelande. Send-email\n" +" frågar som standard innan sändning när detta sker.\n" +" Beteendet styrs av konfigurationsinställningen\n" +" sendemail.confirm\n" +"\n" +" För ytterligare information, kör \"git send-email --help\".\n" +" För att behålla nuvarande beteende, men dölja detta\n" +" meddelande, kör \"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:1324 +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:1327 +msgid "Send this email reply required" +msgstr "Svar krävs på frågan \"Sända brevet?\"" + +#: git-send-email.perl:1353 +msgid "The required SMTP server is not properly defined." +msgstr "Nödvändig SMTP-server har inte angivits korrekt." + +#: git-send-email.perl:1397 +#, perl-format +msgid "Server does not support STARTTLS! %s" +msgstr "Servern stöder inte SMARTTLS! %s" + +#: git-send-email.perl:1403 +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:1421 +#, perl-format +msgid "Failed to send %s\n" +msgstr "Misslyckades sända %s\n" + +#: git-send-email.perl:1424 +#, perl-format +msgid "Dry-Sent %s\n" +msgstr "Test-Sände %s\n" + +#: git-send-email.perl:1424 +#, perl-format +msgid "Sent %s\n" +msgstr "Sände %s\n" + +#: git-send-email.perl:1426 +msgid "Dry-OK. Log says:\n" +msgstr "Test-OK. Loggen säger:\n" + +#: git-send-email.perl:1426 +msgid "OK. Log says:\n" +msgstr "OK. Loggen säger:\n" + +#: git-send-email.perl:1438 +msgid "Result: " +msgstr "Resultat: " + +#: git-send-email.perl:1441 +msgid "Result: OK\n" +msgstr "Resultat: OK\n" + +#: git-send-email.perl:1454 +#, perl-format +msgid "can't open file %s" +msgstr "kan inte öppna filen %s" + +#: git-send-email.perl:1501 git-send-email.perl:1521 +#, 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:1507 +#, 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:1555 +#, 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:1578 +#, 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:1676 +#, perl-format +msgid "(%s) Could not execute '%s'" +msgstr "(%s) Kunde inte köra \"%s\"" + +#: git-send-email.perl:1683 +#, 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:1687 +#, perl-format +msgid "(%s) failed to close pipe to '%s'" +msgstr "(%s) misslyckades stänga röret till \"%s\"" + +#: git-send-email.perl:1714 +msgid "cannot send message as 7bit" +msgstr "kan inte sända brev som sjubitars" + +#: git-send-email.perl:1722 +msgid "invalid transfer encoding" +msgstr "ogiltig överföringskondning" + +#: git-send-email.perl:1741 git-send-email.perl:1792 git-send-email.perl:1802 +#, perl-format +msgid "unable to open %s: %s\n" +msgstr "kunde inte öppna %s: %s\n" + +#: git-send-email.perl:1744 +#, 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:1760 +#, perl-format +msgid "Skipping %s with backup suffix '%s'.\n" +msgstr "" +"Hoppar över %s med filnamnstillägget \"%s\" som används för " +"säkerhetskopior.\n" + +#. TRANSLATORS: please keep "[y|N]" as is. +#: git-send-email.perl:1764 +#, perl-format +msgid "Do you really want to send %s? [y|N]: " +msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " + +#~ msgid "Use an experimental blank-line-based heuristic to improve diffs" +#~ msgstr "" +#~ "Använd en experimentell algoritm baserad på tomma rader för att förbättra " +#~ "diffar" + +#~ msgid "Clever... amending the last one with dirty index." +#~ msgstr "Smart... utöka den senaste med smutsigt index." + +#~ msgid "" +#~ "the following submodule (or one of its nested submodules)\n" +#~ "uses a .git directory:" +#~ msgid_plural "" +#~ "the following submodules (or one of their nested submodules)\n" +#~ "use a .git directory:" +#~ msgstr[0] "" +#~ "följande undermodul (eller en av dess nästlade undermoduler)\n" +#~ "använder en .git-katalog:" +#~ msgstr[1] "" +#~ "följande undermoduler (eller en av deras nästlade undermoduler)\n" +#~ "använder en .git-katalog:" + +#~ msgid "" +#~ "\n" +#~ "(use 'rm -rf' if you really want to remove it including all of its " +#~ "history)" +#~ msgstr "" +#~ "\n" +#~ "(använd \"rm -rf\" om du verkligen vill ta bort den och all dess historik)" + #~ msgid "Could not write to %s" #~ msgstr "Kunde inte skriva till %s" @@ -14723,9 +16071,6 @@ msgstr "Kunde inte bestämma absolut sökväg till git-katalogen" #~ msgid "bug: unhandled diff status %c" #~ msgstr "programfel: diff-status %c ej hanterad" -#~ msgid "read of %s failed" -#~ msgstr "misslyckades läsa %s" - #~ msgid "could not write branch description template" #~ msgstr "kunde inte skriva grenbeskrivningsmall" @@ -14810,12 +16155,6 @@ msgstr "Kunde inte bestämma absolut sökväg till git-katalogen" #~ msgid "unable to access '%s': %s" #~ msgstr "kan inte komma åt \"%s\": %s" -#~ msgid "could not open '%s' for reading: %s" -#~ msgstr "kunde inte öppna \"%s\" för läsning: %s" - -#~ msgid "could not open '%s' for writing: %s" -#~ msgstr "Kunde inte öppna \"%s\" för skrivning: %s" - #~ msgid " git branch -d %s\n" #~ msgstr " git branch -d %s\n" @@ -15310,18 +16649,12 @@ msgstr "Kunde inte bestämma absolut sökväg till git-katalogen" #~ msgid "oops" #~ msgstr "hoppsan" -#~ msgid "Would not remove %s\n" -#~ msgstr "Skulle inte ta bort %s\n" - #~ msgid "Not removing %s\n" #~ msgstr "Tar inte bort %s\n" #~ msgid "git remote set-head <name> (-a | -d | <branch>])" #~ msgstr "git remote set-head <namn> (-a | -d | <gren>])" -#~ msgid " 0 files changed" -#~ msgstr " 0 filer ändrade" - #~ msgid " %d file changed" #~ msgid_plural " %d files changed" #~ msgstr[0] " %d fil ändrad" @@ -2,14 +2,14 @@ # Bản dịch tiếng Việt dành cho GIT-CORE. # This file is distributed under the same license as the git-core package. # Nguyễn Thái Ngọc Duy <pclouds@gmail.com>, 2012. -# Trần Ngọc Quân <vnwildman@gmail.com>, 2012, 2013, 2014, 2015, 2016. +# Trần Ngọc Quân <vnwildman@gmail.com>, 2012, 2013, 2014, 2015, 2016, 2017. # msgid "" msgstr "" -"Project-Id-Version: git v2.11.0\n" +"Project-Id-Version: git v2.12.0-rc0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2016-11-25 22:50+0800\n" -"PO-Revision-Date: 2016-11-25 23:00+0800\n" +"POT-Creation-Date: 2017-02-04 13:02+0800\n" +"PO-Revision-Date: 2017-02-17 13:49+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:114 builtin/merge.c:1181 +#: advice.c:114 builtin/merge.c:1206 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)." @@ -542,7 +542,7 @@ msgstr[0] "Đang áp dụng miếng vá %%s với %d lần từ chối…" 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:4540 builtin/fetch.c:740 builtin/fetch.c:989 +#: apply.c:4540 builtin/fetch.c:737 builtin/fetch.c:986 #, c-format msgid "cannot open %s" msgstr "không mở được “%s”" @@ -593,15 +593,16 @@ 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:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431 +#: apply.c:4888 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391 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:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280 #: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180 -#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:407 -#: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592 -#: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947 +#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:591 +#: builtin/submodule--helper.c:594 builtin/submodule--helper.c:960 +#: builtin/submodule--helper.c:963 builtin/submodule--helper.c:1104 +#: git-add--interactive.perl:239 msgid "path" msgstr "đường-dẫn" @@ -706,8 +707,8 @@ msgid "allow overlapping hunks" msgstr "cho phép chồng khối nhớ" #: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19 -#: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593 -#: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114 +#: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651 +#: builtin/log.c:1860 builtin/mv.c:122 builtin/read-tree.c:114 msgid "be verbose" msgstr "chi tiết" @@ -747,7 +748,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <kho> [--exec <lệnh>] --list" -#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327 +#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300 #, 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" @@ -768,11 +769,11 @@ msgstr "tiền_tố" 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:432 builtin/archive.c:88 builtin/blame.c:2603 -#: builtin/blame.c:2604 builtin/config.c:59 builtin/fast-export.c:987 -#: builtin/fast-export.c:989 builtin/grep.c:723 builtin/hash-object.c:101 -#: builtin/ls-files.c:539 builtin/ls-files.c:542 builtin/notes.c:401 -#: builtin/notes.c:564 builtin/read-tree.c:109 parse-options.h:153 +#: archive.c:432 builtin/blame.c:2607 builtin/blame.c:2608 builtin/config.c:59 +#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1054 +#: builtin/hash-object.c:101 builtin/ls-files.c:539 builtin/ls-files.c:542 +#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109 +#: parse-options.h:153 msgid "file" msgstr "tập_tin" @@ -805,7 +806,7 @@ msgid "list supported archive formats" msgstr "liệt kê các kiểu nén được hỗ trợ" #: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88 -#: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953 +#: builtin/submodule--helper.c:603 builtin/submodule--helper.c:969 msgid "repo" msgstr "kho" @@ -901,11 +902,11 @@ msgstr "" #: bisect.c:750 #, c-format msgid "" -"Some %s revs are not ancestor of the %s rev.\n" +"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 "" -"Một số điểm xét duyệt %s không phải tổ tiên của %s.\n" +"Một số điểm xét duyệt %s không phải tổ tiên của điểm xét duyệt %s.\n" "git bisect không thể làm việc đúng đắn trong trường hợp này.\n" "Liệu có phải bạn nhầm lẫn các điểm %s và %s không?\n" @@ -931,7 +932,7 @@ msgstr "Bisecting: nền hòa trộn cần phải được kiểm tra\n" msgid "a %s revision is needed" msgstr "cần một điểm xét duyệt %s" -#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248 +#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:262 #, c-format msgid "could not create file '%s'" msgstr "không thể tạo tập tin “%s”" @@ -1122,7 +1123,7 @@ 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:87 sequencer.c:963 builtin/commit.c:777 +#: bundle.c:87 sequencer.c:1331 sequencer.c:1752 builtin/commit.c:777 #, c-format msgid "could not open '%s'" msgstr "không thể mở “%s”" @@ -1131,10 +1132,10 @@ 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:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374 -#: builtin/blame.c:2814 builtin/commit.c:1061 builtin/log.c:348 +#: bundle.c:163 ref-filter.c:1499 sequencer.c:1154 sequencer.c:2290 +#: builtin/blame.c:2820 builtin/commit.c:1061 builtin/log.c:348 #: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909 -#: builtin/merge.c:356 builtin/shortlog.c:170 +#: builtin/merge.c:360 builtin/shortlog.c:177 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" @@ -1171,7 +1172,7 @@ msgstr "rev-list đã chết" 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:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273 +#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:282 #, c-format msgid "unrecognized argument: %s" msgstr "đối số không được thừa nhận: %s" @@ -1189,13 +1190,13 @@ msgstr "không thể tạo “%s”" msgid "index-pack died" msgstr "mục lục gói đã chết" -#: color.c:290 +#: color.c:300 #, c-format msgid "invalid color value: %.*s" msgstr "giá trị màu không hợp lệ: %.*s" -#: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493 -#: builtin/am.c:2127 +#: commit.c:40 sequencer.c:1564 builtin/am.c:421 builtin/am.c:457 +#: builtin/am.c:1493 builtin/am.c:2127 #, c-format msgid "could not parse %s" msgstr "không thể phân tích cú pháp %s" @@ -1219,125 +1220,135 @@ msgstr "" msgid "memory exhausted" msgstr "hết bộ nhớ" -#: config.c:516 +#: config.c:518 #, 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:520 +#: config.c:522 #, 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:524 +#: config.c:526 #, 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:528 +#: config.c:530 #, 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:532 +#: config.c:534 #, 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:536 +#: config.c:538 #, c-format msgid "bad config line %d in %s" msgstr "cấu hình sai tại dòng %d trong %s" -#: config.c:655 +#: config.c:657 msgid "out of range" msgstr "nằm ngoài phạm vi" -#: config.c:655 +#: config.c:657 msgid "invalid unit" msgstr "đơn vị không hợp lệ" -#: config.c:661 +#: config.c:663 #, 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:666 +#: config.c:668 #, 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:669 +#: config.c:671 #, 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:672 +#: config.c:674 #, 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:675 +#: config.c:677 #, 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:678 +#: config.c:680 #, 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:681 +#: config.c:683 #, 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:768 +#: config.c:770 #, 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:852 config.c:863 +#: config.c:865 config.c:876 #, c-format msgid "bad zlib compression level %d" msgstr "mức nén zlib %d là sai" -#: config.c:978 +#: config.c:993 #, 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:1312 +#: config.c:1149 +#, c-format +msgid "bad pack compression level %d" +msgstr "mức nén gói %d không hợp lệ" + +#: config.c:1339 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:1362 +#: config.c:1389 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:1716 +#: config.c:1743 #, 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:1718 +#: config.c:1745 #, 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:1777 +#: config.c:1804 #, c-format msgid "%s has multiple values" msgstr "%s có đa giá trị" -#: config.c:2311 +#: config.c:2225 config.c:2450 +#, c-format +msgid "fstat on %s failed" +msgstr "fstat trên %s gặp lỗi" + +#: config.c:2343 #, c-format msgid "could not set '%s' to '%s'" msgstr "không thể đặt “%s” thành “%s”" -#: config.c:2313 +#: config.c:2345 #, c-format msgid "could not unset '%s'" msgstr "không thể thôi đặt “%s”" @@ -1358,7 +1369,7 @@ 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:173 builtin/prune.c:140 +#: connected.c:63 builtin/fsck.c:190 builtin/prune.c:140 msgid "Checking connectivity" msgstr "Đang kiểm tra kết nối" @@ -1485,12 +1496,12 @@ msgstr " Gặp lỗi khi phân tích dirstat cắt bỏ phần trăm “%s”\n msgid " Unknown dirstat parameter '%s'\n" msgstr " Không hiểu đối số dirstat “%s”\n" -#: diff.c:283 +#: diff.c:281 #, 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:346 +#: diff.c:344 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -1499,20 +1510,20 @@ msgstr "" "Tìm thấy các lỗi trong biến cấu hình “diff.dirstat”:\n" "%s" -#: diff.c:3087 +#: diff.c:3085 #, 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:3412 +#: diff.c:3411 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:3502 +#: diff.c:3501 msgid "--follow requires exactly one pathspec" msgstr "--follow cần chính xác một đặc tả đường dẫn" -#: diff.c:3665 +#: diff.c:3664 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -1521,22 +1532,22 @@ msgstr "" "Gặp lỗi khi phân tích đối số tùy chọn --dirstat/-X:\n" "%s" -#: diff.c:3679 +#: diff.c:3678 #, 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:4700 +#: diff.c:4695 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:4703 +#: diff.c:4698 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:4706 +#: diff.c:4701 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -1544,14 +1555,19 @@ 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:1866 +#: dir.c:1863 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:1985 +#: dir.c:1982 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:2760 +#, 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”" + #: fetch-pack.c:213 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: cần danh sách shallow" @@ -1732,35 +1748,40 @@ msgstr "không thể tạo tập tin tạm thời" msgid "failed writing detached signature to '%s'" msgstr "gặp lỗi khi ghi chữ ký đính kèm vào “%s”" -#: grep.c:1782 +#: graph.c:96 +#, c-format +msgid "ignore invalid color '%.*s' in log.graphColors" +msgstr "bỏ qua màu không hợp lệ “%.*s” trong log.graphColors" + +#: grep.c:1794 #, c-format msgid "'%s': unable to read %s" msgstr "“%s”: không thể đọc %s" -#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155 +#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:133 #, c-format msgid "failed to stat '%s'" msgstr "gặp lỗi khi lấy thống kê về “%s”" -#: grep.c:1810 +#: grep.c:1822 #, c-format msgid "'%s': short read" msgstr "“%s”: đọc ngắn" -#: help.c:203 +#: help.c:218 #, c-format msgid "available git commands in '%s'" msgstr "các lệnh git sẵn có trong thư mục “%s”:" -#: help.c:210 +#: help.c:225 msgid "git commands available from elsewhere on your $PATH" msgstr "các lệnh git sẵn có từ một nơi khác trong $PATH của bạn" -#: help.c:241 +#: help.c:256 msgid "These are common Git commands used in various situations:" msgstr "Có các lệnh Git chung được sử dụng trong các tình huống khác nhau:" -#: help.c:306 +#: help.c:321 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -1769,11 +1790,11 @@ msgstr "" "“%s” trông như là một lệnh git, nhưng chúng tôi không\n" "thể thực thi nó. Có lẽ là lệnh git-%s đã bị hỏng?" -#: help.c:361 +#: help.c:376 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Ối chà. Hệ thống của bạn báo rằng chẳng có lệnh Git nào cả." -#: help.c:383 +#: help.c:398 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" @@ -1782,17 +1803,17 @@ msgstr "" "CẢNH BÁO: Bạn đã gọi lệnh Git có tên “%s”, mà nó lại không có sẵn.\n" "Tiếp tục và coi rằng ý bạn là “%s”" -#: help.c:388 +#: help.c:403 #, c-format msgid "in %0.1f seconds automatically..." msgstr "trong %0.1f giây một cách tự động…" -#: help.c:395 +#: help.c:410 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: “%s” không phải là một lệnh của git. Xem “git --help”." -#: help.c:399 help.c:465 +#: help.c:414 help.c:480 msgid "" "\n" "Did you mean this?" @@ -1803,7 +1824,7 @@ msgstr[0] "" "\n" "Có phải ý bạn là một trong số những cái này không?" -#: help.c:461 +#: help.c:476 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" @@ -1871,69 +1892,69 @@ msgstr "không thể ghi tập tin lưu bảng mục lục mới" msgid "(bad commit)\n" msgstr "(commit sai)\n" -#: merge-recursive.c:231 +#: merge-recursive.c:231 merge-recursive.c:239 #, 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:301 +#: merge-recursive.c:303 msgid "error building trees" msgstr "gặp lỗi khi xây dựng cây" -#: merge-recursive.c:720 +#: merge-recursive.c:727 #, 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:731 +#: merge-recursive.c:738 #, 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:745 merge-recursive.c:764 +#: merge-recursive.c:752 merge-recursive.c:771 msgid ": perhaps a D/F conflict?" msgstr ": có lẽ là một xung đột D/F?" -#: merge-recursive.c:754 +#: merge-recursive.c:761 #, 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:796 builtin/cat-file.c:34 +#: merge-recursive.c:803 builtin/cat-file.c:34 #, c-format msgid "cannot read object %s '%s'" msgstr "không thể đọc đối tượng %s “%s”" -#: merge-recursive.c:798 +#: merge-recursive.c:805 #, c-format msgid "blob expected for %s '%s'" msgstr "đối tượng blob được mong đợi cho %s “%s”" -#: merge-recursive.c:822 +#: merge-recursive.c:829 #, c-format msgid "failed to open '%s': %s" msgstr "gặp lỗi khi mở “%s”: %s" -#: merge-recursive.c:833 +#: merge-recursive.c:840 #, 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:838 +#: merge-recursive.c:845 #, 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:978 +#: merge-recursive.c:985 msgid "Failed to execute internal merge" msgstr "Gặp lỗi khi thực hiện trộn nội bộ" -#: merge-recursive.c:982 +#: merge-recursive.c:989 #, 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:1081 merge-recursive.c:1095 +#: merge-recursive.c:1088 merge-recursive.c:1102 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -1942,7 +1963,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:1087 merge-recursive.c:1100 +#: merge-recursive.c:1094 merge-recursive.c:1107 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -1951,20 +1972,20 @@ 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:1143 +#: merge-recursive.c:1150 msgid "rename" msgstr "đổi tên" -#: merge-recursive.c:1143 +#: merge-recursive.c:1150 msgid "renamed" msgstr "đã đổi tên" -#: merge-recursive.c:1200 +#: merge-recursive.c:1207 #, 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:1225 +#: merge-recursive.c:1232 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -1973,136 +1994,136 @@ 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:1230 +#: merge-recursive.c:1237 msgid " (left unresolved)" msgstr " (cần giải quyết)" -#: merge-recursive.c:1292 +#: merge-recursive.c:1299 #, 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:1325 +#: merge-recursive.c:1332 #, 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:1531 +#: merge-recursive.c:1538 #, 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:1546 +#: merge-recursive.c:1553 #, c-format msgid "Adding merged %s" msgstr "Thêm hòa trộn %s" -#: merge-recursive.c:1553 merge-recursive.c:1766 +#: merge-recursive.c:1560 merge-recursive.c:1774 #, c-format msgid "Adding as %s instead" msgstr "Thay vào đó thêm vào %s" -#: merge-recursive.c:1610 +#: merge-recursive.c:1617 #, c-format msgid "cannot read object %s" msgstr "không thể đọc đối tượng %s" -#: merge-recursive.c:1613 +#: merge-recursive.c:1620 #, 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:1666 +#: merge-recursive.c:1673 msgid "modify" msgstr "sửa đổi" -#: merge-recursive.c:1666 +#: merge-recursive.c:1673 msgid "modified" msgstr "đã sửa" -#: merge-recursive.c:1676 +#: merge-recursive.c:1683 msgid "content" msgstr "nội dung" -#: merge-recursive.c:1683 +#: merge-recursive.c:1690 msgid "add/add" msgstr "thêm/thêm" -#: merge-recursive.c:1718 +#: merge-recursive.c:1726 #, 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:1732 +#: merge-recursive.c:1740 #, c-format msgid "Auto-merging %s" msgstr "Tự-động-hòa-trộn %s" -#: merge-recursive.c:1736 git-submodule.sh:924 +#: merge-recursive.c:1744 git-submodule.sh:930 msgid "submodule" msgstr "mô-đun-con" -#: merge-recursive.c:1737 +#: merge-recursive.c:1745 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "XUNG ĐỘT (%s): Xung đột hòa trộn trong %s" -#: merge-recursive.c:1831 +#: merge-recursive.c:1839 #, c-format msgid "Removing %s" msgstr "Đang xóa %s" -#: merge-recursive.c:1857 +#: merge-recursive.c:1865 msgid "file/directory" msgstr "tập-tin/thư-mục" -#: merge-recursive.c:1863 +#: merge-recursive.c:1871 msgid "directory/file" msgstr "thư-mục/tập-tin" -#: merge-recursive.c:1868 +#: merge-recursive.c:1877 #, 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:1877 +#: merge-recursive.c:1886 #, c-format msgid "Adding %s" msgstr "Thêm \"%s\"" -#: merge-recursive.c:1914 +#: merge-recursive.c:1923 msgid "Already up-to-date!" msgstr "Đã cập nhật rồi!" -#: merge-recursive.c:1923 +#: merge-recursive.c:1932 #, 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:2006 +#: merge-recursive.c:2015 msgid "Merging:" msgstr "Đang trộn:" -#: merge-recursive.c:2019 +#: merge-recursive.c:2028 #, 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:2058 +#: merge-recursive.c:2067 msgid "merge returned no commit" msgstr "hòa trộn không trả về lần chuyển giao nào" -#: merge-recursive.c:2121 +#: merge-recursive.c:2130 #, c-format msgid "Could not parse object '%s'" msgstr "Không thể phân tích đối tượng “%s”" -#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788 +#: merge-recursive.c:2144 builtin/merge.c:645 builtin/merge.c:792 msgid "Unable to write index." msgstr "Không thể ghi bảng mục lục" @@ -2186,12 +2207,12 @@ msgstr "tên đối tượng dị hình “%s”" msgid "Could not make %s writable by group" msgstr "Không thể làm %s được ghi bởi nhóm" -#: pathspec.c:133 +#: pathspec.c:142 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" "các cài đặt đặc tả đường dẫn “glob” và “noglob” toàn cục là xung khắc nhau" -#: pathspec.c:143 +#: pathspec.c:149 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -2199,46 +2220,51 @@ msgstr "" "cài đặt đặc tả đường dẫn “literal” toàn cục là xung khắc với các cài đặt đặc " "tả đường dẫn toàn cục khác" -#: pathspec.c:177 +#: pathspec.c:188 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "tham số không hợp lệ cho “tiền tố” màu nhiệm đặc tả đường đẫn" -#: pathspec.c:183 +#: pathspec.c:201 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "Số màu nhiệm đặc tả đường dẫn không hợp lệ “%.*s” trong “%s”" -#: pathspec.c:187 +#: pathspec.c:206 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "Thiếu “)” tại cuối của số màu nhiệm đặc tả đường dẫn trong “%s”" -#: pathspec.c:205 +#: pathspec.c:238 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Chưa viết mã cho số màu nhiệm đặc tả đường dẫn “%c” trong “%s”" -#: pathspec.c:230 +#: pathspec.c:293 pathspec.c:315 +#, c-format +msgid "Pathspec '%s' is in submodule '%.*s'" +msgstr "Đặc tả đường dẫn “%s” thì ở trong mô-đun-con “%.*s”" + +#: pathspec.c:350 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: “literal” và “glob” xung khắc nhau" -#: pathspec.c:241 +#: pathspec.c:363 #, c-format msgid "%s: '%s' is outside repository" msgstr "%s: “%s” ngoài một kho chứa" -#: pathspec.c:291 +#: pathspec.c:451 #, c-format -msgid "Pathspec '%s' is in submodule '%.*s'" -msgstr "Đặc tả đường dẫn “%s” thì ở trong mô-đun-con “%.*s”" +msgid "'%s' (mnemonic: '%c')" +msgstr "“%s” (mnemonic: “%c”)" -#: pathspec.c:353 +#: pathspec.c:461 #, c-format 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:408 +#: pathspec.c:511 msgid "" "empty strings as pathspecs will be made invalid in upcoming releases. please " "use . instead if you meant to match all paths" @@ -2246,12 +2272,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:440 +#: pathspec.c:535 #, 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" -#: pathspec.c:449 +#: pathspec.c:544 msgid "" "There is nothing to exclude from by :(exclude) patterns.\n" "Perhaps you forgot to add either ':/' or '.' ?" @@ -2259,11 +2285,11 @@ msgstr "" "Ở đây không có gì bị loại trừ bởi: các mẫu (loại trừ).\n" "Có lẽ bạn đã quên thêm hoặc là “:/” hoặc là “.”?" -#: pretty.c:971 +#: pretty.c:982 msgid "unable to parse --pretty format" msgstr "không thể phân tích định dạng --pretty" -#: read-cache.c:1315 +#: read-cache.c:1307 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -2272,7 +2298,7 @@ msgstr "" "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:1325 +#: read-cache.c:1317 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -2281,7 +2307,7 @@ 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" -#: refs.c:576 builtin/merge.c:840 +#: refs.c:576 builtin/merge.c:844 #, c-format msgid "Could not open '%s' for writing" msgstr "Không thể mở “%s” để ghi" @@ -2301,228 +2327,233 @@ msgstr "không thể xóa bỏ tham chiếu: %s" msgid "could not remove reference %s" msgstr "không thể gỡ bỏ tham chiếu: %s" -#: ref-filter.c:55 +#: ref-filter.c:56 #, c-format msgid "expected format: %%(color:<color>)" msgstr "cần định dạng: %%(color:<color>)" -#: ref-filter.c:57 +#: ref-filter.c:58 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "không nhận ra màu: %%(màu:%s)" -#: ref-filter.c:71 +#: ref-filter.c:72 #, c-format msgid "unrecognized format: %%(%s)" msgstr "không nhận ra định dạng: %%(%s)" -#: ref-filter.c:77 +#: ref-filter.c:78 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) không nhận các đối số" -#: ref-filter.c:84 +#: ref-filter.c:85 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) không nhận các đối số" -#: ref-filter.c:101 +#: ref-filter.c:92 +#, c-format +msgid "%%(trailers) does not take arguments" +msgstr "%%(trailers) không nhận các đối số" + +#: ref-filter.c:111 #, 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:103 +#: ref-filter.c:113 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "đối số không được thừa nhận %%(contents): %s" -#: ref-filter.c:113 +#: ref-filter.c:123 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "đối số không được thừa nhận %%(objectname): %s" -#: ref-filter.c:135 +#: ref-filter.c:145 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "cần định dạng: %%(align:<width>,<position>)" -#: ref-filter.c:147 +#: ref-filter.c:157 #, c-format msgid "unrecognized position:%s" msgstr "vị trí không được thừa nhận:%s" -#: ref-filter.c:151 +#: ref-filter.c:161 #, c-format msgid "unrecognized width:%s" msgstr "chiều rộng không được thừa nhận:%s" -#: ref-filter.c:157 +#: ref-filter.c:167 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "đối số không được thừa nhận %%(align): %s" -#: ref-filter.c:161 +#: ref-filter.c:171 #, 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:244 +#: ref-filter.c:255 #, c-format msgid "malformed field name: %.*s" msgstr "tên trường dị hình: %.*s" -#: ref-filter.c:270 +#: ref-filter.c:281 #, c-format msgid "unknown field name: %.*s" msgstr "không hiểu tên trường: %.*s" -#: ref-filter.c:372 +#: ref-filter.c:383 #, 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:424 +#: ref-filter.c:435 #, c-format msgid "malformed format string %s" msgstr "chuỗi định dạng dị hình %s" -#: ref-filter.c:878 +#: ref-filter.c:898 msgid ":strip= requires a positive integer argument" msgstr ":strip= cần một đối số nguyên dương" -#: ref-filter.c:883 +#: ref-filter.c:903 #, c-format msgid "ref '%s' does not have %ld components to :strip" msgstr "tham chiếu “%s” không có %ld thành phần để mà :strip" -#: ref-filter.c:1046 +#: ref-filter.c:1066 #, c-format msgid "unknown %.*s format %s" msgstr "Không hiểu định dạng %.*s %s" -#: ref-filter.c:1066 ref-filter.c:1097 +#: ref-filter.c:1086 ref-filter.c:1117 #, c-format msgid "missing object %s for %s" msgstr "thiếu đối tượng %s cho %s" -#: ref-filter.c:1069 ref-filter.c:1100 +#: ref-filter.c:1089 ref-filter.c:1120 #, 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:1311 +#: ref-filter.c:1343 #, c-format msgid "malformed object at '%s'" msgstr "đối tượng dị hình tại “%s”" -#: ref-filter.c:1373 +#: ref-filter.c:1410 #, 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:1378 +#: ref-filter.c:1415 #, c-format msgid "ignoring broken ref %s" msgstr "đang lờ đi tham chiếu hỏng %s" -#: ref-filter.c:1633 +#: ref-filter.c:1670 #, c-format msgid "format: %%(end) atom missing" msgstr "định dạng: thiếu nguyên tử %%(end)" -#: ref-filter.c:1687 +#: ref-filter.c:1734 #, c-format msgid "malformed object name %s" msgstr "tên đối tượng dị hình %s" -#: remote.c:746 +#: remote.c:754 #, 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:750 +#: remote.c:758 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s thường theo dõi %s, không phải %s" -#: remote.c:754 +#: remote.c:762 #, c-format msgid "%s tracks both %s and %s" msgstr "%s theo dõi cả %s và %s" -#: remote.c:762 +#: remote.c:770 msgid "Internal error" msgstr "Lỗi nội bộ" -#: remote.c:1677 remote.c:1720 +#: remote.c:1685 remote.c:1787 msgid "HEAD does not point to a branch" msgstr "HEAD không chỉ đến một nhánh nào cả" -#: remote.c:1686 +#: remote.c:1694 #, c-format msgid "no such branch: '%s'" msgstr "không có nhánh nào như thế: “%s”" -#: remote.c:1689 +#: remote.c:1697 #, 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:1695 +#: remote.c:1703 #, 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:1710 +#: remote.c:1718 #, 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:1730 #, 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:1741 #, 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:1754 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:1776 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" -#: remote.c:2073 +#: remote.c:2081 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" "Nhánh của bạn dựa trên cơ sở là “%s”, nhưng trên thượng nguồn không còn.\n" -#: remote.c:2077 +#: remote.c:2085 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (dùng \" git branch --unset-upstream\" để sửa)\n" -#: remote.c:2080 +#: remote.c:2088 #, c-format 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:2084 +#: remote.c:2092 #, 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] "Nhánh của bạn đứng trước “%s” %d lần chuyển giao.\n" -#: remote.c:2090 +#: remote.c:2098 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (dùng \"git push\" để xuất bản các lần chuyển giao nội bộ của bạn)\n" -#: remote.c:2093 +#: remote.c:2101 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -2531,11 +2562,11 @@ msgstr[0] "" "Nhánh của bạn đứng đằng sau “%s” %d lần chuyển giao, và có thể được chuyển-" "tiếp-nhanh.\n" -#: remote.c:2101 +#: remote.c:2109 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (dùng \"git pull\" để cập nhật nhánh nội bộ của bạn)\n" -#: remote.c:2104 +#: remote.c:2112 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -2548,7 +2579,7 @@ msgstr[0] "" "và có %d và %d lần chuyển giao khác nhau cho từng cái,\n" "tương ứng với mỗi lần.\n" -#: remote.c:2114 +#: remote.c:2122 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" " (dùng \"git pull\" để hòa trộn nhánh trên máy chủ vào trong nhánh của " @@ -2567,11 +2598,11 @@ msgstr "nhánh hiện tại của bạn “%s” không có một lần chuyển msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent xung khắc với --bisect" -#: run-command.c:106 +#: run-command.c:125 msgid "open /dev/null failed" msgstr "gặp lỗi khi mở “/dev/null”" -#: run-command.c:108 +#: run-command.c:127 #, c-format msgid "dup2(%d,%d) failed" msgstr "dup2(%d,%d) gặp lỗi" @@ -2600,15 +2631,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:171 +#: sequencer.c:215 msgid "revert" msgstr "hoàn nguyên" -#: sequencer.c:171 +#: sequencer.c:217 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:228 +#: sequencer.c:219 +msgid "rebase -i" +msgstr "rebase -i" + +#: sequencer.c:221 +#, c-format +msgid "Unknown action: %d" +msgstr "Không nhận ra thao tác: %d" + +#: sequencer.c:278 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -2616,7 +2656,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:231 +#: sequencer.c:281 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -2626,60 +2666,63 @@ 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:244 sequencer.c:1209 +#: sequencer.c:294 sequencer.c:1667 #, c-format msgid "could not lock '%s'" msgstr "không thể khóa “%s”" -#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214 +#: sequencer.c:297 sequencer.c:1545 sequencer.c:1672 sequencer.c:1686 #, c-format msgid "could not write to '%s'" msgstr "không thể ghi vào “%s”" -#: sequencer.c:251 +#: sequencer.c:301 #, c-format msgid "could not write eol to '%s'" msgstr "không thể ghi eol vào “%s”" -#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216 +#: sequencer.c:305 sequencer.c:1550 sequencer.c:1674 #, c-format msgid "failed to finalize '%s'." msgstr "gặp lỗi khi finalize “%s”" -#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032 +#: sequencer.c:329 sequencer.c:808 sequencer.c:1571 builtin/am.c:259 +#: builtin/commit.c:749 builtin/merge.c:1036 #, c-format msgid "could not read '%s'" msgstr "Không thể đọc “%s”." -#: sequencer.c:305 +#: sequencer.c:355 #, 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:309 +#: sequencer.c:359 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:324 +#: sequencer.c:388 #, c-format msgid "%s: fast-forward" msgstr "%s: chuyển-tiếp-nhanh" -#. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:399 +#. TRANSLATORS: %s will be "revert", "cherry-pick" or +#. * "rebase -i". +#. +#: sequencer.c:470 #, 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:418 +#: sequencer.c:489 msgid "could not resolve HEAD commit\n" msgstr "không thể phân giải lần chuyển giao HEAD\n" -#: sequencer.c:438 +#: sequencer.c:509 msgid "unable to update cache tree\n" msgstr "không thể cập nhật cây bộ nhớ đệm\n" -#: sequencer.c:483 +#: sequencer.c:592 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -2708,174 +2751,397 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:567 +#: sequencer.c:688 #, 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:572 +#: sequencer.c:693 #, 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:656 +#: sequencer.c:815 +#, c-format +msgid "" +"unexpected 1st line of squash message:\n" +"\n" +"\t%.*s" +msgstr "" +"không cần dòng thứ nhất của ghi chú squash:\n" +"\n" +"\t%.*s" + +#: sequencer.c:821 +#, c-format +msgid "" +"invalid 1st line of squash message:\n" +"\n" +"\t%.*s" +msgstr "" +"dòng thứ nhất của ghi chú squash không hợp lệ:\n" +"\n" +"\t%.*s" + +#: sequencer.c:827 sequencer.c:852 +#, 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:836 +msgid "need a HEAD to fixup" +msgstr "cần một HEAD để sửa" + +#: sequencer.c:838 +msgid "could not read HEAD" +msgstr "không thể đọc HEAD" + +#: sequencer.c:840 +msgid "could not read HEAD's commit message" +msgstr "không thể đọc phần chú thích (message) của HEAD" + +#: sequencer.c:846 +#, c-format +msgid "cannot write '%s'" +msgstr "không thể ghi “%s”" + +#: sequencer.c:855 git-rebase--interactive.sh:445 +msgid "This is the 1st commit message:" +msgstr "Đây là chú thích cho lần chuyển giao thứ nhất:" + +#: sequencer.c:863 +#, 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:870 +#, 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:875 +#, 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:880 +#, c-format +msgid "unknown command: %d" +msgstr "không hiểu câu lệnh %d" + +#: sequencer.c:946 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:675 +#: sequencer.c:964 #, 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:683 +#: sequencer.c:972 #, 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:687 +#: sequencer.c:976 #, 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:982 +#, 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:700 +#: sequencer.c:1001 #, 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:705 +#: sequencer.c:1063 sequencer.c:1812 #, c-format -msgid "cannot get commit message for %s" -msgstr "không thể lấy ghi chú lần chuyển giao cho %s" +msgid "could not rename '%s' to '%s'" +msgstr "không thể đổi tên “%s” thành “%s”" -#: sequencer.c:797 +#: sequencer.c:1114 #, c-format msgid "could not revert %s... %s" msgstr "không thể hoàn nguyên %s… %s" -#: sequencer.c:798 +#: sequencer.c:1115 #, c-format msgid "could not apply %s... %s" msgstr "không thể áp dụng miếng vá %s… %s" -#: sequencer.c:833 +#: sequencer.c:1157 msgid "empty commit set passed" msgstr "lần chuyển giao trống rỗng đặt là hợp quy cách" -#: sequencer.c:843 +#: sequencer.c:1167 #, 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:850 +#: sequencer.c:1174 #, 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:944 +#: sequencer.c:1294 #, c-format msgid "invalid line %d: %.*s" msgstr "dòng không hợp lệ %d: %.*s" -#: sequencer.c:950 -msgid "no commits parsed." -msgstr "không có lần chuyển giao nào được phân tích." +#: sequencer.c:1302 +#, 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:966 +#: sequencer.c:1334 #, c-format msgid "could not read '%s'." msgstr "không thể đọc “%s”." -#: sequencer.c:972 +#: sequencer.c:1341 +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:1343 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "bảng chỉ thị không thể dùng được: %s" -#: sequencer.c:983 +#: sequencer.c:1348 +msgid "no commits parsed." +msgstr "không có lần chuyển giao nào được phân tích." + +#: sequencer.c:1359 msgid "cannot cherry-pick during a revert." msgstr "không thể cherry-pick trong khi hoàn nguyên." -#: sequencer.c:985 +#: sequencer.c:1361 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:1028 +#: sequencer.c:1424 #, c-format msgid "invalid key: %s" msgstr "khóa không đúng: %s" -#: sequencer.c:1031 +#: sequencer.c:1427 #, c-format msgid "invalid value for %s: %s" msgstr "giá trị cho %s không hợp lệ: %s" -#: sequencer.c:1063 +#: sequencer.c:1484 #, c-format msgid "malformed options sheet: '%s'" msgstr "bảng tùy chọn dị hình: “%s”" -#: sequencer.c:1101 +#: sequencer.c:1522 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:1102 +#: sequencer.c:1523 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "hãy thử \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:1106 +#: sequencer.c:1526 #, 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:1120 +#: sequencer.c:1540 msgid "could not lock HEAD" msgstr "không thể khóa HEAD" -#: sequencer.c:1151 sequencer.c:1289 +#: sequencer.c:1596 sequencer.c:2150 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:1153 +#: sequencer.c:1598 msgid "cannot resolve HEAD" msgstr "không thể phân giải HEAD" -#: sequencer.c:1155 sequencer.c:1189 +#: sequencer.c:1600 sequencer.c:1634 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:1175 builtin/grep.c:578 +#: sequencer.c:1620 builtin/grep.c:904 #, c-format msgid "cannot open '%s'" msgstr "không mở được “%s”" -#: sequencer.c:1177 +#: sequencer.c:1622 #, c-format msgid "cannot read '%s': %s" msgstr "không thể đọc “%s”: %s" -#: sequencer.c:1178 +#: sequencer.c:1623 msgid "unexpected end of file" msgstr "gặp kết thúc tập tin đột xuất" -#: sequencer.c:1184 +#: sequencer.c:1629 #, 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:1354 +#: sequencer.c:1640 +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:1777 sequencer.c:2049 +msgid "cannot read HEAD" +msgstr "không thể đọc HEAD" + +#: sequencer.c:1817 builtin/difftool.c:574 +#, c-format +msgid "could not copy '%s' to '%s'" +msgstr "không thể chép “%s” sang “%s”" + +#: sequencer.c:1833 +msgid "could not read index" +msgstr "không thể đọc bảng mục lục" + +#: sequencer.c:1838 +#, c-format +msgid "" +"execution failed: %s\n" +"%sYou can fix the problem, and then run\n" +"\n" +" git rebase --continue\n" +"\n" +msgstr "" +"thực thi gặp lỗi: %s\n" +"%sBạn có thể sửa các trục trặc, và sau đó chạy lệnh\n" +"\n" +" git rebase --continue\n" +"\n" + +#: sequencer.c:1844 +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:1850 +#, 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 "" +"thực thi thành công: %s\n" +"nhưng còn các thay đổi trong mục lục và/hoặc cây làm việc\n" +"Chuyển giao hay tạm cất các thay đổi này đi, rồi chạy\n" +"\n" +" git rebase --continue\n" +"\n" + +#: sequencer.c:1905 git-rebase.sh:168 +#, c-format +msgid "Applied autostash." +msgstr "Đã áp dụng autostash." + +#: sequencer.c:1917 +#, c-format +msgid "cannot store %s" +msgstr "không thử lưu “%s”" + +#: sequencer.c:1919 git-rebase.sh:172 +#, 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 "" +"Áp dụng autostash có hiệu quả trong các xung đột.\n" +"Các thay đổi của bạn an toàn trong stash (tạm cất đi).\n" +"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:2000 +#, c-format +msgid "stopped at %s... %.*s" +msgstr "dừng lại ở %s… %.*s" + +#: sequencer.c:2027 +#, c-format +msgid "unknown command %d" +msgstr "không hiểu câu lệnh %d" + +#: sequencer.c:2057 +msgid "could not read orig-head" +msgstr "không thể đọc orig-head" + +#: sequencer.c:2061 +msgid "could not read 'onto'" +msgstr "không thể đọc “onto”." + +#: sequencer.c:2068 +#, c-format +msgid "could not update %s" +msgstr "không thể cập nhật %s" + +#: sequencer.c:2075 +#, c-format +msgid "could not update HEAD to %s" +msgstr "không thể cập nhật HEAD thành %s" + +#: sequencer.c:2159 +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:2164 +msgid "could not remove CHERRY_PICK_HEAD" +msgstr "không thể xóa bỏ CHERRY_PICK_HEAD" + +#: sequencer.c:2173 +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:2175 +#, c-format +msgid "invalid file: '%s'" +msgstr "tập tin không hợp lệ: “%s”" + +#: sequencer.c:2177 +#, c-format +msgid "invalid contents: '%s'" +msgstr "nội dung không hợp lệ: “%s”" + +#: sequencer.c:2180 +msgid "" +"\n" +"You have uncommitted changes in your working tree. Please, commit them\n" +"first and then run 'git rebase --continue' again." +msgstr "" +"\n" +"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:2190 +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:2270 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: không thể cherry-pick một %s" -#: sequencer.c:1358 +#: sequencer.c:2274 #, c-format msgid "%s: bad revision" msgstr "%s: điểm xét duyệt sai" -#: sequencer.c:1391 +#: sequencer.c:2307 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" @@ -2912,29 +3178,29 @@ 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:468 +#: setup.c:470 #, 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:476 +#: setup.c:478 msgid "unknown repository extensions found:" msgstr "tìm thấy phần mở rộng kho chưa biết:" -#: setup.c:762 +#: setup.c:768 #, 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:764 setup.c:915 builtin/index-pack.c:1641 +#: setup.c:770 setup.c:922 builtin/index-pack.c:1643 msgid "Cannot come back to cwd" msgstr "Không thể quay lại cwd" -#: setup.c:845 +#: setup.c:852 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:920 +#: setup.c:927 #, c-format msgid "" "Not a git repository (or any parent up to mount point %s)\n" @@ -2944,12 +3210,12 @@ msgstr "" "Dừng tại biên của hệ thống tập tin (GIT_DISCOVERY_ACROSS_FILESYSTEM chưa " "đặt)." -#: setup.c:927 +#: setup.c:934 #, c-format msgid "Cannot change to '%s/..'" msgstr "Không thể chuyển sang “%s/..”" -#: setup.c:989 +#: setup.c:996 #, c-format msgid "" "Problem with core.sharedRepository filemode value (0%.3o).\n" @@ -2958,41 +3224,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:473 +#: sha1_file.c:490 #, c-format msgid "path '%s' does not exist" msgstr "đường dẫn “%s” không tồn tại" -#: sha1_file.c:499 +#: sha1_file.c:516 #, 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:505 +#: sha1_file.c:522 #, 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:511 +#: sha1_file.c:528 #, c-format msgid "reference repository '%s' is shallow" msgstr "kho tham chiếu “%s” là nông" -#: sha1_file.c:519 +#: sha1_file.c:536 #, c-format msgid "reference repository '%s' is grafted" msgstr "kho tham chiếu “%s” bị cấy ghép" -#: sha1_file.c:1159 +#: sha1_file.c:1176 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:2592 +#: sha1_file.c:2637 #, 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:2596 +#: sha1_file.c:2641 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" @@ -3031,90 +3297,135 @@ msgstr "" "này\n" "bằng cách chạy lệnh \"git config advice.objectNameWarning false\"" -#: submodule.c:64 submodule.c:98 +#: submodule.c:65 submodule.c:99 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:68 submodule.c:102 +#: submodule.c:69 submodule.c:103 #, 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:76 +#: submodule.c:77 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Không thể cập nhật mục .gitmodules %s" -#: submodule.c:109 +#: submodule.c:110 #, 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:120 +#: submodule.c:121 msgid "staging updated .gitmodules failed" msgstr "gặp lỗi khi tổ chức .gitmodules đã cập nhật" -#: submodule.c:158 +#: submodule.c:159 msgid "negative values not allowed for submodule.fetchJobs" msgstr "không cho phép giá trị âm ở submodule.fetchJobs" -#: submodule-config.c:358 +#: submodule.c:1184 +#, c-format +msgid "could not start 'git status in submodule '%s'" +msgstr "không thể khởi chạy “git status trong mô-đun-con cho “%s”" + +#: submodule.c:1197 +#, 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:1398 +#, c-format +msgid "" +"relocate_gitdir for submodule '%s' with more than one worktree not supported" +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:1410 submodule.c:1471 +#, 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:1414 submodule.c:1474 builtin/submodule--helper.c:640 +#: builtin/submodule--helper.c:650 +#, c-format +msgid "could not create directory '%s'" +msgstr "không thể tạo thư mục “%s”" + +#: submodule.c:1420 +#, c-format +msgid "" +"Migrating git directory of '%s%s' from\n" +"'%s' to\n" +"'%s'\n" +msgstr "" +"Di cư thư mục git của “%s%s” từ\n" +"“%s” sang\n" +"“%s”\n" + +#: submodule.c:1512 +#, c-format +msgid "could not recurse into submodule '%s'" +msgstr "không thể đệ quy vào trong mô-đun-con “%s”" + +#: submodule-config.c:360 #, c-format msgid "invalid value for %s" msgstr "giá trị cho %s không hợp lệ" -#: trailer.c:238 +#: trailer.c:240 #, c-format msgid "running trailer command '%s' failed" msgstr "chạy lệnh kéo theo “%s” gặp lỗi" -#: trailer.c:471 trailer.c:475 trailer.c:479 trailer.c:533 trailer.c:537 -#: trailer.c:541 +#: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539 +#: trailer.c:543 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "không hiểu giá trị “%s” cho khóa “%s”" -#: trailer.c:523 trailer.c:528 builtin/remote.c:289 +#: trailer.c:525 trailer.c:530 builtin/remote.c:289 #, c-format msgid "more than one %s" msgstr "nhiều hơn một %s" -#: trailer.c:672 +#: trailer.c:702 #, 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:695 +#: trailer.c:722 #, c-format msgid "could not read input file '%s'" msgstr "không đọc được tập tin đầu vào “%s”" -#: trailer.c:698 +#: trailer.c:725 msgid "could not read from stdin" msgstr "không thể đọc từ đầu vào tiêu chuẩn" -#: trailer.c:929 builtin/am.c:44 +#: trailer.c:949 builtin/am.c:44 #, c-format msgid "could not stat %s" msgstr "không thể lấy thông tin thống kê về %s" -#: trailer.c:931 +#: trailer.c:951 #, 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:933 +#: trailer.c:953 #, 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:945 +#: trailer.c:965 msgid "could not open temporary file" msgstr "không thể tạo tập tin tạm thời" -#: trailer.c:983 +#: trailer.c:1001 #, 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" @@ -3129,7 +3440,7 @@ msgstr "Không thể đặt thượng nguồn của “%s” thành “%s” c 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:817 +#: transport.c:885 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -3138,7 +3449,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:821 +#: transport.c:889 #, c-format msgid "" "\n" @@ -3165,7 +3476,7 @@ msgstr "" "để đẩy chúng lên máy phục vụ.\n" "\n" -#: transport.c:829 +#: transport.c:897 msgid "Aborting." msgstr "Bãi bỏ." @@ -3190,7 +3501,7 @@ msgstr "tên tập tin trống rỗng trong mục tin cây" msgid "too-short tree file" msgstr "tập tin cây quá ngắn" -#: unpack-trees.c:64 +#: unpack-trees.c:99 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3201,7 +3512,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:66 +#: unpack-trees.c:101 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3211,7 +3522,7 @@ msgstr "" "checkout:\n" "%%s" -#: unpack-trees.c:69 +#: unpack-trees.c:104 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3222,7 +3533,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:71 +#: unpack-trees.c:106 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3232,7 +3543,7 @@ msgstr "" "hòa trộn:\n" "%%s" -#: unpack-trees.c:74 +#: unpack-trees.c:109 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -3242,7 +3553,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:76 +#: unpack-trees.c:111 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -3252,17 +3563,17 @@ msgstr "" "%s:\n" "%%s" -#: unpack-trees.c:81 +#: unpack-trees.c:116 #, c-format msgid "" -"Updating the following directories would lose untracked files in it:\n" +"Updating the following directories would lose untracked files in them:\n" "%s" msgstr "" -"Việc cập nhật các thư mục sau đây có thể làm mất các tập tin theo dõi trong " -"nó:\n" +"Việc cập nhật các thư mục sau đây có thể làm mất các tập tin chưa theo dõi " +"trong nó:\n" "%s" -#: unpack-trees.c:85 +#: unpack-trees.c:120 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -3272,7 +3583,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:87 +#: unpack-trees.c:122 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -3282,7 +3593,7 @@ msgstr "" "checkout:\n" "%%s" -#: unpack-trees.c:90 +#: unpack-trees.c:125 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -3292,7 +3603,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:92 +#: unpack-trees.c:127 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -3302,7 +3613,7 @@ msgstr "" "trộn:\n" "%%s" -#: unpack-trees.c:95 +#: unpack-trees.c:130 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -3311,7 +3622,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:97 +#: unpack-trees.c:132 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -3320,7 +3631,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:102 +#: unpack-trees.c:137 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3331,7 +3642,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:104 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3342,7 +3653,7 @@ msgstr "" "checkout:\n" "%%s" -#: unpack-trees.c:107 +#: unpack-trees.c:142 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -3352,7 +3663,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:109 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -3362,7 +3673,7 @@ msgstr "" "hòa trộn:\n" "%%s" -#: unpack-trees.c:112 +#: unpack-trees.c:147 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -3372,7 +3683,7 @@ msgstr "" "%s:\n" "%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn %s." -#: unpack-trees.c:114 +#: unpack-trees.c:149 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -3382,12 +3693,12 @@ msgstr "" "%s:\n" "%%s" -#: unpack-trees.c:121 +#: unpack-trees.c:156 #, 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:124 +#: unpack-trees.c:159 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up-to-date:\n" @@ -3396,7 +3707,7 @@ 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:126 +#: unpack-trees.c:161 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -3407,7 +3718,7 @@ msgstr "" "nhật checkout rải rác:\n" "%s" -#: unpack-trees.c:128 +#: unpack-trees.c:163 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -3418,12 +3729,12 @@ msgstr "" "nhật checkout rải rác:\n" "%s" -#: unpack-trees.c:205 +#: unpack-trees.c:240 #, c-format msgid "Aborting\n" msgstr "Bãi bỏ\n" -#: unpack-trees.c:237 +#: unpack-trees.c:270 msgid "Checking out files" msgstr "Đang lấy ra các tập tin" @@ -3472,7 +3783,7 @@ msgid "could not open '%s' for writing" msgstr "không thể mở “%s” để ghi" #: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759 -#: builtin/am.c:847 builtin/commit.c:1705 builtin/merge.c:1029 +#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1033 #: builtin/pull.c:341 #, c-format msgid "could not open '%s' for reading" @@ -3688,65 +3999,69 @@ msgstr " (dùng \"git am --skip\" để bỏ qua miếng vá này)" 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)" -#: wt-status.c:1172 +#: wt-status.c:1176 +msgid "git-rebase-todo is missing." +msgstr "thiếu git-rebase-todo" + +#: wt-status.c:1178 msgid "No commands done." msgstr "Không thực hiện lệnh nào." -#: wt-status.c:1175 +#: wt-status.c:1181 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Lệnh thực hiện cuối (%d lệnh được thực thi):" -#: wt-status.c:1186 +#: wt-status.c:1192 #, c-format msgid " (see more in file %s)" msgstr " (xem thêm trong %s)" -#: wt-status.c:1191 +#: wt-status.c:1197 msgid "No commands remaining." msgstr "Không có lệnh nào còn lại." -#: wt-status.c:1194 +#: wt-status.c:1200 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Lệnh cần làm kế tiếp (%d lệnh còn lại):" -#: wt-status.c:1202 +#: wt-status.c:1208 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (dùng lệnh \"git rebase --edit-todo\" để xem và sửa)" -#: wt-status.c:1215 +#: wt-status.c:1221 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Bạn hiện nay đang thực hiện việc “rebase” nhánh “%s” trên “%s”." -#: wt-status.c:1220 +#: wt-status.c:1226 msgid "You are currently rebasing." msgstr "Bạn hiện nay đang thực hiện việc “rebase” (“cải tổ”)." -#: wt-status.c:1234 +#: wt-status.c:1240 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" " (sửa các xung đột và sau đó chạy lệnh “cải tổ” \"git rebase --continue\")" -#: wt-status.c:1236 +#: wt-status.c:1242 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (dùng lệnh “cải tổ” \"git rebase --skip\" để bỏ qua lần vá này)" -#: wt-status.c:1238 +#: wt-status.c:1244 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" " (dùng lệnh “cải tổ” \"git rebase --abort\" để check-out nhánh nguyên thủy)" -#: wt-status.c:1244 +#: wt-status.c:1250 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" " (khi tất cả các xung đột đã sửa xong: chạy lệnh “cải tổ” \"git rebase --" "continue\")" -#: wt-status.c:1248 +#: wt-status.c:1254 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -3754,130 +4069,130 @@ msgstr "" "Bạn hiện nay đang thực hiện việc chia tách một lần chuyển giao trong khi " "đang “rebase” nhánh “%s” trên “%s”." -#: wt-status.c:1253 +#: wt-status.c:1259 msgid "You are currently splitting a commit during a rebase." msgstr "" "Bạn hiện tại đang cắt đôi một lần chuyển giao trong khi đang thực hiện việc " "rebase." -#: wt-status.c:1256 +#: wt-status.c:1262 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Một khi thư mục làm việc của bạn đã gọn gàng, chạy lệnh “cải tổ” \"git " "rebase --continue\")" -#: wt-status.c:1260 +#: wt-status.c:1266 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Bạn hiện nay đang thực hiện việc sửa chữa một lần chuyển giao trong khi đang " "rebase nhánh “%s” trên “%s”." -#: wt-status.c:1265 +#: wt-status.c:1271 msgid "You are currently editing a commit during a rebase." msgstr "Bạn hiện đang sửa một lần chuyển giao trong khi bạn thực hiện rebase." -#: wt-status.c:1268 +#: wt-status.c:1274 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (dùng \"git commit --amend\" để “tu bổ” lần chuyển giao hiện tại)" -#: wt-status.c:1270 +#: wt-status.c:1276 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (chạy lệnh “cải tổ” \"git rebase --continue\" một khi bạn cảm thấy hài " "lòng về những thay đổi của mình)" -#: wt-status.c:1280 +#: wt-status.c:1286 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Bạn hiện nay đang thực hiện việc cherry-pick lần chuyển giao %s." -#: wt-status.c:1285 +#: wt-status.c:1291 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" " (sửa các xung đột và sau đó chạy lệnh \"git cherry-pick --continue\")" -#: wt-status.c:1288 +#: wt-status.c:1294 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git cherry-pick --" "continue\")" -#: wt-status.c:1290 +#: wt-status.c:1296 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " (dùng \"git cherry-pick --abort\" để hủy bỏ thao tác cherry-pick)" -#: wt-status.c:1299 +#: wt-status.c:1305 #, c-format msgid "You are currently reverting commit %s." msgstr "Bạn hiện nay đang thực hiện thao tác hoàn nguyên lần chuyển giao “%s”." -#: wt-status.c:1304 +#: wt-status.c:1310 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (sửa các xung đột và sau đó chạy lệnh \"git revert --continue\")" -#: wt-status.c:1307 +#: wt-status.c:1313 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" " (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git revert --continue\")" -#: wt-status.c:1309 +#: wt-status.c:1315 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (dùng \"git revert --abort\" để hủy bỏ thao tác hoàn nguyên)" -#: wt-status.c:1320 +#: wt-status.c:1326 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "" "Bạn hiện nay đang thực hiện thao tác di chuyển nửa bước (bisect), bắt đầu từ " "nhánh “%s”." -#: wt-status.c:1324 +#: wt-status.c:1330 msgid "You are currently bisecting." msgstr "Bạn hiện tại đang thực hiện việc bisect (di chuyển nửa bước)." -#: wt-status.c:1327 +#: wt-status.c:1333 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (dùng \"git bisect reset\" để quay trở lại nhánh nguyên thủy)" -#: wt-status.c:1524 +#: wt-status.c:1530 msgid "On branch " msgstr "Trên nhánh " -#: wt-status.c:1530 +#: wt-status.c:1536 msgid "interactive rebase in progress; onto " msgstr "rebase ở chế độ tương tác đang được thực hiện; lên trên " -#: wt-status.c:1532 +#: wt-status.c:1538 msgid "rebase in progress; onto " msgstr "rebase đang được thực hiện: lên trên " -#: wt-status.c:1537 +#: wt-status.c:1543 msgid "HEAD detached at " msgstr "HEAD được tách rời tại " -#: wt-status.c:1539 +#: wt-status.c:1545 msgid "HEAD detached from " msgstr "HEAD được tách rời từ " -#: wt-status.c:1542 +#: wt-status.c:1548 msgid "Not currently on any branch." msgstr "Hiện tại chẳng ở nhánh nào cả." -#: wt-status.c:1560 +#: wt-status.c:1566 msgid "Initial commit" msgstr "Lần chuyển giao khởi tạo" -#: wt-status.c:1574 +#: wt-status.c:1580 msgid "Untracked files" msgstr "Những tập tin chưa được theo dõi" -#: wt-status.c:1576 +#: wt-status.c:1582 msgid "Ignored files" msgstr "Những tập tin bị lờ đi" -#: wt-status.c:1580 +#: wt-status.c:1586 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -3889,32 +4204,32 @@ msgstr "" "có lẽ làm nó nhanh hơn, nhưng bạn phải cẩn thận đừng quên mình phải\n" "tự thêm các tập tin mới (xem “git help status”.." -#: wt-status.c:1586 +#: wt-status.c:1592 #, c-format msgid "Untracked files not listed%s" msgstr "Những tập tin chưa được theo dõi không được liệt kê ra %s" -#: wt-status.c:1588 +#: wt-status.c:1594 msgid " (use -u option to show untracked files)" msgstr " (dùng tùy chọn -u để hiển thị các tập tin chưa được theo dõi)" -#: wt-status.c:1594 +#: wt-status.c:1600 msgid "No changes" msgstr "Không có thay đổi nào" -#: wt-status.c:1599 +#: wt-status.c:1605 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "không có thay đổi nào được thêm vào để chuyển giao (dùng \"git add\" và/hoặc " "\"git commit -a\")\n" -#: wt-status.c:1602 +#: wt-status.c:1608 #, c-format msgid "no changes added to commit\n" msgstr "không có thay đổi nào được thêm vào để chuyển giao\n" -#: wt-status.c:1605 +#: wt-status.c:1611 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -3923,68 +4238,68 @@ msgstr "" "không có gì được thêm vào lần chuyển giao nhưng có những tập tin chưa được " "theo dõi hiện diện (dùng \"git add\" để đưa vào theo dõi)\n" -#: wt-status.c:1608 +#: wt-status.c:1614 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" "không có gì được thêm vào lần chuyển giao nhưng có những tập tin chưa được " "theo dõi hiện diện\n" -#: wt-status.c:1611 +#: wt-status.c:1617 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "không có gì để chuyển giao (tạo/sao-chép các tập tin và dùng \"git add\" để " "đưa vào theo dõi)\n" -#: wt-status.c:1614 wt-status.c:1619 +#: wt-status.c:1620 wt-status.c:1625 #, c-format msgid "nothing to commit\n" msgstr "không có gì để chuyển giao\n" -#: wt-status.c:1617 +#: wt-status.c:1623 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "không có gì để chuyển giao (dùng -u xem các tập tin chưa được theo dõi)\n" -#: wt-status.c:1621 +#: wt-status.c:1627 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "không có gì để chuyển giao, thư mục làm việc sạch sẽ\n" -#: wt-status.c:1728 +#: wt-status.c:1734 msgid "Initial commit on " msgstr "Lần chuyển giao khởi tạo trên " -#: wt-status.c:1732 +#: wt-status.c:1738 msgid "HEAD (no branch)" msgstr "HEAD (không nhánh)" -#: wt-status.c:1761 +#: wt-status.c:1767 msgid "gone" msgstr "đã ra đi" -#: wt-status.c:1763 wt-status.c:1771 +#: wt-status.c:1769 wt-status.c:1777 msgid "behind " msgstr "đằng sau " -#: wt-status.c:1766 wt-status.c:1769 +#: wt-status.c:1772 wt-status.c:1775 msgid "ahead " msgstr "phía trước " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2270 +#: wt-status.c:2277 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "không thể %s: Bạn có các thay đổi chưa được đưa lên bệ phóng." -#: wt-status.c:2276 +#: wt-status.c:2283 msgid "additionally, your index contains uncommitted changes." msgstr "" "thêm vào đó, bảng mục lục của bạn có chứa các thay đổi chưa được chuyển giao." -#: wt-status.c:2278 +#: wt-status.c:2285 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "" @@ -4018,7 +4333,7 @@ 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:209 builtin/rev-parse.c:840 +#: builtin/add.c:209 builtin/rev-parse.c:845 msgid "Could not read the index" msgstr "Không thể đọc bảng mục lục" @@ -4055,9 +4370,9 @@ 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:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:111 -#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:521 -#: builtin/remote.c:1326 builtin/rm.c:268 builtin/send-pack.c:162 +#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:123 +#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524 +#: builtin/remote.c:1326 builtin/rm.c:241 builtin/send-pack.c:162 msgid "dry run" msgstr "chạy thử" @@ -4065,7 +4380,7 @@ msgstr "chạy thử" msgid "interactive picking" msgstr "sửa bằng cách tương tác" -#: builtin/add.c:270 builtin/checkout.c:1156 builtin/reset.c:286 +#: builtin/add.c:270 builtin/checkout.c:1159 builtin/reset.c:286 msgid "select hunks interactively" msgstr "chọn “hunks” theo kiểu tương tác" @@ -4151,7 +4466,7 @@ msgstr "Có lẽ ý bạn là “git add .” phải không?\n" #: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279 #: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350 -#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271 #: builtin/submodule--helper.c:244 msgid "index file corrupt" msgstr "tập tin ghi bảng mục lục bị hỏng" @@ -4272,7 +4587,7 @@ msgstr "Đang trở lại để vá cơ sở và “hòa trộn 3-đường” msgid "Failed to merge in the changes." msgstr "Gặp lỗi khi trộn vào các thay đổi." -#: builtin/am.c:1686 builtin/merge.c:628 +#: builtin/am.c:1686 builtin/merge.c:632 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" @@ -4280,8 +4595,8 @@ msgstr "lệnh git write-tree gặp lỗi khi ghi một cây" msgid "applying to an empty history" msgstr "áp dụng vào một lịch sử trống rỗng" -#: builtin/am.c:1706 builtin/commit.c:1769 builtin/merge.c:798 -#: builtin/merge.c:823 +#: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802 +#: builtin/merge.c:827 msgid "failed to write commit object" msgstr "gặp lỗi khi ghi đối tượng chuyển giao" @@ -4396,7 +4711,7 @@ 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:2245 builtin/init-db.c:483 builtin/prune-packed.c:57 -#: builtin/repack.c:172 +#: builtin/repack.c:178 msgid "be quiet" msgstr "im lặng" @@ -4440,15 +4755,15 @@ msgid "pass it through git-apply" msgstr "chuyển nó qua git-apply" #: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 -#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135 -#: builtin/pull.c:194 builtin/repack.c:181 builtin/repack.c:185 -#: builtin/show-branch.c:644 builtin/show-ref.c:175 builtin/tag.c:340 +#: builtin/grep.c:1038 builtin/merge.c:202 builtin/pull.c:135 +#: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191 +#: builtin/show-branch.c:644 builtin/show-ref.c:169 builtin/tag.c:355 #: parse-options.h:132 parse-options.h:134 parse-options.h:245 msgid "n" msgstr "n" #: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438 -#: builtin/tag.c:372 +#: builtin/tag.c:387 builtin/verify-tag.c:38 msgid "format" msgstr "định dạng" @@ -4484,8 +4799,8 @@ msgstr "nói dối về ngày chuyển giao" 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:2315 builtin/commit.c:1605 builtin/merge.c:229 -#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:355 +#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:233 +#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:370 msgid "key-id" msgstr "mã-số-khóa" @@ -4587,118 +4902,113 @@ msgstr "git blame [<các-tùy-chọn>] [<rev-opts>] [<rev>] [--] <tập-tin>" msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<rev-opts> được mô tả trong tài liệu git-rev-list(1)" -#: builtin/blame.c:1781 +#: builtin/blame.c:1786 msgid "Blaming lines" msgstr "Các dòng blame" -#: builtin/blame.c:2577 +#: builtin/blame.c:2582 msgid "Show blame entries as we find them, incrementally" msgstr "Hiển thị các mục “blame” như là chúng ta thấy chúng, tăng dần" -#: builtin/blame.c:2578 +#: builtin/blame.c:2583 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" "Hiển thị SHA-1 trắng cho những lần chuyển giao biên giới (Mặc định: off)" -#: builtin/blame.c:2579 +#: builtin/blame.c:2584 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Không coi các lần chuyển giao gốc là giới hạn (Mặc định: off)" -#: builtin/blame.c:2580 +#: builtin/blame.c:2585 msgid "Show work cost statistics" msgstr "Hiển thị thống kê công sức làm việc" -#: builtin/blame.c:2581 +#: builtin/blame.c:2586 msgid "Force progress reporting" msgstr "Ép buộc báo cáo tiến triển công việc" -#: builtin/blame.c:2582 +#: builtin/blame.c:2587 msgid "Show output score for blame entries" msgstr "Hiển thị kết xuất điểm số có các mục tin “blame”" -#: builtin/blame.c:2583 +#: builtin/blame.c:2588 msgid "Show original filename (Default: auto)" msgstr "Hiển thị tên tập tin gốc (Mặc định: auto)" -#: builtin/blame.c:2584 +#: builtin/blame.c:2589 msgid "Show original linenumber (Default: off)" msgstr "Hiển thị số dòng gốc (Mặc định: off)" -#: builtin/blame.c:2585 +#: builtin/blame.c:2590 msgid "Show in a format designed for machine consumption" msgstr "Hiển thị ở định dạng đã thiết kế cho sự tiêu dùng bằng máy" -#: builtin/blame.c:2586 +#: builtin/blame.c:2591 msgid "Show porcelain format with per-line commit information" msgstr "Hiển thị định dạng “porcelain” với thông tin chuyển giao mỗi dòng" -#: builtin/blame.c:2587 +#: builtin/blame.c:2592 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "Dùng cùng chế độ xuất ra với git-annotate (Mặc định: off)" -#: builtin/blame.c:2588 +#: builtin/blame.c:2593 msgid "Show raw timestamp (Default: off)" msgstr "Hiển thị dấu vết thời gian dạng thô (Mặc định: off)" -#: builtin/blame.c:2589 +#: builtin/blame.c:2594 msgid "Show long commit SHA1 (Default: off)" msgstr "Hiển thị SHA1 của lần chuyển giao dạng dài (Mặc định: off)" -#: builtin/blame.c:2590 +#: builtin/blame.c:2595 msgid "Suppress author name and timestamp (Default: off)" msgstr "Không hiển thị tên tác giả và dấu vết thời gian (Mặc định: off)" -#: builtin/blame.c:2591 +#: builtin/blame.c:2596 msgid "Show author email instead of name (Default: off)" msgstr "Hiển thị thư điện tử của tác giả thay vì tên (Mặc định: off)" -#: builtin/blame.c:2592 +#: builtin/blame.c:2597 msgid "Ignore whitespace differences" msgstr "Bỏ qua các khác biệt do khoảng trắng gây ra" -#: builtin/blame.c:2599 -msgid "Use an experimental indent-based heuristic to improve diffs" -msgstr "Dùng một phỏng đoán dựa trên thụt lề thử nghiệm để tăng cường các diff" - -#: builtin/blame.c:2600 -msgid "Use an experimental blank-line-based heuristic to improve diffs" -msgstr "" -"Dùng một phỏng đoán dựa trên dòng trắng thử nghiệm để tăng cường các diff" +#: builtin/blame.c:2604 +msgid "Use an experimental heuristic to improve diffs" +msgstr "Dùng một phỏng đoán thử nghiệm để tăng cường các diff" -#: builtin/blame.c:2602 +#: builtin/blame.c:2606 msgid "Spend extra cycles to find better match" msgstr "Tiêu thụ thêm năng tài nguyên máy móc để tìm kiếm tốt hơn nữa" -#: builtin/blame.c:2603 +#: builtin/blame.c:2607 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" "Sử dụng điểm xét duyệt (revision) từ <tập tin> thay vì gọi “git-rev-list”" -#: builtin/blame.c:2604 +#: builtin/blame.c:2608 msgid "Use <file>'s contents as the final image" msgstr "Sử dụng nội dung của <tập tin> như là ảnh cuối cùng" -#: builtin/blame.c:2605 builtin/blame.c:2606 +#: builtin/blame.c:2609 builtin/blame.c:2610 msgid "score" msgstr "điểm số" -#: builtin/blame.c:2605 +#: builtin/blame.c:2609 msgid "Find line copies within and across files" msgstr "Tìm các bản sao chép dòng trong và ngang qua tập tin" -#: builtin/blame.c:2606 +#: builtin/blame.c:2610 msgid "Find line movements within and across files" msgstr "Tìm các di chuyển dòng trong và ngang qua tập tin" -#: builtin/blame.c:2607 +#: builtin/blame.c:2611 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2607 +#: builtin/blame.c:2611 msgid "Process only line range n,m, counting from 1" msgstr "Xử lý chỉ dòng vùng n,m, tính từ 1" -#: builtin/blame.c:2654 +#: builtin/blame.c:2658 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "--progress không được dùng cùng với --incremental hay các định dạng porcelain" @@ -4709,41 +5019,41 @@ msgstr "" #. 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:2700 +#: builtin/blame.c:2706 msgid "4 years, 11 months ago" msgstr "4 năm, 11 tháng trước" -#: builtin/blame.c:2780 +#: builtin/blame.c:2786 msgid "--contents and --reverse do not blend well." msgstr "tùy chọn--contents và --reverse không được trộn vào nhau." -#: builtin/blame.c:2800 +#: builtin/blame.c:2806 msgid "cannot use --contents with final commit object name" msgstr "không thể dùng --contents với tên đối tượng chuyển giao cuối cùng" -#: builtin/blame.c:2805 +#: builtin/blame.c:2811 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" -#: builtin/blame.c:2832 +#: builtin/blame.c:2838 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "--reverse --first-parent cùng nhau yêu cầu vùng cùng với chuỗi cha-mẹ-đầu-" "tiên" -#: builtin/blame.c:2843 +#: builtin/blame.c:2849 #, c-format msgid "no such path %s in %s" msgstr "không có đường dẫn %s trong “%s”" -#: builtin/blame.c:2854 +#: builtin/blame.c:2860 #, c-format msgid "cannot read blob %s for path %s" msgstr "không thể đọc blob %s cho đường dẫn “%s”" -#: builtin/blame.c:2873 +#: builtin/blame.c:2879 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" @@ -4920,44 +5230,44 @@ msgstr "(HEAD được tách rời từ %s)" msgid "(no branch)" msgstr "(không nhánh)" -#: builtin/branch.c:544 +#: builtin/branch.c:535 #, 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:548 +#: builtin/branch.c:539 #, 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:563 +#: builtin/branch.c:554 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:573 +#: builtin/branch.c:564 #, c-format msgid "Invalid branch name: '%s'" msgstr "Tên nhánh không hợp lệ: “%s”" -#: builtin/branch.c:590 +#: builtin/branch.c:581 msgid "Branch rename failed" msgstr "Gặp lỗi khi đổi tên nhánh" -#: builtin/branch.c:594 +#: builtin/branch.c:585 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Đã đổi tên nhánh khuyết danh “%s” đi" -#: builtin/branch.c:597 +#: builtin/branch.c:588 #, 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:604 +#: builtin/branch.c:595 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:620 +#: builtin/branch.c:611 #, c-format msgid "" "Please edit the description for the branch\n" @@ -4968,163 +5278,167 @@ msgstr "" " %s\n" "Những dòng được bắt đầu bằng “%c” sẽ được cắt bỏ.\n" -#: builtin/branch.c:651 +#: builtin/branch.c:643 msgid "Generic options" msgstr "Tùy chọn chung" -#: builtin/branch.c:653 +#: builtin/branch.c:645 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:654 +#: builtin/branch.c:646 msgid "suppress informational messages" msgstr "không xuất các thông tin" -#: builtin/branch.c:655 +#: builtin/branch.c:647 msgid "set up tracking mode (see git-pull(1))" msgstr "cài đặt chế độ theo dõi (xem git-pull(1))" -#: builtin/branch.c:657 +#: builtin/branch.c:649 msgid "change upstream info" msgstr "thay đổi thông tin thượng nguồn" -#: builtin/branch.c:659 +#: builtin/branch.c:651 msgid "upstream" msgstr "thượng nguồn" -#: builtin/branch.c:659 +#: builtin/branch.c:651 msgid "change the upstream info" msgstr "thay đổi thông tin thượng nguồn" -#: builtin/branch.c:660 +#: builtin/branch.c:652 msgid "Unset the upstream info" msgstr "Bỏ đặt thông tin thượng nguồn" -#: builtin/branch.c:661 +#: builtin/branch.c:653 msgid "use colored output" msgstr "tô màu kết xuất" -#: builtin/branch.c:662 +#: builtin/branch.c:654 msgid "act on remote-tracking branches" msgstr "thao tác trên nhánh “remote-tracking”" -#: builtin/branch.c:664 builtin/branch.c:665 +#: builtin/branch.c:656 builtin/branch.c:657 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:668 +#: builtin/branch.c:660 msgid "Specific git-branch actions:" msgstr "Hành động git-branch:" -#: builtin/branch.c:669 +#: builtin/branch.c:661 msgid "list both remote-tracking and local branches" msgstr "liệt kê cả nhánh “remote-tracking” và nội bộ" -#: builtin/branch.c:671 +#: builtin/branch.c:663 msgid "delete fully merged branch" msgstr "xóa một toàn bộ nhánh đã hòa trộn" -#: builtin/branch.c:672 +#: builtin/branch.c:664 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:673 +#: builtin/branch.c:665 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:674 +#: builtin/branch.c:666 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:675 +#: builtin/branch.c:667 msgid "list branch names" msgstr "liệt kê các tên nhánh" -#: builtin/branch.c:676 +#: builtin/branch.c:668 msgid "create the branch's reflog" msgstr "tạo reflog của nhánh" -#: builtin/branch.c:678 +#: builtin/branch.c:670 msgid "edit the description for the branch" msgstr "sửa mô tả cho nhánh" -#: builtin/branch.c:679 +#: builtin/branch.c:671 msgid "force creation, move/rename, deletion" msgstr "buộc tạo, di chuyển/đổi tên, xóa" -#: builtin/branch.c:680 +#: builtin/branch.c:672 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:681 +#: builtin/branch.c:673 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:682 +#: builtin/branch.c:674 msgid "list branches in columns" msgstr "liệt kê các nhánh trong các cột" -#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366 +#: builtin/branch.c:675 builtin/for-each-ref.c:38 builtin/tag.c:381 msgid "key" msgstr "khóa" -#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367 +#: builtin/branch.c:676 builtin/for-each-ref.c:39 builtin/tag.c:382 msgid "field name to sort on" msgstr "tên trường cần sắp xếp" -#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:404 +#: builtin/branch.c:678 builtin/for-each-ref.c:41 builtin/notes.c:404 #: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570 -#: builtin/tag.c:369 +#: builtin/tag.c:384 msgid "object" msgstr "đối tượng" -#: builtin/branch.c:687 +#: builtin/branch.c:679 msgid "print only branches of the object" msgstr "chỉ hiển thị các nhánh của đối tượng" -#: builtin/branch.c:705 +#: builtin/branch.c:681 builtin/for-each-ref.c:46 builtin/tag.c:388 +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:698 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:709 builtin/clone.c:706 +#: builtin/branch.c:702 builtin/clone.c:706 msgid "HEAD not found below refs/heads!" msgstr "không tìm thấy HEAD ở dưới refs/heads!" -#: builtin/branch.c:729 +#: builtin/branch.c:724 msgid "--column and --verbose are incompatible" msgstr "tùy chọn --column và --verbose xung khắc nhau" -#: builtin/branch.c:740 builtin/branch.c:782 +#: builtin/branch.c:735 builtin/branch.c:787 msgid "branch name required" msgstr "cần chỉ ra tên nhánh" -#: builtin/branch.c:758 +#: builtin/branch.c:763 msgid "Cannot give description to detached HEAD" msgstr "Không thể đưa ra mô tả HEAD đã tách rời" -#: builtin/branch.c:763 +#: builtin/branch.c:768 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:770 +#: builtin/branch.c:775 #, 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:773 +#: builtin/branch.c:778 #, c-format msgid "No branch named '%s'." msgstr "Không có nhánh nào có tên “%s”." -#: builtin/branch.c:788 +#: builtin/branch.c:793 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:793 +#: builtin/branch.c:798 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:797 +#: builtin/branch.c:802 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -5132,40 +5446,40 @@ 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:800 builtin/branch.c:822 builtin/branch.c:843 +#: builtin/branch.c:805 builtin/branch.c:827 builtin/branch.c:848 #, c-format msgid "no such branch '%s'" msgstr "không có nhánh nào như thế “%s”" -#: builtin/branch.c:804 +#: builtin/branch.c:809 #, c-format msgid "branch '%s' does not exist" msgstr "chưa có nhánh “%s”" -#: builtin/branch.c:816 +#: builtin/branch.c:821 msgid "too many branches to unset upstream" msgstr "quá nhiều nhánh để bỏ đặt thượng nguồn" -#: builtin/branch.c:820 +#: builtin/branch.c:825 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:826 +#: builtin/branch.c:831 #, 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:840 +#: builtin/branch.c:845 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:846 +#: builtin/branch.c:851 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:849 +#: builtin/branch.c:854 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -5174,7 +5488,7 @@ 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:866 +#: builtin/branch.c:871 #, c-format msgid "" "\n" @@ -5242,7 +5556,7 @@ msgstr "với đối tượng blob, chạy lệnh textconv trên nội dung củ 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:561 git-submodule.sh:923 +#: builtin/cat-file.c:561 git-submodule.sh:929 msgid "blob" msgstr "blob" @@ -5299,7 +5613,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:18 builtin/checkout.c:1137 builtin/gc.c:325 +#: builtin/check-ignore.c:18 builtin/checkout.c:1140 builtin/gc.c:332 msgid "suppress progress reporting" msgstr "chặn các báo cáo tiến trình hoạt động" @@ -5390,9 +5704,9 @@ msgid "write the content to temporary files" msgstr "ghi nội dung vào tập tin tạm" #: builtin/checkout-index.c:174 builtin/column.c:30 -#: builtin/submodule--helper.c:595 builtin/submodule--helper.c:598 -#: builtin/submodule--helper.c:604 builtin/submodule--helper.c:951 -#: builtin/worktree.c:469 +#: builtin/submodule--helper.c:597 builtin/submodule--helper.c:600 +#: builtin/submodule--helper.c:606 builtin/submodule--helper.c:967 +#: builtin/worktree.c:471 msgid "string" msgstr "chuỗi" @@ -5468,50 +5782,50 @@ msgstr "đường dẫn “%s” không được hòa trộn" 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:624 +#: builtin/checkout.c:625 #, 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:663 +#: builtin/checkout.c:666 msgid "HEAD is now at" msgstr "HEAD hiện giờ tại" -#: builtin/checkout.c:667 builtin/clone.c:660 +#: builtin/checkout.c:670 builtin/clone.c:660 msgid "unable to update HEAD" msgstr "không thể cập nhật HEAD" -#: builtin/checkout.c:671 +#: builtin/checkout.c:674 #, c-format msgid "Reset branch '%s'\n" msgstr "Đặt lại nhánh “%s”\n" -#: builtin/checkout.c:674 +#: builtin/checkout.c:677 #, c-format msgid "Already on '%s'\n" msgstr "Đã sẵn sàng trên “%s”\n" -#: builtin/checkout.c:678 +#: builtin/checkout.c:681 #, 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:680 builtin/checkout.c:1069 +#: builtin/checkout.c:683 builtin/checkout.c:1072 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Đã chuyển đến nhánh mới “%s”\n" -#: builtin/checkout.c:682 +#: builtin/checkout.c:685 #, c-format msgid "Switched to branch '%s'\n" msgstr "Đã chuyển đến nhánh “%s”\n" -#: builtin/checkout.c:733 +#: builtin/checkout.c:736 #, c-format msgid " ... and %d more.\n" msgstr " … và nhiều hơn %d.\n" -#: builtin/checkout.c:739 +#: builtin/checkout.c:742 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -5530,7 +5844,7 @@ msgstr[0] "" "\n" "%s\n" -#: builtin/checkout.c:758 +#: builtin/checkout.c:761 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -5551,152 +5865,152 @@ msgstr[0] "" " git branch <tên_nhánh_mới> %s\n" "\n" -#: builtin/checkout.c:794 +#: builtin/checkout.c:797 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:798 +#: builtin/checkout.c:801 msgid "Previous HEAD position was" msgstr "Vị trí trước kia của HEAD là" -#: builtin/checkout.c:825 builtin/checkout.c:1064 +#: builtin/checkout.c:828 builtin/checkout.c:1067 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:970 +#: builtin/checkout.c:973 #, 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:1010 builtin/worktree.c:214 +#: builtin/checkout.c:1013 builtin/worktree.c:214 #, c-format msgid "invalid reference: %s" msgstr "tham chiếu không hợp lệ: %s" -#: builtin/checkout.c:1039 +#: builtin/checkout.c:1042 #, 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:1078 +#: builtin/checkout.c:1081 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:1081 builtin/checkout.c:1085 +#: builtin/checkout.c:1084 builtin/checkout.c:1088 #, 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:1089 builtin/checkout.c:1092 builtin/checkout.c:1097 -#: builtin/checkout.c:1100 +#: builtin/checkout.c:1092 builtin/checkout.c:1095 builtin/checkout.c:1100 +#: builtin/checkout.c:1103 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "“%s” không thể được dùng với “%s”" -#: builtin/checkout.c:1105 +#: builtin/checkout.c:1108 #, 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:1138 builtin/checkout.c:1140 builtin/clone.c:93 +#: builtin/checkout.c:1141 builtin/checkout.c:1143 builtin/clone.c:93 #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324 #: builtin/worktree.c:326 msgid "branch" msgstr "nhánh" -#: builtin/checkout.c:1139 +#: builtin/checkout.c:1142 msgid "create and checkout a new branch" msgstr "tạo và checkout một nhánh mới" -#: builtin/checkout.c:1141 +#: builtin/checkout.c:1144 msgid "create/reset and checkout a branch" msgstr "tạo/đặt_lại và checkout một nhánh" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1145 msgid "create reflog for new branch" msgstr "tạo reflog cho nhánh mới" -#: builtin/checkout.c:1143 builtin/worktree.c:328 +#: builtin/checkout.c:1146 builtin/worktree.c:328 msgid "detach HEAD at named commit" msgstr "rời bỏ HEAD tại lần chuyển giao theo tên" -#: builtin/checkout.c:1144 +#: builtin/checkout.c:1147 msgid "set upstream info for new branch" msgstr "đặt thông tin thượng nguồn cho nhánh mới" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1149 msgid "new-branch" msgstr "nhánh-mới" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1149 msgid "new unparented branch" msgstr "nhánh không cha mới" -#: builtin/checkout.c:1147 +#: builtin/checkout.c:1150 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:1149 +#: builtin/checkout.c:1152 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:1151 +#: builtin/checkout.c:1154 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:1152 +#: builtin/checkout.c:1155 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:1153 builtin/merge.c:231 +#: builtin/checkout.c:1156 builtin/merge.c:235 msgid "update ignored files (default)" msgstr "cập nhật các tập tin bị bỏ qua (mặc định)" -#: builtin/checkout.c:1154 builtin/log.c:1466 parse-options.h:251 +#: builtin/checkout.c:1157 builtin/log.c:1466 parse-options.h:251 msgid "style" msgstr "kiểu" -#: builtin/checkout.c:1155 +#: builtin/checkout.c:1158 msgid "conflict style (merge or diff3)" msgstr "xung đột kiểu (hòa trộn hoặc diff3)" -#: builtin/checkout.c:1158 +#: builtin/checkout.c:1161 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:1160 +#: builtin/checkout.c:1163 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:1162 +#: builtin/checkout.c:1165 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:1163 builtin/clone.c:63 builtin/fetch.c:119 -#: builtin/merge.c:228 builtin/pull.c:117 builtin/push.c:536 +#: builtin/checkout.c:1166 builtin/clone.c:63 builtin/fetch.c:119 +#: builtin/merge.c:232 builtin/pull.c:117 builtin/push.c:539 #: builtin/send-pack.c:168 msgid "force progress reporting" msgstr "ép buộc báo cáo tiến triển công việc" -#: builtin/checkout.c:1194 +#: builtin/checkout.c:1197 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:1211 +#: builtin/checkout.c:1214 msgid "--track needs a branch name" msgstr "--track cần tên một nhánh" -#: builtin/checkout.c:1216 +#: builtin/checkout.c:1219 msgid "Missing branch name; try -b" msgstr "Thiếu tên nhánh; hãy thử -b" -#: builtin/checkout.c:1252 +#: builtin/checkout.c:1255 msgid "invalid path specification" msgstr "đường dẫn đã cho không hợp lệ" -#: builtin/checkout.c:1259 +#: builtin/checkout.c:1262 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -5706,12 +6020,12 @@ msgstr "" "Bạn đã có ý định checkout “%s” cái mà không thể được phân giải như là lần " "chuyển giao?" -#: builtin/checkout.c:1264 +#: builtin/checkout.c:1267 #, 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:1268 +#: builtin/checkout.c:1271 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -5750,19 +6064,21 @@ 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:291 +#: builtin/clean.c:291 git-add--interactive.perl:623 +#, c-format msgid "" "Prompt help:\n" "1 - select a numbered item\n" "foo - select item based on unique prefix\n" -" - (empty) select nothing" +" - (empty) select nothing\n" msgstr "" "Trợ giúp về nhắc:\n" "1 - chọn một mục được đánh số\n" "foo - chọn mục trên cơ sở tiền tố duy nhất\n" -" - (để trống) không chọn gì cả" +" - (để trống) không chọn gì cả\n" -#: builtin/clean.c:295 +#: builtin/clean.c:295 git-add--interactive.perl:632 +#, c-format msgid "" "Prompt help:\n" "1 - select a single item\n" @@ -5771,21 +6087,22 @@ msgid "" "foo - select item based on unique prefix\n" "-... - unselect specified items\n" "* - choose all items\n" -" - (empty) finish selecting" +" - (empty) finish selecting\n" msgstr "" "Trợ giúp về nhắc:\n" "1 - chọn một mục đơn\n" "3-5 - chọn một vùng\n" "2-3,6-9 - chọn nhiều vùng\n" "foo - chọn mục dựa trên tiền tố duy nhất\n" -"-… - không chọn các mục đã chỉ ra\n" +"-… - không chọn các mục đã chỉ ra\n" "* - chọn tất\n" -" - (để trống) kết thúc việc chọn" +" - (để trống) kết thúc việc chọn\n" -#: builtin/clean.c:511 -#, c-format -msgid "Huh (%s)?" -msgstr "Hả (%s)?" +#: builtin/clean.c:511 git-add--interactive.perl:598 +#: git-add--interactive.perl:603 +#, c-format, perl-format +msgid "Huh (%s)?\n" +msgstr "Hả (%s)?\n" #: builtin/clean.c:653 #, c-format @@ -5807,9 +6124,10 @@ msgstr "Chọn mục muốn xóa" msgid "Remove %s [y/N]? " msgstr "Xóa bỏ “%s” [y/N]? " -#: builtin/clean.c:777 -msgid "Bye." -msgstr "Tạm biệt." +#: builtin/clean.c:777 git-add--interactive.perl:1669 +#, c-format +msgid "Bye.\n" +msgstr "Tạm biệt.\n" #: builtin/clean.c:785 msgid "" @@ -5829,11 +6147,11 @@ 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:812 +#: builtin/clean.c:812 git-add--interactive.perl:1745 msgid "*** Commands ***" msgstr "*** Lệnh ***" -#: builtin/clean.c:813 +#: builtin/clean.c:813 git-add--interactive.perl:1742 msgid "What now" msgstr "Giờ thì sao" @@ -5862,8 +6180,8 @@ msgstr "dọn bằng kiểu tương tác" msgid "remove whole directories" msgstr "gỡ bỏ toàn bộ thư mục" -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:725 -#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:182 +#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:1056 +#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:176 msgid "pattern" msgstr "mẫu" @@ -5943,8 +6261,8 @@ msgstr "thư-mục-mẫu" 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:86 builtin/clone.c:88 builtin/submodule--helper.c:602 -#: builtin/submodule--helper.c:954 +#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:604 +#: builtin/submodule--helper.c:970 msgid "reference repository" msgstr "kho tham chiếu" @@ -5968,8 +6286,7 @@ msgstr "lấy ra <nhánh> thay cho HEAD của máy chủ" 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:97 builtin/fetch.c:120 builtin/grep.c:668 -#: builtin/pull.c:202 +#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:999 builtin/pull.c:202 msgid "depth" msgstr "độ-sâu" @@ -5977,7 +6294,7 @@ msgstr "độ-sâu" 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:99 builtin/fetch.c:122 builtin/pack-objects.c:2848 +#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2836 #: parse-options.h:142 msgid "time" msgstr "thời-gian" @@ -5991,8 +6308,8 @@ msgid "revision" msgstr "điểm xét duyệt" #: builtin/clone.c:102 builtin/fetch.c:125 -msgid "deepen history of shallow clone by 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ừ" +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:104 msgid "clone only one branch, HEAD or --branch" @@ -6018,11 +6335,11 @@ msgstr "khóa=giá_trị" 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:111 builtin/fetch.c:140 builtin/push.c:547 +#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:550 msgid "use IPv4 addresses only" msgstr "chỉ dùng địa chỉ IPv4" -#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:549 +#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:552 msgid "use IPv6 addresses only" msgstr "chỉ dùng địa chỉ IPv6" @@ -6135,7 +6452,7 @@ msgstr "tùy chọn --bare và --separate-git-dir xung khắc nhau." msgid "repository '%s' does not exist" msgstr "kho chứa “%s” chưa tồn tại" -#: builtin/clone.c:905 builtin/fetch.c:1338 +#: builtin/clone.c:905 builtin/fetch.c:1335 #, 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" @@ -6150,8 +6467,9 @@ msgstr "đường dẫn đích “%s” đã có từ trước và không phải 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:940 builtin/clone.c:951 builtin/submodule--helper.c:657 -#: builtin/worktree.c:222 builtin/worktree.c:249 +#: builtin/clone.c:940 builtin/clone.c:951 builtin/difftool.c:252 +#: builtin/submodule--helper.c:659 builtin/worktree.c:222 +#: builtin/worktree.c:249 #, 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”" @@ -6438,7 +6756,7 @@ msgstr "" msgid "could not lookup commit %s" msgstr "không thể tìm kiếm commit (lần chuyển giao) %s" -#: builtin/commit.c:704 builtin/shortlog.c:286 +#: builtin/commit.c:704 builtin/shortlog.c:295 #, 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" @@ -6540,7 +6858,7 @@ msgstr "Không đọc được bảng mục lục" msgid "Error building trees" msgstr "Gặp lỗi khi xây dựng cây" -#: builtin/commit.c:969 builtin/tag.c:266 +#: builtin/commit.c:968 builtin/tag.c:280 #, 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" @@ -6552,7 +6870,7 @@ 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:1086 builtin/commit.c:1327 +#: builtin/commit.c:1086 builtin/commit.c:1325 #, 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”" @@ -6609,69 +6927,65 @@ 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:1212 -msgid "Clever... amending the last one with dirty index." -msgstr "Giỏi… “tu bổ” cái cuối với bảng mục lục bẩn." - -#: builtin/commit.c:1214 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" "Những đường dẫn rõ ràng được chỉ ra không có tùy chọn -i cũng không -o; coi " "là --only những đường dẫn" -#: builtin/commit.c:1226 builtin/tag.c:474 +#: builtin/commit.c:1224 builtin/tag.c:495 #, c-format msgid "Invalid cleanup mode %s" msgstr "Chế độ dọn dẹp không hợp lệ %s" -#: builtin/commit.c:1231 +#: builtin/commit.c:1229 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:1341 builtin/commit.c:1617 +#: builtin/commit.c:1339 builtin/commit.c:1612 msgid "show status concisely" msgstr "hiển thị trạng thái ở dạng súc tích" -#: builtin/commit.c:1343 builtin/commit.c:1619 +#: builtin/commit.c:1341 builtin/commit.c:1614 msgid "show branch information" msgstr "hiển thị thông tin nhánh" -#: builtin/commit.c:1345 +#: builtin/commit.c:1343 msgid "version" msgstr "phiên bản" -#: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522 -#: builtin/worktree.c:440 +#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525 +#: builtin/worktree.c:442 msgid "machine-readable output" msgstr "kết xuất dạng máy-có-thể-đọc" -#: builtin/commit.c:1348 builtin/commit.c:1623 +#: builtin/commit.c:1346 builtin/commit.c:1618 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:1351 builtin/commit.c:1626 +#: builtin/commit.c:1349 builtin/commit.c:1621 msgid "terminate entries with NUL" msgstr "chấm dứt các mục bằng NUL" -#: builtin/commit.c:1353 builtin/commit.c:1629 builtin/fast-export.c:981 -#: builtin/fast-export.c:984 builtin/tag.c:353 +#: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981 +#: builtin/fast-export.c:984 builtin/tag.c:368 msgid "mode" msgstr "chế độ" -#: builtin/commit.c:1354 builtin/commit.c:1629 +#: builtin/commit.c:1352 builtin/commit.c:1624 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:1357 +#: builtin/commit.c:1355 msgid "show ignored files" msgstr "hiển thị các tập tin ẩn" -#: builtin/commit.c:1358 parse-options.h:155 +#: builtin/commit.c:1356 parse-options.h:155 msgid "when" msgstr "khi" -#: builtin/commit.c:1359 +#: builtin/commit.c:1357 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -6679,205 +6993,205 @@ 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:1361 +#: builtin/commit.c:1359 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:1437 +#: builtin/commit.c:1435 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:1439 +#: builtin/commit.c:1437 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:1484 +#: builtin/commit.c:1482 msgid "detached HEAD" msgstr "đã rời khỏi HEAD" -#: builtin/commit.c:1487 +#: builtin/commit.c:1485 msgid " (root-commit)" msgstr " (root-commit)" -#: builtin/commit.c:1587 +#: builtin/commit.c:1582 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:1583 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:1585 msgid "Commit message options" msgstr "Các tùy chọn ghi chú commit" -#: builtin/commit.c:1591 builtin/tag.c:351 +#: builtin/commit.c:1586 builtin/tag.c:366 msgid "read message from file" msgstr "đọc chú thích từ tập tin" -#: builtin/commit.c:1592 +#: builtin/commit.c:1587 msgid "author" msgstr "tác giả" -#: builtin/commit.c:1592 +#: builtin/commit.c:1587 msgid "override author for commit" msgstr "ghi đè tác giả cho commit" -#: builtin/commit.c:1593 builtin/gc.c:326 +#: builtin/commit.c:1588 builtin/gc.c:333 msgid "date" msgstr "ngày tháng" -#: builtin/commit.c:1593 +#: builtin/commit.c:1588 msgid "override date for commit" msgstr "ghi đè ngày tháng cho lần chuyển giao" -#: builtin/commit.c:1594 builtin/merge.c:220 builtin/notes.c:398 -#: builtin/notes.c:561 builtin/tag.c:349 +#: builtin/commit.c:1589 builtin/merge.c:222 builtin/notes.c:398 +#: builtin/notes.c:561 builtin/tag.c:364 msgid "message" msgstr "chú thích" -#: builtin/commit.c:1594 +#: builtin/commit.c:1589 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:79 +#: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592 +#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:81 msgid "commit" msgstr "lần_chuyển_giao" -#: builtin/commit.c:1595 +#: builtin/commit.c:1590 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:1591 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:1592 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:1593 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:1594 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:1413 builtin/revert.c:86 +#: builtin/commit.c:1595 builtin/log.c:1413 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "(nên dùng) thêm dòng Signed-off-by:" -#: builtin/commit.c:1601 +#: builtin/commit.c:1596 msgid "use specified template file" msgstr "sử dụng tập tin mẫu đã cho" -#: builtin/commit.c:1602 +#: builtin/commit.c:1597 msgid "force edit of commit" msgstr "ép buộc sửa lần commit" -#: builtin/commit.c:1603 +#: builtin/commit.c:1598 msgid "default" msgstr "mặc định" -#: builtin/commit.c:1603 builtin/tag.c:354 +#: builtin/commit.c:1598 builtin/tag.c:369 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:1599 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:230 builtin/pull.c:166 +#: builtin/commit.c:1601 builtin/merge.c:234 builtin/pull.c:166 #: builtin/revert.c:93 msgid "GPG sign commit" msgstr "ký lần chuyển giao dùng GPG" -#: builtin/commit.c:1609 +#: builtin/commit.c:1604 msgid "Commit contents options" msgstr "Các tùy nội dung ghi chú commit" -#: builtin/commit.c:1610 +#: builtin/commit.c:1605 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:1606 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:1607 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:1608 msgid "interactively add changes" msgstr "thêm các thay đổi bằng tương tác" -#: builtin/commit.c:1614 +#: builtin/commit.c:1609 msgid "commit only specified files" msgstr "chỉ chuyển giao các tập tin đã chỉ ra" -#: builtin/commit.c:1615 +#: builtin/commit.c:1610 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:1611 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:1622 msgid "amend previous commit" msgstr "“tu bổ” (amend) lần commit trước" -#: builtin/commit.c:1628 +#: builtin/commit.c:1623 msgid "bypass post-rewrite hook" msgstr "vòng qua móc (hook) post-rewrite" -#: builtin/commit.c:1633 +#: builtin/commit.c:1628 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:1630 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:1664 +#: builtin/commit.c:1659 msgid "could not parse HEAD commit" msgstr "không thể phân tích commit (lần chuyển giao) HEAD" -#: builtin/commit.c:1712 +#: builtin/commit.c:1707 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Tập tin MERGE_HEAD sai hỏng (%s)" -#: builtin/commit.c:1719 +#: builtin/commit.c:1714 msgid "could not read MERGE_MODE" msgstr "không thể đọc MERGE_MODE" -#: builtin/commit.c:1738 +#: builtin/commit.c:1733 #, c-format msgid "could not read commit message: %s" -msgstr "không thể đọc phần chú thích (message) của llần chuyển giao: %s" +msgstr "không thể đọc phần chú thích (message) của lần chuyển giao: %s" -#: builtin/commit.c:1749 +#: builtin/commit.c:1744 #, 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:1754 +#: builtin/commit.c:1749 #, 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:1802 +#: builtin/commit.c:1797 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -7232,6 +7546,95 @@ msgstr "đã cho nhiều hơn hai đối tượng blob: “%s”" msgid "unhandled object '%s' given." msgstr "đã cho đối tượng không thể nắm giữ “%s”." +#: builtin/difftool.c:28 +msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" +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:241 +#, c-format +msgid "failed: %d" +msgstr "gặp lỗi: %d" + +#: builtin/difftool.c:342 +msgid "" +"combined diff formats('-c' and '--cc') are not supported in\n" +"directory diff mode('-d' and '--dir-diff')." +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:567 +#, c-format +msgid "both files modified: '%s' and '%s'." +msgstr "cả hai tập tin đã bị sửa: “%s” và “%s”." + +#: builtin/difftool.c:569 +msgid "working tree file has been left." +msgstr "cây làm việc ở bên trái." + +#: builtin/difftool.c:580 +#, c-format +msgid "temporary files exist in '%s'." +msgstr "các tập tin tạm đã sẵn có trong “%s”." + +#: builtin/difftool.c:581 +msgid "you may want to cleanup or recover these." +msgstr "bạn có lẽ muốn dọn dẹp hay " + +#: builtin/difftool.c:626 +msgid "use `diff.guitool` instead of `diff.tool`" +msgstr "dùng “diff.guitool“ thay vì dùng “diff.tool“" + +#: builtin/difftool.c:628 +msgid "perform a full-directory diff" +msgstr "thực hiện một diff toàn thư mục" + +#: builtin/difftool.c:630 +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:636 +msgid "use symlinks in dir-diff mode" +msgstr "dùng liên kết mềm trong diff-thư-mục" + +#: builtin/difftool.c:637 +msgid "<tool>" +msgstr "<công_cụ>" + +#: builtin/difftool.c:638 +msgid "use the specified diff tool" +msgstr "dùng công cụ diff đã cho" + +#: builtin/difftool.c:640 +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:643 +msgid "" +"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " +"code" +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:645 +msgid "<command>" +msgstr "<lệnh>" + +#: builtin/difftool.c:646 +msgid "specify a custom command for viewing diffs" +msgstr "chỉ định một lệnh tùy ý để xem diff" + +#: builtin/difftool.c:670 +msgid "no <tool> given for --tool=<tool>" +msgstr "chưa đưa ra <công_cụ> cho --tool=<công_cụ>" + +#: builtin/difftool.c:677 +msgid "no <cmd> given for --extcmd=<cmd>" +msgstr "chưa đưa ra <lệnh> cho --extcmd=<lệnh>" + #: builtin/fast-export.c:25 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-opts]" @@ -7390,77 +7793,77 @@ msgstr "refmap" msgid "specify fetch refmap" msgstr "chỉ ra refmap cần lấy về" -#: builtin/fetch.c:398 +#: builtin/fetch.c:395 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:514 +#: builtin/fetch.c:511 #, 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:607 +#: builtin/fetch.c:604 #, c-format msgid "object %s not found" msgstr "Không tìm thấy đối tượng %s" -#: builtin/fetch.c:611 +#: builtin/fetch.c:608 msgid "[up to date]" msgstr "[đã cập nhật]" -#: builtin/fetch.c:624 builtin/fetch.c:704 +#: builtin/fetch.c:621 builtin/fetch.c:701 msgid "[rejected]" msgstr "[Bị từ chối]" -#: builtin/fetch.c:625 +#: builtin/fetch.c:622 msgid "can't fetch in current branch" msgstr "không thể fetch (lấy) về nhánh hiện hành" -#: builtin/fetch.c:634 +#: builtin/fetch.c:631 msgid "[tag update]" msgstr "[cập nhật thẻ]" -#: builtin/fetch.c:635 builtin/fetch.c:668 builtin/fetch.c:684 -#: builtin/fetch.c:699 +#: builtin/fetch.c:632 builtin/fetch.c:665 builtin/fetch.c:681 +#: builtin/fetch.c:696 msgid "unable to update local ref" msgstr "không thể cập nhật tham chiếu nội bộ" -#: builtin/fetch.c:654 +#: builtin/fetch.c:651 msgid "[new tag]" msgstr "[thẻ mới]" -#: builtin/fetch.c:657 +#: builtin/fetch.c:654 msgid "[new branch]" msgstr "[nhánh mới]" -#: builtin/fetch.c:660 +#: builtin/fetch.c:657 msgid "[new ref]" msgstr "[ref (tham chiếu) mới]" -#: builtin/fetch.c:699 +#: builtin/fetch.c:696 msgid "forced update" msgstr "cưỡng bức cập nhật" -#: builtin/fetch.c:704 +#: builtin/fetch.c:701 msgid "non-fast-forward" msgstr "không-phải-chuyển-tiếp-nhanh" -#: builtin/fetch.c:749 +#: builtin/fetch.c:746 #, 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:769 +#: builtin/fetch.c:766 #, 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:856 builtin/fetch.c:952 +#: builtin/fetch.c:853 builtin/fetch.c:949 #, c-format msgid "From %.*s\n" msgstr "Từ %.*s\n" -#: builtin/fetch.c:867 +#: builtin/fetch.c:864 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -7469,57 +7872,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:922 +#: builtin/fetch.c:919 #, 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:923 +#: builtin/fetch.c:920 #, c-format msgid " (%s has become dangling)" msgstr " (%s đã trở thành không đầu (không được quản lý))" -#: builtin/fetch.c:955 +#: builtin/fetch.c:952 msgid "[deleted]" msgstr "[đã xóa]" -#: builtin/fetch.c:956 builtin/remote.c:1020 +#: builtin/fetch.c:953 builtin/remote.c:1020 msgid "(none)" msgstr "(không)" -#: builtin/fetch.c:979 +#: builtin/fetch.c:976 #, 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:998 +#: builtin/fetch.c:995 #, 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:1001 +#: builtin/fetch.c:998 #, 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:1077 +#: builtin/fetch.c:1074 #, 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:1237 +#: builtin/fetch.c:1234 #, c-format msgid "Fetching %s\n" msgstr "Đang lấy “%s” về\n" -#: builtin/fetch.c:1239 builtin/remote.c:96 +#: builtin/fetch.c:1236 builtin/remote.c:96 #, c-format msgid "Could not fetch %s" msgstr "không thể “%s” về" -#: builtin/fetch.c:1257 +#: builtin/fetch.c:1254 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -7527,40 +7930,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:1280 +#: builtin/fetch.c:1277 msgid "You need to specify a tag name." msgstr "Bạn phải định rõ tên thẻ." -#: builtin/fetch.c:1322 +#: builtin/fetch.c:1319 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:1324 +#: builtin/fetch.c:1321 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:1329 +#: builtin/fetch.c:1326 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:1331 +#: builtin/fetch.c:1328 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:1353 +#: builtin/fetch.c:1350 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:1355 +#: builtin/fetch.c:1352 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:1366 +#: builtin/fetch.c:1363 #, 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:1374 +#: builtin/fetch.c:1371 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ý" @@ -7627,7 +8030,7 @@ 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:37 builtin/tag.c:372 +#: builtin/for-each-ref.c:37 builtin/tag.c:387 builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "định dạng sẽ dùng cho đầu ra" @@ -7647,63 +8050,63 @@ msgstr "chỉ hiển thị những tham chiếu mà nó không được hòa tr 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/fsck.c:519 +#: builtin/fsck.c:554 msgid "Checking object directories" msgstr "Đang kiểm tra các thư mục đối tượng" -#: builtin/fsck.c:588 +#: builtin/fsck.c:646 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<các-tùy-chọn>] [<đối-tượng>…]" -#: builtin/fsck.c:594 +#: builtin/fsck.c:652 msgid "show unreachable objects" msgstr "hiển thị các đối tượng không thể đọc được" -#: builtin/fsck.c:595 +#: builtin/fsck.c:653 msgid "show dangling objects" msgstr "hiển thị các đối tượng không được quản lý" -#: builtin/fsck.c:596 +#: builtin/fsck.c:654 msgid "report tags" msgstr "báo cáo các thẻ" -#: builtin/fsck.c:597 +#: builtin/fsck.c:655 msgid "report root nodes" msgstr "báo cáo node gốc" -#: builtin/fsck.c:598 +#: builtin/fsck.c:656 msgid "make index objects head nodes" msgstr "tạo “index objects head nodes”" -#: builtin/fsck.c:599 +#: builtin/fsck.c:657 msgid "make reflogs head nodes (default)" msgstr "tạo “reflogs head nodes” (mặc định)" -#: builtin/fsck.c:600 +#: builtin/fsck.c:658 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:601 +#: builtin/fsck.c:659 msgid "check only connectivity" msgstr "chỉ kiểm tra kết nối" -#: builtin/fsck.c:602 +#: builtin/fsck.c:660 msgid "enable more strict checking" msgstr "cho phép kiểm tra hạn chế hơn" -#: builtin/fsck.c:604 +#: builtin/fsck.c:662 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:605 builtin/prune.c:107 +#: builtin/fsck.c:663 builtin/prune.c:107 msgid "show progress" msgstr "hiển thị quá trình" -#: builtin/fsck.c:606 +#: builtin/fsck.c:664 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:665 +#: builtin/fsck.c:725 msgid "Checking objects" msgstr "Đang kiểm tra các đối tượng" @@ -7721,7 +8124,7 @@ msgstr "%s không hợp lệ: “%s”" msgid "insanely long object directory %.*s" msgstr "thư mục đối tượng dài một cách điên rồ %.*s" -#: builtin/gc.c:290 +#: builtin/gc.c:297 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -7736,40 +8139,40 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:327 +#: builtin/gc.c:334 msgid "prune unreferenced objects" msgstr "xóa bỏ các đối tượng không được tham chiếu" -#: builtin/gc.c:329 +#: builtin/gc.c:336 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:330 +#: builtin/gc.c:337 msgid "enable auto-gc mode" msgstr "bật chế độ auto-gc" -#: builtin/gc.c:331 +#: builtin/gc.c:338 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:373 +#: builtin/gc.c:380 #, 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:375 +#: builtin/gc.c:382 #, 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:376 +#: builtin/gc.c:383 #, 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:397 +#: builtin/gc.c:404 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -7777,243 +8180,259 @@ 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:441 +#: builtin/gc.c:448 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" "Có quá nhiều đối tượng tự do không được dùng đến; hãy chạy lệnh “git prune” " "để xóa bỏ chúng đi." -#: builtin/grep.c:23 +#: builtin/grep.c:25 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:219 +#: builtin/grep.c:232 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep: gặp lỗi tạo tuyến (thread): %s" -#: builtin/grep.c:277 +#: builtin/grep.c:290 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "số tuyến đã cho không hợp lệ (%d) cho %s" -#: builtin/grep.c:453 builtin/grep.c:488 +#: builtin/grep.c:763 builtin/grep.c:804 #, c-format msgid "unable to read tree (%s)" msgstr "không thể đọc cây (%s)" -#: builtin/grep.c:503 +#: builtin/grep.c:823 #, 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:561 +#: builtin/grep.c:887 #, 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:647 +#: builtin/grep.c:973 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:649 +#: builtin/grep.c:975 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:651 +#: builtin/grep.c:977 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:653 +#: builtin/grep.c:979 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:656 +#: builtin/grep.c:981 +msgid "recursivley search in each submodule" +msgstr "tìm kiếm đệ quy trong từng mô-đun-con" + +#: builtin/grep.c:983 +msgid "basename" +msgstr "tên cơ sở" + +#: builtin/grep.c:984 +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:987 msgid "show non-matching lines" msgstr "hiển thị những dòng không khớp với mẫu" -#: builtin/grep.c:658 +#: builtin/grep.c:989 msgid "case insensitive matching" msgstr "phân biệt HOA/thường" -#: builtin/grep.c:660 +#: builtin/grep.c:991 msgid "match patterns only at word boundaries" msgstr "chỉ khớp mẫu tại đường ranh giới từ" -#: builtin/grep.c:662 +#: builtin/grep.c:993 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:664 +#: builtin/grep.c:995 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:667 +#: builtin/grep.c:998 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:669 +#: builtin/grep.c:1000 msgid "descend at most <depth> levels" msgstr "hạ xuống ít nhất là mức <sâu>" -#: builtin/grep.c:673 +#: builtin/grep.c:1004 msgid "use extended POSIX regular expressions" msgstr "dùng biểu thức chính qui POSIX có mở rộng" -#: builtin/grep.c:676 +#: builtin/grep.c:1007 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:679 +#: builtin/grep.c:1010 msgid "interpret patterns as fixed strings" msgstr "diễn dịch các mẫu như là chuỗi cố định" -#: builtin/grep.c:682 +#: builtin/grep.c:1013 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:685 +#: builtin/grep.c:1016 msgid "show line numbers" msgstr "hiển thị số của dòng" -#: builtin/grep.c:686 +#: builtin/grep.c:1017 msgid "don't show filenames" msgstr "không hiển thị tên tập tin" -#: builtin/grep.c:687 +#: builtin/grep.c:1018 msgid "show filenames" msgstr "hiển thị các tên tập tin" -#: builtin/grep.c:689 +#: builtin/grep.c:1020 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:691 +#: builtin/grep.c:1022 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:693 +#: builtin/grep.c:1024 msgid "synonym for --files-with-matches" msgstr "đồng nghĩa với --files-with-matches" -#: builtin/grep.c:696 +#: builtin/grep.c:1027 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:698 +#: builtin/grep.c:1029 msgid "print NUL after filenames" msgstr "thêm NUL vào sau tên tập tin" -#: builtin/grep.c:700 +#: builtin/grep.c:1031 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:701 +#: builtin/grep.c:1032 msgid "highlight matches" msgstr "tô sáng phần khớp mẫu" -#: builtin/grep.c:703 +#: builtin/grep.c:1034 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:705 +#: builtin/grep.c:1036 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:708 +#: builtin/grep.c:1039 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:711 +#: builtin/grep.c:1042 msgid "show <n> context lines before matches" msgstr "hiển thị <n> dòng nội dung trước khớp" -#: builtin/grep.c:713 +#: builtin/grep.c:1044 msgid "show <n> context lines after matches" msgstr "hiển thị <n> dòng nội dung sau khớp" -#: builtin/grep.c:715 +#: builtin/grep.c:1046 msgid "use <n> worker threads" msgstr "dùng <n> tuyến trình làm việc" -#: builtin/grep.c:716 +#: builtin/grep.c:1047 msgid "shortcut for -C NUM" msgstr "dạng viết tắt của -C SỐ" -#: builtin/grep.c:719 +#: builtin/grep.c:1050 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:721 +#: builtin/grep.c:1052 msgid "show the surrounding function" msgstr "hiển thị hàm bao quanh" -#: builtin/grep.c:724 +#: builtin/grep.c:1055 msgid "read patterns from file" msgstr "đọc mẫu từ tập-tin" -#: builtin/grep.c:726 +#: builtin/grep.c:1057 msgid "match <pattern>" msgstr "match <mẫu>" -#: builtin/grep.c:728 +#: builtin/grep.c:1059 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:740 +#: builtin/grep.c:1071 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:742 +#: builtin/grep.c:1073 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:744 +#: builtin/grep.c:1075 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:748 +#: builtin/grep.c:1079 msgid "pager" msgstr "dàn trang" -#: builtin/grep.c:748 +#: builtin/grep.c:1079 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:751 +#: builtin/grep.c:1082 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:814 +#: builtin/grep.c:1146 msgid "no pattern given." msgstr "chưa chỉ ra mẫu." -#: builtin/grep.c:846 builtin/index-pack.c:1480 +#: builtin/grep.c:1178 builtin/index-pack.c:1482 #, c-format msgid "invalid number of threads specified (%d)" msgstr "số tuyến chỉ ra không hợp lệ (%d)" -#: builtin/grep.c:876 +#: builtin/grep.c:1215 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:902 +#: builtin/grep.c:1238 +msgid "option not supported with --recurse-submodules." +msgstr "tùy chọn không được hỗ trợ với --recurse-submodules." + +#: builtin/grep.c:1244 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:907 +#: builtin/grep.c:1249 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 các tùy chọn liên " "quan đến revs." -#: builtin/grep.c:910 +#: builtin/grep.c:1252 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:918 +#: builtin/grep.c:1260 msgid "both --cached and trees are given." msgstr "cả hai --cached và các cây phải được chỉ ra." @@ -8289,179 +8708,183 @@ 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:811 builtin/index-pack.c:820 +#: builtin/index-pack.c:813 builtin/index-pack.c:822 #, 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:166 -#: builtin/pack-objects.c:258 +#: builtin/index-pack.c:751 builtin/pack-objects.c:164 +#: builtin/pack-objects.c:256 #, c-format msgid "unable to read %s" msgstr "không thể đọc %s" -#: builtin/index-pack.c:817 +#: builtin/index-pack.c:819 #, 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:831 +#: builtin/index-pack.c:833 #, c-format msgid "invalid blob object %s" msgstr "đối tượng blob không hợp lệ %s" -#: builtin/index-pack.c:845 +#: builtin/index-pack.c:847 #, c-format msgid "invalid %s" msgstr "%s không hợp lệ" -#: builtin/index-pack.c:848 +#: builtin/index-pack.c:850 msgid "Error in object" msgstr "Lỗi trong đối tượng" -#: builtin/index-pack.c:850 +#: builtin/index-pack.c:852 #, 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:922 builtin/index-pack.c:953 +#: builtin/index-pack.c:924 builtin/index-pack.c:955 msgid "failed to apply delta" msgstr "gặp lỗi khi áp dụng delta" -#: builtin/index-pack.c:1123 +#: builtin/index-pack.c:1125 msgid "Receiving objects" msgstr "Đang nhận về các đối tượng" -#: builtin/index-pack.c:1123 +#: builtin/index-pack.c:1125 msgid "Indexing objects" msgstr "Các đối tượng bảng mục lục" -#: builtin/index-pack.c:1155 +#: builtin/index-pack.c:1157 msgid "pack is corrupted (SHA1 mismatch)" msgstr "gói bị sai hỏng (SHA1 không khớp)" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1162 msgid "cannot fstat packfile" msgstr "không thể lấy thông tin thống kê packfile" -#: builtin/index-pack.c:1163 +#: builtin/index-pack.c:1165 msgid "pack has junk at the end" msgstr "pack có phần thừa ở cuối" -#: builtin/index-pack.c:1174 +#: builtin/index-pack.c:1176 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:1197 +#: builtin/index-pack.c:1199 msgid "Resolving deltas" msgstr "Đang phân giải các delta" -#: builtin/index-pack.c:1208 +#: builtin/index-pack.c:1210 #, c-format msgid "unable to create thread: %s" msgstr "không thể tạo tuyến: %s" -#: builtin/index-pack.c:1250 +#: builtin/index-pack.c:1252 msgid "confusion beyond insanity" msgstr "lộn xộn hơn cả điên rồ" -#: builtin/index-pack.c:1256 +#: builtin/index-pack.c:1258 #, 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:1268 +#: builtin/index-pack.c:1270 #, 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:1272 +#: builtin/index-pack.c:1274 #, 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:1296 +#: builtin/index-pack.c:1298 #, 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:1372 +#: builtin/index-pack.c:1374 #, c-format msgid "local object %s is corrupt" msgstr "đối tượng nội bộ %s bị hỏng" -#: builtin/index-pack.c:1396 +#: builtin/index-pack.c:1398 msgid "error while closing pack file" msgstr "gặp lỗi trong khi đóng tập tin gói" -#: builtin/index-pack.c:1409 +#: builtin/index-pack.c:1411 #, c-format msgid "cannot write keep file '%s'" msgstr "không thể ghi tập tin giữ lại “%s”" -#: builtin/index-pack.c:1417 +#: builtin/index-pack.c:1419 #, 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:1430 +#: builtin/index-pack.c:1432 msgid "cannot store pack file" msgstr "không thể lưu tập tin gói" -#: builtin/index-pack.c:1441 +#: builtin/index-pack.c:1443 msgid "cannot store index file" msgstr "không thể lưu trữ tập tin ghi mục lục" -#: builtin/index-pack.c:1474 +#: builtin/index-pack.c:1476 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "sai pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1484 builtin/index-pack.c:1681 +#: builtin/index-pack.c:1486 builtin/index-pack.c:1683 #, c-format msgid "no threads support, ignoring %s" msgstr "không hỗ trợ đa tuyến, bỏ qua %s" -#: builtin/index-pack.c:1542 +#: builtin/index-pack.c:1544 #, 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:1544 +#: builtin/index-pack.c:1546 #, 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:1591 +#: builtin/index-pack.c:1593 #, 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:1598 +#: builtin/index-pack.c:1600 #, 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:1611 +#: builtin/index-pack.c:1613 #, 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:1693 builtin/index-pack.c:1696 -#: builtin/index-pack.c:1712 builtin/index-pack.c:1716 +#: builtin/index-pack.c:1695 builtin/index-pack.c:1698 +#: builtin/index-pack.c:1714 builtin/index-pack.c:1718 #, c-format msgid "bad %s" msgstr "%s sai" -#: builtin/index-pack.c:1732 +#: builtin/index-pack.c:1734 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:1740 +#: builtin/index-pack.c:1736 +msgid "--stdin requires a git repository" +msgstr "--stdin cần một kho git" + +#: builtin/index-pack.c:1744 msgid "--verify with no packfile name given" msgstr "dùng tùy chọn --verify mà không đưa ra tên packfile" @@ -8709,7 +9132,7 @@ msgstr "Hai thư mục kết xuất?" msgid "Unknown commit %s" msgstr "Không hiểu lần chuyển giao %s" -#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:455 +#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:476 #, 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ệ." @@ -9097,35 +9520,35 @@ msgstr "hiển thị tham chiếu nằm dưới để thêm vào đối tượng msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "git ls-tree [<các-tùy-chọn>] <tree-ish> [<đường-dẫn>…]" -#: builtin/ls-tree.c:128 +#: builtin/ls-tree.c:126 msgid "only show trees" msgstr "chỉ hiển thị các tree" -#: builtin/ls-tree.c:130 +#: builtin/ls-tree.c:128 msgid "recurse into subtrees" msgstr "đệ quy vào các thư mục con" -#: builtin/ls-tree.c:132 +#: builtin/ls-tree.c:130 msgid "show trees when recursing" msgstr "hiển thị cây khi đệ quy" -#: builtin/ls-tree.c:135 +#: builtin/ls-tree.c:133 msgid "terminate entries with NUL byte" msgstr "chấm dứt mục tin với byte NUL" -#: builtin/ls-tree.c:136 +#: builtin/ls-tree.c:134 msgid "include object size" msgstr "gồm cả kích thước đối tượng" -#: builtin/ls-tree.c:138 builtin/ls-tree.c:140 +#: builtin/ls-tree.c:136 builtin/ls-tree.c:138 msgid "list only filenames" msgstr "chỉ liệt kê tên tập tin" -#: builtin/ls-tree.c:143 +#: builtin/ls-tree.c:141 msgid "use full path names" msgstr "dùng tên đường dẫn đầy đủ" -#: builtin/ls-tree.c:145 +#: builtin/ls-tree.c:143 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "liệt kê cây mục tin; không chỉ thư mục hiện hành (ngụ ý --full-name)" @@ -9141,164 +9564,172 @@ msgstr "git merge [<các-tùy-chọn>] <tin-nhắn> HEAD <commit>" msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:102 +#: builtin/merge.c:49 +msgid "git merge --continue" +msgstr "git merge --continue" + +#: builtin/merge.c:104 msgid "switch `m' requires a value" msgstr "switch “m” yêu cầu một giá trị" -#: builtin/merge.c:139 +#: builtin/merge.c:141 #, 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:140 +#: builtin/merge.c:142 #, c-format msgid "Available strategies are:" msgstr "Các chiến lược sẵn sàng là:" -#: builtin/merge.c:145 +#: builtin/merge.c:147 #, 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:195 builtin/pull.c:127 +#: builtin/merge.c:197 builtin/pull.c:127 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:198 builtin/pull.c:130 +#: builtin/merge.c:200 builtin/pull.c:130 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:199 builtin/pull.c:133 +#: builtin/merge.c:201 builtin/pull.c:133 msgid "(synonym to --stat)" msgstr "(đồng nghĩa với --stat)" -#: builtin/merge.c:201 builtin/pull.c:136 +#: builtin/merge.c:203 builtin/pull.c:136 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:204 builtin/pull.c:139 +#: builtin/merge.c:206 builtin/pull.c:139 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:206 builtin/pull.c:142 +#: builtin/merge.c:208 builtin/pull.c:142 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:208 builtin/pull.c:145 +#: builtin/merge.c:210 builtin/pull.c:145 msgid "edit message before committing" msgstr "sửa chú thích trước khi chuyển giao" -#: builtin/merge.c:209 +#: builtin/merge.c:211 msgid "allow fast-forward (default)" msgstr "cho phép chuyển-tiếp-nhanh (mặc định)" -#: builtin/merge.c:211 builtin/pull.c:151 +#: builtin/merge.c:213 builtin/pull.c:151 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:215 builtin/pull.c:154 +#: builtin/merge.c:217 builtin/pull.c:154 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:216 builtin/notes.c:774 builtin/pull.c:158 +#: builtin/merge.c:218 builtin/notes.c:774 builtin/pull.c:158 #: builtin/revert.c:89 msgid "strategy" msgstr "chiến lược" -#: builtin/merge.c:217 builtin/pull.c:159 +#: builtin/merge.c:219 builtin/pull.c:159 msgid "merge strategy to use" msgstr "chiến lược hòa trộn sẽ dùng" -#: builtin/merge.c:218 builtin/pull.c:162 +#: builtin/merge.c:220 builtin/pull.c:162 msgid "option=value" msgstr "tùy_chọn=giá_trị" -#: builtin/merge.c:219 builtin/pull.c:163 +#: builtin/merge.c:221 builtin/pull.c:163 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:221 +#: builtin/merge.c:223 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:225 +#: builtin/merge.c:227 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:227 builtin/pull.c:170 +#: builtin/merge.c:229 +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:170 msgid "allow merging unrelated histories" msgstr "cho phép hòa trộn lịch sử không liên quan" -#: builtin/merge.c:255 +#: builtin/merge.c:259 msgid "could not run stash." msgstr "không thể chạy stash." -#: builtin/merge.c:260 +#: builtin/merge.c:264 msgid "stash failed" msgstr "lệnh tạm cất gặp lỗi" -#: builtin/merge.c:265 +#: builtin/merge.c:269 #, 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:284 builtin/merge.c:301 +#: builtin/merge.c:288 builtin/merge.c:305 msgid "read-tree failed" msgstr "read-tree gặp lỗi" -#: builtin/merge.c:331 +#: builtin/merge.c:335 msgid " (nothing to squash)" msgstr " (không có gì để squash)" -#: builtin/merge.c:342 +#: builtin/merge.c:346 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Squash commit -- không cập nhật HEAD\n" -#: builtin/merge.c:392 +#: builtin/merge.c:396 #, 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:443 +#: builtin/merge.c:447 #, 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:533 +#: builtin/merge.c:537 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Chuỗi branch.%s.mergeoptions sai: %s" -#: builtin/merge.c:652 +#: builtin/merge.c:656 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:666 +#: builtin/merge.c:670 #, 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:681 +#: builtin/merge.c:685 #, c-format msgid "unable to write %s" msgstr "không thể ghi %s" -#: builtin/merge.c:733 +#: builtin/merge.c:737 #, c-format msgid "Could not read from '%s'" msgstr "Không thể đọc từ “%s”" -#: builtin/merge.c:742 +#: builtin/merge.c:746 #, 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:748 +#: builtin/merge.c:752 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -9316,69 +9747,81 @@ msgstr "" "rỗng\n" "sẽ hủy bỏ lần chuyển giao.\n" -#: builtin/merge.c:772 +#: builtin/merge.c:776 msgid "Empty commit message." msgstr "Chú thích của lần commit (chuyển giao) bị trống rỗng." -#: builtin/merge.c:792 +#: builtin/merge.c:796 #, c-format msgid "Wonderful.\n" msgstr "Tuyệt vời.\n" -#: builtin/merge.c:847 +#: builtin/merge.c:851 #, 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:863 +#: builtin/merge.c:867 #, c-format msgid "'%s' is not a commit" msgstr "%s không phải là một lần commit (chuyển giao)" -#: builtin/merge.c:904 +#: builtin/merge.c:908 msgid "No current branch." msgstr "không phải nhánh hiện hành" -#: builtin/merge.c:906 +#: builtin/merge.c:910 msgid "No remote for the current branch." msgstr "Không có máy chủ cho nhánh hiện hành." -#: builtin/merge.c:908 +#: builtin/merge.c:912 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:913 +#: builtin/merge.c:917 #, 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:960 +#: builtin/merge.c:964 #, 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:1034 +#: builtin/merge.c:1038 #, c-format msgid "could not close '%s'" msgstr "không thể đóng “%s”" -#: builtin/merge.c:1061 +#: builtin/merge.c:1065 #, c-format msgid "not something we can merge in %s: %s" msgstr "không phải là một số thứ chúng tôi có thể hòa trộn trong %s: %s" -#: builtin/merge.c:1095 +#: builtin/merge.c:1099 msgid "not something we can merge" msgstr "không phải là một số thứ chúng tôi có thể hòa trộn" -#: builtin/merge.c:1162 +#: builtin/merge.c:1167 +msgid "--abort expects no arguments" +msgstr "--abort không nhận các đối số" + +#: builtin/merge.c:1171 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:1178 +#: builtin/merge.c:1183 +msgid "--continue expects no arguments" +msgstr "--continue không nhận đối số" + +#: builtin/merge.c:1187 +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:1203 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -9386,7 +9829,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:1185 +#: builtin/merge.c:1210 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -9394,115 +9837,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:1188 +#: builtin/merge.c:1213 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:1197 +#: builtin/merge.c:1222 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:1205 +#: builtin/merge.c:1230 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:1222 +#: builtin/merge.c:1247 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:1224 +#: builtin/merge.c:1249 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:1229 +#: builtin/merge.c:1254 #, c-format msgid "%s - not something we can merge" msgstr "%s - không phải là một số thứ chúng tôi có thể hòa trộn" -#: builtin/merge.c:1231 +#: builtin/merge.c:1256 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:1287 +#: builtin/merge.c:1312 #, 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:1290 +#: builtin/merge.c:1315 #, 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:1293 +#: builtin/merge.c:1318 #, 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:1296 +#: builtin/merge.c:1321 #, 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:1358 +#: builtin/merge.c:1383 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:1367 +#: builtin/merge.c:1392 msgid "Already up-to-date." msgstr "Đã cập nhật rồi." -#: builtin/merge.c:1377 +#: builtin/merge.c:1402 #, c-format msgid "Updating %s..%s\n" msgstr "Đang cập nhật %s..%s\n" -#: builtin/merge.c:1418 +#: builtin/merge.c:1443 #, 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:1425 +#: builtin/merge.c:1450 #, c-format msgid "Nope.\n" msgstr "Không.\n" -#: builtin/merge.c:1450 +#: builtin/merge.c:1475 msgid "Already up-to-date. Yeeah!" msgstr "Đã cập nhật rồi. Yeeah!" -#: builtin/merge.c:1456 +#: builtin/merge.c:1481 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:1479 builtin/merge.c:1558 +#: builtin/merge.c:1504 builtin/merge.c:1583 #, 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:1483 +#: builtin/merge.c:1508 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Đang thử chiến lược hòa trộn %s…\n" -#: builtin/merge.c:1549 +#: builtin/merge.c:1574 #, 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:1551 +#: builtin/merge.c:1576 #, 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:1560 +#: builtin/merge.c:1585 #, 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:1572 +#: builtin/merge.c:1597 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -9635,95 +10078,95 @@ msgstr "cho phép thiếu đối tượng" msgid "allow creation of more than one tree" msgstr "cho phép tạo nhiều hơn một cây" -#: builtin/mv.c:15 +#: builtin/mv.c:16 msgid "git mv [<options>] <source>... <destination>" msgstr "git mv [<các-tùy-chọn>] <nguồn>… <đích>" -#: builtin/mv.c:70 +#: builtin/mv.c:82 #, c-format 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:72 builtin/rm.c:317 +#: builtin/mv.c:84 builtin/rm.c:290 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ý" -#: builtin/mv.c:90 +#: builtin/mv.c:102 #, c-format msgid "%.*s is in index" msgstr "%.*s trong bảng mục lục" -#: builtin/mv.c:112 +#: builtin/mv.c:124 msgid "force move/rename even if target exists" msgstr "ép buộc di chuyển hay đổi tên thậm chí cả khi đích đã tồn tại" -#: builtin/mv.c:113 +#: builtin/mv.c:125 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:155 +#: 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:166 +#: 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:170 +#: builtin/mv.c:182 msgid "bad source" msgstr "nguồn sai" -#: builtin/mv.c:173 +#: 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:176 +#: 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:185 +#: builtin/mv.c:197 msgid "source directory is empty" msgstr "thư mục nguồn là trống rỗng" -#: builtin/mv.c:210 +#: 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:213 +#: builtin/mv.c:225 msgid "destination exists" msgstr "đích đã tồn tại sẵn rồi" -#: builtin/mv.c:221 +#: builtin/mv.c:233 #, c-format msgid "overwriting '%s'" msgstr "đang ghi đè lên “%s”" -#: builtin/mv.c:224 +#: builtin/mv.c:236 msgid "Cannot overwrite" msgstr "Không thể ghi đè" -#: builtin/mv.c:227 +#: 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:229 +#: builtin/mv.c:241 msgid "destination directory does not exist" msgstr "thư mục đích không tồn tại" -#: builtin/mv.c:236 +#: builtin/mv.c:248 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, nguồn=%s, đích=%s" -#: builtin/mv.c:257 +#: builtin/mv.c:269 #, c-format msgid "Renaming %s to %s\n" msgstr "Đổi tên %s thành %s\n" -#: builtin/mv.c:263 builtin/remote.c:710 builtin/repack.c:375 +#: builtin/mv.c:275 builtin/remote.c:710 builtin/repack.c:384 #, c-format msgid "renaming '%s' failed" msgstr "gặp lỗi khi đổi tên “%s”" @@ -9911,12 +10354,12 @@ 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:233 builtin/tag.c:439 +#: builtin/notes.c:233 builtin/tag.c:460 #, c-format msgid "cannot read '%s'" msgstr "không thể đọc “%s”" -#: builtin/notes.c:235 builtin/tag.c:442 +#: builtin/notes.c:235 builtin/tag.c:463 #, c-format msgid "could not open or read '%s'" msgstr "không thể mở hay đọc “%s”" @@ -10197,175 +10640,175 @@ 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:179 builtin/pack-objects.c:182 +#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 #, c-format msgid "deflate error (%d)" msgstr "lỗi giải nén (%d)" -#: builtin/pack-objects.c:768 +#: builtin/pack-objects.c:766 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:781 +#: builtin/pack-objects.c:779 msgid "Writing objects" msgstr "Đang ghi lại các đối tượng" -#: builtin/pack-objects.c:1070 +#: builtin/pack-objects.c:1068 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:2346 +#: builtin/pack-objects.c:2344 msgid "Compressing objects" msgstr "Đang nén các đối tượng" -#: builtin/pack-objects.c:2759 +#: builtin/pack-objects.c:2747 #, 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:2763 +#: builtin/pack-objects.c:2751 #, c-format msgid "bad index version '%s'" msgstr "phiên bản mục lục sai “%s”" -#: builtin/pack-objects.c:2793 +#: builtin/pack-objects.c:2781 msgid "do not show progress meter" msgstr "không hiển thị bộ đo tiến trình" -#: builtin/pack-objects.c:2795 +#: builtin/pack-objects.c:2783 msgid "show progress meter" msgstr "hiển thị bộ đo tiến trình" -#: builtin/pack-objects.c:2797 +#: builtin/pack-objects.c:2785 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:2800 +#: builtin/pack-objects.c:2788 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:2801 +#: builtin/pack-objects.c:2789 msgid "version[,offset]" msgstr "phiên bản[,offset]" -#: builtin/pack-objects.c:2802 +#: builtin/pack-objects.c:2790 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:2805 +#: builtin/pack-objects.c:2793 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:2807 +#: builtin/pack-objects.c:2795 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:2809 +#: builtin/pack-objects.c:2797 msgid "ignore packed objects" msgstr "bỏ qua các đối tượng đóng gói" -#: builtin/pack-objects.c:2811 +#: builtin/pack-objects.c:2799 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:2813 +#: builtin/pack-objects.c:2801 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:2815 +#: builtin/pack-objects.c:2803 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:2817 +#: builtin/pack-objects.c:2805 msgid "reuse existing deltas" msgstr "dùng lại các delta sẵn có" -#: builtin/pack-objects.c:2819 +#: builtin/pack-objects.c:2807 msgid "reuse existing objects" msgstr "dùng lại các đối tượng sẵn có" -#: builtin/pack-objects.c:2821 +#: builtin/pack-objects.c:2809 msgid "use OFS_DELTA objects" msgstr "dùng các đối tượng OFS_DELTA" -#: builtin/pack-objects.c:2823 +#: builtin/pack-objects.c:2811 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:2825 +#: builtin/pack-objects.c:2813 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:2827 +#: builtin/pack-objects.c:2815 msgid "read revision arguments from standard input" msgstr " đọc tham số “revision” từ thiết bị nhập chuẩn" -#: builtin/pack-objects.c:2829 +#: builtin/pack-objects.c:2817 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:2832 +#: builtin/pack-objects.c:2820 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:2835 +#: builtin/pack-objects.c:2823 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:2838 +#: builtin/pack-objects.c:2826 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:2841 +#: builtin/pack-objects.c:2829 msgid "output pack to stdout" msgstr "xuất gói ra đầu ra tiêu chuẩn" -#: builtin/pack-objects.c:2843 +#: builtin/pack-objects.c:2831 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:2845 +#: builtin/pack-objects.c:2833 msgid "keep unreachable objects" msgstr "giữ lại các đối tượng không thể đọc được" -#: builtin/pack-objects.c:2847 +#: builtin/pack-objects.c:2835 msgid "pack loose unreachable objects" msgstr "pack mất các đối tượng không thể đọc được" -#: builtin/pack-objects.c:2849 +#: builtin/pack-objects.c:2837 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:2852 +#: builtin/pack-objects.c:2840 msgid "create thin packs" msgstr "tạo gói nhẹ" -#: builtin/pack-objects.c:2854 +#: builtin/pack-objects.c:2842 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:2856 +#: builtin/pack-objects.c:2844 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:2858 +#: builtin/pack-objects.c:2846 msgid "pack compression level" msgstr "mức nén gói" -#: builtin/pack-objects.c:2860 +#: builtin/pack-objects.c:2848 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:2862 +#: builtin/pack-objects.c:2850 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:2864 +#: builtin/pack-objects.c:2852 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:2993 +#: builtin/pack-objects.c:2979 msgid "Counting objects" msgstr "Đang đếm các đối tượng" @@ -10500,7 +10943,7 @@ msgstr "Xem git-pull(1) để biết thêm chi tiết." msgid "<remote>" msgstr "<máy chủ>" -#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:451 +#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:455 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<nhánh>" @@ -10675,14 +11118,14 @@ msgstr "" "nhánh hiện tại “%s” của bạn, mà không báo cho tôi biết là cái gì được push\n" "để cập nhật nhánh máy chủ nào." -#: builtin/push.c:242 +#: builtin/push.c:245 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "Bạn đã không chỉ ra một refspecs nào để đẩy lên, và push.default là \"không " "là gì cả\"." -#: builtin/push.c:249 +#: builtin/push.c:252 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -10695,7 +11138,7 @@ msgstr "" "Xem “Note about fast-forwards” trong “git push --help” để có thông tin chi " "tiết." -#: builtin/push.c:255 +#: builtin/push.c:258 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" @@ -10709,7 +11152,7 @@ msgstr "" "Xem “Note about fast-forwards” trong “git push --help” để có thông tin chi " "tiết." -#: builtin/push.c:261 +#: builtin/push.c:264 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" @@ -10724,11 +11167,11 @@ msgstr "" "Xem “Note about fast-forwards” trong “git push --help” để có thông tin chi " "tiết." -#: builtin/push.c:268 +#: builtin/push.c:271 msgid "Updates were rejected because the tag already exists in the remote." msgstr "Việc cập nhật bị từ chối bởi vì thẻ đã sẵn có từ trước trên máy chủ." -#: builtin/push.c:271 +#: builtin/push.c:274 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" @@ -10740,22 +11183,22 @@ msgstr "" "đối tượng\n" "không phải chuyển giao, mà không sử dụng tùy chọn “--force”.\n" -#: builtin/push.c:331 +#: builtin/push.c:334 #, c-format msgid "Pushing to %s\n" msgstr "Đang đẩy lên %s\n" -#: builtin/push.c:335 +#: builtin/push.c:338 #, c-format msgid "failed to push some refs to '%s'" msgstr "gặp lỗi khi đẩy tới một số tham chiếu đến “%s”" -#: builtin/push.c:366 +#: builtin/push.c:369 #, c-format msgid "bad repository '%s'" msgstr "repository (kho) sai “%s”" -#: builtin/push.c:367 +#: builtin/push.c:370 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -10776,112 +11219,112 @@ msgstr "" "\n" " git push <tên>\n" -#: builtin/push.c:385 +#: builtin/push.c:388 msgid "--all and --tags are incompatible" msgstr "--all và --tags xung khắc nhau" -#: builtin/push.c:386 +#: builtin/push.c:389 msgid "--all can't be combined with refspecs" msgstr "--all không thể được tổ hợp cùng với đặc tả đường dẫn" -#: builtin/push.c:391 +#: builtin/push.c:394 msgid "--mirror and --tags are incompatible" msgstr "--mirror và --tags xung khắc nhau" -#: builtin/push.c:392 +#: builtin/push.c:395 msgid "--mirror can't be combined with refspecs" msgstr "--mirror không thể được tổ hợp cùng với đặc tả đường dẫn" -#: builtin/push.c:397 +#: builtin/push.c:400 msgid "--all and --mirror are incompatible" msgstr "--all và --mirror xung khắc nhau" -#: builtin/push.c:515 +#: builtin/push.c:518 msgid "repository" msgstr "kho" -#: builtin/push.c:516 builtin/send-pack.c:161 +#: builtin/push.c:519 builtin/send-pack.c:161 msgid "push all refs" msgstr "đẩy tất cả các tham chiếu" -#: builtin/push.c:517 builtin/send-pack.c:163 +#: builtin/push.c:520 builtin/send-pack.c:163 msgid "mirror all refs" msgstr "mirror tất cả các tham chiếu" -#: builtin/push.c:519 +#: builtin/push.c:522 msgid "delete refs" msgstr "xóa các tham chiếu" -#: builtin/push.c:520 +#: builtin/push.c:523 msgid "push tags (can't be used with --all or --mirror)" msgstr "đẩy các thẻ (không dùng cùng với --all hay --mirror)" -#: builtin/push.c:523 builtin/send-pack.c:164 +#: builtin/push.c:526 builtin/send-pack.c:164 msgid "force updates" msgstr "ép buộc cập nhật" -#: builtin/push.c:525 builtin/send-pack.c:175 +#: builtin/push.c:528 builtin/send-pack.c:175 msgid "refname>:<expect" msgstr "tên-tham-chiếu>:<cần" -#: builtin/push.c:526 builtin/send-pack.c:176 +#: builtin/push.c:529 builtin/send-pack.c:176 msgid "require old value of ref to be at this value" msgstr "yêu cầu giá-trị cũ của tham chiếu thì là giá-trị này" -#: builtin/push.c:529 +#: builtin/push.c:532 msgid "control recursive pushing of submodules" msgstr "điều khiển việc đẩy lên (push) đệ qui của mô-đun-con" -#: builtin/push.c:531 builtin/send-pack.c:169 +#: builtin/push.c:534 builtin/send-pack.c:169 msgid "use thin pack" msgstr "tạo gói nhẹ" -#: builtin/push.c:532 builtin/push.c:533 builtin/send-pack.c:158 +#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:158 #: builtin/send-pack.c:159 msgid "receive pack program" msgstr "chương trình nhận gói" -#: builtin/push.c:534 +#: builtin/push.c:537 msgid "set upstream for git pull/status" msgstr "đặt thượng nguồn cho git pull/status" -#: builtin/push.c:537 +#: builtin/push.c:540 msgid "prune locally removed refs" msgstr "xén tỉa những tham chiếu bị gỡ bỏ" -#: builtin/push.c:539 +#: builtin/push.c:542 msgid "bypass pre-push hook" msgstr "vòng qua móc tiền-đẩy (pre-push)" -#: builtin/push.c:540 +#: builtin/push.c:543 msgid "push missing but relevant tags" msgstr "push phần bị thiếu nhưng các thẻ lại thích hợp" -#: builtin/push.c:543 builtin/send-pack.c:166 +#: builtin/push.c:546 builtin/send-pack.c:166 msgid "GPG sign the push" msgstr "ký lần đẩy dùng GPG" -#: builtin/push.c:545 builtin/send-pack.c:170 +#: builtin/push.c:548 builtin/send-pack.c:170 msgid "request atomic transaction on remote side" msgstr "yêu cầu giao dịch hạt nhân bên phía máy chủ" -#: builtin/push.c:546 +#: builtin/push.c:549 msgid "server-specific" msgstr "đặc-tả-máy-phục-vụ" -#: builtin/push.c:546 +#: builtin/push.c:549 msgid "option to transmit" msgstr "tùy chọn để chuyển giao" -#: builtin/push.c:560 +#: builtin/push.c:563 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete là xung khắc với các tùy chọn --all, --mirror và --tags" -#: builtin/push.c:562 +#: builtin/push.c:565 msgid "--delete doesn't make sense without any refs" msgstr "--delete không hợp lý nếu không có bất kỳ tham chiếu nào" -#: builtin/push.c:579 +#: builtin/push.c:584 msgid "push options must not have new line characters" msgstr "các tùy chọn push phải không có ký tự dòng mới" @@ -10972,8 +11415,8 @@ msgid "" "with what you pushed, and will require 'git reset --hard' to match\n" "the work tree to HEAD.\n" "\n" -"You can set 'receive.denyCurrentBranch' configuration variable to\n" -"'ignore' or 'warn' in the remote repository to allow pushing into\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" @@ -10981,7 +11424,7 @@ msgid "" "To squelch this message and still keep the default behaviour, set\n" "'receive.denyCurrentBranch' configuration variable to 'refuse'." msgstr "" -"Theo mặc định, việc cập nhật nhánh hiện tại không một kho không-thuần\n" +"Theo mặc định, việc cập nhật nhánh hiện tại trong một kho không-thuần\n" "bị từ chối, bởi vì nó sẽ làm cho chỉ mục và cây làm việc mâu thuẫn với\n" "cái mà bạn đẩy lên, và sẽ yêu cầu lệnh “git reset --hard” để mà làm\n" "cho cây làm việc khớp với HEAD.\n" @@ -11536,83 +11979,91 @@ msgstr "Không hiểu câu lệnh con: %s" msgid "git repack [<options>]" msgstr "git repack [<các-tùy-chọn>]" -#: builtin/repack.c:160 +#: builtin/repack.c:22 +msgid "" +"Incremental repacks are incompatible with bitmap indexes. Use\n" +"--no-write-bitmap-index or disable the pack.writebitmaps configuration." +msgstr "" +"Gia tăng repack là không tương thích với chỉ mục bitmap. Dùng\n" +"--no-write-bitmap-index hay tắt cấu hình pack.writebitmaps." + +#: builtin/repack.c:166 msgid "pack everything in a single pack" msgstr "đóng gói mọi thứ trong một gói đơn" -#: builtin/repack.c:162 +#: builtin/repack.c:168 msgid "same as -a, and turn unreachable objects loose" msgstr "giống với -a, và chỉnh sửa các đối tượng không đọc được thiếu sót" -#: builtin/repack.c:165 +#: builtin/repack.c:171 msgid "remove redundant packs, and run git-prune-packed" msgstr "xóa bỏ các gói dư thừa, và chạy git-prune-packed" -#: builtin/repack.c:167 +#: builtin/repack.c:173 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "chuyển --no-reuse-delta cho git-pack-objects" -#: builtin/repack.c:169 +#: builtin/repack.c:175 msgid "pass --no-reuse-object to git-pack-objects" msgstr "chuyển --no-reuse-object cho git-pack-objects" -#: builtin/repack.c:171 +#: builtin/repack.c:177 msgid "do not run git-update-server-info" msgstr "không chạy git-update-server-info" -#: builtin/repack.c:174 +#: builtin/repack.c:180 msgid "pass --local to git-pack-objects" msgstr "chuyển --local cho git-pack-objects" -#: builtin/repack.c:176 +#: builtin/repack.c:182 msgid "write bitmap index" msgstr "ghi mục lục ánh xạ" -#: builtin/repack.c:177 +#: builtin/repack.c:183 msgid "approxidate" msgstr "ngày ước tính" -#: builtin/repack.c:178 +#: builtin/repack.c:184 msgid "with -A, do not loosen objects older than this" msgstr "với -A, các đối tượng cũ hơn khoảng thời gian này thì không bị mất" -#: builtin/repack.c:180 +#: builtin/repack.c:186 msgid "with -a, repack unreachable objects" msgstr "với -a, đóng gói lại các đối tượng không thể đọc được" -#: builtin/repack.c:182 +#: builtin/repack.c:188 msgid "size of the window used for delta compression" msgstr "kích thước cửa sổ được dùng cho nén “delta”" -#: builtin/repack.c:183 builtin/repack.c:187 +#: builtin/repack.c:189 builtin/repack.c:193 msgid "bytes" msgstr "byte" -#: builtin/repack.c:184 +#: builtin/repack.c:190 msgid "same as the above, but limit memory size instead of entries count" msgstr "giống như trên, nhưng giới hạn kích thước bộ nhớ hay vì số lượng" -#: builtin/repack.c:186 +#: builtin/repack.c:192 msgid "limits the maximum delta depth" msgstr "giới hạn độ sâu tối đa của “delta”" -#: builtin/repack.c:188 +#: builtin/repack.c:194 msgid "maximum size of each packfile" msgstr "kích thước tối đa cho từng tập tin gói" -#: builtin/repack.c:190 +#: builtin/repack.c:196 msgid "repack objects in packs marked with .keep" msgstr "đóng gói lại các đối tượng trong các gói đã đánh dấu bằng .keep" -#: builtin/repack.c:200 +#: builtin/repack.c:206 msgid "cannot delete packs in a precious-objects repo" msgstr "không thể xóa các gói trong một kho đối_tượng_vĩ_đại" -#: builtin/repack.c:204 +#: builtin/repack.c:210 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable và -A xung khắc nhau" -#: builtin/repack.c:391 builtin/worktree.c:115 +#: builtin/repack.c:400 builtin/worktree.c:115 #, c-format msgid "failed to remove '%s'" msgstr "gặp lỗi khi gỡ bỏ “%s”" @@ -11844,23 +12295,23 @@ msgstr "Không thể ghi tập tin lưu bảng mục lục mới." 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:386 +#: builtin/rev-parse.c:391 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:391 +#: builtin/rev-parse.c:396 msgid "keep the `--` passed as an arg" msgstr "giữ lại “--” chuyển sang làm tham số" -#: builtin/rev-parse.c:393 +#: builtin/rev-parse.c:398 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:396 +#: builtin/rev-parse.c:401 msgid "output in stuck long form" msgstr "kết xuất trong định dạng gậy dài" -#: builtin/rev-parse.c:527 +#: builtin/rev-parse.c:532 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -11959,27 +12410,7 @@ msgstr "cherry-pick gặp lỗi" msgid "git rm [<options>] [--] <file>..." msgstr "git rm [<các-tùy-chọn>] [--] <tập-tin>…" -#: builtin/rm.c:65 -msgid "" -"the following submodule (or one of its nested submodules)\n" -"uses a .git directory:" -msgid_plural "" -"the following submodules (or one of their nested submodules)\n" -"use a .git directory:" -msgstr[0] "" -"các mô-đun-con sau đây (hay một trong số mô-đun-con bên trong của nó)\n" -"dùng một thư mục .git:" - -#: builtin/rm.c:71 -msgid "" -"\n" -"(use 'rm -rf' if you really want to remove it including all of its history)" -msgstr "" -"\n" -"(dùng /\"rm -rf/\" nếu bạn thực sự muốn gỡ bỏ nó cùng với tất cả lịch sử của " -"chúng)" - -#: builtin/rm.c:230 +#: builtin/rm.c:205 msgid "" "the following file has staged content different from both the\n" "file and the HEAD:" @@ -11990,7 +12421,7 @@ msgstr[0] "" "các tập tin sau đây có khác biệt nội dung đã đưa lên bệ phóng\n" "từ cả tập tin và cả HEAD:" -#: builtin/rm.c:235 +#: builtin/rm.c:210 msgid "" "\n" "(use -f to force removal)" @@ -11998,12 +12429,12 @@ msgstr "" "\n" "(dùng -f để buộc gỡ bỏ)" -#: builtin/rm.c:239 +#: builtin/rm.c:214 msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" msgstr[0] "các tập tin sau đây có thay đổi trạng thái trong bảng mục lục:" -#: builtin/rm.c:243 builtin/rm.c:254 +#: builtin/rm.c:218 builtin/rm.c:227 msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" @@ -12011,41 +12442,46 @@ msgstr "" "\n" "(dùng tùy chọn --cached để giữ tập tin, hoặc -f để ép buộc gỡ bỏ)" -#: builtin/rm.c:251 +#: builtin/rm.c:224 msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" msgstr[0] "những tập tin sau đây có những thay đổi nội bộ:" -#: builtin/rm.c:269 +#: builtin/rm.c:242 msgid "do not list removed files" msgstr "không liệt kê các tập tin đã gỡ bỏ" -#: builtin/rm.c:270 +#: builtin/rm.c:243 msgid "only remove from the index" msgstr "chỉ gỡ bỏ từ mục lục" -#: builtin/rm.c:271 +#: builtin/rm.c:244 msgid "override the up-to-date check" msgstr "ghi đè lên kiểm tra cập nhật" -#: builtin/rm.c:272 +#: builtin/rm.c:245 msgid "allow recursive removal" msgstr "cho phép gỡ bỏ đệ qui" -#: builtin/rm.c:274 +#: builtin/rm.c:247 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:335 +#: builtin/rm.c:308 #, 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:374 +#: builtin/rm.c:347 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: không thể gỡ bỏ %s" +#: builtin/rm.c:370 +#, c-format +msgid "could not remove '%s'" +msgstr "không thể gỡ bỏ “%s”" + #: builtin/send-pack.c:18 msgid "" "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" @@ -12078,23 +12514,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:242 +#: builtin/shortlog.c:249 +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 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:244 +#: builtin/shortlog.c:253 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:246 +#: builtin/shortlog.c:255 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:247 +#: builtin/shortlog.c:256 msgid "w[,i1[,i2]]" msgstr "w[,i1[,i2]]" -#: builtin/shortlog.c:248 +#: builtin/shortlog.c:257 msgid "Linewrap output" msgstr "Ngắt dòng khi quá dài" @@ -12243,37 +12683,37 @@ msgstr "" msgid "git show-ref --exclude-existing[=<pattern>]" msgstr "git show-ref --exclude-existing[=<mẫu>]" -#: builtin/show-ref.c:165 +#: builtin/show-ref.c:159 msgid "only show tags (can be combined with heads)" msgstr "chỉ hiển thị thẻ (có thể tổ hợp cùng với đầu)" -#: builtin/show-ref.c:166 +#: builtin/show-ref.c:160 msgid "only show heads (can be combined with tags)" msgstr "chỉ hiển thị đầu (có thể tổ hợp cùng với thẻ)" -#: builtin/show-ref.c:167 +#: builtin/show-ref.c:161 msgid "stricter reference checking, requires exact ref path" msgstr "" "việc kiểm tra tham chiếu chính xác, đòi hỏi chính xác đường dẫn tham chiếu" -#: builtin/show-ref.c:170 builtin/show-ref.c:172 +#: builtin/show-ref.c:164 builtin/show-ref.c:166 msgid "show the HEAD reference, even if it would be filtered out" msgstr "hiển thị tham chiếu HEAD, ngay cả khi nó đã được lọc ra" -#: builtin/show-ref.c:174 +#: builtin/show-ref.c:168 msgid "dereference tags into object IDs" msgstr "bãi bỏ tham chiếu các thẻ thành ra các ID đối tượng" -#: builtin/show-ref.c:176 +#: builtin/show-ref.c:170 msgid "only show SHA1 hash using <n> digits" msgstr "chỉ hiển thị mã băm SHA1 sử dụng <n> chữ số" -#: builtin/show-ref.c:180 +#: builtin/show-ref.c:174 msgid "do not print results to stdout (useful with --verify)" msgstr "" "không hiển thị kết quả ra đầu ra chuẩn (stdout) (chỉ hữu dụng với --verify)" -#: builtin/show-ref.c:182 +#: builtin/show-ref.c:176 msgid "show refs from stdin that aren't in local repository" msgstr "" "hiển thị các tham chiếu từ đầu vào tiêu chuẩn (stdin) cái mà không ở kho nội " @@ -12295,12 +12735,12 @@ 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:24 builtin/submodule--helper.c:1046 +#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1062 #, c-format msgid "No such ref: %s" msgstr "Không có tham chiếu nào như thế: %s" -#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1055 +#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1071 #, 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" @@ -12310,8 +12750,7 @@ msgstr "Cần tên tham chiếu dạng đầy đủ, nhưng lại nhận đượ 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:282 builtin/submodule--helper.c:408 -#: builtin/submodule--helper.c:590 +#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:592 msgid "alternative anchor for relative paths" msgstr "điểm neo thay thế cho các đường dẫn tương đối" @@ -12319,86 +12758,86 @@ msgstr "điểm neo thay thế cho các đường dẫn tương đối" msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=</đường/dẫn>] [</đường/dẫn>…]" -#: builtin/submodule--helper.c:329 builtin/submodule--helper.c:343 +#: builtin/submodule--helper.c:333 builtin/submodule--helper.c:347 #, 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:369 +#: builtin/submodule--helper.c:373 #, 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:373 +#: builtin/submodule--helper.c:377 #, 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:383 +#: builtin/submodule--helper.c:387 #, 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:390 +#: builtin/submodule--helper.c:394 #, 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:409 +#: builtin/submodule--helper.c:410 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:414 +#: builtin/submodule--helper.c:415 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper init [</đường/dẫn>]" -#: builtin/submodule--helper.c:435 +#: builtin/submodule--helper.c:436 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name </đường/dẫn>" -#: builtin/submodule--helper.c:441 +#: builtin/submodule--helper.c:442 #, 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:524 builtin/submodule--helper.c:527 +#: builtin/submodule--helper.c:525 builtin/submodule--helper.c:528 #, 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:563 +#: builtin/submodule--helper.c:564 #, 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:570 +#: builtin/submodule--helper.c:571 #, 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:593 +#: builtin/submodule--helper.c:595 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:596 +#: builtin/submodule--helper.c:598 msgid "name of the new submodule" msgstr "tên của mô-đun-con mới" -#: builtin/submodule--helper.c:599 +#: builtin/submodule--helper.c:601 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:605 +#: builtin/submodule--helper.c:607 msgid "depth for shallow clones" msgstr "chiều sâu lịch sử khi tạo bản sao" -#: builtin/submodule--helper.c:608 builtin/submodule--helper.c:964 +#: builtin/submodule--helper.c:610 builtin/submodule--helper.c:980 msgid "force cloning progress" msgstr "ép buộc tiến trình nhân bản" -#: builtin/submodule--helper.c:613 +#: builtin/submodule--helper.c:615 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -12406,99 +12845,94 @@ 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:638 builtin/submodule--helper.c:648 -#, c-format -msgid "could not create directory '%s'" -msgstr "không thể tạo thư mục “%s”" - -#: builtin/submodule--helper.c:644 +#: builtin/submodule--helper.c:646 #, 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:660 +#: builtin/submodule--helper.c:662 #, c-format msgid "cannot open file '%s'" msgstr "không thể mở tập tin “%s”" -#: builtin/submodule--helper.c:665 +#: builtin/submodule--helper.c:667 #, c-format msgid "could not close file %s" msgstr "không thể đóng tập tin %s" -#: builtin/submodule--helper.c:672 +#: builtin/submodule--helper.c:674 #, 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:726 +#: builtin/submodule--helper.c:742 #, 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:730 +#: builtin/submodule--helper.c:746 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:756 +#: builtin/submodule--helper.c:772 #, 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:777 +#: builtin/submodule--helper.c:793 #, c-format msgid "Skipping submodule '%s'" msgstr "Bỏ qua mô-đun-con “%s”" -#: builtin/submodule--helper.c:913 +#: builtin/submodule--helper.c:929 #, 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:924 +#: builtin/submodule--helper.c:940 #, 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:945 +#: builtin/submodule--helper.c:961 builtin/submodule--helper.c:1105 msgid "path into the working tree" msgstr "đường dẫn đến cây làm việc" -#: builtin/submodule--helper.c:948 +#: builtin/submodule--helper.c:964 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:952 +#: builtin/submodule--helper.c:968 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout hoặc không làm gì cả" -#: builtin/submodule--helper.c:956 +#: builtin/submodule--helper.c:972 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:959 +#: builtin/submodule--helper.c:975 msgid "parallel jobs" msgstr "công việc đồng thời" -#: builtin/submodule--helper.c:961 +#: builtin/submodule--helper.c:977 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:962 +#: builtin/submodule--helper.c:978 msgid "don't print cloning progress" msgstr "đừng in tiến trình nhân bản" -#: builtin/submodule--helper.c:969 +#: builtin/submodule--helper.c:985 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:979 +#: builtin/submodule--helper.c:995 msgid "bad value for update parameter" msgstr "giá trị cho tham số cập nhật bị sai" -#: builtin/submodule--helper.c:1050 +#: builtin/submodule--helper.c:1066 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -12507,11 +12941,24 @@ 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:1100 +#: builtin/submodule--helper.c:1106 +msgid "recurse into submodules" +msgstr "đệ quy vào trong mô-đun-con" + +#: builtin/submodule--helper.c:1112 +msgid "git submodule--helper embed-git-dir [<path>...]" +msgstr "git submodule--helper embed-git-dir [</đường/dẫn>…]" + +#: builtin/submodule--helper.c:1157 msgid "submodule--helper subcommand must be called with a subcommand" msgstr "lệnh con submodule--helper phải được gọi với một lệnh con" -#: builtin/submodule--helper.c:1107 +#: builtin/submodule--helper.c:1164 +#, c-format +msgid "%s doesn't support --super-prefix" +msgstr "%s không hỗ trợ --super-prefix" + +#: builtin/submodule--helper.c:1170 #, 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ệ" @@ -12566,25 +13013,25 @@ msgstr "" "\t\t[--format=<định dạng>] [--[no-]merged [<lần_chuyển_giao>]] [<mẫu>…]" #: builtin/tag.c:27 -msgid "git tag -v <tagname>..." -msgstr "git tag -v <tên-thẻ>…" +msgid "git tag -v [--format=<format>] <tagname>..." +msgstr "git tag -v [--format=<định_dạng>] <tên-thẻ>…" -#: builtin/tag.c:81 +#: builtin/tag.c:82 #, c-format msgid "tag name too long: %.*s..." msgstr "tên thẻ quá dài: %.*s…" -#: builtin/tag.c:86 +#: builtin/tag.c:87 #, c-format msgid "tag '%s' not found." msgstr "không tìm thấy tìm thấy thẻ “%s”." -#: builtin/tag.c:101 +#: 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:117 +#: builtin/tag.c:131 #, c-format msgid "" "\n" @@ -12597,7 +13044,7 @@ msgstr "" " %s\n" "Những dòng được bắt đầu bằng “%c” sẽ được bỏ qua.\n" -#: builtin/tag.c:121 +#: builtin/tag.c:135 #, c-format msgid "" "\n" @@ -12612,138 +13059,138 @@ 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:199 +#: builtin/tag.c:213 msgid "unable to sign the tag" msgstr "không thể ký thẻ" -#: builtin/tag.c:201 +#: builtin/tag.c:215 msgid "unable to write tag file" msgstr "không thể ghi vào tập tin lưu thẻ" -#: builtin/tag.c:226 +#: builtin/tag.c:240 msgid "bad object type." msgstr "kiểu đối tượng sai." -#: builtin/tag.c:239 +#: builtin/tag.c:253 msgid "tag header too big." msgstr "phần đầu thẻ quá lớn." -#: builtin/tag.c:275 +#: builtin/tag.c:289 msgid "no tag message?" msgstr "không có chú thích gì cho cho thẻ à?" -#: builtin/tag.c:281 +#: builtin/tag.c:295 #, 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:339 +#: builtin/tag.c:354 msgid "list tag names" msgstr "chỉ liệt kê tên các thẻ" -#: builtin/tag.c:341 +#: builtin/tag.c:356 msgid "print <n> lines of each tag message" msgstr "hiển thị <n> dòng cho mỗi ghi chú" -#: builtin/tag.c:343 +#: builtin/tag.c:358 msgid "delete tags" msgstr "xóa thẻ" -#: builtin/tag.c:344 +#: builtin/tag.c:359 msgid "verify tags" msgstr "thẩm tra thẻ" -#: builtin/tag.c:346 +#: builtin/tag.c:361 msgid "Tag creation options" msgstr "Tùy chọn tạo thẻ" -#: builtin/tag.c:348 +#: builtin/tag.c:363 msgid "annotated tag, needs a message" msgstr "để chú giải cho thẻ, cần một lời ghi chú" -#: builtin/tag.c:350 +#: builtin/tag.c:365 msgid "tag message" msgstr "phần chú thích cho thẻ" -#: builtin/tag.c:352 +#: builtin/tag.c:367 msgid "annotated and GPG-signed tag" msgstr "thẻ chú giải và ký kiểu GPG" -#: builtin/tag.c:356 +#: builtin/tag.c:371 msgid "use another key to sign the tag" msgstr "dùng kháo khác để ký thẻ" -#: builtin/tag.c:357 +#: builtin/tag.c:372 msgid "replace the tag if exists" msgstr "thay thế nếu thẻ đó đã có trước" -#: builtin/tag.c:358 builtin/update-ref.c:368 +#: builtin/tag.c:373 builtin/update-ref.c:368 msgid "create a reflog" msgstr "tạo một reflog" -#: builtin/tag.c:360 +#: builtin/tag.c:375 msgid "Tag listing options" msgstr "Các tùy chọn liệt kê thẻ" -#: builtin/tag.c:361 +#: builtin/tag.c:376 msgid "show tag list in columns" msgstr "hiển thị danh sách thẻ trong các cột" -#: builtin/tag.c:362 builtin/tag.c:363 +#: builtin/tag.c:377 builtin/tag.c:378 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:364 +#: builtin/tag.c:379 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:365 +#: builtin/tag.c:380 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:370 +#: builtin/tag.c:385 msgid "print only tags of the object" msgstr "chỉ hiển thị các thẻ của đối tượng" -#: builtin/tag.c:399 +#: builtin/tag.c:415 msgid "--column and -n are incompatible" msgstr "--column và -n xung khắc nhau" -#: builtin/tag.c:419 +#: builtin/tag.c:437 msgid "-n option is only allowed with -l." msgstr "tùy chọn -n chỉ cho phép dùng với -l." -#: builtin/tag.c:421 +#: builtin/tag.c:439 msgid "--contains option is only allowed with -l." msgstr "tùy chọn --contains chỉ cho phép dùng với -l." -#: builtin/tag.c:423 +#: builtin/tag.c:441 msgid "--points-at option is only allowed with -l." msgstr "tùy chọn --points-at chỉ cho phép dùng với -l." -#: builtin/tag.c:425 +#: builtin/tag.c:443 msgid "--merged and --no-merged option are only allowed with -l" msgstr "tùy chọn --merged và --no-merged chỉ cho phép dùng với -l." -#: builtin/tag.c:433 +#: builtin/tag.c:454 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:452 +#: builtin/tag.c:473 msgid "too many params" msgstr "quá nhiều đối số" -#: builtin/tag.c:458 +#: builtin/tag.c:479 #, c-format msgid "'%s' is not a valid tag name." msgstr "“%s” không phải thẻ hợp lệ." -#: builtin/tag.c:463 +#: builtin/tag.c:484 #, c-format msgid "tag '%s' already exists" msgstr "Thẻ “%s” đã tồn tại rồi" -#: builtin/tag.c:491 +#: builtin/tag.c:512 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Đã cập nhật thẻ “%s” (trước là %s)\n" @@ -12936,7 +13383,7 @@ msgstr "kiểm tra xem hệ thống tập tin có hỗ trợ đệm không theo 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:1119 +#: builtin/update-index.c:1120 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -12944,11 +13391,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:1123 +#: builtin/update-index.c:1124 msgid "Untracked cache disabled" msgstr "Nhớ đệm không theo vết bị tắt" -#: builtin/update-index.c:1131 +#: builtin/update-index.c:1132 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -12956,7 +13403,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:1135 +#: builtin/update-index.c:1136 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Nhớ đệm không theo vết được bật cho “%s”" @@ -13005,7 +13452,7 @@ msgstr "git verify-commit [-v | --verbose] <lần_chuyển_giao>…" msgid "print commit contents" msgstr "hiển thị nội dung của lần chuyển giao" -#: builtin/verify-commit.c:73 builtin/verify-tag.c:35 +#: builtin/verify-commit.c:73 builtin/verify-tag.c:37 msgid "print raw gpg status output" msgstr "in kết xuất trạng thái gpg dạng thô" @@ -13021,11 +13468,11 @@ msgstr "chi tiết" msgid "show statistics only" msgstr "chỉ hiển thị thống kê" -#: builtin/verify-tag.c:17 -msgid "git verify-tag [-v | --verbose] <tag>..." -msgstr "git verify-tag [-v | --verbose] <thẻ>…" +#: builtin/verify-tag.c:18 +msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." +msgstr "git verify-tag [-v | --verbose] [--format=<định_dạng>] <thẻ>…" -#: builtin/verify-tag.c:34 +#: builtin/verify-tag.c:36 msgid "print tag contents" msgstr "hiển thị nội dung của thẻ" @@ -13109,30 +13556,30 @@ msgstr "di chuyển cây làm việc mới" 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:470 +#: builtin/worktree.c:472 msgid "reason for locking" msgstr "lý do khóa" -#: builtin/worktree.c:482 builtin/worktree.c:515 +#: builtin/worktree.c:484 builtin/worktree.c:517 #, 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:484 builtin/worktree.c:517 +#: builtin/worktree.c:486 builtin/worktree.c:519 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:489 +#: builtin/worktree.c:491 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "“%s” đã được khóa rồi, lý do: %s" -#: builtin/worktree.c:491 +#: builtin/worktree.c:493 #, c-format msgid "'%s' is already locked" msgstr "“%s” đã được khóa rồi" -#: builtin/worktree.c:519 +#: builtin/worktree.c:521 #, c-format msgid "'%s' is not locked" msgstr "“%s” chưa bị khóa" @@ -13157,19 +13604,19 @@ 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:1028 +#: upload-pack.c:1036 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:1030 +#: upload-pack.c:1038 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:1032 +#: upload-pack.c:1040 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:1034 +#: upload-pack.c:1042 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "ngắt truyền thông sau <n> giây không hoạt động" @@ -13200,14 +13647,30 @@ 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:342 +#: http.c:344 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:351 +#: http.c:353 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:1713 +#, c-format +msgid "" +"unable to update url base from redirection:\n" +" asked for: %s\n" +" redirect: %s" +msgstr "" +"không thể cập nhật dựa trên cơ sở url từ chuyển hướng:\n" +" hỏi cho: %s\n" +" chuyển hướng: %s" + +#: remote-curl.c:319 +#, c-format +msgid "redirecting to %s" +msgstr "chuyển hướng đến %s" + #: common-cmds.h:9 msgid "start a working area (see also: git help tutorial)" msgstr "bắt đầu một vùng làm việc (xem thêm: git help tutorial)" @@ -13578,7 +14041,7 @@ msgstr "Đang thử hòa trộn đơn giản với $pretty_name" msgid "Simple merge did not work, trying automatic merge." msgstr "Hòa trộn đơn giản không làm việc, thử hòa trộn tự động." -#: git-rebase.sh:56 +#: git-rebase.sh:57 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" @@ -13591,56 +14054,41 @@ msgstr "" "Để 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\"." -#: git-rebase.sh:156 git-rebase.sh:395 +#: git-rebase.sh:157 git-rebase.sh:396 #, sh-format msgid "Could not move back to $head_name" msgstr "Không thể quay trở lại $head_name" -#: git-rebase.sh:167 -msgid "Applied autostash." -msgstr "Đã áp dụng autostash." - -#: git-rebase.sh:170 +#: git-rebase.sh:171 #, sh-format msgid "Cannot store $stash_sha1" msgstr "Không thể lưu $stash_sha1" -#: git-rebase.sh:171 -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 "" -"Áp dụng autostash có hiệu quả trong các xung đột.\n" -"Các thay đổi của bạn an toàn trong stash (tạm cất đi).\n" -"Bạn có thể chạy lệnh \"git stash pop\" hay \"git stash drop\" bất kỳ lúc " -"nào.\n" - -#: git-rebase.sh:210 +#: git-rebase.sh:211 msgid "The pre-rebase hook refused to rebase." msgstr "Móc (hook) pre-rebase từ chối rebase." -#: git-rebase.sh:215 +#: git-rebase.sh:216 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:356 +#: git-rebase.sh:357 msgid "No rebase in progress?" msgstr "Không có tiến trình rebase nào phải không?" -#: git-rebase.sh:367 +#: git-rebase.sh:368 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:374 +#: git-rebase.sh:375 msgid "Cannot read HEAD" msgstr "Không thể đọc HEAD" -#: git-rebase.sh:377 +#: git-rebase.sh:378 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -13648,7 +14096,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:414 +#: git-rebase.sh:418 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -13669,64 +14117,64 @@ 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:465 +#: git-rebase.sh:469 #, sh-format msgid "invalid upstream $upstream_name" msgstr "thượng nguồn không hợp lệ $upstream_name" -#: git-rebase.sh:489 +#: git-rebase.sh:493 #, 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:492 git-rebase.sh:496 +#: git-rebase.sh:496 git-rebase.sh:500 #, 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:501 +#: git-rebase.sh:505 #, 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:524 +#: git-rebase.sh:528 #, 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:557 +#: git-rebase.sh:561 msgid "Cannot autostash" msgstr "Không thể autostash" -#: git-rebase.sh:562 +#: git-rebase.sh:566 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Đã tạo autostash: $stash_abbrev" -#: git-rebase.sh:566 +#: git-rebase.sh:570 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:586 +#: git-rebase.sh:590 #, 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:590 +#: git-rebase.sh:594 #, 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:601 +#: git-rebase.sh:605 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Thay đổi từ $mb thành $onto:" -#: git-rebase.sh:610 +#: git-rebase.sh:614 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:620 +#: git-rebase.sh:624 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "Chuyển-tiếp-nhanh $branch_name thành $onto_name." @@ -13893,24 +14341,31 @@ msgstr "Chưa chỉ ra tên của nhánh" msgid "(To restore them type \"git stash apply\")" msgstr "(Để phục hồi lại chúng hãy gõ \"git stash apply\")" -#: git-submodule.sh:184 +#: git-submodule.sh:181 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" "Đường dẫn tương đối chỉ có thể dùng từ thư mục ở mức cao nhất của cây làm " "việc" -#: git-submodule.sh:194 +#: git-submodule.sh:191 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "" "repo URL: “$repo” phải là đường dẫn tuyệt đối hoặc là bắt đầu bằng ./|../" -#: git-submodule.sh:211 +#: git-submodule.sh:210 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "”$sm_path” thực sự đã tồn tại ở bảng mục lục rồi" -#: git-submodule.sh:215 +#: git-submodule.sh:213 +#, sh-format +msgid "'$sm_path' already exists in the index and is not a submodule" +msgstr "" +"”$sm_path” thực sự đã tồn tại ở bảng mục lục rồi và không phải là một mô-đun-" +"con" + +#: git-submodule.sh:218 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -13922,23 +14377,23 @@ msgstr "" "$sm_path\n" "Sử dụng -f nếu bạn thực sự muốn thêm nó vào." -#: git-submodule.sh:233 +#: git-submodule.sh:236 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "Đang thêm repo có sẵn tại “$sm_path” vào bảng mục lục" -#: git-submodule.sh:235 +#: git-submodule.sh:238 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "”$sm_path” đã tồn tại từ trước và không phải là một kho git hợp lệ" -#: git-submodule.sh:243 +#: git-submodule.sh:246 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" "Thư mục git cho “$sm_name” được tìm thấy một cách cục bộ với các máy chủ:" -#: git-submodule.sh:245 +#: git-submodule.sh:248 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -13954,48 +14409,48 @@ msgstr "" "hoặc là bạn không chắc chắn điều đó nghĩa là gì thì chọn tên khác với tùy " "chọn “--name”." -#: git-submodule.sh:251 +#: git-submodule.sh:254 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "" "Phục hồi sự hoạt động của thư mục git nội bộ cho mô-đun-con “$sm_name”." -#: git-submodule.sh:263 +#: git-submodule.sh:266 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Không thể lấy ra mô-đun-con “$sm_path”" -#: git-submodule.sh:268 +#: git-submodule.sh:271 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Gặp lỗi khi thêm mô-đun-con “$sm_path”" -#: git-submodule.sh:277 +#: git-submodule.sh:280 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Gặp lỗi khi đăng ký với hệ thống mô-đun-con “$sm_path”" -#: git-submodule.sh:324 +#: git-submodule.sh:327 #, sh-format msgid "Entering '$displaypath'" msgstr "Đang vào “$displaypath”" -#: git-submodule.sh:344 +#: git-submodule.sh:347 #, sh-format msgid "Stopping at '$displaypath'; script returned non-zero status." msgstr "Dừng lại tại “$displaypath”; script trả về trạng thái khác không." -#: git-submodule.sh:415 +#: git-submodule.sh:418 #, sh-format msgid "pathspec and --all are incompatible" msgstr "đặc tả đường dẫn và --all xung khắc nhau" -#: git-submodule.sh:420 +#: git-submodule.sh:423 #, sh-format msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "Dùng “--all” nếu bạn thực sự muốn hủy khởi tạo mọi mô-đun-con" -#: git-submodule.sh:440 +#: git-submodule.sh:443 #, sh-format msgid "" "Submodule work tree '$displaypath' contains a .git directory\n" @@ -14005,7 +14460,7 @@ msgstr "" "(dùng “rm -rf” nếu bạn thực sự muốn gỡ bỏ nó cùng với tất cả lịch sử của " "chúng)" -#: git-submodule.sh:448 +#: git-submodule.sh:451 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " @@ -14014,39 +14469,39 @@ msgstr "" "Cây làm việc mô-đun-con “$displaypath” chứa các thay đổi nội bộ; hãy dùng “-" "f” để loại bỏ chúng đi" -#: git-submodule.sh:451 +#: git-submodule.sh:454 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "Đã tạo thư mục “$displaypath”" -#: git-submodule.sh:452 +#: git-submodule.sh:455 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "Không thể gỡ bỏ cây làm việc mô-đun-con “$displaypath”" -#: git-submodule.sh:455 +#: git-submodule.sh:458 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "Không thể tạo thư mục mô-đun-con rỗng “$displaypath”" -#: git-submodule.sh:464 +#: git-submodule.sh:467 #, sh-format 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:617 +#: git-submodule.sh:623 #, 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:627 +#: git-submodule.sh:633 #, 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:632 +#: git-submodule.sh:638 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -14055,12 +14510,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:650 +#: git-submodule.sh:656 #, 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:656 +#: git-submodule.sh:662 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -14069,86 +14524,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:663 +#: git-submodule.sh:669 #, 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:664 +#: git-submodule.sh:670 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Đường dẫn mô-đun-con “$displaypath”: đã checkout “$sha1”" -#: git-submodule.sh:668 +#: git-submodule.sh:674 #, 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:669 +#: git-submodule.sh:675 #, 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:674 +#: git-submodule.sh:680 #, 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:675 +#: git-submodule.sh:681 #, 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:680 +#: git-submodule.sh:686 #, 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:681 +#: git-submodule.sh:687 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Đường dẫn mô-đun-con “$displaypath”: “$command $sha1”" -#: git-submodule.sh:712 +#: git-submodule.sh:718 #, 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:820 +#: git-submodule.sh:826 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:872 +#: git-submodule.sh:878 #, sh-format msgid "unexpected mode $mod_dst" msgstr "chế độ không như mong chờ $mod_dst" -#: git-submodule.sh:892 +#: git-submodule.sh:898 #, 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:895 +#: git-submodule.sh:901 #, 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:898 +#: git-submodule.sh:904 #, 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:1045 +#: git-submodule.sh:1051 #, 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:1112 +#: git-submodule.sh:1118 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Url Mô-đun-con đồng bộ hóa cho “$displaypath”" @@ -14158,12 +14613,12 @@ msgstr "Url Mô-đun-con đồng bộ hóa cho “$displaypath”" msgid "See git-${cmd}(1) for details." msgstr "Xem git-${cmd}(1) để biết thêm chi tiết." -#: git-rebase--interactive.sh:131 +#: git-rebase--interactive.sh:140 #, sh-format msgid "Rebasing ($new_count/$total)" msgstr "Đang rebase ($new_count/$total)" -#: git-rebase--interactive.sh:147 +#: git-rebase--interactive.sh:156 msgid "" "\n" "Commands:\n" @@ -14191,7 +14646,7 @@ msgstr "" "Những dòng này có thể đảo ngược thứ tự; chúng chạy từ trên đỉnh xuống dưới " "đáy.\n" -#: git-rebase--interactive.sh:162 +#: git-rebase--interactive.sh:171 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -14200,7 +14655,7 @@ msgstr "" "Đừng xóa bất kỳ dòng nào. Dùng “drop” một cách rõ ràng để xóa bỏ một lần " "chuyển giao.\n" -#: git-rebase--interactive.sh:166 +#: git-rebase--interactive.sh:175 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -14208,7 +14663,7 @@ msgstr "" "\n" "Nếu bạn xóa bỏ một dòng ở đây thì LẦN CHUYỂN GIAO ĐÓ SẼ MẤT.\n" -#: git-rebase--interactive.sh:202 +#: git-rebase--interactive.sh:211 #, sh-format msgid "" "You can amend the commit now, with\n" @@ -14227,86 +14682,82 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--interactive.sh:227 +#: git-rebase--interactive.sh:236 #, sh-format msgid "$sha1: not a commit that can be picked" msgstr "$sha1: không phải là lần chuyển giao mà có thể lấy ra được" -#: git-rebase--interactive.sh:266 +#: git-rebase--interactive.sh:275 #, sh-format msgid "Invalid commit name: $sha1" msgstr "Tên lần chuyển giao không hợp lệ: $sha1" -#: git-rebase--interactive.sh:308 +#: git-rebase--interactive.sh:317 msgid "Cannot write current commit's replacement sha1" msgstr "Không thể ghi lại sha1 thay thế của lần chuyển giao" -#: git-rebase--interactive.sh:360 +#: git-rebase--interactive.sh:369 #, sh-format msgid "Fast-forward to $sha1" msgstr "Chuyển-tiếp-nhanh đến $sha1" -#: git-rebase--interactive.sh:362 +#: git-rebase--interactive.sh:371 #, sh-format msgid "Cannot fast-forward to $sha1" msgstr "Không thể chuyển-tiếp-nhanh đến $sha1" -#: git-rebase--interactive.sh:371 +#: git-rebase--interactive.sh:380 #, sh-format msgid "Cannot move HEAD to $first_parent" msgstr "Không thể di chuyển HEAD đến $first_parent" -#: git-rebase--interactive.sh:376 +#: git-rebase--interactive.sh:385 #, sh-format msgid "Refusing to squash a merge: $sha1" msgstr "Từ chối squash lần hòa trộn: $sha1" -#: git-rebase--interactive.sh:390 +#: git-rebase--interactive.sh:399 #, 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:398 +#: git-rebase--interactive.sh:407 #, sh-format msgid "Could not pick $sha1" msgstr "Không thể lấy ra $sha1" -#: git-rebase--interactive.sh:407 +#: git-rebase--interactive.sh:416 #, 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:412 +#: git-rebase--interactive.sh:421 #, 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:423 +#: git-rebase--interactive.sh:432 #, 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:431 +#: git-rebase--interactive.sh:441 #, sh-format msgid "Cannot write $fixup_msg" msgstr "Không thể $fixup_msg" -#: git-rebase--interactive.sh:434 +#: git-rebase--interactive.sh:444 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:435 -msgid "This is the 1st commit message:" -msgstr "Đây là chú thích cho lần chuyển giao thứ nhất:" - -#: git-rebase--interactive.sh:475 git-rebase--interactive.sh:518 -#: git-rebase--interactive.sh:521 +#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528 +#: git-rebase--interactive.sh:531 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "Không thể áp dụng $sha1… $rest" -#: git-rebase--interactive.sh:549 +#: git-rebase--interactive.sh:559 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -14322,31 +14773,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:564 +#: git-rebase--interactive.sh:574 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "Bị dừng tại $sha1_abbrev… $rest" -#: git-rebase--interactive.sh:579 +#: git-rebase--interactive.sh:589 #, 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:621 +#: git-rebase--interactive.sh:631 #, sh-format msgid "Executing: $rest" msgstr "Thực thi: $rest" -#: git-rebase--interactive.sh:629 +#: git-rebase--interactive.sh:639 #, sh-format msgid "Execution failed: $rest" msgstr "Thực thi gặp lỗi: $rest" -#: git-rebase--interactive.sh:631 +#: git-rebase--interactive.sh:641 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:633 +#: git-rebase--interactive.sh:643 msgid "" "You can fix the problem, and then run\n" "\n" @@ -14357,7 +14808,7 @@ msgstr "" "\tgit rebase --continue" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--interactive.sh:646 +#: git-rebase--interactive.sh:656 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -14372,25 +14823,25 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--interactive.sh:657 +#: git-rebase--interactive.sh:667 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "Lệnh chưa biết: $command $sha1 $rest" -#: git-rebase--interactive.sh:658 +#: git-rebase--interactive.sh:668 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:693 +#: git-rebase--interactive.sh:703 #, 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:740 +#: 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:898 +#: git-rebase--interactive.sh:908 #, sh-format msgid "" "Warning: the SHA-1 is missing or isn't a commit in the following line:\n" @@ -14400,7 +14851,7 @@ msgstr "" "sau đây:\n" " - $line" -#: git-rebase--interactive.sh:931 +#: git-rebase--interactive.sh:941 #, sh-format msgid "" "Warning: the command isn't recognized in the following line:\n" @@ -14409,11 +14860,11 @@ msgstr "" "Cảnh báo: lệnh không nhận ra trong dòng sau đây:\n" " - $line" -#: git-rebase--interactive.sh:970 +#: git-rebase--interactive.sh:980 msgid "could not detach HEAD" msgstr "không thể tách rời HEAD" -#: git-rebase--interactive.sh:1008 +#: git-rebase--interactive.sh:1018 msgid "" "Warning: some commits may have been dropped accidentally.\n" "Dropped commits (newer to older):" @@ -14421,7 +14872,7 @@ 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:1016 +#: git-rebase--interactive.sh:1026 msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" "\n" @@ -14436,7 +14887,7 @@ msgstr "" "báo.\n" "Cánh ứng xử có thể là: ignore, warn, error." -#: git-rebase--interactive.sh:1027 +#: git-rebase--interactive.sh:1037 #, sh-format msgid "" "Unrecognized setting $check_level for option rebase.missingCommitsCheck. " @@ -14445,7 +14896,7 @@ msgstr "" "Không thừa nhận cài đặt $check_level for option rebase.missingCommitsCheck. " "Nên bỏ qua." -#: git-rebase--interactive.sh:1044 +#: git-rebase--interactive.sh:1054 msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" "continue'." @@ -14453,15 +14904,15 @@ 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:1045 +#: 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:1069 +#: git-rebase--interactive.sh:1079 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "Không thể xóa bỏ CHERRY_PICK_HEAD" -#: git-rebase--interactive.sh:1074 +#: git-rebase--interactive.sh:1084 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -14492,11 +14943,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--interactive.sh:1091 +#: git-rebase--interactive.sh:1101 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:1096 +#: git-rebase--interactive.sh:1106 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -14505,11 +14956,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:1101 git-rebase--interactive.sh:1105 +#: git-rebase--interactive.sh:1111 git-rebase--interactive.sh:1115 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:1129 +#: git-rebase--interactive.sh:1139 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -14523,39 +14974,39 @@ msgstr "" " git rebase --continue\n" "\n" -#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1295 +#: git-rebase--interactive.sh:1147 git-rebase--interactive.sh:1305 msgid "Could not execute editor" msgstr "Không thể thực thi trình biên soạn" -#: git-rebase--interactive.sh:1150 +#: git-rebase--interactive.sh:1160 #, sh-format msgid "Could not checkout $switch_to" msgstr "Không thể checkout $switch_to" -#: git-rebase--interactive.sh:1155 +#: git-rebase--interactive.sh:1165 msgid "No HEAD?" msgstr "Không HEAD?" -#: git-rebase--interactive.sh:1156 +#: git-rebase--interactive.sh:1166 #, 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:1158 +#: git-rebase--interactive.sh:1168 msgid "Could not mark as interactive" msgstr "Không thể đánh dấu là tương tác" -#: git-rebase--interactive.sh:1168 git-rebase--interactive.sh:1173 +#: git-rebase--interactive.sh:1178 git-rebase--interactive.sh:1183 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:1273 +#: git-rebase--interactive.sh:1283 #, 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:1278 +#: git-rebase--interactive.sh:1288 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -14564,7 +15015,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:1285 +#: git-rebase--interactive.sh:1295 msgid "Note that empty commits are commented out" msgstr "Chú ý rằng lần chuyển giao trống rỗng là ghi chú" @@ -14634,6 +15085,901 @@ msgstr "Bạn cần chạy lệnh này từ thư mục ở mức cao nhất củ msgid "Unable to determine absolute path of git directory" msgstr "Không thể dò tìm đường dẫn tuyệt đối của thư mục git" +#. TRANSLATORS: you can adjust this to align "git add -i" status menu +#: git-add--interactive.perl:238 +#, perl-format +msgid "%12s %12s %s" +msgstr "%12s %12s %s" + +#: git-add--interactive.perl:239 +msgid "staged" +msgstr "đã đưa lên bệ phóng" + +#: git-add--interactive.perl:239 +msgid "unstaged" +msgstr "chưa đưa lên bệ phóng" + +#: git-add--interactive.perl:297 git-add--interactive.perl:322 +msgid "binary" +msgstr "nhị phân" + +#: git-add--interactive.perl:306 git-add--interactive.perl:360 +msgid "nothing" +msgstr "không có gì" + +#: git-add--interactive.perl:342 git-add--interactive.perl:357 +msgid "unchanged" +msgstr "không thay đổi" + +#: git-add--interactive.perl:653 +#, perl-format +msgid "added %d path\n" +msgid_plural "added %d paths\n" +msgstr[0] "đã thêm %d đường dẫn\n" + +#: git-add--interactive.perl:656 +#, perl-format +msgid "updated %d path\n" +msgid_plural "updated %d paths\n" +msgstr[0] "đã cập nhật %d đường dẫn\n" + +#: git-add--interactive.perl:659 +#, perl-format +msgid "reverted %d path\n" +msgid_plural "reverted %d paths\n" +msgstr[0] "đã hoàn nguyên %d đường dẫn\n" + +#: git-add--interactive.perl:662 +#, perl-format +msgid "touched %d path\n" +msgid_plural "touched %d paths\n" +msgstr[0] "%d đường dẫn đã touch (chạm)\n" + +#: git-add--interactive.perl:671 +msgid "Update" +msgstr "Cập nhật" + +#: git-add--interactive.perl:683 +msgid "Revert" +msgstr "Hoàn nguyên" + +#: git-add--interactive.perl:706 +#, perl-format +msgid "note: %s is untracked now.\n" +msgstr "chú ý: %s giờ đã bỏ theo dõi.\n" + +#: git-add--interactive.perl:717 +msgid "Add untracked" +msgstr "Thêm các cái chưa được theo dõi" + +#: git-add--interactive.perl:723 +msgid "No untracked files.\n" +msgstr "Không có tập tin nào chưa được theo dõi.\n" + +#: git-add--interactive.perl:1039 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for staging." +msgstr "" +"Nếu miếng vá được áp dụng sạch sẽ, hunk đã sửa sẽ ngay lập tức\n" +"được đánh dấu để chuyển lên bệ phóng." + +#: git-add--interactive.perl:1042 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for stashing." +msgstr "" +"Nếu miếng vá được áp dụng sạch sẽ, hunk đã sửa sẽ ngay lập tức\n" +"được đánh dấu để tạm cất." + +#: git-add--interactive.perl:1045 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for unstaging." +msgstr "" +"Nếu miếng vá được áp dụng sạch sẽ, hunk đã sửa sẽ ngay lập tức\n" +"được đánh dấu để bỏ chuyển lên bệ phóng." + +#: git-add--interactive.perl:1048 git-add--interactive.perl:1057 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for applying." +msgstr "" +"Nếu miếng vá được áp dụng sạch sẽ, hunk đã sửa sẽ ngay lập tức\n" +"được đánh dấu để áp dụng." + +#: git-add--interactive.perl:1051 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for discarding" +msgstr "" +"Nếu miếng vá được áp dụng sạch sẽ, hunk đã sửa sẽ ngay lập tức\n" +"được đánh dấu để loại bỏ" + +#: git-add--interactive.perl:1054 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for discarding." +msgstr "" +"Nếu miếng vá được áp dụng sạch sẽ, hunk đã sửa sẽ ngay lập tức\n" +"được đánh dấu để loại bỏ." + +#: git-add--interactive.perl:1067 +#, perl-format +msgid "failed to open hunk edit file for writing: %s" +msgstr "gặp lỗi khi tập tin sửa hunk để ghi: %s" + +#: git-add--interactive.perl:1068 +msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" +msgstr "Chế độ sửa hunk bằng tay -- xem ở đáy để có hướng dẫn sử dụng nhanh.\n" + +#: git-add--interactive.perl:1074 +#, 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" +"Để gỡ bỏ các dòng “%s”, làm chúng thành những dòng “ “ (nội dung).\n" +"Để xóa bỏ dòng “%s”, xóa chúng đi.\n" +"Những dòng bắt đầu bằng %s sẽ bị loại bỏ.\n" + +#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. +#: git-add--interactive.perl:1082 +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 "" +"Nếu miếng vá không được áp dụng sạch sẽ, bạn sẽ có một cơ hội\n" +"để sửa lần nữa. Nếu mọi dòng của hunk bị xóa bỏ, thế thì những\n" +"sửa dổi sẽ bị loại bỏ, và hunk vẫn giữ nguyên.\n" + +#: git-add--interactive.perl:1096 +#, perl-format +msgid "failed to open hunk edit file for reading: %s" +msgstr "gặp lỗi khi mở tập tin hunk để đọc: %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:1187 +msgid "" +"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +msgstr "" +"Hunk đã sửa của bạn không được áp dụng. Sửa lại lần nữa (nói \"n\" để loại " +"bỏ!) [y/n]? " + +#: git-add--interactive.perl:1196 +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 - đưa lên bệ phóng hunk này\n" +"n - đừng đưa lên bệ phóng hunk này\n" +"q - thoát; đừng đưa lên bệ phóng hunk này cũng như bất kỳ cái nào còn lại\n" +"a - đưa lên bệ phóng hunk này và tất cả các hunk sau này trong tập tin\n" +"d - đừng đưa lên bệ phóng hunk này cũng như bất kỳ cái nào còn lại trong tập " +"tin" + +#: git-add--interactive.perl:1202 +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 - tạm cất hunk này\n" +"n - đừng tạm cất hunk này\n" +"q - thoát; đừng tạm cất hunk này cũng như bất kỳ cái nào còn lại\n" +"a - tạm cất hunk này và tất cả các hunk sau này trong tập tin\n" +"d - đừng tạm cất hunk này cũng như bất kỳ cái nào còn lại trong tập tin" + +#: git-add--interactive.perl:1208 +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 - đưa ra khỏi bệ phóng hunk này\n" +"n - đừng đưa ra khỏi bệ phóng hunk này\n" +"q - thoát; đừng đưa ra khỏi bệ phóng hunk này cũng như bất kỳ cái nào còn " +"lại\n" +"a - đưa ra khỏi bệ phóng hunk này và tất cả các hunk sau này trong tập tin\n" +"d - đừng đưa ra khỏi bệ phóng hunk này cũng như bất kỳ cái nào còn lại trong " +"tập tin" + +#: git-add--interactive.perl:1214 +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 - áp dụng hunk này vào mục lục\n" +"n - đừng áp dụng hunk này vào mục lục\n" +"q - thoát; đừng áp dụng hunk này cũng như bất kỳ cái nào còn lại\n" +"a - áp dụng hunk này và tất cả các hunk sau này trong tập tin\n" +"d - đừng áp dụng hunk này cũng như bất kỳ cái nào sau này trong tập tin" + +#: git-add--interactive.perl:1220 +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 - loại bỏ hunk này khỏi cây làm việc\n" +"n - đừng loại bỏ hunk khỏi cây làm việc\n" +"q - thoát; đừng loại bỏ hunk này cũng như bất kỳ cái nào còn lại\n" +"a - loại bỏ hunk này và tất cả các hunk sau này trong tập tin\n" +"d - đừng loại bỏ hunk này cũng như bất kỳ cái nào sau này trong tập tin" + +#: git-add--interactive.perl:1226 +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 - loại bỏ hunk này khỏi mục lục và cây làm việc\n" +"n - đừng loại bỏ hunk khỏi mục lục và cây làm việc\n" +"q - thoát; đừng loại bỏ hunk này cũng như bất kỳ cái nào còn lại\n" +"a - loại bỏ hunk này và tất cả các hunk sau này trong tập tin\n" +"d - đừng loại bỏ hunk này cũng như bất kỳ cái nào sau này trong tập tin" + +#: git-add--interactive.perl:1232 +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 - áp dụng hunk này vào mục lục và cây làm việc\n" +"n - đừng áp dụng hunk vào mục lục và cây làm việc\n" +"q - thoát; đừng áp dụng hunk này cũng như bất kỳ cái nào còn lại\n" +"a - áp dụng hunk này và tất cả các hunk sau này trong tập tin\n" +"d - đừng áp dụng hunk này cũng như bất kỳ cái nào sau này trong tập tin" + +#: git-add--interactive.perl:1241 +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 - chọn một hunk muốn tới\n" +"/ - tìm một hunk khớp với biểu thức chính quy đưa ra\n" +"j - để lại hunk này là chưa quyết định, xem hunk chưa quyết định kế\n" +"J - để lại hunk này là chưa quyết định, xem hunk kế\n" +"k - để lại hunk này là chưa quyết định, xem hunk chưa quyết định kế trước\n" +"K - để lại hunk này là chưa quyết định, xem hunk kế trước\n" +"s - chia hunk hiện tại thành các hunk nhỏ hơn\n" +"e - sửa bằng tay hunk hiện hành\n" +"? - in trợ giúp\n" + +#: git-add--interactive.perl:1272 +msgid "The selected hunks do not apply to the index!\n" +msgstr "Các hunk đã chọn không được áp dụng vào bảng mục lục!\n" + +#: git-add--interactive.perl:1273 +msgid "Apply them to the worktree anyway? " +msgstr "Vẫn áp dụng chúng cho cây làm việc? " + +#: git-add--interactive.perl:1276 +msgid "Nothing was applied.\n" +msgstr "Đã không áp dụng gì cả.\n" + +#: git-add--interactive.perl:1287 +#, perl-format +msgid "ignoring unmerged: %s\n" +msgstr "bỏ qua những thứ chưa hòa trộn: %s\n" + +#: git-add--interactive.perl:1296 +msgid "Only binary files changed.\n" +msgstr "Chỉ có các tập tin nhị phân là thay đổi.\n" + +#: git-add--interactive.perl:1298 +msgid "No changes.\n" +msgstr "Không có thay đổi nào.\n" + +#: git-add--interactive.perl:1306 +msgid "Patch update" +msgstr "Cập nhật miếng vá" + +#: git-add--interactive.perl:1358 +#, perl-format +msgid "Stage mode change [y,n,q,a,d,/%s,?]? " +msgstr "Thay đổi chế độ bệ phóng [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1359 +#, perl-format +msgid "Stage deletion [y,n,q,a,d,/%s,?]? " +msgstr "Xóa khỏi bệ phóng [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1360 +#, perl-format +msgid "Stage this hunk [y,n,q,a,d,/%s,?]? " +msgstr "Đưa lên bệ phóng hunk này [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1363 +#, perl-format +msgid "Stash mode change [y,n,q,a,d,/%s,?]? " +msgstr "Thay đổi chế độ tạm cất đi [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1364 +#, perl-format +msgid "Stash deletion [y,n,q,a,d,/%s,?]? " +msgstr "Xóa tạm cất [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1365 +#, perl-format +msgid "Stash this hunk [y,n,q,a,d,/%s,?]? " +msgstr "Tạm cất hunk này [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1368 +#, perl-format +msgid "Unstage mode change [y,n,q,a,d,/%s,?]? " +msgstr "Thay đổi chế độ bỏ ra khỏi bệ phóng [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1369 +#, perl-format +msgid "Unstage deletion [y,n,q,a,d,/%s,?]? " +msgstr "Xóa bỏ việc bỏ ra khỏi bệ phóng [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1370 +#, perl-format +msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? " +msgstr "Bỏ ra khỏi bệ phóng hunk này [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1373 +#, perl-format +msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? " +msgstr "Áp dụng thay đổi chế độ cho mục lục [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1374 +#, perl-format +msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? " +msgstr "Áp dụng việc xóa vào mục lục [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1375 +#, perl-format +msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? " +msgstr "Áo dụng hunk này vào mục lục [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1378 +#, perl-format +msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? " +msgstr "Loại bỏ các thay đổi chế độ từ cây làm việc [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1379 +#, perl-format +msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? " +msgstr "Loại bỏ việc xóa khỏi cây làm việc [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1380 +#, perl-format +msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? " +msgstr "Loại bỏ hunk này khỏi cây làm việc [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1383 +#, perl-format +msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "Loại bỏ thay đổi chế độ từ mục lục và cây làm việc [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1384 +#, perl-format +msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "Loại bỏ việc xóa khỏi mục lục và cây làm việc [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1385 +#, perl-format +msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "Loại bỏ hunk này khỏi mục lục và cây làm việc [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1388 +#, perl-format +msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "" +"Áp dụng thay đổi chế độ cho mục lục và cây làm việc [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1389 +#, perl-format +msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "Áp dụng việc xóa vào mục lục và cây làm việc [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1390 +#, perl-format +msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "Áp dụng hunk này vào mục lục và cây làm việc [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1493 +msgid "go to which hunk (<ret> to see more)? " +msgstr "nhảy đến hunk nào (<ret> để xem thêm)? " + +#: git-add--interactive.perl:1495 +msgid "go to which hunk? " +msgstr "nhảy đến hunk nào?" + +#: git-add--interactive.perl:1504 +#, perl-format +msgid "Invalid number: '%s'\n" +msgstr "Số không hợp lệ: “%s”\n" + +#: git-add--interactive.perl:1509 +#, perl-format +msgid "Sorry, only %d hunk available.\n" +msgid_plural "Sorry, only %d hunks available.\n" +msgstr[0] "Rất tiếc, chỉ có sẵn %d hunk..\n" + +#: git-add--interactive.perl:1535 +msgid "search for regex? " +msgstr "tìm kiếm cho regex? " + +#: git-add--interactive.perl:1548 +#, perl-format +msgid "Malformed search regexp %s: %s\n" +msgstr "Định dạng tìm kiếm của biểu thức chính quy không đúng %s: %s\n" + +#: git-add--interactive.perl:1558 +msgid "No hunk matches the given pattern\n" +msgstr "Không thấy hunk nào khớp mẫu đã cho\n" + +#: git-add--interactive.perl:1570 git-add--interactive.perl:1592 +msgid "No previous hunk\n" +msgstr "Không có hunk kế trước\n" + +#: git-add--interactive.perl:1579 git-add--interactive.perl:1598 +msgid "No next hunk\n" +msgstr "Không có hunk kế tiếp\n" + +#: git-add--interactive.perl:1606 +#, perl-format +msgid "Split into %d hunk.\n" +msgid_plural "Split into %d hunks.\n" +msgstr[0] "Chi nhỏ thành %d hunks.\n" + +#: git-add--interactive.perl:1658 +msgid "Review diff" +msgstr "Xem xét lại diff" + +#. TRANSLATORS: please do not translate the command names +#. 'status', 'update', 'revert', etc. +#: git-add--interactive.perl:1677 +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\t - view diff between HEAD and index\n" +"add untracked - add contents of untracked files to the staged set of " +"changes\n" +msgstr "" +"status - hiển thị các đường dẫn với các thay đổi\n" +"update - đặt trạng thái cây làm việc thành tập hợp các thay đổi đã " +"đặt lên bệ phóng\n" +"revert - hoàn nguyên tập hợp các thay đổi đã đặt lên bệ phóng trở lại " +"phiên bản HEAD\n" +"patch - cậy các hunk và cập nhật có lựa chọn\n" +"diff\t - xem khác biệt giữa HEAD và mục lục\n" +"add untracked - thêm nội dung các các tập tin chưa theo dõi và tập hợp các " +"thay đổi đã đặt lên bệ phóng\n" + +#: git-add--interactive.perl:1694 git-add--interactive.perl:1699 +#: git-add--interactive.perl:1702 git-add--interactive.perl:1709 +#: git-add--interactive.perl:1713 git-add--interactive.perl:1719 +msgid "missing --" +msgstr "thiếu --" + +#: git-add--interactive.perl:1715 +#, perl-format +msgid "unknown --patch mode: %s" +msgstr "không hiểu chế độ --patch: %s" + +#: git-add--interactive.perl:1721 git-add--interactive.perl:1727 +#, perl-format +msgid "invalid argument %s, expecting --" +msgstr "đối số không hợp lệ %s, cần --" + +#: git-send-email.perl:121 +msgid "local zone differs from GMT by a non-minute interval\n" +msgstr "múi giờ nội bộ khác biệt với GMT bởi khoảng thời gian không-phút\n" + +#: git-send-email.perl:128 git-send-email.perl:134 +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:202 git-send-email.perl:208 +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:282 +#, 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:287 +#, 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:305 +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:368 git-send-email.perl:623 +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:437 +#, perl-format +msgid "Unknown --suppress-cc field: '%s'\n" +msgstr "Không hiểu trường --suppress-cc: “%s”\n" + +#: git-send-email.perl:466 +#, perl-format +msgid "Unknown --confirm setting: '%s'\n" +msgstr "Không hiểu cài đặt --confirm: “%s”\n" + +#: git-send-email.perl:498 +#, 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:500 +#, 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:502 +#, 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:507 +#, 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:589 +#, 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 "" +"Tập tin “%s” đã có sẵn nhưng nó có lẽ cũng là chuẩn bị của\n" +"các miếng vá tạo lần chuyển giao. Vui lòng làm rõ ý bằng…\n" +"\n" +" * 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:610 +#, perl-format +msgid "Failed to opendir %s: %s" +msgstr "Gặp lỗi khi mở thư mục “%s”: %s" + +#: git-send-email.perl:634 +#, perl-format +msgid "" +"fatal: %s: %s\n" +"warning: no patches were sent\n" +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:645 +msgid "" +"\n" +"No patch files specified!\n" +"\n" +msgstr "" +"\n" +"Chưa chỉ định các tập tin miếng vá!\n" +"\n" + +#: git-send-email.perl:658 +#, perl-format +msgid "No subject line in %s?" +msgstr "Không có dòng chủ đề trong %s?" + +#: git-send-email.perl:668 +#, perl-format +msgid "Failed to open for writing %s: %s" +msgstr "Gặp lỗi khi mở “%s” để ghi: %s" + +#: git-send-email.perl:678 +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 "" +"Các dòng bắt đầu bằng \"GIT:\" sẽ bị xóa bỏ.\n" +"Cân nhắc bao gồm một thống kê diff toàn thể hay bảng nội dung\n" +"cho miếng vá mà bạn đang viết.\n" +"\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:701 +#, perl-format +msgid "Failed to open %s.final: %s" +msgstr "Gặp lỗi khi mở %s.final: %s" + +#: git-send-email.perl:704 +#, perl-format +msgid "Failed to open %s: %s" +msgstr "Gặp lỗi khi mở “%s”: %s" + +#: git-send-email.perl:739 +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:748 +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:780 +#, 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:809 +msgid "" +"The following files are 8bit, but do not declare a Content-Transfer-" +"Encoding.\n" +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:814 +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:822 +#, 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 "" +"Từ chối gửi bởi vì miếng vá\n" +"\t%s\n" +"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:841 +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:859 +#, 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:871 +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:921 git-send-email.perl:929 +#, 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" + +#. 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:933 +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:1234 +#, 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:1309 +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 "" +" Danh sách Cc ở trên được diễn giải bằng các địa chỉ phụ\n" +" thêm tìm thấy trong lời ghi chú lần chuyển giao của miếng vá.\n" +" Theo mặc định send-email sẽ nhắc trước khi gửi bất cứ khi\n" +" nào điều này xảy ra. Cách hành xử này được điều khiển bởi cài\n" +" đặt cấu hình sendemail.confirm.\n" +"\n" +" Để biết thêm chi tiết, hãy chạy lệnh “git send-email --help”.\n" +" Để giữ lại cách hành xử hiện nay, làm hết lời nhắn này,\n" +" chạy “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:1324 +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:1327 +msgid "Send this email reply required" +msgstr "Gửi thư này trả lời yêu cầu" + +#: git-send-email.perl:1353 +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:1397 +#, perl-format +msgid "Server does not support STARTTLS! %s" +msgstr "Máy chủ không hỗ trợ STARTTLS! %s" + +#: git-send-email.perl:1403 +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:1421 +#, perl-format +msgid "Failed to send %s\n" +msgstr "Gặp lỗi khi gửi %s\n" + +#: git-send-email.perl:1424 +#, perl-format +msgid "Dry-Sent %s\n" +msgstr "Thử gửi %s\n" + +#: git-send-email.perl:1424 +#, perl-format +msgid "Sent %s\n" +msgstr "Gửi %s\n" + +#: git-send-email.perl:1426 +msgid "Dry-OK. Log says:\n" +msgstr "Dry-OK. Nhật ký nói rằng:\n" + +#: git-send-email.perl:1426 +msgid "OK. Log says:\n" +msgstr "OK. Nhật ký nói rằng:\n" + +#: git-send-email.perl:1438 +msgid "Result: " +msgstr "Kết quả: " + +#: git-send-email.perl:1441 +msgid "Result: OK\n" +msgstr "Kết quả: Tốt\n" + +#: git-send-email.perl:1454 +#, perl-format +msgid "can't open file %s" +msgstr "không thể mở tập tin “%s”" + +#: git-send-email.perl:1501 git-send-email.perl:1521 +#, 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:1507 +#, 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:1555 +#, 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:1578 +#, 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:1676 +#, perl-format +msgid "(%s) Could not execute '%s'" +msgstr "(%s) Không thể thực thi “%s”" + +#: git-send-email.perl:1683 +#, perl-format +msgid "(%s) Adding %s: %s from: '%s'\n" +msgstr "(%s) Đang thêm %s: %s từ: “%s”\n" + +#: git-send-email.perl:1687 +#, 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:1714 +msgid "cannot send message as 7bit" +msgstr "không thể lấy gửi thư dạng 7 bít" + +#: git-send-email.perl:1722 +msgid "invalid transfer encoding" +msgstr "bảng mã truyền không hợp lệ" + +#: git-send-email.perl:1741 git-send-email.perl:1792 git-send-email.perl:1802 +#, perl-format +msgid "unable to open %s: %s\n" +msgstr "không thể mở %s: %s\n" + +#: git-send-email.perl:1744 +#, 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:1760 +#, 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:1764 +#, 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 "Use an experimental blank-line-based heuristic to improve diffs" +#~ msgstr "" +#~ "Dùng một phỏng đoán dựa trên dòng trắng thử nghiệm để tăng cường các diff" + +#~ msgid "Clever... amending the last one with dirty index." +#~ msgstr "Giỏi… “tu bổ” cái cuối với bảng mục lục bẩn." + +#~ msgid "" +#~ "the following submodule (or one of its nested submodules)\n" +#~ "uses a .git directory:" +#~ msgid_plural "" +#~ "the following submodules (or one of their nested submodules)\n" +#~ "use a .git directory:" +#~ msgstr[0] "" +#~ "các mô-đun-con sau đây (hay một trong số mô-đun-con bên trong của nó)\n" +#~ "dùng một thư mục .git:" + +#~ msgid "" +#~ "\n" +#~ "(use 'rm -rf' if you really want to remove it including all of its " +#~ "history)" +#~ msgstr "" +#~ "\n" +#~ "(dùng /\"rm -rf/\" nếu bạn thực sự muốn gỡ bỏ nó cùng với tất cả lịch sử " +#~ "của chúng)" + #~ msgid "Could not write to %s" #~ msgstr "Không thể ghi vào %s" @@ -14820,9 +16166,6 @@ msgstr "Không thể dò tìm đường dẫn tuyệt đối của thư mục gi #~ msgid "bug: unhandled diff status %c" #~ msgstr "lỗi: không thể tiếp nhận trạng thái lệnh diff %c" -#~ msgid "read of %s failed" -#~ msgstr "đọc %s gặp lỗi" - #~ msgid "could not write branch description template" #~ msgstr "không thể ghi mẫu mô tả nhánh" @@ -14904,12 +16247,6 @@ msgstr "Không thể dò tìm đường dẫn tuyệt đối của thư mục gi #~ msgid "unable to access '%s': %s" #~ msgstr "không thể truy cập “%s”: %s" -#~ msgid "could not open '%s' for reading: %s" -#~ msgstr "không thể mở “%s” để đọc: %s" - -#~ msgid "could not open '%s' for writing: %s" -#~ msgstr "Không thể mở “%s” để ghi: %s" - #~ msgid " git branch -d %s\n" #~ msgstr " git branch -d %s\n" @@ -15415,18 +16752,12 @@ msgstr "Không thể dò tìm đường dẫn tuyệt đối của thư mục gi #~ msgid "oops" #~ msgstr "ôi?" -#~ msgid "Would not remove %s\n" -#~ msgstr "Không thể gỡ bỏ %s\n" - #~ msgid "Not removing %s\n" #~ msgstr "Không xóa %s\n" #~ msgid "git remote set-head <name> (-a | -d | <branch>])" #~ msgstr "git remote set-head <tên> (-a | -d | <nhánh>])" -#~ msgid " 0 files changed" -#~ msgstr " 0 có tập tin nào thay đổi cả" - #~ msgid " %d file changed" #~ msgid_plural " %d files changed" #~ msgstr[0] " %d tập tin thay đổi" diff --git a/po/zh_CN.po b/po/zh_CN.po index c38326c6f..4f5c3ab9a 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -136,7 +136,7 @@ msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" "POT-Creation-Date: 2016-11-25 22:50+0800\n" -"PO-Revision-Date: 2016-11-25 22:54+0800\n" +"PO-Revision-Date: 2017-01-02 20:11+0800\n" "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" "Language-Team: GitHub <https://github.com/jiangxin/git/>\n" "Language: zh_CN\n" @@ -404,7 +404,7 @@ msgstr "缺失 '%s' 的二进制补丁数据" #: apply.c:3098 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" -msgstr "不能反向应用一个没有至 '%s' 的反向数据块的二进制补丁" +msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁" #: apply.c:3144 #, c-format @@ -415,12 +415,12 @@ msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁" #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." -msgstr "补丁引用到 '%s' (%s)，但是和当前内容不匹配。" +msgstr "补丁应用到 '%s'（%s），但是和当前内容不匹配。" #: apply.c:3162 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" -msgstr "补丁应用到空文件 '%s'，但是它并不空" +msgstr "补丁应用到空文件 '%s'，但其并非空文件" #: apply.c:3180 #, c-format @@ -563,7 +563,7 @@ msgstr "子模组 %s 的 sha1 信息缺失或无效" #: apply.c:4082 #, c-format msgid "mode change for %s, which is not in current HEAD" -msgstr "%s 的属性改变，但它不再当前 HEAD 中" +msgstr "%s 的模式被改变，但它不在当前 HEAD 中" #: apply.c:4085 #, c-format @@ -1309,9 +1309,9 @@ msgid "" "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 "" -"警告：提交说明不符合 UTF-8 字符集。\n" +"警告：提交说明不符合 UTF-8 字符编码。\n" "您可以通过修补提交来改正提交说明，或者将配置变量 i18n.commitencoding\n" -"设置为您项目所用的字符集。\n" +"设置为您项目所用的字符编码。\n" #: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" @@ -1440,7 +1440,7 @@ msgstr "不能取消设置 '%s'" #: connect.c:49 msgid "The remote end hung up upon initial contact" -msgstr "远端在初始连接时即挂断" +msgstr "远端在连接发起时即挂断" #: connect.c:51 msgid "" @@ -1644,7 +1644,7 @@ msgstr "因为文件太多，只在修改的路径中查找拷贝。" #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." -msgstr "您可能想要将您的 %s 变量至少设置为 %d 并重复此命令。" +msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。" #: dir.c:1866 msgid "failed to get kernel name and information" @@ -1732,7 +1732,7 @@ msgstr "标记 %s 为完成" #: fetch-pack.c:697 #, c-format msgid "already have %s (%s)" -msgstr "已经有 %s (%s)" +msgstr "已经有 %s（%s）" #: fetch-pack.c:735 msgid "fetch-pack: unable to fork off sideband demultiplexer" @@ -2215,9 +2215,9 @@ msgid "" "Please, use 'git notes merge --commit' or 'git notes merge --abort' to " "commit/abort the previous merge before you start a new notes merge." msgstr "" -"您尚未结束您前一次注释合并（存在 %s）。\n" -"请您在开始一个新的注释合并之前，使用 'git notes merge --commit' 或者 'git " -"notes merge --abort' 来提交/终止前一次合并。" +"您的前一次注释合并尚未结束（存在 %s）。\n" +"在开始一个新的注释合并之前，请使用 'git notes merge --commit' 或者 " +"'git notes merge --abort' 来提交/终止前一次合并。" #: notes-merge.c:280 #, c-format @@ -2340,7 +2340,7 @@ msgid "" "empty strings as pathspecs will be made invalid in upcoming releases. please " "use . instead if you meant to match all paths" msgstr "" -"在即将到来的版本，不能再使用空字符串作为路径表达式。如果要匹配所有路径，\n" +"在下一个版本中，使用空字符串作为路径规格将被视作非法。如果要匹配所有路径，\n" "请代之以 ." #: pathspec.c:440 @@ -2771,7 +2771,7 @@ msgstr "不能解析 HEAD 提交\n" #: sequencer.c:438 msgid "unable to update cache tree\n" -msgstr "不能更新缓存\n" +msgstr "不能更新缓存树\n" #: sequencer.c:483 #, c-format @@ -2789,11 +2789,11 @@ msgid "" "\n" " git rebase --continue\n" msgstr "" -"您已暂存了工作区的修改。如果这些修改要压缩到前一个提交，执行：\n" +"您的工作区中存在已暂存的修改\n如果这些修改需要被并入前一个提交，执行：\n" "\n" " git commit --amend %s\n" "\n" -"如果这些变更要形成一个新提交，执行：\n" +"如果这些修改要形成一个新提交，执行：\n" "\n" " git commit %s\n" "\n" @@ -2883,7 +2883,7 @@ msgstr "不能读取 '%s'。" #: sequencer.c:972 #, c-format msgid "unusable instruction sheet: '%s'" -msgstr "无用的指令清单：'%s'" +msgstr "不可用的指令清单：'%s'" #: sequencer.c:983 msgid "cannot cherry-pick during a revert." @@ -3088,7 +3088,7 @@ msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）" #: sha1_name.c:407 #, c-format msgid "short SHA1 %s is ambiguous" -msgstr "歧义的短 SHA1 %s" +msgstr "短 SHA1 %s 存在歧义" #: sha1_name.c:418 msgid "The candidates are:" @@ -3260,7 +3260,7 @@ msgstr "太短的树对象" #: tree-walk.c:37 msgid "malformed mode in tree entry" -msgstr "树对象中的条目属性错误" +msgstr "树对象中的条目模式错误" #: tree-walk.c:41 msgid "empty filename in tree entry" @@ -4043,7 +4043,7 @@ msgstr "不能%s：您有未暂存的变更。" #: wt-status.c:2276 msgid "additionally, your index contains uncommitted changes." -msgstr "而且您的索引中包含未提交的变更。" +msgstr "另外，您的索引中包含未提交的变更。" #: wt-status.c:2278 #, c-format @@ -4778,7 +4778,7 @@ msgstr "在 %2$s 中无此路径 %1$s" #: builtin/blame.c:2854 #, c-format msgid "cannot read blob %s for path %s" -msgstr "不能为路径 %2$s 读取对象 %1$s" +msgstr "不能为路径 %2$s 读取数据对象 %1$s" #: builtin/blame.c:2873 #, c-format @@ -7749,7 +7749,7 @@ msgstr "手工维护参见 \"git help gc\"。\n" msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "" -"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> （如果不是，使用 --force）" +"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>（如果不是，使用 --force）" #: builtin/gc.c:441 msgid "" @@ -9240,7 +9240,7 @@ msgstr "坏的 branch.%s.mergeoptions 字符串：%s" #: builtin/merge.c:652 msgid "Not handling anything other than two heads merge." -msgstr "不能处理两个头合并之外的任何操作。" +msgstr "未处理两个头合并之外的任何操作。" #: builtin/merge.c:666 #, c-format @@ -10904,10 +10904,10 @@ msgid "" "To squelch this message, you can set it to 'refuse'." msgstr "" "默认禁止删除当前分支，因为下一次 'git clone' 将不会检出任何文件，\n" -"导致混淆。\n" +"导致困惑。\n" "\n" "您可以在远程仓库中设置 'receive.denyDeleteCurrent' 配置变量为\n" -"'warn' 或 'ignore' 以允许删除当前分支，显示或者不显示警告。\n" +"'warn'（显示警告信息）或 'ignore'（忽略警告信息）以允许删除当前分支。\n" "\n" "若要屏蔽此信息，您可以设置它为 'refuse'。" @@ -12124,7 +12124,7 @@ msgstr "'%s' 不是一个有效的引用。" #: builtin/show-branch.c:836 #, c-format msgid "cannot find commit %s (%s)" -msgstr "不能找到提交 %s (%s)" +msgstr "不能找到提交 %s（%s）" #: builtin/show-ref.c:10 msgid "" @@ -12286,7 +12286,7 @@ msgstr "浅克隆的深度" #: builtin/submodule--helper.c:608 builtin/submodule--helper.c:964 msgid "force cloning progress" -msgstr "显示克隆进度" +msgstr "强制显示克隆进度" #: builtin/submodule--helper.c:613 msgid "" @@ -12964,7 +12964,7 @@ msgstr "不能创建目录 '%s'" #: builtin/worktree.c:272 #, c-format msgid "Preparing %s (identifier %s)" -msgstr "准备 %s （标识符 %s）" +msgstr "准备 %s（标识符 %s）" #: builtin/worktree.c:323 msgid "checkout <branch> even if already checked out in other worktree" @@ -13058,7 +13058,7 @@ msgid "" "\n" "\tchmod 0700 %s" msgstr "" -"您 socket 目录权限过于放松，其他用户可能会读取您缓存的认证信息。考虑执行：\n" +"您的 socket 目录权限过于宽松，其他用户可能会读取您缓存的认证信息。考虑执行：\n" "\n" "\tchmod 0700 %s" @@ -14280,8 +14280,7 @@ 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 --edit-todo' 修正问题然后执行 'git rebase --continue'。" #: git-rebase--interactive.sh:1045 msgid "Or you can abort the rebase with 'git rebase --abort'." |